diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-08-07 09:07:39 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-08-07 09:07:40 +0200 |
commit | 609619de8b218e5c10b708c37cd58218b7c9251c (patch) | |
tree | 934d8c6a68d658d9de170bf16faca3a37788f166 | |
parent | 7b385595842b103ce6c990e6be5b9f18f2abdf7e (diff) |
Indentation fixes
These files had a consistent style before, let's keep them that way.
Change-Id: If64773d8c29dee23638e4fb9b7e5b69b34d47e49
-rw-r--r-- | oox/source/shape/LockedCanvasContext.cxx | 2 | ||||
-rw-r--r-- | oox/source/shape/LockedCanvasContext.hxx | 2 | ||||
-rw-r--r-- | oox/source/shape/WpgContext.cxx | 2 | ||||
-rw-r--r-- | oox/source/shape/WpgContext.hxx | 2 | ||||
-rw-r--r-- | oox/source/shape/WpsContext.cxx | 2 | ||||
-rw-r--r-- | oox/source/shape/WpsContext.hxx | 2 | ||||
-rw-r--r-- | sw/inc/textboxhelper.hxx | 8 | ||||
-rw-r--r-- | sw/source/core/doc/textboxhelper.cxx | 8 | ||||
-rw-r--r-- | writerfilter/inc/dmapper/DomainMapperFactory.hxx | 2 | ||||
-rw-r--r-- | writerfilter/source/dmapper/SdtHelper.cxx | 4 | ||||
-rw-r--r-- | writerfilter/source/dmapper/SdtHelper.hxx | 2 | ||||
-rw-r--r-- | writerfilter/source/dmapper/domainmapperfactory.cxx | 2 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 6 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.hxx | 4 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfsdrimport.cxx | 2 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfsdrimport.hxx | 2 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtftokenizer.cxx | 2 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtftokenizer.hxx | 2 |
18 files changed, 28 insertions, 28 deletions
diff --git a/oox/source/shape/LockedCanvasContext.cxx b/oox/source/shape/LockedCanvasContext.cxx index 661227086431..0b2e06ccbb3f 100644 --- a/oox/source/shape/LockedCanvasContext.cxx +++ b/oox/source/shape/LockedCanvasContext.cxx @@ -20,7 +20,7 @@ namespace oox namespace shape { -LockedCanvasContext::LockedCanvasContext(ContextHandler2Helper const & rParent) +LockedCanvasContext::LockedCanvasContext(ContextHandler2Helper const& rParent) : ContextHandler2(rParent) { } diff --git a/oox/source/shape/LockedCanvasContext.hxx b/oox/source/shape/LockedCanvasContext.hxx index 4c26809a9669..63bd6eac1570 100644 --- a/oox/source/shape/LockedCanvasContext.hxx +++ b/oox/source/shape/LockedCanvasContext.hxx @@ -22,7 +22,7 @@ namespace shape class LockedCanvasContext : public oox::core::ContextHandler2 { public: - explicit LockedCanvasContext(oox::core::ContextHandler2Helper const & rParent); + explicit LockedCanvasContext(oox::core::ContextHandler2Helper const& rParent); ~LockedCanvasContext() override; oox::core::ContextHandlerRef onCreateContext(sal_Int32 nElementToken, const ::oox::AttributeList& rAttribs) override; diff --git a/oox/source/shape/WpgContext.cxx b/oox/source/shape/WpgContext.cxx index e7f67dd52cd3..ead163738d74 100644 --- a/oox/source/shape/WpgContext.cxx +++ b/oox/source/shape/WpgContext.cxx @@ -21,7 +21,7 @@ namespace oox namespace shape { -WpgContext::WpgContext(ContextHandler2Helper const & rParent) +WpgContext::WpgContext(ContextHandler2Helper const& rParent) : ContextHandler2(rParent) { mpShape.reset(new oox::drawingml::Shape("com.sun.star.drawing.GroupShape")); diff --git a/oox/source/shape/WpgContext.hxx b/oox/source/shape/WpgContext.hxx index 1280d537f9a4..3faa56f5f5e0 100644 --- a/oox/source/shape/WpgContext.hxx +++ b/oox/source/shape/WpgContext.hxx @@ -22,7 +22,7 @@ namespace shape class WpgContext : public oox::core::ContextHandler2 { public: - explicit WpgContext(oox::core::ContextHandler2Helper const & rParent); + explicit WpgContext(oox::core::ContextHandler2Helper const& rParent); ~WpgContext() override; oox::core::ContextHandlerRef onCreateContext(sal_Int32 nElementToken, const oox::AttributeList& rAttribs) override; diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx index 7aa5c169f3f0..23e9af6fb8f2 100644 --- a/oox/source/shape/WpsContext.cxx +++ b/oox/source/shape/WpsContext.cxx @@ -33,7 +33,7 @@ namespace oox namespace shape { -WpsContext::WpsContext(ContextHandler2Helper const & rParent, uno::Reference<drawing::XShape> xShape) +WpsContext::WpsContext(ContextHandler2Helper const& rParent, uno::Reference<drawing::XShape> xShape) : ContextHandler2(rParent), mxShape(std::move(xShape)) { diff --git a/oox/source/shape/WpsContext.hxx b/oox/source/shape/WpsContext.hxx index c2e53765669f..b0b22a305524 100644 --- a/oox/source/shape/WpsContext.hxx +++ b/oox/source/shape/WpsContext.hxx @@ -22,7 +22,7 @@ namespace shape class WpsContext : public oox::core::ContextHandler2 { public: - WpsContext(oox::core::ContextHandler2Helper const & rParent, css::uno::Reference<css::drawing::XShape> xShape); + WpsContext(oox::core::ContextHandler2Helper const& rParent, css::uno::Reference<css::drawing::XShape> xShape); ~WpsContext() override; oox::core::ContextHandlerRef onCreateContext(sal_Int32 nElementToken, const oox::AttributeList& rAttribs) override; diff --git a/sw/inc/textboxhelper.hxx b/sw/inc/textboxhelper.hxx index eba513190fcf..d8ed926c1bc0 100644 --- a/sw/inc/textboxhelper.hxx +++ b/sw/inc/textboxhelper.hxx @@ -60,10 +60,10 @@ public: /// Does the same, but works on properties which lack an sw-specific WID / MemberID. static void syncProperty(SwFrameFormat* pShape, const OUString& rPropertyName, const css::uno::Any& rValue); /// Get a property of the underlying TextFrame. - static void getProperty(SwFrameFormat const * pShape, sal_uInt16 nWID, sal_uInt8 nMemberID, css::uno::Any& rValue); + static void getProperty(SwFrameFormat const* pShape, sal_uInt16 nWID, sal_uInt8 nMemberID, css::uno::Any& rValue); /// Similar to syncProperty(), but used by the internal API (e.g. for UI purposes). - static void syncFlyFrameAttr(SwFrameFormat& rShape, SfxItemSet const & rSet); + static void syncFlyFrameAttr(SwFrameFormat& rShape, SfxItemSet const& rSet); /** * If we have an associated TextFrame, then return that. @@ -95,11 +95,11 @@ public: /// Count number of shapes in the document, excluding TextBoxes. static sal_Int32 getCount(const SwDoc* pDoc); /// Count number of shapes on the page, excluding TextBoxes. - static sal_Int32 getCount(SdrPage const * pPage); + static sal_Int32 getCount(SdrPage const* pPage); /// Get a shape by index, excluding TextBoxes. /// /// @throws css::lang::IndexOutOfBoundsException - static css::uno::Any getByIndex(SdrPage const * pPage, sal_Int32 nIndex); + static css::uno::Any getByIndex(SdrPage const* pPage, sal_Int32 nIndex); /// Get the order of the shape, excluding TextBoxes. static sal_Int32 getOrdNum(const SdrObject* pObject); /// If pTextBox is a textbox, then set rWrapThrough to the surround of its shape. diff --git a/sw/source/core/doc/textboxhelper.cxx b/sw/source/core/doc/textboxhelper.cxx index 4c2e12ce9e39..2bc005b247c3 100644 --- a/sw/source/core/doc/textboxhelper.cxx +++ b/sw/source/core/doc/textboxhelper.cxx @@ -154,7 +154,7 @@ bool SwTextBoxHelper::isTextBox(const SdrObject* pObject) return isTextBox(pVirtFlyDrawObj->GetFormat(), RES_FLYFRMFMT); } -sal_Int32 SwTextBoxHelper::getCount(SdrPage const * pPage) +sal_Int32 SwTextBoxHelper::getCount(SdrPage const* pPage) { sal_Int32 nRet = 0; for (std::size_t i = 0; i < pPage->GetObjCount(); ++i) @@ -178,7 +178,7 @@ sal_Int32 SwTextBoxHelper::getCount(const SwDoc* pDoc) return nRet; } -uno::Any SwTextBoxHelper::getByIndex(SdrPage const * pPage, sal_Int32 nIndex) +uno::Any SwTextBoxHelper::getByIndex(SdrPage const* pPage, sal_Int32 nIndex) { if (nIndex < 0) throw lang::IndexOutOfBoundsException(); @@ -362,7 +362,7 @@ void SwTextBoxHelper::syncProperty(SwFrameFormat* pShape, const OUString& rPrope syncProperty(pShape, RES_BOX, BOTTOM_BORDER_DISTANCE, rValue); } -void SwTextBoxHelper::getProperty(SwFrameFormat const * pShape, sal_uInt16 nWID, sal_uInt8 nMemberID, css::uno::Any& rValue) +void SwTextBoxHelper::getProperty(SwFrameFormat const* pShape, sal_uInt16 nWID, sal_uInt8 nMemberID, css::uno::Any& rValue) { if (!pShape) return; @@ -594,7 +594,7 @@ void SwTextBoxHelper::restoreLinks(std::set<ZSortFly>& rOld, std::vector<SwFrame } } -void SwTextBoxHelper::syncFlyFrameAttr(SwFrameFormat& rShape, SfxItemSet const & rSet) +void SwTextBoxHelper::syncFlyFrameAttr(SwFrameFormat& rShape, SfxItemSet const& rSet) { if (SwFrameFormat* pFormat = getOtherTextBoxFormat(&rShape, RES_DRAWFRMFMT)) { diff --git a/writerfilter/inc/dmapper/DomainMapperFactory.hxx b/writerfilter/inc/dmapper/DomainMapperFactory.hxx index 331d871128ad..602dd7f1c9fa 100644 --- a/writerfilter/inc/dmapper/DomainMapperFactory.hxx +++ b/writerfilter/inc/dmapper/DomainMapperFactory.hxx @@ -42,7 +42,7 @@ public: css::uno::Reference<css::lang::XComponent> const& xModel, bool bRepairStorage, SourceDocumentType eDocumentType, - utl::MediaDescriptor const & rMediaDesc); + utl::MediaDescriptor const& rMediaDesc); }; // export just for test diff --git a/writerfilter/source/dmapper/SdtHelper.cxx b/writerfilter/source/dmapper/SdtHelper.cxx index 2e96d623e1ba..c00fc9ea6a88 100644 --- a/writerfilter/source/dmapper/SdtHelper.cxx +++ b/writerfilter/source/dmapper/SdtHelper.cxx @@ -25,7 +25,7 @@ namespace dmapper using namespace ::com::sun::star; /// w:sdt's w:dropDownList doesn't have width, so guess the size based on the longest string. -awt::Size lcl_getOptimalWidth(const StyleSheetTablePtr& pStyleSheet, OUString const & rDefault, std::vector<OUString>& rItems) +awt::Size lcl_getOptimalWidth(const StyleSheetTablePtr& pStyleSheet, OUString const& rDefault, std::vector<OUString>& rItems) { OUString aLongest = rDefault; sal_Int32 nHeight = 0; @@ -85,7 +85,7 @@ void SdtHelper::createDropDownControl() m_aDropDownItems.clear(); } -void SdtHelper::createDateControl(OUString const & rContentText, const beans::PropertyValue& rCharFormat) +void SdtHelper::createDateControl(OUString const& rContentText, const beans::PropertyValue& rCharFormat) { uno::Reference<awt::XControlModel> xControlModel; try diff --git a/writerfilter/source/dmapper/SdtHelper.hxx b/writerfilter/source/dmapper/SdtHelper.hxx index 65dbc145099d..3f3574af7adf 100644 --- a/writerfilter/source/dmapper/SdtHelper.hxx +++ b/writerfilter/source/dmapper/SdtHelper.hxx @@ -111,7 +111,7 @@ public: /// Create drop-down control from w:sdt's w:dropDownList. void createDropDownControl(); /// Create date control from w:sdt's w:date. - void createDateControl(OUString const & rContentText, const css::beans::PropertyValue& rCharFormat); + void createDateControl(OUString const& rContentText, const css::beans::PropertyValue& rCharFormat); void appendToInteropGrabBag(const css::beans::PropertyValue& rValue); css::uno::Sequence<css::beans::PropertyValue> getInteropGrabBagAndClear(); diff --git a/writerfilter/source/dmapper/domainmapperfactory.cxx b/writerfilter/source/dmapper/domainmapperfactory.cxx index f2988a40838e..c347c8b6b16b 100644 --- a/writerfilter/source/dmapper/domainmapperfactory.cxx +++ b/writerfilter/source/dmapper/domainmapperfactory.cxx @@ -20,7 +20,7 @@ Stream::Pointer_t DomainMapperFactory::createMapper(css::uno::Reference<css::uno css::uno::Reference<css::lang::XComponent> const& xModel, bool bRepairStorage, SourceDocumentType eDocumentType, - utl::MediaDescriptor const & rMediaDesc) + utl::MediaDescriptor const& rMediaDesc) { #ifdef DEBUG_WRITERFILTER OUString sURL = rMediaDesc.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_URL(), OUString()); diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 544370132005..14f250b3492d 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -208,7 +208,7 @@ const char* keywordToString(RTFKeyword nKeyword) return nullptr; } -static util::DateTime lcl_getDateTime(RTFParserState const & aState) +static util::DateTime lcl_getDateTime(RTFParserState const& aState) { return {0 /*100sec*/, 0 /*sec*/, aState.nMinute, aState.nHour, aState.nDay, aState.nMonth, aState.nYear, false @@ -336,7 +336,7 @@ void RTFDocumentImpl::resolveSubstream(std::size_t nPos, Id nId) { resolveSubstream(nPos, nId, OUString()); } -void RTFDocumentImpl::resolveSubstream(std::size_t nPos, Id nId, OUString const & rIgnoreFirst) +void RTFDocumentImpl::resolveSubstream(std::size_t nPos, Id nId, OUString const& rIgnoreFirst) { sal_uInt64 const nCurrent = Strm().Tell(); // Seek to header position, parse, then seek back. @@ -3187,7 +3187,7 @@ void RTFDocumentImpl::setDestination(Destination eDestination) // this is a questionably named method that is used only in a very special // situation where it looks like the "current" buffer is needed? -void RTFDocumentImpl::setDestinationText(OUString const & rString) +void RTFDocumentImpl::setDestinationText(OUString const& rString) { m_aStates.top().aDestinationText.setLength(0); m_aStates.top().aDestinationText.append(rString); diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx index 51b1e254311e..2a75d1f48948 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx @@ -426,7 +426,7 @@ public: return m_xModelFactory; } bool isInBackground(); - void setDestinationText(OUString const & rString); + void setDestinationText(OUString const& rString); /// Resolve a picture: If not inline, then anchored. void resolvePict(bool bInline, css::uno::Reference<css::drawing::XShape> const& xShape); @@ -466,7 +466,7 @@ private: void resetSprms(); void resetAttributes(); void resolveSubstream(std::size_t nPos, Id nId); - void resolveSubstream(std::size_t nPos, Id nId, OUString const & rIgnoreFirst); + void resolveSubstream(std::size_t nPos, Id nId, OUString const& rIgnoreFirst); void text(OUString& rString); // Sends a single character to dmapper, taking care of buffering. diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx index dc4ed8eb2780..0933236c834a 100644 --- a/writerfilter/source/rtftok/rtfsdrimport.cxx +++ b/writerfilter/source/rtftok/rtfsdrimport.cxx @@ -146,7 +146,7 @@ void RTFSdrImport::resolveDhgt(uno::Reference<beans::XPropertySet> const& xPrope } } -void RTFSdrImport::resolveLineColorAndWidth(bool bTextFrame, const uno::Reference<beans::XPropertySet>& xPropertySet, uno::Any const & rLineColor, uno::Any const & rLineWidth) +void RTFSdrImport::resolveLineColorAndWidth(bool bTextFrame, const uno::Reference<beans::XPropertySet>& xPropertySet, uno::Any const& rLineColor, uno::Any const& rLineWidth) { if (!bTextFrame) { diff --git a/writerfilter/source/rtftok/rtfsdrimport.hxx b/writerfilter/source/rtftok/rtfsdrimport.hxx index ccb02c55d885..22959fb88dbe 100644 --- a/writerfilter/source/rtftok/rtfsdrimport.hxx +++ b/writerfilter/source/rtftok/rtfsdrimport.hxx @@ -36,7 +36,7 @@ public: void appendGroupProperty(const OUString& aKey, const OUString& aValue); void resolveDhgt(css::uno::Reference<css::beans::XPropertySet> const& xPropertySet, sal_Int32 nZOrder, bool bOldStyle); /// Set line color and line width on the shape, using the relevant API depending on if the shape is a text frame or not. - static void resolveLineColorAndWidth(bool bTextFrame, const css::uno::Reference<css::beans::XPropertySet>& xPropertySet, css::uno::Any const & rLineColor, css::uno::Any const & rLineWidth); + static void resolveLineColorAndWidth(bool bTextFrame, const css::uno::Reference<css::beans::XPropertySet>& xPropertySet, css::uno::Any const& rLineColor, css::uno::Any const& rLineWidth); static void resolveFLine(css::uno::Reference<css::beans::XPropertySet> const& xPropertySet, sal_Int32 nFLine); /** * These are the default in Word, but not in Writer. diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/writerfilter/source/rtftok/rtftokenizer.cxx index 2c06c816e47f..1b36289e4af0 100644 --- a/writerfilter/source/rtftok/rtftokenizer.cxx +++ b/writerfilter/source/rtftok/rtftokenizer.cxx @@ -272,7 +272,7 @@ bool RTFTokenizer::lookupMathKeyword(RTFMathSymbol& rSymbol) return true; } -RTFError RTFTokenizer::dispatchKeyword(OString const & rKeyword, bool bParam, int nParam) +RTFError RTFTokenizer::dispatchKeyword(OString const& rKeyword, bool bParam, int nParam) { if (m_rImport.getDestination() == Destination::SKIP) { diff --git a/writerfilter/source/rtftok/rtftokenizer.hxx b/writerfilter/source/rtftok/rtftokenizer.hxx index c42b89dc4cd6..343e597720d0 100644 --- a/writerfilter/source/rtftok/rtftokenizer.hxx +++ b/writerfilter/source/rtftok/rtftokenizer.hxx @@ -54,7 +54,7 @@ private: return *m_pInStream; } RTFError resolveKeyword(); - RTFError dispatchKeyword(OString const & rKeyword, bool bParam, int nParam); + RTFError dispatchKeyword(OString const& rKeyword, bool bParam, int nParam); RTFListener& m_rImport; SvStream* m_pInStream; |