[Libreoffice-commits] .: writerfilter/source
Miklos Vajna
vmiklos at kemper.freedesktop.org
Sat Jul 2 05:04:21 PDT 2011
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 8 ++++----
writerfilter/source/rtftok/rtfdocumentimpl.hxx | 12 ++++++------
writerfilter/source/rtftok/rtfsprm.hxx | 2 +-
writerfilter/source/rtftok/rtfvalue.hxx | 18 +++++++++---------
4 files changed, 20 insertions(+), 20 deletions(-)
New commits:
commit 714d4f88c545e5559bbfd7d23ae33f1acea76a05
Author: Miklos Vajna <vmiklos at frugalware.org>
Date: Sat Jul 2 13:54:42 2011 +0200
rtftok: '>>' should be '> >' within a nested template argument list
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index ff462d3..930059d 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -709,7 +709,7 @@ void RTFDocumentImpl::text(OUString& rString)
}
}
-void RTFDocumentImpl::replayBuffer(std::deque<std::pair<RTFBufferTypes, RTFValue::Pointer_t>>& rBuffer)
+void RTFDocumentImpl::replayBuffer(std::deque< std::pair<RTFBufferTypes, RTFValue::Pointer_t> >& rBuffer)
{
while (rBuffer.size())
{
@@ -2177,7 +2177,7 @@ int RTFDocumentImpl::popState()
bool bListLevelEnd = false;
bool bListOverrideEntryEnd = false;
bool bLevelTextEnd = false;
- std::vector<std::pair<rtl::OUString, rtl::OUString>> aShapeProperties;
+ std::vector< std::pair<rtl::OUString, rtl::OUString> > aShapeProperties;
bool bPopShapeProperties = false;
bool bPicPropEnd = false;
@@ -2384,9 +2384,9 @@ int RTFDocumentImpl::popState()
return 0;
}
-void RTFDocumentImpl::resolveShapeProperties(std::vector<std::pair<rtl::OUString, rtl::OUString>>& rShapeProperties)
+void RTFDocumentImpl::resolveShapeProperties(std::vector< std::pair<rtl::OUString, rtl::OUString> >& rShapeProperties)
{
- for (std::vector<std::pair<rtl::OUString, rtl::OUString>>::iterator i = rShapeProperties.begin(); i != rShapeProperties.end(); ++i)
+ for (std::vector< std::pair<rtl::OUString, rtl::OUString> >::iterator i = rShapeProperties.begin(); i != rShapeProperties.end(); ++i)
{
if (i->first.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("shapeType")))
{
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index d515850..90618a8 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -190,7 +190,7 @@ namespace writerfilter {
float nPictureScaleX;
float nPictureScaleY;
- std::vector<std::pair<rtl::OUString, rtl::OUString>> aShapeProperties;
+ std::vector< std::pair<rtl::OUString, rtl::OUString> > aShapeProperties;
/// Current cellx value.
int nCellX;
@@ -230,7 +230,7 @@ namespace writerfilter {
private:
int resolveParse();
int resolveKeyword();
- void resolveShapeProperties(std::vector<std::pair<rtl::OUString, rtl::OUString>>& rShapeProperties);
+ void resolveShapeProperties(std::vector< std::pair<rtl::OUString, rtl::OUString> >& rShapeProperties);
int dispatchKeyword(rtl::OString& rKeyword, bool bParam, int nParam);
int dispatchFlag(RTFKeyword nKeyword);
@@ -247,7 +247,7 @@ namespace writerfilter {
void text(rtl::OUString& rString);
void parBreak();
void sectBreak(bool bFinal);
- void replayBuffer(std::deque<std::pair<RTFBufferTypes, RTFValue::Pointer_t>>& rBuffer);
+ void replayBuffer(std::deque< std::pair<RTFBufferTypes, RTFValue::Pointer_t> >& rBuffer);
com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const& m_xContext;
com::sun::star::uno::Reference<com::sun::star::io::XInputStream> const& m_xInputStream;
@@ -278,15 +278,15 @@ namespace writerfilter {
oox::GraphicHelper* m_pGraphicHelper;
/// Buffered table cells, till cell definitions are not reached.
- std::deque<std::pair<RTFBufferTypes, RTFValue::Pointer_t>> m_aTableBuffer;
+ std::deque< std::pair<RTFBufferTypes, RTFValue::Pointer_t> > m_aTableBuffer;
bool m_bTable;
/// Buffered superscript, till footnote is reached (or not).
- std::deque<std::pair<RTFBufferTypes, RTFValue::Pointer_t>> m_aSuperBuffer;
+ std::deque< std::pair<RTFBufferTypes, RTFValue::Pointer_t> > m_aSuperBuffer;
bool m_bSuper;
bool m_bHasFootnote;
/// If this is a substream.
bool m_bIsSubstream;
- std::deque<std::pair<Id, sal_uInt32>> m_nHeaderFooterPositions;
+ std::deque< std::pair<Id, sal_uInt32> > m_nHeaderFooterPositions;
sal_uInt32 m_nGroupStartPos;
/// Ignore the first occurrence of this text.
rtl::OUString m_aIgnoreFirst;
diff --git a/writerfilter/source/rtftok/rtfsprm.hxx b/writerfilter/source/rtftok/rtfsprm.hxx
index 711a5e7..441c7e9 100644
--- a/writerfilter/source/rtftok/rtfsprm.hxx
+++ b/writerfilter/source/rtftok/rtfsprm.hxx
@@ -36,7 +36,7 @@
namespace writerfilter {
namespace rtftok {
/// A list of RTFSprm
- typedef std::vector<std::pair<Id, RTFValue::Pointer_t>> RTFSprms_t;
+ typedef std::vector< std::pair<Id, RTFValue::Pointer_t> > RTFSprms_t;
namespace RTFSprms {
typedef ::boost::shared_ptr<RTFSprms_t> Pointer_t;
}
diff --git a/writerfilter/source/rtftok/rtfvalue.hxx b/writerfilter/source/rtftok/rtfvalue.hxx
index 700de71..e039719 100644
--- a/writerfilter/source/rtftok/rtfvalue.hxx
+++ b/writerfilter/source/rtftok/rtfvalue.hxx
@@ -41,13 +41,13 @@ namespace writerfilter {
{
public:
typedef ::boost::shared_ptr<RTFValue> Pointer_t;
- RTFValue(int nValue, rtl::OUString sValue, std::vector<std::pair<Id, RTFValue::Pointer_t>> rAttributes,
- std::vector<std::pair<Id, RTFValue::Pointer_t>> rSprms, uno::Reference<drawing::XShape> rShape);
+ RTFValue(int nValue, rtl::OUString sValue, std::vector< std::pair<Id, RTFValue::Pointer_t> > rAttributes,
+ std::vector< std::pair<Id, RTFValue::Pointer_t> > rSprms, uno::Reference<drawing::XShape> rShape);
RTFValue(int nValue);
RTFValue(rtl::OUString sValue, bool bForce = false);
- RTFValue(std::vector<std::pair<Id, RTFValue::Pointer_t>> rAttributes);
- RTFValue(std::vector<std::pair<Id, RTFValue::Pointer_t>> rAttributes,
- std::vector<std::pair<Id, RTFValue::Pointer_t>> rSprms);
+ RTFValue(std::vector< std::pair<Id, RTFValue::Pointer_t> > rAttributes);
+ RTFValue(std::vector< std::pair<Id, RTFValue::Pointer_t> > rAttributes,
+ std::vector< std::pair<Id, RTFValue::Pointer_t> > rSprms);
RTFValue(uno::Reference<drawing::XShape> rShape);
void setString(rtl::OUString sValue);
virtual int getInt() const;
@@ -58,13 +58,13 @@ namespace writerfilter {
virtual writerfilter::Reference<BinaryObj>::Pointer_t getBinary();
virtual std::string toString() const;
virtual RTFValue* Clone();
- std::vector<std::pair<Id, RTFValue::Pointer_t>>& getAttributes();
- std::vector<std::pair<Id, RTFValue::Pointer_t>>& getSprms();
+ std::vector< std::pair<Id, RTFValue::Pointer_t> >& getAttributes();
+ std::vector< std::pair<Id, RTFValue::Pointer_t> >& getSprms();
private:
int m_nValue;
rtl::OUString m_sValue;
- std::vector<std::pair<Id, RTFValue::Pointer_t>> m_rAttributes;
- std::vector<std::pair<Id, RTFValue::Pointer_t>> m_rSprms;
+ std::vector< std::pair<Id, RTFValue::Pointer_t> > m_rAttributes;
+ std::vector< std::pair<Id, RTFValue::Pointer_t> > m_rSprms;
uno::Reference<drawing::XShape> m_rShape;
bool m_bForceString;
};
More information about the Libreoffice-commits
mailing list