[Libreoffice-commits] core.git: sd/qa sw/inc writerfilter/source
Miklos Vajna
vmiklos at collabora.co.uk
Wed Feb 24 08:23:21 UTC 2016
sd/qa/unit/tiledrendering/tiledrendering.cxx | 18 +++++++++---------
sw/inc/docufld.hxx | 6 +++---
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2 +-
3 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 76ab37fe9005c5bea719da4808bbea10206a9d17
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Wed Feb 24 09:22:27 2016 +0100
Indentation fixes
Change-Id: Icafd56488f58a5cc580912d720f91dacd110a7c2
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index baeb36b..402734c 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -522,7 +522,7 @@ void SdTiledRenderingTest::testInsertDeletePage()
SdXImpressDocument* pXImpressDocument = createDoc("insert-delete.odp");
pXImpressDocument->registerCallback(&SdTiledRenderingTest::callback, this);
- SdDrawDocument *pDoc = pXImpressDocument->GetDocShell()->GetDoc();
+ SdDrawDocument* pDoc = pXImpressDocument->GetDocShell()->GetDoc();
CPPUNIT_ASSERT(pDoc);
// the document has 1 slide
@@ -531,11 +531,11 @@ void SdTiledRenderingTest::testInsertDeletePage()
uno::Sequence<beans::PropertyValue> aArgs;
// Insert slides
- for(unsigned it = 1; it <= 10; it++)
+ for (unsigned it = 1; it <= 10; it++)
comphelper::dispatchCommand(".uno:InsertPage", aArgs);
// Verify inserted slides
- for(auto i: m_aPageList)
+ for (auto i: m_aPageList)
{
SdPage* pPage = pDoc->GetSdPage(i, PK_STANDARD);
CPPUNIT_ASSERT(pPage);
@@ -544,11 +544,11 @@ void SdTiledRenderingTest::testInsertDeletePage()
m_aPageList.clear();
// Delete slides
- for(unsigned it = 1; it <= 10; it++)
+ for (unsigned it = 1; it <= 10; it++)
comphelper::dispatchCommand(".uno:DeletePage", aArgs);
// Verify deleted slides
- for(auto i: m_aPageList)
+ for (auto i: m_aPageList)
{
SdPage* pPage = pDoc->GetSdPage(i, PK_STANDARD);
CPPUNIT_ASSERT(pPage == nullptr);
@@ -557,11 +557,11 @@ void SdTiledRenderingTest::testInsertDeletePage()
m_aPageList.clear();
// Undo deleted slides
- for(unsigned it = 1; it <= 10; it++)
+ for (unsigned it = 1; it <= 10; it++)
comphelper::dispatchCommand(".uno:Undo", aArgs);
// Verify inserted slides
- for(auto i: m_aPageList)
+ for (auto i: m_aPageList)
{
SdPage* pPage = pDoc->GetSdPage(i, PK_STANDARD);
CPPUNIT_ASSERT(pPage);
@@ -570,11 +570,11 @@ void SdTiledRenderingTest::testInsertDeletePage()
m_aPageList.clear();
// Redo deleted slides
- for(unsigned it = 1; it <= 10; it++)
+ for (unsigned it = 1; it <= 10; it++)
comphelper::dispatchCommand(".uno:Redo", aArgs);
// Verify deleted slides
- for(auto i: m_aPageList)
+ for (auto i: m_aPageList)
{
SdPage* pPage = pDoc->GetSdPage(i, PK_STANDARD);
CPPUNIT_ASSERT(pPage == nullptr);
diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx
index d684e9f..18f6b70 100644
--- a/sw/inc/docufld.hxx
+++ b/sw/inc/docufld.hxx
@@ -562,8 +562,8 @@ public:
virtual SwFieldType* Copy() const override;
protected:
- /// Overlay, because there is nothing to update!
- virtual void Modify( const SfxPoolItem*, const SfxPoolItem * ) override;
+ /// Overlay, because there is nothing to update!
+ virtual void Modify( const SfxPoolItem*, const SfxPoolItem * ) override;
};
// Relative page numbering.
@@ -599,7 +599,7 @@ class SwRefPageGetFieldType : public SwFieldType
void UpdateField( SwTextField* pTextField, _SetGetExpFields& rSetList );
protected:
/// overwritten to update all RefPageGet fields
- virtual void Modify( const SfxPoolItem*, const SfxPoolItem * ) override;
+ virtual void Modify( const SfxPoolItem*, const SfxPoolItem * ) override;
public:
SwRefPageGetFieldType( SwDoc* pDoc );
virtual SwFieldType* Copy() const override;
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 7473a98..251ff6d 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -5184,7 +5184,7 @@ RTFError RTFDocumentImpl::popState()
{
aPictureURL = rtl::Uri::convertRelToAbs(aFileURL, m_aPicturePath);
}
- catch(const rtl::MalformedUriException& rException)
+ catch (const rtl::MalformedUriException& rException)
{
SAL_WARN("writerfilter", "rtl::Uri::convertRelToAbs() failed: " << rException.getMessage());
}
More information about the Libreoffice-commits
mailing list