summaryrefslogtreecommitdiff
path: root/sw/qa/extras/htmlimport
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2015-05-20 13:05:49 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2015-05-20 13:05:49 +0200
commitab465b90f6c6da5595393a0ba73f33a1e71a2b65 (patch)
tree36b77192de2799a11b4bf0b269cb3f74d0a0bb1f /sw/qa/extras/htmlimport
parent0db96caf0fcce09b87621c11b584a6d81cc7df86 (diff)
bin/rename-sw-abbreviations.shlibreoffice-5-0-branch-point
renames the most annoying abbreviations in Writer (and partially in the shared code too). Change-Id: I9a62759138126c1537cc5c985ba05cf54d6132d9
Diffstat (limited to 'sw/qa/extras/htmlimport')
-rw-r--r--sw/qa/extras/htmlimport/htmlimport.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/qa/extras/htmlimport/htmlimport.cxx b/sw/qa/extras/htmlimport/htmlimport.cxx
index 52a29e2fdb91..973b8304bda1 100644
--- a/sw/qa/extras/htmlimport/htmlimport.cxx
+++ b/sw/qa/extras/htmlimport/htmlimport.cxx
@@ -28,10 +28,10 @@ class HtmlImportTest : public SwModelTestBase
DECLARE_HTMLIMPORT_TEST(testPictureImport, "picture.html")
{
- SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
- CPPUNIT_ASSERT(pTxtDoc);
+ SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+ CPPUNIT_ASSERT(pTextDoc);
// The document contains two pictures stored as a link.
- sfx2::LinkManager& rLinkManager = pTxtDoc->GetDocShell()->GetDoc()->GetEditShell()->GetLinkManager();
+ sfx2::LinkManager& rLinkManager = pTextDoc->GetDocShell()->GetDoc()->GetEditShell()->GetLinkManager();
CPPUNIT_ASSERT_EQUAL(size_t(2), rLinkManager.GetLinks().size());
rLinkManager.Remove(0,2);
CPPUNIT_ASSERT_EQUAL(size_t(0), rLinkManager.GetLinks().size());
@@ -44,11 +44,11 @@ DECLARE_HTMLIMPORT_TEST(testPictureImport, "picture.html")
DECLARE_HTMLIMPORT_TEST(testInlinedImage, "inlined_image.html")
{
- SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
- CPPUNIT_ASSERT(pTxtDoc);
+ SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+ CPPUNIT_ASSERT(pTextDoc);
// The document contains only one embedded picture inlined in img's src attribute.
- SwDoc* pDoc = pTxtDoc->GetDocShell()->GetDoc();
+ SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
SwEditShell* pEditShell = pDoc->GetEditShell();
CPPUNIT_ASSERT(pEditShell);