Skip to content

C
core
Kaydet (Commit) 04fc3bc9 authored tarafından Miklos Vajna's avatar Miklos Vajna
Dosyalara gözat
Seçenekler

writerfilter: fix indentation in rtfvalue 

Change-Id: I40edb3980fe9cf9e88a7bd75b542dc44509fd74b
üst 084e656d
Hide whitespace changes
Inline Side-by-side
Showing with 109 additions and 107 deletions
writerfilter/source/rtftok/rtfvalue.cxx
Dosyayı görüntüle @ 04fc3bc9
...@@ -10,20 +10,22 @@ ...@@ -10,20 +10,22 @@
#include <rtfreferenceproperties.hxx> #include <rtfreferenceproperties.hxx>
#include <rtfdocumentimpl.hxx> #include <rtfdocumentimpl.hxx>
namespace writerfilter { namespace writerfilter
namespace rtftok { {
namespace rtftok
{
RTFValue::RTFValue(int nValue, const OUString& sValue, RTFSprms rAttributes, RTFValue::RTFValue(int nValue, const OUString& sValue, RTFSprms rAttributes,
RTFSprms rSprms, uno::Reference<drawing::XShape> xShape, RTFSprms rSprms, uno::Reference<drawing::XShape> xShape,
uno::Reference<io::XInputStream> xStream, uno::Reference<embed::XEmbeddedObject> xObject, bool bForceString, uno::Reference<io::XInputStream> xStream, uno::Reference<embed::XEmbeddedObject> xObject, bool bForceString,
RTFShape aShape) RTFShape aShape)
: m_nValue(nValue), : m_nValue(nValue),
m_sValue(sValue), m_sValue(sValue),
m_xShape(xShape), m_xShape(xShape),
m_xStream(xStream), m_xStream(xStream),
m_xObject(xObject), m_xObject(xObject),
m_bForceString(bForceString) m_bForceString(bForceString)
{ {
m_pAttributes.reset(new RTFSprms(rAttributes)); m_pAttributes.reset(new RTFSprms(rAttributes));
m_pSprms.reset(new RTFSprms(rSprms)); m_pSprms.reset(new RTFSprms(rSprms));
...@@ -32,11 +34,11 @@ RTFValue::RTFValue(int nValue, const OUString& sValue, RTFSprms rAttributes, ...@@ -32,11 +34,11 @@ RTFValue::RTFValue(int nValue, const OUString& sValue, RTFSprms rAttributes,
RTFValue::RTFValue() RTFValue::RTFValue()
: m_nValue(0), : m_nValue(0),
m_sValue(), m_sValue(),
m_xShape(), m_xShape(),
m_xStream(), m_xStream(),
m_xObject(), m_xObject(),
m_bForceString(false) m_bForceString(false)
{ {
m_pAttributes.reset(new RTFSprms()); m_pAttributes.reset(new RTFSprms());
m_pSprms.reset(new RTFSprms()); m_pSprms.reset(new RTFSprms());
...@@ -45,11 +47,11 @@ RTFValue::RTFValue() ...@@ -45,11 +47,11 @@ RTFValue::RTFValue()
RTFValue::RTFValue(int nValue) RTFValue::RTFValue(int nValue)
: m_nValue(nValue), : m_nValue(nValue),
m_sValue(), m_sValue(),
m_xShape(), m_xShape(),
m_xStream(), m_xStream(),
m_xObject(), m_xObject(),
m_bForceString(false) m_bForceString(false)
{ {
m_pAttributes.reset(new RTFSprms()); m_pAttributes.reset(new RTFSprms());
m_pSprms.reset(new RTFSprms()); m_pSprms.reset(new RTFSprms());
...@@ -58,11 +60,11 @@ RTFValue::RTFValue(int nValue) ...@@ -58,11 +60,11 @@ RTFValue::RTFValue(int nValue)
RTFValue::RTFValue(const OUString& sValue, bool bForce) RTFValue::RTFValue(const OUString& sValue, bool bForce)
: m_nValue(), : m_nValue(),
m_sValue(sValue), m_sValue(sValue),
m_xShape(), m_xShape(),
m_xStream(), m_xStream(),
m_xObject(), m_xObject(),
m_bForceString(bForce) m_bForceString(bForce)
{ {
m_pAttributes.reset(new RTFSprms()); m_pAttributes.reset(new RTFSprms());
m_pSprms.reset(new RTFSprms()); m_pSprms.reset(new RTFSprms());
...@@ -71,11 +73,11 @@ RTFValue::RTFValue(const OUString& sValue, bool bForce) ...@@ -71,11 +73,11 @@ RTFValue::RTFValue(const OUString& sValue, bool bForce)
RTFValue::RTFValue(RTFSprms rAttributes) RTFValue::RTFValue(RTFSprms rAttributes)
: m_nValue(), : m_nValue(),
m_sValue(), m_sValue(),
m_xShape(), m_xShape(),
m_xStream(), m_xStream(),
m_xObject(), m_xObject(),
m_bForceString(false) m_bForceString(false)
{ {
m_pAttributes.reset(new RTFSprms(rAttributes)); m_pAttributes.reset(new RTFSprms(rAttributes));
m_pSprms.reset(new RTFSprms()); m_pSprms.reset(new RTFSprms());
...@@ -84,11 +86,11 @@ RTFValue::RTFValue(RTFSprms rAttributes) ...@@ -84,11 +86,11 @@ RTFValue::RTFValue(RTFSprms rAttributes)
RTFValue::RTFValue(RTFSprms rAttributes, RTFSprms rSprms) RTFValue::RTFValue(RTFSprms rAttributes, RTFSprms rSprms)
: m_nValue(), : m_nValue(),
m_sValue(), m_sValue(),
m_xShape(), m_xShape(),
m_xStream(), m_xStream(),
m_xObject(), m_xObject(),
m_bForceString(false) m_bForceString(false)
{ {
m_pAttributes.reset(new RTFSprms(rAttributes)); m_pAttributes.reset(new RTFSprms(rAttributes));
m_pSprms.reset(new RTFSprms(rSprms)); m_pSprms.reset(new RTFSprms(rSprms));
...@@ -97,11 +99,11 @@ RTFValue::RTFValue(RTFSprms rAttributes, RTFSprms rSprms) ...@@ -97,11 +99,11 @@ RTFValue::RTFValue(RTFSprms rAttributes, RTFSprms rSprms)
RTFValue::RTFValue(uno::Reference<drawing::XShape> rShape) RTFValue::RTFValue(uno::Reference<drawing::XShape> rShape)
: m_nValue(), : m_nValue(),
m_sValue(), m_sValue(),
m_xShape(rShape), m_xShape(rShape),
m_xStream(), m_xStream(),
m_xObject(), m_xObject(),
m_bForceString(false) m_bForceString(false)
{ {
m_pAttributes.reset(new RTFSprms()); m_pAttributes.reset(new RTFSprms());
m_pSprms.reset(new RTFSprms()); m_pSprms.reset(new RTFSprms());
...@@ -110,11 +112,11 @@ RTFValue::RTFValue(uno::Reference<drawing::XShape> rShape) ...@@ -110,11 +112,11 @@ RTFValue::RTFValue(uno::Reference<drawing::XShape> rShape)
RTFValue::RTFValue(uno::Reference<io::XInputStream> rStream) RTFValue::RTFValue(uno::Reference<io::XInputStream> rStream)
: m_nValue(), : m_nValue(),
m_sValue(), m_sValue(),
m_xShape(), m_xShape(),
m_xStream(rStream), m_xStream(rStream),
m_xObject(), m_xObject(),
m_bForceString(false) m_bForceString(false)
{ {
m_pAttributes.reset(new RTFSprms()); m_pAttributes.reset(new RTFSprms());
m_pSprms.reset(new RTFSprms()); m_pSprms.reset(new RTFSprms());
...@@ -123,11 +125,11 @@ RTFValue::RTFValue(uno::Reference<io::XInputStream> rStream) ...@@ -123,11 +125,11 @@ RTFValue::RTFValue(uno::Reference<io::XInputStream> rStream)
RTFValue::RTFValue(uno::Reference<embed::XEmbeddedObject> xObject) RTFValue::RTFValue(uno::Reference<embed::XEmbeddedObject> xObject)
: m_nValue(), : m_nValue(),
m_sValue(), m_sValue(),
m_xShape(), m_xShape(),
m_xStream(), m_xStream(),
m_xObject(xObject), m_xObject(xObject),
m_bForceString(false) m_bForceString(false)
{ {
m_pAttributes.reset(new RTFSprms()); m_pAttributes.reset(new RTFSprms());
m_pSprms.reset(new RTFSprms()); m_pSprms.reset(new RTFSprms());
...@@ -136,11 +138,11 @@ RTFValue::RTFValue(uno::Reference<embed::XEmbeddedObject> xObject) ...@@ -136,11 +138,11 @@ RTFValue::RTFValue(uno::Reference<embed::XEmbeddedObject> xObject)
RTFValue::RTFValue(RTFShape aShape) RTFValue::RTFValue(RTFShape aShape)
: m_nValue(), : m_nValue(),
m_sValue(), m_sValue(),
m_xShape(), m_xShape(),
m_xStream(), m_xStream(),
m_xObject(), m_xObject(),
m_bForceString(false) m_bForceString(false)
{ {
m_pAttributes.reset(new RTFSprms()); m_pAttributes.reset(new RTFSprms());
m_pSprms.reset(new RTFSprms()); m_pSprms.reset(new RTFSprms());
...@@ -192,9 +194,7 @@ RTFShape& RTFValue::getShape() const ...@@ -192,9 +194,7 @@ RTFShape& RTFValue::getShape() const
writerfilter::Reference<Properties>::Pointer_t RTFValue::getProperties() writerfilter::Reference<Properties>::Pointer_t RTFValue::getProperties()
{ {
writerfilter::Reference<Properties>::Pointer_t const pProperties( writerfilter::Reference<Properties>::Pointer_t pProperties(new RTFReferenceProperties(*m_pAttributes, *m_pSprms));
new RTFReferenceProperties(*m_pAttributes, *m_pSprms)
);
return pProperties; return pProperties;
} }
......
writerfilter/source/rtftok/rtfvalue.hxx
Dosyayı görüntüle @ 04fc3bc9
...@@ -14,55 +14,57 @@ ...@@ -14,55 +14,57 @@
#include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/embed/XEmbeddedObject.hpp>
namespace writerfilter { namespace writerfilter
namespace rtftok { {
class RTFSprms; namespace rtftok
class RTFShape; {
/// Value of an RTF keyword class RTFSprms;
class RTFValue class RTFShape;
: public Value /// Value of an RTF keyword
{ class RTFValue
public: : public Value
typedef boost::shared_ptr<RTFValue> Pointer_t; {
RTFValue(int nValue, const OUString& sValue, RTFSprms rAttributes, RTFSprms rSprms, uno::Reference<drawing::XShape> rShape, public:
uno::Reference<io::XInputStream> rStream, uno::Reference<embed::XEmbeddedObject> rObject, bool bForceString, typedef boost::shared_ptr<RTFValue> Pointer_t;
RTFShape aShape); RTFValue(int nValue, const OUString& sValue, RTFSprms rAttributes, RTFSprms rSprms, uno::Reference<drawing::XShape> rShape,
RTFValue(); uno::Reference<io::XInputStream> rStream, uno::Reference<embed::XEmbeddedObject> rObject, bool bForceString,
RTFValue(int nValue); RTFShape aShape);
RTFValue(const OUString& sValue, bool bForce = false); RTFValue();
RTFValue(RTFSprms rAttributes); RTFValue(int nValue);
RTFValue(RTFSprms rAttributes, RTFSprms rSprms); RTFValue(const OUString& sValue, bool bForce = false);
RTFValue(uno::Reference<drawing::XShape> rShape); RTFValue(RTFSprms rAttributes);
RTFValue(uno::Reference<io::XInputStream> rStream); RTFValue(RTFSprms rAttributes, RTFSprms rSprms);
RTFValue(uno::Reference<embed::XEmbeddedObject> rObject); RTFValue(uno::Reference<drawing::XShape> rShape);
RTFValue(RTFShape aShape); RTFValue(uno::Reference<io::XInputStream> rStream);
virtual ~RTFValue(); RTFValue(uno::Reference<embed::XEmbeddedObject> rObject);
void setString(const OUString& sValue); RTFValue(RTFShape aShape);
virtual int getInt() const SAL_OVERRIDE; virtual ~RTFValue();
virtual OUString getString() const SAL_OVERRIDE; void setString(const OUString& sValue);
virtual uno::Any getAny() const SAL_OVERRIDE; virtual int getInt() const SAL_OVERRIDE;
virtual writerfilter::Reference<Properties>::Pointer_t getProperties() SAL_OVERRIDE; virtual OUString getString() const SAL_OVERRIDE;
virtual writerfilter::Reference<Stream>::Pointer_t getStream() SAL_OVERRIDE; virtual uno::Any getAny() const SAL_OVERRIDE;
virtual writerfilter::Reference<BinaryObj>::Pointer_t getBinary() SAL_OVERRIDE; virtual writerfilter::Reference<Properties>::Pointer_t getProperties() SAL_OVERRIDE;
virtual std::string toString() const SAL_OVERRIDE; virtual writerfilter::Reference<Stream>::Pointer_t getStream() SAL_OVERRIDE;
virtual RTFValue* Clone(); virtual writerfilter::Reference<BinaryObj>::Pointer_t getBinary() SAL_OVERRIDE;
RTFSprms& getAttributes(); virtual std::string toString() const SAL_OVERRIDE;
RTFSprms& getSprms(); virtual RTFValue* Clone();
RTFShape& getShape() const; RTFSprms& getAttributes();
bool equals(RTFValue& rOther); RTFSprms& getSprms();
private: RTFShape& getShape() const;
RTFValue& operator=(RTFValue const& rOther); bool equals(RTFValue& rOther);
int m_nValue; private:
OUString m_sValue; RTFValue& operator=(RTFValue const& rOther);
boost::shared_ptr<RTFSprms> m_pAttributes; int m_nValue;
boost::shared_ptr<RTFSprms> m_pSprms; OUString m_sValue;
uno::Reference<drawing::XShape> m_xShape; boost::shared_ptr<RTFSprms> m_pAttributes;
uno::Reference<io::XInputStream> m_xStream; boost::shared_ptr<RTFSprms> m_pSprms;
uno::Reference<embed::XEmbeddedObject> m_xObject; uno::Reference<drawing::XShape> m_xShape;
bool m_bForceString; uno::Reference<io::XInputStream> m_xStream;
boost::shared_ptr<RTFShape> m_pShape; uno::Reference<embed::XEmbeddedObject> m_xObject;
}; bool m_bForceString;
} // namespace rtftok boost::shared_ptr<RTFShape> m_pShape;
};
} // namespace rtftok
} // namespace writerfilter } // namespace writerfilter
#endif // INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFVALUE_HXX #endif // INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFVALUE_HXX
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment