[Libreoffice-commits] core.git: solenv/clang-format writerfilter/inc writerfilter/qa writerfilter/source
Philipp Hofer (via logerrit)
logerrit at kemper.freedesktop.org
Thu Nov 19 18:25:28 UTC 2020
solenv/clang-format/excludelist | 25 --
writerfilter/inc/dmapper/resourcemodel.hxx | 44 +--
writerfilter/inc/ooxml/QNameToString.hxx | 4
writerfilter/qa/cppunittests/misc/misc.cxx | 15 -
writerfilter/source/dmapper/FFDataHandler.hxx | 35 +-
writerfilter/source/dmapper/FormControlHelper.hxx | 11
writerfilter/source/dmapper/GraphicHelpers.hxx | 34 +-
writerfilter/source/dmapper/LoggedResources.cxx | 74 ++----
writerfilter/source/dmapper/LoggedResources.hxx | 49 +--
writerfilter/source/dmapper/MeasureHandler.hxx | 9
writerfilter/source/dmapper/ModelEventListener.hxx | 9
writerfilter/source/dmapper/PageBordersHandler.hxx | 21 -
writerfilter/source/dmapper/PropertyMapHelper.cxx | 16 -
writerfilter/source/dmapper/PropertyMapHelper.hxx | 8
writerfilter/source/dmapper/SectionColumnHandler.cxx | 29 +-
writerfilter/source/dmapper/SettingsTable.hxx | 24 -
writerfilter/source/dmapper/TextEffectsHandler.hxx | 9
writerfilter/source/dmapper/ThemeTable.hxx | 9
writerfilter/source/dmapper/TrackChangesHandler.hxx | 8
writerfilter/source/dmapper/WrapPolygonHandler.hxx | 22 -
writerfilter/source/dmapper/util.cxx | 13 -
writerfilter/source/dmapper/util.hxx | 5
writerfilter/source/ooxml/Handler.hxx | 103 ++++----
writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx | 7
writerfilter/source/ooxml/OOXMLParserState.hxx | 27 --
writerfilter/source/ooxml/OOXMLPropertySet.hxx | 185 ++++++++-------
26 files changed, 366 insertions(+), 429 deletions(-)
New commits:
commit 7b49f8c7ebf40048181b56e9bfb11135bd473cab
Author: Philipp Hofer <philipp.hofer at protonmail.com>
AuthorDate: Thu Nov 12 13:28:09 2020 +0100
Commit: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Thu Nov 19 19:24:47 2020 +0100
tdf#123936 Formatting files in module writerfilter with clang-format
Change-Id: Ia60e7c5e2d3be0baa0496a6bd99c6ae98cd4ff96
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105730
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index ee1544646f0d..b36977f1c8b5 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -16383,10 +16383,7 @@ winaccessibility/source/service/AccTopWindowListener.cxx
winaccessibility/source/service/AccTreeEventListener.cxx
winaccessibility/source/service/AccWindowEventListener.cxx
winaccessibility/source/service/msaaservice_impl.cxx
-writerfilter/inc/dmapper/resourcemodel.hxx
writerfilter/inc/ooxml/OOXMLDocument.hxx
-writerfilter/inc/ooxml/QNameToString.hxx
-writerfilter/qa/cppunittests/misc/misc.cxx
writerfilter/source/dmapper/BorderHandler.cxx
writerfilter/source/dmapper/BorderHandler.hxx
writerfilter/source/dmapper/CellColorHandler.cxx
@@ -16404,38 +16401,26 @@ writerfilter/source/dmapper/DomainMapperTableManager.hxx
writerfilter/source/dmapper/DomainMapper_Impl.cxx
writerfilter/source/dmapper/DomainMapper_Impl.hxx
writerfilter/source/dmapper/FFDataHandler.cxx
-writerfilter/source/dmapper/FFDataHandler.hxx
writerfilter/source/dmapper/FieldTypes.hxx
writerfilter/source/dmapper/FontTable.cxx
writerfilter/source/dmapper/FontTable.hxx
writerfilter/source/dmapper/FormControlHelper.cxx
-writerfilter/source/dmapper/FormControlHelper.hxx
writerfilter/source/dmapper/GraphicHelpers.cxx
-writerfilter/source/dmapper/GraphicHelpers.hxx
writerfilter/source/dmapper/GraphicImport.cxx
writerfilter/source/dmapper/GraphicImport.hxx
-writerfilter/source/dmapper/LoggedResources.cxx
-writerfilter/source/dmapper/LoggedResources.hxx
writerfilter/source/dmapper/MeasureHandler.cxx
-writerfilter/source/dmapper/MeasureHandler.hxx
writerfilter/source/dmapper/ModelEventListener.cxx
-writerfilter/source/dmapper/ModelEventListener.hxx
writerfilter/source/dmapper/NumberingManager.cxx
writerfilter/source/dmapper/NumberingManager.hxx
writerfilter/source/dmapper/OLEHandler.cxx
writerfilter/source/dmapper/OLEHandler.hxx
writerfilter/source/dmapper/PageBordersHandler.cxx
-writerfilter/source/dmapper/PageBordersHandler.hxx
writerfilter/source/dmapper/PropertyIds.cxx
writerfilter/source/dmapper/PropertyIds.hxx
writerfilter/source/dmapper/PropertyMap.cxx
writerfilter/source/dmapper/PropertyMap.hxx
-writerfilter/source/dmapper/PropertyMapHelper.cxx
-writerfilter/source/dmapper/PropertyMapHelper.hxx
-writerfilter/source/dmapper/SectionColumnHandler.cxx
writerfilter/source/dmapper/SectionColumnHandler.hxx
writerfilter/source/dmapper/SettingsTable.cxx
-writerfilter/source/dmapper/SettingsTable.hxx
writerfilter/source/dmapper/StyleSheetTable.cxx
writerfilter/source/dmapper/StyleSheetTable.hxx
writerfilter/source/dmapper/TDefTableHandler.cxx
@@ -16449,19 +16434,11 @@ writerfilter/source/dmapper/TagLogger.hxx
writerfilter/source/dmapper/TblStylePrHandler.cxx
writerfilter/source/dmapper/TblStylePrHandler.hxx
writerfilter/source/dmapper/TextEffectsHandler.cxx
-writerfilter/source/dmapper/TextEffectsHandler.hxx
writerfilter/source/dmapper/ThemeTable.cxx
-writerfilter/source/dmapper/ThemeTable.hxx
writerfilter/source/dmapper/TrackChangesHandler.cxx
-writerfilter/source/dmapper/TrackChangesHandler.hxx
writerfilter/source/dmapper/WrapPolygonHandler.cxx
-writerfilter/source/dmapper/WrapPolygonHandler.hxx
-writerfilter/source/dmapper/util.cxx
-writerfilter/source/dmapper/util.hxx
writerfilter/source/ooxml/Handler.cxx
-writerfilter/source/ooxml/Handler.hxx
writerfilter/source/ooxml/OOXMLBinaryObjectReference.cxx
-writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
writerfilter/source/ooxml/OOXMLFactory.cxx
@@ -16472,9 +16449,7 @@ writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
writerfilter/source/ooxml/OOXMLFastHelper.hxx
writerfilter/source/ooxml/OOXMLParserState.cxx
-writerfilter/source/ooxml/OOXMLParserState.hxx
writerfilter/source/ooxml/OOXMLPropertySet.cxx
-writerfilter/source/ooxml/OOXMLPropertySet.hxx
writerfilter/source/ooxml/OOXMLStreamImpl.cxx
writerfilter/source/ooxml/OOXMLStreamImpl.hxx
xmlhelp/source/cxxhelp/inc/tvfactory.hxx
diff --git a/writerfilter/inc/dmapper/resourcemodel.hxx b/writerfilter/inc/dmapper/resourcemodel.hxx
index 284e9982fad7..5ea1512fb1ba 100644
--- a/writerfilter/inc/dmapper/resourcemodel.hxx
+++ b/writerfilter/inc/dmapper/resourcemodel.hxx
@@ -51,11 +51,10 @@
the handler.
*/
-
typedef sal_uInt32 Id;
-namespace writerfilter {
-
+namespace writerfilter
+{
/**
Reference to a resource that generates events and sends them to a
handler.
@@ -76,8 +75,7 @@ namespace writerfilter {
sending these events to a stream handler.
*/
-template <class T>
-class SAL_DLLPUBLIC_TEMPLATE Reference : public virtual SvRefBase
+template <class T> class SAL_DLLPUBLIC_TEMPLATE Reference : public virtual SvRefBase
{
public:
/**
@@ -86,7 +84,7 @@ public:
@attention The ownership of a reference is transferred when
the reference is passed.
*/
- typedef tools::SvRef< Reference<T> > Pointer_t;
+ typedef tools::SvRef<Reference<T>> Pointer_t;
/**
Resolves the reference.
@@ -96,13 +94,13 @@ public:
@param rHandler handler which receives the events
*/
- virtual void resolve(T & rHandler) = 0;
+ virtual void resolve(T& rHandler) = 0;
Reference() = default;
- Reference(Reference const &) = default;
- Reference(Reference &&) = default;
- Reference & operator =(Reference const &) = default;
- Reference & operator =(Reference &&) = default;
+ Reference(Reference const&) = default;
+ Reference(Reference&&) = default;
+ Reference& operator=(Reference const&) = default;
+ Reference& operator=(Reference&&) = default;
protected:
~Reference() override {}
@@ -123,14 +121,14 @@ public:
@param name name of the attribute
@param val value of the attribute
*/
- virtual void attribute(Id name, Value & val) = 0;
+ virtual void attribute(Id name, Value& val) = 0;
/**
Receives a SPRM.
@param sprm the SPRM received
*/
- virtual void sprm(Sprm & sprm) = 0;
+ virtual void sprm(Sprm& sprm) = 0;
protected:
~Properties() override {}
@@ -184,7 +182,6 @@ const sal_uInt8 cFieldEnd = 0x15;
class Stream : public virtual SvRefBase
{
public:
-
/**
Pointer to this stream.
*/
@@ -201,7 +198,7 @@ public:
virtual void endSectionGroup() = 0;
/// The current section is the last one in this body text.
- virtual void markLastSectionGroup( ) { };
+ virtual void markLastSectionGroup(){};
/**
Receives start mark for group with the same paragraph properties.
@@ -213,7 +210,7 @@ public:
*/
virtual void endParagraphGroup() = 0;
- virtual void markLastParagraphInSection( ) { };
+ virtual void markLastParagraphInSection(){};
/**
Receives start mark for group with the same character properties.
@@ -230,7 +227,7 @@ public:
*/
virtual void startShape(css::uno::Reference<css::drawing::XShape> const& xShape) = 0;
- virtual void endShape( ) = 0;
+ virtual void endShape() = 0;
/**
Receives 8-bit per character text.
@@ -238,7 +235,7 @@ public:
@param data buffer containing the text
@param len number of characters in the text
*/
- virtual void text(const sal_uInt8 * data, size_t len) = 0;
+ virtual void text(const sal_uInt8* data, size_t len) = 0;
/**
Receives 16-bit per character text.
@@ -246,7 +243,7 @@ public:
@param data buffer containing the text
@param len number of characters in the text.
*/
- virtual void utext(const sal_uInt8 * data, size_t len) = 0;
+ virtual void utext(const sal_uInt8* data, size_t len) = 0;
/**
* Offset in EMUs for a shape.
@@ -277,8 +274,7 @@ public:
@param name name of the table
@param ref reference to the table
*/
- virtual void table(Id name,
- writerfilter::Reference<Table>::Pointer_t ref) = 0;
+ virtual void table(Id name, writerfilter::Reference<Table>::Pointer_t ref) = 0;
/**
Receives a substream.
@@ -286,15 +282,14 @@ public:
@param name name of the substream
@param ref reference to the substream
*/
- virtual void substream(Id name,
- writerfilter::Reference<Stream>::Pointer_t ref) = 0;
+ virtual void substream(Id name, writerfilter::Reference<Stream>::Pointer_t ref) = 0;
/**
Debugging: Receives information about current point in stream.
@param info the information
*/
- virtual void info(const std::string & info) = 0;
+ virtual void info(const std::string& info) = 0;
/// Receives start mark for glossary document entry.
virtual void startGlossaryEntry() = 0;
@@ -398,7 +393,6 @@ protected:
};
typedef sal_Int32 Token_t;
-
}
#endif // INCLUDED_WRITERFILTER_INC_DMAPPER_RESOURCEMODEL_HXX
diff --git a/writerfilter/inc/ooxml/QNameToString.hxx b/writerfilter/inc/ooxml/QNameToString.hxx
index 9cdf13de143b..c7aa4d39a857 100644
--- a/writerfilter/inc/ooxml/QNameToString.hxx
+++ b/writerfilter/inc/ooxml/QNameToString.hxx
@@ -24,11 +24,9 @@
namespace writerfilter
{
-
#ifdef DBG_UTIL
- std::string QNameToString(Id);
+std::string QNameToString(Id);
#endif
-
}
#endif // INCLUDED_WRITERFILTER_INC_OOXML_QNAMETOSTRING_HXX
diff --git a/writerfilter/qa/cppunittests/misc/misc.cxx b/writerfilter/qa/cppunittests/misc/misc.cxx
index 983e6fc87129..ce9e9ba28c29 100644
--- a/writerfilter/qa/cppunittests/misc/misc.cxx
+++ b/writerfilter/qa/cppunittests/misc/misc.cxx
@@ -21,10 +21,9 @@
#include <dmapper/ConversionHelper.hxx>
#include <dmapper/DomainMapperFactory.hxx>
-namespace {
-
-class WriterfilterMiscTest
- : public ::CppUnit::TestFixture
+namespace
+{
+class WriterfilterMiscTest : public ::CppUnit::TestFixture
{
public:
void testTwipConversions();
@@ -59,7 +58,7 @@ void WriterfilterMiscTest::testTwipConversions()
void WriterfilterMiscTest::testFieldParameters()
{
using writerfilter::dmapper::splitFieldCommand;
- std::tuple<OUString, std::vector<OUString>, std::vector<OUString> > result;
+ std::tuple<OUString, std::vector<OUString>, std::vector<OUString>> result;
result = splitFieldCommand("PAGEREF last_page");
CPPUNIT_ASSERT_EQUAL(OUString("PAGEREF"), std::get<0>(result));
@@ -148,9 +147,8 @@ void WriterfilterMiscTest::testFieldParameters()
CPPUNIT_ASSERT_EQUAL(OUString("\\A"), std::get<2>(result)[2]);
CPPUNIT_ASSERT_EQUAL(OUString(), std::get<2>(result)[3]);
- for (auto prefix : {"#", "$", "%", "&", "'", "(", ")", "*", "+", ",",
- "-", ".", "/", ":", ";", "<", ">", "?", "@", "[",
- "]", "^", "_", "`", "{", "|", "}", "~"})
+ for (auto prefix : { "#", "$", "%", "&", "'", "(", ")", "*", "+", ",", "-", ".", "/", ":",
+ ";", "<", ">", "?", "@", "[", "]", "^", "_", "`", "{", "|", "}", "~" })
{
OUString test(OUString::createFromAscii(prefix) + "PAGE");
result = splitFieldCommand(test + " ");
@@ -170,7 +168,6 @@ void WriterfilterMiscTest::testFieldParameters()
}
CPPUNIT_TEST_SUITE_REGISTRATION(WriterfilterMiscTest);
-
}
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/FFDataHandler.hxx b/writerfilter/source/dmapper/FFDataHandler.hxx
index f5bdb6666ea1..1603d39b0ad0 100644
--- a/writerfilter/source/dmapper/FFDataHandler.hxx
+++ b/writerfilter/source/dmapper/FFDataHandler.hxx
@@ -21,7 +21,8 @@
#include "LoggedResources.hxx"
#include <rtl/ustring.hxx>
#include <vector>
-namespace writerfilter::dmapper {
+namespace writerfilter::dmapper
+{
class FFDataHandler : public LoggedProperties
{
public:
@@ -35,41 +36,41 @@ public:
virtual ~FFDataHandler() override;
// member: name
- const OUString & getName() const { return m_sName;}
+ const OUString& getName() const { return m_sName; }
// member: helpText
- const OUString & getHelpText() const { return m_sHelpText;}
+ const OUString& getHelpText() const { return m_sHelpText; }
// member: statusText
- const OUString & getStatusText() const { return m_sStatusText;}
+ const OUString& getStatusText() const { return m_sStatusText; }
- const OUString & getEntryMacro() const { return m_sEntryMacro;}
- const OUString & getExitMacro() const { return m_sExitMacro;}
+ const OUString& getEntryMacro() const { return m_sEntryMacro; }
+ const OUString& getExitMacro() const { return m_sExitMacro; }
// member: checkboxHeight
- sal_uInt32 getCheckboxHeight() const { return m_nCheckboxHeight;}
+ sal_uInt32 getCheckboxHeight() const { return m_nCheckboxHeight; }
// member: checkboxAutoHeight
- bool getCheckboxAutoHeight() const { return m_bCheckboxAutoHeight;}
+ bool getCheckboxAutoHeight() const { return m_bCheckboxAutoHeight; }
// member: checkboxChecked or checkboxDefault (if the previous is not set)
bool getCheckboxChecked() const;
// member: dropDownResult
- const OUString & getDropDownResult() const { return m_sDropDownResult;}
+ const OUString& getDropDownResult() const { return m_sDropDownResult; }
// member: dropDownEntries
- const DropDownEntries_t & getDropDownEntries() const { return m_DropDownEntries;}
+ const DropDownEntries_t& getDropDownEntries() const { return m_DropDownEntries; }
// member: textDefault
- const OUString & getTextDefault() const { return m_sTextDefault;}
+ const OUString& getTextDefault() const { return m_sTextDefault; }
- const OUString & getTextType() const { return m_sTextType; }
- const OUString & getTextFormat() const { return m_sTextFormat; }
+ const OUString& getTextType() const { return m_sTextType; }
+ const OUString& getTextFormat() const { return m_sTextFormat; }
sal_uInt16 getTextMaxLength() const { return m_nTextMaxLength; }
// sprm
- void resolveSprm(Sprm & r_sprm);
+ void resolveSprm(Sprm& r_sprm);
private:
OUString m_sName;
@@ -89,13 +90,11 @@ private:
sal_uInt16 m_nTextMaxLength;
// sprm
- void lcl_sprm(Sprm & r_sprm) override;
+ void lcl_sprm(Sprm& r_sprm) override;
// attribute
- void lcl_attribute(Id name, Value & val) override;
+ void lcl_attribute(Id name, Value& val) override;
};
-
-
}
#endif // INCLUDED_WRITERFILTER_SOURCE_DMAPPER_FFDATAHANDLER_HXX
diff --git a/writerfilter/source/dmapper/FormControlHelper.hxx b/writerfilter/source/dmapper/FormControlHelper.hxx
index da60c3fea21f..f3cb74549226 100644
--- a/writerfilter/source/dmapper/FormControlHelper.hxx
+++ b/writerfilter/source/dmapper/FormControlHelper.hxx
@@ -25,32 +25,31 @@
#include <com/sun/star/uno/Reference.hxx>
#include "FieldTypes.hxx"
-namespace writerfilter::dmapper {
-
+namespace writerfilter::dmapper
+{
class FormControlHelper : public virtual SvRefBase
{
public:
typedef tools::SvRef<FormControlHelper> Pointer_t;
FormControlHelper(FieldId eFieldId,
css::uno::Reference<css::text::XTextDocument> const& rTextDocument,
- FFDataHandler::Pointer_t const & pFFData);
+ FFDataHandler::Pointer_t const& pFFData);
~FormControlHelper() override;
void insertControl(css::uno::Reference<css::text::XTextRange> const& xTextRange);
void processField(css::uno::Reference<css::text::XFormField> const& xFormField);
bool hasFFDataHandler() const { return (m_pFFData != nullptr); }
+
private:
FFDataHandler::Pointer_t m_pFFData;
struct FormControlHelper_Impl;
tools::SvRef<FormControlHelper_Impl> m_pImpl;
bool createCheckbox(css::uno::Reference<css::text::XTextRange> const& xTextRange,
- const OUString & rControlName);
+ const OUString& rControlName);
};
-
}
-
#endif // INCLUDED_WRITERFILTER_SOURCE_DMAPPER_FORMCONTROLHELPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/GraphicHelpers.hxx b/writerfilter/source/dmapper/GraphicHelpers.hxx
index 54d5520c3717..66fd06c06281 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.hxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.hxx
@@ -27,19 +27,20 @@
namespace writerfilter::dmapper
{
-
-class PositionHandler: public LoggedProperties
+class PositionHandler : public LoggedProperties
{
public:
- PositionHandler( std::pair<OUString, OUString>& rPositionOffsets, std::pair<OUString, OUString>& rAligns );
- virtual ~PositionHandler( ) override;
+ PositionHandler(std::pair<OUString, OUString>& rPositionOffsets,
+ std::pair<OUString, OUString>& rAligns);
+ virtual ~PositionHandler() override;
sal_Int16 orientation() const;
- sal_Int16 relation() const { return m_nRelation;}
- sal_Int32 position() const { return m_nPosition;}
+ sal_Int16 relation() const { return m_nRelation; }
+ sal_Int32 position() const { return m_nPosition; }
bool GetPageToggle() const { return m_bPageToggle; }
- private:
- virtual void lcl_attribute( Id aName, Value& rVal ) override;
- virtual void lcl_sprm( Sprm& rSprm ) override;
+
+private:
+ virtual void lcl_attribute(Id aName, Value& rVal) override;
+ virtual void lcl_sprm(Sprm& rSprm) override;
sal_Int16 m_nOrient;
sal_Int16 m_nRelation;
sal_Int32 m_nPosition;
@@ -48,17 +49,17 @@ public:
bool m_bPageToggle = false;
};
-class WrapHandler: public LoggedProperties
+class WrapHandler : public LoggedProperties
{
public:
- WrapHandler( );
- virtual ~WrapHandler( ) override;
+ WrapHandler();
+ virtual ~WrapHandler() override;
- css::text::WrapTextMode getWrapMode( ) const;
+ css::text::WrapTextMode getWrapMode() const;
- private:
- virtual void lcl_attribute( Id aName, Value& rVal ) override;
- virtual void lcl_sprm( Sprm& rSprm ) override;
+private:
+ virtual void lcl_attribute(Id aName, Value& rVal) override;
+ virtual void lcl_sprm(Sprm& rSprm) override;
sal_Int32 m_nType;
sal_Int32 m_nSide;
@@ -74,7 +75,6 @@ public:
/// Name a graphic based on rTemplate.
OUString NameGraphic(const OUString& rTemplate);
};
-
}
#endif
diff --git a/writerfilter/source/dmapper/LoggedResources.cxx b/writerfilter/source/dmapper/LoggedResources.cxx
index d8857911ea1d..c604019e0e2c 100644
--- a/writerfilter/source/dmapper/LoggedResources.cxx
+++ b/writerfilter/source/dmapper/LoggedResources.cxx
@@ -25,65 +25,55 @@ using namespace ::com::sun::star;
namespace writerfilter
{
-
#ifdef DBG_UTIL
-LoggedResourcesHelper::LoggedResourcesHelper(const std::string & sPrefix)
-: msPrefix(sPrefix)
+LoggedResourcesHelper::LoggedResourcesHelper(const std::string& sPrefix)
+ : msPrefix(sPrefix)
{
}
-LoggedResourcesHelper::~LoggedResourcesHelper()
-{
-}
+LoggedResourcesHelper::~LoggedResourcesHelper() {}
-void LoggedResourcesHelper::startElement(const std::string & sElement)
+void LoggedResourcesHelper::startElement(const std::string& sElement)
{
TagLogger::getInstance().startElement(msPrefix + "." + sElement);
}
-void LoggedResourcesHelper::endElement()
-{
- TagLogger::getInstance().endElement();
-}
+void LoggedResourcesHelper::endElement() { TagLogger::getInstance().endElement(); }
-void LoggedResourcesHelper::chars(const OUString & rChars)
+void LoggedResourcesHelper::chars(const OUString& rChars)
{
TagLogger::getInstance().chars(rChars);
}
-void LoggedResourcesHelper::chars(const std::string & rChars)
+void LoggedResourcesHelper::chars(const std::string& rChars)
{
TagLogger::getInstance().chars(rChars);
}
-void LoggedResourcesHelper::attribute(const std::string & rName, const std::string & rValue)
+void LoggedResourcesHelper::attribute(const std::string& rName, const std::string& rValue)
{
TagLogger::getInstance().attribute(rName, rValue);
}
-void LoggedResourcesHelper::attribute(const std::string & rName, sal_uInt32 nValue)
+void LoggedResourcesHelper::attribute(const std::string& rName, sal_uInt32 nValue)
{
TagLogger::getInstance().attribute(rName, nValue);
}
#endif
-
LoggedStream::LoggedStream(
#ifdef DBG_UTIL
- const std::string & sPrefix
-) : mHelper(sPrefix)
+ const std::string& sPrefix)
+ : mHelper(sPrefix)
#else
- const std::string&
-)
+ const std::string&)
#endif
{
}
-LoggedStream::~LoggedStream()
-{
-}
+LoggedStream::~LoggedStream() {}
void LoggedStream::startSectionGroup()
{
@@ -121,7 +111,6 @@ void LoggedStream::endParagraphGroup()
#endif
}
-
void LoggedStream::startCharacterGroup()
{
#ifdef DBG_UTIL
@@ -158,12 +147,12 @@ void LoggedStream::endShape()
#endif
}
-void LoggedStream::text(const sal_uInt8 * data, size_t len)
+void LoggedStream::text(const sal_uInt8* data, size_t len)
{
#ifdef DBG_UTIL
mHelper.startElement("text");
- OUString sText( reinterpret_cast<const char*>(data), len, RTL_TEXTENCODING_MS_1252 );
+ OUString sText(reinterpret_cast<const char*>(data), len, RTL_TEXTENCODING_MS_1252);
mHelper.startElement("data");
LoggedResourcesHelper::chars(sText);
@@ -177,13 +166,13 @@ void LoggedStream::text(const sal_uInt8 * data, size_t len)
#endif
}
-void LoggedStream::utext(const sal_uInt8 * data, size_t len)
+void LoggedStream::utext(const sal_uInt8* data, size_t len)
{
#ifdef DBG_UTIL
mHelper.startElement("utext");
mHelper.startElement("data");
- OUString sText( reinterpret_cast<const sal_Unicode *>(data), len);
+ OUString sText(reinterpret_cast<const sal_Unicode*>(data), len);
LoggedResourcesHelper::chars(sText);
@@ -282,7 +271,7 @@ void LoggedStream::substream(Id name, writerfilter::Reference<Stream>::Pointer_t
#endif
}
-void LoggedStream::info(const std::string & _info)
+void LoggedStream::info(const std::string& _info)
{
#ifdef DBG_UTIL
mHelper.startElement("info");
@@ -324,20 +313,17 @@ void LoggedStream::endGlossaryEntry()
LoggedProperties::LoggedProperties(
#ifdef DBG_UTIL
- const std::string & sPrefix
-) : mHelper(sPrefix)
+ const std::string& sPrefix)
+ : mHelper(sPrefix)
#else
- const std::string&
-)
+ const std::string&)
#endif
{
}
-LoggedProperties::~LoggedProperties()
-{
-}
+LoggedProperties::~LoggedProperties() {}
-void LoggedProperties::attribute(Id name, Value & val)
+void LoggedProperties::attribute(Id name, Value& val)
{
#ifdef DBG_UTIL
mHelper.startElement("attribute");
@@ -349,7 +335,7 @@ void LoggedProperties::attribute(Id name, Value & val)
lcl_attribute(name, val);
}
-void LoggedProperties::sprm(Sprm & rSprm)
+void LoggedProperties::sprm(Sprm& rSprm)
{
#ifdef DBG_UTIL
mHelper.startElement("sprm");
@@ -366,18 +352,15 @@ void LoggedProperties::sprm(Sprm & rSprm)
LoggedTable::LoggedTable(
#ifdef DBG_UTIL
- const std::string & sPrefix
-) : mHelper(sPrefix)
+ const std::string& sPrefix)
+ : mHelper(sPrefix)
#else
- const std::string&
-)
+ const std::string&)
#endif
{
}
-LoggedTable::~LoggedTable()
-{
-}
+LoggedTable::~LoggedTable() {}
void LoggedTable::entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref)
{
@@ -394,7 +377,6 @@ void LoggedTable::entry(int pos, writerfilter::Reference<Properties>::Pointer_t
LoggedResourcesHelper::endElement();
#endif
}
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/LoggedResources.hxx b/writerfilter/source/dmapper/LoggedResources.hxx
index 0be0f2ba4f12..cb940800d949 100644
--- a/writerfilter/source/dmapper/LoggedResources.hxx
+++ b/writerfilter/source/dmapper/LoggedResources.hxx
@@ -22,23 +22,21 @@
#include <dmapper/resourcemodel.hxx>
-
namespace writerfilter
{
-
#ifdef DBG_UTIL
class LoggedResourcesHelper final
{
public:
- explicit LoggedResourcesHelper(const std::string & sPrefix);
+ explicit LoggedResourcesHelper(const std::string& sPrefix);
~LoggedResourcesHelper();
- void startElement(const std::string & sElement);
+ void startElement(const std::string& sElement);
static void endElement();
- static void chars(const OUString & rChars);
- static void chars(const std::string & rChars);
- static void attribute(const std::string & rName, const std::string & rValue);
- static void attribute(const std::string & rName, sal_uInt32 nValue);
+ static void chars(const OUString& rChars);
+ static void chars(const std::string& rChars);
+ static void attribute(const std::string& rName, const std::string& rValue);
+ static void attribute(const std::string& rName, sal_uInt32 nValue);
private:
std::string msPrefix;
@@ -48,7 +46,7 @@ private:
class LoggedStream : public Stream
{
public:
- explicit LoggedStream(const std::string & sPrefix);
+ explicit LoggedStream(const std::string& sPrefix);
virtual ~LoggedStream() override;
void startSectionGroup() override;
@@ -59,15 +57,15 @@ public:
void endCharacterGroup() override;
void startShape(css::uno::Reference<css::drawing::XShape> const& xShape) override;
void endShape() override;
- void text(const sal_uInt8 * data, size_t len) override;
- void utext(const sal_uInt8 * data, size_t len) override;
+ void text(const sal_uInt8* data, size_t len) override;
+ void utext(const sal_uInt8* data, size_t len) override;
void positionOffset(const OUString& rText, bool bVertical) override;
void align(const OUString& rText, bool bVertical) override;
void positivePercentage(const OUString& rText) override;
void props(writerfilter::Reference<Properties>::Pointer_t ref) override;
void table(Id name, writerfilter::Reference<Table>::Pointer_t ref) override;
void substream(Id name, writerfilter::Reference<Stream>::Pointer_t ref) override;
- void info(const std::string & info) override;
+ void info(const std::string& info) override;
void startGlossaryEntry() override;
void endGlossaryEntry() override;
@@ -80,17 +78,17 @@ protected:
virtual void lcl_endCharacterGroup() = 0;
virtual void lcl_startShape(css::uno::Reference<css::drawing::XShape> const& xShape) = 0;
virtual void lcl_endShape() = 0;
- virtual void lcl_text(const sal_uInt8 * data, size_t len) = 0;
- virtual void lcl_utext(const sal_uInt8 * data, size_t len) = 0;
- virtual void lcl_positionOffset(const OUString& /*rText*/, bool /*bVertical*/) { }
+ virtual void lcl_text(const sal_uInt8* data, size_t len) = 0;
+ virtual void lcl_utext(const sal_uInt8* data, size_t len) = 0;
+ virtual void lcl_positionOffset(const OUString& /*rText*/, bool /*bVertical*/) {}
virtual css::awt::Point getPositionOffset() override { return css::awt::Point(); }
- virtual void lcl_align(const OUString& /*rText*/, bool /*bVertical*/) { }
- virtual void lcl_positivePercentage(const OUString& /*rText*/) { }
+ virtual void lcl_align(const OUString& /*rText*/, bool /*bVertical*/) {}
+ virtual void lcl_positivePercentage(const OUString& /*rText*/) {}
virtual void lcl_props(writerfilter::Reference<Properties>::Pointer_t ref) = 0;
virtual void lcl_table(Id name, writerfilter::Reference<Table>::Pointer_t ref) = 0;
virtual void lcl_substream(Id name, writerfilter::Reference<Stream>::Pointer_t ref) = 0;
- virtual void lcl_startGlossaryEntry() { }
- virtual void lcl_endGlossaryEntry() { }
+ virtual void lcl_startGlossaryEntry() {}
+ virtual void lcl_endGlossaryEntry() {}
#ifdef DBG_UTIL
LoggedResourcesHelper mHelper;
@@ -100,15 +98,15 @@ protected:
class LoggedProperties : public Properties
{
public:
- explicit LoggedProperties(const std::string & sPrefix);
+ explicit LoggedProperties(const std::string& sPrefix);
virtual ~LoggedProperties() override;
- void attribute(Id name, Value & val) override;
- void sprm(Sprm & sprm) override;
+ void attribute(Id name, Value& val) override;
+ void sprm(Sprm& sprm) override;
protected:
- virtual void lcl_attribute(Id name, Value & val) = 0;
- virtual void lcl_sprm(Sprm & sprm) = 0;
+ virtual void lcl_attribute(Id name, Value& val) = 0;
+ virtual void lcl_sprm(Sprm& sprm) = 0;
#ifdef DBG_UTIL
LoggedResourcesHelper mHelper;
@@ -118,7 +116,7 @@ protected:
class LoggedTable : public Table
{
public:
- explicit LoggedTable(const std::string & sPrefix);
+ explicit LoggedTable(const std::string& sPrefix);
virtual ~LoggedTable() override;
void entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref) override;
@@ -130,7 +128,6 @@ protected:
LoggedResourcesHelper mHelper;
#endif
};
-
}
#endif // INCLUDED_WRITERFILTER_SOURCE_DMAPPER_LOGGEDRESOURCES_HXX
diff --git a/writerfilter/source/dmapper/MeasureHandler.hxx b/writerfilter/source/dmapper/MeasureHandler.hxx
index b32b3840675a..3b70987d5345 100644
--- a/writerfilter/source/dmapper/MeasureHandler.hxx
+++ b/writerfilter/source/dmapper/MeasureHandler.hxx
@@ -39,8 +39,8 @@ class MeasureHandler : public LoggedProperties
std::vector<css::beans::PropertyValue> m_aInteropGrabBag;
// Properties
- virtual void lcl_attribute(Id Name, Value & val) override;
- virtual void lcl_sprm(Sprm & sprm) override;
+ virtual void lcl_attribute(Id Name, Value& val) override;
+ virtual void lcl_sprm(Sprm& sprm) override;
public:
MeasureHandler();
@@ -51,12 +51,11 @@ public:
sal_Int32 getValue() const { return m_nMeasureValue; }
sal_Int32 getUnit() const { return m_nUnit; }
- sal_Int16 GetRowHeightSizeType() const { return m_nRowHeightSizeType;}
+ sal_Int16 GetRowHeightSizeType() const { return m_nRowHeightSizeType; }
void enableInteropGrabBag(const OUString& aName);
css::beans::PropertyValue getInteropGrabBag();
};
-typedef tools::SvRef
- < MeasureHandler > MeasureHandlerPtr;
+typedef tools::SvRef<MeasureHandler> MeasureHandlerPtr;
}
#endif
diff --git a/writerfilter/source/dmapper/ModelEventListener.hxx b/writerfilter/source/dmapper/ModelEventListener.hxx
index acb69661d127..7080674ff27c 100644
--- a/writerfilter/source/dmapper/ModelEventListener.hxx
+++ b/writerfilter/source/dmapper/ModelEventListener.hxx
@@ -22,22 +22,21 @@
#include <com/sun/star/document/XEventListener.hpp>
#include <cppuhelper/implbase.hxx>
-namespace writerfilter::dmapper{
-
-
+namespace writerfilter::dmapper
+{
class ModelEventListener : public cppu::WeakImplHelper<css::document::XEventListener>
{
bool m_bIndexes;
bool m_bControls;
+
public:
ModelEventListener(bool bIndexes, bool bControls);
virtual ~ModelEventListener() override;
virtual void SAL_CALL notifyEvent(const css::document::EventObject& Event) override;
virtual void SAL_CALL disposing(const css::lang::EventObject& Source) override;
-
};
-}//namespace writerfilter::dmapper
+} //namespace writerfilter::dmapper
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/PageBordersHandler.hxx b/writerfilter/source/dmapper/PageBordersHandler.hxx
index 177ac4bd9847..4b913c09af1d 100644
--- a/writerfilter/source/dmapper/PageBordersHandler.hxx
+++ b/writerfilter/source/dmapper/PageBordersHandler.hxx
@@ -27,40 +27,37 @@
#include <vector>
-
-namespace writerfilter::dmapper {
-
+namespace writerfilter::dmapper
+{
class PgBorder
{
public:
css::table::BorderLine2 m_rLine;
- sal_Int32 m_nDistance;
+ sal_Int32 m_nDistance;
BorderPosition m_ePos;
bool m_bShadow;
- PgBorder( );
+ PgBorder();
};
class PageBordersHandler : public LoggedProperties
{
private:
-
// See implementation of SectionPropertyMap::ApplyBorderToPageStyles
SectionPropertyMap::BorderApply m_eBorderApply;
SectionPropertyMap::BorderOffsetFrom m_eOffsetFrom;
std::vector<PgBorder> m_aBorders;
// Properties
- virtual void lcl_attribute( Id eName, Value& rVal ) override;
- virtual void lcl_sprm( Sprm& rSprm ) override;
+ virtual void lcl_attribute(Id eName, Value& rVal) override;
+ virtual void lcl_sprm(Sprm& rSprm) override;
public:
- PageBordersHandler( );
- virtual ~PageBordersHandler( ) override;
+ PageBordersHandler();
+ virtual ~PageBordersHandler() override;
- void SetBorders( SectionPropertyMap* pSectContext );
+ void SetBorders(SectionPropertyMap* pSectContext);
};
-
}
#endif
diff --git a/writerfilter/source/dmapper/PropertyMapHelper.cxx b/writerfilter/source/dmapper/PropertyMapHelper.cxx
index 59f59b1b2372..a944dc147aa4 100644
--- a/writerfilter/source/dmapper/PropertyMapHelper.cxx
+++ b/writerfilter/source/dmapper/PropertyMapHelper.cxx
@@ -23,10 +23,9 @@
namespace writerfilter::dmapper
{
-
using namespace ::com::sun::star;
-void lcl_DumpTableColumnSeparators(const uno::Any & rTableColumnSeparators)
+void lcl_DumpTableColumnSeparators(const uno::Any& rTableColumnSeparators)
{
#ifdef DBG_UTIL
uno::Sequence<text::TableColumnSeparator> aSeq;
@@ -47,16 +46,16 @@ void lcl_DumpTableColumnSeparators(const uno::Any & rTableColumnSeparators)
TagLogger::getInstance().endElement();
#else
- (void) rTableColumnSeparators;
+ (void)rTableColumnSeparators;
#endif // DBG_UTIL
}
#ifdef DBG_UTIL
-void lcl_DumpPropertyValues(beans::PropertyValues const & rValues)
+void lcl_DumpPropertyValues(beans::PropertyValues const& rValues)
{
TagLogger::getInstance().startElement("propertyValues");
- for (beans::PropertyValue const & propVal : rValues)
+ for (beans::PropertyValue const& propVal : rValues)
{
TagLogger::getInstance().startElement("propertyValue");
@@ -72,7 +71,7 @@ void lcl_DumpPropertyValues(beans::PropertyValues const & rValues)
{
}
- if ( propVal.Name == "TableColumnSeparators" )
+ if (propVal.Name == "TableColumnSeparators")
{
lcl_DumpTableColumnSeparators(propVal.Value);
}
@@ -82,11 +81,11 @@ void lcl_DumpPropertyValues(beans::PropertyValues const & rValues)
TagLogger::getInstance().endElement();
}
-void lcl_DumpPropertyValueSeq(css::uno::Sequence<css::beans::PropertyValues> const & rPropValSeq)
+void lcl_DumpPropertyValueSeq(css::uno::Sequence<css::beans::PropertyValues> const& rPropValSeq)
{
TagLogger::getInstance().startElement("PropertyValueSeq");
- for (auto const & propVal : rPropValSeq)
+ for (auto const& propVal : rPropValSeq)
{
lcl_DumpPropertyValues(propVal);
}
@@ -94,7 +93,6 @@ void lcl_DumpPropertyValueSeq(css::uno::Sequence<css::beans::PropertyValues> con
TagLogger::getInstance().endElement();
}
#endif // DBG_UTIL
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/PropertyMapHelper.hxx b/writerfilter/source/dmapper/PropertyMapHelper.hxx
index 09df75385e71..044ae1b92f35 100644
--- a/writerfilter/source/dmapper/PropertyMapHelper.hxx
+++ b/writerfilter/source/dmapper/PropertyMapHelper.hxx
@@ -24,16 +24,14 @@
namespace writerfilter::dmapper
{
-
-void lcl_DumpTableColumnSeparators(const css::uno::Any & rTableColumnSeparators);
+void lcl_DumpTableColumnSeparators(const css::uno::Any& rTableColumnSeparators);
#ifdef DBG_UTIL
-void lcl_DumpPropertyValues(css::beans::PropertyValues const & rValues);
+void lcl_DumpPropertyValues(css::beans::PropertyValues const& rValues);
-void lcl_DumpPropertyValueSeq(css::uno::Sequence<css::beans::PropertyValues> const & rPropValSeq);
+void lcl_DumpPropertyValueSeq(css::uno::Sequence<css::beans::PropertyValues> const& rPropValSeq);
#endif // DBG_UTIL
}
-
#endif // INCLUDED_WRITERFILTER_SOURCE_DMAPPER_PROPERTYMAPHELPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/SectionColumnHandler.cxx b/writerfilter/source/dmapper/SectionColumnHandler.cxx
index 9ce0cdc85ad6..9fed9c34a68e 100644
--- a/writerfilter/source/dmapper/SectionColumnHandler.cxx
+++ b/writerfilter/source/dmapper/SectionColumnHandler.cxx
@@ -21,11 +21,10 @@
#include <ooxml/resourceids.hxx>
#include <osl/diagnose.h>
-namespace writerfilter::dmapper {
-
+namespace writerfilter::dmapper
+{
using namespace ::com::sun::star;
-
SectionColumnHandler::SectionColumnHandler()
: LoggedProperties("SectionColumnHandler")
, m_bEqualWidth(false)
@@ -36,20 +35,18 @@ SectionColumnHandler::SectionColumnHandler()
m_aTempColumn.nWidth = m_aTempColumn.nSpace = 0;
}
-SectionColumnHandler::~SectionColumnHandler()
-{
-}
+SectionColumnHandler::~SectionColumnHandler() {}
-void SectionColumnHandler::lcl_attribute(Id rName, Value & rVal)
+void SectionColumnHandler::lcl_attribute(Id rName, Value& rVal)
{
sal_Int32 nIntValue = rVal.getInt();
- switch( rName )
+ switch (rName)
{
case NS_ooxml::LN_CT_Columns_equalWidth:
m_bEqualWidth = (nIntValue != 0);
break;
case NS_ooxml::LN_CT_Columns_space:
- m_nSpace = ConversionHelper::convertTwipToMM100( nIntValue );
+ m_nSpace = ConversionHelper::convertTwipToMM100(nIntValue);
break;
case NS_ooxml::LN_CT_Columns_num:
m_nNum = nIntValue;
@@ -59,25 +56,25 @@ void SectionColumnHandler::lcl_attribute(Id rName, Value & rVal)
break;
case NS_ooxml::LN_CT_Column_w:
- m_aTempColumn.nWidth = ConversionHelper::convertTwipToMM100( nIntValue );
+ m_aTempColumn.nWidth = ConversionHelper::convertTwipToMM100(nIntValue);
break;
case NS_ooxml::LN_CT_Column_space:
- m_aTempColumn.nSpace = ConversionHelper::convertTwipToMM100( nIntValue );
+ m_aTempColumn.nSpace = ConversionHelper::convertTwipToMM100(nIntValue);
break;
default:
- OSL_FAIL( "SectionColumnHandler: unknown attribute");
+ OSL_FAIL("SectionColumnHandler: unknown attribute");
}
}
-void SectionColumnHandler::lcl_sprm(Sprm & rSprm)
+void SectionColumnHandler::lcl_sprm(Sprm& rSprm)
{
- switch( rSprm.getId())
+ switch (rSprm.getId())
{
case NS_ooxml::LN_CT_Columns_col:
{
m_aTempColumn.nWidth = m_aTempColumn.nSpace = 0;
writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps();
- if( pProperties )
+ if (pProperties)
{
pProperties->resolve(*this);
m_aCols.push_back(m_aTempColumn);
@@ -85,7 +82,7 @@ void SectionColumnHandler::lcl_sprm(Sprm & rSprm)
}
break;
default:
- OSL_FAIL( "SectionColumnHandler: unknown sprm");
+ OSL_FAIL("SectionColumnHandler: unknown sprm");
}
}
} //namespace writerfilter::dmapper
diff --git a/writerfilter/source/dmapper/SettingsTable.hxx b/writerfilter/source/dmapper/SettingsTable.hxx
index f7e8eff9df02..d2d0a28ce87e 100644
--- a/writerfilter/source/dmapper/SettingsTable.hxx
+++ b/writerfilter/source/dmapper/SettingsTable.hxx
@@ -24,9 +24,10 @@
#include <com/sun/star/text/XTextDocument.hpp>
#include <memory>
-namespace com::sun::star::lang {
- class XMultiServiceFactory;
- struct Locale;
+namespace com::sun::star::lang
+{
+class XMultiServiceFactory;
+struct Locale;
}
namespace writerfilter::dmapper
@@ -39,7 +40,7 @@ class SettingsTable : public LoggedProperties, public LoggedTable
{
std::unique_ptr<SettingsTable_Impl> m_pImpl;
- public:
+public:
SettingsTable(const DomainMapper& rDomainMapper);
virtual ~SettingsTable() override;
@@ -81,7 +82,7 @@ class SettingsTable : public LoggedProperties, public LoggedTable
OUString GetDecimalSymbol() const;
OUString GetListSeparator() const;
- css::uno::Sequence<css::beans::PropertyValue> const & GetThemeFontLangProperties() const;
+ css::uno::Sequence<css::beans::PropertyValue> const& GetThemeFontLangProperties() const;
css::uno::Sequence<css::beans::PropertyValue> GetCompatSettings() const;
@@ -89,21 +90,20 @@ class SettingsTable : public LoggedProperties, public LoggedTable
void ApplyProperties(css::uno::Reference<css::text::XTextDocument> const& xDoc);
- bool GetCompatSettingValue( const OUString& sCompatName ) const;
+ bool GetCompatSettingValue(const OUString& sCompatName) const;
sal_Int32 GetWordCompatibilityMode() const;
- const OUString & GetCurrentDatabaseDataSource() const;
+ const OUString& GetCurrentDatabaseDataSource() const;
- private:
+private:
// Properties
- virtual void lcl_attribute(Id Name, Value & val) override;
- virtual void lcl_sprm(Sprm & sprm) override;
+ virtual void lcl_attribute(Id Name, Value& val) override;
+ virtual void lcl_sprm(Sprm& sprm) override;
// Table
virtual void lcl_entry(writerfilter::Reference<Properties>::Pointer_t ref) override;
-
};
-typedef tools::SvRef< SettingsTable > SettingsTablePtr;
+typedef tools::SvRef<SettingsTable> SettingsTablePtr;
}
#endif
diff --git a/writerfilter/source/dmapper/TextEffectsHandler.hxx b/writerfilter/source/dmapper/TextEffectsHandler.hxx
index dede6df2829a..d7df31d85515 100644
--- a/writerfilter/source/dmapper/TextEffectsHandler.hxx
+++ b/writerfilter/source/dmapper/TextEffectsHandler.hxx
@@ -24,13 +24,12 @@
namespace writerfilter::dmapper
{
-
/// Class to process all text effects like glow, textOutline, ...
class TextEffectsHandler : public LoggedProperties
{
private:
- std::optional<PropertyIds> maPropertyId;
- OUString maElementName;
+ std::optional<PropertyIds> maPropertyId;
+ OUString maElementName;
std::unique_ptr<oox::GrabBagStack> mpGrabBagStack;
void convertElementIdToPropertyId(sal_Int32 aElementId);
@@ -43,7 +42,7 @@ public:
explicit TextEffectsHandler(sal_uInt32 aElementId);
virtual ~TextEffectsHandler() override;
- const std::optional<PropertyIds>& getGrabBagPropertyId() const { return maPropertyId;}
+ const std::optional<PropertyIds>& getGrabBagPropertyId() const { return maPropertyId; }
css::beans::PropertyValue getInteropGrabBag();
@@ -65,9 +64,7 @@ public:
static OUString getNumSpacingString(sal_Int32 nType);
static sal_uInt8 GetTextFillSolidFillAlpha(const css::beans::PropertyValue& rValue);
-
};
-
}
#endif // INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TEXTEFFECTSHANDLER_HXX
diff --git a/writerfilter/source/dmapper/ThemeTable.hxx b/writerfilter/source/dmapper/ThemeTable.hxx
index 5bb03a64321b..eed737020247 100644
--- a/writerfilter/source/dmapper/ThemeTable.hxx
+++ b/writerfilter/source/dmapper/ThemeTable.hxx
@@ -27,7 +27,6 @@
namespace writerfilter::dmapper
{
-
struct ThemeTable_Impl;
class ThemeTable : public LoggedProperties, public LoggedTable
@@ -42,10 +41,10 @@ public:
static OUString getStringForTheme(const Id id);
void setThemeFontLangProperties(const css::uno::Sequence<css::beans::PropertyValue>& aPropSeq);
- private:
+private:
// Properties
- virtual void lcl_attribute(Id Name, Value & val) override;
- virtual void lcl_sprm(Sprm & sprm) override;
+ virtual void lcl_attribute(Id Name, Value& val) override;
+ virtual void lcl_sprm(Sprm& sprm) override;
// Table
virtual void lcl_entry(writerfilter::Reference<Properties>::Pointer_t ref) override;
@@ -54,7 +53,7 @@ public:
static OUString fromLocaleToScriptTag(const OUString& sLocale);
static OUString fromLCIDToScriptTag(LanguageType lang);
};
-typedef tools::SvRef< ThemeTable > ThemeTablePtr;
+typedef tools::SvRef<ThemeTable> ThemeTablePtr;
}
#endif
diff --git a/writerfilter/source/dmapper/TrackChangesHandler.hxx b/writerfilter/source/dmapper/TrackChangesHandler.hxx
index 16276a2523a3..bd29fc4a20b2 100644
--- a/writerfilter/source/dmapper/TrackChangesHandler.hxx
+++ b/writerfilter/source/dmapper/TrackChangesHandler.hxx
@@ -23,14 +23,14 @@ namespace writerfilter::dmapper
*/
class TrackChangesHandler : public LoggedProperties
{
- RedlineParamsPtr m_pRedlineParams;
+ RedlineParamsPtr m_pRedlineParams;
// Properties
- virtual void lcl_attribute(Id Name, Value & val) override;
- virtual void lcl_sprm(Sprm & sprm) override;
+ virtual void lcl_attribute(Id Name, Value& val) override;
+ virtual void lcl_sprm(Sprm& sprm) override;
public:
- explicit TrackChangesHandler( sal_Int32 nToken );
+ explicit TrackChangesHandler(sal_Int32 nToken);
virtual ~TrackChangesHandler() override;
/// Compute the UNO properties for the track changes object based on the received tokens.
diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.hxx b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
index f537fde2338f..2267ce8f35e8 100644
--- a/writerfilter/source/dmapper/WrapPolygonHandler.hxx
+++ b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
@@ -30,8 +30,8 @@ namespace com::sun::star::text
struct GraphicCrop;
}
-namespace writerfilter::dmapper {
-
+namespace writerfilter::dmapper
+{
/// Handles <wp:wrapPolygon> from DOCX and the pWrapPolygonVertices shape property from RTF.
class WrapPolygon final : public virtual SvRefBase
{
@@ -46,15 +46,15 @@ public:
WrapPolygon();
~WrapPolygon() override;
- void addPoint(const css::awt::Point & rPoint);
+ void addPoint(const css::awt::Point& rPoint);
Points_t::const_iterator begin() const;
Points_t::const_iterator end() const;
- WrapPolygon::Pointer_t move(const css::awt::Point & rMove) const;
- WrapPolygon::Pointer_t scale(const Fraction & rFractionX, const Fraction & rFractionY) const;
- WrapPolygon::Pointer_t correctWordWrapPolygon(const css::awt::Size & rSrcSize) const;
- WrapPolygon::Pointer_t correctWordWrapPolygonPixel(const css::awt::Size & rSrcSize) const;
+ WrapPolygon::Pointer_t move(const css::awt::Point& rMove) const;
+ WrapPolygon::Pointer_t scale(const Fraction& rFractionX, const Fraction& rFractionY) const;
+ WrapPolygon::Pointer_t correctWordWrapPolygon(const css::awt::Size& rSrcSize) const;
+ WrapPolygon::Pointer_t correctWordWrapPolygonPixel(const css::awt::Size& rSrcSize) const;
WrapPolygon::Pointer_t correctCrop(const css::awt::Size& rGraphicSize,
const css::text::GraphicCrop& rGraphicCrop) const;
css::drawing::PointSequenceSequence getPointSequenceSequence() const;
@@ -66,7 +66,7 @@ public:
WrapPolygonHandler();
virtual ~WrapPolygonHandler() override;
- const WrapPolygon::Pointer_t& getPolygon() const { return mpPolygon;}
+ const WrapPolygon::Pointer_t& getPolygon() const { return mpPolygon; }
private:
WrapPolygon::Pointer_t mpPolygon;
@@ -75,11 +75,9 @@ private:
sal_Int32 mnY;
// Properties
- virtual void lcl_attribute(Id Name, Value & val) override;
- virtual void lcl_sprm(Sprm & sprm) override;
-
+ virtual void lcl_attribute(Id Name, Value& val) override;
+ virtual void lcl_sprm(Sprm& sprm) override;
};
-
}
#endif // INCLUDED_WRITERFILTER_SOURCE_DMAPPER_WRAPPOLYGONHANDLER_HXX
diff --git a/writerfilter/source/dmapper/util.cxx b/writerfilter/source/dmapper/util.cxx
index d4389fce7571..d5b23a3d46bc 100644
--- a/writerfilter/source/dmapper/util.cxx
+++ b/writerfilter/source/dmapper/util.cxx
@@ -24,7 +24,7 @@ namespace writerfilter::dmapper
{
using namespace com::sun::star;
-std::string XTextRangeToString(uno::Reference< text::XTextRange > const & textRange)
+std::string XTextRangeToString(uno::Reference<text::XTextRange> const& textRange)
{
std::string result;
@@ -44,28 +44,27 @@ std::string XTextRangeToString(uno::Reference< text::XTextRange > const & textRa
result += ")";
}
- OString aOStr(aOUStr.getStr(), aOUStr.getLength(), RTL_TEXTENCODING_ASCII_US );
+ OString aOStr(aOUStr.getStr(), aOUStr.getLength(), RTL_TEXTENCODING_ASCII_US);
result = aOStr.getStr();
}
else
{
- result="(nil)";
+ result = "(nil)";
}
#else
- (void) textRange;
+ (void)textRange;
#endif
return result;
}
-void resolveSprmProps(Properties & rHandler, Sprm & rSprm)
+void resolveSprmProps(Properties& rHandler, Sprm& rSprm)
{
writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps();
- if( pProperties)
+ if (pProperties)
pProperties->resolve(rHandler);
}
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/util.hxx b/writerfilter/source/dmapper/util.hxx
index 13a032b5a254..5a94a5d0932d 100644
--- a/writerfilter/source/dmapper/util.hxx
+++ b/writerfilter/source/dmapper/util.hxx
@@ -26,11 +26,10 @@
namespace writerfilter::dmapper
{
- std::string XTextRangeToString(css::uno::Reference< css::text::XTextRange > const & textRange);
- void resolveSprmProps(Properties & rHandler, Sprm & rSprm);
+std::string XTextRangeToString(css::uno::Reference<css::text::XTextRange> const& textRange);
+void resolveSprmProps(Properties& rHandler, Sprm& rSprm);
}
-
#endif // INCLUDED_WRITERFILTER_SOURCE_DMAPPER_UTIL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/ooxml/Handler.hxx b/writerfilter/source/ooxml/Handler.hxx
index 111b92aae5e3..214820086a1e 100644
--- a/writerfilter/source/ooxml/Handler.hxx
+++ b/writerfilter/source/ooxml/Handler.hxx
@@ -26,149 +26,154 @@ namespace writerfilter::ooxml
{
class OOXMLFootnoteHandler : public Properties
{
- OOXMLFastContextHandler * mpFastContext;
+ OOXMLFastContextHandler* mpFastContext;
public:
- explicit OOXMLFootnoteHandler(OOXMLFastContextHandler * pContext);
+ explicit OOXMLFootnoteHandler(OOXMLFastContextHandler* pContext);
virtual ~OOXMLFootnoteHandler() override;
- virtual void attribute(Id name, Value & val) override;
- virtual void sprm(Sprm & sprm) override;
+ virtual void attribute(Id name, Value& val) override;
+ virtual void sprm(Sprm& sprm) override;
};
class OOXMLEndnoteHandler : public Properties
{
- OOXMLFastContextHandler * mpFastContext;
+ OOXMLFastContextHandler* mpFastContext;
+
public:
- explicit OOXMLEndnoteHandler(OOXMLFastContextHandler * pContext);
+ explicit OOXMLEndnoteHandler(OOXMLFastContextHandler* pContext);
virtual ~OOXMLEndnoteHandler() override;
- virtual void attribute(Id name, Value & val) override;
- virtual void sprm(Sprm & sprm) override;
+ virtual void attribute(Id name, Value& val) override;
+ virtual void sprm(Sprm& sprm) override;
};
class OOXMLFooterHandler : public Properties
{
- OOXMLFastContextHandler * mpFastContext;
+ OOXMLFastContextHandler* mpFastContext;
OUString msStreamId;
sal_Int32 mnType;
+
public:
- explicit OOXMLFooterHandler(OOXMLFastContextHandler * pContext);
+ explicit OOXMLFooterHandler(OOXMLFastContextHandler* pContext);
void finalize();
- virtual void attribute(Id name, Value & val) override;
- virtual void sprm(Sprm & sprm) override;
+ virtual void attribute(Id name, Value& val) override;
+ virtual void sprm(Sprm& sprm) override;
};
class OOXMLHeaderHandler : public Properties
{
- OOXMLFastContextHandler * mpFastContext;
+ OOXMLFastContextHandler* mpFastContext;
OUString msStreamId;
sal_Int32 mnType;
+
public:
- explicit OOXMLHeaderHandler(OOXMLFastContextHandler * pContext);
+ explicit OOXMLHeaderHandler(OOXMLFastContextHandler* pContext);
void finalize();
- virtual void attribute(Id name, Value & val) override;
- virtual void sprm(Sprm & sprm) override;
+ virtual void attribute(Id name, Value& val) override;
+ virtual void sprm(Sprm& sprm) override;
};
class OOXMLCommentHandler : public Properties
{
- OOXMLFastContextHandler * mpFastContext;
+ OOXMLFastContextHandler* mpFastContext;
+
public:
- explicit OOXMLCommentHandler(OOXMLFastContextHandler * pContext);
+ explicit OOXMLCommentHandler(OOXMLFastContextHandler* pContext);
virtual ~OOXMLCommentHandler() override;
- virtual void attribute(Id name, Value & val) override;
- virtual void sprm(Sprm & sprm) override;
+ virtual void attribute(Id name, Value& val) override;
+ virtual void sprm(Sprm& sprm) override;
};
class OOXMLOLEHandler : public Properties
{
- OOXMLFastContextHandler * mpFastContext;
+ OOXMLFastContextHandler* mpFastContext;
public:
- explicit OOXMLOLEHandler(OOXMLFastContextHandler * pContext);
+ explicit OOXMLOLEHandler(OOXMLFastContextHandler* pContext);
virtual ~OOXMLOLEHandler() override;
- virtual void attribute(Id name, Value & val) override;
- virtual void sprm(Sprm & sprm) override;
+ virtual void attribute(Id name, Value& val) override;
+ virtual void sprm(Sprm& sprm) override;
};
class OOXMLEmbeddedFontHandler : public Properties
{
- OOXMLFastContextHandler * mpFastContext;
+ OOXMLFastContextHandler* mpFastContext;
public:
- explicit OOXMLEmbeddedFontHandler(OOXMLFastContextHandler * pContext);
+ explicit OOXMLEmbeddedFontHandler(OOXMLFastContextHandler* pContext);
virtual ~OOXMLEmbeddedFontHandler() override;
- virtual void attribute(Id name, Value & val) override;
- virtual void sprm(Sprm & sprm) override;
+ virtual void attribute(Id name, Value& val) override;
+ virtual void sprm(Sprm& sprm) override;
};
class OOXMLBreakHandler : public Properties
{
sal_Int32 mnType;
- Stream & mrStream;
+ Stream& mrStream;
+
public:
- explicit OOXMLBreakHandler(Stream & rStream);
+ explicit OOXMLBreakHandler(Stream& rStream);
virtual ~OOXMLBreakHandler() override;
- virtual void attribute(Id name, Value & val) override;
- virtual void sprm(Sprm & sprm) override;
+ virtual void attribute(Id name, Value& val) override;
+ virtual void sprm(Sprm& sprm) override;
};
class OOXMLPictureHandler : public Properties
{
- OOXMLFastContextHandler * mpFastContext;
+ OOXMLFastContextHandler* mpFastContext;
+
public:
- explicit OOXMLPictureHandler(OOXMLFastContextHandler * pContext);
+ explicit OOXMLPictureHandler(OOXMLFastContextHandler* pContext);
virtual ~OOXMLPictureHandler() override;
- virtual void attribute(Id name, Value & val) override;
- virtual void sprm(Sprm & sprm) override;
+ virtual void attribute(Id name, Value& val) override;
+ virtual void sprm(Sprm& sprm) override;
};
class OOXMLHyperlinkHandler : public Properties
{
- OOXMLFastContextHandler * mpFastContext;
+ OOXMLFastContextHandler* mpFastContext;
OUString mFieldCode;
OUString mURL;
public:
- explicit OOXMLHyperlinkHandler(OOXMLFastContextHandler * pContext);
+ explicit OOXMLHyperlinkHandler(OOXMLFastContextHandler* pContext);
virtual ~OOXMLHyperlinkHandler() override;
void writetext();
- virtual void attribute(Id name, Value & val) override;
- virtual void sprm(Sprm & sprm) override;
+ virtual void attribute(Id name, Value& val) override;
+ virtual void sprm(Sprm& sprm) override;
};
class OOXMLHyperlinkURLHandler : public Properties
{
- OOXMLFastContextHandler * mpFastContext;
+ OOXMLFastContextHandler* mpFastContext;
OUString mURL;
public:
- explicit OOXMLHyperlinkURLHandler(OOXMLFastContextHandler * pContext);
+ explicit OOXMLHyperlinkURLHandler(OOXMLFastContextHandler* pContext);
virtual ~OOXMLHyperlinkURLHandler() override;
- virtual void attribute(Id name, Value & val) override;
- virtual void sprm(Sprm & sprm) override;
+ virtual void attribute(Id name, Value& val) override;
+ virtual void sprm(Sprm& sprm) override;
};
/// Looks up the stream name for a '<w:altChunk r:id="..."/>' reference.
class OOXMLAltChunkHandler : public Properties
{
- OOXMLFastContextHandler * mpFastContext;
+ OOXMLFastContextHandler* mpFastContext;
OUString m_aStreamName;
public:
- explicit OOXMLAltChunkHandler(OOXMLFastContextHandler * pContext);
+ explicit OOXMLAltChunkHandler(OOXMLFastContextHandler* pContext);
virtual ~OOXMLAltChunkHandler() override;
- virtual void attribute(Id name, Value & val) override;
- virtual void sprm(Sprm & sprm) override;
+ virtual void attribute(Id name, Value& val) override;
+ virtual void sprm(Sprm& sprm) override;
};
-
}
#endif // INCLUDED_WRITERFILTER_SOURCE_OOXML_HANDLER_HXX
diff --git a/writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx b/writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx
index a6daaa836f82..92177d0b35ed 100644
--- a/writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx
+++ b/writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx
@@ -25,8 +25,7 @@
namespace writerfilter::ooxml
{
-class OOXMLBinaryObjectReference :
- public writerfilter::Reference<BinaryObj>
+class OOXMLBinaryObjectReference : public writerfilter::Reference<BinaryObj>
{
OOXMLStream::Pointer_t mpStream;
std::vector<sal_Int8> mSequence;
@@ -35,10 +34,10 @@ class OOXMLBinaryObjectReference :
void read();
public:
- explicit OOXMLBinaryObjectReference(OOXMLStream::Pointer_t const & pStream);
+ explicit OOXMLBinaryObjectReference(OOXMLStream::Pointer_t const& pStream);
virtual ~OOXMLBinaryObjectReference() override;
- virtual void resolve(BinaryObj & rHandler) override;
+ virtual void resolve(BinaryObj& rHandler) override;
};
}
diff --git a/writerfilter/source/ooxml/OOXMLParserState.hxx b/writerfilter/source/ooxml/OOXMLParserState.hxx
index 65009aba4a70..422ba0b776ef 100644
--- a/writerfilter/source/ooxml/OOXMLParserState.hxx
+++ b/writerfilter/source/ooxml/OOXMLParserState.hxx
@@ -25,7 +25,6 @@
namespace writerfilter::ooxml
{
-
/**
* Struct to store our 'alternate state'. If multiple mc:AlternateContent
* elements arrive, then while the inner ones are active, the original state is
@@ -66,44 +65,44 @@ public:
OOXMLParserState();
~OOXMLParserState() override;
- bool isInSectionGroup() const { return mbInSectionGroup;}
+ bool isInSectionGroup() const { return mbInSectionGroup; }
void setInSectionGroup(bool bInSectionGroup);
void setLastParagraphInSection(bool bLastParagraphInSection);
- bool isLastParagraphInSection() const { return mbLastParagraphInSection;}
+ bool isLastParagraphInSection() const { return mbLastParagraphInSection; }
std::vector<SavedAlternateState>& getSavedAlternateStates() { return maSavedAlternateStates; }
- bool isInParagraphGroup() const { return mbInParagraphGroup;}
+ bool isInParagraphGroup() const { return mbInParagraphGroup; }
void setInParagraphGroup(bool bInParagraphGroup);
- bool isInCharacterGroup() const { return mbInCharacterGroup;}
+ bool isInCharacterGroup() const { return mbInCharacterGroup; }
void setInCharacterGroup(bool bInCharacterGroup);
void setForwardEvents(bool bForwardEvents);
- bool isForwardEvents() const { return mbForwardEvents;}
+ bool isForwardEvents() const { return mbForwardEvents; }
std::string getHandle() const;
void setHandle();
void setDocument(OOXMLDocumentImpl* pDocument);
- OOXMLDocumentImpl* getDocument() const { return mpDocument;}
+ OOXMLDocumentImpl* getDocument() const { return mpDocument; }
void setXNoteId(const sal_Int32 rId);
sal_Int32 getXNoteId() const;
- const OUString & getTarget() const;
+ const OUString& getTarget() const;
- void resolveCharacterProperties(Stream & rStream);
+ void resolveCharacterProperties(Stream& rStream);
void setCharacterProperties(const OOXMLPropertySet::Pointer_t& pProps);
- void resolveCellProperties(Stream & rStream);
+ void resolveCellProperties(Stream& rStream);
void setCellProperties(const OOXMLPropertySet::Pointer_t& pProps);
- void resolveRowProperties(Stream & rStream);
+ void resolveRowProperties(Stream& rStream);
void setRowProperties(const OOXMLPropertySet::Pointer_t& pProps);
- void resolveTableProperties(Stream & rStream);
+ void resolveTableProperties(Stream& rStream);
void setTableProperties(const OOXMLPropertySet::Pointer_t& pProps);
// tdf#108714
- void resolvePostponedBreak(Stream & rStream);
+ void resolvePostponedBreak(Stream& rStream);
void setPostponedBreak(const OOXMLPropertySet::Pointer_t& pProps);
void startTable();
@@ -113,9 +112,7 @@ public:
void startTxbxContent();
void endTxbxContent();
-
};
-
}
#endif // INCLUDED_WRITERFILTER_SOURCE_OOXML_OOXMLPARSERSTATE_HXX
diff --git a/writerfilter/source/ooxml/OOXMLPropertySet.hxx b/writerfilter/source/ooxml/OOXMLPropertySet.hxx
index 892bef78ceaa..2df6fee85d9a 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySet.hxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySet.hxx
@@ -26,7 +26,6 @@
namespace writerfilter::ooxml
{
-
class OOXMLValue : public Value
{
public:
@@ -34,10 +33,10 @@ public:
OOXMLValue();
virtual ~OOXMLValue() override;
- OOXMLValue(OOXMLValue const &) = default;
- OOXMLValue(OOXMLValue &&) = default;
- OOXMLValue & operator =(OOXMLValue const &) = default;
- OOXMLValue & operator =(OOXMLValue &&) = default;
+ OOXMLValue(OOXMLValue const&) = default;
+ OOXMLValue(OOXMLValue&&) = default;
+ OOXMLValue& operator=(OOXMLValue const&) = default;
+ OOXMLValue& operator=(OOXMLValue&&) = default;
virtual int getInt() const override;
;
@@ -48,14 +47,19 @@ public:
#ifdef DBG_UTIL
virtual std::string toString() const override;
#endif
- virtual OOXMLValue * clone() const;
+ virtual OOXMLValue* clone() const;
};
class OOXMLProperty : public Sprm
{
public:
typedef tools::SvRef<OOXMLProperty> Pointer_t;
- enum Type_t { SPRM, ATTRIBUTE };
+ enum Type_t
+ {
+ SPRM,
+ ATTRIBUTE
+ };
+
private:
Id mId;
mutable OOXMLValue::Pointer_t mpValue;
@@ -63,7 +67,7 @@ private:
public:
OOXMLProperty(Id id, const OOXMLValue::Pointer_t& pValue, Type_t eType);
- OOXMLProperty(const OOXMLProperty & rSprm) = delete;
+ OOXMLProperty(const OOXMLProperty& rSprm) = delete;
virtual ~OOXMLProperty() override;
sal_uInt32 getId() const override;
@@ -73,64 +77,67 @@ public:
std::string getName() const override;
std::string toString() const override;
#endif
- void resolve(Properties & rProperties);
+ void resolve(Properties& rProperties);
};
class OOXMLBinaryValue : public OOXMLValue
{
mutable OOXMLBinaryObjectReference::Pointer_t mpBinaryObj;
+
public:
- explicit OOXMLBinaryValue(OOXMLBinaryObjectReference::Pointer_t const & pBinaryObj);
+ explicit OOXMLBinaryValue(OOXMLBinaryObjectReference::Pointer_t const& pBinaryObj);
virtual ~OOXMLBinaryValue() override;
virtual writerfilter::Reference<BinaryObj>::Pointer_t getBinary() override;
#ifdef DBG_UTIL
virtual std::string toString() const override;
#endif
- virtual OOXMLValue * clone() const override;
+ virtual OOXMLValue* clone() const override;
};
class OOXMLBooleanValue : public OOXMLValue
{
bool mbValue;
explicit OOXMLBooleanValue(bool bValue);
+
public:
- static OOXMLValue::Pointer_t const & Create (bool bValue);
- static OOXMLValue::Pointer_t const & Create (const char *pValue);
+ static OOXMLValue::Pointer_t const& Create(bool bValue);
+ static OOXMLValue::Pointer_t const& Create(const char* pValue);
virtual ~OOXMLBooleanValue() override;
- OOXMLBooleanValue(OOXMLBooleanValue const &) = default;
- OOXMLBooleanValue(OOXMLBooleanValue &&) = default;
- OOXMLBooleanValue & operator =(OOXMLBooleanValue const &) = delete; // due to const mbValue
- OOXMLBooleanValue & operator =(OOXMLBooleanValue &&) = delete; // due to const mbValue
+ OOXMLBooleanValue(OOXMLBooleanValue const&) = default;
+ OOXMLBooleanValue(OOXMLBooleanValue&&) = default;
+ OOXMLBooleanValue& operator=(OOXMLBooleanValue const&) = delete; // due to const mbValue
+ OOXMLBooleanValue& operator=(OOXMLBooleanValue&&) = delete; // due to const mbValue
virtual int getInt() const override;
virtual css::uno::Any getAny() const override;
#ifdef DBG_UTIL
virtual std::string toString() const override;
#endif
- virtual OOXMLValue * clone() const override;
+ virtual OOXMLValue* clone() const override;
};
class OOXMLStringValue : public OOXMLValue
{
OUString mStr;
+
public:
- explicit OOXMLStringValue(const OUString & rStr);
+ explicit OOXMLStringValue(const OUString& rStr);
virtual ~OOXMLStringValue() override;
- OOXMLStringValue(OOXMLStringValue const &) = default;
- OOXMLStringValue(OOXMLStringValue &&) = default;
- OOXMLStringValue & operator =(OOXMLStringValue const &) = delete; // due to const mStr
- OOXMLStringValue & operator =(OOXMLStringValue &&) = delete; // due to const mStr
+ OOXMLStringValue(OOXMLStringValue const&) = default;
+ OOXMLStringValue(OOXMLStringValue&&) = default;
+ OOXMLStringValue& operator=(OOXMLStringValue const&) = delete; // due to const mStr
+ OOXMLStringValue& operator=(OOXMLStringValue&&) = delete; // due to const mStr
virtual css::uno::Any getAny() const override;
virtual OUString getString() const override;
#ifdef DBG_UTIL
virtual std::string toString() const override;
#endif
- virtual OOXMLValue * clone() const override;
+ virtual OOXMLValue* clone() const override;
};
class OOXMLInputStreamValue : public OOXMLValue
@@ -138,14 +145,14 @@ class OOXMLInputStreamValue : public OOXMLValue
css::uno::Reference<css::io::XInputStream> mxInputStream;
public:
- explicit OOXMLInputStreamValue(css::uno::Reference<css::io::XInputStream> const & xInputStream);
+ explicit OOXMLInputStreamValue(css::uno::Reference<css::io::XInputStream> const& xInputStream);
virtual ~OOXMLInputStreamValue() override;
virtual css::uno::Any getAny() const override;
#ifdef DBG_UTIL
virtual std::string toString() const override;
#endif
- virtual OOXMLValue * clone() const override;
+ virtual OOXMLValue* clone() const override;
};
class OOXMLPropertySet : public writerfilter::Reference<Properties>
@@ -153,22 +160,24 @@ class OOXMLPropertySet : public writerfilter::Reference<Properties>
public:
typedef std::vector<OOXMLProperty::Pointer_t> OOXMLProperties_t;
typedef tools::SvRef<OOXMLPropertySet> Pointer_t;
+
private:
OOXMLProperties_t mProperties;
void add(const OOXMLProperty::Pointer_t& pProperty);
+
public:
OOXMLPropertySet();
virtual ~OOXMLPropertySet() override;
- OOXMLPropertySet(OOXMLPropertySet const &) = default;
- OOXMLPropertySet(OOXMLPropertySet &&) = default;
- OOXMLPropertySet & operator =(OOXMLPropertySet const &) = default;
- OOXMLPropertySet & operator =(OOXMLPropertySet &&) = default;
+ OOXMLPropertySet(OOXMLPropertySet const&) = default;
+ OOXMLPropertySet(OOXMLPropertySet&&) = default;
+ OOXMLPropertySet& operator=(OOXMLPropertySet const&) = default;
+ OOXMLPropertySet& operator=(OOXMLPropertySet&&) = default;
- void resolve(Properties & rHandler) override;
+ void resolve(Properties& rHandler) override;
void add(Id id, const OOXMLValue::Pointer_t& pValue, OOXMLProperty::Type_t eType);
void add(const OOXMLPropertySet::Pointer_t& pPropertySet);
- OOXMLPropertySet * clone() const;
+ OOXMLPropertySet* clone() const;
OOXMLProperties_t::iterator begin();
OOXMLProperties_t::iterator end();
@@ -189,14 +198,15 @@ public:
OOXMLTable();
virtual ~OOXMLTable() override;
- OOXMLTable(OOXMLTable const &) = default;
- OOXMLTable(OOXMLTable &&) = default;
- OOXMLTable & operator =(OOXMLTable const &) = default;
- OOXMLTable & operator =(OOXMLTable &&) = default;
+ OOXMLTable(OOXMLTable const&) = default;
+ OOXMLTable(OOXMLTable&&) = default;
+ OOXMLTable& operator=(OOXMLTable const&) = default;
+ OOXMLTable& operator=(OOXMLTable&&) = default;
- void resolve(Table & rTable) override;
+ void resolve(Table& rTable) override;
void add(const ValuePointer_t& pPropertySet);
- OOXMLTable * clone() const;
+ OOXMLTable* clone() const;
+
private:
typedef std::vector<ValuePointer_t> PropertySets_t;
PropertySets_t mPropertySets;
@@ -205,82 +215,88 @@ private:
class OOXMLPropertySetValue : public OOXMLValue
{
OOXMLPropertySet::Pointer_t mpPropertySet;
+
public:
explicit OOXMLPropertySetValue(const OOXMLPropertySet::Pointer_t& pPropertySet);
virtual ~OOXMLPropertySetValue() override;
- OOXMLPropertySetValue(OOXMLPropertySetValue const &) = default;
- OOXMLPropertySetValue(OOXMLPropertySetValue &&) = default;
- OOXMLPropertySetValue & operator =(OOXMLPropertySetValue const &) = delete; // due to const mpPropertySet
- OOXMLPropertySetValue & operator =(OOXMLPropertySetValue &&) = delete; // due to const mpPropertySet
+ OOXMLPropertySetValue(OOXMLPropertySetValue const&) = default;
+ OOXMLPropertySetValue(OOXMLPropertySetValue&&) = default;
+ OOXMLPropertySetValue& operator=(OOXMLPropertySetValue const&)
+ = delete; // due to const mpPropertySet
+ OOXMLPropertySetValue& operator=(OOXMLPropertySetValue&&)
+ = delete; // due to const mpPropertySet
virtual writerfilter::Reference<Properties>::Pointer_t getProperties() override;
#ifdef DBG_UTIL
virtual std::string toString() const override;
#endif
- virtual OOXMLValue * clone() const override;
+ virtual OOXMLValue* clone() const override;
};
class OOXMLIntegerValue : public OOXMLValue
{
sal_Int32 mnValue;
explicit OOXMLIntegerValue(sal_Int32 nValue);
+
public:
- static OOXMLValue::Pointer_t Create (sal_Int32 nValue);
+ static OOXMLValue::Pointer_t Create(sal_Int32 nValue);
virtual ~OOXMLIntegerValue() override;
- OOXMLIntegerValue(OOXMLIntegerValue const &) = default;
- OOXMLIntegerValue(OOXMLIntegerValue &&) = default;
- OOXMLIntegerValue & operator =(OOXMLIntegerValue const &) = delete; // due to const mnValue
- OOXMLIntegerValue & operator =(OOXMLIntegerValue &&) = delete; // due to const mnValue
+ OOXMLIntegerValue(OOXMLIntegerValue const&) = default;
+ OOXMLIntegerValue(OOXMLIntegerValue&&) = default;
+ OOXMLIntegerValue& operator=(OOXMLIntegerValue const&) = delete; // due to const mnValue
+ OOXMLIntegerValue& operator=(OOXMLIntegerValue&&) = delete; // due to const mnValue
virtual int getInt() const override;
virtual css::uno::Any getAny() const override;
#ifdef DBG_UTIL
virtual std::string toString() const override;
#endif
- virtual OOXMLValue * clone() const override;
+ virtual OOXMLValue* clone() const override;
};
class OOXMLHexValue : public OOXMLValue
{
protected:
sal_uInt32 mnValue;
+
public:
explicit OOXMLHexValue(sal_uInt32 nValue);
- explicit OOXMLHexValue(const char * pValue);
+ explicit OOXMLHexValue(const char* pValue);
virtual ~OOXMLHexValue() override;
- OOXMLHexValue(OOXMLHexValue const &) = default;
- OOXMLHexValue(OOXMLHexValue &&) = default;
- OOXMLHexValue & operator =(OOXMLHexValue const &) = default;
- OOXMLHexValue & operator =(OOXMLHexValue &&) = default;
+ OOXMLHexValue(OOXMLHexValue const&) = default;
+ OOXMLHexValue(OOXMLHexValue&&) = default;
+ OOXMLHexValue& operator=(OOXMLHexValue const&) = default;
+ OOXMLHexValue& operator=(OOXMLHexValue&&) = default;
virtual int getInt() const override;
#ifdef DBG_UTIL
virtual std::string toString() const override;
#endif
- virtual OOXMLValue * clone() const override;
+ virtual OOXMLValue* clone() const override;
};
class OOXMLHexColorValue : public OOXMLHexValue
{
public:
- explicit OOXMLHexColorValue(const char * pValue);
+ explicit OOXMLHexColorValue(const char* pValue);
};
class OOXMLUniversalMeasureValue : public OOXMLValue
{
private:
int mnValue;
+
public:
- OOXMLUniversalMeasureValue(const char * pValue, sal_uInt32 npPt);
+ OOXMLUniversalMeasureValue(const char* pValue, sal_uInt32 npPt);
virtual ~OOXMLUniversalMeasureValue() override;
- OOXMLUniversalMeasureValue(OOXMLUniversalMeasureValue const &) = default;
- OOXMLUniversalMeasureValue(OOXMLUniversalMeasureValue &&) = default;
- OOXMLUniversalMeasureValue & operator =(OOXMLUniversalMeasureValue const &) = default;
- OOXMLUniversalMeasureValue & operator =(OOXMLUniversalMeasureValue &&) = default;
+ OOXMLUniversalMeasureValue(OOXMLUniversalMeasureValue const&) = default;
+ OOXMLUniversalMeasureValue(OOXMLUniversalMeasureValue&&) = default;
+ OOXMLUniversalMeasureValue& operator=(OOXMLUniversalMeasureValue const&) = default;
+ OOXMLUniversalMeasureValue& operator=(OOXMLUniversalMeasureValue&&) = default;
virtual int getInt() const override;
#ifdef DBG_UTIL
@@ -292,12 +308,11 @@ public:
template <sal_uInt32 npPt> class OOXMLNthPtMeasureValue : public OOXMLUniversalMeasureValue
{
public:
- explicit OOXMLNthPtMeasureValue(const char * pValue)
- : OOXMLUniversalMeasureValue(pValue, npPt) {}
- virtual OOXMLValue* clone() const override
+ explicit OOXMLNthPtMeasureValue(const char* pValue)
+ : OOXMLUniversalMeasureValue(pValue, npPt)
{
- return new OOXMLNthPtMeasureValue<npPt>(*this);
}
+ virtual OOXMLValue* clone() const override { return new OOXMLNthPtMeasureValue<npPt>(*this); }
};
/// Handles OOXML's ST_TwipsMeasure value.
@@ -309,14 +324,12 @@ typedef OOXMLNthPtMeasureValue<2> OOXMLHpsMeasureValue;
class OOXMLMeasurementOrPercentValue : public OOXMLValue
{
int mnValue;
+
public:
- explicit OOXMLMeasurementOrPercentValue(const char * pValue);
+ explicit OOXMLMeasurementOrPercentValue(const char* pValue);
virtual int getInt() const override;
- virtual OOXMLValue* clone() const override
- {
- return new OOXMLMeasurementOrPercentValue(*this);
- }
+ virtual OOXMLValue* clone() const override { return new OOXMLMeasurementOrPercentValue(*this); }
#ifdef DBG_UTIL
virtual std::string toString() const override;
#endif
@@ -325,29 +338,31 @@ public:
class OOXMLShapeValue : public OOXMLValue
{
css::uno::Reference<css::drawing::XShape> mrShape;
+
public:
- explicit OOXMLShapeValue(css::uno::Reference<css::drawing::XShape> const & rShape);
+ explicit OOXMLShapeValue(css::uno::Reference<css::drawing::XShape> const& rShape);
virtual ~OOXMLShapeValue() override;
virtual css::uno::Any getAny() const override;
#ifdef DBG_UTIL
virtual std::string toString() const override;
#endif
- virtual OOXMLValue * clone() const override;
+ virtual OOXMLValue* clone() const override;
};
class OOXMLStarMathValue : public OOXMLValue
{
- css::uno::Reference< css::embed::XEmbeddedObject > component;
+ css::uno::Reference<css::embed::XEmbeddedObject> component;
+
public:
- explicit OOXMLStarMathValue( css::uno::Reference< css::embed::XEmbeddedObject > const & component );
+ explicit OOXMLStarMathValue(css::uno::Reference<css::embed::XEmbeddedObject> const& component);
virtual ~OOXMLStarMathValue() override;
virtual css::uno::Any getAny() const override;
#ifdef DBG_UTIL
virtual std::string toString() const override;
#endif
- virtual OOXMLValue * clone() const override;
+ virtual OOXMLValue* clone() const override;
};
class OOXMLPropertySetEntryToString : public Properties
@@ -359,41 +374,41 @@ public:
explicit OOXMLPropertySetEntryToString(Id nId);
virtual ~OOXMLPropertySetEntryToString() override;
- virtual void sprm(Sprm & rSprm) override;
- virtual void attribute(Id nId, Value & rValue) override;
+ virtual void sprm(Sprm& rSprm) override;
+ virtual void attribute(Id nId, Value& rValue) override;
- const OUString & getString() const { return mStr;}
+ const OUString& getString() const { return mStr; }
};
class OOXMLPropertySetEntryToInteger : public Properties
{
Id mnId;
int mnValue;
+
public:
explicit OOXMLPropertySetEntryToInteger(Id nId);
virtual ~OOXMLPropertySetEntryToInteger() override;
- virtual void sprm(Sprm & rSprm) override;
- virtual void attribute(Id nId, Value & rValue) override;
+ virtual void sprm(Sprm& rSprm) override;
+ virtual void attribute(Id nId, Value& rValue) override;
- int getValue() const { return mnValue;}
+ int getValue() const { return mnValue; }
};
class OOXMLPropertySetEntryToBool : public Properties
{
Id mnId;
bool mValue;
+
public:
explicit OOXMLPropertySetEntryToBool(Id nId);
virtual ~OOXMLPropertySetEntryToBool() override;
- virtual void sprm(Sprm & rSprm) override;
- virtual void attribute(Id nId, Value & rValue) override;
+ virtual void sprm(Sprm& rSprm) override;
+ virtual void attribute(Id nId, Value& rValue) override;
bool getValue() const { return mValue; }
};
-
-
}
#endif // INCLUDED_WRITERFILTER_SOURCE_OOXML_OOXMLPROPERTYSET_HXX
More information about the Libreoffice-commits
mailing list