diff options
| author | Prashant Shah <pshah.mumbai@gmail.com> | 2010-10-14 10:53:13 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2010-10-14 10:53:13 +0100 |
| commit | dd4140f60abf81c1d8addcc250e0eedb4d623376 (patch) | |
| tree | 15d0c78ef9e258d5e775eb1204cafbbb557bcdd3 | |
| parent | 85288d73534394efa734548c5bbe731f2189041a (diff) | |
remove bogus comments
| -rw-r--r-- | sw/source/core/unocore/unocoll.cxx | 172 | ||||
| -rw-r--r-- | sw/source/core/unocore/unoidx.cxx | 221 | ||||
| -rw-r--r-- | sw/source/core/unocore/unoobj.cxx | 230 | ||||
| -rw-r--r-- | sw/source/core/unocore/unoport.cxx | 104 | ||||
| -rw-r--r-- | sw/source/core/unocore/unosett.cxx | 208 | ||||
| -rw-r--r-- | sw/source/core/unocore/unotext.cxx | 168 |
6 files changed, 39 insertions, 1064 deletions
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index 42f3c13a73..62d91a02ba 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -274,9 +274,6 @@ public: }; -/****************************************************************************** - * - ******************************************************************************/ struct ProvNamesId_Type { const char * pName; @@ -461,9 +458,6 @@ const ProvNamesId_Type __FAR_DATA aProvNamesId[] = { CSS_TEXT_FIELDMASTER_BIBLIOGRAPHY, SW_SERVICE_FIELDMASTER_BIBLIOGRAPHY } }; -/* -----------------------------23.03.01 13:38-------------------------------- - - ---------------------------------------------------------------------------*/ const SvEventDescription* lcl_GetSupportedMacroItems() { static const SvEventDescription aMacroDescriptionsImpl[] = @@ -479,9 +473,6 @@ const SvEventDescription* lcl_GetSupportedMacroItems() /****************************************************************** * SwXServiceProvider ******************************************************************/ -/*-- 13.01.99 13:31:44--------------------------------------------------- - - -----------------------------------------------------------------------*/ OUString SwXServiceProvider::GetProviderName(sal_uInt16 nObjectType) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -491,9 +482,7 @@ OUString SwXServiceProvider::GetProviderName(sal_uInt16 nObjectType) sRet = C2U(aProvNamesId[nObjectType].pName); return sRet; } -/* -----------------11.03.99 12:05------------------- - * - * --------------------------------------------------*/ + uno::Sequence<OUString> SwXServiceProvider::GetAllServiceNames() { sal_uInt16 nEntries = SAL_N_ELEMENTS(aProvNamesId); @@ -514,9 +503,6 @@ uno::Sequence<OUString> SwXServiceProvider::GetAllServiceNames() } -/*-- 13.01.99 13:31:45--------------------------------------------------- - - -----------------------------------------------------------------------*/ sal_uInt16 SwXServiceProvider::GetProviderType(const OUString& rServiceName) { sal_uInt16 nEntries = SAL_N_ELEMENTS(aProvNamesId); @@ -527,9 +513,7 @@ sal_uInt16 SwXServiceProvider::GetProviderType(const OUString& rServiceName) } return SW_SERVICE_INVALID; } -/* -----------------13.01.99 14:37------------------- - * - * --------------------------------------------------*/ + uno::Reference< uno::XInterface > SwXServiceProvider::MakeInstance(sal_uInt16 nObjectType, SwDoc* pDoc) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -853,29 +837,22 @@ uno::Reference< uno::XInterface > SwXServiceProvider::MakeInstance(sal_uInt16 } return xRet; } + /****************************************************************** * SwXTextTables ******************************************************************/ //SMART_UNO_IMPLEMENTATION( SwXTextTables, UsrObject ); - -/*-- 13.01.99 12:56:24--------------------------------------------------- - - -----------------------------------------------------------------------*/ SwXTextTables::SwXTextTables(SwDoc* pDc) : SwUnoCollection(pDc) { } -/*-- 13.01.99 12:56:25--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXTextTables::~SwXTextTables() { } -/*-- 13.01.99 12:56:25--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Int32 SwXTextTables::getCount(void) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -884,9 +861,7 @@ sal_Int32 SwXTextTables::getCount(void) throw( uno::RuntimeException ) nRet = GetDoc()->GetTblFrmFmtCount(sal_True); return nRet; } -/*-- 13.01.99 12:56:26--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Any SAL_CALL SwXTextTables::getByIndex(sal_Int32 nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, uno::RuntimeException ) { @@ -908,9 +883,7 @@ uno::Any SAL_CALL SwXTextTables::getByIndex(sal_Int32 nIndex) throw uno::RuntimeException(); return aRet; } -/*-- 13.01.99 12:56:26--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Any SwXTextTables::getByName(const OUString& rItemName) throw( NoSuchElementException, WrappedTargetException, uno::RuntimeException ) { @@ -939,9 +912,7 @@ uno::Any SwXTextTables::getByName(const OUString& rItemName) throw uno::RuntimeException(); return aRet; } -/*-- 13.01.99 12:56:26--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Sequence< OUString > SwXTextTables::getElementNames(void) throw( uno::RuntimeException ) { @@ -962,9 +933,7 @@ uno::Sequence< OUString > SwXTextTables::getElementNames(void) } return aSeq; } -/*-- 13.01.99 12:56:27--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool SwXTextTables::hasByName(const OUString& rName) throw( uno::RuntimeException ) { @@ -988,18 +957,14 @@ sal_Bool SwXTextTables::hasByName(const OUString& rName) throw uno::RuntimeException(); return bRet; } -/*-- 13.01.99 12:56:27--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Type SAL_CALL SwXTextTables::getElementType( ) throw(uno::RuntimeException) { return ::getCppuType((uno::Reference<XTextTable>*)0); } -/*-- 13.01.99 12:56:27--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool SwXTextTables::hasElements(void) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -1007,23 +972,17 @@ sal_Bool SwXTextTables::hasElements(void) throw( uno::RuntimeException ) throw uno::RuntimeException(); return 0 != GetDoc()->GetTblFrmFmtCount(sal_True); } -/* -----------------25.10.99 16:01------------------- - --------------------------------------------------*/ OUString SwXTextTables::getImplementationName(void) throw( uno::RuntimeException ) { return C2U("SwXTextTables"); } -/* -----------------25.10.99 16:01------------------- - --------------------------------------------------*/ sal_Bool SwXTextTables::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) { return rServiceName == C2U("com.sun.star.text.TextTables"); } -/* -----------------25.10.99 16:01------------------- - --------------------------------------------------*/ uno::Sequence< OUString > SwXTextTables::getSupportedServiceNames(void) throw( uno::RuntimeException ) { uno::Sequence< OUString > aRet(1); @@ -1031,9 +990,7 @@ uno::Sequence< OUString > SwXTextTables::getSupportedServiceNames(void) throw( u pArr[0] = C2U("com.sun.star.text.TextTables"); return aRet; } -/*-- 13.01.99 12:56:28--------------------------------------------------- - -----------------------------------------------------------------------*/ XTextTable* SwXTextTables::GetObject( SwFrmFmt& rFmt ) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -1044,7 +1001,6 @@ XTextTable* SwXTextTables::GetObject( SwFrmFmt& rFmt ) return pTbl ; } - /****************************************************************** * SwXFrameEnumeration ******************************************************************/ @@ -1365,23 +1321,16 @@ SwXFrame* SwXFrames::GetObject(SwFrmFmt& rFmt, FlyCntType eType) /****************************************************************** * SwXTextFrames ******************************************************************/ -/* -----------------------------06.04.00 12:44-------------------------------- - - ---------------------------------------------------------------------------*/ OUString SwXTextFrames::getImplementationName(void) throw( RuntimeException ) { return C2U("SwXTextFrames"); } -/* -----------------------------06.04.00 12:44-------------------------------- - ---------------------------------------------------------------------------*/ BOOL SwXTextFrames::supportsService(const OUString& rServiceName) throw( RuntimeException ) { return C2U("com.sun.star.text.TextFrames") == rServiceName; } -/* -----------------------------06.04.00 12:44-------------------------------- - ---------------------------------------------------------------------------*/ Sequence< OUString > SwXTextFrames::getSupportedServiceNames(void) throw( RuntimeException ) { Sequence< OUString > aRet(1); @@ -1389,16 +1338,12 @@ Sequence< OUString > SwXTextFrames::getSupportedServiceNames(void) throw( Runtim pArray[0] = C2U("com.sun.star.text.TextFrames"); return aRet; } -/*-- 14.01.99 08:06:16--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXTextFrames::SwXTextFrames(SwDoc* _pDoc) : SwXFrames(_pDoc, FLYCNTTYPE_FRM) { } -/*-- 14.01.99 08:06:17--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXTextFrames::~SwXTextFrames() { } @@ -1407,24 +1352,16 @@ SwXTextFrames::~SwXTextFrames() * SwXTextGraphicObjects ******************************************************************/ //SMART_UNO_IMPLEMENTATION( SwXTextGraphicObjects, UsrObject ); - -/* -----------------------------06.04.00 12:44-------------------------------- - - ---------------------------------------------------------------------------*/ OUString SwXTextGraphicObjects::getImplementationName(void) throw( RuntimeException ) { return C2U("SwXTextGraphicObjects"); } -/* -----------------------------06.04.00 12:44-------------------------------- - ---------------------------------------------------------------------------*/ BOOL SwXTextGraphicObjects::supportsService(const OUString& rServiceName) throw( RuntimeException ) { return C2U("com.sun.star.text.TextGraphicObjects") == rServiceName; } -/* -----------------------------06.04.00 12:44-------------------------------- - ---------------------------------------------------------------------------*/ Sequence< OUString > SwXTextGraphicObjects::getSupportedServiceNames(void) throw( RuntimeException ) { Sequence< OUString > aRet(1); @@ -1432,16 +1369,12 @@ Sequence< OUString > SwXTextGraphicObjects::getSupportedServiceNames(void) throw pArray[0] = C2U("com.sun.star.text.TextGraphicObjects"); return aRet; } -/*-- 14.01.99 08:45:53--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXTextGraphicObjects::SwXTextGraphicObjects(SwDoc* _pDoc) : SwXFrames(_pDoc, FLYCNTTYPE_GRF) { } -/*-- 14.01.99 08:45:54--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXTextGraphicObjects::~SwXTextGraphicObjects() { } @@ -1449,23 +1382,16 @@ SwXTextGraphicObjects::~SwXTextGraphicObjects() /****************************************************************** * SwXTextEmbeddedObjects ******************************************************************/ -/* -----------------------------06.04.00 12:44-------------------------------- - - ---------------------------------------------------------------------------*/ OUString SwXTextEmbeddedObjects::getImplementationName(void) throw( RuntimeException ) { return C2U("SwXTextEmbeddedObjects"); } -/* -----------------------------06.04.00 12:44-------------------------------- - ---------------------------------------------------------------------------*/ BOOL SwXTextEmbeddedObjects::supportsService(const OUString& rServiceName) throw( RuntimeException ) { return C2U("com.sun.star.text.TextEmbeddedObjects") == rServiceName; } -/* -----------------------------06.04.00 12:44-------------------------------- - ---------------------------------------------------------------------------*/ Sequence< OUString > SwXTextEmbeddedObjects::getSupportedServiceNames(void) throw( RuntimeException ) { Sequence< OUString > aRet(1); @@ -1473,41 +1399,28 @@ Sequence< OUString > SwXTextEmbeddedObjects::getSupportedServiceNames(void) thro pArray[0] = C2U("com.sun.star.text.TextEmbeddedObjects"); return aRet; } -/*-- 14.01.99 08:45:13--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXTextEmbeddedObjects::SwXTextEmbeddedObjects(SwDoc* _pDoc) : SwXFrames(_pDoc, FLYCNTTYPE_OLE) { } -/*-- 14.01.99 08:45:31--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXTextEmbeddedObjects::~SwXTextEmbeddedObjects() { } -/****************************************************************** - * - ******************************************************************/ #define PASSWORD_STD_TIMEOUT 1000 -/* -----------------------------06.04.00 12:44-------------------------------- - ---------------------------------------------------------------------------*/ OUString SwXTextSections::getImplementationName(void) throw( RuntimeException ) { return C2U("SwXTextSections"); } -/* -----------------------------06.04.00 12:44-------------------------------- - ---------------------------------------------------------------------------*/ BOOL SwXTextSections::supportsService(const OUString& rServiceName) throw( RuntimeException ) { return C2U("com.sun.star.text.TextSections") == rServiceName; } -/* -----------------------------06.04.00 12:44-------------------------------- - ---------------------------------------------------------------------------*/ Sequence< OUString > SwXTextSections::getSupportedServiceNames(void) throw( RuntimeException ) { Sequence< OUString > aRet(1); @@ -1515,22 +1428,16 @@ Sequence< OUString > SwXTextSections::getSupportedServiceNames(void) throw( Runt pArray[0] = C2U("com.sun.star.text.TextSections"); return aRet; } -/*-- 14.01.99 09:06:05--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXTextSections::SwXTextSections(SwDoc* _pDoc) : SwUnoCollection(_pDoc) { } -/*-- 14.01.99 09:06:05--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXTextSections::~SwXTextSections() { } -/*-- 14.01.99 09:06:05--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Int32 SwXTextSections::getCount(void) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -1545,9 +1452,7 @@ sal_Int32 SwXTextSections::getCount(void) throw( uno::RuntimeException ) } return nCount; } -/*-- 14.01.99 09:06:06--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Any SwXTextSections::getByIndex(sal_Int32 nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, uno::RuntimeException ) { @@ -1580,9 +1485,7 @@ uno::Any SwXTextSections::getByIndex(sal_Int32 nIndex) throw uno::RuntimeException(); return makeAny(xRet); } -/*-- 14.01.99 09:06:06--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Any SwXTextSections::getByName(const OUString& Name) throw( NoSuchElementException, WrappedTargetException, uno::RuntimeException ) { @@ -1611,9 +1514,7 @@ uno::Any SwXTextSections::getByName(const OUString& Name) throw uno::RuntimeException(); return aRet; } -/*-- 14.01.99 09:06:06--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Sequence< OUString > SwXTextSections::getElementNames(void) throw( uno::RuntimeException ) { @@ -1646,9 +1547,7 @@ uno::Sequence< OUString > SwXTextSections::getElementNames(void) } return aSeq; } -/*-- 14.01.99 09:06:06--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool SwXTextSections::hasByName(const OUString& Name) throw( uno::RuntimeException ) { @@ -1676,16 +1575,12 @@ sal_Bool SwXTextSections::hasByName(const OUString& Name) } return bRet; } -/*-- 14.01.99 09:06:06--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Type SAL_CALL SwXTextSections::getElementType() throw(uno::RuntimeException) { return ::getCppuType((uno::Reference<XTextSection>*)0); } -/*-- 14.01.99 09:06:06--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool SwXTextSections::hasElements(void) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -1699,9 +1594,7 @@ sal_Bool SwXTextSections::hasElements(void) throw( uno::RuntimeException ) throw uno::RuntimeException(); return nCount > 0; } -/*-- 14.01.99 09:06:07--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Reference< XTextSection > SwXTextSections::GetObject( SwSectionFmt& rFmt ) { return SwXTextSection::CreateXTextSection(&rFmt); @@ -1819,10 +1712,6 @@ sal_Bool SwXBookmarks::hasElements(void) return GetDoc()->getIDocumentMarkAccess()->getBookmarksCount() != 0; } -/****************************************************************** - * - ******************************************************************/ - SwXNumberingRulesCollection::SwXNumberingRulesCollection( SwDoc* _pDoc ) : SwUnoCollection(_pDoc) { @@ -1875,23 +1764,16 @@ sal_Bool SwXNumberingRulesCollection::hasElements(void) throw( uno::RuntimeExcep return GetDoc()->GetNumRuleTbl().Count() > 0; } -/* -----------------------------06.04.00 12:44-------------------------------- - - ---------------------------------------------------------------------------*/ OUString SwXFootnotes::getImplementationName(void) throw( RuntimeException ) { return C2U("SwXFootnotes"); } -/* -----------------------------06.04.00 12:44-------------------------------- - ---------------------------------------------------------------------------*/ BOOL SwXFootnotes::supportsService(const OUString& rServiceName) throw( RuntimeException ) { return C2U("com.sun.star.text.Footnotes") == rServiceName; } -/* -----------------------------06.04.00 12:44-------------------------------- - ---------------------------------------------------------------------------*/ Sequence< OUString > SwXFootnotes::getSupportedServiceNames(void) throw( RuntimeException ) { Sequence< OUString > aRet(1); @@ -1899,23 +1781,17 @@ Sequence< OUString > SwXFootnotes::getSupportedServiceNames(void) throw( Runtime pArray[0] = C2U("com.sun.star.text.Footnotes"); return aRet; } -/*-- 14.01.99 09:03:52--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXFootnotes::SwXFootnotes(sal_Bool bEnd, SwDoc* _pDoc) : SwUnoCollection(_pDoc) , m_bEndnote(bEnd) { } -/*-- 14.01.99 09:03:52--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXFootnotes::~SwXFootnotes() { } -/*-- 14.01.99 09:03:53--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Int32 SwXFootnotes::getCount(void) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -1934,9 +1810,7 @@ sal_Int32 SwXFootnotes::getCount(void) throw( uno::RuntimeException ) } return nCount; } -/*-- 14.01.99 09:03:53--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Any SwXFootnotes::getByIndex(sal_Int32 nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, uno::RuntimeException ) { @@ -1970,16 +1844,12 @@ uno::Any SwXFootnotes::getByIndex(sal_Int32 nIndex) throw uno::RuntimeException(); return aRet; } -/*-- 14.01.99 09:03:53--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Type SAL_CALL SwXFootnotes::getElementType() throw(uno::RuntimeException) { return ::getCppuType((uno::Reference<XFootnote>*)0); } -/*-- 14.01.99 09:03:54--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool SwXFootnotes::hasElements(void) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -1987,34 +1857,22 @@ sal_Bool SwXFootnotes::hasElements(void) throw( uno::RuntimeException ) throw uno::RuntimeException(); return GetDoc()->GetFtnIdxs().Count() > 0; } -/* -----------------------------05.09.00 12:48-------------------------------- - ---------------------------------------------------------------------------*/ Reference<XFootnote> SwXFootnotes::GetObject( SwDoc& rDoc, const SwFmtFtn& rFmt ) { return SwXFootnote::CreateXFootnote(rDoc, rFmt); } -/****************************************************************** - * - ******************************************************************/ -/* -----------------------------06.04.00 12:44-------------------------------- - - ---------------------------------------------------------------------------*/ OUString SwXReferenceMarks::getImplementationName(void) throw( RuntimeException ) { return C2U("SwXReferenceMarks"); } -/* -----------------------------06.04.00 12:44-------------------------------- - ---------------------------------------------------------------------------*/ BOOL SwXReferenceMarks::supportsService(const OUString& rServiceName) throw( RuntimeException ) { return C2U("com.sun.star.text.ReferenceMarks") == rServiceName; } -/* -----------------------------06.04.00 12:44-------------------------------- - ---------------------------------------------------------------------------*/ Sequence< OUString > SwXReferenceMarks::getSupportedServiceNames(void) throw( RuntimeException ) { Sequence< OUString > aRet(1); @@ -2022,22 +1880,16 @@ Sequence< OUString > SwXReferenceMarks::getSupportedServiceNames(void) throw( Ru pArray[0] = C2U("com.sun.star.text.ReferenceMarks"); return aRet; } -/*-- 14.01.99 09:03:16--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXReferenceMarks::SwXReferenceMarks(SwDoc* _pDoc) : SwUnoCollection(_pDoc) { } -/*-- 14.01.99 09:03:16--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXReferenceMarks::~SwXReferenceMarks() { } -/*-- 14.01.99 09:03:17--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Int32 SwXReferenceMarks::getCount(void) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -2045,9 +1897,7 @@ sal_Int32 SwXReferenceMarks::getCount(void) throw( uno::RuntimeException ) throw uno::RuntimeException(); return GetDoc()->GetRefMarks(); } -/*-- 14.01.99 09:03:17--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Any SwXReferenceMarks::getByIndex(sal_Int32 nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, uno::RuntimeException ) { @@ -2069,9 +1919,7 @@ uno::Any SwXReferenceMarks::getByIndex(sal_Int32 nIndex) throw IndexOutOfBoundsException(); return aRet; } -/*-- 14.01.99 09:03:17--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Any SwXReferenceMarks::getByName(const OUString& rName) throw( NoSuchElementException, WrappedTargetException, uno::RuntimeException ) { @@ -2092,9 +1940,7 @@ uno::Any SwXReferenceMarks::getByName(const OUString& rName) throw uno::RuntimeException(); return aRet; } -/*-- 14.01.99 09:03:17--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Sequence< OUString > SwXReferenceMarks::getElementNames(void) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -2112,9 +1958,7 @@ uno::Sequence< OUString > SwXReferenceMarks::getElementNames(void) throw( uno::R throw uno::RuntimeException(); return aRet; } -/*-- 14.01.99 09:03:17--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool SwXReferenceMarks::hasByName(const OUString& rName) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -2122,16 +1966,12 @@ sal_Bool SwXReferenceMarks::hasByName(const OUString& rName) throw( uno::Runtime throw uno::RuntimeException(); return 0 != GetDoc()->GetRefMark( rName); } -/*-- 14.01.99 09:03:18--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Type SAL_CALL SwXReferenceMarks::getElementType() throw(uno::RuntimeException) { return ::getCppuType((uno::Reference<XTextContent>*)0); } -/*-- 14.01.99 09:03:18--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool SwXReferenceMarks::hasElements(void) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -2139,9 +1979,7 @@ sal_Bool SwXReferenceMarks::hasElements(void) throw( uno::RuntimeException ) throw uno::RuntimeException(); return 0 != GetDoc()->GetRefMarks(); } -/*-- 14.01.99 09:03:19--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXReferenceMark* SwXReferenceMarks::GetObject( SwDoc* pDoc, const SwFmtRefMark* pMark ) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -2149,9 +1987,6 @@ SwXReferenceMark* SwXReferenceMarks::GetObject( SwDoc* pDoc, const SwFmtRefMark* return SwXReferenceMark::CreateXReferenceMark(*pDoc, *pMark); } -/****************************************************************** - * - ******************************************************************/ /*-----------------11.03.98 11:18------------------- Gueltigkeitspruefung --------------------------------------------------*/ @@ -2160,4 +1995,3 @@ void SwUnoCollection::Invalidate() bObjectValid = sal_False; pDoc = 0; } - diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index 977b051318..1aac551a23 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -76,7 +76,6 @@ using namespace ::com::sun::star; using ::rtl::OUString; -//----------------------------------------------------------------------------- static OUString lcl_AnyToString(uno::Any const& rVal) throw (lang::IllegalArgumentException) { @@ -87,7 +86,7 @@ lcl_AnyToString(uno::Any const& rVal) throw (lang::IllegalArgumentException) } return sRet; } -//----------------------------------------------------------------------------- + static sal_Int16 lcl_AnyToInt16(uno::Any const& rVal) throw (lang::IllegalArgumentException) { @@ -98,7 +97,7 @@ lcl_AnyToInt16(uno::Any const& rVal) throw (lang::IllegalArgumentException) } return nRet; } -//----------------------------------------------------------------------------- + static sal_Bool lcl_AnyToBool(uno::Any const& rVal) throw (lang::IllegalArgumentException) { @@ -119,6 +118,7 @@ throw (lang::IllegalArgumentException) ? (rBitMask | nBit) : (rBitMask & ~nBit); } + static void lcl_BitMaskToAny(uno::Any & o_rValue, const sal_uInt16 nBitMask, const sal_uInt16 nBit) @@ -127,7 +127,6 @@ lcl_BitMaskToAny(uno::Any & o_rValue, o_rValue <<= bRet; } -//----------------------------------------------------------------------------- static void lcl_ReAssignTOXType(SwDoc* pDoc, SwTOXBase& rTOXBase, const OUString& rNewName) { @@ -150,7 +149,7 @@ lcl_ReAssignTOXType(SwDoc* pDoc, SwTOXBase& rTOXBase, const OUString& rNewName) //has to be non-const-casted ((SwTOXType*)pNewType)->Add(&rTOXBase); } -//----------------------------------------------------------------------------- + static const char cUserDefined[] = "User-Defined"; static const char cUserSuffix[] = " (user)"; #define USER_LEN 12 @@ -171,7 +170,7 @@ void lcl_ConvertTOUNameToProgrammaticName(OUString& rTmp) rTmp += C2U(cUserSuffix); } } -//----------------------------------------------------------------------------- + static void lcl_ConvertTOUNameToUserName(OUString& rTmp) { @@ -192,9 +191,6 @@ lcl_ConvertTOUNameToUserName(OUString& rTmp) } } -/* -----------------13.09.99 16:39------------------- - - --------------------------------------------------*/ typedef ::cppu::WeakImplHelper2 < lang::XServiceInfo , container::XIndexReplace @@ -240,9 +236,6 @@ public: }; -/* -----------------13.09.99 16:39------------------- - - --------------------------------------------------*/ typedef ::cppu::WeakImplHelper2 < lang::XServiceInfo , container::XIndexReplace @@ -289,14 +282,9 @@ public: }; - /****************************************************************** * SwXDocumentIndex ******************************************************************/ - -/* -----------------20.06.98 11:06------------------- - * - * --------------------------------------------------*/ class SwDocIndexDescriptorProperties_Impl { private: @@ -310,9 +298,7 @@ public: const OUString& GetTypeName() const { return m_sUserTOXTypeName; } void SetTypeName(const OUString& rSet) { m_sUserTOXTypeName = rSet; } }; -/* -----------------20.06.98 11:41------------------- - * - * --------------------------------------------------*/ + SwDocIndexDescriptorProperties_Impl::SwDocIndexDescriptorProperties_Impl( SwTOXType const*const pType) { @@ -410,9 +396,6 @@ public: }; -/*-- 14.12.98 09:35:07--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SwXDocumentIndex::Impl::Modify(SfxPoolItem *pOld, SfxPoolItem *pNew) { ClientModify(this, pOld, pNew); @@ -423,26 +406,18 @@ void SwXDocumentIndex::Impl::Modify(SfxPoolItem *pOld, SfxPoolItem *pNew) } } -/*-- 14.12.98 09:35:03--------------------------------------------------- - - -----------------------------------------------------------------------*/ SwXDocumentIndex::SwXDocumentIndex( SwTOXBaseSection const& rBaseSection, SwDoc & rDoc) : m_pImpl( new SwXDocumentIndex::Impl( *this, rDoc, rBaseSection.SwTOXBase::GetType(), & rBaseSection) ) { } -/* -----------------15.01.99 14:59------------------- - * - * --------------------------------------------------*/ + SwXDocumentIndex::SwXDocumentIndex(const TOXTypes eType, SwDoc& rDoc) : m_pImpl( new SwXDocumentIndex::Impl( *this, rDoc, eType, 0) ) { } -/*-- 14.12.98 09:35:04--------------------------------------------------- - - -----------------------------------------------------------------------*/ SwXDocumentIndex::~SwXDocumentIndex() { } @@ -465,17 +440,12 @@ SwXDocumentIndex::CreateXDocumentIndex( return xIndex; } -/* -----------------------------10.03.00 18:02-------------------------------- - - ---------------------------------------------------------------------------*/ const uno::Sequence< sal_Int8 > & SwXDocumentIndex::getUnoTunnelId() { static uno::Sequence< sal_Int8 > aSeq = ::CreateUnoTunnelId(); return aSeq; } -/* -----------------------------10.03.00 18:04-------------------------------- - ---------------------------------------------------------------------------*/ sal_Int64 SAL_CALL SwXDocumentIndex::getSomething(const uno::Sequence< sal_Int8 >& rId) throw (uno::RuntimeException) @@ -483,17 +453,12 @@ throw (uno::RuntimeException) return ::sw::UnoTunnelImpl<SwXDocumentIndex>(rId, this); } -/* -----------------------------06.04.00 15:01-------------------------------- - - ---------------------------------------------------------------------------*/ OUString SAL_CALL SwXDocumentIndex::getImplementationName() throw (uno::RuntimeException) { return C2U("SwXDocumentIndex"); } -/* -----------------------------06.04.00 15:01-------------------------------- - ---------------------------------------------------------------------------*/ sal_Bool SAL_CALL SwXDocumentIndex::supportsService(const OUString& rServiceName) throw (uno::RuntimeException) @@ -516,9 +481,7 @@ throw (uno::RuntimeException) || ((TOX_AUTHORITIES == m_pImpl->m_eTOXType) && rServiceName.equalsAscii("com.sun.star.text.Bibliography")); } -/* -----------------------------06.04.00 15:01-------------------------------- - ---------------------------------------------------------------------------*/ uno::Sequence< OUString > SAL_CALL SwXDocumentIndex::getSupportedServiceNames() throw (uno::RuntimeException) { @@ -554,9 +517,6 @@ SwXDocumentIndex::getSupportedServiceNames() throw (uno::RuntimeException) return aRet; } -/*-- 14.12.98 09:35:05--------------------------------------------------- - - -----------------------------------------------------------------------*/ OUString SAL_CALL SwXDocumentIndex::getServiceName() throw (uno::RuntimeException) { @@ -584,9 +544,6 @@ throw (uno::RuntimeException) return SwXServiceProvider::GetProviderName(nObjectType); } -/*-- 14.12.98 09:35:05--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SAL_CALL SwXDocumentIndex::update() throw (uno::RuntimeException) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -603,9 +560,6 @@ void SAL_CALL SwXDocumentIndex::update() throw (uno::RuntimeException) pTOXBase->UpdatePageNum(); } -/*-- 14.12.98 09:35:05--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXDocumentIndex::getPropertySetInfo() throw (uno::RuntimeException) { @@ -616,9 +570,6 @@ SwXDocumentIndex::getPropertySetInfo() throw (uno::RuntimeException) return xRef; } -/*-- 14.12.98 09:35:05--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SAL_CALL SwXDocumentIndex::setPropertyValue( const OUString& rPropertyName, const uno::Any& rValue) @@ -936,9 +887,6 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, } } -/*-- 14.12.98 09:35:05--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Any SAL_CALL SwXDocumentIndex::getPropertyValue(const OUString& rPropertyName) throw (beans::UnknownPropertyException, lang::WrappedTargetException, @@ -1287,9 +1235,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, return aRet; } -/*-- 14.12.98 09:35:06--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SAL_CALL SwXDocumentIndex::addPropertyChangeListener( const ::rtl::OUString& /*rPropertyName*/, @@ -1334,9 +1279,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, "SwXDocumentIndex::removeVetoableChangeListener(): not implemented"); } -/* -----------------18.02.99 13:39------------------- - * - * --------------------------------------------------*/ void SAL_CALL SwXDocumentIndex::attach(const uno::Reference< text::XTextRange > & xTextRange) throw (lang::IllegalArgumentException, uno::RuntimeException) @@ -1399,9 +1341,6 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) m_pImpl->m_bIsDescriptor = sal_False; } -/*-- 15.01.99 14:23:56--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Reference< text::XTextRange > SAL_CALL SwXDocumentIndex::getAnchor() throw (uno::RuntimeException) { @@ -1428,9 +1367,6 @@ SwXDocumentIndex::getAnchor() throw (uno::RuntimeException) return xRet; } -/*-- 15.01.99 15:46:48--------------------------------------------------- - - -----------------------------------------------------------------------*/ void lcl_RemoveChildSections(SwSectionFmt& rParentFmt) { SwSections aTmpArr; @@ -1463,9 +1399,6 @@ void SAL_CALL SwXDocumentIndex::dispose() throw (uno::RuntimeException) } } -/*-- 15.01.99 15:46:49--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SAL_CALL SwXDocumentIndex::addEventListener( const uno::Reference< lang::XEventListener > & xListener) @@ -1479,9 +1412,7 @@ throw (uno::RuntimeException) } m_pImpl->m_ListenerContainer.AddListener(xListener); } -/*-- 15.01.99 15:46:54--------------------------------------------------- - -----------------------------------------------------------------------*/ void SAL_CALL SwXDocumentIndex::removeEventListener( const uno::Reference< lang::XEventListener > & xListener) @@ -1496,9 +1427,6 @@ throw (uno::RuntimeException) } } -/* -----------------30.07.99 11:28------------------- - - --------------------------------------------------*/ OUString SAL_CALL SwXDocumentIndex::getName() throw (uno::RuntimeException) { vos::OGuard g(Application::GetSolarMutex()); @@ -1519,9 +1447,7 @@ OUString SAL_CALL SwXDocumentIndex::getName() throw (uno::RuntimeException) } return uRet; } -/* -----------------30.07.99 11:28------------------- - --------------------------------------------------*/ void SAL_CALL SwXDocumentIndex::setName(const OUString& rName) throw (uno::RuntimeException) { @@ -1574,9 +1500,6 @@ uno::Reference<frame::XModel> SwXDocumentIndex::GetModel() /****************************************************************** * SwXDocumentIndexMark ******************************************************************/ -/* -----------------21.04.99 09:36------------------- - * - * --------------------------------------------------*/ static sal_uInt16 lcl_TypeToPropertyMap_Mark(const TOXTypes eType) { @@ -1671,9 +1594,6 @@ public: virtual void Modify(SfxPoolItem *pOld, SfxPoolItem *pNew); }; -/* -----------------------------16.10.00 11:24-------------------------------- - - ---------------------------------------------------------------------------*/ void SwXDocumentIndexMark::Impl::Invalidate() { if (GetRegisteredIn()) @@ -1693,9 +1613,6 @@ void SwXDocumentIndexMark::Impl::Invalidate() m_pTOXMark = 0; } -/*-- 14.12.98 10:25:47--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SwXDocumentIndexMark::Impl::Modify(SfxPoolItem *pOld, SfxPoolItem *pNew) { ClientModify(this, pOld, pNew); @@ -1706,25 +1623,18 @@ void SwXDocumentIndexMark::Impl::Modify(SfxPoolItem *pOld, SfxPoolItem *pNew) } } -/*-- 14.12.98 10:25:43--------------------------------------------------- - - -----------------------------------------------------------------------*/ SwXDocumentIndexMark::SwXDocumentIndexMark(const TOXTypes eToxType) : m_pImpl( new SwXDocumentIndexMark::Impl(*this, 0, eToxType, 0, 0) ) { } -/*-- 14.12.98 10:25:44--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXDocumentIndexMark::SwXDocumentIndexMark(SwDoc & rDoc, SwTOXType & rType, SwTOXMark & rMark) : m_pImpl( new SwXDocumentIndexMark::Impl(*this, &rDoc, rType.GetType(), &rType, &rMark) ) { } -/*-- 14.12.98 10:25:44--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXDocumentIndexMark::~SwXDocumentIndexMark() { } @@ -1747,17 +1657,12 @@ SwXDocumentIndexMark::CreateXDocumentIndexMark( return xTOXMark; } -/* -----------------------------10.03.00 18:02-------------------------------- - - ---------------------------------------------------------------------------*/ const uno::Sequence< sal_Int8 > & SwXDocumentIndexMark::getUnoTunnelId() { static uno::Sequence< sal_Int8 > aSeq = ::CreateUnoTunnelId(); return aSeq; } -/* -----------------------------10.03.00 18:04-------------------------------- - ---------------------------------------------------------------------------*/ sal_Int64 SAL_CALL SwXDocumentIndexMark::getSomething(const uno::Sequence< sal_Int8 >& rId) throw (uno::RuntimeException) @@ -1772,17 +1677,12 @@ static const sal_Char cIdxMarkAsian[] = "com.sun.star.text.DocumentIndexMarkAsi static const sal_Char cUserMark[] = "com.sun.star.text.UserIndexMark"; static const sal_Char cTextContent[] = "com.sun.star.text.TextContent"; -/* -----------------------------06.04.00 15:07-------------------------------- - - ---------------------------------------------------------------------------*/ OUString SAL_CALL SwXDocumentIndexMark::getImplementationName() throw (uno::RuntimeException) { return C2U("SwXDocumentIndexMark"); } -/* -----------------------------06.04.00 15:07-------------------------------- - ---------------------------------------------------------------------------*/ sal_Bool SAL_CALL SwXDocumentIndexMark::supportsService(const OUString& rServiceName) throw (uno::RuntimeException) @@ -1800,9 +1700,7 @@ throw (uno::RuntimeException) || ((m_pImpl->m_eTOXType == TOX_INDEX) && rServiceName.equalsAscii(cIdxMarkAsian)); } -/* -----------------------------06.04.00 15:07-------------------------------- - ---------------------------------------------------------------------------*/ uno::Sequence< OUString > SAL_CALL SwXDocumentIndexMark::getSupportedServiceNames() throw (uno::RuntimeException) { @@ -1832,9 +1730,6 @@ SwXDocumentIndexMark::getSupportedServiceNames() throw (uno::RuntimeException) return aRet; } -/*-- 14.12.98 10:25:45--------------------------------------------------- - - -----------------------------------------------------------------------*/ OUString SAL_CALL SwXDocumentIndexMark::getMarkEntry() throw (uno::RuntimeException) { @@ -1856,9 +1751,7 @@ SwXDocumentIndexMark::getMarkEntry() throw (uno::RuntimeException) } return sRet; } -/*-- 14.12.98 10:25:45--------------------------------------------------- - -----------------------------------------------------------------------*/ void SAL_CALL SwXDocumentIndexMark::setMarkEntry(const OUString& rIndexEntry) throw (uno::RuntimeException) @@ -1893,9 +1786,6 @@ throw (uno::RuntimeException) } } -/* -----------------18.02.99 13:40------------------- - * - * --------------------------------------------------*/ void SAL_CALL SwXDocumentIndexMark::attach( const uno::Reference< text::XTextRange > & xTextRange) @@ -2105,9 +1995,6 @@ void SwXDocumentIndexMark::Impl::InsertTOXMark( const_cast<SwTOXType &>(rTOXType).Add(& m_TypeDepend); } -/*-- 14.12.98 10:25:45--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Reference< text::XTextRange > SAL_CALL SwXDocumentIndexMark::getAnchor() throw (uno::RuntimeException) { @@ -2142,9 +2029,6 @@ SwXDocumentIndexMark::getAnchor() throw (uno::RuntimeException) return xRet; } -/*-- 14.12.98 10:25:45--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SAL_CALL SwXDocumentIndexMark::dispose() throw (uno::RuntimeException) { @@ -2156,9 +2040,7 @@ SwXDocumentIndexMark::dispose() throw (uno::RuntimeException) m_pImpl->DeleteTOXMark(); // call Invalidate() via modify! } } -/*-- 14.12.98 10:25:45--------------------------------------------------- - -----------------------------------------------------------------------*/ void SAL_CALL SwXDocumentIndexMark::addEventListener( const uno::Reference< lang::XEventListener > & xListener) @@ -2172,9 +2054,7 @@ throw (uno::RuntimeException) } m_pImpl->m_ListenerContainer.AddListener(xListener); } -/*-- 14.12.98 10:25:46--------------------------------------------------- - -----------------------------------------------------------------------*/ void SAL_CALL SwXDocumentIndexMark::removeEventListener( const uno::Reference< lang::XEventListener > & xListener) @@ -2189,9 +2069,6 @@ throw (uno::RuntimeException) } } -/*-- 14.12.98 10:25:46--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXDocumentIndexMark::getPropertySetInfo() throw (uno::RuntimeException) { @@ -2221,9 +2098,6 @@ SwXDocumentIndexMark::getPropertySetInfo() throw (uno::RuntimeException) return xInfos[nPos]; } -/*-- 14.12.98 10:25:46--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SAL_CALL SwXDocumentIndexMark::setPropertyValue( const OUString& rPropertyName, const uno::Any& rValue) @@ -2350,9 +2224,6 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, } } -/*-- 14.12.98 10:25:46--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Any SAL_CALL SwXDocumentIndexMark::getPropertyValue(const OUString& rPropertyName) throw (beans::UnknownPropertyException, lang::WrappedTargetException, @@ -2460,9 +2331,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, return aRet; } -/*-- 14.12.98 10:25:46--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SAL_CALL SwXDocumentIndexMark::addPropertyChangeListener( const ::rtl::OUString& /*rPropertyName*/, @@ -2507,27 +2375,18 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, "SwXDocumentIndexMark::removeVetoableChangeListener(): not implemented"); } - /****************************************************************** * SwXDocumentIndexes ******************************************************************/ -/*-- 05.05.99 13:14:59--------------------------------------------------- - - -----------------------------------------------------------------------*/ SwXDocumentIndexes::SwXDocumentIndexes(SwDoc *const _pDoc) : SwUnoCollection(_pDoc) { } -/*-- 05.05.99 13:15:00--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXDocumentIndexes::~SwXDocumentIndexes() { } -/* -----------------------------06.04.00 15:08-------------------------------- - - ---------------------------------------------------------------------------*/ OUString SAL_CALL SwXDocumentIndexes::getImplementationName() throw (uno::RuntimeException) { @@ -2538,6 +2397,7 @@ static char const*const g_ServicesDocumentIndexes[] = { "com.sun.star.text.DocumentIndexes", }; + static const size_t g_nServicesDocumentIndexes( SAL_N_ELEMENTS(g_ServicesDocumentIndexes)); @@ -2556,9 +2416,6 @@ SwXDocumentIndexes::getSupportedServiceNames() throw (uno::RuntimeException) g_nServicesDocumentIndexes, g_ServicesDocumentIndexes); } -/*-- 05.05.99 13:15:01--------------------------------------------------- - - -----------------------------------------------------------------------*/ sal_Int32 SAL_CALL SwXDocumentIndexes::getCount() throw (uno::RuntimeException) { @@ -2581,9 +2438,6 @@ SwXDocumentIndexes::getCount() throw (uno::RuntimeException) return nRet; } -/*-- 05.05.99 13:15:01--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Any SAL_CALL SwXDocumentIndexes::getByIndex(sal_Int32 nIndex) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, @@ -2616,9 +2470,6 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, throw lang::IndexOutOfBoundsException(); } -/*-- 31.01.00 10:12:31--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Any SAL_CALL SwXDocumentIndexes::getByName(const OUString& rName) throw (container::NoSuchElementException, lang::WrappedTargetException, @@ -2650,9 +2501,6 @@ throw (container::NoSuchElementException, lang::WrappedTargetException, throw container::NoSuchElementException(); } -/*-- 31.01.00 10:12:31--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Sequence< OUString > SAL_CALL SwXDocumentIndexes::getElementNames() throw (uno::RuntimeException) { @@ -2690,9 +2538,6 @@ SwXDocumentIndexes::getElementNames() throw (uno::RuntimeException) return aRet; } -/*-- 31.01.00 10:12:31--------------------------------------------------- - - -----------------------------------------------------------------------*/ sal_Bool SAL_CALL SwXDocumentIndexes::hasByName(const OUString& rName) throw (uno::RuntimeException) @@ -2720,17 +2565,12 @@ throw (uno::RuntimeException) return sal_False; } -/*-- 05.05.99 13:15:01--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Type SAL_CALL SwXDocumentIndexes::getElementType() throw (uno::RuntimeException) { return text::XDocumentIndex::static_type(); } -/*-- 05.05.99 13:15:02--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool SAL_CALL SwXDocumentIndexes::hasElements() throw (uno::RuntimeException) { @@ -2740,25 +2580,16 @@ SwXDocumentIndexes::hasElements() throw (uno::RuntimeException) /****************************************************************** * SwXDocumentIndex::StyleAccess_Impl ******************************************************************/ - -/*-- 13.09.99 16:52:28--------------------------------------------------- - - -----------------------------------------------------------------------*/ SwXDocumentIndex::StyleAccess_Impl::StyleAccess_Impl( SwXDocumentIndex& rParentIdx) : m_xParent(&rParentIdx) { } -/*-- 13.09.99 16:52:29--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXDocumentIndex::StyleAccess_Impl::~StyleAccess_Impl() { } -/* -----------------------------06.04.00 15:08-------------------------------- - - ---------------------------------------------------------------------------*/ OUString SAL_CALL SwXDocumentIndex::StyleAccess_Impl::getImplementationName() throw (uno::RuntimeException) @@ -2770,6 +2601,7 @@ static char const*const g_ServicesIndexStyleAccess[] = { "com.sun.star.text.DocumentIndexParagraphStyles", }; + static const size_t g_nServicesIndexStyleAccess( SAL_N_ELEMENTS(g_ServicesIndexStyleAccess)); @@ -2790,9 +2622,6 @@ throw (uno::RuntimeException) g_nServicesIndexStyleAccess, g_ServicesIndexStyleAccess); } -/*-- 13.09.99 16:52:29--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SAL_CALL SwXDocumentIndex::StyleAccess_Impl::replaceByIndex( sal_Int32 nIndex, const uno::Any& rElement) @@ -2830,17 +2659,13 @@ throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, } rTOXBase.SetStyleNames(sSetStyles, static_cast<sal_uInt16>(nIndex)); } -/*-- 13.09.99 16:52:29--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Int32 SAL_CALL SwXDocumentIndex::StyleAccess_Impl::getCount() throw (uno::RuntimeException) { return MAXLEVEL; } -/*-- 13.09.99 16:52:30--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Any SAL_CALL SwXDocumentIndex::StyleAccess_Impl::getByIndex(sal_Int32 nIndex) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, @@ -2873,18 +2698,14 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::Any aRet(&aStyles, ::getCppuType((uno::Sequence<OUString>*)0)); return aRet; } -/*-- 13.09.99 16:52:30--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Type SAL_CALL SwXDocumentIndex::StyleAccess_Impl::getElementType() throw (uno::RuntimeException) { return ::getCppuType((uno::Sequence<OUString>*)0); } -/*-- 13.09.99 16:52:30--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool SAL_CALL SwXDocumentIndex::StyleAccess_Impl::hasElements() throw (uno::RuntimeException) { @@ -2894,24 +2715,16 @@ SwXDocumentIndex::StyleAccess_Impl::hasElements() throw (uno::RuntimeException) /****************************************************************** * SwXDocumentIndex::TokenAccess_Impl ******************************************************************/ -/*-- 13.09.99 16:52:28--------------------------------------------------- - - -----------------------------------------------------------------------*/ SwXDocumentIndex::TokenAccess_Impl::TokenAccess_Impl( SwXDocumentIndex& rParentIdx) : m_xParent(&rParentIdx) { } -/*-- 13.09.99 16:52:29--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXDocumentIndex::TokenAccess_Impl::~TokenAccess_Impl() { } -/* -----------------------------06.04.00 15:08-------------------------------- - - ---------------------------------------------------------------------------*/ OUString SAL_CALL SwXDocumentIndex::TokenAccess_Impl::getImplementationName() throw (uno::RuntimeException) @@ -2923,6 +2736,7 @@ static char const*const g_ServicesIndexTokenAccess[] = { "com.sun.star.text.DocumentIndexLevelFormat", }; + static const size_t g_nServicesIndexTokenAccess( SAL_N_ELEMENTS(g_ServicesIndexTokenAccess)); @@ -2962,9 +2776,6 @@ static const struct TokenType g_TokenTypes[] = { 0, static_cast<enum FormTokenType>(0) } }; -/*-- 13.09.99 16:52:29--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SAL_CALL SwXDocumentIndex::TokenAccess_Impl::replaceByIndex( sal_Int32 nIndex, const uno::Any& rElement) @@ -3159,9 +2970,6 @@ throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, rTOXBase.SetTOXForm(aForm); } -/*-- 13.09.99 16:52:29--------------------------------------------------- - - -----------------------------------------------------------------------*/ sal_Int32 SAL_CALL SwXDocumentIndex::TokenAccess_Impl::getCount() throw (uno::RuntimeException) { @@ -3171,9 +2979,6 @@ SwXDocumentIndex::TokenAccess_Impl::getCount() throw (uno::RuntimeException) return nRet; } -/*-- 13.09.99 16:52:30--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Any SAL_CALL SwXDocumentIndex::TokenAccess_Impl::getByIndex(sal_Int32 nIndex) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, @@ -3430,22 +3235,16 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, return aRet; } -/*-- 13.09.99 16:52:30--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Type SAL_CALL SwXDocumentIndex::TokenAccess_Impl::getElementType() throw (uno::RuntimeException) { return ::getCppuType((uno::Sequence< beans::PropertyValues >*)0); } -/*-- 13.09.99 16:52:30--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool SAL_CALL SwXDocumentIndex::TokenAccess_Impl::hasElements() throw (uno::RuntimeException) { return sal_True; } - diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index 8d404a53f2..a2f31a252f 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -128,7 +128,6 @@ using namespace ::com::sun::star; using ::rtl::OUString; using ::rtl::OUStringBuffer; - /**************************************************************************** static methods ****************************************************************************/ @@ -140,17 +139,15 @@ uno::Sequence< sal_Int8 > CreateUnoTunnelId() rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, sal_True ); return aSeq; } + /**************************************************************************** Hilfsklassen ****************************************************************************/ - -/* -----------------13.05.98 12:15------------------- - * - * --------------------------------------------------*/ SwUnoInternalPaM::SwUnoInternalPaM(SwDoc& rDoc) : SwPaM(rDoc.GetNodes()) { } + SwUnoInternalPaM::~SwUnoInternalPaM() { while( GetNext() != this) @@ -180,9 +177,6 @@ SwUnoInternalPaM& SwUnoInternalPaM::operator=(const SwPaM& rPaM) return *this; } -/*-----------------09.03.98 08:29------------------- - ---------------------------------------------------*/ void SwUnoCursorHelper::SelectPam(SwPaM & rPam, const bool bExpand) { if (bExpand) @@ -198,9 +192,6 @@ void SwUnoCursorHelper::SelectPam(SwPaM & rPam, const bool bExpand) } } -/* -----------------20.05.98 14:59------------------- - * - * --------------------------------------------------*/ void SwUnoCursorHelper::GetTextFromPam(SwPaM & rPam, OUString & rBuffer) { if (!rPam.HasMark()) @@ -266,9 +257,6 @@ void SwUnoCursorHelper::GetTextFromPam(SwPaM & rPam, OUString & rBuffer) } } -/* -----------------06.07.98 07:33------------------- - * - * --------------------------------------------------*/ static void lcl_setCharStyle(SwDoc *const pDoc, const uno::Any & rValue, SfxItemSet & rSet) throw (lang::IllegalArgumentException) @@ -294,9 +282,7 @@ throw (lang::IllegalArgumentException) rSet.Put(aFmt); } }; -/* -----------------08.06.06 10:43------------------- - * - * --------------------------------------------------*/ + static void lcl_setAutoStyle(IStyleAccess & rStyleAccess, const uno::Any & rValue, SfxItemSet & rSet, const bool bPara) @@ -323,9 +309,7 @@ throw (lang::IllegalArgumentException) throw lang::IllegalArgumentException(); } }; -/* -----------------30.06.98 08:46------------------- - * - * --------------------------------------------------*/ + void SwUnoCursorHelper::SetTxtFmtColl(const uno::Any & rAny, SwPaM & rPaM) throw (lang::IllegalArgumentException) @@ -357,9 +341,6 @@ throw (lang::IllegalArgumentException) pDoc->EndUndo( UNDO_END, NULL ); } -/* -----------------06.07.98 07:38------------------- - * - * --------------------------------------------------*/ bool SwUnoCursorHelper::SetPageDesc( const uno::Any& rValue, SwDoc & rDoc, SfxItemSet & rSet) @@ -411,9 +392,6 @@ SwUnoCursorHelper::SetPageDesc( return true; } -/* -----------------30.06.98 10:29------------------- - * - * --------------------------------------------------*/ static void lcl_SetNodeNumStart(SwPaM & rCrsr, uno::Any const& rValue) { @@ -544,9 +522,6 @@ lcl_setRubyCharstyle(SfxItemSet & rItemSet, uno::Any const& rValue) rItemSet.Put(*pRuby); } -/* -----------------17.09.98 09:44------------------- - * - * --------------------------------------------------*/ bool SwUnoCursorHelper::SetCursorPropertyValue( SfxItemPropertySimpleEntry const& rEntry, const uno::Any& rValue, @@ -684,9 +659,6 @@ throw (lang::IllegalArgumentException) return bRet; } -/* -----------------30.06.98 08:39------------------- - * - * --------------------------------------------------*/ SwFmtColl * SwUnoCursorHelper::GetCurTxtFmtColl(SwPaM & rPaM, const bool bConditional) { @@ -771,7 +743,6 @@ SwPageDesc* GetPageDescByName_Impl(SwDoc& rDoc, const String& rName) /****************************************************************** * SwXTextCursor ******************************************************************/ - class SwXTextCursor::Impl : public SwClient { @@ -844,7 +815,6 @@ void SwXTextCursor::Impl::Modify(SfxPoolItem *pOld, SfxPoolItem *pNew) } } - SwUnoCrsr const* SwXTextCursor::GetCursor() const { return m_pImpl->GetCursor(); @@ -855,9 +825,6 @@ SwUnoCrsr * SwXTextCursor::GetCursor() return m_pImpl->GetCursor(); } -/*-- 09.12.98 14:19:01--------------------------------------------------- - - -----------------------------------------------------------------------*/ SwPaM const* SwXTextCursor::GetPaM() const { return m_pImpl->GetCursor(); @@ -868,25 +835,16 @@ SwPaM * SwXTextCursor::GetPaM() return m_pImpl->GetCursor(); } -/*-- 09.12.98 14:19:02--------------------------------------------------- - - -----------------------------------------------------------------------*/ SwDoc const* SwXTextCursor::GetDoc() const { return m_pImpl->GetCursor() ? m_pImpl->GetCursor()->GetDoc() : 0; } -/* -----------------22.07.99 13:52------------------- - --------------------------------------------------*/ SwDoc * SwXTextCursor::GetDoc() { return m_pImpl->GetCursor() ? m_pImpl->GetCursor()->GetDoc() : 0; } - -/*-- 09.12.98 14:19:19--------------------------------------------------- - - -----------------------------------------------------------------------*/ SwXTextCursor::SwXTextCursor( SwDoc & rDoc, uno::Reference< text::XText > const& xParent, @@ -898,9 +856,6 @@ SwXTextCursor::SwXTextCursor( { } -/* -----------------04.03.99 09:02------------------- - * - * --------------------------------------------------*/ SwXTextCursor::SwXTextCursor(uno::Reference< text::XText > const& xParent, SwPaM const& rSourceCursor, const enum CursorType eType) : m_pImpl( new SwXTextCursor::Impl(*this, *rSourceCursor.GetDoc(), eType, @@ -909,16 +864,10 @@ SwXTextCursor::SwXTextCursor(uno::Reference< text::XText > const& xParent, { } -/*-- 09.12.98 14:19:20--------------------------------------------------- - - -----------------------------------------------------------------------*/ SwXTextCursor::~SwXTextCursor() { } -/*-- 09.12.98 14:19:18--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SwXTextCursor::DeleteAndInsert(const ::rtl::OUString& rText, const bool bForceExpandHints) { @@ -955,7 +904,6 @@ void SwXTextCursor::DeleteAndInsert(const ::rtl::OUString& rText, } } - enum ForceIntoMetaMode { META_CHECK_BOTH, META_INIT_START, META_INIT_END }; static sal_Bool @@ -1032,17 +980,11 @@ bool SwXTextCursor::IsAtEndOfMeta() const return false; } -/*-- 09.12.98 14:19:19--------------------------------------------------- - - -----------------------------------------------------------------------*/ OUString SwXTextCursor::getImplementationName() throw (uno::RuntimeException) { return C2U("SwXTextCursor"); } -/*-- 09.12.98 14:19:19--------------------------------------------------- - - -----------------------------------------------------------------------*/ static char const*const g_ServicesTextCursor[] = { "com.sun.star.text.TextCursor", @@ -1054,6 +996,7 @@ static char const*const g_ServicesTextCursor[] = "com.sun.star.style.ParagraphPropertiesComplex", "com.sun.star.text.TextSortable", }; + static const size_t g_nServicesTextCursor( SAL_N_ELEMENTS(g_ServicesTextCursor)); @@ -1071,17 +1014,12 @@ SwXTextCursor::getSupportedServiceNames() throw (uno::RuntimeException) g_nServicesTextCursor, g_ServicesTextCursor); } -/* -----------------------------10.03.00 18:02-------------------------------- - - ---------------------------------------------------------------------------*/ const uno::Sequence< sal_Int8 > & SwXTextCursor::getUnoTunnelId() { static uno::Sequence< sal_Int8 > aSeq = ::CreateUnoTunnelId(); return aSeq; } -/* -----------------------------10.03.00 18:04-------------------------------- - ---------------------------------------------------------------------------*/ sal_Int64 SAL_CALL SwXTextCursor::getSomething(const uno::Sequence< sal_Int8 >& rId) throw (uno::RuntimeException) @@ -1090,9 +1028,6 @@ throw (uno::RuntimeException) return (nRet) ? nRet : OTextCursorHelper::getSomething(rId); } -/*-- 09.12.98 14:18:12--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SAL_CALL SwXTextCursor::collapseToStart() throw (uno::RuntimeException) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -1108,9 +1043,7 @@ void SAL_CALL SwXTextCursor::collapseToStart() throw (uno::RuntimeException) rUnoCursor.DeleteMark(); } } -/*-- 09.12.98 14:18:14--------------------------------------------------- - -----------------------------------------------------------------------*/ void SAL_CALL SwXTextCursor::collapseToEnd() throw (uno::RuntimeException) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -1126,9 +1059,7 @@ void SAL_CALL SwXTextCursor::collapseToEnd() throw (uno::RuntimeException) rUnoCursor.DeleteMark(); } } -/*-- 09.12.98 14:18:41--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool SAL_CALL SwXTextCursor::isCollapsed() throw (uno::RuntimeException) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -1142,9 +1073,6 @@ sal_Bool SAL_CALL SwXTextCursor::isCollapsed() throw (uno::RuntimeException) return bRet; } -/*-- 09.12.98 14:18:42--------------------------------------------------- - - -----------------------------------------------------------------------*/ sal_Bool SAL_CALL SwXTextCursor::goLeft(sal_Int16 nCount, sal_Bool Expand) throw (uno::RuntimeException) @@ -1163,9 +1091,7 @@ throw (uno::RuntimeException) } return bRet; } -/*-- 09.12.98 14:18:42--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool SAL_CALL SwXTextCursor::goRight(sal_Int16 nCount, sal_Bool Expand) throw (uno::RuntimeException) @@ -1185,9 +1111,6 @@ throw (uno::RuntimeException) return bRet; } -/*-- 09.12.98 14:18:43--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SAL_CALL SwXTextCursor::gotoStart(sal_Bool Expand) throw (uno::RuntimeException) { @@ -1243,9 +1166,7 @@ SwXTextCursor::gotoStart(sal_Bool Expand) throw (uno::RuntimeException) lcl_ForceIntoMeta(rUnoCursor, m_pImpl->m_xParentText, META_INIT_START); } } -/*-- 09.12.98 14:18:43--------------------------------------------------- - -----------------------------------------------------------------------*/ void SAL_CALL SwXTextCursor::gotoEnd(sal_Bool Expand) throw (uno::RuntimeException) { @@ -1400,9 +1321,6 @@ throw (uno::RuntimeException) } } -/*-- 09.12.98 14:18:44--------------------------------------------------- - - -----------------------------------------------------------------------*/ sal_Bool SAL_CALL SwXTextCursor::isStartOfWord() throw (uno::RuntimeException) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -1413,9 +1331,7 @@ sal_Bool SAL_CALL SwXTextCursor::isStartOfWord() throw (uno::RuntimeException) rUnoCursor.IsStartWordWT( i18n::WordType::DICTIONARY_WORD ); return bRet; } -/*-- 09.12.98 14:18:44--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool SAL_CALL SwXTextCursor::isEndOfWord() throw (uno::RuntimeException) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -1427,9 +1343,6 @@ sal_Bool SAL_CALL SwXTextCursor::isEndOfWord() throw (uno::RuntimeException) return bRet; } -/*-- 09.12.98 14:18:44--------------------------------------------------- - - -----------------------------------------------------------------------*/ sal_Bool SAL_CALL SwXTextCursor::gotoNextWord(sal_Bool Expand) throw (uno::RuntimeException) { @@ -1477,9 +1390,6 @@ SwXTextCursor::gotoNextWord(sal_Bool Expand) throw (uno::RuntimeException) return bRet; } -/*-- 09.12.98 14:18:45--------------------------------------------------- - - -----------------------------------------------------------------------*/ sal_Bool SAL_CALL SwXTextCursor::gotoPreviousWord(sal_Bool Expand) throw (uno::RuntimeException) { @@ -1520,9 +1430,6 @@ SwXTextCursor::gotoPreviousWord(sal_Bool Expand) throw (uno::RuntimeException) return bRet; } -/*-- 09.12.98 14:18:45--------------------------------------------------- - - -----------------------------------------------------------------------*/ sal_Bool SAL_CALL SwXTextCursor::gotoEndOfWord(sal_Bool Expand) throw (uno::RuntimeException) { @@ -1558,9 +1465,7 @@ SwXTextCursor::gotoEndOfWord(sal_Bool Expand) throw (uno::RuntimeException) return bRet; } -/*-- 09.12.98 14:18:46--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool SAL_CALL SwXTextCursor::gotoStartOfWord(sal_Bool Expand) throw (uno::RuntimeException) { @@ -1597,9 +1502,6 @@ SwXTextCursor::gotoStartOfWord(sal_Bool Expand) throw (uno::RuntimeException) return bRet; } -/*-- 09.12.98 14:18:46--------------------------------------------------- - - -----------------------------------------------------------------------*/ sal_Bool SAL_CALL SwXTextCursor::isStartOfSentence() throw (uno::RuntimeException) { @@ -1622,9 +1524,7 @@ SwXTextCursor::isStartOfSentence() throw (uno::RuntimeException) } return bRet; } -/*-- 09.12.98 14:18:47--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool SAL_CALL SwXTextCursor::isEndOfSentence() throw (uno::RuntimeException) { @@ -1649,9 +1549,6 @@ SwXTextCursor::isEndOfSentence() throw (uno::RuntimeException) return bRet; } -/*-- 09.12.98 14:18:47--------------------------------------------------- - - -----------------------------------------------------------------------*/ sal_Bool SAL_CALL SwXTextCursor::gotoNextSentence(sal_Bool Expand) throw (uno::RuntimeException) { @@ -1686,9 +1583,7 @@ SwXTextCursor::gotoNextSentence(sal_Bool Expand) throw (uno::RuntimeException) } return bRet; } -/*-- 09.12.98 14:18:47--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool SAL_CALL SwXTextCursor::gotoPreviousSentence(sal_Bool Expand) throw (uno::RuntimeException) @@ -1718,9 +1613,6 @@ throw (uno::RuntimeException) return bRet; } -/* -----------------15.10.99 08:24------------------- - - --------------------------------------------------*/ sal_Bool SAL_CALL SwXTextCursor::gotoStartOfSentence(sal_Bool Expand) throw (uno::RuntimeException) @@ -1745,9 +1637,7 @@ throw (uno::RuntimeException) } return bRet; } -/* -----------------15.10.99 08:24------------------- - --------------------------------------------------*/ sal_Bool SAL_CALL SwXTextCursor::gotoEndOfSentence(sal_Bool Expand) throw (uno::RuntimeException) { @@ -1773,9 +1663,6 @@ SwXTextCursor::gotoEndOfSentence(sal_Bool Expand) throw (uno::RuntimeException) return bRet; } -/*-- 09.12.98 14:18:48--------------------------------------------------- - - -----------------------------------------------------------------------*/ sal_Bool SAL_CALL SwXTextCursor::isStartOfParagraph() throw (uno::RuntimeException) { @@ -1786,9 +1673,7 @@ SwXTextCursor::isStartOfParagraph() throw (uno::RuntimeException) const sal_Bool bRet = SwUnoCursorHelper::IsStartOfPara(rUnoCursor); return bRet; } -/*-- 09.12.98 14:18:48--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool SAL_CALL SwXTextCursor::isEndOfParagraph() throw (uno::RuntimeException) { @@ -1800,9 +1685,6 @@ SwXTextCursor::isEndOfParagraph() throw (uno::RuntimeException) return bRet; } -/*-- 09.12.98 14:18:49--------------------------------------------------- - - -----------------------------------------------------------------------*/ sal_Bool SAL_CALL SwXTextCursor::gotoStartOfParagraph(sal_Bool Expand) throw (uno::RuntimeException) @@ -1828,9 +1710,7 @@ throw (uno::RuntimeException) DBG_ASSERT( bRet, "gotoStartOfParagraph failed" ); return bRet; } -/*-- 09.12.98 14:18:49--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool SAL_CALL SwXTextCursor::gotoEndOfParagraph(sal_Bool Expand) throw (uno::RuntimeException) { @@ -1856,9 +1736,6 @@ SwXTextCursor::gotoEndOfParagraph(sal_Bool Expand) throw (uno::RuntimeException) return bRet; } -/*-- 09.12.98 14:18:50--------------------------------------------------- - - -----------------------------------------------------------------------*/ sal_Bool SAL_CALL SwXTextCursor::gotoNextParagraph(sal_Bool Expand) throw (uno::RuntimeException) { @@ -1874,9 +1751,7 @@ SwXTextCursor::gotoNextParagraph(sal_Bool Expand) throw (uno::RuntimeException) const sal_Bool bRet = rUnoCursor.MovePara(fnParaNext, fnParaStart); return bRet; } -/*-- 09.12.98 14:18:50--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool SAL_CALL SwXTextCursor::gotoPreviousParagraph(sal_Bool Expand) throw (uno::RuntimeException) @@ -1894,9 +1769,6 @@ throw (uno::RuntimeException) return bRet; } -/*-- 09.12.98 14:18:50--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Reference< text::XText > SAL_CALL SwXTextCursor::getText() throw (uno::RuntimeException) { @@ -1905,9 +1777,6 @@ SwXTextCursor::getText() throw (uno::RuntimeException) return m_pImpl->m_xParentText; } -/*-- 09.12.98 14:18:50--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Reference< text::XTextRange > SAL_CALL SwXTextCursor::getStart() throw (uno::RuntimeException) { @@ -1933,9 +1802,7 @@ SwXTextCursor::getStart() throw (uno::RuntimeException) } return xRet; } -/*-- 09.12.98 14:18:51--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Reference< text::XTextRange > SAL_CALL SwXTextCursor::getEnd() throw (uno::RuntimeException) { @@ -1962,9 +1829,6 @@ SwXTextCursor::getEnd() throw (uno::RuntimeException) return xRet; } -/*-- 09.12.98 14:18:51--------------------------------------------------- - - -----------------------------------------------------------------------*/ OUString SAL_CALL SwXTextCursor::getString() throw (uno::RuntimeException) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -1975,9 +1839,7 @@ OUString SAL_CALL SwXTextCursor::getString() throw (uno::RuntimeException) SwUnoCursorHelper::GetTextFromPam(rUnoCursor, aTxt); return aTxt; } -/*-- 09.12.98 14:18:52--------------------------------------------------- - -----------------------------------------------------------------------*/ void SAL_CALL SwXTextCursor::setString(const OUString& aString) throw (uno::RuntimeException) { @@ -1993,9 +1855,6 @@ SwXTextCursor::setString(const OUString& aString) throw (uno::RuntimeException) DeleteAndInsert(aString, bForceExpandHints); } -/* -----------------------------03.05.00 12:56-------------------------------- - - ---------------------------------------------------------------------------*/ uno::Any SwUnoCursorHelper::GetPropertyValue( SwPaM& rPaM, const SfxItemPropertySet& rPropSet, const OUString& rPropertyName) @@ -2031,9 +1890,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, return aAny; } -/* -----------------------------03.05.00 12:57-------------------------------- - ---------------------------------------------------------------------------*/ void SwUnoCursorHelper::SetPropertyValue( SwPaM& rPaM, const SfxItemPropertySet& rPropSet, const OUString& rPropertyName, @@ -2073,9 +1930,6 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, SwUnoCursorHelper::SetCrsrAttr(rPaM, aItemSet, nAttrMode, bTableMode); } -/* -----------------------------03.05.00 13:16-------------------------------- - - ---------------------------------------------------------------------------*/ uno::Sequence< beans::PropertyState > SwUnoCursorHelper::GetPropertyStates( SwPaM& rPaM, const SfxItemPropertySet& rPropSet, @@ -2189,9 +2043,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException) } return aRet; } -/* -----------------------------03.05.00 13:17-------------------------------- - ---------------------------------------------------------------------------*/ beans::PropertyState SwUnoCursorHelper::GetPropertyState( SwPaM& rPaM, const SfxItemPropertySet& rPropSet, const OUString& rPropertyName) @@ -2204,9 +2056,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException) SW_PROPERTY_STATE_CALLER_SINGLE_VALUE_ONLY ); return aSeq[0]; } -/* -----------------------------03.05.00 13:20-------------------------------- - ---------------------------------------------------------------------------*/ static void lcl_SelectParaAndReset( SwPaM &rPaM, SwDoc & rDoc, SvUShortsSort const*const pWhichIds = 0 ) @@ -2229,7 +2079,6 @@ lcl_SelectParaAndReset( SwPaM &rPaM, SwDoc & rDoc, rDoc.ResetAttrs(*pTemp, sal_True, pWhichIds); } - void SwUnoCursorHelper::SetPropertyToDefault( SwPaM& rPaM, const SfxItemPropertySet& rPropSet, const OUString& rPropertyName) @@ -2271,9 +2120,6 @@ throw (beans::UnknownPropertyException, uno::RuntimeException) } } -/* -----------------------------03.05.00 13:19-------------------------------- - - ---------------------------------------------------------------------------*/ uno::Any SwUnoCursorHelper::GetPropertyDefault( SwPaM& rPaM, const SfxItemPropertySet& rPropSet, const OUString& rPropertyName) @@ -2300,9 +2146,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, return aRet; } -/*-- 09.12.98 14:18:54--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXTextCursor::getPropertySetInfo() throw (uno::RuntimeException) { @@ -2328,9 +2171,6 @@ SwXTextCursor::getPropertySetInfo() throw (uno::RuntimeException) return xRef; } -/*-- 09.12.98 14:18:54--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SAL_CALL SwXTextCursor::setPropertyValue( const OUString& rPropertyName, const uno::Any& rValue) @@ -2368,9 +2208,6 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, } } -/*-- 09.12.98 14:18:55--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Any SAL_CALL SwXTextCursor::getPropertyValue(const OUString& rPropertyName) throw (beans::UnknownPropertyException, lang::WrappedTargetException, @@ -2400,9 +2237,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, return aAny; } -/*-- 09.12.98 14:18:55--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SAL_CALL SwXTextCursor::addPropertyChangeListener( const ::rtl::OUString& /*rPropertyName*/, @@ -2414,9 +2248,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, "SwXTextCursor::addPropertyChangeListener(): not implemented"); } -/*-- 09.12.98 14:18:57--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SAL_CALL SwXTextCursor::removePropertyChangeListener( const ::rtl::OUString& /*rPropertyName*/, @@ -2428,9 +2259,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, "SwXTextCursor::removePropertyChangeListener(): not implemented"); } -/*-- 09.12.98 14:18:57--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SAL_CALL SwXTextCursor::addVetoableChangeListener( const ::rtl::OUString& /*rPropertyName*/, @@ -2442,9 +2270,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, "SwXTextCursor::addVetoableChangeListener(): not implemented"); } -/*-- 09.12.98 14:18:58--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SAL_CALL SwXTextCursor::removeVetoableChangeListener( const ::rtl::OUString& /*rPropertyName*/, @@ -2456,9 +2281,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, "SwXTextCursor::removeVetoableChangeListener(): not implemented"); } -/*-- 05.03.99 11:36:11--------------------------------------------------- - - -----------------------------------------------------------------------*/ beans::PropertyState SAL_CALL SwXTextCursor::getPropertyState(const OUString& rPropertyName) throw (beans::UnknownPropertyException, uno::RuntimeException) @@ -2471,9 +2293,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException) rUnoCursor, m_pImpl->m_rPropSet, rPropertyName); return eRet; } -/*-- 05.03.99 11:36:11--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Sequence< beans::PropertyState > SAL_CALL SwXTextCursor::getPropertyStates( const uno::Sequence< OUString >& rPropertyNames) @@ -2487,9 +2307,6 @@ throw (beans::UnknownPropertyException, uno::RuntimeException) rUnoCursor, m_pImpl->m_rPropSet, rPropertyNames); } -/*-- 05.03.99 11:36:12--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SAL_CALL SwXTextCursor::setPropertyToDefault(const OUString& rPropertyName) throw (beans::UnknownPropertyException, uno::RuntimeException) @@ -2498,9 +2315,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException) uno::Sequence < OUString > aSequence ( &rPropertyName, 1 ); setPropertiesToDefault ( aSequence ); } -/*-- 05.03.99 11:36:12--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Any SAL_CALL SwXTextCursor::getPropertyDefault(const OUString& rPropertyName) throw (beans::UnknownPropertyException, lang::WrappedTargetException, @@ -2686,9 +2501,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, return aRet; } -/*-- 10.03.2008 09:58:47--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SAL_CALL SwXTextCursor::makeRedline( const ::rtl::OUString& rRedlineType, @@ -2702,9 +2514,6 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) SwUnoCursorHelper::makeRedline(rUnoCursor, rRedlineType, rRedlineProperties); } -/*-- 09.12.98 14:18:58--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SAL_CALL SwXTextCursor::insertDocumentFromURL(const OUString& rURL, const uno::Sequence< beans::PropertyValue >& rOptions) throw (lang::IllegalArgumentException, io::IOException, @@ -2717,9 +2526,6 @@ throw (lang::IllegalArgumentException, io::IOException, SwUnoCursorHelper::InsertFile(&rUnoCursor, rURL, rOptions); } -/* -----------------------------15.12.00 14:01-------------------------------- - - ---------------------------------------------------------------------------*/ uno::Sequence< beans::PropertyValue > SwUnoCursorHelper::CreateSortDescriptor(const bool bFromTable) { @@ -2791,9 +2597,6 @@ SwUnoCursorHelper::CreateSortDescriptor(const bool bFromTable) return aRet; } -/*-- 09.12.98 14:18:58--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Sequence< beans::PropertyValue > SAL_CALL SwXTextCursor::createSortDescriptor() throw (uno::RuntimeException) { @@ -2802,9 +2605,6 @@ SwXTextCursor::createSortDescriptor() throw (uno::RuntimeException) return SwUnoCursorHelper::CreateSortDescriptor(false); } -/* -----------------------------15.12.00 14:06-------------------------------- - - ---------------------------------------------------------------------------*/ sal_Bool SwUnoCursorHelper::ConvertSortProperties( const uno::Sequence< beans::PropertyValue >& rDescriptor, SwSortOptions& rSortOpt) @@ -3052,9 +2852,6 @@ sal_Bool SwUnoCursorHelper::ConvertSortProperties( return bRet && rSortOpt.aKeys.Count() > 0; } -/*-- 09.12.98 14:19:00--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SAL_CALL SwXTextCursor::sort(const uno::Sequence< beans::PropertyValue >& rDescriptor) throw (uno::RuntimeException) @@ -3099,9 +2896,6 @@ throw (uno::RuntimeException) } } -/* -----------------------------03.04.00 09:11-------------------------------- - - ---------------------------------------------------------------------------*/ uno::Reference< container::XEnumeration > SAL_CALL SwXTextCursor::createContentEnumeration(const OUString& rServiceName) throw (uno::RuntimeException) @@ -3120,9 +2914,6 @@ throw (uno::RuntimeException) return xRet; } -/* -----------------------------07.03.01 14:53-------------------------------- - - ---------------------------------------------------------------------------*/ uno::Reference< container::XEnumeration > SAL_CALL SwXTextCursor::createEnumeration() throw (uno::RuntimeException) { @@ -3164,26 +2955,17 @@ SwXTextCursor::createEnumeration() throw (uno::RuntimeException) return xRet; } -/* -----------------------------07.03.01 15:43-------------------------------- - - ---------------------------------------------------------------------------*/ uno::Type SAL_CALL SwXTextCursor::getElementType() throw (uno::RuntimeException) { return text::XTextRange::static_type(); } -/* -----------------------------07.03.01 15:43-------------------------------- - - ---------------------------------------------------------------------------*/ sal_Bool SAL_CALL SwXTextCursor::hasElements() throw (uno::RuntimeException) { return sal_True; } -/* -----------------------------03.04.00 09:11-------------------------------- - - ---------------------------------------------------------------------------*/ uno::Sequence< OUString > SAL_CALL SwXTextCursor::getAvailableServiceNames() throw (uno::RuntimeException) { @@ -3193,7 +2975,6 @@ SwXTextCursor::getAvailableServiceNames() throw (uno::RuntimeException) return aRet; } -// --------------------------------------------------------------------------- IMPLEMENT_FORWARD_REFCOUNT( SwXTextCursor,SwXTextCursor_Base ) uno::Any SAL_CALL @@ -3204,4 +2985,3 @@ throw (uno::RuntimeException) ? OTextCursorHelper::queryInterface(rType) : SwXTextCursor_Base::queryInterface(rType); } - diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx index 9cd61d1b24..e2a79a7d13 100644 --- a/sw/source/core/unocore/unoport.cxx +++ b/sw/source/core/unocore/unoport.cxx @@ -58,11 +58,9 @@ using namespace ::com::sun::star; using ::rtl::OUString; - /****************************************************************** * SwXTextPortion ******************************************************************/ - static void init(SwXTextPortion & rPortion, const SwUnoCrsr* pPortionCursor) { SwUnoCrsr* pUnoCursor = @@ -75,9 +73,6 @@ static void init(SwXTextPortion & rPortion, const SwUnoCrsr* pPortionCursor) pUnoCursor->Add(& rPortion); } -/*-- 11.12.98 09:56:55--------------------------------------------------- - - -----------------------------------------------------------------------*/ SwXTextPortion::SwXTextPortion(const SwUnoCrsr* pPortionCrsr, uno::Reference< text::XText > const& rParent, SwTextPortionType eType) @@ -100,9 +95,6 @@ SwXTextPortion::SwXTextPortion(const SwUnoCrsr* pPortionCrsr, init(*this, pPortionCrsr); } -/* -----------------24.03.99 16:30------------------- - * - * --------------------------------------------------*/ SwXTextPortion::SwXTextPortion(const SwUnoCrsr* pPortionCrsr, uno::Reference< text::XText > const& rParent, SwFrmFmt& rFmt ) @@ -122,9 +114,6 @@ SwXTextPortion::SwXTextPortion(const SwUnoCrsr* pPortionCrsr, init(*this, pPortionCrsr); } -/* -----------------------------19.02.01 10:52-------------------------------- - - ---------------------------------------------------------------------------*/ SwXTextPortion::SwXTextPortion(const SwUnoCrsr* pPortionCrsr, SwTxtRuby const& rAttr, uno::Reference< text::XText > const& xParent, @@ -154,26 +143,19 @@ SwXTextPortion::SwXTextPortion(const SwUnoCrsr* pPortionCrsr, } } -/*-- 11.12.98 09:56:55--------------------------------------------------- - - -----------------------------------------------------------------------*/ SwXTextPortion::~SwXTextPortion() { vos::OGuard aGuard(Application::GetSolarMutex()); SwUnoCrsr* pUnoCrsr = GetCursor(); delete pUnoCrsr; } -/*-- 11.12.98 09:56:56--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Reference< text::XText > SwXTextPortion::getText() throw( uno::RuntimeException ) { return m_xParentText; } -/*-- 11.12.98 09:56:56--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Reference< text::XTextRange > SwXTextPortion::getStart() throw( uno::RuntimeException ) { @@ -188,9 +170,7 @@ throw( uno::RuntimeException ) xRet = new SwXTextRange(aPam, xParent); return xRet; } -/*-- 11.12.98 09:56:57--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Reference< text::XTextRange > SwXTextPortion::getEnd() throw( uno::RuntimeException ) { @@ -205,9 +185,7 @@ throw( uno::RuntimeException ) xRet = new SwXTextRange(aPam, xParent); return xRet; } -/*-- 11.12.98 09:56:57--------------------------------------------------- - -----------------------------------------------------------------------*/ OUString SwXTextPortion::getString() throw( uno::RuntimeException ) { @@ -227,9 +205,7 @@ throw( uno::RuntimeException ) } return aTxt; } -/*-- 11.12.98 09:56:57--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXTextPortion::setString(const OUString& aString) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -239,9 +215,7 @@ void SwXTextPortion::setString(const OUString& aString) throw( uno::RuntimeExcep SwUnoCursorHelper::SetString(*pUnoCrsr, aString); } -/*-- 11.12.98 09:56:57--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Reference< beans::XPropertySetInfo > SwXTextPortion::getPropertySetInfo() throw( uno::RuntimeException ) { @@ -258,9 +232,7 @@ throw( uno::RuntimeException ) return (PORTION_REDLINE_START == m_ePortionType || PORTION_REDLINE_END == m_ePortionType) ? xRedlPorRef : xTxtPorExtRef; } -/*-- 11.12.98 09:56:57--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXTextPortion::setPropertyValue(const OUString& rPropertyName, const uno::Any& aValue) throw( beans::UnknownPropertyException, @@ -274,9 +246,7 @@ void SwXTextPortion::setPropertyValue(const OUString& rPropertyName, SwUnoCursorHelper::SetPropertyValue(*pUnoCrsr, *m_pPropSet, rPropertyName, aValue); } -/*-- 04.11.03 09:56:58--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXTextPortion::GetPropertyValue( uno::Any &rVal, const SfxItemPropertySimpleEntry& rEntry, @@ -430,7 +400,6 @@ void SwXTextPortion::GetPropertyValue( } } - uno::Sequence< uno::Any > SAL_CALL SwXTextPortion::GetPropertyValues_Impl( const uno::Sequence< OUString >& rPropertyNames ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) @@ -462,9 +431,7 @@ uno::Sequence< uno::Any > SAL_CALL SwXTextPortion::GetPropertyValues_Impl( } return aValues; } -/*-- 11.12.98 09:56:58--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Any SwXTextPortion::getPropertyValue( const OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) @@ -474,9 +441,7 @@ uno::Any SwXTextPortion::getPropertyValue( aPropertyNames.getArray()[0] = rPropertyName; return GetPropertyValues_Impl(aPropertyNames).getConstArray()[0]; } -/* -----------------------------02.04.01 11:44-------------------------------- - ---------------------------------------------------------------------------*/ void SAL_CALL SwXTextPortion::SetPropertyValues_Impl( const uno::Sequence< OUString >& rPropertyNames, const uno::Sequence< uno::Any >& rValues ) @@ -527,9 +492,7 @@ void SwXTextPortion::setPropertyValues( throw aWExc; } } -/* -----------------------------02.04.01 11:44-------------------------------- - ---------------------------------------------------------------------------*/ uno::Sequence< uno::Any > SwXTextPortion::getPropertyValues( const uno::Sequence< OUString >& rPropertyNames ) throw(uno::RuntimeException) @@ -553,12 +516,8 @@ uno::Sequence< uno::Any > SwXTextPortion::getPropertyValues( return aValues; } -/* -----------------------------29.09.03 11:44-------------------------------- - - ---------------------------------------------------------------------------*/ /* disabled for #i46921# */ - uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL SwXTextPortion::setPropertyValuesTolerant( const uno::Sequence< OUString >& rPropertyNames, const uno::Sequence< uno::Any >& rValues ) @@ -631,7 +590,6 @@ uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL SwXTextPortion::setPr return aFailed; } - uno::Sequence< beans::GetPropertyTolerantResult > SAL_CALL SwXTextPortion::getPropertyValuesTolerant( const uno::Sequence< OUString >& rPropertyNames ) throw (uno::RuntimeException) @@ -651,7 +609,6 @@ uno::Sequence< beans::GetPropertyTolerantResult > SAL_CALL SwXTextPortion::getPr return aRes; } - uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL SwXTextPortion::getDirectPropertyValuesTolerant( const uno::Sequence< OUString >& rPropertyNames ) throw (uno::RuntimeException) @@ -660,7 +617,6 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL SwXTextPortion: return GetPropertyValuesTolerant_Impl( rPropertyNames, sal_True ); } - uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL SwXTextPortion::GetPropertyValuesTolerant_Impl( const uno::Sequence< OUString >& rPropertyNames, sal_Bool bDirectValuesOnly ) @@ -755,33 +711,23 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL SwXTextPortion: return aResult; } - -/* -----------------------------02.04.01 11:44-------------------------------- - - ---------------------------------------------------------------------------*/ void SwXTextPortion::addPropertiesChangeListener( const uno::Sequence< OUString >& /*aPropertyNames*/, const uno::Reference< beans::XPropertiesChangeListener >& /*xListener*/ ) throw(uno::RuntimeException) {} -/* -----------------------------02.04.01 11:44-------------------------------- - ---------------------------------------------------------------------------*/ void SwXTextPortion::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& /*xListener*/ ) throw(uno::RuntimeException) {} -/* -----------------------------02.04.01 11:44-------------------------------- - ---------------------------------------------------------------------------*/ void SwXTextPortion::firePropertiesChangeEvent( const uno::Sequence< OUString >& /*aPropertyNames*/, const uno::Reference< beans::XPropertiesChangeListener >& /*xListener*/ ) throw(uno::RuntimeException) {} -/*-- 11.12.98 09:56:58--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXTextPortion::addPropertyChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) @@ -789,30 +735,22 @@ void SwXTextPortion::addPropertyChangeListener( { DBG_WARNING("not implemented"); } -/*-- 11.12.98 09:56:58--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXTextPortion::removePropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { DBG_WARNING("not implemented"); } -/*-- 11.12.98 09:56:58--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXTextPortion::addVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { DBG_WARNING("not implemented"); } -/*-- 11.12.98 09:56:59--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXTextPortion::removeVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { DBG_WARNING("not implemented"); } -/*-- 08.03.99 09:41:43--------------------------------------------------- - -----------------------------------------------------------------------*/ beans::PropertyState SwXTextPortion::getPropertyState(const OUString& rPropertyName) throw( beans::UnknownPropertyException, uno::RuntimeException ) { @@ -834,9 +772,7 @@ beans::PropertyState SwXTextPortion::getPropertyState(const OUString& rPropertyN } return eRet; } -/*-- 08.03.99 09:41:47--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Sequence< beans::PropertyState > SwXTextPortion::getPropertyStates( const uno::Sequence< OUString >& rPropertyNames) throw( beans::UnknownPropertyException, uno::RuntimeException ) @@ -862,9 +798,7 @@ uno::Sequence< beans::PropertyState > SwXTextPortion::getPropertyStates( } return aRet; } -/*-- 08.03.99 09:41:47--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXTextPortion::setPropertyToDefault(const OUString& rPropertyName) throw( beans::UnknownPropertyException, uno::RuntimeException ) { @@ -876,9 +810,7 @@ void SwXTextPortion::setPropertyToDefault(const OUString& rPropertyName) SwUnoCursorHelper::SetPropertyToDefault( *pUnoCrsr, *m_pPropSet, rPropertyName); } -/*-- 08.03.99 09:41:48--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Any SwXTextPortion::getPropertyDefault(const OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { @@ -893,9 +825,6 @@ uno::Any SwXTextPortion::getPropertyDefault(const OUString& rPropertyName) return aRet; } -/*-- 11.12.98 09:56:59--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SwXTextPortion::attach(const uno::Reference< text::XTextRange > & /*xTextRange*/) throw( lang::IllegalArgumentException, uno::RuntimeException ) { @@ -904,9 +833,7 @@ void SwXTextPortion::attach(const uno::Reference< text::XTextRange > & /*xTextRa // they cannot be attached throw uno::RuntimeException(); } -/*-- 11.12.98 09:57:00--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Reference< text::XTextRange > SwXTextPortion::getAnchor() throw( uno::RuntimeException ) { @@ -919,9 +846,7 @@ throw( uno::RuntimeException ) aRet = new SwXTextRange(*pUnoCrsr, m_xParentText); return aRet; } -/*-- 11.12.98 09:57:00--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXTextPortion::dispose() throw( uno::RuntimeException ) { @@ -933,9 +858,7 @@ throw( uno::RuntimeException ) setString(aEmptyStr); pUnoCrsr->Remove(this); } -/*-- 11.12.98 09:57:00--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXTextPortion::addEventListener(const uno::Reference< lang::XEventListener > & aListener) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -944,18 +867,14 @@ void SwXTextPortion::addEventListener(const uno::Reference< lang::XEventListener m_ListenerContainer.AddListener(aListener); } -/*-- 11.12.98 09:57:01--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXTextPortion::removeEventListener(const uno::Reference< lang::XEventListener > & aListener) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); if (!GetRegisteredIn() || !m_ListenerContainer.RemoveListener(aListener)) throw uno::RuntimeException(); } -/* -----------------24.03.99 13:30------------------- - * - * --------------------------------------------------*/ + uno::Reference< container::XEnumeration > SwXTextPortion::createContentEnumeration(const OUString& /*aServiceName*/) throw( uno::RuntimeException ) { @@ -970,17 +889,13 @@ uno::Reference< container::XEnumeration > SwXTextPortion::createContentEnumerat return xRet; } -/* -----------------------------04.07.01 08:52-------------------------------- - ---------------------------------------------------------------------------*/ const uno::Sequence< sal_Int8 > & SwXTextPortion::getUnoTunnelId() { static uno::Sequence< sal_Int8 > aSeq = ::CreateUnoTunnelId(); return aSeq; } -/* -----------------------------04.07.01 08:52-------------------------------- - ---------------------------------------------------------------------------*/ sal_Int64 SwXTextPortion::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw(uno::RuntimeException) { @@ -992,9 +907,7 @@ sal_Int64 SwXTextPortion::getSomething( const uno::Sequence< sal_Int8 >& rId ) } return 0; } -/* -----------------24.03.99 13:30------------------- - * - * --------------------------------------------------*/ + uno::Sequence< OUString > SwXTextPortion::getAvailableServiceNames() throw( uno::RuntimeException ) { @@ -1004,17 +917,13 @@ throw( uno::RuntimeException ) pArray[0] = C2U("com.sun.star.text.TextContent"); return aRet; } -/* -----------------25.03.99 10:30------------------- - * - * --------------------------------------------------*/ + OUString SwXTextPortion::getImplementationName() throw( uno::RuntimeException ) { return C2U("SwXTextPortion"); } -/* -----------------25.03.99 10:30------------------- - * - * --------------------------------------------------*/ + sal_Bool SwXTextPortion::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -1036,9 +945,7 @@ sal_Bool SwXTextPortion::supportsService(const OUString& rServiceName) throw( un return bRet; } -/* --------------------------------------------------------------------------- - ---------------------------------------------------------------------------*/ uno::Sequence< OUString > SwXTextPortion::getSupportedServiceNames() throw( uno::RuntimeException ) { @@ -1058,9 +965,7 @@ throw( uno::RuntimeException ) pArray[6] = C2U("com.sun.star.style.ParagraphPropertiesComplex"); return aRet; } -/*-- 11.12.98 09:57:01--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXTextPortion::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew) { ClientModify(this, pOld, pNew); @@ -1069,4 +974,3 @@ void SwXTextPortion::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew) m_pFrameFmt = 0; } } - diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index a63aa674b7..3bbd373dfd 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -138,6 +138,7 @@ const SfxItemPropertySet* GetFootnoteSet() static SfxItemPropertySet aFootnoteSet_Impl(aFootnoteMap_Impl); return &aFootnoteSet_Impl; } + const SfxItemPropertySet* GetEndnoteSet() { static SfxItemPropertyMapEntry aEndnoteMap_Impl[] = @@ -155,6 +156,7 @@ const SfxItemPropertySet* GetEndnoteSet() static SfxItemPropertySet aEndnoteSet_Impl(aEndnoteMap_Impl); return &aEndnoteSet_Impl; } + const SfxItemPropertySet* GetNumberingRulesSet() { static SfxItemPropertyMapEntry aNumberingRulesMap_Impl[] = @@ -170,6 +172,7 @@ const SfxItemPropertySet* GetNumberingRulesSet() static SfxItemPropertySet aNumberingRulesSet_Impl( aNumberingRulesMap_Impl ); return &aNumberingRulesSet_Impl; } + #define WID_NUM_ON 0 #define WID_SEPARATOR_INTERVAL 1 #define WID_NUMBERING_TYPE 2 @@ -203,9 +206,6 @@ const SfxItemPropertySet* GetLineNumberingSet() return &aLineNumberingSet_Impl; } -/* -----------------05.05.98 08:30------------------- - * - * --------------------------------------------------*/ SwCharFmt* lcl_getCharFmt(SwDoc* pDoc, const uno::Any& aValue) { SwCharFmt* pRet = 0; @@ -226,9 +226,7 @@ SwCharFmt* lcl_getCharFmt(SwDoc* pDoc, const uno::Any& aValue) } return pRet; } -/* -----------------05.05.98 08:30------------------- - * - * --------------------------------------------------*/ + SwTxtFmtColl* lcl_GetParaStyle(SwDoc* pDoc, const uno::Any& aValue) { OUString uTmp; @@ -244,9 +242,7 @@ SwTxtFmtColl* lcl_GetParaStyle(SwDoc* pDoc, const uno::Any& aValue) } return pRet; } -/* -----------------05.05.98 08:30------------------- - * - * --------------------------------------------------*/ + SwPageDesc* lcl_GetPageDesc(SwDoc* pDoc, const uno::Any& aValue) { SwPageDesc* pRet = 0; @@ -273,9 +269,7 @@ SwPageDesc* lcl_GetPageDesc(SwDoc* pDoc, const uno::Any& aValue) } return pRet; } -/****************************************************************************** - * - ******************************************************************************/ + // Numerierung const unsigned short aSvxToUnoAdjust[] = { @@ -300,23 +294,16 @@ const unsigned short aUnoToSvxAdjust[] = /****************************************************************** * SwXFootnoteProperties ******************************************************************/ -/* -----------------------------06.04.00 11:43-------------------------------- - - ---------------------------------------------------------------------------*/ OUString SwXFootnoteProperties::getImplementationName(void) throw( RuntimeException ) { return C2U("SwXFootnoteProperties"); } -/* -----------------------------06.04.00 11:43-------------------------------- - ---------------------------------------------------------------------------*/ BOOL SwXFootnoteProperties::supportsService(const OUString& rServiceName) throw( RuntimeException ) { return C2U("com.sun.star.text.FootnoteSettings") == rServiceName; } -/* -----------------------------06.04.00 11:43-------------------------------- - ---------------------------------------------------------------------------*/ Sequence< OUString > SwXFootnoteProperties::getSupportedServiceNames(void) throw( RuntimeException ) { Sequence< OUString > aRet(1); @@ -324,33 +311,25 @@ Sequence< OUString > SwXFootnoteProperties::getSupportedServiceNames(void) throw pArray[0] = C2U("com.sun.star.text.FootnoteSettings"); return aRet; } -/*-- 14.12.98 14:03:20--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXFootnoteProperties::SwXFootnoteProperties(SwDoc* pDc) : pDoc(pDc), m_pPropertySet(GetFootnoteSet()) { } -/*-- 14.12.98 14:03:20--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXFootnoteProperties::~SwXFootnoteProperties() { } -/*-- 14.12.98 14:03:20--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Reference< beans::XPropertySetInfo > SwXFootnoteProperties::getPropertySetInfo(void) throw( uno::RuntimeException ) { static uno::Reference< beans::XPropertySetInfo > aRef = m_pPropertySet->getPropertySetInfo(); return aRef; } -/*-- 14.12.98 14:03:20--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXFootnoteProperties::setPropertyValue(const OUString& rPropertyName, const uno::Any& aValue) throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException ) { @@ -472,9 +451,7 @@ void SwXFootnoteProperties::setPropertyValue(const OUString& rPropertyName, cons else throw uno::RuntimeException(); } -/*-- 14.12.98 14:03:21--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Any SwXFootnoteProperties::getPropertyValue(const OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { @@ -595,36 +572,28 @@ uno::Any SwXFootnoteProperties::getPropertyValue(const OUString& rPropertyName) throw uno::RuntimeException(); return aRet; } -/*-- 14.12.98 14:03:21--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXFootnoteProperties::addPropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { DBG_WARNING("not implemented"); } -/*-- 14.12.98 14:03:21--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXFootnoteProperties::removePropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { DBG_WARNING("not implemented"); } -/*-- 14.12.98 14:03:21--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXFootnoteProperties::addVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { DBG_WARNING("not implemented"); } -/*-- 14.12.98 14:03:22--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXFootnoteProperties::removeVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) @@ -635,23 +604,16 @@ void SwXFootnoteProperties::removeVetoableChangeListener( /****************************************************************** * SwXEndnoteProperties ******************************************************************/ -/* -----------------------------06.04.00 11:45-------------------------------- - - ---------------------------------------------------------------------------*/ OUString SwXEndnoteProperties::getImplementationName(void) throw( RuntimeException ) { return C2U("SwXEndnoteProperties"); } -/* -----------------------------06.04.00 11:45-------------------------------- - ---------------------------------------------------------------------------*/ BOOL SwXEndnoteProperties::supportsService(const OUString& rServiceName) throw( RuntimeException ) { return C2U("com.sun.star.text.FootnoteSettings") == rServiceName; } -/* -----------------------------06.04.00 11:45-------------------------------- - ---------------------------------------------------------------------------*/ Sequence< OUString > SwXEndnoteProperties::getSupportedServiceNames(void) throw( RuntimeException ) { Sequence< OUString > aRet(1); @@ -659,33 +621,25 @@ Sequence< OUString > SwXEndnoteProperties::getSupportedServiceNames(void) throw( pArray[0] = C2U("com.sun.star.text.FootnoteSettings"); return aRet; } -/*-- 14.12.98 14:27:39--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXEndnoteProperties::SwXEndnoteProperties(SwDoc* pDc) : pDoc(pDc), m_pPropertySet(GetEndnoteSet()) { } -/*-- 14.12.98 14:27:39--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXEndnoteProperties::~SwXEndnoteProperties() { } -/*-- 14.12.98 14:27:40--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Reference< beans::XPropertySetInfo > SwXEndnoteProperties::getPropertySetInfo(void) throw( uno::RuntimeException ) { static uno::Reference< beans::XPropertySetInfo > aRef = m_pPropertySet->getPropertySetInfo(); return aRef; } -/*-- 14.12.98 14:27:40--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXEndnoteProperties::setPropertyValue(const OUString& rPropertyName, const uno::Any& aValue) throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException ) @@ -763,9 +717,7 @@ void SwXEndnoteProperties::setPropertyValue(const OUString& rPropertyName, const throw UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); } } -/*-- 14.12.98 14:27:41--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Any SwXEndnoteProperties::getPropertyValue(const OUString& rPropertyName) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { @@ -853,60 +805,46 @@ uno::Any SwXEndnoteProperties::getPropertyValue(const OUString& rPropertyName) } return aRet; } -/*-- 14.12.98 14:27:41--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXEndnoteProperties::addPropertyChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { DBG_WARNING("not implemented"); } -/*-- 14.12.98 14:27:41--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXEndnoteProperties::removePropertyChangeListener(const OUString& /*PropertyName*/, const uno:: Reference< beans::XPropertyChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { DBG_WARNING("not implemented"); } -/*-- 14.12.98 14:27:41--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXEndnoteProperties::addVetoableChangeListener(const OUString& /*PropertyName*/, const uno:: Reference< beans::XVetoableChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { DBG_WARNING("not implemented"); } -/*-- 14.12.98 14:27:42--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXEndnoteProperties::removeVetoableChangeListener(const OUString& /*PropertyName*/, const uno:: Reference< beans::XVetoableChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { DBG_WARNING("not implemented"); } + /****************************************************************** * SwXLineNumberingProperties ******************************************************************/ -/* -----------------------------06.04.00 11:47-------------------------------- - - ---------------------------------------------------------------------------*/ OUString SwXLineNumberingProperties::getImplementationName(void) throw( RuntimeException ) { return C2U("SwXLineNumberingProperties"); } -/* -----------------------------06.04.00 11:47-------------------------------- - ---------------------------------------------------------------------------*/ BOOL SwXLineNumberingProperties::supportsService(const OUString& rServiceName) throw( RuntimeException ) { return C2U("com.sun.star.text.LineNumberingProperties") == rServiceName; } -/* -----------------------------06.04.00 11:47-------------------------------- - ---------------------------------------------------------------------------*/ Sequence< OUString > SwXLineNumberingProperties::getSupportedServiceNames(void) throw( RuntimeException ) { Sequence< OUString > aRet(1); @@ -914,33 +852,25 @@ Sequence< OUString > SwXLineNumberingProperties::getSupportedServiceNames(void) pArray[0] = C2U("com.sun.star.text.LineNumberingProperties"); return aRet; } -/*-- 14.12.98 14:33:36--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXLineNumberingProperties::SwXLineNumberingProperties(SwDoc* pDc) : pDoc(pDc), m_pPropertySet(GetLineNumberingSet()) { } -/*-- 14.12.98 14:33:37--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXLineNumberingProperties::~SwXLineNumberingProperties() { } -/*-- 14.12.98 14:33:37--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Reference< beans::XPropertySetInfo > SwXLineNumberingProperties::getPropertySetInfo(void) throw( uno::RuntimeException ) { static uno::Reference< beans::XPropertySetInfo > aRef = m_pPropertySet->getPropertySetInfo(); return aRef; } -/*-- 14.12.98 14:33:37--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXLineNumberingProperties::setPropertyValue( const OUString& rPropertyName, const Any& aValue) throw( UnknownPropertyException, PropertyVetoException, @@ -1060,9 +990,7 @@ void SwXLineNumberingProperties::setPropertyValue( else throw uno::RuntimeException(); } -/*-- 14.12.98 14:33:38--------------------------------------------------- - -----------------------------------------------------------------------*/ Any SwXLineNumberingProperties::getPropertyValue(const OUString& rPropertyName) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { @@ -1166,35 +1094,28 @@ Any SwXLineNumberingProperties::getPropertyValue(const OUString& rPropertyName) throw uno::RuntimeException(); return aRet; } -/*-- 14.12.98 14:33:38--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXLineNumberingProperties::addPropertyChangeListener(const OUString& /*rPropertyName*/, const uno:: Reference< beans::XPropertyChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { DBG_WARNING("not implemented"); } -/*-- 14.12.98 14:33:38--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXLineNumberingProperties::removePropertyChangeListener(const OUString& /*rPropertyName*/, const uno:: Reference< beans::XPropertyChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { DBG_WARNING("not implemented"); } -/*-- 14.12.98 14:33:39--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXLineNumberingProperties::addVetoableChangeListener(const OUString& /*rPropertyName*/, const uno:: Reference< beans::XVetoableChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { DBG_WARNING("not implemented"); } -/*-- 14.12.98 14:33:39--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXLineNumberingProperties::removeVetoableChangeListener(const OUString& /*rPropertyName*/, const uno:: Reference< beans::XVetoableChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { DBG_WARNING("not implemented"); } + /****************************************************************** * SwXNumberingRules ******************************************************************/ @@ -1204,17 +1125,13 @@ const String& SwXNumberingRules::GetInvalidStyle() { return sInvalidStyle; } -/* -----------------------------10.03.00 17:05-------------------------------- - ---------------------------------------------------------------------------*/ const uno::Sequence< sal_Int8 > & SwXNumberingRules::getUnoTunnelId() { static uno::Sequence< sal_Int8 > aSeq = ::CreateUnoTunnelId(); return aSeq; } -/* -----------------------------10.03.00 17:05-------------------------------- - ---------------------------------------------------------------------------*/ // return implementation specific data sal_Int64 SwXNumberingRules::getSomething( const uno::Sequence< sal_Int8 > & rId ) throw(uno::RuntimeException) { @@ -1227,23 +1144,16 @@ sal_Int64 SwXNumberingRules::getSomething( const uno::Sequence< sal_Int8 > & rId return 0; } -/* -----------------------------06.04.00 11:47-------------------------------- - - ---------------------------------------------------------------------------*/ OUString SwXNumberingRules::getImplementationName(void) throw( RuntimeException ) { return C2U("SwXNumberingRules"); } -/* -----------------------------06.04.00 11:47-------------------------------- - ---------------------------------------------------------------------------*/ BOOL SwXNumberingRules::supportsService(const OUString& rServiceName) throw( RuntimeException ) { return C2U("com.sun.star.text.NumberingRules") == rServiceName; } -/* -----------------------------06.04.00 11:47-------------------------------- - ---------------------------------------------------------------------------*/ Sequence< OUString > SwXNumberingRules::getSupportedServiceNames(void) throw( RuntimeException ) { Sequence< OUString > aRet(1); @@ -1252,9 +1162,6 @@ Sequence< OUString > SwXNumberingRules::getSupportedServiceNames(void) throw( Ru return aRet; } -/*-- 14.12.98 14:57:57--------------------------------------------------- - - -----------------------------------------------------------------------*/ SwXNumberingRules::SwXNumberingRules(const SwNumRule& rRule) : pDoc(0), pDocShell(0), @@ -1284,9 +1191,7 @@ SwXNumberingRules::SwXNumberingRules(const SwNumRule& rRule) : sNewBulletFontNames[i] = SwXNumberingRules::GetInvalidStyle(); } } -/* -----------------22.02.99 16:35------------------- - * - * --------------------------------------------------*/ + SwXNumberingRules::SwXNumberingRules(SwDocShell& rDocSh) : pDoc(0), pDocShell(&rDocSh), @@ -1296,9 +1201,7 @@ SwXNumberingRules::SwXNumberingRules(SwDocShell& rDocSh) : { pDocShell->GetDoc()->GetPageDescFromPool(RES_POOLPAGE_STANDARD)->Add(this); } -/* -----------------------------24.08.00 11:36-------------------------------- - ---------------------------------------------------------------------------*/ SwXNumberingRules::SwXNumberingRules(SwDoc& rDoc) : pDoc(&rDoc), pDocShell(0), @@ -1321,9 +1224,7 @@ SwXNumberingRules::SwXNumberingRules(SwDoc& rDoc) : (void)nIndex; #endif } -/*-- 14.12.98 14:57:57--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXNumberingRules::~SwXNumberingRules() { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -1332,9 +1233,7 @@ SwXNumberingRules::~SwXNumberingRules() if( pNumRule && bOwnNumRuleCreated ) delete pNumRule; } -/*-- 14.12.98 14:57:58--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXNumberingRules::replaceByIndex(sal_Int32 nIndex, const uno::Any& rElement) throw( lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) @@ -1410,16 +1309,12 @@ void SwXNumberingRules::replaceByIndex(sal_Int32 nIndex, const uno::Any& rElemen throw uno::RuntimeException(); } -/*-- 14.12.98 14:57:58--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Int32 SwXNumberingRules::getCount(void) throw( uno::RuntimeException ) { return MAXLEVEL; } -/*-- 14.12.98 14:57:58--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Any SwXNumberingRules::getByIndex(sal_Int32 nIndex) throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException ) @@ -1449,24 +1344,18 @@ uno::Any SwXNumberingRules::getByIndex(sal_Int32 nIndex) throw uno::RuntimeException(); return aVal; } -/*-- 14.12.98 14:57:59--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Type SwXNumberingRules::getElementType(void) throw( uno::RuntimeException ) { return ::getCppuType((uno::Sequence<beans::PropertyValue>*)0); } -/*-- 14.12.98 14:57:59--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool SwXNumberingRules::hasElements(void) throw( uno::RuntimeException ) { return sal_True; } -/*-- 14.12.98 14:57:59--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex( const SwNumRule& rNumRule, sal_Int32 nIndex) const { @@ -1728,9 +1617,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex( aPropertyValues.DeleteAndDestroy(0, aPropertyValues.Count()); return aSeq; } -/*-- 14.12.98 14:57:59--------------------------------------------------- - -----------------------------------------------------------------------*/ PropValData* lcl_FindProperty(const char* cName, PropValDataArr& rPropertyValues) { OUString sCmp = C2U(cName); @@ -1742,7 +1629,6 @@ PropValData* lcl_FindProperty(const char* cName, PropValDataArr& rPropertyValues } return 0; } -//----------------------------------------------------------------------- void SwXNumberingRules::SetNumberingRuleByIndex( SwNumRule& rNumRule, @@ -2245,18 +2131,14 @@ void SwXNumberingRules::SetNumberingRuleByIndex( rNumRule.Set( (sal_uInt16)nIndex, aFmt ); } -/*-- 19.07.00 07:49:17--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Reference< XPropertySetInfo > SwXNumberingRules::getPropertySetInfo() throw(RuntimeException) { static uno::Reference< beans::XPropertySetInfo > aRef = m_pPropertySet->getPropertySetInfo(); return aRef; } -/*-- 19.07.00 07:49:17--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXNumberingRules::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) @@ -2330,9 +2212,7 @@ void SwXNumberingRules::setPropertyValue( const OUString& rPropertyName, const A pCreatedRule->Validate(); } } -/*-- 19.07.00 07:49:18--------------------------------------------------- - -----------------------------------------------------------------------*/ Any SwXNumberingRules::getPropertyValue( const OUString& rPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { @@ -2379,41 +2259,31 @@ Any SwXNumberingRules::getPropertyValue( const OUString& rPropertyName ) throw UnknownPropertyException(); return aRet; } -/*-- 19.07.00 07:49:18--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXNumberingRules::addPropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< XPropertyChangeListener >& /*xListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { } -/*-- 19.07.00 07:49:18--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXNumberingRules::removePropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< XPropertyChangeListener >& /*xListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { } -/*-- 19.07.00 07:49:18--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXNumberingRules::addVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< XVetoableChangeListener >& /*xListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { } -/*-- 19.07.00 07:49:18--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXNumberingRules::removeVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< XVetoableChangeListener >& /*xListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { } -/* -----------------------------17.10.00 14:23-------------------------------- - ---------------------------------------------------------------------------*/ OUString SwXNumberingRules::getName() throw( RuntimeException ) { String aString; @@ -2433,18 +2303,14 @@ OUString SwXNumberingRules::getName() throw( RuntimeException ) else return sCreatedNumRuleName; } -/* -----------------------------17.10.00 14:23-------------------------------- - ---------------------------------------------------------------------------*/ void SwXNumberingRules::setName(const OUString& /*rName*/) throw( RuntimeException ) { RuntimeException aExcept; aExcept.Message = C2U("readonly"); throw aExcept; } -/*-- 14.12.98 14:58:00--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXNumberingRules::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew) { ClientModify(this, pOld, pNew); @@ -2456,25 +2322,19 @@ void SwXNumberingRules::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew) pDoc = 0; } } -/* -----------------------------06.04.00 11:47-------------------------------- - ---------------------------------------------------------------------------*/ OUString SwXChapterNumbering::getImplementationName(void) throw( RuntimeException ) { return C2U("SwXChapterNumbering"); } -/* -----------------------------06.04.00 11:47-------------------------------- - ---------------------------------------------------------------------------*/ BOOL SwXChapterNumbering::supportsService(const OUString& rServiceName) throw( RuntimeException ) { String sServiceName(rServiceName); return sServiceName.EqualsAscii("com.sun.star.text.ChapterNumbering") || sServiceName.EqualsAscii("com.sun.star.text.NumberingRules"); } -/* -----------------------------06.04.00 11:47-------------------------------- - ---------------------------------------------------------------------------*/ Sequence< OUString > SwXChapterNumbering::getSupportedServiceNames(void) throw( RuntimeException ) { Sequence< OUString > aRet(2); @@ -2483,16 +2343,12 @@ Sequence< OUString > SwXChapterNumbering::getSupportedServiceNames(void) throw( pArray[1] = C2U("com.sun.star.text.NumberingRules"); return aRet; } -/* -----------------22.02.99 16:33------------------- - * - * --------------------------------------------------*/ + SwXChapterNumbering::SwXChapterNumbering(SwDocShell& rDocSh) : SwXNumberingRules(rDocSh) { } -/* -----------------22.02.99 16:33------------------- - * - * --------------------------------------------------*/ + SwXChapterNumbering::~SwXChapterNumbering() { } @@ -2500,23 +2356,16 @@ SwXChapterNumbering::~SwXChapterNumbering() /****************************************************************** * SwXTextColumns ******************************************************************/ -/* -----------------------------06.04.00 11:47-------------------------------- - - ---------------------------------------------------------------------------*/ OUString SwXTextColumns::getImplementationName(void) throw( RuntimeException ) { return C2U("SwXTextColumns"); } -/* -----------------------------06.04.00 11:47-------------------------------- - ---------------------------------------------------------------------------*/ BOOL SwXTextColumns::supportsService(const OUString& rServiceName) throw( RuntimeException ) { return C2U("com.sun.star.text.TextColumns") == rServiceName; } -/* -----------------------------06.04.00 11:47-------------------------------- - ---------------------------------------------------------------------------*/ Sequence< OUString > SwXTextColumns::getSupportedServiceNames(void) throw( RuntimeException ) { Sequence< OUString > aRet(1); @@ -2524,9 +2373,7 @@ Sequence< OUString > SwXTextColumns::getSupportedServiceNames(void) throw( Runti pArray[0] = C2U("com.sun.star.text.TextColumns"); return aRet; } -/* -----------------------------24.10.00 16:45-------------------------------- - ---------------------------------------------------------------------------*/ SwXTextColumns::SwXTextColumns(sal_uInt16 nColCount) : nReference(0), bIsAutomaticWidth(sal_True), @@ -2541,9 +2388,7 @@ SwXTextColumns::SwXTextColumns(sal_uInt16 nColCount) : if(nColCount) setColumnCount(nColCount); } -/*-- 16.12.98 14:06:53--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXTextColumns::SwXTextColumns(const SwFmtCol& rFmtCol) : nReference(0), aTextColumns(rFmtCol.GetNumCols()), @@ -2582,32 +2427,24 @@ SwXTextColumns::SwXTextColumns(const SwFmtCol& rFmtCol) : case COLADJ_NONE: nSepLineVertAlign = style::VerticalAlignment_MIDDLE; } } -/*-- 16.12.98 14:06:54--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXTextColumns::~SwXTextColumns() { } -/*-- 16.12.98 14:06:54--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Int32 SwXTextColumns::getReferenceValue(void) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); return nReference; } -/*-- 16.12.98 14:06:55--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Int16 SwXTextColumns::getColumnCount(void) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); return static_cast< sal_Int16>( aTextColumns.getLength() ); } -/*-- 16.12.98 14:06:55--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXTextColumns::setColumnCount(sal_Int16 nColumns) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -2628,17 +2465,13 @@ void SwXTextColumns::setColumnCount(sal_Int16 nColumns) throw( uno::RuntimeExcep } pCols[nColumns - 1].Width += nDiff; } -/*-- 16.12.98 14:06:55--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Sequence< TextColumn > SwXTextColumns::getColumns(void) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); return aTextColumns; } -/*-- 16.12.98 14:06:56--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXTextColumns::setColumns(const uno::Sequence< TextColumn >& rColumns) throw( uno::RuntimeException ) { @@ -2653,17 +2486,13 @@ void SwXTextColumns::setColumns(const uno::Sequence< TextColumn >& rColumns) nReference = !nReferenceTemp ? USHRT_MAX : nReferenceTemp; aTextColumns = rColumns; } -/*-- 25.10.00 10:15:39--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Reference< XPropertySetInfo > SwXTextColumns::getPropertySetInfo( ) throw(RuntimeException) { static uno::Reference< beans::XPropertySetInfo > aRef = m_pPropSet->getPropertySetInfo(); return aRef; } -/*-- 25.10.00 10:15:39--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXTextColumns::setPropertyValue( const OUString& rPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) @@ -2734,9 +2563,7 @@ void SwXTextColumns::setPropertyValue( const OUString& rPropertyName, const Any& break; } } -/*-- 25.10.00 10:15:40--------------------------------------------------- - -----------------------------------------------------------------------*/ Any SwXTextColumns::getPropertyValue( const OUString& rPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { @@ -2771,49 +2598,37 @@ Any SwXTextColumns::getPropertyValue( const OUString& rPropertyName ) } return aRet; } -/*-- 25.10.00 10:15:40--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXTextColumns::addPropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< XPropertyChangeListener >& /*xListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { } -/*-- 25.10.00 10:15:40--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXTextColumns::removePropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< XPropertyChangeListener >& /*xListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { } -/*-- 25.10.00 10:15:40--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXTextColumns::addVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< XVetoableChangeListener >& /*xListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { } -/*-- 25.10.00 10:15:40--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXTextColumns::removeVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< XVetoableChangeListener >& /*xListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { } -/* -----------------------------25.10.00 11:04-------------------------------- - ---------------------------------------------------------------------------*/ const uno::Sequence< sal_Int8 > & SwXTextColumns::getUnoTunnelId() { static uno::Sequence< sal_Int8 > aSeq = ::CreateUnoTunnelId(); return aSeq; } -/* -----------------------------10.03.00 18:04-------------------------------- - ---------------------------------------------------------------------------*/ sal_Int64 SAL_CALL SwXTextColumns::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw(uno::RuntimeException) { @@ -2825,4 +2640,3 @@ sal_Int64 SAL_CALL SwXTextColumns::getSomething( const uno::Sequence< sal_Int8 > } return 0; } - diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index 96c7f8aa4e..c84c6039ae 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -85,7 +85,6 @@ const sal_Char cInvalidObject[] = "this object is invalid"; /****************************************************************** * SwXText ******************************************************************/ - class SwXText::Impl { @@ -131,24 +130,15 @@ public: }; -/* -----------------------------15.03.2002 12:39------------------------------ - - ---------------------------------------------------------------------------*/ SwXText::SwXText(SwDoc *const pDoc, const enum CursorType eType) : m_pImpl( new SwXText::Impl(*this, pDoc, eType) ) { } -/*-- 09.12.98 12:43:55--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXText::~SwXText() { } -/*-- 09.12.98 12:44:07--------------------------------------------------- - - -----------------------------------------------------------------------*/ - const SwDoc * SwXText::GetDoc() const { return m_pImpl->m_pDoc; @@ -208,9 +198,6 @@ SwXText::CreateCursor() throw (uno::RuntimeException) return xRet; } -/*-- 09.12.98 12:43:02--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Any SAL_CALL SwXText::queryInterface(const uno::Type& rType) throw (uno::RuntimeException) { @@ -281,9 +268,7 @@ SwXText::queryInterface(const uno::Type& rType) throw (uno::RuntimeException) } return aRet; } -/* -----------------------------15.03.00 17:42-------------------------------- - ---------------------------------------------------------------------------*/ uno::Sequence< uno::Type > SAL_CALL SwXText::getTypes() throw (uno::RuntimeException) { @@ -413,9 +398,6 @@ throw (uno::RuntimeException) } } -/*-- 09.12.98 12:43:16--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SAL_CALL SwXText::insertControlCharacter( const uno::Reference< text::XTextRange > & xTextRange, @@ -529,9 +511,6 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) } } -/*-- 09.12.98 12:43:17--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SAL_CALL SwXText::insertTextContent( const uno::Reference< text::XTextRange > & xRange, @@ -646,9 +625,6 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) xContent->attach(xTempRange); } -/* -----------------------------10.07.00 15:40-------------------------------- - - ---------------------------------------------------------------------------*/ void SAL_CALL SwXText::insertTextContentBefore( const uno::Reference< text::XTextContent>& xNewContent, @@ -710,9 +686,6 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) pPara->attachToText(*this, *pTxtNode); } -/* -----------------------------10.07.00 15:40-------------------------------- - - ---------------------------------------------------------------------------*/ void SAL_CALL SwXText::insertTextContentAfter( const uno::Reference< text::XTextContent>& xNewContent, @@ -771,9 +744,6 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) pPara->attachToText(*this, *pTxtNode); } -/* -----------------------------10.07.00 15:40-------------------------------- - - ---------------------------------------------------------------------------*/ void SAL_CALL SwXText::removeTextContentBefore( const uno::Reference< text::XTextContent>& xSuccessor) @@ -827,9 +797,6 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) } } -/* -----------------------------10.07.00 15:40-------------------------------- - - ---------------------------------------------------------------------------*/ void SAL_CALL SwXText::removeTextContentAfter( const uno::Reference< text::XTextContent>& xPredecessor) @@ -884,9 +851,6 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) } } -/*-- 09.12.98 12:43:19--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SAL_CALL SwXText::removeTextContent( const uno::Reference< text::XTextContent > & xContent) @@ -902,9 +866,6 @@ throw (container::NoSuchElementException, uno::RuntimeException) xContent->dispose(); } -/*-- 09.12.98 12:43:22--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Reference< text::XText > SAL_CALL SwXText::getText() throw (uno::RuntimeException) { @@ -914,9 +875,6 @@ SwXText::getText() throw (uno::RuntimeException) return xRet; } -/*-- 09.12.98 12:43:24--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Reference< text::XTextRange > SAL_CALL SwXText::getStart() throw (uno::RuntimeException) { @@ -933,9 +891,7 @@ SwXText::getStart() throw (uno::RuntimeException) const uno::Reference< text::XTextRange > xRet(xRef, uno::UNO_QUERY); return xRet; } -/*-- 09.12.98 12:43:27--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Reference< text::XTextRange > SAL_CALL SwXText::getEnd() throw (uno::RuntimeException) { @@ -953,9 +909,6 @@ SwXText::getEnd() throw (uno::RuntimeException) return xRet; } -/*-- 09.12.98 12:43:29--------------------------------------------------- - - -----------------------------------------------------------------------*/ OUString SAL_CALL SwXText::getString() throw (uno::RuntimeException) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -970,9 +923,7 @@ OUString SAL_CALL SwXText::getString() throw (uno::RuntimeException) xRet->gotoEnd(sal_True); return xRet->getString(); } -/*-- 09.12.98 12:43:30--------------------------------------------------- - -----------------------------------------------------------------------*/ void SAL_CALL SwXText::setString(const OUString& rString) throw (uno::RuntimeException) { @@ -1128,9 +1079,6 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) return nCompare; } -/*-- 28.03.00 10:37:22--------------------------------------------------- - - -----------------------------------------------------------------------*/ sal_Int16 SAL_CALL SwXText::compareRegionStarts( const uno::Reference<text::XTextRange>& xRange1, @@ -1148,9 +1096,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) return m_pImpl->ComparePositions(xStart1, xStart2); } -/*-- 28.03.00 10:37:25--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Int16 SAL_CALL SwXText::compareRegionEnds( const uno::Reference<text::XTextRange>& xRange1, @@ -1169,9 +1115,6 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) return m_pImpl->ComparePositions(xEnd1, xEnd2); } -/*-- 15.03.2002 12:30:40--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXText::getPropertySetInfo() throw(uno::RuntimeException) { @@ -1182,9 +1125,6 @@ SwXText::getPropertySetInfo() throw(uno::RuntimeException) return xInfo; } -/*-- 15.03.2002 12:30:42--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SAL_CALL SwXText::setPropertyValue(const ::rtl::OUString& /*aPropertyName*/, const uno::Any& /*aValue*/) @@ -1194,9 +1134,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, { throw lang::IllegalArgumentException(); } -/*-- 15.03.2002 12:30:42--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Any SAL_CALL SwXText::getPropertyValue( const ::rtl::OUString& rPropertyName) @@ -1253,9 +1191,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, return aRet; } -/*-- 15.03.2002 12:30:42--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SAL_CALL SwXText::addPropertyChangeListener( const ::rtl::OUString& /*rPropertyName*/, @@ -1266,9 +1201,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, OSL_ENSURE(false, "SwXText::addPropertyChangeListener(): not implemented"); } -/*-- 15.03.2002 12:30:43--------------------------------------------------- - -----------------------------------------------------------------------*/ void SAL_CALL SwXText::removePropertyChangeListener( const ::rtl::OUString& /*rPropertyName*/, @@ -1279,9 +1212,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, OSL_ENSURE(false, "SwXText::removePropertyChangeListener(): not implemented"); } -/*-- 15.03.2002 12:30:43--------------------------------------------------- - -----------------------------------------------------------------------*/ void SAL_CALL SwXText::addVetoableChangeListener( const ::rtl::OUString& /*rPropertyName*/, @@ -1292,9 +1223,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, OSL_ENSURE(false, "SwXText::addVetoableChangeListener(): not implemented"); } -/*-- 15.03.2002 12:30:43--------------------------------------------------- - -----------------------------------------------------------------------*/ void SAL_CALL SwXText::removeVetoableChangeListener( const ::rtl::OUString& /*rPropertyName*/, @@ -1306,17 +1235,12 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, "SwXText::removeVetoableChangeListener(): not implemented"); } -/* -----------------------------08.01.01 09:07-------------------------------- - - ---------------------------------------------------------------------------*/ const uno::Sequence< sal_Int8 > & SwXText::getUnoTunnelId() { static uno::Sequence< sal_Int8 > aSeq = ::CreateUnoTunnelId(); return aSeq; } -/* -----------------------------08.01.01 09:07-------------------------------- - ---------------------------------------------------------------------------*/ sal_Int64 SAL_CALL SwXText::getSomething(const uno::Sequence< sal_Int8 >& rId) throw (uno::RuntimeException) @@ -1324,9 +1248,6 @@ throw (uno::RuntimeException) return ::sw::UnoTunnelImpl<SwXText>(rId, this); } -/*-- 23.06.2006 08:56:30--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Reference< text::XTextRange > SAL_CALL SwXText::appendParagraph( const uno::Sequence< beans::PropertyValue > & rProperties) @@ -1336,9 +1257,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) return m_pImpl->finishOrAppendParagraph(false, rProperties); } -/*-- 23.06.2006 08:56:22--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Reference< text::XTextRange > SAL_CALL SwXText::finishParagraph( const uno::Sequence< beans::PropertyValue > & rProperties) @@ -1349,9 +1268,6 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) return m_pImpl->finishOrAppendParagraph(true, rProperties); } -/*-- 08.05.2006 13:26:26--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Reference< text::XTextRange > SwXText::Impl::finishOrAppendParagraph( const bool bFinish, @@ -1840,7 +1756,6 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) /*-- 11.05.2006 15:46:26--------------------------------------------------- Move previously imported paragraphs into a new text table. - -----------------------------------------------------------------------*/ struct VerticallyMergedCell { @@ -1856,7 +1771,9 @@ struct VerticallyMergedCell aCells.push_back( rxCell ); } }; + #define COL_POS_FUZZY 2 + static bool lcl_SimilarPosition( const sal_Int32 nPos1, const sal_Int32 nPos2 ) { return abs( nPos1 - nPos2 ) < COL_POS_FUZZY; @@ -2115,7 +2032,6 @@ lcl_DebugCellProperties( //--< #endif - static void lcl_ApplyCellProperties( const sal_Int32 nCell, @@ -2401,28 +2317,21 @@ SwXBodyText::SwXBodyText(SwDoc *const pDoc) { } -/*-- 10.12.98 11:17:27--------------------------------------------------- - - -----------------------------------------------------------------------*/ SwXBodyText::~SwXBodyText() { - } -/* -----------------------------06.04.00 16:33-------------------------------- - ---------------------------------------------------------------------------*/ OUString SAL_CALL SwXBodyText::getImplementationName() throw (uno::RuntimeException) { return C2U("SwXBodyText"); } -/* -----------------------------06.04.00 16:33-------------------------------- - ---------------------------------------------------------------------------*/ static char const*const g_ServicesBodyText[] = { "com.sun.star.text.Text", }; + static const size_t g_nServicesBodyText( SAL_N_ELEMENTS(g_ServicesBodyText)); @@ -2440,9 +2349,6 @@ SwXBodyText::getSupportedServiceNames() throw (uno::RuntimeException) g_nServicesBodyText, g_ServicesBodyText); } -/*-- 10.12.98 11:17:27--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Any SAL_CALL SwXBodyText::queryAggregation(const uno::Type& rType) throw (uno::RuntimeException) @@ -2471,9 +2377,6 @@ throw (uno::RuntimeException) return aRet; } -/*-- 10.12.98 11:17:28--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Sequence< uno::Type > SAL_CALL SwXBodyText::getTypes() throw (uno::RuntimeException) { @@ -2481,9 +2384,7 @@ SwXBodyText::getTypes() throw (uno::RuntimeException) const uno::Sequence< uno::Type > aTextTypes = SwXText::getTypes(); return ::comphelper::concatSequences(aTypes, aTextTypes); } -/* -----------------------------21.03.00 15:39-------------------------------- - ---------------------------------------------------------------------------*/ uno::Sequence< sal_Int8 > SAL_CALL SwXBodyText::getImplementationId() throw (uno::RuntimeException) { @@ -2497,9 +2398,7 @@ SwXBodyText::getImplementationId() throw (uno::RuntimeException) } return aId; } -/*-- 10.12.98 11:17:28--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Any SAL_CALL SwXBodyText::queryInterface(const uno::Type& rType) throw (uno::RuntimeException) @@ -2509,9 +2408,7 @@ throw (uno::RuntimeException) ? SwXBodyText_Base::queryInterface(rType) : ret; } -/* -----------------------------05.01.00 11:07-------------------------------- - ---------------------------------------------------------------------------*/ SwXTextCursor * SwXBodyText::CreateTextCursor(const bool bIgnoreTables) { if(!IsValid()) @@ -2540,9 +2437,6 @@ SwXTextCursor * SwXBodyText::CreateTextCursor(const bool bIgnoreTables) return new SwXTextCursor(*GetDoc(), this, CURSOR_BODY, *aPam.GetPoint()); } -/*-- 10.12.98 11:17:29--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Reference< text::XTextCursor > SAL_CALL SwXBodyText::createTextCursor() throw (uno::RuntimeException) { @@ -2558,9 +2452,7 @@ SwXBodyText::createTextCursor() throw (uno::RuntimeException) } return xRef; } -/*-- 10.12.98 11:17:29--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Reference< text::XTextCursor > SAL_CALL SwXBodyText::createTextCursorByRange( const uno::Reference< text::XTextRange > & xTextPosition) @@ -2603,9 +2495,6 @@ throw (uno::RuntimeException) return aRef; } -/*-- 10.12.98 11:17:30--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Reference< container::XEnumeration > SAL_CALL SwXBodyText::createEnumeration() throw (uno::RuntimeException) @@ -2629,17 +2518,12 @@ throw (uno::RuntimeException) return xRet; } -/* -----------------18.12.98 13:36------------------- - * - * --------------------------------------------------*/ uno::Type SAL_CALL SwXBodyText::getElementType() throw (uno::RuntimeException) { return text::XTextRange::static_type(); } -/* -----------------18.12.98 13:36------------------- - * - * --------------------------------------------------*/ + sal_Bool SAL_CALL SwXBodyText::hasElements() throw (uno::RuntimeException) { @@ -2658,7 +2542,6 @@ SwXBodyText::hasElements() throw (uno::RuntimeException) /****************************************************************** * SwXHeadFootText ******************************************************************/ - class SwXHeadFootText::Impl : public SwClient { @@ -2693,9 +2576,6 @@ public: }; -/*-- 11.12.98 10:14:51--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SwXHeadFootText::Impl::Modify(SfxPoolItem *pOld, SfxPoolItem *pNew) { ClientModify(this, pOld, pNew); @@ -2724,9 +2604,6 @@ SwXHeadFootText::CreateXHeadFootText( return xText; } -/*-- 11.12.98 10:14:48--------------------------------------------------- - - -----------------------------------------------------------------------*/ SwXHeadFootText::SwXHeadFootText(SwFrmFmt & rHeadFootFmt, const bool bIsHeader) : SwXText(rHeadFootFmt.GetDoc(), (bIsHeader) ? CURSOR_HEADER : CURSOR_FOOTER) @@ -2734,29 +2611,21 @@ SwXHeadFootText::SwXHeadFootText(SwFrmFmt & rHeadFootFmt, const bool bIsHeader) { } -/*-- 11.12.98 10:14:48--------------------------------------------------- - - -----------------------------------------------------------------------*/ SwXHeadFootText::~SwXHeadFootText() { } -/* -----------------------------06.04.00 16:40-------------------------------- - - ---------------------------------------------------------------------------*/ OUString SAL_CALL SwXHeadFootText::getImplementationName() throw (uno::RuntimeException) { return C2U("SwXHeadFootText"); } -/* -----------------------------06.04.00 16:40-------------------------------- - - ---------------------------------------------------------------------------*/ static char const*const g_ServicesHeadFootText[] = { "com.sun.star.text.Text", }; + static const size_t g_nServicesHeadFootText(SAL_N_ELEMENTS(g_ServicesHeadFootText)); sal_Bool SAL_CALL SwXHeadFootText::supportsService(const OUString& rServiceName) @@ -2773,9 +2642,6 @@ SwXHeadFootText::getSupportedServiceNames() throw (uno::RuntimeException) g_nServicesHeadFootText, g_ServicesHeadFootText); } -/*-- 11.12.98 10:14:49--------------------------------------------------- - - -----------------------------------------------------------------------*/ const SwStartNode *SwXHeadFootText::GetStartNode() const { const SwStartNode *pSttNd = 0; @@ -2796,9 +2662,7 @@ SwXHeadFootText::CreateCursor() throw (uno::RuntimeException) { return createTextCursor(); } -/* -----------------------------21.03.00 15:39-------------------------------- - ---------------------------------------------------------------------------*/ uno::Sequence< uno::Type > SAL_CALL SwXHeadFootText::getTypes() throw (uno::RuntimeException) { @@ -2807,9 +2671,6 @@ SwXHeadFootText::getTypes() throw (uno::RuntimeException) return ::comphelper::concatSequences(aTypes, aTextTypes); } -/* -----------------------------21.03.00 15:39-------------------------------- - - ---------------------------------------------------------------------------*/ uno::Sequence< sal_Int8 > SAL_CALL SwXHeadFootText::getImplementationId() throw (uno::RuntimeException) { @@ -2823,9 +2684,7 @@ SwXHeadFootText::getImplementationId() throw (uno::RuntimeException) } return aId; } -/* -----------------------------21.03.00 15:46-------------------------------- - ---------------------------------------------------------------------------*/ uno::Any SAL_CALL SwXHeadFootText::queryInterface(const uno::Type& rType) throw (uno::RuntimeException) @@ -2836,9 +2695,6 @@ throw (uno::RuntimeException) : ret; } -/*-- 11.12.98 10:14:50--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Reference< text::XTextCursor > SAL_CALL SwXHeadFootText::createTextCursor() throw (uno::RuntimeException) { @@ -2885,9 +2741,6 @@ SwXHeadFootText::createTextCursor() throw (uno::RuntimeException) return xRet; } -/*-- 11.12.98 10:14:50--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Reference< text::XTextCursor > SAL_CALL SwXHeadFootText::createTextCursorByRange( const uno::Reference< text::XTextRange > & xTextPosition) @@ -2924,9 +2777,6 @@ throw (uno::RuntimeException) return xRet; } -/* -----------------19.03.99 15:44------------------- - * - * --------------------------------------------------*/ uno::Reference< container::XEnumeration > SAL_CALL SwXHeadFootText::createEnumeration() throw (uno::RuntimeException) @@ -2948,19 +2798,13 @@ throw (uno::RuntimeException) return aRef; } -/* -----------------19.03.99 15:50------------------- - * - * --------------------------------------------------*/ uno::Type SAL_CALL SwXHeadFootText::getElementType() throw (uno::RuntimeException) { return text::XTextRange::static_type(); } -/* -----------------19.03.99 15:50------------------- - * - * --------------------------------------------------*/ + sal_Bool SAL_CALL SwXHeadFootText::hasElements() throw (uno::RuntimeException) { return sal_True; } - |