summaryrefslogtreecommitdiff
path: root/sw/qa
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-04-27 09:22:13 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-04-28 09:31:16 +0000
commit43b4903db3e925c652e25c34362490f8adc9c5ec (patch)
treeaf12777b72d42280467e8cc19b914b2c7f4f3816 /sw/qa
parent7d6308dad9f4a079d57719a6e3a9c4cebb47d051 (diff)
teach stylepolice plugin about ref-counted-pointer naming
Change-Id: I6e91d22fc1826038c05ddb6fc065563c6a250752 Reviewed-on: https://gerrit.libreoffice.org/24459 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sw/qa')
-rw-r--r--sw/qa/core/macros-test.cxx2
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport2.cxx4
-rw-r--r--sw/qa/extras/ooxmlimport/ooxmlimport.cxx6
-rw-r--r--sw/qa/extras/uiwriter/uiwriter.cxx10
4 files changed, 11 insertions, 11 deletions
diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index 8b465c5a24cd..d1bcbaf88a9c 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -524,7 +524,7 @@ void SwMacrosTest::testFindReplace()
Reference<lang::XComponent> const xComponent =
loadFromDesktop("private:factory/swriter", "com.sun.star.text.TextDocument");
- const ::comphelper::ScopeGuard xComponentScopeGuard(
+ const ::comphelper::ScopeGuard aComponentScopeGuard(
[&xComponent]() { xComponent->dispose(); } );
SwXTextDocument *const pTextDoc = dynamic_cast<SwXTextDocument *>(xComponent.get());
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
index 549755cbaae3..cb0c8046ce70 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
@@ -370,7 +370,7 @@ DECLARE_OOXMLEXPORT_TEST(testTable, "table.odt")
DECLARE_OOXMLEXPORT_TEST(testTablePosition, "table-position.docx")
{
- sal_Int32 xCoordsFromOffice[] = { 2500, -1000, 0, 0 };
+ sal_Int32 aXCoordsFromOffice[] = { 2500, -1000, 0, 0 };
sal_Int32 cellLeftMarginFromOffice[] = { 250, 100, 0, 0 };
uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY);
@@ -386,7 +386,7 @@ DECLARE_OOXMLEXPORT_TEST(testTablePosition, "table-position.docx")
uno::Reference<text::XTextViewCursor> xCursor(xTextViewCursorSupplier->getViewCursor(), uno::UNO_QUERY);
awt::Point pos = xCursor->getPosition();
CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Incorrect X coord computed from docx",
- xCoordsFromOffice[i], pos.X, 1);
+ aXCoordsFromOffice[i], pos.X, 1);
// Verify left margin of 1st cell :
// * Office left margins are measured relative to the right of the border
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 08cc3c4a1593..f29304f5ecb8 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2003,9 +2003,9 @@ DECLARE_OOXMLIMPORT_TEST(testFdo69649, "fdo69649.docx")
uno::Reference<text::XTextCursor> xTextCursor(xText->createTextCursor( ), uno::UNO_QUERY);
xTextCursor->gotoRange(xTextRange->getStart(),false);
xTextCursor->gotoRange(xTextRange->getEnd(),true);
- OUString xTocString(xTextCursor->getString());
- xTocString = xTocString.copy(256);
- CPPUNIT_ASSERT(xTocString.startsWithIgnoreAsciiCase( "Heading 15.1:\t15" ) );
+ OUString aTocString(xTextCursor->getString());
+ aTocString = aTocString.copy(256);
+ CPPUNIT_ASSERT(aTocString.startsWithIgnoreAsciiCase( "Heading 15.1:\t15" ) );
}
DECLARE_OOXMLIMPORT_TEST(testFdo73389,"fdo73389.docx")
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index 82f461038c2d..01c6500a0b6b 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -3418,8 +3418,8 @@ void SwUiWriterTest::testTdf96479()
OUStringLiteral1<CH_TXT_ATR_INPUTFIELDSTART>() + OUStringLiteral1<CH_TXT_ATR_INPUTFIELDEND>();
SwDoc* pDoc = createDoc();
- SwXTextDocument *xTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
- CPPUNIT_ASSERT(xTextDoc);
+ SwXTextDocument *pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+ CPPUNIT_ASSERT(pTextDoc);
// So we can clean up all references for reload
{
@@ -3483,9 +3483,9 @@ void SwUiWriterTest::testTdf96479()
utl::TempFile aTempFile;
save("writer8", aTempFile);
loadURL(aTempFile.GetURL(), nullptr);
- xTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
- CPPUNIT_ASSERT(xTextDoc);
- pDoc = xTextDoc->GetDocShell()->GetDoc();
+ pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+ CPPUNIT_ASSERT(pTextDoc);
+ pDoc = pTextDoc->GetDocShell()->GetDoc();
// Lookup "replacement" bookmark
IDocumentMarkAccess &rIDMA = *pDoc->getIDocumentMarkAccess();