diff options
Diffstat (limited to 'sw/source/filter')
64 files changed, 874 insertions, 874 deletions
diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx index db16166a2a02..5c6f63ecf85d 100644 --- a/sw/source/filter/ascii/parasc.cxx +++ b/sw/source/filter/ascii/parasc.cxx @@ -62,7 +62,7 @@ class SwASCIIParser void InsertText( const OUString& rStr ); public: - SwASCIIParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn, + SwASCIIParser( SwDoc* pD, const SwPaM& rCursor, SvStream& rIn, bool bReadNewDoc, const SwAsciiOptions& rOpts ); ~SwASCIIParser(); @@ -88,12 +88,12 @@ sal_uLong AsciiReader::Read( SwDoc &rDoc, const OUString&, SwPaM &rPam, const OU return nRet; } -SwASCIIParser::SwASCIIParser(SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn, +SwASCIIParser::SwASCIIParser(SwDoc* pD, const SwPaM& rCursor, SvStream& rIn, bool bReadNewDoc, const SwAsciiOptions& rOpts) : pDoc(pD), rInput(rIn), rOpt(rOpts), nFileSize(0), nScript(SvtScriptType::NONE) , bNewDoc(bReadNewDoc) { - pPam = new SwPaM( *rCrsr.GetPoint() ); + pPam = new SwPaM( *rCursor.GetPoint() ); pArr = new sal_Char [ ASC_BUFFLEN + 2 ]; pItemSet = new SfxItemSet( pDoc->GetAttrPool(), diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index 7e785aa9966e..18c175caa6d3 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -298,18 +298,18 @@ void CalculateFlySize(SfxItemSet& rFlySet, const SwNodeIndex& rAnchor, { const SfxPoolItem* pItem = nullptr; if( SfxItemState::SET != rFlySet.GetItemState( RES_FRM_SIZE, true, &pItem ) || - MINFLY > static_cast<const SwFormatFrmSize*>(pItem)->GetWidth() ) + MINFLY > static_cast<const SwFormatFrameSize*>(pItem)->GetWidth() ) { - SwFormatFrmSize aSz(static_cast<const SwFormatFrmSize&>(rFlySet.Get(RES_FRM_SIZE))); + SwFormatFrameSize aSz(static_cast<const SwFormatFrameSize&>(rFlySet.Get(RES_FRM_SIZE))); if (pItem) - aSz = static_cast<const SwFormatFrmSize&>(*pItem); + aSz = static_cast<const SwFormatFrameSize&>(*pItem); SwTwips nWidth; // determine the width; if there is a table use the width of the table; // otherwise use the width of the page const SwTableNode* pTableNd = rAnchor.GetNode().FindTableNode(); if( pTableNd ) - nWidth = pTableNd->GetTable().GetFrameFormat()->GetFrmSize().GetWidth(); + nWidth = pTableNd->GetTable().GetFrameFormat()->GetFrameSize().GetWidth(); else nWidth = nPageWidth; @@ -318,8 +318,8 @@ void CalculateFlySize(SfxItemSet& rFlySet, const SwNodeIndex& rAnchor, if( pSttNd ) { bool bOnlyOneNode = true; - sal_uLong nMinFrm = 0; - sal_uLong nMaxFrm = 0; + sal_uLong nMinFrame = 0; + sal_uLong nMaxFrame = 0; SwTextNode* pFirstTextNd = nullptr; SwNodeIndex aIdx( *pSttNd, 1 ); SwNodeIndex aEnd( *pSttNd->GetNode().EndOfSectionNode() ); @@ -338,14 +338,14 @@ void CalculateFlySize(SfxItemSet& rFlySet, const SwNodeIndex& rAnchor, } sal_uLong nAbsMinCnts; - pTextNd->GetMinMaxSize( aIdx.GetIndex(), nMinFrm, nMaxFrm, nAbsMinCnts ); + pTextNd->GetMinMaxSize( aIdx.GetIndex(), nMinFrame, nMaxFrame, nAbsMinCnts ); } ++aIdx; } if( bOnlyOneNode ) { - if( nMinFrm < MINLAY && pFirstTextNd ) + if( nMinFrame < MINLAY && pFirstTextNd ) { // if the first node don't contained any content, then // insert one char in it calc again and delete once again @@ -353,7 +353,7 @@ void CalculateFlySize(SfxItemSet& rFlySet, const SwNodeIndex& rAnchor, pFirstTextNd->InsertText("MM", aNdIdx); sal_uLong nAbsMinCnts; pFirstTextNd->GetMinMaxSize( pFirstTextNd->GetIndex(), - nMinFrm, nMaxFrm, nAbsMinCnts ); + nMinFrame, nMaxFrame, nAbsMinCnts ); aNdIdx -= 2; pFirstTextNd->EraseText( aNdIdx, 2 ); } @@ -368,22 +368,22 @@ void CalculateFlySize(SfxItemSet& rFlySet, const SwNodeIndex& rAnchor, { sal_uInt16 nWidthTmp = pLn->GetOutWidth() + pLn->GetInWidth(); nWidthTmp = nWidthTmp + rBoxItem.GetDistance( nLine ); - nMinFrm += nWidthTmp; - nMaxFrm += nWidthTmp; + nMinFrame += nWidthTmp; + nMaxFrame += nWidthTmp; } nLine = SvxBoxItemLine::RIGHT; } // enforce minimum width for contents - if( nMinFrm < MINLAY ) - nMinFrm = MINLAY; - if( nMaxFrm < MINLAY ) - nMaxFrm = MINLAY; - - if( nWidth > (sal_uInt16)nMaxFrm ) - nWidth = nMaxFrm; - else if( nWidth > (sal_uInt16)nMinFrm ) - nWidth = nMinFrm; + if( nMinFrame < MINLAY ) + nMinFrame = MINLAY; + if( nMaxFrame < MINLAY ) + nMaxFrame = MINLAY; + + if( nWidth > (sal_uInt16)nMaxFrame ) + nWidth = nMaxFrame; + else if( nWidth > (sal_uInt16)nMinFrame ) + nWidth = nMinFrame; } } @@ -395,9 +395,9 @@ void CalculateFlySize(SfxItemSet& rFlySet, const SwNodeIndex& rAnchor, aSz.SetHeight( MINFLY ); rFlySet.Put( aSz ); } - else if( MINFLY > static_cast<const SwFormatFrmSize*>(pItem)->GetHeight() ) + else if( MINFLY > static_cast<const SwFormatFrameSize*>(pItem)->GetHeight() ) { - SwFormatFrmSize aSz( *static_cast<const SwFormatFrmSize*>(pItem) ); + SwFormatFrameSize aSz( *static_cast<const SwFormatFrameSize*>(pItem) ); aSz.SetHeight( MINFLY ); rFlySet.Put( aSz ); } diff --git a/sw/source/filter/basflt/fltshell.cxx b/sw/source/filter/basflt/fltshell.cxx index 8218236081c3..becc8ad52e5e 100644 --- a/sw/source/filter/basflt/fltshell.cxx +++ b/sw/source/filter/basflt/fltshell.cxx @@ -527,7 +527,7 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, if(pDoc->getIDocumentLayoutAccess().GetCurrentViewShell() && (FLY_AT_PARA == pFormat->GetAnchor().GetAnchorId())) { - pFormat->MakeFrms(); + pFormat->MakeFrames(); } } } diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx index 7c098122b840..a2e6a5c6c6e5 100644 --- a/sw/source/filter/basflt/shellio.cxx +++ b/sw/source/filter/basflt/shellio.cxx @@ -68,7 +68,7 @@ sal_uLong SwReader::Read( const Reader& rOptions ) po->pStrm = pStrm; po->pStg = pStg; po->xStg = xStg; - po->bInsertMode = nullptr != pCrsr; + po->bInsertMode = nullptr != pCursor; po->bSkipImages = mbSkipImages; // if a Medium is selected, get its Stream @@ -94,8 +94,8 @@ sal_uLong SwReader::Read( const Reader& rOptions ) pDoc->SetInXMLImport( dynamic_cast< XMLReader* >(po) != nullptr ); SwPaM *pPam; - if( pCrsr ) - pPam = pCrsr; + if( pCursor ) + pPam = pCursor; else { // if the Reader was not called by a Shell, create a PaM ourselves @@ -114,7 +114,7 @@ sal_uLong SwReader::Read( const Reader& rOptions ) bool bReadPageDescs = false; bool const bDocUndo = pDoc->GetIDocumentUndoRedo().DoesUndo(); - bool bSaveUndo = bDocUndo && pCrsr; + bool bSaveUndo = bDocUndo && pCursor; if( bSaveUndo ) { // the reading of the page template cannot be undone! @@ -137,7 +137,7 @@ sal_uLong SwReader::Read( const Reader& rOptions ) RedlineMode_t ePostReadRedlineMode( nsRedlineMode_t::REDLINE_IGNORE ); // Array of FlyFormats - SwFrameFormats aFlyFrmArr; + SwFrameFormats aFlyFrameArr; // only read templates? then ignore multi selection! bool bFormatsOnly = po->aOpt.IsFormatsOnly(); @@ -149,7 +149,7 @@ sal_uLong SwReader::Read( const Reader& rOptions ) pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( nsRedlineMode_t::REDLINE_IGNORE ); SwPaM* pUndoPam = nullptr; - if( bDocUndo || pCrsr ) + if( bDocUndo || pCursor ) { // set Pam to the previous node, so that it is not also moved const SwNodeIndex& rTmp = pPam->GetPoint()->nNode; @@ -157,10 +157,10 @@ sal_uLong SwReader::Read( const Reader& rOptions ) } // store for now all Fly's - if( pCrsr ) + if( pCursor ) { std::copy(pDoc->GetSpzFrameFormats()->begin(), - pDoc->GetSpzFrameFormats()->end(), std::back_inserter(aFlyFrmArr)); + pDoc->GetSpzFrameFormats()->end(), std::back_inserter(aFlyFrameArr)); } const sal_Int32 nSttContent = pPam->GetPoint()->nContent.GetIndex(); @@ -205,7 +205,7 @@ sal_uLong SwReader::Read( const Reader& rOptions ) } } - if( pCrsr ) + if( pCursor ) { *pUndoPam->GetMark() = *pPam->GetPoint(); ++pUndoPam->GetPoint()->nNode; @@ -224,7 +224,7 @@ sal_uLong SwReader::Read( const Reader& rOptions ) { SwFrameFormat* pFrameFormat = (*pDoc->GetSpzFrameFormats())[ n ]; const SwFormatAnchor& rAnchor = pFrameFormat->GetAnchor(); - if( !aFlyFrmArr.Contains( pFrameFormat) ) + if( !aFlyFrameArr.Contains( pFrameFormat) ) { SwPosition const*const pFrameAnchor( rAnchor.GetContentAnchor()); @@ -254,7 +254,7 @@ sal_uLong SwReader::Read( const Reader& rOptions ) RES_DRAWFRMFMT == pFrameFormat->Which() ) { // DrawObjects are not allowed in Headers/Footers! - pFrameFormat->DelFrms(); + pFrameFormat->DelFrames(); pDoc->DelFrameFormat( pFrameFormat ); --n; } @@ -273,28 +273,28 @@ sal_uLong SwReader::Read( const Reader& rOptions ) if( pFrameFormat->HasWriterListeners() ) { // Draw-Objects create a Frame when being inserted; thus delete them - pFrameFormat->DelFrms(); + pFrameFormat->DelFrames(); } if (FLY_AT_PAGE == rAnchor.GetAnchorId()) { if( !rAnchor.GetContentAnchor() ) { - pFrameFormat->MakeFrms(); + pFrameFormat->MakeFrames(); } - else if( pCrsr ) + else if( pCursor ) { pDoc->SetContainsAtPageObjWithContentAnchor( true ); } } else - pFrameFormat->MakeFrms(); + pFrameFormat->MakeFrames(); } } } } - if( !aFlyFrmArr.empty() ) - aFlyFrmArr.clear(); + if( !aFlyFrameArr.empty() ) + aFlyFrameArr.clear(); pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( eOld ); if( pDoc->getIDocumentRedlineAccess().IsRedlineOn() ) @@ -357,7 +357,7 @@ sal_uLong SwReader::Read( const Reader& rOptions ) } // delete Pam if it was created only for reading - if( !pCrsr ) + if( !pCursor ) { delete pPam; // open a new one @@ -376,7 +376,7 @@ sal_uLong SwReader::Read( const Reader& rOptions ) pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( eOld ); pDoc->SetOle2Link( aOLELink ); - if( pCrsr ) // das Doc ist jetzt modifiziert + if( pCursor ) // das Doc ist jetzt modifiziert pDoc->getIDocumentState().SetModified(); // #i38810# - If links have been updated, the document // have to be modified. During update of links the OLE link at the document @@ -397,7 +397,7 @@ sal_uLong SwReader::Read( const Reader& rOptions ) SwReader::SwReader(SfxMedium& rMedium, const OUString& rFileName, SwDoc *pDocument) - : SwDocFac(pDocument), pStrm(nullptr), pMedium(&rMedium), pCrsr(nullptr), + : SwDocFac(pDocument), pStrm(nullptr), pMedium(&rMedium), pCursor(nullptr), aFileName(rFileName), mbSkipImages(false) { SetBaseURL( rMedium.GetBaseURL() ); @@ -407,7 +407,7 @@ SwReader::SwReader(SfxMedium& rMedium, const OUString& rFileName, SwDoc *pDocume // Read into an existing document SwReader::SwReader(SvStream& rStrm, const OUString& rFileName, const OUString& rBaseURL, SwPaM& rPam) - : SwDocFac(rPam.GetDoc()), pStrm(&rStrm), pMedium(nullptr), pCrsr(&rPam), + : SwDocFac(rPam.GetDoc()), pStrm(&rStrm), pMedium(nullptr), pCursor(&rPam), aFileName(rFileName), mbSkipImages(false) { SetBaseURL( rBaseURL ); @@ -415,13 +415,13 @@ SwReader::SwReader(SvStream& rStrm, const OUString& rFileName, const OUString& r SwReader::SwReader(SfxMedium& rMedium, const OUString& rFileName, SwPaM& rPam) : SwDocFac(rPam.GetDoc()), pStrm(nullptr), pMedium(&rMedium), - pCrsr(&rPam), aFileName(rFileName), mbSkipImages(false) + pCursor(&rPam), aFileName(rFileName), mbSkipImages(false) { SetBaseURL( rMedium.GetBaseURL() ); } SwReader::SwReader( const uno::Reference < embed::XStorage > &rStg, const OUString& rFilename, SwPaM &rPam ) - : SwDocFac(rPam.GetDoc()), pStrm(nullptr), xStg( rStg ), pMedium(nullptr), pCrsr(&rPam), aFileName(rFilename), mbSkipImages(false) + : SwDocFac(rPam.GetDoc()), pStrm(nullptr), xStg( rStg ), pMedium(nullptr), pCursor(&rPam), aFileName(rFilename), mbSkipImages(false) { } @@ -616,11 +616,11 @@ void Reader::SetFltName( const OUString& ) { } -void Reader::ResetFrameFormatAttrs( SfxItemSet &rFrmSet ) +void Reader::ResetFrameFormatAttrs( SfxItemSet &rFrameSet ) { - rFrmSet.Put( SvxLRSpaceItem(RES_LR_SPACE) ); - rFrmSet.Put( SvxULSpaceItem(RES_UL_SPACE) ); - rFrmSet.Put( SvxBoxItem(RES_BOX) ); + rFrameSet.Put( SvxLRSpaceItem(RES_LR_SPACE) ); + rFrameSet.Put( SvxULSpaceItem(RES_UL_SPACE) ); + rFrameSet.Put( SvxBoxItem(RES_BOX) ); } void Reader::ResetFrameFormats( SwDoc& rDoc ) @@ -699,7 +699,7 @@ int StgReader::GetReaderType() * Constructors, Destructors are inline (inc/shellio.hxx). */ -SwWriter::SwWriter(SvStream& rStrm, SwCrsrShell &rShell, bool bInWriteAll) +SwWriter::SwWriter(SvStream& rStrm, SwCursorShell &rShell, bool bInWriteAll) : pStrm(&rStrm), pMedium(nullptr), pOutPam(nullptr), pShell(&rShell), rDoc(*rShell.GetDoc()), bWriteAll(bInWriteAll) { @@ -722,7 +722,7 @@ SwWriter::SwWriter( const uno::Reference < embed::XStorage >& rStg, SwDoc &rDocu { } -SwWriter::SwWriter(SfxMedium& rMedium, SwCrsrShell &rShell, bool bInWriteAll) +SwWriter::SwWriter(SfxMedium& rMedium, SwCursorShell &rShell, bool bInWriteAll) : pStrm(nullptr), pMedium(&rMedium), pOutPam(nullptr), pShell(&rShell), rDoc(*rShell.GetDoc()), bWriteAll(bInWriteAll) { @@ -768,7 +768,7 @@ sal_uLong SwWriter::Write( WriterRef& rxWriter, const OUString* pRealFileName ) if( !bWriteAll && ( pShell || pOutPam )) { if( pShell ) - pPam = pShell->GetCrsr(); + pPam = pShell->GetCursor(); else pPam = pOutPam; @@ -832,13 +832,13 @@ sal_uLong SwWriter::Write( WriterRef& rxWriter, const OUString* pRealFileName ) { const SwPageDesc& rPgDsc = pOutDoc->GetPageDesc( 0 ); //const SwPageDesc& rPgDsc = *pOutDoc->GetPageDescFromPool( RES_POOLPAGE_STANDARD ); - const SwFormatFrmSize& rSz = rPgDsc.GetMaster().GetFrmSize(); + const SwFormatFrameSize& rSz = rPgDsc.GetMaster().GetFrameSize(); // Clipboard-Document is always created w/o printer; thus the // default PageDesc is always aug LONG_MAX !! Set then to DIN A4 if( LONG_MAX == rSz.GetHeight() || LONG_MAX == rSz.GetWidth() ) { SwPageDesc aNew( rPgDsc ); - SwFormatFrmSize aNewSz( rSz ); + SwFormatFrameSize aNewSz( rSz ); Size a4(SvxPaperInfo::GetPaperSize( PAPER_A4 )); aNewSz.SetHeight( a4.Width() ); aNewSz.SetWidth( a4.Height() ); diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index 0d1399a7f085..b5690e80ed9e 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -145,7 +145,7 @@ static Writer& OutCSS1_SvxULSpace_SvxLRSpace( Writer& rWrt, static Writer& OutCSS1_SvxBrush( Writer& rWrt, const SfxPoolItem& rHt, sal_uInt16 nMode ); static Writer& OutCSS1_SvxBrush( Writer& rWrt, const SfxPoolItem& rHt ); -static Writer& OutCSS1_SwFormatFrmSize( Writer& rWrt, const SfxPoolItem& rHt, +static Writer& OutCSS1_SwFormatFrameSize( Writer& rWrt, const SfxPoolItem& rHt, sal_uInt16 nMode ); static Writer& OutCSS1_SvxFormatBreak_SwFormatPDesc_SvxFormatKeep( Writer& rWrt, const SfxItemSet& rItemSet, @@ -1713,10 +1713,10 @@ static Writer& OutCSS1_SwPageDesc( Writer& rWrt, const SwPageDesc& rPageDesc, // only export Portrait oder Landscape. Otherwise export size. bool bRefLandscape = pRefPageDesc && pRefPageDesc->GetLandscape(); Size aRefSz; - const Size& rSz = rPageDesc.GetMaster().GetFrmSize().GetSize(); + const Size& rSz = rPageDesc.GetMaster().GetFrameSize().GetSize(); if( pRefPageDesc ) { - aRefSz = pRefPageDesc->GetMaster().GetFrmSize().GetSize(); + aRefSz = pRefPageDesc->GetMaster().GetFrameSize().GetSize(); if( bRefLandscape != rPageDesc.GetLandscape() ) { long nTmp = aRefSz.Height(); @@ -1960,7 +1960,7 @@ Writer& OutCSS1_NumBulListStyleOpt( Writer& rWrt, const SwNumRule& rNumRule, } void SwHTMLWriter::OutCSS1_FrameFormatOptions( const SwFrameFormat& rFrameFormat, - sal_uInt32 nFrmOpts, + sal_uInt32 nFrameOpts, const SdrObject *pSdrObj, const SfxItemSet *pItemSet ) { @@ -1971,7 +1971,7 @@ void SwHTMLWriter::OutCSS1_FrameFormatOptions( const SwFrameFormat& rFrameFormat const SwFormatHoriOrient& rHoriOri = rFrameFormat.GetHoriOrient(); SvxLRSpaceItem aLRItem( rFrameFormat.GetLRSpace() ); SvxULSpaceItem aULItem( rFrameFormat.GetULSpace() ); - if( nFrmOpts & HTML_FRMOPT_S_ALIGN ) + if( nFrameOpts & HTML_FRMOPT_S_ALIGN ) { const SwFormatAnchor& rAnchor = rFrameFormat.GetAnchor(); switch( rAnchor.GetAnchorId() ) @@ -1981,7 +1981,7 @@ void SwHTMLWriter::OutCSS1_FrameFormatOptions( const SwFrameFormat& rFrameFormat if( text::RelOrientation::FRAME == rHoriOri.GetRelationOrient() || text::RelOrientation::PRINT_AREA == rHoriOri.GetRelationOrient() ) { - if( !(nFrmOpts & HTML_FRMOPT_ALIGN) ) + if( !(nFrameOpts & HTML_FRMOPT_ALIGN) ) { // float const sal_Char *pStr = text::HoriOrientation::RIGHT==rHoriOri.GetHoriOrient() @@ -2072,7 +2072,7 @@ void SwHTMLWriter::OutCSS1_FrameFormatOptions( const SwFrameFormat& rFrameFormat } // width/height - if( nFrmOpts & HTML_FRMOPT_S_SIZE ) + if( nFrameOpts & HTML_FRMOPT_S_SIZE ) { if( RES_DRAWFRMFMT == rFrameFormat.Which() ) { @@ -2083,17 +2083,17 @@ void SwHTMLWriter::OutCSS1_FrameFormatOptions( const SwFrameFormat& rFrameFormat if( pSdrObj ) { Size aTwipSz( pSdrObj->GetLogicRect().GetSize() ); - if( nFrmOpts & HTML_FRMOPT_S_WIDTH ) + if( nFrameOpts & HTML_FRMOPT_S_WIDTH ) { - if( nFrmOpts & HTML_FRMOPT_S_PIXSIZE ) + if( nFrameOpts & HTML_FRMOPT_S_PIXSIZE ) OutCSS1_PixelProperty( sCSS1_P_width, aTwipSz.Width(), false ); else OutCSS1_UnitProperty( sCSS1_P_width, aTwipSz.Width() ); } - if( nFrmOpts & HTML_FRMOPT_S_HEIGHT ) + if( nFrameOpts & HTML_FRMOPT_S_HEIGHT ) { - if( nFrmOpts & HTML_FRMOPT_S_PIXSIZE ) + if( nFrameOpts & HTML_FRMOPT_S_PIXSIZE ) OutCSS1_PixelProperty( sCSS1_P_height, aTwipSz.Height(), true ); else @@ -2103,25 +2103,25 @@ void SwHTMLWriter::OutCSS1_FrameFormatOptions( const SwFrameFormat& rFrameFormat } else { - OSL_ENSURE( HTML_FRMOPT_ABSSIZE & nFrmOpts, + OSL_ENSURE( HTML_FRMOPT_ABSSIZE & nFrameOpts, "Export absolute size" ); - OSL_ENSURE( HTML_FRMOPT_ANYSIZE & nFrmOpts, + OSL_ENSURE( HTML_FRMOPT_ANYSIZE & nFrameOpts, "Export every size" ); sal_uInt16 nMode = 0; - if( nFrmOpts & HTML_FRMOPT_S_WIDTH ) + if( nFrameOpts & HTML_FRMOPT_S_WIDTH ) nMode |= CSS1_FRMSIZE_WIDTH; - if( nFrmOpts & HTML_FRMOPT_S_HEIGHT ) + if( nFrameOpts & HTML_FRMOPT_S_HEIGHT ) nMode |= (CSS1_FRMSIZE_MINHEIGHT|CSS1_FRMSIZE_FIXHEIGHT); - if( nFrmOpts & HTML_FRMOPT_S_PIXSIZE ) + if( nFrameOpts & HTML_FRMOPT_S_PIXSIZE ) nMode |= CSS1_FRMSIZE_PIXEL; - OutCSS1_SwFormatFrmSize( *this, rFrameFormat.GetFrmSize(), nMode ); + OutCSS1_SwFormatFrameSize( *this, rFrameFormat.GetFrameSize(), nMode ); } } const SfxItemSet& rItemSet = rFrameFormat.GetAttrSet(); // margin-* - if( (nFrmOpts & HTML_FRMOPT_S_SPACE) && + if( (nFrameOpts & HTML_FRMOPT_S_SPACE) && IsHTMLMode( HTMLMODE_FLY_MARGINS) ) { const SvxLRSpaceItem *pLRItem = nullptr; @@ -2135,17 +2135,17 @@ void SwHTMLWriter::OutCSS1_FrameFormatOptions( const SwFrameFormat& rFrameFormat } // border - if( nFrmOpts & HTML_FRMOPT_S_BORDER ) + if( nFrameOpts & HTML_FRMOPT_S_BORDER ) { const SfxPoolItem* pItem; - if( nFrmOpts & HTML_FRMOPT_S_NOBORDER ) + if( nFrameOpts & HTML_FRMOPT_S_NOBORDER ) OutCSS1_SvxBox( *this, rFrameFormat.GetBox() ); else if( SfxItemState::SET==rItemSet.GetItemState( RES_BOX, true, &pItem ) ) OutCSS1_SvxBox( *this, *pItem ); } // background (if, then the color must be set also) - if( nFrmOpts & HTML_FRMOPT_S_BACKGROUND ) + if( nFrameOpts & HTML_FRMOPT_S_BACKGROUND ) OutCSS1_FrameFormatBackground( rFrameFormat ); if( pItemSet ) @@ -2919,12 +2919,12 @@ static Writer& OutCSS1_SwFormatDrop( Writer& rWrt, const SfxPoolItem& rHt ) return rWrt; } -static Writer& OutCSS1_SwFormatFrmSize( Writer& rWrt, const SfxPoolItem& rHt, +static Writer& OutCSS1_SwFormatFrameSize( Writer& rWrt, const SfxPoolItem& rHt, sal_uInt16 nMode ) { SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt); - const SwFormatFrmSize& rFSItem = static_cast<const SwFormatFrmSize&>(rHt); + const SwFormatFrameSize& rFSItem = static_cast<const SwFormatFrameSize&>(rHt); if( nMode & CSS1_FRMSIZE_WIDTH ) { diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 7b644865b823..97b9248297ee 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -868,7 +868,7 @@ void OutHTML_SwFormat( Writer& rWrt, const SwFormat& rFormat, sal_uInt16 nDir = rHWrt.GetHTMLDirection( (pNodeItemSet ? static_cast < const SvxFrameDirectionItem& >( pNodeItemSet->Get( RES_FRAMEDIR ) ) - : rFormat.GetFrmDir() ).GetValue() ); + : rFormat.GetFrameDir() ).GetValue() ); // Ein <P> wird nur geschrieben, wenn // - wir in keiner OL/UL/DL sind, oder @@ -2063,7 +2063,7 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode ) rHTMLWrt.ChangeParaToken( 0 ); // Alle an dem Node verankerten Rahmen ausgeben - rHTMLWrt.OutFlyFrm( rNode.GetIndex(), 0, HTML_POS_ANY ); + rHTMLWrt.OutFlyFrame( rNode.GetIndex(), 0, HTML_POS_ANY ); if( rHTMLWrt.m_bLFPossible ) rHTMLWrt.OutNewLine(); // Absatz-Tag in eine neue Zeile @@ -2089,7 +2089,7 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode ) const SwFrameFormat& rPgFormat = rHTMLWrt.pDoc->getIDocumentStylePoolAccess().GetPageDescFromPool ( RES_POOLPAGE_HTML, false )->GetMaster(); - const SwFormatFrmSize& rSz = rPgFormat.GetFrmSize(); + const SwFormatFrameSize& rSz = rPgFormat.GetFrameSize(); const SvxLRSpaceItem& rLR = rPgFormat.GetLRSpace(); const SwFormatCol& rCol = rPgFormat.GetCol(); @@ -2104,7 +2104,7 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode ) const SwTableBox* pBox = pTableNd->GetTable().GetTableBox( pNd->StartOfSectionIndex() ); if( pBox ) - nPageWidth = pBox->GetFrameFormat()->GetFrmSize().GetWidth(); + nPageWidth = pBox->GetFrameFormat()->GetFrameSize().GetWidth(); } OString sWidth = OString::number(SwHTMLWriter::ToPixel(nPageWidth - nLeft - nRight, false)); @@ -2176,7 +2176,7 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode ) rHTMLWrt.m_bLFPossible = !rHTMLWrt.m_nLastParaToken; // Alle an dem Node verankerten Rahmen ausgeben - rHTMLWrt.OutFlyFrm( rNode.GetIndex(), 0, HTML_POS_ANY ); + rHTMLWrt.OutFlyFrame( rNode.GetIndex(), 0, HTML_POS_ANY ); rHTMLWrt.m_bLFPossible = false; return rWrt; @@ -2229,13 +2229,13 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode ) rHTMLWrt.OutForm(); // An dem Node "verankerte" Seitenegebunde Rahmen ausgeben - bool bFlysLeft = rHTMLWrt.OutFlyFrm( rNode.GetIndex(), 0, HTML_POS_PREFIX ); + bool bFlysLeft = rHTMLWrt.OutFlyFrame( rNode.GetIndex(), 0, HTML_POS_PREFIX ); // An dem Node verankerte Rahmen ausgeben, die vor dem // Absatz-Tag geschrieben werden sollen. if( bFlysLeft ) { - bFlysLeft = rHTMLWrt.OutFlyFrm( rNode.GetIndex(), 0, HTML_POS_BEFORE ); + bFlysLeft = rHTMLWrt.OutFlyFrame( rNode.GetIndex(), 0, HTML_POS_BEFORE ); } if( rHTMLWrt.pCurPam->GetPoint()->nNode == rHTMLWrt.pCurPam->GetMark()->nNode ) @@ -2402,7 +2402,7 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode ) if( bFlysLeft ) { aEndPosLst.OutEndAttrs( rHTMLWrt, nStrPos + nOffset, &aContext ); - bFlysLeft = rHTMLWrt.OutFlyFrm( rNode.GetIndex(), + bFlysLeft = rHTMLWrt.OutFlyFrame( rNode.GetIndex(), nStrPos, HTML_POS_INSIDE, &aContext ); } @@ -2562,7 +2562,7 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode ) // Die an der letzten Position verankerten Rahmen ausgeben if( bFlysLeft ) - bFlysLeft = rHTMLWrt.OutFlyFrm( rNode.GetIndex(), + bFlysLeft = rHTMLWrt.OutFlyFrame( rNode.GetIndex(), nEnd, HTML_POS_INSIDE ); OSL_ENSURE( !bFlysLeft, "Es wurden nicht alle Rahmen gespeichert!" ); @@ -2900,9 +2900,9 @@ static Writer& OutHTML_SwFlyCnt( Writer& rWrt, const SfxPoolItem& rHt ) const SwFrameFormat& rFormat = *rFlyCnt.GetFrameFormat(); const SdrObject *pSdrObj = nullptr; - SwHTMLFrmType eType = - (SwHTMLFrmType)rHTMLWrt.GuessFrmType( rFormat, pSdrObj ); - sal_uInt8 nMode = aHTMLOutFrmAsCharTable[eType][rHTMLWrt.m_nExportMode]; + SwHTMLFrameType eType = + (SwHTMLFrameType)rHTMLWrt.GuessFrameType( rFormat, pSdrObj ); + sal_uInt8 nMode = aHTMLOutFrameAsCharTable[eType][rHTMLWrt.m_nExportMode]; rHTMLWrt.OutFrameFormat( nMode, rFormat, pSdrObj ); return rWrt; } diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index addae9ddf749..291856442520 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -385,8 +385,8 @@ void SwCSS1Parser::SetPageDescAttrs( const SvxBrushItem *pBrush, { SvxBrushItem aBrushItem( RES_BACKGROUND ); SvxBoxItem aBoxItem( RES_BOX ); - SvxFrameDirectionItem aFrmDirItem(FRMDIR_ENVIRONMENT, RES_FRAMEDIR); - bool bSetBrush = pBrush!=nullptr, bSetBox = false, bSetFrmDir = false; + SvxFrameDirectionItem aFrameDirItem(FRMDIR_ENVIRONMENT, RES_FRAMEDIR); + bool bSetBrush = pBrush!=nullptr, bSetBox = false, bSetFrameDir = false; if( pBrush ) aBrushItem = *pBrush; @@ -413,13 +413,13 @@ void SwCSS1Parser::SetPageDescAttrs( const SvxBrushItem *pBrush, if( SfxItemState::SET == pItemSet2->GetItemState( RES_FRAMEDIR, false, &pItem ) ) { // eine Umrandung wird gesetzt - aFrmDirItem = *static_cast< const SvxFrameDirectionItem *>( pItem ); + aFrameDirItem = *static_cast< const SvxFrameDirectionItem *>( pItem ); pItemSet2->ClearItem( RES_FRAMEDIR ); - bSetFrmDir = true; + bSetFrameDir = true; } } - if( bSetBrush || bSetBox || bSetFrmDir ) + if( bSetBrush || bSetBox || bSetFrameDir ) { static sal_uInt16 aPoolIds[] = { RES_POOLPAGE_HTML, RES_POOLPAGE_FIRST, RES_POOLPAGE_LEFT, RES_POOLPAGE_RIGHT }; @@ -434,8 +434,8 @@ void SwCSS1Parser::SetPageDescAttrs( const SvxBrushItem *pBrush, rMaster.SetFormatAttr( aBrushItem ); if( bSetBox ) rMaster.SetFormatAttr( aBoxItem ); - if( bSetFrmDir ) - rMaster.SetFormatAttr( aFrmDirItem ); + if( bSetFrameDir ) + rMaster.SetFormatAttr( aFrameDirItem ); ChgPageDesc( pPageDesc, aNewPageDesc ); } @@ -512,7 +512,7 @@ void SwCSS1Parser::SetPageDescAttrs( const SwPageDesc *pPageDesc, { if( rPropInfo.eSizeType == SVX_CSS1_STYPE_TWIP ) { - rMaster.SetFormatAttr( SwFormatFrmSize( ATT_FIX_SIZE, rPropInfo.nWidth, + rMaster.SetFormatAttr( SwFormatFrameSize( ATT_FIX_SIZE, rPropInfo.nWidth, rPropInfo.nHeight ) ); bChanged = true; } @@ -522,17 +522,17 @@ void SwCSS1Parser::SetPageDescAttrs( const SwPageDesc *pPageDesc, // Groesse der Vorlage erhalten. Bei "landscape" und "portrait" // wird das Landscape-Flag gesetzt und evtl. die Breite/Hoehe // vertauscht. - SwFormatFrmSize aFrmSz( rMaster.GetFrmSize() ); + SwFormatFrameSize aFrameSz( rMaster.GetFrameSize() ); bool bLandscape = aNewPageDesc.GetLandscape(); if( ( bLandscape && rPropInfo.eSizeType == SVX_CSS1_STYPE_PORTRAIT ) || ( !bLandscape && rPropInfo.eSizeType == SVX_CSS1_STYPE_LANDSCAPE ) ) { - SwTwips nTmp = aFrmSz.GetHeight(); - aFrmSz.SetHeight( aFrmSz.GetWidth() ); - aFrmSz.SetWidth( nTmp ); - rMaster.SetFormatAttr( aFrmSz ); + SwTwips nTmp = aFrameSz.GetHeight(); + aFrameSz.SetHeight( aFrameSz.GetWidth() ); + aFrameSz.SetWidth( nTmp ); + rMaster.SetFormatAttr( aFrameSz ); aNewPageDesc.SetLandscape( !bLandscape ); bChanged = true; } @@ -1943,7 +1943,7 @@ bool SwHTMLParser::ParseStyleOptions( const OUString &rStyle, void SwHTMLParser::SetAnchorAndAdjustment( const SfxItemSet & /*rItemSet*/, const SvxCSS1PropertyInfo &rPropInfo, - SfxItemSet &rFrmItemSet ) + SfxItemSet &rFrameItemSet ) { SwFormatAnchor aAnchor; @@ -2039,20 +2039,20 @@ void SwHTMLParser::SetAnchorAndAdjustment( const SfxItemSet & /*rItemSet*/, eSurround = SURROUND_RIGHT; } } - rFrmItemSet.Put( aAnchor ); + rFrameItemSet.Put( aAnchor ); // Absolut Positioniert mit Durchlauf - rFrmItemSet.Put( SwFormatHoriOrient( nHoriPos, eHoriOri, eHoriRel ) ); - rFrmItemSet.Put( SwFormatVertOrient( nVertPos, eVertOri, eVertRel ) ); - rFrmItemSet.Put( SwFormatSurround( eSurround ) ); + rFrameItemSet.Put( SwFormatHoriOrient( nHoriPos, eHoriOri, eHoriRel ) ); + rFrameItemSet.Put( SwFormatVertOrient( nVertPos, eVertOri, eVertRel ) ); + rFrameItemSet.Put( SwFormatSurround( eSurround ) ); } void SwHTMLParser::SetVarSize( SfxItemSet & /*rItemSet*/, SvxCSS1PropertyInfo &rPropInfo, - SfxItemSet &rFrmItemSet, + SfxItemSet &rFrameItemSet, SwTwips nDfltWidth, sal_uInt8 nDfltPrcWidth ) { - SwFrmSize eSize = ATT_MIN_SIZE; + SwFrameSize eSize = ATT_MIN_SIZE; SwTwips nWidth = nDfltWidth, nHeight = MINFLY; sal_uInt8 nPrcWidth = nDfltPrcWidth, nPrcHeight = 0; switch( rPropInfo.eWidthType ) @@ -2082,16 +2082,16 @@ void SwHTMLParser::SetVarSize( SfxItemSet & /*rItemSet*/, ; } - SwFormatFrmSize aFrmSize( eSize, nWidth, nHeight ); - aFrmSize.SetWidthPercent( nPrcWidth ); - aFrmSize.SetHeightPercent( nPrcHeight ); - rFrmItemSet.Put( aFrmSize ); + SwFormatFrameSize aFrameSize( eSize, nWidth, nHeight ); + aFrameSize.SetWidthPercent( nPrcWidth ); + aFrameSize.SetHeightPercent( nPrcHeight ); + rFrameItemSet.Put( aFrameSize ); } void SwHTMLParser::SetFrameFormatAttrs( SfxItemSet &rItemSet, SvxCSS1PropertyInfo & /*rPropInfo*/, sal_uInt16 nFlags, - SfxItemSet &rFrmItemSet ) + SfxItemSet &rFrameItemSet ) { const SfxPoolItem *pItem; if( (nFlags & HTML_FF_BOX) != 0 && @@ -2102,11 +2102,11 @@ void SwHTMLParser::SetFrameFormatAttrs( SfxItemSet &rItemSet, SvxBoxItem aBoxItem( *static_cast<const SvxBoxItem *>(pItem) ); // Alle 4 Seiten gleichzeitig auf 0 setzen aBoxItem.SetDistance( 0 ); - rFrmItemSet.Put( aBoxItem ); + rFrameItemSet.Put( aBoxItem ); } else { - rFrmItemSet.Put( *pItem ); + rFrameItemSet.Put( *pItem ); } rItemSet.ClearItem( RES_BOX ); } @@ -2114,14 +2114,14 @@ void SwHTMLParser::SetFrameFormatAttrs( SfxItemSet &rItemSet, if( (nFlags & HTML_FF_BACKGROUND) != 0 && SfxItemState::SET==rItemSet.GetItemState( RES_BACKGROUND, true, &pItem ) ) { - rFrmItemSet.Put( *pItem ); + rFrameItemSet.Put( *pItem ); rItemSet.ClearItem( RES_BACKGROUND ); } if( (nFlags & HTML_FF_DIRECTION) != 0 && SfxItemState::SET==rItemSet.GetItemState( RES_FRAMEDIR, true, &pItem ) ) { - rFrmItemSet.Put( *pItem ); + rFrameItemSet.Put( *pItem ); rItemSet.ClearItem( RES_FRAMEDIR ); } } diff --git a/sw/source/filter/html/htmlctxt.cxx b/sw/source/filter/html/htmlctxt.cxx index 669a46862d44..01aa9ea1f838 100644 --- a/sw/source/filter/html/htmlctxt.cxx +++ b/sw/source/filter/html/htmlctxt.cxx @@ -423,27 +423,27 @@ bool SwHTMLParser::DoPositioning( SfxItemSet &rItemSet, // - es wurde eine Breite angegeben (in beiden Faellen noetig) if( SwCSS1Parser::MayBePositioned( rPropInfo ) ) { - SfxItemSet aFrmItemSet( m_pDoc->GetAttrPool(), + SfxItemSet aFrameItemSet( m_pDoc->GetAttrPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1 ); if( !IsNewDoc() ) - Reader::ResetFrameFormatAttrs(aFrmItemSet ); + Reader::ResetFrameFormatAttrs(aFrameItemSet ); // Ausrichtung setzen SetAnchorAndAdjustment( text::VertOrientation::NONE, text::HoriOrientation::NONE, rItemSet, rPropInfo, - aFrmItemSet ); + aFrameItemSet ); // Groesse setzen - SetVarSize( rItemSet, rPropInfo, aFrmItemSet ); + SetVarSize( rItemSet, rPropInfo, aFrameItemSet ); // Abstaende setzen - SetSpace( Size(0,0), rItemSet, rPropInfo, aFrmItemSet ); + SetSpace( Size(0,0), rItemSet, rPropInfo, aFrameItemSet ); // Sonstige CSS1-Attribute Setzen SetFrameFormatAttrs( rItemSet, rPropInfo, HTML_FF_BOX|HTML_FF_PADDING|HTML_FF_BACKGROUND|HTML_FF_DIRECTION, - aFrmItemSet ); + aFrameItemSet ); - InsertFlyFrame( aFrmItemSet, pContext, rPropInfo.aId, + InsertFlyFrame( aFrameItemSet, pContext, rPropInfo.aId, CONTEXT_FLAGS_ABSPOS ); pContext->SetPopStack( true ); rPropInfo.aId.clear(); @@ -463,18 +463,18 @@ bool SwHTMLParser::CreateContainer( const OUString& rClass, SwCSS1Parser::MayBePositioned( rPropInfo ) ) { // Container-Klasse - SfxItemSet *pFrmItemSet = pContext->GetFrmItemSet( m_pDoc ); + SfxItemSet *pFrameItemSet = pContext->GetFrameItemSet( m_pDoc ); if( !IsNewDoc() ) - Reader::ResetFrameFormatAttrs( *pFrmItemSet ); + Reader::ResetFrameFormatAttrs( *pFrameItemSet ); SetAnchorAndAdjustment( text::VertOrientation::NONE, text::HoriOrientation::NONE, - rItemSet, rPropInfo, *pFrmItemSet ); + rItemSet, rPropInfo, *pFrameItemSet ); Size aDummy(0,0); SetFixSize( aDummy, aDummy, false, false, rItemSet, rPropInfo, - *pFrmItemSet ); - SetSpace( aDummy, rItemSet, rPropInfo, *pFrmItemSet ); + *pFrameItemSet ); + SetSpace( aDummy, rItemSet, rPropInfo, *pFrameItemSet ); SetFrameFormatAttrs( rItemSet, rPropInfo, HTML_FF_BOX|HTML_FF_BACKGROUND|HTML_FF_DIRECTION, - *pFrmItemSet ); + *pFrameItemSet ); bRet = true; } @@ -730,12 +730,12 @@ void SwHTMLParser::SplitPREListingXMP( _HTMLAttrContext *pCntxt ) FinishPREListingXMP(); } -SfxItemSet *_HTMLAttrContext::GetFrmItemSet( SwDoc *pCreateDoc ) +SfxItemSet *_HTMLAttrContext::GetFrameItemSet( SwDoc *pCreateDoc ) { - if( !pFrmItemSet && pCreateDoc ) - pFrmItemSet = new SfxItemSet( pCreateDoc->GetAttrPool(), + if( !pFrameItemSet && pCreateDoc ) + pFrameItemSet = new SfxItemSet( pCreateDoc->GetAttrPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1 ); - return pFrmItemSet; + return pFrameItemSet; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/html/htmldrawreader.cxx b/sw/source/filter/html/htmldrawreader.cxx index b6fa8fddc5b0..633afe6e83f9 100644 --- a/sw/source/filter/html/htmldrawreader.cxx +++ b/sw/source/filter/html/htmldrawreader.cxx @@ -83,10 +83,10 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj, // to the visible layer. pNewDrawObj->SetLayer( m_pDoc->getIDocumentDrawModelAccess().GetInvisibleHeavenId() ); - SfxItemSet aFrmSet( m_pDoc->GetAttrPool(), + SfxItemSet aFrameSet( m_pDoc->GetAttrPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1 ); if( !IsNewDoc() ) - Reader::ResetFrameFormatAttrs( aFrmSet ); + Reader::ResetFrameFormatAttrs( aFrameSet ); sal_uInt16 nLeftSpace = 0, nRightSpace = 0, nUpperSpace = 0, nLowerSpace = 0; if( (rPixSpace.Width() || rPixSpace.Height()) && Application::GetDefaultDevice() ) @@ -124,7 +124,7 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj, SvxLRSpaceItem aLRItem( RES_LR_SPACE ); aLRItem.SetLeft( nLeftSpace ); aLRItem.SetRight( nRightSpace ); - aFrmSet.Put( aLRItem ); + aFrameSet.Put( aLRItem ); } // oberen/unteren Rand setzen @@ -150,7 +150,7 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj, SvxULSpaceItem aULItem( RES_UL_SPACE ); aULItem.SetUpper( nUpperSpace ); aULItem.SetLower( nLowerSpace ); - aFrmSet.Put( aULItem ); + aFrameSet.Put( aULItem ); } SwFormatAnchor aAnchor( FLY_AS_CHAR ); @@ -174,20 +174,20 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj, // #i26791# - direct positioning for <SwDoc::Insert(..)> pNewDrawObj->SetRelativePos( Point(rCSS1PropInfo.nLeft + nLeftSpace, rCSS1PropInfo.nTop + nUpperSpace) ); - aFrmSet.Put( SwFormatSurround(SURROUND_THROUGHT) ); + aFrameSet.Put( SwFormatSurround(SURROUND_THROUGHT) ); } else if( SVX_ADJUST_LEFT == rCSS1PropInfo.eFloat || text::HoriOrientation::LEFT == eHoriOri ) { aAnchor.SetType( FLY_AT_PARA ); - aFrmSet.Put( SwFormatSurround(bHidden ? SURROUND_THROUGHT + aFrameSet.Put( SwFormatSurround(bHidden ? SURROUND_THROUGHT : SURROUND_RIGHT) ); // #i26791# - direct positioning for <SwDoc::Insert(..)> pNewDrawObj->SetRelativePos( Point(nLeftSpace, nUpperSpace) ); } else if( text::VertOrientation::NONE != eVertOri ) { - aFrmSet.Put( SwFormatVertOrient( 0, eVertOri ) ); + aFrameSet.Put( SwFormatVertOrient( 0, eVertOri ) ); } if (FLY_AT_PAGE == aAnchor.GetAnchorId()) @@ -198,9 +198,9 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj, { aAnchor.SetAnchor( m_pPam->GetPoint() ); } - aFrmSet.Put( aAnchor ); + aFrameSet.Put( aAnchor ); - m_pDoc->getIDocumentContentOperations().InsertDrawObj( *m_pPam, *pNewDrawObj, aFrmSet ); + m_pDoc->getIDocumentContentOperations().InsertDrawObj( *m_pPam, *pNewDrawObj, aFrameSet ); } static void PutEEPoolItem( SfxItemSet &rEEItemSet, diff --git a/sw/source/filter/html/htmldrawwriter.cxx b/sw/source/filter/html/htmldrawwriter.cxx index f879cf3c7b17..c9769f8a52e0 100644 --- a/sw/source/filter/html/htmldrawwriter.cxx +++ b/sw/source/filter/html/htmldrawwriter.cxx @@ -283,12 +283,12 @@ Writer& OutHTML_DrawFrameFormatAsMarquee( Writer& rWrt, rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); // und nun noch ALIGN, HSPACE und VSPACE - sal_uInt32 nFrmFlags = HTML_FRMOPTS_MARQUEE; + sal_uInt32 nFrameFlags = HTML_FRMOPTS_MARQUEE; if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_DRAW ) ) - nFrmFlags |= HTML_FRMOPTS_MARQUEE_CSS1; - OString aEndTags = rHTMLWrt.OutFrameFormatOptions( rFormat, aEmptyOUStr, nFrmFlags ); + nFrameFlags |= HTML_FRMOPTS_MARQUEE_CSS1; + OString aEndTags = rHTMLWrt.OutFrameFormatOptions( rFormat, aEmptyOUStr, nFrameFlags ); if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_DRAW ) ) - rHTMLWrt.OutCSS1_FrameFormatOptions( rFormat, nFrmFlags, &rSdrObject ); + rHTMLWrt.OutCSS1_FrameFormatOptions( rFormat, nFrameFlags, &rSdrObject ); rWrt.Strm().WriteChar( '>' ); diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx index d7320398f63d..ddabe12afee2 100644 --- a/sw/source/filter/html/htmlfly.cxx +++ b/sw/source/filter/html/htmlfly.cxx @@ -35,7 +35,7 @@ using namespace css; -SwHTMLPosFlyFrm::SwHTMLPosFlyFrm( const SwPosFlyFrm& rPosFly, +SwHTMLPosFlyFrame::SwHTMLPosFlyFrame( const SwPosFlyFrame& rPosFly, const SdrObject *pSdrObj, sal_uInt8 nOutMode ) : pFrameFormat( &rPosFly.GetFormat() ), @@ -69,22 +69,22 @@ SwHTMLPosFlyFrm::SwHTMLPosFlyFrm( const SwPosFlyFrm& rPosFly, } } -bool SwHTMLPosFlyFrm::operator<( const SwHTMLPosFlyFrm& rFrm ) const +bool SwHTMLPosFlyFrame::operator<( const SwHTMLPosFlyFrame& rFrame ) const { - if( pNdIdx->GetIndex() == rFrm.pNdIdx->GetIndex() ) + if( pNdIdx->GetIndex() == rFrame.pNdIdx->GetIndex() ) { - if( nContentIdx == rFrm.nContentIdx ) + if( nContentIdx == rFrame.nContentIdx ) { - if( GetOutPos() == rFrm.GetOutPos() ) - return nOrdNum < rFrm.nOrdNum; + if( GetOutPos() == rFrame.GetOutPos() ) + return nOrdNum < rFrame.nOrdNum; else - return GetOutPos() < rFrm.GetOutPos(); + return GetOutPos() < rFrame.GetOutPos(); } else - return nContentIdx < rFrm.nContentIdx; + return nContentIdx < rFrame.nContentIdx; } else - return pNdIdx->GetIndex() < rFrm.pNdIdx->GetIndex(); + return pNdIdx->GetIndex() < rFrame.pNdIdx->GetIndex(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/html/htmlfly.hxx b/sw/source/filter/html/htmlfly.hxx index 265305385b62..bf42b0f5ee46 100644 --- a/sw/source/filter/html/htmlfly.hxx +++ b/sw/source/filter/html/htmlfly.hxx @@ -26,11 +26,11 @@ class SdrObject; class SwFrameFormat; class SwNodeIndex; -class SwPosFlyFrm; +class SwPosFlyFrame; // ACHTUNG: Die Werte dieses Enumgs gehen direkt in die // Augabe Tabelle!!! -enum SwHTMLFrmType +enum SwHTMLFrameType { HTML_FRMTYPE_TABLE, HTML_FRMTYPE_TABLE_CAP, @@ -76,28 +76,28 @@ enum SwHTMLFrmType const sal_uInt16 MAX_FRMTYPES = HTML_FRMTYPE_END; const sal_uInt16 MAX_BROWSERS = 4; -extern sal_uInt8 aHTMLOutFrmPageFlyTable[MAX_FRMTYPES][MAX_BROWSERS]; -extern sal_uInt8 aHTMLOutFrmParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS]; -extern sal_uInt8 aHTMLOutFrmParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS]; -extern sal_uInt8 aHTMLOutFrmParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS]; -extern sal_uInt8 aHTMLOutFrmAsCharTable[MAX_FRMTYPES][MAX_BROWSERS]; +extern sal_uInt8 aHTMLOutFramePageFlyTable[MAX_FRMTYPES][MAX_BROWSERS]; +extern sal_uInt8 aHTMLOutFrameParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS]; +extern sal_uInt8 aHTMLOutFrameParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS]; +extern sal_uInt8 aHTMLOutFrameParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS]; +extern sal_uInt8 aHTMLOutFrameAsCharTable[MAX_FRMTYPES][MAX_BROWSERS]; -class SwHTMLPosFlyFrm +class SwHTMLPosFlyFrame { const SwFrameFormat *pFrameFormat; // der Rahmen const SdrObject *pSdrObject; // ggf. Sdr-Objekt SwNodeIndex *pNdIdx; // Node-Index - sal_uInt32 nOrdNum; // Aus SwPosFlyFrm + sal_uInt32 nOrdNum; // Aus SwPosFlyFrame sal_Int32 nContentIdx; // seine Position im Content sal_uInt8 nOutputMode; // Ausgabe-Infos public: - SwHTMLPosFlyFrm( const SwPosFlyFrm& rPosFly, + SwHTMLPosFlyFrame( const SwPosFlyFrame& rPosFly, const SdrObject *pSdrObj, sal_uInt8 nOutMode ); - bool operator==( const SwHTMLPosFlyFrm& ) const { return false; } - bool operator<( const SwHTMLPosFlyFrm& ) const; + bool operator==( const SwHTMLPosFlyFrame& ) const { return false; } + bool operator<( const SwHTMLPosFlyFrame& ) const; const SwFrameFormat& GetFormat() const { return *pFrameFormat; } const SdrObject *GetSdrObject() const { return pSdrObject; } @@ -115,9 +115,9 @@ public: sal_uInt8 GetOutPos() const { return nOutputMode & HTML_POS_MASK; } }; -class SwHTMLPosFlyFrms - : public o3tl::sorted_vector<SwHTMLPosFlyFrm*, - o3tl::less_ptr_to<SwHTMLPosFlyFrm>, +class SwHTMLPosFlyFrames + : public o3tl::sorted_vector<SwHTMLPosFlyFrame*, + o3tl::less_ptr_to<SwHTMLPosFlyFrame>, o3tl::find_partialorder_ptrequals> {}; diff --git a/sw/source/filter/html/htmlflyt.cxx b/sw/source/filter/html/htmlflyt.cxx index 21fd0c75dcff..f8b61022b07f 100644 --- a/sw/source/filter/html/htmlflyt.cxx +++ b/sw/source/filter/html/htmlflyt.cxx @@ -21,7 +21,7 @@ #define TE(t,p,c) (sal_uInt8)( HTML_OUT_##t | HTML_POS_##p | HTML_CNTNR_##c ) -sal_uInt8 aHTMLOutFrmPageFlyTable[MAX_FRMTYPES][MAX_BROWSERS] = +sal_uInt8 aHTMLOutFramePageFlyTable[MAX_FRMTYPES][MAX_BROWSERS] = { { // Textrahmen mit Tabelle @@ -117,7 +117,7 @@ sal_uInt8 aHTMLOutFrmPageFlyTable[MAX_FRMTYPES][MAX_BROWSERS] = } }; -sal_uInt8 aHTMLOutFrmParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS] = +sal_uInt8 aHTMLOutFrameParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS] = { { // Textrahmen mit Tabelle @@ -214,7 +214,7 @@ sal_uInt8 aHTMLOutFrmParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS] = } }; -sal_uInt8 aHTMLOutFrmParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS] = +sal_uInt8 aHTMLOutFrameParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS] = { { // Textrahmen mit Tabelle @@ -310,7 +310,7 @@ sal_uInt8 aHTMLOutFrmParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS] = } }; -sal_uInt8 aHTMLOutFrmParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS] = +sal_uInt8 aHTMLOutFrameParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS] = { { // Textrahmen mit Tabelle @@ -406,7 +406,7 @@ sal_uInt8 aHTMLOutFrmParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS] = } }; -sal_uInt8 aHTMLOutFrmAsCharTable[MAX_FRMTYPES][MAX_BROWSERS] = +sal_uInt8 aHTMLOutFrameAsCharTable[MAX_FRMTYPES][MAX_BROWSERS] = { { // Textrahmen mit Tabelle diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx index 2defd045c41e..9395e49290a3 100644 --- a/sw/source/filter/html/htmlflywriter.cxx +++ b/sw/source/filter/html/htmlflywriter.cxx @@ -158,10 +158,10 @@ static HTMLOutEvent aIMapEventTable[] = { nullptr, nullptr, 0 } }; -sal_uInt16 SwHTMLWriter::GuessFrmType( const SwFrameFormat& rFrameFormat, +sal_uInt16 SwHTMLWriter::GuessFrameType( const SwFrameFormat& rFrameFormat, const SdrObject*& rpSdrObj ) { - SwHTMLFrmType eType; + SwHTMLFrameType eType; if( RES_DRAWFRMFMT == rFrameFormat.Which() ) { @@ -205,7 +205,7 @@ sal_uInt16 SwHTMLWriter::GuessFrmType( const SwFrameFormat& rFrameFormat, else if( pNd->IsOLENode() ) { // Applet, Plugin, Floating-Frame - eType = (SwHTMLFrmType)GuessOLENodeFrmType( *pNd ); + eType = (SwHTMLFrameType)GuessOLENodeFrameType( *pNd ); } else { @@ -246,11 +246,11 @@ sal_uInt16 SwHTMLWriter::GuessFrmType( const SwFrameFormat& rFrameFormat, // leerer Rahmen? Nur wenn kein Rahmen am // Text- oder Start-Node verankert ist. bEmpty = true; - if( m_pHTMLPosFlyFrms ) + if( m_pHTMLPosFlyFrames ) { - for( auto pHTMLPosFlyFrm : *m_pHTMLPosFlyFrms ) + for( auto pHTMLPosFlyFrame : *m_pHTMLPosFlyFrames ) { - sal_uLong nIdx = pHTMLPosFlyFrm->GetNdIndex().GetIndex(); + sal_uLong nIdx = pHTMLPosFlyFrame->GetNdIndex().GetIndex(); bEmpty = (nIdx != nStt) && (nIdx != nStt-1); if( !bEmpty || nIdx > nStt ) break; @@ -288,20 +288,20 @@ sal_uInt16 SwHTMLWriter::GuessFrmType( const SwFrameFormat& rFrameFormat, return static_cast< sal_uInt16 >(eType); } -void SwHTMLWriter::CollectFlyFrms() +void SwHTMLWriter::CollectFlyFrames() { OSL_ENSURE( HTML_CFG_MAX+1 == MAX_BROWSERS, "number of browser configurations has changed" ); - SwPosFlyFrms aFlyPos(pDoc->GetAllFlyFormats(bWriteAll ? nullptr : pCurPam, true)); + SwPosFlyFrames aFlyPos(pDoc->GetAllFlyFormats(bWriteAll ? nullptr : pCurPam, true)); - for(SwPosFlyFrms::const_iterator aIter(aFlyPos.begin()); aIter != aFlyPos.end(); ++aIter) + for(SwPosFlyFrames::const_iterator aIter(aFlyPos.begin()); aIter != aFlyPos.end(); ++aIter) { const SwFrameFormat& rFrameFormat = (*aIter)->GetFormat(); const SdrObject *pSdrObj = nullptr; const SwPosition *pAPos; const SwContentNode *pACNd; - SwHTMLFrmType eType = (SwHTMLFrmType)GuessFrmType( rFrameFormat, pSdrObj ); + SwHTMLFrameType eType = (SwHTMLFrameType)GuessFrameType( rFrameFormat, pSdrObj ); sal_uInt8 nMode; const SwFormatAnchor& rAnchor = rFrameFormat.GetAnchor(); @@ -310,7 +310,7 @@ void SwHTMLWriter::CollectFlyFrms() { case FLY_AT_PAGE: case FLY_AT_FLY: - nMode = aHTMLOutFrmPageFlyTable[eType][m_nExportMode]; + nMode = aHTMLOutFramePageFlyTable[eType][m_nExportMode]; break; case FLY_AT_PARA: @@ -325,56 +325,56 @@ void SwHTMLWriter::CollectFlyFrms() static_cast<const SvxLRSpaceItem&>(pACNd->GetAttr(RES_LR_SPACE)); if( rLRItem.GetTextLeft() || rLRItem.GetRight() ) { - nMode = aHTMLOutFrmParaFrameTable[eType][m_nExportMode]; + nMode = aHTMLOutFrameParaFrameTable[eType][m_nExportMode]; break; } } - nMode = aHTMLOutFrmParaPrtAreaTable[eType][m_nExportMode]; + nMode = aHTMLOutFrameParaPrtAreaTable[eType][m_nExportMode]; break; case FLY_AT_CHAR: if( text::RelOrientation::FRAME == eHoriRel || text::RelOrientation::PRINT_AREA == eHoriRel ) - nMode = aHTMLOutFrmParaPrtAreaTable[eType][m_nExportMode]; + nMode = aHTMLOutFrameParaPrtAreaTable[eType][m_nExportMode]; else - nMode = aHTMLOutFrmParaOtherTable[eType][m_nExportMode]; + nMode = aHTMLOutFrameParaOtherTable[eType][m_nExportMode]; break; default: - nMode = aHTMLOutFrmParaPrtAreaTable[eType][m_nExportMode]; + nMode = aHTMLOutFrameParaPrtAreaTable[eType][m_nExportMode]; break; } - if( !m_pHTMLPosFlyFrms ) - m_pHTMLPosFlyFrms = new SwHTMLPosFlyFrms; + if( !m_pHTMLPosFlyFrames ) + m_pHTMLPosFlyFrames = new SwHTMLPosFlyFrames; - SwHTMLPosFlyFrm *pNew = new SwHTMLPosFlyFrm(**aIter, pSdrObj, nMode); - m_pHTMLPosFlyFrms->insert( pNew ); + SwHTMLPosFlyFrame *pNew = new SwHTMLPosFlyFrame(**aIter, pSdrObj, nMode); + m_pHTMLPosFlyFrames->insert( pNew ); } } -bool SwHTMLWriter::OutFlyFrm( sal_uLong nNdIdx, sal_Int32 nContentIdx, sal_uInt8 nPos, +bool SwHTMLWriter::OutFlyFrame( sal_uLong nNdIdx, sal_Int32 nContentIdx, sal_uInt8 nPos, HTMLOutContext *pContext ) { bool bFlysLeft = false; // Noch Flys an aktueller Node-Position da? - // OutFlyFrm kan rekursiv aufgerufen werden. Deshalb muss man + // OutFlyFrame kan rekursiv aufgerufen werden. Deshalb muss man // manchmal wieder von vorne anfangen, nachdem ein Fly ausgegeben // wurde. bool bRestart = true; - while( m_pHTMLPosFlyFrms && bRestart ) + while( m_pHTMLPosFlyFrames && bRestart ) { bFlysLeft = bRestart = false; // suche nach dem Anfang der FlyFrames size_t i {0}; - for( ; i < m_pHTMLPosFlyFrms->size() && - (*m_pHTMLPosFlyFrms)[i]->GetNdIndex().GetIndex() < nNdIdx; i++ ) + for( ; i < m_pHTMLPosFlyFrames->size() && + (*m_pHTMLPosFlyFrames)[i]->GetNdIndex().GetIndex() < nNdIdx; i++ ) ; - for( ; !bRestart && i < m_pHTMLPosFlyFrms->size() && - (*m_pHTMLPosFlyFrms)[i]->GetNdIndex().GetIndex() == nNdIdx; i++ ) + for( ; !bRestart && i < m_pHTMLPosFlyFrames->size() && + (*m_pHTMLPosFlyFrames)[i]->GetNdIndex().GetIndex() == nNdIdx; i++ ) { - SwHTMLPosFlyFrm *pPosFly = (*m_pHTMLPosFlyFrms)[i]; + SwHTMLPosFlyFrame *pPosFly = (*m_pHTMLPosFlyFrames)[i]; if( ( HTML_POS_ANY == nPos || pPosFly->GetOutPos() == nPos ) && pPosFly->GetContentIndex() == nContentIdx ) @@ -382,12 +382,12 @@ bool SwHTMLWriter::OutFlyFrm( sal_uLong nNdIdx, sal_Int32 nContentIdx, sal_uInt8 // Erst entfernen ist wichtig, weil in tieferen // Rekursionen evtl. weitere Eintraege oder das // ganze Array geloscht werden koennte. - m_pHTMLPosFlyFrms->erase(i); + m_pHTMLPosFlyFrames->erase(i); i--; - if( m_pHTMLPosFlyFrms->empty() ) + if( m_pHTMLPosFlyFrames->empty() ) { - delete m_pHTMLPosFlyFrms; - m_pHTMLPosFlyFrms = nullptr; + delete m_pHTMLPosFlyFrames; + m_pHTMLPosFlyFrames = nullptr; bRestart = true; // nicht wirklich, nur raus // aus der Schleife } @@ -424,8 +424,8 @@ bool SwHTMLWriter::OutFlyFrm( sal_uLong nNdIdx, sal_Int32 nContentIdx, sal_uInt8 void SwHTMLWriter::OutFrameFormat( sal_uInt8 nMode, const SwFrameFormat& rFrameFormat, const SdrObject *pSdrObject ) { - sal_uInt8 nCntnrMode = SwHTMLPosFlyFrm::GetOutCntnr( nMode ); - sal_uInt8 nOutMode = SwHTMLPosFlyFrm::GetOutFn(nMode); + sal_uInt8 nCntnrMode = SwHTMLPosFlyFrame::GetOutCntnr( nMode ); + sal_uInt8 nOutMode = SwHTMLPosFlyFrame::GetOutFn(nMode); const sal_Char *pCntnrStr = nullptr; if( HTML_CNTNR_NONE != nCntnrMode ) { @@ -443,15 +443,15 @@ void SwHTMLWriter::OutFrameFormat( sal_uInt8 nMode, const SwFrameFormat& rFrameF Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); // Fuer Nicht-Zeichenobekte eine Breite ausgeben - sal_uLong nFrmFlags = HTML_FRMOPTS_CNTNR; + sal_uLong nFrameFlags = HTML_FRMOPTS_CNTNR; // Fuer spaltige Rahmen koennen wir auch noch den Hintergrund ausgeben. if( HTML_OUT_MULTICOL == nOutMode ) - nFrmFlags |= HTML_FRMOPT_S_BACKGROUND|HTML_FRMOPT_S_BORDER; + nFrameFlags |= HTML_FRMOPT_S_BACKGROUND|HTML_FRMOPT_S_BORDER; if( IsHTMLMode( HTMLMODE_BORDER_NONE ) ) - nFrmFlags |= HTML_FRMOPT_S_NOBORDER; - OutCSS1_FrameFormatOptions( rFrameFormat, nFrmFlags, pSdrObject ); + nFrameFlags |= HTML_FRMOPT_S_NOBORDER; + OutCSS1_FrameFormatOptions( rFrameFormat, nFrameFlags, pSdrObject ); Strm().WriteChar( '>' ); if( HTML_CNTNR_DIV == nCntnrMode ) @@ -520,7 +520,7 @@ void SwHTMLWriter::OutFrameFormat( sal_uInt8 nMode, const SwFrameFormat& rFrameF OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat, const OUString& rAlternateText, - sal_uInt32 nFrmOpts, + sal_uInt32 nFrameOpts, const OString &rEndTags ) { OString sRetEndTags(rEndTags); @@ -529,11 +529,11 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat, const SfxItemSet& rItemSet = rFrameFormat.GetAttrSet(); // Name - if( (nFrmOpts & (HTML_FRMOPT_ID|HTML_FRMOPT_NAME)) && + if( (nFrameOpts & (HTML_FRMOPT_ID|HTML_FRMOPT_NAME)) && !rFrameFormat.GetName().isEmpty() ) { const sal_Char *pStr = - (nFrmOpts & HTML_FRMOPT_ID) ? OOO_STRING_SVTOOLS_HTML_O_id : OOO_STRING_SVTOOLS_HTML_O_name; + (nFrameOpts & HTML_FRMOPT_ID) ? OOO_STRING_SVTOOLS_HTML_O_id : OOO_STRING_SVTOOLS_HTML_O_name; sOut.append(' ').append(pStr). append("=\""); Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); @@ -542,7 +542,7 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat, } // Name - if( nFrmOpts & HTML_FRMOPT_DIR ) + if( nFrameOpts & HTML_FRMOPT_DIR ) { sal_uInt16 nDir = GetHTMLDirection( rItemSet ); Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); @@ -550,7 +550,7 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat, } // ALT - if( (nFrmOpts & HTML_FRMOPT_ALT) && !rAlternateText.isEmpty() ) + if( (nFrameOpts & HTML_FRMOPT_ALT) && !rAlternateText.isEmpty() ) { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_alt). append("=\""); @@ -562,14 +562,14 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat, // ALIGN const sal_Char *pStr = nullptr; RndStdIds eAnchorId = rFrameFormat.GetAnchor().GetAnchorId(); - if( (nFrmOpts & HTML_FRMOPT_ALIGN) && + if( (nFrameOpts & HTML_FRMOPT_ALIGN) && ((FLY_AT_PARA == eAnchorId) || (FLY_AT_CHAR == eAnchorId)) ) { // MIB 12.3.98: Ist es nicht schlauer, absatzgebundene // Rahmen notfalls links auszurichten als sie // zeichengebunden einzufuegen??? const SwFormatHoriOrient& rHoriOri = rFrameFormat.GetHoriOrient(); - if( !(nFrmOpts & HTML_FRMOPT_S_ALIGN) || + if( !(nFrameOpts & HTML_FRMOPT_S_ALIGN) || text::RelOrientation::FRAME == rHoriOri.GetRelationOrient() || text::RelOrientation::PRINT_AREA == rHoriOri.GetRelationOrient() ) { @@ -578,8 +578,8 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat, : OOO_STRING_SVTOOLS_HTML_AL_left; } } - if( (nFrmOpts & HTML_FRMOPT_ALIGN) && !pStr && - ( (nFrmOpts & HTML_FRMOPT_S_ALIGN) == 0 || + if( (nFrameOpts & HTML_FRMOPT_ALIGN) && !pStr && + ( (nFrameOpts & HTML_FRMOPT_S_ALIGN) == 0 || (FLY_AS_CHAR == eAnchorId) ) && SfxItemState::SET == rItemSet.GetItemState( RES_VERT_ORIENT, true, &pItem )) { @@ -605,7 +605,7 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat, // HSPACE und VSPACE Size aTwipSpc( 0, 0 ); - if( (nFrmOpts & (HTML_FRMOPT_SPACE|HTML_FRMOPT_MARGINSIZE)) && + if( (nFrameOpts & (HTML_FRMOPT_SPACE|HTML_FRMOPT_MARGINSIZE)) && SfxItemState::SET == rItemSet.GetItemState( RES_LR_SPACE, true, &pItem )) { aTwipSpc.Width() = @@ -613,7 +613,7 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat, static_cast<const SvxLRSpaceItem*>(pItem)->GetRight() ) / 2; m_nDfltLeftMargin = m_nDfltRightMargin = aTwipSpc.Width(); } - if( (nFrmOpts & (HTML_FRMOPT_SPACE|HTML_FRMOPT_MARGINSIZE)) && + if( (nFrameOpts & (HTML_FRMOPT_SPACE|HTML_FRMOPT_MARGINSIZE)) && SfxItemState::SET == rItemSet.GetItemState( RES_UL_SPACE, true, &pItem )) { aTwipSpc.Height() = @@ -622,7 +622,7 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat, m_nDfltTopMargin = m_nDfltBottomMargin = (sal_uInt16)aTwipSpc.Height(); } - if( (nFrmOpts & HTML_FRMOPT_SPACE) && + if( (nFrameOpts & HTML_FRMOPT_SPACE) && (aTwipSpc.Width() || aTwipSpc.Height()) && Application::GetDefaultDevice() ) { @@ -649,7 +649,7 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat, // Der Abstand muss bei der Groesse beruecksichtigt, wenn das entsprechende // Flag gesetzt ist. - if( (nFrmOpts & HTML_FRMOPT_MARGINSIZE) ) + if( (nFrameOpts & HTML_FRMOPT_MARGINSIZE) ) { aTwipSpc.Width() *= -2; aTwipSpc.Height() *= -2; @@ -660,7 +660,7 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat, aTwipSpc.Height() = 0; } - if( !(nFrmOpts & HTML_FRMOPT_ABSSIZE) && + if( !(nFrameOpts & HTML_FRMOPT_ABSSIZE) && SfxItemState::SET == rItemSet.GetItemState( RES_BOX, true, &pItem )) { const SvxBoxItem* pBoxItem = static_cast<const SvxBoxItem*>(pItem); @@ -673,12 +673,12 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat, // WIDTH und/oder HEIGHT // ATT_VAR_SIZE/ATT_MIN_SIZE nur ausgeben, wenn ANYSIZE gesezut ist - if( (nFrmOpts & HTML_FRMOPT_SIZE) && + if( (nFrameOpts & HTML_FRMOPT_SIZE) && SfxItemState::SET == rItemSet.GetItemState( RES_FRM_SIZE, true, &pItem ) && - ( (nFrmOpts & HTML_FRMOPT_ANYSIZE) || - ATT_FIX_SIZE == static_cast<const SwFormatFrmSize *>(pItem)->GetHeightSizeType()) ) + ( (nFrameOpts & HTML_FRMOPT_ANYSIZE) || + ATT_FIX_SIZE == static_cast<const SwFormatFrameSize *>(pItem)->GetHeightSizeType()) ) { - const SwFormatFrmSize *pFSItem = static_cast<const SwFormatFrmSize *>(pItem); + const SwFormatFrameSize *pFSItem = static_cast<const SwFormatFrameSize *>(pItem); sal_uInt8 nPrcWidth = pFSItem->GetWidthPercent(); sal_uInt8 nPrcHeight = pFSItem->GetHeightPercent(); @@ -708,7 +708,7 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat, aPixelSz.Height() = 1; } - if( (nFrmOpts & HTML_FRMOPT_WIDTH) && + if( (nFrameOpts & HTML_FRMOPT_WIDTH) && ((nPrcWidth && nPrcWidth!=255) || aPixelSz.Width()) ) { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_width). @@ -720,7 +720,7 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat, sOut.append("\""); } - if( (nFrmOpts & HTML_FRMOPT_HEIGHT) && + if( (nFrameOpts & HTML_FRMOPT_HEIGHT) && ((nPrcHeight && nPrcHeight!=255) || aPixelSz.Height()) ) { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_height). @@ -738,7 +738,7 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat, // Umlauf fuer absatzgeb. Grafiken als <BR CLEAR=...> in den String // schreiben - if( (nFrmOpts & HTML_FRMOPT_BRCLEAR) && + if( (nFrameOpts & HTML_FRMOPT_BRCLEAR) && ((FLY_AT_PARA == rFrameFormat.GetAnchor().GetAnchorId()) || (FLY_AT_CHAR == rFrameFormat.GetAnchor().GetAnchorId())) && SfxItemState::SET == rItemSet.GetItemState( RES_SURROUND, true, &pItem )) @@ -942,9 +942,9 @@ void SwHTMLWriter::writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrameForma if( (nFrameOptions & HTML_FRMOPT_SIZE) && SfxItemState::SET == rItemSet.GetItemState( RES_FRM_SIZE, true, &pItem ) && ( (nFrameOptions & HTML_FRMOPT_ANYSIZE) || - ATT_FIX_SIZE == static_cast<const SwFormatFrmSize *>(pItem)->GetHeightSizeType()) ) + ATT_FIX_SIZE == static_cast<const SwFormatFrameSize *>(pItem)->GetHeightSizeType()) ) { - const SwFormatFrmSize *pFSItem = static_cast<const SwFormatFrmSize *>(pItem); + const SwFormatFrameSize *pFSItem = static_cast<const SwFormatFrameSize *>(pItem); sal_uInt8 nPrcWidth = pFSItem->GetWidthPercent(); sal_uInt8 nPrcHeight = pFSItem->GetHeightPercent(); @@ -1125,12 +1125,12 @@ OUString lclWriteOutImap(SwHTMLWriter& rHTMLWrt, const SfxItemSet& rItemSet, con Fraction aScaleX(1, 1); Fraction aScaleY(1, 1); - const SwFormatFrmSize& rFrmSize = rFrameFormat.GetFrmSize(); + const SwFormatFrameSize& rFrameSize = rFrameFormat.GetFrameSize(); const SvxBoxItem& rBox = rFrameFormat.GetBox(); - if (!rFrmSize.GetWidthPercent() && rRealSize.Width()) + if (!rFrameSize.GetWidthPercent() && rRealSize.Width()) { - SwTwips nWidth = rFrmSize.GetWidth(); + SwTwips nWidth = rFrameSize.GetWidth(); nWidth -= rBox.CalcLineSpace(SvxBoxItemLine::LEFT) + rBox.CalcLineSpace(SvxBoxItemLine::RIGHT); OSL_ENSURE( nWidth > 0, "Gibt es 0 twip breite Grafiken!?" ); @@ -1144,9 +1144,9 @@ OUString lclWriteOutImap(SwHTMLWriter& rHTMLWrt, const SfxItemSet& rItemSet, con } } - if (!rFrmSize.GetHeightPercent() && rRealSize.Height()) + if (!rFrameSize.GetHeightPercent() && rRealSize.Height()) { - SwTwips nHeight = rFrmSize.GetHeight(); + SwTwips nHeight = rFrameSize.GetHeight(); nHeight -= rBox.CalcLineSpace(SvxBoxItemLine::TOP) + rBox.CalcLineSpace(SvxBoxItemLine::BOTTOM); @@ -1203,7 +1203,7 @@ OUString lclWriteOutImap(SwHTMLWriter& rHTMLWrt, const SfxItemSet& rItemSet, con Writer& OutHTML_Image( Writer& rWrt, const SwFrameFormat &rFrameFormat, Graphic& rGraphic, const OUString& rAlternateText, - const Size &rRealSize, sal_uInt32 nFrmOpts, + const Size &rRealSize, sal_uInt32 nFrameOpts, const sal_Char *pMarkType, const ImageMap *pAltImgMap ) { @@ -1292,7 +1292,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrameFormat &rFrameFormat, // <font color = ...>...<img ... >...</font> sal_uInt16 nBorderWidth = 0; - if( (nFrmOpts & HTML_FRMOPT_BORDER) && + if( (nFrameOpts & HTML_FRMOPT_BORDER) && SfxItemState::SET == rItemSet.GetItemState( RES_BOX, true, &pItem )) { Size aTwipBorder( 0, 0 ); @@ -1380,11 +1380,11 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrameFormat &rFrameFormat, } // alt, align, width, height, hspace, vspace - rHTMLWrt.writeFrameFormatOptions(aHtml, rFrameFormat, rAlternateText, nFrmOpts); + rHTMLWrt.writeFrameFormatOptions(aHtml, rFrameFormat, rAlternateText, nFrameOpts); if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) ) - rHTMLWrt.OutCSS1_FrameFormatOptions( rFrameFormat, nFrmOpts ); + rHTMLWrt.OutCSS1_FrameFormatOptions( rFrameFormat, nFrameOpts ); - if( nFrmOpts & HTML_FRMOPT_BORDER ) + if( nFrameOpts & HTML_FRMOPT_BORDER ) { aHtml.attribute(OOO_STRING_SVTOOLS_HTML_O_border, nBorderWidth); } @@ -1543,13 +1543,13 @@ static Writer & OutHTML_FrameFormatAsMulticol( Writer& rWrt, rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); // WIDTH - sal_uLong nFrmFlags = bInCntnr ? HTML_FRMOPTS_MULTICOL_CNTNR + sal_uLong nFrameFlags = bInCntnr ? HTML_FRMOPTS_MULTICOL_CNTNR : HTML_FRMOPTS_MULTICOL; if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) && !bInCntnr ) - nFrmFlags |= HTML_FRMOPTS_MULTICOL_CSS1; - rHTMLWrt.OutFrameFormatOptions( rFrameFormat, aEmptyOUStr, nFrmFlags ); + nFrameFlags |= HTML_FRMOPTS_MULTICOL_CSS1; + rHTMLWrt.OutFrameFormatOptions( rFrameFormat, aEmptyOUStr, nFrameFlags ); if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) && !bInCntnr ) - rHTMLWrt.OutCSS1_FrameFormatOptions( rFrameFormat, nFrmFlags ); + rHTMLWrt.OutCSS1_FrameFormatOptions( rFrameFormat, nFrameFlags ); rWrt.Strm().WriteChar( '>' ); @@ -1629,11 +1629,11 @@ static Writer& OutHTML_FrameFormatAsDivOrSpan( Writer& rWrt, sOut.append('<').append(pStr); rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); - sal_uLong nFrmFlags = HTML_FRMOPTS_DIV; + sal_uLong nFrameFlags = HTML_FRMOPTS_DIV; if( rHTMLWrt.IsHTMLMode( HTMLMODE_BORDER_NONE ) ) - nFrmFlags |= HTML_FRMOPT_S_NOBORDER; - OString aEndTags = rHTMLWrt.OutFrameFormatOptions( rFrameFormat, aEmptyOUStr, nFrmFlags ); - rHTMLWrt.OutCSS1_FrameFormatOptions( rFrameFormat, nFrmFlags ); + nFrameFlags |= HTML_FRMOPT_S_NOBORDER; + OString aEndTags = rHTMLWrt.OutFrameFormatOptions( rFrameFormat, aEmptyOUStr, nFrameFlags ); + rHTMLWrt.OutCSS1_FrameFormatOptions( rFrameFormat, nFrameFlags ); rWrt.Strm().WriteChar( '>' ); rHTMLWrt.IncIndentLevel(); // den Inhalt einruecken @@ -1643,7 +1643,7 @@ static Writer& OutHTML_FrameFormatAsDivOrSpan( Writer& rWrt, sal_uLong nStt = rFlyContent.GetContentIdx()->GetIndex(); // Am Start-Node verankerte Rahmen-gebundene Rahmen ausgeben - rHTMLWrt.OutFlyFrm( nStt, 0, HTML_POS_ANY ); + rHTMLWrt.OutFlyFrame( nStt, 0, HTML_POS_ANY ); const SwStartNode* pSttNd = rWrt.pDoc->GetNodes()[nStt]->GetStartNode(); OSL_ENSURE( pSttNd, "Wo ist der Start-Node" ); @@ -1702,13 +1702,13 @@ static Writer& OutHTML_FrameFormatGrfNode( Writer& rWrt, const SwFrameFormat& rF if( !pGrfNd ) return rWrt; - sal_uLong nFrmFlags = bInCntnr ? HTML_FRMOPTS_IMG_CNTNR : HTML_FRMOPTS_IMG; + sal_uLong nFrameFlags = bInCntnr ? HTML_FRMOPTS_IMG_CNTNR : HTML_FRMOPTS_IMG; if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) && !bInCntnr ) - nFrmFlags |= HTML_FRMOPTS_IMG_CSS1; + nFrameFlags |= HTML_FRMOPTS_IMG_CSS1; Graphic aGraphic = pGrfNd->GetGraphic(); OutHTML_Image( rWrt, rFrameFormat, aGraphic, pGrfNd->GetTitle(), - pGrfNd->GetTwipSize(), nFrmFlags, "graphic" ); + pGrfNd->GetTwipSize(), nFrameFlags, "graphic" ); return rWrt; } diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx index 4388f16d093f..b56cc4b7db5b 100644 --- a/sw/source/filter/html/htmlforw.cxx +++ b/sw/source/filter/html/htmlforw.cxx @@ -725,7 +725,7 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt, bool bEmptyValue = false; uno::Any aTmp = xPropSet->getPropertyValue( "ClassId" ); sal_Int16 nClassId = *static_cast<sal_Int16 const *>(aTmp.getValue()); - sal_uInt32 nFrmOpts = HTML_FRMOPTS_CONTROL; + sal_uInt32 nFrameOpts = HTML_FRMOPTS_CONTROL; switch( nClassId ) { case form::FormComponentType::CHECKBOX: @@ -914,7 +914,7 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt, case form::FormComponentType::IMAGEBUTTON: eType = TYPE_IMAGE; - nFrmOpts = HTML_FRMOPTS_IMG_CONTROL; + nFrameOpts = HTML_FRMOPTS_IMG_CONTROL; break; default: // kennt HTML nicht @@ -1024,13 +1024,13 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt, { // Wenn Zeichen-Objekte nicht absolut positioniert werden duerfen, // das entsprechende Flag loeschen. - nFrmOpts |= (TYPE_IMAGE == eType + nFrameOpts |= (TYPE_IMAGE == eType ? HTML_FRMOPTS_IMG_CONTROL_CSS1 : HTML_FRMOPTS_CONTROL_CSS1); } OString aEndTags; - if( nFrmOpts != 0 ) - aEndTags = rHTMLWrt.OutFrameFormatOptions( rFormat, aEmptyOUStr, nFrmOpts ); + if( nFrameOpts != 0 ) + aEndTags = rHTMLWrt.OutFrameFormatOptions( rFormat, aEmptyOUStr, nFrameOpts ); if( rHTMLWrt.m_bCfgOutStyles ) { @@ -1138,7 +1138,7 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt, } } - rHTMLWrt.OutCSS1_FrameFormatOptions( rFormat, nFrmOpts, &rFormObj, + rHTMLWrt.OutCSS1_FrameFormatOptions( rFormat, nFrameOpts, &rFormObj, &aItemSet ); } @@ -1313,22 +1313,22 @@ void SwHTMLWriter::GetControls() // Ueber dieses Array laesst sich dann feststellen, wo form::Forms geoeffnet // und geschlossen werden muessen. - if( m_pHTMLPosFlyFrms ) + if( m_pHTMLPosFlyFrames ) { // die absatz-gebundenen Controls einsammeln - for( size_t i=0; i<m_pHTMLPosFlyFrms->size(); i++ ) + for( size_t i=0; i<m_pHTMLPosFlyFrames->size(); i++ ) { - const SwHTMLPosFlyFrm* pPosFlyFrm = (*m_pHTMLPosFlyFrms)[ i ]; - if( HTML_OUT_CONTROL != pPosFlyFrm->GetOutFn() ) + const SwHTMLPosFlyFrame* pPosFlyFrame = (*m_pHTMLPosFlyFrames)[ i ]; + if( HTML_OUT_CONTROL != pPosFlyFrame->GetOutFn() ) continue; - const SdrObject *pSdrObj = pPosFlyFrm->GetSdrObject(); + const SdrObject *pSdrObj = pPosFlyFrame->GetSdrObject(); OSL_ENSURE( pSdrObj, "Wo ist das SdrObject?" ); if( !pSdrObj ) continue; AddControl( m_aHTMLControls, dynamic_cast<const SdrUnoObj&>(*pSdrObj), - pPosFlyFrm->GetNdIndex().GetIndex() ); + pPosFlyFrame->GetNdIndex().GetIndex() ); } } diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index 35dbcf540ddf..00ec79fd3f97 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -152,36 +152,36 @@ void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16 eVertOri, sal_Int16 eHoriOri, const SfxItemSet &rCSS1ItemSet, const SvxCSS1PropertyInfo &rCSS1PropInfo, - SfxItemSet& rFrmItemSet ) + SfxItemSet& rFrameItemSet ) { const SfxItemSet *pCntnrItemSet = nullptr; auto i = m_aContexts.size(); while( !pCntnrItemSet && i > m_nContextStMin ) - pCntnrItemSet = m_aContexts[--i]->GetFrmItemSet(); + pCntnrItemSet = m_aContexts[--i]->GetFrameItemSet(); if( pCntnrItemSet ) { // Wenn wir und in einem Container befinden wird die Verankerung // des Containers uebernommen. - rFrmItemSet.Put( *pCntnrItemSet ); + rFrameItemSet.Put( *pCntnrItemSet ); } else if( SwCSS1Parser::MayBePositioned( rCSS1PropInfo, true ) ) { // Wenn die Ausrichtung anhand der CSS1-Optionen gesetzt werden kann // werden die benutzt. - SetAnchorAndAdjustment( rCSS1ItemSet, rCSS1PropInfo, rFrmItemSet ); + SetAnchorAndAdjustment( rCSS1ItemSet, rCSS1PropInfo, rFrameItemSet ); } else { // Sonst wird die Ausrichtung entsprechend der normalen HTML-Optionen // gesetzt. - SetAnchorAndAdjustment( eVertOri, eHoriOri, rFrmItemSet ); + SetAnchorAndAdjustment( eVertOri, eHoriOri, rFrameItemSet ); } } void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16 eVertOri, sal_Int16 eHoriOri, - SfxItemSet& rFrmSet, + SfxItemSet& rFrameSet, bool bDontAppend ) { bool bMoveBackward = false; @@ -256,11 +256,11 @@ void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16 eVertOri, eVertRel = text::RelOrientation::PRINT_AREA; } - rFrmSet.Put( SwFormatHoriOrient( 0, eHoriOri, eHoriRel) ); + rFrameSet.Put( SwFormatHoriOrient( 0, eHoriOri, eHoriRel) ); - rFrmSet.Put( SwFormatSurround( eSurround ) ); + rFrameSet.Put( SwFormatSurround( eSurround ) ); } - rFrmSet.Put( SwFormatVertOrient( 0, eVertOri, eVertRel) ); + rFrameSet.Put( SwFormatVertOrient( 0, eVertOri, eVertRel) ); if( bMoveBackward ) m_pPam->Move( fnMoveBackward ); @@ -270,10 +270,10 @@ void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16 eVertOri, if( bMoveBackward ) m_pPam->Move( fnMoveForward ); - rFrmSet.Put( aAnchor ); + rFrameSet.Put( aAnchor ); } -void SwHTMLParser::RegisterFlyFrm( SwFrameFormat *pFlyFormat ) +void SwHTMLParser::RegisterFlyFrame( SwFrameFormat *pFlyFormat ) { // automatisch verankerte Rahmen muessen noch um eine Position // nach vorne verschoben werden. @@ -281,7 +281,7 @@ void SwHTMLParser::RegisterFlyFrm( SwFrameFormat *pFlyFormat ) (FLY_AT_PARA == pFlyFormat->GetAnchor().GetAnchorId()) && SURROUND_THROUGHT == pFlyFormat->GetSurround().GetSurround() ) { - m_aMoveFlyFrms.push_back( pFlyFormat ); + m_aMoveFlyFrames.push_back( pFlyFormat ); m_aMoveFlyCnts.push_back( m_pPam->GetPoint()->nContent.GetIndex() ); } } @@ -494,10 +494,10 @@ IMAGE_SETEVENT: if( HasStyleOptions( aStyle, aId, aClass ) ) ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo ); - SfxItemSet aFrmSet( m_pDoc->GetAttrPool(), + SfxItemSet aFrameSet( m_pDoc->GetAttrPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1 ); if( !IsNewDoc() ) - Reader::ResetFrameFormatAttrs( aFrmSet ); + Reader::ResetFrameFormatAttrs( aFrameSet ); // Umrandung setzen long nHBorderWidth = 0, nVBorderWidth = 0; @@ -537,17 +537,17 @@ IMAGE_SETEVENT: aBoxItem.SetLine( &aHBorderLine, SvxBoxItemLine::BOTTOM ); aBoxItem.SetLine( &aVBorderLine, SvxBoxItemLine::LEFT ); aBoxItem.SetLine( &aVBorderLine, SvxBoxItemLine::RIGHT ); - aFrmSet.Put( aBoxItem ); + aFrameSet.Put( aBoxItem ); } // Ausrichtung setzen - SetAnchorAndAdjustment( eVertOri, eHoriOri, aItemSet, aPropInfo, aFrmSet ); + SetAnchorAndAdjustment( eVertOri, eHoriOri, aItemSet, aPropInfo, aFrameSet ); // Abstaende setzen - SetSpace( Size( nHSpace, nVSpace), aItemSet, aPropInfo, aFrmSet ); + SetSpace( Size( nHSpace, nVSpace), aItemSet, aPropInfo, aFrameSet ); // Sonstige CSS1-Attribute Setzen - SetFrameFormatAttrs( aItemSet, aPropInfo, HTML_FF_BOX, aFrmSet ); + SetFrameFormatAttrs( aItemSet, aPropInfo, HTML_FF_BOX, aFrameSet ); Size aTwipSz( bPrcWidth ? 0 : nWidth, bPrcHeight ? 0 : nHeight ); if( (aTwipSz.Width() || aTwipSz.Height()) && Application::GetDefaultDevice() ) @@ -590,7 +590,7 @@ IMAGE_SETEVENT: Size aGrfSz( 0, 0 ); bool bSetTwipSize = true; // Twip-Size am Node setzen? - bool bChangeFrmSize = false; // Frame-Format nachtraeglich anpassen? + bool bChangeFrameSize = false; // Frame-Format nachtraeglich anpassen? bool bRequestGrfNow = false; bool bSetScaleImageMap = false; sal_uInt8 nPrcWidth = 0, nPrcHeight = 0; @@ -608,7 +608,7 @@ IMAGE_SETEVENT: } // Die Groesse des Rahmens wird nachtraeglich gesetzt - bChangeFrmSize = true; + bChangeFrameSize = true; aGrfSz = aTwipSz; if( !nWidth && !nHeight ) { @@ -673,13 +673,13 @@ IMAGE_SETEVENT: SwFormatURL aURL; aURL.SetMap( pImgMap );//wird kopieiert bSetScaleImageMap = !nPrcWidth || !nPrcHeight; - aFrmSet.Put( aURL ); + aFrameSet.Put( aURL ); } else { ImageMap aEmptyImgMap( aName ); SwFormatURL aURL; aURL.SetMap( &aEmptyImgMap );//wird kopieiert - aFrmSet.Put( aURL ); + aFrameSet.Put( aURL ); m_nMissingImgMaps++; // es fehlen noch Image-Maps // die Grafik muss beim SetTwipSize skaliert werden, wenn @@ -717,14 +717,14 @@ IMAGE_SETEVENT: aTwipSz.Height() = MINFLY; } - SwFormatFrmSize aFrmSize( ATT_FIX_SIZE, aTwipSz.Width(), aTwipSz.Height() ); - aFrmSize.SetWidthPercent( nPrcWidth ); - aFrmSize.SetHeightPercent( nPrcHeight ); - aFrmSet.Put( aFrmSize ); + SwFormatFrameSize aFrameSize( ATT_FIX_SIZE, aTwipSz.Width(), aTwipSz.Height() ); + aFrameSize.SetWidthPercent( nPrcWidth ); + aFrameSize.SetHeightPercent( nPrcHeight ); + aFrameSet.Put( aFrameSize ); // passing empty sGrfNm here, means we don't want the graphic to be linked SwFrameFormat *pFlyFormat = m_pDoc->getIDocumentContentOperations().Insert( *m_pPam, sGrfNm, aEmptyOUStr, &aGraphic, - &aFrmSet, nullptr, nullptr ); + &aFrameSet, nullptr, nullptr ); SwGrfNode *pGrfNd = m_pDoc->GetNodes()[ pFlyFormat->GetContent().GetContentIdx() ->GetIndex()+1 ]->GetGrfNode(); @@ -748,7 +748,7 @@ IMAGE_SETEVENT: if( bSetTwipSize ) pGrfNd->SetTwipSize( aGrfSz ); - pGrfNd->SetChgTwipSize( bChangeFrmSize ); + pGrfNd->SetChgTwipSize( bChangeFrameSize ); if( bSetScaleImageMap ) pGrfNd->SetScaleImageMap( true ); @@ -817,7 +817,7 @@ IMAGE_SETEVENT: } // Ggf. Frames anlegen und Auto-gebundenen Rahmen registrieren - RegisterFlyFrm( pFlyFormat ); + RegisterFlyFrame( pFlyFormat ); if( !aId.isEmpty() ) InsertBookmark( aId ); diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx index e0caa1610ae3..1ecfa949a72a 100644 --- a/sw/source/filter/html/htmlplug.cxx +++ b/sw/source/filter/html/htmlplug.cxx @@ -196,10 +196,10 @@ void SwHTMLParser::SetFixSize( const Size& rPixSize, } // Size setzen - SwFormatFrmSize aFrmSize( ATT_FIX_SIZE, aTwipSz.Width(), aTwipSz.Height() ); - aFrmSize.SetWidthPercent( nPrcWidth ); - aFrmSize.SetHeightPercent( nPrcHeight ); - rFlyItemSet.Put( aFrmSize ); + SwFormatFrameSize aFrameSize( ATT_FIX_SIZE, aTwipSz.Width(), aTwipSz.Height() ); + aFrameSize.SetWidthPercent( nPrcWidth ); + aFrameSize.SetHeightPercent( nPrcHeight ); + rFlyItemSet.Put( aFrameSize ); } void SwHTMLParser::SetSpace( const Size& rPixSpace, @@ -386,7 +386,7 @@ void SwHTMLParser::InsertEmbed() ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo ); // Die Default-Werte umsetzen (ausser Hoehe/Breite, das macht schon - // SetFrmSize() fuer uns) + // SetFrameSize() fuer uns) if( eVertOri==text::VertOrientation::NONE && eHoriOri==text::HoriOrientation::NONE ) eVertOri = text::VertOrientation::TOP; if( USHRT_MAX==aSpace.Width() ) @@ -395,7 +395,7 @@ void SwHTMLParser::InsertEmbed() aSpace.Height() = 0; if( bHidden ) { - // Size (0,0) wird in SetFrmSize auf (MINFLY, MINFLY) umgebogen + // Size (0,0) wird in SetFrameSize auf (MINFLY, MINFLY) umgebogen aSize.Width() = 0; aSize.Height() = 0; aSpace.Width() = 0; aSpace.Height() = 0; bPrcWidth = bPrcHeight = false; @@ -437,35 +437,35 @@ void SwHTMLParser::InsertEmbed() } } - SfxItemSet aFrmSet( m_pDoc->GetAttrPool(), + SfxItemSet aFrameSet( m_pDoc->GetAttrPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1 ); if( !IsNewDoc() ) - Reader::ResetFrameFormatAttrs( aFrmSet ); + Reader::ResetFrameFormatAttrs( aFrameSet ); // den Anker setzen if( !bHidden ) { - SetAnchorAndAdjustment( eVertOri, eHoriOri, aItemSet, aPropInfo, aFrmSet ); + SetAnchorAndAdjustment( eVertOri, eHoriOri, aItemSet, aPropInfo, aFrameSet ); } else { SwFormatAnchor aAnchor( FLY_AT_PARA ); aAnchor.SetAnchor( m_pPam->GetPoint() ); - aFrmSet.Put( aAnchor ); - aFrmSet.Put( SwFormatHoriOrient( 0, text::HoriOrientation::LEFT, text::RelOrientation::FRAME) ); - aFrmSet.Put( SwFormatSurround( SURROUND_THROUGHT ) ); - aFrmSet.Put( SwFormatVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::PRINT_AREA ) ); + aFrameSet.Put( aAnchor ); + aFrameSet.Put( SwFormatHoriOrient( 0, text::HoriOrientation::LEFT, text::RelOrientation::FRAME) ); + aFrameSet.Put( SwFormatSurround( SURROUND_THROUGHT ) ); + aFrameSet.Put( SwFormatVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::PRINT_AREA ) ); } // und noch die Groesse des Rahmens Size aDfltSz( HTML_DFLT_EMBED_WIDTH, HTML_DFLT_EMBED_HEIGHT ); SetFixSize( aSize, aDfltSz, bPrcWidth, bPrcHeight, aItemSet, aPropInfo, - aFrmSet ); - SetSpace( aSpace, aItemSet, aPropInfo, aFrmSet ); + aFrameSet ); + SetSpace( aSpace, aItemSet, aPropInfo, aFrameSet ); // und in das Dok einfuegen SwFrameFormat* pFlyFormat = - m_pDoc->getIDocumentContentOperations().Insert( *m_pPam, ::svt::EmbeddedObjectRef( xObj, embed::Aspects::MSOLE_CONTENT ), &aFrmSet, nullptr, nullptr ); + m_pDoc->getIDocumentContentOperations().Insert( *m_pPam, ::svt::EmbeddedObjectRef( xObj, embed::Aspects::MSOLE_CONTENT ), &aFrameSet, nullptr, nullptr ); // Namen am FrameFormat setzen if( !aName.isEmpty() ) @@ -480,10 +480,10 @@ void SwHTMLParser::InsertEmbed() // Ggf Frames anlegen und auto-geb. Rahmen registrieren if( !bHidden ) { - // HIDDEN-Plugins sollen absatzgebunden bleiben. Da RegisterFlyFrm + // HIDDEN-Plugins sollen absatzgebunden bleiben. Da RegisterFlyFrame // absatzgebundene Rahmen mit DUrchlauf in am Zeichen gebundene // Rahmen umwandelt, muessen die Frames hier von Hand angelegt werden. - RegisterFlyFrm( pFlyFormat ); + RegisterFlyFrame( pFlyFormat ); } } @@ -611,18 +611,18 @@ void SwHTMLParser::NewObject() if( HasStyleOptions( aStyle, aId, aClass ) ) ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo ); - SfxItemSet& rFrmSet = m_pAppletImpl->GetItemSet(); + SfxItemSet& rFrameSet = m_pAppletImpl->GetItemSet(); if( !IsNewDoc() ) - Reader::ResetFrameFormatAttrs( rFrmSet ); + Reader::ResetFrameFormatAttrs( rFrameSet ); // den Anker und die Ausrichtung setzen - SetAnchorAndAdjustment( eVertOri, eHoriOri, aItemSet, aPropInfo, rFrmSet ); + SetAnchorAndAdjustment( eVertOri, eHoriOri, aItemSet, aPropInfo, rFrameSet ); // und noch die Groesse des Rahmens Size aDfltSz( HTML_DFLT_APPLET_WIDTH, HTML_DFLT_APPLET_HEIGHT ); SetFixSize( aSize, aDfltSz, bPrcWidth, bPrcHeight, aItemSet, aPropInfo, - rFrmSet ); - SetSpace( aSpace, aItemSet, aPropInfo, rFrmSet ); + rFrameSet ); + SetSpace( aSpace, aItemSet, aPropInfo, rFrameSet ); } #endif @@ -650,7 +650,7 @@ void SwHTMLParser::EndObject() pNoTextNd->SetTitle( m_pAppletImpl->GetAltText() ); // Ggf Frames anlegen und auto-geb. Rahmen registrieren - RegisterFlyFrm( pFlyFormat ); + RegisterFlyFrame( pFlyFormat ); delete m_pAppletImpl; m_pAppletImpl = nullptr; @@ -746,18 +746,18 @@ void SwHTMLParser::InsertApplet() if( HasStyleOptions( aStyle, aId, aClass ) ) ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo ); - SfxItemSet& rFrmSet = m_pAppletImpl->GetItemSet(); + SfxItemSet& rFrameSet = m_pAppletImpl->GetItemSet(); if( !IsNewDoc() ) - Reader::ResetFrameFormatAttrs( rFrmSet ); + Reader::ResetFrameFormatAttrs( rFrameSet ); // den Anker und die Ausrichtung setzen - SetAnchorAndAdjustment( eVertOri, eHoriOri, aItemSet, aPropInfo, rFrmSet ); + SetAnchorAndAdjustment( eVertOri, eHoriOri, aItemSet, aPropInfo, rFrameSet ); // und noch die Groesse des Rahmens Size aDfltSz( HTML_DFLT_APPLET_WIDTH, HTML_DFLT_APPLET_HEIGHT ); SetFixSize( aSize, aDfltSz, bPrcWidth, bPrcHeight, aItemSet, aPropInfo, - rFrmSet ); - SetSpace( aSpace, aItemSet, aPropInfo, rFrmSet ); + rFrameSet ); + SetSpace( aSpace, aItemSet, aPropInfo, rFrameSet ); } #endif @@ -784,7 +784,7 @@ void SwHTMLParser::EndApplet() pNoTextNd->SetTitle( m_pAppletImpl->GetAltText() ); // Ggf Frames anlegen und auto-geb. Rahmen registrieren - RegisterFlyFrm( pFlyFormat ); + RegisterFlyFrame( pFlyFormat ); delete m_pAppletImpl; m_pAppletImpl = nullptr; @@ -929,23 +929,23 @@ void SwHTMLParser::InsertFloatingFrame() ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo ); // den Itemset holen - SfxItemSet aFrmSet( m_pDoc->GetAttrPool(), + SfxItemSet aFrameSet( m_pDoc->GetAttrPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1 ); if( !IsNewDoc() ) - Reader::ResetFrameFormatAttrs( aFrmSet ); + Reader::ResetFrameFormatAttrs( aFrameSet ); // den Anker und die Ausrichtung setzen - SetAnchorAndAdjustment( eVertOri, eHoriOri, aItemSet, aPropInfo, aFrmSet ); + SetAnchorAndAdjustment( eVertOri, eHoriOri, aItemSet, aPropInfo, aFrameSet ); // und noch die Groesse des Rahmens Size aDfltSz( HTML_DFLT_APPLET_WIDTH, HTML_DFLT_APPLET_HEIGHT ); SetFixSize( aSize, aDfltSz, bPrcWidth, bPrcHeight, aItemSet, aPropInfo, - aFrmSet ); - SetSpace( aSpace, aItemSet, aPropInfo, aFrmSet ); + aFrameSet ); + SetSpace( aSpace, aItemSet, aPropInfo, aFrameSet ); // und in das Dok einfuegen SwFrameFormat* pFlyFormat = - m_pDoc->getIDocumentContentOperations().Insert( *m_pPam, ::svt::EmbeddedObjectRef( xObj, embed::Aspects::MSOLE_CONTENT ), &aFrmSet, nullptr, nullptr ); + m_pDoc->getIDocumentContentOperations().Insert( *m_pPam, ::svt::EmbeddedObjectRef( xObj, embed::Aspects::MSOLE_CONTENT ), &aFrameSet, nullptr, nullptr ); // den alternativen Namen setzen SwNoTextNode *pNoTextNd = @@ -954,16 +954,16 @@ void SwHTMLParser::InsertFloatingFrame() pNoTextNd->SetTitle( aAlt ); // Ggf Frames anlegen und auto-geb. Rahmen registrieren - RegisterFlyFrm( pFlyFormat ); + RegisterFlyFrame( pFlyFormat ); m_bInFloatingFrame = true; } -sal_uInt16 SwHTMLWriter::GuessOLENodeFrmType( const SwNode& rNode ) +sal_uInt16 SwHTMLWriter::GuessOLENodeFrameType( const SwNode& rNode ) { SwOLEObj& rObj = const_cast<SwOLENode*>(rNode.GetOLENode())->GetOLEObj(); - SwHTMLFrmType eType = HTML_FRMTYPE_OLE; + SwHTMLFrameType eType = HTML_FRMTYPE_OLE; uno::Reference < embed::XClassifiedObject > xClass ( rObj.GetOleRef(), uno::UNO_QUERY ); SvGlobalName aClass( xClass->getClassID() ); @@ -1013,7 +1013,7 @@ Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const SwFrameFormat& rFrameFor return rWrt; } - sal_uLong nFrmOpts; + sal_uLong nFrameOpts; // wenn meoglich vor dem "Objekt" einen Zeilen-Umbruch ausgeben if( rHTMLWrt.m_bLFPossible ) @@ -1065,12 +1065,12 @@ Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const SwFrameFormat& rFrameFor { // Das Plugin ist HIDDEN sOut.append(' ').append(OOO_STRING_SW_HTML_O_Hidden); - nFrmOpts = HTML_FRMOPTS_HIDDEN_EMBED; + nFrameOpts = HTML_FRMOPTS_HIDDEN_EMBED; bHiddenEmbed = true; } else { - nFrmOpts = bInCntnr ? HTML_FRMOPTS_EMBED_CNTNR + nFrameOpts = bInCntnr ? HTML_FRMOPTS_EMBED_CNTNR : HTML_FRMOPTS_EMBED; } } @@ -1125,7 +1125,7 @@ Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const SwFrameFormat& rFrameFor if( bScript ) sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_mayscript); - nFrmOpts = bInCntnr ? HTML_FRMOPTS_APPLET_CNTNR + nFrameOpts = bInCntnr ? HTML_FRMOPTS_APPLET_CNTNR : HTML_FRMOPTS_APPLET; } else @@ -1140,7 +1140,7 @@ Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const SwFrameFormat& rFrameFor rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); - nFrmOpts = bInCntnr ? HTML_FRMOPTS_IFRAME_CNTNR + nFrameOpts = bInCntnr ? HTML_FRMOPTS_IFRAME_CNTNR : HTML_FRMOPTS_IFRAME; } @@ -1148,10 +1148,10 @@ Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const SwFrameFormat& rFrameFor // ALT, WIDTH, HEIGHT, HSPACE, VSPACE, ALIGN if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) && !bHiddenEmbed ) - nFrmOpts |= HTML_FRMOPTS_OLE_CSS1; - OString aEndTags = rHTMLWrt.OutFrameFormatOptions( rFrameFormat, pOLENd->GetTitle(), nFrmOpts ); + nFrameOpts |= HTML_FRMOPTS_OLE_CSS1; + OString aEndTags = rHTMLWrt.OutFrameFormatOptions( rFrameFormat, pOLENd->GetTitle(), nFrameOpts ); if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) && !bHiddenEmbed ) - rHTMLWrt.OutCSS1_FrameFormatOptions( rFrameFormat, nFrmOpts ); + rHTMLWrt.OutCSS1_FrameFormatOptions( rFrameFormat, nFrameOpts ); if( aGlobName == SvGlobalName( SO3_APPLET_CLASSID ) ) { diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx index b40c3ce4bc50..1907c71adf7c 100644 --- a/sw/source/filter/html/htmlsect.cxx +++ b/sw/source/filter/html/htmlsect.cxx @@ -313,26 +313,26 @@ void SwHTMLParser::NewDivision( int nToken ) aSection.SetProtectFlag(true); } - SfxItemSet aFrmItemSet( m_pDoc->GetAttrPool(), + SfxItemSet aFrameItemSet( m_pDoc->GetAttrPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1 ); if( !IsNewDoc() ) - Reader::ResetFrameFormatAttrs(aFrmItemSet ); + Reader::ResetFrameFormatAttrs(aFrameItemSet ); const SfxPoolItem *pItem; if( SfxItemState::SET == aItemSet.GetItemState( RES_BACKGROUND, false, &pItem ) ) { - aFrmItemSet.Put( *pItem ); + aFrameItemSet.Put( *pItem ); aItemSet.ClearItem( RES_BACKGROUND ); } if( SfxItemState::SET == aItemSet.GetItemState( RES_FRAMEDIR, false, &pItem ) ) { - aFrmItemSet.Put( *pItem ); + aFrameItemSet.Put( *pItem ); aItemSet.ClearItem( RES_FRAMEDIR ); } - m_pDoc->InsertSwSection( *m_pPam, aSection, nullptr, &aFrmItemSet, false ); + m_pDoc->InsertSwSection( *m_pPam, aSection, nullptr, &aFrameItemSet, false ); // ggfs. einen Bereich anspringen if( JUMPTO_REGION == m_eJumpTo && aName == m_sJmpMark ) @@ -591,7 +591,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss ) bool bInCntnr = false; auto i = m_aContexts.size(); while( !bInCntnr && i > m_nContextStMin ) - bInCntnr = nullptr != m_aContexts[--i]->GetFrmItemSet(); + bInCntnr = nullptr != m_aContexts[--i]->GetFrameItemSet(); // Parse style sheets, but don't position anything by now. bool bStyleParsed = false; @@ -618,26 +618,26 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss ) bool bPositioned = false; if( bInCntnr || SwCSS1Parser::MayBePositioned( aPropInfo, true ) ) { - SfxItemSet aFrmItemSet( m_pDoc->GetAttrPool(), + SfxItemSet aFrameItemSet( m_pDoc->GetAttrPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1 ); if( !IsNewDoc() ) - Reader::ResetFrameFormatAttrs(aFrmItemSet ); + Reader::ResetFrameFormatAttrs(aFrameItemSet ); SetAnchorAndAdjustment( text::VertOrientation::NONE, text::HoriOrientation::NONE, aItemSet, aPropInfo, - aFrmItemSet ); + aFrameItemSet ); // The width is either the WIDTH attribute's value or contained // in some style option. - SetVarSize( aItemSet, aPropInfo, aFrmItemSet, nTwipWidth, nPrcWidth ); + SetVarSize( aItemSet, aPropInfo, aFrameItemSet, nTwipWidth, nPrcWidth ); - SetSpace( Size(0,0), aItemSet, aPropInfo, aFrmItemSet ); + SetSpace( Size(0,0), aItemSet, aPropInfo, aFrameItemSet ); // Set some other frame attributes. If the background is set, its // it will be cleared here. That for, it won't be set at the section, // too. SetFrameFormatAttrs( aItemSet, aPropInfo, HTML_FF_BOX|HTML_FF_BACKGROUND|HTML_FF_PADDING|HTML_FF_DIRECTION, - aFrmItemSet ); + aFrameItemSet ); // Insert fly frame. If the are columns, the fly frame's name is not // the sections name but a generated one. @@ -648,7 +648,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss ) aPropInfo.aId.clear(); } - InsertFlyFrame( aFrmItemSet, pCntxt, aFlyName, CONTEXT_FLAGS_ABSPOS ); + InsertFlyFrame( aFrameItemSet, pCntxt, aFlyName, CONTEXT_FLAGS_ABSPOS ); pCntxt->SetPopStack( true ); bPositioned = true; @@ -690,10 +690,10 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss ) OUString aName( m_pDoc->GetUniqueSectionName( !aId.isEmpty() ? &aId : nullptr ) ); SwSectionData aSection( CONTENT_SECTION, aName ); - SfxItemSet aFrmItemSet( m_pDoc->GetAttrPool(), + SfxItemSet aFrameItemSet( m_pDoc->GetAttrPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1 ); if( !IsNewDoc() ) - Reader::ResetFrameFormatAttrs(aFrmItemSet ); + Reader::ResetFrameFormatAttrs(aFrameItemSet ); if( nGutter && Application::GetDefaultDevice() ) { @@ -706,22 +706,22 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss ) nPrcWidth = 100; aFormatCol.Init( nCols, nGutter, USHRT_MAX ); - aFrmItemSet.Put( aFormatCol ); + aFrameItemSet.Put( aFormatCol ); const SfxPoolItem *pItem; if( SfxItemState::SET == aItemSet.GetItemState( RES_BACKGROUND, false, &pItem ) ) { - aFrmItemSet.Put( *pItem ); + aFrameItemSet.Put( *pItem ); aItemSet.ClearItem( RES_BACKGROUND ); } if( SfxItemState::SET == aItemSet.GetItemState( RES_FRAMEDIR, false, &pItem ) ) { - aFrmItemSet.Put( *pItem ); + aFrameItemSet.Put( *pItem ); aItemSet.ClearItem( RES_FRAMEDIR ); } - m_pDoc->InsertSwSection( *m_pPam, aSection, nullptr, &aFrmItemSet, false ); + m_pDoc->InsertSwSection( *m_pPam, aSection, nullptr, &aFrameItemSet, false ); // Jump to section, if this is requested. if( JUMPTO_REGION == m_eJumpTo && aName == m_sJmpMark ) @@ -778,7 +778,7 @@ void SwHTMLParser::InsertFlyFrame( const SfxItemSet& rItemSet, if( !rName.isEmpty() ) pFlyFormat->SetName( rName ); - RegisterFlyFrm( pFlyFormat ); + RegisterFlyFrame( pFlyFormat ); const SwFormatContent& rFlyContent = pFlyFormat->GetContent(); const SwNodeIndex& rFlyCntIdx = *rFlyContent.GetContentIdx(); diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 5e1fc096469f..0559b5f81a40 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -1400,10 +1400,10 @@ void HTMLTable::FixFrameFormat( SwTableBox *pBox, pFrameFormat = pBox->ClaimFrameFormat(); // die Breite der Box berechnen - SwTwips nFrmWidth = (SwTwips)pLayoutInfo->GetColumn(nCol) + SwTwips nFrameWidth = (SwTwips)pLayoutInfo->GetColumn(nCol) ->GetRelColWidth(); for( sal_uInt16 i=1; i<nColSpan; i++ ) - nFrmWidth += (SwTwips)pLayoutInfo->GetColumn(nCol+i) + nFrameWidth += (SwTwips)pLayoutInfo->GetColumn(nCol+i) ->GetRelColWidth(); // die Umrandung nur an Edit-Boxen setzen (bei der oberen und unteren @@ -1414,7 +1414,7 @@ void HTMLTable::FixFrameFormat( SwTableBox *pBox, bool bSet = (nCellPadding > 0); SvxBoxItem aBoxItem( RES_BOX ); - long nInnerFrmWidth = nFrmWidth; + long nInnerFrameWidth = nFrameWidth; if( bTopLine ) { @@ -1453,13 +1453,13 @@ void HTMLTable::FixFrameFormat( SwTableBox *pBox, const SvxBorderLine& rBorderLine = 0==nCol ? aLeftBorderLine : aBorderLine; aBoxItem.SetLine( &rBorderLine, SvxBoxItemLine::LEFT ); - nInnerFrmWidth -= GetBorderWidth( rBorderLine ); + nInnerFrameWidth -= GetBorderWidth( rBorderLine ); bSet = true; } if( nCol+nColSpan == nCols && bRightBorder ) { aBoxItem.SetLine( &aRightBorderLine, SvxBoxItemLine::RIGHT ); - nInnerFrmWidth -= GetBorderWidth( aRightBorderLine ); + nInnerFrameWidth -= GetBorderWidth( aRightBorderLine ); bSet = true; } @@ -1471,8 +1471,8 @@ void HTMLTable::FixFrameFormat( SwTableBox *pBox, { // BorderDist nicht mehr Bestandteil einer Zelle mit fixer Breite sal_uInt16 nBDist = static_cast< sal_uInt16 >( - (2*nCellPadding <= nInnerFrmWidth) ? nCellPadding - : (nInnerFrmWidth / 2) ); + (2*nCellPadding <= nInnerFrameWidth) ? nCellPadding + : (nInnerFrameWidth / 2) ); // wir setzen das Item nur, wenn es eine Umrandung gibt // oder eine sheet::Border-Distanz vorgegeben ist. Fehlt letztere, // dann gibt es eine Umrandung, und wir muessen die Distanz @@ -1670,7 +1670,7 @@ SwTableLine *HTMLTable::MakeTableLine( SwTableBox *pUpper, nRowHeight += GetTopCellSpace( nTopRow, 1, false ) + GetBottomCellSpace( nTopRow, 1, false ); - pFrameFormat->SetFormatAttr( SwFormatFrmSize( ATT_MIN_SIZE, 0, nRowHeight ) ); + pFrameFormat->SetFormatAttr( SwFormatFrameSize( ATT_MIN_SIZE, 0, nRowHeight ) ); } if( pBGBrushItem ) @@ -2525,9 +2525,9 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail, if( bPrcWidth && text::HoriOrientation::FULL!=eHoriOri ) { pFrameFormat->LockModify(); - SwFormatFrmSize aFrmSize( pFrameFormat->GetFrmSize() ); - aFrmSize.SetWidthPercent( (sal_uInt8)nWidth ); - pFrameFormat->SetFormatAttr( aFrmSize ); + SwFormatFrameSize aFrameSize( pFrameFormat->GetFrameSize() ); + aFrameSize.SetWidthPercent( (sal_uInt8)nWidth ); + pFrameFormat->SetFormatAttr( aFrameSize ); pFrameFormat->UnlockModify(); } } @@ -2638,7 +2638,7 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail, (pSwTable->GetTabLines())[0]->ClaimFrameFormat(); (pSwTable->GetTabLines())[0]->GetFrameFormat() - ->SetFormatAttr( SwFormatFrmSize( ATT_MIN_SIZE, 0, nHeight ) ); + ->SetFormatAttr( SwFormatFrameSize( ATT_MIN_SIZE, 0, nHeight ) ); } if( GetBGBrush() ) @@ -2662,9 +2662,9 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail, sal_uInt32 nMin = pLayoutInfo->GetMin(); if( nMin > USHRT_MAX ) nMin = USHRT_MAX; - SwFormatFrmSize aFlyFrmSize( ATT_VAR_SIZE, (SwTwips)nMin, MINLAY ); - aFlyFrmSize.SetWidthPercent( 100 ); - pContext->GetFrameFormat()->SetFormatAttr( aFlyFrmSize ); + SwFormatFrameSize aFlyFrameSize( ATT_VAR_SIZE, (SwTwips)nMin, MINLAY ); + aFlyFrameSize.SetWidthPercent( 100 ); + pContext->GetFrameFormat()->SetFormatAttr( aFlyFrameSize ); bIsInFlyFrame = false; } else @@ -2679,8 +2679,8 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail, sal_uInt32 nMax = pLayoutInfo->GetMax(); if( nMax > USHRT_MAX ) nMax = USHRT_MAX; - SwFormatFrmSize aFlyFrmSize( ATT_VAR_SIZE, (SwTwips)nMax, MINLAY ); - pContext->GetFrameFormat()->SetFormatAttr( aFlyFrmSize ); + SwFormatFrameSize aFlyFrameSize( ATT_VAR_SIZE, (SwTwips)nMax, MINLAY ); + pContext->GetFrameFormat()->SetFormatAttr( aFlyFrameSize ); bIsInFlyFrame = false; } else @@ -3673,10 +3673,10 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions, { // Die Tabelle soll in einen Rahmen geschaufelt werden. - SfxItemSet aFrmSet( m_pDoc->GetAttrPool(), + SfxItemSet aFrameSet( m_pDoc->GetAttrPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1 ); if( !pCurTable->IsNewDoc() ) - Reader::ResetFrameFormatAttrs( aFrmSet ); + Reader::ResetFrameFormatAttrs( aFrameSet ); SwSurround eSurround = SURROUND_NONE; sal_Int16 eHori; @@ -3697,26 +3697,26 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions, eHori = text::HoriOrientation::LEFT; break; } - SetAnchorAndAdjustment( text::VertOrientation::NONE, eHori, aFrmSet, + SetAnchorAndAdjustment( text::VertOrientation::NONE, eHori, aFrameSet, true ); - aFrmSet.Put( SwFormatSurround(eSurround) ); + aFrameSet.Put( SwFormatSurround(eSurround) ); - SwFormatFrmSize aFrmSize( ATT_VAR_SIZE, 20*MM50, MINLAY ); - aFrmSize.SetWidthPercent( 100 ); - aFrmSet.Put( aFrmSize ); + SwFormatFrameSize aFrameSize( ATT_VAR_SIZE, 20*MM50, MINLAY ); + aFrameSize.SetWidthPercent( 100 ); + aFrameSet.Put( aFrameSize ); sal_uInt16 nSpace = pCurTable->GetHSpace(); if( nSpace ) - aFrmSet.Put( SvxLRSpaceItem(nSpace,nSpace, 0, 0, RES_LR_SPACE) ); + aFrameSet.Put( SvxLRSpaceItem(nSpace,nSpace, 0, 0, RES_LR_SPACE) ); nSpace = pCurTable->GetVSpace(); if( nSpace ) - aFrmSet.Put( SvxULSpaceItem(nSpace,nSpace, RES_UL_SPACE) ); + aFrameSet.Put( SvxULSpaceItem(nSpace,nSpace, RES_UL_SPACE) ); - RndStdIds eAnchorId = static_cast<const SwFormatAnchor&>(aFrmSet. + RndStdIds eAnchorId = static_cast<const SwFormatAnchor&>(aFrameSet. Get( RES_ANCHOR )). GetAnchorId(); SwFrameFormat *pFrameFormat = m_pDoc->MakeFlySection( - eAnchorId, m_pPam->GetPoint(), &aFrmSet ); + eAnchorId, m_pPam->GetPoint(), &aFrameSet ); pTCntxt->SetFrameFormat( pFrameFormat ); const SwFormatContent& rFlyContent = pFrameFormat->GetContent(); @@ -5006,17 +5006,17 @@ void _TableSaveStruct::MakeTable( sal_uInt16 nWidth, SwPosition& rPos, SwDoc *pD if( pTCntxt->GetFrameFormat() ) { - pTCntxt->GetFrameFormat()->DelFrms(); - pTableNd->DelFrms(); - pTCntxt->GetFrameFormat()->MakeFrms(); + pTCntxt->GetFrameFormat()->DelFrames(); + pTableNd->DelFrames(); + pTCntxt->GetFrameFormat()->MakeFrames(); } else { - pTableNd->DelFrms(); + pTableNd->DelFrames(); SwNodeIndex aIdx( *pTableNd->EndOfSectionNode(), 1 ); OSL_ENSURE( aIdx.GetIndex() <= pTCntxt->GetPos()->nNode.GetIndex(), "unerwarteter Node fuer das Tabellen-Layout" ); - pTableNd->MakeFrms( &aIdx ); + pTableNd->MakeFrames( &aIdx ); } } diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx index 3b3c8a457ce6..1773f8d6b42a 100644 --- a/sw/source/filter/html/htmltabw.cxx +++ b/sw/source/filter/html/htmltabw.cxx @@ -902,9 +902,9 @@ Writer& OutHTML_SwTableNode( Writer& rWrt, SwTableNode & rNode, if( pFlyFrameFormat ) { eSurround = pFlyFrameFormat->GetSurround().GetSurround(); - const SwFormatFrmSize& rFrmSize = pFlyFrameFormat->GetFrmSize(); - nFlyPrcWidth = rFrmSize.GetWidthPercent(); - nFlyWidth = rFrmSize.GetSize().Width(); + const SwFormatFrameSize& rFrameSize = pFlyFrameFormat->GetFrameSize(); + nFlyPrcWidth = rFrameSize.GetWidthPercent(); + nFlyWidth = rFrameSize.GetSize().Width(); eFlyHoriOri = pFlyFrameFormat->GetHoriOrient().GetHoriOrient(); if( text::HoriOrientation::NONE == eFlyHoriOri ) @@ -928,9 +928,9 @@ Writer& OutHTML_SwTableNode( Writer& rWrt, SwTableNode & rNode, SwFrameFormat *pFormat = rTable.GetFrameFormat(); - const SwFormatFrmSize& rFrmSize = pFormat->GetFrmSize(); - long nWidth = rFrmSize.GetSize().Width(); - sal_uInt8 nPrcWidth = rFrmSize.GetWidthPercent(); + const SwFormatFrameSize& rFrameSize = pFormat->GetFrameSize(); + long nWidth = rFrameSize.GetSize().Width(); + sal_uInt8 nPrcWidth = rFrameSize.GetWidthPercent(); sal_uInt16 nBaseWidth = (sal_uInt16)nWidth; sal_Int16 eTabHoriOri = pFormat->GetHoriOrient().GetHoriOrient(); diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 54cfe6767ba8..42c4ff1befd9 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -233,7 +233,7 @@ sal_uLong HTMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPam, return nRet; } -SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCrsr, SvStream& rIn, +SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCursor, SvStream& rIn, const OUString& rPath, const OUString& rBaseURL, bool bReadNewDoc, @@ -300,13 +300,13 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCrsr, SvStream& rIn, { m_nEventId = nullptr; m_bUpperSpace = m_bViewCreated = m_bChkJumpMark = - m_bSetCrsr = false; + m_bSetCursor = false; m_eScriptLang = HTML_SL_UNKNOWN; m_bAnyStarBasic = true; - rCrsr.DeleteMark(); - m_pPam = &rCrsr; // re-use existing cursor: avoids spurious ~SwIndexReg assert + rCursor.DeleteMark(); + m_pPam = &rCursor; // re-use existing cursor: avoids spurious ~SwIndexReg assert memset( &m_aAttrTab, 0, sizeof( _HTMLAttrTable )); // Die Font-Groessen 1-7 aus der INI-Datei lesen @@ -761,16 +761,16 @@ if( m_pSttNdIdx->GetIndex()+1 == m_pPam->GetBound( false ).nNode.GetIndex() ) pCNd->EndOfSectionIndex() && !bHasFlysOrMarks ) { SwViewShell *pVSh = CheckActionViewShell(); - SwCrsrShell *pCrsrSh = pVSh && dynamic_cast< const SwCrsrShell *>( pVSh ) != nullptr - ? static_cast < SwCrsrShell * >( pVSh ) + SwCursorShell *pCursorSh = pVSh && dynamic_cast< const SwCursorShell *>( pVSh ) != nullptr + ? static_cast < SwCursorShell * >( pVSh ) : nullptr; - if( pCrsrSh && - pCrsrSh->GetCrsr()->GetPoint() + if( pCursorSh && + pCursorSh->GetCursor()->GetPoint() ->nNode.GetIndex() == nNodeIdx ) { - pCrsrSh->MovePara(fnParaPrev, fnParaEnd ); - pCrsrSh->SetMark(); - pCrsrSh->ClearMark(); + pCursorSh->MovePara(fnParaPrev, fnParaEnd ); + pCursorSh->SetMark(); + pCursorSh->ClearMark(); } m_pPam->GetBound().nContent.Assign( nullptr, 0 ); m_pPam->GetBound(false).nContent.Assign( nullptr, 0 ); @@ -2579,16 +2579,16 @@ SwViewShell *SwHTMLParser::CallEndAction( bool bChkAction, bool bChkPtr ) if( !m_pActionViewShell || (bChkAction && !m_pActionViewShell->ActionPend()) ) return m_pActionViewShell; - if( m_bSetCrsr ) + if( m_bSetCursor ) { - // set the cursor to the doc begin in all CrsrEditShells + // set the cursor to the doc begin in all CursorEditShells for(SwViewShell& rSh : m_pActionViewShell->GetRingContainer()) { - if( dynamic_cast<const SwCrsrShell *>(&rSh) != nullptr ) - static_cast<SwCrsrShell*>(&rSh)->SttEndDoc(true); + if( dynamic_cast<const SwCursorShell *>(&rSh) != nullptr ) + static_cast<SwCursorShell*>(&rSh)->SttEndDoc(true); } - m_bSetCrsr = false; + m_bSetCursor = false; } if( dynamic_cast< const SwEditShell *>( m_pActionViewShell ) != nullptr ) { @@ -2891,9 +2891,9 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable, } } - for( auto n = m_aMoveFlyFrms.size(); n; ) + for( auto n = m_aMoveFlyFrames.size(); n; ) { - SwFrameFormat *pFrameFormat = m_aMoveFlyFrms[ --n ]; + SwFrameFormat *pFrameFormat = m_aMoveFlyFrames[ --n ]; const SwFormatAnchor& rAnchor = pFrameFormat->GetAnchor(); OSL_ENSURE( FLY_AT_PARA == rAnchor.GetAnchorId(), @@ -2916,7 +2916,7 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable, } if( bMoveFly ) { - pFrameFormat->DelFrms(); + pFrameFormat->DelFrames(); *pAttrPam->GetPoint() = *pFlyPos; pAttrPam->GetPoint()->nContent.Assign( pAttrPam->GetContentNode(), m_aMoveFlyCnts[n] ); @@ -2940,8 +2940,8 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable, pFrameFormat->SetFormatAttr( aVertOri ); } - pFrameFormat->MakeFrms(); - m_aMoveFlyFrms.erase( m_aMoveFlyFrms.begin() + n ); + pFrameFormat->MakeFrames(); + m_aMoveFlyFrames.erase( m_aMoveFlyFrames.begin() + n ); m_aMoveFlyCnts.erase( m_aMoveFlyCnts.begin() + n ); } } @@ -4875,13 +4875,13 @@ void SwHTMLParser::InsertSpacer() // einen leeren Textrahmen anlegen // den Itemset holen - SfxItemSet aFrmSet( m_pDoc->GetAttrPool(), + SfxItemSet aFrameSet( m_pDoc->GetAttrPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1 ); if( !IsNewDoc() ) - Reader::ResetFrameFormatAttrs( aFrmSet ); + Reader::ResetFrameFormatAttrs( aFrameSet ); // den Anker und die Ausrichtung setzen - SetAnchorAndAdjustment( eVertOri, eHoriOri, aFrmSet ); + SetAnchorAndAdjustment( eVertOri, eHoriOri, aFrameSet ); // und noch die Groesse des Rahmens Size aDfltSz( MINFLY, MINFLY ); @@ -4891,21 +4891,21 @@ void SwHTMLParser::InsertSpacer() SvxCSS1PropertyInfo aDummyPropInfo; SetFixSize( aSize, aDfltSz, bPrcWidth, bPrcHeight, - aDummyItemSet, aDummyPropInfo, aFrmSet ); - SetSpace( aSpace, aDummyItemSet, aDummyPropInfo, aFrmSet ); + aDummyItemSet, aDummyPropInfo, aFrameSet ); + SetSpace( aSpace, aDummyItemSet, aDummyPropInfo, aFrameSet ); // den Inhalt schuetzen SvxProtectItem aProtectItem( RES_PROTECT) ; aProtectItem.SetContentProtect( true ); - aFrmSet.Put( aProtectItem ); + aFrameSet.Put( aProtectItem ); // der Rahmen anlegen RndStdIds eAnchorId = - static_cast<const SwFormatAnchor &>(aFrmSet.Get(RES_ANCHOR)).GetAnchorId(); + static_cast<const SwFormatAnchor &>(aFrameSet.Get(RES_ANCHOR)).GetAnchorId(); SwFrameFormat *pFlyFormat = m_pDoc->MakeFlySection( eAnchorId, - m_pPam->GetPoint(), &aFrmSet ); + m_pPam->GetPoint(), &aFrameSet ); // Ggf Frames anlegen und auto-geb. Rahmen registrieren - RegisterFlyFrm( pFlyFormat ); + RegisterFlyFrame( pFlyFormat ); } break; case HTML_SPTYPE_VERT: @@ -5015,7 +5015,7 @@ SwTwips SwHTMLParser::GetCurrentBrowseWidth() { const SwFrameFormat& rPgFormat = m_pCSS1Parser->GetMasterPageDesc()->GetMaster(); - const SwFormatFrmSize& rSz = rPgFormat.GetFrmSize(); + const SwFormatFrameSize& rSz = rPgFormat.GetFrameSize(); const SvxLRSpaceItem& rLR = rPgFormat.GetLRSpace(); const SvxULSpaceItem& rUL = rPgFormat.GetULSpace(); const SwFormatCol& rCol = rPgFormat.GetCol(); diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index da2a33aa64e1..376e68b61ed7 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -202,7 +202,7 @@ class _HTMLAttrContext OUString aClass; // die Klasse des Kontexts _HTMLAttrContext_SaveDoc *pSaveDocContext; - SfxItemSet *pFrmItemSet; + SfxItemSet *pFrameItemSet; sal_uInt16 nToken; // das Token, zu dem der Kontext gehoehrt @@ -234,7 +234,7 @@ public: bool bDfltColl=false ) : aClass( rClass ), pSaveDocContext( nullptr ), - pFrmItemSet( nullptr ), + pFrameItemSet( nullptr ), nToken( nTokn ), nTextFormatColl( nPoolId ), nLeftMargin( 0 ), @@ -256,7 +256,7 @@ public: explicit _HTMLAttrContext( sal_uInt16 nTokn ) : pSaveDocContext( nullptr ), - pFrmItemSet( nullptr ), + pFrameItemSet( nullptr ), nToken( nTokn ), nTextFormatColl( 0 ), nLeftMargin( 0 ), @@ -276,7 +276,7 @@ public: bRestartListing( false ) {} - ~_HTMLAttrContext() { ClearSaveDocContext(); delete pFrmItemSet; } + ~_HTMLAttrContext() { ClearSaveDocContext(); delete pFrameItemSet; } sal_uInt16 GetToken() const { return nToken; } @@ -308,8 +308,8 @@ public: bool HasSaveDocContext() const { return pSaveDocContext!=nullptr; } _HTMLAttrContext_SaveDoc *GetSaveDocContext( bool bCreate=false ); - const SfxItemSet *GetFrmItemSet() const { return pFrmItemSet; } - SfxItemSet *GetFrmItemSet( SwDoc *pCreateDoc ); + const SfxItemSet *GetFrameItemSet() const { return pFrameItemSet; } + SfxItemSet *GetFrameItemSet( SwDoc *pCreateDoc ); void SetFinishPREListingXMP( bool bSet ) { bFinishPREListingXMP = bSet; } bool IsFinishPREListingXMP() const { return bFinishPREListingXMP; } @@ -381,7 +381,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient _HTMLAttrs m_aParaAttrs; // vorlauefige Absatz-Attribute _HTMLAttrTable m_aAttrTab; // "offene" Attribute _HTMLAttrContexts m_aContexts;// der aktuelle Attribut/Token-Kontext - std::vector<SwFrameFormat *> m_aMoveFlyFrms;// Fly-Frames, the anchor is moved + std::vector<SwFrameFormat *> m_aMoveFlyFrames;// Fly-Frames, the anchor is moved std::deque<sal_Int32> m_aMoveFlyCnts;// and the Content-Positions SwApplet_Impl *m_pAppletImpl; // das aktuelle Applet @@ -438,7 +438,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient // Flag um doppeltes init durch Rekursion // zu verhindern. bool m_bViewCreated : 1; // die View wurde schon erzeugt (asynchron) - bool m_bSetCrsr : 1; // Crsr wieder auf den Anfang setzen + bool m_bSetCursor : 1; // Cursor wieder auf den Anfang setzen bool m_bSetModEnabled : 1; bool m_bInFloatingFrame : 1; // Wir sind in einen Floating Frame @@ -493,7 +493,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient inline void SetAttr( bool bChkEnd = true, bool bBeforeTable = false, _HTMLAttrs *pPostIts = nullptr ) { - if( !m_aSetAttrTab.empty() || !m_aMoveFlyFrms.empty() ) + if( !m_aSetAttrTab.empty() || !m_aMoveFlyFrames.empty() ) _SetAttr( bChkEnd, bBeforeTable, pPostIts ); } @@ -667,20 +667,20 @@ private: sal_Int16 eHoriOri, const SfxItemSet &rItemSet, const SvxCSS1PropertyInfo &rPropInfo, - SfxItemSet& rFrmSet ); + SfxItemSet& rFrameSet ); void SetAnchorAndAdjustment( sal_Int16 eVertOri, sal_Int16 eHoriOri, - SfxItemSet& rFrmSet, + SfxItemSet& rFrameSet, bool bDontAppend=false ); void SetAnchorAndAdjustment( const SfxItemSet &rItemSet, const SvxCSS1PropertyInfo &rPropInfo, - SfxItemSet &rFrmItemSet ); + SfxItemSet &rFrameItemSet ); static void SetFrameFormatAttrs( SfxItemSet &rItemSet, SvxCSS1PropertyInfo &rPropInfo, - sal_uInt16 nFlags, SfxItemSet &rFrmItemSet ); + sal_uInt16 nFlags, SfxItemSet &rFrameItemSet ); // Frames anlegen und Auto-gebundene Rahmen registrieren - void RegisterFlyFrm( SwFrameFormat *pFlyFrm ); + void RegisterFlyFrame( SwFrameFormat *pFlyFrame ); // Die Groesse des Fly-Frames an die Vorgaben und Gegebenheiten anpassen // (nicht fuer Grafiken, deshalb htmlplug.cxx) @@ -884,7 +884,7 @@ protected: public: - SwHTMLParser( SwDoc* pD, SwPaM & rCrsr, SvStream& rIn, + SwHTMLParser( SwDoc* pD, SwPaM & rCursor, SvStream& rIn, const OUString& rFileName, const OUString& rBaseURL, bool bReadNewDoc = true, diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index f66e87631f12..e741ee631b5a 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -91,7 +91,7 @@ static sal_Char sIndentTabs[MAX_INDENT_LEVEL+2] = "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t"; SwHTMLWriter::SwHTMLWriter( const OUString& rBaseURL ) - : m_pHTMLPosFlyFrms(nullptr) + : m_pHTMLPosFlyFrames(nullptr) , m_pNumRuleInfo(new SwHTMLNumRuleInfo) , m_pNextNumRuleInfo(nullptr) , m_nHTMLMode(0) @@ -378,8 +378,8 @@ sal_uLong SwHTMLWriter::WriteStream() // Tabelle fuer die freifliegenden Rahmen erzeugen, aber nur wenn // das gesamte Dokument geschrieben wird - m_pHTMLPosFlyFrms = nullptr; - CollectFlyFrms(); + m_pHTMLPosFlyFrames = nullptr; + CollectFlyFrames(); m_nLastParaToken = 0; GetControls(); CollectLinkTargets(); @@ -438,12 +438,12 @@ sal_uLong SwHTMLWriter::WriteStream() } // loesche die Tabelle mit den freifliegenden Rahmen - OSL_ENSURE( !m_pHTMLPosFlyFrms, "Wurden nicht alle Rahmen ausgegeben" ); - if( m_pHTMLPosFlyFrms ) + OSL_ENSURE( !m_pHTMLPosFlyFrames, "Wurden nicht alle Rahmen ausgegeben" ); + if( m_pHTMLPosFlyFrames ) { - m_pHTMLPosFlyFrms->DeleteAndDestroyAll(); - delete m_pHTMLPosFlyFrms; - m_pHTMLPosFlyFrms = nullptr; + m_pHTMLPosFlyFrames->DeleteAndDestroyAll(); + delete m_pHTMLPosFlyFrames; + m_pHTMLPosFlyFrames = nullptr; } m_aHTMLControls.DeleteAndDestroyAll(); diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx index 8a65c8128ae6..03d891f57866 100644 --- a/sw/source/filter/html/wrthtml.hxx +++ b/sw/source/filter/html/wrthtml.hxx @@ -52,7 +52,7 @@ class SdrUnoObj; class SvxBrushItem; class SvxFontItem; class SwHTMLNumRuleInfo; -class SwHTMLPosFlyFrms; +class SwHTMLPosFlyFrames; class SwTextFootnote; typedef std::vector<SwTextFootnote*> SwHTMLTextFootnotes; @@ -260,7 +260,7 @@ class IDocumentStylePoolAccess; class SwHTMLWriter : public Writer { - SwHTMLPosFlyFrms *m_pHTMLPosFlyFrms; + SwHTMLPosFlyFrames *m_pHTMLPosFlyFrames; SwHTMLNumRuleInfo *m_pNumRuleInfo;// aktuelle Numerierung SwHTMLNumRuleInfo *m_pNextNumRuleInfo; sal_uInt32 m_nHTMLMode; // Beschreibung der Export-Konfiguration @@ -414,7 +414,7 @@ public: void OutHyperlinkHRefValue( const OUString& rURL ); // gebe die evt. an der akt. Position stehenden FlyFrame aus. - bool OutFlyFrm( sal_uLong nNdIdx, sal_Int32 nContentIdx, + bool OutFlyFrame( sal_uLong nNdIdx, sal_Int32 nContentIdx, sal_uInt8 nPos, HTMLOutContext *pContext = nullptr ); void OutFrameFormat( sal_uInt8 nType, const SwFrameFormat& rFormat, const SdrObject *pSdrObj ); @@ -468,14 +468,14 @@ public: // Frame-Formats ausgeben und ggf. ein <BR CLEAR=...> vorne an // rEndTags anhaengen OString OutFrameFormatOptions( const SwFrameFormat& rFrameFormat, const OUString& rAltText, - sal_uInt32 nFrmOpts, const OString& rEndTags = OString() ); + sal_uInt32 nFrameOpts, const OString& rEndTags = OString() ); - void writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrameFormat& rFrameFormat, const OUString& rAltText, sal_uInt32 nFrmOpts); + void writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrameFormat& rFrameFormat, const OUString& rAltText, sal_uInt32 nFrameOpts); void OutCSS1_TableFrameFormatOptions( const SwFrameFormat& rFrameFormat ); void OutCSS1_TableCellBorderHack(const SwFrameFormat& rFrameFormat); void OutCSS1_SectionFormatOptions( const SwFrameFormat& rFrameFormat, const SwFormatCol *pCol ); - void OutCSS1_FrameFormatOptions( const SwFrameFormat& rFrameFormat, sal_uInt32 nFrmOpts, + void OutCSS1_FrameFormatOptions( const SwFrameFormat& rFrameFormat, sal_uInt32 nFrameOpts, const SdrObject *pSdrObj=nullptr, const SfxItemSet *pItemSet=nullptr ); void OutCSS1_FrameFormatBackground( const SwFrameFormat& rFrameFormat ); @@ -504,11 +504,11 @@ public: static sal_uInt32 ToPixel( sal_uInt32 nVal, const bool bVert ); - sal_uInt16 GuessFrmType( const SwFrameFormat& rFrameFormat, + sal_uInt16 GuessFrameType( const SwFrameFormat& rFrameFormat, const SdrObject*& rpStrObj ); - static sal_uInt16 GuessOLENodeFrmType( const SwNode& rNd ); + static sal_uInt16 GuessOLENodeFrameType( const SwNode& rNd ); - void CollectFlyFrms(); + void CollectFlyFrames(); sal_uInt16 GetHTMLFontSize( sal_uInt32 nFontHeight ) const; @@ -649,7 +649,7 @@ Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrameFormat& rFrameFormat, Writer& OutHTML_Image( Writer&, const SwFrameFormat& rFormat, Graphic& rGraphic, const OUString& rAlternateText, - const Size& rRealSize, sal_uInt32 nFrmOpts, + const Size& rRealSize, sal_uInt32 nFrameOpts, const sal_Char *pMarkType = nullptr, const ImageMap *pGenImgMap = nullptr ); diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx index 0e213ed4aedd..a3157b6f7195 100644 --- a/sw/source/filter/inc/msfilter.hxx +++ b/sw/source/filter/inc/msfilter.hxx @@ -310,7 +310,7 @@ namespace sw their layout frms deleted and recalculated. This TableManager detects the necessity to do this, and all tables inserted into a document should be registered with this manager with - InsertTable, and before finialization DelAndMakeTableFrms should + InsertTable, and before finialization DelAndMakeTableFrames should be called. @author @@ -323,7 +323,7 @@ namespace sw public: typedef std::map<InsertedTableClient *, SwNodeIndex *> TableMap; typedef TableMap::iterator TableMapIter; - void DelAndMakeTableFrms(); + void DelAndMakeTableFrames(); void InsertTable(SwTableNode &rTableNode, SwPaM &rPaM); explicit InsertedTablesManager(const SwDoc &rDoc); private: diff --git a/sw/source/filter/inc/wrtswtbl.hxx b/sw/source/filter/inc/wrtswtbl.hxx index 55819710c516..7d5871bca30a 100644 --- a/sw/source/filter/inc/wrtswtbl.hxx +++ b/sw/source/filter/inc/wrtswtbl.hxx @@ -236,7 +236,7 @@ protected: sal_uInt16 nBorder; // Dicke der ausseren Umrandung sal_uInt16 nInnerBorder; // Dicke der inneren Umrandung - sal_uInt32 nBaseWidth; // Bezugsgroesse fur Breiten SwFormatFrmSize + sal_uInt32 nBaseWidth; // Bezugsgroesse fur Breiten SwFormatFrameSize sal_uInt16 nHeadEndRow; // letzte Zeile des Tabellen-Kopfes diff --git a/sw/source/filter/writer/wrtswtbl.cxx b/sw/source/filter/writer/wrtswtbl.cxx index 5cd0bd4e27a1..4dbb1315fc33 100644 --- a/sw/source/filter/writer/wrtswtbl.cxx +++ b/sw/source/filter/writer/wrtswtbl.cxx @@ -81,10 +81,10 @@ SwWriteTableCol::SwWriteTableCol(sal_uInt32 nPosition) sal_uInt32 SwWriteTable::GetBoxWidth( const SwTableBox *pBox ) { const SwFrameFormat *pFormat = pBox->GetFrameFormat(); - const SwFormatFrmSize& aFrmSize= - static_cast<const SwFormatFrmSize&>(pFormat->GetFormatAttr( RES_FRM_SIZE )); + const SwFormatFrameSize& aFrameSize= + static_cast<const SwFormatFrameSize&>(pFormat->GetFormatAttr( RES_FRM_SIZE )); - return sal::static_int_cast<sal_uInt32>(aFrmSize.GetSize().Width()); + return sal::static_int_cast<sal_uInt32>(aFrameSize.GetSize().Width()); } long SwWriteTable::GetLineHeight( const SwTableLine *pLine ) @@ -151,7 +151,7 @@ long SwWriteTable::GetLineHeight( const SwTableBox *pBox ) long nHeight = 0; if( SfxItemState::SET == rItemSet.GetItemState( RES_FRM_SIZE, true, &pItem )) - nHeight = static_cast<const SwFormatFrmSize*>(pItem)->GetHeight(); + nHeight = static_cast<const SwFormatFrameSize*>(pItem)->GetHeight(); return nHeight; } @@ -587,7 +587,7 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, sal_uInt16 nStartRow, long nHeight = 0; if( SfxItemState::SET == rItemSet.GetItemState( RES_FRM_SIZE, true, &pItem )) - nHeight = static_cast<const SwFormatFrmSize*>(pItem)->GetHeight(); + nHeight = static_cast<const SwFormatFrameSize*>(pItem)->GetHeight(); const SvxBrushItem *pBrushItem, *pLineBrush = pParentBrush; if( SfxItemState::SET == rItemSet.GetItemState( RES_BACKGROUND, false, diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx b/sw/source/filter/ww8/WW8TableInfo.cxx index 92640e340f90..6bb6f54870b5 100644 --- a/sw/source/filter/ww8/WW8TableInfo.cxx +++ b/sw/source/filter/ww8/WW8TableInfo.cxx @@ -206,7 +206,7 @@ GridColsPtr WW8TableNodeInfoInner::getGridColsOfRow(AttributeOutputBase & rBase, if (!pFormat) return pResult; - const SwFormatFrmSize &rSize = pFormat->GetFrmSize(); + const SwFormatFrameSize &rSize = pFormat->GetFrameSize(); unsigned long nTableSz = static_cast<unsigned long>(rSize.GetWidth()); long nPageSize = 0; @@ -259,7 +259,7 @@ WidthsPtr WW8TableNodeInfoInner::getColumnWidthsBasedOnAllRows() for (size_t nBoxIndex = 0; nBoxIndex < nBoxes; ++nBoxIndex) { const SwFrameFormat* pBoxFormat = rTabBoxes[ nBoxIndex ]->GetFrameFormat(); - const SwFormatFrmSize& rLSz = pBoxFormat->GetFrmSize(); + const SwFormatFrameSize& rLSz = pBoxFormat->GetFrameSize(); nSeparatorPosition += rLSz.GetWidth(); pSeparators->push_back(nSeparatorPosition); } @@ -312,7 +312,7 @@ WidthsPtr WW8TableNodeInfoInner::getWidthsOfRow() for (sal_uInt32 n = 0; n < nBoxes; n++) { const SwFrameFormat* pBoxFormat = rTabBoxes[ n ]->GetFrameFormat(); - const SwFormatFrmSize& rLSz = pBoxFormat->GetFrmSize(); + const SwFormatFrameSize& rLSz = pBoxFormat->GetFrameSize(); pWidths->push_back(rLSz.GetWidth()); } @@ -587,7 +587,7 @@ WW8TableInfo::processSwTableByLayout(const SwTable * pTable, RowEndInners_t &rLa { SwRect aRect = aTableCellInfo.getRect(); - SAL_INFO( "sw.ww8", "<CellFrm>" ); + SAL_INFO( "sw.ww8", "<CellFrame>" ); SAL_INFO( "sw.ww8", "<rect top=\"" << aRect.Top() << "\" bottom=\"" << aRect.Bottom() << "\" left=\"" << aRect.Left() << "\" right=\"" << aRect.Right() << "\"/>" ); const SwTableBox * pTableBox = aTableCellInfo.getTableBox(); @@ -618,7 +618,7 @@ WW8TableInfo::processSwTableByLayout(const SwTable * pTable, RowEndInners_t &rLa while (!bDone); } - SAL_INFO( "sw.ww8", "</CellFrm>" ); + SAL_INFO( "sw.ww8", "</CellFrame>" ); } return reorderByLayout(pTable, rLastRowEnds); @@ -1098,12 +1098,12 @@ CellInfoMultiSet::const_iterator WW8TableCellGrid::getCellsEnd(long nTop) void WW8TableCellGrid::insert(const SwRect & rRect, WW8TableNodeInfo * pNodeInfo, - unsigned long * pFormatFrmWidth) + unsigned long * pFormatFrameWidth) { CellInfo aCellInfo(rRect, pNodeInfo); - if (pFormatFrmWidth != nullptr) - aCellInfo.setFormatFrmWidth(*pFormatFrmWidth); + if (pFormatFrameWidth != nullptr) + aCellInfo.setFormatFrameWidth(*pFormatFrameWidth); WW8TableCellGridRow::Pointer_t pRow = getRow(rRect.Top()); pRow->insert(aCellInfo); @@ -1143,8 +1143,8 @@ void WW8TableCellGrid::addShadowCells() *aRowSpanIt < aCellIt->bottom()) { aRect.Top(*aRowSpanIt); - unsigned long nFormatFrmWidth = aCellIt->getFormatFrmWidth(); - insert(aRect, nullptr, &nFormatFrmWidth); + unsigned long nFormatFrameWidth = aCellIt->getFormatFrameWidth(); + insert(aRect, nullptr, &nFormatFrameWidth); bVertMerge = true; } @@ -1248,7 +1248,7 @@ WW8TableNodeInfo * WW8TableCellGrid::connectCells(RowEndInners_t &rLastRowEnds) if (bBeginningOfCell) { - pWidths->push_back(aCellIt->getFormatFrmWidth()); + pWidths->push_back(aCellIt->getFormatFrameWidth()); if (pNodeInfo) pTableBoxes->push_back(pNodeInfo->getTableBox()); @@ -1475,15 +1475,15 @@ void WW8TableCellGridRow::setRowSpans(RowSpansPtr pRowSpans) CellInfo::CellInfo(const SwRect & aRect, WW8TableNodeInfo * pNodeInfo) -: m_aRect(aRect), m_pNodeInfo(pNodeInfo), m_nFormatFrmWidth(0) +: m_aRect(aRect), m_pNodeInfo(pNodeInfo), m_nFormatFrameWidth(0) { if (pNodeInfo != nullptr) { const SwTableBox * pBox = pNodeInfo->getTableBox(); const SwFrameFormat * pFrameFormat = pBox->GetFrameFormat(); - const SwFormatFrmSize & rSize = pFrameFormat->GetFrmSize(); + const SwFormatFrameSize & rSize = pFrameFormat->GetFrameSize(); - m_nFormatFrmWidth = rSize.GetWidth(); + m_nFormatFrameWidth = rSize.GetWidth(); } } diff --git a/sw/source/filter/ww8/WW8TableInfo.hxx b/sw/source/filter/ww8/WW8TableInfo.hxx index f6f7168e5d92..24f7cae08a1f 100644 --- a/sw/source/filter/ww8/WW8TableInfo.hxx +++ b/sw/source/filter/ww8/WW8TableInfo.hxx @@ -116,7 +116,7 @@ class CellInfo { SwRect m_aRect; WW8TableNodeInfo * m_pNodeInfo; - unsigned long m_nFormatFrmWidth; + unsigned long m_nFormatFrameWidth; public: CellInfo(const SwRect & aRect, WW8TableNodeInfo * pNodeInfo); @@ -124,7 +124,7 @@ public: CellInfo(const CellInfo & aRectAndTableInfo) : m_aRect(aRectAndTableInfo.m_aRect), m_pNodeInfo(aRectAndTableInfo.m_pNodeInfo), - m_nFormatFrmWidth(aRectAndTableInfo.m_nFormatFrmWidth) + m_nFormatFrameWidth(aRectAndTableInfo.m_nFormatFrameWidth) { } @@ -141,14 +141,14 @@ public: SwRect getRect() const { return m_aRect; } WW8TableNodeInfo * getTableNodeInfo() const { return m_pNodeInfo; } - unsigned long getFormatFrmWidth() const + unsigned long getFormatFrameWidth() const { - return m_nFormatFrmWidth; + return m_nFormatFrameWidth; } - void setFormatFrmWidth(unsigned long nFormatFrmWidth) + void setFormatFrameWidth(unsigned long nFormatFrameWidth) { - m_nFormatFrmWidth = nFormatFrmWidth; + m_nFormatFrameWidth = nFormatFrameWidth; } #ifdef DBG_UTIL @@ -276,7 +276,7 @@ public: ~WW8TableCellGrid(); void insert(const SwRect & rRect, WW8TableNodeInfo * pNodeInfo, - unsigned long * pFormatFrmWidth = nullptr); + unsigned long * pFormatFrameWidth = nullptr); void addShadowCells(); WW8TableNodeInfo *connectCells(RowEndInners_t &rLastRowEnds); diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx b/sw/source/filter/ww8/attributeoutputbase.hxx index 308a247abd4d..092153ad0cbf 100644 --- a/sw/source/filter/ww8/attributeoutputbase.hxx +++ b/sw/source/filter/ww8/attributeoutputbase.hxx @@ -90,7 +90,7 @@ class SfxPoolItem; class SfxItemSet; class SvxParaVertAlignItem; class SvxParaGridItem; -class SwFormatFrmSize; +class SwFormatFrameSize; class SvxPaperBinItem; class SvxLRSpaceItem; class SvxULSpaceItem; @@ -541,7 +541,7 @@ protected: virtual void ParaSnapToGrid( const SvxParaGridItem& ) = 0; /// Sfx item RES_FRM_SIZE - virtual void FormatFrameSize( const SwFormatFrmSize& ) = 0; + virtual void FormatFrameSize( const SwFormatFrameSize& ) = 0; /// Sfx item RES_PAPER_BIN virtual void FormatPaperBin( const SvxPaperBinItem& ) = 0; diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 4c1ca922dfff..c21910850e25 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -3014,7 +3014,7 @@ void DocxAttributeOutput::InitTableHelper( ww8::WW8TableNodeInfoInner::Pointer_t GetTablePageSize( pTableTextNodeInfoInner.get(), nPageSize, bRelBoxSize ); const SwFrameFormat *pFormat = pTable->GetFrameFormat( ); - const sal_uInt32 nTableSz = static_cast<sal_uInt32>(pFormat->GetFrmSize( ).GetWidth( )); + const sal_uInt32 nTableSz = static_cast<sal_uInt32>(pFormat->GetFrameSize( ).GetWidth( )); const SwHTMLTableLayout *pLayout = pTable->GetHTMLTableLayout(); if( pLayout && pLayout->IsExportable() ) @@ -3202,7 +3202,7 @@ void DocxAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t // If actual width of table is relative it should export is as "pct".` const SwTable *pTable = pTableTextNodeInfoInner->getTable(); SwFrameFormat *pTableFormat = pTable->GetFrameFormat( ); - const SwFormatFrmSize &rSize = pTableFormat->GetFrmSize(); + const SwFormatFrameSize &rSize = pTableFormat->GetFrameSize(); int nWidthPercent = rSize.GetWidthPercent(); uno::Reference<beans::XPropertySet> xPropertySet(SwXTextTables::GetObject(const_cast<SwTableFormat&>(*pTable->GetFrameFormat( ))),uno::UNO_QUERY); bool isWidthRelative = false; @@ -3615,7 +3615,7 @@ void DocxAttributeOutput::TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t pTa const SwTableLine * pTabLine = pTabBox->GetUpper(); const SwFrameFormat * pLineFormat = pTabLine->GetFrameFormat(); - const SwFormatFrmSize& rLSz = pLineFormat->GetFrmSize(); + const SwFormatFrameSize& rLSz = pLineFormat->GetFrameSize(); if ( ATT_VAR_SIZE != rLSz.GetHeightSizeType() && rLSz.GetHeight() ) { sal_Int32 nHeight = rLSz.GetHeight(); @@ -7238,7 +7238,7 @@ void DocxAttributeOutput::ParaSnapToGrid( const SvxParaGridItem& rGrid ) FSEND ); } -void DocxAttributeOutput::FormatFrameSize( const SwFormatFrmSize& rSize ) +void DocxAttributeOutput::FormatFrameSize( const SwFormatFrameSize& rSize ) { if (m_rExport.SdrExporter().getTextFrameSyntax() && m_rExport.SdrExporter().getFlyFrameSize()) { @@ -7249,7 +7249,7 @@ void DocxAttributeOutput::FormatFrameSize( const SwFormatFrmSize& rSize ) else if (m_rExport.SdrExporter().getDMLTextFrameSyntax()) { } - else if ( m_rExport.m_bOutFlyFrmAttrs ) + else if ( m_rExport.m_bOutFlyFrameAttrs ) { if ( rSize.GetWidth() && rSize.GetWidthSizeType() == ATT_FIX_SIZE ) AddToAttrList( m_rExport.SdrExporter().getFlyAttrList(), @@ -7298,7 +7298,7 @@ void DocxAttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLRSpace ) else if (m_rExport.SdrExporter().getDMLTextFrameSyntax()) { } - else if ( m_rExport.m_bOutFlyFrmAttrs ) + else if ( m_rExport.m_bOutFlyFrameAttrs ) { AddToAttrList( m_rExport.SdrExporter().getFlyAttrList(), FSNS( XML_w, XML_hSpace ), OString::number( @@ -7356,7 +7356,7 @@ void DocxAttributeOutput::FormatULSpace( const SvxULSpaceItem& rULSpace ) else if (m_rExport.SdrExporter().getDMLTextFrameSyntax()) { } - else if ( m_rExport.m_bOutFlyFrmAttrs ) + else if ( m_rExport.m_bOutFlyFrameAttrs ) { AddToAttrList( m_rExport.SdrExporter().getFlyAttrList(), FSNS( XML_w, XML_vSpace ), OString::number( @@ -7483,7 +7483,7 @@ void DocxAttributeOutput::FormatSurround( const SwFormatSurround& rSurround ) else if (m_rExport.SdrExporter().getDMLTextFrameSyntax()) { } - else if ( m_rExport.m_bOutFlyFrmAttrs ) + else if ( m_rExport.m_bOutFlyFrameAttrs ) { OString sWrap( "auto" ); switch ( rSurround.GetSurround( ) ) @@ -7562,7 +7562,7 @@ void DocxAttributeOutput::FormatVertOrientation( const SwFormatVertOrient& rFlyV else if (m_rExport.SdrExporter().getDMLTextFrameSyntax()) { } - else if ( m_rExport.m_bOutFlyFrmAttrs ) + else if ( m_rExport.m_bOutFlyFrameAttrs ) { if ( !sAlign.isEmpty() ) AddToAttrList( m_rExport.SdrExporter().getFlyAttrList(), FSNS( XML_w, XML_yAlign ), sAlign.getStr() ); @@ -7622,7 +7622,7 @@ void DocxAttributeOutput::FormatHorizOrientation( const SwFormatHoriOrient& rFly else if (m_rExport.SdrExporter().getDMLTextFrameSyntax()) { } - else if ( m_rExport.m_bOutFlyFrmAttrs ) + else if ( m_rExport.m_bOutFlyFrameAttrs ) { if ( !sAlign.isEmpty() ) AddToAttrList( m_rExport.SdrExporter().getFlyAttrList(), FSNS( XML_w, XML_xAlign ), sAlign.getStr() ); @@ -8064,7 +8064,7 @@ void DocxAttributeOutput::FormatFrameDirection( const SvxFrameDirectionItem& rDi if ( bBiDi ) m_pSerializer->singleElementNS( XML_w, XML_bidi, FSEND ); } - else if ( !m_rExport.m_bOutFlyFrmAttrs ) + else if ( !m_rExport.m_bOutFlyFrameAttrs ) { if ( bBiDi ) m_pSerializer->singleElementNS( XML_w, XML_bidi, FSNS( XML_w, XML_val ), "1", FSEND ); diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index 1dbddc43f73a..73abf8217fb0 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -609,7 +609,7 @@ protected: virtual void ParaSnapToGrid( const SvxParaGridItem& ) override; /// Sfx item RES_FRM_SIZE - virtual void FormatFrameSize( const SwFormatFrmSize& ) override; + virtual void FormatFrameSize( const SwFormatFrameSize& ) override; /// Sfx item RES_PAPER_BIN virtual void FormatPaperBin( const SvxPaperBinItem& ) override; diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx index 0366407d9368..6518f4f126f2 100644 --- a/sw/source/filter/ww8/docxsdrexport.cxx +++ b/sw/source/filter/ww8/docxsdrexport.cxx @@ -1598,7 +1598,7 @@ void DocxSdrExport::writeDMLTextFrame(ww8::Frame* pParentFrame, int nAnchorId, b { pFS->startElementNS(XML_wps, XML_bodyPr, xBodyPrAttrList); // AutoSize of the Text Frame. - const SwFormatFrmSize& rSize = rFrameFormat.GetFrmSize(); + const SwFormatFrameSize& rSize = rFrameFormat.GetFrameSize(); pFS->singleElementNS(XML_a, (rSize.GetHeightSizeType() == ATT_VAR_SIZE ? XML_spAutoFit : XML_noAutofit), FSEND); pFS->endElementNS(XML_wps, XML_bodyPr); @@ -1608,7 +1608,7 @@ void DocxSdrExport::writeDMLTextFrame(ww8::Frame* pParentFrame, int nAnchorId, b // Relative size of the Text Frame. const sal_uInt8 nWidthPercent = rSize.GetWidthPercent(); - if (nWidthPercent && nWidthPercent != SwFormatFrmSize::SYNCED) + if (nWidthPercent && nWidthPercent != SwFormatFrameSize::SYNCED) { pFS->startElementNS(XML_wp14, XML_sizeRelH, XML_relativeFrom, (rSize.GetWidthPercentRelation() == text::RelOrientation::PAGE_FRAME ? "page" : "margin"), @@ -1619,7 +1619,7 @@ void DocxSdrExport::writeDMLTextFrame(ww8::Frame* pParentFrame, int nAnchorId, b pFS->endElementNS(XML_wp14, XML_sizeRelH); } const sal_uInt8 nHeightPercent = rSize.GetHeightPercent(); - if (nHeightPercent && nHeightPercent != SwFormatFrmSize::SYNCED) + if (nHeightPercent && nHeightPercent != SwFormatFrameSize::SYNCED) { pFS->startElementNS(XML_wp14, XML_sizeRelV, XML_relativeFrom, (rSize.GetHeightPercentRelation() == text::RelOrientation::PAGE_FRAME ? "page" : "margin"), diff --git a/sw/source/filter/ww8/escher.hxx b/sw/source/filter/ww8/escher.hxx index b956d5f48c1a..d0ea96eac96c 100644 --- a/sw/source/filter/ww8/escher.hxx +++ b/sw/source/filter/ww8/escher.hxx @@ -120,7 +120,7 @@ public: sal_Int32 WriteGrfBullet(const Graphic&); sal_Int32 WriteOLEFlyFrame(const SwFrameFormat& rFormat, sal_uInt32 nShapeId); void WriteEmptyFlyFrame(const SwFrameFormat& rFormat, sal_uInt32 nShapeId); - virtual void WriteFrmExtraData(const SwFrameFormat&); + virtual void WriteFrameExtraData(const SwFrameFormat&); virtual void WritePictures(); virtual ~SwBasicEscherEx(); //i120927,this function is added to export hyperlink info,such as graphic/frame/OLE @@ -148,7 +148,7 @@ private: void MakeZOrderArrAndFollowIds(std::vector<DrawObj>& rSrcArr, DrawObjPointerVector& rDstArr); - sal_Int32 WriteFlyFrm(const DrawObj &rObj, sal_uInt32 &rShapeId, + sal_Int32 WriteFlyFrame(const DrawObj &rObj, sal_uInt32 &rShapeId, DrawObjPointerVector &rPVec); sal_Int32 WriteTextFlyFrame(const DrawObj &rObj, sal_uInt32 nShapeId, sal_uInt32 nTextBox, DrawObjPointerVector &rPVec); @@ -166,7 +166,7 @@ public: void FinishEscher(); virtual void WritePictures() override; - virtual void WriteFrmExtraData(const SwFrameFormat& rFormat) override; + virtual void WriteFrameExtraData(const SwFrameFormat& rFormat) override; EscherExHostAppData* StartShape(const css::uno::Reference< css::drawing::XShape > &, const Rectangle*) override {return &aHostData;} private: diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 2f2e35d44471..577d827d14b4 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -719,10 +719,10 @@ void RtfAttributeOutput::TableDefinition(ww8::WW8TableNodeInfoInner::Pointer_t p GetExport().m_pDoc->GetPageDesc(0).GetPageFormatOfNode(*pNode, false); const SvxLRSpaceItem& rLR = pFrameFormat->GetLRSpace(); - nPageSize = pFrameFormat->GetFrmSize().GetWidth() - + nPageSize = pFrameFormat->GetFrameSize().GetWidth() - rLR.GetLeft() - rLR.GetRight(); } - SwTwips nTableSz = pFormat->GetFrmSize().GetWidth(); + SwTwips nTableSz = pFormat->GetFrameSize().GetWidth(); // Not using m_nTableDepth, which is not yet incremented here. sal_uInt32 nCurrentDepth = pTableTextNodeInfoInner->getDepth(); m_aCells[nCurrentDepth] = pRow->GetCells().size(); @@ -736,7 +736,7 @@ void RtfAttributeOutput::TableDefinition(ww8::WW8TableNodeInfoInner::Pointer_t p // Right boundary: this can't be in TableCellProperties as the old // value of nSz is needed. - nSz += pCellFormat->GetFrmSize().GetWidth(); + nSz += pCellFormat->GetFrameSize().GetWidth(); m_aRowDefs.append(OOO_STRING_SVTOOLS_RTF_CELLX); SwTwips nCalc = nSz; nCalc *= nPageSize; @@ -826,7 +826,7 @@ void RtfAttributeOutput::TableHeight(ww8::WW8TableNodeInfoInner::Pointer_t pTabl const SwTableBox* pTabBox = pTableTextNodeInfoInner->getTableBox(); const SwTableLine* pTabLine = pTabBox->GetUpper(); const SwFrameFormat* pLineFormat = pTabLine->GetFrameFormat(); - const SwFormatFrmSize& rLSz = pLineFormat->GetFrmSize(); + const SwFormatFrameSize& rLSz = pLineFormat->GetFrameSize(); if (ATT_VAR_SIZE != rLSz.GetHeightSizeType() && rLSz.GetHeight()) { @@ -969,7 +969,7 @@ void RtfAttributeOutput::InitTableHelper(ww8::WW8TableNodeInfoInner::Pointer_t p GetTablePageSize(pTableTextNodeInfoInner.get(), nPageSize, bRelBoxSize); const SwFrameFormat* pFormat = pTable->GetFrameFormat(); - const sal_uInt32 nTableSz = static_cast<sal_uInt32>(pFormat->GetFrmSize().GetWidth()); + const sal_uInt32 nTableSz = static_cast<sal_uInt32>(pFormat->GetFrameSize().GetWidth()); const SwHTMLTableLayout* pLayout = pTable->GetHTMLTableLayout(); if (pLayout && pLayout->IsExportable()) @@ -1732,11 +1732,11 @@ void lcl_TextFrameShadow(std::vector< std::pair<OString, OString> >& rFlyPropert void lcl_TextFrameRelativeSize(std::vector< std::pair<OString, OString> >& rFlyProperties, const SwFrameFormat& rFrameFormat) { - const SwFormatFrmSize& rSize = rFrameFormat.GetFrmSize(); + const SwFormatFrameSize& rSize = rFrameFormat.GetFrameSize(); // Relative size of the Text Frame. const sal_uInt8 nWidthPercent = rSize.GetWidthPercent(); - if (nWidthPercent && nWidthPercent != SwFormatFrmSize::SYNCED) + if (nWidthPercent && nWidthPercent != SwFormatFrameSize::SYNCED) { rFlyProperties.push_back(std::make_pair<OString, OString>("pctHoriz", OString::number(nWidthPercent * 10))); @@ -1753,7 +1753,7 @@ void lcl_TextFrameRelativeSize(std::vector< std::pair<OString, OString> >& rFlyP rFlyProperties.push_back(std::make_pair("sizerelh", aRelation)); } const sal_uInt8 nHeightPercent = rSize.GetHeightPercent(); - if (nHeightPercent && nHeightPercent != SwFormatFrmSize::SYNCED) + if (nHeightPercent && nHeightPercent != SwFormatFrameSize::SYNCED) { rFlyProperties.push_back(std::make_pair<OString, OString>("pctVert", OString::number(nHeightPercent * 10))); @@ -1867,11 +1867,11 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const ww8::Frame& rFrame, const Poi const Size aSize = rFrame.GetSize(); m_pFlyFrameSize = &aSize; - m_rExport.m_bOutFlyFrmAttrs = m_rExport.bRTFFlySyntax = true; + m_rExport.m_bOutFlyFrameAttrs = m_rExport.bRTFFlySyntax = true; m_rExport.OutputFormat(rFrame.GetFrameFormat(), false, false, true); m_rExport.Strm().WriteCharPtr(m_aRunText.makeStringAndClear().getStr()); m_rExport.Strm().WriteCharPtr(m_aStyles.makeStringAndClear().getStr()); - m_rExport.m_bOutFlyFrmAttrs = m_rExport.bRTFFlySyntax = false; + m_rExport.m_bOutFlyFrameAttrs = m_rExport.bRTFFlySyntax = false; m_pFlyFrameSize = nullptr; const SwFrameFormat& rFrameFormat = rFrame.GetFrameFormat(); @@ -2928,7 +2928,7 @@ void RtfAttributeOutput::ParaSnapToGrid(const SvxParaGridItem& /*rGrid*/) SAL_INFO("sw.rtf", "TODO: " << OSL_THIS_FUNC); } -void RtfAttributeOutput::FormatFrameSize(const SwFormatFrmSize& rSize) +void RtfAttributeOutput::FormatFrameSize(const SwFormatFrameSize& rSize) { if (m_rExport.m_bOutPageDescs) { @@ -2948,7 +2948,7 @@ void RtfAttributeOutput::FormatPaperBin(const SvxPaperBinItem&) void RtfAttributeOutput::FormatLRSpace(const SvxLRSpaceItem& rLRSpace) { - if (!m_rExport.m_bOutFlyFrmAttrs) + if (!m_rExport.m_bOutFlyFrameAttrs) { if (m_rExport.m_bOutPageDescs) { @@ -2989,7 +2989,7 @@ void RtfAttributeOutput::FormatLRSpace(const SvxLRSpaceItem& rLRSpace) void RtfAttributeOutput::FormatULSpace(const SvxULSpaceItem& rULSpace) { - if (!m_rExport.m_bOutFlyFrmAttrs) + if (!m_rExport.m_bOutFlyFrameAttrs) { if (m_rExport.m_bOutPageDescs) { @@ -3043,7 +3043,7 @@ void RtfAttributeOutput::FormatULSpace(const SvxULSpaceItem& rULSpace) void RtfAttributeOutput::FormatSurround(const SwFormatSurround& rSurround) { - if (m_rExport.m_bOutFlyFrmAttrs && !m_rExport.bRTFFlySyntax) + if (m_rExport.m_bOutFlyFrameAttrs && !m_rExport.bRTFFlySyntax) { SwSurround eSurround = rSurround.GetSurround(); bool bGold = SURROUND_IDEAL == eSurround; @@ -3053,7 +3053,7 @@ void RtfAttributeOutput::FormatSurround(const SwFormatSurround& rSurround) m_aRunText->append(OOO_STRING_SVTOOLS_RTF_FLYMAINCNT); m_aRunText->append((sal_Int32) aMC.GetValue()); } - else if (m_rExport.m_bOutFlyFrmAttrs && m_rExport.bRTFFlySyntax) + else if (m_rExport.m_bOutFlyFrameAttrs && m_rExport.bRTFFlySyntax) { // See DocxSdrExport::startDMLAnchorInline() for SwFormatSurround -> WR / WRK mappings. sal_Int32 nWr = -1; @@ -3092,7 +3092,7 @@ void RtfAttributeOutput::FormatSurround(const SwFormatSurround& rSurround) void RtfAttributeOutput::FormatVertOrientation(const SwFormatVertOrient& rFlyVert) { - if (m_rExport.m_bOutFlyFrmAttrs && m_rExport.bRTFFlySyntax) + if (m_rExport.m_bOutFlyFrameAttrs && m_rExport.bRTFFlySyntax) { switch (rFlyVert.GetRelationOrient()) { @@ -3135,7 +3135,7 @@ void RtfAttributeOutput::FormatVertOrientation(const SwFormatVertOrient& rFlyVer void RtfAttributeOutput::FormatHorizOrientation(const SwFormatHoriOrient& rFlyHori) { - if (m_rExport.m_bOutFlyFrmAttrs && m_rExport.bRTFFlySyntax) + if (m_rExport.m_bOutFlyFrameAttrs && m_rExport.bRTFFlySyntax) { switch (rFlyHori.GetRelationOrient()) { @@ -3904,7 +3904,7 @@ void RtfAttributeOutput::FlyFrameGraphic(const SwFlyFrameFormat* pFlyFrameFormat Size aSize(pGrfNode->GetTwipSize()); Size aRendered(aSize); - const SwFormatFrmSize& rS = pFlyFrameFormat->GetFrmSize(); + const SwFormatFrameSize& rS = pFlyFrameFormat->GetFrameSize(); aRendered.Width() = rS.GetWidth(); aRendered.Height() = rS.GetHeight(); @@ -3935,9 +3935,9 @@ void RtfAttributeOutput::FlyFrameGraphic(const SwFlyFrameFormat* pFlyFrameFormat m_rExport.Strm().WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_SHP "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_SHPINST); m_pFlyFrameSize = &aRendered; m_rExport.m_pParentFrame = pFrame; - m_rExport.m_bOutFlyFrmAttrs = m_rExport.bRTFFlySyntax = true; + m_rExport.m_bOutFlyFrameAttrs = m_rExport.bRTFFlySyntax = true; m_rExport.OutputFormat(pFrame->GetFrameFormat(), false, false, true); - m_rExport.m_bOutFlyFrmAttrs = m_rExport.bRTFFlySyntax = false; + m_rExport.m_bOutFlyFrameAttrs = m_rExport.bRTFFlySyntax = false; m_rExport.m_pParentFrame = nullptr; m_pFlyFrameSize = nullptr; diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx index 1a882fd5dc97..e13fcd6c2ec8 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.hxx +++ b/sw/source/filter/ww8/rtfattributeoutput.hxx @@ -375,7 +375,7 @@ protected: virtual void ParaSnapToGrid(const SvxParaGridItem&) override; /// Sfx item RES_FRM_SIZE - virtual void FormatFrameSize(const SwFormatFrmSize&) override; + virtual void FormatFrameSize(const SwFormatFrameSize&) override; /// Sfx item RES_PAPER_BIN virtual void FormatPaperBin(const SvxPaperBinItem&) override; diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index df670a7f0982..29e4ae0436ad 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -593,7 +593,7 @@ void RtfExport::ExportDocument_Impl() if (rPageDesc.GetLandscape()) Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_LANDSCAPE); - const SwFormatFrmSize& rSz = rFormatPage.GetFrmSize(); + const SwFormatFrameSize& rSz = rFormatPage.GetFrameSize(); // Clipboard document is always created without a printer, then // the size will be always LONG_MAX! Solution then is to use A4 if (LONG_MAX == rSz.GetHeight() || LONG_MAX == rSz.GetWidth()) diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx index c5dda9fe66d7..9281a257f885 100644 --- a/sw/source/filter/ww8/writerhelper.cxx +++ b/sw/source/filter/ww8/writerhelper.cxx @@ -110,17 +110,17 @@ namespace } /* - Utility to convert a SwPosFlyFrms into a simple vector of ww8::Frames + Utility to convert a SwPosFlyFrames into a simple vector of ww8::Frames The crucial thing is that a ww8::Frame always has an anchor which points to some content in the document. This is a requirement of exporting to Word */ - ww8::Frames SwPosFlyFrmsToFrames(const SwPosFlyFrms &rFlys) + ww8::Frames SwPosFlyFramesToFrames(const SwPosFlyFrames &rFlys) { ww8::Frames aRet; - for(SwPosFlyFrms::const_iterator aIter(rFlys.begin()); aIter != rFlys.end(); ++aIter) + for(SwPosFlyFrames::const_iterator aIter(rFlys.begin()); aIter != rFlys.end(); ++aIter) { const SwFrameFormat &rEntry = (*aIter)->GetFormat(); @@ -165,7 +165,7 @@ namespace ww8 { //For i120928,size conversion before exporting graphic of bullet Frame::Frame(const Graphic &rGrf, const SwPosition &rPos) - : mpFlyFrm(nullptr) + : mpFlyFrame(nullptr) , maPos(rPos) , maSize() , maLayoutSize() @@ -190,7 +190,7 @@ namespace ww8 } Frame::Frame(const SwFrameFormat &rFormat, const SwPosition &rPos) - : mpFlyFrm(&rFormat) + : mpFlyFrame(&rFormat) , maPos(rPos) , maSize() , maLayoutSize() // #i43447# @@ -217,7 +217,7 @@ namespace ww8 // header/footer) - thus, get the values from the format. if ( aLayRect.IsEmpty() ) { - aRect.SetSize( rFormat.GetFrmSize().GetSize() ); + aRect.SetSize( rFormat.GetFrameSize().GetSize() ); } maLayoutSize = aRect.GetSize(); } @@ -524,8 +524,8 @@ namespace sw */ ww8::Frames GetFrames(const SwDoc &rDoc, SwPaM *pPaM /*, bool bAll*/) { - SwPosFlyFrms aFlys(rDoc.GetAllFlyFormats(pPaM, true)); - ww8::Frames aRet(SwPosFlyFrmsToFrames(aFlys)); + SwPosFlyFrames aFlys(rDoc.GetAllFlyFormats(pPaM, true)); + ww8::Frames aRet(SwPosFlyFramesToFrames(aFlys)); return aRet; } @@ -844,7 +844,7 @@ namespace sw { } - void InsertedTablesManager::DelAndMakeTableFrms() + void InsertedTablesManager::DelAndMakeTableFrames() { if (!mbHasRoot) return; @@ -862,8 +862,8 @@ namespace sw if (pFrameFormat != nullptr) { SwNodeIndex *pIndex = aIter->second; - pTable->DelFrms(); - pTable->MakeFrms(pIndex); + pTable->DelFrames(); + pTable->MakeFrames(pIndex); } } } diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx index af98c92dbd0e..6c60d7760492 100644 --- a/sw/source/filter/ww8/writerhelper.hxx +++ b/sw/source/filter/ww8/writerhelper.hxx @@ -96,7 +96,7 @@ namespace ww8 public: enum WriterSource {eTextBox, eGraphic, eOle, eDrawing, eFormControl,eBulletGrf}; private: - const SwFrameFormat* mpFlyFrm; + const SwFrameFormat* mpFlyFrame; SwPosition maPos; Size maSize; // #i43447# - Size of the frame in the layout. @@ -110,7 +110,7 @@ namespace ww8 bool mbForBullet:1; Graphic maGrf; public: - Frame(const SwFrameFormat &rFlyFrm, const SwPosition &rPos); + Frame(const SwFrameFormat &rFlyFrame, const SwPosition &rPos); Frame(const Graphic&, const SwPosition &); /** Get the writer SwFrameFormat that this object describes @@ -118,7 +118,7 @@ namespace ww8 @return The wrapped SwFrameFormat */ - const SwFrameFormat &GetFrameFormat() const { return *mpFlyFrm; } + const SwFrameFormat &GetFrameFormat() const { return *mpFlyFrame; } /** Get the position this frame is anchored at @@ -179,7 +179,7 @@ namespace ww8 if (mbForBullet && rOther.mbForBullet) return (maGrf == rOther.maGrf); else if ((!mbForBullet) && (!rOther.mbForBullet)) - return (mpFlyFrm == rOther.mpFlyFrm); + return (mpFlyFrame == rOther.mpFlyFrame); return false; } diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx index a070676b5c00..25ad1a18e046 100644 --- a/sw/source/filter/ww8/writerwordglue.cxx +++ b/sw/source/filter/ww8/writerwordglue.cxx @@ -66,7 +66,7 @@ namespace myImplHelpers height, which is totally nonoptimum, but the best we can do. */ long nDist=0; - const SwFormatFrmSize& rSz = rFormat.GetFrmSize(); + const SwFormatFrameSize& rSz = rFormat.GetFrameSize(); const SwHeaderAndFooterEatSpacingItem &rSpacingCtrl = sw::util::ItemGet<SwHeaderAndFooterEatSpacingItem> @@ -80,7 +80,7 @@ namespace myImplHelpers nDist += aRect.Height(); else { - const SwFormatFrmSize& rSize = rFormat.GetFrmSize(); + const SwFormatFrameSize& rSize = rFormat.GetFrameSize(); if (ATT_VAR_SIZE != rSize.GetHeightSizeType()) nDist += rSize.GetHeight(); else @@ -367,8 +367,8 @@ namespace sw const SwColumns& rFollowColumns = rFollowCols.GetColumns(); SvxLRSpaceItem aOneLR = lcl_getWordLRSpace(rTitleFormat); SvxLRSpaceItem aTwoLR = lcl_getWordLRSpace(rFollowFormat); - const SwFormatFrmSize& rFirstFrmSize = rTitleFormat.GetFrmSize(); - const SwFormatFrmSize& rFollowFrmSize = rFollowFormat.GetFrmSize(); + const SwFormatFrameSize& rFirstFrameSize = rTitleFormat.GetFrameSize(); + const SwFormatFrameSize& rFollowFrameSize = rFollowFormat.GetFrameSize(); if (rFirstColumns.size() != rFollowColumns.size()) { @@ -377,7 +377,7 @@ namespace sw } else if (aOneLR != aTwoLR) bPlausableSingleWordSection = false; - else if (rFirstFrmSize != rFollowFrmSize) + else if (rFirstFrameSize != rFollowFrameSize) bPlausableSingleWordSection = false; else { diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index 2da78d53c20c..648e6454fa7f 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -203,17 +203,17 @@ void SwBasicEscherEx::WriteHyperlinkWithinFly( SvMemoryStream& rStrm, const SwFo OUString tmpTextMark; OUString rUrl = pINetFormatArg->GetURL(); - OUString rTarFrm = pINetFormatArg->GetTargetFrameName(); + OUString rTarFrame = pINetFormatArg->GetTargetFrameName(); sal_uInt32 mnFlags = 0; INetURLObject aUrlObj( rUrl ); const INetProtocol eProtocol = aUrlObj.GetProtocol(); //Target Frame - if (!rTarFrm.isEmpty()) + if (!rTarFrame.isEmpty()) { - SwWW8Writer::WriteLong(tmpStrm, rTarFrm.getLength()+1); - SwWW8Writer::WriteString16(tmpStrm, rTarFrm, false); + SwWW8Writer::WriteLong(tmpStrm, rTarFrame.getLength()+1); + SwWW8Writer::WriteString16(tmpStrm, rTarFrame, false); tmpStrm.WriteUInt16( 0 ); @@ -743,7 +743,7 @@ void PlcDrawObj::WritePlc( WW8Export& rWrt ) const // the Object is not visible - so get the values from // the format. The Position may not be correct. if( aLayRect.IsEmpty() ) - aRect.SetSize( rFormat.GetFrmSize().GetSize() ); + aRect.SetSize( rFormat.GetFrameSize().GetSize() ); else { // #i56090# Do not only consider the first client @@ -1572,7 +1572,7 @@ SwBasicEscherEx::~SwBasicEscherEx() { } -void SwBasicEscherEx::WriteFrmExtraData(const SwFrameFormat&) +void SwBasicEscherEx::WriteFrameExtraData(const SwFrameFormat&) { AddAtom(4, ESCHER_ClientAnchor); GetStream().WriteUInt32( 0x80000000 ); @@ -1583,7 +1583,7 @@ void SwBasicEscherEx::WriteEmptyFlyFrame(const SwFrameFormat& rFormat, sal_uInt3 OpenContainer(ESCHER_SpContainer); AddShape(ESCHER_ShpInst_PictureFrame, 0xa00, nShapeId); // store anchor attribute - WriteFrmExtraData(rFormat); + WriteFrameExtraData(rFormat); AddAtom(6, DFF_msofbtUDefProp, 3, 1); //Prop id is 0xF122 GetStream().WriteUInt16( 0x053F ).WriteUInt32( nInlineHack ); @@ -1739,7 +1739,7 @@ sal_Int32 SwBasicEscherEx::WriteGrfFlyFrame(const SwFrameFormat& rFormat, sal_uI aPropOpt.Commit( GetStream() ); // store anchor attribute - WriteFrmExtraData( rFormat ); + WriteFrameExtraData( rFormat ); CloseContainer(); // ESCHER_SpContainer return nBorderThick; @@ -1897,7 +1897,7 @@ sal_Int32 SwBasicEscherEx::WriteOLEFlyFrame(const SwFrameFormat& rFormat, sal_uI aPropOpt.Commit(GetStream()); // store anchor attribute - WriteFrmExtraData( rFormat ); + WriteFrameExtraData( rFormat ); CloseContainer(); // ESCHER_SpContainer } @@ -2326,7 +2326,7 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export& rWW8Wrt) case ww8::Frame::eTextBox: case ww8::Frame::eOle: case ww8::Frame::eGraphic: - nBorderThick = WriteFlyFrm(*pObj, nShapeId, aSorted); + nBorderThick = WriteFlyFrame(*pObj, nShapeId, aSorted); break; case ww8::Frame::eFormControl: WriteOCXControl(rFormat, nShapeId = GenerateShapeId()); @@ -2489,7 +2489,7 @@ bool WinwordAnchoring::ConvertPosition( SwFormatHoriOrient& _iorHoriOri, // This is the case for drawing objects, which are anchored inside a page // header/footer of an *unused* page style. if ( dynamic_cast<SwAnchoredDrawObject*>(pAnchoredObj) && - !pAnchoredObj->GetAnchorFrm() ) + !pAnchoredObj->GetAnchorFrame() ) { return false; } @@ -2596,7 +2596,7 @@ bool WinwordAnchoring::ConvertPosition( SwFormatHoriOrient& _iorHoriOri, _iorHoriOri.SetRelationOrient( text::RelOrientation::PAGE_FRAME ); // #i33818# bool bRelToTableCell( false ); - aPos = pAnchoredObj->GetRelPosToPageFrm( bFollowTextFlow, + aPos = pAnchoredObj->GetRelPosToPageFrame( bFollowTextFlow, bRelToTableCell ); if ( bRelToTableCell ) { @@ -2606,7 +2606,7 @@ bool WinwordAnchoring::ConvertPosition( SwFormatHoriOrient& _iorHoriOri, else if ( eHoriConv == CONV2COL ) { _iorHoriOri.SetRelationOrient( text::RelOrientation::FRAME ); - aPos = pAnchoredObj->GetRelPosToAnchorFrm(); + aPos = pAnchoredObj->GetRelPosToAnchorFrame(); } else if ( eHoriConv == CONV2CHAR ) { @@ -2707,7 +2707,7 @@ bool WinwordAnchoring::ConvertPosition( SwFormatHoriOrient& _iorHoriOri, _iorVertOri.SetRelationOrient( text::RelOrientation::PAGE_FRAME ); // #i33818# bool bRelToTableCell( false ); - aPos = pAnchoredObj->GetRelPosToPageFrm( bFollowTextFlow, + aPos = pAnchoredObj->GetRelPosToPageFrame( bFollowTextFlow, bRelToTableCell ); if ( bRelToTableCell ) { @@ -2717,7 +2717,7 @@ bool WinwordAnchoring::ConvertPosition( SwFormatHoriOrient& _iorHoriOri, else if ( eVertConv == CONV2PARA ) { _iorVertOri.SetRelationOrient( text::RelOrientation::FRAME ); - aPos = pAnchoredObj->GetRelPosToAnchorFrm(); + aPos = pAnchoredObj->GetRelPosToAnchorFrame(); } else if ( eVertConv == CONV2LINE ) { @@ -2871,7 +2871,7 @@ void WinwordAnchoring::SetAnchoring(const SwFrameFormat& rFormat) } } -void SwEscherEx::WriteFrmExtraData( const SwFrameFormat& rFormat ) +void SwEscherEx::WriteFrameExtraData( const SwFrameFormat& rFormat ) { aWinwordAnchoring.SetAnchoring(rFormat); aWinwordAnchoring.WriteData(*this); @@ -2883,7 +2883,7 @@ void SwEscherEx::WriteFrmExtraData( const SwFrameFormat& rFormat ) GetStream().WriteInt32( 1 ); } -sal_Int32 SwEscherEx::WriteFlyFrm(const DrawObj &rObj, sal_uInt32 &rShapeId, +sal_Int32 SwEscherEx::WriteFlyFrame(const DrawObj &rObj, sal_uInt32 &rShapeId, DrawObjPointerVector &rPVec) { const SwFrameFormat &rFormat = rObj.maContent.GetFrameFormat(); @@ -3033,7 +3033,7 @@ sal_Int32 SwEscherEx::WriteTextFlyFrame(const DrawObj &rObj, sal_uInt32 nShapeId aPropOpt.Commit( GetStream() ); // store anchor attribute - WriteFrmExtraData( rFormat ); + WriteFrameExtraData( rFormat ); AddAtom( 4, ESCHER_ClientTextbox ); GetStream().WriteUInt32( nTextBox ); @@ -3090,7 +3090,7 @@ void SwEscherEx::WriteOCXControl( const SwFrameFormat& rFormat, sal_uInt32 nShap aPropOpt.Commit( GetStream() ); // store anchor attribute - WriteFrmExtraData( rFormat ); + WriteFrameExtraData( rFormat ); CloseContainer(); // ESCHER_SpContainer } diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index 84c83c94bdf9..dfafddecca55 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -199,8 +199,8 @@ SwWW8AttrIter::SwWW8AttrIter(MSWordExportBase& rWr, const SwTextNode& rTextNd) : #i2916# Get list of any graphics which may be anchored from this paragraph. */ - maFlyFrms = GetFramesInNode(rWr.m_aFrames, rNd); - std::sort(maFlyFrms.begin(), maFlyFrms.end(), sortswflys()); + maFlyFrames = GetFramesInNode(rWr.m_aFrames, rNd); + std::sort(maFlyFrames.begin(), maFlyFrames.end(), sortswflys()); /* #i18480# @@ -210,11 +210,11 @@ SwWW8AttrIter::SwWW8AttrIter(MSWordExportBase& rWr, const SwTextNode& rTextNd) : */ if (rWr.m_bInWriteEscher) { - for ( auto& aFlyFrm : maFlyFrms ) - aFlyFrm.ForceTreatAsInline(); + for ( auto& aFlyFrame : maFlyFrames ) + aFlyFrame.ForceTreatAsInline(); } - maFlyIter = maFlyFrms.begin(); + maFlyIter = maFlyFrames.begin(); if ( !m_rExport.m_pDoc->getIDocumentRedlineAccess().GetRedlineTable().empty() ) { @@ -347,7 +347,7 @@ sal_Int32 SwWW8AttrIter::SearchNext( sal_Int32 nStartPos ) character because anchors in Word appear after the character they are anchored to. */ - if (maFlyIter != maFlyFrms.end()) + if (maFlyIter != maFlyFrames.end()) { const SwPosition &rAnchor = maFlyIter->GetPosition(); @@ -510,10 +510,10 @@ void SwWW8AttrIter::OutAttr( sal_Int32 nSwPos, bool bRuby ) bool SwWW8AttrIter::IsWatermarkFrame() { - if (maFlyFrms.size() != 1) + if (maFlyFrames.size() != 1) return false; - while ( maFlyIter != maFlyFrms.end() ) + while ( maFlyIter != maFlyFrames.end() ) { const SdrObject* pSdrObj = maFlyIter->GetFrameFormat().FindRealSdrObject(); @@ -532,7 +532,7 @@ bool SwWW8AttrIter::IsAnchorLinkedToThisNode( sal_uLong nNodePos ) { ww8::FrameIter aTmpFlyIter = maFlyIter ; - while ( aTmpFlyIter != maFlyFrms.end() ) + while ( aTmpFlyIter != maFlyFrames.end() ) { const SwPosition &rAnchor = maFlyIter->GetPosition(); sal_uLong nAnchorPos = rAnchor.nNode.GetIndex(); @@ -552,7 +552,7 @@ FlyProcessingState SwWW8AttrIter::OutFlys(sal_Int32 nSwPos) // collection point to first gather info about all of the potentially linked textboxes: to be analyzed later. OUString sLinkChainName; ww8::FrameIter linkedTextboxesIter = maFlyIter; - while ( linkedTextboxesIter != maFlyFrms.end() ) + while ( linkedTextboxesIter != maFlyFrames.end() ) { uno::Reference< drawing::XShape > xShape; ww8::Frame xFrame = *linkedTextboxesIter; @@ -617,7 +617,7 @@ FlyProcessingState SwWW8AttrIter::OutFlys(sal_Int32 nSwPos) May have an anchored graphic to be placed, loop through sorted array and output all at this position */ - while ( maFlyIter != maFlyFrms.end() ) + while ( maFlyIter != maFlyFrames.end() ) { const SwPosition &rAnchor = maFlyIter->GetPosition(); const sal_Int32 nPos = rAnchor.nContent.GetIndex(); @@ -1495,7 +1495,7 @@ short MSWordExportBase::GetCurrentPageDirection() const const SwFrameFormat &rFormat = m_pAktPageDesc ? m_pAktPageDesc->GetMaster() : m_pDoc->GetPageDesc( 0 ).GetMaster(); - return rFormat.GetFrmDir().GetValue(); + return rFormat.GetFrameDir().GetValue(); } short MSWordExportBase::GetDefaultFrameDirection( ) const @@ -1506,7 +1506,7 @@ short MSWordExportBase::GetDefaultFrameDirection( ) const nDir = GetCurrentPageDirection( ); else if ( m_pOutFormatNode ) { - if ( m_bOutFlyFrmAttrs ) //frame + if ( m_bOutFlyFrameAttrs ) //frame { nDir = TrueFrameDirection( *static_cast< const SwFrameFormat * >(m_pOutFormatNode) ); } @@ -1543,7 +1543,7 @@ short MSWordExportBase::TrueFrameDirection( const SwFrameFormat &rFlyFormat ) co const SvxFrameDirectionItem* pItem = nullptr; while ( pFlyFormat ) { - pItem = &pFlyFormat->GetFrmDir(); + pItem = &pFlyFormat->GetFrameDir(); if ( FRMDIR_ENVIRONMENT == pItem->GetValue() ) { pItem = nullptr; @@ -2955,7 +2955,7 @@ void WW8AttributeOutput::OutputFlyFrame_Impl( const ww8::Frame& rFormat, const P { /* Munge flys in fly into absolutely positioned elements for word 6 */ const SwTextNode* pParTextNode = rAnch.GetContentAnchor()->nNode.GetNode().GetTextNode(); - const SwRect aPageRect = pParTextNode->FindPageFrmRect(); + const SwRect aPageRect = pParTextNode->FindPageFrameRect(); aOffset = rFrameFormat.FindLayoutRect().Pos(); aOffset -= aPageRect.Pos(); @@ -2998,7 +2998,7 @@ void AttributeOutputBase::OutputFlyFrame( const ww8::Frame& rFormat ) // get the Layout Node-Position if (FLY_AT_PAGE == rFormat.GetFrameFormat().GetAnchor().GetAnchorId()) - aLayPos = rNode.FindPageFrmRect().Pos(); + aLayPos = rNode.FindPageFrameRect().Pos(); else aLayPos = rNode.FindLayoutRect().Pos(); diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index d1d8bbfb2473..76182e223a2d 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -1777,7 +1777,7 @@ void MSWordExportBase::SaveData( sal_uLong nStt, sal_uLong nEnd ) aData.eOldAnchorType = m_eNewAnchorType; aData.bOldOutTable = m_bOutTable; - aData.bOldFlyFrmAttrs = m_bOutFlyFrmAttrs; + aData.bOldFlyFrameAttrs = m_bOutFlyFrameAttrs; aData.bOldStartTOX = m_bStartTOX; aData.bOldInWriteTOX = m_bInWriteTOX; @@ -1785,7 +1785,7 @@ void MSWordExportBase::SaveData( sal_uLong nStt, sal_uLong nEnd ) m_bOutTable = false; // Caution: bIsInTable should not be set here - m_bOutFlyFrmAttrs = false; + m_bOutFlyFrameAttrs = false; m_bStartTOX = false; m_bInWriteTOX = false; @@ -1803,7 +1803,7 @@ void MSWordExportBase::RestoreData() m_pOrigPam = rData.pOldEnd; m_bOutTable = rData.bOldOutTable; - m_bOutFlyFrmAttrs = rData.bOldFlyFrmAttrs; + m_bOutFlyFrameAttrs = rData.bOldFlyFrameAttrs; m_bStartTOX = rData.bOldStartTOX; m_bInWriteTOX = rData.bOldInWriteTOX; @@ -2035,7 +2035,7 @@ void WW8AttributeOutput::TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t pTab // Zeilenhoehe ausgeben sprmTDyaRowHeight long nHeight = 0; - const SwFormatFrmSize& rLSz = pLineFormat->GetFrmSize(); + const SwFormatFrameSize& rLSz = pLineFormat->GetFrameSize(); if ( ATT_VAR_SIZE != rLSz.GetHeightSizeType() && rLSz.GetHeight() ) { if ( ATT_MIN_SIZE == rLSz.GetHeightSizeType() ) @@ -2256,7 +2256,7 @@ void AttributeOutputBase::GetTablePageSize( ww8::WW8TableNodeInfoInner * pTableT if (!pFormat) return; - const SwFormatFrmSize &rSize = pFormat->GetFrmSize(); + const SwFormatFrameSize &rSize = pFormat->GetFrameSize(); int nWidthPercent = rSize.GetWidthPercent(); bool bManualAligned = pFormat->GetHoriOrient().GetHoriOrient() == text::HoriOrientation::NONE; if ( (pFormat->GetHoriOrient().GetHoriOrient() == text::HoriOrientation::FULL) || bManualAligned ) @@ -2284,7 +2284,7 @@ void AttributeOutputBase::GetTablePageSize( ww8::WW8TableNodeInfoInner * pTableT if ( 0 == ( nPageSize = aRect.Width() ) ) { const SvxLRSpaceItem& rLR = pParentFormat->GetLRSpace(); - nPageSize = pParentFormat->GetFrmSize().GetWidth() - rLR.GetLeft() + nPageSize = pParentFormat->GetFrameSize().GetWidth() - rLR.GetLeft() - rLR.GetRight(); } } @@ -2922,7 +2922,7 @@ void MSWordExportBase::ExportDocument( bool bWriteAll ) m_nFormatCollStart = m_nCharFormatStart + m_pDoc->GetCharFormats()->size() - 1; m_bStyDef = m_bBreakBefore = m_bOutKF = - m_bOutFlyFrmAttrs = m_bOutPageDescs = m_bOutTable = m_bOutFirstPage = + m_bOutFlyFrameAttrs = m_bOutPageDescs = m_bOutTable = m_bOutFirstPage = m_bOutGrf = m_bInWriteEscher = m_bStartTOX = m_bInWriteTOX = false; @@ -3384,7 +3384,7 @@ MSWordExportBase::MSWordExportBase( SwDoc *pDocument, SwPaM *pCurrentPam, SwPaM , m_bStyDef(false) , m_bBreakBefore(false) , m_bOutKF(false) - , m_bOutFlyFrmAttrs(false) + , m_bOutFlyFrameAttrs(false) , m_bOutPageDescs(false) , m_bOutFirstPage(false) , m_bOutTable(false) diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index 9bfb0bdb7139..834a55dbdf1f 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -437,7 +437,7 @@ struct MSWordSaveData bool bOldWriteAll : 1; ///< WW8Export only bool bOldOutTable : 1; - bool bOldFlyFrmAttrs : 1; + bool bOldFlyFrameAttrs : 1; bool bOldStartTOX : 1; bool bOldInWriteTOX : 1; // m_bOutPageDescs does not have to be saved in MSWordExportBase::SaveData @@ -536,7 +536,7 @@ public: bool m_bStyDef : 1; // should Style be written? bool m_bBreakBefore : 1; // Breaks are being written 2 times bool m_bOutKF : 1; // Header/Footer texts are being written - bool m_bOutFlyFrmAttrs : 1; // Frame-attr of Flys are being written + bool m_bOutFlyFrameAttrs : 1; // Frame-attr of Flys are being written bool m_bOutPageDescs : 1; ///< PageDescs (section properties) are being written bool m_bOutFirstPage : 1; // write Attrset of FirstPageDesc bool m_bOutTable : 1; // table is being written @@ -1324,7 +1324,7 @@ public: class GraphicDetails { public: - ww8::Frame maFly; // surrounding FlyFrms + ww8::Frame maFly; // surrounding FlyFrames sal_uLong mnPos; // FilePos of the graphics sal_uInt16 mnWid; // Width of the graphics sal_uInt16 mnHei; // Height of the graphics @@ -1462,7 +1462,7 @@ private: const SwFormatDrop &mrSwFormatDrop; - ww8::Frames maFlyFrms; // #i2916# + ww8::Frames maFlyFrames; // #i2916# ww8::FrameIter maFlyIter; sal_Int32 SearchNext( sal_Int32 nStartPos ); diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx index be42e4f531c0..476ab4fcef90 100644 --- a/sw/source/filter/ww8/wrtww8gr.cxx +++ b/sw/source/filter/ww8/wrtww8gr.cxx @@ -421,7 +421,7 @@ void WW8Export::OutGrf(const ww8::Frame &rFrame) } if (!bVert) { - SwTwips nHeight = rFlyFormat.GetFrmSize().GetHeight(); + SwTwips nHeight = rFlyFormat.GetFrameSize().GetHeight(); nHeight/=20; //nHeight was in twips, want it in half points, but //then half of total height. long nFontHeight = static_cast<const SvxFontHeightItem&>( diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 112a125e4c7f..aec5271e00ec 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -822,11 +822,11 @@ void MSWordExportBase::OutputFormat( const SwFormat& rFormat, bool bPapFormat, b } } - m_bOutFlyFrmAttrs = true; + m_bOutFlyFrameAttrs = true; //script doesn't matter if not exporting chp OutputItemSet(aSet, true, false, i18n::ScriptType::LATIN, m_bExportModeRTF); - m_bOutFlyFrmAttrs = false; + m_bOutFlyFrameAttrs = false; bCallOutSet = false; } @@ -2925,9 +2925,9 @@ void AttributeOutputBase::TextFlyContent( const SwFormatFlyCnt& rFlyContent ) aLayPos = pTextNd->FindLayoutRect( false, &aLayPos ).Pos(); SwPosition aPos( *pTextNd ); - ww8::Frame aFrm( *rFlyContent.GetFrameFormat(), aPos ); + ww8::Frame aFrame( *rFlyContent.GetFrameFormat(), aPos ); - OutputFlyFrame_Impl( aFrm, aLayPos ); + OutputFlyFrame_Impl( aFrame, aLayPos ); } } @@ -3284,9 +3284,9 @@ void WW8AttributeOutput::ParaNumRule_Impl(const SwTextNode* /*pTextNd*/, /* File FRMATR.HXX */ -void WW8AttributeOutput::FormatFrameSize( const SwFormatFrmSize& rSize ) +void WW8AttributeOutput::FormatFrameSize( const SwFormatFrameSize& rSize ) { - if( m_rWW8Export.m_bOutFlyFrmAttrs ) // Flys + if( m_rWW8Export.m_bOutFlyFrameAttrs ) // Flys { if( m_rWW8Export.m_bOutGrf ) return; // Fly um Grafik -> Auto-Groesse @@ -3621,7 +3621,7 @@ void WW8AttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLR ) { // Flys fehlen noch ( siehe RTF ) - if ( m_rWW8Export.m_bOutFlyFrmAttrs ) // Flys + if ( m_rWW8Export.m_bOutFlyFrameAttrs ) // Flys { // sprmPDxaFromText10 m_rWW8Export.InsUInt16( NS_sprm::LN_PDxaFromText10 ); @@ -3670,7 +3670,7 @@ void WW8AttributeOutput::FormatULSpace( const SvxULSpaceItem& rUL ) { // Flys fehlen noch ( siehe RTF ) - if ( m_rWW8Export.m_bOutFlyFrmAttrs ) // Flys + if ( m_rWW8Export.m_bOutFlyFrameAttrs ) // Flys { // sprmPDyaFromText m_rWW8Export.InsUInt16( NS_sprm::LN_PDyaFromText ); @@ -3728,7 +3728,7 @@ void WW8AttributeOutput::FormatULSpace( const SvxULSpaceItem& rUL ) void WW8AttributeOutput::FormatSurround( const SwFormatSurround& rSurround ) { - if ( m_rWW8Export.m_bOutFlyFrmAttrs ) + if ( m_rWW8Export.m_bOutFlyFrameAttrs ) { m_rWW8Export.InsUInt16( NS_sprm::LN_PWr ); @@ -3741,7 +3741,7 @@ void WW8AttributeOutput::FormatVertOrientation( const SwFormatVertOrient& rFlyVe { //!!!! Ankertyp und entsprechende Umrechnung fehlt noch - if ( m_rWW8Export.m_bOutFlyFrmAttrs ) + if ( m_rWW8Export.m_bOutFlyFrameAttrs ) { short nPos; switch( rFlyVert.GetVertOrient() ) @@ -3779,7 +3779,7 @@ void WW8AttributeOutput::FormatHorizOrientation( const SwFormatHoriOrient& rFlyH } //!!!! Ankertyp und entsprechende Umrechnung fehlt noch - if ( m_rWW8Export.m_bOutFlyFrmAttrs ) + if ( m_rWW8Export.m_bOutFlyFrameAttrs ) { short nPos; switch( rFlyHori.GetHoriOrient() ) @@ -3812,7 +3812,7 @@ void WW8AttributeOutput::FormatAnchor( const SwFormatAnchor& rAnchor ) { OSL_ENSURE( m_rWW8Export.m_pParentFrame, "Anchor without mpParentFrame !!" ); - if ( m_rWW8Export.m_bOutFlyFrmAttrs ) + if ( m_rWW8Export.m_bOutFlyFrameAttrs ) { sal_uInt8 nP = 0; switch ( rAnchor.GetAnchorId() ) @@ -4134,7 +4134,7 @@ SwTwips WW8Export::CurrentPageWidth(SwTwips &rLeft, SwTwips &rRight) const : &m_pDoc->GetPageDesc(0).GetMaster(); const SvxLRSpaceItem& rLR = pFormat->GetLRSpace(); - SwTwips nPageSize = pFormat->GetFrmSize().GetWidth(); + SwTwips nPageSize = pFormat->GetFrameSize().GetWidth(); rLeft = rLR.GetLeft(); rRight = rLR.GetRight(); return nPageSize; @@ -4188,17 +4188,17 @@ void AttributeOutputBase::FormatColumns( const SwFormatCol& rCol ) const SwColumns& rColumns = rCol.GetColumns(); sal_uInt16 nCols = rColumns.size(); - if ( 1 < nCols && !GetExport( ).m_bOutFlyFrmAttrs ) + if ( 1 < nCols && !GetExport( ).m_bOutFlyFrameAttrs ) { // dann besorge mal die Seitenbreite ohne Raender !! const SwFrameFormat* pFormat = GetExport( ).m_pAktPageDesc ? &GetExport( ).m_pAktPageDesc->GetMaster() : &const_cast<const SwDoc *>(GetExport( ).m_pDoc)->GetPageDesc(0).GetMaster(); - const SvxFrameDirectionItem &frameDirection = pFormat->GetFrmDir(); + const SvxFrameDirectionItem &frameDirection = pFormat->GetFrameDir(); SwTwips nPageSize; if ( frameDirection.GetValue() == FRMDIR_VERT_TOP_RIGHT || frameDirection.GetValue() == FRMDIR_VERT_TOP_LEFT ) { const SvxULSpaceItem &rUL = pFormat->GetULSpace(); - nPageSize = pFormat->GetFrmSize().GetHeight(); + nPageSize = pFormat->GetFrameSize().GetHeight(); nPageSize -= rUL.GetUpper() + rUL.GetLower(); const SwFormatHeader *header = dynamic_cast<const SwFormatHeader *>(pFormat->GetAttrSet().GetItem(RES_HEADER)); @@ -4207,7 +4207,7 @@ void AttributeOutputBase::FormatColumns( const SwFormatCol& rCol ) const SwFrameFormat *headerFormat = header->GetHeaderFormat(); if (headerFormat) { - nPageSize -= headerFormat->GetFrmSize().GetHeight(); + nPageSize -= headerFormat->GetFrameSize().GetHeight(); } } const SwFormatFooter *footer = dynamic_cast<const SwFormatFooter *>(pFormat->GetAttrSet().GetItem(RES_FOOTER)); @@ -4216,14 +4216,14 @@ void AttributeOutputBase::FormatColumns( const SwFormatCol& rCol ) const SwFrameFormat *footerFormat = footer->GetFooterFormat(); if ( footerFormat ) { - nPageSize -= footerFormat->GetFrmSize().GetHeight(); + nPageSize -= footerFormat->GetFrameSize().GetHeight(); } } } else { const SvxLRSpaceItem &rLR = pFormat->GetLRSpace(); - nPageSize = pFormat->GetFrmSize().GetWidth(); + nPageSize = pFormat->GetFrameSize().GetWidth(); nPageSize -= rLR.GetLeft() + rLR.GetRight(); //i120133: The Section width should consider page indent value. nPageSize -= rCol.GetAdjustValue(); @@ -4420,7 +4420,7 @@ void WW8AttributeOutput::FormatFrameDirection( const SvxFrameDirectionItem& rDir nDir = m_rWW8Export.GetCurrentPageDirection(); else if ( m_rWW8Export.m_pOutFormatNode ) { - if ( m_rWW8Export.m_bOutFlyFrmAttrs ) //frame + if ( m_rWW8Export.m_bOutFlyFrameAttrs ) //frame { nDir = m_rWW8Export.TrueFrameDirection( *static_cast<const SwFrameFormat*>(m_rWW8Export.m_pOutFormatNode) ); @@ -4466,7 +4466,7 @@ void WW8AttributeOutput::FormatFrameDirection( const SvxFrameDirectionItem& rDir m_rWW8Export.InsUInt16( NS_sprm::LN_SFBiDi ); m_rWW8Export.pO->push_back( bBiDi ? 1 : 0 ); } - else if ( !m_rWW8Export.m_bOutFlyFrmAttrs ) //paragraph/style + else if ( !m_rWW8Export.m_bOutFlyFrameAttrs ) //paragraph/style { m_rWW8Export.InsUInt16( NS_sprm::LN_PFBiDi ); m_rWW8Export.pO->push_back( bBiDi ? 1 : 0 ); @@ -4965,7 +4965,7 @@ void AttributeOutputBase::OutputItem( const SfxPoolItem& rHt ) break; case RES_FRM_SIZE: - FormatFrameSize( static_cast< const SwFormatFrmSize& >( rHt ) ); + FormatFrameSize( static_cast< const SwFormatFrameSize& >( rHt ) ); break; case RES_PAPER_BIN: FormatPaperBin( static_cast< const SvxPaperBinItem& >( rHt ) ); diff --git a/sw/source/filter/ww8/ww8attributeoutput.hxx b/sw/source/filter/ww8/ww8attributeoutput.hxx index f3c0b9af7b9b..1a1f1d6fdf6f 100644 --- a/sw/source/filter/ww8/ww8attributeoutput.hxx +++ b/sw/source/filter/ww8/ww8attributeoutput.hxx @@ -356,7 +356,7 @@ protected: virtual void ParaSnapToGrid( const SvxParaGridItem& ) override; /// Sfx item RES_FRM_SIZE - virtual void FormatFrameSize( const SwFormatFrmSize& ) override; + virtual void FormatFrameSize( const SwFormatFrameSize& ) override; /// Sfx item RES_PAPER_BIN virtual void FormatPaperBin( const SvxPaperBinItem& ) override; diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index e937f314beab..7458609689f6 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -1457,15 +1457,15 @@ void SwWW8ImplReader::ReadGrafLayer1( WW8PLCFspecial* pPF, long nGrafAnchorCp ) aSet.Put(SwFormatVertOrient(aRect.Top(), text::VertOrientation::NONE, aVertRelOriTab[ nYAlign ])); - SwFrameFormat *pFrm = m_rDoc.getIDocumentContentOperations().InsertDrawObj( *m_pPaM, *pObject, aSet ); + SwFrameFormat *pFrame = m_rDoc.getIDocumentContentOperations().InsertDrawObj( *m_pPaM, *pObject, aSet ); pObject->SetMergedItemSet(aSet); - if (dynamic_cast< const SwDrawFrameFormat *>( pFrm ) != nullptr) + if (dynamic_cast< const SwDrawFrameFormat *>( pFrame ) != nullptr) { - static_cast<SwDrawFrameFormat*>(pFrm)->PosAttrSet(); + static_cast<SwDrawFrameFormat*>(pFrame)->PosAttrSet(); } - AddAutoAnchor(pFrm); + AddAutoAnchor(pFrame); } } } @@ -1622,7 +1622,7 @@ void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject* pSdrObj, /* am Rahmen zu setzende Frame-Attribute ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - SwFormatFrmSize falls noch nicht gesetzt, hier setzen + SwFormatFrameSize falls noch nicht gesetzt, hier setzen SvxLRSpaceItem hier setzen SvxULSpaceItem hier setzen SvxOpaqueItem (Derzeit bei Rahmen nicht moeglich! khz 10.2.1999) @@ -1720,21 +1720,21 @@ void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject* pSdrObj, bool bFixSize = !(WW8ITEMVALUE(rOldSet, SDRATTR_TEXT_AUTOGROWHEIGHT, SdrOnOffItem)); - // Size: SwFormatFrmSize + // Size: SwFormatFrameSize if( SfxItemState::SET != rFlySet.GetItemState(RES_FRM_SIZE, false) ) { const Rectangle& rSnapRect = pSdrObj->GetSnapRect(); // if necessary adapt width and position of the framework: The // recorded interior is to remain equally large despite thick edges. - rFlySet.Put( SwFormatFrmSize(bFixSize ? ATT_FIX_SIZE : ATT_VAR_SIZE, + rFlySet.Put( SwFormatFrameSize(bFixSize ? ATT_FIX_SIZE : ATT_VAR_SIZE, rSnapRect.GetWidth() + 2*nOutside, rSnapRect.GetHeight() + 2*nOutside) ); } else // If a size is set, adjust it to consider border thickness { - SwFormatFrmSize aSize = static_cast<const SwFormatFrmSize &>(rFlySet.Get(RES_FRM_SIZE)); + SwFormatFrameSize aSize = static_cast<const SwFormatFrameSize &>(rFlySet.Get(RES_FRM_SIZE)); - SwFormatFrmSize aNewSize = SwFormatFrmSize(bFixSize ? ATT_FIX_SIZE : ATT_VAR_SIZE, + SwFormatFrameSize aNewSize = SwFormatFrameSize(bFixSize ? ATT_FIX_SIZE : ATT_VAR_SIZE, aSize.GetWidth() + 2*nOutside, aSize.GetHeight() + 2*nOutside); aNewSize.SetWidthSizeType(aSize.GetWidthSizeType()); @@ -2628,7 +2628,7 @@ SwFrameFormat* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp ) sal_uInt16 nCount = pObject->GetUserDataCount(); if(nCount) { - OUString lnName, aObjName, aTarFrm; + OUString lnName, aObjName, aTarFrame; for (sal_uInt16 i = 0; i < nCount; i++ ) { SdrObjUserData* pData = pObject->GetUserData( i ); @@ -2643,7 +2643,7 @@ SwFrameFormat* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp ) { lnName = macInf->GetHlink(); aObjName = macInf->GetName(); - aTarFrm = macInf->GetTarFrm(); + aTarFrame = macInf->GetTarFrame(); break; } } @@ -2653,8 +2653,8 @@ SwFrameFormat* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp ) pFormatURL->SetURL( lnName, false ); if (!aObjName.isEmpty()) pFormatURL->SetName(aObjName); - if (!aTarFrm.isEmpty()) - pFormatURL->SetTargetFrameName(aTarFrm); + if (!aTarFrame.isEmpty()) + pFormatURL->SetTargetFrameName(aTarFrame); pFormatURL->SetMap(nullptr); aFlySet.Put(*pFormatURL); } @@ -2892,9 +2892,9 @@ SwFlyFrameFormat* SwWW8ImplReader::ConvertDrawTextToFly(SdrObject* &rpObject, Rectangle aInnerDist(pRecord->nDxTextLeft, pRecord->nDyTextTop, pRecord->nDxTextRight, pRecord->nDyTextBottom); - SwFormatFrmSize aFrmSize(ATT_FIX_SIZE, pF->nXaRight - pF->nXaLeft, pF->nYaBottom - pF->nYaTop); - aFrmSize.SetWidthSizeType(pRecord->bAutoWidth ? ATT_VAR_SIZE : ATT_FIX_SIZE); - rFlySet.Put(aFrmSize); + SwFormatFrameSize aFrameSize(ATT_FIX_SIZE, pF->nXaRight - pF->nXaLeft, pF->nYaBottom - pF->nYaTop); + aFrameSize.SetWidthSizeType(pRecord->bAutoWidth ? ATT_VAR_SIZE : ATT_FIX_SIZE); + rFlySet.Put(aFrameSize); MatchSdrItemsIntoFlySet( rpObject, rFlySet, pRecord->eLineStyle, pRecord->eLineDashing, pRecord->eShapeType, aInnerDist ); @@ -3008,7 +3008,7 @@ SwFlyFrameFormat* SwWW8ImplReader::ImportReplaceableDrawables( SdrObject* &rpObj ProcessEscherAlign(pRecord, pF, rFlySet, true); - rFlySet.Put(SwFormatFrmSize(ATT_FIX_SIZE, nWidthTw, nHeightTw)); + rFlySet.Put(SwFormatFrameSize(ATT_FIX_SIZE, nWidthTw, nHeightTw)); SfxItemSet aGrSet(m_rDoc.GetAttrPool(), RES_GRFATR_BEGIN, RES_GRFATR_END-1); diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx index 09c13885fab1..194e2105d511 100644 --- a/sw/source/filter/ww8/ww8graf2.cxx +++ b/sw/source/filter/ww8/ww8graf2.cxx @@ -366,7 +366,7 @@ SwFlyFrameFormat* SwWW8ImplReader::MakeGrafNotInContent(const WW8PicDesc& rPD, aAnchor.SetAnchor(m_pPaM->GetPoint()); aFlySet.Put(aAnchor); - aFlySet.Put( SwFormatFrmSize( ATT_FIX_SIZE, nWidth, nHeight ) ); + aFlySet.Put( SwFormatFrameSize( ATT_FIX_SIZE, nWidth, nHeight ) ); SwFlyFrameFormat* pFlyFormat = m_rDoc.getIDocumentContentOperations().Insert(*m_pPaM, rFileName, OUString(), pGraph, &aFlySet, &rGrfSet, nullptr); @@ -375,7 +375,7 @@ SwFlyFrameFormat* SwWW8ImplReader::MakeGrafNotInContent(const WW8PicDesc& rPD, if (m_rDoc.getIDocumentLayoutAccess().GetCurrentViewShell() && (FLY_AT_PARA == pFlyFormat->GetAnchor().GetAnchorId())) { - pFlyFormat->MakeFrms(); + pFlyFormat->MakeFrames(); } return pFlyFormat; } @@ -602,7 +602,7 @@ SwFrameFormat* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj, // Set the size from the WinWord PIC-structure as graphic // size - aAttrSet.Put( SwFormatFrmSize( ATT_FIX_SIZE, aPD.nWidth, + aAttrSet.Put( SwFormatFrameSize( ATT_FIX_SIZE, aPD.nWidth, aPD.nHeight ) ); } diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 0fe320c3aa25..84512a5297ad 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -302,9 +302,9 @@ void SwWW8ImplReader::ReadEmbeddedData( SvMemoryStream& rStrm, SwDocShell* pDocS // target frame if( ::get_flag( nFlags, WW8_HLINK_FRAME ) ) { - OUString sFrmName; - lclAppendString32(sFrmName, rStrm, true); - hlStr.tarFrm = sFrmName; + OUString sFrameName; + lclAppendString32(sFrameName, rStrm, true); + hlStr.tarFrame = sFrameName; } // UNC path @@ -1174,8 +1174,8 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, { pInfo->SetShapeId( rObjData.nShapeId ); pInfo->SetHlink( hlStr.hLinkAddr ); - if (!hlStr.tarFrm.isEmpty()) - pInfo->SetTarFrm( hlStr.tarFrm ); + if (!hlStr.tarFrame.isEmpty()) + pInfo->SetTarFrame( hlStr.tarFrame ); OUString aNameStr = GetPropertyString( DFF_Prop_wzName, rSt ); if (!aNameStr.isEmpty()) pInfo->SetName( aNameStr ); @@ -1493,18 +1493,18 @@ void SwWW8FltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, SwPaM aRegion(rTmpPos); if (rEntry.MakeRegion(pDoc, aRegion, false)) { - SwFrameFormat *pFrm; + SwFrameFormat *pFrame; // If we have just one single inline graphic then // don't insert a field for the single frame, set // the frames hyperlink field attribute directly. - if (nullptr != (pFrm = SwWW8ImplReader::ContainsSingleInlineGraphic(aRegion))) + if (nullptr != (pFrame = SwWW8ImplReader::ContainsSingleInlineGraphic(aRegion))) { const SwFormatINetFormat *pAttr = static_cast<const SwFormatINetFormat *>( rEntry.pAttr); SwFormatURL aURL; aURL.SetURL(pAttr->GetValue(), false); aURL.SetTargetFrameName(pAttr->GetTargetFrame()); - pFrm->SetFormatAttr(aURL); + pFrame->SetFormatAttr(aURL); } else { @@ -2117,14 +2117,14 @@ void WW8ReaderSave::Restore( SwWW8ImplReader* pRdr ) pRdr->m_bFirstPara = mbFirstPara; // Close all attributes as attributes could be created that extend the Fly - pRdr->DeleteCtrlStk(); + pRdr->DeleteCtrlStack(); pRdr->m_pCtrlStck = mpOldStck; pRdr->m_pRedlineStack->closeall(*pRdr->m_pPaM->GetPoint()); delete pRdr->m_pRedlineStack; pRdr->m_pRedlineStack = mpOldRedlines; - pRdr->DeleteAnchorStk(); + pRdr->DeleteAnchorStack(); pRdr->m_pAnchorStck = mpOldAnchorStck; *pRdr->m_pPaM->GetPoint() = maTmpPos; @@ -2246,22 +2246,22 @@ void SwWW8ImplReader::Read_HdFtTextAsHackedFrame(WW8_CP nStart, WW8_CP nLen, SwFormatAnchor aAnch( pFrame->GetAnchor() ); aAnch.SetType( FLY_AT_PARA ); pFrame->SetFormatAttr( aAnch ); - SwFormatFrmSize aSz(ATT_MIN_SIZE, nPageWidth, MINLAY); - SwFrmSize eFrmSize = ATT_MIN_SIZE; - if( eFrmSize != aSz.GetWidthSizeType() ) - aSz.SetWidthSizeType( eFrmSize ); + SwFormatFrameSize aSz(ATT_MIN_SIZE, nPageWidth, MINLAY); + SwFrameSize eFrameSize = ATT_MIN_SIZE; + if( eFrameSize != aSz.GetWidthSizeType() ) + aSz.SetWidthSizeType( eFrameSize ); pFrame->SetFormatAttr(aSz); pFrame->SetFormatAttr(SwFormatSurround(SURROUND_THROUGHT)); pFrame->SetFormatAttr(SwFormatHoriOrient(0, text::HoriOrientation::LEFT)); //iFOO // #i43427# - send frame for header/footer into background. pFrame->SetFormatAttr( SvxOpaqueItem( RES_OPAQUE, false ) ); - SdrObject* pFrmObj = CreateContactObject( pFrame ); - OSL_ENSURE( pFrmObj, + SdrObject* pFrameObj = CreateContactObject( pFrame ); + OSL_ENSURE( pFrameObj, "<SwWW8ImplReader::Read_HdFtTextAsHackedFrame(..)> - missing SdrObject instance" ); - if ( pFrmObj ) + if ( pFrameObj ) { - pFrmObj->SetOrdNum( 0L ); + pFrameObj->SetOrdNum( 0L ); } MoveInsideFly(pFrame); @@ -4275,10 +4275,10 @@ SwWW8ImplReader::SwWW8ImplReader(sal_uInt8 nVersionPara, SotStorage* pStorage, m_pStrm->SetEndian( SvStreamEndian::LITTLE ); m_aApos.push_back(false); - mpCrsr = m_rDoc.CreateUnoCrsr(rPos); + mpCursor = m_rDoc.CreateUnoCursor(rPos); } -void SwWW8ImplReader::DeleteStk(SwFltControlStack* pStck) +void SwWW8ImplReader::DeleteStack(SwFltControlStack* pStck) { if( pStck ) { @@ -4934,7 +4934,7 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss) pDocShell->SetReadOnlyUI(); } - m_pPaM = mpCrsr.get(); + m_pPaM = mpCursor.get(); m_pCtrlStck = new SwWW8FltControlStack( &m_rDoc, m_nFieldFlags, *this ); @@ -5258,7 +5258,7 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss) eMode |= nsRedlineMode_t::REDLINE_SHOW_DELETE; } - m_aInsertedTables.DelAndMakeTableFrms(); + m_aInsertedTables.DelAndMakeTableFrames(); m_aSectionManager.InsertSegments(); m_vColl.clear(); @@ -5280,11 +5280,11 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss) m_pDataStream = nullptr; m_pTableStream = nullptr; - DeleteCtrlStk(); + DeleteCtrlStack(); m_pRedlineStack->closeall(*m_pPaM->GetPoint()); delete m_pRedlineStack; - DeleteAnchorStk(); - DeleteRefStks(); + DeleteAnchorStack(); + DeleteRefStacks(); // For i120928,achieve the graphics from the special bookmark with is for graphic bullet { @@ -5370,7 +5370,7 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss) SAL_WARN_IF(m_pTableEndPaM, "sw.ww8", "document ended without table ending"); m_pTableEndPaM.reset(); //ensure this is deleted before pPaM - mpCrsr.reset(); + mpCursor.reset(); m_pPaM = nullptr; m_pLastAnchorPos.reset();//ensure this is deleted before UpdatePageDescs diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index ab3bd028e3ad..0d2fb99a0fcf 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -525,8 +525,8 @@ public: void SetHlink( const OUString& rHlink ) { maHlink = rHlink; } const OUString& GetHlink() const { return maHlink; } - void SetTarFrm( const OUString& rTarFrm ) { maTarFrm = rTarFrm; } - const OUString& GetTarFrm() const { return maTarFrm; } + void SetTarFrame( const OUString& rTarFrame ) { maTarFrame = rTarFrame; } + const OUString& GetTarFrame() const { return maTarFrame; } void SetShapeId( const sal_Int32& rShapeId ) { mnShapeId = rShapeId; } const sal_Int32& GetShapeId() const { return mnShapeId; } void SetName( const OUString& rName ) { maNameStr = rName; } @@ -536,13 +536,13 @@ private: sal_Int32 mnShapeId; OUString maHlink; OUString maNameStr; - OUString maTarFrm; + OUString maTarFrame; }; struct HyperLinksTable { OUString hLinkAddr; - OUString tarFrm; + OUString tarFrame; }; namespace sw @@ -1091,7 +1091,7 @@ private: // general stuff SwDoc& m_rDoc; - std::shared_ptr<SwUnoCrsr> mpCrsr; + std::shared_ptr<SwUnoCursor> mpCursor; SwPaM* m_pPaM; SwWW8FltControlStack* m_pCtrlStck; // stack for the attributes @@ -1395,16 +1395,16 @@ private: void CopyPageDescHdFt( const SwPageDesc* pOrgPageDesc, SwPageDesc* pNewPageDesc, sal_uInt8 nCode ); - void DeleteStk(SwFltControlStack* prStck); - void DeleteCtrlStk() { DeleteStk( m_pCtrlStck ); m_pCtrlStck = nullptr; } - void DeleteRefStks() + void DeleteStack(SwFltControlStack* prStck); + void DeleteCtrlStack() { DeleteStack( m_pCtrlStck ); m_pCtrlStck = nullptr; } + void DeleteRefStacks() { - DeleteStk( m_pReffedStck ); + DeleteStack( m_pReffedStck ); m_pReffedStck = nullptr; - DeleteStk( m_pReffingStck ); + DeleteStack( m_pReffingStck ); m_pReffingStck = nullptr; } - void DeleteAnchorStk() { DeleteStk( m_pAnchorStck ); m_pAnchorStck = nullptr; } + void DeleteAnchorStack() { DeleteStack( m_pAnchorStck ); m_pAnchorStck = nullptr; } void emulateMSWordAddTextToParagraph(const OUString& rAddString); void simpleAddTextToParagraph(const OUString& rAddString); bool HandlePageBreakChar(); diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index daaeee6fd16f..3501d63d1911 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -2306,7 +2306,7 @@ void WW8TabDesc::SetSizePosition(SwFrameFormat* pFrameFormat) pApply->SetFormatAttr(aItemSet); if (pFrameFormat) { - SwFormatFrmSize aSize = pFrameFormat->GetFrmSize(); + SwFormatFrameSize aSize = pFrameFormat->GetFrameSize(); aSize.SetHeightSizeType(ATT_MIN_SIZE); aSize.SetHeight(MINLAY); pFrameFormat->SetFormatAttr(aSize); @@ -2418,8 +2418,8 @@ void WW8TabDesc::CreateSwTable(SvxULSpaceItem* pULSpaceItem) // total width of table if( nMaxRight - nMinLeft > MINLAY * nDefaultSwCols ) { - pTable->GetFrameFormat()->SetFormatAttr(SwFormatFrmSize(ATT_FIX_SIZE, nSwWidth)); - aItemSet.Put(SwFormatFrmSize(ATT_FIX_SIZE, nSwWidth)); + pTable->GetFrameFormat()->SetFormatAttr(SwFormatFrameSize(ATT_FIX_SIZE, nSwWidth)); + aItemSet.Put(SwFormatFrameSize(ATT_FIX_SIZE, nSwWidth)); } SvxFrameDirectionItem aDirection( @@ -3098,7 +3098,7 @@ void WW8TabDesc::AdjustNewBand() if( bClaimLineFormat ) { pTabLine->ClaimFrameFormat(); // necessary because of cell height - SwFormatFrmSize aF( ATT_MIN_SIZE, 0, 0 ); // default + SwFormatFrameSize aF( ATT_MIN_SIZE, 0, 0 ); // default if (pActBand->nLineHeight == 0) // 0 = Auto aF.SetHeightSizeType( ATT_VAR_SIZE ); @@ -3125,7 +3125,7 @@ void WW8TabDesc::AdjustNewBand() short i; // SW-Index short j; // WW-Index short nW; // Width - SwFormatFrmSize aFS( ATT_FIX_SIZE ); + SwFormatFrameSize aFS( ATT_FIX_SIZE ); j = pActBand->bLEmptyCol ? -1 : 0; for( i = 0; i < pActBand->nSwCols; i++ ) @@ -4512,14 +4512,14 @@ void WW8RStyle::Import() rtl_TextEncoding SwWW8StyInf::GetCharSet() const { - if ((m_pFormat) && (m_pFormat->GetFrmDir().GetValue() == FRMDIR_HORI_RIGHT_TOP)) + if ((m_pFormat) && (m_pFormat->GetFrameDir().GetValue() == FRMDIR_HORI_RIGHT_TOP)) return m_eRTLFontSrcCharSet; return m_eLTRFontSrcCharSet; } rtl_TextEncoding SwWW8StyInf::GetCJKCharSet() const { - if ((m_pFormat) && (m_pFormat->GetFrmDir().GetValue() == FRMDIR_HORI_RIGHT_TOP)) + if ((m_pFormat) && (m_pFormat->GetFrameDir().GetValue() == FRMDIR_HORI_RIGHT_TOP)) return m_eRTLFontSrcCharSet; return m_eCJKFontSrcCharSet; } diff --git a/sw/source/filter/ww8/ww8par2.hxx b/sw/source/filter/ww8/ww8par2.hxx index 4b508e5f995e..7f14316d932d 100644 --- a/sw/source/filter/ww8/ww8par2.hxx +++ b/sw/source/filter/ww8/ww8par2.hxx @@ -34,7 +34,7 @@ class WW8RStyle; class WW8DupProperties { public: - WW8DupProperties(SwDoc &rDoc, SwWW8FltControlStack *pStk); + WW8DupProperties(SwDoc &rDoc, SwWW8FltControlStack *pStack); void Insert(const SwPosition &rPos); private: WW8DupProperties(const WW8DupProperties&) = delete; @@ -54,7 +54,7 @@ struct WW8SwFlyPara sal_Int16 nWidth, nHeight; // size sal_Int16 nNetWidth; - SwFrmSize eHeightFix; // height fixed or min + SwFrameSize eHeightFix; // height fixed or min RndStdIds eAnchor; // binding short eHRel; // page or page border short eVRel; // page or page border diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx index 586be7d8758e..ff437e345eec 100644 --- a/sw/source/filter/ww8/ww8par4.cxx +++ b/sw/source/filter/ww8/ww8par4.cxx @@ -272,7 +272,7 @@ SwFrameFormat* SwWW8ImplReader::ImportOle(const Graphic* pGrf, const Size aSizeTwip = OutputDevice::LogicToLogic( aGraph.GetPrefSize(), aGraph.GetPrefMapMode(), MAP_TWIP ); - pTempSet->Put( SwFormatFrmSize( ATT_FIX_SIZE, aSizeTwip.Width(), + pTempSet->Put( SwFormatFrameSize( ATT_FIX_SIZE, aSizeTwip.Width(), aSizeTwip.Height() ) ); pTempSet->Put( SwFormatVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::FRAME )); @@ -380,8 +380,8 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph, if (pFlySet) { - if (const SwFormatFrmSize* pSize = - static_cast<const SwFormatFrmSize*>(pFlySet->GetItem(RES_FRM_SIZE, false))) + if (const SwFormatFrameSize* pSize = + static_cast<const SwFormatFrameSize*>(pFlySet->GetItem(RES_FRM_SIZE, false))) { aRect.SetSize(pSize->GetSize()); } diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 092c694124df..79ecd45b4215 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -215,12 +215,12 @@ void SwWW8ImplReader::SetDocumentGrid(SwFrameFormat &rFormat, const wwSection &r rFormat.SetFormatAttr(SvxFrameDirectionItem(rSection.meDir, RES_FRAMEDIR)); - SwTwips nTextareaHeight = rFormat.GetFrmSize().GetHeight(); + SwTwips nTextareaHeight = rFormat.GetFrameSize().GetHeight(); const SvxULSpaceItem &rUL = ItemGet<SvxULSpaceItem>(rFormat, RES_UL_SPACE); nTextareaHeight -= rUL.GetUpper(); nTextareaHeight -= rUL.GetLower(); - SwTwips nTextareaWidth = rFormat.GetFrmSize().GetWidth(); + SwTwips nTextareaWidth = rFormat.GetFrameSize().GetWidth(); const SvxLRSpaceItem &rLR = ItemGet<SvxLRSpaceItem>(rFormat, RES_LR_SPACE); nTextareaWidth -= rLR.GetLeft(); nTextareaWidth -= rLR.GetRight(); @@ -418,7 +418,7 @@ void wwSectionManager::SetPage(SwPageDesc &rInPageDesc, SwFrameFormat &rFormat, rInPageDesc.SetLandscape(rSection.IsLandScape()); // 2. paper size - SwFormatFrmSize aSz( rFormat.GetFrmSize() ); + SwFormatFrameSize aSz( rFormat.GetFrameSize() ); aSz.SetWidth(rSection.GetPageWidth()); aSz.SetHeight(SvxPaperInfo::GetSloppyPaperDimension(rSection.GetPageHeight())); rFormat.SetFormatAttr(aSz); @@ -589,7 +589,7 @@ void wwSectionManager::SetPageULSpaceItems(SwFrameFormat &rFormat, SvxULSpaceItem aHdUL(pHdFormat->GetULSpace()); if (!rSection.IsFixedHeightHeader()) //normal { - pHdFormat->SetFormatAttr(SwFormatFrmSize(ATT_MIN_SIZE, 0, rData.nSwHLo)); + pHdFormat->SetFormatAttr(SwFormatFrameSize(ATT_MIN_SIZE, 0, rData.nSwHLo)); // #i19922# - minimum page header height is now 1mm // use new constant <cMinHdFtHeight> aHdUL.SetLower( writer_cast<sal_uInt16>(rData.nSwHLo - cMinHdFtHeight) ); @@ -600,7 +600,7 @@ void wwSectionManager::SetPageULSpaceItems(SwFrameFormat &rFormat, { // #i48832# - set correct spacing between header and body. const SwTwips nHdLowerSpace( std::abs(rSection.maSep.dyaTop) - rData.nSwUp - rData.nSwHLo ); - pHdFormat->SetFormatAttr(SwFormatFrmSize(ATT_FIX_SIZE, 0, rData.nSwHLo + nHdLowerSpace)); + pHdFormat->SetFormatAttr(SwFormatFrameSize(ATT_FIX_SIZE, 0, rData.nSwHLo + nHdLowerSpace)); aHdUL.SetLower( static_cast< sal_uInt16 >(nHdLowerSpace) ); pHdFormat->SetFormatAttr(SwHeaderAndFooterEatSpacingItem( RES_HEADER_FOOTER_EAT_SPACING, false)); @@ -616,7 +616,7 @@ void wwSectionManager::SetPageULSpaceItems(SwFrameFormat &rFormat, SvxULSpaceItem aFtUL(pFtFormat->GetULSpace()); if (!rSection.IsFixedHeightFooter()) //normal { - pFtFormat->SetFormatAttr(SwFormatFrmSize(ATT_MIN_SIZE, 0, rData.nSwFUp)); + pFtFormat->SetFormatAttr(SwFormatFrameSize(ATT_MIN_SIZE, 0, rData.nSwFUp)); // #i19922# - minimum page header height is now 1mm // use new constant <cMinHdFtHeight> aFtUL.SetUpper( writer_cast<sal_uInt16>(rData.nSwFUp - cMinHdFtHeight) ); @@ -627,7 +627,7 @@ void wwSectionManager::SetPageULSpaceItems(SwFrameFormat &rFormat, { // #i48832# - set correct spacing between footer and body. const SwTwips nFtUpperSpace( std::abs(rSection.maSep.dyaBottom) - rData.nSwLo - rData.nSwFUp ); - pFtFormat->SetFormatAttr(SwFormatFrmSize(ATT_FIX_SIZE, 0, rData.nSwFUp + nFtUpperSpace)); + pFtFormat->SetFormatAttr(SwFormatFrameSize(ATT_FIX_SIZE, 0, rData.nSwFUp + nFtUpperSpace)); aFtUL.SetUpper( static_cast< sal_uInt16 >(nFtUpperSpace) ); pFtFormat->SetFormatAttr(SwHeaderAndFooterEatSpacingItem( RES_HEADER_FOOTER_EAT_SPACING, false)); @@ -2061,7 +2061,7 @@ WW8FlySet::WW8FlySet(SwWW8ImplReader& rReader, const WW8FlyPara* pFW, //types of frames, the left right thickness and space makes //it wider, but the top bottom spacing and border thickness //is placed inside. - Put( SwFormatFrmSize( pFS->eHeightFix, pFS->nWidth + + Put( SwFormatFrameSize( pFS->eHeightFix, pFS->nWidth + aSizeArray[WW8_LEFT] + aSizeArray[WW8_RIGHT], pFS->nHeight)); } @@ -2097,7 +2097,7 @@ WW8FlySet::WW8FlySet( SwWW8ImplReader& rReader, const SwPaM* pPaM, aSizeArray[WW8_BOT]*=2; } - Put( SwFormatFrmSize( ATT_FIX_SIZE, nWidth+aSizeArray[WW8_LEFT]+ + Put( SwFormatFrameSize( ATT_FIX_SIZE, nWidth+aSizeArray[WW8_LEFT]+ aSizeArray[WW8_RIGHT], nHeight+aSizeArray[WW8_TOP] + aSizeArray[WW8_BOT]) ); } @@ -2121,8 +2121,8 @@ void WW8FlySet::Init(const SwWW8ImplReader& rReader, const SwPaM* pPaM) Put(SwFormatVertOrient(0, text::VertOrientation::TOP, text::RelOrientation::FRAME)); } -WW8DupProperties::WW8DupProperties(SwDoc &rDoc, SwWW8FltControlStack *pStk) - : pCtrlStck(pStk), +WW8DupProperties::WW8DupProperties(SwDoc &rDoc, SwWW8FltControlStack *pStack) + : pCtrlStck(pStack), aChrSet(rDoc.GetAttrPool(), RES_CHRATR_BEGIN, RES_CHRATR_END - 1 ), aParSet(rDoc.GetAttrPool(), RES_PARATR_BEGIN, RES_PARATR_END - 1 ) { @@ -2234,7 +2234,7 @@ SwTwips SwWW8ImplReader::MoveOutsideFly(SwFrameFormat *pFlyFormat, if (pTableFormat) { - SwFormatFrmSize aSize = pTableFormat->GetFrmSize(); + SwFormatFrameSize aSize = pTableFormat->GetFrameSize(); aSize.SetHeightSizeType(ATT_MIN_SIZE); aSize.SetHeight(MINLAY); pFlyFormat->SetFormatAttr(aSize); @@ -2540,7 +2540,7 @@ void SwWW8ImplReader::StopApo() if (m_pSFlyPara->pFlyFormat) m_pSFlyPara->pFlyFormat->SetFormatAttr(SvxBrushItem(aBg, RES_BACKGROUND)); - DeleteAnchorStk(); + DeleteAnchorStack(); m_pAnchorStck = m_pSFlyPara->pOldAnchorStck; // When inserting a graphic into the fly frame using the auto @@ -2552,7 +2552,7 @@ void SwWW8ImplReader::StopApo() long nW = m_pSFlyPara->nNewNetWidth; nW += m_pSFlyPara->nWidth - m_pSFlyPara->nNetWidth; // border for it m_pSFlyPara->pFlyFormat->SetFormatAttr( - SwFormatFrmSize( m_pSFlyPara->eHeightFix, nW, m_pSFlyPara->nHeight ) ); + SwFormatFrameSize( m_pSFlyPara->eHeightFix, nW, m_pSFlyPara->nHeight ) ); } /* Word set *no* width meaning its an automatic width. The @@ -2567,14 +2567,14 @@ void SwWW8ImplReader::StopApo() using namespace sw::util; SfxItemSet aFlySet( m_pSFlyPara->pFlyFormat->GetAttrSet() ); - SwFormatFrmSize aSize(ItemGet<SwFormatFrmSize>(aFlySet, RES_FRM_SIZE)); + SwFormatFrameSize aSize(ItemGet<SwFormatFrameSize>(aFlySet, RES_FRM_SIZE)); aFlySet.ClearItem(RES_FRM_SIZE); CalculateFlySize(aFlySet, m_pSFlyPara->pMainTextPos->nNode, m_pSFlyPara->nWidth); - nNewWidth = ItemGet<SwFormatFrmSize>(aFlySet, RES_FRM_SIZE).GetWidth(); + nNewWidth = ItemGet<SwFormatFrameSize>(aFlySet, RES_FRM_SIZE).GetWidth(); aSize.SetWidth(nNewWidth); aSize.SetWidthSizeType(ATT_VAR_SIZE); @@ -2583,8 +2583,8 @@ void SwWW8ImplReader::StopApo() } delete m_pSFlyPara->pMainTextPos, m_pSFlyPara->pMainTextPos = nullptr; -// To create the SwFrms when inserting into an existing document, fltshell.cxx -// will call pFlyFrm->MakeFrms() when setting the FltAnchor attribute +// To create the SwFrames when inserting into an existing document, fltshell.cxx +// will call pFlyFrame->MakeFrames() when setting the FltAnchor attribute } diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index aeb5f9782a24..f19243d523b0 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -4601,7 +4601,7 @@ WW8PLCFMan::WW8PLCFMan(WW8ScannerBase* pBase, ManTypes nType, long nStartCp, p->nCp2OrIdx = 0; p->bFirstSprm = false; - p->pIdStk = nullptr; + p->pIdStack = nullptr; if ((p == pChp) || (p == pPap)) p->nStartPos = p->nEndPos = nStartCp; @@ -4622,7 +4622,7 @@ WW8PLCFMan::WW8PLCFMan(WW8ScannerBase* pBase, ManTypes nType, long nStartCp, if( p->pPLCFx->IsSprm() ) { // Careful: nEndPos must be - p->pIdStk = new std::stack<sal_uInt16>; + p->pIdStack = new std::stack<sal_uInt16>; if ((p == pChp) || (p == pPap)) { WW8_CP nTemp = p->nEndPos+p->nCpOfs; @@ -4645,7 +4645,7 @@ WW8PLCFMan::WW8PLCFMan(WW8ScannerBase* pBase, ManTypes nType, long nStartCp, WW8PLCFMan::~WW8PLCFMan() { for( sal_uInt16 i=0; i<nPLCF; i++) - delete aD[i].pIdStk; + delete aD[i].pIdStack; } // 0. which attr class, @@ -4773,8 +4773,8 @@ void WW8PLCFMan::GetSprmEnd( short nIdx, WW8PLCFManResult* pRes ) const const WW8PLCFxDesc* p = &aD[nIdx]; - if (!(p->pIdStk->empty())) - pRes->nSprmId = p->pIdStk->top(); // get end position + if (!(p->pIdStack->empty())) + pRes->nSprmId = p->pIdStack->top(); // get end position else { OSL_ENSURE( false, "No Id on the Stack" ); @@ -4835,12 +4835,12 @@ bool WW8PLCFMan::TransferOpenSprms(std::stack<sal_uInt16> &rStack) for (sal_uInt16 i = 0; i < nPLCF; ++i) { WW8PLCFxDesc* p = &aD[i]; - if (!p || !p->pIdStk) + if (!p || !p->pIdStack) continue; - while (!p->pIdStk->empty()) + while (!p->pIdStack->empty()) { - rStack.push(p->pIdStk->top()); - p->pIdStk->pop(); + rStack.push(p->pIdStack->top()); + p->pIdStack->pop(); } } return rStack.empty(); @@ -4854,7 +4854,7 @@ void WW8PLCFMan::AdvSprm(short nIdx, bool bStart) if( bStart ) { const sal_uInt16 nLastId = GetId(p); - p->pIdStk->push(nLastId); // remember Id for attribute end + p->pIdStack->push(nLastId); // remember Id for attribute end if( p->nSprmsLen ) { /* @@ -4886,9 +4886,9 @@ void WW8PLCFMan::AdvSprm(short nIdx, bool bStart) } else { - if (!(p->pIdStk->empty())) - p->pIdStk->pop(); - if (p->pIdStk->empty()) + if (!(p->pIdStack->empty())) + p->pIdStack->pop(); + if (p->pIdStack->empty()) { if ( (p == pChp) || (p == pPap) ) { @@ -4974,7 +4974,7 @@ void WW8PLCFMan::AdvNoSprm(short nIdx, bool bStart) p->nStartPos = aD[nIdx+1].nStartPos; else { - if (aD[nIdx+1].pIdStk->empty()) + if (aD[nIdx+1].pIdStack->empty()) { WW8PLCFx_PCD *pTemp = static_cast<WW8PLCFx_PCD*>(pPcd->pPLCFx); /* diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index b0ec865217e5..368429aa2b92 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -821,7 +821,7 @@ enum ManTypes // enums for PLCFMan-ctor struct WW8PLCFxDesc { WW8PLCFx* pPLCFx; - ::std::stack<sal_uInt16>* pIdStk; // memory for Attr-Id for Attr-end(s) + ::std::stack<sal_uInt16>* pIdStack; // memory for Attr-Id for Attr-end(s) const sal_uInt8* pMemPos;// where are the Sprm(s) long nOrigSprmsLen; @@ -852,7 +852,7 @@ struct WW8PLCFxDesc //existing ones. WW8PLCFxDesc() : pPLCFx(nullptr) - , pIdStk(nullptr) + , pIdStack(nullptr) , pMemPos(nullptr) , nOrigSprmsLen(0) , nStartPos(WW8_CP_MAX) diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx index c556a4da7983..4f5be35d9724 100644 --- a/sw/source/filter/xml/xmlexpit.cxx +++ b/sw/source/filter/xml/xmlexpit.cxx @@ -1069,32 +1069,32 @@ bool SvXMLExportItemMapper::QueryXMLValue( case RES_FRM_SIZE: { - const SwFormatFrmSize& rFrmSize = dynamic_cast<const SwFormatFrmSize&>(rItem); + const SwFormatFrameSize& rFrameSize = dynamic_cast<const SwFormatFrameSize&>(rItem); bool bOutHeight = false; switch( nMemberId ) { case MID_FRMSIZE_REL_WIDTH: - if (rFrmSize.GetWidthPercent()) + if (rFrameSize.GetWidthPercent()) { ::sax::Converter::convertPercent( - aOut, rFrmSize.GetWidthPercent() ); + aOut, rFrameSize.GetWidthPercent() ); bOk = true; } break; case MID_FRMSIZE_MIN_HEIGHT: - if( ATT_MIN_SIZE == rFrmSize.GetHeightSizeType() ) + if( ATT_MIN_SIZE == rFrameSize.GetHeightSizeType() ) bOutHeight = true; break; case MID_FRMSIZE_FIX_HEIGHT: - if( ATT_FIX_SIZE == rFrmSize.GetHeightSizeType() ) + if( ATT_FIX_SIZE == rFrameSize.GetHeightSizeType() ) bOutHeight = true; break; } if( bOutHeight ) { - rUnitConverter.convertMeasureToXML(aOut, rFrmSize.GetHeight()); + rUnitConverter.convertMeasureToXML(aOut, rFrameSize.GetHeight()); bOk = true; } } diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index 195bafd7d760..127726796d06 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -480,14 +480,14 @@ sal_Int64 SAL_CALL SwXMLImport::getSomething( const Sequence< sal_Int8 >& rId ) static OTextCursorHelper *lcl_xml_GetSwXTextCursor( const Reference < XTextCursor >& rTextCursor ) { - Reference<XUnoTunnel> xCrsrTunnel( rTextCursor, UNO_QUERY ); - OSL_ENSURE( xCrsrTunnel.is(), "missing XUnoTunnel for Cursor" ); - if( !xCrsrTunnel.is() ) + Reference<XUnoTunnel> xCursorTunnel( rTextCursor, UNO_QUERY ); + OSL_ENSURE( xCursorTunnel.is(), "missing XUnoTunnel for Cursor" ); + if( !xCursorTunnel.is() ) return nullptr; - OTextCursorHelper *pTextCrsr = reinterpret_cast< OTextCursorHelper *>( - sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() ))); - OSL_ENSURE( pTextCrsr, "SwXTextCursor missing" ); - return pTextCrsr; + OTextCursorHelper *pTextCursor = reinterpret_cast< OTextCursorHelper *>( + sal::static_int_cast< sal_IntPtr >( xCursorTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() ))); + OSL_ENSURE( pTextCursor, "SwXTextCursor missing" ); + return pTextCursor; } void SwXMLImport::startDocument() @@ -588,7 +588,7 @@ void SwXMLImport::startDocument() // We also might change into the insert mode later, so we have to make // sure to first set the insert mode and then create the text import // helper. Otherwise it won't have the insert flag set! - OTextCursorHelper *pTextCrsr = nullptr; + OTextCursorHelper *pTextCursor = nullptr; Reference < XTextCursor > xTextCursor; if( HasTextImport() ) xTextCursor = GetTextImport()->GetCursor(); @@ -597,16 +597,16 @@ void SwXMLImport::startDocument() Reference < XTextDocument > xTextDoc( GetModel(), UNO_QUERY ); Reference < XText > xText = xTextDoc->getText(); xTextCursor = xText->createTextCursor(); - SwCrsrShell *pCrsrSh = nullptr; + SwCursorShell *pCursorSh = nullptr; SwDoc *pDoc = nullptr; if( SvXMLImportFlags::ALL == getImportFlags() ) { - pTextCrsr = lcl_xml_GetSwXTextCursor( xTextCursor ); - OSL_ENSURE( pTextCrsr, "SwXTextCursor missing" ); - if( !pTextCrsr ) + pTextCursor = lcl_xml_GetSwXTextCursor( xTextCursor ); + OSL_ENSURE( pTextCursor, "SwXTextCursor missing" ); + if( !pTextCursor ) return; - pDoc = pTextCrsr->GetDoc(); + pDoc = pTextCursor->GetDoc(); OSL_ENSURE( pDoc, "SwDoc missing" ); if( !pDoc ) return; @@ -615,16 +615,16 @@ void SwXMLImport::startDocument() // a document. We then have to insert at the current edit shell's // cursor position. That not quite clean code, but there is no other // way currently. - pCrsrSh = pDoc->GetEditShell(); + pCursorSh = pDoc->GetEditShell(); } - if( pCrsrSh ) + if( pCursorSh ) { const uno::Reference<text::XTextRange> xInsertTextRange( SwXTextRange::CreateXTextRange( - *pDoc, *pCrsrSh->GetCrsr()->GetPoint(), nullptr ) ); + *pDoc, *pCursorSh->GetCursor()->GetPoint(), nullptr ) ); setTextInsertMode( xInsertTextRange ); xTextCursor = GetTextImport()->GetCursor(); - pTextCrsr = nullptr; + pTextCursor = nullptr; } else GetTextImport()->SetCursor( xTextCursor ); @@ -633,13 +633,13 @@ void SwXMLImport::startDocument() if( (!(getImportFlags() & (SvXMLImportFlags::CONTENT|SvXMLImportFlags::MASTERSTYLES)))) return; - if( !pTextCrsr ) - pTextCrsr = lcl_xml_GetSwXTextCursor( xTextCursor ); - OSL_ENSURE( pTextCrsr, "SwXTextCursor missing" ); - if( !pTextCrsr ) + if( !pTextCursor ) + pTextCursor = lcl_xml_GetSwXTextCursor( xTextCursor ); + OSL_ENSURE( pTextCursor, "SwXTextCursor missing" ); + if( !pTextCursor ) return; - SwDoc *pDoc = pTextCrsr->GetDoc(); + SwDoc *pDoc = pTextCursor->GetDoc(); OSL_ENSURE( pDoc, "SwDoc missing" ); if( !pDoc ) return; @@ -656,7 +656,7 @@ void SwXMLImport::startDocument() m_pSttNdIdx = new SwNodeIndex( pDoc->GetNodes() ); if( IsInsertMode() ) { - SwPaM *pPaM = pTextCrsr->GetPaM(); + SwPaM *pPaM = pTextCursor->GetPaM(); const SwPosition* pPos = pPaM->GetPoint(); // Split once and remember the node that has been splitted. @@ -725,13 +725,13 @@ void SwXMLImport::endDocument() SwDoc *pDoc = nullptr; if( (getImportFlags() & SvXMLImportFlags::CONTENT) && !IsStylesOnlyMode() ) { - Reference<XUnoTunnel> xCrsrTunnel( GetTextImport()->GetCursor(), + Reference<XUnoTunnel> xCursorTunnel( GetTextImport()->GetCursor(), UNO_QUERY); - assert(xCrsrTunnel.is() && "missing XUnoTunnel for Cursor"); - OTextCursorHelper *pTextCrsr = reinterpret_cast< OTextCursorHelper *>( - sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() ))); - assert(pTextCrsr && "SwXTextCursor missing"); - SwPaM *pPaM = pTextCrsr->GetPaM(); + assert(xCursorTunnel.is() && "missing XUnoTunnel for Cursor"); + OTextCursorHelper *pTextCursor = reinterpret_cast< OTextCursorHelper *>( + sal::static_int_cast< sal_IntPtr >( xCursorTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() ))); + assert(pTextCursor && "SwXTextCursor missing"); + SwPaM *pPaM = pTextCursor->GetPaM(); if( IsInsertMode() && m_pSttNdIdx->GetIndex() ) { // If we are in insert mode, join the splitted node that is in front diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx index 2a0d155f9f93..0e28509b7edd 100644 --- a/sw/source/filter/xml/xmlimpit.cxx +++ b/sw/source/filter/xml/xmlimpit.cxx @@ -845,12 +845,12 @@ bool SvXMLImportItemMapper::PutXMLValue( case RES_FRM_SIZE: { - SwFormatFrmSize& rFrmSize = dynamic_cast<SwFormatFrmSize&>(rItem); + SwFormatFrameSize& rFrameSize = dynamic_cast<SwFormatFrameSize&>(rItem); bool bSetHeight = false; bool bSetWidth = false; bool bSetSizeType = false; - SwFrmSize eSizeType = ATT_VAR_SIZE; + SwFrameSize eSizeType = ATT_VAR_SIZE; sal_Int32 nMin = MINLAY; switch( nMemberId ) @@ -866,7 +866,7 @@ bool SvXMLImportItemMapper::PutXMLValue( else if( nValue > 100 ) nValue = 100; - rFrmSize.SetWidthPercent( (sal_Int8)nValue ); + rFrameSize.SetWidthPercent( (sal_Int8)nValue ); } } break; @@ -901,8 +901,8 @@ bool SvXMLImportItemMapper::PutXMLValue( else if( nValue > USHRT_MAX ) nValue = USHRT_MAX; - rFrmSize.SetWidth( (sal_uInt16)nValue ); - rFrmSize.SetHeightSizeType( ATT_VAR_SIZE ); + rFrameSize.SetWidth( (sal_uInt16)nValue ); + rFrameSize.SetHeightSizeType( ATT_VAR_SIZE ); bOk = true; } } @@ -917,11 +917,11 @@ bool SvXMLImportItemMapper::PutXMLValue( if( bOk ) { if( bSetWidth ) - rFrmSize.SetWidth( (sal_uInt16)nValue ); + rFrameSize.SetWidth( (sal_uInt16)nValue ); if( bSetHeight ) - rFrmSize.SetHeight( (sal_uInt16)nValue ); + rFrameSize.SetHeight( (sal_uInt16)nValue ); if( bSetSizeType ) - rFrmSize.SetHeightSizeType( eSizeType ); + rFrameSize.SetHeightSizeType( eSizeType ); } } } diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx index 1852787fb193..227ea830d9b2 100644 --- a/sw/source/filter/xml/xmltble.cxx +++ b/sw/source/filter/xml/xmltble.cxx @@ -191,14 +191,14 @@ bool SwXMLTableFrameFormatsSort_Impl::AddRow( SwFrameFormat& rFrameFormat, const OUString& rNamePrefix, sal_uInt32 nLine ) { - const SwFormatFrmSize *pFrmSize = nullptr; + const SwFormatFrameSize *pFrameSize = nullptr; const SwFormatRowSplit* pRowSplit = nullptr; const SvxBrushItem *pBrush = nullptr; const SfxItemSet& rItemSet = rFrameFormat.GetAttrSet(); const SfxPoolItem *pItem; if( SfxItemState::SET == rItemSet.GetItemState( RES_FRM_SIZE, false, &pItem ) ) - pFrmSize = static_cast<const SwFormatFrmSize *>(pItem); + pFrameSize = static_cast<const SwFormatFrameSize *>(pItem); if( SfxItemState::SET == rItemSet.GetItemState( RES_ROW_SPLIT, false, &pItem ) ) pRowSplit = static_cast<const SwFormatRowSplit *>(pItem); @@ -207,7 +207,7 @@ bool SwXMLTableFrameFormatsSort_Impl::AddRow( SwFrameFormat& rFrameFormat, pBrush = static_cast<const SvxBrushItem *>(pItem); // empty styles have not to be exported - if( !pFrmSize && !pBrush && !pRowSplit ) + if( !pFrameSize && !pBrush && !pRowSplit ) return false; // order is: -/brush, size/-, size/brush @@ -215,7 +215,7 @@ bool SwXMLTableFrameFormatsSort_Impl::AddRow( SwFrameFormat& rFrameFormat, SwXMLFrameFormats_Impl::iterator i; for( i = aFormatList.begin(); i < aFormatList.end(); ++i ) { - const SwFormatFrmSize *pTestFrmSize = nullptr; + const SwFormatFrameSize *pTestFrameSize = nullptr; const SwFormatRowSplit* pTestRowSplit = nullptr; const SvxBrushItem *pTestBrush = nullptr; const SwFrameFormat *pTestFormat = *i; @@ -223,14 +223,14 @@ bool SwXMLTableFrameFormatsSort_Impl::AddRow( SwFrameFormat& rFrameFormat, if( SfxItemState::SET == rTestSet.GetItemState( RES_FRM_SIZE, false, &pItem ) ) { - if( !pFrmSize ) + if( !pFrameSize ) break; - pTestFrmSize = static_cast<const SwFormatFrmSize *>(pItem); + pTestFrameSize = static_cast<const SwFormatFrameSize *>(pItem); } else { - if( pFrmSize ) + if( pFrameSize ) continue; } @@ -262,9 +262,9 @@ bool SwXMLTableFrameFormatsSort_Impl::AddRow( SwFrameFormat& rFrameFormat, continue; } - if( pFrmSize && - ( pFrmSize->GetHeightSizeType() != pTestFrmSize->GetHeightSizeType() || - pFrmSize->GetHeight() != pTestFrmSize->GetHeight() ) ) + if( pFrameSize && + ( pFrameSize->GetHeightSizeType() != pTestFrameSize->GetHeightSizeType() || + pFrameSize->GetHeight() != pTestFrameSize->GetHeight() ) ) continue; if( pBrush && (*pBrush != *pTestBrush) ) @@ -701,11 +701,11 @@ void SwXMLExport::ExportTableAutoStyles( const SwTableNode& rTableNd ) if( pTableFormat ) { sal_Int16 eTabHoriOri = pTableFormat->GetHoriOrient().GetHoriOrient(); - const SwFormatFrmSize& rFrmSize = pTableFormat->GetFrmSize(); + const SwFormatFrameSize& rFrameSize = pTableFormat->GetFrameSize(); - sal_uInt32 nAbsWidth = rFrmSize.GetSize().Width(); + sal_uInt32 nAbsWidth = rFrameSize.GetSize().Width(); sal_uInt32 nBaseWidth = 0UL; - sal_Int8 nPrcWidth = rFrmSize.GetWidthPercent(); + sal_Int8 nPrcWidth = rFrameSize.GetWidthPercent(); bool bFixAbsWidth = nPrcWidth != 0 || /*text::*/HoriOrientation::NONE == eTabHoriOri || /*text::*/HoriOrientation::FULL == eTabHoriOri; diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 8cb7e491f4cf..a5ec78a33e5f 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -691,26 +691,26 @@ void SwXMLTableCellContext_Impl::EndElement() xSrcTextCursor->gotoEnd( sal_True ); // Until we have an API for copying we have to use the core. - Reference<XUnoTunnel> xSrcCrsrTunnel( xSrcTextCursor, UNO_QUERY); - assert(xSrcCrsrTunnel.is() && "missing XUnoTunnel for Cursor"); - OTextCursorHelper *pSrcTextCrsr = reinterpret_cast< OTextCursorHelper * >( - sal::static_int_cast< sal_IntPtr >( xSrcCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() ))); - assert(pSrcTextCrsr && "SwXTextCursor missing"); - SwDoc *pDoc = pSrcTextCrsr->GetDoc(); - const SwPaM *pSrcPaM = pSrcTextCrsr->GetPaM(); + Reference<XUnoTunnel> xSrcCursorTunnel( xSrcTextCursor, UNO_QUERY); + assert(xSrcCursorTunnel.is() && "missing XUnoTunnel for Cursor"); + OTextCursorHelper *pSrcTextCursor = reinterpret_cast< OTextCursorHelper * >( + sal::static_int_cast< sal_IntPtr >( xSrcCursorTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() ))); + assert(pSrcTextCursor && "SwXTextCursor missing"); + SwDoc *pDoc = pSrcTextCursor->GetDoc(); + const SwPaM *pSrcPaM = pSrcTextCursor->GetPaM(); while( nColRepeat > 1 && GetTable()->IsInsertCellPossible() ) { _InsertContent(); - Reference<XUnoTunnel> xDstCrsrTunnel( + Reference<XUnoTunnel> xDstCursorTunnel( GetImport().GetTextImport()->GetCursor(), UNO_QUERY); - assert(xDstCrsrTunnel.is() && "missing XUnoTunnel for Cursor"); - OTextCursorHelper *pDstTextCrsr = reinterpret_cast< OTextCursorHelper * >( - sal::static_int_cast< sal_IntPtr >( xDstCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )) ); - assert(pDstTextCrsr && "SwXTextCursor missing"); + assert(xDstCursorTunnel.is() && "missing XUnoTunnel for Cursor"); + OTextCursorHelper *pDstTextCursor = reinterpret_cast< OTextCursorHelper * >( + sal::static_int_cast< sal_IntPtr >( xDstCursorTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )) ); + assert(pDstTextCursor && "SwXTextCursor missing"); SwPaM aSrcPaM(*pSrcPaM->GetMark(), *pSrcPaM->GetPoint()); - SwPosition aDstPos( *pDstTextCrsr->GetPaM()->GetPoint() ); + SwPosition aDstPos( *pDstTextCursor->GetPaM()->GetPoint() ); pDoc->getIDocumentContentOperations().CopyRange( aSrcPaM, aDstPos, /*bCopyAll=*/false, /*bCheckPos=*/true ); nColRepeat--; @@ -801,7 +801,7 @@ SwXMLTableColContext_Impl::SwXMLTableColContext_Impl( SfxItemState::SET == pAutoItemSet->GetItemState( RES_FRM_SIZE, false, &pItem ) ) { - const SwFormatFrmSize *pSize = static_cast<const SwFormatFrmSize *>(pItem); + const SwFormatFrameSize *pSize = static_cast<const SwFormatFrameSize *>(pItem); nWidth = pSize->GetWidth(); bRelWidth = ATT_VAR_SIZE == pSize->GetHeightSizeType(); } @@ -1921,7 +1921,7 @@ SwTableBox *SwXMLTableContext::MakeTableBox( SwTableLine *pUpper, pFrameFormat->ResetAllFormatAttr(); // #i73790# - method renamed pFrameFormat->SetFormatAttr( aFillOrder ); - pFrameFormat->SetFormatAttr( SwFormatFrmSize( ATT_VAR_SIZE, nColWidth ) ); + pFrameFormat->SetFormatAttr( SwFormatFrameSize( ATT_VAR_SIZE, nColWidth ) ); SwTableLines& rLines = pBox->GetTabLines(); bool bSplitted = false; @@ -2168,7 +2168,7 @@ SwTableBox *SwXMLTableContext::MakeTableBox( if (! bModifyLocked) pBoxFormat2->UnlockModify(); - pBoxFormat2->SetFormatAttr( SwFormatFrmSize( ATT_VAR_SIZE, nColWidth ) ); + pBoxFormat2->SetFormatAttr( SwFormatFrameSize( ATT_VAR_SIZE, nColWidth ) ); return pBox; } @@ -2702,10 +2702,10 @@ void SwXMLTableContext::MakeTable() bSetHoriOrient = true; } - const SwFormatFrmSize *pSize = nullptr; + const SwFormatFrameSize *pSize = nullptr; if( SfxItemState::SET == pAutoItemSet->GetItemState( RES_FRM_SIZE, false, &pItem ) ) - pSize = static_cast<const SwFormatFrmSize *>(pItem); + pSize = static_cast<const SwFormatFrameSize *>(pItem); switch( eHoriOrient ) { @@ -2776,7 +2776,7 @@ void SwXMLTableContext::MakeTable() // This must be after the call to _MakeTable, because nWidth might be // changed there. pFrameFormat->LockModify(); - SwFormatFrmSize aSize( ATT_VAR_SIZE, m_nWidth ); + SwFormatFrameSize aSize( ATT_VAR_SIZE, m_nWidth ); aSize.SetWidthPercent( nPrcWidth ); pFrameFormat->SetFormatAttr( aSize ); pFrameFormat->UnlockModify(); @@ -2806,9 +2806,9 @@ void SwXMLTableContext::MakeTable() // ??? this is always false: root frame is only created in SwViewShell::Init if( m_pTableNode->GetDoc()->getIDocumentLayoutAccess().GetCurrentViewShell() ) { - m_pTableNode->DelFrms(); + m_pTableNode->DelFrames(); SwNodeIndex aIdx( *m_pTableNode->EndOfSectionNode(), 1 ); - m_pTableNode->MakeFrms( &aIdx ); + m_pTableNode->MakeFrames( &aIdx ); } } @@ -2840,17 +2840,17 @@ const SwStartNode *SwXMLTableContext::InsertTableSection( ->InsertTableSection(pPrevSttNd, pStringValueStyleName); const SwStartNode *pStNd; - Reference<XUnoTunnel> xCrsrTunnel( GetImport().GetTextImport()->GetCursor(), + Reference<XUnoTunnel> xCursorTunnel( GetImport().GetTextImport()->GetCursor(), UNO_QUERY); - OSL_ENSURE( xCrsrTunnel.is(), "missing XUnoTunnel for Cursor" ); - OTextCursorHelper *pTextCrsr = reinterpret_cast< OTextCursorHelper * >( - sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() ))); - OSL_ENSURE( pTextCrsr, "SwXTextCursor missing" ); + OSL_ENSURE( xCursorTunnel.is(), "missing XUnoTunnel for Cursor" ); + OTextCursorHelper *pTextCursor = reinterpret_cast< OTextCursorHelper * >( + sal::static_int_cast< sal_IntPtr >( xCursorTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() ))); + OSL_ENSURE( pTextCursor, "SwXTextCursor missing" ); if( m_bFirstSection ) { // The Cursor already is in the first section - pStNd = pTextCrsr->GetPaM()->GetNode().FindTableBoxStartNode(); + pStNd = pTextCursor->GetPaM()->GetNode().FindTableBoxStartNode(); m_bFirstSection = false; GetImport().GetTextImport()->SetStyleAndAttrs( GetImport(), GetImport().GetTextImport()->GetCursor(), "Standard", true ); @@ -2861,7 +2861,7 @@ const SwStartNode *SwXMLTableContext::InsertTableSection( const SwEndNode *pEndNd = pPrevSttNd ? pPrevSttNd->EndOfSectionNode() : m_pTableNode->EndOfSectionNode(); // #i78921# - make code robust - OSL_ENSURE( pDoc, "<SwXMLTableContext::InsertTableSection(..)> - no <pDoc> at <SwXTextCursor> instance - <SwXTextCurosr> doesn't seem to be registered at a <SwUnoCrsr> instance." ); + OSL_ENSURE( pDoc, "<SwXMLTableContext::InsertTableSection(..)> - no <pDoc> at <SwXTextCursor> instance - <SwXTextCurosr> doesn't seem to be registered at a <SwUnoCursor> instance." ); if ( !pDoc ) { pDoc = const_cast<SwDoc*>(pEndNd->GetDoc()); diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx index d310886bb0bd..b6e3f4f11586 100644 --- a/sw/source/filter/xml/xmltexte.cxx +++ b/sw/source/filter/xml/xmltexte.cxx @@ -68,10 +68,10 @@ enum SvEmbeddedObjectTypes SwNoTextNode *SwXMLTextParagraphExport::GetNoTextNode( const Reference < XPropertySet >& rPropSet ) { - Reference<XUnoTunnel> xCrsrTunnel( rPropSet, UNO_QUERY ); - assert(xCrsrTunnel.is() && "missing XUnoTunnel for embedded"); + Reference<XUnoTunnel> xCursorTunnel( rPropSet, UNO_QUERY ); + assert(xCursorTunnel.is() && "missing XUnoTunnel for embedded"); SwXFrame *pFrame = reinterpret_cast< SwXFrame * >( - sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( SwXFrame::getUnoTunnelId() ))); + sal::static_int_cast< sal_IntPtr >( xCursorTunnel->getSomething( SwXFrame::getUnoTunnelId() ))); assert(pFrame && "SwXFrame missing"); SwFrameFormat *pFrameFormat = pFrame->GetFrameFormat(); const SwFormatContent& rContent = pFrameFormat->GetContent(); diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx index 7f7a3481ac9d..a57a910aee9b 100644 --- a/sw/source/filter/xml/xmltexti.cxx +++ b/sw/source/filter/xml/xmltexti.cxx @@ -105,7 +105,7 @@ static void lcl_putHeightAndWidth ( SfxItemSet &rItemSet, nHeight = convertMm100ToTwip( nHeight ); if( nHeight < MINFLY ) nHeight = MINFLY; - rItemSet.Put( SwFormatFrmSize( ATT_FIX_SIZE, nWidth, nHeight ) ); + rItemSet.Put( SwFormatFrameSize( ATT_FIX_SIZE, nWidth, nHeight ) ); } SwFormatAnchor aAnchor( FLY_AT_CHAR ); @@ -183,15 +183,15 @@ SvXMLImportContext *SwXMLTextImportHelper::CreateTableChildContext( bool SwXMLTextImportHelper::IsInHeaderFooter() const { - uno::Reference<XUnoTunnel> xCrsrTunnel( + uno::Reference<XUnoTunnel> xCursorTunnel( const_cast<SwXMLTextImportHelper *>(this)->GetCursor(), UNO_QUERY ); - assert(xCrsrTunnel.is() && "missing XUnoTunnel for Cursor"); - OTextCursorHelper *pTextCrsr = reinterpret_cast< OTextCursorHelper * >( - sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() ))); - SAL_WARN_IF(!pTextCrsr, "sw.uno", "SwXTextCursor missing"); - SwDoc *pDoc = pTextCrsr ? pTextCrsr->GetDoc() : nullptr; + assert(xCursorTunnel.is() && "missing XUnoTunnel for Cursor"); + OTextCursorHelper *pTextCursor = reinterpret_cast< OTextCursorHelper * >( + sal::static_int_cast< sal_IntPtr >( xCursorTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() ))); + SAL_WARN_IF(!pTextCursor, "sw.uno", "SwXTextCursor missing"); + SwDoc *pDoc = pTextCursor ? pTextCursor->GetDoc() : nullptr; - return pDoc && pDoc->IsInHeaderFooter( pTextCrsr->GetPaM()->GetPoint()->nNode ); + return pDoc && pDoc->IsInHeaderFooter( pTextCursor->GetPaM()->GetPoint()->nNode ); } static SwOLENode *lcl_GetOLENode( const SwFrameFormat *pFrameFormat ) @@ -228,11 +228,11 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject( if( aObjName.isEmpty() ) return xPropSet; - uno::Reference<XUnoTunnel> xCrsrTunnel( GetCursor(), UNO_QUERY ); - assert(xCrsrTunnel.is() && "missing XUnoTunnel for Cursor"); - OTextCursorHelper *pTextCrsr = reinterpret_cast< OTextCursorHelper * >( - sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() ))); - SAL_WARN_IF(!pTextCrsr, "sw.uno", "SwXTextCursor missing"); + uno::Reference<XUnoTunnel> xCursorTunnel( GetCursor(), UNO_QUERY ); + assert(xCursorTunnel.is() && "missing XUnoTunnel for Cursor"); + OTextCursorHelper *pTextCursor = reinterpret_cast< OTextCursorHelper * >( + sal::static_int_cast< sal_IntPtr >( xCursorTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() ))); + SAL_WARN_IF(!pTextCursor, "sw.uno", "SwXTextCursor missing"); SwDoc *pDoc = SwImport::GetDocFromXMLImport( rImport ); SfxItemSet aItemSet( pDoc->GetAttrPool(), RES_FRMATR_BEGIN, @@ -286,9 +286,9 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject( lcl_setObjectVisualArea( xObj, nAspect, aTwipSize, MAP_TWIP ); } - if( pTextCrsr ) + if( pTextCursor ) { - pFrameFormat = pDoc->getIDocumentContentOperations().Insert( *pTextCrsr->GetPaM(), + pFrameFormat = pDoc->getIDocumentContentOperations().Insert( *pTextCursor->GetPaM(), ::svt::EmbeddedObjectRef( xObj, embed::Aspects::MSOLE_CONTENT ), &aItemSet, nullptr, @@ -342,9 +342,9 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject( // the correct aspect will be set later // TODO/LATER: Actually it should be set here - if( pTextCrsr ) + if( pTextCursor ) { - pFrameFormat = pDoc->getIDocumentContentOperations().InsertOLE( *pTextCrsr->GetPaM(), aName, embed::Aspects::MSOLE_CONTENT, &aItemSet, nullptr, nullptr ); + pFrameFormat = pDoc->getIDocumentContentOperations().InsertOLE( *pTextCursor->GetPaM(), aName, embed::Aspects::MSOLE_CONTENT, &aItemSet, nullptr, nullptr ); pOLENd = lcl_GetOLENode( pFrameFormat ); } aObjName = aName; @@ -542,11 +542,11 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOOoLink( uno::Reference < XPropertySet > xPropSet; - uno::Reference<XUnoTunnel> xCrsrTunnel( GetCursor(), UNO_QUERY ); - assert(xCrsrTunnel.is() && "missing XUnoTunnel for Cursor"); - OTextCursorHelper *pTextCrsr = reinterpret_cast< OTextCursorHelper * >( - sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() ))); - OSL_ENSURE( pTextCrsr, "SwXTextCursor missing" ); + uno::Reference<XUnoTunnel> xCursorTunnel( GetCursor(), UNO_QUERY ); + assert(xCursorTunnel.is() && "missing XUnoTunnel for Cursor"); + OTextCursorHelper *pTextCursor = reinterpret_cast< OTextCursorHelper * >( + sal::static_int_cast< sal_IntPtr >( xCursorTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() ))); + OSL_ENSURE( pTextCursor, "SwXTextCursor missing" ); SwDoc *pDoc = SwImport::GetDocFromXMLImport( rImport ); SfxItemSet aItemSet( pDoc->GetAttrPool(), RES_FRMATR_BEGIN, @@ -593,7 +593,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOOoLink( uno::UNO_QUERY_THROW ); { - SwFrameFormat *pFrameFormat = pDoc->getIDocumentContentOperations().Insert( *pTextCrsr->GetPaM(), + SwFrameFormat *pFrameFormat = pDoc->getIDocumentContentOperations().Insert( *pTextCursor->GetPaM(), ::svt::EmbeddedObjectRef( xObj, embed::Aspects::MSOLE_CONTENT ), &aItemSet, nullptr, @@ -630,12 +630,12 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertApplet( SolarMutexGuard aGuard; uno::Reference < XPropertySet > xPropSet; - uno::Reference<XUnoTunnel> xCrsrTunnel( GetCursor(), UNO_QUERY ); - assert(xCrsrTunnel.is() && "missing XUnoTunnel for Cursor"); - OTextCursorHelper *pTextCrsr = reinterpret_cast< OTextCursorHelper * >( - sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() ))); - OSL_ENSURE( pTextCrsr, "SwXTextCursor missing" ); - SwDoc *pDoc = pTextCrsr->GetDoc(); + uno::Reference<XUnoTunnel> xCursorTunnel( GetCursor(), UNO_QUERY ); + assert(xCursorTunnel.is() && "missing XUnoTunnel for Cursor"); + OTextCursorHelper *pTextCursor = reinterpret_cast< OTextCursorHelper * >( + sal::static_int_cast< sal_IntPtr >( xCursorTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() ))); + OSL_ENSURE( pTextCursor, "SwXTextCursor missing" ); + SwDoc *pDoc = pTextCursor->GetDoc(); SfxItemSet aItemSet( pDoc->GetAttrPool(), RES_FRMATR_BEGIN, RES_FRMATR_END ); @@ -655,7 +655,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertApplet( Size( nWidth, nHeight ), MAP_100TH_MM ); - SwFrameFormat *pFrameFormat = pDoc->getIDocumentContentOperations().Insert( *pTextCrsr->GetPaM(), + SwFrameFormat *pFrameFormat = pDoc->getIDocumentContentOperations().Insert( *pTextCursor->GetPaM(), ::svt::EmbeddedObjectRef( aAppletImpl.GetApplet(), embed::Aspects::MSOLE_CONTENT ), &aAppletImpl.GetItemSet(), nullptr, @@ -677,12 +677,12 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertPlugin( sal_Int32 nWidth, sal_Int32 nHeight ) { uno::Reference < XPropertySet > xPropSet; - uno::Reference<XUnoTunnel> xCrsrTunnel( GetCursor(), UNO_QUERY ); - assert(xCrsrTunnel.is() && "missing XUnoTunnel for Cursor"); - OTextCursorHelper *pTextCrsr = reinterpret_cast< OTextCursorHelper * >( - sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() ))); - OSL_ENSURE( pTextCrsr, "SwXTextCursor missing" ); - SwDoc *pDoc = pTextCrsr->GetDoc(); + uno::Reference<XUnoTunnel> xCursorTunnel( GetCursor(), UNO_QUERY ); + assert(xCursorTunnel.is() && "missing XUnoTunnel for Cursor"); + OTextCursorHelper *pTextCursor = reinterpret_cast< OTextCursorHelper * >( + sal::static_int_cast< sal_IntPtr >( xCursorTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() ))); + OSL_ENSURE( pTextCursor, "SwXTextCursor missing" ); + SwDoc *pDoc = pTextCursor->GetDoc(); SfxItemSet aItemSet( pDoc->GetAttrPool(), RES_FRMATR_BEGIN, RES_FRMATR_END ); @@ -730,7 +730,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertPlugin( makeAny( OUString( rMimeType ) ) ); } - SwFrameFormat *pFrameFormat = pDoc->getIDocumentContentOperations().Insert( *pTextCrsr->GetPaM(), + SwFrameFormat *pFrameFormat = pDoc->getIDocumentContentOperations().Insert( *pTextCursor->GetPaM(), ::svt::EmbeddedObjectRef( xObj, embed::Aspects::MSOLE_CONTENT ), &aItemSet, nullptr, @@ -760,12 +760,12 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFra SolarMutexGuard aGuard; uno::Reference < XPropertySet > xPropSet; - uno::Reference<XUnoTunnel> xCrsrTunnel( GetCursor(), UNO_QUERY ); - assert(xCrsrTunnel.is() && "missing XUnoTunnel for Cursor"); - OTextCursorHelper *pTextCrsr = reinterpret_cast< OTextCursorHelper * >( - sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() ))); - OSL_ENSURE( pTextCrsr, "SwXTextCursor missing" ); - SwDoc *pDoc = pTextCrsr->GetDoc(); + uno::Reference<XUnoTunnel> xCursorTunnel( GetCursor(), UNO_QUERY ); + assert(xCursorTunnel.is() && "missing XUnoTunnel for Cursor"); + OTextCursorHelper *pTextCursor = reinterpret_cast< OTextCursorHelper * >( + sal::static_int_cast< sal_IntPtr >( xCursorTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() ))); + OSL_ENSURE( pTextCursor, "SwXTextCursor missing" ); + SwDoc *pDoc = pTextCursor->GetDoc(); SfxItemSet aItemSet( pDoc->GetAttrPool(), RES_FRMATR_BEGIN, RES_FRMATR_END ); @@ -883,7 +883,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFra makeAny( sal_Int32( aMargin.Height() ) ) ); } - SwFrameFormat *pFrameFormat = pDoc->getIDocumentContentOperations().Insert( *pTextCrsr->GetPaM(), + SwFrameFormat *pFrameFormat = pDoc->getIDocumentContentOperations().Insert( *pTextCursor->GetPaM(), ::svt::EmbeddedObjectRef( xObj, embed::Aspects::MSOLE_CONTENT ), &aItemSet, nullptr, @@ -912,10 +912,10 @@ void SwXMLTextImportHelper::endAppletOrPlugin( // this method will modify the document directly -> lock SolarMutex SolarMutexGuard aGuard; - uno::Reference<XUnoTunnel> xCrsrTunnel( rPropSet, UNO_QUERY ); - assert(xCrsrTunnel.is() && "missing XUnoTunnel for embedded"); + uno::Reference<XUnoTunnel> xCursorTunnel( rPropSet, UNO_QUERY ); + assert(xCursorTunnel.is() && "missing XUnoTunnel for embedded"); SwXFrame *pFrame = reinterpret_cast< SwXFrame * >( - sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( SwXFrame::getUnoTunnelId() ))); + sal::static_int_cast< sal_IntPtr >( xCursorTunnel->getSomething( SwXFrame::getUnoTunnelId() ))); OSL_ENSURE( pFrame, "SwXFrame missing" ); SwFrameFormat *pFrameFormat = pFrame->GetFrameFormat(); const SwFormatContent& rContent = pFrameFormat->GetContent(); |