From 0b2e0baf12ca2dfba2052f0cde4c0c2adfe79531 Mon Sep 17 00:00:00 2001 From: Prashant Shah Date: Wed, 13 Oct 2010 16:05:00 +0530 Subject: Cleanup: remove bogus comments from unocore directory This patch removes bogus comments found in the unocore directory including empty Beschreibung (translation: description) statements Signed-off-by: Prashant Shah --- sw/source/core/unocore/TextCursorHelper.cxx | 6 - sw/source/core/unocore/unochart.cxx | 108 +--------- sw/source/core/unocore/unocrsrhelper.cxx | 36 +--- sw/source/core/unocore/unodraw.cxx | 184 ++--------------- sw/source/core/unocore/unoframe.cxx | 304 ++-------------------------- sw/source/core/unocore/unoftn.cxx | 83 +------- sw/source/core/unocore/unoparagraph.cxx | 135 +----------- sw/source/core/unocore/unoredlines.cxx | 39 ---- sw/source/core/unocore/unosrch.cxx | 79 -------- 9 files changed, 50 insertions(+), 924 deletions(-) (limited to 'sw/source') diff --git a/sw/source/core/unocore/TextCursorHelper.cxx b/sw/source/core/unocore/TextCursorHelper.cxx index 5616d51d1d9f..aad4f405fc90 100644 --- a/sw/source/core/unocore/TextCursorHelper.cxx +++ b/sw/source/core/unocore/TextCursorHelper.cxx @@ -33,17 +33,13 @@ using namespace ::com::sun::star; -/* -----------------------------03.03.03 11:07-------------------------------- - ---------------------------------------------------------------------------*/ const uno::Sequence< sal_Int8 > & OTextCursorHelper::getUnoTunnelId() { static uno::Sequence< sal_Int8 > aSeq = ::CreateUnoTunnelId(); return aSeq; } -/* -----------------------------03.03.03 11:07-------------------------------- - ---------------------------------------------------------------------------*/ //XUnoTunnel sal_Int64 SAL_CALL OTextCursorHelper::getSomething( const uno::Sequence< sal_Int8 >& rId ) @@ -57,5 +53,3 @@ sal_Int64 SAL_CALL OTextCursorHelper::getSomething( } return 0; } -// ----------------------------------------------------------------------------- - diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index 8ff48cefd067..394ca947c5fe 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -84,8 +84,6 @@ extern int lcl_CompareCellRanges( sal_Bool bCmpColsFirst ); extern void lcl_NormalizeRange( String &rCell1, String &rCell2 ); -////////////////////////////////////////////////////////////////////// - //static void SwChartHelper::DoUpdateAllCharts( SwDoc* pDoc ) { @@ -123,8 +121,6 @@ void SwChartHelper::DoUpdateAllCharts( SwDoc* pDoc ) } } -////////////////////////////////////////////////////////////////////// - SwChartLockController_Helper::SwChartLockController_Helper( SwDoc *pDocument ) : pDoc( pDocument ) { @@ -132,14 +128,12 @@ SwChartLockController_Helper::SwChartLockController_Helper( SwDoc *pDocument ) : aUnlockTimer.SetTimeoutHdl( LINK( this, SwChartLockController_Helper, DoUnlockAllCharts )); } - SwChartLockController_Helper::~SwChartLockController_Helper() { if (pDoc) // still connected? Disconnect(); } - void SwChartLockController_Helper::StartOrContinueLocking() { if (!bIsLocked) @@ -147,7 +141,6 @@ void SwChartLockController_Helper::StartOrContinueLocking() aUnlockTimer.Start(); // start or continue time of locking } - void SwChartLockController_Helper::Disconnect() { aUnlockTimer.Stop(); @@ -155,7 +148,6 @@ void SwChartLockController_Helper::Disconnect() pDoc = 0; } - void SwChartLockController_Helper::LockUnlockAllCharts( sal_Bool bLock ) { if (!pDoc) @@ -205,23 +197,18 @@ void SwChartLockController_Helper::LockUnlockAllCharts( sal_Bool bLock ) bIsLocked = bLock; } - IMPL_LINK( SwChartLockController_Helper, DoUnlockAllCharts, Timer *, /*pTimer*/ ) { UnlockAllCharts(); return 0; } - -////////////////////////////////////////////////////////////////////// - static osl::Mutex & GetChartMutex() { static osl::Mutex aMutex; return aMutex; } - static void LaunchModifiedEvent( ::cppu::OInterfaceContainerHelper &rICH, const uno::Reference< uno::XInterface > &rxI ) @@ -236,8 +223,6 @@ static void LaunchModifiedEvent( } } -////////////////////////////////////////////////////////////////////// - // rCellRangeName needs to be of one of the following formats: // - e.g. "A2:E5" or // - e.g. "Table1.A2:E5" @@ -266,7 +251,6 @@ sal_Bool FillRangeDescriptor( return sal_True; } - static String GetCellRangeName( SwFrmFmt &rTblFmt, SwUnoCrsr &rTblCrsr ) { String aRes; @@ -315,7 +299,6 @@ static String GetCellRangeName( SwFrmFmt &rTblFmt, SwUnoCrsr &rTblCrsr ) return aRes; } - static String GetRangeRepFromTableAndCells( const String &rTableName, const String &rStartCell, const String &rEndCell, sal_Bool bForceEndCellName ) @@ -340,7 +323,6 @@ static String GetRangeRepFromTableAndCells( const String &rTableName, return aRes; } - static sal_Bool GetTableAndCellsFromRangeRep( const OUString &rRangeRepresentation, String &rTblName, @@ -391,7 +373,6 @@ static sal_Bool GetTableAndCellsFromRangeRep( return bSuccess; } - static void GetTableByName( const SwDoc &rDoc, const String &rTableName, SwFrmFmt **ppTblFmt, SwTable **ppTable) { @@ -414,7 +395,6 @@ static void GetTableByName( const SwDoc &rDoc, const String &rTableName, *ppTable = pTblFmt ? SwTable::FindTable( pTblFmt ) : 0; } - static void GetFormatAndCreateCursorFromRangeRep( const SwDoc *pDoc, const OUString &rRangeRepresentation, // must be a single range (i.e. so called sub-range) @@ -495,7 +475,6 @@ static void GetFormatAndCreateCursorFromRangeRep( } } - static sal_Bool GetSubranges( const OUString &rRangeRepresentation, uno::Sequence< OUString > &rSubRanges, sal_Bool bNormalize ) { @@ -543,7 +522,6 @@ static sal_Bool GetSubranges( const OUString &rRangeRepresentation, return bRes; } - static void SortSubranges( uno::Sequence< OUString > &rSubRanges, sal_Bool bCmpByColumn ) { sal_Int32 nLen = rSubRanges.getLength(); @@ -590,8 +568,6 @@ static void SortSubranges( uno::Sequence< OUString > &rSubRanges, sal_Bool bCmpB } } -////////////////////////////////////////////////////////////////////// - SwChartDataProvider::SwChartDataProvider( const SwDoc* pSwDoc ) : aEvtListeners( GetChartMutex() ), pDoc( pSwDoc ) @@ -599,7 +575,6 @@ SwChartDataProvider::SwChartDataProvider( const SwDoc* pSwDoc ) : bDisposed = sal_False; } - SwChartDataProvider::~SwChartDataProvider() { } @@ -1508,7 +1483,6 @@ uno::Reference< chart2::data::XDataSequence > SAL_CALL SwChartDataProvider::crea return Impl_createDataSequenceByRangeRepresentation( rRangeRepresentation ); } - uno::Reference< sheet::XRangeSelection > SAL_CALL SwChartDataProvider::getRangeSelection( ) throw (uno::RuntimeException) { @@ -1516,7 +1490,6 @@ uno::Reference< sheet::XRangeSelection > SAL_CALL SwChartDataProvider::getRangeS return uno::Reference< sheet::XRangeSelection >(); } - void SAL_CALL SwChartDataProvider::dispose( ) throw (uno::RuntimeException) { @@ -1545,7 +1518,6 @@ void SAL_CALL SwChartDataProvider::dispose( ) } } - void SAL_CALL SwChartDataProvider::addEventListener( const uno::Reference< lang::XEventListener >& rxListener ) throw (uno::RuntimeException) @@ -1555,7 +1527,6 @@ void SAL_CALL SwChartDataProvider::addEventListener( aEvtListeners.addInterface( rxListener ); } - void SAL_CALL SwChartDataProvider::removeEventListener( const uno::Reference< lang::XEventListener >& rxListener ) throw (uno::RuntimeException) @@ -1565,15 +1536,12 @@ void SAL_CALL SwChartDataProvider::removeEventListener( aEvtListeners.removeInterface( rxListener ); } - - OUString SAL_CALL SwChartDataProvider::getImplementationName( ) throw (uno::RuntimeException) { return C2U("SwChartDataProvider"); } - sal_Bool SAL_CALL SwChartDataProvider::supportsService( const OUString& rServiceName ) throw (uno::RuntimeException) @@ -1582,7 +1550,6 @@ sal_Bool SAL_CALL SwChartDataProvider::supportsService( return rServiceName.equalsAscii( SN_DATA_PROVIDER ); } - uno::Sequence< OUString > SAL_CALL SwChartDataProvider::getSupportedServiceNames( ) throw (uno::RuntimeException) { @@ -1592,26 +1559,22 @@ uno::Sequence< OUString > SAL_CALL SwChartDataProvider::getSupportedServiceNames return aRes; } - void SwChartDataProvider::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew) { // actually this function should be superfluous (need to check later) ClientModify(this, pOld, pNew ); } - void SwChartDataProvider::AddDataSequence( const SwTable &rTable, uno::Reference< chart2::data::XDataSequence > &rxDataSequence ) { aDataSequences[ &rTable ].insert( rxDataSequence ); } - void SwChartDataProvider::RemoveDataSequence( const SwTable &rTable, uno::Reference< chart2::data::XDataSequence > &rxDataSequence ) { aDataSequences[ &rTable ].erase( rxDataSequence ); } - void SwChartDataProvider::InvalidateTable( const SwTable *pTable ) { DBG_ASSERT( pTable, "table pointer is NULL" ); @@ -1637,7 +1600,6 @@ void SwChartDataProvider::InvalidateTable( const SwTable *pTable ) } } - sal_Bool SwChartDataProvider::DeleteBox( const SwTable *pTable, const SwTableBox &rBox ) { sal_Bool bRes = sal_False; @@ -1689,7 +1651,6 @@ sal_Bool SwChartDataProvider::DeleteBox( const SwTable *pTable, const SwTableBox return bRes; } - void SwChartDataProvider::DisposeAllDataSequences( const SwTable *pTable ) { DBG_ASSERT( pTable, "table pointer is NULL" ); @@ -1720,7 +1681,6 @@ void SwChartDataProvider::DisposeAllDataSequences( const SwTable *pTable ) } } - //////////////////////////////////////// // SwChartDataProvider::AddRowCols tries to notify charts of added columns // or rows and extends the value sequence respectively (if possible). @@ -1832,9 +1792,7 @@ void SwChartDataProvider::AddRowCols( } } - // XRangeXMLConversion --------------------------------------------------- - rtl::OUString SAL_CALL SwChartDataProvider::convertRangeToXML( const rtl::OUString& rRangeRepresentation ) throw ( uno::RuntimeException, lang::IllegalArgumentException ) { @@ -1956,22 +1914,17 @@ rtl::OUString SAL_CALL SwChartDataProvider::convertRangeFromXML( const rtl::OUSt return aRes; } - -////////////////////////////////////////////////////////////////////// - SwChartDataSource::SwChartDataSource( const uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > > &rLDS ) : aLDS( rLDS ) { } - SwChartDataSource::~SwChartDataSource() { // delete pTblCrsr; } - uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > > SAL_CALL SwChartDataSource::getDataSequences( ) throw (uno::RuntimeException) { @@ -1979,7 +1932,6 @@ uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > > SAL_CALL S return aLDS; } - OUString SAL_CALL SwChartDataSource::getImplementationName( ) throw (uno::RuntimeException) { @@ -1987,7 +1939,6 @@ OUString SAL_CALL SwChartDataSource::getImplementationName( ) return C2U("SwChartDataSource"); } - sal_Bool SAL_CALL SwChartDataSource::supportsService( const OUString& rServiceName ) throw (uno::RuntimeException) @@ -1996,7 +1947,6 @@ sal_Bool SAL_CALL SwChartDataSource::supportsService( return rServiceName.equalsAscii( SN_DATA_SOURCE ); } - uno::Sequence< OUString > SAL_CALL SwChartDataSource::getSupportedServiceNames( ) throw (uno::RuntimeException) { @@ -2006,8 +1956,6 @@ uno::Sequence< OUString > SAL_CALL SwChartDataSource::getSupportedServiceNames( return aRes; } -////////////////////////////////////////////////////////////////////// - SwChartDataSequence::SwChartDataSequence( SwChartDataProvider &rProvider, SwFrmFmt &rTblFmt, @@ -2059,7 +2007,6 @@ SwChartDataSequence::SwChartDataSequence( #endif } - SwChartDataSequence::SwChartDataSequence( const SwChartDataSequence &rObj ) : SwChartDataSequenceBaseClass(), SwClient( rObj.GetFrmFmt() ), @@ -2110,7 +2057,6 @@ SwChartDataSequence::SwChartDataSequence( const SwChartDataSequence &rObj ) : #endif } - SwChartDataSequence::~SwChartDataSequence() { // since the data-provider holds only weak references to the data-sequence @@ -2119,14 +2065,12 @@ SwChartDataSequence::~SwChartDataSequence() delete pTblCrsr; } - const uno::Sequence< sal_Int8 > & SwChartDataSequence::getUnoTunnelId() { static uno::Sequence< sal_Int8 > aSeq = ::CreateUnoTunnelId(); return aSeq; } - sal_Int64 SAL_CALL SwChartDataSequence::getSomething( const uno::Sequence< sal_Int8 > &rId ) throw(uno::RuntimeException) { @@ -2139,7 +2083,6 @@ sal_Int64 SAL_CALL SwChartDataSequence::getSomething( const uno::Sequence< sal_I return 0; } - uno::Sequence< uno::Any > SAL_CALL SwChartDataSequence::getData( ) throw (uno::RuntimeException) { @@ -2169,7 +2112,6 @@ uno::Sequence< uno::Any > SAL_CALL SwChartDataSequence::getData( ) return aRes; } - OUString SAL_CALL SwChartDataSequence::getSourceRangeRepresentation( ) throw (uno::RuntimeException) { @@ -2305,8 +2247,6 @@ uno::Sequence< OUString > SAL_CALL SwChartDataSequence::generateLabel( return 0; } - - uno::Sequence< OUString > SAL_CALL SwChartDataSequence::getTextualData( ) throw (uno::RuntimeException) { @@ -2336,7 +2276,6 @@ uno::Sequence< OUString > SAL_CALL SwChartDataSequence::getTextualData( ) return aRes; } - uno::Sequence< double > SAL_CALL SwChartDataSequence::getNumericalData( ) throw (uno::RuntimeException) { @@ -2369,7 +2308,6 @@ uno::Sequence< double > SAL_CALL SwChartDataSequence::getNumericalData( ) return aRes; } - uno::Reference< util::XCloneable > SAL_CALL SwChartDataSequence::createClone( ) throw (uno::RuntimeException) { @@ -2379,7 +2317,6 @@ uno::Reference< util::XCloneable > SAL_CALL SwChartDataSequence::createClone( ) return new SwChartDataSequence( *this ); } - uno::Reference< beans::XPropertySetInfo > SAL_CALL SwChartDataSequence::getPropertySetInfo( ) throw (uno::RuntimeException) { @@ -2391,7 +2328,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL SwChartDataSequence::getPrope return xRes; } - void SAL_CALL SwChartDataSequence::setPropertyValue( const OUString& rPropertyName, const uno::Any& rValue ) @@ -2410,7 +2346,6 @@ void SAL_CALL SwChartDataSequence::setPropertyValue( throw beans::UnknownPropertyException(); } - uno::Any SAL_CALL SwChartDataSequence::getPropertyValue( const OUString& rPropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -2428,7 +2363,6 @@ uno::Any SAL_CALL SwChartDataSequence::getPropertyValue( return aRes; } - void SAL_CALL SwChartDataSequence::addPropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ ) @@ -2438,7 +2372,6 @@ void SAL_CALL SwChartDataSequence::addPropertyChangeListener( DBG_ERROR( "not implemented" ); } - void SAL_CALL SwChartDataSequence::removePropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ ) @@ -2448,7 +2381,6 @@ void SAL_CALL SwChartDataSequence::removePropertyChangeListener( DBG_ERROR( "not implemented" ); } - void SAL_CALL SwChartDataSequence::addVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/ ) @@ -2458,7 +2390,6 @@ void SAL_CALL SwChartDataSequence::addVetoableChangeListener( DBG_ERROR( "not implemented" ); } - void SAL_CALL SwChartDataSequence::removeVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/ ) @@ -2468,14 +2399,12 @@ void SAL_CALL SwChartDataSequence::removeVetoableChangeListener( DBG_ERROR( "not implemented" ); } - OUString SAL_CALL SwChartDataSequence::getImplementationName( ) throw (uno::RuntimeException) { return C2U("SwChartDataSequence"); } - sal_Bool SAL_CALL SwChartDataSequence::supportsService( const OUString& rServiceName ) throw (uno::RuntimeException) @@ -2483,7 +2412,6 @@ sal_Bool SAL_CALL SwChartDataSequence::supportsService( return rServiceName.equalsAscii( SN_DATA_SEQUENCE ); } - uno::Sequence< OUString > SAL_CALL SwChartDataSequence::getSupportedServiceNames( ) throw (uno::RuntimeException) { @@ -2493,7 +2421,6 @@ uno::Sequence< OUString > SAL_CALL SwChartDataSequence::getSupportedServiceNames return aRes; } - void SwChartDataSequence::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew) { ClientModify(this, pOld, pNew ); @@ -2510,7 +2437,6 @@ void SwChartDataSequence::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew) } } - sal_Bool SAL_CALL SwChartDataSequence::isModified( ) throw (uno::RuntimeException) { @@ -2521,7 +2447,6 @@ sal_Bool SAL_CALL SwChartDataSequence::isModified( ) return sal_True; } - void SAL_CALL SwChartDataSequence::setModified( ::sal_Bool bModified ) throw (beans::PropertyVetoException, uno::RuntimeException) @@ -2534,7 +2459,6 @@ void SAL_CALL SwChartDataSequence::setModified( LaunchModifiedEvent( aModifyListeners, dynamic_cast< XModifyBroadcaster * >(this) ); } - void SAL_CALL SwChartDataSequence::addModifyListener( const uno::Reference< util::XModifyListener >& rxListener ) throw (uno::RuntimeException) @@ -2544,7 +2468,6 @@ void SAL_CALL SwChartDataSequence::addModifyListener( aModifyListeners.addInterface( rxListener ); } - void SAL_CALL SwChartDataSequence::removeModifyListener( const uno::Reference< util::XModifyListener >& rxListener ) throw (uno::RuntimeException) @@ -2554,7 +2477,6 @@ void SAL_CALL SwChartDataSequence::removeModifyListener( aModifyListeners.removeInterface( rxListener ); } - void SAL_CALL SwChartDataSequence::disposing( const lang::EventObject& rSource ) throw (uno::RuntimeException) { @@ -2567,7 +2489,6 @@ void SAL_CALL SwChartDataSequence::disposing( const lang::EventObject& rSource ) } } - void SAL_CALL SwChartDataSequence::dispose( ) throw (uno::RuntimeException) { @@ -2601,7 +2522,6 @@ void SAL_CALL SwChartDataSequence::dispose( ) } } - void SAL_CALL SwChartDataSequence::addEventListener( const uno::Reference< lang::XEventListener >& rxListener ) throw (uno::RuntimeException) @@ -2611,7 +2531,6 @@ void SAL_CALL SwChartDataSequence::addEventListener( aEvtListeners.addInterface( rxListener ); } - void SAL_CALL SwChartDataSequence::removeEventListener( const uno::Reference< lang::XEventListener >& rxListener ) throw (uno::RuntimeException) @@ -2621,7 +2540,6 @@ void SAL_CALL SwChartDataSequence::removeEventListener( aEvtListeners.removeInterface( rxListener ); } - sal_Bool SwChartDataSequence::DeleteBox( const SwTableBox &rBox ) { #if OSL_DEBUG_LEVEL > 1 @@ -2695,8 +2613,8 @@ sal_Bool SwChartDataSequence::DeleteBox( const SwTableBox &rBox ) if (pNewBox) // set new position (cell range) to use { - // So erhält man den ersten Inhaltsnode in einer gegebenen Zelle: - // Zunächst einen SwNodeIndex auf den Node hinter dem SwStartNode der Box... + // So erh lt man den ersten Inhaltsnode in einer gegebenen Zelle: + // Zun chst einen SwNodeIndex auf den Node hinter dem SwStartNode der Box... SwNodeIndex aIdx( *pNewBox->GetSttNd(), +1 ); // Dies kann ein SwCntntNode sein, kann aber auch ein Tabellen oder Sectionnode sein, // deshalb das GoNext; @@ -2730,7 +2648,6 @@ sal_Bool SwChartDataSequence::DeleteBox( const SwTableBox &rBox ) return bNowEmpty; } - void SwChartDataSequence::FillRangeDesc( SwRangeDescriptor &rRangeDesc ) const { SwFrmFmt* pTblFmt = GetFrmFmt(); @@ -2851,8 +2768,6 @@ bool SwChartDataSequence::ExtendTo( bool bExtendCol, return bChanged; } -////////////////////////////////////////////////////////////////////// - SwChartLabeledDataSequence::SwChartLabeledDataSequence() : aEvtListeners( GetChartMutex() ), aModifyListeners( GetChartMutex() ) @@ -2860,12 +2775,10 @@ SwChartLabeledDataSequence::SwChartLabeledDataSequence() : bDisposed = sal_False; } - SwChartLabeledDataSequence::~SwChartLabeledDataSequence() { } - uno::Reference< chart2::data::XDataSequence > SAL_CALL SwChartLabeledDataSequence::getValues( ) throw (uno::RuntimeException) { @@ -2875,7 +2788,6 @@ uno::Reference< chart2::data::XDataSequence > SAL_CALL SwChartLabeledDataSequenc return xData; } - void SwChartLabeledDataSequence::SetDataSequence( uno::Reference< chart2::data::XDataSequence >& rxDest, const uno::Reference< chart2::data::XDataSequence >& rxSource) @@ -2902,7 +2814,6 @@ void SwChartLabeledDataSequence::SetDataSequence( xMB->addModifyListener( xML ); } - void SAL_CALL SwChartLabeledDataSequence::setValues( const uno::Reference< chart2::data::XDataSequence >& rxSequence ) throw (uno::RuntimeException) @@ -2919,7 +2830,6 @@ void SAL_CALL SwChartLabeledDataSequence::setValues( } } - uno::Reference< chart2::data::XDataSequence > SAL_CALL SwChartLabeledDataSequence::getLabel( ) throw (uno::RuntimeException) { @@ -2929,7 +2839,6 @@ uno::Reference< chart2::data::XDataSequence > SAL_CALL SwChartLabeledDataSequenc return xLabels; } - void SAL_CALL SwChartLabeledDataSequence::setLabel( const uno::Reference< chart2::data::XDataSequence >& rxSequence ) throw (uno::RuntimeException) @@ -2946,7 +2855,6 @@ void SAL_CALL SwChartLabeledDataSequence::setLabel( } } - uno::Reference< util::XCloneable > SAL_CALL SwChartLabeledDataSequence::createClone( ) throw (uno::RuntimeException) { @@ -2974,14 +2882,12 @@ uno::Reference< util::XCloneable > SAL_CALL SwChartLabeledDataSequence::createCl return xRes; } - OUString SAL_CALL SwChartLabeledDataSequence::getImplementationName( ) throw (uno::RuntimeException) { return C2U("SwChartLabeledDataSequence"); } - sal_Bool SAL_CALL SwChartLabeledDataSequence::supportsService( const OUString& rServiceName ) throw (uno::RuntimeException) @@ -2989,7 +2895,6 @@ sal_Bool SAL_CALL SwChartLabeledDataSequence::supportsService( return rServiceName.equalsAscii( SN_LABELED_DATA_SEQUENCE ); } - uno::Sequence< OUString > SAL_CALL SwChartLabeledDataSequence::getSupportedServiceNames( ) throw (uno::RuntimeException) { @@ -2999,7 +2904,6 @@ uno::Sequence< OUString > SAL_CALL SwChartLabeledDataSequence::getSupportedServi return aRes; } - void SAL_CALL SwChartLabeledDataSequence::disposing( const lang::EventObject& rSource ) throw (uno::RuntimeException) @@ -3014,7 +2918,6 @@ void SAL_CALL SwChartLabeledDataSequence::disposing( dispose(); } - void SAL_CALL SwChartLabeledDataSequence::modified( const lang::EventObject& rEvent ) throw (uno::RuntimeException) @@ -3025,7 +2928,6 @@ void SAL_CALL SwChartLabeledDataSequence::modified( } } - void SAL_CALL SwChartLabeledDataSequence::addModifyListener( const uno::Reference< util::XModifyListener >& rxListener ) throw (uno::RuntimeException) @@ -3035,7 +2937,6 @@ void SAL_CALL SwChartLabeledDataSequence::addModifyListener( aModifyListeners.addInterface( rxListener ); } - void SAL_CALL SwChartLabeledDataSequence::removeModifyListener( const uno::Reference< util::XModifyListener >& rxListener ) throw (uno::RuntimeException) @@ -3045,7 +2946,6 @@ void SAL_CALL SwChartLabeledDataSequence::removeModifyListener( aModifyListeners.removeInterface( rxListener ); } - void SAL_CALL SwChartLabeledDataSequence::dispose( ) throw (uno::RuntimeException) { @@ -3067,7 +2967,6 @@ void SAL_CALL SwChartLabeledDataSequence::dispose( ) } } - void SAL_CALL SwChartLabeledDataSequence::addEventListener( const uno::Reference< lang::XEventListener >& rxListener ) throw (uno::RuntimeException) @@ -3077,7 +2976,6 @@ void SAL_CALL SwChartLabeledDataSequence::addEventListener( aEvtListeners.addInterface( rxListener ); } - void SAL_CALL SwChartLabeledDataSequence::removeEventListener( const uno::Reference< lang::XEventListener >& rxListener ) throw (uno::RuntimeException) @@ -3086,5 +2984,3 @@ void SAL_CALL SwChartLabeledDataSequence::removeEventListener( if (!bDisposed && rxListener.is()) aEvtListeners.removeInterface( rxListener ); } - -////////////////////////////////////////////////////////////////////// diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx index 92a33da130fe..acaa2e739eab 100644 --- a/sw/source/core/unocore/unocrsrhelper.cxx +++ b/sw/source/core/unocore/unocrsrhelper.cxx @@ -100,7 +100,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; using ::rtl::OUString; - namespace SwUnoCursorHelper { @@ -134,7 +133,6 @@ GetNestedTextContent(SwTxtNode & rTextNode, xub_StrLen const nIndex, return xRet; } - /* -----------------16.09.98 12:27------------------- * Lesen spezieller Properties am Cursor * --------------------------------------------------*/ @@ -597,9 +595,7 @@ sal_Bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry eState = eNewState; return bDone; }; -/* -----------------30.06.98 10:30------------------- - * - * --------------------------------------------------*/ + sal_Int16 IsNodeNumStart(SwPaM& rPam, PropertyState& eState) { const SwTxtNode* pTxtNd = rPam.GetNode()->GetTxtNode(); @@ -618,9 +614,6 @@ sal_Int16 IsNodeNumStart(SwPaM& rPam, PropertyState& eState) return -1; } -/* -----------------25.05.98 11:41------------------- - * - * --------------------------------------------------*/ void setNumberingProperty(const Any& rValue, SwPaM& rPam) { uno::Reference xIndexReplace; @@ -760,10 +753,6 @@ void setNumberingProperty(const Any& rValue, SwPaM& rPam) } } - -/* -----------------25.05.98 11:40------------------- - * - * --------------------------------------------------*/ void getNumberingProperty(SwPaM& rPam, PropertyState& eState, Any * pAny ) { const SwNumRule* pNumRule = rPam.GetDoc()->GetCurrNumRule( *rPam.GetPoint() ); @@ -777,15 +766,14 @@ void getNumberingProperty(SwPaM& rPam, PropertyState& eState, Any * pAny ) else eState = PropertyState_DEFAULT_VALUE; } -/* -----------------04.07.98 15:15------------------- - * - * --------------------------------------------------*/ + void GetCurPageStyle(SwPaM& rPaM, String &rString) { const SwPageFrm* pPage = rPaM.GetCntntNode()->GetFrm()->FindPageFrm(); if(pPage) SwStyleNameMapper::FillProgName( pPage->GetPageDesc()->GetName(), rString, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, sal_True ); } + /* -----------------30.03.99 10:52------------------- * spezielle Properties am Cursor zuruecksetzen * --------------------------------------------------*/ @@ -831,9 +819,7 @@ void resetCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry, SwPaM& rPa break; } } -/* -----------------21.07.98 11:36------------------- - * - * --------------------------------------------------*/ + void InsertFile(SwUnoCrsr* pUnoCrsr, const String& rURL, const uno::Sequence< beans::PropertyValue >& rOptions @@ -987,10 +973,6 @@ void InsertFile(SwUnoCrsr* pUnoCrsr, delete pMed; } -/* -----------------14.07.04 ------------------------ - * - * --------------------------------------------------*/ - // insert text and scan for CR characters in order to insert // paragraph breaks at those positions by calling SplitNode sal_Bool DocInsertStringSplitCR( @@ -1048,9 +1030,7 @@ sal_Bool DocInsertStringSplitCR( return bOK; } -/*-- 10.03.2008 09:58:47--------------------------------------------------- - -----------------------------------------------------------------------*/ void makeRedline( SwPaM& rPaM, const ::rtl::OUString& rRedlineType, const uno::Sequence< beans::PropertyValue >& rRedlineProperties ) @@ -1104,9 +1084,6 @@ void makeRedline( SwPaM& rPaM, throw lang::IllegalArgumentException(); } -/*-- 19.02.2009 09:27:26--------------------------------------------------- - - -----------------------------------------------------------------------*/ SwAnyMapHelper::~SwAnyMapHelper() { AnyMapHelper_t::iterator aIt = begin(); @@ -1116,9 +1093,7 @@ SwAnyMapHelper::~SwAnyMapHelper() ++aIt; } } -/*-- 19.02.2009 09:27:26--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwAnyMapHelper::SetValue( USHORT nWhichId, USHORT nMemberId, const uno::Any& rAny ) { sal_uInt32 nKey = (nWhichId << 16) + nMemberId; @@ -1130,9 +1105,7 @@ void SwAnyMapHelper::SetValue( USHORT nWhichId, USHORT nMemberId, const uno::Any else insert( value_type(nKey, new uno::Any( rAny )) ); } -/*-- 19.02.2009 09:27:26--------------------------------------------------- - -----------------------------------------------------------------------*/ bool SwAnyMapHelper::FillValue( USHORT nWhichId, USHORT nMemberId, const uno::Any*& pAny ) { bool bRet = false; @@ -1147,4 +1120,3 @@ bool SwAnyMapHelper::FillValue( USHORT nWhichId, USHORT nMemberId, const uno: } }//namespace SwUnoCursorHelper - diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index ab5d68910769..b7fcb45620fb 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -94,9 +94,6 @@ DECLARE_STL_USTRINGACCESS_MAP( uno::Sequence< sal_Int8 > *, SwShapeImplementati static SwShapeImplementationIdMap aImplementationIdMap; -/* -----------------22.01.99 13:19------------------- - * - * --------------------------------------------------*/ class SwShapeDescriptor_Impl { SwFmtHoriOrient* pHOrient; @@ -278,63 +275,47 @@ public: DELETEZ(pWrapInfluenceOnObjPos); } }; + /**************************************************************************** class SwFmDrawPage ****************************************************************************/ - -/* -----------------28.01.99 12:03------------------- - * - * --------------------------------------------------*/ SwFmDrawPage::SwFmDrawPage( SdrPage* pPage ) : SvxFmDrawPage( pPage ), pPageView(0) { } -/*-- 22.01.99 11:13:07--------------------------------------------------- - - -----------------------------------------------------------------------*/ SwFmDrawPage::~SwFmDrawPage() throw () { RemovePageView(); } -/*-- 22.01.99 11:13:07--------------------------------------------------- - -----------------------------------------------------------------------*/ const SdrMarkList& SwFmDrawPage::PreGroup(const uno::Reference< drawing::XShapes > & xShapes) { _SelectObjectsInView( xShapes, GetPageView() ); const SdrMarkList& rMarkList = mpView->GetMarkedObjectList(); return rMarkList; } -/*-- 22.01.99 11:13:08--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwFmDrawPage::PreUnGroup(const uno::Reference< drawing::XShapeGroup > xShapeGroup) { uno::Reference< drawing::XShape > xShape( xShapeGroup, uno::UNO_QUERY); _SelectObjectInView( xShape, GetPageView() ); } -/*-- 22.01.99 11:13:08--------------------------------------------------- - -----------------------------------------------------------------------*/ SdrPageView* SwFmDrawPage::GetPageView() { if(!pPageView) pPageView = mpView->ShowSdrPage( mpPage ); return pPageView; } -/*-- 22.01.99 11:13:08--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwFmDrawPage::RemovePageView() { if(pPageView && mpView) mpView->HideSdrPage(); pPageView = 0; } -/*-- 22.01.99 11:13:09--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Reference< uno::XInterface > SwFmDrawPage::GetInterface( SdrObject* pObj ) { uno::Reference< XInterface > xShape; @@ -352,17 +333,12 @@ uno::Reference< uno::XInterface > SwFmDrawPage::GetInterface( SdrObject* pObj } return xShape; } -/*-- 22.01.99 11:13:09--------------------------------------------------- - -----------------------------------------------------------------------*/ SdrObject* SwFmDrawPage::_CreateSdrObject( const uno::Reference< drawing::XShape > & xShape ) throw () { //TODO: stimmt das so - kann die Methode weg? return SvxFmDrawPage::_CreateSdrObject( xShape ); } -/*-- 22.01.99 11:13:09--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Reference< drawing::XShape > SwFmDrawPage::_CreateShape( SdrObject *pObj ) const throw () { @@ -498,6 +474,7 @@ uno::Sequence< OUString > SwXShapesEnumeration::getSupportedServiceNames(void) t { return ::comphelper::makeSequence(C2U("com.sun.star.container.XEnumeration")); } + /**************************************************************************** class SwXDrawPage ****************************************************************************/ @@ -507,23 +484,17 @@ uno::Reference< container::XEnumeration > SwXDrawPage::createEnumeration(void) t return uno::Reference< container::XEnumeration >( new SwXShapesEnumeration(this)); } -/* -----------------------------06.04.00 13:14-------------------------------- - ---------------------------------------------------------------------------*/ rtl::OUString SwXDrawPage::getImplementationName(void) throw( uno::RuntimeException ) { return C2U("SwXDrawPage"); } -/* -----------------------------06.04.00 13:14-------------------------------- - ---------------------------------------------------------------------------*/ BOOL SwXDrawPage::supportsService(const rtl::OUString& rServiceName) throw( uno::RuntimeException ) { return C2U("com.sun.star.drawing.GenericDrawPage") == rServiceName; } -/* -----------------------------06.04.00 13:14-------------------------------- - ---------------------------------------------------------------------------*/ uno::Sequence< rtl::OUString > SwXDrawPage::getSupportedServiceNames(void) throw( uno::RuntimeException ) { uno::Sequence< rtl::OUString > aRet(1); @@ -531,17 +502,13 @@ uno::Sequence< rtl::OUString > SwXDrawPage::getSupportedServiceNames(void) throw pArray[0] = C2U("com.sun.star.drawing.GenericDrawPage"); return aRet; } -/*-- 22.01.99 11:22:25--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXDrawPage::SwXDrawPage(SwDoc* pDc) : pDoc(pDc), pDrawPage(0) { } -/*-- 22.01.99 11:22:25--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXDrawPage::~SwXDrawPage() { if(xPageAgg.is()) @@ -550,9 +517,7 @@ SwXDrawPage::~SwXDrawPage() xPageAgg->setDelegator(xInt); } } -/* -----------------------------15.06.00 15:00-------------------------------- - ---------------------------------------------------------------------------*/ uno::Any SwXDrawPage::queryInterface( const uno::Type& aType ) throw( uno::RuntimeException ) { @@ -572,9 +537,7 @@ uno::Any SwXDrawPage::queryInterface( const uno::Type& aType ) } return aRet; } -/* -----------------------------15.06.00 15:01-------------------------------- - ---------------------------------------------------------------------------*/ uno::Sequence< uno::Type > SwXDrawPage::getTypes() throw( uno::RuntimeException ) { uno::Sequence< uno::Type > aPageTypes = SwXDrawPageBaseClass::getTypes(); @@ -593,9 +556,7 @@ uno::Sequence< uno::Type > SwXDrawPage::getTypes() throw( uno::RuntimeException pPageTypes[nIndex] = ::getCppuType((uno::Reference*)0); return aPageTypes; } -/*-- 22.01.99 11:33:44--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Int32 SwXDrawPage::getCount(void) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -609,9 +570,7 @@ sal_Int32 SwXDrawPage::getCount(void) throw( uno::RuntimeException ) return pDrawPage->getCount(); } } -/*-- 22.01.99 11:33:46--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Any SwXDrawPage::getByIndex(sal_Int32 nIndex) throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException ) @@ -625,16 +584,12 @@ uno::Any SwXDrawPage::getByIndex(sal_Int32 nIndex) ((SwXDrawPage*)this)->GetSvxPage(); return pDrawPage->getByIndex( nIndex ); } -/* -----------------22.01.99 13:13------------------- - * - * --------------------------------------------------*/ + uno::Type SwXDrawPage::getElementType(void) throw( uno::RuntimeException ) { return ::getCppuType((const uno::Reference*)0); } -/* -----------------22.01.99 13:13------------------- - * - * --------------------------------------------------*/ + sal_Bool SwXDrawPage::hasElements(void) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -646,9 +601,6 @@ sal_Bool SwXDrawPage::hasElements(void) throw( uno::RuntimeException ) return ((SwXDrawPage*)this)->GetSvxPage()->hasElements(); } -/* -----------------22.01.99 12:42------------------- - * - * --------------------------------------------------*/ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape) throw( uno::RuntimeException ) { @@ -821,9 +773,7 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape) delete pPam; delete pInternalPam; } -/* -----------------22.01.99 12:42------------------- - * - * --------------------------------------------------*/ + void SwXDrawPage::remove(const uno::Reference< drawing::XShape > & xShape) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -832,9 +782,7 @@ void SwXDrawPage::remove(const uno::Reference< drawing::XShape > & xShape) throw uno::Reference xComp(xShape, uno::UNO_QUERY); xComp->dispose(); } -/* -----------------17.02.99 10:38------------------- - * - * --------------------------------------------------*/ + uno::Reference< drawing::XShapeGroup > SwXDrawPage::group(const uno::Reference< drawing::XShapes > & xShapes) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -888,9 +836,7 @@ uno::Reference< drawing::XShapeGroup > SwXDrawPage::group(const uno::Reference< } return xRet; } -/* -----------------17.02.99 10:38------------------- - * - * --------------------------------------------------*/ + void SwXDrawPage::ungroup(const uno::Reference< drawing::XShapeGroup > & xShapeGroup) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -914,9 +860,7 @@ void SwXDrawPage::ungroup(const uno::Reference< drawing::XShapeGroup > & xShapeG pPage->RemovePageView(); } } -/* -----------------05.05.98 17:05------------------- - * - * --------------------------------------------------*/ + SwFmDrawPage* SwXDrawPage::GetSvxPage() { if(!xPageAgg.is() && pDoc) @@ -948,21 +892,14 @@ void SwXDrawPage::InvalidateSwDoc() pDoc = 0; } -/**************************************************************************** - -****************************************************************************/ TYPEINIT1(SwXShape, SwClient); -/* -----------------------------10.03.00 18:02-------------------------------- - ---------------------------------------------------------------------------*/ const uno::Sequence< sal_Int8 > & SwXShape::getUnoTunnelId() { static uno::Sequence< sal_Int8 > aSeq = ::CreateUnoTunnelId(); return aSeq; } -/* -----------------------------10.03.00 18:04-------------------------------- - ---------------------------------------------------------------------------*/ sal_Int64 SAL_CALL SwXShape::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw(uno::RuntimeException) { @@ -996,9 +933,6 @@ namespace } } -/* -----------------01.02.99 11:38------------------- - * - * --------------------------------------------------*/ SwXShape::SwXShape(uno::Reference< uno::XInterface > & xShape) : m_pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_SHAPE)), m_pPropertyMapEntries(aSwMapProvider.GetPropertyMapEntries(PROPERTY_MAP_TEXT_SHAPE)), @@ -1048,9 +982,6 @@ SwXShape::SwXShape(uno::Reference< uno::XInterface > & xShape) : } } -/*-- 09.04.09 15:06:13--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SwXShape::AddExistingShapeToFmt( SdrObject& _rObj ) { SdrObjListIter aIter( _rObj, IM_DEEPNOGROUPS ); @@ -1085,9 +1016,6 @@ void SwXShape::AddExistingShapeToFmt( SdrObject& _rObj ) } } -/*-- 22.01.99 11:42:26--------------------------------------------------- - - -----------------------------------------------------------------------*/ SwXShape::~SwXShape() { if (xShapeAgg.is()) @@ -1097,9 +1025,7 @@ SwXShape::~SwXShape() } delete pImpl; } -/* -----------------------------16.06.00 12:21-------------------------------- - ---------------------------------------------------------------------------*/ uno::Any SwXShape::queryInterface( const uno::Type& aType ) throw( uno::RuntimeException ) { uno::Any aRet = SwXShapeBaseClass::queryInterface(aType); @@ -1116,9 +1042,7 @@ uno::Any SwXShape::queryInterface( const uno::Type& aType ) throw( uno::RuntimeE // <-- return aRet; } -/* -----------------------------16.06.00 12:21-------------------------------- - ---------------------------------------------------------------------------*/ uno::Sequence< uno::Type > SwXShape::getTypes( ) throw(uno::RuntimeException) { uno::Sequence< uno::Type > aRet = SwXShapeBaseClass::getTypes(); @@ -1142,9 +1066,7 @@ uno::Sequence< uno::Type > SwXShape::getTypes( ) throw(uno::RuntimeException) } return aRet; } -/* -----------------------------04.04.01 07:37-------------------------------- - ---------------------------------------------------------------------------*/ uno::Sequence< sal_Int8 > SwXShape::getImplementationId( ) throw(uno::RuntimeException) { vos::OGuard aGuard( Application::GetSolarMutex() ); @@ -1186,9 +1108,7 @@ uno::Sequence< sal_Int8 > SwXShape::getImplementationId( ) throw(uno::RuntimeEx return *pImplementationId; } } -/*-- 22.01.99 11:42:26--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Reference< beans::XPropertySetInfo > SwXShape::getPropertySetInfo(void) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -1211,9 +1131,7 @@ uno::Reference< beans::XPropertySetInfo > SwXShape::getPropertySetInfo(void) th aRet = m_pPropSet->getPropertySetInfo(); return aRet; } -/*-- 22.01.99 11:42:27--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXShape::setPropertyValue(const rtl::OUString& rPropertyName, const uno::Any& aValue) throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, @@ -1575,9 +1493,7 @@ void SwXShape::setPropertyValue(const rtl::OUString& rPropertyName, const uno::A } } } -/*-- 22.01.99 11:42:27--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Any SwXShape::getPropertyValue(const rtl::OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) @@ -1833,10 +1749,6 @@ uno::Any SwXShape::_getPropAtAggrObj( const ::rtl::OUString& _rPropertyName ) return aRet; } - -/* -----------------------------02.11.00 09:41-------------------------------- - - ---------------------------------------------------------------------------*/ beans::PropertyState SwXShape::getPropertyState( const rtl::OUString& rPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { @@ -1847,9 +1759,7 @@ beans::PropertyState SwXShape::getPropertyState( const rtl::OUString& rPropertyN uno::Sequence< beans::PropertyState > aStates = getPropertyStates(aNames); return aStates.getConstArray()[0]; } -/* -----------------------------02.11.00 09:41-------------------------------- - ---------------------------------------------------------------------------*/ uno::Sequence< beans::PropertyState > SwXShape::getPropertyStates( const uno::Sequence< rtl::OUString >& aPropertyNames ) throw(beans::UnknownPropertyException, uno::RuntimeException) @@ -1951,9 +1861,7 @@ uno::Sequence< beans::PropertyState > SwXShape::getPropertyStates( throw uno::RuntimeException(); return aRet; } -/* -----------------------------02.11.00 09:41-------------------------------- - ---------------------------------------------------------------------------*/ void SwXShape::setPropertyToDefault( const rtl::OUString& rPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { @@ -2015,9 +1923,7 @@ void SwXShape::setPropertyToDefault( const rtl::OUString& rPropertyName ) else throw uno::RuntimeException(); } -/* -----------------------------02.11.00 09:41-------------------------------- - ---------------------------------------------------------------------------*/ uno::Any SwXShape::getPropertyDefault( const rtl::OUString& rPropertyName ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) @@ -2053,9 +1959,7 @@ uno::Any SwXShape::getPropertyDefault( const rtl::OUString& rPropertyName ) throw uno::RuntimeException(); return aRet; } -/*-- 22.01.99 11:42:27--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXShape::addPropertyChangeListener( const rtl::OUString& _propertyName, const uno::Reference< beans::XPropertyChangeListener > & _listener ) @@ -2070,9 +1974,7 @@ void SwXShape::addPropertyChangeListener( if ( xShapeAgg->queryAggregation( beans::XPropertySet::static_type() ) >>= xShapeProps ) xShapeProps->addPropertyChangeListener( _propertyName, _listener ); } -/*-- 22.01.99 11:42:27--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXShape::removePropertyChangeListener( const rtl::OUString& _propertyName, const uno::Reference< beans::XPropertyChangeListener > & _listener) @@ -2087,9 +1989,7 @@ void SwXShape::removePropertyChangeListener( if ( xShapeAgg->queryAggregation( beans::XPropertySet::static_type() ) >>= xShapeProps ) xShapeProps->removePropertyChangeListener( _propertyName, _listener ); } -/*-- 22.01.99 11:42:28--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXShape::addVetoableChangeListener( const rtl::OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/ ) @@ -2098,9 +1998,7 @@ void SwXShape::addVetoableChangeListener( { DBG_WARNING("not implemented"); } -/*-- 22.01.99 11:42:28--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXShape::removeVetoableChangeListener( const rtl::OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) @@ -2109,16 +2007,12 @@ void SwXShape::removeVetoableChangeListener( { DBG_WARNING("not implemented"); } -/*-- 22.01.99 11:42:28--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXShape::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew) { ClientModify(this, pOld, pNew); } -/* -----------------14.04.99 13:02------------------- - * - * --------------------------------------------------*/ + void SwXShape::attach(const uno::Reference< text::XTextRange > & xTextRange) throw( lang::IllegalArgumentException, uno::RuntimeException ) { @@ -2186,9 +2080,7 @@ void SwXShape::attach(const uno::Reference< text::XTextRange > & xTextRange) } } } -/* -----------------14.04.99 13:02------------------- - * - * --------------------------------------------------*/ + uno::Reference< text::XTextRange > SwXShape::getAnchor(void) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -2210,9 +2102,7 @@ uno::Reference< text::XTextRange > SwXShape::getAnchor(void) throw( uno::Runtim aRef = pImpl->GetTextRange(); return aRef; } -/* -----------------14.04.99 13:02------------------- - * - * --------------------------------------------------*/ + void SwXShape::dispose(void) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -2263,9 +2153,7 @@ void SwXShape::dispose(void) throw( uno::RuntimeException ) xComp->dispose(); } } -/* -----------------14.04.99 13:02------------------- - * - * --------------------------------------------------*/ + void SwXShape::addEventListener( const uno::Reference< lang::XEventListener > & aListener) throw( uno::RuntimeException ) @@ -2275,9 +2163,7 @@ void SwXShape::addEventListener( if(pSvxShape) pSvxShape->addEventListener(aListener); } -/* -----------------14.04.99 13:02------------------- - * - * --------------------------------------------------*/ + void SwXShape::removeEventListener( const uno::Reference< lang::XEventListener > & aListener) throw( uno::RuntimeException ) @@ -2286,16 +2172,12 @@ void SwXShape::removeEventListener( if(pSvxShape) pSvxShape->removeEventListener(aListener); } -/* -----------------03.06.99 08:53------------------- - * - * --------------------------------------------------*/ + rtl::OUString SwXShape::getImplementationName(void) throw( uno::RuntimeException ) { return C2U("SwXShape"); } -/* -----------------03.06.99 08:53------------------- - * - * --------------------------------------------------*/ + sal_Bool SwXShape::supportsService(const rtl::OUString& rServiceName) throw( uno::RuntimeException ) { sal_Bool bRet = sal_False; @@ -2309,9 +2191,7 @@ sal_Bool SwXShape::supportsService(const rtl::OUString& rServiceName) throw( uno } return bRet; } -/* -----------------03.06.99 08:53------------------- - * - * --------------------------------------------------*/ + uno::Sequence< rtl::OUString > SwXShape::getSupportedServiceNames(void) throw( uno::RuntimeException ) { uno::Sequence< rtl::OUString > aSeq; @@ -2329,9 +2209,7 @@ uno::Sequence< rtl::OUString > SwXShape::getSupportedServiceNames(void) throw( u } return aSeq; } -/* -----------------------------15.03.00 14:54-------------------------------- - ---------------------------------------------------------------------------*/ SvxShape* SwXShape::GetSvxShape() { SvxShape* pSvxShape = 0; @@ -2413,6 +2291,7 @@ awt::Point SAL_CALL SwXShape::getPosition() throw ( uno::RuntimeException ) return aPos; } + void SAL_CALL SwXShape::setPosition( const awt::Point& aPosition ) throw ( uno::RuntimeException ) { @@ -2505,6 +2384,7 @@ void SAL_CALL SwXShape::setPosition( const awt::Point& aPosition ) mxShape->setPosition( aNewPos ); } } + awt::Size SAL_CALL SwXShape::getSize() throw ( uno::RuntimeException ) { awt::Size aSize; @@ -2514,6 +2394,7 @@ awt::Size SAL_CALL SwXShape::getSize() throw ( uno::RuntimeException ) } return aSize; } + void SAL_CALL SwXShape::setSize( const awt::Size& aSize ) throw ( beans::PropertyVetoException, uno::RuntimeException ) @@ -2656,6 +2537,7 @@ awt::Point SwXShape::_ConvertPositionToHoriL2R( const awt::Point _aObjPos, return aObjPosInHoriL2R; } + /** method to convert the transformation of the drawing object to the layout direction, the drawing object is in @@ -2909,9 +2791,6 @@ void SwXShape::_AdjustPositionProperties( const awt::Point _aPosition ) return aConvertedPath; } -/*-- 31.05.01 09:59:19--------------------------------------------------- - - -----------------------------------------------------------------------*/ SwXGroupShape::SwXGroupShape(uno::Reference< XInterface > & xShape) : SwXShape(xShape) { @@ -2921,15 +2800,10 @@ SwXGroupShape::SwXGroupShape(uno::Reference< XInterface > & xShape) : #endif } -/*-- 31.05.01 09:59:19--------------------------------------------------- - - -----------------------------------------------------------------------*/ SwXGroupShape::~SwXGroupShape() { } -/*-- 31.05.01 09:59:19--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Any SwXGroupShape::queryInterface( const uno::Type& rType ) throw(uno::RuntimeException) { uno::Any aRet; @@ -2939,23 +2813,17 @@ uno::Any SwXGroupShape::queryInterface( const uno::Type& rType ) throw(uno::Runt aRet = SwXShape::queryInterface(rType); return aRet; } -/*-- 31.05.01 09:59:19--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXGroupShape::acquire( ) throw() { SwXShape::acquire(); } -/*-- 31.05.01 09:59:19--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXGroupShape::release( ) throw() { SwXShape::release(); } -/*-- 31.05.01 09:59:19--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXGroupShape::add( const uno::Reference< XShape >& xShape ) throw (uno::RuntimeException) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -3014,9 +2882,7 @@ void SwXGroupShape::add( const uno::Reference< XShape >& xShape ) throw (uno::Ru else throw uno::RuntimeException(); } -/*-- 31.05.01 09:59:20--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXGroupShape::remove( const uno::Reference< XShape >& xShape ) throw (uno::RuntimeException) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -3031,9 +2897,7 @@ void SwXGroupShape::remove( const uno::Reference< XShape >& xShape ) throw (uno: throw uno::RuntimeException(); xShapes->remove(xShape); } -/*-- 31.05.01 09:59:20--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Int32 SwXGroupShape::getCount(void) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -3048,9 +2912,7 @@ sal_Int32 SwXGroupShape::getCount(void) throw( uno::RuntimeException ) throw uno::RuntimeException(); return xAcc->getCount(); } -/*-- 31.05.01 09:59:20--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Any SwXGroupShape::getByIndex(sal_Int32 nIndex) throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException ) @@ -3067,9 +2929,7 @@ uno::Any SwXGroupShape::getByIndex(sal_Int32 nIndex) throw uno::RuntimeException(); return xAcc->getByIndex(nIndex); } -/*-- 31.05.01 09:59:20--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Type SwXGroupShape::getElementType( ) throw(uno::RuntimeException) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -3084,9 +2944,7 @@ uno::Type SwXGroupShape::getElementType( ) throw(uno::RuntimeException) throw uno::RuntimeException(); return xAcc->getElementType(); } -/*-- 31.05.01 09:59:22--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool SwXGroupShape::hasElements( ) throw(uno::RuntimeException) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -3101,5 +2959,3 @@ sal_Bool SwXGroupShape::hasElements( ) throw(uno::RuntimeException) throw uno::RuntimeException(); return xAcc->hasElements(); } - - diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index d5a6223afaae..d7141c57c1ca 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -152,33 +152,26 @@ public: virtual sal_Bool AnyToItemSet( SwDoc* pDoc, SfxItemSet& rFrmSet, SfxItemSet& rSet, sal_Bool& rSizeFound) = 0; }; -/* -----------------------------12.06.01 15:46-------------------------------- - ---------------------------------------------------------------------------*/ BaseFrameProperties_Impl::~BaseFrameProperties_Impl() { } -/* -----------------------------12.06.01 15:43-------------------------------- - ---------------------------------------------------------------------------*/ void BaseFrameProperties_Impl::SetProperty(USHORT nWID, BYTE nMemberId, const uno::Any& rVal) { aAnyMap.SetValue( nWID, nMemberId, rVal ); } -/* -----------------------------12.06.01 15:43-------------------------------- - ---------------------------------------------------------------------------*/ sal_Bool BaseFrameProperties_Impl::GetProperty(USHORT nWID, BYTE nMemberId, const uno::Any*& rpAny) { return aAnyMap.FillValue( nWID, nMemberId, rpAny ); } + //void BaseFrameProperties_Impl::GetProperty( const OUString &rPropertyName, const uno::Reference < beans::XPropertySet > &rxPropertySet, uno::Any & rAny ) //{ // rAny = rxPropertySet->getPropertyValue( rPropertyName ); //} -/* -----------------29.06.98 09:55------------------- - * - * --------------------------------------------------*/ + sal_Bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxItemSet& rFromSet, sal_Bool& rSizeFound) { sal_Bool bRet = sal_True; @@ -526,9 +519,6 @@ sal_Bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const return bRet; } -/* -----------------22.06.98 09:17------------------- - * - * --------------------------------------------------*/ class SwFrameProperties_Impl : public BaseFrameProperties_Impl { @@ -541,16 +531,12 @@ public: virtual sal_Bool AnyToItemSet( SwDoc* pDoc, SfxItemSet& rFrmSet, SfxItemSet& rSet, sal_Bool& rSizeFound); }; -/* -----------------22.06.98 09:17------------------- - * - * --------------------------------------------------*/ + SwFrameProperties_Impl::SwFrameProperties_Impl(): BaseFrameProperties_Impl(/*aSwMapProvider.GetPropertyMap(PROPERTY_MAP_TEXT_FRAME)*/ ) { } -/* -----------------22.06.98 11:27------------------- - * - * --------------------------------------------------*/ + inline void lcl_FillCol ( SfxItemSet &rToSet, const :: SfxItemSet &rFromSet, const :: uno::Any *pAny) { if ( pAny ) @@ -560,6 +546,7 @@ inline void lcl_FillCol ( SfxItemSet &rToSet, const :: SfxItemSet &rFromSet, con rToSet.Put(aCol); } } + sal_Bool SwFrameProperties_Impl::AnyToItemSet(SwDoc *pDoc, SfxItemSet& rSet, SfxItemSet&, sal_Bool& rSizeFound) { //Properties fuer alle Frames @@ -599,6 +586,7 @@ sal_Bool SwFrameProperties_Impl::AnyToItemSet(SwDoc *pDoc, SfxItemSet& rSet, } return bRet; } + /**************************************************************************** Grafik-Descriptor ****************************************************************************/ @@ -610,17 +598,12 @@ public: virtual sal_Bool AnyToItemSet( SwDoc* pDoc, SfxItemSet& rFrmSet, SfxItemSet& rSet, sal_Bool& rSizeFound); }; -/* -----------------27.06.98 14:53------------------- - * - * --------------------------------------------------*/ + SwGraphicProperties_Impl::SwGraphicProperties_Impl( ) : BaseFrameProperties_Impl(/*aSwMapProvider.GetPropertyMap(PROPERTY_MAP_TEXT_GRAPHIC)*/ ) { } -/* -----------------27.06.98 14:40------------------- - * - * --------------------------------------------------*/ inline void lcl_FillMirror ( SfxItemSet &rToSet, const :: SfxItemSet &rFromSet, const ::uno::Any *pHEvenMirror, const ::uno::Any *pHOddMirror, const ::uno::Any *pVMirror, sal_Bool &rRet ) { if(pHEvenMirror || pHOddMirror || pVMirror ) @@ -707,9 +690,6 @@ sal_Bool SwGraphicProperties_Impl::AnyToItemSet( return bRet; } -/* -----------------4/1/2003 13:54------------------- - - --------------------------------------------------*/ class SwOLEProperties_Impl : public SwFrameProperties_Impl { @@ -720,9 +700,6 @@ public: virtual sal_Bool AnyToItemSet( SwDoc* pDoc, SfxItemSet& rFrmSet, SfxItemSet& rSet, sal_Bool& rSizeFound); }; -/* -----------------4/1/2003 15:32------------------- - - --------------------------------------------------*/ sal_Bool SwOLEProperties_Impl::AnyToItemSet( SwDoc* pDoc, SfxItemSet& rFrmSet, SfxItemSet& rSet, sal_Bool& rSizeFound) @@ -738,17 +715,12 @@ sal_Bool SwOLEProperties_Impl::AnyToItemSet( /****************************************************************** * SwXFrame ******************************************************************/ -/* -----------------------------10.03.00 18:02-------------------------------- - - ---------------------------------------------------------------------------*/ const :: uno::Sequence< sal_Int8 > & SwXFrame::getUnoTunnelId() { static uno::Sequence< sal_Int8 > aSeq = ::CreateUnoTunnelId(); return aSeq; } -/* -----------------------------10.03.00 18:04-------------------------------- - ---------------------------------------------------------------------------*/ sal_Int64 SAL_CALL SwXFrame::getSomething( const :: uno::Sequence< sal_Int8 >& rId ) throw(uno::RuntimeException) { @@ -760,30 +732,21 @@ sal_Int64 SAL_CALL SwXFrame::getSomething( const :: uno::Sequence< sal_Int8 >& r } return 0; } -/*-----------------24.03.98 14:49------------------- - ---------------------------------------------------*/ TYPEINIT1(SwXFrame, SwClient); -/* -----------------------------06.04.00 14:20-------------------------------- - ---------------------------------------------------------------------------*/ OUString SwXFrame::getImplementationName(void) throw( uno::RuntimeException ) { return C2U("SwXFrame"); } -/* -----------------------------06.04.00 14:20-------------------------------- - ---------------------------------------------------------------------------*/ BOOL SwXFrame::supportsService(const :: OUString& rServiceName) throw( uno::RuntimeException ) { return !rServiceName.compareToAscii("com.sun.star.text.BaseFrame")|| !rServiceName.compareToAscii("com.sun.star.text.TextContent") || !rServiceName.compareToAscii("com.sun.star.document.LinkTarget"); } -/* -----------------------------06.04.00 14:20-------------------------------- - ---------------------------------------------------------------------------*/ uno::Sequence< OUString > SwXFrame::getSupportedServiceNames(void) throw( uno::RuntimeException ) { uno::Sequence< OUString > aRet(3); @@ -794,7 +757,6 @@ uno::Sequence< OUString > SwXFrame::getSupportedServiceNames(void) throw( uno::R return aRet; } - /*-- 14.01.99 11:31:52--------------------------------------------------- Dieser CTor legt den Frame als Descriptor an -----------------------------------------------------------------------*/ @@ -849,9 +811,6 @@ SwXFrame::SwXFrame(FlyCntType eSet, const :: SfxItemPropertySet* pSet, SwDoc *pD } } -/*-- 11.12.98 15:05:01--------------------------------------------------- - - -----------------------------------------------------------------------*/ SwXFrame::SwXFrame(SwFrmFmt& rFrmFmt, FlyCntType eSet, const :: SfxItemPropertySet* pSet) : SwClient( &rFrmFmt ), aLstnrCntnr( (container::XNamed*)this), @@ -864,20 +823,13 @@ SwXFrame::SwXFrame(SwFrmFmt& rFrmFmt, FlyCntType eSet, const :: SfxItemPropertyS { } -/*-- 11.12.98 15:05:02--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXFrame::~SwXFrame() { delete m_pCopySource; delete pProps; } -/*-- 11.12.98 15:05:03--------------------------------------------------- - - -----------------------------------------------------------------------*/ -/*-- 11.12.98 15:05:03--------------------------------------------------- - -----------------------------------------------------------------------*/ OUString SwXFrame::getName(void) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -891,9 +843,7 @@ OUString SwXFrame::getName(void) throw( uno::RuntimeException ) throw uno::RuntimeException(); return sRet; } -/*-- 11.12.98 15:05:03--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXFrame::setName(const :: OUString& rName) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -912,9 +862,7 @@ void SwXFrame::setName(const :: OUString& rName) throw( uno::RuntimeException ) else throw uno::RuntimeException(); } -/*-- 11.12.98 15:05:03--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Reference< beans::XPropertySetInfo > SwXFrame::getPropertySetInfo(void) throw( uno::RuntimeException ) { uno::Reference< beans::XPropertySetInfo > xRef; @@ -943,9 +891,7 @@ uno::Reference< beans::XPropertySetInfo > SwXFrame::getPropertySetInfo(void) th } return xRef; } -/*-- 15.05.06 12:21:43--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXFrame::SetSelection(SwPaM& rCopySource) { if(m_pCopySource) @@ -954,9 +900,6 @@ void SwXFrame::SetSelection(SwPaM& rCopySource) m_pCopySource->SetMark(); *m_pCopySource->GetMark() = *rCopySource.End(); } -/*-- 11.12.98 15:05:04--------------------------------------------------- - - -----------------------------------------------------------------------*/ SdrObject *SwXFrame::GetOrCreateSdrObject( SwFlyFrmFmt *pFmt ) { @@ -1469,9 +1412,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno:: else throw uno::RuntimeException(); } -/*-- 11.12.98 15:05:04--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { @@ -1732,45 +1673,35 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName) throw uno::RuntimeException(); return aAny; } -/*-- 11.12.98 15:05:04--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXFrame::addPropertyChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { DBG_WARNING("not implemented"); } -/*-- 11.12.98 15:05:05--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXFrame::removePropertyChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { DBG_WARNING("not implemented"); } -/*-- 11.12.98 15:05:05--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXFrame::addVetoableChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { DBG_WARNING("not implemented"); } -/*-- 11.12.98 15:05:05--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXFrame::removeVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { DBG_WARNING("not implemented"); } -/*-- 12.09.00 14:04:53--------------------------------------------------- - -----------------------------------------------------------------------*/ beans::PropertyState SwXFrame::getPropertyState( const OUString& rPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { @@ -1781,9 +1712,7 @@ beans::PropertyState SwXFrame::getPropertyState( const OUString& rPropertyName ) uno::Sequence< beans::PropertyState > aStates = getPropertyStates(aPropertyNames); return aStates.getConstArray()[0]; } -/*-- 12.09.00 14:04:54--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Sequence< beans::PropertyState > SwXFrame::getPropertyStates( const uno::Sequence< OUString >& aPropertyNames ) throw(beans::UnknownPropertyException, uno::RuntimeException) @@ -1847,9 +1776,7 @@ uno::Sequence< beans::PropertyState > SwXFrame::getPropertyStates( throw uno::RuntimeException(); return aStates; } -/*-- 12.09.00 14:04:54--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXFrame::setPropertyToDefault( const OUString& rPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { @@ -1946,9 +1873,7 @@ void SwXFrame::setPropertyToDefault( const OUString& rPropertyName ) throw uno::RuntimeException(); } -/*-- 12.09.00 14:04:55--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Any SwXFrame::getPropertyDefault( const OUString& rPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -1974,26 +1899,20 @@ uno::Any SwXFrame::getPropertyDefault( const OUString& rPropertyName ) throw uno::RuntimeException(); return aRet; } -/* -----------------22.04.99 14:59------------------- - * - * --------------------------------------------------*/ + void SwXFrame::addEventListener(const uno::Reference< lang::XEventListener > & aListener) throw( uno::RuntimeException ) { if(!GetRegisteredIn()) throw uno::RuntimeException(); aLstnrCntnr.AddListener(aListener); } -/* -----------------22.04.99 14:59------------------- - * - * --------------------------------------------------*/ + void SwXFrame::removeEventListener(const uno::Reference< lang::XEventListener > & aListener) throw( uno::RuntimeException ) { if(!GetRegisteredIn() || !aLstnrCntnr.RemoveListener(aListener)) throw uno::RuntimeException(); } -/*-- 11.12.98 15:05:06--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXFrame::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew) { ClientModify(this, pOld, pNew); @@ -2006,9 +1925,6 @@ void SwXFrame::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew) } } -/*-- 11.12.98 15:23:05--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SwXFrame::dispose(void) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -2037,9 +1953,7 @@ void SwXFrame::dispose(void) throw( uno::RuntimeException ) } } -/*-- 11.12.98 16:02:27--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Reference< text::XTextRange > SwXFrame::getAnchor(void) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -2061,9 +1975,7 @@ uno::Reference< text::XTextRange > SwXFrame::getAnchor(void) throw( uno::Runtim throw uno::RuntimeException(); return aRef; } -/* -----------------14.01.99 12:02------------------- - * - * --------------------------------------------------*/ + void SwXFrame::ResetDescriptor() { bIsDescriptor = sal_False; @@ -2071,9 +1983,7 @@ void SwXFrame::ResetDescriptor() mxStyleFamily.clear(); DELETEZ(pProps); } -/* -----------------18.02.99 13:34------------------- - * - * --------------------------------------------------*/ + void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRange) throw( lang::IllegalArgumentException, uno::RuntimeException ) { @@ -2405,9 +2315,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan //setzt das Flag zurueck und loescht den Descriptor-Pointer ResetDescriptor(); } -/* -----------------------------04.04.01 14:27-------------------------------- - ---------------------------------------------------------------------------*/ void SwXFrame::attach(const uno::Reference< text::XTextRange > & xTextRange) throw( lang::IllegalArgumentException, uno::RuntimeException ) { @@ -2442,9 +2350,7 @@ void SwXFrame::attach(const uno::Reference< text::XTextRange > & xTextRange) throw lang::IllegalArgumentException(); } } -/*-- 22.04.99 08:03:20--------------------------------------------------- - -----------------------------------------------------------------------*/ awt::Point SwXFrame::getPosition(void) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -2452,9 +2358,7 @@ awt::Point SwXFrame::getPosition(void) throw( uno::RuntimeException ) aRuntime.Message = C2U("position cannot be determined with this method"); throw aRuntime; } -/*-- 22.04.99 08:03:21--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXFrame::setPosition(const awt::Point& /*aPosition*/) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -2462,76 +2366,56 @@ void SwXFrame::setPosition(const awt::Point& /*aPosition*/) throw( uno::RuntimeE aRuntime.Message = C2U("position cannot be changed with this method"); throw aRuntime; } -/*-- 22.04.99 08:03:21--------------------------------------------------- - -----------------------------------------------------------------------*/ awt::Size SwXFrame::getSize(void) throw( uno::RuntimeException ) { const ::uno::Any aVal = getPropertyValue(C2U("Size")); awt::Size* pRet = (awt::Size*)aVal.getValue(); return *pRet; } -/*-- 22.04.99 08:03:21--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXFrame::setSize(const awt::Size& aSize) throw( beans::PropertyVetoException, uno::RuntimeException ) { const ::uno::Any aVal(&aSize, ::getCppuType(static_cast(0))); setPropertyValue(C2U("Size"), aVal); } -/*-- 22.04.99 08:03:21--------------------------------------------------- - -----------------------------------------------------------------------*/ OUString SwXFrame::getShapeType(void) throw( uno::RuntimeException ) { return C2U("FrameShape"); } - /****************************************************************** * SwXTextFrame ******************************************************************/ -/*-- 14.01.99 11:27:51--------------------------------------------------- - - -----------------------------------------------------------------------*/ SwXTextFrame::SwXTextFrame( SwDoc *_pDoc ) : SwXText(0, CURSOR_FRAME), SwXFrame(FLYCNTTYPE_FRM, aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_FRAME), _pDoc ) { } -/*-- 11.12.98 15:23:01--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXTextFrame::SwXTextFrame(SwFrmFmt& rFmt) : SwXText(rFmt.GetDoc(), CURSOR_FRAME), SwXFrame(rFmt, FLYCNTTYPE_FRM, aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_FRAME)) { } -/*-- 11.12.98 15:23:02--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXTextFrame::~SwXTextFrame() { } -/* -----------------------------15.03.00 16:30-------------------------------- - ---------------------------------------------------------------------------*/ void SAL_CALL SwXTextFrame::acquire( )throw() { SwXFrame::acquire(); } -/* -----------------------------15.03.00 16:30-------------------------------- - ---------------------------------------------------------------------------*/ void SAL_CALL SwXTextFrame::release( )throw() { SwXFrame::release(); } -/* -----------------------------15.03.00 16:30-------------------------------- - ---------------------------------------------------------------------------*/ ::uno::Any SAL_CALL SwXTextFrame::queryInterface( const uno::Type& aType ) throw (uno::RuntimeException) { @@ -2542,9 +2426,7 @@ void SAL_CALL SwXTextFrame::release( )throw() aRet = SwXTextFrameBaseClass::queryInterface(aType); return aRet; } -/* -----------------------------15.03.00 16:30-------------------------------- - ---------------------------------------------------------------------------*/ uno::Sequence< uno::Type > SAL_CALL SwXTextFrame::getTypes( ) throw(uno::RuntimeException) { uno::Sequence< uno::Type > aTextFrameTypes = SwXTextFrameBaseClass::getTypes(); @@ -2569,9 +2451,7 @@ uno::Sequence< uno::Type > SAL_CALL SwXTextFrame::getTypes( ) throw(uno::Runtim return aTextFrameTypes; } -/* -----------------------------15.03.00 16:30-------------------------------- - ---------------------------------------------------------------------------*/ uno::Sequence< sal_Int8 > SAL_CALL SwXTextFrame::getImplementationId( ) throw(uno::RuntimeException) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -2584,16 +2464,12 @@ uno::Sequence< sal_Int8 > SAL_CALL SwXTextFrame::getImplementationId( ) throw(u } return aId; } -/*-- 11.12.98 15:23:03--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Reference< text::XText > SwXTextFrame::getText(void) throw( uno::RuntimeException ) { return this; } -/*-- 11.12.98 15:23:03--------------------------------------------------- - -----------------------------------------------------------------------*/ const SwStartNode *SwXTextFrame::GetStartNode() const { const SwStartNode *pSttNd = 0; @@ -2614,9 +2490,7 @@ SwXTextFrame::CreateCursor() throw (uno::RuntimeException) { return createTextCursor(); } -/*-- 11.12.98 15:23:03--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Reference< text::XTextCursor > SwXTextFrame::createTextCursor(void) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -2663,9 +2537,7 @@ uno::Reference< text::XTextCursor > SwXTextFrame::createTextCursor(void) throw( throw uno::RuntimeException(); return aRef; } -/*-- 11.12.98 15:23:03--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Reference< text::XTextCursor > SwXTextFrame::createTextCursorByRange(const uno::Reference< text::XTextRange > & aTextPosition) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -2692,9 +2564,7 @@ uno::Reference< text::XTextCursor > SwXTextFrame::createTextCursorByRange(const throw uno::RuntimeException(); return aRef; } -/*-- 11.12.98 15:23:03--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Reference< container::XEnumeration > SwXTextFrame::createEnumeration(void) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -2715,77 +2585,57 @@ uno::Reference< container::XEnumeration > SwXTextFrame::createEnumeration(void) } return aRef; } -/*-- 11.12.98 15:23:04--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Type SwXTextFrame::getElementType(void) throw( uno::RuntimeException ) { return ::getCppuType(static_cast*>(0)); } -/*-- 11.12.98 15:23:04--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool SwXTextFrame::hasElements(void) throw( uno::RuntimeException ) { return sal_True; } -/*-- 11.12.98 15:23:04--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXTextFrame::attach(const uno::Reference< text::XTextRange > & xTextRange) throw( lang::IllegalArgumentException, uno::RuntimeException ) { SwXFrame::attach(xTextRange); } -/*-- 11.12.98 15:23:04--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Reference< text::XTextRange > SwXTextFrame::getAnchor(void) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); return SwXFrame::getAnchor(); } -/*-- 11.12.98 15:23:05--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXTextFrame::dispose(void) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); SwXFrame::dispose(); } -/*-- 11.12.98 15:23:05--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXTextFrame::addEventListener(const uno::Reference< lang::XEventListener > & aListener) throw( uno::RuntimeException ) { SwXFrame::addEventListener(aListener); } -/*-- 11.12.98 15:23:05--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXTextFrame::removeEventListener(const uno::Reference< lang::XEventListener > & aListener) throw( uno::RuntimeException ) { SwXFrame::removeEventListener(aListener); } -/* -----------------03.05.99 12:28------------------- - * - * --------------------------------------------------*/ + OUString SwXTextFrame::getImplementationName(void) throw( uno::RuntimeException ) { return C2U("SwXTextFrame"); } -/* -----------------03.05.99 12:28------------------- - * - * --------------------------------------------------*/ + sal_Bool SwXTextFrame::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) { return COMPARE_EQUAL == rServiceName.compareToAscii("com.sun.star.text.Text")|| COMPARE_EQUAL == rServiceName.compareToAscii("com.sun.star.text.TextFrame")|| SwXFrame::supportsService(rServiceName); } -/* -----------------03.05.99 12:28------------------- - * - * --------------------------------------------------*/ + uno::Sequence< OUString > SwXTextFrame::getSupportedServiceNames(void) throw( uno::RuntimeException ) { uno::Sequence < OUString > aRet = SwXFrame::getSupportedServiceNames(); @@ -2795,16 +2645,12 @@ uno::Sequence< OUString > SwXTextFrame::getSupportedServiceNames(void) throw( un pArray[aRet.getLength() - 1] = C2U("com.sun.star.text.Text"); return aRet; } -/* -----------------------------20.06.00 10:02-------------------------------- - ---------------------------------------------------------------------------*/ void * SAL_CALL SwXTextFrame::operator new( size_t t) throw() { return SwXTextFrameBaseClass::operator new( t); } -/* -----------------------------20.06.00 10:02-------------------------------- - ---------------------------------------------------------------------------*/ void SAL_CALL SwXTextFrame::operator delete( void * p) throw() { SwXTextFrameBaseClass::operator delete(p); @@ -2815,9 +2661,7 @@ uno::Reference SAL_CALL SwXTextFrame::getEvents() { return new SwFrameEventDescriptor( *this ); } -/* -----------------------------10.01.01 13:27-------------------------------- - ---------------------------------------------------------------------------*/ sal_Int64 SAL_CALL SwXTextFrame::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw(uno::RuntimeException) { @@ -2827,9 +2671,7 @@ sal_Int64 SAL_CALL SwXTextFrame::getSomething( const uno::Sequence< sal_Int8 >& return nRet; } -/* -----------------------------19.03.2002 16:43------------------------------ - ---------------------------------------------------------------------------*/ ::uno::Any SwXTextFrame::getPropertyValue(const OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { @@ -2846,48 +2688,36 @@ sal_Int64 SAL_CALL SwXTextFrame::getSomething( const uno::Sequence< sal_Int8 >& aRet = SwXFrame::getPropertyValue(rPropertyName); return aRet; } + /****************************************************************** * SwXTextGraphicObject ******************************************************************/ -/*-- 14.01.99 11:27:51--------------------------------------------------- - - -----------------------------------------------------------------------*/ SwXTextGraphicObject::SwXTextGraphicObject( SwDoc *pDoc ) : SwXFrame(FLYCNTTYPE_GRF, aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_GRAPHIC), pDoc) { } -/*-- 11.12.98 16:02:25--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXTextGraphicObject::SwXTextGraphicObject(SwFrmFmt& rFmt) : SwXFrame(rFmt, FLYCNTTYPE_GRF, aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_GRAPHIC)) { } -/*-- 11.12.98 16:02:26--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXTextGraphicObject::~SwXTextGraphicObject() { } -/* -----------------------------15.03.00 16:30-------------------------------- - ---------------------------------------------------------------------------*/ void SAL_CALL SwXTextGraphicObject::acquire( )throw() { SwXFrame::acquire(); } -/* -----------------------------15.03.00 16:30-------------------------------- - ---------------------------------------------------------------------------*/ void SAL_CALL SwXTextGraphicObject::release( )throw() { SwXFrame::release(); } -/* -----------------------------15.03.00 16:30-------------------------------- - ---------------------------------------------------------------------------*/ ::uno::Any SAL_CALL SwXTextGraphicObject::queryInterface( const uno::Type& aType ) throw(uno::RuntimeException) { @@ -2896,9 +2726,7 @@ void SAL_CALL SwXTextGraphicObject::release( )throw() aRet = SwXTextGraphicObjectBaseClass::queryInterface(aType); return aRet; } -/* -----------------------------15.03.00 16:30-------------------------------- - ---------------------------------------------------------------------------*/ uno::Sequence< uno::Type > SAL_CALL SwXTextGraphicObject::getTypes( ) throw(uno::RuntimeException) { @@ -2918,9 +2746,7 @@ uno::Sequence< uno::Type > SAL_CALL return aGraphicTypes; } -/* -----------------------------15.03.00 16:30-------------------------------- - ---------------------------------------------------------------------------*/ uno::Sequence< sal_Int8 > SAL_CALL SwXTextGraphicObject::getImplementationId( ) throw(uno::RuntimeException) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -2933,63 +2759,47 @@ uno::Sequence< sal_Int8 > SAL_CALL SwXTextGraphicObject::getImplementationId( ) } return aId; } -/*-- 11.12.98 16:02:27--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXTextGraphicObject::attach(const uno::Reference< text::XTextRange > & xTextRange) throw( lang::IllegalArgumentException, uno::RuntimeException ) { SwXFrame::attach(xTextRange); } -/*-- 11.12.98 16:02:27--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Reference< text::XTextRange > SwXTextGraphicObject::getAnchor(void) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); return SwXFrame::getAnchor(); } -/*-- 11.12.98 16:02:28--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXTextGraphicObject::dispose(void) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); SwXFrame::dispose(); } -/*-- 11.12.98 16:02:29--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXTextGraphicObject::addEventListener(const uno::Reference< lang::XEventListener > & aListener) throw( uno::RuntimeException ) { SwXFrame::addEventListener(aListener); } -/*-- 11.12.98 16:02:29--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXTextGraphicObject::removeEventListener(const uno::Reference< lang::XEventListener > & aListener) throw( uno::RuntimeException ) { SwXFrame::removeEventListener(aListener); } -/* -----------------03.05.99 12:28------------------- - * - * --------------------------------------------------*/ + OUString SwXTextGraphicObject::getImplementationName(void) throw( uno::RuntimeException ) { return C2U("SwXTextGraphicObject"); } -/* -----------------03.05.99 12:28------------------- - * - * --------------------------------------------------*/ + sal_Bool SwXTextGraphicObject::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) { return COMPARE_EQUAL == rServiceName.compareToAscii("com.sun.star.text.TextGraphicObject") || SwXFrame::supportsService(rServiceName); } -/* -----------------03.05.99 12:28------------------- - * - * --------------------------------------------------*/ + uno::Sequence< OUString > SwXTextGraphicObject::getSupportedServiceNames(void) throw( uno::RuntimeException ) { @@ -2999,23 +2809,17 @@ uno::Sequence< OUString > SwXTextGraphicObject::getSupportedServiceNames(void) pArray[aRet.getLength() - 1] = C2U("com.sun.star.text.TextGraphicObject"); return aRet; } -/* -----------------------------20.06.00 10:02-------------------------------- - ---------------------------------------------------------------------------*/ void * SAL_CALL SwXTextGraphicObject::operator new( size_t t) throw() { return SwXTextGraphicObjectBaseClass::operator new(t); } -/* -----------------------------20.06.00 10:02-------------------------------- - ---------------------------------------------------------------------------*/ void SAL_CALL SwXTextGraphicObject::operator delete( void * p) throw() { SwXTextGraphicObjectBaseClass::operator delete(p); } -/* -----------------------------15.12.00 12:45-------------------------------- - ---------------------------------------------------------------------------*/ uno::Reference SAL_CALL SwXTextGraphicObject::getEvents() throw(uno::RuntimeException) @@ -3023,51 +2827,32 @@ uno::Reference SAL_CALL return new SwFrameEventDescriptor( *this ); } -/****************************************************************** - * - ******************************************************************/ -/*-- 11.12.98 16:16:53--------------------------------------------------- - - -----------------------------------------------------------------------*/ SwXTextEmbeddedObject::SwXTextEmbeddedObject( SwDoc *pDoc ) : SwXFrame(FLYCNTTYPE_OLE, aSwMapProvider.GetPropertySet(PROPERTY_MAP_EMBEDDED_OBJECT), pDoc) { } -/*-- 11.12.98 16:16:53--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXTextEmbeddedObject::SwXTextEmbeddedObject(SwFrmFmt& rFmt) : SwXFrame(rFmt, FLYCNTTYPE_OLE, aSwMapProvider.GetPropertySet(PROPERTY_MAP_EMBEDDED_OBJECT)) { } -/*-- 11.12.98 16:16:54--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXTextEmbeddedObject::~SwXTextEmbeddedObject() { } -/*-- 11.12.98 16:16:54--------------------------------------------------- - - -----------------------------------------------------------------------*/ -/* -----------------------------15.03.00 16:32-------------------------------- - ---------------------------------------------------------------------------*/ void SAL_CALL SwXTextEmbeddedObject::acquire()throw() { SwXFrame::acquire(); } -/* -----------------------------15.03.00 16:32-------------------------------- - ---------------------------------------------------------------------------*/ void SAL_CALL SwXTextEmbeddedObject::release()throw() { SwXFrame::release(); } -/* -----------------------------15.03.00 16:32-------------------------------- - ---------------------------------------------------------------------------*/ ::uno::Any SAL_CALL SwXTextEmbeddedObject::queryInterface( const uno::Type& aType ) throw( uno::RuntimeException) { @@ -3076,9 +2861,7 @@ void SAL_CALL SwXTextEmbeddedObject::release()throw() aRet = SwXTextEmbeddedObjectBaseClass::queryInterface(aType); return aRet; } -/* -----------------------------15.03.00 16:32-------------------------------- - ---------------------------------------------------------------------------*/ uno::Sequence< uno::Type > SAL_CALL SwXTextEmbeddedObject::getTypes( ) throw(uno::RuntimeException) { uno::Sequence< uno::Type > aTextEmbeddedTypes = SwXTextEmbeddedObjectBaseClass::getTypes(); @@ -3098,9 +2881,7 @@ uno::Sequence< uno::Type > SAL_CALL SwXTextEmbeddedObject::getTypes( ) throw(un return aTextEmbeddedTypes; } -/* -----------------------------15.03.00 16:32-------------------------------- - ---------------------------------------------------------------------------*/ uno::Sequence< sal_Int8 > SAL_CALL SwXTextEmbeddedObject::getImplementationId( ) throw(uno::RuntimeException) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -3113,46 +2894,33 @@ uno::Sequence< sal_Int8 > SAL_CALL SwXTextEmbeddedObject::getImplementationId( } return aId; } -/*-- 11.12.98 16:16:54--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXTextEmbeddedObject::attach(const uno::Reference< text::XTextRange > & xTextRange) throw( lang::IllegalArgumentException, uno::RuntimeException ) { SwXFrame::attach(xTextRange); } -/*-- 11.12.98 16:16:54--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Reference< text::XTextRange > SwXTextEmbeddedObject::getAnchor(void) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); return SwXFrame::getAnchor(); } -/*-- 11.12.98 16:16:54--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXTextEmbeddedObject::dispose(void) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); SwXFrame::dispose(); } -/*-- 11.12.98 16:16:55--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXTextEmbeddedObject::addEventListener(const uno::Reference< lang::XEventListener > & aListener) throw( uno::RuntimeException ) { SwXFrame::addEventListener(aListener); } -/*-- 11.12.98 16:16:55--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXTextEmbeddedObject::removeEventListener(const uno::Reference< lang::XEventListener > & aListener) throw( uno::RuntimeException ) { SwXFrame::removeEventListener(aListener); } -/*-- 11.12.98 16:16:55--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Reference< lang::XComponent > SwXTextEmbeddedObject::getEmbeddedObject(void) throw( uno::RuntimeException ) { @@ -3195,11 +2963,6 @@ uno::Reference< lang::XComponent > SwXTextEmbeddedObject::getEmbeddedObject(voi return xRet; } -/* --18.05.2006 16:39--------------------------------------------------- - - -----------------------------------------------------------------------*/ - - uno::Reference< embed::XEmbeddedObject > SAL_CALL SwXTextEmbeddedObject::getExtendedControlOverEmbeddedObject() throw( uno::RuntimeException ) { @@ -3293,25 +3056,18 @@ uno::Reference< graphic::XGraphic > SAL_CALL SwXTextEmbeddedObject::getReplaceme return uno::Reference< graphic::XGraphic >(); } -/* -----------------03.05.99 12:28------------------- - * - * --------------------------------------------------*/ OUString SwXTextEmbeddedObject::getImplementationName(void) throw( uno::RuntimeException ) { return C2U("SwXTextEmbeddedObject"); } -/* -----------------03.05.99 12:28------------------- - * - * --------------------------------------------------*/ + sal_Bool SwXTextEmbeddedObject::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) { return COMPARE_EQUAL == rServiceName.compareToAscii("com.sun.star.text.TextEmbeddedObject")|| SwXFrame::supportsService(rServiceName); } -/* -----------------03.05.99 12:28------------------- - * - * --------------------------------------------------*/ + uno::Sequence< OUString > SwXTextEmbeddedObject::getSupportedServiceNames(void) throw( uno::RuntimeException ) { @@ -3321,23 +3077,17 @@ uno::Sequence< OUString > SwXTextEmbeddedObject::getSupportedServiceNames(void) pArray[aRet.getLength() - 1] = C2U("com.sun.star.text.TextEmbeddedObject"); return aRet; } -/* -----------------------------20.06.00 10:02-------------------------------- - ---------------------------------------------------------------------------*/ void * SAL_CALL SwXTextEmbeddedObject::operator new( size_t t) throw() { return SwXTextEmbeddedObjectBaseClass::operator new(t); } -/* -----------------------------20.06.00 10:02-------------------------------- - ---------------------------------------------------------------------------*/ void SAL_CALL SwXTextEmbeddedObject::operator delete( void * p) throw() { SwXTextEmbeddedObjectBaseClass::operator delete(p); } -/* -----------------------------15.12.00 12:45-------------------------------- - ---------------------------------------------------------------------------*/ uno::Reference SAL_CALL SwXTextEmbeddedObject::getEvents() throw(uno::RuntimeException) @@ -3345,22 +3095,14 @@ uno::Reference SAL_CALL return new SwFrameEventDescriptor( *this ); } - -/****************************************************************** - * - ******************************************************************/ TYPEINIT1(SwXOLEListener, SwClient); -/* -----------------------------18.01.2002 09:59------------------------------ - ---------------------------------------------------------------------------*/ SwXOLEListener::SwXOLEListener( SwFmt& rOLEFmt, uno::Reference< XModel > xOLE) : SwClient(&rOLEFmt), xOLEModel(xOLE) { } -/* -----------------------------18.01.2002 09:59------------------------------ - ---------------------------------------------------------------------------*/ SwXOLEListener::~SwXOLEListener() {} @@ -3396,9 +3138,6 @@ void SwXOLEListener::modified( const lang::EventObject& /*rEvent*/ ) pNd->GetDoc()->SetOLEObjModified(); } -/* --------------------------------------------------------------------------- - - ---------------------------------------------------------------------------*/ void SwXOLEListener::disposing( const lang::EventObject& rEvent ) throw( uno::RuntimeException ) { @@ -3420,13 +3159,10 @@ void SwXOLEListener::disposing( const lang::EventObject& rEvent ) DBG_ERROR("OLE Listener couldn't be removed"); } } -/* --------------------------------------------------------------------------- - ---------------------------------------------------------------------------*/ void SwXOLEListener::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew ) { ClientModify(this, pOld, pNew); if(!GetRegisteredIn()) xOLEModel = 0; } - diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx index b5db26084fe9..db9e36bd2a6d 100644 --- a/sw/source/core/unocore/unoftn.cxx +++ b/sw/source/core/unocore/unoftn.cxx @@ -57,7 +57,6 @@ using ::rtl::OUString; /****************************************************************** * SwXFootnote ******************************************************************/ - class SwXFootnote::Impl : public SwClient { @@ -105,9 +104,6 @@ public: }; -/* -----------------------------07.01.00 12:39-------------------------------- - - ---------------------------------------------------------------------------*/ void SwXFootnote::Impl::Invalidate() { if (GetRegisteredIn()) @@ -119,9 +115,6 @@ void SwXFootnote::Impl::Invalidate() m_rThis.SetDoc(0); } -/* -----------------18.01.99 09:12------------------- - * - * --------------------------------------------------*/ void SwXFootnote::Impl::Modify(SfxPoolItem *pOld, SfxPoolItem *pNew) { ClientModify(this, pOld, pNew); @@ -145,25 +138,18 @@ void SwXFootnote::Impl::Modify(SfxPoolItem *pOld, SfxPoolItem *pNew) } } -/*-- 10.12.98 15:31:44--------------------------------------------------- - - -----------------------------------------------------------------------*/ SwXFootnote::SwXFootnote(const bool bEndnote) : SwXText(0, CURSOR_FOOTNOTE) , m_pImpl( new SwXFootnote::Impl(*this, 0, 0, bEndnote) ) { } -/*-- 10.12.98 15:31:45--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXFootnote::SwXFootnote(SwDoc & rDoc, const SwFmtFtn& rFmt) : SwXText(& rDoc, CURSOR_FOOTNOTE) , m_pImpl( new SwXFootnote::Impl(*this, &rDoc, &rFmt, rFmt.IsEndNote()) ) { } -/*-- 10.12.98 15:31:45--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXFootnote::~SwXFootnote() { } @@ -208,17 +194,12 @@ SwXFootnote::CreateXFootnote(SwDoc & rDoc, SwFmtFtn const& rFootnoteFmt) : new SwXFootnote(rDoc, rFootnoteFmt); } -/* -----------------------------13.03.00 12:15-------------------------------- - - ---------------------------------------------------------------------------*/ const uno::Sequence< sal_Int8 > & SwXFootnote::getUnoTunnelId() { static uno::Sequence< sal_Int8 > aSeq = ::CreateUnoTunnelId(); return aSeq; } -/* -----------------------------10.03.00 18:04-------------------------------- - ---------------------------------------------------------------------------*/ sal_Int64 SAL_CALL SwXFootnote::getSomething(const uno::Sequence< sal_Int8 >& rId) throw (uno::RuntimeException) @@ -227,18 +208,12 @@ throw (uno::RuntimeException) return (nRet) ? nRet : SwXText::getSomething(rId); } -/* -----------------------------06.04.00 16:36-------------------------------- - - ---------------------------------------------------------------------------*/ OUString SAL_CALL SwXFootnote::getImplementationName() throw (uno::RuntimeException) { return C2U("SwXFootnote"); } -/* -----------------------------06.04.00 16:36-------------------------------- - - ---------------------------------------------------------------------------*/ static char const*const g_ServicesFootnote[] = { "com.sun.star.text.TextContent", @@ -246,8 +221,10 @@ static char const*const g_ServicesFootnote[] = "com.sun.star.text.Text", "com.sun.star.text.Endnote", // NB: only supported for endnotes! }; + static const size_t g_nServicesEndnote( SAL_N_ELEMENTS(g_ServicesFootnote)); + static const size_t g_nServicesFootnote( g_nServicesEndnote - 1 ); // NB: omit! sal_Bool SAL_CALL SwXFootnote::supportsService(const OUString& rServiceName) @@ -268,9 +245,6 @@ SwXFootnote::getSupportedServiceNames() throw (uno::RuntimeException) g_ServicesFootnote); } -/* -----------------------------21.03.00 15:39-------------------------------- - - ---------------------------------------------------------------------------*/ uno::Sequence< uno::Type > SAL_CALL SwXFootnote::getTypes() throw (uno::RuntimeException) { @@ -279,9 +253,6 @@ SwXFootnote::getTypes() throw (uno::RuntimeException) return ::comphelper::concatSequences(aTypes, aTextTypes); } -/* -----------------------------21.03.00 15:39-------------------------------- - - ---------------------------------------------------------------------------*/ uno::Sequence< sal_Int8 > SAL_CALL SwXFootnote::getImplementationId() throw (uno::RuntimeException) { @@ -295,9 +266,7 @@ SwXFootnote::getImplementationId() throw (uno::RuntimeException) } return aId; } -/* -----------------------------21.03.00 15:46-------------------------------- - ---------------------------------------------------------------------------*/ uno::Any SAL_CALL SwXFootnote::queryInterface(const uno::Type& rType) throw (uno::RuntimeException) @@ -308,9 +277,6 @@ throw (uno::RuntimeException) : ret; } -/*-- 10.12.98 15:31:47--------------------------------------------------- - - -----------------------------------------------------------------------*/ OUString SAL_CALL SwXFootnote::getLabel() throw (uno::RuntimeException) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -332,9 +298,6 @@ OUString SAL_CALL SwXFootnote::getLabel() throw (uno::RuntimeException) return sRet; } -/*-- 10.12.98 15:31:48--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SAL_CALL SwXFootnote::setLabel(const OUString& aLabel) throw (uno::RuntimeException) { @@ -360,9 +323,6 @@ SwXFootnote::setLabel(const OUString& aLabel) throw (uno::RuntimeException) } } -/* -----------------18.02.99 13:32------------------- - * - * --------------------------------------------------*/ void SAL_CALL SwXFootnote::attach(const uno::Reference< text::XTextRange > & xTextRange) throw (lang::IllegalArgumentException, uno::RuntimeException) @@ -432,9 +392,6 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) SetDoc(pNewDoc); } -/*-- 10.12.98 15:31:48--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Reference< text::XTextRange > SAL_CALL SwXFootnote::getAnchor() throw (uno::RuntimeException) { @@ -451,9 +408,7 @@ SwXFootnote::getAnchor() throw (uno::RuntimeException) SwXTextRange::CreateXTextRange(*GetDoc(), *aPam.Start(), aPam.End()); return xRet; } -/*-- 10.12.98 15:31:49--------------------------------------------------- - -----------------------------------------------------------------------*/ void SAL_CALL SwXFootnote::dispose() throw (uno::RuntimeException) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -468,9 +423,6 @@ void SAL_CALL SwXFootnote::dispose() throw (uno::RuntimeException) GetDoc()->DeleteAndJoin( aPam ); } -/*-- 10.12.98 15:31:49--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SAL_CALL SwXFootnote::addEventListener( const uno::Reference< lang::XEventListener > & xListener) @@ -484,9 +436,7 @@ throw (uno::RuntimeException) } m_pImpl->m_ListenerContainer.AddListener(xListener); } -/*-- 10.12.98 15:31:50--------------------------------------------------- - -----------------------------------------------------------------------*/ void SAL_CALL SwXFootnote::removeEventListener( const uno::Reference< lang::XEventListener > & xListener) @@ -501,9 +451,6 @@ throw (uno::RuntimeException) } } -/* -----------------06.05.99 15:31------------------- - * - * --------------------------------------------------*/ const SwStartNode *SwXFootnote::GetStartNode() const { SwFmtFtn const*const pFmt = m_pImpl->GetFootnoteFormat(); @@ -524,9 +471,6 @@ SwXFootnote::CreateCursor() throw (uno::RuntimeException) return createTextCursor(); } -/*-- 10.12.98 15:31:50--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Reference< text::XTextCursor > SAL_CALL SwXFootnote::createTextCursor() throw (uno::RuntimeException) { @@ -545,9 +489,6 @@ SwXFootnote::createTextCursor() throw (uno::RuntimeException) return xRet; } -/*-- 10.12.98 15:31:51--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Reference< text::XTextCursor > SAL_CALL SwXFootnote::createTextCursorByRange( const uno::Reference< text::XTextRange > & xTextPosition) @@ -579,9 +520,6 @@ throw (uno::RuntimeException) return xRet; } -/*-- 13.06.00 14:28:23--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Reference< container::XEnumeration > SAL_CALL SwXFootnote::createEnumeration() throw (uno::RuntimeException) { @@ -599,24 +537,16 @@ SwXFootnote::createEnumeration() throw (uno::RuntimeException) return xRet; } -/*-- 13.06.00 14:28:24--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Type SAL_CALL SwXFootnote::getElementType() throw (uno::RuntimeException) { return text::XTextRange::static_type(); } -/*-- 13.06.00 14:28:24--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool SAL_CALL SwXFootnote::hasElements() throw (uno::RuntimeException) { return sal_True; } -/*-- 11.09.00 13:12:03--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXFootnote::getPropertySetInfo() throw (uno::RuntimeException) @@ -628,9 +558,6 @@ throw (uno::RuntimeException) return xRet; } -/*-- 11.09.00 13:12:04--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SAL_CALL SwXFootnote::setPropertyValue(const ::rtl::OUString&, const uno::Any&) throw (beans::UnknownPropertyException, beans::PropertyVetoException, @@ -640,9 +567,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, //no values to be set throw lang::IllegalArgumentException(); } -/*-- 11.09.00 13:12:04--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Any SAL_CALL SwXFootnote::getPropertyValue(const OUString& rPropertyName) throw (beans::UnknownPropertyException, lang::WrappedTargetException, @@ -683,9 +608,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, return aRet; } -/*-- 11.09.00 13:12:04--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SAL_CALL SwXFootnote::addPropertyChangeListener( const ::rtl::OUString& /*rPropertyName*/, @@ -729,4 +651,3 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, OSL_ENSURE(false, "SwXFootnote::removeVetoableChangeListener(): not implemented"); } - diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx index be4270230577..2e45c3cb957c 100644 --- a/sw/source/core/unocore/unoparagraph.cxx +++ b/sw/source/core/unocore/unoparagraph.cxx @@ -60,10 +60,6 @@ using namespace ::com::sun::star; using ::rtl::OUString; - -/* -----------------------------01.12.00 18:09-------------------------------- - - ---------------------------------------------------------------------------*/ class SwParaSelection { SwCursor & m_rCursor; @@ -101,11 +97,9 @@ SwParaSelection::~SwParaSelection() } } - /****************************************************************** * forward declarations ******************************************************************/ - beans::PropertyState lcl_SwXParagraph_getPropertyState( const SwTxtNode& rTxtNode, const SwAttrSet** ppSet, @@ -116,7 +110,6 @@ beans::PropertyState lcl_SwXParagraph_getPropertyState( /****************************************************************** * SwXParagraph ******************************************************************/ - class SwXParagraph::Impl : public SwClient { @@ -189,9 +182,6 @@ public: }; -/*-- 11.12.98 08:12:58--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SwXParagraph::Impl::Modify(SfxPoolItem *pOld, SfxPoolItem *pNew) { ClientModify(this, pOld, pNew); @@ -201,17 +191,11 @@ void SwXParagraph::Impl::Modify(SfxPoolItem *pOld, SfxPoolItem *pNew) } } -/*-- 11.12.98 08:12:47--------------------------------------------------- - - -----------------------------------------------------------------------*/ SwXParagraph::SwXParagraph() : m_pImpl( new SwXParagraph::Impl(*this) ) { } -/*-- 11.12.98 08:12:47--------------------------------------------------- - - -----------------------------------------------------------------------*/ SwXParagraph::SwXParagraph( uno::Reference< text::XText > const & xParent, SwTxtNode & rTxtNode, @@ -221,9 +205,6 @@ SwXParagraph::SwXParagraph( { } -/*-- 11.12.98 08:12:48--------------------------------------------------- - - -----------------------------------------------------------------------*/ SwXParagraph::~SwXParagraph() { } @@ -290,17 +271,12 @@ bool SwXParagraph::SelectPaM(SwPaM & rPaM) return true; } -/* -----------------------------13.03.00 12:15-------------------------------- - - ---------------------------------------------------------------------------*/ const uno::Sequence< sal_Int8 > & SwXParagraph::getUnoTunnelId() { static uno::Sequence< sal_Int8 > aSeq = ::CreateUnoTunnelId(); return aSeq; } -/* -----------------------------10.03.00 18:04-------------------------------- - ---------------------------------------------------------------------------*/ sal_Int64 SAL_CALL SwXParagraph::getSomething(const uno::Sequence< sal_Int8 >& rId) throw (uno::RuntimeException) @@ -308,17 +284,12 @@ throw (uno::RuntimeException) return ::sw::UnoTunnelImpl(rId, this); } -/* -----------------------------06.04.00 16:37-------------------------------- - - ---------------------------------------------------------------------------*/ OUString SAL_CALL SwXParagraph::getImplementationName() throw (uno::RuntimeException) { return C2U("SwXParagraph"); } -/* -----------------------------06.04.00 16:37-------------------------------- - ---------------------------------------------------------------------------*/ static char const*const g_ServicesParagraph[] = { "com.sun.star.text.TextContent", @@ -330,6 +301,7 @@ static char const*const g_ServicesParagraph[] = "com.sun.star.style.ParagraphPropertiesAsian", "com.sun.star.style.ParagraphPropertiesComplex", }; + static const size_t g_nServicesParagraph( SAL_N_ELEMENTS(g_ServicesParagraph)); @@ -340,9 +312,7 @@ throw (uno::RuntimeException) return ::sw::SupportsServiceImpl( g_nServicesParagraph, g_ServicesParagraph, rServiceName); } -/* -----------------------------06.04.00 16:37-------------------------------- - ---------------------------------------------------------------------------*/ uno::Sequence< OUString > SAL_CALL SwXParagraph::getSupportedServiceNames() throw (uno::RuntimeException) { @@ -350,9 +320,6 @@ SwXParagraph::getSupportedServiceNames() throw (uno::RuntimeException) g_nServicesParagraph, g_ServicesParagraph); } -/* -----------------------------11.07.00 14:48-------------------------------- - - ---------------------------------------------------------------------------*/ void SwXParagraph::attachToText(SwXText & rParent, SwTxtNode & rTxtNode) { @@ -372,9 +339,6 @@ SwXParagraph::attachToText(SwXText & rParent, SwTxtNode & rTxtNode) } } -/*-- 11.12.98 08:12:49--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXParagraph::getPropertySetInfo() throw (uno::RuntimeException) @@ -385,9 +349,7 @@ throw (uno::RuntimeException) m_pImpl->m_rPropSet.getPropertySetInfo(); return xRef; } -/*-- 11.12.98 08:12:49--------------------------------------------------- - -----------------------------------------------------------------------*/ void SAL_CALL SwXParagraph::setPropertyValue(const OUString& rPropertyName, const uno::Any& rValue) @@ -403,9 +365,6 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, m_pImpl->SetPropertyValues_Impl( aPropertyNames, aValues ); } -/*-- 11.12.98 08:12:49--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Any SwXParagraph::getPropertyValue(const OUString& rPropertyName) throw (beans::UnknownPropertyException, lang::WrappedTargetException, @@ -418,9 +377,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, m_pImpl->GetPropertyValues_Impl(aPropertyNames); return aRet.getConstArray()[0]; } -/* -----------------------------02.04.01 11:43-------------------------------- - ---------------------------------------------------------------------------*/ void SwXParagraph::Impl::SetPropertyValues_Impl( const uno::Sequence< OUString >& rPropertyNames, const uno::Sequence< uno::Any >& rValues ) @@ -482,9 +439,6 @@ throw (beans::PropertyVetoException, lang::IllegalArgumentException, } } -/* -----------------------------02.04.01 11:43-------------------------------- - - ---------------------------------------------------------------------------*/ uno::Sequence< uno::Any > SwXParagraph::Impl::GetPropertyValues_Impl( const uno::Sequence< OUString > & rPropertyNames ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, @@ -526,9 +480,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, return aValues; } -/* -----------------------------04.11.03 11:43-------------------------------- - - ---------------------------------------------------------------------------*/ uno::Sequence< uno::Any > SAL_CALL SwXParagraph::getPropertyValues(const uno::Sequence< OUString >& rPropertyNames) throw (uno::RuntimeException) @@ -557,9 +508,6 @@ throw (uno::RuntimeException) return aValues; } -/* -----------------------------02.04.01 11:43-------------------------------- - - ---------------------------------------------------------------------------*/ void SAL_CALL SwXParagraph::addPropertiesChangeListener( const uno::Sequence< OUString >& /*aPropertyNames*/, const uno::Reference< beans::XPropertiesChangeListener >& /*xListener*/ ) @@ -568,9 +516,7 @@ throw (uno::RuntimeException) OSL_ENSURE(false, "SwXParagraph::addPropertiesChangeListener(): not implemented"); } -/* -----------------------------02.04.01 11:43-------------------------------- - ---------------------------------------------------------------------------*/ void SAL_CALL SwXParagraph::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& /*xListener*/ ) throw (uno::RuntimeException) @@ -578,9 +524,7 @@ throw (uno::RuntimeException) OSL_ENSURE(false, "SwXParagraph::removePropertiesChangeListener(): not implemented"); } -/* -----------------------------02.04.01 11:43-------------------------------- - ---------------------------------------------------------------------------*/ void SAL_CALL SwXParagraph::firePropertiesChangeEvent( const uno::Sequence< OUString >& /*aPropertyNames*/, const uno::Reference< beans::XPropertiesChangeListener >& /*xListener*/ ) @@ -589,9 +533,6 @@ void SAL_CALL SwXParagraph::firePropertiesChangeEvent( OSL_ENSURE(false, "SwXParagraph::firePropertiesChangeEvent(): not implemented"); } -/* -----------------------------25.09.03 11:09-------------------------------- - - ---------------------------------------------------------------------------*/ /* disabled for #i46921# */ @@ -689,7 +630,6 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) return aFailed; } - uno::Sequence< beans::GetPropertyTolerantResult > SAL_CALL SwXParagraph::getPropertyValuesTolerant( const uno::Sequence< OUString >& rPropertyNames ) @@ -713,7 +653,6 @@ throw (uno::RuntimeException) return aRes; } - uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL SwXParagraph::getDirectPropertyValuesTolerant( const uno::Sequence< OUString >& rPropertyNames ) @@ -724,7 +663,6 @@ throw (uno::RuntimeException) return m_pImpl->GetPropertyValuesTolerant_Impl( rPropertyNames, true ); } - uno::Sequence< beans::GetDirectPropertyTolerantResult > SwXParagraph::Impl::GetPropertyValuesTolerant_Impl( const uno::Sequence< OUString >& rPropertyNames, @@ -843,9 +781,6 @@ throw (uno::RuntimeException) return aResult; } -/* -----------------------------12.09.00 11:09-------------------------------- - - ---------------------------------------------------------------------------*/ bool ::sw::GetDefaultTextContentValue( uno::Any& rAny, const OUString& rPropertyName, USHORT nWID) { @@ -877,9 +812,7 @@ bool ::sw::GetDefaultTextContentValue( } return TRUE; } -/*-- 11.12.98 08:12:50--------------------------------------------------- - -----------------------------------------------------------------------*/ void SAL_CALL SwXParagraph::addPropertyChangeListener( const ::rtl::OUString& /*rPropertyName*/, @@ -891,9 +824,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, "SwXParagraph::addPropertyChangeListener(): not implemented"); } -/*-- 11.12.98 08:12:50--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SAL_CALL SwXParagraph::removePropertyChangeListener( const ::rtl::OUString& /*rPropertyName*/, @@ -905,9 +835,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, "SwXParagraph::removePropertyChangeListener(): not implemented"); } -/*-- 11.12.98 08:12:50--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SAL_CALL SwXParagraph::addVetoableChangeListener( const ::rtl::OUString& /*rPropertyName*/, @@ -919,9 +846,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, "SwXParagraph::addVetoableChangeListener(): not implemented"); } -/*-- 11.12.98 08:12:51--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SAL_CALL SwXParagraph::removeVetoableChangeListener( const ::rtl::OUString& /*rPropertyName*/, @@ -933,7 +857,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, "SwXParagraph::removeVetoableChangeListener(): not implemented"); } -//----------------------------------------------------------------------------- beans::PropertyState lcl_SwXParagraph_getPropertyState( // SwUnoCrsr& rUnoCrsr, const SwTxtNode& rTxtNode, @@ -993,9 +916,6 @@ throw (beans::UnknownPropertyException) return eRet; } -/*-- 05.03.99 11:37:30--------------------------------------------------- - - -----------------------------------------------------------------------*/ beans::PropertyState SAL_CALL SwXParagraph::getPropertyState(const OUString& rPropertyName) throw (beans::UnknownPropertyException, uno::RuntimeException) @@ -1019,9 +939,6 @@ throw (beans::UnknownPropertyException, uno::RuntimeException) lcl_SwXParagraph_getPropertyState(rTxtNode, &pSet, *pEntry, bDummy); return eRet; } -/*-- 05.03.99 11:37:32--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Sequence< beans::PropertyState > SAL_CALL SwXParagraph::getPropertyStates( @@ -1066,9 +983,6 @@ throw (beans::UnknownPropertyException, uno::RuntimeException) return aRet; } -/*-- 05.03.99 11:37:33--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SAL_CALL SwXParagraph::setPropertyToDefault(const OUString& rPropertyName) throw (beans::UnknownPropertyException, uno::RuntimeException) @@ -1143,9 +1057,6 @@ throw (beans::UnknownPropertyException, uno::RuntimeException) } } -/*-- 05.03.99 11:37:33--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Any SAL_CALL SwXParagraph::getPropertyDefault(const OUString& rPropertyName) throw (beans::UnknownPropertyException, lang::WrappedTargetException, @@ -1181,9 +1092,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, return aRet; } -/*-- 11.12.98 08:12:51--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SAL_CALL SwXParagraph::attach(const uno::Reference< text::XTextRange > & /*xTextRange*/) throw (lang::IllegalArgumentException, uno::RuntimeException) @@ -1195,9 +1103,6 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) throw uno::RuntimeException(); } -/*-- 11.12.98 08:12:51--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Reference< text::XTextRange > SAL_CALL SwXParagraph::getAnchor() throw (uno::RuntimeException) { @@ -1214,9 +1119,6 @@ SwXParagraph::getAnchor() throw (uno::RuntimeException) return xRet; } -/*-- 11.12.98 08:12:52--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SAL_CALL SwXParagraph::dispose() throw (uno::RuntimeException) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -1234,9 +1136,6 @@ void SAL_CALL SwXParagraph::dispose() throw (uno::RuntimeException) } } -/*-- 11.12.98 08:12:52--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SAL_CALL SwXParagraph::addEventListener( const uno::Reference< lang::XEventListener > & xListener) throw (uno::RuntimeException) @@ -1249,9 +1148,7 @@ throw (uno::RuntimeException) } m_pImpl->m_ListenerContainer.AddListener(xListener); } -/*-- 11.12.98 08:12:53--------------------------------------------------- - -----------------------------------------------------------------------*/ void SAL_CALL SwXParagraph::removeEventListener( const uno::Reference< lang::XEventListener > & xListener) throw (uno::RuntimeException) @@ -1265,9 +1162,6 @@ throw (uno::RuntimeException) } } -/*-- 11.12.98 08:12:53--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Reference< container::XEnumeration > SAL_CALL SwXParagraph::createEnumeration() throw (uno::RuntimeException) { @@ -1283,25 +1177,17 @@ SwXParagraph::createEnumeration() throw (uno::RuntimeException) return xRef; } -/*-- 11.12.98 08:12:54--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Type SAL_CALL SwXParagraph::getElementType() throw (uno::RuntimeException) { return text::XTextRange::static_type(); } -/*-- 11.12.98 08:12:54--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool SAL_CALL SwXParagraph::hasElements() throw (uno::RuntimeException) { vos::OGuard aGuard(Application::GetSolarMutex()); return (GetTxtNode()) ? sal_True : sal_False; } -/*-- 11.12.98 08:12:55--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Reference< text::XText > SAL_CALL SwXParagraph::getText() throw (uno::RuntimeException) { @@ -1310,9 +1196,6 @@ SwXParagraph::getText() throw (uno::RuntimeException) return m_pImpl->m_xParentText; } -/*-- 11.12.98 08:12:55--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Reference< text::XTextRange > SAL_CALL SwXParagraph::getStart() throw (uno::RuntimeException) { @@ -1329,9 +1212,7 @@ SwXParagraph::getStart() throw (uno::RuntimeException) new SwXTextRange(aPam, xParent); return xRet; } -/*-- 11.12.98 08:12:56--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Reference< text::XTextRange > SAL_CALL SwXParagraph::getEnd() throw (uno::RuntimeException) { @@ -1349,9 +1230,6 @@ SwXParagraph::getEnd() throw (uno::RuntimeException) return xRet; } -/*-- 11.12.98 08:12:56--------------------------------------------------- - - -----------------------------------------------------------------------*/ OUString SAL_CALL SwXParagraph::getString() throw (uno::RuntimeException) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -1374,9 +1252,7 @@ OUString SAL_CALL SwXParagraph::getString() throw (uno::RuntimeException) } return aRet; } -/*-- 11.12.98 08:12:57--------------------------------------------------- - -----------------------------------------------------------------------*/ void SAL_CALL SwXParagraph::setString(const OUString& aString) throw (uno::RuntimeException) { @@ -1407,9 +1283,6 @@ throw (uno::RuntimeException) } } -/* -----------------23.03.99 12:49------------------- - * - * --------------------------------------------------*/ uno::Reference< container::XEnumeration > SAL_CALL SwXParagraph::createContentEnumeration(const OUString& rServiceName) throw (uno::RuntimeException) @@ -1429,9 +1302,7 @@ throw (uno::RuntimeException) new SwXParaFrameEnumeration(aPam, PARAFRAME_PORTION_PARAGRAPH); return xRet; } -/* -----------------23.03.99 12:49------------------- - * - * --------------------------------------------------*/ + uno::Sequence< OUString > SAL_CALL SwXParagraph::getAvailableServiceNames() throw (uno::RuntimeException) { @@ -1441,7 +1312,6 @@ SwXParagraph::getAvailableServiceNames() throw (uno::RuntimeException) return aRet; } - // MetadatableMixin ::sfx2::Metadatable* SwXParagraph::GetCoreObject() { @@ -1459,4 +1329,3 @@ uno::Reference SwXParagraph::GetModel() } return 0; } - diff --git a/sw/source/core/unocore/unoredlines.cxx b/sw/source/core/unocore/unoredlines.cxx index 91fbcfa0f5f7..c59d12b0f2d7 100644 --- a/sw/source/core/unocore/unoredlines.cxx +++ b/sw/source/core/unocore/unoredlines.cxx @@ -47,22 +47,15 @@ using namespace ::com::sun::star; using ::rtl::OUString; -/*-- 11.01.01 15:28:54--------------------------------------------------- - - -----------------------------------------------------------------------*/ SwXRedlines::SwXRedlines(SwDoc* _pDoc) : SwUnoCollection(_pDoc) { } -/*-- 11.01.01 15:28:55--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXRedlines::~SwXRedlines() { } -/*-- 11.01.01 15:28:55--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Int32 SwXRedlines::getCount( ) throw(uno::RuntimeException) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -71,9 +64,7 @@ sal_Int32 SwXRedlines::getCount( ) throw(uno::RuntimeException) const SwRedlineTbl& rRedTbl = GetDoc()->GetRedlineTbl(); return rRedTbl.Count(); } -/*-- 11.01.01 15:28:55--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Any SwXRedlines::getByIndex(sal_Int32 nIndex) throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException ) { @@ -91,9 +82,7 @@ uno::Any SwXRedlines::getByIndex(sal_Int32 nIndex) throw lang::IndexOutOfBoundsException(); return aRet; } -/*-- 11.01.01 15:28:55--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Reference< container::XEnumeration > SwXRedlines::createEnumeration(void) throw( uno::RuntimeException ) { @@ -102,16 +91,12 @@ uno::Reference< container::XEnumeration > SwXRedlines::createEnumeration(void) throw uno::RuntimeException(); return uno::Reference< container::XEnumeration >(new SwXRedlineEnumeration(*GetDoc())); } -/*-- 11.01.01 15:28:55--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Type SwXRedlines::getElementType( ) throw(uno::RuntimeException) { return ::getCppuType((uno::Reference*)0); } -/*-- 11.01.01 15:28:56--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool SwXRedlines::hasElements( ) throw(uno::RuntimeException) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -120,34 +105,26 @@ sal_Bool SwXRedlines::hasElements( ) throw(uno::RuntimeException) const SwRedlineTbl& rRedTbl = GetDoc()->GetRedlineTbl(); return rRedTbl.Count() > 0; } -/*-- 11.01.01 15:28:56--------------------------------------------------- - -----------------------------------------------------------------------*/ OUString SwXRedlines::getImplementationName(void) throw( uno::RuntimeException ) { return C2U("SwXRedlines"); } -/*-- 11.01.01 15:28:56--------------------------------------------------- - -----------------------------------------------------------------------*/ BOOL SwXRedlines::supportsService(const rtl::OUString& /*ServiceName*/) throw( uno::RuntimeException ) { DBG_ERROR("not implemented"); return FALSE; } -/*-- 11.01.01 15:28:57--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Sequence< OUString > SwXRedlines::getSupportedServiceNames(void) throw( uno::RuntimeException ) { DBG_ERROR("not implemented"); return uno::Sequence< OUString >(); } -/*-- 11.01.01 15:28:57--------------------------------------------------- - -----------------------------------------------------------------------*/ beans::XPropertySet* SwXRedlines::GetObject( SwRedline& rRedline, SwDoc& rDoc ) { SwPageDesc* pStdDesc = rDoc.GetPageDescFromPool(RES_POOLPAGE_STANDARD); @@ -163,33 +140,25 @@ beans::XPropertySet* SwXRedlines::GetObject( SwRedline& rRedline, SwDoc& rDoc pxRedline = new SwXRedline(rRedline, rDoc); return pxRedline; } -/*-- 12.01.01 15:06:10--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXRedlineEnumeration::SwXRedlineEnumeration(SwDoc& rDoc) : pDoc(&rDoc), nCurrentIndex(0) { pDoc->GetPageDescFromPool(RES_POOLPAGE_STANDARD)->Add(this); } -/*-- 12.01.01 15:06:10--------------------------------------------------- - -----------------------------------------------------------------------*/ SwXRedlineEnumeration::~SwXRedlineEnumeration() { } -/*-- 12.01.01 15:06:10--------------------------------------------------- - -----------------------------------------------------------------------*/ BOOL SwXRedlineEnumeration::hasMoreElements(void) throw( uno::RuntimeException ) { if(!pDoc) throw uno::RuntimeException(); return pDoc->GetRedlineTbl().Count() > nCurrentIndex; } -/*-- 12.01.01 15:06:10--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Any SwXRedlineEnumeration::nextElement(void) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ) { @@ -203,30 +172,22 @@ uno::Any SwXRedlineEnumeration::nextElement(void) aRet <<= xRet; return aRet; } -/*-- 12.01.01 15:06:10--------------------------------------------------- - -----------------------------------------------------------------------*/ rtl::OUString SwXRedlineEnumeration::getImplementationName(void) throw( uno::RuntimeException ) { return C2U("SwXRedlineEnumeration"); } -/*-- 12.01.01 15:06:10--------------------------------------------------- - -----------------------------------------------------------------------*/ BOOL SwXRedlineEnumeration::supportsService(const rtl::OUString& /*ServiceName*/) throw( uno::RuntimeException ) { return FALSE; } -/*-- 12.01.01 15:06:11--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Sequence< OUString > SwXRedlineEnumeration::getSupportedServiceNames(void) throw( uno::RuntimeException ) { return uno::Sequence< OUString >(); } -/*-- 12.01.01 15:06:11--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXRedlineEnumeration::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew) { ClientModify(this, pOld, pNew); diff --git a/sw/source/core/unocore/unosrch.cxx b/sw/source/core/unocore/unosrch.cxx index 277eef1693f5..7ce245ee7eb1 100644 --- a/sw/source/core/unocore/unosrch.cxx +++ b/sw/source/core/unocore/unosrch.cxx @@ -46,13 +46,6 @@ using namespace ::com::sun::star; using ::rtl::OUString; -/****************************************************************************** - * - ******************************************************************************/ - -/* -----------------23.06.99 12:19------------------- - - --------------------------------------------------*/ class SwSearchProperties_Impl { beans::PropertyValue** pValueArr; // @@ -69,9 +62,7 @@ public: void FillItemSet(SfxItemSet& rSet, sal_Bool bIsValueSearch) const; sal_Bool HasAttributes() const; }; -/* -----------------23.06.99 13:08------------------- - --------------------------------------------------*/ SwSearchProperties_Impl::SwSearchProperties_Impl() : nArrLen(0), aPropertyEntries( aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_CURSOR)->getPropertyMap()->getPropertyEntries()) @@ -81,18 +72,14 @@ SwSearchProperties_Impl::SwSearchProperties_Impl() : for(sal_uInt32 i = 0; i < nArrLen; i++) pValueArr[i] = 0; } -/* -----------------23.06.99 13:08------------------- - --------------------------------------------------*/ SwSearchProperties_Impl::~SwSearchProperties_Impl() { for(sal_uInt32 i = 0; i < nArrLen; i++) delete pValueArr[i]; delete[] pValueArr; } -/* -----------------23.06.99 13:09------------------- - --------------------------------------------------*/ void SwSearchProperties_Impl::SetProperties(const uno::Sequence< beans::PropertyValue >& aSearchAttribs) throw( beans::UnknownPropertyException, lang::IllegalArgumentException, uno::RuntimeException ) { @@ -121,9 +108,7 @@ void SwSearchProperties_Impl::SetProperties(const uno::Sequence< beans::Prope pValueArr[nIndex] = new beans::PropertyValue(pProps[i]); } } -/* -----------------23.06.99 13:08------------------- - --------------------------------------------------*/ const uno::Sequence< beans::PropertyValue > SwSearchProperties_Impl::GetProperties() const { sal_uInt32 nPropCount = 0; @@ -144,9 +129,7 @@ const uno::Sequence< beans::PropertyValue > SwSearchProperties_Impl::GetProperti } return aRet; } -/* -----------------23.06.99 13:06------------------- - --------------------------------------------------*/ void SwSearchProperties_Impl::FillItemSet(SfxItemSet& rSet, sal_Bool bIsValueSearch) const { // @@ -420,9 +403,7 @@ void SwSearchProperties_Impl::FillItemSet(SfxItemSet& rSet, sal_Bool bIsValueSea delete pCasemapItem ; delete pBrushItem ; } -/* -----------------23.06.99 14:18------------------- - --------------------------------------------------*/ sal_Bool SwSearchProperties_Impl::HasAttributes() const { for(sal_uInt32 i = 0; i < nArrLen; i++) @@ -431,9 +412,6 @@ sal_Bool SwSearchProperties_Impl::HasAttributes() const return sal_False; } -/*-- 14.12.98 13:07:10 --------------------------------------------------- - - -----------------------------------------------------------------------*/ SwXTextSearch::SwXTextSearch() : pSearchProperties( new SwSearchProperties_Impl), pReplaceProperties( new SwSearchProperties_Impl), @@ -452,25 +430,19 @@ SwXTextSearch::SwXTextSearch() : bIsValueSearch(sal_True) { } -/*-- 14.12.98 13:07:12 --------------------------------------------------- - -----------------------------------------------------------------------*/ SwXTextSearch::~SwXTextSearch() { delete pSearchProperties; delete pReplaceProperties; } -/* -----------------------------10.03.00 18:02-------------------------------- - ---------------------------------------------------------------------------*/ const uno::Sequence< sal_Int8 > & SwXTextSearch::getUnoTunnelId() { static uno::Sequence< sal_Int8 > aSeq = ::CreateUnoTunnelId(); return aSeq; } -/* -----------------------------10.03.00 18:04-------------------------------- - ---------------------------------------------------------------------------*/ sal_Int64 SAL_CALL SwXTextSearch::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw(uno::RuntimeException) { @@ -482,50 +454,38 @@ sal_Int64 SAL_CALL SwXTextSearch::getSomething( const uno::Sequence< sal_Int8 >& } return 0; } -/*-- 14.12.98 13:07:12--------------------------------------------------- - -----------------------------------------------------------------------*/ OUString SwXTextSearch::getSearchString(void) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); return sSearchText; } -/*-- 14.12.98 13:07:12--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXTextSearch::setSearchString(const OUString& rString) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); sSearchText = String(rString); } -/*-- 14.12.98 13:07:12--------------------------------------------------- - -----------------------------------------------------------------------*/ OUString SwXTextSearch::getReplaceString(void) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); return sReplaceText; } -/*-- 14.12.98 13:07:12--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXTextSearch::setReplaceString(const OUString& rReplaceString) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); sReplaceText = String(rReplaceString); } -/*-- 14.12.98 13:07:13--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Reference< beans::XPropertySetInfo > SwXTextSearch::getPropertySetInfo(void) throw( uno::RuntimeException ) { static uno::Reference< beans::XPropertySetInfo > aRef = m_pPropSet->getPropertySetInfo(); return aRef; } -/*-- 14.12.98 13:07:13--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXTextSearch::setPropertyValue(const OUString& rPropertyName, const uno::Any& aValue) throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException ) @@ -558,9 +518,7 @@ void SwXTextSearch::setPropertyValue(const OUString& rPropertyName, const uno::A else throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); } -/*-- 14.12.98 13:07:13--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Any SwXTextSearch::getPropertyValue(const OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); @@ -597,127 +555,93 @@ SET_UINT16: throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); return aRet; } -/*-- 14.12.98 13:07:13--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXTextSearch::addPropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { DBG_WARNING("not implemented"); } -/*-- 14.12.98 13:07:13--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXTextSearch::removePropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) throw(beans::UnknownPropertyException, lang::WrappedTargetException,uno::RuntimeException ) { DBG_WARNING("not implemented"); } -/*-- 14.12.98 13:07:14--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXTextSearch::addVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/) throw(beans::UnknownPropertyException, lang::WrappedTargetException,uno::RuntimeException ) { DBG_WARNING("not implemented"); } -/*-- 14.12.98 13:07:14--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXTextSearch::removeVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/) throw(beans::UnknownPropertyException, lang::WrappedTargetException,uno::RuntimeException ) { DBG_WARNING("not implemented"); } -/*-- 14.12.98 13:07:14--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool SwXTextSearch::getValueSearch(void) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); return bIsValueSearch; } -/*-- 14.12.98 13:07:15--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXTextSearch::setValueSearch(sal_Bool ValueSearch_) throw( uno::RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); bIsValueSearch = ValueSearch_; } -/*-- 14.12.98 13:07:15--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Sequence< beans::PropertyValue > SwXTextSearch::getSearchAttributes(void) throw( uno::RuntimeException ) { return pSearchProperties->GetProperties(); } -/*-- 14.12.98 13:07:16--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXTextSearch::setSearchAttributes(const uno::Sequence< beans::PropertyValue >& rSearchAttribs) throw( beans::UnknownPropertyException, lang::IllegalArgumentException, uno::RuntimeException ) { pSearchProperties->SetProperties(rSearchAttribs); } -/*-- 14.12.98 13:07:16--------------------------------------------------- - -----------------------------------------------------------------------*/ uno::Sequence< beans::PropertyValue > SwXTextSearch::getReplaceAttributes(void) throw( uno::RuntimeException ) { return pReplaceProperties->GetProperties(); } -/*-- 14.12.98 13:07:17--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwXTextSearch::setReplaceAttributes(const uno::Sequence< beans::PropertyValue >& rReplaceAttribs) throw( beans::UnknownPropertyException, lang::IllegalArgumentException, uno::RuntimeException ) { pReplaceProperties->SetProperties(rReplaceAttribs); } -/* -----------------23.06.99 14:13------------------- - --------------------------------------------------*/ void SwXTextSearch::FillSearchItemSet(SfxItemSet& rSet) const { pSearchProperties->FillItemSet(rSet, bIsValueSearch); } -/* -----------------23.06.99 14:14------------------- - --------------------------------------------------*/ void SwXTextSearch::FillReplaceItemSet(SfxItemSet& rSet) const { pReplaceProperties->FillItemSet(rSet, bIsValueSearch); } -/* -----------------23.06.99 14:17------------------- - --------------------------------------------------*/ sal_Bool SwXTextSearch::HasSearchAttributes() const { return pSearchProperties->HasAttributes(); } -/* -----------------23.06.99 14:17------------------- - --------------------------------------------------*/ sal_Bool SwXTextSearch::HasReplaceAttributes() const { return pReplaceProperties->HasAttributes(); } -/* -----------------------------19.04.00 14:43-------------------------------- - ---------------------------------------------------------------------------*/ OUString SwXTextSearch::getImplementationName(void) throw( uno::RuntimeException ) { return C2U("SwXTextSearch"); } -/* -----------------------------19.04.00 14:43-------------------------------- - ---------------------------------------------------------------------------*/ BOOL SwXTextSearch::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) { return C2U("com.sun.star.util.SearchDescriptor") == rServiceName || C2U("com.sun.star.util.ReplaceDescriptor") == rServiceName; } -/* -----------------------------19.04.00 14:43-------------------------------- - ---------------------------------------------------------------------------*/ uno::Sequence< OUString > SwXTextSearch::getSupportedServiceNames(void) throw( uno::RuntimeException ) { uno::Sequence< OUString > aRet(2); @@ -757,6 +681,3 @@ void SwXTextSearch::FillSearchOptions( util::SearchOptions& rSearchOpt ) const // inSelection?? // aSrchParam.SetSrchInSelection(TypeConversion::toBOOL(aVal)); } - - - -- cgit v1.2.3