summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Riemer <ruderphilipp@gmail.com>2013-08-31 17:56:27 +0200
committerPhilipp Riemer <ruderphilipp@gmail.com>2013-08-31 22:41:11 +0200
commit78ced6235b0a0f043d9e9618cd8758a8e6f34d33 (patch)
treef274df4221d67b6fabd20d9a8e67b78192083995
parent160a4dd9a35488786a3cd4aa1c4c1a74997e7b7e (diff)
fix indentation
This is a follow up commit to - 22d1beb78a475e4846af945afde1c4d6c263b5d6 - 1c7af455ab9345304a7ac48ce2e0310de2ac8a75 Change-Id: I55ff666c357c89ad355a1a5bc0d0347fcc188476
-rw-r--r--cli_ure/source/uno_bridge/cli_data.cxx12
-rw-r--r--connectivity/source/commontools/dbtools.cxx32
-rw-r--r--connectivity/source/drivers/ado/APreparedStatement.cxx2
-rw-r--r--include/drawinglayer/processor3d/zbufferprocessor3d.hxx10
-rw-r--r--include/editeng/boxitem.hxx10
-rw-r--r--sax/test/sax/testsax.cxx22
-rw-r--r--sw/source/filter/ww8/ww8scan.hxx13
-rw-r--r--sw/source/filter/ww8/ww8toolbar.cxx5
-rw-r--r--sw/source/filter/ww8/ww8toolbar.hxx19
-rw-r--r--xmloff/inc/txtfldi.hxx2
10 files changed, 65 insertions, 62 deletions
diff --git a/cli_ure/source/uno_bridge/cli_data.cxx b/cli_ure/source/uno_bridge/cli_data.cxx
index 6735908db22f..76739d622e7d 100644
--- a/cli_ure/source/uno_bridge/cli_data.cxx
+++ b/cli_ure/source/uno_bridge/cli_data.cxx
@@ -1545,10 +1545,10 @@ void Bridge::map_to_cli(
break;
}
case typelib_TypeClass_TYPE:
- {
+ {
*cli_data= mapUnoType( *(typelib_TypeDescriptionReference * const *)uno_data );
break;
- }
+ }
case typelib_TypeClass_ANY:
{
uno_Any const * pAny = (uno_Any const *)uno_data;
@@ -1569,7 +1569,7 @@ void Bridge::map_to_cli(
break;
}
case typelib_TypeClass_ENUM:
- {
+ {
if (info != nullptr)
{
OSL_ASSERT(info->IsByRef);
@@ -1986,8 +1986,8 @@ void Bridge::map_to_cli(
buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("] unsupported type!") );
throw BridgeRuntimeError( buf.makeStringAndClear() );
}
- }
-}
-}
+ } //switch
+} // method
+} // namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index 8d295f84a833..341fa30b8981 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -2030,34 +2030,34 @@ void checkDisposed(sal_Bool _bThrow) throw ( DisposedException )
}
- OSQLColumns::Vector::const_iterator find( OSQLColumns::Vector::const_iterator __first,
+OSQLColumns::Vector::const_iterator find(OSQLColumns::Vector::const_iterator __first,
OSQLColumns::Vector::const_iterator __last,
const OUString& _rVal,
const ::comphelper::UStringMixEqual& _rCase)
- {
- OUString sName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME);
- return find(__first,__last,sName,_rVal,_rCase);
- }
+{
+ OUString sName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME);
+ return find(__first,__last,sName,_rVal,_rCase);
+}
- OSQLColumns::Vector::const_iterator findRealName( OSQLColumns::Vector::const_iterator __first,
+OSQLColumns::Vector::const_iterator findRealName(OSQLColumns::Vector::const_iterator __first,
OSQLColumns::Vector::const_iterator __last,
const OUString& _rVal,
const ::comphelper::UStringMixEqual& _rCase)
- {
- OUString sRealName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME);
- return find(__first,__last,sRealName,_rVal,_rCase);
- }
+{
+ OUString sRealName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME);
+ return find(__first,__last,sRealName,_rVal,_rCase);
+}
- OSQLColumns::Vector::const_iterator find( OSQLColumns::Vector::const_iterator __first,
+OSQLColumns::Vector::const_iterator find(OSQLColumns::Vector::const_iterator __first,
OSQLColumns::Vector::const_iterator __last,
const OUString& _rProp,
const OUString& _rVal,
const ::comphelper::UStringMixEqual& _rCase)
- {
- while (__first != __last && !_rCase(getString((*__first)->getPropertyValue(_rProp)),_rVal))
- ++__first;
- return __first;
- }
+{
+ while (__first != __last && !_rCase(getString((*__first)->getPropertyValue(_rProp)),_rVal))
+ ++__first;
+ return __first;
+}
} //namespace connectivity
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx
index 854abca05f4a..8b5177965189 100644
--- a/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/connectivity/source/drivers/ado/APreparedStatement.cxx
@@ -263,7 +263,7 @@ Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) throw(SQLE
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
// first clear the old things
-m_xMetaData.clear();
+ m_xMetaData.clear();
disposeResultSet();
if(m_RecordSet.IsValid())
m_RecordSet.Close();
diff --git a/include/drawinglayer/processor3d/zbufferprocessor3d.hxx b/include/drawinglayer/processor3d/zbufferprocessor3d.hxx
index 89b23f130f79..347996de0c5f 100644
--- a/include/drawinglayer/processor3d/zbufferprocessor3d.hxx
+++ b/include/drawinglayer/processor3d/zbufferprocessor3d.hxx
@@ -57,23 +57,23 @@ namespace drawinglayer
{
private:
/// the raster target, a Z-Buffer
- basegfx::BZPixelRaster* mpBZPixelRaster;
+ basegfx::BZPixelRaster* mpBZPixelRaster;
/// inverse of EyeToView for rasterconversion with evtl. Phong shading
- basegfx::B3DHomMatrix maInvEyeToView;
+ basegfx::B3DHomMatrix maInvEyeToView;
/// The raster converter for Z-Buffer
- ZBufferRasterConverter3D* mpZBufferRasterConverter3D;
+ ZBufferRasterConverter3D* mpZBufferRasterConverter3D;
/* AA value. Defines how many oversamples will be used in X and Y. Values 0, 1
will switch it off while e.g. 2 will use 2x2 pixels for each pixel to create
*/
- sal_uInt16 mnAntiAlialize;
+ sal_uInt16 mnAntiAlialize;
/* remembered RasterPrimitive3D's which need to be painted back to front
for transparent 3D parts
*/
- std::vector< RasterPrimitive3D >* mpRasterPrimitive3Ds;
+ std::vector< RasterPrimitive3D >* mpRasterPrimitive3Ds;
// rasterconversions for filled and non-filled polygons
diff --git a/include/editeng/boxitem.hxx b/include/editeng/boxitem.hxx
index 587bc1264845..5a450d86f4e4 100644
--- a/include/editeng/boxitem.hxx
+++ b/include/editeng/boxitem.hxx
@@ -56,7 +56,7 @@ class EDITENG_DLLPUBLIC SvxBoxItem : public SfxPoolItem
*pBottom,
*pLeft,
*pRight;
- sal_uInt16 nTopDist,
+ sal_uInt16 nTopDist,
nBottomDist,
nLeftDist,
nRightDist;
@@ -94,7 +94,7 @@ public:
const editeng::SvxBorderLine* GetLine( sal_uInt16 nLine ) const;
- //The Pointers are being copied!
+ //The Pointers are being copied!
void SetLine( const editeng::SvxBorderLine* pNew, sal_uInt16 nLine );
sal_uInt16 GetDistance( sal_uInt16 nLine ) const;
@@ -103,8 +103,8 @@ public:
void SetDistance( sal_uInt16 nNew, sal_uInt16 nLine );
inline void SetDistance( sal_uInt16 nNew );
- // Line width plus Space plus inward distance
- //bIgnoreLine = TRUE -> Also return distance, when no Line is set
+ // Line width plus Space plus inward distance
+ // bIgnoreLine = TRUE -> Also return distance, when no Line is set
sal_uInt16 CalcLineSpace( sal_uInt16 nLine, sal_Bool bIgnoreLine = sal_False ) const;
static com::sun::star::table::BorderLine2 SvxLineToLine( const editeng::SvxBorderLine* pLine, sal_Bool bConvert );
static sal_Bool LineToSvxLine(const ::com::sun::star::table::BorderLine& rLine, editeng::SvxBorderLine& rSvxLine, sal_Bool bConvert);
@@ -197,7 +197,7 @@ public:
const editeng::SvxBorderLine* GetHori() const { return pHori; }
const editeng::SvxBorderLine* GetVert() const { return pVert; }
- //The Pointers are being copied!
+ //The Pointers are being copied!
void SetLine( const editeng::SvxBorderLine* pNew, sal_uInt16 nLine );
sal_Bool IsTable() const { return mbEnableHor && mbEnableVer; }
diff --git a/sax/test/sax/testsax.cxx b/sax/test/sax/testsax.cxx
index 42d7529e5133..1100119e7bb6 100644
--- a/sax/test/sax/testsax.cxx
+++ b/sax/test/sax/testsax.cxx
@@ -66,10 +66,10 @@ public:
sal_Int32 hTestHandle)
throw ( IllegalArgumentException,RuntimeException);
- virtual sal_Bool SAL_CALL testPassed(void) throw ( RuntimeException);
- virtual Sequence< OUString > SAL_CALL getErrors(void) throw (RuntimeException);
- virtual Sequence< Any > SAL_CALL getErrorExceptions(void) throw (RuntimeException);
- virtual Sequence< OUString > SAL_CALL getWarnings(void) throw (RuntimeException);
+ virtual sal_Bool SAL_CALL testPassed(void) throw (RuntimeException);
+ virtual Sequence< OUString > SAL_CALL getErrors(void) throw (RuntimeException);
+ virtual Sequence< Any > SAL_CALL getErrorExceptions(void) throw (RuntimeException);
+ virtual Sequence< OUString > SAL_CALL getWarnings(void) throw (RuntimeException);
private:
void testSimple( const Reference < XParser > &r );
@@ -78,9 +78,9 @@ private:
void testEncoding( const Reference < XParser > &rParser );
void testPerformance( const Reference < XParser > &rParser );
- Sequence<Any> m_seqExceptions;
- Sequence<OUString> m_seqErrors;
- Sequence<OUString> m_seqWarnings;
+ Sequence<Any> m_seqExceptions;
+ Sequence<OUString> m_seqErrors;
+ Sequence<OUString> m_seqWarnings;
Reference < XMultiServiceFactory > m_rFactory;
};
@@ -178,22 +178,22 @@ sal_Int32 OSaxParserTest::test(
return hTestHandle;
}
-sal_Bool OSaxParserTest::testPassed(void) throw (RuntimeException)
+sal_Bool OSaxParserTest::testPassed(void) throw (RuntimeException)
{
return m_seqErrors.getLength() == 0;
}
-Sequence< OUString > OSaxParserTest::getErrors(void) throw (RuntimeException)
+Sequence< OUString > OSaxParserTest::getErrors(void) throw (RuntimeException)
{
return m_seqErrors;
}
-Sequence< Any > OSaxParserTest::getErrorExceptions(void) throw (RuntimeException)
+Sequence< Any > OSaxParserTest::getErrorExceptions(void) throw (RuntimeException)
{
return m_seqExceptions;
}
-Sequence< OUString > OSaxParserTest::getWarnings(void) throw (RuntimeException)
+Sequence< OUString > OSaxParserTest::getWarnings(void) throw (RuntimeException)
{
return m_seqWarnings;
}
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index 63fdebcdd925..301dfa8b2642 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -305,7 +305,7 @@ public:
/* for Piece Table (.i.e. FastSave Table) */
class WW8PLCFpcd
{
-friend class WW8PLCFpcd_Iter;
+ friend class WW8PLCFpcd_Iter;
sal_Int32* pPLCF_PosArray; // Pointer auf Pos-Array und auf ganze Struktur
sal_uInt8* pPLCF_Contents; // Pointer auf Inhalts-Array-Teil des Pos-Array
@@ -947,15 +947,15 @@ private:
WW8PLCFspecial* pHdFtTxbxBkd; // Break-Deskriptoren fuer diese
WW8PLCFspecial* pMagicTables; // Break-Deskriptoren fuer diese
WW8PLCFspecial* pSubdocs; // subdoc references in master document
- sal_uInt8* pExtendedAtrds; // Extended ATRDs
+ sal_uInt8* pExtendedAtrds; // Extended ATRDs
WW8PLCFx_Book* pBook; // Bookmarks
WW8PLCFpcd* pPiecePLCF; // fuer FastSave ( Basis-PLCF ohne Iterator )
WW8PLCFpcd_Iter* pPieceIter; // fuer FastSave ( Iterator dazu )
WW8PLCFx_PCD* pPLCFx_PCD; // dito
WW8PLCFx_PCDAttrs* pPLCFx_PCDAttrs;
- sal_uInt8** pPieceGrpprls; // Attribute an Piece-Table
- sal_uInt16 nPieceGrpprls; // Anzahl davon
+ sal_uInt8** pPieceGrpprls; // Attribute an Piece-Table
+ sal_uInt16 nPieceGrpprls; // Anzahl davon
WW8PLCFpcd* OpenPieceTable( SvStream* pStr, const WW8Fib* pWwF );
void DeletePieceTable();
@@ -1078,7 +1078,7 @@ public:
// 0x6A62 is the creator ID for Word and is reserved.
// Other creators should choose a different value.
sal_uInt16 wMagicRevised; // identifies the File's last modifier
- sal_uInt16 wMagicCreatedPrivate; // private data
+ sal_uInt16 wMagicCreatedPrivate; // private data
sal_uInt16 wMagicRevisedPrivate; // private data
sal_Int16 lidFE; // Language id if document was written by Far East version
@@ -1702,7 +1702,7 @@ public:
sal_uInt16 fAcetateShowProps:1;
// 2. Initialisier-Dummy:
- sal_uInt8 nDataEnd;
+ sal_uInt8 nDataEnd;
bool bUseThaiLineBreakingRules;
@@ -1712,6 +1712,7 @@ public:
/* Constructs default DOP suitable for exporting */
WW8Dop();
bool Write(SvStream& rStrm, WW8Fib& rFib) const;
+
public:
sal_uInt32 GetCompatabilityOptions() const;
void SetCompatabilityOptions(sal_uInt32 a32Bit);
diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx
index c4f6d6840637..3575f3cb22a2 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -374,8 +374,9 @@ bool Customization::ImportMenu( SwCTBWrapper& rWrapper, CustomToolBarImportHelpe
helper.getCfgManager()->replaceSettings( sMenuBar, uno::Reference< container::XIndexAccess >( xIndexContainer, uno::UNO_QUERY_THROW ) );
else
helper.getCfgManager()->insertSettings( sMenuBar, uno::Reference< container::XIndexAccess >( xIndexContainer, uno::UNO_QUERY_THROW ) );
- uno::Reference< ui::XUIConfigurationPersistence > xPersistence( helper.getCfgManager(), uno::UNO_QUERY_THROW );
- xPersistence->store();
+
+ uno::Reference< ui::XUIConfigurationPersistence > xPersistence( helper.getCfgManager(), uno::UNO_QUERY_THROW );
+ xPersistence->store();
}
}
}
diff --git a/sw/source/filter/ww8/ww8toolbar.hxx b/sw/source/filter/ww8/ww8toolbar.hxx
index 943166672aef..c9a0d2b41ecf 100644
--- a/sw/source/filter/ww8/ww8toolbar.hxx
+++ b/sw/source/filter/ww8/ww8toolbar.hxx
@@ -23,6 +23,7 @@ public:
};
class SwCTBWrapper;
+
class SwTBC : public TBBase
{
TBCHeader tbch;
@@ -91,7 +92,7 @@ public:
class Tcg255SubStruct : public TBBase
{
-friend class Tcg255;
+ friend class Tcg255;
bool mbReadId;
Tcg255SubStruct(const Tcg255SubStruct&);
@@ -111,7 +112,7 @@ class SwCTBWrapper;
class Customization : public TBBase
{
-friend class SwCTBWrapper;
+ friend class SwCTBWrapper;
sal_Int32 tbidForTBD;
sal_uInt16 reserved1;
@@ -263,13 +264,13 @@ public:
class TcgSttbfCore : public TBBase
{
-struct SBBItem
-{
- sal_uInt16 cchData;
- OUString data;
- sal_uInt16 extraData;
- SBBItem() : cchData(0), extraData(0){}
-};
+ struct SBBItem
+ {
+ sal_uInt16 cchData;
+ OUString data;
+ sal_uInt16 extraData;
+ SBBItem() : cchData(0), extraData(0){}
+ };
sal_uInt16 fExtend;
sal_uInt16 cData;
diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index b3ba8b3ace8d..81dcaafbe9a4 100644
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -449,7 +449,7 @@ protected:
bool bUseDisplay );
public:
-TYPEINFO();
+ TYPEINFO();
/// process attribute values
virtual void ProcessAttribute( sal_uInt16 nAttrToken,