[Libreoffice-commits] .: sc/source
Noel Power
noelp at kemper.freedesktop.org
Wed Jun 20 13:21:03 PDT 2012
sc/source/filter/inc/sheetdatacontext.hxx | 1 -
sc/source/filter/inc/workbookhelper.hxx | 2 --
sc/source/filter/oox/sheetdatacontext.cxx | 6 ------
sc/source/filter/oox/workbookfragment.cxx | 1 -
sc/source/filter/oox/workbookhelper.cxx | 15 ---------------
5 files changed, 25 deletions(-)
New commits:
commit 6ea4e42eaa28a773ec66fee3b8f764e0dc365297
Author: Noel Power <noel.power at novell.com>
Date: Wed Jun 20 21:18:29 2012 +0100
gah :/ some cleanup for 7fff9872 that I applied to wrong source tree.
Change-Id: I91d84a7a8d8f18883798541e6a171ea91f135edb
diff --git a/sc/source/filter/inc/sheetdatacontext.hxx b/sc/source/filter/inc/sheetdatacontext.hxx
index 8dd16de..ac1c4b7 100644
--- a/sc/source/filter/inc/sheetdatacontext.hxx
+++ b/sc/source/filter/inc/sheetdatacontext.hxx
@@ -121,7 +121,6 @@ private:
private:
::rtl::OUString maCellValue; /// Cell value string (OOXML only).
RichStringRef mxInlineStr; /// Inline rich string (OOXML only).
- ApiTokenSequence maTokens; /// Formula token array (OOXML only).
::rtl::OUString maFormulaStr;
DataTableModel maTableData; /// Settings for table operations.
BinAddress maCurrPos; /// Current cell position (BIFF12 only).
diff --git a/sc/source/filter/inc/workbookhelper.hxx b/sc/source/filter/inc/workbookhelper.hxx
index 643d950..cbabb1d 100644
--- a/sc/source/filter/inc/workbookhelper.hxx
+++ b/sc/source/filter/inc/workbookhelper.hxx
@@ -146,8 +146,6 @@ public:
FilterType getFilterType() const;
/** Returns the filter progress bar. */
SegmentProgressBar& getProgressBar() const;
- ::boost::shared_ptr<oox::ISegmentProgressBar> getFormulaProgressBar() const;
- void setFormulaProgressBar( ::boost::shared_ptr<oox::ISegmentProgressBar> rBar );
/** Returns true, if the file is a multi-sheet document, or false if single-sheet. */
bool isWorkbookFile() const;
/** Returns the index of the current Calc sheet, if filter currently processes a sheet. */
diff --git a/sc/source/filter/oox/sheetdatacontext.cxx b/sc/source/filter/oox/sheetdatacontext.cxx
index 28fcc00..37f882c 100644
--- a/sc/source/filter/oox/sheetdatacontext.cxx
+++ b/sc/source/filter/oox/sheetdatacontext.cxx
@@ -165,7 +165,6 @@ void SheetDataContext::onCharacters( const OUString& rChars )
case XLS_TOKEN( f ):
if( maFmlaData.mnFormulaType != XML_TOKEN_INVALID )
{
-// maTokens = mrFormulaParser.importFormula( maCellData.maCellAddr, rChars );
maFormulaStr = rChars;
}
break;
@@ -183,7 +182,6 @@ void SheetDataContext::onEndElement()
// a) need to set format first
// :/
case XML_normal:
- //mrSheetData.setFormulaCell( maCellData, maTokens );
setCellFormula( maCellData.maCellAddr, maFormulaStr );
mrSheetData.setCellFormat( maCellData );
break;
@@ -195,7 +193,6 @@ void SheetDataContext::onEndElement()
//mrSheetData.createSharedFormula( maFmlaData.mnSharedId, mrFormulaParser.importFormula( maCellData.maCellAddr, maFormulaStr ) );
createSharedFormulaMapEntry( maCellData.maCellAddr, maFmlaData.mnSharedId, maFormulaStr );
}
- //mrSheetData.setFormulaCell( maCellData, maFmlaData.mnSharedId );
setCellFormula( maCellData.maCellAddr, maFmlaData.mnSharedId );
mrSheetData.setCellFormat( maCellData );
}
@@ -205,7 +202,6 @@ void SheetDataContext::onEndElement()
break;
case XML_array:
if( mbValidRange && maFmlaData.isValidArrayRef( maCellData.maCellAddr ) )
- //mrSheetData.createArrayFormula( maFmlaData.maFormulaRef, maTokens );
setCellArrayFormula( maFmlaData.maFormulaRef, maCellData.maCellAddr, maFormulaStr );
// set cell formatting, but do not set result as cell value
mrSheetData.setBlankCell( maCellData );
@@ -379,8 +375,6 @@ void SheetDataContext::importFormula( const AttributeList& rAttribs )
maTableData.mbRef2Deleted = rAttribs.getBool( XML_del2, false );
}
- // clear token array, will be regenerated from element text
- maTokens = ApiTokenSequence();
maFormulaStr = rtl::OUString();
}
diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx
index 843a7fe..943f5fd 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -296,7 +296,6 @@ void WorkbookFragment::finalizeImport()
// create all defined names and database ranges
getDefinedNames().finalizeImport();
getTables().finalizeImport();
- int nSheetNum = 0;
// load all worksheets
for( SheetFragmentVector::iterator aIt = aSheetFragments.begin(), aEnd = aSheetFragments.end(); aIt != aEnd; ++aIt )
{
diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx
index 891573f..e8df821 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -124,9 +124,6 @@ public:
inline FilterBase& getBaseFilter() const { return mrBaseFilter; }
/** Returns the filter progress bar. */
inline SegmentProgressBar& getProgressBar() const { return *mxProgressBar; }
- /** Returns the formula progress bar. */
- inline ISegmentProgressBarRef getFormulaProgressBar() const { return mxFormulaProgressBar; }
- inline void setFormulaProgressBar( ISegmentProgressBarRef rBar ) { mxFormulaProgressBar = rBar; }
/** Returns the file type of the current filter. */
inline FilterType getFilterType() const { return meFilterType; }
/** Returns true, if the file is a multi-sheet document, or false if single-sheet. */
@@ -274,7 +271,6 @@ private:
ExcelFilterBase& mrExcelBase; /// Base object for registration of this structure.
FilterType meFilterType; /// File type of the filter.
ProgressBarPtr mxProgressBar; /// The progress bar.
- ISegmentProgressBarRef mxFormulaProgressBar;/// The progress bar for end of import formula processing
StorageRef mxVbaPrjStrg; /// Storage containing the VBA project.
sal_Int16 mnCurrSheet; /// Current sheet index in Calc document.
bool mbWorkbook; /// True = multi-sheet file.
@@ -563,7 +559,6 @@ void WorkbookGlobals::initialize( bool bWorkbookFile )
//! TODO: localize progress bar text
mxProgressBar.reset( new SegmentProgressBar( mrBaseFilter.getStatusIndicator(), CREATE_OUSTRING( "Saving..." ) ) );
}
-// mxFormulaProgressBar = mxProgressBar->createSegment( 0.4 );
// filter specific
switch( getFilterType() )
{
@@ -638,16 +633,6 @@ SegmentProgressBar& WorkbookHelper::getProgressBar() const
return mrBookGlob.getProgressBar();
}
-ISegmentProgressBarRef WorkbookHelper::getFormulaProgressBar() const
-{
- return mrBookGlob.getFormulaProgressBar();
-}
-
-void WorkbookHelper::setFormulaProgressBar(ISegmentProgressBarRef rFormBar )
-{
- return mrBookGlob.setFormulaProgressBar( rFormBar );
-}
-
bool WorkbookHelper::isWorkbookFile() const
{
return mrBookGlob.isWorkbookFile();
More information about the Libreoffice-commits
mailing list