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 @@
#include <rtfreferenceproperties.hxx>
#include <rtfdocumentimpl.hxx>
namespace writerfilter {
namespace rtftok {
namespace writerfilter
{
namespace rtftok
{
RTFValue::RTFValue(int nValue, const OUString& sValue, RTFSprms rAttributes,
RTFSprms rSprms, uno::Reference<drawing::XShape> xShape,
uno::Reference<io::XInputStream> xStream, uno::Reference<embed::XEmbeddedObject> xObject, bool bForceString,
RTFShape aShape)
RTFSprms rSprms, uno::Reference<drawing::XShape> xShape,
uno::Reference<io::XInputStream> xStream, uno::Reference<embed::XEmbeddedObject> xObject, bool bForceString,
RTFShape aShape)
: m_nValue(nValue),
m_sValue(sValue),
m_xShape(xShape),
m_xStream(xStream),
m_xObject(xObject),
m_bForceString(bForceString)
m_sValue(sValue),
m_xShape(xShape),
m_xStream(xStream),
m_xObject(xObject),
m_bForceString(bForceString)
{
m_pAttributes.reset(new RTFSprms(rAttributes));
m_pSprms.reset(new RTFSprms(rSprms));
......@@ -32,11 +34,11 @@ RTFValue::RTFValue(int nValue, const OUString& sValue, RTFSprms rAttributes,
RTFValue::RTFValue()
: m_nValue(0),
m_sValue(),
m_xShape(),
m_xStream(),
m_xObject(),
m_bForceString(false)
m_sValue(),
m_xShape(),
m_xStream(),
m_xObject(),
m_bForceString(false)
{
m_pAttributes.reset(new RTFSprms());
m_pSprms.reset(new RTFSprms());
......@@ -45,11 +47,11 @@ RTFValue::RTFValue()
RTFValue::RTFValue(int nValue)
: m_nValue(nValue),
m_sValue(),
m_xShape(),
m_xStream(),
m_xObject(),
m_bForceString(false)
m_sValue(),
m_xShape(),
m_xStream(),
m_xObject(),
m_bForceString(false)
{
m_pAttributes.reset(new RTFSprms());
m_pSprms.reset(new RTFSprms());
......@@ -58,11 +60,11 @@ RTFValue::RTFValue(int nValue)
RTFValue::RTFValue(const OUString& sValue, bool bForce)
: m_nValue(),
m_sValue(sValue),
m_xShape(),
m_xStream(),
m_xObject(),
m_bForceString(bForce)
m_sValue(sValue),
m_xShape(),
m_xStream(),
m_xObject(),
m_bForceString(bForce)
{
m_pAttributes.reset(new RTFSprms());
m_pSprms.reset(new RTFSprms());
......@@ -71,11 +73,11 @@ RTFValue::RTFValue(const OUString& sValue, bool bForce)
RTFValue::RTFValue(RTFSprms rAttributes)
: m_nValue(),
m_sValue(),
m_xShape(),
m_xStream(),
m_xObject(),
m_bForceString(false)
m_sValue(),
m_xShape(),
m_xStream(),
m_xObject(),
m_bForceString(false)
{
m_pAttributes.reset(new RTFSprms(rAttributes));
m_pSprms.reset(new RTFSprms());
......@@ -84,11 +86,11 @@ RTFValue::RTFValue(RTFSprms rAttributes)
RTFValue::RTFValue(RTFSprms rAttributes, RTFSprms rSprms)
: m_nValue(),
m_sValue(),
m_xShape(),
m_xStream(),
m_xObject(),
m_bForceString(false)
m_sValue(),
m_xShape(),
m_xStream(),
m_xObject(),
m_bForceString(false)
{
m_pAttributes.reset(new RTFSprms(rAttributes));
m_pSprms.reset(new RTFSprms(rSprms));
......@@ -97,11 +99,11 @@ RTFValue::RTFValue(RTFSprms rAttributes, RTFSprms rSprms)
RTFValue::RTFValue(uno::Reference<drawing::XShape> rShape)
: m_nValue(),
m_sValue(),
m_xShape(rShape),
m_xStream(),
m_xObject(),
m_bForceString(false)
m_sValue(),
m_xShape(rShape),
m_xStream(),
m_xObject(),
m_bForceString(false)
{
m_pAttributes.reset(new RTFSprms());
m_pSprms.reset(new RTFSprms());
......@@ -110,11 +112,11 @@ RTFValue::RTFValue(uno::Reference<drawing::XShape> rShape)
RTFValue::RTFValue(uno::Reference<io::XInputStream> rStream)
: m_nValue(),
m_sValue(),
m_xShape(),
m_xStream(rStream),
m_xObject(),
m_bForceString(false)
m_sValue(),
m_xShape(),
m_xStream(rStream),
m_xObject(),
m_bForceString(false)
{
m_pAttributes.reset(new RTFSprms());
m_pSprms.reset(new RTFSprms());
......@@ -123,11 +125,11 @@ RTFValue::RTFValue(uno::Reference<io::XInputStream> rStream)
RTFValue::RTFValue(uno::Reference<embed::XEmbeddedObject> xObject)
: m_nValue(),
m_sValue(),
m_xShape(),
m_xStream(),
m_xObject(xObject),
m_bForceString(false)
m_sValue(),
m_xShape(),
m_xStream(),
m_xObject(xObject),
m_bForceString(false)
{
m_pAttributes.reset(new RTFSprms());
m_pSprms.reset(new RTFSprms());
......@@ -136,11 +138,11 @@ RTFValue::RTFValue(uno::Reference<embed::XEmbeddedObject> xObject)
RTFValue::RTFValue(RTFShape aShape)
: m_nValue(),
m_sValue(),
m_xShape(),
m_xStream(),
m_xObject(),
m_bForceString(false)
m_sValue(),
m_xShape(),
m_xStream(),
m_xObject(),
m_bForceString(false)
{
m_pAttributes.reset(new RTFSprms());
m_pSprms.reset(new RTFSprms());
......@@ -192,9 +194,7 @@ RTFShape& RTFValue::getShape() const
writerfilter::Reference<Properties>::Pointer_t RTFValue::getProperties()
{
writerfilter::Reference<Properties>::Pointer_t const pProperties(
new RTFReferenceProperties(*m_pAttributes, *m_pSprms)
);
writerfilter::Reference<Properties>::Pointer_t pProperties(new RTFReferenceProperties(*m_pAttributes, *m_pSprms));
return pProperties;
}
......
writerfilter/source/rtftok/rtfvalue.hxx
Dosyayı görüntüle @ 04fc3bc9
......@@ -14,55 +14,57 @@
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
namespace writerfilter {
namespace rtftok {
class RTFSprms;
class RTFShape;
/// Value of an RTF keyword
class RTFValue
: public Value
{
public:
typedef boost::shared_ptr<RTFValue> Pointer_t;
RTFValue(int nValue, const OUString& sValue, RTFSprms rAttributes, RTFSprms rSprms, uno::Reference<drawing::XShape> rShape,
uno::Reference<io::XInputStream> rStream, uno::Reference<embed::XEmbeddedObject> rObject, bool bForceString,
RTFShape aShape);
RTFValue();
RTFValue(int nValue);
RTFValue(const OUString& sValue, bool bForce = false);
RTFValue(RTFSprms rAttributes);
RTFValue(RTFSprms rAttributes, RTFSprms rSprms);
RTFValue(uno::Reference<drawing::XShape> rShape);
RTFValue(uno::Reference<io::XInputStream> rStream);
RTFValue(uno::Reference<embed::XEmbeddedObject> rObject);
RTFValue(RTFShape aShape);
virtual ~RTFValue();
void setString(const OUString& sValue);
virtual int getInt() const SAL_OVERRIDE;
virtual OUString getString() const SAL_OVERRIDE;
virtual uno::Any getAny() const SAL_OVERRIDE;
virtual writerfilter::Reference<Properties>::Pointer_t getProperties() SAL_OVERRIDE;
virtual writerfilter::Reference<Stream>::Pointer_t getStream() SAL_OVERRIDE;
virtual writerfilter::Reference<BinaryObj>::Pointer_t getBinary() SAL_OVERRIDE;
virtual std::string toString() const SAL_OVERRIDE;
virtual RTFValue* Clone();
RTFSprms& getAttributes();
RTFSprms& getSprms();
RTFShape& getShape() const;
bool equals(RTFValue& rOther);
private:
RTFValue& operator=(RTFValue const& rOther);
int m_nValue;
OUString m_sValue;
boost::shared_ptr<RTFSprms> m_pAttributes;
boost::shared_ptr<RTFSprms> m_pSprms;
uno::Reference<drawing::XShape> m_xShape;
uno::Reference<io::XInputStream> m_xStream;
uno::Reference<embed::XEmbeddedObject> m_xObject;
bool m_bForceString;
boost::shared_ptr<RTFShape> m_pShape;
};
} // namespace rtftok
namespace writerfilter
{
namespace rtftok
{
class RTFSprms;
class RTFShape;
/// Value of an RTF keyword
class RTFValue
: public Value
{
public:
typedef boost::shared_ptr<RTFValue> Pointer_t;
RTFValue(int nValue, const OUString& sValue, RTFSprms rAttributes, RTFSprms rSprms, uno::Reference<drawing::XShape> rShape,
uno::Reference<io::XInputStream> rStream, uno::Reference<embed::XEmbeddedObject> rObject, bool bForceString,
RTFShape aShape);
RTFValue();
RTFValue(int nValue);
RTFValue(const OUString& sValue, bool bForce = false);
RTFValue(RTFSprms rAttributes);
RTFValue(RTFSprms rAttributes, RTFSprms rSprms);
RTFValue(uno::Reference<drawing::XShape> rShape);
RTFValue(uno::Reference<io::XInputStream> rStream);
RTFValue(uno::Reference<embed::XEmbeddedObject> rObject);
RTFValue(RTFShape aShape);
virtual ~RTFValue();
void setString(const OUString& sValue);
virtual int getInt() const SAL_OVERRIDE;
virtual OUString getString() const SAL_OVERRIDE;
virtual uno::Any getAny() const SAL_OVERRIDE;
virtual writerfilter::Reference<Properties>::Pointer_t getProperties() SAL_OVERRIDE;
virtual writerfilter::Reference<Stream>::Pointer_t getStream() SAL_OVERRIDE;
virtual writerfilter::Reference<BinaryObj>::Pointer_t getBinary() SAL_OVERRIDE;
virtual std::string toString() const SAL_OVERRIDE;
virtual RTFValue* Clone();
RTFSprms& getAttributes();
RTFSprms& getSprms();
RTFShape& getShape() const;
bool equals(RTFValue& rOther);
private:
RTFValue& operator=(RTFValue const& rOther);
int m_nValue;
OUString m_sValue;
boost::shared_ptr<RTFSprms> m_pAttributes;
boost::shared_ptr<RTFSprms> m_pSprms;
uno::Reference<drawing::XShape> m_xShape;
uno::Reference<io::XInputStream> m_xStream;
uno::Reference<embed::XEmbeddedObject> m_xObject;
bool m_bForceString;
boost::shared_ptr<RTFShape> m_pShape;
};
} // namespace rtftok
} // namespace writerfilter
#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