Kaydet (Commit) 609619de authored tarafından Miklos Vajna's avatar Miklos Vajna

Indentation fixes

These files had a consistent style before, let's keep them that way.

Change-Id: If64773d8c29dee23638e4fb9b7e5b69b34d47e49
üst 7b385595
...@@ -20,7 +20,7 @@ namespace oox ...@@ -20,7 +20,7 @@ namespace oox
namespace shape namespace shape
{ {
LockedCanvasContext::LockedCanvasContext(ContextHandler2Helper const & rParent) LockedCanvasContext::LockedCanvasContext(ContextHandler2Helper const& rParent)
: ContextHandler2(rParent) : ContextHandler2(rParent)
{ {
} }
......
...@@ -22,7 +22,7 @@ namespace shape ...@@ -22,7 +22,7 @@ namespace shape
class LockedCanvasContext : public oox::core::ContextHandler2 class LockedCanvasContext : public oox::core::ContextHandler2
{ {
public: public:
explicit LockedCanvasContext(oox::core::ContextHandler2Helper const & rParent); explicit LockedCanvasContext(oox::core::ContextHandler2Helper const& rParent);
~LockedCanvasContext() override; ~LockedCanvasContext() override;
oox::core::ContextHandlerRef onCreateContext(sal_Int32 nElementToken, const ::oox::AttributeList& rAttribs) override; oox::core::ContextHandlerRef onCreateContext(sal_Int32 nElementToken, const ::oox::AttributeList& rAttribs) override;
......
...@@ -21,7 +21,7 @@ namespace oox ...@@ -21,7 +21,7 @@ namespace oox
namespace shape namespace shape
{ {
WpgContext::WpgContext(ContextHandler2Helper const & rParent) WpgContext::WpgContext(ContextHandler2Helper const& rParent)
: ContextHandler2(rParent) : ContextHandler2(rParent)
{ {
mpShape.reset(new oox::drawingml::Shape("com.sun.star.drawing.GroupShape")); mpShape.reset(new oox::drawingml::Shape("com.sun.star.drawing.GroupShape"));
......
...@@ -22,7 +22,7 @@ namespace shape ...@@ -22,7 +22,7 @@ namespace shape
class WpgContext : public oox::core::ContextHandler2 class WpgContext : public oox::core::ContextHandler2
{ {
public: public:
explicit WpgContext(oox::core::ContextHandler2Helper const & rParent); explicit WpgContext(oox::core::ContextHandler2Helper const& rParent);
~WpgContext() override; ~WpgContext() override;
oox::core::ContextHandlerRef onCreateContext(sal_Int32 nElementToken, const oox::AttributeList& rAttribs) override; oox::core::ContextHandlerRef onCreateContext(sal_Int32 nElementToken, const oox::AttributeList& rAttribs) override;
......
...@@ -33,7 +33,7 @@ namespace oox ...@@ -33,7 +33,7 @@ namespace oox
namespace shape namespace shape
{ {
WpsContext::WpsContext(ContextHandler2Helper const & rParent, uno::Reference<drawing::XShape> xShape) WpsContext::WpsContext(ContextHandler2Helper const& rParent, uno::Reference<drawing::XShape> xShape)
: ContextHandler2(rParent), : ContextHandler2(rParent),
mxShape(std::move(xShape)) mxShape(std::move(xShape))
{ {
......
...@@ -22,7 +22,7 @@ namespace shape ...@@ -22,7 +22,7 @@ namespace shape
class WpsContext : public oox::core::ContextHandler2 class WpsContext : public oox::core::ContextHandler2
{ {
public: 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; ~WpsContext() override;
oox::core::ContextHandlerRef onCreateContext(sal_Int32 nElementToken, const oox::AttributeList& rAttribs) override; oox::core::ContextHandlerRef onCreateContext(sal_Int32 nElementToken, const oox::AttributeList& rAttribs) override;
......
...@@ -60,10 +60,10 @@ public: ...@@ -60,10 +60,10 @@ public:
/// Does the same, but works on properties which lack an sw-specific WID / MemberID. /// 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); static void syncProperty(SwFrameFormat* pShape, const OUString& rPropertyName, const css::uno::Any& rValue);
/// Get a property of the underlying TextFrame. /// 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). /// 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. * If we have an associated TextFrame, then return that.
...@@ -95,11 +95,11 @@ public: ...@@ -95,11 +95,11 @@ public:
/// Count number of shapes in the document, excluding TextBoxes. /// Count number of shapes in the document, excluding TextBoxes.
static sal_Int32 getCount(const SwDoc* pDoc); static sal_Int32 getCount(const SwDoc* pDoc);
/// Count number of shapes on the page, excluding TextBoxes. /// 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. /// Get a shape by index, excluding TextBoxes.
/// ///
/// @throws css::lang::IndexOutOfBoundsException /// @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. /// Get the order of the shape, excluding TextBoxes.
static sal_Int32 getOrdNum(const SdrObject* pObject); static sal_Int32 getOrdNum(const SdrObject* pObject);
/// If pTextBox is a textbox, then set rWrapThrough to the surround of its shape. /// If pTextBox is a textbox, then set rWrapThrough to the surround of its shape.
......
...@@ -154,7 +154,7 @@ bool SwTextBoxHelper::isTextBox(const SdrObject* pObject) ...@@ -154,7 +154,7 @@ bool SwTextBoxHelper::isTextBox(const SdrObject* pObject)
return isTextBox(pVirtFlyDrawObj->GetFormat(), RES_FLYFRMFMT); return isTextBox(pVirtFlyDrawObj->GetFormat(), RES_FLYFRMFMT);
} }
sal_Int32 SwTextBoxHelper::getCount(SdrPage const * pPage) sal_Int32 SwTextBoxHelper::getCount(SdrPage const* pPage)
{ {
sal_Int32 nRet = 0; sal_Int32 nRet = 0;
for (std::size_t i = 0; i < pPage->GetObjCount(); ++i) for (std::size_t i = 0; i < pPage->GetObjCount(); ++i)
...@@ -178,7 +178,7 @@ sal_Int32 SwTextBoxHelper::getCount(const SwDoc* pDoc) ...@@ -178,7 +178,7 @@ sal_Int32 SwTextBoxHelper::getCount(const SwDoc* pDoc)
return nRet; 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) if (nIndex < 0)
throw lang::IndexOutOfBoundsException(); throw lang::IndexOutOfBoundsException();
...@@ -362,7 +362,7 @@ void SwTextBoxHelper::syncProperty(SwFrameFormat* pShape, const OUString& rPrope ...@@ -362,7 +362,7 @@ void SwTextBoxHelper::syncProperty(SwFrameFormat* pShape, const OUString& rPrope
syncProperty(pShape, RES_BOX, BOTTOM_BORDER_DISTANCE, rValue); 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) if (!pShape)
return; return;
...@@ -594,7 +594,7 @@ void SwTextBoxHelper::restoreLinks(std::set<ZSortFly>& rOld, std::vector<SwFrame ...@@ -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)) if (SwFrameFormat* pFormat = getOtherTextBoxFormat(&rShape, RES_DRAWFRMFMT))
{ {
......
...@@ -42,7 +42,7 @@ public: ...@@ -42,7 +42,7 @@ public:
css::uno::Reference<css::lang::XComponent> const& xModel, css::uno::Reference<css::lang::XComponent> const& xModel,
bool bRepairStorage, bool bRepairStorage,
SourceDocumentType eDocumentType, SourceDocumentType eDocumentType,
utl::MediaDescriptor const & rMediaDesc); utl::MediaDescriptor const& rMediaDesc);
}; };
// export just for test // export just for test
......
...@@ -25,7 +25,7 @@ namespace dmapper ...@@ -25,7 +25,7 @@ namespace dmapper
using namespace ::com::sun::star; using namespace ::com::sun::star;
/// w:sdt's w:dropDownList doesn't have width, so guess the size based on the longest string. /// 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; OUString aLongest = rDefault;
sal_Int32 nHeight = 0; sal_Int32 nHeight = 0;
...@@ -85,7 +85,7 @@ void SdtHelper::createDropDownControl() ...@@ -85,7 +85,7 @@ void SdtHelper::createDropDownControl()
m_aDropDownItems.clear(); 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; uno::Reference<awt::XControlModel> xControlModel;
try try
......
...@@ -111,7 +111,7 @@ public: ...@@ -111,7 +111,7 @@ public:
/// Create drop-down control from w:sdt's w:dropDownList. /// Create drop-down control from w:sdt's w:dropDownList.
void createDropDownControl(); void createDropDownControl();
/// Create date control from w:sdt's w:date. /// 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); void appendToInteropGrabBag(const css::beans::PropertyValue& rValue);
css::uno::Sequence<css::beans::PropertyValue> getInteropGrabBagAndClear(); css::uno::Sequence<css::beans::PropertyValue> getInteropGrabBagAndClear();
......
...@@ -20,7 +20,7 @@ Stream::Pointer_t DomainMapperFactory::createMapper(css::uno::Reference<css::uno ...@@ -20,7 +20,7 @@ Stream::Pointer_t DomainMapperFactory::createMapper(css::uno::Reference<css::uno
css::uno::Reference<css::lang::XComponent> const& xModel, css::uno::Reference<css::lang::XComponent> const& xModel,
bool bRepairStorage, bool bRepairStorage,
SourceDocumentType eDocumentType, SourceDocumentType eDocumentType,
utl::MediaDescriptor const & rMediaDesc) utl::MediaDescriptor const& rMediaDesc)
{ {
#ifdef DEBUG_WRITERFILTER #ifdef DEBUG_WRITERFILTER
OUString sURL = rMediaDesc.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_URL(), OUString()); OUString sURL = rMediaDesc.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_URL(), OUString());
......
...@@ -208,7 +208,7 @@ const char* keywordToString(RTFKeyword nKeyword) ...@@ -208,7 +208,7 @@ const char* keywordToString(RTFKeyword nKeyword)
return nullptr; 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, return {0 /*100sec*/, 0 /*sec*/, aState.nMinute, aState.nHour,
aState.nDay, aState.nMonth, aState.nYear, false aState.nDay, aState.nMonth, aState.nYear, false
...@@ -336,7 +336,7 @@ void RTFDocumentImpl::resolveSubstream(std::size_t nPos, Id nId) ...@@ -336,7 +336,7 @@ void RTFDocumentImpl::resolveSubstream(std::size_t nPos, Id nId)
{ {
resolveSubstream(nPos, nId, OUString()); 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(); sal_uInt64 const nCurrent = Strm().Tell();
// Seek to header position, parse, then seek back. // Seek to header position, parse, then seek back.
...@@ -3187,7 +3187,7 @@ void RTFDocumentImpl::setDestination(Destination eDestination) ...@@ -3187,7 +3187,7 @@ void RTFDocumentImpl::setDestination(Destination eDestination)
// this is a questionably named method that is used only in a very special // this is a questionably named method that is used only in a very special
// situation where it looks like the "current" buffer is needed? // 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.setLength(0);
m_aStates.top().aDestinationText.append(rString); m_aStates.top().aDestinationText.append(rString);
......
...@@ -426,7 +426,7 @@ public: ...@@ -426,7 +426,7 @@ public:
return m_xModelFactory; return m_xModelFactory;
} }
bool isInBackground(); bool isInBackground();
void setDestinationText(OUString const & rString); void setDestinationText(OUString const& rString);
/// Resolve a picture: If not inline, then anchored. /// Resolve a picture: If not inline, then anchored.
void resolvePict(bool bInline, css::uno::Reference<css::drawing::XShape> const& xShape); void resolvePict(bool bInline, css::uno::Reference<css::drawing::XShape> const& xShape);
...@@ -466,7 +466,7 @@ private: ...@@ -466,7 +466,7 @@ private:
void resetSprms(); void resetSprms();
void resetAttributes(); void resetAttributes();
void resolveSubstream(std::size_t nPos, Id nId); 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); void text(OUString& rString);
// Sends a single character to dmapper, taking care of buffering. // Sends a single character to dmapper, taking care of buffering.
......
...@@ -146,7 +146,7 @@ void RTFSdrImport::resolveDhgt(uno::Reference<beans::XPropertySet> const& xPrope ...@@ -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) if (!bTextFrame)
{ {
......
...@@ -36,7 +36,7 @@ public: ...@@ -36,7 +36,7 @@ public:
void appendGroupProperty(const OUString& aKey, const OUString& aValue); void appendGroupProperty(const OUString& aKey, const OUString& aValue);
void resolveDhgt(css::uno::Reference<css::beans::XPropertySet> const& xPropertySet, sal_Int32 nZOrder, bool bOldStyle); 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. /// 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); static void resolveFLine(css::uno::Reference<css::beans::XPropertySet> const& xPropertySet, sal_Int32 nFLine);
/** /**
* These are the default in Word, but not in Writer. * These are the default in Word, but not in Writer.
......
...@@ -272,7 +272,7 @@ bool RTFTokenizer::lookupMathKeyword(RTFMathSymbol& rSymbol) ...@@ -272,7 +272,7 @@ bool RTFTokenizer::lookupMathKeyword(RTFMathSymbol& rSymbol)
return true; 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) if (m_rImport.getDestination() == Destination::SKIP)
{ {
......
...@@ -54,7 +54,7 @@ private: ...@@ -54,7 +54,7 @@ private:
return *m_pInStream; return *m_pInStream;
} }
RTFError resolveKeyword(); RTFError resolveKeyword();
RTFError dispatchKeyword(OString const & rKeyword, bool bParam, int nParam); RTFError dispatchKeyword(OString const& rKeyword, bool bParam, int nParam);
RTFListener& m_rImport; RTFListener& m_rImport;
SvStream* m_pInStream; SvStream* m_pInStream;
......
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