diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2012-08-05 22:14:59 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2012-08-05 22:14:59 +0200 |
| commit | 7d0a2c0b3da61b73a36fb43ba3c8165a6be11e92 (patch) | |
| tree | 590a02da5164c3f818a27645894c40a9328994c2 | |
| parent | e238a59430ce1f2e45469faf14d9c0a4d151b60e (diff) | |
Remove commented out code
Change-Id: I0e0198eaef062799a7456cf9fe39a2b33bc7e02b
46 files changed, 5 insertions, 975 deletions
diff --git a/binfilter/bf_sc/source/core/data/sc_column2.cxx b/binfilter/bf_sc/source/core/data/sc_column2.cxx index e139ca9fb..d6e4b35ad 100644 --- a/binfilter/bf_sc/source/core/data/sc_column2.cxx +++ b/binfilter/bf_sc/source/core/data/sc_column2.cxx @@ -565,10 +565,6 @@ namespace binfilter { /*N*/ SfxItemSet* pSet = new SfxItemSet( pEngine->GetEmptyItemSet() ); /*N*/ pPattern->FillEditItemSet( pSet, pCondSet ); /*N*/ -/*N*/ // no longer needed, are setted with the text (is faster) -/*N*/ // pEngine->SetDefaults( pSet ); -/*N*/ -/*N*/ /*N*/ Size aPaper = Size( 1000000, 1000000 ); /*N*/ if ( eOrient==SVX_ORIENTATION_STACKED && !bAsianVertical ) /*?*/ aPaper.Width() = 1; @@ -1036,11 +1032,6 @@ namespace binfilter { /*N*/ } /*N*/ } - -// ========================================================================================= - - - // ========================================================================================= /*N*/ BOOL ScColumn::TestTabRefAbs(USHORT nTable) diff --git a/binfilter/bf_sc/source/core/data/sc_dociter.cxx b/binfilter/bf_sc/source/core/data/sc_dociter.cxx index ef206bd3d..551a68a21 100644 --- a/binfilter/bf_sc/source/core/data/sc_dociter.cxx +++ b/binfilter/bf_sc/source/core/data/sc_dociter.cxx @@ -230,15 +230,6 @@ namespace binfilter { /*N*/ return GetThis(rValue, rErr); /*N*/ } -/* ist inline: -BOOL ScValueIterator::GetNext(double& rValue, USHORT& rErr) -{ - ++nRow; - return GetThis(rValue, rErr); -} -*/ - -//------------------------------------------------------------------------ //------------------------------------------------------------------------ /*N*/ ScQueryValueIterator::ScQueryValueIterator(ScDocument* pDocument, USHORT nTable, const ScQueryParam& rParam) : @@ -830,12 +821,6 @@ BOOL ScValueIterator::GetNext(double& rValue, USHORT& rErr) //------------------------------------------------------------------------------- - -//------------------------------------------------------------------------------- - - -//------------------------------------------------------------------------------- - /*N*/ ScDocAttrIterator::ScDocAttrIterator(ScDocument* pDocument, USHORT nTable, /*N*/ USHORT nCol1, USHORT nRow1, /*N*/ USHORT nCol2, USHORT nRow2) : diff --git a/binfilter/bf_sc/source/core/data/sc_table2.cxx b/binfilter/bf_sc/source/core/data/sc_table2.cxx index 70663ea16..39a562c88 100644 --- a/binfilter/bf_sc/source/core/data/sc_table2.cxx +++ b/binfilter/bf_sc/source/core/data/sc_table2.cxx @@ -279,28 +279,9 @@ void lcl_LoadRange( SvStream& rStream, ScRange** ppRange ); /*N*/ aPattern.GetItemSet().Put( ScProtectionAttr( FALSE ) ); /*N*/ ApplyPatternArea( nCol1, nRow1, nCol2, nRow2, aPattern ); /*N*/ } -/*N*/ -/* if( !--nRecalcLvl ) - SetDrawPageSize(); -*/ /*N*/ } /*N*/ } - - - -// pTable = Clipboard - - - - - - -// Markierung von diesem Dokument - - - - /*N*/ void ScTable::StartAllListeners() /*N*/ { /*N*/ for (USHORT i=0; i<=MAXCOL; i++) @@ -314,11 +295,6 @@ void lcl_LoadRange( SvStream& rStream, ScRange** ppRange ); /*N*/ aCol[i].StartNameListeners( bOnlyRelNames ); /*N*/ } - - - - - /*N*/ void ScTable::CopyToTable(USHORT nCol1, USHORT nRow1, USHORT nCol2, USHORT nRow2, /*N*/ USHORT nFlags, BOOL bMarked, ScTable* pDestTab, /*N*/ const ScMarkData* pMarkData, @@ -359,12 +335,6 @@ void lcl_LoadRange( SvStream& rStream, ScRange** ppRange ); /*N*/ } /*N*/ } - - - - - - /*N*/ void ScTable::MarkScenarioIn( ScMarkData& rDestMark, USHORT nNeededBits ) const /*N*/ { /*N*/ DBG_ASSERT( bScenario, "bScenario == FALSE" ); diff --git a/binfilter/bf_sc/source/core/inc/interpre.hxx b/binfilter/bf_sc/source/core/inc/interpre.hxx index 90bbf2f6b..8c70e1bb9 100644 --- a/binfilter/bf_sc/source/core/inc/interpre.hxx +++ b/binfilter/bf_sc/source/core/inc/interpre.hxx @@ -244,10 +244,6 @@ StackVar GetStackType(); // peek StackType of Parameter, Parameter 1 == TOS, 2 == TOS-1, ... StackVar GetStackType( BYTE nParam ); BYTE GetByte() { return cPar; } -/* -short GetShort(); -double GetLong(); -*/ // generiert aus DoubleRef positionsabhaengige SingleRef BOOL DoubleRefToPosSingleRef( const ScRange& rRange, ScAddress& rAdr ); double GetDouble(); diff --git a/binfilter/bf_sch/source/core/sch_chtmode9.cxx b/binfilter/bf_sch/source/core/sch_chtmode9.cxx index 051ebd322..4b661ff85 100644 --- a/binfilter/bf_sch/source/core/sch_chtmode9.cxx +++ b/binfilter/bf_sch/source/core/sch_chtmode9.cxx @@ -137,39 +137,16 @@ namespace binfilter { /*N*/ case CHSTYLE_2D_AREA: /*N*/ case CHSTYLE_2D_STACKEDAREA: /*N*/ case CHSTYLE_2D_PERCENTAREA: -/* case CHSTYLE_2D_PIE: - case CHSTYLE_3D_STRIPE: - case CHSTYLE_3D_COLUMN: - case CHSTYLE_3D_FLATCOLUMN: - case CHSTYLE_3D_STACKEDFLATCOLUMN: - case CHSTYLE_3D_PERCENTFLATCOLUMN: - case CHSTYLE_3D_AREA: - case CHSTYLE_3D_STACKEDAREA: - case CHSTYLE_3D_PERCENTAREA: - case CHSTYLE_3D_SURFACE: - case CHSTYLE_3D_PIE: -*/ case CHSTYLE_2D_XY: -/*N*/ // case CHSTYLE_3D_XYZ: /*N*/ case CHSTYLE_2D_LINESYMBOLS: /*N*/ case CHSTYLE_2D_STACKEDLINESYM: /*N*/ case CHSTYLE_2D_PERCENTLINESYM: /*N*/ case CHSTYLE_2D_XYSYMBOLS: /*N*/ case CHSTYLE_3D_XYZSYMBOLS: -/*N*/ // case CHSTYLE_2D_DONUT1: -/*N*/ // case CHSTYLE_2D_DONUT2: /*N*/ case CHSTYLE_3D_BAR: /*N*/ case CHSTYLE_3D_FLATBAR: /*N*/ case CHSTYLE_3D_STACKEDFLATBAR: /*N*/ case CHSTYLE_3D_PERCENTFLATBAR: -/* case CHSTYLE_2D_PIE_SEGOF1: - case CHSTYLE_2D_PIE_SEGOFALL: - case CHSTYLE_2D_NET: - case CHSTYLE_2D_NET_SYMBOLS: - case CHSTYLE_2D_NET_STACK: - case CHSTYLE_2D_NET_SYMBOLS_STACK: - case CHSTYLE_2D_NET_PERCENT: - case CHSTYLE_2D_NET_SYMBOLS_PERCENT: -*/ case CHSTYLE_2D_CUBIC_SPLINE: + case CHSTYLE_2D_CUBIC_SPLINE: /*N*/ case CHSTYLE_2D_CUBIC_SPLINE_SYMBOL: /*N*/ case CHSTYLE_2D_LINE_STACKEDCOLUMN: /*N*/ case CHSTYLE_2D_LINE_COLUMN: diff --git a/binfilter/bf_sch/source/core/sch_chtmodel.cxx b/binfilter/bf_sch/source/core/sch_chtmodel.cxx index dda90449f..707871cd8 100644 --- a/binfilter/bf_sch/source/core/sch_chtmodel.cxx +++ b/binfilter/bf_sch/source/core/sch_chtmodel.cxx @@ -1175,13 +1175,6 @@ void ChartModel::ClearItemSetLists() /************************************************************************* |* -|* -\************************************************************************/ - - - -/************************************************************************* -|* |* Language setzen |* \************************************************************************/ diff --git a/binfilter/bf_sch/source/core/sch_memchrt.cxx b/binfilter/bf_sch/source/core/sch_memchrt.cxx index b5df29611..f7a83745d 100644 --- a/binfilter/bf_sch/source/core/sch_memchrt.cxx +++ b/binfilter/bf_sch/source/core/sch_memchrt.cxx @@ -89,12 +89,6 @@ namespace binfilter { #define MIN(a,b) ( ((a)<(b))? (a) : (b) ) -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ - /************************************************************************* |* @@ -1392,8 +1386,6 @@ using namespace ::com::sun::star; if( STRING_NOTFOUND == nTrenner ) return false; -/*N*/ // DBG_ASSERT( STRING_NOTFOUND != nTrenner, "no valid selection" ); -/*N*/ /*N*/ SchCellRangeAddress aCRA; /*N*/ ::binfilter::lcl_GetWriterTblBox( sBox.Copy( 0, nTrenner ), aCRA.maUpperLeft ); /*N*/ ::binfilter::lcl_GetWriterTblBox( sBox.Copy( nTrenner+1 ), aCRA.maLowerRight ); diff --git a/binfilter/bf_sch/source/ui/inc/ChXChartObject.hxx b/binfilter/bf_sch/source/ui/inc/ChXChartObject.hxx index e2917d4fa..9027952f6 100644 --- a/binfilter/bf_sch/source/ui/inc/ChXChartObject.hxx +++ b/binfilter/bf_sch/source/ui/inc/ChXChartObject.hxx @@ -138,11 +138,7 @@ public: ::com::sun::star::uno::RuntimeException ); // XMultiPropertyStates -/* virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates ( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) - throw ( ::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException); -*/ virtual void SAL_CALL setAllPropertiesToDefault (void) + virtual void SAL_CALL setAllPropertiesToDefault (void) throw ( ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertiesToDefault ( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartAxis.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartAxis.cxx index a7635a09d..408db4e1f 100644 --- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartAxis.cxx +++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartAxis.cxx @@ -796,33 +796,6 @@ void SAL_CALL ChXChartAxis::setPropertyValues ( mpModel->ChangeAttr (aAttributes, mnWhichId); } - - - -/* -Sequence<PropertyState > SAL_CALL ChXChartAxis::getPropertyStates( - const Sequence<OUString > & aPropertyNames) - throw( UnknownPropertyException, - RuntimeException ) -{ - SolarMutexGuard aGuard; - - const sal_Int32 nCount = aPropertyNames.getLength(); - const ::rtl::OUString * pName = aPropertyNames.getConstArray(); - Sequence<PropertyState > aStates (nCount); - PropertyState * pState = aStates.getArray(); - - if (mpModel == NULL) - return aStates; - - for (sal_Int32 nIdx = 0; nIdx < nCount; nIdx++) - pState[nIdx] = getPropertyState (pName[nIdx]); - - return aStates; -} -*/ - - //===== protected methods ======================================================================= SfxItemSet * ChXChartAxis::CreateItemSet (void) diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx index 975a935bc..41ba5a03a 100644 --- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx +++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx @@ -776,13 +776,6 @@ void SAL_CALL ChXChartObject::setPropertyValues ( // note: this fall-through is intended default: -/* if ( aModifications.Count() == 0 - && mpModel->GetItemPool().IsWhich (nWID) - && ! ((nWID >= OWN_ATTR_VALUE_START) && (nWID <= OWN_ATTR_VALUE_END))) - { - aModifications.Put (mpModel->GetItemPool().GetDefaultItem (nWID)); - } -*/ // First look if we are looking at a special character property. if ( ! SvxUnoTextRangeBase::SetPropertyValueHelper (aModifications, pProperty, *pValue, aModifications)) diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDataPoint.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDataPoint.cxx index 143e54b48..8bd8b9170 100644 --- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDataPoint.cxx +++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDataPoint.cxx @@ -604,27 +604,6 @@ beans::PropertyState SAL_CALL ChXDataPoint::getPropertyState( const ::rtl::OUStr return beans::PropertyState_DIRECT_VALUE; } -/* -uno::Sequence< beans::PropertyState > SAL_CALL ChXDataPoint::getPropertyStates( - const uno::Sequence< ::rtl::OUString >& aPropertyName ) - throw( beans::UnknownPropertyException, - uno::RuntimeException ) -{ - SolarMutexGuard aGuard; - - const sal_Int32 nCount = aPropertyName.getLength(); - const ::rtl::OUString* pNames = aPropertyName.getConstArray(); - - uno::Sequence< beans::PropertyState > aRet( nCount ); - beans::PropertyState* pState = aRet.getArray(); - - for( sal_Int32 nIdx = 0; nIdx < nCount; nIdx++ ) - pState[ nIdx ] = getPropertyState( pNames[ nIdx ] ); - - return aRet; -} -*/ - uno::Sequence< beans::PropertyState > SAL_CALL ChXDataPoint::getPropertyStates ( const uno::Sequence< ::rtl::OUString > & aPropertyName) @@ -715,7 +694,6 @@ uno::Sequence< beans::PropertyState > SAL_CALL } else pStateArray[nIndex] = beans::PropertyState_DEFAULT_VALUE; -// pStateArray[nIndex] = beans::PropertyState_DIRECT_VALUE; } } else diff --git a/binfilter/bf_sd/source/filter/bin/sd_sdbinfilter.cxx b/binfilter/bf_sd/source/filter/bin/sd_sdbinfilter.cxx index 41a24b8f2..91efeb099 100644 --- a/binfilter/bf_sd/source/filter/bin/sd_sdbinfilter.cxx +++ b/binfilter/bf_sd/source/filter/bin/sd_sdbinfilter.cxx @@ -164,39 +164,6 @@ static void ImplPostLoadCheckStyleSheetPool( SfxStyleSheetPool* pStyleSheetPool, delete pNewItem; } } -/* sample code for fixing bullet problems. Didn't need it yet - if( SFX_ITEM_SET == rSet.GetItemState( EE_PARA_NUMBULLET, sal_False, &pItem ) ) - { - SvxNumRule* pRule = ((SvxNumBulletItem*)rSet.GetItem( EE_PARA_NUMBULLET ))->GetNumRule(); - - const USHORT nLevelCount = pRule->GetLevelCount(); - USHORT nLevel; - BOOL bNeedsFix = FALSE; - for( nLevel = 0; !bNeedsFix && (nLevel < nLevelCount); nLevel++ ) - { - const SvxNumberFormat& rLevel = pRule->GetLevel(nLevel); - bNeedsFix = (rLevel.GetNumberingType() == ::com::sun::star::style::NumberingType::CHAR_SPECIAL) && - (rLevel.GetBulletChar() == 0 ); - } - - if( bNeedsFix ) - { - SvxNumRule aNewRule( pRule->GetFeatureFlags(), nLevelCount, FALSE, pRule->GetNumRuleType() ); - - for( nLevel = 0; !bNeedsFix && (nLevel < nLevelCount); nLevel++ ) - { - SvxNumberFormat aLevel(pRule->GetLevel(nLevel)) ; - if( (aLevel.GetNumberingType() == ::com::sun::star::style::NumberingType::CHAR_SPECIAL) && (aLevel.GetBulletChar() == 0 ) ) - aLevel.SetNumberingType( ::com::sun::star::style::NumberingType::NUMBER_NONE ); - - aNewRule.SetLevel(nLevel, aLevel); - } - - rSet.Put( SvxNumBulletItem( aNewRule, EE_PARA_NUMBULLET ) ); - - } - } -*/ pStyleSheet = pStyleSheetPool->Next(); } } diff --git a/binfilter/bf_sfx2/source/bastyp/sfx2_progress.cxx b/binfilter/bf_sfx2/source/bastyp/sfx2_progress.cxx index 2f2e1e290..1aa6b6169 100644 --- a/binfilter/bf_sfx2/source/bastyp/sfx2_progress.cxx +++ b/binfilter/bf_sfx2/source/bastyp/sfx2_progress.cxx @@ -370,15 +370,6 @@ BOOL SfxProgress::SetState /*N*/ return pProgress; /*N*/ } -// ----------------------------------------------------------------------- - - -// ----------------------------------------------------------------------- - - -// ----------------------------------------------------------------------- - - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx index bf3b4ac09..49c04e6af 100644 --- a/binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx +++ b/binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx @@ -364,9 +364,6 @@ extern AsynchronLink* pPendingCloser; //-------------------------------------------------------------------- - -//-------------------------------------------------------------------- - Reference< XLibraryContainer > SfxObjectShell::GetBasicContainer() { if( !pImp->pBasicLibContainer ) diff --git a/binfilter/bf_so3/source/inplace/embobj.cxx b/binfilter/bf_so3/source/inplace/embobj.cxx index 83048658c..76d91a861 100644 --- a/binfilter/bf_so3/source/inplace/embobj.cxx +++ b/binfilter/bf_so3/source/inplace/embobj.cxx @@ -166,15 +166,6 @@ UINT32 SvEmbeddedInfoObject::GetViewAspect() const return nViewAspect; } -/********************** SvFilterList ************************************** -**************************************************************************/ - -/************** class SvObjectDescriptor ******************************** -**************************************************************************/ - - - - /************************************************************************* |* |* SvEmbeddedObject::Factory() @@ -840,9 +831,7 @@ void SvEmbeddedObject::DoDraw( OutputDevice * pDev, const Point & rViewPos, else pMtf = NULL; } -// #ifndef UNX if( pDev->IsClipRegion() && pDev->GetOutDevType() != OUTDEV_PRINTER ) -// #endif { aRegion = pDev->PixelToLogic( aRegion ); pDev->SetClipRegion( aRegion ); diff --git a/binfilter/bf_so3/source/inplace/outplace.cxx b/binfilter/bf_so3/source/inplace/outplace.cxx index ea0198b7d..73870b1b6 100644 --- a/binfilter/bf_so3/source/inplace/outplace.cxx +++ b/binfilter/bf_so3/source/inplace/outplace.cxx @@ -90,8 +90,6 @@ public: virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); }; -//sal_Int64 SAL_CALL OLEWrapper_Impl::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException) ; - sal_Int64 SAL_CALL OLEWrapper_Impl::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException) { SvGlobalName aName; @@ -118,9 +116,6 @@ void SAL_CALL OLEWrapper_Impl::removeEventListener(const ::com::sun::star::uno:: #endif //------------------------------------------------------------------------------- -//------------------------------------------------------------------------------- -//------------------------------------------------------------------------------- -/*************************************************************************/ BOOL Impl_OlePres::Read( SvStream & rStm ) { ULONG nBeginPos = rStm.Tell(); @@ -321,8 +316,6 @@ Impl_OlePres * CreateCache_Impl( SotStorage * pStor ) //========================================================================= -//========================================================================= -//========================================================================= struct SvOutPlace_Impl /* [Beschreibung] @@ -357,7 +350,6 @@ struct SvOutPlace_Impl //========================================================================= //============== SvOutPlaceObject =========================================== //========================================================================= -//SO2_IMPL_BASIC_CLASS1_DLL( SvOutPlaceObject, SvFactory, SvInPlaceObject, SO2_IMPL_BASIC_CLASS1( SvOutPlaceObject, SvFactory, SvInPlaceObject, SvGlobalName( SO3_OUT_CLASSID ) ) @@ -639,9 +631,6 @@ SvInPlaceObjectRef SvOutPlaceObject::InsertObject if( !pInsertFct ) return &xRet; - //uTemp=pInsertFct(&io); - //uTemp=OleUIInsertObject(&io); - //if (OLEUI_OK==uTemp) { TENANTTYPE tType; @@ -689,9 +678,6 @@ SvInPlaceObjectRef SvOutPlaceObject::InsertObject if( tType == TENANTTYPE_EMBEDDEDFILE ) xRet->pImpl->pSO_Cont->Update(); - //RECTL rcl; - //SETRECTL(rcl, 0, 0, szl.cx, szl.cy); - //xRet->pImpl->pSO_Cont->RectSet(&rcl, FALSE, TRUE); xRet->SetVisAreaSize( Size( szl.cx, szl.cy ) ); WIN_BOOL fSetExtent; xRet->pImpl->pSO_Cont->GetInfo( xRet->pImpl->dwAspect, fSetExtent ); @@ -789,9 +775,6 @@ SvInPlaceObjectRef SvOutPlaceObject::CreateFromData( const Reference<XTransfer { xRet->pImpl->pSO_Cont->Update(); xRet->pImpl->pSO_Cont->Invalidate(); - //RECTL rcl; - //SETRECTL(rcl, 0, 0, szl.cx, szl.cy); - //xRet->pImpl->pSO_Cont->RectSet(&rcl, FALSE, TRUE); xRet->SetVisAreaSize( Size( szl.cx, szl.cy ) ); WIN_BOOL fSetExtent; xRet->pImpl->pSO_Cont->GetInfo( xRet->pImpl->dwAspect, fSetExtent ); @@ -1127,8 +1110,6 @@ void SvOutPlaceObject::Draw if ( nBufSize && nBufSize == GetMetaFileBitsEx( hMet, nBufSize, pBuf+22 ) ) { SvMemoryStream aStream( pBuf, nBufSize+22, STREAM_READ ); - //SvFileStream aFile(String::CreateFromAscii("file:///d:/test.wmf"), STREAM_STD_READWRITE); - //aStream >> aFile; aStream.Seek(0); GDIMetaFile aMtf; if( ReadWindowMetafile( aStream, aMtf, NULL ) ) @@ -1136,14 +1117,6 @@ void SvOutPlaceObject::Draw aMtf.WindStart(); MapMode aMode( MAP_100TH_MM ); Size aSize = OutputDevice::LogicToLogic( aOutRect.GetSize(), aMode, pDev->GetMapMode() ); - // AllSettings aNew( pDev->GetSettings() ); - // StyleSettings aSet ( aNew.GetStyleSettings() ); - // aSet.SetAntialiasingMinPixelHeight( 5 ); - // aNew.SetStyleSettings( aSet ); - // pDev->SetSettings( aNew ); - - //Point aPoint; - //Size aSize( aOutRect.GetSize() ); aMtf.Play( pDev, Point(), aSize ); bPlayed = TRUE; } @@ -1388,23 +1361,12 @@ void SvOutPlaceObject::DrawObject if ( nBufSize && nBufSize == GetMetaFileBitsEx( hMet, nBufSize, pBuf+22 ) ) { SvMemoryStream aStream( pBuf, nBufSize+22, STREAM_READ ); - //SvFileStream aFile(String::CreateFromAscii("file:///d:/test.wmf"), STREAM_STD_READWRITE); - //aStream >> aFile; aStream.Seek(0); GDIMetaFile aMtf; if( ReadWindowMetafile( aStream, aMtf, NULL ) ) { aMtf.WindStart(); MapMode aMode( MAP_100TH_MM ); - //Size aSize = OutputDevice::LogicToLogic( aOutRect.GetSize(), aMode, pDev->GetMapMode() ); - // AllSettings aNew( pDev->GetSettings() ); - // StyleSettings aSet ( aNew.GetStyleSettings() ); - // aSet.SetAntialiasingMinPixelHeight( 5 ); - // aNew.SetStyleSettings( aSet ); - // pDev->SetSettings( aNew ); - - //Point aPoint; - //Size aSize( aOutRect.GetSize() ); Size aSize = OutputDevice::LogicToLogic( rSize, aMode, pDev->GetMapMode() ); aMtf.Play( pDev, Point(), aSize ); bPlayed = TRUE; diff --git a/binfilter/bf_svtools/source/items/svt_macitem.cxx b/binfilter/bf_svtools/source/items/svt_macitem.cxx index 021b98d2c..221eed6f4 100644 --- a/binfilter/bf_svtools/source/items/svt_macitem.cxx +++ b/binfilter/bf_svtools/source/items/svt_macitem.cxx @@ -174,20 +174,6 @@ SfxItemPresentation SvxMacroItem::GetPresentation const ::IntlWrapper * ) const { -/*!!! - SvxMacroTableDtor& rTbl = (SvxMacroTableDtor&)GetMacroTable(); - SvxMacro* pMac = rTbl.First(); - - while ( pMac ) - { - rText += pMac->GetLibName(); - rText += cpDelim; - rText += pMac->GetMacName(); - pMac = rTbl.Next(); - if ( pMac ) - rText += cpDelim; - } -*/ rText.Erase(); return SFX_ITEM_PRESENTATION_NONE; } diff --git a/binfilter/bf_svtools/source/items1/svt_dateitem.cxx b/binfilter/bf_svtools/source/items1/svt_dateitem.cxx index f48a30d09..154a1bac4 100644 --- a/binfilter/bf_svtools/source/items1/svt_dateitem.cxx +++ b/binfilter/bf_svtools/source/items1/svt_dateitem.cxx @@ -188,22 +188,6 @@ bool SfxDateTimeItem::QueryValue( com::sun::star::uno::Any& rVal, return true; } -// ----------------------------------------------------------------------- -// ----------------------------------------------------------------------- -// ----------------------------------------------------------------------- -/* -TYPEINIT1(SfxColumnDateTimeItem, SfxDateTimeItem); - -SfxPoolItem* SfxColumnDateTimeItem::Clone( SfxItemPool* ) const -{ - return new SfxColumnDateTimeItem( *this ); -} - -SfxItemPresentation SfxColumnDateTimeItem::GetPresentation( SfxItemPresentation, SfxMapUnit, SfxMapUnit, XubString&, const ::IntlWrapper * ) const -{ - return SFX_ITEM_PRESENTATION_NAMELESS; -} -*/ } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/binfilter/bf_svtools/source/items1/svt_frqitem.cxx b/binfilter/bf_svtools/source/items1/svt_frqitem.cxx index af53c0940..a6d377f65 100644 --- a/binfilter/bf_svtools/source/items1/svt_frqitem.cxx +++ b/binfilter/bf_svtools/source/items1/svt_frqitem.cxx @@ -100,15 +100,6 @@ rItem DBG_CHKTHIS( SfxFrequencyItem, 0 ); DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); -/* DateTime aThisRange( aEndDateTime - aStartDateTime ); - DateTime aRange(((const SfxFrequencyItem&)rItem).aEndDateTime - - ((const SfxFrequencyItem&)rItem).aStartDateTime ); - if( aRange < aThisRange ) - return -1; - else if( aRange == aThisRange ) - return 0; - else -*/ return 1; } diff --git a/binfilter/bf_svtools/source/items1/svt_poolitem.cxx b/binfilter/bf_svtools/source/items1/svt_poolitem.cxx index 5bb31303f..a1285ed03 100644 --- a/binfilter/bf_svtools/source/items1/svt_poolitem.cxx +++ b/binfilter/bf_svtools/source/items1/svt_poolitem.cxx @@ -56,9 +56,7 @@ ULONG nSfxFlag32Val[32] = TYPEINIT0(SfxPoolItem); TYPEINIT1(SfxVoidItem, SfxPoolItem); -// @@@ TYPEINIT1(SfxInvalidItem, SfxPoolItem); TYPEINIT1(SfxSetItem, SfxPoolItem); -// @@@ TYPEINIT1(SfxItemChangedHint, SfxHint); // ------------------------------------------------------------------------ #if OSL_DEBUG_LEVEL > 1 diff --git a/binfilter/bf_svx/source/engine3d/svx_viewpt3d.cxx b/binfilter/bf_svx/source/engine3d/svx_viewpt3d.cxx index 2dface506..02267782f 100644 --- a/binfilter/bf_svx/source/engine3d/svx_viewpt3d.cxx +++ b/binfilter/bf_svx/source/engine3d/svx_viewpt3d.cxx @@ -111,13 +111,6 @@ namespace binfilter { /************************************************************************* |* -|* ViewWindow zurueckgeben -|* -\************************************************************************/ - - -/************************************************************************* -|* |* View-Window genau um das mit rTransform transformierte Volumen legen |* \************************************************************************/ @@ -224,20 +217,6 @@ namespace binfilter { /************************************************************************* |* -|* uebergebenen Punkt transformieren -|* -\************************************************************************/ - - -/************************************************************************* -|* -|* neuen Punkt transformiert zurueckgeben -|* -\************************************************************************/ - - -/************************************************************************* -|* |* 3D-Punkt auf Viewplane projizieren |* \************************************************************************/ @@ -288,21 +267,6 @@ namespace binfilter { /************************************************************************* |* -|* 3D-Punkt auf Viewplane projizieren und auf Geraetekoordinaten mappen -|* -\************************************************************************/ - - -/************************************************************************* -|* -|* Device-Werte fuer Breite und Hoehe des Vektors in View-Werte -|* wandeln, abhaengig von der Projektion -|* -\************************************************************************/ - - -/************************************************************************* -|* |* View Reference Point setzen |* \************************************************************************/ diff --git a/binfilter/bf_svx/source/unodraw/svx_unoipset.cxx b/binfilter/bf_svx/source/unodraw/svx_unoipset.cxx index ea3da1bcb..92f688782 100644 --- a/binfilter/bf_svx/source/unodraw/svx_unoipset.cxx +++ b/binfilter/bf_svx/source/unodraw/svx_unoipset.cxx @@ -455,17 +455,6 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertyMap* pMap ) // diesen zurueck SdrItemPool* pItemPool = SdrObject::GetGlobalDrawObjectItemPool(); -/* - if(!pItemPool) - { - // ItemPool generieren - ((SvxItemPropertySet*)this)->pItemPool = new SdrItemPool; - // Der Outliner hat keinen eigenen Pool, deshalb den der EditEngine - SfxItemPool* pOutlPool=EditEngine::CreatePool(); - // OutlinerPool als SecondaryPool des SdrPool - pItemPool->SetSecondaryPool(pOutlPool); - } -*/ const SfxMapUnit eMapUnit = pItemPool ? pItemPool->GetMetric((USHORT)pMap->nWID) : SFX_MAPUNIT_100TH_MM; BYTE nMemberId = pMap->nMemberId & (~SFX_METRIC_ITEM); if( eMapUnit == SFX_MAPUNIT_100TH_MM ) diff --git a/binfilter/bf_svx/source/unodraw/svx_unopage.cxx b/binfilter/bf_svx/source/unodraw/svx_unopage.cxx index 85f8c8891..bc53221e5 100644 --- a/binfilter/bf_svx/source/unodraw/svx_unopage.cxx +++ b/binfilter/bf_svx/source/unodraw/svx_unopage.cxx @@ -23,8 +23,6 @@ #include <sot/clsids.hxx> #endif -/* -*/ #include <rtl/uuid.h> #include <rtl/memory.h> @@ -557,8 +555,6 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt3 { switch( nType ) { -// case OBJ_NONE: -// break; case OBJ_GRUP: pRet = new SvxShapeGroup( pObj, pPage ); break; @@ -682,8 +678,6 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt3 case OBJ_MEASURE: pRet = new SvxShapeDimensioning( pObj ); break; -// case OBJ_DUMMY: -// break; case OBJ_UNO: pRet = new SvxShapeControl( pObj ); break; diff --git a/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx b/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx index 0fb35872f..2a6fc0b47 100644 --- a/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx +++ b/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx @@ -1054,10 +1054,6 @@ const XDash& XLineDashItem::GetValue() const const XPolygon& XLineStartItem::GetValue() const { - //if (!IsIndex()) - // return aXPolygon; - //else - // return pTable->Get(GetIndex())->GetLineEnd(); return aXPolygon; } @@ -2053,9 +2049,6 @@ const XPolygon& XLineEndItem::GetValue() const //------------------------------------------------------------------------ - -//------------------------------------------------------------------------ - /*N*/ USHORT XFillStyleItem::GetValueCount() const /*N*/ { /*N*/ return 5; @@ -2376,9 +2369,6 @@ const XGradient& XFillGradientItem::GetValue() const /*N*/ return 1; /*N*/ } -//------------------------------------------------------------------------ - - // ----------------------------------------------------------------------- /*N*/ bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const /*N*/ { @@ -2647,11 +2637,6 @@ const XGradient& XFillGradientItem::GetValue() const //------------------------------------------------------------------------ - -//------------------------------------------------------------------------ - - - /*N*/ XFillFloatTransparenceItem* XFillFloatTransparenceItem::checkForUniqueItem( SdrModel* pModel ) const /*N*/ { /*N*/ // #85953# unique name only necessary when enabled @@ -2835,16 +2820,8 @@ const XHatch& XFillHatchItem::GetValue() const return aHatch; } -//------------------------------------------------------------------------ - - -//------------------------------------------------------------------------ - - -//------------------------------------------------------------------------ - - // ----------------------------------------------------------------------- + /*N*/ bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const /*N*/ { /*N*/ diff --git a/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx b/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx index aad706478..2a5cac63e 100644 --- a/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx +++ b/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx @@ -1168,9 +1168,6 @@ void SwDoc::DelCharFmt( SwCharFmt *pFmt ) /*N*/ /*N*/ /*N*/ LanguageType eLang = LANGUAGE_SYSTEM; //System::GetLanguage(); -/* ((const SvxLanguageItem&)GetAttrPool(). - GetDefaultItem( RES_CHRATR_LANGUAGE )).GetLanguage(); -*/ /*N*/ Reference< XMultiServiceFactory > xMSF = ::legacy_binfilters::getLegacyProcessServiceFactory(); /*N*/ pNumberFormatter = new SvNumberFormatter( xMSF, eLang ); /*N*/ pNumberFormatter->SetEvalDateFormat( NF_EVALDATEFORMAT_FORMAT_INTL ); diff --git a/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx b/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx index 9e417a239..9f452cfb0 100644 --- a/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx +++ b/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx @@ -670,8 +670,6 @@ void SwDrawContact::DisconnectFromLayout( bool _bMoveMasterToInvisibleLayer ) // Instead of removing 'master' object from drawing page, move // the 'master' drawing object into the corresponding invisible layer. { - //((SwFrmFmt*)pRegisteredIn)->GetDoc()->GetDrawModel()->GetPage(0)-> - // RemoveObject( GetMaster()->GetOrdNum() ); SwDoc* pWriterDoc = ((SwFrmFmt*)pRegisteredIn)->GetDoc(); if ( pWriterDoc->IsVisibleLayerId( GetMaster()->GetLayer() ) ) { diff --git a/binfilter/bf_sw/source/core/fields/sw_cellfml.cxx b/binfilter/bf_sw/source/core/fields/sw_cellfml.cxx index d399c3dc9..0dd941558 100644 --- a/binfilter/bf_sw/source/core/fields/sw_cellfml.cxx +++ b/binfilter/bf_sw/source/core/fields/sw_cellfml.cxx @@ -472,20 +472,6 @@ const USHORT cMAXSTACKSIZE = 50; /*N*/ const SwFrm* lcl_GetBoxFrm( const SwTableBox& rBox ) /*N*/ { -/* - - // oder besser ueber die Box den Frame suchen - - SwClientIter aIter( *pBox->GetFrmFmt() ); - ULONG nMinPos = ULONG_MAX; - const SwFrm* pFnd = 0; - for( SwFrm* pF = (SwFrm*)aIter.First( TYPE( SwCellFrm )); pF; - pF = (SwFrm*)aIter.Next() ) - { - if( pF->Frm().Y() < - } -*/ -/*N*/ /*N*/ SwNodeIndex aIdx( *rBox.GetSttNd() ); /*N*/ SwCntntNode* pCNd = aIdx.GetNodes().GoNext( &aIdx ); /*N*/ OSL_ENSURE( pCNd, "Box hat keinen TextNode" ); diff --git a/binfilter/bf_sw/source/core/swg/sw_rdflds.cxx b/binfilter/bf_sw/source/core/swg/sw_rdflds.cxx index fef9ff624..49cd9cb21 100644 --- a/binfilter/bf_sw/source/core/swg/sw_rdflds.cxx +++ b/binfilter/bf_sw/source/core/swg/sw_rdflds.cxx @@ -105,43 +105,6 @@ static SwUserFieldType* In_SwUserFieldType( SwSwgReader& rPar ) return p; } -/* MS: Diese Felder gibt es nicht mehr - -static SwRegFieldType* In_SwRegFieldType( SwSwgReader& rPar ) -{ - BYTE nCount; - long nEditTime; - rPar.r.long4(); - rPar.r >> nCount; - aType.aTitle = rPar.GetText(); - rPar.r >> nEditTime; - SwRegFieldType aType; - aType.aEditTime.SetTime( nEditTime ); - for( BYTE i = 0; ( i < nCount ) && rPar.r.good(); i++ ) - { - aType.aInfo[ i ].aAuthor = rPar.GetText(); - ULONG nDate; - long nTime; - rPar.r >> nDate >> nTime; - aType.aInfo[ i ].aDateTime.SetDate( nDate ); - aType.aInfo[ i ].aDateTime.SetTime( nTime ); - } - rPar.r.long3(); - return (SwRegFieldType*) rPar.pDoc->InsertFldType( aType ); -} - - -static SwVarRegFieldType* In_SwVarRegFieldType( SwSwgReader& rPar ) -{ - USHORT nType; - rPar.r >> nType; - SwVarRegFieldType aType( rPar.GetText(), nType ); - aType.SetValue( rPar.GetText() ); - return (SwVarRegFieldType*) rPar.pDoc->InsertFldType( aType ); -} - -End Of Comment MS: */ - static SwDDEFieldType* In_SwDDEFieldType( SwSwgReader& rPar ) { USHORT nType; @@ -347,24 +310,6 @@ static SwField* In_SwFixTimeField( SwSwgReader& rPar, SwDateTimeFieldType* pType return pFld; } -/* MS: RegFields werden nicht mehr gebraucht - -static SwField* In_SwRegField( SwSwgReader& rPar, SwRegFieldType* pType ) -{ - pType = In_SwRegFieldType( rPar ); - if( !pType ) return NULL; - USHORT nType; - rPar.r >> nType; - return new SwRegField( pType, nType ); -} - -static SwField* In_SwVarRegField( SwSwgReader& rPar, SwVarRegFieldType* pType ) -{ - pType = In_SwVarRegFieldType( rPar ); - return new SwVarRegField( pType ); -} -*/ - static SwField* In_SwDDEField( SwSwgReader& rPar, SwDDEFieldType* pType ) { pType = In_SwDDEFieldType( rPar ); @@ -444,10 +389,6 @@ static SwField* In_SwGetExpField( SwSwgReader& rPar, SwGetExpFieldType* pType, U if( GSE_STRING & nSubType ) nNewFldFmt = 0; - // Falls sich das Feld in einem Shared-Format befindet, - // mus es nach dem Lesen ge-updated werden -// if( rPar.nStatus & SWGSTAT_SHAREDFMT ) -// rPar.nStatus |= SWGSTAT_UPDATEEXPR; return p; } @@ -482,7 +423,6 @@ static SwField* In_SwSetExpField( SwSwgReader& rPar, SwSetExpFieldType* pType, U } aFrml = pFld->GetExpStr(); -// pFld->SetValue( strtod( (const sal_Char*)aFrml, &dummy ) ); // TODO: unicode: is this correct? pFld->SetValue( aFrml.ToDouble() ); @@ -501,11 +441,6 @@ static SwField* In_SwSetExpField( SwSwgReader& rPar, SwSetExpFieldType* pType, U if( GSE_STRING & nSubType ) nNewFldFmt = 0; // Warum auch immer - // neue Felder: Subtyp bereits im Feldtyp! - // Falls sich das Feld in einem Shared-Format befindet, - // mus es nach dem Lesen ge-updated werden -// if( rPar.nStatus & SWGSTAT_SHAREDFMT ) -// rPar.nStatus |= SWGSTAT_UPDATEEXPR; return pFld; } @@ -646,16 +581,6 @@ SwField* SwSwgReader::InField() case RES_FIXTIMEFLD: pFld = In_SwFixTimeField( *this, (SwDateTimeFieldType*) pType ); break; - /* - MS: gibst nicht mehr - - case RES_REGFLD: - pFld = In_SwRegField( *this, NULL ); - break; - case RES_VARREGFLD: - pFld = In_SwVarRegField( *this, NULL ); - break; - */ case RES_DDEFLD: pFld = In_SwDDEField( *this, NULL ); break; @@ -740,14 +665,6 @@ SwFieldType* SwSwgReader::InFieldType() p = In_SwDBFieldType( *this ); break; case RES_USERFLD: p = In_SwUserFieldType( *this ); break; - /* - MS: Gibts nicht mehr - - case RES_REGFLD: - p = In_SwRegFieldType( *this ); break; - case RES_VARREGFLD: - p = In_SwVarRegFieldType( *this ); break; - */ case RES_DDEFLD: p = In_SwDDEFieldType( *this ); break; case RES_SETEXPFLD: diff --git a/binfilter/bf_sw/source/core/text/sw_frmform.cxx b/binfilter/bf_sw/source/core/text/sw_frmform.cxx index 675d97e21..bcb72bcef 100644 --- a/binfilter/bf_sw/source/core/text/sw_frmform.cxx +++ b/binfilter/bf_sw/source/core/text/sw_frmform.cxx @@ -532,7 +532,6 @@ MSHORT FormatLevel::nLevel = 0; /*N*/ while( GetFollow() && GetFollow()->GetFollow() && /*N*/ nNewOfst >= GetFollow()->GetFollow()->GetOfst() ) /*N*/ { -///*?*/ DBG_LOOP; /*?*/ JoinFrm(); /*N*/ } /*N*/ } diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx index a246086e4..c2e8c211f 100644 --- a/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx +++ b/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx @@ -1262,21 +1262,7 @@ OUString SwXTextRange::getString(void) throw( uno::RuntimeException ) const SwPosition& rPoint = pBkm->GetPos(); const SwPosition* pMark = pBkm->GetOtherPos(); SwPaM aCrsr(*pMark, rPoint); -/* if( rPoint.nNode.GetIndex() == - pMark->nNode.GetIndex() ) - { - SwTxtNode* pTxtNd = aCrsr.GetNode()->GetTxtNode(); - if( pTxtNd ) - { - sal_uInt16 nStt = aCrsr.Start()->nContent.GetIndex(); - sRet = pTxtNd->GetExpandTxt( nStt, - aCrsr.End()->nContent.GetIndex() - nStt ); - } - } - else -*/ { - SwXTextCursor::getTextFromPam(aCrsr, sRet); - } + SwXTextCursor::getTextFromPam(aCrsr, sRet); } return sRet; } diff --git a/binfilter/bf_sw/source/filter/excel/sw_excimpop.cxx b/binfilter/bf_sw/source/filter/excel/sw_excimpop.cxx index f40777502..25bd780a9 100644 --- a/binfilter/bf_sw/source/filter/excel/sw_excimpop.cxx +++ b/binfilter/bf_sw/source/filter/excel/sw_excimpop.cxx @@ -445,47 +445,6 @@ void SwExcelParser::Rk() } } -/* -// ------------------------------------------------------------------ 0x85 -void SwExcelParser::Boundsheet() - { - BYTE nOpt0, nOpt1; - UINT32 nStrPos; - String aName; - - if( eDateiTyp == Biff5W ) - { - *pIn >> nStrPos; - *pIn >> nOpt0 >> nOpt1; - nBytesLeft -= 6; - - if( nOpt0 == 0x00 ) // nur Namen von Worksheets speichern - { - ReadExcString( LenByte, aName ); - aName.Convert( eQuellChar, eZielChar ); - //aTabNameBuff << aName; -// aExcDok.NewTab( aName, nStrPos ); #################################### - } - } - else - { - ReadExcString( LenByte, aName ); - - aName.Convert( eQuellChar, eZielChar ); - //aTabNameBuff << aName; -// aExcDok.Set( aName, nTab ); #################################### - nTab++; - } - -// if( nOpt0 == 0x00 ) // nur Namen von Worksheets speichern -// { -// aDataPool.InsertEntry( aAnsiName, EET_Table, aAnsiName, -// aTabNameBuff.GetLastIndex(), 0, 0xFFFF, 0, 0xFFFF ); - // zunaechst gesamte Tabelle selektieren, da Groesse noch nicht bekannt -// } - } -*/ - // ------------------------------------------------------------------ 0x92 void SwExcelParser::Palette() { @@ -1095,14 +1054,6 @@ String &SwExcelParser::ReadExcString( StringInfoLen eLen, String &aString ) //---------------------------------------------- SwExcelParser::ResetBof - void SwExcelParser::ResetBof() {// setzt alle Einstellungen fuer neuen Tabellenbeginn zurueck -// pFontBuffer->Reset(); -// pXF_Buffer->Reset(); -// pColorBuffer->Reset(); -// aNameBuff.Reset(); -// aExtNameBuff.Reset(); -// aExtSheetBuff.Reset(); -// aColRowBuff.NewTab( nTab ); -// aFltTab.Reset( nTab ); } #endif @@ -1473,7 +1424,6 @@ void SwExcelParser::Bundleheader() aName.Convert( eQuellChar, eZielChar ); aTabNameBuff << aName; -// aExcDok.Set( aName, nTab ); #################################### nTab++; } diff --git a/binfilter/bf_sw/source/ui/inc/content.hxx b/binfilter/bf_sw/source/ui/inc/content.hxx index 484c3b1e3..7a393868c 100644 --- a/binfilter/bf_sw/source/ui/inc/content.hxx +++ b/binfilter/bf_sw/source/ui/inc/content.hxx @@ -92,33 +92,6 @@ class SwRegionContent : public SwContent nRegionLevel(nLevel){} BYTE GetRegionLevel() const {return nRegionLevel;} }; -//---------------------------------------------------------------------------- - - - - -//---------------------------------------------------------------------------- - - - -//---------------------------------------------------------------------------- - - - -//---------------------------------------------------------------------------- -/* - class ContentType enthaelt Informationen zu einer Inhaltsform - Das MemberArray wird nur gefuellt, wenn der Inhalt mit GetMember - angefordert wird. Es wird nach Invalidate() nur dann neu geladen, - wenn der Inhalt erneut ausgelesen werden soll. -*/ -//---------------------------------------------------------------------------- -//---------------------------------------------------------------------------- - - - - - } //namespace binfilter #endif diff --git a/binfilter/bf_sw/source/ui/uno/sw_SwXDocumentSettings.cxx b/binfilter/bf_sw/source/ui/uno/sw_SwXDocumentSettings.cxx index e13186541..0b6793448 100644 --- a/binfilter/bf_sw/source/ui/uno/sw_SwXDocumentSettings.cxx +++ b/binfilter/bf_sw/source/ui/uno/sw_SwXDocumentSettings.cxx @@ -126,31 +126,6 @@ MasterPropertySetInfo * lcl_createSettingsInfo() { RTL_CONSTASCII_STRINGPARAM("PrinterIndependentLayout"), HANDLE_PRINTER_INDEPENDENT_LAYOUT, CPPUTYPE_INT16, 0, 0}, { RTL_CONSTASCII_STRINGPARAM("IsLabelDocument"), HANDLE_IS_LABEL_DOC, CPPUTYPE_BOOLEAN, 0, 0}, { RTL_CONSTASCII_STRINGPARAM("AddFrameOffsets"), HANDLE_IS_ADD_FLY_OFFSET, CPPUTYPE_BOOLEAN, 0, 0}, -/* - * As OS said, we don't have a view when we need to set this, so I have to - * find another solution before adding them to this property set - MTG - { RTL_CONSTASCII_STRINGPARAM("IsGridVisible"), HANDLE_IS_GRID_VISIBLE, CPPUTYPE_BOOLEAN, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("IsSnapToGrid"), HANDLE_IS_SNAP_TO_GRID, CPPUTYPE_BOOLEAN, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("IsSynchroniseAxes"), HANDLE_IS_SYNCHRONISE_AXES, CPPUTYPE_BOOLEAN, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("HorizontalGridResolution"), HANDLE_HORIZONTAL_GRID_RESOLUTION, CPPUTYPE_INT32, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("HorizontalGridSubdivision"), HANDLE_HORIZONTAL_GRID_SUBDIVISION, CPPUTYPE_INT16, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("VerticalGridResolution"), HANDLE_VERTICAL_GRID_RESOLUTION, CPPUTYPE_INT32, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("VerticalGridSubdivision"), HANDLE_VERTICAL_GRID_SUBDIVISION, CPPUTYPE_INT16, 0, 0}, - - { RTL_CONSTASCII_STRINGPARAM("ShowParagraphEnd"), HANDLE_SHOW_PARAGRAPH_END, CPPUTYPE_BOOLEAN, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("ShowOptionalHyphens"), HANDLE_SHOW_OPTIONAL_HYPHENS, CPPUTYPE_BOOLEAN, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("ShowSpaces"), HANDLE_SHOW_SPACES, CPPUTYPE_BOOLEAN, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("ShowTabs"), HANDLE_SHOW_TABS, CPPUTYPE_BOOLEAN, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("ShowBreaks"), HANDLE_SHOW_BREAKS, CPPUTYPE_BOOLEAN, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("ShowHiddenText"), HANDLE_SHOW_HIDDEN_TEXT, CPPUTYPE_BOOLEAN, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("ShowHiddenParagraphs"), HANDLE_SHOW_HIDDEN_PARAGRAPHS, CPPUTYPE_BOOLEAN, 0, 0}, - - { RTL_CONSTASCII_STRINGPARAM("ShowTextLimitGuide"), HANDLE_SHOW_TEXT_LIMIT_GUIDE, CPPUTYPE_BOOLEAN, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("ShowTableLimitGuide"), HANDLE_SHOW_TABLE_LIMIT_GUIDE, CPPUTYPE_BOOLEAN, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("ShowSectionLimitGuide"), HANDLE_SHOW_SECTION_LIMIT_GUIDE, CPPUTYPE_BOOLEAN, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("ShowGuidesWhileMoving"), HANDLE_SHOW_GUIDES_WHILE_MOVING, CPPUTYPE_BOOLEAN, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("ShowLargeHandles"), HANDLE_SHOW_LARGE_HANDLES, CPPUTYPE_BOOLEAN, 0, 0}, -*/ { NULL, 0, 0, CPPUTYPE_UNKNOWN, 0, 0 } }; return new MasterPropertySetInfo ( aWriterSettingsInfoMap ); diff --git a/binfilter/bf_xmloff/source/draw/xmloff_animimp.cxx b/binfilter/bf_xmloff/source/draw/xmloff_animimp.cxx index b9de20af6..5c20d4828 100644 --- a/binfilter/bf_xmloff/source/draw/xmloff_animimp.cxx +++ b/binfilter/bf_xmloff/source/draw/xmloff_animimp.cxx @@ -18,28 +18,17 @@ */ #include <tools/debug.hxx> - #include <com/sun/star/presentation/AnimationSpeed.hpp> - #include <list> - - #include <comphelper/extract.hxx> - #include "xmlimp.hxx" - #include "xmlnmspe.hxx" - #include "xmluconv.hxx" -/* -*/ - #include "nmspmap.hxx" - #include "anim.hxx" - #include "animimp.hxx" + namespace binfilter { using namespace ::std; diff --git a/binfilter/bf_xmloff/source/draw/xmloff_shapeexport.cxx b/binfilter/bf_xmloff/source/draw/xmloff_shapeexport.cxx index 1812d9e52..f62b9e368 100644 --- a/binfilter/bf_xmloff/source/draw/xmloff_shapeexport.cxx +++ b/binfilter/bf_xmloff/source/draw/xmloff_shapeexport.cxx @@ -99,11 +99,6 @@ XMLShapeExport::XMLShapeExport(SvXMLExport& rExp, xPropertySetMapper->ChainExportMapper( xExtMapper ); } -/* - // chain text attributes - xPropertySetMapper->ChainExportMapper(XMLTextParagraphExport::CreateParaExtPropMapper(rExp)); -*/ - rExport.GetAutoStylePool()->AddFamily( XML_STYLE_FAMILY_SD_GRAPHICS_ID, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_SD_GRAPHICS_NAME)), @@ -156,7 +151,6 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap ImpCalcShapeType(xShape, aShapeInfo.meShapeType); const bool bObjSupportsText = -// aShapeInfo.meShapeType != XmlShapeTypeDrawControlShape && aShapeInfo.meShapeType != XmlShapeTypeDrawChartShape && aShapeInfo.meShapeType != XmlShapeTypePresChartShape && aShapeInfo.meShapeType != XmlShapeTypeDrawOLE2Shape && @@ -898,25 +892,6 @@ void XMLShapeExport::ImpCalcShapeType(const uno::Reference< drawing::XShape >& x // general OLE2 Object } } -/* uno::Reference <lang::XServiceInfo> xObjectInfo; - - if(aAny >>= xObjectInfo) - { - if(xObjectInfo->supportsService(OUString(RTL_CONSTASCII_USTRINGPARAM - ("com.sun.star.chart.ChartDocument")))) - { - eShapeType = XmlShapeTypeDrawChartShape; - } - else if(xObjectInfo->supportsService(OUString(RTL_CONSTASCII_USTRINGPARAM - ("com.sun.star.sheet.SpreadsheetDocument")))) - { - eShapeType = XmlShapeTypeDrawTableShape; - } - else - { - // general OLE2 Object - } - }*/ } } else if(aType.EqualsAscii("Page", 21, 4)) { eShapeType = XmlShapeTypeDrawPageShape; } diff --git a/binfilter/bf_xmloff/source/draw/xmloff_shapeimport.cxx b/binfilter/bf_xmloff/source/draw/xmloff_shapeimport.cxx index 21ad5e50d..e894d3350 100644 --- a/binfilter/bf_xmloff/source/draw/xmloff_shapeimport.cxx +++ b/binfilter/bf_xmloff/source/draw/xmloff_shapeimport.cxx @@ -162,12 +162,6 @@ XMLShapeImportHelper::XMLShapeImportHelper( // chain text attributes mpPropertySetMapper->ChainImportMapper(XMLTextImportHelper::CreateParaExtPropMapper(rImporter)); -/* - // chain form attributes - const UniReference< SvXMLImportPropertyMapper> xFormMapper( rImporter.GetFormImport()->getStylePropertyMapper().get() ); - mpPropertySetMapper->ChainImportMapper(xFormMapper); -*/ - // construct PresPagePropsMapper xMapper = new XMLPropertySetMapper((XMLPropertyMapEntry*)aXMLSDPresPageProps, mpSdPropHdlFactory); mpPresPagePropsMapper = new SvXMLImportPropertyMapper( xMapper, rImporter ); @@ -296,27 +290,6 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DSceneShapeElemTokenMap() } ////////////////////////////////////////////////////////////////////////////// -/* -static SvXMLTokenMapEntry aShapeAttrTokenMap[] = -{ - { XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_SHAPE_NAME }, - { XML_NAMESPACE_DRAW, XML_STYLE_NAME, XML_TOK_SHAPE_DRAWSTYLE_NAME_GRAPHICS }, - { XML_NAMESPACE_PRESENTATION, XML_CLASS, XML_TOK_SHAPE_PRESENTATION_CLASS }, - { XML_NAMESPACE_PRESENTATION, XML_STYLE_NAME, XML_TOK_SHAPE_DRAWSTYLE_NAME_PRESENTATION }, - { XML_NAMESPACE_SVG, XML_TRANSFORM, XML_TOK_SHAPE_TRANSFORM }, - { XML_NAMESPACE_PRESENTATION, XML_PLACEHOLDER, XML_TOK_SHAPE_IS_PLACEHOLDER }, - { XML_NAMESPACE_PRESENTATION, XML_USER_TRANSFORMED, XML_TOK_SHAPE_IS_USER_TRANSFORMED }, - XML_TOKEN_MAP_END -}; - -const SvXMLTokenMap& XMLShapeImportHelper::GetShapeAttrTokenMap() -{ - if(!mpShapeAttrTokenMap) - mpShapeAttrTokenMap = new SvXMLTokenMap(aShapeAttrTokenMap); - return *mpShapeAttrTokenMap; -} -*/ -////////////////////////////////////////////////////////////////////////////// static SvXMLTokenMapEntry a3DObjectAttrTokenMap[] = { @@ -399,43 +372,6 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DLightAttrTokenMap() } ////////////////////////////////////////////////////////////////////////////// -/* -static SvXMLTokenMapEntry aPageShapeAttrTokenMap[] = -{ - { XML_NAMESPACE_SVG, XML_X, XML_TOK_PAGESHAPE_X }, - { XML_NAMESPACE_SVG, XML_Y, XML_TOK_PAGESHAPE_Y }, - { XML_NAMESPACE_SVG, XML_WIDTH, XML_TOK_PAGESHAPE_WIDTH }, - { XML_NAMESPACE_SVG, XML_HEIGHT, XML_TOK_PAGESHAPE_HEIGHT }, - XML_TOKEN_MAP_END -}; - -const SvXMLTokenMap& XMLShapeImportHelper::GetPageShapeAttrTokenMap() -{ - if(!mpPageShapeAttrTokenMap) - mpPageShapeAttrTokenMap = new SvXMLTokenMap(aPageShapeAttrTokenMap); - return *mpPageShapeAttrTokenMap; -} - -////////////////////////////////////////////////////////////////////////////// - -static SvXMLTokenMapEntry aGraphicObjectShapeAttrTokenMap[] = -{ - { XML_NAMESPACE_SVG, XML_X, XML_TOK_GOSHAPE_X }, - { XML_NAMESPACE_SVG, XML_Y, XML_TOK_GOSHAPE_Y }, - { XML_NAMESPACE_SVG, XML_WIDTH, XML_TOK_GOSHAPE_WIDTH }, - { XML_NAMESPACE_SVG, XML_HEIGHT, XML_TOK_GOSHAPE_HEIGHT }, - { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_GOSHAPE_URL }, - XML_TOKEN_MAP_END -}; - -const SvXMLTokenMap& XMLShapeImportHelper::GetGraphicObjectShapeAttrTokenMap() -{ - if(!mpGraphicObjectShapeAttrTokenMap) - mpGraphicObjectShapeAttrTokenMap = new SvXMLTokenMap(aGraphicObjectShapeAttrTokenMap); - return *mpGraphicObjectShapeAttrTokenMap; -} -*/ -////////////////////////////////////////////////////////////////////////////// SvXMLImportContext* XMLShapeImportHelper::Create3DSceneChildContext( SvXMLImport& rImport, diff --git a/binfilter/bf_xmloff/source/forms/layerimport.hxx b/binfilter/bf_xmloff/source/forms/layerimport.hxx index e8f04cf7b..de29cc11f 100644 --- a/binfilter/bf_xmloff/source/forms/layerimport.hxx +++ b/binfilter/bf_xmloff/source/forms/layerimport.hxx @@ -47,27 +47,6 @@ namespace xmloff class OAttribute2Property; //===================================================================== - //= ControlReference - //===================================================================== - /// a structure containing a property set (the referred control) and a string (the list of referring controls) -/* struct ControlReference - { - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > - xReferredControl; - ::rtl::OUString - sReferringControls; - - ControlReference( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxReferredControl, - const ::rtl::OUString& _rReferringControls) - :xReferredControl(_rxReferredControl) - ,sReferringControls(_rReferringControls) - { - } - }; -*/ - - //===================================================================== //= OFormLayerXMLImport_Impl //===================================================================== class OFormLayerXMLImport_Impl diff --git a/binfilter/bf_xmloff/source/style/xmloff_EnumPropertyHdl.cxx b/binfilter/bf_xmloff/source/style/xmloff_EnumPropertyHdl.cxx index 686f05e47..0e5ce853d 100644 --- a/binfilter/bf_xmloff/source/style/xmloff_EnumPropertyHdl.cxx +++ b/binfilter/bf_xmloff/source/style/xmloff_EnumPropertyHdl.cxx @@ -18,28 +18,12 @@ */ #include <tools/debug.hxx> - #include <EnumPropertyHdl.hxx> - #include "xmluconv.hxx" - #include <comphelper/extract.hxx> - #include "rtl/ustring.hxx" - #include <rtl/ustrbuf.hxx> -/* - -#include <bf_svtools/bf_solar.h> - -#ifndef _INC_LIMITS -#include <limits.h> -#endif - - -*/ - namespace binfilter { using namespace ::rtl; diff --git a/binfilter/inc/bf_basic/sberrors.hxx b/binfilter/inc/bf_basic/sberrors.hxx index 28ef0b72a..6a2d1f49a 100644 --- a/binfilter/inc/bf_basic/sberrors.hxx +++ b/binfilter/inc/bf_basic/sberrors.hxx @@ -393,143 +393,6 @@ typedef ULONG SbError; #define SbERR_PROG_TOO_LARGE ERRCODE_BASIC_PROG_TOO_LARGE #define SbERR_NO_STRINGS_ARRAYS ERRCODE_BASIC_NO_STRINGS_ARRAYS #define SbERR_BASIC_EXCEPTION ERRCODE_BASIC_EXCEPTION -// #define SbERR_COMPILER_END ERRCODE_BASIC_COMPILER_END - - -/* ALT -#define SbERR_SYNTAX 2 // unspecified syntax error -#define SbERR_NO_GOSUB 3 // Return without Gosub -#define SbERR_REDO_FROM_START 4 // Redo form start (SB internal) -#define SbERR_BAD_ARGUMENT 5 // Invalid procedure call -#define SbERR_MATH_OVERFLOW 6 // Overflow -#define SbERR_NO_MEMORY 7 // Out of memory -#define SbERR_ALREADY_DIM 8 // Array already dimensioned -#define SbERR_OUT_OF_RANGE 9 // Subscript out of range -#define SbERR_DUPLICATE_DEF 10 // Duplicate definition -#define SbERR_ZERODIV 11 // Division by zero -#define SbERR_VAR_UNDEFINED 12 // Variable undefined (SB) -#define SbERR_CONVERSION 13 // Type mismatch -#define SbERR_BAD_PARAMETER 14 // Invalid Parameter -#define SbERR_USER_ABORT 18 // User interrupt occurred -#define SbERR_BAD_RESUME 20 // Resume without error -#define SbERR_STACK_OVERFLOW 28 // Out of stack space -#define SbERR_PROC_UNDEFINED 35 // Sub or Function not defined -#define SbERR_BAD_DLL_LOAD 48 // Error in loading DLL -#define SbERR_BAD_DLL_CALL 49 // Bad DLL calling convention -#define SbERR_INTERNAL_ERROR 51 // internal error -#define SbERR_BAD_CHANNEL 52 // Bad file name or number -#define SbERR_FILE_NOT_FOUND 53 // File not found -#define SbERR_BAD_FILE_MODE 54 // Bad file mode -#define SbERR_FILE_ALREADY_OPEN 55 // File already open -#define SbERR_IO_ERROR 57 // Device I/O error -#define SbERR_FILE_EXISTS 58 // File already exists -#define SbERR_BAD_RECORD_LENGTH 59 // bad record length -#define SbERR_DISK_FULL 61 // disk full -#define SbERR_READ_PAST_EOF 62 // Input past end of file -#define SbERR_BAD_RECORD_NUMBER 63 // Bad record number -#define SbERR_TOO_MANY_FILES 67 // Too many files -#define SbERR_NO_DEVICE 68 // Device not available -#define SbERR_ACCESS_DENIED 70 // Permission denied -#define SbERR_NOT_READY 71 // Disk not ready -#define SbERR_NOT_IMPLEMENTED 73 // Feature not implemented -#define SbERR_DIFFERENT_DRIVE 74 // No rename with different drive -#define SbERR_ACCESS_ERROR 75 // Path/File access error -#define SbERR_PATH_NOT_FOUND 76 // Path not found -#define SbERR_NO_OBJECT 91 // Object variable not set -#define SbERR_BAD_PATTERN 93 // Invalid pattern string -#define SBERR_IS_NULL 94 // Invalid use of Null - -// DDE messages from 250-299 -#define SbERR_DDE_ERROR 250 -#define SbERR_DDE_WAITINGACK 280 -#define SbERR_DDE_OUTOFCHANNELS 281 -#define SbERR_DDE_NO_RESPONSE 282 -#define SbERR_DDE_MULT_RESPONSES 283 -#define SbERR_DDE_CHANNEL_LOCKED 284 -#define SbERR_DDE_NOTPROCESSED 285 -#define SbERR_DDE_TIMEOUT 286 -#define SbERR_DDE_USER_INTERRUPT 287 -#define SbERR_DDE_BUSY 288 -#define SbERR_DDE_NO_DATA 289 -#define SbERR_DDE_WRONG_DATA_FORMAT 290 -#define SbERR_DDE_PARTNER_QUIT 291 -#define SbERR_DDE_CONV_CLOSED 292 -#define SbERR_DDE_NO_CHANNEL 293 -#define SbERR_DDE_INVALID_LINK 294 -#define SbERR_DDE_QUEUE_OVERFLOW 295 -#define SbERR_DDE_LINK_ALREADY_EST 296 -#define SbERR_DDE_LINK_INV_TOPIC 297 -#define SbERR_DDE_DLL_NOT_FOUND 298 - -#define SbERR_CANNOT_LOAD 323 // Can't load module -#define SbERR_BAD_INDEX 341 // Invalid object index -#define SbERR_NO_ACTIVE_OBJECT 366 // No active view or document -#define SbERR_BAD_PROP_VALUE 380 // Bad property value -#define SbERR_PROP_READONLY 382 // Property is read only -#define SbERR_PROP_WRITEONLY 394 // Property is write only -#define SbERR_INVALID_OBJECT 420 // Invalid object reference -#define SbERR_NO_METHOD 423 // Property or method not found -#define SbERR_NEEDS_OBJECT 424 // Object required -#define SbERR_INVALID_USAGE_OBJECT 425 // Invalid usee of object -#define SbERR_NO_OLE 430 // Class does not support OLE -#define SbERR_BAD_METHOD 438 // Object doesn't support method -#define SbERR_OLE_ERROR 440 // OLE Automation error -#define SbERR_BAD_ACTION 445 // Object doesn't support this action -#define SbERR_NO_NAMED_ARGS 446 // Object doesn't support named args -#define SbERR_BAD_LOCALE 447 // Object doesn't support current locale setting -#define SbERR_NAMED_NOT_FOUND 448 // Named argument not found -#define SbERR_NOT_OPTIONAL 449 // Argument not optional -#define SbERR_WRONG_ARGS 450 // Wrong number of arguments -#define SbERR_NOT_A_COLL 451 // Object not a collection -#define SbERR_BAD_ORDINAL 452 // Invalid ordinal -#define SbERR_DLLPROC_NOT_FOUND 453 // Specified DLL function not found -#define SbERR_BAD_CLIPBD_FORMAT 460 // Invalid clipboard format - -// Debugger messages from 700-799 - -#define SbERR_PROPERTY_NOT_FOUND 1000 // Class not have property -#define SbERR_METHOD_NOT_FOUND 1001 // Class does not have method -#define SbERR_ARG_MISSING 1002 // Missing required argument -#define SbERR_BAD_NUMBER_OF_ARGS 1003 // Bad number of arguments -#define SbERR_METHOD_FAILED 1004 // Method failed -#define SbERR_SETPROP_FAILED 1005 // Unable to set property -#define SbERR_GETPROP_FAILED 1006 // Unable to get property - -// Compiler Errors (treten waehrend des Programmlaufs nicht auf) -// Diese IDs koennen sich jederzeit verschieben - -#define SbERR_COMPILER_BGN 950 -#define SbERR_UNEXPECTED 951 // Unexpected symbol: xx -#define SbERR_EXPECTED 952 // Expected: xx -#define SbERR_SYMBOL_EXPECTED 953 // Symbol expected -#define SbERR_VAR_EXPECTED 954 // Variable expected -#define SbERR_LABEL_EXPECTED 955 // Label expected -#define SbERR_LVALUE_EXPECTED 956 // Lvalue expected -#define SbERR_VAR_DEFINED 957 // Variable xxx already defined -#define SbERR_PROC_DEFINED 958 // Procedure xx already defined -#define SbERR_LABEL_DEFINED 959 // Label xxx already defined -#define SbERR_UNDEF_VAR 960 // Variable xx undefined -#define SbERR_UNDEF_ARRAY 961 // Array or function xx undefined -#define SbERR_UNDEF_PROC 962 // Procedure xxx undefined -#define SbERR_UNDEF_LABEL 963 // Label xxx undefined -#define SbERR_UNDEF_TYPE 964 // Unknown user defined type xxx -#define SbERR_BAD_EXIT 965 // Exit XXX expexted -#define SbERR_BAD_BLOCK 966 // Unterminated statement block: missing XX -#define SbERR_BAD_BRACKETS 967 // Parentheses do not match -#define SbERR_BAD_DECLARATION 968 // Symbol xx defined differently -#define SbERR_BAD_PARAMETERS 969 // Parameters do not match -#define SbERR_BAD_CHAR_IN_NUMBER 970 // Bad character in number -#define SbERR_MUST_HAVE_DIMS 971 // Array needs dimensioning -#define SbERR_NO_IF 972 // Else/Endif without If -#define SbERR_NOT_IN_SUBR 973 // xxx not allowed within a sub -#define SbERR_NOT_IN_MAIN 974 // xxx not allowed outside a sub -#define SbERR_WRONG_DIMS 975 // Dimensions do not match -#define SbERR_BAD_OPTION 976 // Unknown option: xxx -#define SbERR_CONSTANT_REDECLARED 977 // Constant xx redeclared -#define SbERR_PROG_TOO_LARGE 978 // Program is too large -#define SbERR_NO_STRINGS_ARRAYS 979 -#define SbERR_COMPILER_END 299 -*/ // Grid messages from 30000-30999 // OLE messages from 31000-31999 diff --git a/binfilter/inc/bf_basic/sbxdef.hxx b/binfilter/inc/bf_basic/sbxdef.hxx index 924307306..a8fcbdaa6 100644 --- a/binfilter/inc/bf_basic/sbxdef.hxx +++ b/binfilter/inc/bf_basic/sbxdef.hxx @@ -248,43 +248,6 @@ typedef ULONG SbxError; // Alten Typ erhalten #define SbxERR_WRONG_ARGS ERRCODE_SBX_WRONG_ARGS #define SbxERR_NOT_A_COLL ERRCODE_SBX_NOT_A_COLL - -/* Alte Codes mit VB-Fehler-Codes -enum SbxError { // Ergebnis einer Rechenoperation/Konversion - SbxERR_OK = 0, // durchgefuehrt - SbxERR_SYNTAX = 2, // Syntaxfehler im Parser - SbxERR_NOTIMP = 5, // nicht moeglich - SbxERR_OVERFLOW = 6, // Ueberlauf - SbxERR_BOUNDS = 9, // Array-Index ungueltig - SbxERR_ZERODIV = 11, // Division durch Null - SbxERR_CONVERSION = 13, // falscher Datentyp - SbxERR_BAD_PARAMETER = 14, // ung�ltiger Parameter - SbxERR_PROC_UNDEFINED = 35, // BASIC-Sub oder Function undefiniert - SbxERR_ERROR = 51, // andere Fehler - // Objektbezogene Fehler - SbxERR_NO_OBJECT = 91, // Objektvariable nicht belegt - SbxERR_CANNOT_LOAD = 323, // Objekt kann nicht geladen/eingerichtet werden - SbxERR_BAD_INDEX = 341, // Invalid object index - SbxERR_NO_ACTIVE_OBJECT=366,// Objekt ist nicht aktiviert - SbxERR_BAD_PROP_VALUE = 380,// Bad property value - SbxERR_PROP_READONLY = 382, // Property is read only - SbxERR_PROP_WRITEONLY = 394,// Property is write only - SbxERR_INVALID_OBJECT = 420,// Invalid object reference - SbxERR_NO_METHOD = 423, // Property oder Methode unbekannt - SbxERR_INVALID_USAGE_OBJECT=425,// Falsche Verwendung eines Objekts - SbxERR_NO_OLE = 430, // Kein OLE-Objekt - SbxERR_BAD_METHOD = 438, // Methode nicht unterst�tzt - SbxERR_OLE_ERROR = 440, // OLE Automation-Fehler - SbxERR_BAD_ACTION = 445, // Aktion nicht unterst�tzt - SbxERR_NO_NAMED_ARGS = 446, // Keine benannten Argumente - SbxERR_BAD_LOCALE = 447, // Laenderspezifische Einstellungen nicht unterst�tzt - SbxERR_NAMED_NOT_FOUND = 448,// Unbekanntes benanntes Argument - SbxERR_NOT_OPTIONAL = 449, // Argument nicht optional - SbxERR_WRONG_ARGS = 450, // Falsche Zahl von Argumenten - SbxERR_NOT_A_COLL = 451 // Objekt enth�lt keine Elemente -}; -*/ - // Flag-Bits: #define SBX_READ 0x0001 // Leseerlaubnis #define SBX_WRITE 0x0002 // Schreiberlaubnis diff --git a/binfilter/inc/bf_sc/cell.hxx b/binfilter/inc/bf_sc/cell.hxx index 07ae83139..c8263028d 100644 --- a/binfilter/inc/bf_sc/cell.hxx +++ b/binfilter/inc/bf_sc/cell.hxx @@ -512,18 +512,6 @@ inline void ScStringCell::SetString( const String& rString ) } -/* - -// ScFormulaCell - -inline ScBaseCell* ScFormulaCell::Clone(ScDocument* pDoc) const -{ - return new ScFormulaCell(pDoc, *this); -} -*/ - - - // ScNoteCell inline ScNoteCell::ScNoteCell() : diff --git a/binfilter/inc/bf_sch/defines.hxx b/binfilter/inc/bf_sch/defines.hxx index c65856ed3..430d70adb 100644 --- a/binfilter/inc/bf_sch/defines.hxx +++ b/binfilter/inc/bf_sch/defines.hxx @@ -86,10 +86,6 @@ namespace binfilter { #define CHOBJID_DIAGRAM_Y_GRID_HELP_GROUP 53 #define CHOBJID_DIAGRAM_Z_GRID_HELP_GROUP 54 #define CHOBJID_DIAGRAM_SPECIAL_GROUP 55 -/*#define CHOBJID_3D_PIE_BOTTOM 57 -#define CHOBJID_3D_PIE_SIDE 58 -#define CHOBJID_3D_PIE_TOP 59 -*/ #define CHOBJID_DIAGRAM_STOCKLINE 60 #define CHOBJID_DIAGRAM_STOCKRECT 61 #define CHOBJID_DIAGRAM_STOCKLINE_GROUP 62 diff --git a/binfilter/inc/bf_svtools/securityoptions.hxx b/binfilter/inc/bf_svtools/securityoptions.hxx index a8750825f..5e1af9b19 100644 --- a/binfilter/inc/bf_svtools/securityoptions.hxx +++ b/binfilter/inc/bf_svtools/securityoptions.hxx @@ -112,16 +112,6 @@ class SvtSecurityOptions: public Options typedef ::com::sun::star::uno::Sequence< ::rtl::OUString > Certificate; - /* - // MT: Doesn't work for sequence... - struct Certificate - { - ::rtl::OUString SubjectName; - ::rtl::OUString SerialNumber; - ::rtl::OUString RawData; - }; - */ - //------------------------------------------------------------------------------------------------------------- // public methods //------------------------------------------------------------------------------------------------------------- diff --git a/binfilter/inc/bf_svx/tstpitem.hxx b/binfilter/inc/bf_svx/tstpitem.hxx index b7e205905..040f13d76 100644 --- a/binfilter/inc/bf_svx/tstpitem.hxx +++ b/binfilter/inc/bf_svx/tstpitem.hxx @@ -110,8 +110,6 @@ Dieses Item beschreibt eine Liste von TabStops. class SvxTabStopItem : public SfxPoolItem, private SvxTabStopArr { -//friend class SvxTabStopObject_Impl; - public: TYPEINFO(); diff --git a/binfilter/inc/bf_sw/unomod.hxx b/binfilter/inc/bf_sw/unomod.hxx index 743139f70..19bc37bc7 100644 --- a/binfilter/inc/bf_sw/unomod.hxx +++ b/binfilter/inc/bf_sw/unomod.hxx @@ -32,12 +32,6 @@ class SwViewOption; struct SwPrintData; class SwDoc; -/****************************************************************************** - * - ******************************************************************************/ - - - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SwXModule_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & ); class SwXModule : public cppu::WeakImplHelper4 @@ -159,32 +153,6 @@ public: }; -/*class SwXTerminateListener : public ::com::sun::star::frame::XTerminateListener, - public UsrObject -{ -public: - SwXTerminateListener(); - virtual ~SwXTerminateListener(); - - SMART_UNO_DECLARATION( SwXTerminateListener, UsrObject ); - - virtual UString getClassName(); -// automatisch auskommentiert - [getIdlClass or queryInterface] - Bitte XTypeProvider benutzen! -// virtual ::com::sun::star::uno::XInterface * queryInterface( ::com::sun::star::uno::Uik aUik); - -// automatisch auskommentiert - [getIdlClass or queryInterface] - Bitte XTypeProvider benutzen! -// virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > > getIdlClasses(void); - - - //XTerminateListener - virtual void queryTermination(const ::com::sun::star::lang::EventObject& aEvent); - virtual void notifyTermination(const ::com::sun::star::lang::EventObject& aEvent); - - //XEventListener - virtual void disposing(const ::com::sun::star::lang::EventObject& Source); -}; - -*/ } //namespace binfilter #endif diff --git a/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx b/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx index 2a2d5981b..eb57c6656 100644 --- a/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx +++ b/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx @@ -547,8 +547,6 @@ public: Sequence< Any > const & rArguments, Reference< XComponentContext > const & xContext ) throw (Exception, RuntimeException); -// virtual Sequence< OUString > SAL_CALL getAvailableServiceNames() -// throw (RuntimeException); // XMultiServiceFactory virtual Sequence< OUString > SAL_CALL getAvailableServiceNames() throw(::com::sun::star::uno::RuntimeException); @@ -949,13 +947,6 @@ Sequence< OUString > OServiceManager::getAvailableServiceNames( HashSet_OWString while( aSIt != m_ServiceMap.end() ) aNameSet.insert( (*aSIt++).first ); - /* do not return the implementation names - HashMap_OWString_Interface m_ImplementationNameMap; - HashMap_OWString_Interface::iterator aIt = m_ImplementationNameMap.begin(); - while( aIt != m_ImplementationNameMap.end() ) - aNameSet.insert( (*aIt++).first ); - */ - Sequence< OUString > aNames( aNameSet.size() ); OUString * pArray = aNames.getArray(); sal_Int32 i = 0; @@ -1444,8 +1435,6 @@ void ORegistryServiceManager::dispose() * Return the root key of the registry. The Default registry service is ordered * if no registry is set. */ -//Reference<XServiceProvider > create_DefaultRegistry_ServiceProvider(); - Reference<XRegistryKey > ORegistryServiceManager::getRootKey() { if( !m_xRootKey.is() ) @@ -1772,8 +1761,6 @@ public: Sequence< Any > const & rArguments, Reference< XComponentContext > const & xContext ) throw (Exception, RuntimeException); -// virtual Sequence< OUString > SAL_CALL getAvailableServiceNames() -// throw (RuntimeException); // XMultiServiceFactory virtual Sequence< OUString > SAL_CALL getAvailableServiceNames() |