summaryrefslogtreecommitdiff
path: root/oox/source/helper
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2014-06-25 05:22:57 +0200
committerMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2014-06-25 05:41:11 +0200
commitca362d6348e4d0a29317492b3c8ef9637a656f4f (patch)
tree80e13761f3d287077dfb0620638fd0397087c9e4 /oox/source/helper
parent37e6631cc5d4147e9d0a4ebefbd0c9d2a8137d24 (diff)
remove whitespaces
Change-Id: Ie14ba3dcb97f20479a04538748ef2c1c9e6c5dac
Diffstat (limited to 'oox/source/helper')
-rw-r--r--oox/source/helper/attributelist.cxx10
-rw-r--r--oox/source/helper/binaryinputstream.cxx12
-rw-r--r--oox/source/helper/binaryoutputstream.cxx8
-rw-r--r--oox/source/helper/binarystreambase.cxx10
-rw-r--r--oox/source/helper/containerhelper.cxx10
-rw-r--r--oox/source/helper/grabbagstack.cxx1
-rw-r--r--oox/source/helper/graphichelper.cxx10
-rw-r--r--oox/source/helper/modelobjecthelper.cxx8
-rw-r--r--oox/source/helper/progressbar.cxx17
-rw-r--r--oox/source/helper/propertyset.cxx4
-rw-r--r--oox/source/helper/storagebase.cxx10
-rw-r--r--oox/source/helper/textinputstream.cxx10
-rw-r--r--oox/source/helper/zipstorage.cxx6
13 files changed, 0 insertions, 116 deletions
diff --git a/oox/source/helper/attributelist.cxx b/oox/source/helper/attributelist.cxx
index 0fa5abdb0d10..3360c203c830 100644
--- a/oox/source/helper/attributelist.cxx
+++ b/oox/source/helper/attributelist.cxx
@@ -27,14 +27,10 @@
namespace oox {
-
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
-
-
namespace {
const sal_Int32 XSTRING_ENCCHAR_LEN = 7;
@@ -67,8 +63,6 @@ sal_Unicode lclGetXChar( const sal_Unicode*& rpcStr, const sal_Unicode* pcEnd )
} // namespace
-
-
sal_Int32 AttributeConversion::decodeToken( const OUString& rValue )
{
return StaticTokenMap::get().getTokenFromUnicode( rValue );
@@ -111,8 +105,6 @@ sal_Int32 AttributeConversion::decodeIntegerHex( const OUString& rValue )
// cast, but that will have a ripple effect
}
-
-
AttributeList::AttributeList( const Reference< XFastAttributeList >& rxAttribs ) :
mxAttribs( rxAttribs ),
mpAttribList( NULL )
@@ -314,8 +306,6 @@ util::DateTime AttributeList::getDateTime( sal_Int32 nAttrToken, const util::Dat
return getDateTime( nAttrToken ).get( rDefault );
}
-
-
} // namespace oox
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/helper/binaryinputstream.cxx b/oox/source/helper/binaryinputstream.cxx
index 552e321ec52d..6c97222bdbe8 100644
--- a/oox/source/helper/binaryinputstream.cxx
+++ b/oox/source/helper/binaryinputstream.cxx
@@ -29,8 +29,6 @@
namespace oox {
-
-
using namespace ::com::sun::star::io;
using namespace ::com::sun::star::uno;
@@ -40,8 +38,6 @@ const sal_Int32 INPUTSTREAM_BUFFERSIZE = 0x8000;
} // namespace
-
-
OUString BinaryInputStream::readNulUnicodeArray()
{
OUStringBuffer aBuffer;
@@ -121,8 +117,6 @@ void BinaryInputStream::copyToStream( BinaryOutputStream& rOutStrm, sal_Int64 nB
}
}
-
-
BinaryXInputStream::BinaryXInputStream( const Reference< XInputStream >& rxInStrm, bool bAutoClose ) :
BinaryStreamBase( Reference< XSeekable >( rxInStrm, UNO_QUERY ).is() ),
BinaryXSeekableStream( Reference< XSeekable >( rxInStrm, UNO_QUERY ) ),
@@ -202,8 +196,6 @@ void BinaryXInputStream::skip( sal_Int32 nBytes, size_t /*nAtomSize*/ )
}
}
-
-
SequenceInputStream::SequenceInputStream( const StreamDataSequence& rData ) :
BinaryStreamBase( true ),
SequenceSeekableStream( rData )
@@ -249,8 +241,6 @@ void SequenceInputStream::skip( sal_Int32 nBytes, size_t /*nAtomSize*/ )
}
}
-
-
RelativeInputStream::RelativeInputStream( BinaryInputStream& rInStrm, sal_Int64 nSize ) :
BinaryStreamBase( rInStrm.isSeekable() ),
mpInStrm( &rInStrm ),
@@ -325,8 +315,6 @@ void RelativeInputStream::skip( sal_Int32 nBytes, size_t nAtomSize )
}
}
-
-
} // namespace oox
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/helper/binaryoutputstream.cxx b/oox/source/helper/binaryoutputstream.cxx
index 30c55e47eb3d..fcd21e07ddfb 100644
--- a/oox/source/helper/binaryoutputstream.cxx
+++ b/oox/source/helper/binaryoutputstream.cxx
@@ -26,8 +26,6 @@
namespace oox {
-
-
using namespace ::com::sun::star::io;
using namespace ::com::sun::star::uno;
@@ -37,8 +35,6 @@ const sal_Int32 OUTPUTSTREAM_BUFFERSIZE = 0x8000;
} // namespace
-
-
BinaryXOutputStream::BinaryXOutputStream( const Reference< XOutputStream >& rxOutStrm, bool bAutoClose ) :
BinaryStreamBase( Reference< XSeekable >( rxOutStrm, UNO_QUERY ).is() ),
BinaryXSeekableStream( Reference< XSeekable >( rxOutStrm, UNO_QUERY ) ),
@@ -137,8 +133,6 @@ BinaryOutputStream::writeCompressedUnicodeArray( const OUString& rString, bool b
writeUnicodeArray( rString, bAllowNulChars );
}
-
-
SequenceOutputStream::SequenceOutputStream( StreamDataSequence& rData ) :
BinaryStreamBase( true ),
SequenceSeekableStream( rData )
@@ -162,8 +156,6 @@ void SequenceOutputStream::writeMemory( const void* pMem, sal_Int32 nBytes, size
}
}
-
-
} // namespace oox
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/helper/binarystreambase.cxx b/oox/source/helper/binarystreambase.cxx
index 9e86080f0565..6b314fc5c18b 100644
--- a/oox/source/helper/binarystreambase.cxx
+++ b/oox/source/helper/binarystreambase.cxx
@@ -24,13 +24,9 @@
namespace oox {
-
-
using namespace ::com::sun::star::io;
using namespace ::com::sun::star::uno;
-
-
BinaryStreamBase::~BinaryStreamBase()
{
}
@@ -57,8 +53,6 @@ void BinaryStreamBase::alignToBlock( sal_Int32 nBlockSize, sal_Int64 nAnchorPos
}
}
-
-
BinaryXSeekableStream::BinaryXSeekableStream( const Reference< XSeekable >& rxSeekable ) :
BinaryStreamBase( mxSeekable.is() ),
mxSeekable( rxSeekable )
@@ -114,8 +108,6 @@ void BinaryXSeekableStream::close()
mbEof = true;
}
-
-
SequenceSeekableStream::SequenceSeekableStream( const StreamDataSequence& rData ) :
BinaryStreamBase( true ),
mpData( &rData ),
@@ -148,8 +140,6 @@ void SequenceSeekableStream::close()
mbEof = true;
}
-
-
} // namespace oox
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/helper/containerhelper.cxx b/oox/source/helper/containerhelper.cxx
index bb7a13b92d0c..805a9c52e94d 100644
--- a/oox/source/helper/containerhelper.cxx
+++ b/oox/source/helper/containerhelper.cxx
@@ -28,14 +28,10 @@
namespace oox {
-
-
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
-
-
namespace {
struct ValueRangeComp
@@ -48,8 +44,6 @@ struct ValueRangeComp
} // namespace
-
-
void ValueRangeSet::insert( const ValueRange& rRange )
{
// find the first range that contains or follows the starting point of the passed range
@@ -80,8 +74,6 @@ void ValueRangeSet::insert( const ValueRange& rRange )
}
}
-
-
OUString ContainerHelper::getUnusedName(
const Reference< XNameAccess >& rxNameAccess, const OUString& rSuggestedName,
sal_Unicode cSeparator, sal_Int32 nFirstIndexToAppend )
@@ -147,8 +139,6 @@ OUString ContainerHelper::insertByUnusedName(
return aNewName;
}
-
-
} // namespace oox
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/helper/grabbagstack.cxx b/oox/source/helper/grabbagstack.cxx
index 8a7e3ad8d1c8..1505bb286864 100644
--- a/oox/source/helper/grabbagstack.cxx
+++ b/oox/source/helper/grabbagstack.cxx
@@ -25,7 +25,6 @@ GrabBagStack::GrabBagStack(const OUString& aName)
GrabBagStack::~GrabBagStack()
{}
-
bool GrabBagStack::isStackEmpty()
{
return mStack.empty();
diff --git a/oox/source/helper/graphichelper.cxx b/oox/source/helper/graphichelper.cxx
index 9e8c00f4f37e..11dc2da83ca0 100644
--- a/oox/source/helper/graphichelper.cxx
+++ b/oox/source/helper/graphichelper.cxx
@@ -40,9 +40,6 @@
namespace oox {
-
-
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::frame;
@@ -51,8 +48,6 @@ using namespace ::com::sun::star::io;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
-
-
namespace {
inline sal_Int32 lclConvertScreenPixelToHmm( double fPixel, double fPixelPerHmm )
@@ -62,8 +57,6 @@ inline sal_Int32 lclConvertScreenPixelToHmm( double fPixel, double fPixelPerHmm
} // namespace
-
-
GraphicHelper::GraphicHelper( const Reference< XComponentContext >& rxContext, const Reference< XFrame >& rxTargetFrame, const StorageRef& rxStorage ) :
mxContext( rxContext ),
mxStorage( rxStorage ),
@@ -160,7 +153,6 @@ sal_Int32 GraphicHelper::getPaletteColor( sal_Int32 /*nPaletteIdx*/ ) const
// Device info and device dependent unit conversion ---------------------------
-
sal_Int32 GraphicHelper::convertScreenPixelXToHmm( double fPixelX ) const
{
return lclConvertScreenPixelToHmm( fPixelX, mfPixelPerHmmX );
@@ -336,8 +328,6 @@ awt::Size GraphicHelper::getOriginalSize( const Reference< XGraphic >& xGraphic
return aSizeHmm;
}
-
-
} // namespace oox
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/helper/modelobjecthelper.cxx b/oox/source/helper/modelobjecthelper.cxx
index 1ec45af58d55..4b6ef286ae36 100644
--- a/oox/source/helper/modelobjecthelper.cxx
+++ b/oox/source/helper/modelobjecthelper.cxx
@@ -29,15 +29,11 @@
namespace oox {
-
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::drawing;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
-
-
ObjectContainer::ObjectContainer( const Reference< XMultiServiceFactory >& rxModelFactory, const OUString& rServiceName ) :
mxModelFactory( rxModelFactory ),
maServiceName( rServiceName ),
@@ -89,8 +85,6 @@ void ObjectContainer::createContainer() const
OSL_ENSURE( mxContainer.is(), "ObjectContainer::createContainer - container not found" );
}
-
-
ModelObjectHelper::ModelObjectHelper( const Reference< XMultiServiceFactory >& rxModelFactory ) :
maMarkerContainer( rxModelFactory, "com.sun.star.drawing.MarkerTable" ),
maDashContainer( rxModelFactory, "com.sun.star.drawing.DashTable" ),
@@ -147,8 +141,6 @@ OUString ModelObjectHelper::getFillBitmapUrl( const OUString &rGraphicName )
return OUString();
}
-
-
} // namespace oox
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/helper/progressbar.cxx b/oox/source/helper/progressbar.cxx
index ab616772d7c9..307a78bf553b 100644
--- a/oox/source/helper/progressbar.cxx
+++ b/oox/source/helper/progressbar.cxx
@@ -24,8 +24,6 @@
namespace oox {
-
-
using namespace ::com::sun::star::task;
using namespace ::com::sun::star::uno;
@@ -35,21 +33,14 @@ const sal_Int32 PROGRESS_RANGE = 1000000;
} // namespace
-
-
IProgressBar::~IProgressBar()
{
}
-
-
ISegmentProgressBar::~ISegmentProgressBar()
{
}
-
-
-
ProgressBar::ProgressBar( const Reference< XStatusIndicator >& rxIndicator, const OUString& rText ) :
mxIndicator( rxIndicator ),
mfPosition( 0 )
@@ -77,8 +68,6 @@ void ProgressBar::setPosition( double fPosition )
mxIndicator->setValue( static_cast< sal_Int32 >( mfPosition * PROGRESS_RANGE ) );
}
-
-
namespace prv {
class SubSegment : public ISegmentProgressBar
@@ -100,8 +89,6 @@ private:
double mfFreeStart;
};
-
-
SubSegment::SubSegment( IProgressBar& rParentProgress, double fStartPos, double fLength ) :
mrParentProgress( rParentProgress ),
mfStartPos( fStartPos ),
@@ -139,8 +126,6 @@ ISegmentProgressBarRef SubSegment::createSegment( double fLength )
} // namespace prv
-
-
SegmentProgressBar::SegmentProgressBar( const Reference< XStatusIndicator >& rxIndicator, const OUString& rText ) :
maProgress( rxIndicator, rText ),
mfFreeStart( 0.0 )
@@ -171,8 +156,6 @@ ISegmentProgressBarRef SegmentProgressBar::createSegment( double fLength )
return xSegment;
}
-
-
} // namespace oox
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/helper/propertyset.cxx b/oox/source/helper/propertyset.cxx
index 70a733fc168b..ff092e029b05 100644
--- a/oox/source/helper/propertyset.cxx
+++ b/oox/source/helper/propertyset.cxx
@@ -25,13 +25,9 @@
namespace oox {
-
-
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::uno;
-
-
void PropertySet::set( const Reference< XPropertySet >& rxPropSet )
{
mxPropSet = rxPropSet;
diff --git a/oox/source/helper/storagebase.cxx b/oox/source/helper/storagebase.cxx
index 740db3270d55..1083d02a27fb 100644
--- a/oox/source/helper/storagebase.cxx
+++ b/oox/source/helper/storagebase.cxx
@@ -27,14 +27,10 @@
namespace oox {
-
-
using namespace ::com::sun::star::embed;
using namespace ::com::sun::star::io;
using namespace ::com::sun::star::uno;
-
-
namespace {
void lclSplitFirstElement( OUString& orElement, OUString& orRemainder, const OUString& _aFullName )
@@ -62,8 +58,6 @@ void lclSplitFirstElement( OUString& orElement, OUString& orRemainder, const OUS
} // namespace
-
-
StorageBase::StorageBase( const Reference< XInputStream >& rxInStream, bool bBaseStreamAccess ) :
mxInStream( rxInStream ),
mbBaseStreamAccess( bBaseStreamAccess ),
@@ -102,13 +96,11 @@ bool StorageBase::isRootStorage() const
return implIsStorage() && maStorageName.isEmpty();
}
-
Reference< XStorage > StorageBase::getXStorage() const
{
return implGetXStorage();
}
-
OUString StorageBase::getPath() const
{
OUStringBuffer aBuffer( maParentPath );
@@ -258,8 +250,6 @@ StorageRef StorageBase::getSubStorage( const OUString& rElementName, bool bCreat
return rxSubStrg;
}
-
-
} // namespace oox
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/helper/textinputstream.cxx b/oox/source/helper/textinputstream.cxx
index 3d86c403fd82..82148c497bf0 100644
--- a/oox/source/helper/textinputstream.cxx
+++ b/oox/source/helper/textinputstream.cxx
@@ -27,14 +27,10 @@
namespace oox {
-
-
using namespace ::com::sun::star::io;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
-
-
namespace {
typedef ::cppu::WeakImplHelper1< XInputStream > UnoBinaryInputStream_BASE;
@@ -64,8 +60,6 @@ private:
BinaryInputStream* mpInStrm;
};
-
-
UnoBinaryInputStream::UnoBinaryInputStream( BinaryInputStream& rInStrm ) :
mpInStrm( &rInStrm )
{
@@ -113,8 +107,6 @@ void UnoBinaryInputStream::ensureConnected() const throw (NotConnectedException)
} // namespace
-
-
TextInputStream::TextInputStream( const Reference< XComponentContext >& rxContext, const Reference< XInputStream >& rxInStrm, rtl_TextEncoding eTextEnc )
{
init( rxContext, rxInStrm, eTextEnc );
@@ -220,8 +212,6 @@ void TextInputStream::init( const Reference< XComponentContext >& rxContext, con
mxTextStrm = createXTextInputStream( rxContext, rxInStrm, eTextEnc );
}
-
-
} // namespace oox
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/helper/zipstorage.cxx b/oox/source/helper/zipstorage.cxx
index 46fffdc9dc9b..be8068c65836 100644
--- a/oox/source/helper/zipstorage.cxx
+++ b/oox/source/helper/zipstorage.cxx
@@ -31,16 +31,12 @@
namespace oox {
-
-
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::embed;
using namespace ::com::sun::star::io;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
-
-
ZipStorage::ZipStorage( const Reference< XComponentContext >& rxContext, const Reference< XInputStream >& rxInStream ) :
StorageBase( rxInStream, false )
{
@@ -202,8 +198,6 @@ void ZipStorage::implCommit() const
}
}
-
-
} // namespace oox
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */