diff options
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/filter/excel/xiname.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/xcl97/xcl97rec.cxx | 38 | ||||
| -rw-r--r-- | sc/source/ui/vba/excelvbahelper.cxx | 2 |
3 files changed, 2 insertions, 40 deletions
diff --git a/sc/source/filter/excel/xiname.cxx b/sc/source/filter/excel/xiname.cxx index fa11a8eb91b0..111f9da97426 100644 --- a/sc/source/filter/excel/xiname.cxx +++ b/sc/source/filter/excel/xiname.cxx @@ -232,7 +232,7 @@ XclImpName::XclImpName( XclImpStream& rStrm, sal_uInt16 nXclNameIdx ) : // discard deleted ranges ( for the moment at least ) if ( pData->IsValidReference( aRange ) ) { - /* ScExtTabSettings& rTabSett = */ GetExtDocOptions().GetOrCreateTabSettings( nXclTab ); + GetExtDocOptions().GetOrCreateTabSettings( nXclTab ); // create a mapping between the unmodified localname to // the name in the global name container for named ranges OSL_TRACE(" mapping local name to global name for tab %d which exists? %s", nXclTab, GetDoc().HasTable( mnScTab ) ? "true" : "false" ); diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index 011acb939f48..c76c42792736 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -972,44 +972,6 @@ void XclObjAny::WriteFromTo( XclExpXmlStream& rStrm, const XclObjAny& rObj ) WriteFromTo( rStrm, rObj.GetShape(), rObj.GetTab() ); } -/* is this function (WritePicPr) exported or only local, if such I'll remove it */ -/* -static void -WritePicPr( sax_fastparser::FSHelperPtr pDrawing, sal_Int32 nId, Reference< XPropertySet > xPropSet ) -{ - pDrawing->startElement( FSNS( XML_xdr, XML_nvPicPr ), - FSEND ); - OUString sName, sDescr; - xPropSet->getPropertyValue( XclXmlUtils::ToOUString( "Name" ) ) >>= sName; - xPropSet->getPropertyValue( XclXmlUtils::ToOUString( "Description" ) ) >>= sDescr; - pDrawing->singleElement( FSNS( XML_xdr, XML_cNvPr ), - XML_id, OString::valueOf( nId ).getStr(), - XML_name, XclXmlUtils::ToOString( sName ).getStr(), - XML_descr, XclXmlUtils::ToOString( sDescr ).getStr(), - FSEND ); - // OOXTODO: //xdr:cNvPr children: XML_extLst, XML_hlinkClick, XML_hlinkHover - pDrawing->startElement( FSNS( XML_xdr, XML_cNvPicPr ), - // OOXTODO: FSNS( XML_xdr, XML_preferRelativeSize ) - FSEND ); - // OOXTODO: XML_extLst - pDrawing->singleElement( FSNS( XML_a, XML_picLocks ), - // OOXTODO: XML_noGrp, - // OOXTODO: XML_noSelect, - // OOXTODO: XML_noRot, - // OOXTODO: XML_noChangeAspect, - // OOXTODO: XML_noMove, - // OOXTODO: XML_noResize, - // OOXTODO: XML_noEditPoints, - // OOXTODO: XML_noAdjustHandles, - // OOXTODO: XML_noChangeArrowheads, - // OOXTODO: XML_noChangeShapeType, - // OOXTODO: XML_noCrop, - FSEND ); - pDrawing->endElement( FSNS( XML_xdr, XML_cNvPicPr ) ); - pDrawing->endElement( FSNS( XML_xdr, XML_nvPicPr ) ); -} -*/ - static const char* GetEditAs( XclObjAny& rObj ) { diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx index b3213a728978..99fda2b57a81 100644 --- a/sc/source/ui/vba/excelvbahelper.cxx +++ b/sc/source/ui/vba/excelvbahelper.cxx @@ -377,7 +377,7 @@ void CompileExcelFormulaToODF( ScDocument* pDoc, const String& rOldFormula, Stri } ScCompiler aCompiler( pDoc, ScAddress() ); aCompiler.SetGrammar( excel::GetFormulaGrammar( pDoc, ScAddress(), uno::Any( rtl::OUString( rOldFormula ) ) ) ); - /* ScTokenArray* pCode = */ aCompiler.CompileString( rOldFormula ); // ignore the return ? + aCompiler.CompileString( rOldFormula ); aCompiler.SetGrammar( formula::FormulaGrammar::GRAM_PODF_A1 ); aCompiler.CreateStringFromTokenArray( rNewFormula ); } |