diff options
author | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2017-07-23 19:26:09 -0400 |
---|---|---|
committer | Ashod Nakashian <ashnakash@gmail.com> | 2017-07-24 02:59:30 +0200 |
commit | 5a6d6429f4d5ce7a1bbddc97990628039ff6f2ed (patch) | |
tree | d77f96fd6aebd0627e7035baf60a4aa616b9a1d3 /sw | |
parent | 425c68a316a5682696ac29f54f5e99c005685fc1 (diff) |
sw: non-functional minor cleanup
Change-Id: I94e34214e49de02e0922f85d5e799926a000d8e3
Reviewed-on: https://gerrit.libreoffice.org/40344
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Diffstat (limited to 'sw')
-rw-r--r-- | sw/inc/IDocumentContentOperations.hxx | 1 | ||||
-rw-r--r-- | sw/inc/dbfld.hxx | 2 | ||||
-rw-r--r-- | sw/inc/docufld.hxx | 1 | ||||
-rw-r--r-- | sw/inc/postithelper.hxx | 1 | ||||
-rw-r--r-- | sw/source/core/unocore/unocoll.cxx | 62 | ||||
-rw-r--r-- | sw/source/core/unocore/unofield.cxx | 42 |
6 files changed, 52 insertions, 57 deletions
diff --git a/sw/inc/IDocumentContentOperations.hxx b/sw/inc/IDocumentContentOperations.hxx index c0becb223b1a..9f4674ff2953 100644 --- a/sw/inc/IDocumentContentOperations.hxx +++ b/sw/inc/IDocumentContentOperations.hxx @@ -37,7 +37,6 @@ class SwFrameFormat; class SwDrawFrameFormat; class SwFlyFrameFormat; class SwNodeIndex; -class SwFormatField; namespace utl { class TransliterationWrapper; } namespace svt { class EmbeddedObjectRef; } diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx index 61b1b2267afb..753d119e8aa6 100644 --- a/sw/inc/dbfld.hxx +++ b/sw/inc/dbfld.hxx @@ -24,8 +24,6 @@ #include "swdbdata.hxx" class SwDoc; -class SwTextField; -class SwFrame; // Database field. class SW_DLLPUBLIC SwDBFieldType : public SwValueFieldType diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index 440f31d306fb..10bb1ac1f57d 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -32,7 +32,6 @@ class SwTextField; class SwFrame; class OutlinerParaObject; class SwTextAPIObject; -class SwFormatField; enum SwAuthorFormat { diff --git a/sw/inc/postithelper.hxx b/sw/inc/postithelper.hxx index 26eb10186233..483fbbd8f74a 100644 --- a/sw/inc/postithelper.hxx +++ b/sw/inc/postithelper.hxx @@ -28,7 +28,6 @@ #include <SidebarWindowsTypes.hxx> class SfxBroadcaster; -class SwTextField; class SwRootFrame; class SwPostItMgr; class SwEditWin; diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index 52ce1d245a1e..1557c9abffdb 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -730,31 +730,31 @@ SwXServiceProvider::MakeInstance(SwServiceType nObjectType, SwDoc & rDoc) case SwServiceType::FieldTypeDatabaseSetNum: case SwServiceType::FieldTypeDatabase: case SwServiceType::FieldTypeDatabaseName: - case SwServiceType::FieldTypePageCount : - case SwServiceType::FieldTypeParagraphCount : - case SwServiceType::FieldTypeWordCount : - case SwServiceType::FieldTypeCharacterCount : - case SwServiceType::FieldTypeTableCount : - case SwServiceType::FieldTypeGraphicObjectCount : - case SwServiceType::FieldTypeEmbeddedObjectCount : - case SwServiceType::FieldTypeDocInfoChangeAuthor : - case SwServiceType::FieldTypeDocInfoChangeDateTime : - case SwServiceType::FieldTypeDocInfoEditTime : - case SwServiceType::FieldTypeDocInfoDescription : - case SwServiceType::FieldTypeDocInfoCreateAuthor : - case SwServiceType::FieldTypeDocInfoCreateDateTime : - case SwServiceType::FieldTypeDocInfoCustom : - case SwServiceType::FieldTypeDocInfoPrintAuthor : - case SwServiceType::FieldTypeDocInfoPrintDateTime : - case SwServiceType::FieldTypeDocInfoKeywords : - case SwServiceType::FieldTypeDocInfoSubject : - case SwServiceType::FieldTypeDocInfoTitle : - case SwServiceType::FieldTypeDocInfoRevision : + case SwServiceType::FieldTypePageCount: + case SwServiceType::FieldTypeParagraphCount: + case SwServiceType::FieldTypeWordCount: + case SwServiceType::FieldTypeCharacterCount: + case SwServiceType::FieldTypeTableCount: + case SwServiceType::FieldTypeGraphicObjectCount: + case SwServiceType::FieldTypeEmbeddedObjectCount: + case SwServiceType::FieldTypeDocInfoChangeAuthor: + case SwServiceType::FieldTypeDocInfoChangeDateTime: + case SwServiceType::FieldTypeDocInfoEditTime: + case SwServiceType::FieldTypeDocInfoDescription: + case SwServiceType::FieldTypeDocInfoCreateAuthor: + case SwServiceType::FieldTypeDocInfoCreateDateTime: + case SwServiceType::FieldTypeDocInfoCustom: + case SwServiceType::FieldTypeDocInfoPrintAuthor: + case SwServiceType::FieldTypeDocInfoPrintDateTime: + case SwServiceType::FieldTypeDocInfoKeywords: + case SwServiceType::FieldTypeDocInfoSubject: + case SwServiceType::FieldTypeDocInfoTitle: + case SwServiceType::FieldTypeDocInfoRevision: case SwServiceType::FieldTypeBibliography: - case SwServiceType::FieldTypeInputUser : - case SwServiceType::FieldTypeHiddenText : - case SwServiceType::FieldTypeCombinedCharacters : - case SwServiceType::FieldTypeDropdown : + case SwServiceType::FieldTypeInputUser: + case SwServiceType::FieldTypeHiddenText: + case SwServiceType::FieldTypeCombinedCharacters: + case SwServiceType::FieldTypeDropdown: case SwServiceType::FieldTypeTableFormula: // NOTE: the sw.SwXAutoTextEntry unoapi test depends on pDoc = 0 xRet = SwXTextField::CreateXTextField(nullptr, nullptr, nObjectType); @@ -790,28 +790,28 @@ SwXServiceProvider::MakeInstance(SwServiceType nObjectType, SwDoc & rDoc) xRet = SwXFieldMaster::CreateXFieldMaster(&rDoc, pType); } break; - case SwServiceType::Paragraph : + case SwServiceType::Paragraph: xRet = SwXParagraph::CreateXParagraph(rDoc, nullptr); break; - case SwServiceType::NumberingRules : + case SwServiceType::NumberingRules: xRet = static_cast<cppu::OWeakObject*>(new SwXNumberingRules(rDoc)); break; - case SwServiceType::TextColumns : + case SwServiceType::TextColumns: xRet = static_cast<cppu::OWeakObject*>(new SwXTextColumns); break; case SwServiceType::Defaults: xRet = static_cast<cppu::OWeakObject*>(new SwXTextDefaults(&rDoc)); break; - case SwServiceType::IMapRectangle : + case SwServiceType::IMapRectangle: xRet = SvUnoImageMapRectangleObject_createInstance( sw_GetSupportedMacroItems() ); break; - case SwServiceType::IMapCircle : + case SwServiceType::IMapCircle: xRet = SvUnoImageMapCircleObject_createInstance( sw_GetSupportedMacroItems() ); break; - case SwServiceType::IMapPolygon : + case SwServiceType::IMapPolygon: xRet = SvUnoImageMapPolygonObject_createInstance( sw_GetSupportedMacroItems() ); break; - case SwServiceType::Chart2DataProvider : + case SwServiceType::Chart2DataProvider: // #i64497# If a chart is in a temporary document during clipoard // paste, there should be no data provider, so that own data is used // This should not happen during copy/paste, as this will unlink diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index 77f56b435dd1..e0d95b20b633 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -1495,19 +1495,19 @@ void SAL_CALL SwXTextField::attach( m_pImpl->m_pProps->sPar1); } break; - case SwServiceType::FieldTypeDocInfoChangeAuthor : - case SwServiceType::FieldTypeDocInfoChangeDateTime : - case SwServiceType::FieldTypeDocInfoEditTime : - case SwServiceType::FieldTypeDocInfoDescription : - case SwServiceType::FieldTypeDocInfoCreateAuthor : - case SwServiceType::FieldTypeDocInfoCreateDateTime : - case SwServiceType::FieldTypeDocInfoCustom : - case SwServiceType::FieldTypeDocInfoPrintAuthor : - case SwServiceType::FieldTypeDocInfoPrintDateTime : - case SwServiceType::FieldTypeDocInfoKeywords : - case SwServiceType::FieldTypeDocInfoSubject : - case SwServiceType::FieldTypeDocInfoTitle : - case SwServiceType::FieldTypeDocInfoRevision : + case SwServiceType::FieldTypeDocInfoChangeAuthor: + case SwServiceType::FieldTypeDocInfoChangeDateTime: + case SwServiceType::FieldTypeDocInfoEditTime: + case SwServiceType::FieldTypeDocInfoDescription: + case SwServiceType::FieldTypeDocInfoCreateAuthor: + case SwServiceType::FieldTypeDocInfoCreateDateTime: + case SwServiceType::FieldTypeDocInfoCustom: + case SwServiceType::FieldTypeDocInfoPrintAuthor: + case SwServiceType::FieldTypeDocInfoPrintDateTime: + case SwServiceType::FieldTypeDocInfoKeywords: + case SwServiceType::FieldTypeDocInfoSubject: + case SwServiceType::FieldTypeDocInfoTitle: + case SwServiceType::FieldTypeDocInfoRevision: case SwServiceType::FieldTypeDocInfo: { SwFieldType* pFieldType = pDoc->getIDocumentFieldsAccess().GetSysFieldType(SwFieldIds::DocInfo); @@ -1822,13 +1822,13 @@ void SAL_CALL SwXTextField::attach( m_pImpl->m_pProps->sPar2); } break; - case SwServiceType::FieldTypePageCount : - case SwServiceType::FieldTypeParagraphCount : - case SwServiceType::FieldTypeWordCount : - case SwServiceType::FieldTypeCharacterCount : - case SwServiceType::FieldTypeTableCount : - case SwServiceType::FieldTypeGraphicObjectCount : - case SwServiceType::FieldTypeEmbeddedObjectCount : + case SwServiceType::FieldTypePageCount: + case SwServiceType::FieldTypeParagraphCount: + case SwServiceType::FieldTypeWordCount: + case SwServiceType::FieldTypeCharacterCount: + case SwServiceType::FieldTypeTableCount: + case SwServiceType::FieldTypeGraphicObjectCount: + case SwServiceType::FieldTypeEmbeddedObjectCount: { sal_uInt16 nSubType = DS_PAGE; switch (m_pImpl->m_nServiceId) @@ -1882,7 +1882,7 @@ void SAL_CALL SwXTextField::attach( } break; - case SwServiceType::FieldTypeTableFormula : + case SwServiceType::FieldTypeTableFormula: { // create field sal_uInt16 nType = nsSwGetSetExpType::GSE_FORMULA; |