This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push: new 3945fe2 Fixed typos (sould -> should) and some more 3945fe2 is described below commit 3945fe28166b82700c7d567fedab7482a96de498 Author: mseidel <msei...@apache.org> AuthorDate: Wed Aug 26 23:29:14 2020 +0200 Fixed typos (sould -> should) and some more --- .../sun/star/ucb/XInteractionCookieHandling.idl | 11 +- .../inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx | 14 +- main/sw/source/core/layout/paintfrm.cxx | 104 +++++++-------- main/sw/source/filter/ww8/docxattributeoutput.cxx | 142 ++++++++++----------- 4 files changed, 137 insertions(+), 134 deletions(-) diff --git a/main/offapi/com/sun/star/ucb/XInteractionCookieHandling.idl b/main/offapi/com/sun/star/ucb/XInteractionCookieHandling.idl index 917be4b..f3cd7c8 100644 --- a/main/offapi/com/sun/star/ucb/XInteractionCookieHandling.idl +++ b/main/offapi/com/sun/star/ucb/XInteractionCookieHandling.idl @@ -1,5 +1,5 @@ /************************************************************** - * + * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -7,19 +7,20 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * *************************************************************/ + #ifndef __com_sun_star_ucb_XInteractionCookieHandling_idl__ #define __com_sun_star_ucb_XInteractionCookieHandling_idl__ @@ -65,7 +66,7 @@ published interface XInteractionCookieHandling: com::sun::star::task::XInteracti <p>This method should be called before select(). @param ConfirmCookie - A cookie that sould come from the sequence of + A cookie that should come from the sequence of cookies offered by the <type>HandleCookiesRequest</type> and that should have a policy of <member>CookiePolicy::CONFIRM</member>. diff --git a/main/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx b/main/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx index d05cb27..4c3a6e8 100644 --- a/main/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx +++ b/main/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx @@ -1,5 +1,5 @@ /************************************************************** - * + * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -7,16 +7,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * *************************************************************/ @@ -47,7 +47,7 @@ namespace drawinglayer class SdrTextPrimitive2D : public BufferedDecompositionPrimitive2D { private: - // The text model data; this sould later just be the OutlinerParaObject or + // The text model data; this should later just be the OutlinerParaObject or // something equal ::tools::WeakReference< SdrText > mrSdrText; @@ -86,7 +86,7 @@ namespace drawinglayer public: SdrTextPrimitive2D( - const SdrText* pSdrText, + const SdrText* pSdrText, const OutlinerParaObject& rOutlinerParaObjectPtr); // get data @@ -129,7 +129,7 @@ namespace drawinglayer SdrContourTextPrimitive2D( const SdrText* pSdrText, const OutlinerParaObject& rOutlinerParaObjectPtr, - const basegfx::B2DPolyPolygon& rUnitPolyPolygon, + const basegfx::B2DPolyPolygon& rUnitPolyPolygon, const basegfx::B2DHomMatrix& rObjectTransform); // get data diff --git a/main/sw/source/core/layout/paintfrm.cxx b/main/sw/source/core/layout/paintfrm.cxx index eb70ae1..9a1cc36 100644 --- a/main/sw/source/core/layout/paintfrm.cxx +++ b/main/sw/source/core/layout/paintfrm.cxx @@ -1,5 +1,5 @@ /************************************************************** - * + * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -7,18 +7,20 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * *************************************************************/ + + // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" @@ -958,7 +960,7 @@ void SwSubsRects::PaintSubsidiary( OutputDevice *pOut, case SUBCOL_FLY: pCol = &SwViewOption::GetObjectBoundariesColor(); break; case SUBCOL_TAB: pCol = &SwViewOption::GetTableBoundariesColor(); break; case SUBCOL_SECT: pCol = &SwViewOption::GetSectionBoundColor(); break; - case SUBCOL_BREAK: pCol = &SwViewOption::GetPageBreakColor(); break; + case SUBCOL_BREAK: pCol = &SwViewOption::GetPageBreakColor(); break; } if ( pOut->GetFillColor() != *pCol ) @@ -1417,12 +1419,12 @@ void MA_FASTCALL lcl_ExtendLeftAndRight( SwRect& _rRect, // // have not to be subtracted from given region. // // But, if method is called for a fly frame and // // <pFly> is a direct lower of this fly frame and -// // <pFly> inherites its transparent background brush from its parent, +// // <pFly> inherits its transparent background brush from its parent, // // then <pFly> frame area have to be subtracted from given region. // // NOTE: Because in Status Quo transparent backgrounds can only be // // assigned to fly frames, the handle of this special case // // avoids drawing of transparent areas more than once, if -// // a fly frame inherites a transparent background from its +// // a fly frame inherits a transparent background from its // // parent fly frame. // if ( pFrm->IsFlyFrm() && // (pFly->GetAnchorFrm()->FindFlyFrm() == pFrm) && @@ -1500,7 +1502,7 @@ void MA_FASTCALL lcl_ExtendLeftAndRight( SwRect& _rRect, output device the background has to be drawn in. @param _rPaintRect - paint retangle in the output device, which has to be drawn with the background. + paint rectangle in the output device, which has to be drawn with the background. rectangle have to be aligned by method ::SwAlignRect @param _rGraphicObj @@ -1631,8 +1633,8 @@ void lcl_DrawGraphic( const SvxBrushItem& rBrush, OutputDevice *pOut, } // end of method <lcl_DrawGraphic> bool MA_FASTCALL DrawFillAttributes( - const drawinglayer::attribute::SdrAllFillAttributesHelperPtr& rFillAttributes, - const SwRect& rOriginalLayoutRect, + const drawinglayer::attribute::SdrAllFillAttributesHelperPtr& rFillAttributes, + const SwRect& rOriginalLayoutRect, const SwRect& rPaintRect, OutputDevice& rOut) { @@ -1647,8 +1649,8 @@ bool MA_FASTCALL DrawFillAttributes( rPaintRect.Right(), rPaintRect.Bottom()); - if(!aPaintRange.isEmpty() && - !basegfx::fTools::equalZero(aPaintRange.getWidth()) && + if(!aPaintRange.isEmpty() && + !basegfx::fTools::equalZero(aPaintRange.getWidth()) && !basegfx::fTools::equalZero(aPaintRange.getHeight())) { const SvtOptionsDrawinglayer aSvtOptionsDrawinglayer; @@ -1660,10 +1662,10 @@ bool MA_FASTCALL DrawFillAttributes( if(aSvtOptionsDrawinglayer.IsAntiAliasing()) { // if AAed in principle expand by 0.5 in all directions. Since painting edges of - // AAed regions does not add to no transparence (0.5 opacity covered by 0.5 opacity + // AAed regions does not add to no transparency (0.5 opacity covered by 0.5 opacity // is not full opacity but 0.75 opacity) we need some overlap here to avoid paint // artifacts. Checked experimentally - a little bit more in Y is needed, probably - // due to still existing integer alignment and cruncing in writer. + // due to still existing integer alignment and crunching in Writer. static double fExpandX = 0.55; static double fExpandY = 0.70; const basegfx::B2DVector aSingleUnit(rOut.GetInverseViewTransformation() * basegfx::B2DVector(fExpandX, fExpandY)); @@ -1693,14 +1695,14 @@ bool MA_FASTCALL DrawFillAttributes( if(rSequence.getLength()) { const drawinglayer::geometry::ViewInformation2D aViewInformation2D( - basegfx::B2DHomMatrix(), - rOut.GetViewTransformation(), - aPaintRange, + basegfx::B2DHomMatrix(), + rOut.GetViewTransformation(), + aPaintRange, 0, - 0.0, + 0.0, uno::Sequence< beans::PropertyValue >()); drawinglayer::processor2d::BaseProcessor2D* pProcessor = drawinglayer::processor2d::createProcessor2DFromOutputDevice( - rOut, + rOut, aViewInformation2D); if(pProcessor) @@ -1721,7 +1723,7 @@ bool MA_FASTCALL DrawFillAttributes( return false; } -void MA_FASTCALL DrawGraphic( +void MA_FASTCALL DrawGraphic( const SvxBrushItem *pBrush, OutputDevice *pOutDev, const SwRect &rOrg, @@ -1862,7 +1864,7 @@ void MA_FASTCALL DrawGraphic( // n_chars = k1 * ---------- + k2 * A_bitmap // A_bitmap // - // minimum n_chars is obtained for (derive for A_bitmap, + // minimum n_chars is obtained for (derive for A_bitmap, // set to 0, take positive solution): // k1 // A_bitmap = Sqrt( ---- A_out ) @@ -2218,7 +2220,7 @@ SwLineEntry::SwLineEntry( SwTwips nKey, ---------- rNew */ -SwLineEntry::OverlapType SwLineEntry::Overlaps( const SwLineEntry& rNew ) const +SwLineEntry::OverlapType SwLineEntry::Overlaps( const SwLineEntry& rNew ) const { SwLineEntry::OverlapType eRet = OVERLAP3; @@ -2825,8 +2827,8 @@ namespace rOriginal, rDisplayInfo ); } }; - -} // end of anonymous namespace + +} // end of anonymous namespace // <-- /************************************************************************* @@ -2834,12 +2836,12 @@ namespace |* SwRootFrm::Paint() |* |* Beschreibung -|* Fuer jede sichtbare Seite, die von Rect ber?hrt wird einmal Painten. +|* Fuer jede sichtbare Seite, die von Rect berührt wird einmal Painten. |* 1. Umrandungen und Hintergruende Painten. -|* 2. Den Draw Layer (Ramen und Zeichenobjekte) der unter dem Dokument +|* 2. Den Draw Layer (Rahmen und Zeichenobjekte) der unter dem Dokument |* liegt painten (Hoelle). |* 3. Den Dokumentinhalt (Text) Painten. -|* 4. Den Drawlayer der ueber dem Dokuemnt liegt painten. +|* 4. Den Drawlayer der ueber dem Dokument liegt painten. |* |* Ersterstellung MA 01. Jun. 92 |* Letzte Aenderung MA 10. Oct. 97 @@ -2882,7 +2884,7 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const ::SwCalcPixStatics( pSh->GetOut() ); aGlobalRetoucheColor = pSh->Imp()->GetRetoucheColor(); - //Ggf. eine Action ausloesen um klare Verhaeltnisse zu schaffen. + //Ggf. eine Aktion ausloesen um klare Verhaeltnisse zu schaffen. //Durch diesen Kunstgriff kann in allen Paints davon ausgegangen werden, //das alle Werte gueltigt sind - keine Probleme, keine Sonderbehandlung(en). // --> OD 2008-10-07 #i92745# @@ -2948,7 +2950,7 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const while ( pPage ) { - const bool bPaintRightShadow = !bBookMode || (pPage == Lower()) || (!bLTR && !pPage->OnRightPage()) || (bLTR && pPage->OnRightPage()); + const bool bPaintRightShadow = !bBookMode || (pPage == Lower()) || (!bLTR && !pPage->OnRightPage()) || (bLTR && pPage->OnRightPage()); const bool bRightSidebar = pPage->SidebarPosition() == sw::sidebarwindows::SIDEBAR_RIGHT; if ( !pPage->IsEmptyPage() ) @@ -2998,7 +3000,7 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const // moved paint pre-process for DrawingLayer overlay here since the above // code dependent from bExtraData may expand the PaintRect { - // #i75172# if called from ViewShell::ImplEndAction it sould no longer + // #i75172# if called from ViewShell::ImplEndAction it should no longer // really be used but handled by ViewShell::ImplEndAction already const Region aDLRegion(aPaintRect.SVRect()); pSh->DLPrePaint2(aDLRegion); @@ -3032,10 +3034,10 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const { pLines->LockLines( sal_True ); const IDocumentDrawModelAccess* pIDDMA = pSh->getIDocumentDrawModelAccess(); - pSh->Imp()->PaintLayer( pIDDMA->GetHellId(), - pPrintData, + pSh->Imp()->PaintLayer( pIDDMA->GetHellId(), + pPrintData, aPaintRect, - &aPageBackgrdColor, + &aPageBackgrdColor, (pPage->IsRightToLeft() ? true : false), &aSwRedirector ); pLines->PaintLines( pSh->GetOut() ); @@ -3066,8 +3068,8 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const { /// OD 29.08.2002 #102450# - add 3rd parameter // OD 09.12.2002 #103045# - add 4th parameter for horizontal text direction. - pSh->Imp()->PaintLayer( pSh->GetDoc()->GetHeavenId(), - pPrintData, + pSh->Imp()->PaintLayer( pSh->GetDoc()->GetHeavenId(), + pPrintData, aPaintRect, &aPageBackgrdColor, (pPage->IsRightToLeft() ? true : false), @@ -3117,7 +3119,7 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const if ( aRect.IsOver( aEmptyPageRect ) ) { - // #i75172# if called from ViewShell::ImplEndAction it sould no longer + // #i75172# if called from ViewShell::ImplEndAction it should no longer // really be used but handled by ViewShell::ImplEndAction already { const Region aDLRegion(aPaintRect.SVRect()); @@ -3518,7 +3520,7 @@ sal_Bool SwFlyFrm::IsPaint( SdrObject *pObj, const ViewShell *pSh ) // --> OD #i117962# if ( pObj->ISA(SwFlyDrawObj) ) { - bPaint = false; + bPaint = false; } // <-- else if ( pObj->ISA(SwVirtFlyDrawObj) ) @@ -3804,7 +3806,7 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const } } - // OD 19.12.2002 #106318# - fly frame will paint it's subsidiary lines and + // OD 19.12.2002 #106318# - fly frame will paint its subsidiary lines and // the subsidiary lines of its lowers on its own, due to overlapping with // other fly frames or other objects. if( pGlobalShell->GetWin() @@ -3833,7 +3835,7 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const } else { - // create new special subsidiardy lines + // create new special subsidiary lines pSpecSubsLines = new SwSubsRects; bSpecSubsLineRectsCreated = true; } @@ -4101,7 +4103,7 @@ void SwFrm::PaintShadow( const SwRect& rRect, SwRect& rOutRect, if( aRegion.Count() && pGlobalShell->GetWin() && Application::GetSettings().GetStyleSettings().GetHighContrastMode() ) { - // Is heigh contrast mode, the output device has already set the + // In high contrast mode, the output device has already set the // DRAWMODE_SETTINGSFILL flag. This causes the SetFillColor function // to ignore the setting of a new color. Therefore we have to reset // the drawing mode @@ -5975,11 +5977,11 @@ void SwFrm::PaintBackground( const SwRect &rRect, const SwPageFrm *pPage, /// background transparency have to be considered /// Set missing 5th parameter to the default value GRFNUM_NO /// - see declaration in /core/inc/frmtool.hxx. - ::DrawGraphic( - pItem, - pOut, - aOrigBackRect, - aRect, // aRegion[i], + ::DrawGraphic( + pItem, + pOut, + aOrigBackRect, + aRect, // aRegion[i], GRFNUM_NO, bConsiderBackgroundTransparency ); //} @@ -6115,7 +6117,7 @@ void SwLayoutFrm::RefreshLaySubsidiary( const SwPageFrm *pPage, } } - if ( bSubsOther || bSubsSect || bSubsBody || bSubsTable || bSubsFly ) + if ( bSubsOther || bSubsSect || bSubsBody || bSubsTable || bSubsFly ) PaintSubsidiaryLines( pPage, rRect ); const SwFrm *pLow = Lower(); @@ -6487,7 +6489,7 @@ void SwLayoutFrm::RefreshExtraData( const SwRect &rRect ) const if ( pCnt->IsTxtFrm() && ( bRedLine || ( !pCnt->IsInTab() && ((bLineInBody && pCnt->IsInDocBody()) || - (bLineInFly && pCnt->IsInFly())) ) ) && + (bLineInFly && pCnt->IsInFly())) ) ) && pCnt->Frm().Top() <= rRect.Bottom() && pCnt->Frm().Bottom() >= rRect.Top() ) { @@ -6709,7 +6711,7 @@ void SwFrm::Retouche( const SwPageFrm * pPage, const SwRect &rRect ) const @return true, if a background brush for the frame is found */ -sal_Bool SwFrm::GetBackgroundBrush( +sal_Bool SwFrm::GetBackgroundBrush( drawinglayer::attribute::SdrAllFillAttributesHelperPtr& rFillAttributes, const SvxBrushItem* & rpBrush, const Color*& rpCol, @@ -6767,8 +6769,8 @@ sal_Bool SwFrm::GetBackgroundBrush( // #i125189# Do not base the decision for using the parent's fill style for this // frame when the new DrawingLayer FillAttributes are used on the SdrAllFillAttributesHelper - // information. There the data is already optimized to no fill in the case that the - // transparence is at 100% while no fill is the criteria for derivation + // information. There the data is already optimized to no fill in the case that the + // transparency is at 100% while no fill is the criteria for derivation bool bNewDrawingLayerFillStyleIsUsedAndNotNoFill(false); if(rFillAttributes.get()) @@ -6797,7 +6799,7 @@ sal_Bool SwFrm::GetBackgroundBrush( /// If <bConsiderBackgroundTransparency> is set - see above -, /// return brush of frame <pFrm>, if its color is *not* "no fill"/"auto fill" if ( - // #i125189# Done when the new DrawingLayer FillAttributes are used and + // #i125189# Done when the new DrawingLayer FillAttributes are used and // not XFILL_NONE (see above) bNewDrawingLayerFillStyleIsUsedAndNotNoFill || diff --git a/main/sw/source/filter/ww8/docxattributeoutput.cxx b/main/sw/source/filter/ww8/docxattributeoutput.cxx index a87e1a0..4ca167c 100644 --- a/main/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/main/sw/source/filter/ww8/docxattributeoutput.cxx @@ -1,5 +1,5 @@ /************************************************************** - * + * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -7,16 +7,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * *************************************************************/ @@ -161,7 +161,7 @@ void DocxAttributeOutput::StartParagraph( ww8::WW8TableNodeInfo::Pointer_t pText if ( nRow == 0 && nCell == 0 ) { // Do we have to start the table? - // [If we are at the rigth depth already, it means that we + // [If we are at the right depth already, it means that we // continue the table cell] sal_uInt32 nCurrentDepth = pTextNodeInfo->getDepth(); @@ -190,7 +190,7 @@ void DocxAttributeOutput::StartParagraph( ww8::WW8TableNodeInfo::Pointer_t pText // no section break in this paragraph yet; can be set in SectionBreak() m_pSectionInfo = NULL; - + m_bParagraphOpened = true; } @@ -220,7 +220,7 @@ void DocxAttributeOutput::FinishTableRowCell( ww8::WW8TableNodeInfoInner::Pointe if ( pInner->isEndOfCell() ) { if ( bForceEmptyParagraph ) - m_pSerializer->singleElementNS( XML_w, XML_p, FSEND ); + m_pSerializer->singleElementNS( XML_w, XML_p, FSEND ); EndTableCell(); } @@ -245,7 +245,7 @@ void DocxAttributeOutput::StartParagraphProperties( const SwTxtNode& rNode ) // output page/section breaks // Writer can have them at the beginning of a paragraph, or at the end, but // in docx, we have to output them in the paragraph properties of the last - // paragraph in a section. To get it right, we have to switch to the next + // paragraph in a section. To get it right, we have to switch to the next // paragraph, and detect the section breaks there. SwNodeIndex aNextIndex( rNode, 1 ); if ( aNextIndex.GetNode().IsTxtNode() ) @@ -297,7 +297,7 @@ void DocxAttributeOutput::EndParagraphProperties() WriteCollectedParagraphProperties(); m_pSerializer->endElementNS( XML_w, XML_pPr ); - + if ( m_nColBreakStatus == COLBRK_WRITE ) { m_pSerializer->startElementNS( XML_w, XML_r, FSEND ); @@ -339,7 +339,7 @@ void DocxAttributeOutput::EndRun() StartField_Impl( *pIt ); // Remove the field from the stack if only the start has to be written - // Unknown fields sould be removed too + // Unknown fields should be removed too if ( !pIt->bClose || ( pIt->eType == ww::eUNKNOWN ) ) { m_Fields.erase( pIt ); @@ -379,7 +379,7 @@ void DocxAttributeOutput::EndRun() } } } - + DoWriteBookmarks( ); WriteCommentRanges(); @@ -448,12 +448,12 @@ void DocxAttributeOutput::DoWriteBookmarks() m_rOpenedMarksIds[rName] = nId; m_pSerializer->singleElementNS( XML_w, XML_bookmarkStart, FSNS( XML_w, XML_id ), OString::valueOf( sal_Int32( nId ) ).getStr( ), - FSNS( XML_w, XML_name ), rName.getStr(), + FSNS( XML_w, XML_name ), rName.getStr(), FSEND ); } m_rMarksStart.clear(); - // export the end bookmarks + // export the end bookmarks for ( std::vector< OString >::const_iterator it = m_rMarksEnd.begin(), end = m_rMarksEnd.end(); it < end; ++it ) { @@ -465,7 +465,7 @@ void DocxAttributeOutput::DoWriteBookmarks() { sal_uInt16 nId = ( *pPos ).second; m_pSerializer->singleElementNS( XML_w, XML_bookmarkEnd, - FSNS( XML_w, XML_id ), OString::valueOf( sal_Int32( nId ) ).getStr( ), + FSNS( XML_w, XML_id ), OString::valueOf( sal_Int32( nId ) ).getStr( ), FSEND ); m_rOpenedMarksIds.erase( rName ); } @@ -500,7 +500,7 @@ void DocxAttributeOutput::StartField_Impl( FieldInfos& rInfos, sal_Bool bWriteRu rFld2.GetSelectedItem(), aItems); m_pSerializer->endElementNS( XML_w, XML_fldChar ); - + if ( bWriteRun ) m_pSerializer->endElementNS( XML_w, XML_r ); @@ -515,7 +515,7 @@ void DocxAttributeOutput::StartField_Impl( FieldInfos& rInfos, sal_Bool bWriteRu if ( bWriteRun ) m_pSerializer->endElementNS( XML_w, XML_r ); - // The hyperlinks fields can't be expanded: the value is + // The hyperlinks fields can't be expanded: the value is // normally in the text run if ( !rInfos.pField ) CmdField_Impl( rInfos ); @@ -547,7 +547,7 @@ void DocxAttributeOutput::CmdField_Impl( FieldInfos& rInfos ) if ( i < ( nNbToken - 1 ) ) RunText( String::CreateFromAscii( "\t" ) ); } - + m_pSerializer->endElementNS( XML_w, XML_r ); @@ -612,7 +612,7 @@ void DocxAttributeOutput::EndField_Impl( FieldInfos& rInfos ) sal_uInt16 nSubType = rInfos.pField->GetSubType( ); bool bIsSetField = rInfos.pField->GetTyp( )->Which( ) == RES_SETEXPFLD; bool bShowRef = ( !bIsSetField || ( nSubType & nsSwExtendedSubType::SUB_INVISIBLE ) ) ? false : true; - + if ( ( m_sFieldBkm.Len( ) > 0 ) && bShowRef ) { // Write the field beginning @@ -621,15 +621,15 @@ void DocxAttributeOutput::EndField_Impl( FieldInfos& rInfos ) FSNS( XML_w, XML_fldCharType ), "begin", FSEND ); m_pSerializer->endElementNS( XML_w, XML_r ); - + rInfos.sCmd = FieldString( ww::eREF ); rInfos.sCmd.APPEND_CONST_ASC( "\"" ); rInfos.sCmd += m_sFieldBkm; rInfos.sCmd.APPEND_CONST_ASC( "\" " ); - + // Clean the field bookmark data to avoid infinite loop m_sFieldBkm = String( ); - + // Write the end of the field EndField_Impl( rInfos ); } @@ -699,7 +699,7 @@ void DocxAttributeOutput::EndRunProperties( const SwRedlineData* /*pRedlineData* /** Output sal_Unicode* as a run text (<t>the text</t>). When bMove is true, update rBegin to point _after_ the end of the text + - 1, meaning that it skips one character after the text. This is to make + 1, meaning that it skips one character after the text. This is to make the switch in DocxAttributeOutput::RunText() nicer ;-) */ static void impl_WriteRunText( FSHelperPtr pSerializer, sal_Int32 nTextToken, @@ -789,7 +789,7 @@ bool DocxAttributeOutput::AnalyzeURL( const String& rUrl, const String& rTarget, bool bOutputField = sMark.Len(); - if ( bOutputField ) + if ( bOutputField ) { if ( bBookMarkOnly ) sURL = FieldString( ww::eHYPERLINK ); @@ -800,10 +800,10 @@ bool DocxAttributeOutput::AnalyzeURL( const String& rUrl, const String& rTarget, sURL.Insert( sFld, 0 ); sURL += '\"'; } - + if ( sMark.Len() ) ( ( sURL.APPEND_CONST_ASC( " \\l \"" ) ) += sMark ) += '\"'; - + if ( rTarget.Len() ) ( sURL.APPEND_CONST_ASC( " \\n " ) ) += rTarget; } @@ -821,16 +821,16 @@ bool DocxAttributeOutput::StartURL( const String& rUrl, const String& rTarget ) bool bBookmarkOnly = AnalyzeURL( rUrl, rTarget, &sUrl, &sMark ); - if ( sMark.Len() && !bBookmarkOnly ) + if ( sMark.Len() && !bBookmarkOnly ) { m_rExport.OutputField( NULL, ww::eHYPERLINK, sUrl ); } else { // Output a hyperlink XML element - + m_pHyperlinkAttrList = m_pSerializer->createAttrList(); - if ( !bBookmarkOnly ) + if ( !bBookmarkOnly ) { OUString osUrl( sUrl ); @@ -840,9 +840,9 @@ bool DocxAttributeOutput::StartURL( const String& rUrl, const String& rTarget ) m_pHyperlinkAttrList->add( FSNS( XML_r, XML_id), sId.getStr()); } else - m_pHyperlinkAttrList->add( FSNS( XML_w, XML_anchor ), + m_pHyperlinkAttrList->add( FSNS( XML_w, XML_anchor ), OUStringToOString( OUString( sMark ), RTL_TEXTENCODING_UTF8 ).getStr( ) ); - + OUString sTarget( rTarget ); if ( sTarget.getLength( ) > 0 ) { @@ -886,7 +886,7 @@ static void impl_AppendTwoDigits( OStringBuffer &rBuffer, sal_Int32 nNum ) /** Convert DateTime to xsd::dateTime string. -I guess there must be an implementation of this somewhere in OOo, but I failed +I guess there must be an implementation of this somewhere in AOO, but I failed to find it, unfortunately :-( */ static OString impl_DateTimeToOString( const DateTime& rDateTime ) @@ -1038,7 +1038,7 @@ static void impl_borderLine( FSHelperPtr pSerializer, sal_Int32 elementToken, co sal_uInt16 inW = pBorderLine->GetInWidth(); sal_uInt16 outW = pBorderLine->GetOutWidth(); - sal_uInt16 nWidth = inW + outW; + sal_uInt16 nWidth = inW + outW; // Compute val attribute value // Can be one of: @@ -1096,7 +1096,7 @@ static void impl_pageBorders( FSHelperPtr pSerializer, const SvxBoxItem& rBox ) BOX_LINE_TOP, BOX_LINE_LEFT, BOX_LINE_BOTTOM, BOX_LINE_RIGHT }; - static const sal_uInt16 aXmlElements[] = + static const sal_uInt16 aXmlElements[] = { XML_top, XML_left, XML_bottom, XML_right }; @@ -1125,13 +1125,13 @@ void DocxAttributeOutput::TableCellProperties( ww8::WW8TableNodeInfoInner::Point long vSpan = pTblBox->getRowSpan( ); if ( vSpan > 1 ) { - m_pSerializer->singleElementNS( XML_w, XML_vMerge, + m_pSerializer->singleElementNS( XML_w, XML_vMerge, FSNS( XML_w, XML_val ), "restart", FSEND ); } else if ( vSpan < 0 ) { - m_pSerializer->singleElementNS( XML_w, XML_vMerge, + m_pSerializer->singleElementNS( XML_w, XML_vMerge, FSNS( XML_w, XML_val ), "continue", FSEND ); } @@ -1151,7 +1151,7 @@ void DocxAttributeOutput::TableCellProperties( ww8::WW8TableNodeInfoInner::Point // Cell preferred width SwTwips nWidth = GetGridCols( pTableTextNodeInfoInner )[ pTableTextNodeInfoInner->getCell() ]; - m_pSerializer->singleElementNS( XML_w, XML_tcW, + m_pSerializer->singleElementNS( XML_w, XML_tcW, FSNS( XML_w, XML_w ), OString::valueOf( sal_Int32( nWidth ) ).getStr( ), FSNS( XML_w, XML_type ), "dxa", FSEND ); @@ -1164,7 +1164,7 @@ void DocxAttributeOutput::TableCellProperties( ww8::WW8TableNodeInfoInner::Point BOX_LINE_TOP, BOX_LINE_LEFT, BOX_LINE_BOTTOM, BOX_LINE_RIGHT }; - static const sal_uInt16 aXmlElements[] = + static const sal_uInt16 aXmlElements[] = { XML_top, XML_left, XML_bottom, XML_right }; @@ -1192,16 +1192,16 @@ void DocxAttributeOutput::InitTableHelper( ww8::WW8TableNodeInfoInner::Pointer_t // Create the SwWriteTable instance to use col spans (and maybe other infos) GetTablePageSize( pTableTextNodeInfoInner, nPageSize, bRelBoxSize ); - + const SwTable* pTable = pTableTextNodeInfoInner->getTable( ); const SwFrmFmt *pFmt = pTable->GetFrmFmt( ); SwTwips nTblSz = pFmt->GetFrmSize( ).GetWidth( ); - + const SwHTMLTableLayout *pLayout = pTable->GetHTMLTableLayout(); if( pLayout && pLayout->IsExportable() ) m_pTableWrt = new SwWriteTable( pLayout ); else - m_pTableWrt = new SwWriteTable( pTable->GetTabLines(), (sal_uInt16)nPageSize, + m_pTableWrt = new SwWriteTable( pTable->GetTabLines(), (sal_uInt16)nPageSize, (sal_uInt16)nTblSz, false); } @@ -1234,11 +1234,11 @@ void DocxAttributeOutput::StartTableRow( ww8::WW8TableNodeInfoInner::Pointer_t p // Output the row properties m_pSerializer->startElementNS( XML_w, XML_trPr, FSEND ); - + // Header row: tblHeader const SwTable *pTable = pTableTextNodeInfoInner->getTable( ); if ( pTable->GetRowsToRepeat( ) > pTableTextNodeInfoInner->getRow( ) ) - m_pSerializer->singleElementNS( XML_w, XML_tblHeader, + m_pSerializer->singleElementNS( XML_w, XML_tblHeader, FSNS( XML_w, XML_val ), "true", FSEND ); @@ -1289,13 +1289,13 @@ void DocxAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t sal_uInt32 nPageSize = 0; bool bRelBoxSize = false; - + // Create the SwWriteTable instance to use col spans (and maybe other infos) GetTablePageSize( pTableTextNodeInfoInner, nPageSize, bRelBoxSize ); - + // Output the table preferred width if ( nPageSize != 0 ) - m_pSerializer->singleElementNS( XML_w, XML_tblW, + m_pSerializer->singleElementNS( XML_w, XML_tblW, FSNS( XML_w, XML_w ), OString::valueOf( sal_Int32( nPageSize ) ).getStr( ), FSNS( XML_w, XML_type ), "dxa", FSEND ); @@ -1338,11 +1338,11 @@ void DocxAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t FSEND ); m_pSerializer->endElementNS( XML_w, XML_tblPr ); - + // Write the table grid infos m_pSerializer->startElementNS( XML_w, XML_tblGrid, FSEND ); - + std::vector<SwTwips> gridCols = GetGridCols( pTableTextNodeInfoInner ); for ( std::vector<SwTwips>::const_iterator it = gridCols.begin(); it != gridCols.end(); ++it ) m_pSerializer->singleElementNS( XML_w, XML_gridCol, @@ -1371,7 +1371,7 @@ void DocxAttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_ Color aColor; if ( SFX_ITEM_ON == pFmt->GetAttrSet().GetItemState( RES_BACKGROUND, false, &pI ) ) - aColor = dynamic_cast<const SvxBrushItem *>(pI)->GetColor(); + aColor = dynamic_cast<const SvxBrushItem *>(pI)->GetColor(); else aColor = COL_AUTO; @@ -1384,7 +1384,7 @@ void DocxAttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_ void DocxAttributeOutput::TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) { const SwTableBox * pTabBox = pTableTextNodeInfoInner->getTableBox(); - const SwTableLine * pTabLine = pTabBox->GetUpper(); + const SwTableLine * pTabLine = pTabBox->GetUpper(); const SwFrmFmt * pLineFmt = pTabLine->GetFrmFmt(); const SwFmtFrmSize& rLSz = pLineFmt->GetFrmSize(); @@ -1411,7 +1411,7 @@ void DocxAttributeOutput::TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t pTa void DocxAttributeOutput::TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) { const SwTableBox * pTabBox = pTableTextNodeInfoInner->getTableBox(); - const SwTableLine * pTabLine = pTabBox->GetUpper(); + const SwTableLine * pTabLine = pTabBox->GetUpper(); const SwFrmFmt * pLineFmt = pTabLine->GetFrmFmt(); const SwFmtRowSplit& rSplittable = pLineFmt->GetRowSplit( ); @@ -1426,7 +1426,7 @@ void DocxAttributeOutput::TableBidi( ww8::WW8TableNodeInfoInner::Pointer_t pTabl { const SwTable * pTable = pTableTextNodeInfoInner->getTable(); const SwFrmFmt * pFrmFmt = pTable->GetFrmFmt(); - + if ( m_rExport.TrueFrameDirection( *pFrmFmt ) == FRMDIR_HORI_RIGHT_TOP ) { m_pSerializer->singleElementNS( XML_w, XML_bidiVisual, @@ -1454,7 +1454,7 @@ void DocxAttributeOutput::TableNodeInfo( ww8::WW8TableNodeInfo::Pointer_t /*pNod void DocxAttributeOutput::TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer_t pNodeInfoInner ) { // This is called when the nested table ends in a cell, and there's no - // paragraph benhind that; so we must check for the ends of cell, rows, + // paragraph behind that; so we must check for the ends of cell, rows, // tables // ['true' to write an empty paragraph, MS Word insists on that] FinishTableRowCell( pNodeInfoInner, true ); @@ -2603,7 +2603,7 @@ bool DocxAttributeOutput::DropdownField( const SwField* pFld ) bool bExpand = false; ww::eField eType = ww::eFORMDROPDOWN; - String sCmd = FieldString( eType ); + String sCmd = FieldString( eType ); GetExport( ).OutputField( pFld, eType, sCmd ); return bExpand; @@ -2637,7 +2637,7 @@ void DocxAttributeOutput::WriteField_Impl( const SwField* pFld, ww::eField eType { sal_uInt16 nType = pFld->GetTyp( )->Which( ); sal_uInt16 nSubType = pFld->GetSubType(); - + // TODO Any other field types here ? if ( ( nType == RES_SETEXPFLD ) && ( nSubType & nsSwGetSetExpType::GSE_STRING ) ) { @@ -2652,7 +2652,7 @@ void DocxAttributeOutput::WriteField_Impl( const SwField* pFld, ww::eField eType } } -void DocxAttributeOutput::WriteBookmarks_Impl( std::vector< OUString >& rStarts, +void DocxAttributeOutput::WriteBookmarks_Impl( std::vector< OUString >& rStarts, std::vector< OUString >& rEnds ) { for ( std::vector< OUString >::const_iterator it = rStarts.begin(), end = rStarts.end(); it < end; ++it ) @@ -2661,7 +2661,7 @@ void DocxAttributeOutput::WriteBookmarks_Impl( std::vector< OUString >& rStarts, m_rMarksStart.push_back( rName ); } rStarts.clear(); - + for ( std::vector< OUString >::const_iterator it = rEnds.begin(), end = rEnds.end(); it < end; ++it ) { OString rName = OUStringToOString( *it, RTL_TEXTENCODING_UTF8 ).getStr( ); @@ -2888,13 +2888,13 @@ void DocxAttributeOutput::ParaTabStop( const SvxTabStopItem& rTabStop ) { const SfxPoolItem* pLR = m_rExport.HasItem( RES_LR_SPACE ); long nCurrentLeft = pLR ? ((const SvxLRSpaceItem*)pLR)->GetTxtLeft() : 0; - + m_pSerializer->startElementNS( XML_w, XML_tabs, FSEND ); sal_uInt16 nCount = rTabStop.Count(); for (sal_uInt16 i = 0; i < nCount; i++ ) impl_WriteTabElement( m_pSerializer, rTabStop[i], nCurrentLeft ); - + m_pSerializer->endElementNS( XML_w, XML_tabs ); } @@ -2983,7 +2983,7 @@ void DocxAttributeOutput::FormatFrameSize( const SwFmtFrmSize& rSize ) OSL_TRACE( "TODO DocxAttributeOutput::FormatFrameSize() - Fly frames\n" ); #endif } - else if ( m_rExport.bOutPageDescs ) + else if ( m_rExport.bOutPageDescs ) { FastAttributeList *attrList = m_pSerializer->createAttrList( ); if ( m_rExport.pAktPageDesc->GetLandscape( ) ) @@ -3015,7 +3015,7 @@ void DocxAttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLRSpace ) OSL_TRACE( "DocxAttributeOutput::FormatLRSpace() - Fly frames\n" ); #endif } - else if ( m_rExport.bOutPageDescs ) + else if ( m_rExport.bOutPageDescs ) { if ( !m_pSpacingAttrList ) m_pSpacingAttrList = m_pSerializer->createAttrList(); @@ -3059,7 +3059,7 @@ void DocxAttributeOutput::FormatULSpace( const SvxULSpaceItem& rULSpace ) if ( m_rExport.bOutFlyFrmAttrs ) { - } + } else if (m_rExport.bOutPageDescs ) { ASSERT( m_rExport.GetCurItemSet(), "Impossible" ); @@ -3071,31 +3071,31 @@ void DocxAttributeOutput::FormatULSpace( const SvxULSpaceItem& rULSpace ) if ( aDistances.HasHeader() ) { // Header top - m_pSpacingAttrList->add( FSNS( XML_w, XML_header ), + m_pSpacingAttrList->add( FSNS( XML_w, XML_header ), OString::valueOf( sal_Int32( aDistances.dyaHdrTop ) ) ); } // Page top - m_pSpacingAttrList->add( FSNS( XML_w, XML_top ), + m_pSpacingAttrList->add( FSNS( XML_w, XML_top ), OString::valueOf( sal_Int32( aDistances.dyaTop ) ) ); if ( aDistances.HasFooter() ) { // Footer bottom - m_pSpacingAttrList->add( FSNS( XML_w, XML_footer ), + m_pSpacingAttrList->add( FSNS( XML_w, XML_footer ), OString::valueOf( sal_Int32( aDistances.dyaHdrBottom ) ) ); } // Page Bottom - m_pSpacingAttrList->add( FSNS( XML_w, XML_bottom ), + m_pSpacingAttrList->add( FSNS( XML_w, XML_bottom ), OString::valueOf( sal_Int32( aDistances.dyaBottom ) ) ); - + } else { - m_pSpacingAttrList->add( FSNS( XML_w, XML_before ), + m_pSpacingAttrList->add( FSNS( XML_w, XML_before ), OString::valueOf( (sal_Int32)rULSpace.GetUpper() ) ); - m_pSpacingAttrList->add( FSNS( XML_w, XML_after ), + m_pSpacingAttrList->add( FSNS( XML_w, XML_after ), OString::valueOf( (sal_Int32)rULSpace.GetLower() ) ); } } @@ -3172,7 +3172,7 @@ void DocxAttributeOutput::FormatColumns_Impl( sal_uInt16 nCols, const SwFmtCol& // Get the columns attributes FastAttributeList *pColsAttrList = m_pSerializer->createAttrList(); - pColsAttrList->add( FSNS( XML_w, XML_num ), + pColsAttrList->add( FSNS( XML_w, XML_num ), OString::valueOf( sal_Int32( nCols ) ). getStr( ) ); const char* pEquals = "false"; @@ -3265,12 +3265,12 @@ void DocxAttributeOutput::FormatFrameDirection( const SvxFrameDirectionItem& rDi FSNS( XML_w, XML_val ), sTextFlow.getStr( ), FSEND ); if ( bBiDi ) - m_pSerializer->singleElementNS( XML_w, XML_bidi, FSEND ); + m_pSerializer->singleElementNS( XML_w, XML_bidi, FSEND ); } else if ( !m_rExport.bOutFlyFrmAttrs ) { if ( bBiDi ) - m_pSerializer->singleElementNS( XML_w, XML_bidi, FSEND ); + m_pSerializer->singleElementNS( XML_w, XML_bidi, FSEND ); } }