[Libreoffice-commits] core.git: include/svx stoc/test sw/source
Sven Wehner
wehner at informatik.uni-freiburg.de
Sun Jan 26 09:30:29 PST 2014
include/svx/svdocirc.hxx | 28 +++--------
stoc/test/testintrosp.cxx | 72 ++++++++++++++----------------
sw/source/core/text/porfld.cxx | 96 ++++++-----------------------------------
3 files changed, 58 insertions(+), 138 deletions(-)
New commits:
commit 5591e21e31837211e591dc3cda4b75dd35c5b03d
Author: Sven Wehner <wehner at informatik.uni-freiburg.de>
Date: Fri Jan 17 17:13:43 2014 +0100
Translate some German comments to English, and remove some ASCII art.
Additional changes according to Chris Sherlock's wishes (removing
comment decorations, removing no-purpose comments)
Change-Id: I5346010d67ed5d1b2b2ad0df91ac472dde905683
Reviewed-on: https://gerrit.libreoffice.org/7504
Reviewed-by: Chris Sherlock <chris.sherlock79 at gmail.com>
Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud at gmail.com>
diff --git a/include/svx/svdocirc.hxx b/include/svx/svdocirc.hxx
index d62e5c8..81fccce 100644
--- a/include/svx/svdocirc.hxx
+++ b/include/svx/svdocirc.hxx
@@ -23,17 +23,11 @@
#include <svx/svdorect.hxx>
#include <svx/svxdllapi.h>
-//************************************************************
-// Vorausdeklarationen
-//************************************************************
-
namespace sdr { namespace properties {
class CircleProperties;
}}
-//************************************************************
-// Hilfsklasse SdrCircObjGeoData
-//************************************************************
+// Helper class SdrCircObjGeoData
// #109872#
class SdrCircObjGeoData : public SdrTextObjGeoData
@@ -43,9 +37,7 @@ public:
long nEndWink;
};
-//************************************************************
-// SdrCircObj
-//************************************************************
+// class SdrCircObj
class SVX_DLLPUBLIC SdrCircObj : public SdrRectObj
{
@@ -70,10 +62,10 @@ protected:
private:
SVX_DLLPRIVATE basegfx::B2DPolygon ImpCalcXPolyCirc(const SdrObjKind eKind, const Rectangle& rRect1, long nStart, long nEnd) const;
SVX_DLLPRIVATE void ImpSetCreateParams(SdrDragStat& rStat) const;
- SVX_DLLPRIVATE void ImpSetAttrToCircInfo(); // Werte vom Pool kopieren
- SVX_DLLPRIVATE void ImpSetCircInfoToAttr(); // Werte in den Pool kopieren
+ SVX_DLLPRIVATE void ImpSetAttrToCircInfo(); // copy values from pool
+ SVX_DLLPRIVATE void ImpSetCircInfoToAttr(); // copy values into pool
- // Liefert sal_True, wenn das Painten ein XPolygon erfordert.
+ // returns sal_True if paint requires a XPolygon
SVX_DLLPRIVATE bool PaintNeedsXPolyCirc() const; // PaintNeedsXPoly-> PaintNeedsXPolyCirc
SVX_DLLPRIVATE virtual void RecalcXPoly();
@@ -82,15 +74,13 @@ protected:
public:
TYPEINFO();
- SdrCircObj(SdrObjKind eNewKind); // Circ, CArc, Sect oder CCut
+ SdrCircObj(SdrObjKind eNewKind); // Circ, CArc, Sect or CCut
SdrCircObj(SdrObjKind eNewKind, const Rectangle& rRect);
// 0=0.00Deg=3h 9000=90.00Deg=12h 18000=180.00Deg=9h 27000=270.00Deg=6h
- // Der Verlauf des Kreises von StartWink nach EndWink ist immer entgegen
- // dem Uhrzeigersinn.
- // Wenn nNewStartWink==nNewEndWink hat der Kreisbogen einen Verlaufswinkel
- // von 0 Grad. Bei nNewStartWink+36000==nNewEndWink ist der Verlaufswinkel
- // 360.00 Grad.
+ // The circle is build up from StartWink to EndWink anti-clockwise.
+ // If nNewStartWink==nNewEndWink, then arc has an angle of 0 degrees.
+ // If nNewStartWink+36000==nNewEndWink, then the arc has angle of 360 degrees.
SdrCircObj(SdrObjKind eNewKind, const Rectangle& rRect, long nNewStartWink, long nNewEndWink);
virtual ~SdrCircObj();
diff --git a/stoc/test/testintrosp.cxx b/stoc/test/testintrosp.cxx
index 89c884c..f6d0860 100644
--- a/stoc/test/testintrosp.cxx
+++ b/stoc/test/testintrosp.cxx
@@ -61,9 +61,7 @@ typedef WeakImplHelper1< XPropertySetInfo > ImplPropertySetInfoHelper;
#define DEFAULT_INDEX_ACCESS_COUNT 10
#define DEFAULT_NAME_ACCESS_COUNT 5
-//*******************************************************************
-//*** Auxiliary function, in order to get from one type XIdlClass ***
-//*******************************************************************
+// Auxiliary function, in order to get from one type XIdlClass
Reference<XIdlClass> TypeToIdlClass( const Type& rType, const Reference< XMultiServiceFactory > & xMgr )
{
static Reference< XIdlReflection > xRefl;
@@ -87,11 +85,9 @@ Reference<XIdlClass> TypeToIdlClass( const Type& rType, const Reference< XMultiS
}
-//****************************************************
-//*** Hilfs-Funktion, um Any als UString auszugeben ***
-//****************************************************
-// ACHTUNG: Kann mal an eine zentrale Stelle uebernommen werden
-// Wird zunaechst nur fuer einfache Datentypen ausgefuehrt
+// Helper function to convert Any to UString
+// TODO: This code could be moved to a more central place.
+// Currently it's used only for simple data types.
OUString AnyToString( const Any& aValue, sal_Bool bIncludeType, const Reference< XMultiServiceFactory > & xMgr )
{
@@ -180,9 +176,7 @@ OUString AnyToString( const Any& aValue, sal_Bool bIncludeType, const Reference<
return aRetStr;
}
-//*****************************************
-//*** XPropertySetInfo fuer Test-Klasse ***
-//*****************************************
+// XPropertySetInfo for test class
class ImplPropertySetInfo : public ImplPropertySetInfoHelper
{
@@ -298,11 +292,11 @@ class ImplIntroTest : public ImplIntroTestHelper
Reference< XIntroTest >* pIndexAccessTab;
sal_Int16 iIndexAccessCount;
- // struct-Properties
+ // struct properties
Property m_aFirstStruct;
PropertyValue m_aSecondStruct;
- // Listener merken (zunaechst einfach, nur einen pro Property)
+ // remember listener (one listener per property)
Reference< XPropertyChangeListener > aPropChangeListener;
OUString aPropChangeListenerStr;
Reference< XVetoableChangeListener > aVetoPropChangeListener;
@@ -317,7 +311,7 @@ public:
Init();
}
- // Trotz virtual inline, um Schreibarbeit zu sparen (nur fuer Testzwecke)
+ // despite virtual inline, to simplify coding (testing only)
// XPropertySet
virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo( )
throw(RuntimeException);
@@ -430,20 +424,20 @@ public:
void ImplIntroTest::Init( void )
{
- // Eindeutigen Namen verpassen
+ // set unique name
static sal_Int32 nObjCount = 0;
OUString aName( "IntroTest-Obj Nr. " );
aName += OUString::valueOf( nObjCount );
setObjectName( aName );
- // Properties initialization
+ // initialize properties
aAnyArray[0] <<= 3.14;
aAnyArray[1] <<= (sal_Int32)42;
aAnyArray[2] <<= OUString( "Hallo" );
- // Einmal fuer den internen Gebrauch die PropertySetInfo abholen
+ // fetch PropertySetInfo once for internal use
m_xMyInfo = getPropertySetInfo();
- m_xMyInfo->acquire(); // sonst raucht es am Programm-Ende ab
+ m_xMyInfo->acquire(); // otherwise it could crash at shutdown
m_nMarkusAge = 33;
m_nMarkusChildrenCount = 2;
@@ -455,7 +449,7 @@ void ImplIntroTest::Init( void )
m_nLaber = 1;
eTypeClass = TypeClass_INTERFACE;
- // String-Sequence initialization
+ // string sequence initialization
aStringSeq.realloc( 3 );
aStringSeq[ 0 ] = "String 0";
aStringSeq[ 1 ] = "String 1";
@@ -680,11 +674,11 @@ struct DefItem
sal_Int32 nConcept;
};
-// Spezial-Wert fuer Method-Concept, um "normale" Funktionen kennzeichnen zu koennen
+// special value for method concept, to mark "normal" functions
#define MethodConcept_NORMAL_IMPL 0x80000000
-// Test-Objekt liefern
+// return test object
Any getIntrospectionTestObject( const Reference< XMultiServiceFactory > & xMgr )
{
Any aObjAny;
@@ -854,10 +848,10 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
//******************************************************
- // create Test object
+ // create test object
Any aObjAny = getIntrospectionTestObject( xMgr );
- // Introspection-Service unspecten
+ // inspect introspection service
Reference< XIntrospectionAccess > xAccess = xIntrospection->inspect( aObjAny );
xAccess = xIntrospection->inspect( aObjAny );
xAccess = xIntrospection->inspect( aObjAny );
@@ -865,9 +859,9 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
if( !xAccess.is() )
return sal_False;
- // Ergebnis der Introspection pruefen
+ // check result of introspection
- // XPropertySet-UIK ermitteln
+ // determine XPropertySet-UIK
Type aType = getCppuType( (Reference< XPropertySet >*) NULL );
Reference< XInterface > xPropSetIface = xAccess->queryAdapter( aType );
@@ -878,10 +872,10 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
Reference< XExactName > xExactName( xAccess, UNO_QUERY );
OSL_ENSURE( xExactName.is(), "Introspection unterstuetzt kein ExactName" );
- // Schleife ueber alle Kombinationen von Concepts
+ // loop over all concept combinations
for( sal_Int32 nConcepts = 0 ; nConcepts < 16 ; nConcepts++ )
{
- // Wieviele Properties sollten es sein
+ // how many properties should this be
sal_Int32 nDemandedPropCount = 0;
sal_Int32 iList = 0;
while( pPropertyDefs[ iList ].pName )
@@ -912,7 +906,7 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
{
const Property aProp = pProps[ i ];
- // Naechste Passende Methode in der Liste suchen
+ // search for next suitable method in the list
while( pPropertyDefs[ iList ].pName )
{
if( pPropertyDefs[ iList ].nConcept & nConcepts )
@@ -945,7 +939,7 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
aErrorStr += "<";
OSL_ENSURE( aTypeNameStr == aDemandedTypeNameStr, aErrorStr.getStr() );
- // Wert des Property lesen und ausgeben
+ // read and report value of property
aPropVal = xPropSet->getPropertyValue( aPropName );
OString aValStr = OUStringToOString( AnyToString( aPropVal, sal_False, xMgr ), RTL_TEXTENCODING_ASCII_US );
@@ -959,7 +953,7 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
aErrorStr += "<";
OSL_ENSURE( aValStr == aDemandedValStr, aErrorStr.getStr() );
- // Wert pruefen und typgerecht modifizieren
+ // check value and modify it according to its type
TypeClass eType = aPropVal.getValueType().getTypeClass();
Any aNewVal;
sal_Bool bModify = sal_True;
@@ -999,11 +993,11 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
break;
}
- // Modifizieren nur beim letzten Durchlauf
+ // modify only in the last iteration
if( nConcepts == 15 )
{
- // XExactName pruefen, dafuer alles gross machen
- // (Introspection ist mit LowerCase implementiert, also anders machen)
+ // check XExactName, switch everything to upper case
+ // (introspection uses lower case)
OUString aUpperUStr = aPropName.toAsciiUpperCase();
OUString aExactName = xExactName->getExactName( aUpperUStr );
if( aExactName != aPropName )
@@ -1021,10 +1015,10 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
bModify = sal_False;
}
- // Neuen Wert setzen, wieder lesen und ausgeben
+ // set new value, then read and return value
if( bModify )
{
- // UnknownPropertyException bei ReadOnly-Properties abfangen
+ // catch UnknownPropertyException for ReadOnly properties
try
{
xPropSet->setPropertyValue( aPropName, aNewVal );
@@ -1048,7 +1042,7 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
OSL_ENSURE( aModifiedValStr == aDemandedModifiedValStr, aErrorStr.getStr() );
}
- // Checken, ob alle Properties auch einzeln gefunden werden
+ // check whether all properties can be found individually
aErrorStr = "property \"";
aErrorStr += aDemandedName;
aErrorStr += "\" not found with hasProperty()";
@@ -1075,7 +1069,7 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
}
}
- // Schleife ueber alle Kombinationen von Concepts
+ // loop over all concept combinations
for( sal_Int32 nConcepts = 0 ; nConcepts < 128 ; nConcepts++ )
{
// Das 2^6-Bit steht fuer "den Rest"
@@ -1159,7 +1153,7 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
}
}
- // Listener-Klassen ausgeben
+ // print listener class
Sequence< Type > aClassSeq = xAccess->getSupportedListeners();
sal_Int32 nLen = aClassSeq.getLength();
@@ -1169,7 +1163,7 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
// Methode ansprechen
const Type& aListenerType = pListeners[i];
- // Namen besorgen
+ // get name
OUString aListenerClassName = aListenerType.getTypeName();
}
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 83d5c94..1d187ad 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -45,9 +45,7 @@
using namespace ::com::sun::star;
-/*************************************************************************
- * class SwFldPortion
- *************************************************************************/
+// class SwFldPortion
SwLinePortion *SwFldPortion::Compress()
{ return (GetLen() || !aExpand.isEmpty() || SwLinePortion::Compress()) ? this : 0; }
@@ -112,14 +110,9 @@ SwFldPortion::~SwFldPortion()
pBlink->Delete( this );
}
-/*************************************************************************
- * virtual SwFldPortion::GetViewWidth()
- *************************************************************************/
-
KSHORT SwFldPortion::GetViewWidth( const SwTxtSizeInfo &rInf ) const
{
- // Wir stehen zwar im const, aber nViewWidth sollte erst im letzten
- // Moment errechnet werden:
+ // even though this is const, nViewWidth should be computed at the very end:
SwFldPortion* pThis = (SwFldPortion*)this;
if( !Width() && rInf.OnWin() && !rInf.GetOpt().IsPagePreview() &&
!rInf.GetOpt().IsReadonly() && SwViewOption::IsFieldShadings() )
@@ -132,15 +125,9 @@ KSHORT SwFldPortion::GetViewWidth( const SwTxtSizeInfo &rInf ) const
return nViewWidth;
}
-/*************************************************************************
- * virtual SwFldPortion::Format()
- *************************************************************************/
-
// 8653: in keinem Fall nur SetLen(0);
-/*************************************************************************
- * Hilfsklasse SwFldSlot
- **************************************************************************/
+// Helper class SwFldSlot
class SwFldSlot
{
@@ -383,7 +370,7 @@ sal_Bool SwFldPortion::Format( SwTxtFormatInfo &rInf )
switch( aNew[0] )
{
case CH_BREAK : bFull = sal_True;
- // kein break;
+ // no break
case ' ' :
case CH_TAB :
case CHAR_HARDHYPHEN: // non-breaking hyphen
@@ -427,10 +414,6 @@ sal_Bool SwFldPortion::Format( SwTxtFormatInfo &rInf )
return bFull;
}
-/*************************************************************************
- * virtual SwFldPortion::Paint()
- *************************************************************************/
-
void SwFldPortion::Paint( const SwTxtPaintInfo &rInf ) const
{
SwFontSave aSave( rInf, pFnt );
@@ -444,10 +427,6 @@ void SwFldPortion::Paint( const SwTxtPaintInfo &rInf ) const
}
}
-/*************************************************************************
- * virtual SwFldPortion::GetExpTxt()
- *************************************************************************/
-
sal_Bool SwFldPortion::GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const
{
rTxt = aExpand;
@@ -459,10 +438,6 @@ sal_Bool SwFldPortion::GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) co
return sal_True;
}
-/*************************************************************************
- * virtual SwFldPortion::HandlePortion()
- *************************************************************************/
-
void SwFldPortion::HandlePortion( SwPortionHandler& rPH ) const
{
sal_Int32 nH = 0;
@@ -475,10 +450,6 @@ void SwFldPortion::HandlePortion( SwPortionHandler& rPH ) const
}
}
-/*************************************************************************
- * virtual SwFldPortion::GetTxtSize()
- *************************************************************************/
-
SwPosSize SwFldPortion::GetTxtSize( const SwTxtSizeInfo &rInf ) const
{
SwFontSave aSave( rInf, pFnt );
@@ -486,9 +457,8 @@ SwPosSize SwFldPortion::GetTxtSize( const SwTxtSizeInfo &rInf ) const
return aSize;
}
-/*************************************************************************
- * class SwHiddenPortion
- *************************************************************************/
+
+// class SwHiddenPortion
SwFldPortion *SwHiddenPortion::Clone(const OUString &rExpand ) const
{
@@ -498,10 +468,6 @@ SwFldPortion *SwHiddenPortion::Clone(const OUString &rExpand ) const
return new SwHiddenPortion( rExpand, pNewFnt );
}
-/*************************************************************************
- * virtual SwHiddenPortion::Paint()
- *************************************************************************/
-
void SwHiddenPortion::Paint( const SwTxtPaintInfo &rInf ) const
{
if( Width() )
@@ -512,19 +478,14 @@ void SwHiddenPortion::Paint( const SwTxtPaintInfo &rInf ) const
}
}
-/*************************************************************************
- * virtual SwHiddenPortion::GetExpTxt()
- *************************************************************************/
-
sal_Bool SwHiddenPortion::GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const
{
// Nicht auf IsHidden() abfragen !
return SwFldPortion::GetExpTxt( rInf, rTxt );
}
-/*************************************************************************
- * class SwNumberPortion
- *************************************************************************/
+
+// class SwNumberPortion
SwNumberPortion::SwNumberPortion( const OUString &rExpand,
SwFont *pFont,
@@ -558,10 +519,6 @@ SwFldPortion *SwNumberPortion::Clone( const OUString &rExpand ) const
nMinDist, mbLabelAlignmentPosAndSpaceModeActive );
}
-/*************************************************************************
- * virtual SwNumberPortion::Format()
- *************************************************************************/
-
// 5010: Wir sind in der Lage, mehrzeilige NumFelder anzulegen!
// 3689: Fies ist, wenn man in der Dialogbox soviel Davor-Text
// eingibt, bis die Zeile ueberlaeuft.
@@ -599,7 +556,7 @@ sal_Bool SwNumberPortion::Format( SwTxtFormatInfo &rInf )
nDiff = rInf.Left() - rInf.First() + rInf.ForcedLeftMargin();
}
}
- // Ein Vorschlag von Juergen und Volkmar:
+ // proposal from Juergen and Volkmar:
// Der Textteil hinter der Numerierung sollte immer
// mindestens beim linken Rand beginnen.
if( nDiff < 0 )
@@ -651,10 +608,6 @@ void SwNumberPortion::FormatEOL( SwTxtFormatInfo& )
// SetHide( sal_True );
}
-/*************************************************************************
- * virtual SwNumberPortion::Paint()
- *************************************************************************/
-
void SwNumberPortion::Paint( const SwTxtPaintInfo &rInf ) const
{
/* Eine verborgene NumberPortion wird nicht angezeigt, es sei denn, es gibt
@@ -717,7 +670,7 @@ void SwNumberPortion::Paint( const SwTxtPaintInfo &rInf ) const
SwExpandPortion::Paint( rInf );
else
{
- // logisches const: Width wird wieder zurueckgesetzt
+ // logical const: reset width
SwLinePortion *pThis = (SwLinePortion*)this;
bPaintSpace = bPaintSpace && nFixWidth < nOldWidth;
KSHORT nSpaceOffs = nFixWidth;
@@ -774,9 +727,7 @@ static sal_Char const sDoubleSpace[] = " ";
}
-/*************************************************************************
- * class SwBulletPortion
- *************************************************************************/
+// class SwBulletPortion
SwBulletPortion::SwBulletPortion( const sal_Unicode cBullet,
const OUString& rBulletFollowedBy,
@@ -792,9 +743,8 @@ SwBulletPortion::SwBulletPortion( const sal_Unicode cBullet,
SetWhichPor( POR_BULLET );
}
-/*************************************************************************
- * class SwGrfNumPortion
- *************************************************************************/
+
+// class SwGrfNumPortion
#define GRFNUM_SECURE 10
@@ -886,7 +836,7 @@ sal_Bool SwGrfNumPortion::Format( SwTxtFormatInfo &rInf )
long nDiff = mbLabelAlignmentPosAndSpaceModeActive
? 0
: rInf.Left() - rInf.First() + rInf.ForcedLeftMargin();
- // Ein Vorschlag von Juergen und Volkmar:
+ // proposal by Juergen and Volkmar:
// Der Textteil hinter der Numerierung sollte immer
// mindestens beim linken Rand beginnen.
if( nDiff < 0 )
@@ -1083,10 +1033,8 @@ void SwTxtFrm::StopAnimation( OutputDevice* pOut )
}
}
-/*************************************************************************
- * SwCombinedPortion::SwCombinedPortion(..)
- * initializes the script array and clears the width array
- *************************************************************************/
+// SwCombinedPortion::SwCombinedPortion(..)
+// initializes the script array and clears the width array
SwCombinedPortion::SwCombinedPortion( const OUString &rTxt )
: SwFldPortion( rTxt )
@@ -1122,10 +1070,6 @@ SwCombinedPortion::SwCombinedPortion( const OUString &rTxt )
memset( &aWidth, 0, sizeof(aWidth) );
}
-/*************************************************************************
- * SwCombinedPortion::Paint(..)
- *************************************************************************/
-
void SwCombinedPortion::Paint( const SwTxtPaintInfo &rInf ) const
{
OSL_ENSURE( GetLen() <= 1, "SwFldPortion::Paint: rest-portion polution?" );
@@ -1180,10 +1124,6 @@ void SwCombinedPortion::Paint( const SwTxtPaintInfo &rInf ) const
}
}
-/*************************************************************************
- * SwCombinedPortion::Format(..)
- *************************************************************************/
-
sal_Bool SwCombinedPortion::Format( SwTxtFormatInfo &rInf )
{
sal_Int32 nCount = aExpand.getLength();
@@ -1346,10 +1286,6 @@ sal_Bool SwCombinedPortion::Format( SwTxtFormatInfo &rInf )
return bFull;
}
-/*************************************************************************
- * SwCombinedPortion::GetViewWidth(..)
- *************************************************************************/
-
KSHORT SwCombinedPortion::GetViewWidth( const SwTxtSizeInfo &rInf ) const
{
if( !GetLen() ) // for the dummy part at the end of the line, where
More information about the Libreoffice-commits
mailing list