[Libreoffice-commits] .: 5 commits - tools/inc
Philipp Riemer
priemer at kemper.freedesktop.org
Mon Aug 13 14:54:00 PDT 2012
tools/inc/bootstrp/prj.hxx | 9
tools/inc/impcont.hxx | 53 --
tools/inc/impstrg.hxx | 3
tools/inc/poly.h | 15
tools/inc/tools/StringListResource.hxx | 4
tools/inc/tools/appendunixshellword.hxx | 18
tools/inc/tools/b3dtrans.hxx | 91 ++--
tools/inc/tools/bigint.hxx | 23 -
tools/inc/tools/cachestr.hxx | 24 -
tools/inc/tools/color.hxx | 33 -
tools/inc/tools/config.hxx | 14
tools/inc/tools/contnr.hxx | 21 -
tools/inc/tools/date.hxx | 46 --
tools/inc/tools/datetime.hxx | 36 -
tools/inc/tools/debug.hxx | 15
tools/inc/tools/diagnose_ex.h | 8
tools/inc/tools/errcode.hxx | 4
tools/inc/tools/errinf.hxx | 55 --
tools/inc/tools/extendapplicationenvironment.hxx | 1
tools/inc/tools/fldunit.hxx | 7
tools/inc/tools/fontenum.hxx | 43 --
tools/inc/tools/fract.hxx | 5
tools/inc/tools/fsys.hxx | 113 ++---
tools/inc/tools/gen.hxx | 27 -
tools/inc/tools/getprocessworkingdir.hxx | 1
tools/inc/tools/globname.hxx | 7
tools/inc/tools/helpers.hxx | 4
tools/inc/tools/inetmime.hxx | 13
tools/inc/tools/inetmsg.hxx | 53 --
tools/inc/tools/inetstrm.hxx | 34 -
tools/inc/tools/line.hxx | 13
tools/inc/tools/link.hxx | 10
tools/inc/tools/list.hxx | 7
tools/inc/tools/mapunit.hxx | 6
tools/inc/tools/mempool.hxx | 10
tools/inc/tools/multisel.hxx | 38 -
tools/inc/tools/pathutils.hxx | 88 ++--
tools/inc/tools/poly.hxx | 57 --
tools/inc/tools/pstm.hxx | 61 +--
tools/inc/tools/rc.h | 11
tools/inc/tools/rc.hxx | 16
tools/inc/tools/rcid.h | 5
tools/inc/tools/ref.hxx | 73 +--
tools/inc/tools/resary.hxx | 13
tools/inc/tools/resid.hxx | 39 -
tools/inc/tools/resmgr.hxx | 136 +++---
tools/inc/tools/rtti.hxx | 30 -
tools/inc/tools/shl.hxx | 8
tools/inc/tools/simplerm.hxx | 14
tools/inc/tools/solar.h | 50 --
tools/inc/tools/stream.hxx | 455 +++++++++++------------
tools/inc/tools/string.hxx | 70 +--
tools/inc/tools/svborder.hxx | 3
tools/inc/tools/tempfile.hxx | 42 +-
tools/inc/tools/tenccvt.hxx | 26 -
tools/inc/tools/time.hxx | 70 +--
tools/inc/tools/tools.h | 2
tools/inc/tools/toolsdllapi.h | 2
tools/inc/tools/unqidx.hxx | 12
tools/inc/tools/urlobj.hxx | 26 -
tools/inc/tools/vcompat.hxx | 22 -
tools/inc/tools/vector2d.hxx | 24 -
tools/inc/tools/weakbase.h | 9
tools/inc/tools/weakbase.hxx | 2
tools/inc/tools/wintypes.hxx | 37 -
tools/inc/tools/wldcrd.hxx | 8
tools/inc/tools/zcodec.hxx | 45 --
67 files changed, 903 insertions(+), 1417 deletions(-)
New commits:
commit d170a36bbfc41d6a7d12a7ad242efe89b5f7e306
Author: Philipp Riemer <ruderphilipp at gmail.com>
Date: Mon Aug 13 23:42:18 2012 +0200
re-indent LOC to match coding styles (in tools/inc/)
This is a follow-up patch of c8b7aa55138848fe07108779099267424bc03e3d.
Change-Id: I368c1e119225bbee2adf71cbde0ebc41120c4b15
diff --git a/tools/inc/tools/b3dtrans.hxx b/tools/inc/tools/b3dtrans.hxx
index 2024c88..c9e6595 100644
--- a/tools/inc/tools/b3dtrans.hxx
+++ b/tools/inc/tools/b3dtrans.hxx
@@ -49,68 +49,68 @@ class TOOLS_DLLPUBLIC B3dTransformationSet
{
private:
// Object Matrix Object -> World
- basegfx::B3DHomMatrix maObjectTrans;
- basegfx::B3DHomMatrix maInvObjectTrans;
+ basegfx::B3DHomMatrix maObjectTrans;
+ basegfx::B3DHomMatrix maInvObjectTrans;
// Orientation Matrix
- basegfx::B3DHomMatrix maOrientation;
- basegfx::B3DHomMatrix maInvOrientation;
+ basegfx::B3DHomMatrix maOrientation;
+ basegfx::B3DHomMatrix maInvOrientation;
// Projection Matrix
- basegfx::B3DHomMatrix maProjection;
- basegfx::B3DHomMatrix maInvProjection;
+ basegfx::B3DHomMatrix maProjection;
+ basegfx::B3DHomMatrix maInvProjection;
// Texture Matrices
- basegfx::B2DHomMatrix maTexture;
+ basegfx::B2DHomMatrix maTexture;
// Special transformation set for converting Object -> Device
- basegfx::B3DHomMatrix maObjectToDevice;
+ basegfx::B3DHomMatrix maObjectToDevice;
// Transposed and inversed matrix for vector transformations
- basegfx::B3DHomMatrix maInvTransObjectToEye;
+ basegfx::B3DHomMatrix maInvTransObjectToEye;
// Transformation for World->View
- basegfx::B3DHomMatrix maMatFromWorldToView;
- basegfx::B3DHomMatrix maInvMatFromWorldToView;
+ basegfx::B3DHomMatrix maMatFromWorldToView;
+ basegfx::B3DHomMatrix maInvMatFromWorldToView;
// Parameters for ViewportTransformation
- basegfx::B3DVector maScale;
- basegfx::B3DVector maTranslate;
+ basegfx::B3DVector maScale;
+ basegfx::B3DVector maTranslate;
// ViewPlane DeviceRectangle (user-defined)
- double mfLeftBound;
- double mfRightBound;
- double mfBottomBound;
- double mfTopBound;
+ double mfLeftBound;
+ double mfRightBound;
+ double mfBottomBound;
+ double mfTopBound;
// Near and far clipping planes
- double mfNearBound;
- double mfFarBound;
+ double mfNearBound;
+ double mfFarBound;
// Aspect ratio of 3D transformation (Y / X)
// default: 1:1 -> 1.0
// Disable with value 0.0
- double mfRatio;
+ double mfRatio;
// Viewport area in logical coordinates
- Rectangle maViewportRectangle;
+ Rectangle maViewportRectangle;
// Visible area within viewport
- Rectangle maVisibleRectangle;
+ Rectangle maVisibleRectangle;
// Actual coordinates as set by CalcViewport
// of visible viewport area (logical coordinates)
- Rectangle maSetBound;
+ Rectangle maSetBound;
// Method of keeping defined aspect ratio
// default: Base3DRatioGrow
- Base3DRatio meRatio;
+ Base3DRatio meRatio;
// Flags
- unsigned mbPerspective : 1;
- unsigned mbWorldToViewValid : 1;
- unsigned mbInvTransObjectToEyeValid : 1;
- unsigned mbObjectToDeviceValid : 1;
- unsigned mbProjectionValid : 1;
+ unsigned mbPerspective : 1;
+ unsigned mbWorldToViewValid : 1;
+ unsigned mbInvTransObjectToEyeValid : 1;
+ unsigned mbObjectToDeviceValid : 1;
+ unsigned mbProjectionValid : 1;
public:
B3dTransformationSet();
@@ -143,7 +143,9 @@ public:
Base3DRatio GetRatioMode() { return meRatio; }
// Parameters of ViewportTransformation
- void SetDeviceRectangle(double fL=-1.0, double fR=1.0, double fB=-1.0, double fT=1.0, sal_Bool bBroadCastChange=sal_True);
+ void SetDeviceRectangle(double fL=-1.0, double fR=1.0,
+ double fB=-1.0, double fT=1.0,
+ sal_Bool bBroadCastChange=sal_True);
double GetDeviceRectangleWidth() const { return mfRightBound - mfLeftBound; }
double GetDeviceRectangleHeight() const { return mfTopBound - mfBottomBound; }
double GetFrontClippingPlane() { return mfNearBound; }
@@ -192,9 +194,9 @@ protected:
class TOOLS_DLLPUBLIC B3dViewport : public B3dTransformationSet
{
private:
- basegfx::B3DPoint aVRP; // View Reference Point
- basegfx::B3DVector aVPN; // View Plane Normal
- basegfx::B3DVector aVUV; // View Up Vector
+ basegfx::B3DPoint aVRP; // View Reference Point
+ basegfx::B3DVector aVPN; // View Plane Normal
+ basegfx::B3DVector aVUV; // View Up Vector
public:
B3dViewport();
diff --git a/tools/inc/tools/bigint.hxx b/tools/inc/tools/bigint.hxx
index 40242ae..0637ddd 100644
--- a/tools/inc/tools/bigint.hxx
+++ b/tools/inc/tools/bigint.hxx
@@ -87,15 +87,15 @@ public:
void Set( sal_Bool bSet ) { bIsSet = bSet; }
rtl::OUString GetString() const;
- sal_Bool IsSet() const { return bIsSet; }
- sal_Bool IsNeg() const;
- sal_Bool IsZero() const;
- sal_Bool IsOne() const;
- sal_Bool IsLong() const { return !bIsBig; }
+ sal_Bool IsSet() const { return bIsSet; }
+ sal_Bool IsNeg() const;
+ sal_Bool IsZero() const;
+ sal_Bool IsOne() const;
+ sal_Bool IsLong() const { return !bIsBig; }
void Abs();
#ifdef _TLBIGINT_INT64
- sal_Bool INT64 ( SbxINT64 *p ) const;
- sal_Bool UINT64( SbxUINT64 *p ) const;
+ sal_Bool INT64 ( SbxINT64 *p ) const;
+ sal_Bool UINT64( SbxUINT64 *p ) const;
#endif
BigInt& operator =( const BigInt& rVal );
diff --git a/tools/inc/tools/color.hxx b/tools/inc/tools/color.hxx
index 55637a5..59f28d9 100644
--- a/tools/inc/tools/color.hxx
+++ b/tools/inc/tools/color.hxx
@@ -101,8 +101,8 @@ public:
{ mnColor = RGB_COLORDATA( nRed, nGreen, nBlue ); }
Color( sal_uInt8 nTransparency, sal_uInt8 nRed, sal_uInt8 nGreen, sal_uInt8 nBlue )
{ mnColor = TRGB_COLORDATA( nTransparency, nRed, nGreen, nBlue ); }
+ // This ctor is defined in svtools, not tools!
Color( const ResId& rResId );
- // This ctor is defined in svtools, not tools!
// constructor to create a tools-Color from ::basegfx::BColor
explicit Color(const ::basegfx::BColor& rBColor)
@@ -114,21 +114,21 @@ public:
}
void SetRed( sal_uInt8 nRed );
- sal_uInt8 GetRed() const { return COLORDATA_RED( mnColor ); }
+ sal_uInt8 GetRed() const { return COLORDATA_RED( mnColor ); }
void SetGreen( sal_uInt8 nGreen );
- sal_uInt8 GetGreen() const { return COLORDATA_GREEN( mnColor ); }
+ sal_uInt8 GetGreen() const { return COLORDATA_GREEN( mnColor ); }
void SetBlue( sal_uInt8 nBlue );
- sal_uInt8 GetBlue() const { return COLORDATA_BLUE( mnColor ); }
+ sal_uInt8 GetBlue() const { return COLORDATA_BLUE( mnColor ); }
void SetTransparency( sal_uInt8 nTransparency );
- sal_uInt8 GetTransparency() const { return COLORDATA_TRANSPARENCY( mnColor ); }
+ sal_uInt8 GetTransparency() const { return COLORDATA_TRANSPARENCY( mnColor ); }
void SetColor( ColorData nColor ) { mnColor = nColor; }
ColorData GetColor() const { return mnColor; }
ColorData GetRGBColor() const { return COLORDATA_RGB( mnColor ); }
- sal_uInt8 GetColorError( const Color& rCompareColor ) const;
+ sal_uInt8 GetColorError( const Color& rCompareColor ) const;
- sal_uInt8 GetLuminance() const;
+ sal_uInt8 GetLuminance() const;
void IncreaseLuminance( sal_uInt8 cLumInc );
void DecreaseLuminance( sal_uInt8 cLumDec );
@@ -138,11 +138,11 @@ public:
void Merge( const Color& rMergeColor, sal_uInt8 cTransparency );
- sal_Bool IsRGBEqual( const Color& rColor ) const;
+ sal_Bool IsRGBEqual( const Color& rColor ) const;
// comparison with luminance thresholds
- sal_Bool IsDark() const;
- sal_Bool IsBright() const;
+ sal_Bool IsDark() const;
+ sal_Bool IsBright() const;
// color space conversion tools
// the range for h/s/b is:
diff --git a/tools/inc/tools/config.hxx b/tools/inc/tools/config.hxx
index 422a68b..5c64f49 100644
--- a/tools/inc/tools/config.hxx
+++ b/tools/inc/tools/config.hxx
@@ -38,7 +38,7 @@ private:
sal_Bool mbDummy1;
#ifdef _CONFIG_CXX
- TOOLS_DLLPRIVATE sal_Bool ImplUpdateConfig() const;
+ TOOLS_DLLPRIVATE sal_Bool ImplUpdateConfig() const;
TOOLS_DLLPRIVATE ImplGroupData* ImplGetGroup() const;
#endif
@@ -52,7 +52,7 @@ public:
const rtl::OString& GetGroup() const { return maGroupName; }
void DeleteGroup(const rtl::OString& rGroup);
rtl::OString GetGroupName(sal_uInt16 nGroup) const;
- sal_uInt16 GetGroupCount() const;
+ sal_uInt16 GetGroupCount() const;
sal_Bool HasGroup(const rtl::OString& rGroup) const;
rtl::OString ReadKey(const rtl::OString& rKey) const;
@@ -64,7 +64,7 @@ public:
rtl::OString ReadKey(sal_uInt16 nKey) const;
sal_uInt16 GetKeyCount() const;
- sal_Bool IsLocked() const { return (mnLockCount != 0); }
+ sal_Bool IsLocked() const { return (mnLockCount != 0); }
void Flush();
void EnablePersistence( sal_Bool bPersistence = sal_True )
@@ -72,7 +72,7 @@ public:
sal_Bool IsPersistenceEnabled() const { return mbPersistence; }
private:
- TOOLS_DLLPRIVATE Config( const Config& rConfig );
+ TOOLS_DLLPRIVATE Config( const Config& rConfig );
TOOLS_DLLPRIVATE Config& operator = ( const Config& rConfig );
};
diff --git a/tools/inc/tools/contnr.hxx b/tools/inc/tools/contnr.hxx
index b1d4ffd..13e2d34 100644
--- a/tools/inc/tools/contnr.hxx
+++ b/tools/inc/tools/contnr.hxx
@@ -38,11 +38,11 @@ private:
CBlock* pFirstBlock;
CBlock* pCurBlock;
CBlock* pLastBlock;
- sal_uInt16 nCurIndex;
- sal_uInt16 nBlockSize;
- sal_uInt16 nInitSize;
- sal_uInt16 nReSize;
- sal_uIntPtr nCount;
+ sal_uInt16 nCurIndex;
+ sal_uInt16 nBlockSize;
+ sal_uInt16 nInitSize;
+ sal_uInt16 nReSize;
+ sal_uIntPtr nCount;
TOOLS_DLLPRIVATE void ImpCopyContainer(Container const *);
#if defined DBG_UTIL
@@ -97,8 +97,8 @@ public:
Container& operator =( const Container& rContainer );
- sal_Bool operator ==( const Container& rContainer ) const;
- sal_Bool operator !=( const Container& rContainer ) const
+ sal_Bool operator ==( const Container& rContainer ) const;
+ sal_Bool operator !=( const Container& rContainer ) const
{ return !(Container::operator==( rContainer )); }
};
diff --git a/tools/inc/tools/date.hxx b/tools/inc/tools/date.hxx
index c28fd0a..dbb40be 100644
--- a/tools/inc/tools/date.hxx
+++ b/tools/inc/tools/date.hxx
@@ -62,33 +62,33 @@ public:
void SetDay( sal_uInt16 nNewDay );
void SetMonth( sal_uInt16 nNewMonth );
void SetYear( sal_uInt16 nNewYear );
- sal_uInt16 GetDay() const { return (sal_uInt16)(nDate % 100); }
- sal_uInt16 GetMonth() const { return (sal_uInt16)((nDate / 100) % 100); }
- sal_uInt16 GetYear() const { return (sal_uInt16)(nDate / 10000); }
+ sal_uInt16 GetDay() const { return (sal_uInt16)(nDate % 100); }
+ sal_uInt16 GetMonth() const { return (sal_uInt16)((nDate / 100) % 100); }
+ sal_uInt16 GetYear() const { return (sal_uInt16)(nDate / 10000); }
/// Internally normalizes a copy of values.
DayOfWeek GetDayOfWeek() const;
/// Internally normalizes a copy of values.
- sal_uInt16 GetDayOfYear() const;
+ sal_uInt16 GetDayOfYear() const;
/** nMinimumNumberOfDaysInWeek: how many days of a week must reside in the
first week of a year.
Internally normalizes a copy of values. */
- sal_uInt16 GetWeekOfYear( DayOfWeek eStartDay = MONDAY,
+ sal_uInt16 GetWeekOfYear( DayOfWeek eStartDay = MONDAY,
sal_Int16 nMinimumNumberOfDaysInWeek = 4 ) const;
/// Internally normalizes a copy of values.
- sal_uInt16 GetDaysInMonth() const;
+ sal_uInt16 GetDaysInMonth() const;
- sal_uInt16 GetDaysInYear() const { return (IsLeapYear()) ? 366 : 365; }
- sal_Bool IsLeapYear() const;
+ sal_uInt16 GetDaysInYear() const { return (IsLeapYear()) ? 366 : 365; }
+ sal_Bool IsLeapYear() const;
/** If the represented date is valid (1<=month<=12, 1<=day<=(28,29,30,31)
depending on month/year) AND is of the Gregorian calendar (1582-10-15
<= date) (AND implicitly date <= 9999-12-31 due to internal
representation) */
- sal_Bool IsValidAndGregorian() const;
+ sal_Bool IsValidAndGregorian() const;
/** If the represented date is valid (1<=month<=12, 1<=day<=(28,29,30,31)
depending on month/year) */
@@ -108,21 +108,21 @@ public:
*/
bool Normalize();
- sal_Bool IsBetween( const Date& rFrom, const Date& rTo ) const
+ sal_Bool IsBetween( const Date& rFrom, const Date& rTo ) const
{ return ((nDate >= rFrom.nDate) &&
(nDate <= rTo.nDate)); }
- sal_Bool operator ==( const Date& rDate ) const
+ sal_Bool operator ==( const Date& rDate ) const
{ return (nDate == rDate.nDate); }
- sal_Bool operator !=( const Date& rDate ) const
+ sal_Bool operator !=( const Date& rDate ) const
{ return (nDate != rDate.nDate); }
- sal_Bool operator >( const Date& rDate ) const
+ sal_Bool operator >( const Date& rDate ) const
{ return (nDate > rDate.nDate); }
- sal_Bool operator <( const Date& rDate ) const
+ sal_Bool operator <( const Date& rDate ) const
{ return (nDate < rDate.nDate); }
- sal_Bool operator >=( const Date& rDate ) const
+ sal_Bool operator >=( const Date& rDate ) const
{ return (nDate >= rDate.nDate); }
- sal_Bool operator <=( const Date& rDate ) const
+ sal_Bool operator <=( const Date& rDate ) const
{ return (nDate <= rDate.nDate); }
Date& operator =( const Date& rDate )
diff --git a/tools/inc/tools/datetime.hxx b/tools/inc/tools/datetime.hxx
index 19c4d1a..5d40dfe 100644
--- a/tools/inc/tools/datetime.hxx
+++ b/tools/inc/tools/datetime.hxx
@@ -47,26 +47,26 @@ public:
DateTime( const Date& rDate, const Time& rTime ) :
Date( rDate ), Time( rTime ) {}
- sal_Bool IsBetween( const DateTime& rFrom,
+ sal_Bool IsBetween( const DateTime& rFrom,
const DateTime& rTo ) const;
- sal_Bool IsEqualIgnore100Sec( const DateTime& rDateTime ) const
- {
- if ( Date::operator!=( rDateTime ) )
- return sal_False;
- return Time::IsEqualIgnore100Sec( rDateTime );
- }
+ sal_Bool IsEqualIgnore100Sec( const DateTime& rDateTime ) const
+ {
+ if ( Date::operator!=( rDateTime ) )
+ return sal_False;
+ return Time::IsEqualIgnore100Sec( rDateTime );
+ }
- sal_Bool operator ==( const DateTime& rDateTime ) const
+ sal_Bool operator ==( const DateTime& rDateTime ) const
{ return (Date::operator==( rDateTime ) &&
Time::operator==( rDateTime )); }
- sal_Bool operator !=( const DateTime& rDateTime ) const
+ sal_Bool operator !=( const DateTime& rDateTime ) const
{ return (Date::operator!=( rDateTime ) ||
Time::operator!=( rDateTime )); }
- sal_Bool operator >( const DateTime& rDateTime ) const;
- sal_Bool operator <( const DateTime& rDateTime ) const;
- sal_Bool operator >=( const DateTime& rDateTime ) const;
- sal_Bool operator <=( const DateTime& rDateTime ) const;
+ sal_Bool operator >( const DateTime& rDateTime ) const;
+ sal_Bool operator <( const DateTime& rDateTime ) const;
+ sal_Bool operator >=( const DateTime& rDateTime ) const;
+ sal_Bool operator <=( const DateTime& rDateTime ) const;
long GetSecFromDateTime( const Date& rDate ) const;
diff --git a/tools/inc/tools/debug.hxx b/tools/inc/tools/debug.hxx
index c9f2ffc..92ea214 100644
--- a/tools/inc/tools/debug.hxx
+++ b/tools/inc/tools/debug.hxx
@@ -336,7 +336,7 @@ private:
DbgDataType* pDbgData;
const void* pThis;
DbgUsr fDbgUsr;
- sal_uInt16 nAction;
+ sal_uInt16 nAction;
public:
DbgXtorObj( DbgDataType* pData,
diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx
index 6a91cda..42231ed 100644
--- a/tools/inc/tools/fsys.hxx
+++ b/tools/inc/tools/fsys.hxx
@@ -140,9 +140,9 @@ class TOOLS_DLLPUBLIC FileStat
friend struct DirReader_Impl;
friend void ImpInitFileStat( FileStat&, dirent* );
- sal_uIntPtr nError;
+ sal_uIntPtr nError;
DirEntryKind nKindFlags;
- sal_uIntPtr nSize;
+ sal_uIntPtr nSize;
String aCreator;
String aType;
Date aDateCreated;
@@ -153,7 +153,7 @@ class TOOLS_DLLPUBLIC FileStat
Time aTimeAccessed;
private:
- TOOLS_DLLPRIVATE void ImpInit( void* );
+ TOOLS_DLLPRIVATE void ImpInit( void* );
protected:
// Implementation
@@ -162,16 +162,16 @@ protected:
public:
FileStat( const DirEntry& rDirEntry,
FSysAccess nAccess = FSYS_ACCESS_FLOPPY );
- sal_Bool Update( const DirEntry& rDirEntry,
- sal_Bool bForceAccess = sal_True );
+ sal_Bool Update( const DirEntry& rDirEntry,
+ sal_Bool bForceAccess = sal_True );
- sal_uIntPtr GetError() const { return ERRCODE_TOERROR(nError); }
- sal_uIntPtr GetErrorCode() const { return nError; }
+ sal_uIntPtr GetError() const { return ERRCODE_TOERROR(nError); }
+ sal_uIntPtr GetErrorCode() const { return nError; }
- sal_uIntPtr GetSize() const { return nSize; }
+ sal_uIntPtr GetSize() const { return nSize; }
DirEntryKind GetKind() const { return nKindFlags; }
- sal_Bool IsKind( DirEntryKind nKind ) const;
+ sal_Bool IsKind( DirEntryKind nKind ) const;
String GetType() const { return aType; }
String GetCreator() const { return aCreator; }
@@ -183,8 +183,8 @@ public:
Date DateAccessed() const { return aDateAccessed; }
Time TimeAccessed() const { return aTimeAccessed; }
- static sal_uIntPtr SetReadOnlyFlag( const DirEntry &rEntry, sal_Bool bRO = sal_True );
- static sal_Bool GetReadOnlyFlag( const DirEntry &rEntry );
+ static sal_uIntPtr SetReadOnlyFlag( const DirEntry &rEntry, sal_Bool bRO = sal_True );
+ static sal_Bool GetReadOnlyFlag( const DirEntry &rEntry );
};
// DirEntry
@@ -203,20 +203,20 @@ friend class FileCopier;
#endif
rtl::OString aName;
DirEntry* pParent;
- sal_uIntPtr nError;
+ sal_uIntPtr nError;
DirEntryFlag eFlag;
private:
- TOOLS_DLLPRIVATE DirEntry( const rtl::OString& rInitName,
+ TOOLS_DLLPRIVATE DirEntry( const rtl::OString& rInitName,
DirEntryFlag aDirFlag );
friend class Dir;
friend class FileStat;
friend const char* ImpCheckDirEntry( const void* p );
- TOOLS_DLLPRIVATE FSysError ImpParseName( const rtl::OString& rIntiName );
- TOOLS_DLLPRIVATE const DirEntry* ImpGetTopPtr() const;
- TOOLS_DLLPRIVATE DirEntry* ImpGetTopPtr();
+ TOOLS_DLLPRIVATE FSysError ImpParseName( const rtl::OString& rIntiName );
+ TOOLS_DLLPRIVATE const DirEntry* ImpGetTopPtr() const;
+ TOOLS_DLLPRIVATE DirEntry* ImpGetTopPtr();
protected:
void ImpTrim();
@@ -242,8 +242,8 @@ public:
FSysPathStyle eParser = FSYS_STYLE_HOST );
~DirEntry();
- sal_uIntPtr GetError() const { return nError; }
- sal_Bool IsValid() const;
+ sal_uIntPtr GetError() const { return nError; }
+ sal_Bool IsValid() const;
DirEntryFlag GetFlag() const { return eFlag; };
void SetExtension( const String& rExt, char cSep = '.' );
@@ -264,23 +264,23 @@ public:
sal_uInt16 nMaxChars = STRING_MAXLEN ) const;
DirEntry TempName( DirEntryKind = FSYS_KIND_NONE ) const;
- sal_Bool MakeShortName( const String& rLongName,
+ sal_Bool MakeShortName( const String& rLongName,
DirEntryKind eCreateKind = FSYS_KIND_NONE,
sal_Bool bUseTilde = sal_True,
FSysPathStyle eStyle = FSYS_STYLE_DETECT );
bool IsAbs() const;
- sal_Bool ToAbs();
- sal_Bool Find( const String& rPfad, char cDelim = 0 );
+ sal_Bool ToAbs();
+ sal_Bool Find( const String& rPfad, char cDelim = 0 );
- sal_Bool SetCWD( sal_Bool bSloppy = sal_False ) const;
- sal_Bool MakeDir( sal_Bool bSloppy = sal_False ) const;
- sal_Bool Exists( FSysAccess nAccess = FSYS_ACCESS_FLOPPY ) const;
- sal_Bool First();
+ sal_Bool SetCWD( sal_Bool bSloppy = sal_False ) const;
+ sal_Bool MakeDir( sal_Bool bSloppy = sal_False ) const;
+ sal_Bool Exists( FSysAccess nAccess = FSYS_ACCESS_FLOPPY ) const;
+ sal_Bool First();
- sal_uInt16 Level() const;
+ sal_uInt16 Level() const;
const DirEntry& operator []( sal_uInt16 nParentLevel ) const;
- sal_Bool Contains( const DirEntry &rSubEntry ) const;
+ sal_Bool Contains( const DirEntry &rSubEntry ) const;
FSysError CopyTo( const DirEntry& rDestDir,
FSysAction nActions = FSYS_ACTION_STANDARD ) const;
@@ -290,8 +290,8 @@ public:
DirEntry& operator =( const DirEntry& rOrigDir );
DirEntry operator +( const DirEntry& rSubDir ) const;
DirEntry& operator +=( const DirEntry& rSubDir );
- sal_Bool operator ==( const DirEntry& rAnotherDir ) const;
- sal_Bool operator !=( const DirEntry& rAnotherDir ) const
+ sal_Bool operator ==( const DirEntry& rAnotherDir ) const;
+ sal_Bool operator !=( const DirEntry& rAnotherDir ) const
{ return !(DirEntry::operator==( rAnotherDir )); }
inline sal_Int32 NameCompareDirect( const DirEntry &rWith ) const
@@ -315,18 +315,18 @@ class FileCopier
{
DirEntry aSource;
DirEntry aTarget;
- sal_uIntPtr nBytesTotal;
- sal_uIntPtr nBytesCopied;
+ sal_uIntPtr nBytesTotal;
+ sal_uIntPtr nBytesCopied;
Link aProgressLink;
- sal_uInt16 nBlockSize;
+ sal_uInt16 nBlockSize;
FileCopier_Impl* pImp;
private:
- TOOLS_DLLPRIVATE FSysError DoCopy_Impl(
+ TOOLS_DLLPRIVATE FSysError DoCopy_Impl(
const DirEntry &rSource, const DirEntry &rTarget );
protected:
- virtual sal_Bool Progress();
+ virtual sal_Bool Progress();
virtual ErrCode Error( ErrCode eErr,
const DirEntry *pSource, const DirEntry *pTarget );
@@ -336,13 +336,13 @@ public:
FileCopier( const FileCopier &rCopier );
virtual ~FileCopier();
- FileCopier& operator = ( const FileCopier &rCopier );
+ FileCopier& operator =( const FileCopier &rCopier );
void SetBlockSize( sal_uInt16 nBytes ) { nBlockSize = nBytes; }
- sal_uInt16 GetBlockSize() const { return nBlockSize; }
+ sal_uInt16 GetBlockSize() const { return nBlockSize; }
- sal_uIntPtr GetBytesTotal() const { return nBytesTotal; }
- sal_uIntPtr GetBytesCopied() const { return nBytesCopied; }
+ sal_uIntPtr GetBytesTotal() const { return nBytesTotal; }
+ sal_uIntPtr GetBytesCopied() const { return nBytesCopied; }
void SetSource( const DirEntry &rSource ) { aSource = rSource; }
void SetTarget( const DirEntry &rTarget ) { aTarget = rTarget; }
@@ -351,7 +351,7 @@ public:
FSysError Execute( FSysAction nActions = FSYS_ACTION_STANDARD );
FSysError ExecuteExact( FSysAction nActions = FSYS_ACTION_STANDARD,
- FSysExact eExact = FSYS_NOTEXACT);
+ FSysExact eExact = FSYS_NOTEXACT);
void SetProgressHdl( const Link& rLink ) { aProgressLink = rLink; }
const Link& GetProgressHdl() const { return aProgressLink; }
@@ -362,7 +362,7 @@ public:
struct DirReader_Impl;
class TOOLS_DLLPUBLIC Dir : public DirEntry
{
-friend struct DirReader_Impl;
+ friend struct DirReader_Impl;
DirReader_Impl* pReader; // is system-dependent
DirEntryList* pLst;
@@ -372,11 +372,11 @@ friend struct DirReader_Impl;
DirEntryKind eAttrMask;
private:
- TOOLS_DLLPRIVATE Dir( const Dir& ); // not allowed
- TOOLS_DLLPRIVATE Dir& operator=( const Dir& ); // not allowed
+ TOOLS_DLLPRIVATE Dir( const Dir& ); // not allowed
+ TOOLS_DLLPRIVATE Dir& operator =( const Dir& ); // not allowed
#ifdef _DIR_CXX
- TOOLS_DLLPRIVATE void Construct( DirEntryKind nKind = FSYS_KIND_DIR|FSYS_KIND_FILE );
+ TOOLS_DLLPRIVATE void Construct( DirEntryKind nKind = FSYS_KIND_DIR|FSYS_KIND_FILE );
#endif
#ifndef _TOOLS_HXX
diff --git a/tools/inc/tools/inetmsg.hxx b/tools/inc/tools/inetmsg.hxx
index b27b56c..8788b68 100644
--- a/tools/inc/tools/inetmsg.hxx
+++ b/tools/inc/tools/inetmsg.hxx
@@ -79,7 +79,7 @@ public:
}
};
- typedef ::std::vector< INetMessageHeader* > HeaderList_impl;
+typedef ::std::vector< INetMessageHeader* > HeaderList_impl;
class INetMessage
{
diff --git a/tools/inc/tools/line.hxx b/tools/inc/tools/line.hxx
index cc6bf22..fba5e21 100644
--- a/tools/inc/tools/line.hxx
+++ b/tools/inc/tools/line.hxx
@@ -47,9 +47,9 @@ public:
double GetLength() const;
- sal_Bool Intersection( const Line& rLine, double& rIntersectionX, double& rIntersectionY ) const;
- sal_Bool Intersection( const Line& rLine, Point& rIntersection ) const;
- sal_Bool Intersection( const Rectangle& rRect, Line& rIntersection ) const;
+ sal_Bool Intersection( const Line& rLine, double& rIntersectionX, double& rIntersectionY ) const;
+ sal_Bool Intersection( const Line& rLine, Point& rIntersection ) const;
+ sal_Bool Intersection( const Rectangle& rRect, Line& rIntersection ) const;
double GetDistance( const double& rPtX, const double& rPtY ) const;
double GetDistance( const Point& rPoint ) const { return( GetDistance( rPoint.X(), rPoint.Y() ) ); }
diff --git a/tools/inc/tools/multisel.hxx b/tools/inc/tools/multisel.hxx
index 20eb547..b0ae1e3 100644
--- a/tools/inc/tools/multisel.hxx
+++ b/tools/inc/tools/multisel.hxx
@@ -35,17 +35,17 @@ class TOOLS_DLLPUBLIC MultiSelection
private:
ImpSelList aSels; // array of SV-selections
Range aTotRange; // total range of indexes
- sal_uIntPtr nCurSubSel; // index in aSels of current selected index
+ sal_uIntPtr nCurSubSel; // index in aSels of current selected index
long nCurIndex; // current selected entry
- sal_uIntPtr nSelCount; // number of selected indexes
- sal_Bool bInverseCur;// inverse cursor
- sal_Bool bCurValid; // are nCurIndex and nCurSubSel valid
- sal_Bool bSelectNew; // auto-select newly inserted indexes
+ sal_uIntPtr nSelCount; // number of selected indexes
+ sal_Bool bInverseCur;// inverse cursor
+ sal_Bool bCurValid; // are nCurIndex and nCurSubSel valid
+ sal_Bool bSelectNew; // auto-select newly inserted indexes
#ifdef _SV_MULTISEL_CXX
TOOLS_DLLPRIVATE void ImplClear();
TOOLS_DLLPRIVATE size_t ImplFindSubSelection( long nIndex ) const;
- TOOLS_DLLPRIVATE sal_Bool ImplMergeSubSelections( size_t nPos1, size_t nPos2 );
+ TOOLS_DLLPRIVATE sal_Bool ImplMergeSubSelections( size_t nPos1, size_t nPos2 );
TOOLS_DLLPRIVATE long ImplFwdUnselected();
#endif
@@ -56,17 +56,17 @@ public:
~MultiSelection();
MultiSelection& operator= ( const MultiSelection& rOrig );
- sal_Bool operator== ( MultiSelection& rOrig );
- sal_Bool operator!= ( MultiSelection& rOrig )
+ sal_Bool operator== ( MultiSelection& rOrig );
+ sal_Bool operator!= ( MultiSelection& rOrig )
{ return !operator==( rOrig ); }
- sal_Bool operator !() const
+ sal_Bool operator !() const
{ return nSelCount == 0; }
void SelectAll( sal_Bool bSelect = sal_True );
- sal_Bool Select( long nIndex, sal_Bool bSelect = sal_True );
+ sal_Bool Select( long nIndex, sal_Bool bSelect = sal_True );
void Select( const Range& rIndexRange, sal_Bool bSelect = sal_True );
- sal_Bool IsSelected( long nIndex ) const;
- sal_Bool IsAllSelected() const
+ sal_Bool IsSelected( long nIndex ) const;
+ sal_Bool IsAllSelected() const
{ return nSelCount == sal_uIntPtr(aTotRange.Len()); }
long GetSelectCount() const { return nSelCount; }
@@ -75,7 +75,7 @@ public:
void Remove( long nIndex );
const Range& GetTotalRange() const { return aTotRange; }
- sal_Bool IsCurValid() const { return bCurValid; }
+ sal_Bool IsCurValid() const { return bCurValid; }
long GetCurSelected() const { return nCurIndex; }
long FirstSelected( sal_Bool bInverse = sal_False );
long LastSelected();
diff --git a/tools/inc/tools/poly.hxx b/tools/inc/tools/poly.hxx
index a51fd87..e8cdcb5 100644
--- a/tools/inc/tools/poly.hxx
+++ b/tools/inc/tools/poly.hxx
@@ -66,8 +66,8 @@ public:
PolyOptimizeData( sal_uIntPtr nAbsolut ) : eType( DATA_ABSOLUT ), mnAbsolut( nAbsolut ) {}
PolyOptimizeData( sal_uInt16 nPercent ) : eType( DATA_PERCENT ), mnPercent( nPercent ) {}
- sal_uIntPtr GetAbsValue() const { DBG_ASSERT( eType == DATA_ABSOLUT, "Wrong data type" ); return mnAbsolut; }
- sal_uInt16 GetPercentValue() const { DBG_ASSERT( eType == DATA_PERCENT, "Wrong data type" ); return mnPercent; }
+ sal_uIntPtr GetAbsValue() const { DBG_ASSERT( eType == DATA_ABSOLUT, "Wrong data type" ); return mnAbsolut; }
+ sal_uInt16 GetPercentValue() const { DBG_ASSERT( eType == DATA_PERCENT, "Wrong data type" ); return mnPercent; }
};
class SvStream;
@@ -122,17 +122,17 @@ public:
PolyFlags GetFlags( sal_uInt16 nPos ) const;
sal_Bool HasFlags() const;
- sal_Bool IsRect() const;
+ sal_Bool IsRect() const;
void SetSize( sal_uInt16 nNewSize );
- sal_uInt16 GetSize() const;
+ sal_uInt16 GetSize() const;
void Clear();
Rectangle GetBoundRect() const;
double GetSignedArea() const;
- sal_Bool IsInside( const Point& rPt ) const;
- sal_Bool IsRightOrientated() const;
+ sal_Bool IsInside( const Point& rPt ) const;
+ sal_Bool IsRightOrientated() const;
double CalcDistance( sal_uInt16 nPt1, sal_uInt16 nPt2 );
void Clip( const Rectangle& rRect, sal_Bool bPolygon = sal_True );
void Optimize( sal_uIntPtr nOptimizeFlags, const PolyOptimizeData* pData = NULL );
@@ -170,8 +170,8 @@ public:
Point& operator[]( sal_uInt16 nPos );
Polygon& operator=( const Polygon& rPoly );
- sal_Bool operator==( const Polygon& rPoly ) const;
- sal_Bool operator!=( const Polygon& rPoly ) const
+ sal_Bool operator==( const Polygon& rPoly ) const;
+ sal_Bool operator!=( const Polygon& rPoly ) const
{ return !(Polygon::operator==( rPoly )); }
sal_Bool IsEqual( const Polygon& rPoly ) const;
@@ -184,7 +184,7 @@ public:
void Write( SvStream& rOStream ) const;
const Point* GetConstPointAry() const;
- const sal_uInt8* GetConstFlagAry() const;
+ const sal_uInt8* GetConstFlagAry() const;
// convert to ::basegfx::B2DPolygon and return
::basegfx::B2DPolygon getB2DPolygon() const;
@@ -216,11 +216,11 @@ public:
void Replace( const Polygon& rPoly, sal_uInt16 nPos );
const Polygon& GetObject( sal_uInt16 nPos ) const;
- sal_Bool IsRect() const;
+ sal_Bool IsRect() const;
void Clear();
- sal_uInt16 Count() const;
+ sal_uInt16 Count() const;
Rectangle GetBoundRect() const;
void Clip( const Rectangle& rRect );
void Optimize( sal_uIntPtr nOptimizeFlags, const PolyOptimizeData* pData = NULL );
diff --git a/tools/inc/tools/rc.hxx b/tools/inc/tools/rc.hxx
index dd8c68d..1b90296 100644
--- a/tools/inc/tools/rc.hxx
+++ b/tools/inc/tools/rc.hxx
@@ -26,7 +26,7 @@
class TOOLS_DLLPUBLIC Resource
{
- protected:
+protected:
ResMgr* m_pResMgr;
// check availability of Resource
@@ -83,12 +83,12 @@ class TOOLS_DLLPUBLIC Resource
Resource() : m_pResMgr( NULL ) {}
Resource( const ResId& rResId );
- public:
- #ifdef DBG_UTIL
+public:
+#ifdef DBG_UTIL
~Resource() { TestRes(); }
- #else
+#else
~Resource() {}
- #endif
+#endif
};
#endif
diff --git a/tools/inc/tools/resary.hxx b/tools/inc/tools/resary.hxx
index b061937..df40eb9 100644
--- a/tools/inc/tools/resary.hxx
+++ b/tools/inc/tools/resary.hxx
@@ -29,7 +29,7 @@
class TOOLS_DLLPUBLIC ResStringArray : private boost::noncopyable
{
- private:
+private:
struct ImplResStringItem
{
rtl::OUString m_aStr;
@@ -43,7 +43,7 @@ class TOOLS_DLLPUBLIC ResStringArray : private boost::noncopyable
std::vector< ImplResStringItem > m_aStrings;
- public:
+public:
ResStringArray( const ResId& rResId );
~ResStringArray();
diff --git a/tools/inc/tools/resid.hxx b/tools/inc/tools/resid.hxx
index 78d6656..1319bfe 100644
--- a/tools/inc/tools/resid.hxx
+++ b/tools/inc/tools/resid.hxx
@@ -56,7 +56,7 @@ class ResId
OSL_ENSURE( m_pResMgr != NULL, "ResId without ResMgr created" );
}
- public:
+public:
ResId( RSHEADER_TYPE * pRc, ResMgr& rMgr )
{
ImplInit( 0, rMgr, pRc );
@@ -79,10 +79,8 @@ class ResId
ImplInit( sal_uInt32(nId), rMgr, NULL );
}
- sal_uInt32 GetWinBits() const
- { return m_nWinBits; }
- void SetWinBits( sal_uInt32 nBits ) const
- { m_nWinBits = nBits; }
+ sal_uInt32 GetWinBits() const { return m_nWinBits; }
+ void SetWinBits( sal_uInt32 nBits ) const { m_nWinBits = nBits; }
RESOURCE_TYPE GetRT() const { return( m_nRT ); }
@@ -143,11 +141,11 @@ class ResId
return *this;
}
- sal_Bool IsAutoRelease() const
+ sal_Bool IsAutoRelease() const
{ return !(m_nResId & RSC_DONTRELEASE); }
- sal_uInt32 GetId() const { return m_nResId & ~RSC_DONTRELEASE; }
- RSHEADER_TYPE* GetpResource() const { return m_pResource; }
+ sal_uInt32 GetId() const { return m_nResId & ~RSC_DONTRELEASE; }
+ RSHEADER_TYPE* GetpResource() const { return m_pResource; }
TOOLS_DLLPUBLIC rtl::OUString toString() const;
TOOLS_DLLPUBLIC operator rtl::OUString() const { return toString(); }
diff --git a/tools/inc/tools/resmgr.hxx b/tools/inc/tools/resmgr.hxx
index 7e2e5a9..283be1a 100644
--- a/tools/inc/tools/resmgr.hxx
+++ b/tools/inc/tools/resmgr.hxx
@@ -86,25 +86,29 @@ private:
ResMgr* pOriginalResMgr; ///< the res mgr that fell back to this
///< stack level
- TOOLS_DLLPRIVATE void incStack();
- TOOLS_DLLPRIVATE void decStack();
+ TOOLS_DLLPRIVATE void incStack();
+ TOOLS_DLLPRIVATE void decStack();
TOOLS_DLLPRIVATE const ImpRCStack * StackTop( sal_uInt32 nOff = 0 ) const
{
return (((int)nOff >= nCurStack) ? NULL : &aStack[nCurStack-nOff]);
}
- TOOLS_DLLPRIVATE void Init( const rtl::OUString& rFileName );
+ TOOLS_DLLPRIVATE void Init( const rtl::OUString& rFileName );
TOOLS_DLLPRIVATE ResMgr( InternalResMgr * pImp );
#ifdef DBG_UTIL
- TOOLS_DLLPRIVATE static void RscError_Impl( const sal_Char* pMessage, ResMgr* pResMgr,
- RESOURCE_TYPE nRT, sal_uInt32 nId,
- std::vector< ImpRCStack >& rResStack, int nDepth );
+ TOOLS_DLLPRIVATE static void RscError_Impl( const sal_Char* pMessage,
+ ResMgr* pResMgr,
+ RESOURCE_TYPE nRT,
+ sal_uInt32 nId,
+ std::vector< ImpRCStack >& rResStack,
+ int nDepth );
#endif
// called from within GetResource() if a resource could not be found
- TOOLS_DLLPRIVATE ResMgr* CreateFallbackResMgr( const ResId& rId, const Resource* pResource );
+ TOOLS_DLLPRIVATE ResMgr* CreateFallbackResMgr( const ResId& rId,
+ const Resource* pResource );
// creates a 1k sized buffer set to zero for unfound resources
// used in case RC_NOTFOUND
static void* pEmptyBuffer;
@@ -113,9 +117,10 @@ private:
// the next two methods are needed to prevent the string hook called
// with the res mgr mutex locked
// like GetString, but doesn't call the string hook
- TOOLS_DLLPRIVATE static sal_uInt32 GetStringWithoutHook( UniString& rStr, const sal_uInt8* pStr );
+ TOOLS_DLLPRIVATE static sal_uInt32 GetStringWithoutHook( UniString& rStr,
+ const sal_uInt8* pStr );
// like ReadString but doesn't call the string hook
- TOOLS_DLLPRIVATE UniString ReadStringWithoutHook();
+ TOOLS_DLLPRIVATE UniString ReadStringWithoutHook();
static ResMgr* ImplCreateResMgr( InternalResMgr* pImpl ) { return new ResMgr( pImpl ); }
@@ -141,11 +146,11 @@ public:
void TestStack( const Resource * );
/// Check whether resource is available
- sal_Bool IsAvailable( const ResId& rId,
+ sal_Bool IsAvailable( const ResId& rId,
const Resource* = NULL) const;
/// Search and load resource, given its ID
- sal_Bool GetResource( const ResId& rId, const Resource * = NULL );
+ sal_Bool GetResource( const ResId& rId, const Resource * = NULL );
static void * GetResourceSkipHeader( const ResId& rResId, ResMgr ** ppResMgr );
/// Free resource context
void PopContext( const Resource* = NULL );
@@ -170,9 +175,9 @@ public:
/// Return a int64
static sal_uInt64 GetUInt64( void* pDatum );
/// Return a long
- static sal_Int32 GetLong( void * pLong );
+ static sal_Int32 GetLong( void * pLong );
/// Return a short
- static sal_Int16 GetShort( void * pShort );
+ static sal_Int16 GetShort( void * pShort );
/// Return a pointer to the resource
void * GetClass();
@@ -183,8 +188,8 @@ public:
const rtl::OUString&GetFileName() const;
- sal_Int16 ReadShort();
- sal_Int32 ReadLong();
+ sal_Int16 ReadShort();
+ sal_Int32 ReadLong();
UniString ReadString();
rtl::OString ReadByteString();
diff --git a/tools/inc/tools/solar.h b/tools/inc/tools/solar.h
index 550c150..ad903c6 100644
--- a/tools/inc/tools/solar.h
+++ b/tools/inc/tools/solar.h
@@ -62,17 +62,17 @@ typedef sal_uIntPtr sal_uLong; /* Replaces type ULONG */
always little endian;
not necessarily aligned */
-typedef sal_uInt8 SVBT8[1];
-typedef sal_uInt8 SVBT16[2];
-typedef sal_uInt8 SVBT32[4];
-typedef sal_uInt8 SVBT64[8];
+typedef sal_uInt8 SVBT8[1];
+typedef sal_uInt8 SVBT16[2];
+typedef sal_uInt8 SVBT32[4];
+typedef sal_uInt8 SVBT64[8];
#ifdef __cplusplus
-inline sal_uInt8 SVBT8ToByte ( const SVBT8 p ) { return p[0]; }
-inline sal_uInt16 SVBT16ToShort( const SVBT16 p ) { return (sal_uInt16)p[0]
+inline sal_uInt8 SVBT8ToByte ( const SVBT8 p ) { return p[0]; }
+inline sal_uInt16 SVBT16ToShort( const SVBT16 p ) { return (sal_uInt16)p[0]
+ ((sal_uInt16)p[1] << 8); }
-inline sal_uInt32 SVBT32ToUInt32 ( const SVBT32 p ) { return (sal_uInt32)p[0]
+inline sal_uInt32 SVBT32ToUInt32 ( const SVBT32 p ) { return (sal_uInt32)p[0]
+ ((sal_uInt32)p[1] << 8)
+ ((sal_uInt32)p[2] << 16)
+ ((sal_uInt32)p[3] << 24); }
diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx
index 958bd2a..3ac9e1c 100644
--- a/tools/inc/tools/stream.hxx
+++ b/tools/inc/tools/stream.hxx
@@ -57,7 +57,7 @@ typedef sal_uInt16 StreamMode;
// sharing options
#define STREAM_SHARE_DENYNONE 0x0100
#define STREAM_SHARE_DENYREAD 0x0200 // overrides denynone
-#define STREAM_SHARE_DENYWRITE 0x0400 // overrides denynone
+#define STREAM_SHARE_DENYWRITE 0x0400 // overrides denynone
#define STREAM_SHARE_DENYALL 0x0800 // overrides denyread,write,none
#define STREAM_SHAREBITS (STREAM_SHARE_DENYNONE | STREAM_SHARE_DENYREAD |\
@@ -76,12 +76,12 @@ typedef sal_uInt16 StreamMode;
#define NUMBERFORMAT_INT_BIGENDIAN (sal_uInt16)0x0000
#define NUMBERFORMAT_INT_LITTLEENDIAN (sal_uInt16)0xFFFF
-#define COMPRESSMODE_NONE (sal_uInt16)0x0000
+#define COMPRESSMODE_NONE (sal_uInt16)0x0000
#define COMPRESSMODE_ZBITMAP (sal_uInt16)0x0001
#define COMPRESSMODE_NATIVE (sal_uInt16)0x0010
-#define STREAM_IO_DONTKNOW 0
-#define STREAM_IO_READ 1
+#define STREAM_IO_DONTKNOW 0
+#define STREAM_IO_READ 1
#define STREAM_IO_WRITE 2
#define ID_STREAM 1
@@ -105,7 +105,7 @@ struct SvLockBytesStat
{
sal_Size nSize;
- SvLockBytesStat(): nSize(0) {}
+ SvLockBytesStat() : nSize(0) {}
};
enum SvLockBytesStatFlag { SVSTATFLAG_DEFAULT };
@@ -122,9 +122,9 @@ protected:
public:
TYPEINFO();
- SvLockBytes(): m_pStream(0), m_bOwner(sal_False), m_bSync(sal_False) {}
+ SvLockBytes() : m_pStream(0), m_bOwner(sal_False), m_bSync(sal_False) {}
- SvLockBytes(SvStream * pTheStream, sal_Bool bTheOwner = sal_False):
+ SvLockBytes(SvStream * pTheStream, sal_Bool bTheOwner = sal_False) :
m_pStream(pTheStream), m_bOwner(bTheOwner), m_bSync(sal_False) {}
virtual ~SvLockBytes() { close(); }
@@ -158,7 +158,7 @@ class TOOLS_DLLPUBLIC SvOpenLockBytes: public SvLockBytes
public:
TYPEINFO();
- SvOpenLockBytes(): SvLockBytes(0, sal_False) {}
+ SvOpenLockBytes() : SvLockBytes(0, sal_False) {}
SvOpenLockBytes(SvStream * pStream, sal_Bool bOwner):
SvLockBytes(pStream, bOwner) {}
@@ -211,8 +211,8 @@ class TOOLS_DLLPUBLIC SvStream
private:
// LockBytes Interface
void* pImp; // unused
- SvLockBytesRef xLockBytes; // Default implementation
- sal_Size nActPos; //
+ SvLockBytesRef xLockBytes; // Default implementation
+ sal_Size nActPos;
// Puffer-Verwaltung
sal_uInt8* pRWBuf; // Points to read/write buffer
@@ -225,17 +225,17 @@ private:
unsigned int eIOMode : 2;// STREAM_IO_*
// Error codes, conversion, compression, ...
- int bIsDirty:1; // sal_True: Stream != buffer content
- int bIsConsistent:1;// sal_False: Buffer contains data, which were
- // NOT allowed to be written by PutData
- // into the derived stream (cf. PutBack)
- int bSwap:1;
- int bIsEof:1;
+ int bIsDirty : 1; // sal_True: Stream != buffer content
+ int bIsConsistent : 1;// sal_False: Buffer contains data, which were
+ // NOT allowed to be written by PutData
+ // into the derived stream (cf. PutBack)
+ int bSwap : 1;
+ int bIsEof : 1;
sal_uInt32 nError;
sal_uInt16 nNumberFormatInt;
sal_uInt16 nCompressMode;
- LineEnd eLineDelimiter;
- CharSet eStreamCharSet;
+ LineEnd eLineDelimiter;
+ CharSet eStreamCharSet;
// Encryption
rtl::OString m_aCryptMaskKey;// aCryptMaskKey.getLength != 0 -> Encryption used
@@ -245,19 +245,19 @@ private:
long nVersion; // for external use
// helper methods
- TOOLS_DLLPRIVATE void ImpInit();
+ TOOLS_DLLPRIVATE void ImpInit();
- SvStream ( const SvStream& rStream ); // not implemented
+ SvStream ( const SvStream& rStream ); // not implemented
SvStream& operator=( const SvStream& rStream ); // not implemented
protected:
- sal_Size nBufFilePos; ///< File position of pBuf[0]
- sal_uInt16 eStreamMode;
- sal_Bool bIsWritable;
+ sal_Size nBufFilePos;///< File position of pBuf[0]
+ sal_uInt16 eStreamMode;
+ sal_Bool bIsWritable;
- virtual sal_Size GetData( void* pData, sal_Size nSize );
- virtual sal_Size PutData( const void* pData, sal_Size nSize );
- virtual sal_Size SeekPos( sal_Size nPos );
+ virtual sal_Size GetData( void* pData, sal_Size nSize );
+ virtual sal_Size PutData( const void* pData, sal_Size nSize );
+ virtual sal_Size SeekPos( sal_Size nPos );
virtual void FlushData();
virtual void SetSize( sal_Size nSize );
@@ -265,8 +265,8 @@ protected:
void ClearBuffer();
// encrypt and write in blocks
- sal_Size CryptAndWriteBuffer( const void* pStart, sal_Size nLen );
- sal_Bool EncryptBuffer( void* pStart, sal_Size nLen );
+ sal_Size CryptAndWriteBuffer( const void* pStart, sal_Size nLen );
+ sal_Bool EncryptBuffer( void* pStart, sal_Size nLen );
void SyncSvStream( sal_Size nNewStreamPos ); ///< SvStream <- Medium
void SyncSysStream(); ///< SvStream -> Medium
@@ -285,15 +285,15 @@ public:
virtual void ResetError();
void SetNumberFormatInt( sal_uInt16 nNewFormat );
- sal_uInt16 GetNumberFormatInt() const { return nNumberFormatInt; }
- /// Enable/disable swapping of endians, may be needed for Unicode import/export
+ sal_uInt16 GetNumberFormatInt() const { return nNumberFormatInt; }
+ /// Enable/disable swapping of endians, may be needed for Unicode import/export
inline void SetEndianSwap( sal_Bool bVal );
/// returns status of endian swap flag
- sal_Bool IsEndianSwap() const { return 0 != bSwap; }
+ sal_Bool IsEndianSwap() const { return 0 != bSwap; }
void SetCompressMode( sal_uInt16 nNewMode )
{ nCompressMode = nNewMode; }
- sal_uInt16 GetCompressMode() const { return nCompressMode; }
+ sal_uInt16 GetCompressMode() const { return nCompressMode; }
void SetCryptMaskKey(const rtl::OString& rCryptMaskKey);
const rtl::OString& GetCryptMaskKey() const { return m_aCryptMaskKey; }
@@ -670,11 +670,11 @@ private:
sal_Bool UnlockRange( sal_Size nByteOffset, sal_Size nBytes );
sal_Bool LockFile();
sal_Bool UnlockFile();
-protected:
- virtual sal_Size GetData( void* pData, sal_Size nSize );
- virtual sal_Size PutData( const void* pData, sal_Size nSize );
- virtual sal_Size SeekPos( sal_Size nPos );
+protected:
+ virtual sal_Size GetData( void* pData, sal_Size nSize );
+ virtual sal_Size PutData( const void* pData, sal_Size nSize );
+ virtual sal_Size SeekPos( sal_Size nPos );
virtual void SetSize( sal_Size nSize );
virtual void FlushData();
@@ -688,9 +688,9 @@ public:
void Open( const String& rFileName, StreamMode eOpenMode );
void Close();
- sal_Bool IsOpen() const { return bIsOpen; }
- sal_Bool IsLocked() const { return ( nLockCounter!=0 ); }
- virtual sal_uInt16 IsA() const;
+ sal_Bool IsOpen() const { return bIsOpen; }
+ sal_Bool IsLocked() const { return ( nLockCounter!=0 ); }
+ virtual sal_uInt16 IsA() const;
const String& GetFileName() const { return aFilename; }
};
@@ -704,19 +704,19 @@ class TOOLS_DLLPUBLIC SvMemoryStream : public SvStream
SvMemoryStream & operator= (const SvMemoryStream&);
friend class SvCacheStream;
- sal_Size GetSize() const { return nSize; }
+ sal_Size GetSize() const { return nSize; }
protected:
- sal_Size nSize;
- sal_Size nResize;
- sal_Size nPos;
- sal_Size nEndOfData;
- sal_uInt8* pBuf;
- sal_Bool bOwnsData;
-
- virtual sal_Size GetData( void* pData, sal_Size nSize );
- virtual sal_Size PutData( const void* pData, sal_Size nSize );
- virtual sal_Size SeekPos( sal_Size nPos );
+ sal_Size nSize;
+ sal_Size nResize;
+ sal_Size nPos;
+ sal_Size nEndOfData;
+ sal_uInt8* pBuf;
+ sal_Bool bOwnsData;
+
+ virtual sal_Size GetData( void* pData, sal_Size nSize );
+ virtual sal_Size PutData( const void* pData, sal_Size nSize );
+ virtual sal_Size SeekPos( sal_Size nPos );
virtual void SetSize( sal_Size nSize );
virtual void FlushData();
@@ -736,7 +736,7 @@ protected:
/// resized. FreeMemory may need to NULLify handles in derived classes.
virtual void FreeMemory();
- SvMemoryStream(void*) { } // for sub-classes
+ SvMemoryStream(void*) { } // for sub-classes
public:
SvMemoryStream( void* pBuf, sal_Size nSize, StreamMode eMode);
@@ -755,9 +755,9 @@ public:
sal_Bool bOwnsData=sal_True, sal_Size nEOF=0 );
void ObjectOwnsMemory( sal_Bool bOwn ) { bOwnsData = bOwn; }
- sal_Bool IsObjectMemoryOwner() { return bOwnsData; }
+ sal_Bool IsObjectMemoryOwner() { return bOwnsData; }
void SetResizeOffset( sal_Size nNewResize ) { nResize = nNewResize; }
- sal_Size GetResizeOffset() const { return nResize; }
+ sal_Size GetResizeOffset() const { return nResize; }
virtual sal_Size remainingSize() { return GetSize() - Tell(); }
};
diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx
index 8ebd70f..9e2071c 100644
--- a/tools/inc/tools/string.hxx
+++ b/tools/inc/tools/string.hxx
@@ -86,9 +86,9 @@ enum StringCompare { COMPARE_LESS = -1, COMPARE_EQUAL = 0, COMPARE_GREATER = 1 }
typedef struct _UniStringData
{
- sal_Int32 mnRefCount; // reference counter
- sal_Int32 mnLen; // Length of the String
- sal_Unicode maStr[1]; // CharArray (String)
+ sal_Int32 mnRefCount; // reference counter
+ sal_Int32 mnLen; // Length of the String
+ sal_Unicode maStr[1]; // CharArray (String)
} UniStringData;
#ifdef SAL_W32
@@ -123,7 +123,7 @@ private:
//detect and reject wrong way to attempt to create a UniString from a substring of
//a rtl::OString
TOOLS_DLLPRIVATE UniString(const rtl::OString& rByteStr, xub_StrLen nPos, xub_StrLen nLen,
- sal_uInt32 nCvtFlags = BYTESTRING_TO_UNISTRING_CVTFLAGS);
+ sal_uInt32 nCvtFlags = BYTESTRING_TO_UNISTRING_CVTFLAGS);
//no longer implemented
TOOLS_DLLPRIVATE UniString( const rtl::OString& rByteStr,
@@ -229,20 +229,20 @@ public:
xub_StrLen nLen = STRING_LEN ) const;
StringCompare CompareIgnoreCaseToAscii( const sal_Char* pAsciiStr,
xub_StrLen nLen = STRING_LEN ) const;
- sal_Bool Equals( const UniString& rStr ) const;
- sal_Bool EqualsAscii( const sal_Char* pAsciiStr ) const;
- sal_Bool EqualsIgnoreCaseAscii( const UniString& rStr ) const;
- sal_Bool EqualsIgnoreCaseAscii( const sal_Unicode* pCharStr ) const;
- sal_Bool EqualsIgnoreCaseAscii( const sal_Char* pAsciiStr ) const;
- sal_Bool Equals( const UniString& rStr,
+ sal_Bool Equals( const UniString& rStr ) const;
+ sal_Bool EqualsAscii( const sal_Char* pAsciiStr ) const;
+ sal_Bool EqualsIgnoreCaseAscii( const UniString& rStr ) const;
+ sal_Bool EqualsIgnoreCaseAscii( const sal_Unicode* pCharStr ) const;
+ sal_Bool EqualsIgnoreCaseAscii( const sal_Char* pAsciiStr ) const;
+ sal_Bool Equals( const UniString& rStr,
xub_StrLen nIndex, xub_StrLen nLen ) const;
- sal_Bool Equals( const sal_Unicode* pCharStr,
+ sal_Bool Equals( const sal_Unicode* pCharStr,
xub_StrLen nIndex, xub_StrLen nLen ) const;
- sal_Bool EqualsAscii( const sal_Char* pAsciiStr,
+ sal_Bool EqualsAscii( const sal_Char* pAsciiStr,
xub_StrLen nIndex, xub_StrLen nLen ) const;
- sal_Bool EqualsIgnoreCaseAscii( const UniString& rStr,
+ sal_Bool EqualsIgnoreCaseAscii( const UniString& rStr,
xub_StrLen nIndex, xub_StrLen nLen ) const;
- sal_Bool EqualsIgnoreCaseAscii( const sal_Char* pAsciiStr,
+ sal_Bool EqualsIgnoreCaseAscii( const sal_Char* pAsciiStr,
xub_StrLen nIndex, xub_StrLen nLen ) const;
xub_StrLen Match( const UniString& rStr ) const;
@@ -274,17 +274,17 @@ public:
void ReleaseBufferAccess( xub_StrLen nLen = STRING_LEN );
sal_Unicode* AllocBuffer( xub_StrLen nLen );
- friend sal_Bool operator == ( const UniString& rStr1, const UniString& rStr2 )
+ friend sal_Bool operator == ( const UniString& rStr1, const UniString& rStr2 )
{ return rStr1.Equals( rStr2 ); }
- friend sal_Bool operator != ( const UniString& rStr1, const UniString& rStr2 )
+ friend sal_Bool operator != ( const UniString& rStr1, const UniString& rStr2 )
{ return !(operator == ( rStr1, rStr2 )); }
- friend sal_Bool operator < ( const UniString& rStr1, const UniString& rStr2 )
+ friend sal_Bool operator < ( const UniString& rStr1, const UniString& rStr2 )
{ return (rStr1.CompareTo( rStr2 ) == COMPARE_LESS); }
- friend sal_Bool operator > ( const UniString& rStr1, const UniString& rStr2 )
+ friend sal_Bool operator > ( const UniString& rStr1, const UniString& rStr2 )
{ return (rStr1.CompareTo( rStr2 ) == COMPARE_GREATER); }
- friend sal_Bool operator <= ( const UniString& rStr1, const UniString& rStr2 )
+ friend sal_Bool operator <= ( const UniString& rStr1, const UniString& rStr2 )
{ return !(operator > ( rStr1, rStr2 )); }
- friend sal_Bool operator >= ( const UniString& rStr1, const UniString& rStr2 )
+ friend sal_Bool operator >= ( const UniString& rStr1, const UniString& rStr2 )
{ return !(operator < ( rStr1, rStr2 )); }
};
diff --git a/tools/inc/tools/tempfile.hxx b/tools/inc/tools/tempfile.hxx
index 376de44..9e84adc 100644
--- a/tools/inc/tools/tempfile.hxx
+++ b/tools/inc/tools/tempfile.hxx
@@ -31,7 +31,7 @@ class TOOLS_DLLPUBLIC TempFile
public:
/** Create a temporary file or directory in a given folder or the default
tempfile folder. */
- TempFile( const String* pParent=NULL, sal_Bool bDirectory=sal_False );
+ TempFile( const String* pParent=NULL, sal_Bool bDirectory=sal_False );
/** Create a temporary file or directory in a given folder or the default
tempfile folder; its name starts with some given characters followed by
@@ -41,24 +41,22 @@ public:
The extension string may be f.e. ".txt" or "", if no extension string is
given, ".tmp" is used.
*/
- TempFile( const String& rLeadingChars, const String* pExtension=NULL, const String* pParent=NULL, sal_Bool bDirectory=sal_False );
+ TempFile( const String& rLeadingChars, const String* pExtension=NULL, const String* pParent=NULL, sal_Bool bDirectory=sal_False );
/** TempFile will be removed from disk in dtor if EnableKillingTempFile was
called before. TempDirs will be removed recursively in that case. */
- ~TempFile();
+ ~TempFile();
- sal_Bool IsValid() const;
+ sal_Bool IsValid() const;
/** Returns the real name of the tempfile in file URL scheme. */
- String GetName() const;
+ String GetName() const;
/** If enabled the file will be removed from disk when the dtor is called
(default is not enabled) */
- void EnableKillingFile( sal_Bool bEnable=sal_True )
- { bKillingFileEnabled = bEnable; }
+ void EnableKillingFile( sal_Bool bEnable=sal_True ) { bKillingFileEnabled = bEnable; }
- sal_Bool IsKillingFileEnabled() const
- { return bKillingFileEnabled; }
+ sal_Bool IsKillingFileEnabled() const { return bKillingFileEnabled; }
/** Only create a name for a temporary file that would be valid at that moment. */
static String CreateTempName( const String* pParent=NULL );
diff --git a/tools/inc/tools/time.hxx b/tools/inc/tools/time.hxx
index 82b94ee..05c6d1e 100644
--- a/tools/inc/tools/time.hxx
+++ b/tools/inc/tools/time.hxx
@@ -33,7 +33,7 @@ class ResId;
class TOOLS_DLLPUBLIC Time
{
private:
- sal_Int32 nTime;
+ sal_Int32 nTime;
public:
enum TimeInitSystem
@@ -63,18 +63,18 @@ public:
void SetMin( sal_uInt16 nNewMin );
void SetSec( sal_uInt16 nNewSec );
void Set100Sec( sal_uInt16 nNew100Sec );
- sal_uInt16 GetHour() const
- { sal_uIntPtr nTempTime = (nTime >= 0) ? nTime : nTime*-1;
- return (sal_uInt16)(nTempTime / 1000000); }
- sal_uInt16 GetMin() const
- { sal_uIntPtr nTempTime = (nTime >= 0) ? nTime : nTime*-1;
- return (sal_uInt16)((nTempTime / 10000) % 100); }
- sal_uInt16 GetSec() const
- { sal_uIntPtr nTempTime = (nTime >= 0) ? nTime : nTime*-1;
- return (sal_uInt16)((nTempTime / 100) % 100); }
- sal_uInt16 Get100Sec() const
- { sal_uIntPtr nTempTime = (nTime >= 0) ? nTime : nTime*-1;
- return (sal_uInt16)(nTempTime % 100); }
+ sal_uInt16 GetHour() const
+ { sal_uIntPtr nTempTime = (nTime >= 0) ? nTime : nTime*-1;
+ return (sal_uInt16)(nTempTime / 1000000); }
+ sal_uInt16 GetMin() const
+ { sal_uIntPtr nTempTime = (nTime >= 0) ? nTime : nTime*-1;
+ return (sal_uInt16)((nTempTime / 10000) % 100); }
+ sal_uInt16 GetSec() const
+ { sal_uIntPtr nTempTime = (nTime >= 0) ? nTime : nTime*-1;
+ return (sal_uInt16)((nTempTime / 100) % 100); }
+ sal_uInt16 Get100Sec() const
+ { sal_uIntPtr nTempTime = (nTime >= 0) ? nTime : nTime*-1;
+ return (sal_uInt16)(nTempTime % 100); }
sal_Int32 GetMSFromTime() const;
void MakeTimeFromMS( sal_Int32 nMS );
@@ -82,23 +82,23 @@ public:
/// 12 hours == 0.5 days
double GetTimeInDays() const;
- sal_Bool IsBetween( const Time& rFrom, const Time& rTo ) const
- { return ((nTime >= rFrom.nTime) && (nTime <= rTo.nTime)); }
-
- sal_Bool IsEqualIgnore100Sec( const Time& rTime ) const;
-
- sal_Bool operator ==( const Time& rTime ) const
- { return (nTime == rTime.nTime); }
- sal_Bool operator !=( const Time& rTime ) const
- { return (nTime != rTime.nTime); }
- sal_Bool operator >( const Time& rTime ) const
- { return (nTime > rTime.nTime); }
- sal_Bool operator <( const Time& rTime ) const
- { return (nTime < rTime.nTime); }
- sal_Bool operator >=( const Time& rTime ) const
- { return (nTime >= rTime.nTime); }
- sal_Bool operator <=( const Time& rTime ) const
- { return (nTime <= rTime.nTime); }
+ sal_Bool IsBetween( const Time& rFrom, const Time& rTo ) const
+ { return ((nTime >= rFrom.nTime) && (nTime <= rTo.nTime)); }
+
+ sal_Bool IsEqualIgnore100Sec( const Time& rTime ) const;
+
+ sal_Bool operator ==( const Time& rTime ) const
+ { return (nTime == rTime.nTime); }
+ sal_Bool operator !=( const Time& rTime ) const
+ { return (nTime != rTime.nTime); }
+ sal_Bool operator >( const Time& rTime ) const
+ { return (nTime > rTime.nTime); }
+ sal_Bool operator <( const Time& rTime ) const
+ { return (nTime < rTime.nTime); }
+ sal_Bool operator >=( const Time& rTime ) const
+ { return (nTime >= rTime.nTime); }
+ sal_Bool operator <=( const Time& rTime ) const
+ { return (nTime <= rTime.nTime); }
static Time GetUTCOffset();
static sal_uIntPtr GetSystemTicks(); // Elapsed time
diff --git a/tools/inc/tools/unqidx.hxx b/tools/inc/tools/unqidx.hxx
index 3424597..18088ef 100644
--- a/tools/inc/tools/unqidx.hxx
+++ b/tools/inc/tools/unqidx.hxx
@@ -29,9 +29,9 @@
class TOOLS_DLLPUBLIC UniqueIndexImpl : public std::map<sal_uInt32, void*>
{
private:
- sal_uIntPtr nStartIndex;
- sal_uIntPtr nUniqIndex;
- sal_uIntPtr nCount;
+ sal_uIntPtr nStartIndex;
+ sal_uIntPtr nUniqIndex;
+ sal_uIntPtr nCount;
public:
UniqueIndexImpl( sal_uIntPtr _nStartIndex = 0 )
diff --git a/tools/inc/tools/vcompat.hxx b/tools/inc/tools/vcompat.hxx
index fbb5b3b..cb3c297 100644
--- a/tools/inc/tools/vcompat.hxx
+++ b/tools/inc/tools/vcompat.hxx
@@ -33,22 +33,22 @@ class SvStream;
class TOOLS_DLLPUBLIC VersionCompat
{
SvStream* mpRWStm;
- sal_uInt32 mnCompatPos;
- sal_uInt32 mnTotalSize;
- sal_uInt16 mnStmMode;
- sal_uInt16 mnVersion;
+ sal_uInt32 mnCompatPos;
+ sal_uInt32 mnTotalSize;
+ sal_uInt16 mnStmMode;
+ sal_uInt16 mnVersion;
VersionCompat() {}
VersionCompat( const VersionCompat& ) {}
VersionCompat& operator=( const VersionCompat& ) { return *this; }
- sal_Bool operator==( const VersionCompat& ) { return sal_False; }
+ sal_Bool operator==( const VersionCompat& ) { return sal_False; }
public:
VersionCompat( SvStream& rStm, sal_uInt16 nStreamMode, sal_uInt16 nVersion = 1 );
~VersionCompat();
- sal_uInt16 GetVersion() const { return mnVersion; }
+ sal_uInt16 GetVersion() const { return mnVersion; }
};
#endif
diff --git a/tools/inc/tools/vector2d.hxx b/tools/inc/tools/vector2d.hxx
index 23002f1..50c6bc8 100644
--- a/tools/inc/tools/vector2d.hxx
+++ b/tools/inc/tools/vector2d.hxx
@@ -26,8 +26,8 @@
class Vector2D
{
private:
- double mfX;
- double mfY;
+ double mfX;
+ double mfY;
public:
inline Vector2D() : mfX( 0.0 ), mfY( 0.0 ) {}
@@ -75,8 +75,8 @@ public:
inline Vector2D& operator/=(double t) { mfX /= t; mfY /= t; return *this; }
inline Vector2D operator/(double t) const { Vector2D aNew(*this); aNew /= t; return aNew; }
- inline sal_Bool operator==( const Vector2D& rVec ) const { return( mfX == rVec.mfX && mfY == rVec.mfY ); }
- inline sal_Bool operator!=( const Vector2D& rVec ) const { return !( *this == rVec ); }
+ inline sal_Bool operator==( const Vector2D& rVec ) const { return( mfX == rVec.mfX && mfY == rVec.mfY ); }
+ inline sal_Bool operator!=( const Vector2D& rVec ) const { return !( *this == rVec ); }
inline Vector2D& operator=( const Vector2D& rVec ) { mfX = rVec.mfX, mfY = rVec.mfY; return *this; }
inline Vector2D& operator=( const Pair& rPair ) { mfX = rPair.nA, mfY = rPair.nB; return *this; }
@@ -85,11 +85,11 @@ public:
inline Vector2D& operator*=( const Pair& rPair ) { mfX *= rPair.nA, mfY *= rPair.nB; return *this; }
inline Vector2D& operator/=( const Pair& rPair ) { mfX /= rPair.nA, mfY /= rPair.nB; return *this; }
- inline sal_Bool operator==( const Pair& rPair ) const { return( mfX == rPair.nA && mfY == rPair.nB ); }
- inline sal_Bool operator!=( const Pair& rPair ) const { return !( *this == rPair ); }
+ inline sal_Bool operator==( const Pair& rPair ) const { return( mfX == rPair.nA && mfY == rPair.nB ); }
+ inline sal_Bool operator!=( const Pair& rPair ) const { return !( *this == rPair ); }
- inline sal_Bool IsPositive( Vector2D& rVec ) const { return( ( mfX * rVec.mfY - mfY * rVec.mfX ) >= 0.0 ); }
- inline sal_Bool IsNegative( Vector2D& rVec ) const { return !IsPositive( rVec ); }
+ inline sal_Bool IsPositive( Vector2D& rVec ) const { return( ( mfX * rVec.mfY - mfY * rVec.mfX ) >= 0.0 ); }
+ inline sal_Bool IsNegative( Vector2D& rVec ) const { return !IsPositive( rVec ); }
};
inline Vector2D& Vector2D::Normalize()
diff --git a/tools/inc/tools/wldcrd.hxx b/tools/inc/tools/wldcrd.hxx
index 2a53c16..cf82984 100644
--- a/tools/inc/tools/wldcrd.hxx
+++ b/tools/inc/tools/wldcrd.hxx
@@ -29,7 +29,7 @@ private:
rtl::OString aWildString;
char cSepSymbol;
- sal_uInt16 ImpMatch( const char *pWild, const char *pStr ) const;
+ sal_uInt16 ImpMatch( const char *pWild, const char *pStr ) const;
public:
WildCard()
@@ -54,7 +54,7 @@ public:
aWildString = rtl::OUStringToOString(rString, osl_getThreadTextEncoding());
}
- sal_Bool Matches( const String& rStr ) const;
+ sal_Bool Matches( const String& rStr ) const;
};
#endif
diff --git a/tools/inc/tools/zcodec.hxx b/tools/inc/tools/zcodec.hxx
index b2c53a7..185cb1d 100644
--- a/tools/inc/tools/zcodec.hxx
+++ b/tools/inc/tools/zcodec.hxx
@@ -55,20 +55,20 @@ class SvStream;
class TOOLS_DLLPUBLIC ZCodec
{
private:
- sal_uIntPtr mbInit;
- sal_Bool mbStatus;
- sal_Bool mbFinish;
- sal_uIntPtr mnMemUsage;
+ sal_uIntPtr mbInit;
+ sal_Bool mbStatus;
+ sal_Bool mbFinish;
+ sal_uIntPtr mnMemUsage;
SvStream* mpIStm;
- sal_uInt8* mpInBuf;
- sal_uIntPtr mnInBufSize;
- sal_uIntPtr mnInToRead;
+ sal_uInt8* mpInBuf;
+ sal_uIntPtr mnInBufSize;
+ sal_uIntPtr mnInToRead;
SvStream* mpOStm;
- sal_uInt8* mpOutBuf;
- sal_uIntPtr mnOutBufSize;
+ sal_uInt8* mpOutBuf;
+ sal_uIntPtr mnOutBufSize;
- sal_uIntPtr mnCRC;
- sal_uIntPtr mnCompressMethod;
+ sal_uIntPtr mnCRC;
+ sal_uIntPtr mnCompressMethod;
void* mpsC_Stream;
void ImplInitBuf( sal_Bool nIOFlag );
@@ -81,7 +81,7 @@ public:
virtual void BeginCompression( sal_uIntPtr nCompressMethod = ZCODEC_DEFAULT );
virtual long EndCompression();
- sal_Bool IsFinished () const { return mbFinish; }
+ sal_Bool IsFinished () const { return mbFinish; }
long Compress( SvStream& rIStm, SvStream& rOStm );
long Decompress( SvStream& rIStm, SvStream& rOStm );
@@ -91,10 +91,10 @@ public:
long ReadAsynchron( SvStream& rIStm, sal_uInt8* pData, sal_uIntPtr nSize );
void SetBreak( sal_uIntPtr );
- sal_uIntPtr GetBreak( void );
+ sal_uIntPtr GetBreak( void );
void SetCRC( sal_uIntPtr nCurrentCRC );
- sal_uIntPtr UpdateCRC( sal_uIntPtr nLatestCRC, sal_uInt8* pSource, long nDatSize );
- sal_uIntPtr GetCRC();
+ sal_uIntPtr UpdateCRC( sal_uIntPtr nLatestCRC, sal_uInt8* pSource, long nDatSize );
+ sal_uIntPtr GetCRC();
};
class GZCodec : public ZCodec
commit 70fc650319f8cfc0b3230ad2dea584eb1368a238
Author: Philipp Riemer <ruderphilipp at gmail.com>
Date: Mon Aug 13 23:33:49 2012 +0200
remove ascii art and blank lines in tools/inc/
Also added some lines for better readability.
This is a follow-up patch of c8b7aa55138848fe07108779099267424bc03e3d.
Change-Id: I50e6c05141ef3b8db70302d8853b46c38414c6d5
diff --git a/tools/inc/bootstrp/prj.hxx b/tools/inc/bootstrp/prj.hxx
index f4525e6..17b9814 100644
--- a/tools/inc/bootstrp/prj.hxx
+++ b/tools/inc/bootstrp/prj.hxx
@@ -16,7 +16,6 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#ifndef _PRJ_HXX
#define _PRJ_HXX
@@ -31,6 +30,7 @@ class SimpleConfig
rtl::OString aStringBuffer;
rtl::OString GetNextLine();
+
public:
SimpleConfig(const String& rSimpleConfigFileName);
~SimpleConfig();
diff --git a/tools/inc/impcont.hxx b/tools/inc/impcont.hxx
index b6a7f5d..1cfb374 100644
--- a/tools/inc/impcont.hxx
+++ b/tools/inc/impcont.hxx
@@ -16,7 +16,6 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#ifndef _IMPCONT_HXX
#define _IMPCONT_HXX
diff --git a/tools/inc/impstrg.hxx b/tools/inc/impstrg.hxx
index dfa583b..1db5ea7 100644
--- a/tools/inc/impstrg.hxx
+++ b/tools/inc/impstrg.hxx
@@ -16,7 +16,6 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#ifndef _IMPSTRG_HXX
#define _IMPSTRG_HXX
diff --git a/tools/inc/poly.h b/tools/inc/poly.h
index b0acd66..e71ba55 100644
--- a/tools/inc/poly.h
+++ b/tools/inc/poly.h
@@ -16,7 +16,6 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#ifndef _POLY_H
#define _POLY_H
diff --git a/tools/inc/tools/appendunixshellword.hxx b/tools/inc/tools/appendunixshellword.hxx
index 94b0421..6461fdb 100644
--- a/tools/inc/tools/appendunixshellword.hxx
+++ b/tools/inc/tools/appendunixshellword.hxx
@@ -23,7 +23,6 @@
#include "sal/config.h"
#if defined UNX
-
#include "tools/toolsdllapi.h"
namespace rtl {
@@ -45,7 +44,6 @@ TOOLS_DLLPUBLIC void appendUnixShellWord(
rtl::OStringBuffer * accumulator, rtl::OString const & text);
}
-
#endif
#endif
diff --git a/tools/inc/tools/b3dtrans.hxx b/tools/inc/tools/b3dtrans.hxx
index 7075935..2024c88 100644
--- a/tools/inc/tools/b3dtrans.hxx
+++ b/tools/inc/tools/b3dtrans.hxx
@@ -252,7 +252,6 @@ protected:
virtual void DeviceRectangleChange();
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/inc/tools/bigint.hxx b/tools/inc/tools/bigint.hxx
index 276efac..40242ae 100644
--- a/tools/inc/tools/bigint.hxx
+++ b/tools/inc/tools/bigint.hxx
@@ -25,6 +25,7 @@
#include <tools/solar.h>
class SvStream;
+
#ifdef _TLBIGINT_INT64
struct SbxINT64;
struct SbxUINT64;
diff --git a/tools/inc/tools/color.hxx b/tools/inc/tools/color.hxx
index e53ef44..55637a5 100644
--- a/tools/inc/tools/color.hxx
+++ b/tools/inc/tools/color.hxx
@@ -23,8 +23,8 @@
class SvStream;
class ResId;
-#include <tools/solar.h>
+#include <tools/solar.h>
#include <basegfx/color/bcolor.hxx>
// Color types
diff --git a/tools/inc/tools/date.hxx b/tools/inc/tools/date.hxx
index 2818455..c28fd0a 100644
--- a/tools/inc/tools/date.hxx
+++ b/tools/inc/tools/date.hxx
@@ -33,7 +33,6 @@ private:
sal_uInt32 nDate;
public:
-
enum DateInitSystem
{
SYSTEM
diff --git a/tools/inc/tools/datetime.hxx b/tools/inc/tools/datetime.hxx
index 0f1ab52..19c4d1a 100644
--- a/tools/inc/tools/datetime.hxx
+++ b/tools/inc/tools/datetime.hxx
@@ -27,7 +27,6 @@
class TOOLS_DLLPUBLIC DateTime : public Date, public Time
{
public:
-
enum DateTimeInitSystem
{
SYSTEM
diff --git a/tools/inc/tools/debug.hxx b/tools/inc/tools/debug.hxx
index 309a451..c9f2ffc 100644
--- a/tools/inc/tools/debug.hxx
+++ b/tools/inc/tools/debug.hxx
@@ -16,7 +16,6 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#ifndef _TOOLS_DEBUG_HXX
#define _TOOLS_DEBUG_HXX
@@ -164,6 +163,7 @@ inline void DbgSetAbort( DbgPrintLine pProc )
}
typedef sal_uInt16 DbgChannelId;
+
/** registers a user-defined channel for emitting the diagnostic messages
Note that such a user-defined channel cannot be revoked during the lifetime
diff --git a/tools/inc/tools/diagnose_ex.h b/tools/inc/tools/diagnose_ex.h
index d106c87..11afdd2 100644
--- a/tools/inc/tools/diagnose_ex.h
+++ b/tools/inc/tools/diagnose_ex.h
@@ -16,7 +16,6 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#ifndef TOOLS_DIAGNOSE_EX_H
#define TOOLS_DIAGNOSE_EX_H
@@ -28,12 +27,10 @@
#include <boost/current_function.hpp>
-
#define OSL_UNUSED( expression ) \
(void)(expression)
#if OSL_DEBUG_LEVEL > 0
-
#include <com/sun/star/configuration/CorruptedConfigurationException.hpp>
#include <com/sun/star/task/ErrorCodeIOException.hpp>
#include <cppuhelper/exc_hlp.hxx>
@@ -89,12 +86,9 @@
OSL_ENSURE( false, sMessage.getStr() )
#else // OSL_DEBUG_LEVEL
-
#define DBG_UNHANDLED_EXCEPTION()
-
#endif // OSL_DEBUG_LEVEL
-
/** This macro asserts the given condition (in debug mode), and throws
an IllegalArgumentException afterwards.
*/
diff --git a/tools/inc/tools/errcode.hxx b/tools/inc/tools/errcode.hxx
index fdd6ffc..884e9f0 100644
--- a/tools/inc/tools/errcode.hxx
+++ b/tools/inc/tools/errcode.hxx
@@ -248,7 +248,6 @@ inline sal_uIntPtr ERRCODE_TOERROR( sal_uIntPtr x )
ERRCODE_AREA_IO)
// FsysErrorCodes
-
#define FSYS_ERR_OK ERRCODE_NONE
#define FSYS_ERR_MISPLACEDCHAR ERRCODE_IO_MISPLACEDCHAR
#define FSYS_ERR_INVALIDCHAR ERRCODE_IO_INVALIDCHAR
@@ -265,7 +264,6 @@ inline sal_uIntPtr ERRCODE_TOERROR( sal_uIntPtr x )
#define FSYS_ERR_UNKNOWN ERRCODE_IO_UNKNOWN
// StreamErrorCodes
-
#define SVSTREAM_OK ERRCODE_NONE
#define SVSTREAM_GENERALERROR ERRCODE_IO_GENERAL
diff --git a/tools/inc/tools/extendapplicationenvironment.hxx b/tools/inc/tools/extendapplicationenvironment.hxx
index 49f32e0..b6ccbf8 100644
--- a/tools/inc/tools/extendapplicationenvironment.hxx
+++ b/tools/inc/tools/extendapplicationenvironment.hxx
@@ -16,7 +16,6 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#ifndef INCLUDED_TOOLS_EXTENDAPPLICATIONENVIRONMENT_HXX
#define INCLUDED_TOOLS_EXTENDAPPLICATIONENVIRONMENT_HXX
diff --git a/tools/inc/tools/fldunit.hxx b/tools/inc/tools/fldunit.hxx
index a87b0cc..2b4a915 100644
--- a/tools/inc/tools/fldunit.hxx
+++ b/tools/inc/tools/fldunit.hxx
@@ -16,7 +16,6 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#ifndef _TOOLS_FLDUNIT_HXX
#define _TOOLS_FLDUNIT_HXX
diff --git a/tools/inc/tools/fontenum.hxx b/tools/inc/tools/fontenum.hxx
index e9792f0..7a53e93 100644
--- a/tools/inc/tools/fontenum.hxx
+++ b/tools/inc/tools/fontenum.hxx
@@ -16,7 +16,6 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#ifndef _TOOLS_FONTENUM_HXX
#define _TOOLS_FONTENUM_HXX
@@ -25,69 +24,44 @@
#ifndef ENUM_FONTFAMILY_DECLARED
#define ENUM_FONTFAMILY_DECLARED
-
enum FontFamily { FAMILY_DONTKNOW, FAMILY_DECORATIVE, FAMILY_MODERN,
FAMILY_ROMAN, FAMILY_SCRIPT, FAMILY_SWISS, FAMILY_SYSTEM, FontFamily_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
-
#endif
-// ------------------------------------------------------------
-
#ifndef ENUM_FONTPITCH_DECLARED
#define ENUM_FONTPITCH_DECLARED
-
enum FontPitch { PITCH_DONTKNOW, PITCH_FIXED, PITCH_VARIABLE, FontPitch_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
-
#endif
-// ------------------------------------------------------------
-
#ifndef ENUM_TEXTALIGN_DECLARED
#define ENUM_TEXTALIGN_DECLARED
-
enum TextAlign { ALIGN_TOP, ALIGN_BASELINE, ALIGN_BOTTOM, TextAlign_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
-
#endif
-// ------------------------------------------------------------
-
#ifndef ENUM_FONTWEIGHT_DECLARED
#define ENUM_FONTWEIGHT_DECLARED
-
enum FontWeight { WEIGHT_DONTKNOW, WEIGHT_THIN, WEIGHT_ULTRALIGHT,
WEIGHT_LIGHT, WEIGHT_SEMILIGHT, WEIGHT_NORMAL,
WEIGHT_MEDIUM, WEIGHT_SEMIBOLD, WEIGHT_BOLD,
WEIGHT_ULTRABOLD, WEIGHT_BLACK, FontWeight_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
-
#endif
-// ------------------------------------------------------------
-
#ifndef ENUM_FONTWIDTH_DECLARED
#define ENUM_FONTWIDTH_DECLARED
-
enum FontWidth { WIDTH_DONTKNOW, WIDTH_ULTRA_CONDENSED, WIDTH_EXTRA_CONDENSED,
WIDTH_CONDENSED, WIDTH_SEMI_CONDENSED, WIDTH_NORMAL,
WIDTH_SEMI_EXPANDED, WIDTH_EXPANDED, WIDTH_EXTRA_EXPANDED,
WIDTH_ULTRA_EXPANDED,
FontWidth_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
-
#endif
-// ------------------------------------------------------------
-
#ifndef ENUM_FONTITALIC_DECLARED
#define ENUM_FONTITALIC_DECLARED
-
enum FontItalic { ITALIC_NONE, ITALIC_OBLIQUE, ITALIC_NORMAL, ITALIC_DONTKNOW, FontItalic_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
-
#endif
-// ------------------------------------------------------------
-
#ifndef ENUM_FONTUNDERLINE_DECLARED
#define ENUM_FONTUNDERLINE_DECLARED
-
enum FontUnderline { UNDERLINE_NONE, UNDERLINE_SINGLE, UNDERLINE_DOUBLE,
UNDERLINE_DOTTED, UNDERLINE_DONTKNOW,
UNDERLINE_DASH, UNDERLINE_LONGDASH,
@@ -99,23 +73,16 @@ enum FontUnderline { UNDERLINE_NONE, UNDERLINE_SINGLE, UNDERLINE_DOUBLE,
UNDERLINE_BOLDDASHDOT, UNDERLINE_BOLDDASHDOTDOT,
UNDERLINE_BOLDWAVE,
FontUnderline_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
-
#endif
-// ------------------------------------------------------------
-
#ifndef ENUM_FONTSTRIKEOUT_DECLARED
#define ENUM_FONTSTRIKEOUT_DECLARED
-
enum FontStrikeout { STRIKEOUT_NONE, STRIKEOUT_SINGLE, STRIKEOUT_DOUBLE,
STRIKEOUT_DONTKNOW, STRIKEOUT_BOLD,
STRIKEOUT_SLASH, STRIKEOUT_X,
FontStrikeout_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
-
#endif
-// ------------------------------------------------------------
-
#ifndef ENUM_FONTEMPHASISMARK_DECLARED
#define ENUM_FONTEMPHASISMARK_DECLARED
@@ -137,28 +104,20 @@ typedef sal_uInt16 FontEmphasisMark;
#endif
-// ------------------------------------------------------------
-
#ifndef ENUM_FONTTYPE_DECLARED
#define ENUM_FONTTYPE_DECLARED
-
enum FontType { TYPE_DONTKNOW, TYPE_RASTER, TYPE_VECTOR, TYPE_SCALABLE,
FontType_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
-
#endif
#ifndef ENUM_FONTEMBEDDEDBITMAP_DECLARED
#define ENUM_FONTEMBEDDEDBITMAP_DECLARED
-
enum FontEmbeddedBitmap { EMBEDDEDBITMAP_DONTKNOW, EMBEDDEDBITMAP_FALSE, EMBEDDEDBITMAP_TRUE };
-
#endif
#ifndef ENUM_FONTANTIALIAS_DECLARED
#define ENUM_FONTANTIALIAS_DECLARED
-
enum FontAntiAlias { ANTIALIAS_DONTKNOW, ANTIALIAS_FALSE, ANTIALIAS_TRUE };
-
#endif
#endif
diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx
index abaf18e..6a91cda 100644
--- a/tools/inc/tools/fsys.hxx
+++ b/tools/inc/tools/fsys.hxx
@@ -133,6 +133,7 @@ enum FSysExact
// FileStat
struct dirent;
+
class TOOLS_DLLPUBLIC FileStat
{
friend class Dir;
@@ -150,6 +151,7 @@ class TOOLS_DLLPUBLIC FileStat
Time aTimeModified;
Date aDateAccessed;
Time aTimeAccessed;
+
private:
TOOLS_DLLPRIVATE void ImpInit( void* );
@@ -230,6 +232,7 @@ protected:
protected:
void SetError( sal_uIntPtr nErr ) { nError = nErr; }
DirEntry* GetParent() { return pParent; }
+
public:
DirEntry( DirEntryFlag aDirFlag = FSYS_FLAG_CURRENT );
DirEntry( const DirEntry& rEntry );
diff --git a/tools/inc/tools/getprocessworkingdir.hxx b/tools/inc/tools/getprocessworkingdir.hxx
index 891e63b..16eedfe 100644
--- a/tools/inc/tools/getprocessworkingdir.hxx
+++ b/tools/inc/tools/getprocessworkingdir.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_TOOLS_GETPROCESSWORKINGDIR_HXX
#include "sal/config.h"
-
#include "tools/toolsdllapi.h"
namespace rtl { class OUString; }
diff --git a/tools/inc/tools/globname.hxx b/tools/inc/tools/globname.hxx
index 76260c1..2ea6850 100644
--- a/tools/inc/tools/globname.hxx
+++ b/tools/inc/tools/globname.hxx
@@ -25,8 +25,6 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <tools/string.hxx>
-/*************************************************************************
-*************************************************************************/
struct ImpSvGlobalName
{
sal_uInt8 szData[ 16 ];
@@ -50,12 +48,15 @@ typedef struct _GUID GUID;
#else
struct GUID;
#endif
+
typedef GUID CLSID;
class SvStream;
+
class TOOLS_DLLPUBLIC SvGlobalName
{
ImpSvGlobalName * pImp;
void NewImp();
+
public:
SvGlobalName();
SvGlobalName( const SvGlobalName & rObj )
diff --git a/tools/inc/tools/helpers.hxx b/tools/inc/tools/helpers.hxx
index f34a7c2..5a52587 100644
--- a/tools/inc/tools/helpers.hxx
+++ b/tools/inc/tools/helpers.hxx
@@ -6,8 +6,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-
-
#ifndef _TOOLS_HELPERS_HXX
#define _TOOLS_HELPERS_HXX
@@ -16,13 +14,11 @@ inline long MinMax( long nVal, long nMin, long nMax )
return nVal >= nMin ? ( nVal <= nMax ? nVal : nMax ) : nMin;
}
-
inline long AlignedWidth4Bytes( long nWidthBits )
{
return ( ( nWidthBits + 31 ) >> 5 ) << 2;
}
-
inline long FRound( double fVal )
{
return fVal > 0.0 ? static_cast<long>( fVal + 0.5 ) : -static_cast<long>( -fVal + 0.5 );
diff --git a/tools/inc/tools/inetmime.hxx b/tools/inc/tools/inetmime.hxx
index 31da16d..5131f99 100644
--- a/tools/inc/tools/inetmime.hxx
+++ b/tools/inc/tools/inetmime.hxx
@@ -35,7 +35,6 @@ class INetContentTypeParameterList;
class INetMIMECharsetList_Impl;
class INetMIMEOutputSink;
-//============================================================================
class TOOLS_DLLPUBLIC INetMIME
{
public:
@@ -824,7 +823,6 @@ inline sal_Unicode * INetMIME::putUTF32Character(sal_Unicode * pBuffer,
return pBuffer;
}
-//============================================================================
class INetMIMEOutputSink
{
public:
@@ -1063,7 +1061,6 @@ inline void INetMIME::writeEscapeSequence(INetMIMEOutputSink & rSink,
<< sal_uInt8(getHexDigit(nChar & 15));
}
-//============================================================================
class INetMIMEStringOutputSink: public INetMIMEOutputSink
{
rtl::OStringBuffer m_aBuffer;
@@ -1087,7 +1084,6 @@ public:
}
};
-//============================================================================
class INetMIMEEncodedWordOutputSink
{
public:
@@ -1191,7 +1187,6 @@ inline bool INetMIMEEncodedWordOutputSink::flush()
return m_ePrevCoding != CODING_NONE;
}
-//============================================================================
struct INetContentTypeParameter
{
/** The name of the attribute, in US-ASCII encoding and converted to lower
@@ -1248,7 +1243,6 @@ struct INetContentTypeParameter
}
};
-//============================================================================
class TOOLS_DLLPUBLIC INetContentTypeParameterList
{
public:
@@ -1277,7 +1271,6 @@ private:
boost::ptr_vector<INetContentTypeParameter> maEntries;
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/inc/tools/inetmsg.hxx b/tools/inc/tools/inetmsg.hxx
index 0d329ec..b27b56c 100644
--- a/tools/inc/tools/inetmsg.hxx
+++ b/tools/inc/tools/inetmsg.hxx
@@ -21,12 +21,11 @@
#include "tools/toolsdllapi.h"
#include <sal/types.h>
-
#include <rtl/textenc.h>
-
#include <tools/inetmime.hxx>
#include <tools/stream.hxx>
#include <tools/string.hxx>
+
#include <vector>
class DateTime;
@@ -81,6 +80,7 @@ public:
};
typedef ::std::vector< INetMessageHeader* > HeaderList_impl;
+
class INetMessage
{
HeaderList_impl m_aHeaderList;
@@ -221,10 +221,8 @@ public:
#define INETMSG_RFC822_SENDER 11
#define INETMSG_RFC822_SUBJECT 12
#define INETMSG_RFC822_TO 13
-
#define INETMSG_RFC822_X_MAILER 14
#define INETMSG_RFC822_RETURN_RECEIPT_TO 15
-
#define INETMSG_RFC822_NUMHDR 16
class TOOLS_DLLPUBLIC INetRFC822Message : public INetMessage
@@ -379,7 +377,6 @@ public:
#define INETMSG_MIME_CONTENT_ID 3
#define INETMSG_MIME_CONTENT_TYPE 4
#define INETMSG_MIME_CONTENT_TRANSFER_ENCODING 5
-
#define INETMSG_MIME_NUMHDR 6
enum INetMessageContainerType
@@ -395,10 +392,10 @@ enum INetMessageContainerType
class INetMIMEMessage;
typedef ::std::vector< INetMIMEMessage* > INetMIMEMessgeList_impl;
+
class TOOLS_DLLPUBLIC INetMIMEMessage : public INetRFC822Message
{
sal_uIntPtr m_nIndex[INETMSG_MIME_NUMHDR];
-
INetMIMEMessage* pParent;
INetMIMEMessgeList_impl aChildren;
rtl::OString m_aBoundary;
diff --git a/tools/inc/tools/line.hxx b/tools/inc/tools/line.hxx
index ca4f780..cc6bf22 100644
--- a/tools/inc/tools/line.hxx
+++ b/tools/inc/tools/line.hxx
@@ -27,7 +27,6 @@ class Link;
class TOOLS_DLLPUBLIC Line
{
private:
-
Point maStart;
Point maEnd;
diff --git a/tools/inc/tools/multisel.hxx b/tools/inc/tools/multisel.hxx
index 6fcebb4..20eb547 100644
--- a/tools/inc/tools/multisel.hxx
+++ b/tools/inc/tools/multisel.hxx
@@ -26,14 +26,10 @@
#include <vector>
#include <set>
-//------------------------------------------------------------------
-
typedef ::std::vector< Range* > ImpSelList;
#define SFX_ENDOFSELECTION ULONG_MAX
-//------------------------------------------------------------------
-
class TOOLS_DLLPUBLIC MultiSelection
{
private:
@@ -127,6 +123,7 @@ public:
sal_Int32 i_nCurrent )
: pEnumerator( i_pEnum ), pPossibleValues( i_pPossibleValues )
, nRangeIndex( i_nRange ), nCurrent( i_nCurrent ) {}
+
public:
Iterator() : pEnumerator( NULL ), pPossibleValues( NULL ), nRangeIndex( -1 ), nCurrent( -1 ) {}
Iterator& operator++();
@@ -151,7 +148,6 @@ public:
bool isValidInput() const { return mbValidInput; }
bool hasValue( sal_Int32 nValue, const std::set< sal_Int32 >* i_pPossibleValues = NULL ) const;
-
/**
i_rPageRange: the string to be changed into a sequence of numbers
valid format example "5-3,9,9,7-8" ; instead of ',' ';' or ' ' are allowed as well
diff --git a/tools/inc/tools/pathutils.hxx b/tools/inc/tools/pathutils.hxx
index d7e4e89..2153db7 100644
--- a/tools/inc/tools/pathutils.hxx
+++ b/tools/inc/tools/pathutils.hxx
@@ -16,23 +16,19 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#ifndef INCLUDED_TOOLS_PATHUTILS_HXX
#define INCLUDED_TOOLS_PATHUTILS_HXX
#include "sal/config.h"
#if defined WNT
-
#include <cstddef>
-
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
// The compiled code is not part of the tl dynamic library, but is delivered as
// pathutils-obj and pathutils-slo objects (it is linked into special
// executables and dynamic libraries that do not link against OOo libraries):
-
namespace tools {
/** Determine the filename part of a path.
@@ -86,7 +82,6 @@ WCHAR * resolveLink(WCHAR * path);
}
#endif
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/inc/tools/poly.hxx b/tools/inc/tools/poly.hxx
index c5a7f91..a51fd87 100644
--- a/tools/inc/tools/poly.hxx
+++ b/tools/inc/tools/poly.hxx
@@ -28,8 +28,6 @@
#define POLY_APPEND (0xFFFF)
#define POLYPOLY_APPEND (0xFFFF)
-// ------------------------------------------------------------------------
-
#define POLY_OPTIMIZE_NONE 0x00000000UL
#define POLY_OPTIMIZE_OPEN 0x00000001UL
#define POLY_OPTIMIZE_CLOSE 0x00000002UL
@@ -64,7 +62,6 @@ private:
union { sal_uIntPtr mnAbsolut; sal_uInt16 mnPercent; };
public:
-
PolyOptimizeData() : eType( DATA_NONE ) {}
PolyOptimizeData( sal_uIntPtr nAbsolut ) : eType( DATA_ABSOLUT ), mnAbsolut( nAbsolut ) {}
PolyOptimizeData( sal_uInt16 nPercent ) : eType( DATA_PERCENT ), mnPercent( nPercent ) {}
@@ -87,13 +84,11 @@ namespace basegfx
class TOOLS_DLLPUBLIC Polygon
{
private:
-
ImplPolygon* mpImplPolygon;
TOOLS_DLLPRIVATE inline void ImplMakeUnique();
public:
-
static void ImplReduceEdges( Polygon& rPoly, const double& rArea, sal_uInt16 nPercent );
void ImplRead( SvStream& rIStream );
void ImplWrite( SvStream& rOStream ) const;
@@ -202,7 +197,6 @@ public:
class TOOLS_DLLPUBLIC PolyPolygon
{
private:
-
ImplPolyPolygon* mpImplPolyPolygon;
TOOLS_DLLPRIVATE void ImplDoOperation( const PolyPolygon& rPolyPoly, PolyPolygon& rResult, sal_uIntPtr nOperation ) const;
@@ -210,7 +204,6 @@ private:
TOOLS_DLLPRIVATE void ImplSetFromArtVpath( void *pVpath );
public:
-
PolyPolygon( sal_uInt16 nInitSize = 16, sal_uInt16 nResize = 16 );
PolyPolygon( const Polygon& rPoly );
PolyPolygon( sal_uInt16 nPoly, const sal_uInt16* pPointCountAry,
diff --git a/tools/inc/tools/rc.h b/tools/inc/tools/rc.h
index 23115c0..5bcd4cb 100644
--- a/tools/inc/tools/rc.h
+++ b/tools/inc/tools/rc.h
@@ -27,6 +27,7 @@
#define RSC_EXTRAMAPUNIT 0xFFFF // do not change that value!
typedef short RSWND_STYLE;
+
#define RSWND_DISABLED 0x01
#define RSWND_CLIENTSIZE 0x02
diff --git a/tools/inc/tools/rcid.h b/tools/inc/tools/rcid.h
index 4cc427e..d257639 100644
--- a/tools/inc/tools/rcid.h
+++ b/tools/inc/tools/rcid.h
@@ -120,7 +120,6 @@
#define RT_SYS_STRING (RSC_NOTYPE + 0xf3) // special case
#define RT_SYS_FILE (RSC_NOTYPE + 0xf4) // not implemented
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/inc/tools/resid.hxx b/tools/inc/tools/resid.hxx
index 58f4881..78d6656 100644
--- a/tools/inc/tools/resid.hxx
+++ b/tools/inc/tools/resid.hxx
@@ -55,6 +55,7 @@ class ResId
m_pResource = pRes; m_nResId = nId; m_nRT = RSC_NOTYPE; m_pResMgr = &rMgr; m_nRT2 = RSC_NOTYPE; m_nWinBits = 0;
OSL_ENSURE( m_pResMgr != NULL, "ResId without ResMgr created" );
}
+
public:
ResId( RSHEADER_TYPE * pRc, ResMgr& rMgr )
{
diff --git a/tools/inc/tools/resmgr.hxx b/tools/inc/tools/resmgr.hxx
index f6008f9..7e2e5a9 100644
--- a/tools/inc/tools/resmgr.hxx
+++ b/tools/inc/tools/resmgr.hxx
@@ -59,6 +59,7 @@ typedef rtl::OUString (*ResHookProc)( const rtl::OUString& rStr );
class Resource;
class ResMgr;
+
struct ImpRCStack
{
// pResource and pClassRes equal NULL: resource was not loaded
@@ -121,6 +122,7 @@ private:
// no copying
ResMgr(const ResMgr&);
ResMgr& operator=(const ResMgr&);
+
public:
static void DestroyAllResMgr(); ///< Called upon app shutdown
@@ -198,14 +200,17 @@ inline sal_uInt32 RSHEADER_TYPE::GetId()
{
return (sal_uInt32)ResMgr::GetLong( &nId );
}
+
inline RESOURCE_TYPE RSHEADER_TYPE::GetRT()
{
return (RESOURCE_TYPE)ResMgr::GetLong( &nRT );
}
+
inline sal_uInt32 RSHEADER_TYPE::GetGlobOff()
{
return (sal_uInt32)ResMgr::GetLong( &nGlobOff );
}
+
inline sal_uInt32 RSHEADER_TYPE::GetLocalOff()
{
return (sal_uInt32)ResMgr::GetLong( &nLocalOff );
diff --git a/tools/inc/tools/rtti.hxx b/tools/inc/tools/rtti.hxx
index 33cc3b9..a3501b7 100644
--- a/tools/inc/tools/rtti.hxx
+++ b/tools/inc/tools/rtti.hxx
@@ -25,8 +25,6 @@
typedef void* (*TypeId)();
-//-------------------------------------------------------------------------
-
#define TYPEINFO() \
static void* CreateType(); \
static TypeId StaticType(); \
@@ -52,8 +50,6 @@ typedef void* (*TypeId)();
#define STATICTYPE(sType) (sType::StaticType())
-//-------------------------------------------------------------------------
-
#define SUPERTYPE(sSuper) \
if ( sSuper::IsOf(aSameOrSuperType ) ) \
return sal_True
@@ -103,8 +99,6 @@ typedef void* (*TypeId)();
#define ISOF(sType) IsOf(sType::StaticType())
#define CREATE(TypeId) (TypeId())
-//-------------------------------------------------------------------------
-
/** Exemplary application macros for pointers
(can be extended for use with references)
diff --git a/tools/inc/tools/simplerm.hxx b/tools/inc/tools/simplerm.hxx
index fe87f31..9c054ec 100644
--- a/tools/inc/tools/simplerm.hxx
+++ b/tools/inc/tools/simplerm.hxx
@@ -31,6 +31,7 @@
#include "tools/toolsdllapi.h"
class InternalResMgr;
+
class TOOLS_DLLPUBLIC SimpleResMgr
{
protected:
diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx
index 3581140..958bd2a 100644
--- a/tools/inc/tools/stream.hxx
+++ b/tools/inc/tools/stream.hxx
@@ -92,6 +92,7 @@ typedef sal_uInt16 StreamMode;
#define ID_PERSISTSTREAM 6
class SvStream;
+
typedef SvStream& (*SvStrPtr)( SvStream& );
inline SvStream& operator<<( SvStream& rStr, SvStrPtr f );
@@ -131,12 +132,10 @@ public:
virtual const SvStream * GetStream() const { return m_pStream; }
virtual void SetSynchronMode(sal_Bool bTheSync = sal_True) { m_bSync = bTheSync; }
-
virtual sal_Bool IsSynchronMode() const { return m_bSync; }
virtual ErrCode ReadAt(sal_Size nPos, void * pBuffer, sal_Size nCount,
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list