summaryrefslogtreecommitdiffstats
path: root/include/oox/dump
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2016-02-09 18:16:42 +1100
committerChris Sherlock <chris.sherlock79@gmail.com>2016-02-09 08:18:05 +0000
commita238b1f8d304bf1e2ffb357937f3ec888ee8ac89 (patch)
tree083c0582d4bf80e313ed256ca476ba8f69c7f7a6 /include/oox/dump
parentFormatting changes across all modules (diff)
downloadcore-a238b1f8d304bf1e2ffb357937f3ec888ee8ac89.tar.gz
core-a238b1f8d304bf1e2ffb357937f3ec888ee8ac89.zip
Remove excess newlines
A ridiculously fast way of doing this is: for i in $(pcregrep -l -M -r --include='.*[hc]xx$' \ --exclude-dir=workdir --exclude-dir=instdir '^ {3,}' .) do perl -0777 -i -pe 's/^ {3,}/ /gm' $i done Change-Id: Iebb93eccbee9e4fc5c4380474ba595858a27ac2c Reviewed-on: https://gerrit.libreoffice.org/22224 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'include/oox/dump')
-rw-r--r--include/oox/dump/dffdumper.hxx2
-rw-r--r--include/oox/dump/dumperbase.hxx67
-rw-r--r--include/oox/dump/oledumper.hxx58
-rw-r--r--include/oox/dump/pptxdumper.hxx3
-rw-r--r--include/oox/dump/xlsbdumper.hxx4
5 files changed, 0 insertions, 134 deletions
diff --git a/include/oox/dump/dffdumper.hxx b/include/oox/dump/dffdumper.hxx
index 46dd050f62a1..2cde09d3e2c0 100644
--- a/include/oox/dump/dffdumper.hxx
+++ b/include/oox/dump/dffdumper.hxx
@@ -28,7 +28,6 @@ namespace oox {
namespace dump {
-
class DffStreamObject : public SequenceRecordObjectBase
{
public:
@@ -59,7 +58,6 @@ private:
};
-
} // namespace dump
} // namespace oox
diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx
index 0f274356b834..4561720c31ee 100644
--- a/include/oox/dump/dumperbase.hxx
+++ b/include/oox/dump/dumperbase.hxx
@@ -62,7 +62,6 @@ namespace oox {
namespace dump {
-
#define OOX_DUMP_UNUSED "unused"
#define OOX_DUMP_UNKNOWN "?unknown"
@@ -97,8 +96,6 @@ typedef ::std::vector< OUString > OUStringVector;
typedef ::std::vector< sal_Int64 > Int64Vector;
-
-
/** Static helper functions for system file and stream access. */
class InputOutputHelper
{
@@ -137,7 +134,6 @@ public:
};
-
class BinaryInputStreamRef : public ::oox::BinaryInputStreamRef
{
public:
@@ -155,8 +151,6 @@ public:
};
-
-
/** Specifiers for atomic data types. */
enum DataType
{
@@ -174,7 +168,6 @@ enum DataType
};
-
/** Specifiers for the output format of values. */
enum FormatType
{
@@ -188,7 +181,6 @@ enum FormatType
};
-
/** Describes the output format of a data item.
Data items are written in the following format:
@@ -249,10 +241,6 @@ struct ItemFormat
};
-
-
-
-
/** Static helper functions for formatted output to strings. */
class StringHelper
{
@@ -364,7 +352,6 @@ public:
};
-
template< typename Type >
void StringHelper::appendFix( OUStringBuffer& rStr, Type nData, sal_Int32 nWidth )
{
@@ -387,7 +374,6 @@ void StringHelper::appendValue( OUStringBuffer& rStr, Type nData, FormatType eFm
}
-
class String : public OUString
{
public:
@@ -403,8 +389,6 @@ public:
static const String EMPTY_STRING;
-
-
class Base;
/** Base class for all dumper classes.
@@ -471,8 +455,6 @@ protected:
};
-
-
class ConfigItemBase
{
public:
@@ -510,7 +492,6 @@ private:
};
-
class SharedConfigData;
class Config;
@@ -600,7 +581,6 @@ private:
};
-
class ConstList : public NameListBase
{
public:
@@ -632,7 +612,6 @@ private:
};
-
class MultiList : public ConstList
{
public:
@@ -653,7 +632,6 @@ private:
};
-
class FlagsList : public NameListBase
{
public:
@@ -684,7 +662,6 @@ private:
};
-
class CombiList : public FlagsList
{
public:
@@ -717,7 +694,6 @@ private:
};
-
class UnitConverter : public NameListBase
{
public:
@@ -742,7 +718,6 @@ private:
};
-
class NameListWrapper
{
public:
@@ -762,7 +737,6 @@ private:
static const NameListWrapper NO_LIST;
-
class ItemFormatMap
{
private:
@@ -782,8 +756,6 @@ public:
};
-
-
class SharedConfigData : public Base, public ConfigItemBase
{
public:
@@ -841,7 +813,6 @@ private:
};
-
template< typename ListType >
std::shared_ptr< ListType > SharedConfigData::createNameList( const OUString& rListName )
{
@@ -863,7 +834,6 @@ void SharedConfigData::readNameList( TextInputStream& rStrm, const OUString& rLi
}
-
class Config : public Base
{
public:
@@ -929,7 +899,6 @@ private:
typedef std::shared_ptr< Config > ConfigRef;
-
template< typename Type >
Type Config::getIntOption( const String& rKey, Type nDefault ) const
{
@@ -960,8 +929,6 @@ bool Config::hasName( const NameListWrapper& rListWrp, Type nKey ) const
}
-
-
class Output : public Base
{
public:
@@ -970,7 +937,6 @@ public:
const OUString& rFileName );
-
void newLine();
void emptyLine( size_t nCount = 1 );
@@ -1047,7 +1013,6 @@ private:
typedef std::shared_ptr< Output > OutputRef;
-
class IndentGuard
{
public:
@@ -1061,7 +1026,6 @@ private:
};
-
class TableGuard
{
public:
@@ -1084,7 +1048,6 @@ private:
};
-
class ItemGuard
{
public:
@@ -1100,7 +1063,6 @@ private:
};
-
class MultiItemsGuard
{
public:
@@ -1114,7 +1076,6 @@ private:
};
-
class StorageIterator : public Base
{
public:
@@ -1137,8 +1098,6 @@ private:
};
-
-
class ObjectBase : public Base
{
public:
@@ -1160,7 +1119,6 @@ protected:
virtual void implDump();
-
Config& cfg() const { return *mxConfig; }
private:
@@ -1170,8 +1128,6 @@ private:
typedef std::shared_ptr< ObjectBase > ObjectRef;
-
-
class StorageObjectBase : public ObjectBase
{
protected:
@@ -1242,9 +1198,6 @@ private:
};
-
-
-
class OutputObjectBase : public ObjectBase
{
public:
@@ -1261,7 +1214,6 @@ protected:
virtual bool implIsValid() const override;
-
void writeEmptyItem( const String& rName );
void writeInfoItem( const String& rName, const String& rData );
void writeCharItem( const String& rName, sal_Unicode cData );
@@ -1304,8 +1256,6 @@ protected:
};
-
-
template< typename Type >
void OutputObjectBase::addNameToItem( Type nData, const NameListWrapper& rListWrp )
{
@@ -1412,8 +1362,6 @@ void OutputObjectBase::writeHexPairItem( const String& rName, Type nData1, Type
}
-
-
class InputObjectBase : public OutputObjectBase
{
public:
@@ -1492,8 +1440,6 @@ protected:
};
-
-
template< typename Type >
Type InputObjectBase::dumpName( const String& rName, const NameListWrapper& rListWrp )
{
@@ -1609,8 +1555,6 @@ void InputObjectBase::dumpHexPair( const String& rName, sal_Unicode cSep )
}
-
-
class BinaryStreamObject : public InputObjectBase
{
public:
@@ -1626,8 +1570,6 @@ protected:
};
-
-
class TextStreamObjectBase : public InputObjectBase
{
protected:
@@ -1657,7 +1599,6 @@ protected:
};
-
class TextLineStreamObject : public TextStreamObjectBase
{
public:
@@ -1678,7 +1619,6 @@ protected:
};
-
class XmlStreamObject : public TextStreamObjectBase
{
public:
@@ -1692,8 +1632,6 @@ protected:
};
-
-
class RecordObjectBase : public InputObjectBase
{
protected:
@@ -1739,7 +1677,6 @@ private:
};
-
class SequenceRecordObjectBase : public RecordObjectBase
{
protected:
@@ -1762,8 +1699,6 @@ private:
};
-
-
/** Base class for a file dumper. Derived classes implement the implDump()
function to add functionality.
*/
@@ -1783,8 +1718,6 @@ protected:
};
-
-
} // namespace dump
} // namespace oox
diff --git a/include/oox/dump/oledumper.hxx b/include/oox/dump/oledumper.hxx
index ea9604dcc218..0edae384cb4d 100644
--- a/include/oox/dump/oledumper.hxx
+++ b/include/oox/dump/oledumper.hxx
@@ -33,8 +33,6 @@ namespace oox {
namespace dump {
-
-
class OleInputObjectBase : public InputObjectBase
{
protected:
@@ -52,8 +50,6 @@ protected:
};
-
-
class StdFontObject : public OleInputObjectBase
{
public:
@@ -64,7 +60,6 @@ protected:
};
-
class StdPicObject : public OleInputObjectBase
{
public:
@@ -75,8 +70,6 @@ protected:
};
-
-
class OleStreamObject : public OleInputObjectBase
{
public:
@@ -84,7 +77,6 @@ public:
};
-
class OleCompObjObject : public OleStreamObject
{
public:
@@ -95,8 +87,6 @@ protected:
};
-
-
class OlePropertyStreamObject : public InputObjectBase
{
public:
@@ -136,7 +126,6 @@ private:
};
-
class OleStorageObject : public StorageObjectBase
{
public:
@@ -156,8 +145,6 @@ protected:
};
-
-
class ComCtlObjectBase : public OleInputObjectBase
{
protected:
@@ -187,7 +174,6 @@ protected:
};
-
class ComCtlScrollBarObject : public ComCtlObjectBase
{
public:
@@ -198,7 +184,6 @@ protected:
};
-
class ComCtlProgressBarObject : public ComCtlObjectBase
{
public:
@@ -209,7 +194,6 @@ protected:
};
-
class ComCtlSliderObject : public ComCtlObjectBase
{
public:
@@ -220,7 +204,6 @@ protected:
};
-
class ComCtlUpDownObject : public ComCtlObjectBase
{
public:
@@ -231,7 +214,6 @@ protected:
};
-
class ComCtlImageListObject : public ComCtlObjectBase
{
public:
@@ -244,7 +226,6 @@ protected:
};
-
class ComCtlTabStripObject : public ComCtlObjectBase
{
public:
@@ -256,7 +237,6 @@ protected:
};
-
class ComCtlTreeViewObject : public ComCtlObjectBase
{
public:
@@ -271,7 +251,6 @@ private:
};
-
class ComCtlStatusBarObject : public ComCtlObjectBase
{
public:
@@ -284,8 +263,6 @@ protected:
};
-
-
class AxPropertyObjectBase : public OleInputObjectBase
{
protected:
@@ -395,7 +372,6 @@ private:
};
-
template< typename Type >
void AxPropertyObjectBase::alignInput()
{
@@ -425,7 +401,6 @@ Type AxPropertyObjectBase::dumpHexProperty( Type nDefault, const NameListWrapper
}
-
class AxCFontNewObject : public AxPropertyObjectBase
{
public:
@@ -436,7 +411,6 @@ protected:
};
-
class AxColumnInfoObject : public AxPropertyObjectBase
{
public:
@@ -447,7 +421,6 @@ protected:
};
-
class AxCommandButtonObject : public AxPropertyObjectBase
{
public:
@@ -459,7 +432,6 @@ protected:
};
-
class AxMorphControlObject : public AxPropertyObjectBase
{
public:
@@ -478,7 +450,6 @@ private:
};
-
class AxLabelObject : public AxPropertyObjectBase
{
public:
@@ -490,7 +461,6 @@ protected:
};
-
class AxImageObject : public AxPropertyObjectBase
{
public:
@@ -501,7 +471,6 @@ protected:
};
-
class AxScrollBarObject : public AxPropertyObjectBase
{
public:
@@ -512,7 +481,6 @@ protected:
};
-
class AxSpinButtonObject : public AxPropertyObjectBase
{
public:
@@ -523,7 +491,6 @@ protected:
};
-
class AxTabStripObject : public AxPropertyObjectBase
{
public:
@@ -538,8 +505,6 @@ private:
};
-
-
class FormControlStreamObject : public OleInputObjectBase
{
public:
@@ -565,8 +530,6 @@ private:
};
-
-
struct VbaFormSiteInfo
{
OUString maProgId;
@@ -580,7 +543,6 @@ struct VbaFormSiteInfo
typedef ::std::vector< VbaFormSiteInfo > VbaFormSiteInfoVector;
-
struct VbaFormSharedData
{
OUStringVector maClassInfoProgIds;
@@ -588,7 +550,6 @@ struct VbaFormSharedData
};
-
class VbaFormClassInfoObject : public AxPropertyObjectBase
{
public:
@@ -602,7 +563,6 @@ private:
};
-
class VbaFormSiteObject : public AxPropertyObjectBase
{
public:
@@ -616,7 +576,6 @@ private:
};
-
class VbaFormDesignExtObject : public AxPropertyObjectBase
{
public:
@@ -627,7 +586,6 @@ protected:
};
-
class VbaFStreamObject : public AxPropertyObjectBase
{
public:
@@ -653,7 +611,6 @@ private:
};
-
class VbaOStreamObject : public OleInputObjectBase
{
public:
@@ -671,7 +628,6 @@ private:
};
-
class VbaPageObject : public AxPropertyObjectBase
{
public:
@@ -682,7 +638,6 @@ protected:
};
-
class VbaMultiPageObject : public AxPropertyObjectBase
{
public:
@@ -697,7 +652,6 @@ private:
};
-
class VbaXStreamObject : public InputObjectBase
{
public:
@@ -715,7 +669,6 @@ private:
};
-
class VbaContainerStorageObject : public OleStorageObject
{
public:
@@ -744,8 +697,6 @@ private:
};
-
-
struct VbaSharedData
{
typedef ::std::map< OUString, sal_Int32 > StreamOffsetMap;
@@ -760,7 +711,6 @@ struct VbaSharedData
};
-
class VbaDirStreamObject : public SequenceRecordObjectBase
{
public:
@@ -789,7 +739,6 @@ private:
};
-
class VbaModuleStreamObject : public InputObjectBase
{
public:
@@ -809,7 +758,6 @@ private:
};
-
class VbaStorageObject : public OleStorageObject
{
public:
@@ -831,7 +779,6 @@ private:
};
-
class VbaFormStorageObject : public VbaContainerStorageObject
{
public:
@@ -853,7 +800,6 @@ private:
};
-
class VbaProjectStorageObject : public OleStorageObject
{
public:
@@ -876,8 +822,6 @@ private:
};
-
-
class ActiveXStorageObject : public VbaContainerStorageObject
{
public:
@@ -893,8 +837,6 @@ protected:
};
-
-
} // namespace dump
} // namespace oox
diff --git a/include/oox/dump/pptxdumper.hxx b/include/oox/dump/pptxdumper.hxx
index 5390df05c0e7..9b0a14857b32 100644
--- a/include/oox/dump/pptxdumper.hxx
+++ b/include/oox/dump/pptxdumper.hxx
@@ -29,7 +29,6 @@ namespace dump {
namespace pptx {
-
class RootStorageObject : public StorageObjectBase
{
public:
@@ -44,7 +43,6 @@ protected:
};
-
class Dumper : public DumperBase
{
public:
@@ -60,7 +58,6 @@ protected:
};
-
} // namespace pptx
} // namespace dump
} // namespace oox
diff --git a/include/oox/dump/xlsbdumper.hxx b/include/oox/dump/xlsbdumper.hxx
index a4651a1cabf5..1d8c28281249 100644
--- a/include/oox/dump/xlsbdumper.hxx
+++ b/include/oox/dump/xlsbdumper.hxx
@@ -36,7 +36,6 @@ namespace dump {
namespace xlsb {
-
class RecordObjectBase : public SequenceRecordObjectBase
{
protected:
@@ -55,7 +54,6 @@ private:
};
-
class RootStorageObject : public StorageObjectBase
{
public:
@@ -70,7 +68,6 @@ protected:
};
-
class Dumper : public DumperBase
{
public:
@@ -86,7 +83,6 @@ protected:
};
-
} // namespace xlsb
} // namespace dump
} // namespace oox