mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

expand vis to visible; fix typos

Browse Source 
* 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>
This commit is contained in:
dennisroczek 2017-03-18 13:46:00 +00:00 committed by Caolán McNamara
parent 26909d9de4
commit b0a3a48c1d
13 changed files with 51 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
filter/source/config/cache/typedetection.cxx vendored
View File

@ -1107,7 +1107,7 @@ OUString TypeDetection::impl_askUserForTypeAndFilterIfAllowed(utl::MediaDescript
// "OK" pressed => verify the selected filter, get its corresponding
// type and return it. (BTW: We must update the media descriptor here ...)
// The user selected explicitly a filter ... but normaly we are interested on
// The user selected explicitly a filter ... but normally we are interested on
// a type here only. But we must be sure, that the selected filter is used
// too and no ambiguous filter registration disturb us .-)

6
include/svtools/ivctrl.hxx
View File

@ -57,7 +57,7 @@ enum class SvxIconChoiceCtrlTextMode
enum class SvxIconChoiceCtrlPositionMode
{
Free, // Free pixel-perfekt positioning
Free, // Free pixel-perfect positioning
AutoArrange, // Auto arrange
};
@ -74,7 +74,7 @@ class SvxIconChoiceCtrlEntry
friend class EntryList_Impl;
friend class IcnGridMap_Impl;
Rectangle aRect; // Bounding-Rect of the entry
Rectangle aRect; // Bounding-Rectangle of the entry
Rectangle aGridRect; // Only valid in Grid-mode
sal_Int32 nPos;
@ -157,7 +157,7 @@ public:
WB_NOHSCROLL
WB_NOVSCROLL
WB_NOSELECTION
WB_SMART_ARRANGE // Keep Vis-Area at arrange
WB_SMART_ARRANGE // Keep Visible-Area at arrange
WB_ALIGN_TOP // Align line vy line LTR
WB_ALIGN_LEFT // Align columns from top to bottom
WB_NODRAGSELECTION // No selection with tracking rectangle

3
sfx2/source/doc/new.cxx
View File

@ -73,7 +73,7 @@ void SfxPreviewWin_Impl::ImpPaint(vcl::RenderContext& rRenderContext, const Rect
rRenderContext.DrawRect(Rectangle(Point(0,0), rRenderContext.GetOutputSize()));
Size aTmpSize = pFile ? pFile->GetPrefSize() : Size(1, 1);
DBG_ASSERT(aTmpSize.Height() != 0 && aTmpSize.Width() != 0, "size of first page is 0, override GetFirstPageSize or set vis-area!");
DBG_ASSERT(aTmpSize.Height() != 0 && aTmpSize.Width() != 0, "size of first page is 0, override GetFirstPageSize or set visible-area!");
#define FRAME 4
@ -161,7 +161,6 @@ public:
// Returns sal_False if '- No -' is set as a template
// Template name can only be obtained if IsTemplate() is TRUE
// erfragt werden
bool IsTemplate() const;
OUString GetTemplateFileName() const;

10
sfx2/source/doc/objcont.cxx
View File

@ -152,7 +152,7 @@ SfxObjectShell::CreatePreviewMetaFile_Impl( bool bFullContent ) const
xFile->SetPrefSize( aTmpSize );
DBG_ASSERT( aTmpSize.Height() != 0 && aTmpSize.Width() != 0,
"size of first page is 0, override GetFirstPageSize or set vis-area!" );
"size of first page is 0, override GetFirstPageSize or set visible-area!" );
xFile->Record( pDevice );
@ -179,7 +179,7 @@ void SfxObjectShell::UpdateDocInfoForSave()
{
uno::Reference<document::XDocumentProperties> xDocProps(getDocProperties());
// clear user data if recommend (see 'Tools - Options - Open/StarOffice - Security')
// clear user data if recommend (see 'Tools - Options - LibreOffice - Security')
if ( SvtSecurityOptions().IsOptionSet(
SvtSecurityOptions::EOption::DocWarnRemovePersonalInfo ) )
{
@ -236,7 +236,7 @@ void SfxObjectShell::UpdateTime_Impl(
sal_uIntPtr nDays = 0 ; // Count of days between now and last editing
tools::Time nAddTime (0) ; // Value to add on aOldTime
// Safe impossible cases!
// Save impossible cases!
// User has changed time to the past between last editing and now ... it's not possible!!!
DBG_ASSERT( !(aNow.GetDate()<pImpl->nTime.GetDate()), "Timestamp of last change is in the past ?!..." );
@ -340,7 +340,7 @@ void SfxObjectShell::LoadStyles
{
pDest = &pMyPool->Make( pSource->GetName(),
pSource->GetFamily(), pSource->GetMask());
// Setting of Parents, the next style
// Setting of parents, the next style
}
pFound[nFound].pSource = pSource;
pFound[nFound].pDest = pDest;
@ -513,7 +513,7 @@ bool SfxObjectShell::IsHelpDocument() const
void SfxObjectShell::ResetFromTemplate( const OUString& rTemplateName, const OUString& rFileName )
{
// only care about resetting this data for openoffice formats otherwise
// only care about resetting this data for LibreOffice formats otherwise
if ( IsOwnStorageFormat( *GetMedium()) )
{
uno::Reference<document::XDocumentProperties> xDocProps(getDocProperties());

1
sfx2/source/view/viewsh.cxx
View File

@ -467,7 +467,6 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
rReq.Done();
}
break;
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
case SID_MAIL_SENDDOCASMS:
case SID_MAIL_SENDDOCASOOO:

4
starmath/source/document.cxx
View File

@ -161,7 +161,7 @@ void SmDocShell::SetText(const OUString& rBuffer)
if ( SfxObjectCreateMode::EMBEDDED == GetCreateMode() )
{
// have SwOleClient::FormatChanged() to align the modified formula properly
// even if the vis area does not change (e.g. when formula text changes from
// even if the visible area does not change (e.g. when formula text changes from
// "{a over b + c} over d" to "d over {a over b + c}"
SfxGetpApp()->NotifyEvent(SfxEventHint( SfxEventHintId::VisAreaChanged, GlobalEventConfig::GetEventName(GlobalEventId::VISAREACHANGED), this));
@ -1249,7 +1249,7 @@ void SmDocShell::SetVisArea(const Rectangle & rVisArea)
//TODO/LATER: it's unclear how this interacts with the SFX code
// If outplace editing, then don't resize the OutplaceWindow. But the
// ObjectShell has to resize. Bug 56470
// ObjectShell has to resize.
bool bUnLockFrame;
if( GetCreateMode() == SfxObjectCreateMode::EMBEDDED && !IsInPlaceActive() && GetFrame() )
{

2
svx/source/form/navigatortree.cxx
View File

@ -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);

12
svx/source/svdraw/svddrgmt.cxx
View File

@ -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;

37
svx/source/unodraw/unoshtxt.cxx
View File

@ -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

12
sw/source/core/access/acccontext.cxx
View File

@ -301,10 +301,10 @@ void SwAccessibleContext::ScrolledWithin( const SwRect& rOldVisArea )
void SwAccessibleContext::ScrolledIn()
{
// This accessible should be freshly created, because it
// was not visible before. Therefore, its vis area must already
// was not visible before. Therefore, its visible area must already
// reflect the scrolling.
OSL_ENSURE( GetVisArea() == GetMap()->GetVisArea(),
"Vis area of child is wrong. Did it exist already?" );
"Visible area of child is wrong. Did it exist already?" );
// Send child event at parent. That's all we have to do here.
const SwFrame* pParent = GetParent();
@ -341,8 +341,8 @@ void SwAccessibleContext::ScrolledOut( const SwRect& rOldVisArea )
// all children that are existing only if they are visible. They
// are not disposed by the recursive Dispose call that follows later on,
// because this call will only dispose children that are in the
// new vis area. The children we want to dispose however are in the
// old vis area all.
// new visible area. The children we want to dispose however are in the
// old visible area all.
ChildrenScrolled( GetFrame(), rOldVisArea );
// Broadcast a state changed event for the showing state.
@ -860,7 +860,7 @@ awt::Rectangle SAL_CALL SwAccessibleContext::getBoundsImpl(bool bRelative)
throw uno::RuntimeException("no Window", static_cast<cppu::OWeakObject*>(this));
}
SwRect aLogBounds( GetBounds( *(GetMap()), GetFrame() ) ); // twip rel to doc root
SwRect aLogBounds( GetBounds( *(GetMap()), GetFrame() ) ); // twip relative to document root
Rectangle aPixBounds( 0, 0, 0, 0 );
if( GetFrame()->IsPageFrame() &&
static_cast < const SwPageFrame * >( GetFrame() )->IsEmptyPage() )
@ -1036,7 +1036,7 @@ void SwAccessibleContext::Dispose(bool bRecursive, bool bCanSkipInvisible)
OSL_ENSURE( GetFrame() && GetMap(), "already disposed" );
OSL_ENSURE( GetMap()->GetVisArea() == GetVisArea(),
"invalid vis area for dispose" );
"invalid visible area for dispose" );
m_isDisposing = true;

8
sw/source/core/access/acccontext.hxx
View File

@ -130,7 +130,7 @@ protected:
SwCursorShell* GetCursorShell();
const SwCursorShell* GetCursorShell() const;
// Notify all children that the vis area has changed.
// Notify all children that the visible area has changed.
// The SwFrame might belong to the current object or to any other child or
// grandchild.
void ChildrenScrolled( const SwFrame *pFrame, const SwRect& rOldVisArea );
@ -139,13 +139,13 @@ protected:
// exist even if they aren't visible.
void Scrolled( const SwRect& rOldVisArea );
// A child has been moved while setting the vis area
// A child has been moved while setting the visible area
void ScrolledWithin( const SwRect& rOldVisArea );
// The has been added while setting the vis area
// The has been added while setting the visible area
void ScrolledIn();
// The context has to be removed while setting the vis area
// The context has to be removed while setting the visible area
void ScrolledOut( const SwRect& rOldVisArea );
// Invalidate the states of all children of the specified SwFrame. The

6
sw/source/core/access/accframe.hxx
View File

@ -102,7 +102,7 @@ protected:
bool bIsPagePreview );
virtual ~SwAccessibleFrame();
// MT: Move to private area?
// Move to private area?
bool m_bIsAccDocUse;
public:
// Return the SwFrame this context is attached to.
@ -115,8 +115,8 @@ public:
const sw::access::SwAccessibleChild& rChild ) const;
protected:
// Return the bounding box of the frame clipped to the vis area. If
// no frame is specified, use this' frame.
// Return the bounding box of the frame clipped to the visible area.
// If no frame is specified, use this' frame.
SwRect GetBounds( const SwAccessibleMap& rAccMap,
const SwFrame *pFrame = nullptr );

2
sw/source/core/access/accmap.cxx
View File

@ -1071,7 +1071,7 @@ void SwAccessibleMap::InvalidateCursorPosition(
{
FireEvents();
// While firing events the current frame might have
// been disposed because it moved out of the vis area.
// been disposed because it moved out of the visible area.
// Setting the cursor for such frames is useless and even
// causes asserts.
if( pAccImpl->GetFrame() )