[Libreoffice-commits] .: binfilter/bf_sch binfilter/bf_sfx2 binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw binfilter/bf_xmloff
Michael Meeks
mmeeks at kemper.freedesktop.org
Tue Jan 11 06:38:25 PST 2011
binfilter/bf_sch/source/core/sch_chtmode7.cxx | 80 -----
binfilter/bf_sfx2/source/appl/sfx2_appbas.cxx | 69 ----
binfilter/bf_svtools/source/items1/svt_nranges.cxx | 57 ---
binfilter/bf_svx/source/unoedit/svx_unofield.cxx | 248 ----------------
binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx | 121 -------
binfilter/bf_sw/source/filter/excel/sw_excread.cxx | 91 -----
binfilter/bf_xmloff/source/draw/xmloff_ximp3dobject.cxx | 60 ---
7 files changed, 1 insertion(+), 725 deletions(-)
New commits:
commit 47e2e2d4f44e26a02b781543abf43b3c5d2554b8
Author: Anders Jonsson <anders.jonsson at norsjonet.se>
Date: Tue Jan 11 11:20:36 2011 +0100
Remove commented code
diff --git a/binfilter/bf_sch/source/core/sch_chtmode7.cxx b/binfilter/bf_sch/source/core/sch_chtmode7.cxx
index 9bb0dee..66cc309 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode7.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode7.cxx
@@ -410,55 +410,6 @@ namespace binfilter {
/*N*/ return pOutliner;
/*N*/ }
-/*
-UINT32 ChartModel::ValFor mat () const
-{
- return nValFo rmat;
-}
-
-
-UINT32& ChartModel::ValForm at()
-{
- return nVal Format;
-}
-
-
-UINT32 ChartModel::PercentVa lFormat () const
-{
- return nPercentV alFormat;
-}
-
-
-UINT32& ChartModel::Per centValFormat ()
-{
- return nPercentValFo rmat;
-}
-
-
-UINT32 ChartModel::Des crFormat () const
-{
- return nDescrFor mat;
-}
-
-
-UINT32& ChartModel::Desc rFormat()
-{
- return nDes crFormat;
-}
-
-
-UINT32 ChartModel::PercentD escrFormat () const
-{
- return nPercentDescrFo rmat;
-}
-
-
-UINT32& ChartModel::Percent DescrF ormat ()
-{
- return nPercentDescr Format;
-}
-
-*/
/*N*/ BOOL ChartModel::IsInitialized() const
/*N*/ {
/*N*/ return mbIsInitialized;
@@ -581,37 +532,6 @@ UINT32& ChartModel::Percent DescrF ormat ()
/*N*/ case CHSTYLE_2D_PERCENTCOLUMN :
/*N*/ return FALSE;
-// case CHSTYLE_2D_LINE :
-// case CHSTYLE_2D_STACKEDLINE :
-// case CHSTYLE_2D_PERCENTLINE :
-// case CHSTYLE_2D_LINESYMBOLS :
-// case CHSTYLE_2D_STACKEDLINESYM :
-// case CHSTYLE_2D_PERCENTLINESYM :
-// case CHSTYLE_2D_CUBIC_SPLINE :
-// case CHSTYLE_2D_CUBIC_SPLINE_SYMBOL :
-// case CHSTYLE_2D_B_SPLINE :
-// case CHSTYLE_2D_B_SPLINE_SYMBOL :
-
-// case CHSTYLE_2D_XY :
-// case CHSTYLE_2D_XYSYMBOLS :
-// case CHSTYLE_2D_XY_LINE :
-// case CHSTYLE_2D_CUBIC_SPLINE_XY :
-// case CHSTYLE_2D_CUBIC_SPLINE_SYMBOL_XY :
-// case CHSTYLE_2D_B_SPLINE_XY :
-// case CHSTYLE_2D_B_SPLINE_SYMBOL_XY :
-
-// case CHSTYLE_2D_BAR :
-// case CHSTYLE_2D_STACKEDBAR:
-// case CHSTYLE_2D_PERCENTBAR:
-
-// case CHSTYLE_2D_AREA :
-// case CHSTYLE_2D_PERCENTAREA :
-// case CHSTYLE_2D_STACKEDAREA :
-
-// case CHSTYLE_2D_STOCK_1:
-// case CHSTYLE_2D_STOCK_2:
-// case CHSTYLE_2D_STOCK_3:
-// case CHSTYLE_2D_STOCK_4:
/*N*/ default :
/*N*/ return TRUE;
/*N*/ }
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appbas.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appbas.cxx
index 2d1701d..0abf450 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appbas.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appbas.cxx
@@ -174,74 +174,7 @@ BasicManager* SfxApplication::GetBasicManager()
/*N*/
/*N*/ // zuerst das BASIC laden
/*N*/ GetBasic();
-/*
- // als erstes SfxShellObject das SbxObject der SfxApplication erzeugen
- SbxObject *pSbx = GetSbxObject();
- DBG_ASSERT( pSbx, "SfxShellObject: can't create SbxObject for SfxApplication" );
-
- // die SbxObjects aller Module erzeugen
- SfxModuleArr_Impl& rArr = GetModules_Impl();
- for ( sal_uInt16 n = 0; n < rArr.Count(); ++n )
- {
- SfxModule *pMod = rArr.GetObject(n);
- if ( pMod->IsLoaded() )
- {
- pSbx = pMod->GetSbxObject();
- DBG_ASSERT( pSbx, "SfxModule: can't create SbxObject" );
- }
- }
-
- // die SbxObjects aller Tasks erzeugen
- for ( SfxTask *pTask = SfxTask::GetFirst(); pTask; pTask = SfxTask::GetNext( *pTask ) )
- pTask->GetSbxObject();
-
- // die SbxObjects aller SfxObjectShells erzeugen (ggf. Frame-los!)
- for ( SfxObjectShell *pObjSh = SfxObjectShell::GetFirst( NULL, sal_False );
- pObjSh;
- pObjSh = SfxObjectShell::GetNext(*pObjSh, NULL, sal_False) )
- {
- // kein IP-Object oder wenn doch dann initialisiert?
- SvStorageRef aStorage;
- if ( !pObjSh->IsHandsOff() )
- aStorage = pObjSh->GetStorage();
- if ( !pObjSh->GetInPlaceObject() || aStorage.Is() )
- {
- DBG( DbgOutf( "SfxShellObject: BASIC-on-demand for %s",
- pObjSh->SfxShell::GetName().GetBuffer() ) );
- pSbx = pObjSh->GetSbxObject();
- DBG_ASSERT( pSbx, "SfxShellObject: can't create SbxObject" );
- }
- }
-
- // die SbxObjects der SfxShells auf den Stacks der Frames erzeugen
- for ( SfxViewFrame *pFrame = SfxViewFrame::GetFirst(0,0,sal_False);
- pFrame;
- pFrame = SfxViewFrame::GetNext(*pFrame,0,0,sal_False) )
- {
- // den Dispatcher des Frames rausholen
- SfxDispatcher *pDispat = pFrame->GetDispatcher();
- pDispat->Flush();
-
- // "uber alle SfxShells auf dem Stack des Dispatchers iterieren
- // Frame selbst wird ausgespart, da er indirekt angezogen wird,
- // sofern er ein Dokument enth"alt.
- for ( sal_uInt16 nStackIdx = pDispat->GetShellLevel(*pFrame);
- 0 != nStackIdx;
- --nStackIdx )
- {
- DBG( DbgOutf( "SfxShellObject: BASIC-on-demand for level %u", nStackIdx-1 ); )
- pSbx = pDispat->GetShell(nStackIdx - 1)->GetSbxObject();
- DBG_ASSERT( pSbx, "SfxShellObject: can't create SbxObject" );
- }
-
- if ( !pFrame->GetObjectShell() )
- {
- DBG( DbgOutf( "SfxShellObject: BASIC-on-demand for empty frame" ); )
- pSbx = pFrame->GetSbxObject();
- DBG_ASSERT( pSbx, "SfxShellObject: can't create SbxObject" );
- }
- }
-*/
+
// Factories anmelden
// SbxBase::AddFactory( new SfxSbxObjectFactory_Impl );
/*N*/ }
diff --git a/binfilter/bf_svtools/source/items1/svt_nranges.cxx b/binfilter/bf_svtools/source/items1/svt_nranges.cxx
index f9c3a8e..13266ea 100644
--- a/binfilter/bf_svtools/source/items1/svt_nranges.cxx
+++ b/binfilter/bf_svtools/source/items1/svt_nranges.cxx
@@ -486,63 +486,6 @@ SfxNumRanges& SfxNumRanges::operator -=
delete [] pTarget;
return *this;
- /* untested code from MI commented out (MDA, 28.01.97)
- do
- {
- // 1st range is smaller than 2nd range?
- if ( pRange1[1] < pRange2[0] )
- // => keep 1st range
- pRange1 += 2;
-
- // 2nd range is smaller than 1st range?
- else if ( pRange2[1] < pRange1[0] )
- // => skip 2nd range
- pRange2 += 2;
-
- // 2nd range totally overlaps the 1st range?
- else if ( pRange2[0] <= pRange1[0] && pRange2[1] >= pRange1[1] )
- // => remove 1st range
- memmove( pRange1, pRange1+2, sizeof(NUMTYPE) * (pEndOfTarget-pRange1+2) );
-
- // 2nd range overlaps only the beginning of 1st range?
- else if ( pRange2[0] <= pRange1[0] && pRange2[1] < pRange1[1] )
- {
- // => cut the beginning of 1st range and goto next 2nd range
- pRange1[0] = pRange2[1] + 1;
- pRange2 += 2;
- }
-
- // 2nd range overlaps only the end of 1st range?
- else if ( pRange2[0] > pRange1[0] && pRange2[1] >= pRange1[0] )
- // => cut the beginning of 1st range
- pRange1[0] = pRange2[1]+1;
-
- // 2nd range is a real subset of 1st range
- else
- {
- // => split 1st range and goto next 2nd range
- memmove( pRange1+3, pRange1+1, sizeof(NUMTYPE) * (pEndOfTarget-pRange1-1) );
- pRange1[1] = pRange2[0] - 1;
- pRange1[2] = pRange2[1] + 1;
- pRange1 += 2;
- pRange2 += 2;
- }
- }
- while ( *pRange1 && *pRange2 );
-
- // assign the differentiated ranges
- delete[] _pRanges;
- NUMTYPE nUShorts = Count_Impl(pTarget) + 1;
- if ( 1 != nUShorts )
- {
- _pRanges = new NUMTYPE[ nUShorts ];
- memcpy( _pRanges, pTarget, nUShorts * sizeof(NUMTYPE) );
- _pRanges[ nUShorts-1 ] = 0;
- }
- else
- _pRanges = 0;
- return *this;
- */
}
//------------------------------------------------------------------------
diff --git a/binfilter/bf_svx/source/unoedit/svx_unofield.cxx b/binfilter/bf_svx/source/unoedit/svx_unofield.cxx
index db506f9..f8f3099 100644
--- a/binfilter/bf_svx/source/unoedit/svx_unofield.cxx
+++ b/binfilter/bf_svx/source/unoedit/svx_unofield.cxx
@@ -699,124 +699,6 @@ void SAL_CALL SvxUnoTextField::setPropertyValue( const OUString& aPropertyName,
throw lang::IllegalArgumentException();
-/*
- case WID_FORMAT:
- {
- sal_Int32 nFormat;
-
- switch( mnId )
- {
- case ID_DATEFIELD:
- {
- SvxDateField* pDate = PTR_CAST( SvxDateField, aFieldItem.GetField() );
- if(pDate)
- pDate->SetFormat( (SvxDateFormat)nFormat );
- break;
- }
- case ID_URLFIELD:
- {
- SvxURLField* pURL = PTR_CAST( SvxURLField, aFieldItem.GetField() );
- if(pURL)
- pURL->SetFormat( (SvxURLFormat)nFormat );
- break;
- }
- case ID_EXT_TIMEFIELD:
- {
- SvxExtTimeField* pTime = PTR_CAST( SvxExtTimeField, aFieldItem.GetField() );
- if(pTime)
- pTime->SetFormat( (SvxTimeFormat)nFormat );
- break;
- }
- case ID_EXT_FILEFIELD:
- {
- SvxExtFileField* pFile = PTR_CAST( SvxExtFileField, aFieldItem.GetField() );
- if(pFile)
- pFile->SetFormat( (SvxFileFormat)nFormat );
- break;
- }
- case ID_AUTHORFIELD:
- {
- SvxAuthorField* pAuthor = PTR_CAST( SvxAuthorField, aFieldItem.GetField() );
- if(pAuthor)
- pAuthor->SetFormat( (SvxAuthorFormat)nFormat );
- break;
- }
- default:
- throw beans::UnknownPropertyException();
- }
- }
- break;
- case WID_FIX:
- {
- if( aValue.hasValue() || aValue.getValueType() != ::getCppuBooleanType() )
- throw lang::IllegalArgumentException();
- sal_Bool bFix( *(sal_Bool*)aValue.getValue() );
- switch( mnId )
- {
- case ID_EXT_TIMEFIELD:
- {
- SvxExtTimeField* pTime = PTR_CAST( SvxExtTimeField, aFieldItem.GetField() );
- if(pTime)
- pTime->SetType( (SvxTimeType)bFix?SVXTIMETYPE_FIX:SVXTIMETYPE_VAR );
- break;
- }
- case ID_DATEFIELD:
- {
- SvxDateField* pDate = PTR_CAST( SvxDateField, aFieldItem.GetField() );
- if(pDate)
- pDate->SetType( (SvxDateType)bFix?SVXDATETYPE_FIX:SVXDATETYPE_VAR );
- break;
- }
- case ID_EXT_FILEFIELD:
- {
- SvxExtFileField* pFile = PTR_CAST( SvxExtFileField, aFieldItem.GetField() );
- if(pFile)
- pFile->SetType( (SvxFileType)bFix?SVXFILETYPE_FIX:SVXFILETYPE_VAR );
- break;
- }
- case ID_AUTHORFIELD:
- {
- SvxAuthorField* pAuthor = PTR_CAST( SvxAuthorField, aFieldItem.GetField() );
- if(pAuthor)
- pAuthor->SetType( (SvxAuthorType)bFix?SVXAUTHORTYPE_FIX:SVXAUTHORTYPE_VAR );
- break;
- }
- default:
- throw beans::UnknownPropertyException();
- }
- }
- break;
- case WID_PRES:
- case WID_URL:
- case WID_TARGET:
- {
- SvxURLField* pURL = PTR_CAST( SvxURLField, aFieldItem.GetField() );
- if(pURL)
- {
- OUString aUnoStr;
- if(!(aValue >>= aUnoStr))
- throw lang::IllegalArgumentException();
-
- switch( pMap->nWID )
- {
- case WID_PRES:
- pURL->SetRepresentation( aUnoStr );
- break;
- case WID_URL:
- pURL->SetURL( aUnoStr );
- break;
- case WID_TARGET:
- pURL->SetTargetFrame( aUnoStr );
- break;
- }
- }
- break;
- }
- }
-
- SfxItemSet aSet = pForwarder->GetAttribs( GetSelection() );
- aSet.Put( aFieldItem );
-*/
}
uno::Any SAL_CALL SvxUnoTextField::getPropertyValue( const OUString& PropertyName )
@@ -859,136 +741,6 @@ uno::Any SAL_CALL SvxUnoTextField::getPropertyValue( const OUString& PropertyNam
}
return aValue;
-
-/*
- switch(pMap->nWID)
- {
- case WID_FORMAT:
- switch( mnId )
- {
- case ID_DATEFIELD:
- {
- SvxDateField* pDate = PTR_CAST( SvxDateField, pFieldItem->GetField() );
- if(pDate)
- aValue <<= (sal_Int32)pDate->GetFormat();
- break;
- }
- case ID_URLFIELD:
- {
- SvxURLField* pURL = PTR_CAST( SvxURLField, pFieldItem->GetField() );
- if(pURL)
- aValue <<= (sal_Int32)pURL->GetFormat();
- break;
- }
- case ID_EXT_TIMEFIELD:
- {
- SvxExtTimeField* pTime = PTR_CAST( SvxExtTimeField, pFieldItem->GetField() );
- if(pTime)
- aValue <<= (sal_Int32)pTime->GetFormat();
- break;
- }
- case ID_EXT_FILEFIELD:
- {
- SvxExtFileField* pFile = PTR_CAST( SvxExtFileField, pFieldItem->GetField() );
- if(pFile)
- aValue <<= (sal_Int32)pFile->GetFormat();
- break;
- }
- case ID_AUTHORFIELD:
- {
- SvxAuthorField* pAuthor = PTR_CAST( SvxAuthorField, pFieldItem->GetField() );
- if(pAuthor)
- aValue <<= (sal_Int32)pAuthor->GetFormat();
- break;
- }
- default:
- throw beans::UnknownPropertyException();
- }
- break;
- case WID_FIX:
- {
- sal_Bool bFix = sal_False;
- switch( mnId )
- {
- case ID_EXT_TIMEFIELD:
- {
- SvxExtTimeField* pTime = PTR_CAST( SvxExtTimeField, pFieldItem->GetField() );
- if(pTime)
- bFix = pTime->GetType() == SVXTIMETYPE_FIX;
- break;
- }
- case ID_DATEFIELD:
- {
- SvxDateField* pDate = PTR_CAST( SvxDateField, pFieldItem->GetField() );
- if(pDate)
- bFix = pDate->GetType() == SVXDATETYPE_FIX;
- break;
- }
- case ID_EXT_FILEFIELD:
- {
- SvxExtFileField* pFile = PTR_CAST( SvxExtFileField, pFieldItem->GetField() );
- if(pFile)
- bFix = pFile->GetType() == SVXFILETYPE_FIX;
- break;
- }
- case ID_AUTHORFIELD:
- {
- SvxAuthorField* pAuthor = PTR_CAST( SvxAuthorField, pFieldItem->GetField() );
- if(pAuthor)
- bFix = pAuthor->GetType() == SVXAUTHORTYPE_FIX;
- break;
- }
- default:
- throw beans::UnknownPropertyException();
- }
- aValue.setValue( &bFix, ::getCppuBooleanType() );
- }
- break;
- case WID_PRES:
- case WID_URL:
- case WID_TARGET:
- {
- SvxURLField* pURL = PTR_CAST( SvxURLField, pFieldItem->GetField() );
- if(pURL)
- {
- OUString aStr;
- switch( pMap->nWID )
- {
- case WID_PRES:
- aStr = pURL->GetRepresentation();
- break;
- case WID_URL:
- aStr = pURL->GetURL();
- break;
- case WID_TARGET:
- aStr = pURL->GetTargetFrame();
- break;
- }
- aValue <<= aStr;
- }
- break;
- }
- case WID_FCOLOR:
- case WID_TCOLOR:
- {
- Color* pFColor = NULL;
- Color* pTColor = NULL;
- const ESelection aSel = GetSelection();
-
- pForwarder->CalcFieldValue( *pFieldItem, aSel.nStartPara, aSel.nStartPos, pTColor, pFColor );
-
- if( pMap->nWID == WID_FCOLOR )
- aValue <<= (sal_Int32)pFColor->GetColor();
- else
- aValue <<= (sal_Int32)pTColor->GetColor();
- break;
-
- delete pTColor;
- delete pFColor;
- }
- }
- return aValue;
-*/
}
void SAL_CALL SvxUnoTextField::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx
index 6943b8e..5b65d52 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx
@@ -1695,127 +1695,6 @@ uno::Reference< XTextRange > SwXTextRange::CreateTextRangeFromPosition(SwDoc* p
delete pNewCrsr;
return aRet;
}
-/*Reference< XTextRange > SwXTextRange::createTextRangeFromPaM(
- SwPaM& rPaM, Reference<XText> xParentText)
-{
- Reference< XTextRange > xRet;
- // in welcher Umgebung steht denn der PaM?
- SwStartNode* pSttNode = rPaM.GetNode()->FindStartNode();
- SwStartNodeType eType = pSttNode->GetStartNodeType();
- uno::Reference< XText > xCurParentRef;
- switch(eType)
- {
- case SwTableBoxStartNode:
- {
- SwTableBox* pBox = pSttNode->GetTblBox();
- xRet = new SwXTextRange(*pBox->GetFrmFmt(), *pBox, rPaM);
- }
- break;
- case SwFlyStartNode:
- {
- SwFrmFmt* pFlyFmt = pSttNode->GetFlyFmt();
- SwXTextFrame* pxFrm = (SwXTextFrame*)SwClientIter( *pFlyFmt ).
- First( TYPE( SwXTextFrame ));
- if(pxFrm)
- xCurParentRef = pxFrm;
- else
- xRet = new SwXTextRange(*pFlyFmt, rPaM);
- }
- break;
- case SwFootnoteStartNode:
- {
- const SwFtnIdxs& rIdxs = rPaM.GetDoc()->GetFtnIdxs();
- sal_uInt16 n, nFtnCnt = rIdxs.Count();
- for( n = 0; n < nFtnCnt; ++n )
- {
- const SwTxtFtn* pFtn = rIdxs[ n ];
-
- const SwStartNode* pTemp = 0;
- const SwNode& rNode = pFtn->GetStartNode()->GetNode();
- if(rNode.GetNodeType() == ND_STARTNODE)
- pTemp = (const SwStartNode*)&rNode;
- if(pSttNode == pTemp)
- {
- const SwFmtFtn& rFtn = pFtn->GetFtn();
- //TODO: schon existierendes Fussnotenobjekt wiederfinden!
- xCurParentRef = new SwXFootnote(rPaM.GetDoc(), rFtn);
- break;
- }
- }
- }
- break;
- case SwHeaderStartNode:
- case SwFooterStartNode:
- {
- //PageStyle besorgen, HeaderText anlegen/erfragen,
- //und dann SwXTextPosition damit anlegen
- String sPageStyleName = SwUnoCursorHelper::GetCurPageStyle(rPaM);
- uno::Reference< style::XStyleFamiliesSupplier > xStyleSupp(
- rPaM.GetDoc()->GetDocShell()->GetBaseModel(), uno::UNO_QUERY);
-
- uno::Reference< container::XNameAccess > xStyles = xStyleSupp->getStyleFamilies();
- uno::Any aStyleFamily = xStyles->getByName(C2U("PageStyles"));
-
- uno::Reference< container::XNameContainer > xFamily =
- *(uno::Reference< container::XNameContainer > *)aStyleFamily.getValue();
- uno::Any aStyle = xFamily->getByName(sPageStyleName);
- uno::Reference< style::XStyle > xStyle = *(uno::Reference< style::XStyle > *)aStyle.getValue();
-
- uno::Reference< beans::XPropertySet > xPropSet(xStyle, uno::UNO_QUERY);
- uno::Any aLayout = xPropSet->getPropertyValue(C2U(UNO_NAME_PAGE_STYLE_LAYOUT));
-
- style::PageStyleLayout eLayout = *(style::PageStyleLayout*)aLayout.getValue();
- uno::Any aShare = xPropSet->getPropertyValue(C2U(UNO_NAME_HEADER_IS_SHARED));
- sal_Bool bShare;
- aShare >>= bShare;
- sal_Bool bLeft = sal_False;
- sal_Bool bRight = sal_False;
- //jetzt evtl. noch zw. linker/rechter Kopf-/Fusszeile unterscheiden
- if(!bShare && eLayout == style::PageStyleLayout_MIRRORED)
- {
- uno::Reference<lang::XUnoTunnel> xTunnel(xStyle, uno::UNO_QUERY);
- SwXPageStyle* pStyle = (SwXPageStyle*)
- xTunnel->getSomething( SwXPageStyle::getUnoTunnelId());
-
- DBG_ASSERT(pStyle, "Was ist das fuer ein style::XStyle?");
- bLeft = pSttNode == pStyle->GetStartNode(eType == SwHeaderStartNode, sal_True);
- bRight = !bLeft;
- }
- uno::Any aParent;
- sal_Bool bFooter = eType == SwFooterStartNode;
- if(eLayout == style::PageStyleLayout_LEFT || bLeft)
- aParent = xPropSet->getPropertyValue(C2U(bFooter ? UNO_NAME_FOOTER_TEXT_LEFT : UNO_NAME_HEADER_TEXT_LEFT));
- else if(eLayout == style::PageStyleLayout_RIGHT)
- aParent = xPropSet->getPropertyValue(C2U(bFooter ? UNO_NAME_FOOTER_TEXT_RIGHT : UNO_NAME_HEADER_TEXT_RIGHT));
- else
- aParent = xPropSet->getPropertyValue(C2U(bFooter ? UNO_NAME_FOOTER_TEXT : UNO_NAME_HEADER_TEXT));
-
- if(aParent.getValueType() != ::getVoidCppuType())
- {
- uno::Reference< XText > xText = *(uno::Reference< XText > *)aParent.getValue();
- xCurParentRef = xText;
- }
- }
-
-
- break;
-// case SwNormalStartNode:
- default:
- {
- if(!xParentText.is())
- {
- uno::Reference< XTextDocument > xDoc(
- rPaM.GetDoc()->GetDocShell()->GetBaseModel(), uno::UNO_QUERY);
- xParentText = xDoc->getText();
- }
- xCurParentRef = xParentText;
- }
- }
- if(xCurParentRef.is() && !xRet.is())
- xRet = new SwXTextRange(rPaM, xCurParentRef);
- DBG_ASSERT(xRet.is(), "SwXTextRange not created");
- return xRet;
-}*/
/* -----------------------------03.04.00 09:11--------------------------------
diff --git a/binfilter/bf_sw/source/filter/excel/sw_excread.cxx b/binfilter/bf_sw/source/filter/excel/sw_excread.cxx
index b0b4790..5e1407f 100644
--- a/binfilter/bf_sw/source/filter/excel/sw_excread.cxx
+++ b/binfilter/bf_sw/source/filter/excel/sw_excread.cxx
@@ -424,97 +424,6 @@ void SwExcelParser::Parse()
// ::EndProgress( pExcGlob->pD->GetDocShell() );
}
-/*
-// ---------------------------------------------- SwExcelParser::Parse() -
-void SwExcelParser::Parse()
- {
- ExcTabelle *pTab;
- USHORT nOpcode; // aktueller Opcode
- USHORT nLaengeRec; // Laenge aktueller Record
- ULONG nLastBof = 0; // Stream Position vom letzten BOF
-
-// ScanDokuInfos();
- // jetzt ist aDataPool mit Daten zum importieren gefuellt
-
-
- // BOF -> EOF => eine Tabelle
- pTab = aExcDok.GetFirstTab();
- while( pTab )
- {
- while( !pIn->IsEof() && eAktZust != ImpZustEnd )
- {
- *pIn >> nOpcode >> nLaengeRec;
- nBytesLeft = nLaengeRec;
-
- // Automat: Init -> [ Global ] -> TabBase -> Tab -> ...
- switch( eAktZust )
- {
- // ----------------------- Tabelleninhalt --------------------
- case ImpZustTab:
- {
- switch( nOpcode )
- {
- case 0x01: Blank25(); break; // BLANK [ 2 5]
- case 0x03: Number25(); break; // NUMBER [ 2 5]
- case 0x04: Label25(); break; // LABEL [ 2 5]
- case 0x06: Formula25(); break; // FORMULA [ 2 5]
- case 0x08: Row25(); break; // ROW [ 2 5]
- case 0x0A: // EOF [ 2345]
- Eof();
- EndSheet();
- eAktZust = ImpZustEnd;
- break;
- case 0x1C: Note(); break; // NOTE [ 2345]
- case 0x21: Array25(); break; // ARRAY [ 2 5]
- case 0x7E: Rk(); break; // RK [ 5]
- case 0xBD: Mulrk(); break; // MULRK [ 5]
- case 0xBE: Mulblank(); break; // MULBLANK [ 5]
- case 0xD6: Rstring(); break; // RSTRING [ 5]
- case 0x0201: Blank34(); break; // BLANK [ 34 ]
- case 0x0203: Number34(); break; // NUMBER [ 34 ]
- case 0x0204: Label34(); break; // LABEL [ 34 ]
- case 0x0206: Formula3(); break; // FORMULA [ 3 ]
- case 0x0208: Row34(); break; // ROW [ 34 ]
- case 0x0221: Array34(); break; // ARRAY [ 34 ]
- case 0x027E: Rk(); break; // RK [ 34 ]
- case 0x0406: Formula4(); break; // FORMULA [ 4 ]
- case 0x04BC: Shrfmla(); break; // SHRFMLA [ 5]
- }
- }
- break;
- // ----------------------- Endzustand (nutzbar?) -------------
- case ImpZustEnd:
- {
- //switch( nOpcode )
- {
- }
- }
- break;
- // ----------------------- Record String folgt ---------------
- case ImpZustString:
- {
- DBG_ASSERT( nOpcode == 0x07 || nOpcode == 0x0207,
- "+SwExcelParser::Read(): Formatfehler: Formula ohne String" );
-
- if( nOpcode == 0x07 || nOpcode == 0x0207 )
- REC_String();
-
- eAktZust = ImpZustTab;
- }
- break;
- // ----------------------- Tabelleninhalt Init-Phase ---------
- // -----------------------------------------------------------
- default:
- DBG_ERROR(
- "*SwExcelParser::Read(): Zustand undefiniert - Trottel!" );
- }
- pIn->SeekRel( nBytesLeft ); // nicht gelesene Bytes ueberlesen
- }
- pTab = aExcDok.GetNextTab();
- }
-
- }
-*/
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_ximp3dobject.cxx b/binfilter/bf_xmloff/source/draw/xmloff_ximp3dobject.cxx
index b472420..b948851 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_ximp3dobject.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_ximp3dobject.cxx
@@ -127,66 +127,6 @@ void SdXML3DObjectContext::EndElement()
SdXMLShapeContext::EndElement();
}
-//////////////////////////////////////////////////////////////////////////////
-/*
-void SdXML3DObjectContext::AddShape(uno::Reference< drawing::XShape >& xShape)
-{
- if(xShape.is() && mxShapes.is())
- {
- // set shape local
- mxShape = xShape;
-
- // add new shape to parent
- mxShapes->add( xShape );
- }
-}
-*/
-//////////////////////////////////////////////////////////////////////////////
-/*
-void SdXML3DObjectContext::SetStyle()
-{
- // set style on shape
- if(maDrawStyleName.getLength() && mxShape.is())
- {
- const SvXMLStyleContext* pStyle = 0L;
- sal_Bool bAutoStyle(FALSE);
-
- if(GetImport().GetShapeImport()->GetAutoStylesContext())
- pStyle = GetImport().GetShapeImport()->GetAutoStylesContext()->FindStyleChildContext(
- XML_STYLE_FAMILY_SD_GRAPHICS_ID, maDrawStyleName);
-
- if(pStyle)
- bAutoStyle = TRUE;
-
- if(!pStyle && GetImport().GetShapeImport()->GetStylesContext())
- pStyle = GetImport().GetShapeImport()->GetStylesContext()->
- FindStyleChildContext(XML_STYLE_FAMILY_SD_GRAPHICS_ID, maDrawStyleName);
-
- if(pStyle && pStyle->ISA(XMLShapeStyleContext))
- {
- uno::Reference< beans::XPropertySet > xPropSet(mxShape, uno::UNO_QUERY);
- if(xPropSet.is())
- {
- XMLShapeStyleContext* pDocStyle = (XMLShapeStyleContext*)pStyle;
-
- if(pDocStyle->GetStyle().is())
- {
- // set style on object
- uno::Any aAny;
- aAny <<= pDocStyle->GetStyle();
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Style")), aAny);
- }
-
- if(bAutoStyle)
- {
- // set PropertySet on object
- pDocStyle->FillPropertySet(xPropSet);
- }
- }
- }
- }
-}
-*/
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
More information about the Libreoffice-commits
mailing list