sc/qa/extras/anchor.cxx | 38 ++++++++++++++++++--------------------
solenv/clang-format/blacklist | 1 -
2 files changed, 18 insertions(+), 21 deletions(-)
New commits:
commit 298284f4a6578aefc4268b7f4b5de6c2e4203465
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
AuthorDate: Thu Feb 14 18:34:06 2019 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Fri Feb 15 08:01:22 2019 +0100
Format anchor.cxx with clang-format
It has nearly correct formatting already, lets keep that.
Change-Id: I0b3b7baf69655cb3241ba039b181b0d8262a3f55
Reviewed-on: https://gerrit.libreoffice.org/67845
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
diff --git a/sc/qa/extras/anchor.cxx b/sc/qa/extras/anchor.cxx
index 92e09a0c2f25..221a6da25289 100644
--- a/sc/qa/extras/anchor.cxx
+++ b/sc/qa/extras/anchor.cxx
@@ -7,10 +7,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <test/calc_unoapi_test.hxx>
+#include <sfx2/dispatch.hxx>
#include <svx/svdograf.hxx>
#include <svx/svdpage.hxx>
-#include <sfx2/dispatch.hxx>
+#include <test/calc_unoapi_test.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/sheet/XSpreadsheet.hpp>
@@ -18,19 +18,19 @@
#include <com/sun/star/text/XText.hpp>
#include <unonames.hxx>
-#include <tabvwsh.hxx>
+#include <cliputil.hxx>
#include <docsh.hxx>
-#include <svx/svdocirc.hxx>
-#include <scitems.hxx>
#include <drwlayer.hxx>
-#include <cliputil.hxx>
+#include <scitems.hxx>
+#include <svx/svdocirc.hxx>
+#include <tabvwsh.hxx>
#include <sc.hrc>
using namespace css;
-namespace sc_apitest {
-
+namespace sc_apitest
+{
class ScAnchorTest : public CalcUnoApiTest
{
public:
@@ -51,9 +51,9 @@ public:
CPPUNIT_TEST(testCopyColumnWithImages);
CPPUNIT_TEST(testCutWithImages);
CPPUNIT_TEST_SUITE_END();
-private:
- uno::Reference< lang::XComponent > mxComponent;
+private:
+ uno::Reference<lang::XComponent> mxComponent;
};
ScAnchorTest::ScAnchorTest()
@@ -61,13 +61,12 @@ ScAnchorTest::ScAnchorTest()
{
}
-
void ScAnchorTest::testUndoAnchor()
{
OUString aFileURL;
createFileURL("document_with_linked_graphic.ods", aFileURL);
// open the document with graphic included
- uno::Reference< css::lang::XComponent > xComponent =
loadFromDesktop(aFileURL);
+ uno::Reference<css::lang::XComponent> xComponent =
loadFromDesktop(aFileURL);
CPPUNIT_ASSERT(xComponent.is());
// Get the document model
@@ -82,7 +81,7 @@ void ScAnchorTest::testUndoAnchor()
ScDrawLayer* pDrawLayer = rDoc.GetDrawLayer();
CPPUNIT_ASSERT(pDrawLayer);
- const SdrPage *pPage = pDrawLayer->GetPage(0);
+ const SdrPage* pPage = pDrawLayer->GetPage(0);
CPPUNIT_ASSERT(pPage);
SdrGrafObj* pObject = dynamic_cast<SdrGrafObj*>(pPage->GetObj(0));
@@ -103,7 +102,7 @@ void ScAnchorTest::testUndoAnchor()
// Select graphic object
pDrawView->MarkNextObj();
- CPPUNIT_ASSERT(pDrawView->AreObjectsMarked() );
+ CPPUNIT_ASSERT(pDrawView->AreObjectsMarked());
// Set Cell Anchor
ScDrawLayer::SetCellAnchoredFromPosition(*pObject, rDoc, 0, false);
@@ -164,12 +163,12 @@ void ScAnchorTest::testUndoAnchor()
void ScAnchorTest::testTdf76183()
{
- uno::Reference< lang::XComponent > xComponent =
loadFromDesktop("private:factory/scalc");
+ uno::Reference<lang::XComponent> xComponent =
loadFromDesktop("private:factory/scalc");
SfxObjectShell* pFoundShell =
SfxObjectShell::GetShellFromComponent(xComponent);
ScDocShell* pDocSh = dynamic_cast<ScDocShell*>(pFoundShell);
ScDocument& rDoc = pDocSh->GetDocument();
ScDrawLayer* pDrawLayer = rDoc.GetDrawLayer();
- SdrPage *pPage = pDrawLayer->GetPage(0);
+ SdrPage* pPage = pDrawLayer->GetPage(0);
// Add a circle somewhere below first row.
const tools::Rectangle aOrigRect = tools::Rectangle(1000, 1000, 1200,
1200);
@@ -199,7 +198,7 @@ void ScAnchorTest::testODFAnchorTypes()
OUString aFileURL;
createFileURL("3AnchorTypes.ods", aFileURL);
// open the document with graphic included
- uno::Reference< css::lang::XComponent > xComponent =
loadFromDesktop(aFileURL);
+ uno::Reference<css::lang::XComponent> xComponent =
loadFromDesktop(aFileURL);
CPPUNIT_ASSERT(xComponent.is());
// Get the document model
@@ -214,7 +213,7 @@ void ScAnchorTest::testODFAnchorTypes()
ScDrawLayer* pDrawLayer = rDoc.GetDrawLayer();
CPPUNIT_ASSERT(pDrawLayer);
- const SdrPage *pPage = pDrawLayer->GetPage(0);
+ const SdrPage* pPage = pDrawLayer->GetPage(0);
CPPUNIT_ASSERT(pPage);
// Check 1st object: Page anchored
@@ -229,7 +228,7 @@ void ScAnchorTest::testODFAnchorTypes()
anchorType = ScDrawLayer::GetAnchorType(*pObject);
CPPUNIT_ASSERT_EQUAL(SCA_CELL_RESIZE, anchorType);
- // Check 3rd object: Cell anchored
+ // Check 3rd object: Cell anchored
pObject = dynamic_cast<SdrGrafObj*>(pPage->GetObj(2));
CPPUNIT_ASSERT(pObject);
anchorType = ScDrawLayer::GetAnchorType(*pObject);
@@ -381,7 +380,6 @@ void ScAnchorTest::tearDown()
}
CPPUNIT_TEST_SUITE_REGISTRATION(ScAnchorTest);
-
}
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 9e104cf16bbd..9378cca7a50c 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -10118,7 +10118,6 @@ sc/inc/waitoff.hxx
sc/inc/warnpassword.hxx
sc/inc/xmlwrap.hxx
sc/inc/zforauto.hxx
-sc/qa/extras/anchor.cxx
sc/qa/extras/check_data_pilot_field.cxx
sc/qa/extras/check_data_pilot_table.cxx
sc/qa/extras/check_xcell_ranges_query.cxx
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
