diff options
author | dennisroczek <dennisroczek@libreoffice.org> | 2017-03-18 13:46:00 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-03-29 08:12:10 +0000 |
commit | b0a3a48c1dc4edc652bdf7cd67db5151832f328c (patch) | |
tree | d82c27dad94b6e528507a279a58170962c0a83a1 /svx | |
parent | 26909d9de4c6e7165fc8f5d938ee6ef55b87cc5c (diff) |
expand vis to visible; fix typos
* translate German source code comments
* remove bogus surce code comments
* remove ascii art
* removed old StarOffice/Sun internal bug tracker references
* remove left over from commit dcd5dee88e3c1185638b190553bef65c2ef6566f
Change-Id: I3c5cce621c43e4a03afb76f4cc5a12065914e5ad
Reviewed-on: https://gerrit.libreoffice.org/35404
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/form/navigatortree.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svddrgmt.cxx | 12 | ||||
-rw-r--r-- | svx/source/unodraw/unoshtxt.cxx | 37 |
3 files changed, 25 insertions, 26 deletions
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 0941b8b52b0f..648b1c3d4344 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -1493,7 +1493,7 @@ namespace svxform { SvTreeListEntry* pToExpand = GetEntry(m_aTimerTriggered); if (pToExpand && (GetChildCount(pToExpand) > 0) && !IsExpanded(pToExpand)) - // normaly, we have to test, if the node is expanded, + // normally, we have to test, if the node is expanded, // but there is no method for this either in base class nor the model // the base class should tolerate it anyway Expand(pToExpand); diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index 15968a4a7b49..5d16e8b95e07 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -1288,7 +1288,7 @@ void SdrDragObjOwn::MoveSdrDrag(const Point& rNoSnapPnt) } if (!DragStat().CheckMinMoved(rNoSnapPnt)) - // Not moved by the minimum threshold. Nothing to do. + // Not moved by the minimum threshold. Nothing to do. return; Hide(); @@ -1311,7 +1311,7 @@ void SdrDragObjOwn::MoveSdrDrag(const Point& rNoSnapPnt) mpClone = pObj->getFullDragClone(); mpClone->applySpecialDrag(DragStat()); - // #120999# AutoGrowWidth may change for SdrTextObj due to the automatism used + // AutoGrowWidth may change for SdrTextObj due to the automatism used // with bDisableAutoWidthOnDragging, so not only geometry changes but // also this (pretty indirect) property change is possible. If it gets // changed, it needs to be copied to the original since nothing will @@ -3597,7 +3597,7 @@ bool SdrDragCrop::EndSdrDrag(bool /*bCopy*/) SdrObject* pSdrObject = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); - // tdf 34555: in order to implement visual crop in Writer, we need to handle two + // tdf#34555: in order to implement visual crop in Writer, we need to handle two // cases: // EndSdrDrag when called in Impress/Draw/...: pSdrObject is a SdrGrafObj // EndSdrDrag when called in Writer: pSdrObject is a SwVirtFlyDrawObj @@ -3800,7 +3800,7 @@ bool SdrDragCrop::EndSdrDrag(bool /*bCopy*/) // get transformation from object pObj->TRGetBaseGeometry(aOriginalMatrix, aPolyPolygon); - { // TTTT correct shear, it comes currently mirrored from TRGetBaseGeometry, can be removed with aw080 + { // correct shear, it comes currently mirrored from TRGetBaseGeometry, can be removed with aw080 basegfx::B2DTuple aScale; basegfx::B2DTuple aTranslate; double fRotate(0.0), fShearX(0.0); @@ -3891,7 +3891,7 @@ bool SdrDragCrop::EndSdrDrag(bool /*bCopy*/) if(bShearCorrected) { - // TTTT back-correct shear + // back-correct shear basegfx::B2DTuple aScale; basegfx::B2DTuple aTranslate; double fRotate(0.0), fShearX(0.0); @@ -3966,7 +3966,7 @@ bool SdrDragCrop::EndSdrDrag(bool /*bCopy*/) if(pObj->IsMirrored()) { // mirrored X or Y, for old stuff, exchange X - // TTTT: check for aw080 + // check for aw080 sal_Int32 nTmp(nDiffLeft); nDiffLeft = -nDiffRight; nDiffRight = -nTmp; diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index 11b57fa15b5c..6d87416e0e93 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -99,7 +99,7 @@ private: bool mbNeedsUpdate; bool mbOldUndoMode; bool mbForwarderIsEditMode; // have to reflect that, since ENDEDIT can happen more often - bool mbShapeIsEditMode; // #104157# only true, if SdrHintKind::BeginEdit was received + bool mbShapeIsEditMode; // only true, if SdrHintKind::BeginEdit was received bool mbNotificationsDisabled; // prevent EditEngine/Outliner notifications (e.g. when setting up forwarder) SvxUnoTextRangeBaseList maTextRanges; @@ -225,7 +225,7 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject& rObject, SdrText* pText if( mpObject ) mpObject->AddObjectUser( *this ); - // #104157# Init edit mode state from shape info (IsTextEditActive()) + // Init edit mode state from shape info (IsTextEditActive()) mbShapeIsEditMode = IsEditMode(); } @@ -339,17 +339,16 @@ void SvxTextEditSourceImpl::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) { case SdrHintKind::ObjectChange: { - mbDataValid = false; // Text muss neu geholt werden + mbDataValid = false; // Text has to be get again if( HasView() ) { - // #104157# Update maTextOffset, object has changed - // #105196#, #105203#: Cannot call that // here, - // since TakeTextRect() (called from there) + // Update maTextOffset, object has changed + // Cannot call that here, since TakeTextRect() (called from there) // changes outliner content. // UpdateOutliner(); - // #101029# Broadcast object changes, as they might change visible attributes + // Broadcast object changes, as they might change visible attributes SvxViewChangedHint aHint; Broadcast( aHint ); } @@ -393,7 +392,7 @@ void SvxTextEditSourceImpl::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) if( mpView && mpView->GetTextEditOutliner() ) mpView->GetTextEditOutliner()->SetNotifyHdl( LINK(this, SvxTextEditSourceImpl, NotifyHdl) ); - // #104157# Only now we're really in edit mode + // Only now we're really in edit mode mbShapeIsEditMode = true; Broadcast( *pSdrHint ); @@ -405,7 +404,7 @@ void SvxTextEditSourceImpl::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) { Broadcast( *pSdrHint ); - // #104157# We're no longer in edit mode + // We're no longer in edit mode mbShapeIsEditMode = false; // remove as listener - outliner might outlive ourselves @@ -418,7 +417,7 @@ void SvxTextEditSourceImpl::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) delete mpViewForwarder; mpViewForwarder = nullptr; - // #100424# Invalidate text forwarder, we might + // Invalidate text forwarder, we might // not be called again before entering edit mode a // second time! Then, the old outliner might be // invalid. @@ -511,7 +510,7 @@ void SvxTextEditSourceImpl::SetupOutliner() Rectangle aBoundRect( pTextObj->GetCurrentBoundRect() ); pTextObj->SetupOutlinerFormatting( *mpOutliner, aPaintRect ); - // #101029# calc text offset from shape anchor + // calc text offset from shape anchor maTextOffset = aPaintRect.TopLeft() - aBoundRect.TopLeft(); } } @@ -532,7 +531,7 @@ void SvxTextEditSourceImpl::UpdateOutliner() Rectangle aBoundRect( pTextObj->GetCurrentBoundRect() ); pTextObj->UpdateOutlinerFormatting( *mpOutliner, aPaintRect ); - // #101029# calc text offset from shape anchor + // calc text offset from shape anchor maTextOffset = aPaintRect.TopLeft() - aBoundRect.TopLeft(); } } @@ -543,7 +542,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder() { bool bCreated = false; - // #99840#: prevent EE/Outliner notifications during setup + // prevent EE/Outliner notifications during setup mbNotificationsDisabled = true; if (!mpTextForwarder) @@ -557,10 +556,10 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder() mpOutliner = mpModel->createOutliner( nOutlMode ); - // #109151# Do the setup after outliner creation, would be useless otherwise + // Do the setup after outliner creation, would be useless otherwise if( HasView() ) { - // #101029#, #104157# Setup outliner _before_ filling it + // Setup outliner _before_ filling it SetupOutliner(); } @@ -611,7 +610,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder() { mpOutliner->SetText( *pOutlinerParaObject ); - // #91254# put text to object and set EmptyPresObj to FALSE + // put text to object and set EmptyPresObj to FALSE if( mpText && bOwnParaObj && mpObject->IsEmptyPresObj() && pTextObj->IsReallyEdited() ) { mpObject->SetEmptyPresObj( false ); @@ -668,7 +667,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder() mpOutliner->SetNotifyHdl( LINK(this, SvxTextEditSourceImpl, NotifyHdl) ); } - // #99840#: prevent EE/Outliner notifications during setup + // prevent EE/Outliner notifications during setup mbNotificationsDisabled = false; return mpTextForwarder; @@ -920,7 +919,7 @@ Rectangle SvxTextEditSourceImpl::GetVisArea() Point SvxTextEditSourceImpl::LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) { - // #101029#: The responsibilities of ViewForwarder happen to be + // The responsibilities of ViewForwarder happen to be // somewhat mixed in this case. On the one hand, we need the // different interface queries on the SvxEditSource interface, // since we need both VisAreas. On the other hand, if an @@ -951,7 +950,7 @@ Point SvxTextEditSourceImpl::LogicToPixel( const Point& rPoint, const MapMode& r Point SvxTextEditSourceImpl::PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) { - // #101029#: The responsibilities of ViewForwarder happen to be + // The responsibilities of ViewForwarder happen to be // somewhat mixed in this case. On the one hand, we need the // different interface queries on the SvxEditSource interface, // since we need both VisAreas. On the other hand, if an |