[Libreoffice-commits] core.git: sw/inc sw/source xmlsecurity/qa

[Miklos Vajna]

 sw/inc/textboxhelper.hxx                |    2 -
 sw/inc/unoredline.hxx                   |    2 -
 sw/inc/unoredlines.hxx                  |    2 -
 sw/source/core/doc/textboxhelper.cxx    |   36 ++++++++++++++++----------------
 xmlsecurity/qa/unit/signing/signing.cxx |    2 -
 5 files changed, 22 insertions(+), 22 deletions(-)

New commits:
commit 698153d9096f705cc5e16e8ae6fc0ebd9210c79d
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Aug 29 17:40:38 2016 +0200

    Indentation fixes
    
    Change-Id: I903fcd36878cd0b74757805bcbdb414feb713d7b

diff --git a/sw/inc/textboxhelper.hxx b/sw/inc/textboxhelper.hxx
index 3a43e8f..e135b92 100644
--- a/sw/inc/textboxhelper.hxx
+++ b/sw/inc/textboxhelper.hxx
@@ -72,7 +72,7 @@ public:
      */
     static SwFrameFormat* getOtherTextBoxFormat(const SwFrameFormat* pFormat, sal_uInt16 nType);
     /// 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).
     static Rectangle getTextRectangle(SwFrameFormat* pShape, bool bAbsolute = true);
 
diff --git a/sw/inc/unoredline.hxx b/sw/inc/unoredline.hxx
index 30e03dd..48d86a7 100644
--- a/sw/inc/unoredline.hxx
+++ b/sw/inc/unoredline.hxx
@@ -106,7 +106,7 @@ public:
     const SwRangeRedline*    GetRedline() const {return pRedline;}
 protected:
     //SwClient
-   virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override;
+    virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override;
 };
 #endif
 
diff --git a/sw/inc/unoredlines.hxx b/sw/inc/unoredlines.hxx
index ccb197b..4f302b2 100644
--- a/sw/inc/unoredlines.hxx
+++ b/sw/inc/unoredlines.hxx
@@ -85,7 +85,7 @@ public:
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
 protected:
     //SwClient
-   virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override;
+    virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override;
 };
 
 #endif
diff --git a/sw/source/core/doc/textboxhelper.cxx b/sw/source/core/doc/textboxhelper.cxx
index 19d30fe..95ab15f 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -58,7 +58,7 @@ void SwTextBoxHelper::create(SwFrameFormat* pShape)
 
         // Link FLY and DRAW formats, so it becomes a text box (needed for syncProperty calls).
         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);
         SwFrameFormat* pFormat = pTextFrame->GetFrameFormat();
 
@@ -128,24 +128,24 @@ void SwTextBoxHelper::destroy(SwFrameFormat* pShape)
 
 bool SwTextBoxHelper::isTextBox(const SwFrameFormat* pShape, sal_uInt16 nType)
 {
-   assert(nType == RES_FLYFRMFMT || nType == RES_DRAWFRMFMT);
-   if (!pShape || pShape->Which() != nType || !pShape->GetAttrSet().HasItem(RES_CNTNT))
-       return false;
+    assert(nType == RES_FLYFRMFMT || nType == RES_DRAWFRMFMT);
+    if (!pShape || pShape->Which() != nType || !pShape->GetAttrSet().HasItem(RES_CNTNT))
+        return false;
 
-   sal_uInt16 nOtherType = (pShape->Which() == RES_FLYFRMFMT) ? RES_DRAWFRMFMT : RES_FLYFRMFMT;
-   SwFrameFormat* pFormat = pShape->GetOtherTextBoxFormat();
-   if (!pFormat)
-       return false;
+    sal_uInt16 nOtherType = (pShape->Which() == RES_FLYFRMFMT) ? RES_DRAWFRMFMT : RES_FLYFRMFMT;
+    SwFrameFormat* pFormat = pShape->GetOtherTextBoxFormat();
+    if (!pFormat)
+        return false;
 
-   assert(pFormat->Which() == nOtherType);
-   if (pFormat->Which() != nOtherType)
-       return false;
+    assert(pFormat->Which() == nOtherType);
+    if (pFormat->Which() != nOtherType)
+        return false;
 
-   const SwFormatContent& rContent = pShape->GetContent();
-   if (!pFormat->GetAttrSet().HasItem(RES_CNTNT) || pFormat->GetContent() != rContent)
-       return false;
+    const SwFormatContent& rContent = pShape->GetContent();
+    if (!pFormat->GetAttrSet().HasItem(RES_CNTNT) || pFormat->GetContent() != rContent)
+        return false;
 
-   return true;
+    return true;
 }
 
 bool SwTextBoxHelper::isTextBox(const SdrObject* pObject)
@@ -226,7 +226,7 @@ sal_Int32 SwTextBoxHelper::getOrdNum(const SdrObject* pObject)
 
 void SwTextBoxHelper::getShapeWrapThrough(const SwFrameFormat* pTextBox, bool& rWrapThrough)
 {
-    SwFrameFormat *pShape = SwTextBoxHelper::getOtherTextBoxFormat(pTextBox, RES_FLYFRMFMT);
+    SwFrameFormat* pShape = SwTextBoxHelper::getOtherTextBoxFormat(pTextBox, RES_FLYFRMFMT);
     if (pShape)
         rWrapThrough = pShape->GetSurround().GetSurround() == SURROUND_THROUGHT;
 }
@@ -238,13 +238,13 @@ SwFrameFormat* SwTextBoxHelper::getOtherTextBoxFormat(const SwFrameFormat* pForm
     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());
     if (!pShape)
         return nullptr;
 
-    SwFrameFormat *pFormat = pShape->GetFrameFormat();
+    SwFrameFormat* pFormat = pShape->GetFrameFormat();
     return getOtherTextBoxFormat(pFormat, RES_DRAWFRMFMT);
 }
 
diff --git a/xmlsecurity/qa/unit/signing/signing.cxx b/xmlsecurity/qa/unit/signing/signing.cxx
index 37bf9be..0f12c66a 100644
--- a/xmlsecurity/qa/unit/signing/signing.cxx
+++ b/xmlsecurity/qa/unit/signing/signing.cxx
@@ -115,7 +115,7 @@ void SigningTest::setUp()
     // Set up cert8.db in workdir/CppunitTest/
     OUString aSourceDir = m_directories.getURLFromSrc(DATA_DIRECTORY);
     OUString aTargetDir = m_directories.getURLFromWorkdir(
-        "/CppunitTest/xmlsecurity_signing.test.user/");
+                              "/CppunitTest/xmlsecurity_signing.test.user/");
     osl::File::copy(aSourceDir + "cert8.db", aTargetDir + "cert8.db");
     OUString aTargetPath;
     osl::FileBase::getSystemPathFromFileURL(aTargetDir, aTargetPath);