Skip to content

C
core
Kaydet (Commit) 698153d9 authored tarafından Miklos Vajna's avatar Miklos Vajna
Dosyalara gözat
Seçenekler

Indentation fixes 

Change-Id: I903fcd36878cd0b74757805bcbdb414feb713d7b
üst 313fe1f7
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
sw/inc/textboxhelper.hxx
Dosyayı görüntüle @ 698153d9
...@@ -72,7 +72,7 @@ public: ...@@ -72,7 +72,7 @@ public:
*/ */
static SwFrameFormat* getOtherTextBoxFormat(const SwFrameFormat* pFormat, sal_uInt16 nType); static SwFrameFormat* getOtherTextBoxFormat(const SwFrameFormat* pFormat, sal_uInt16 nType);
/// If we have an associated TextFrame, then return that. /// If we have an associated TextFrame, then return that.
static SwFrameFormat* getOtherTextBoxFormat(css::uno::Reference<css::drawing::XShape> const & xShape); static SwFrameFormat* getOtherTextBoxFormat(css::uno::Reference<css::drawing::XShape> const& xShape);
/// Return the textbox rectangle of a draw shape (in twips). /// Return the textbox rectangle of a draw shape (in twips).
static Rectangle getTextRectangle(SwFrameFormat* pShape, bool bAbsolute = true); static Rectangle getTextRectangle(SwFrameFormat* pShape, bool bAbsolute = true);
......
sw/source/core/doc/textboxhelper.cxx
Dosyayı görüntüle @ 698153d9
...@@ -58,7 +58,7 @@ void SwTextBoxHelper::create(SwFrameFormat* pShape) ...@@ -58,7 +58,7 @@ void SwTextBoxHelper::create(SwFrameFormat* pShape)
// Link FLY and DRAW formats, so it becomes a text box (needed for syncProperty calls). // Link FLY and DRAW formats, so it becomes a text box (needed for syncProperty calls).
uno::Reference<text::XTextFrame> xRealTextFrame(xTextFrame, uno::UNO_QUERY); uno::Reference<text::XTextFrame> xRealTextFrame(xTextFrame, uno::UNO_QUERY);
SwXTextFrame* pTextFrame = dynamic_cast<SwXTextFrame *>(xRealTextFrame.get()); SwXTextFrame* pTextFrame = dynamic_cast<SwXTextFrame*>(xRealTextFrame.get());
assert(nullptr != pTextFrame); assert(nullptr != pTextFrame);
SwFrameFormat* pFormat = pTextFrame->GetFrameFormat(); SwFrameFormat* pFormat = pTextFrame->GetFrameFormat();
...@@ -226,7 +226,7 @@ sal_Int32 SwTextBoxHelper::getOrdNum(const SdrObject* pObject) ...@@ -226,7 +226,7 @@ sal_Int32 SwTextBoxHelper::getOrdNum(const SdrObject* pObject)
void SwTextBoxHelper::getShapeWrapThrough(const SwFrameFormat* pTextBox, bool& rWrapThrough) void SwTextBoxHelper::getShapeWrapThrough(const SwFrameFormat* pTextBox, bool& rWrapThrough)
{ {
SwFrameFormat *pShape = SwTextBoxHelper::getOtherTextBoxFormat(pTextBox, RES_FLYFRMFMT); SwFrameFormat* pShape = SwTextBoxHelper::getOtherTextBoxFormat(pTextBox, RES_FLYFRMFMT);
if (pShape) if (pShape)
rWrapThrough = pShape->GetSurround().GetSurround() == SURROUND_THROUGHT; rWrapThrough = pShape->GetSurround().GetSurround() == SURROUND_THROUGHT;
} }
...@@ -238,13 +238,13 @@ SwFrameFormat* SwTextBoxHelper::getOtherTextBoxFormat(const SwFrameFormat* pForm ...@@ -238,13 +238,13 @@ SwFrameFormat* SwTextBoxHelper::getOtherTextBoxFormat(const SwFrameFormat* pForm
return pFormat->GetOtherTextBoxFormat(); return pFormat->GetOtherTextBoxFormat();
} }
SwFrameFormat* SwTextBoxHelper::getOtherTextBoxFormat(uno::Reference<drawing::XShape> const & xShape) SwFrameFormat* SwTextBoxHelper::getOtherTextBoxFormat(uno::Reference<drawing::XShape> const& xShape)
{ {
SwXShape* pShape = dynamic_cast<SwXShape*>(xShape.get()); SwXShape* pShape = dynamic_cast<SwXShape*>(xShape.get());
if (!pShape) if (!pShape)
return nullptr; return nullptr;
SwFrameFormat *pFormat = pShape->GetFrameFormat(); SwFrameFormat* pFormat = pShape->GetFrameFormat();
return getOtherTextBoxFormat(pFormat, RES_DRAWFRMFMT); return getOtherTextBoxFormat(pFormat, RES_DRAWFRMFMT);
} }
......
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