include/editeng/paragraphdata.hxx | 2 +- sc/source/filter/excel/xiescher.cxx | 3 +-- sd/source/ui/tools/PreviewRenderer.cxx | 2 +- svx/source/svdraw/svdmrkv.cxx | 6 +++--- svx/source/unodraw/UnoGraphicExporter.cxx | 2 +- svx/source/xoutdev/xtabdash.cxx | 2 +- sw/inc/swunohelper.hxx | 2 +- sw/source/core/graphic/ndgrf.cxx | 2 +- 8 files changed, 10 insertions(+), 11 deletions(-)
New commits: commit 8bb1726007f641dff2aa17d2e79a089e09fd9770 Author: Caolán McNamara <caol...@redhat.com> Date: Wed Jul 27 12:48:32 2016 +0100 formally->formerly Change-Id: I1d631f8dd09193c57b7b65e3202ed080ce15861b diff --git a/include/editeng/paragraphdata.hxx b/include/editeng/paragraphdata.hxx index d08bdaf..a804133 100644 --- a/include/editeng/paragraphdata.hxx +++ b/include/editeng/paragraphdata.hxx @@ -26,7 +26,7 @@ // Only for internal use, oder some kind like hPara for the few // functions where you need it outside ( eg. moving paragraphs... ) -// Unfortunately NOT only local (formally in outliner.hxx), but also +// Unfortunately NOT only local (formerly in outliner.hxx), but also // used in outlobj.hxx. Moved to own header class ParagraphData diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 52a5ab5..30ccf35 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -3410,8 +3410,7 @@ SdrObjectPtr XclImpDffConverter::CreateSdrObject( const XclImpPictureObj& rPicOb Reference< XFormComponent > xFComp; css::awt::Size aSz; // not used in import ReadOCXCtlsStream( mxCtlsStrm, xFComp, rPicObj.GetCtlsStreamPos(), rPicObj.GetCtlsStreamSize() ); - // recreate the method formally known as - // ReadOCXExcelKludgeStream( ) + // recreate the method formerly known as ReadOCXExcelKludgeStream() if ( xFComp.is() ) { ScfPropertySet aPropSet( xFComp ); diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx index bfa61b6..7cc72e0 100644 --- a/sd/source/ui/tools/PreviewRenderer.cxx +++ b/sd/source/ui/tools/PreviewRenderer.cxx @@ -255,7 +255,7 @@ bool PreviewRenderer::Initialize ( return false; // #i121224# No need to set SetApplicationBackgroundColor (which is the color - // of the area 'behind' the page (formally called 'Wiese') since the page previews + // of the area 'behind' the page (formerly called 'Wiese') since the page previews // produced exactly cover the page's area, so it would never be visible. What // needs to be set is the ApplicationDocumentColor which is derived from // svtools::DOCCOLOR normally diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 2e495ff..3819f47 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -690,12 +690,12 @@ void SdrMarkView::SetMarkHandles() // Using a strict return statement is okay here; no handles means *no* handles. if(mpMarkedObj) { - // formally #i33755#: If TextEdit is active the EditEngine will directly paint + // formerly #i33755#: If TextEdit is active the EditEngine will directly paint // to the window, so suppress Overlay and handles completely; a text frame for // the active text edit will be painted by the repaint mechanism in // SdrObjEditView::ImpPaintOutlinerView in this case. This needs to be reworked // in the future - // Also formally #122142#: Pretty much the same for SdrCaptionObj's in calc. + // Also formerly #122142#: Pretty much the same for SdrCaptionObj's in calc. if(static_cast<SdrView*>(this)->IsTextEdit()) { const SdrTextObj* pSdrTextObj = dynamic_cast< const SdrTextObj* >(mpMarkedObj); @@ -715,7 +715,7 @@ void SdrMarkView::SetMarkHandles() } } - // formally #i118524#: if inplace activated OLE is selected, suppress handles + // formerly #i118524#: if inplace activated OLE is selected, suppress handles const SdrOle2Obj* pSdrOle2Obj = dynamic_cast< const SdrOle2Obj* >(mpMarkedObj); if(pSdrOle2Obj && (pSdrOle2Obj->isInplaceActive() || pSdrOle2Obj->isUiActive())) diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index 8dd270a..3d734ad 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -745,7 +745,7 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic, pView->ShowSdrPage( pPage ); // tdf#96922 completely deactivate EditView PageVisualization, including - // PageBackground (formally 'wiese'). + // PageBackground (formerly 'wiese'). pView->SetPagePaintingAllowed(false); const Point aNewOrg( pPage->GetLftBorder(), pPage->GetUppBorder() ); diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx index 40021ae..1dee829 100644 --- a/svx/source/xoutdev/xtabdash.cxx +++ b/svx/source/xoutdev/xtabdash.cxx @@ -213,7 +213,7 @@ OUString const & XDashList::GetStringForUiNoLine() const { if(maStringNoLine.isEmpty()) { - // formally was RID_SVXSTR_INVISIBLE, but to make equal + // formerly was RID_SVXSTR_INVISIBLE, but to make equal // everywhere, use RID_SVXSTR_NONE const_cast< XDashList* >(this)->maStringNoLine = ResId(RID_SVXSTR_NONE, DIALOG_MGR()).toString(); } diff --git a/sw/inc/swunohelper.hxx b/sw/inc/swunohelper.hxx index a4ad0b1..788e3a0 100644 --- a/sw/inc/swunohelper.hxx +++ b/sw/inc/swunohelper.hxx @@ -75,7 +75,7 @@ SW_DLLPUBLIC bool UCB_IsFile( const OUString& rURL ); bool UCB_IsDirectory( const OUString& rURL ); ///UUUU helper to check if fill style is set to color or bitmap -/// and thus formally used SvxBrushItem parts need to be mapped +/// and thus formerly used SvxBrushItem parts need to be mapped /// for backwards compatibility bool needToMapFillItemsToSvxBrushItemTypes(const SfxItemSet& rSet, sal_uInt16 const nMemberId); diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index 97e1b6c..ca05aac 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -749,7 +749,7 @@ void SwGrfNode::ReleaseLink() maGrfObj.SetLink(); // #i15508# added extra processing after getting rid of the link. Use whatever is - // known from the formally linked graphic to get to a state as close to a directly + // known from the formerly linked graphic to get to a state as close to a directly // unlinked inserted graphic as possible. Goal is to have a valid GfxLink at the // ImplGraphic (see there) that holds temporary data to the original data and type // information about the original data. Only when this is given will
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits