summaryrefslogtreecommitdiff
path: root/sc/source/filter/oox
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/filter/oox')
-rw-r--r--sc/source/filter/oox/addressconverter.cxx2
-rw-r--r--sc/source/filter/oox/autofilterbuffer.cxx4
-rw-r--r--sc/source/filter/oox/commentsbuffer.cxx4
-rw-r--r--sc/source/filter/oox/externallinkbuffer.cxx2
-rw-r--r--sc/source/filter/oox/formulabase.cxx2
-rw-r--r--sc/source/filter/oox/formulaparser.cxx4
-rw-r--r--sc/source/filter/oox/pivotcachebuffer.cxx6
-rw-r--r--sc/source/filter/oox/pivottablebuffer.cxx4
-rw-r--r--sc/source/filter/oox/scenariobuffer.cxx4
-rw-r--r--sc/source/filter/oox/stylesbuffer.cxx4
-rw-r--r--sc/source/filter/oox/tablebuffer.cxx4
-rw-r--r--sc/source/filter/oox/workbookhelper.cxx2
-rw-r--r--sc/source/filter/oox/worksheetfragment.cxx6
13 files changed, 24 insertions, 24 deletions
diff --git a/sc/source/filter/oox/addressconverter.cxx b/sc/source/filter/oox/addressconverter.cxx
index 920476511e83..95319ce19566 100644
--- a/sc/source/filter/oox/addressconverter.cxx
+++ b/sc/source/filter/oox/addressconverter.cxx
@@ -348,7 +348,7 @@ bool AddressConverter::convertToCellAddressUnchecked( CellAddress& orAddress,
}
bool AddressConverter::convertToCellAddressUnchecked(
- com::sun::star::table::CellAddress& orAddress, const char* pStr, sal_Int16 nSheet ) const
+ com::sun::star::table::CellAddress& orAddress, const char* pStr, sal_Int16 nSheet )
{
orAddress.Sheet = nSheet;
return parseOoxAddress2d(orAddress.Column, orAddress.Row, pStr);
diff --git a/sc/source/filter/oox/autofilterbuffer.cxx b/sc/source/filter/oox/autofilterbuffer.cxx
index b4453464265b..982daa1a7466 100644
--- a/sc/source/filter/oox/autofilterbuffer.cxx
+++ b/sc/source/filter/oox/autofilterbuffer.cxx
@@ -534,14 +534,14 @@ AutoFilter::AutoFilter( const WorkbookHelper& rHelper ) :
void AutoFilter::importAutoFilter( const AttributeList& rAttribs, sal_Int16 nSheet )
{
OUString aRangeStr = rAttribs.getString( XML_ref, OUString() );
- getAddressConverter().convertToCellRangeUnchecked( maRange, aRangeStr, nSheet );
+ AddressConverter::convertToCellRangeUnchecked( maRange, aRangeStr, nSheet );
}
void AutoFilter::importAutoFilter( SequenceInputStream& rStrm, sal_Int16 nSheet )
{
BinRange aBinRange;
rStrm >> aBinRange;
- getAddressConverter().convertToCellRangeUnchecked( maRange, aBinRange, nSheet );
+ AddressConverter::convertToCellRangeUnchecked( maRange, aBinRange, nSheet );
}
FilterColumn& AutoFilter::createFilterColumn()
diff --git a/sc/source/filter/oox/commentsbuffer.cxx b/sc/source/filter/oox/commentsbuffer.cxx
index 9f74748c5779..d126cf02098a 100644
--- a/sc/source/filter/oox/commentsbuffer.cxx
+++ b/sc/source/filter/oox/commentsbuffer.cxx
@@ -104,7 +104,7 @@ void Comment::importComment( const AttributeList& rAttribs )
{
maModel.mnAuthorId = rAttribs.getInteger( XML_authorId, -1 );
// cell range will be checked while inserting the comment into the document
- getAddressConverter().convertToCellRangeUnchecked( maModel.maRange, rAttribs.getString( XML_ref, OUString() ), getSheetIndex() );
+ AddressConverter::convertToCellRangeUnchecked( maModel.maRange, rAttribs.getString( XML_ref, OUString() ), getSheetIndex() );
}
void Comment::importCommentPr( const AttributeList& rAttribs )
@@ -124,7 +124,7 @@ void Comment::importComment( SequenceInputStream& rStrm )
maModel.mnAuthorId = rStrm.readInt32();
rStrm >> aBinRange;
// cell range will be checked while inserting the comment into the document
- getAddressConverter().convertToCellRangeUnchecked( maModel.maRange, aBinRange, getSheetIndex() );
+ AddressConverter::convertToCellRangeUnchecked( maModel.maRange, aBinRange, getSheetIndex() );
}
RichStringRef Comment::createText()
diff --git a/sc/source/filter/oox/externallinkbuffer.cxx b/sc/source/filter/oox/externallinkbuffer.cxx
index ca1715c08181..896c898307b0 100644
--- a/sc/source/filter/oox/externallinkbuffer.cxx
+++ b/sc/source/filter/oox/externallinkbuffer.cxx
@@ -567,7 +567,7 @@ void ExternalLink::setExternalTargetUrl( const OUString& rTargetUrl, const OUStr
else if( rTargetType == CREATE_MSOFFICE_RELATION_TYPE( "xlExternalLinkPath/xlLibrary" ) )
{
meLinkType = LINKTYPE_LIBRARY;
- meFuncLibType = getFormulaParser().getFuncLibTypeFromLibraryName( rTargetUrl );
+ meFuncLibType = FunctionProvider::getFuncLibTypeFromLibraryName( rTargetUrl );
}
OSL_ENSURE( meLinkType != LINKTYPE_UNKNOWN, "ExternalLink::setExternalTargetUrl - empty target URL or unknown target type" );
diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx
index 408d5e170457..a590a3c29f05 100644
--- a/sc/source/filter/oox/formulabase.cxx
+++ b/sc/source/filter/oox/formulabase.cxx
@@ -1146,7 +1146,7 @@ const FunctionInfo* FunctionProvider::getFuncInfoFromMacroName( const OUString&
return mxFuncImpl->maMacroFuncs.get( rFuncName ).get();
}
-FunctionLibraryType FunctionProvider::getFuncLibTypeFromLibraryName( const OUString& rLibraryName ) const
+FunctionLibraryType FunctionProvider::getFuncLibTypeFromLibraryName( const OUString& rLibraryName )
{
#define OOX_XLS_IS_LIBNAME( libname, basename ) (libname.equalsIgnoreAsciiCase( basename ".XLA" ) || libname.equalsIgnoreAsciiCase( basename ".XLAM" ))
diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx
index 63ff5be43f79..4a48cf257e92 100644
--- a/sc/source/filter/oox/formulaparser.cxx
+++ b/sc/source/filter/oox/formulaparser.cxx
@@ -530,7 +530,7 @@ private:
// reference conversion ---------------------------------------------------
void initReference2d( SingleReference& orApiRef ) const;
- void initReference3d( SingleReference& orApiRef, sal_Int32 nSheet, bool bSameSheet ) const;
+ static void initReference3d( SingleReference& orApiRef, sal_Int32 nSheet, bool bSameSheet );
void convertReference( SingleReference& orApiRef, const BinSingleRef2d& rRef, bool bDeleted, bool bRelativeAsOffset ) const;
void convertReference( ComplexReference& orApiRef, const BinSingleRef2d& rRef1, const BinSingleRef2d& rRef2, bool bDeleted, bool bRelativeAsOffset ) const;
void convertReference2d( SingleReference& orApiRef, const BinSingleRef2d& rRef, bool bDeleted, bool bRelativeAsOffset ) const;
@@ -1108,7 +1108,7 @@ void FormulaParserImpl::initReference2d( SingleReference& orApiRef ) const
}
}
-void FormulaParserImpl::initReference3d( SingleReference& orApiRef, sal_Int32 nSheet, bool bSameSheet ) const
+void FormulaParserImpl::initReference3d( SingleReference& orApiRef, sal_Int32 nSheet, bool bSameSheet )
{
orApiRef.Flags = SHEET_3D;
if( nSheet < 0 )
diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx
index da6e770d8905..e35eaaeb00f0 100644
--- a/sc/source/filter/oox/pivotcachebuffer.cxx
+++ b/sc/source/filter/oox/pivotcachebuffer.cxx
@@ -996,7 +996,7 @@ void PivotCacheField::importPCItemIndex( BiffInputStream& rStrm, WorksheetHelper
// private --------------------------------------------------------------------
void PivotCacheField::writeItemToSourceDataCell( WorksheetHelper& rSheetHelper,
- sal_Int32 nCol, sal_Int32 nRow, const PivotCacheItem& rItem ) const
+ sal_Int32 nCol, sal_Int32 nRow, const PivotCacheItem& rItem )
{
if( rItem.getType() != XML_m )
{
@@ -1094,7 +1094,7 @@ void PivotCache::importWorksheetSource( const AttributeList& rAttribs, const Rel
// resolve URL of external document
maTargetUrl = rRelations.getExternalTargetFromRelId( maSheetSrcModel.maRelId );
// store range address unchecked with sheet index 0, will be resolved/checked later
- getAddressConverter().convertToCellRangeUnchecked( maSheetSrcModel.maRange, rAttribs.getString( XML_ref, OUString() ), 0 );
+ AddressConverter::convertToCellRangeUnchecked( maSheetSrcModel.maRange, rAttribs.getString( XML_ref, OUString() ), 0 );
}
void PivotCache::importPCDefinition( SequenceInputStream& rStrm )
@@ -1149,7 +1149,7 @@ void PivotCache::importPCDSheetSource( SequenceInputStream& rStrm, const Relatio
BinRange aBinRange;
rStrm >> aBinRange;
// store range address unchecked with sheet index 0, will be resolved/checked later
- getAddressConverter().convertToCellRangeUnchecked( maSheetSrcModel.maRange, aBinRange, 0 );
+ AddressConverter::convertToCellRangeUnchecked( maSheetSrcModel.maRange, aBinRange, 0 );
}
else
{
diff --git a/sc/source/filter/oox/pivottablebuffer.cxx b/sc/source/filter/oox/pivottablebuffer.cxx
index ec574e36b327..04b02687de07 100644
--- a/sc/source/filter/oox/pivottablebuffer.cxx
+++ b/sc/source/filter/oox/pivottablebuffer.cxx
@@ -962,7 +962,7 @@ void PivotTable::importPivotTableDefinition( const AttributeList& rAttribs )
void PivotTable::importLocation( const AttributeList& rAttribs, sal_Int16 nSheet )
{
- getAddressConverter().convertToCellRangeUnchecked( maLocationModel.maRange, rAttribs.getString( XML_ref, OUString() ), nSheet );
+ AddressConverter::convertToCellRangeUnchecked( maLocationModel.maRange, rAttribs.getString( XML_ref, OUString() ), nSheet );
maLocationModel.mnFirstHeaderRow = rAttribs.getInteger( XML_firstHeaderRow, 0 );
maLocationModel.mnFirstDataRow = rAttribs.getInteger( XML_firstDataRow, 0 );
maLocationModel.mnFirstDataCol = rAttribs.getInteger( XML_firstDataCol, 0 );
@@ -1087,7 +1087,7 @@ void PivotTable::importPTLocation( SequenceInputStream& rStrm, sal_Int16 nSheet
maLocationModel.mnFirstDataCol = rStrm.readInt32();
maLocationModel.mnRowPageCount = rStrm.readInt32();
maLocationModel.mnColPageCount = rStrm.readInt32();
- getAddressConverter().convertToCellRangeUnchecked( maLocationModel.maRange, aBinRange, nSheet );
+ AddressConverter::convertToCellRangeUnchecked( maLocationModel.maRange, aBinRange, nSheet );
}
void PivotTable::importPTRowFields( SequenceInputStream& rStrm )
diff --git a/sc/source/filter/oox/scenariobuffer.cxx b/sc/source/filter/oox/scenariobuffer.cxx
index 946fad940a08..2308953879a8 100644
--- a/sc/source/filter/oox/scenariobuffer.cxx
+++ b/sc/source/filter/oox/scenariobuffer.cxx
@@ -70,7 +70,7 @@ void Scenario::importScenario( const AttributeList& rAttribs )
void Scenario::importInputCells( const AttributeList& rAttribs )
{
ScenarioCellModel aModel;
- getAddressConverter().convertToCellAddressUnchecked( aModel.maPos, rAttribs.getString( XML_r, OUString() ), mnSheet );
+ AddressConverter::convertToCellAddressUnchecked( aModel.maPos, rAttribs.getString( XML_r, OUString() ), mnSheet );
aModel.maValue = rAttribs.getXString( XML_val, OUString() );
aModel.mnNumFmtId = rAttribs.getInteger( XML_numFmtId, 0 );
aModel.mbDeleted = rAttribs.getBool( XML_deleted, false );
@@ -95,7 +95,7 @@ void Scenario::importInputCells( SequenceInputStream& rStrm )
rStrm.skip( 8 );
aModel.mnNumFmtId = rStrm.readuInt16();
rStrm >> aModel.maValue;
- getAddressConverter().convertToCellAddressUnchecked( aModel.maPos, aPos, mnSheet );
+ AddressConverter::convertToCellAddressUnchecked( aModel.maPos, aPos, mnSheet );
maCells.push_back( aModel );
}
diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx
index 39995a1a9504..5e73b6856359 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -2839,7 +2839,7 @@ void CellStyleBuffer::insertCellStyle( CellStyleRef xCellStyle )
}
}
-::ScStyleSheet* CellStyleBuffer::getCellStyleSheet( const CellStyleRef& rxCellStyle ) const
+::ScStyleSheet* CellStyleBuffer::getCellStyleSheet( const CellStyleRef& rxCellStyle )
{
::ScStyleSheet* pStyleSheet = NULL;
if ( rxCellStyle.get() )
@@ -2847,7 +2847,7 @@ void CellStyleBuffer::insertCellStyle( CellStyleRef xCellStyle )
return pStyleSheet;
}
-OUString CellStyleBuffer::createCellStyle( const CellStyleRef& rxCellStyle ) const
+OUString CellStyleBuffer::createCellStyle( const CellStyleRef& rxCellStyle )
{
if( rxCellStyle.get() )
{
diff --git a/sc/source/filter/oox/tablebuffer.cxx b/sc/source/filter/oox/tablebuffer.cxx
index d70c8c532a83..65aaf64ee6f9 100644
--- a/sc/source/filter/oox/tablebuffer.cxx
+++ b/sc/source/filter/oox/tablebuffer.cxx
@@ -52,7 +52,7 @@ Table::Table( const WorkbookHelper& rHelper ) :
void Table::importTable( const AttributeList& rAttribs, sal_Int16 nSheet )
{
- getAddressConverter().convertToCellRangeUnchecked( maModel.maRange, rAttribs.getString( XML_ref, OUString() ), nSheet );
+ AddressConverter::convertToCellRangeUnchecked( maModel.maRange, rAttribs.getString( XML_ref, OUString() ), nSheet );
maModel.maProgName = rAttribs.getXString( XML_name, OUString() );
maModel.maDisplayName = rAttribs.getXString( XML_displayName, OUString() );
maModel.mnId = rAttribs.getInteger( XML_id, -1 );
@@ -73,7 +73,7 @@ void Table::importTable( SequenceInputStream& rStrm, sal_Int16 nSheet )
rStrm.skip( 32 );
rStrm >> maModel.maProgName >> maModel.maDisplayName;
- getAddressConverter().convertToCellRangeUnchecked( maModel.maRange, aBinRange, nSheet );
+ AddressConverter::convertToCellRangeUnchecked( maModel.maRange, aBinRange, nSheet );
static const sal_Int32 spnTypes[] = { XML_worksheet, XML_TOKEN_INVALID, XML_TOKEN_INVALID, XML_queryTable };
maModel.mnType = STATIC_ARRAY_SELECT( spnTypes, nType, XML_TOKEN_INVALID );
}
diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx
index c25004ecff3c..96db289d4e7f 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -663,7 +663,7 @@ void WorkbookGlobals::recalcFormulaCells()
{
// Ask the user if full re-calculation is desired.
ScopedVclPtrInstance<QueryBox> aBox(
- rDocSh.GetActiveDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES),
+ ScDocShell::GetActiveDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES),
ScGlobal::GetRscString(STR_QUERY_FORMULA_RECALC_ONLOAD_XLS));
aBox->SetCheckBoxText(ScGlobal::GetRscString(STR_ALWAYS_PERFORM_SELECTED));
diff --git a/sc/source/filter/oox/worksheetfragment.cxx b/sc/source/filter/oox/worksheetfragment.cxx
index 666550f4b7da..1eb803d678e5 100644
--- a/sc/source/filter/oox/worksheetfragment.cxx
+++ b/sc/source/filter/oox/worksheetfragment.cxx
@@ -244,7 +244,7 @@ ContextHandlerRef WorksheetFragment::onCreateContext( sal_Int32 nElement, const
case XLS_TOKEN( dimension ): importDimension( rAttribs ); break;
case XLS_TOKEN( sheetFormatPr ): importSheetFormatPr( rAttribs ); break;
case XLS_TOKEN( sheetProtection ): getWorksheetSettings().importSheetProtection( rAttribs ); break;
- case XLS_TOKEN( protectedRanges ): getWorksheetSettings().importProtectedRanges( rAttribs ); return this;
+ case XLS_TOKEN( protectedRanges ): WorksheetSettings::importProtectedRanges( rAttribs ); return this;
case XLS_TOKEN( phoneticPr ): getWorksheetSettings().importPhoneticPr( rAttribs ); break;
case XLS_TOKEN( printOptions ): getPageSettings().importPrintOptions( rAttribs ); break;
case XLS_TOKEN( pageMargins ): getPageSettings().importPageMargins( rAttribs ); break;
@@ -499,7 +499,7 @@ void WorksheetFragment::importPageSetUpPr( const AttributeList& rAttribs )
void WorksheetFragment::importDimension( const AttributeList& rAttribs )
{
CellRangeAddress aRange;
- getAddressConverter().convertToCellRangeUnchecked( aRange, rAttribs.getString( XML_ref, OUString() ), getSheetIndex() );
+ AddressConverter::convertToCellRangeUnchecked( aRange, rAttribs.getString( XML_ref, OUString() ), getSheetIndex() );
/* OOXML stores the used area, if existing, or "A1" if the sheet is empty.
In case of "A1", the dimension at the WorksheetHelper object will not
be set. If the cell A1 exists, the used area will be updated while
@@ -611,7 +611,7 @@ void WorksheetFragment::importDimension( SequenceInputStream& rStrm )
BinRange aBinRange;
aBinRange.read( rStrm );
CellRangeAddress aRange;
- getAddressConverter().convertToCellRangeUnchecked( aRange, aBinRange, getSheetIndex() );
+ AddressConverter::convertToCellRangeUnchecked( aRange, aBinRange, getSheetIndex() );
/* BIFF12 stores the used area, if existing, or "A1" if the sheet is
empty. In case of "A1", the dimension at the WorksheetHelper object
will not be set. If the cell A1 exists, the used area will be updated
generated by cgit (git 2.34.1) at 2024-07-17 00:20:16 +0000