diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-07-11 16:12:59 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-07-11 16:12:59 +0100 |
commit | f937d79eca3523a73183823437225b1b4e6beb54 (patch) | |
tree | ee6210b0a2137a6cbd3d2a31eb12ce3533e77848 | |
parent | f291c96da103e279e04bcea7b578badf0e9cdfa0 (diff) |
callcatcher: remove various unused save, etc. methods
-rw-r--r-- | binfilter/bf_sc/source/core/tool/sc_refdata.cxx | 37 | ||||
-rw-r--r-- | binfilter/bf_starmath/source/cfgitem.hxx | 3 | ||||
-rw-r--r-- | binfilter/bf_starmath/source/mathml.hxx | 1 | ||||
-rw-r--r-- | binfilter/bf_starmath/source/starmath_cfgitem.cxx | 125 | ||||
-rw-r--r-- | binfilter/bf_starmath/source/starmath_document.cxx | 33 | ||||
-rw-r--r-- | binfilter/bf_starmath/source/starmath_mathml.cxx | 132 | ||||
-rw-r--r-- | binfilter/bf_sw/source/core/crsr/sw_trvltbl.cxx | 14 | ||||
-rw-r--r-- | binfilter/inc/bf_sc/refdata.hxx | 1 | ||||
-rw-r--r-- | binfilter/inc/bf_starmath/document.hxx | 5 | ||||
-rw-r--r-- | binfilter/inc/bf_sw/crsrsh.hxx | 1 |
10 files changed, 0 insertions, 352 deletions
diff --git a/binfilter/bf_sc/source/core/tool/sc_refdata.cxx b/binfilter/bf_sc/source/core/tool/sc_refdata.cxx index 7912eea6d..9317ba5d3 100644 --- a/binfilter/bf_sc/source/core/tool/sc_refdata.cxx +++ b/binfilter/bf_sc/source/core/tool/sc_refdata.cxx @@ -140,43 +140,6 @@ namespace binfilter { /*N*/ Flags.bTabRel = TRUE; // ist bei einigen aelteren Dokumenten nicht gesetzt /*N*/ } - -/* - bis Release 3.1 sah Store so aus - - BYTE n = ( ( r.bOldFlag3D & 0x03 ) << 6 ) // RelName, 3D - | ( ( r.bRelTab & 0x03 ) << 4 ) // Relative, RelAbs - | ( ( r.bRelRow & 0x03 ) << 2 ) - | ( r.bRelCol & 0x03 ); - - bis Release 3.1 sah Load so aus - - r.bRelCol = ( n & 0x03 ); - r.bRelRow = ( ( n >> 2 ) & 0x03 ); - r.bRelTab = ( ( n >> 4 ) & 0x03 ); - r.bOldFlag3D = ( ( n >> 6 ) & 0x03 ); - - bRelCol == SR_DELETED war identisch mit bRelCol == (SR_RELATIVE | SR_RELABS) - leider.. - 3.1 liest Zukunft: Deleted wird nicht unbedingt erkannt, nur wenn auch Relativ. - Aber immer noch nCol > MAXCOL und gut sollte sein.. - */ - -/*N*/ BYTE SingleRefData::CreateStoreByteFromFlags() const -/*N*/ { -/*N*/ return (BYTE)( -/*N*/ ( (Flags.bRelName & 0x01) << 7 ) -/*N*/ | ( (Flags.bFlag3D & 0x01) << 6 ) -/*N*/ | ( (Flags.bTabDeleted & 0x01) << 5 ) -/*N*/ | ( (Flags.bTabRel & 0x01) << 4 ) -/*N*/ | ( (Flags.bRowDeleted & 0x01) << 3 ) -/*N*/ | ( (Flags.bRowRel & 0x01) << 2 ) -/*N*/ | ( (Flags.bColDeleted & 0x01) << 1 ) -/*N*/ | (Flags.bColRel & 0x01) -/*N*/ ); -/*N*/ } - - /*N*/ void SingleRefData::CreateFlagsFromLoadByte( BYTE n ) /*N*/ { /*N*/ Flags.bColRel = (n & 0x01 ); diff --git a/binfilter/bf_starmath/source/cfgitem.hxx b/binfilter/bf_starmath/source/cfgitem.hxx index 78a94546f..821e46bf4 100644 --- a/binfilter/bf_starmath/source/cfgitem.hxx +++ b/binfilter/bf_starmath/source/cfgitem.hxx @@ -191,11 +191,8 @@ class SmMathConfig void LoadSymbols(); void LoadOther(); - void SaveOther(); void LoadFormat(); - void SaveFormat(); void LoadFontFormatList(); - void SaveFontFormatList(); diff --git a/binfilter/bf_starmath/source/mathml.hxx b/binfilter/bf_starmath/source/mathml.hxx index b720f2bec..fcaa87a56 100644 --- a/binfilter/bf_starmath/source/mathml.hxx +++ b/binfilter/bf_starmath/source/mathml.hxx @@ -53,7 +53,6 @@ public: SmXMLWrapper(::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel> &rRef) : xModel(rRef), bFlat(sal_True) {} ULONG Import(SfxMedium &rMedium); - sal_Bool Export(SfxMedium &rMedium); void SetFlat(sal_Bool bIn) {bFlat = bIn;} private: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel> xModel; diff --git a/binfilter/bf_starmath/source/starmath_cfgitem.cxx b/binfilter/bf_starmath/source/starmath_cfgitem.cxx index e52e35417..a63be0037 100644 --- a/binfilter/bf_starmath/source/starmath_cfgitem.cxx +++ b/binfilter/bf_starmath/source/starmath_cfgitem.cxx @@ -582,40 +582,6 @@ static const char* aRootName = "Office.Math"; /*N*/ return aRes; /*N*/ } - -/*N*/ void SmMathConfig::SaveFontFormatList() -/*N*/ { -/*N*/ SmFontFormatList &rFntFmtList = GetFontFormatList(); -/*N*/ -/*N*/ if (!rFntFmtList.IsModified()) -/*N*/ return; -/*N*/ -/*?*/ SmMathConfigItem aCfg( String::CreateFromAscii( aRootName ) ); -/*?*/ -/*?*/ Sequence< OUString > aNames = lcl_GetFontPropertyNames(); -/*?*/ INT32 nSymbolProps = aNames.getLength(); -/*?*/ -/*?*/ USHORT nCount = rFntFmtList.GetCount(); -/*?*/ -/*?*/ Sequence< PropertyValue > aValues( nCount * nSymbolProps ); -/*?*/ PropertyValue *pValues = aValues.getArray(); -/*?*/ -/*?*/ PropertyValue *pVal = pValues; -/*?*/ OUString aDelim( OUString::valueOf( (sal_Unicode) '/' ) ); -/*?*/ for (USHORT i = 0; i < nCount; ++i) -/*?*/ { -/*?*/ DBG_BF_ASSERT(0, "STRIP"); -/*?*/ } -/*?*/ DBG_ASSERT( pVal - pValues == nCount * nSymbolProps, "properties missing" ); -/*?*/ (void)pVal; -/*?*/ aCfg.ReplaceSetProperties( A2OU( FONT_FORMAT_LIST ) , aValues ); -/*?*/ -/*?*/ rFntFmtList.SetModified( FALSE ); -/*N*/ } - - - - /*N*/ void SmMathConfig::LoadOther() /*N*/ { /*N*/ if (!pOther) @@ -677,46 +643,6 @@ static const char* aRootName = "Office.Math"; /*N*/ } /*N*/ } - -/*N*/ void SmMathConfig::SaveOther() -/*N*/ { -/*N*/ if (!pOther || !IsOtherModified()) -/*N*/ return; -/*N*/ -/*?*/ SmMathConfigItem aCfg( String::CreateFromAscii( aRootName )); -/*?*/ -/*?*/ const Sequence< OUString > aNames( aCfg.GetOtherPropertyNames() ); -/*?*/ INT32 nProps = aNames.getLength(); -/*?*/ -/*?*/ Sequence< Any > aValues( nProps ); -/*?*/ Any *pValues = aValues.getArray(); -/*?*/ Any *pValue = pValues; -/*?*/ -/*?*/ // Print/Title -/*?*/ *pValue++ <<= (BOOL) pOther->bPrintTitle; -/*?*/ // Print/FormulaText -/*?*/ *pValue++ <<= (BOOL) pOther->bPrintFormulaText; -/*?*/ // Print/Frame -/*?*/ *pValue++ <<= (BOOL) pOther->bPrintFrame; -/*?*/ // Print/Size -/*?*/ *pValue++ <<= (INT16) pOther->ePrintSize; -/*?*/ // Print/ZoomFactor -/*?*/ *pValue++ <<= (INT16) pOther->nPrintZoomFactor; -/*?*/ // Misc/IgnoreSpacesRight -/*?*/ *pValue++ <<= (BOOL) pOther->bIgnoreSpacesRight; -/*?*/ // View/ToolboxVisible -/*?*/ *pValue++ <<= (BOOL) pOther->bToolboxVisible; -/*?*/ // View/AutoRedraw -/*?*/ *pValue++ <<= (BOOL) pOther->bAutoRedraw; -/*?*/ // View/FormulaCursor -/*?*/ *pValue++ <<= (BOOL) pOther->bFormulaCursor; -/*?*/ -/*?*/ DBG_ASSERT( pValue - pValues == nProps, "property mismatch" ); -/*?*/ aCfg.PutProperties( aNames , aValues ); -/*?*/ -/*?*/ SetOtherModified( FALSE ); -/*N*/ } - /*N*/ void SmMathConfig::LoadFormat() /*N*/ { /*N*/ if (!pFormat) @@ -801,57 +727,6 @@ static const char* aRootName = "Office.Math"; /*N*/ } /*N*/ } - -/*N*/ void SmMathConfig::SaveFormat() -/*N*/ { -/*N*/ if (!pFormat || !IsFormatModified()) -/*N*/ return; -/*N*/ -/*?*/ SmMathConfigItem aCfg( String::CreateFromAscii( aRootName )); -/*?*/ -/*?*/ const Sequence< OUString > aNames( aCfg.GetFormatPropertyNames() ); -/*?*/ INT32 nProps = aNames.getLength(); -/*?*/ -/*?*/ Sequence< Any > aValues( nProps ); -/*?*/ Any *pValues = aValues.getArray(); -/*?*/ Any *pValue = pValues; -/*?*/ -/*?*/ // StandardFormat/Textmode -/*?*/ *pValue++ <<= (BOOL) pFormat->IsTextmode(); -/*?*/ // StandardFormat/ScaleNormalBracket -/*?*/ *pValue++ <<= (BOOL) pFormat->IsScaleNormalBrackets(); -/*?*/ // StandardFormat/HorizontalAlignment -/*?*/ *pValue++ <<= (INT16) pFormat->GetHorAlign(); -/*?*/ // StandardFormat/BaseSize -/*?*/ *pValue++ <<= (INT16) SmRoundFraction( Sm100th_mmToPts( -/*?*/ pFormat->GetBaseSize().Height() ) ); -/*?*/ -/*?*/ USHORT i; -/*?*/ for (i = SIZ_BEGIN; i <= SIZ_END; ++i) -/*?*/ *pValue++ <<= (INT16) pFormat->GetRelSize( i ); -/*?*/ -/*?*/ for (i = DIS_BEGIN; i <= DIS_END; ++i) -/*?*/ *pValue++ <<= (INT16) pFormat->GetDistance( i ); -/*?*/ -/*?*/ for (i = FNT_BEGIN; i < FNT_END; ++i) -/*?*/ { -/*?*/ OUString aFntFmtId; -/*?*/ -/*?*/ if (!pFormat->IsDefaultFont( i )) -/*?*/ { -/*?*/ DBG_BF_ASSERT(0, "STRIP"); -/*?*/ } -/*?*/ -/*?*/ *pValue++ <<= aFntFmtId; -/*?*/ } -/*?*/ -/*?*/ DBG_ASSERT( pValue - pValues == nProps, "property mismatch" ); -/*?*/ aCfg.PutProperties( aNames , aValues ); -/*?*/ -/*?*/ SetFormatModified( FALSE ); -/*N*/ } - - /*N*/ const SmFormat & SmMathConfig::GetStandardFormat() const /*N*/ { /*N*/ if (!pFormat) diff --git a/binfilter/bf_starmath/source/starmath_document.cxx b/binfilter/bf_starmath/source/starmath_document.cxx index 9e9e063da..92df294bf 100644 --- a/binfilter/bf_starmath/source/starmath_document.cxx +++ b/binfilter/bf_starmath/source/starmath_document.cxx @@ -487,39 +487,6 @@ static const char pStarMathDoc[] = "StarMathDocument"; /*N*/ return bRet; /*N*/ } - - - -//------------------------------------------------------------------ - -/*N*/ void SmDocShell::ImplSave( SvStorageStreamRef xStrm ) -/*N*/ { -/*N*/ String aTmp( aText ); -/*N*/ if (SOFFICE_FILEFORMAT_50 >= xStrm->GetVersion()) -/*N*/ ConvertText( aTmp, CONVERT_60_TO_50 ); -/*N*/ ByteString exString( ExportString( aTmp ) ); -/*N*/ -/*N*/ *xStrm << SM304AIDENT << SM50VERSION -/*N*/ << 'T'; -/*N*/ xStrm->WriteByteString(exString); -/*N*/ *xStrm << 'F' << aFormat -/*N*/ << 'S'; -/*N*/ xStrm->WriteByteString( ExportString(C2S("unknown")) ); -/*N*/ *xStrm << (USHORT) 0 -/*N*/ << '\0'; -/*N*/ } - -/*N*/ void SmDocShell::UpdateText() -/*N*/ { -/*N*/ if (pEditEngine && pEditEngine->IsModified()) -/*N*/ { -/*N*/ String aEngTxt( pEditEngine->GetText( LINEEND_LF ) ); -/*N*/ if (GetText() != aEngTxt) -/*N*/ SetText( aEngTxt ); -/*N*/ } -/*N*/ } - - /*N*/ void SmDocShell::HandsOff() /*N*/ { /*N*/ SfxInPlaceObject::HandsOff(); diff --git a/binfilter/bf_starmath/source/starmath_mathml.cxx b/binfilter/bf_starmath/source/starmath_mathml.cxx index b62dcd4a5..8f13ab7fa 100644 --- a/binfilter/bf_starmath/source/starmath_mathml.cxx +++ b/binfilter/bf_starmath/source/starmath_mathml.cxx @@ -783,138 +783,6 @@ sal_Bool SmXMLWrapper::WriteThroughComponent( return bRet; } -sal_Bool SmXMLWrapper::Export(SfxMedium &rMedium) -{ - sal_Bool bRet=sal_True; - uno::Reference<lang::XMultiServiceFactory> - xServiceFactory(::legacy_binfilters::getLegacyProcessServiceFactory()); - DBG_ASSERT(xServiceFactory.is(),"got no service manager"); - - //Get model - uno::Reference< lang::XComponent > xModelComp(xModel, uno::UNO_QUERY ); - - sal_Bool bEmbedded = sal_False; - uno::Reference <lang::XUnoTunnel> xTunnel; - xTunnel = uno::Reference <lang::XUnoTunnel> (xModel,uno::UNO_QUERY); - SmModel *pModel = reinterpret_cast<SmModel *> - (xTunnel->getSomething(SmModel::getUnoTunnelId())); - - if (pModel) - { - SmDocShell *pDocShell = - static_cast<SmDocShell*>(pModel->GetObjectShell()); - if( pDocShell && - SFX_CREATE_MODE_EMBEDDED == pDocShell->GetCreateMode() ) - bEmbedded = sal_True; - } - - uno::Reference<task::XStatusIndicator> xStatusIndicator; - if (!bEmbedded) - { - uno::Reference<frame::XController> xController( - xModel->getCurrentController()); - if( xController.is()) - { - uno::Reference<frame::XFrame> xFrame( xController->getFrame()); - if( xFrame.is()) - { - uno::Reference<task::XStatusIndicatorFactory> xFactory( xFrame, - uno::UNO_QUERY ); - if( xFactory.is()) - xStatusIndicator = xFactory->createStatusIndicator(); - } - } - - // set progress range and start status indicator - sal_Int32 nSteps=3; - if (bFlat) - nSteps = 1; - - sal_Int32 nProgressRange(nSteps); - if (xStatusIndicator.is()) - { - xStatusIndicator->start(String(SmResId(STR_STATSTR_WRITING)), - nProgressRange); - } - } - - - // create XPropertySet with three properties for status indicator - ::comphelper::PropertyMapEntry aInfoMap[] = - { - { "UsePrettyPrinting", sizeof("UsePrettyPrinting")-1, 0, - &::getBooleanCppuType(), - beans::PropertyAttribute::MAYBEVOID, 0}, - { NULL, 0, 0, NULL, 0, 0 } - }; - uno::Reference< beans::XPropertySet > xInfoSet( - ::comphelper::GenericPropertySet_CreateInstance( - new comphelper::PropertySetInfo( aInfoMap ) ) ); - - SvtSaveOptions aSaveOpt; - OUString sUsePrettyPrinting(RTL_CONSTASCII_USTRINGPARAM("UsePrettyPrinting")); - sal_Bool bUsePrettyPrinting( bFlat || aSaveOpt.IsPrettyPrinting() ); - Any aAny; - aAny.setValue( &bUsePrettyPrinting, ::getBooleanCppuType() ); - xInfoSet->setPropertyValue( sUsePrettyPrinting, aAny ); - - - sal_Int32 nSteps=0; - if (xStatusIndicator.is()) - xStatusIndicator->setValue(nSteps++); - if (!bFlat) //Storage (Package) of Stream - { - SvStorage *pStg = rMedium.GetOutputStorage(sal_True); - - if( !bEmbedded ) - { - if (xStatusIndicator.is()) - xStatusIndicator->setValue(nSteps++); - - bRet = WriteThroughComponent( - pStg, xModelComp, "meta.xml", xServiceFactory, xInfoSet, - "com.sun.star.comp.Math.XMLMetaExporter",sal_False); - } - if( bRet ) - { - if (xStatusIndicator.is()) - xStatusIndicator->setValue(nSteps++); - - bRet = WriteThroughComponent( - pStg, xModelComp, "content.xml", xServiceFactory, xInfoSet, - "com.sun.star.comp.Math.XMLContentExporter"); - } - - if( bRet ) - { - if (xStatusIndicator.is()) - xStatusIndicator->setValue(nSteps++); - - bRet = WriteThroughComponent( - pStg, xModelComp, "settings.xml", xServiceFactory, xInfoSet, - "com.sun.star.comp.Math.XMLSettingsExporter"); - } - } - else - { - SvStream *pStream = rMedium.GetOutStream(); - uno::Reference<io::XOutputStream> xOut( - new ::utl::OOutputStreamWrapper(*pStream) ); - - if (xStatusIndicator.is()) - xStatusIndicator->setValue(nSteps++); - - bRet = WriteThroughComponent( - xOut, xModelComp, xServiceFactory, xInfoSet, - "com.sun.star.comp.Math.XMLContentExporter"); - } - - if (xStatusIndicator.is()) - xStatusIndicator->end(); - - return bRet; -} - sal_uInt32 SmXMLExport::exportDoc(enum XMLTokenEnum eClass) { if( (getExportFlags() & EXPORT_CONTENT) == 0 ) diff --git a/binfilter/bf_sw/source/core/crsr/sw_trvltbl.cxx b/binfilter/bf_sw/source/core/crsr/sw_trvltbl.cxx index e1802076f..f7026c426 100644 --- a/binfilter/bf_sw/source/core/crsr/sw_trvltbl.cxx +++ b/binfilter/bf_sw/source/core/crsr/sw_trvltbl.cxx @@ -156,20 +156,6 @@ namespace binfilter { /*N*/ delete pBoxIdx, pBoxIdx = 0; /*N*/ pBoxPtr = 0; /*N*/ } - -/*N*/ bool SwCrsrShell::EndAllTblBoxEdit() -/*N*/ { -/*N*/ bool bRet = FALSE; -/*N*/ ViewShell *pSh = this; -/*N*/ do { -/*N*/ if( pSh->IsA( TYPE( SwCrsrShell ) ) ) -/*N*/ bRet |= ((SwCrsrShell*)pSh)->CheckTblBoxCntnt( -/*N*/ ((SwCrsrShell*)pSh)->pCurCrsr->GetPoint() ); -/*N*/ -/*N*/ } while( this != (pSh = (ViewShell *)pSh->GetNext()) ); -/*N*/ return bRet; -/*N*/ } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/binfilter/inc/bf_sc/refdata.hxx b/binfilter/inc/bf_sc/refdata.hxx index 7789ed6a8..8e5fe2487 100644 --- a/binfilter/inc/bf_sc/refdata.hxx +++ b/binfilter/inc/bf_sc/refdata.hxx @@ -112,7 +112,6 @@ struct SingleRefData // Single reference (one address) into the sheet void CalcRelFromAbs( const ScAddress& rPos ); void CalcAbsIfRel( const ScAddress& rPos ); void OldBoolsToNewFlags( const OldSingleRefBools& ); - BYTE CreateStoreByteFromFlags() const; void CreateFlagsFromLoadByte( BYTE ); BOOL operator==( const SingleRefData& ) const; }; diff --git a/binfilter/inc/bf_starmath/document.hxx b/binfilter/inc/bf_starmath/document.hxx index 3be69e449..f432fe562 100644 --- a/binfilter/inc/bf_starmath/document.hxx +++ b/binfilter/inc/bf_starmath/document.hxx @@ -147,7 +147,6 @@ class SmDocShell : public SfxObjectShell, public SfxInPlaceObject, virtual void OnDocumentPrinterChanged( Printer * ); virtual BOOL InitNew(SvStorage *); virtual BOOL Load(SvStorage *); - void ImplSave( SvStorageStreamRef xStrm ); virtual BOOL Save() {return false;} virtual void HandsOff(); @@ -161,10 +160,6 @@ class SmDocShell : public SfxObjectShell, public SfxInPlaceObject, void SetFormulaArranged(BOOL bVal) { bIsFormulaArranged = bVal; } void ArrangeFormula(); - - - void UpdateText(); - public: TYPEINFO(); SFX_DECL_OBJECTFACTORY_DLL(SmDocShell, SM_MOD()); diff --git a/binfilter/inc/bf_sw/crsrsh.hxx b/binfilter/inc/bf_sw/crsrsh.hxx index 73fef6bc8..c8495504a 100644 --- a/binfilter/inc/bf_sw/crsrsh.hxx +++ b/binfilter/inc/bf_sw/crsrsh.hxx @@ -528,7 +528,6 @@ public: bool CheckTblBoxCntnt( const SwPosition* pPos = 0 ); void ClearTblBoxCntnt(); - bool EndAllTblBoxEdit(); // wird gerufen, wenn eine Tabellenselektion im UpdateCrsr erzeugt wird, // ohne das die UI davon etaws weiss |