diff options
author | Mathias Bauer <mba@openoffice.org> | 2011-02-09 15:55:27 +0100 |
---|---|---|
committer | Mathias Bauer <mba@openoffice.org> | 2011-02-09 15:55:27 +0100 |
commit | 749c27fafbe1e57b7ba25f759272c02de20469e0 (patch) | |
tree | d6bc9b5fe3a595ee6e0edd5ef07b042bd61992f0 /sw/source/core/unocore | |
parent | 53b8f0865ff2e59cb71eaf4c1bdbc829238fde6f (diff) |
CWS swlayoutrefactoring: fix merge conflicts
Diffstat (limited to 'sw/source/core/unocore')
-rw-r--r-- | sw/source/core/unocore/unocoll.cxx | 30 | ||||
-rw-r--r-- | sw/source/core/unocore/unodraw.cxx | 5 | ||||
-rw-r--r-- | sw/source/core/unocore/unofield.cxx | 27 | ||||
-rw-r--r-- | sw/source/core/unocore/unoframe.cxx | 15 | ||||
-rw-r--r-- | sw/source/core/unocore/unoidx.cxx | 20 | ||||
-rw-r--r-- | sw/source/core/unocore/unoredlines.cxx | 15 | ||||
-rw-r--r-- | sw/source/core/unocore/unotbl.cxx | 63 |
7 files changed, 1 insertions, 174 deletions
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index 92b338a4d169..fe86698ab4ad 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -1092,12 +1092,7 @@ OUString SwXTextFrames::getImplementationName(void) throw( RuntimeException ) return C2U("SwXTextFrames"); } -<<<<<<< local -BOOL SwXTextFrames::supportsService(const OUString& rServiceName) throw( RuntimeException ) -======= - ---------------------------------------------------------------------------*/ sal_Bool SwXTextFrames::supportsService(const OUString& rServiceName) throw( RuntimeException ) ->>>>>>> other { return C2U("com.sun.star.text.TextFrames") == rServiceName; } @@ -1128,12 +1123,7 @@ OUString SwXTextGraphicObjects::getImplementationName(void) throw( RuntimeExcept return C2U("SwXTextGraphicObjects"); } -<<<<<<< local -BOOL SwXTextGraphicObjects::supportsService(const OUString& rServiceName) throw( RuntimeException ) -======= - ---------------------------------------------------------------------------*/ sal_Bool SwXTextGraphicObjects::supportsService(const OUString& rServiceName) throw( RuntimeException ) ->>>>>>> other { return C2U("com.sun.star.text.TextGraphicObjects") == rServiceName; } @@ -1163,12 +1153,7 @@ OUString SwXTextEmbeddedObjects::getImplementationName(void) throw( RuntimeExcep return C2U("SwXTextEmbeddedObjects"); } -<<<<<<< local -BOOL SwXTextEmbeddedObjects::supportsService(const OUString& rServiceName) throw( RuntimeException ) -======= - ---------------------------------------------------------------------------*/ sal_Bool SwXTextEmbeddedObjects::supportsService(const OUString& rServiceName) throw( RuntimeException ) ->>>>>>> other { return C2U("com.sun.star.text.TextEmbeddedObjects") == rServiceName; } @@ -1199,12 +1184,7 @@ OUString SwXTextSections::getImplementationName(void) throw( RuntimeException ) return C2U("SwXTextSections"); } -<<<<<<< local -BOOL SwXTextSections::supportsService(const OUString& rServiceName) throw( RuntimeException ) -======= - ---------------------------------------------------------------------------*/ sal_Bool SwXTextSections::supportsService(const OUString& rServiceName) throw( RuntimeException ) ->>>>>>> other { return C2U("com.sun.star.text.TextSections") == rServiceName; } @@ -1561,12 +1541,7 @@ OUString SwXFootnotes::getImplementationName(void) throw( RuntimeException ) return C2U("SwXFootnotes"); } -<<<<<<< local -BOOL SwXFootnotes::supportsService(const OUString& rServiceName) throw( RuntimeException ) -======= - ---------------------------------------------------------------------------*/ sal_Bool SwXFootnotes::supportsService(const OUString& rServiceName) throw( RuntimeException ) ->>>>>>> other { return C2U("com.sun.star.text.Footnotes") == rServiceName; } @@ -1669,12 +1644,7 @@ OUString SwXReferenceMarks::getImplementationName(void) throw( RuntimeException return C2U("SwXReferenceMarks"); } -<<<<<<< local -BOOL SwXReferenceMarks::supportsService(const OUString& rServiceName) throw( RuntimeException ) -======= - ---------------------------------------------------------------------------*/ sal_Bool SwXReferenceMarks::supportsService(const OUString& rServiceName) throw( RuntimeException ) ->>>>>>> other { return C2U("com.sun.star.text.ReferenceMarks") == rServiceName; } diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index f3fc03148bbe..449559b5272a 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -489,12 +489,7 @@ rtl::OUString SwXDrawPage::getImplementationName(void) throw( uno::RuntimeExcept return C2U("SwXDrawPage"); } -<<<<<<< local -BOOL SwXDrawPage::supportsService(const rtl::OUString& rServiceName) throw( uno::RuntimeException ) -======= - ---------------------------------------------------------------------------*/ sal_Bool SwXDrawPage::supportsService(const rtl::OUString& rServiceName) throw( uno::RuntimeException ) ->>>>>>> other { return C2U("com.sun.star.drawing.GenericDrawPage") == rServiceName; } diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index b56eb7c0a535..bb2d1721d4b0 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -417,12 +417,7 @@ OUString SwXFieldMaster::getImplementationName(void) throw( uno::RuntimeExceptio return C2U("SwXFieldMaster"); } -<<<<<<< local -BOOL SwXFieldMaster::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) -======= - ---------------------------------------------------------------------------*/ sal_Bool SwXFieldMaster::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) ->>>>>>> other { sal_Bool bRet = sal_False; if(rServiceName.equalsAsciiL( @@ -969,8 +964,6 @@ void SwXFieldMaster::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) } } -<<<<<<< local -======= const Programmatic2UIName_Impl* lcl_GetFieldNameTable() { static sal_Bool bInitialized = sal_False; @@ -990,11 +983,7 @@ const Programmatic2UIName_Impl* lcl_GetFieldNameTable() } return &aFieldNames[0]; } - ---------------------------------------------------------------------------*/ -/* -----------------------------06.11.00 10:26-------------------------------- - ---------------------------------------------------------------------------*/ ->>>>>>> other OUString SwXFieldMaster::GetProgrammaticName(const SwFieldType& rType, SwDoc& rDoc) { OUString sRet(rType.GetName()); @@ -2413,14 +2402,8 @@ OUString SwXTextFieldMasters::getImplementationName(void) throw( uno::RuntimeExc { return C2U("SwXTextFieldMasters"); } -<<<<<<< local -BOOL SwXTextFieldMasters::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) -======= -/* -----------------------------06.04.00 13:22-------------------------------- - ---------------------------------------------------------------------------*/ sal_Bool SwXTextFieldMasters::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) ->>>>>>> other { return rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.TextFieldMasters" )); @@ -2647,12 +2630,7 @@ OUString SwXTextFieldTypes::getImplementationName(void) throw( uno::RuntimeExcep return C2U("SwXTextFieldTypes"); } -<<<<<<< local -BOOL SwXTextFieldTypes::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) -======= - ---------------------------------------------------------------------------*/ sal_Bool SwXTextFieldTypes::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) ->>>>>>> other { return rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.TextFields" )); @@ -2745,12 +2723,7 @@ OUString SwXFieldEnumeration::getImplementationName(void) throw( uno::RuntimeExc return C2U("SwXFieldEnumeration"); } -<<<<<<< local -BOOL SwXFieldEnumeration::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) -======= - ---------------------------------------------------------------------------*/ sal_Bool SwXFieldEnumeration::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) ->>>>>>> other { return rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.FieldEnumeration" )); diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 3466dc1cf20e..9681279c350f 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -157,22 +157,12 @@ BaseFrameProperties_Impl::~BaseFrameProperties_Impl() { } -<<<<<<< local -void BaseFrameProperties_Impl::SetProperty(USHORT nWID, BYTE nMemberId, const uno::Any& rVal) -======= - ---------------------------------------------------------------------------*/ void BaseFrameProperties_Impl::SetProperty(sal_uInt16 nWID, sal_uInt8 nMemberId, const uno::Any& rVal) ->>>>>>> other { aAnyMap.SetValue( nWID, nMemberId, rVal ); } -<<<<<<< local -sal_Bool BaseFrameProperties_Impl::GetProperty(USHORT nWID, BYTE nMemberId, const uno::Any*& rpAny) -======= - ---------------------------------------------------------------------------*/ sal_Bool BaseFrameProperties_Impl::GetProperty(sal_uInt16 nWID, sal_uInt8 nMemberId, const uno::Any*& rpAny) ->>>>>>> other { return aAnyMap.FillValue( nWID, nMemberId, rpAny ); } @@ -742,12 +732,7 @@ OUString SwXFrame::getImplementationName(void) throw( uno::RuntimeException ) return C2U("SwXFrame"); } -<<<<<<< local -BOOL SwXFrame::supportsService(const :: OUString& rServiceName) throw( uno::RuntimeException ) -======= - ---------------------------------------------------------------------------*/ sal_Bool SwXFrame::supportsService(const :: OUString& rServiceName) throw( uno::RuntimeException ) ->>>>>>> other { return !rServiceName.compareToAscii("com.sun.star.text.BaseFrame")|| !rServiceName.compareToAscii("com.sun.star.text.TextContent") || diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index cc4a31c5af9b..a3f23ea6bfb4 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -1247,31 +1247,11 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, case WID_INDEX_MARKS: { SwTOXMarks aMarks; -<<<<<<< local const SwTOXType* pType = pTOXBase->GetTOXType(); SwTOXMark::InsertTOXMarks( aMarks, *pType ); uno::Sequence< uno::Reference<text::XDocumentIndexMark> > aXMarks(aMarks.Count()); uno::Reference<text::XDocumentIndexMark>* pxMarks = aXMarks.getArray(); - for(USHORT i = 0; i < aMarks.Count(); i++) -======= - SwTOXType const*const pType = pTOXBase->GetTOXType(); - SwClientIter aIter(*pType); - SwTOXMark * pMark = - static_cast<SwTOXMark*>(aIter.First(TYPE(SwTOXMark))); - while( pMark ) - { - if(pMark->GetTxtTOXMark()) - { - aMarks.C40_INSERT(SwTOXMark, pMark, aMarks.Count()); - } - pMark = static_cast<SwTOXMark*>(aIter.Next()); - } - uno::Sequence< uno::Reference<text::XDocumentIndexMark> > - aXMarks(aMarks.Count()); - uno::Reference<text::XDocumentIndexMark>* pxMarks = - aXMarks.getArray(); for(sal_uInt16 i = 0; i < aMarks.Count(); i++) ->>>>>>> other { SwTOXMark* pMark = aMarks.GetObject(i); pxMarks[i] = SwXDocumentIndexMark::CreateXDocumentIndexMark( diff --git a/sw/source/core/unocore/unoredlines.cxx b/sw/source/core/unocore/unoredlines.cxx index 9061d6b9af5d..666c80a17bc7 100644 --- a/sw/source/core/unocore/unoredlines.cxx +++ b/sw/source/core/unocore/unoredlines.cxx @@ -111,12 +111,7 @@ OUString SwXRedlines::getImplementationName(void) throw( uno::RuntimeException ) return C2U("SwXRedlines"); } -<<<<<<< local -BOOL SwXRedlines::supportsService(const rtl::OUString& /*ServiceName*/) -======= - -----------------------------------------------------------------------*/ sal_Bool SwXRedlines::supportsService(const rtl::OUString& /*ServiceName*/) ->>>>>>> other throw( uno::RuntimeException ) { DBG_ERROR("not implemented"); @@ -157,12 +152,7 @@ SwXRedlineEnumeration::~SwXRedlineEnumeration() { } -<<<<<<< local -BOOL SwXRedlineEnumeration::hasMoreElements(void) throw( uno::RuntimeException ) -======= - -----------------------------------------------------------------------*/ sal_Bool SwXRedlineEnumeration::hasMoreElements(void) throw( uno::RuntimeException ) ->>>>>>> other { if(!pDoc) throw uno::RuntimeException(); @@ -188,12 +178,7 @@ rtl::OUString SwXRedlineEnumeration::getImplementationName(void) throw( uno::Run return C2U("SwXRedlineEnumeration"); } -<<<<<<< local -BOOL SwXRedlineEnumeration::supportsService(const rtl::OUString& /*ServiceName*/) throw( uno::RuntimeException ) -======= - -----------------------------------------------------------------------*/ sal_Bool SwXRedlineEnumeration::supportsService(const rtl::OUString& /*ServiceName*/) throw( uno::RuntimeException ) ->>>>>>> other { return sal_False; } diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index 744336bf11c2..79f2b127dcac 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -1241,17 +1241,8 @@ OUString SwXCell::getImplementationName(void) throw( uno::RuntimeException ) { return C2U("SwXCell"); } -<<<<<<< local -======= -/* -----------------------------19.04.00 15:20-------------------------------- ->>>>>>> other - -<<<<<<< local -BOOL SwXCell::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) -======= - ---------------------------------------------------------------------------*/ + sal_Bool SwXCell::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) ->>>>>>> other { String sServiceName(rServiceName); return sServiceName.EqualsAscii("com.sun.star.text.CellProperties"); @@ -1273,17 +1264,8 @@ OUString SwXTextTableRow::getImplementationName(void) throw( uno::RuntimeExcepti { return C2U("SwXTextTableRow"); } -<<<<<<< local -======= -/* -----------------------------19.04.00 15:20-------------------------------- ->>>>>>> other -<<<<<<< local -BOOL SwXTextTableRow::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) -======= - ---------------------------------------------------------------------------*/ sal_Bool SwXTextTableRow::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) ->>>>>>> other { return C2U("com.sun.star.text.TextTableRow") == rServiceName; } @@ -1470,17 +1452,8 @@ OUString SwXTextTableCursor::getImplementationName(void) throw( uno::RuntimeExce { return C2U("SwXTextTableCursor"); } -<<<<<<< local -======= -/* -----------------------------19.04.00 15:21-------------------------------- ->>>>>>> other -<<<<<<< local -BOOL SwXTextTableCursor::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) -======= - ---------------------------------------------------------------------------*/ sal_Bool SwXTextTableCursor::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) ->>>>>>> other { return C2U("com.sun.star.text.TextTableCursor") == rServiceName; } @@ -1918,15 +1891,8 @@ SwTableProperties_Impl::SwTableProperties_Impl() SwTableProperties_Impl::~SwTableProperties_Impl() { } -<<<<<<< local -void SwTableProperties_Impl::SetProperty(USHORT nWhichId, USHORT nMemberId, const uno::Any& rVal) -======= -/* -----------------22.06.98 09:51------------------- - * - * --------------------------------------------------*/ void SwTableProperties_Impl::SetProperty(sal_uInt16 nWhichId, sal_uInt16 nMemberId, const uno::Any& rVal) ->>>>>>> other { aAnyMap.SetValue( nWhichId, nMemberId, rVal ); } @@ -3621,17 +3587,8 @@ OUString SwXCellRange::getImplementationName(void) throw( uno::RuntimeException { return C2U("SwXCellRange"); } -<<<<<<< local -======= -/* -----------------------------19.04.00 15:21-------------------------------- ->>>>>>> other -<<<<<<< local -BOOL SwXCellRange::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) -======= - ---------------------------------------------------------------------------*/ sal_Bool SwXCellRange::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) ->>>>>>> other { return rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "com.sun.star.text.CellRange" ) ) || @@ -4596,17 +4553,8 @@ OUString SwXTableRows::getImplementationName(void) throw( uno::RuntimeException { return C2U("SwXTableRows"); } -<<<<<<< local -======= -/* -----------------------------19.04.00 15:22-------------------------------- ->>>>>>> other -<<<<<<< local -BOOL SwXTableRows::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) -======= - ---------------------------------------------------------------------------*/ sal_Bool SwXTableRows::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) ->>>>>>> other { return C2U("com.sun.star.text.TableRows") == rServiceName; } @@ -4822,17 +4770,8 @@ OUString SwXTableColumns::getImplementationName(void) throw( uno::RuntimeExcepti { return C2U("SwXTableColumns"); } -<<<<<<< local -======= -/* -----------------------------19.04.00 15:23-------------------------------- ->>>>>>> other -<<<<<<< local -BOOL SwXTableColumns::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) -======= - ---------------------------------------------------------------------------*/ sal_Bool SwXTableColumns::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) ->>>>>>> other { return C2U("com.sun.star.text.TableColumns") == rServiceName; } |