include/svl/grabbagitem.hxx | 5 ++-
oox/source/shape/LockedCanvasContext.hxx | 5 ++-
oox/source/shape/WpgContext.hxx | 5 ++-
oox/source/shape/WpsContext.hxx | 5 ++-
sw/qa/extras/rtfimport/rtfimport.cxx | 6 +--
sw/source/filter/ww8/rtfattributeoutput.hxx | 5 ++-
writerfilter/source/dmapper/SdtHelper.hxx | 25 ++++++++++++---
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 30 ++++--------------
writerfilter/source/rtftok/rtfdocumentimpl.hxx | 10 ++++--
writerfilter/source/rtftok/rtfreferenceproperties.hxx | 10 ++++--
writerfilter/source/rtftok/rtfsprm.cxx | 13 +++----
writerfilter/source/rtftok/rtftokenizer.hxx | 5 ++-
writerfilter/source/rtftok/rtfvalue.cxx | 3 -
13 files changed, 77 insertions(+), 50 deletions(-)
New commits:
commit 19863db3373effd2a4836481dd6706a0efe6db39
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Thu Jun 19 09:39:49 2014 +0200
indentation fixes
Change-Id: Ia391ccc9889a135730f0fead11eb0b6c2f748ec4
diff --git a/include/svl/grabbagitem.hxx b/include/svl/grabbagitem.hxx
index 9ba6868..c02edaa 100644
--- a/include/svl/grabbagitem.hxx
+++ b/include/svl/grabbagitem.hxx
@@ -30,7 +30,10 @@ public:
SfxGrabBagItem(const SfxGrabBagItem& rItem);
virtual ~SfxGrabBagItem();
- const std::map<OUString, com::sun::star::uno::Any>& GetGrabBag() const {
return m_aMap;}
+ const std::map<OUString, com::sun::star::uno::Any>& GetGrabBag() const
+ {
+ return m_aMap;
+ }
virtual bool operator==(const SfxPoolItem&) const SAL_OVERRIDE;
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE;
diff --git a/oox/source/shape/LockedCanvasContext.hxx
b/oox/source/shape/LockedCanvasContext.hxx
index ab8ceae..4284eec 100644
--- a/oox/source/shape/LockedCanvasContext.hxx
+++ b/oox/source/shape/LockedCanvasContext.hxx
@@ -27,7 +27,10 @@ public:
virtual ::oox::core::ContextHandlerRef onCreateContext(sal_Int32 Element,
const ::oox::AttributeList& rAttribs) SAL_OVERRIDE;
- oox::drawingml::ShapePtr getShape() { return mpShape;}
+ oox::drawingml::ShapePtr getShape()
+ {
+ return mpShape;
+ }
protected:
diff --git a/oox/source/shape/WpgContext.hxx b/oox/source/shape/WpgContext.hxx
index e59cf54..694aef0 100644
--- a/oox/source/shape/WpgContext.hxx
+++ b/oox/source/shape/WpgContext.hxx
@@ -27,7 +27,10 @@ public:
virtual oox::core::ContextHandlerRef onCreateContext(sal_Int32
nElementToken, const oox::AttributeList& rAttribs) SAL_OVERRIDE;
- oox::drawingml::ShapePtr getShape() { return mpShape;}
+ oox::drawingml::ShapePtr getShape()
+ {
+ return mpShape;
+ }
protected:
oox::drawingml::ShapePtr mpShape;
diff --git a/oox/source/shape/WpsContext.hxx b/oox/source/shape/WpsContext.hxx
index cde3532..c7678c7 100644
--- a/oox/source/shape/WpsContext.hxx
+++ b/oox/source/shape/WpsContext.hxx
@@ -27,7 +27,10 @@ public:
virtual oox::core::ContextHandlerRef onCreateContext(sal_Int32
nElementToken, const oox::AttributeList& rAttribs) SAL_OVERRIDE;
- oox::drawingml::ShapePtr getShape() { return mpShape;}
+ oox::drawingml::ShapePtr getShape()
+ {
+ return mpShape;
+ }
protected:
oox::drawingml::ShapePtr mpShape;
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 79a4494..8d8e048 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1173,10 +1173,8 @@ DECLARE_RTFIMPORT_TEST(testN825305, "n825305.rtf")
DECLARE_RTFIMPORT_TEST(testParaBottomMargin, "para-bottom-margin.rtf")
{
- uno::Reference<beans::XPropertySet> xPropertySet(
- getStyles("ParagraphStyles")->getByName("Standard"), uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(sal_Int32(353),
- getProperty<sal_Int32>(xPropertySet, "ParaBottomMargin"));
+ uno::Reference<beans::XPropertySet>
xPropertySet(getStyles("ParagraphStyles")->getByName("Standard"),
uno::UNO_QUERY);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(353), getProperty<sal_Int32>(xPropertySet,
"ParaBottomMargin"));
// This was 353, i.e. bottom margin of the paragraph was 0.35cm instead of
0.
// The reason why this is 0 despite the default style containing \sa200
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx
b/sw/source/filter/ww8/rtfattributeoutput.hxx
index fdd8ff1..8452f73 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -76,7 +76,10 @@ public:
// Access to (anyway) private buffers, used by the sdr exporter
OStringBuffer& RunText();
- OStringBuffer& Styles() { return m_aStyles; }
+ OStringBuffer& Styles()
+ {
+ return m_aStyles;
+ }
/// Output text (without markup).
virtual void RawText(const OUString& rText, bool bForceUnicode,
rtl_TextEncoding eCharSet) SAL_OVERRIDE;
diff --git a/writerfilter/source/dmapper/SdtHelper.hxx
b/writerfilter/source/dmapper/SdtHelper.hxx
index b634109..5f5f81d 100644
--- a/writerfilter/source/dmapper/SdtHelper.hxx
+++ b/writerfilter/source/dmapper/SdtHelper.hxx
@@ -69,11 +69,26 @@ public:
SdtHelper(DomainMapper_Impl& rDM_Impl);
virtual ~SdtHelper();
- std::vector<OUString>& getDropDownItems() { return m_aDropDownItems;}
- OUStringBuffer& getSdtTexts() { return m_aSdtTexts;}
- OUStringBuffer& getDate() { return m_sDate;}
- OUStringBuffer& getDateFormat() { return m_sDateFormat;}
- OUStringBuffer& getLocale() { return m_sLocale;}
+ std::vector<OUString>& getDropDownItems()
+ {
+ return m_aDropDownItems;
+ }
+ OUStringBuffer& getSdtTexts()
+ {
+ return m_aSdtTexts;
+ }
+ OUStringBuffer& getDate()
+ {
+ return m_sDate;
+ }
+ OUStringBuffer& getDateFormat()
+ {
+ return m_sDateFormat;
+ }
+ OUStringBuffer& getLocale()
+ {
+ return m_sLocale;
+ }
/// If createControlShape() was ever called.
bool hasElements()
{
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 2dd00c7..d162aa4 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -443,12 +443,9 @@ writerfilter::Reference<Properties>::Pointer_t
RTFDocumentImpl::getProperties(RT
{
RTFReferenceProperties& rProps =
*(RTFReferenceProperties*)it->second.get();
// Get rid of direct formatting what is already in the style.
- RTFSprms const sprms(
- rSprms.cloneAndDeduplicate(rProps.getSprms()));
- RTFSprms const attributes(
- rAttributes.cloneAndDeduplicate(rProps.getAttributes()));
- return writerfilter::Reference<Properties>::Pointer_t(
- new RTFReferenceProperties(attributes, sprms));
+ RTFSprms const sprms(rSprms.cloneAndDeduplicate(rProps.getSprms()));
+ RTFSprms const
attributes(rAttributes.cloneAndDeduplicate(rProps.getAttributes()));
+ return writerfilter::Reference<Properties>::Pointer_t(new
RTFReferenceProperties(attributes, sprms));
}
writerfilter::Reference<Properties>::Pointer_t pRet(new
RTFReferenceProperties(rAttributes, rSprms));
return pRet;
@@ -2782,8 +2779,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
OUString const aName = getStyleName(0);
if (!aName.isEmpty())
{
-
m_aStates.top().aParagraphSprms.set(NS_ooxml::LN_CT_PPrBase_pStyle,
- RTFValue::Pointer_t(new RTFValue(aName)));
+
m_aStates.top().aParagraphSprms.set(NS_ooxml::LN_CT_PPrBase_pStyle,
RTFValue::Pointer_t(new RTFValue(aName)));
m_aStates.top().nCurrentStyleIndex = 0;
}
else
@@ -3355,10 +3351,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
{
case RTF_FS:
case RTF_AFS:
- nSprm = (m_aStates.top().isRightToLeft
- || m_aStates.top().eRunType == RTFParserState::HICH)
- ? NS_ooxml::LN_EG_RPrBase_szCs
- : NS_ooxml::LN_EG_RPrBase_sz;
+ nSprm = (m_aStates.top().isRightToLeft || m_aStates.top().eRunType ==
RTFParserState::HICH) ? NS_ooxml::LN_EG_RPrBase_szCs :
NS_ooxml::LN_EG_RPrBase_sz;
break;
case RTF_ANIMTEXT:
nSprm = NS_ooxml::LN_EG_RPrBase_effect;
@@ -3643,8 +3636,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
{
m_nCurrentStyleIndex = nParam;
RTFValue::Pointer_t pValue(new RTFValue(-42)); // TODO no value in
enum StyleType?
- m_aStates.top().aTableAttributes.set(
- NS_ooxml::LN_CT_Style_type, pValue); // section style
+ m_aStates.top().aTableAttributes.set(NS_ooxml::LN_CT_Style_type,
pValue); // section style
}
break;
case RTF_TS:
@@ -4605,17 +4597,11 @@ int RTFDocumentImpl::dispatchToggle(RTFKeyword
nKeyword, bool bParam, int nParam
{
case RTF_B:
case RTF_AB:
- nSprm = (m_aStates.top().isRightToLeft
- || m_aStates.top().eRunType == RTFParserState::HICH)
- ? NS_ooxml::LN_EG_RPrBase_bCs
- : NS_ooxml::LN_EG_RPrBase_b;
+ nSprm = (m_aStates.top().isRightToLeft || m_aStates.top().eRunType ==
RTFParserState::HICH) ? NS_ooxml::LN_EG_RPrBase_bCs : NS_ooxml::LN_EG_RPrBase_b;
break;
case RTF_I:
case RTF_AI:
- nSprm = (m_aStates.top().isRightToLeft
- || m_aStates.top().eRunType == RTFParserState::HICH)
- ? NS_ooxml::LN_EG_RPrBase_iCs
- : NS_ooxml::LN_EG_RPrBase_i;
+ nSprm = (m_aStates.top().isRightToLeft || m_aStates.top().eRunType ==
RTFParserState::HICH) ? NS_ooxml::LN_EG_RPrBase_iCs : NS_ooxml::LN_EG_RPrBase_i;
break;
case RTF_OUTL:
nSprm = NS_ooxml::LN_EG_RPrBase_outline;
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 476362b..d8e7134 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -344,7 +344,10 @@ public:
virtual void finishSubstream() SAL_OVERRIDE;
virtual bool isSubstream() const SAL_OVERRIDE;
- Stream& Mapper() { return *m_pMapperStream;}
+ Stream& Mapper()
+ {
+ return *m_pMapperStream;
+ }
void setSubstream(bool bIsSubtream);
void setSuperstream(RTFDocumentImpl* pSuperstream);
void setStreamType(Id nId);
@@ -352,7 +355,10 @@ public:
void setAuthorInitials(OUString& rAuthorInitials);
void setIgnoreFirst(OUString& rIgnoreFirst);
void seek(sal_Size nPos);
- css::uno::Reference<css::lang::XMultiServiceFactory> getModelFactory() {
return m_xModelFactory;}
+ css::uno::Reference<css::lang::XMultiServiceFactory> getModelFactory()
+ {
+ return m_xModelFactory;
+ }
bool isInBackground();
void setDestinationText(OUString& rString);
/// Resolve a picture: If not inline, then anchored.
diff --git a/writerfilter/source/rtftok/rtfreferenceproperties.hxx
b/writerfilter/source/rtftok/rtfreferenceproperties.hxx
index 263ac72..90d30be 100644
--- a/writerfilter/source/rtftok/rtfreferenceproperties.hxx
+++ b/writerfilter/source/rtftok/rtfreferenceproperties.hxx
@@ -26,8 +26,14 @@ public:
virtual ~RTFReferenceProperties();
virtual void resolve(Properties& rHandler) SAL_OVERRIDE;
virtual std::string getType() const SAL_OVERRIDE;
- RTFSprms& getAttributes() { return m_aAttributes;}
- RTFSprms& getSprms() { return m_aSprms;}
+ RTFSprms& getAttributes()
+ {
+ return m_aAttributes;
+ }
+ RTFSprms& getSprms()
+ {
+ return m_aSprms;
+ }
private:
RTFSprms m_aAttributes;
RTFSprms m_aSprms;
diff --git a/writerfilter/source/rtftok/rtfsprm.cxx
b/writerfilter/source/rtftok/rtfsprm.cxx
index 752cd28..5e637fb 100644
--- a/writerfilter/source/rtftok/rtfsprm.cxx
+++ b/writerfilter/source/rtftok/rtfsprm.cxx
@@ -144,12 +144,12 @@ static RTFValue::Pointer_t getDefaultSPRM(Id const id)
{
switch (id)
{
- case NS_ooxml::LN_CT_Spacing_before:
- case NS_ooxml::LN_CT_Spacing_after:
- return RTFValue::Pointer_t(new RTFValue(0));
+ case NS_ooxml::LN_CT_Spacing_before:
+ case NS_ooxml::LN_CT_Spacing_after:
+ return RTFValue::Pointer_t(new RTFValue(0));
- default:
- return RTFValue::Pointer_t();
+ default:
+ return RTFValue::Pointer_t();
}
}
@@ -195,8 +195,7 @@ RTFSprms RTFSprms::cloneAndDeduplicate(RTFSprms&
rReference) const
RTFSprms().cloneAndDeduplicate(i->second->getAttributes()));
if (!sprms.empty() || !attributes.empty())
{
- ret.set(i->first,
- RTFValue::Pointer_t(new RTFValue(attributes, sprms)));
+ ret.set(i->first, RTFValue::Pointer_t(new
RTFValue(attributes, sprms)));
}
}
}
diff --git a/writerfilter/source/rtftok/rtftokenizer.hxx
b/writerfilter/source/rtftok/rtftokenizer.hxx
index ad9e4ac..5a03359 100644
--- a/writerfilter/source/rtftok/rtftokenizer.hxx
+++ b/writerfilter/source/rtftok/rtftokenizer.hxx
@@ -45,7 +45,10 @@ public:
/// To look up additional properties of a math symbol.
static bool lookupMathKeyword(RTFMathSymbol& rSymbol);
private:
- SvStream& Strm() { return *m_pInStream;}
+ SvStream& Strm()
+ {
+ return *m_pInStream;
+ }
int resolveKeyword();
int dispatchKeyword(OString& rKeyword, bool bParam, int nParam);
diff --git a/writerfilter/source/rtftok/rtfvalue.cxx
b/writerfilter/source/rtftok/rtfvalue.cxx
index adf7a77..f11facd 100644
--- a/writerfilter/source/rtftok/rtfvalue.cxx
+++ b/writerfilter/source/rtftok/rtfvalue.cxx
@@ -223,8 +223,7 @@ RTFValue* RTFValue::Clone()
return new RTFValue(m_nValue, m_sValue, *m_pAttributes, *m_pSprms,
m_xShape, m_xStream, m_xObject, m_bForceString, *m_pShape);
}
-RTFValue* RTFValue::CloneWithSprms(
- RTFSprms const& rAttributes, RTFSprms const& rSprms)
+RTFValue* RTFValue::CloneWithSprms(RTFSprms const& rAttributes, RTFSprms
const& rSprms)
{
return new RTFValue(m_nValue, m_sValue, rAttributes, rSprms, m_xShape,
m_xStream, m_xObject, m_bForceString, *m_pShape);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
