Skip to content

C
core
Kaydet (Commit) 1fd796f0 authored tarafından Matthias Freund's avatar Matthias Freund Kaydeden (comit) Thomas Arnhold
Dosyalara gözat
Seçenekler

Comment translation german-english 

Change-Id: I39ad80b9a952462e178be87ca5e53785036cdaf6
Reviewed-on: https://gerrit.libreoffice.org/2190Reviewed-by: 's avatarThomas Arnhold <thomas@arnhold.org>
Tested-by: 's avatarThomas Arnhold <thomas@arnhold.org>
üst ad830cac
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 154 deletions
sw/source/core/draw/dflyobj.cxx
Dosyayı görüntüle @ 1fd796f0
......@@ -68,13 +68,7 @@ static bool bInResize = false;
TYPEINIT1( SwFlyDrawObj, SdrObject )
TYPEINIT1( SwVirtFlyDrawObj, SdrVirtObj )
/*************************************************************************
|*
|* SwFlyDrawObj::Ctor
|*
*************************************************************************/
////////////////////////////////////////////////////////////////////////////////////////////////////
// SwFlyDrawObj::Ctor
namespace sdr
{
......@@ -112,7 +106,6 @@ namespace sdr
} // end of namespace contact
} // end of namespace sdr
////////////////////////////////////////////////////////////////////////////////////////////////////
sdr::properties::BaseProperties* SwFlyDrawObj::CreateObjectSpecificProperties()
{
......@@ -135,11 +128,7 @@ SwFlyDrawObj::~SwFlyDrawObj()
{
}
/*************************************************************************
|*
|* SwFlyDrawObj::Factory-Methoden
|*
*************************************************************************/
// SwFlyDrawObj - Factory-Methods
sal_uInt32 SwFlyDrawObj::GetObjInventor() const
{
......@@ -158,13 +147,8 @@ sal_uInt16 SwFlyDrawObj::GetObjVersion() const
return SwDrawFirst;
}
/*************************************************************************
|*
|* SwVirtFlyDrawObj::CToren, Dtor
|*
*************************************************************************/
// SwVirtFlyDrawObj::CToren, Dtor
//////////////////////////////////////////////////////////////////////////////////////
// AW: Need own primitive to get the FlyFrame paint working
namespace drawinglayer
......@@ -274,7 +258,6 @@ namespace drawinglayer
} // end of namespace primitive2d
} // end of namespace drawinglayer
//////////////////////////////////////////////////////////////////////////////////////
// AW: own sdr::contact::ViewContact (VC) sdr::contact::ViewObjectContact (VOC) needed
// since offset is defined different from SdrVirtObj's sdr::contact::ViewContactOfVirtObj.
// For paint, that offset is used by setting at the OutputDevice; for primitives this is
......@@ -343,7 +326,6 @@ namespace sdr
} // end of namespace contact
} // end of namespace sdr
//////////////////////////////////////////////////////////////////////////////////////
basegfx::B2DRange SwVirtFlyDrawObj::getOuterBound() const
{
......@@ -418,15 +400,12 @@ SwVirtFlyDrawObj::SwVirtFlyDrawObj(SdrObject& rNew, SwFlyFrm* pFly) :
SwVirtFlyDrawObj::~SwVirtFlyDrawObj()
{
if ( GetPage() ) //Der SdrPage die Verantwortung entziehen.
if ( GetPage() ) //Withdraw SdrPage the responsibility.
GetPage()->RemoveObject( GetOrdNum() );
}
/*************************************************************************
|*
|* SwVirtFlyDrawObj::GetFmt()
|*
*************************************************************************/
// SwVirtFlyDrawObj::GetFmt()
const SwFrmFmt *SwVirtFlyDrawObj::GetFmt() const
{
......@@ -439,11 +418,7 @@ SwFrmFmt *SwVirtFlyDrawObj::GetFmt()
return GetFlyFrm()->GetFmt();
}
/*************************************************************************
|*
|* SwVirtFlyDrawObj::Paint()
|*
*************************************************************************/
// SwVirtFlyDrawObj::Paint()
// --> OD #i102707#
namespace
......@@ -527,11 +502,7 @@ void SwVirtFlyDrawObj::wrap_DoPaintObject() const
}
}
/*************************************************************************
|*
|* SwVirtFlyDrawObj::TakeObjInfo()
|*
*************************************************************************/
// SwVirtFlyDrawObj::TakeObjInfo()
void SwVirtFlyDrawObj::TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const
{
......@@ -545,12 +516,7 @@ void SwVirtFlyDrawObj::TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const
rInfo.bCanConvToPathLineToArea = rInfo.bCanConvToPolyLineToArea = sal_False;
}
/*************************************************************************
|*
|* SwVirtFlyDrawObj::Groessenermittlung
|*
*************************************************************************/
// SwVirtFlyDrawObj - Size Determination
void SwVirtFlyDrawObj::SetRect() const
{
......@@ -644,11 +610,7 @@ void SwVirtFlyDrawObj::NbcSetLogicRect(const Rectangle& )
return aRetval;
}
/*************************************************************************
|*
|* SwVirtFlyDrawObj::Move() und Resize()
|*
*************************************************************************/
// SwVirtFlyDrawObj::Move() und Resize()
void SwVirtFlyDrawObj::NbcMove(const Size& rSiz)
{
......@@ -657,16 +619,16 @@ void SwVirtFlyDrawObj::NbcMove(const Size& rSiz)
const Point aNewPos( aOutRect.TopLeft() );
const SwRect aFlyRect( aOutRect );
//Wenn der Fly eine automatische Ausrichtung hat (rechts oder oben),
//so soll die Automatik erhalten bleiben
//If the Fly has a automatic align (right or top),
//so preserve the automatic.
SwFrmFmt *pFmt = GetFlyFrm()->GetFmt();
const sal_Int16 eHori = pFmt->GetHoriOrient().GetHoriOrient();
const sal_Int16 eVert = pFmt->GetVertOrient().GetVertOrient();
const sal_Int16 eRelHori = pFmt->GetHoriOrient().GetRelationOrient();
const sal_Int16 eRelVert = pFmt->GetVertOrient().GetRelationOrient();
//Bei Absatzgebundenen Flys muss ausgehend von der neuen Position ein
//neuer Anker gesetzt werden. Anker und neue RelPos werden vom Fly selbst
//berechnet und gesetzt.
//On paragraph bound Flys starting from the new postition a new
//anchor must be set. Anchor and the new RelPos is calculated and
//placed by the Fly itself.
if( GetFlyFrm()->IsFlyAtCntFrm() )
((SwFlyAtCntFrm*)GetFlyFrm())->SetAbsPos( aNewPos );
else
......@@ -724,9 +686,8 @@ void SwVirtFlyDrawObj::NbcMove(const Size& rSiz)
if( !GetFlyFrm()->IsFlyLayFrm() &&
::GetHtmlMode(pFmt->GetDoc()->GetDocShell()) )
{
//Im HTML-Modus sind nur automatische Ausrichtungen erlaubt.
//Einzig einen Snap auf Links/Rechts bzw. Linker-/Rechter-Rand koennen
//wir versuchen.
//In HTML-Mode only automatic aligns are allowed.
//Only we can try a snap to left/right respectively left-/right border
const SwFrm* pAnch = GetFlyFrm()->GetAnchorFrm();
bool bNextLine = false;
......@@ -740,7 +701,7 @@ void SwVirtFlyDrawObj::NbcMove(const Size& rSiz)
else
{
bNextLine = true;
//Horizontale Ausrichtung:
//Horizontal Align:
const bool bLeftFrm =
aFlyRect.Left() < pAnch->Frm().Left() + pAnch->Prt().Left(),
bLeftPrt = aFlyRect.Left() + aFlyRect.Width() <
......@@ -760,8 +721,8 @@ void SwVirtFlyDrawObj::NbcMove(const Size& rSiz)
}
aSet.Put( aHori );
}
//Vertikale Ausrichtung bleibt grundsaetzlich schlicht erhalten,
//nur bei nicht automatischer Ausrichtung wird umgeschaltet.
//Vertical alignment simply is retained principally,
//only on manual align will be switched over.
bool bRelChar = text::RelOrientation::CHAR == eRelVert;
aVert.SetVertOrient( eVert != text::VertOrientation::NONE ? eVert :
GetFlyFrm()->IsFlyInCntFrm() ? text::VertOrientation::CHAR_CENTER :
......@@ -774,7 +735,7 @@ void SwVirtFlyDrawObj::NbcMove(const Size& rSiz)
bPut = true;
}
//Automatische Ausrichtungen wollen wir moeglichst nicht verlieren.
//We want preferably not to lose the automatic alignments.
if ( !bPut && bInResize )
{
if ( text::HoriOrientation::NONE != eHori )
......@@ -820,7 +781,7 @@ void SwVirtFlyDrawObj::NbcResize(const Point& rRef,
aOutRect.Bottom()- aOutRect.Top() + 1 );
if( aSz != GetFlyFrm()->Frm().SSize() )
{
//Die Breite darf bei Spalten nicht zu schmal werden
//The width of the columns should not be too narrow
if ( GetFlyFrm()->Lower() && GetFlyFrm()->Lower()->IsColumnFrm() )
{
SwBorderAttrAccess aAccess( SwFrm::GetCache(), GetFlyFrm() );
......@@ -875,13 +836,13 @@ void SwVirtFlyDrawObj::NbcResize(const Point& rRef,
}
}
//Position kann auch veraendert sein!
//Position can also be changed!
const Point aOldPos( ( bVertX && !bVertL2RX ) || bRTL ?
GetFlyFrm()->Frm().TopRight() :
GetFlyFrm()->Frm().Pos() );
if ( aNewPos != aOldPos )
{
//Kann sich durch das ChgSize veraendert haben!
//May have been altered by the ChgSize!
if( bVertX || bRTL )
{
if( aOutRect.TopRight() != aNewPos )
......
sw/source/core/draw/dview.cxx
Dosyayı görüntüle @ 1fd796f0
......@@ -92,13 +92,7 @@ static const SwFrm *lcl_FindAnchor( const SdrObject *pObj, sal_Bool bAll )
return 0;
}
/*************************************************************************
|*
|* SwDrawView::Ctor
|*
*************************************************************************/
// SwDrawView
SwDrawView::SwDrawView( SwViewImp &rI, SdrModel *pMd, OutputDevice *pOutDev) :
FmFormView( (FmFormModel*)pMd, pOutDev ),
......@@ -134,7 +128,6 @@ sal_Bool SwDrawView::IsAntiAliasing() const
return getOptionsDrawinglayer().IsAntiAliasing();
}
//////////////////////////////////////////////////////////////////////////////
SdrObject* impLocalHitCorrection(SdrObject* pRetval, const Point& rPnt, sal_uInt16 nTol, const SdrMarkList &rMrkList)
{
......@@ -209,13 +202,8 @@ SdrObject* SwDrawView::CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTo
return pRetval;
}
/*************************************************************************
|*
|* SwDrawView::AddCustomHdl()
|*
|* Gets called every time the handles need to be build
|*
*************************************************************************/
// SwDrawView::AddCustomHdl()
// Gets called every time the handles need to be build
void SwDrawView::AddCustomHdl()
{
......@@ -261,12 +249,7 @@ void SwDrawView::AddCustomHdl()
pAnch->IsRightToLeft() ) );
}
/*************************************************************************
|*
|* SwDrawView::GetMaxToTopObj(), _GetMaxToTopObj()
|*
*************************************************************************/
// SwDrawView::GetMaxToTopObj(), _GetMaxToTopObj()
SdrObject* SwDrawView::GetMaxToTopObj( SdrObject* pObj ) const
{
......@@ -275,8 +258,7 @@ SdrObject* SwDrawView::GetMaxToTopObj( SdrObject* pObj ) const
const SwFrm *pAnch = ::lcl_FindAnchor( pObj, sal_False );
if ( pAnch )
{
//Das oberste Obj innerhalb des Ankers darf nicht ueberholt
//werden.
//The topmost Obj within the anchor must not be overtaken.
const SwFlyFrm *pFly = pAnch->FindFlyFrm();
if ( pFly )
{
......@@ -314,12 +296,7 @@ SdrObject* SwDrawView::GetMaxToTopObj( SdrObject* pObj ) const
return 0;
}
/*************************************************************************
|*
|* SwDrawView::GetMaxToBtmObj()
|*
*************************************************************************/
// SwDrawView::GetMaxToBtmObj()
SdrObject* SwDrawView::GetMaxToBtmObj(SdrObject* pObj) const
{
......@@ -328,7 +305,7 @@ SdrObject* SwDrawView::GetMaxToBtmObj(SdrObject* pObj) const
const SwFrm *pAnch = ::lcl_FindAnchor( pObj, sal_False );
if ( pAnch )
{
//Der Fly des Ankers darf nicht "unterflogen" werden.
//The Fly of the anchor must not be "flying under".
const SwFlyFrm *pFly = pAnch->FindFlyFrm();
if ( pFly )
{
......@@ -340,16 +317,11 @@ SdrObject* SwDrawView::GetMaxToBtmObj(SdrObject* pObj) const
return 0;
}
/*************************************************************************
|*
|* SwDrawView::ObjOrderChanged()
|*
*************************************************************************/
// SwDrawView::ObjOrderChanged()
/** determine maximal order number for a 'child' object of given 'parent' object
// determine maximal order number for a 'child' object of given 'parent' object
// @author OD
@author OD
*/
sal_uInt32 SwDrawView::_GetMaxChildOrdNum( const SwFlyFrm& _rParentObj,
const SdrObject* _pExclChildObj ) const
{
......@@ -382,10 +354,10 @@ sal_uInt32 SwDrawView::_GetMaxChildOrdNum( const SwFlyFrm& _rParentObj,
}
/** method to move 'repeated' objects of the given moved object to the
according level
@author OD
*/
* according level
*
* @author OD
*/
void SwDrawView::_MoveRepeatedObjs( const SwAnchoredObject& _rMovedAnchoredObj,
const std::vector<SdrObject*>& _rMovedChildObjs ) const
{
......@@ -695,12 +667,7 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos,
_MoveRepeatedObjs( *pMovedAnchoredObj, aMovedChildObjs );
}
/*************************************************************************
|*
|* SwDrawView::TakeDragLimit()
|*
*************************************************************************/
// SwDrawView::TakeDragLimit()
sal_Bool SwDrawView::TakeDragLimit( SdrDragMode eMode,
Rectangle& rRect ) const
......@@ -720,12 +687,7 @@ sal_Bool SwDrawView::TakeDragLimit( SdrDragMode eMode,
return bRet;
}
/*************************************************************************
|*
|* SwDrawView::CalcAnchor()
|*
*************************************************************************/
// SwDrawView::CalcAnchor()
const SwFrm* SwDrawView::CalcAnchor()
{
......@@ -735,8 +697,8 @@ const SwFrm* SwDrawView::CalcAnchor()
SdrObject* pObj = rMrkList.GetMark( 0 )->GetMarkedSdrObj();
//Fuer Absatzgebundene Objekte suchen, andernfalls einfach nur
//der aktuelle Anker. Nur suchen wenn wir gerade draggen.
//Search for paragraph bound objects, otherwise only the
//current anchor. Search only if we currently drag.
const SwFrm* pAnch;
Rectangle aMyRect;
const sal_Bool bFly = pObj->ISA(SwVirtFlyDrawObj);
......@@ -807,12 +769,7 @@ const SwFrm* SwDrawView::CalcAnchor()
return pAnch;
}
/*************************************************************************
|*
|* SwDrawView::ShowDragXor(), HideDragXor()
|*
*************************************************************************/
// SwDrawView::ShowDragXor(), HideDragXor()
void SwDrawView::ShowDragAnchor()
{
......@@ -827,12 +784,7 @@ void SwDrawView::ShowDragAnchor()
}
}
/*************************************************************************
|*
|* SwDrawView::MarkListHasChanged()
|*
*************************************************************************/
// SwDrawView::MarkListHasChanged()
void SwDrawView::MarkListHasChanged()
{
......@@ -883,12 +835,12 @@ void SwDrawView::CheckPossibilities()
{
FmFormView::CheckPossibilities();
//Zusaetzlich zu den bestehenden Flags der Objekte selbst, die von der
//DrawingEngine ausgewertet werden, koennen weitere Umstaende zu einem
//Schutz fuehren.
//Objekte, die in Rahmen verankert sind, muessen genau dann geschuetzt
//sein, wenn der Inhalt des Rahmens geschuetzt ist.
//OLE-Objekte konnen selbst einen Resize-Schutz wuenschen (StarMath)
//In addition to the existing flags of the objects themselves,
//which are evaluated by the DrawingEngine, other circumstances
//lead to a protection.
//Objects that are anchored in frames need to be protected
//if the content of the frame is protected.
//OLE-Objects may themselves wish a resize protection (StarMath)
const SdrMarkList &rMrkList = GetMarkedObjectList();
sal_Bool bProtect = sal_False,
......@@ -937,7 +889,7 @@ void SwDrawView::CheckPossibilities()
pFrm = pC->GetAnchorFrm( pObj );
}
if ( pFrm )
bProtect = pFrm->IsProtected(); //Rahmen, Bereiche usw.
bProtect = pFrm->IsProtected(); //Frames, areas etc.
{
SwFrmFmt* pFrmFmt( ::FindFrmFmt( const_cast<SdrObject*>(pObj) ) );
if ( !pFrmFmt )
......@@ -957,9 +909,9 @@ void SwDrawView::CheckPossibilities()
}
/** replace marked <SwDrawVirtObj>-objects by its reference object for delete
marked objects.
@author OD
* marked objects.
*
* @author OD
*/
void SwDrawView::ReplaceMarkedDrawVirtObjs( SdrMarkView& _rMarkView )
{
......
sw/source/core/edit/edatmisc.cxx
Dosyayı görüntüle @ 1fd796f0
......@@ -19,18 +19,18 @@
#include <editsh.hxx>
#include <doc.hxx> // fuer aNodes
#include <doc.hxx> // for aNodes
#include <IDocumentUndoRedo.hxx>
#include <pam.hxx> // fuer SwPaM
#include <edimp.hxx> // fuer MACROS
#include <swundo.hxx> // fuer die UndoIds
#include <ndtxt.hxx> // fuer Get-/ChgFmt Set-/GetAttrXXX
#include <pam.hxx> // for SwPaM
#include <edimp.hxx> // for MACROS
#include <swundo.hxx> // for the UndoIds
#include <ndtxt.hxx> // fot Get-/ChgFmt Set-/GetAttrXXX
/*************************************
* harte Formatierung (Attribute)
*************************************/
/**
* hard formatting (Attribute)
*/
void SwEditShell::ResetAttr( const std::set<sal_uInt16> &attrs, SwPaM* pPaM )
......@@ -87,18 +87,18 @@ void SwEditShell::GCAttr()
FOREACHPAM_END()
}
// Setze das Attribut als neues default Attribut im Dokument.
// Set the attribute as new default attribute in the document.
void SwEditShell::SetDefault( const SfxPoolItem& rFmtHint )
{
// 7502: Action-Klammerung
// 7502: Action-Parenthesis
StartAllAction();
GetDoc()->SetDefault( rFmtHint );
EndAllAction();
}
// Erfrage das Default Attribut in diesem Dokument.
// Inquire the Default Attribut in this document.
const SfxPoolItem& SwEditShell::GetDefault( sal_uInt16 nFmtHint ) const
{
......@@ -112,7 +112,7 @@ void SwEditShell::SetAttr( const SfxPoolItem& rHint, sal_uInt16 nFlags )
SET_CURR_SHELL( this );
StartAllAction();
SwPaM* pCrsr = GetCrsr();
if( pCrsr->GetNext() != pCrsr ) // Ring von Cursorn
if( pCrsr->GetNext() != pCrsr ) // Ring of Cursors
{
sal_Bool bIsTblMode = IsTableMode();
GetDoc()->GetIDocumentUndoRedo().StartUndo(UNDO_INSATTR, NULL);
......@@ -143,7 +143,7 @@ void SwEditShell::SetAttr( const SfxItemSet& rSet, sal_uInt16 nFlags, SwPaM* pPa
SwPaM* pCrsr = pPaM ? pPaM : GetCrsr();
StartAllAction();
if( pCrsr->GetNext() != pCrsr ) // Ring von Cursorn
if( pCrsr->GetNext() != pCrsr ) // Ring of Cursors
{
sal_Bool bIsTblMode = IsTableMode();
GetDoc()->GetIDocumentUndoRedo().StartUndo(UNDO_INSATTR, NULL);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment