summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
Diffstat (limited to 'sc')
-rw-r--r--sc/source/filter/excel/xeroot.cxx6
-rw-r--r--sc/source/filter/excel/xiescher.cxx9
-rw-r--r--sc/source/filter/excel/xlroot.cxx5
-rw-r--r--sc/source/filter/inc/xiescher.hxx1
-rw-r--r--sc/source/filter/inc/xlroot.hxx4
-rw-r--r--sc/source/filter/oox/pagesettings.cxx30
-rw-r--r--sc/source/filter/oox/worksheethelper.cxx6
-rw-r--r--sc/source/filter/xml/XMLStylesExportHelper.cxx43
-rw-r--r--sc/source/filter/xml/XMLStylesExportHelper.hxx11
-rw-r--r--sc/source/filter/xml/xmlexprt.cxx5
-rw-r--r--sc/source/filter/xml/xmlexprt.hxx1
-rw-r--r--sc/source/filter/xml/xmlstyli.cxx17
-rw-r--r--sc/source/filter/xml/xmlstyli.hxx4
13 files changed, 61 insertions, 81 deletions
diff --git a/sc/source/filter/excel/xeroot.cxx b/sc/source/filter/excel/xeroot.cxx
index 7dd616b7de93..a1d822c9d491 100644
--- a/sc/source/filter/excel/xeroot.cxx
+++ b/sc/source/filter/excel/xeroot.cxx
@@ -353,11 +353,7 @@ uno::Sequence< beans::NamedValue > XclExpRoot::GetEncryptionData() const
uno::Sequence< beans::NamedValue > XclExpRoot::GenerateDefaultEncryptionData() const
{
- uno::Sequence< beans::NamedValue > aEncryptionData;
- if ( !GetDefaultPassword().isEmpty() )
- aEncryptionData = GenerateEncryptionData( GetDefaultPassword() );
-
- return aEncryptionData;
+ return GenerateEncryptionData( GetDefaultPassword() );
}
XclExpRootData::XclExpLinkMgrRef const & XclExpRoot::GetLocalLinkMgrRef() const
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index 6a914786565e..3ad8791d6101 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -3266,10 +3266,11 @@ XclImpDffConverter::XclImpDffConvData::XclImpDffConvData(
{
}
+static const OUStringLiteral gaStdFormName( "Standard" ); /// Standard name of control forms.
+
XclImpDffConverter::XclImpDffConverter( const XclImpRoot& rRoot, SvStream& rDffStrm ) :
XclImpSimpleDffConverter( rRoot, rDffStrm ),
oox::ole::MSConvertOCXControls( rRoot.GetDocShell()->GetModel() ),
- maStdFormName( "Standard" ),
mnOleImpFlags( 0 )
{
const SvtFilterOptions& rFilterOpt = SvtFilterOptions::Get();
@@ -3842,14 +3843,14 @@ void XclImpDffConverter::InitControlForm()
Reference< XFormsSupplier > xFormsSupplier( rConvData.mrSdrPage.getUnoPage(), UNO_QUERY_THROW );
Reference< XNameContainer > xFormsNC( xFormsSupplier->getForms(), UNO_SET_THROW );
// find or create the Standard form used to insert the imported controls
- if( xFormsNC->hasByName( maStdFormName ) )
+ if( xFormsNC->hasByName( gaStdFormName ) )
{
- xFormsNC->getByName( maStdFormName ) >>= rConvData.mxCtrlForm;
+ xFormsNC->getByName( gaStdFormName ) >>= rConvData.mxCtrlForm;
}
else if( SfxObjectShell* pDocShell = GetDocShell() )
{
rConvData.mxCtrlForm.set( ScfApiHelper::CreateInstance( pDocShell, "com.sun.star.form.component.Form" ), UNO_QUERY_THROW );
- xFormsNC->insertByName( maStdFormName, Any( rConvData.mxCtrlForm ) );
+ xFormsNC->insertByName( gaStdFormName, Any( rConvData.mxCtrlForm ) );
}
}
catch( const Exception& )
diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx
index e721e2e94c58..9e941bd67720 100644
--- a/sc/source/filter/excel/xlroot.cxx
+++ b/sc/source/filter/excel/xlroot.cxx
@@ -76,6 +76,8 @@ XclDebugObjCounter::~XclDebugObjCounter()
}
#endif
+const OUStringLiteral XclRootData::gaDefPassword( "VelvetSweatshop" );
+
XclRootData::XclRootData( XclBiff eBiff, SfxMedium& rMedium,
tools::SvRef<SotStorage> const & xRootStrg, ScDocument& rDoc, rtl_TextEncoding eTextEnc, bool bExport ) :
meBiff( eBiff ),
@@ -83,7 +85,6 @@ XclRootData::XclRootData( XclBiff eBiff, SfxMedium& rMedium,
mrMedium( rMedium ),
mxRootStrg( xRootStrg ),
mrDoc( rDoc ),
- maDefPassword( "VelvetSweatshop" ),
meTextEnc( eTextEnc ),
meSysLang( Application::GetSettings().GetLanguageTag().getLanguageType() ),
meDocLang( Application::GetSettings().GetLanguageTag().getLanguageType() ),
@@ -237,7 +238,7 @@ sal_Int32 XclRoot::GetHmmFromPixelY( double fPixelY ) const
uno::Sequence< beans::NamedValue > XclRoot::RequestEncryptionData( ::comphelper::IDocPasswordVerifier& rVerifier ) const
{
::std::vector< OUString > aDefaultPasswords;
- aDefaultPasswords.push_back( mrData.maDefPassword );
+ aDefaultPasswords.push_back( XclRootData::gaDefPassword );
return ScfApiHelper::QueryEncryptionDataForMedium( mrData.mrMedium, rVerifier, &aDefaultPasswords );
}
diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx
index 015b7c745242..58ac66867831 100644
--- a/sc/source/filter/inc/xiescher.hxx
+++ b/sc/source/filter/inc/xiescher.hxx
@@ -1024,7 +1024,6 @@ private:
typedef std::shared_ptr< XclImpDffConvData > XclImpDffConvDataRef;
typedef std::vector< XclImpDffConvDataRef > XclImpDffConvDataStack;
- const OUString maStdFormName; /// Standard name of control forms.
tools::SvRef<SotStorageStream> mxCtlsStrm; /// The 'Ctls' stream for OCX form controls.
ScfProgressBarRef mxProgress; /// The progress bar used in ProcessObj().
XclImpDffConvDataStack maDataStack; /// Stack for registered drawing managers.
diff --git a/sc/source/filter/inc/xlroot.hxx b/sc/source/filter/inc/xlroot.hxx
index f1b9a1085825..f5942a4b0808 100644
--- a/sc/source/filter/inc/xlroot.hxx
+++ b/sc/source/filter/inc/xlroot.hxx
@@ -84,7 +84,7 @@ struct XclRootData
OUString maDocUrl; /// Document URL of imported/exported file.
OUString maBasePath; /// Base path of imported/exported file (path of maDocUrl).
OUString maUserName; /// Current user name.
- const OUString maDefPassword; /// The default password used for stream encryption.
+ static const OUStringLiteral gaDefPassword; /// The default password used for stream encryption.
rtl_TextEncoding meTextEnc; /// Text encoding to import/export byte strings.
LanguageType meSysLang; /// System language.
LanguageType meDocLang; /// Document language (import: from file, export: from system).
@@ -178,7 +178,7 @@ public:
const OUString& GetUserName() const { return mrData.maUserName; }
/** Returns the default password used for stream encryption. */
- const OUString& GetDefaultPassword() const { return mrData.maDefPassword; }
+ static const OUStringLiteral& GetDefaultPassword() { return XclRootData::gaDefPassword; }
/** Requests and verifies a password from the medium or the user. */
css::uno::Sequence< css::beans::NamedValue >
RequestEncryptionData( ::comphelper::IDocPasswordVerifier& rVerifier ) const;
diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx
index d822d9734a91..6ed7d463c1b1 100644
--- a/sc/source/filter/oox/pagesettings.cxx
+++ b/sc/source/filter/oox/pagesettings.cxx
@@ -428,11 +428,6 @@ private:
private:
typedef ::std::vector< HFPortionInfo > HFPortionInfoVec;
- const OUString maPageNumberService;
- const OUString maPageCountService;
- const OUString maSheetNameService;
- const OUString maFileNameService;
- const OUString maDateTimeService;
const std::set< OString > maBoldNames; /// All names for bold font style in lowercase UTF-8.
const std::set< OString > maItalicNames; /// All names for italic font style in lowercase UTF-8.
HFPortionInfoVec maPortions;
@@ -466,13 +461,14 @@ static const sal_Char* const sppcItalicNames[] =
} // namespace
+static const OUStringLiteral gaPageNumberService( "com.sun.star.text.TextField.PageNumber" );
+static const OUStringLiteral gaPageCountService( "com.sun.star.text.TextField.PageCount" );
+static const OUStringLiteral gaSheetNameService( "com.sun.star.text.TextField.SheetName" );
+static const OUStringLiteral gaFileNameService( "com.sun.star.text.TextField.FileName" );
+static const OUStringLiteral gaDateTimeService( "com.sun.star.text.TextField.DateTime" );
+
HeaderFooterParser::HeaderFooterParser( const WorkbookHelper& rHelper ) :
WorkbookHelper( rHelper ),
- maPageNumberService( "com.sun.star.text.TextField.PageNumber" ),
- maPageCountService( "com.sun.star.text.TextField.PageCount" ),
- maSheetNameService( "com.sun.star.text.TextField.SheetName" ),
- maFileNameService( "com.sun.star.text.TextField.FileName" ),
- maDateTimeService( "com.sun.star.text.TextField.DateTime" ),
maBoldNames( sppcBoldNames, sppcBoldNames + SAL_N_ELEMENTS(sppcBoldNames) ),
maItalicNames( sppcItalicNames, sppcItalicNames + SAL_N_ELEMENTS(sppcItalicNames) ),
maPortions( static_cast< size_t >( HF_COUNT ) ),
@@ -547,18 +543,18 @@ double HeaderFooterParser::parse( const Reference<sheet::XHeaderFooterContent>&
case 'R': setNewPortion( HF_RIGHT ); break; // right portion
case 'P': // page number
- appendField( createField( maPageNumberService ) );
+ appendField( createField( gaPageNumberService ) );
break;
case 'N': // total page count
- appendField( createField( maPageCountService ) );
+ appendField( createField( gaPageCountService ) );
break;
case 'A': // current sheet name
- appendField( createField( maSheetNameService ) );
+ appendField( createField( gaSheetNameService ) );
break;
case 'F': // file name
{
- Reference<text::XTextContent> xContent = createField( maFileNameService );
+ Reference<text::XTextContent> xContent = createField( gaFileNameService );
PropertySet aPropSet( xContent );
aPropSet.setProperty( PROP_FileFormat, css::text::FilenameDisplayFormat::NAME_AND_EXT );
appendField( xContent );
@@ -566,7 +562,7 @@ double HeaderFooterParser::parse( const Reference<sheet::XHeaderFooterContent>&
break;
case 'Z': // file path (without file name), OOXML, BIFF12, and BIFF8 only
{
- Reference<text::XTextContent> xContent = createField( maFileNameService );
+ Reference<text::XTextContent> xContent = createField( gaFileNameService );
PropertySet aPropSet( xContent );
// FilenameDisplayFormat::PATH not supported by Calc
aPropSet.setProperty( PROP_FileFormat, css::text::FilenameDisplayFormat::FULL );
@@ -579,7 +575,7 @@ double HeaderFooterParser::parse( const Reference<sheet::XHeaderFooterContent>&
break;
case 'D': // date
{
- Reference<text::XTextContent> xContent = createField( maDateTimeService );
+ Reference<text::XTextContent> xContent = createField( gaDateTimeService );
PropertySet aPropSet( xContent );
aPropSet.setProperty( PROP_IsDate, true );
appendField( xContent );
@@ -587,7 +583,7 @@ double HeaderFooterParser::parse( const Reference<sheet::XHeaderFooterContent>&
break;
case 'T': // time
{
- Reference<text::XTextContent> xContent = createField( maDateTimeService );
+ Reference<text::XTextContent> xContent = createField( gaDateTimeService );
PropertySet aPropSet( xContent );
aPropSet.setProperty( PROP_IsDate, false );
appendField( xContent );
diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx
index f2f2d211030a..a4485f3ffc16 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -362,7 +362,6 @@ private:
private:
typedef ::std::unique_ptr< VmlDrawing > VmlDrawingPtr;
- const OUString maSheetCellRanges; /// Service name for a SheetCellRanges object.
const ScAddress& mrMaxApiPos; /// Reference to maximum Calc cell address from address converter.
ScRange maUsedArea; /// Used area of the sheet, and sheet index of the sheet.
ColumnModel maDefColModel; /// Default column formatting.
@@ -394,9 +393,10 @@ private:
bool mbHasDefWidth; /// True = default column width is set from defaultColWidth attribute.
};
+static const OUStringLiteral gaSheetCellRanges( "com.sun.star.sheet.SheetCellRanges" ); /// Service name for a SheetCellRanges object.
+
WorksheetGlobals::WorksheetGlobals( const WorkbookHelper& rHelper, const ISegmentProgressBarRef& rxProgressBar, WorksheetType eSheetType, SCTAB nSheet ) :
WorkbookHelper( rHelper ),
- maSheetCellRanges( "com.sun.star.sheet.SheetCellRanges" ),
mrMaxApiPos( rHelper.getAddressConverter().getMaxApiAddress() ),
maUsedArea( SCCOL_MAX, SCROW_MAX, nSheet, -1, -1, nSheet ), // Set start address to largest possible value, and end address to smallest
maSheetData( *this ),
@@ -475,7 +475,7 @@ Reference< XSheetCellRanges > WorksheetGlobals::getCellRangeList( const ScRangeL
Reference< XSheetCellRanges > xRanges;
if( mxSheet.is() && !rRanges.empty() ) try
{
- xRanges.set( getBaseFilter().getModelFactory()->createInstance( maSheetCellRanges ), UNO_QUERY_THROW );
+ xRanges.set( getBaseFilter().getModelFactory()->createInstance( gaSheetCellRanges ), UNO_QUERY_THROW );
Reference< XSheetCellRangeContainer > xRangeCont( xRanges, UNO_QUERY_THROW );
xRangeCont->addRangeAddresses( AddressConverter::toApiSequence(rRanges), false );
}
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index 3ee8db545ea9..4a1c140d15a5 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -82,18 +82,19 @@ bool ScMyValidation::IsEqual(const ScMyValidation& aVal) const
aVal.sFormula2 == sFormula2;
}
+static const OUStringLiteral gsERRALSTY(SC_UNONAME_ERRALSTY);
+static const OUStringLiteral gsIGNOREBL(SC_UNONAME_IGNOREBL);
+static const OUStringLiteral gsSHOWLIST(SC_UNONAME_SHOWLIST);
+static const OUStringLiteral gsTYPE(SC_UNONAME_TYPE);
+static const OUStringLiteral gsSHOWINP(SC_UNONAME_SHOWINP);
+static const OUStringLiteral gsSHOWERR(SC_UNONAME_SHOWERR);
+static const OUStringLiteral gsINPTITLE(SC_UNONAME_INPTITLE);
+static const OUStringLiteral gsINPMESS(SC_UNONAME_INPMESS);
+static const OUStringLiteral gsERRTITLE(SC_UNONAME_ERRTITLE);
+static const OUStringLiteral gsERRMESS(SC_UNONAME_ERRMESS);
+
ScMyValidationsContainer::ScMyValidationsContainer()
- : aValidationVec(),
- sERRALSTY(SC_UNONAME_ERRALSTY),
- sIGNOREBL(SC_UNONAME_IGNOREBL),
- sSHOWLIST(SC_UNONAME_SHOWLIST),
- sTYPE(SC_UNONAME_TYPE),
- sSHOWINP(SC_UNONAME_SHOWINP),
- sSHOWERR(SC_UNONAME_SHOWERR),
- sINPTITLE(SC_UNONAME_INPTITLE),
- sINPMESS(SC_UNONAME_INPMESS),
- sERRTITLE(SC_UNONAME_ERRTITLE),
- sERRMESS(SC_UNONAME_ERRMESS)
+ : aValidationVec()
{
}
@@ -108,17 +109,17 @@ void ScMyValidationsContainer::AddValidation(const uno::Any& aTempAny,
if (xPropertySet.is())
{
OUString sErrorMessage;
- xPropertySet->getPropertyValue(sERRMESS) >>= sErrorMessage;
+ xPropertySet->getPropertyValue(gsERRMESS) >>= sErrorMessage;
OUString sErrorTitle;
- xPropertySet->getPropertyValue(sERRTITLE) >>= sErrorTitle;
+ xPropertySet->getPropertyValue(gsERRTITLE) >>= sErrorTitle;
OUString sImputMessage;
- xPropertySet->getPropertyValue(sINPMESS) >>= sImputMessage;
+ xPropertySet->getPropertyValue(gsINPMESS) >>= sImputMessage;
OUString sImputTitle;
- xPropertySet->getPropertyValue(sINPTITLE) >>= sImputTitle;
- bool bShowErrorMessage = ::cppu::any2bool(xPropertySet->getPropertyValue(sSHOWERR));
- bool bShowImputMessage = ::cppu::any2bool(xPropertySet->getPropertyValue(sSHOWINP));
+ xPropertySet->getPropertyValue(gsINPTITLE) >>= sImputTitle;
+ bool bShowErrorMessage = ::cppu::any2bool(xPropertySet->getPropertyValue(gsSHOWERR));
+ bool bShowImputMessage = ::cppu::any2bool(xPropertySet->getPropertyValue(gsSHOWINP));
sheet::ValidationType aValidationType;
- xPropertySet->getPropertyValue(sTYPE) >>= aValidationType;
+ xPropertySet->getPropertyValue(gsTYPE) >>= aValidationType;
if (bShowErrorMessage || bShowImputMessage || aValidationType != sheet::ValidationType_ANY ||
!sErrorMessage.isEmpty() || !sErrorTitle.isEmpty() || !sImputMessage.isEmpty() || !sImputTitle.isEmpty())
{
@@ -130,9 +131,9 @@ void ScMyValidationsContainer::AddValidation(const uno::Any& aTempAny,
aValidation.bShowErrorMessage = bShowErrorMessage;
aValidation.bShowImputMessage = bShowImputMessage;
aValidation.aValidationType = aValidationType;
- aValidation.bIgnoreBlanks = ::cppu::any2bool(xPropertySet->getPropertyValue(sIGNOREBL));
- xPropertySet->getPropertyValue(sSHOWLIST) >>= aValidation.nShowList;
- xPropertySet->getPropertyValue(sERRALSTY) >>= aValidation.aAlertStyle;
+ aValidation.bIgnoreBlanks = ::cppu::any2bool(xPropertySet->getPropertyValue(gsIGNOREBL));
+ xPropertySet->getPropertyValue(gsSHOWLIST) >>= aValidation.nShowList;
+ xPropertySet->getPropertyValue(gsERRALSTY) >>= aValidation.aAlertStyle;
uno::Reference<sheet::XSheetCondition> xCondition(xPropertySet, uno::UNO_QUERY);
if (xCondition.is())
{
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.hxx b/sc/source/filter/xml/XMLStylesExportHelper.hxx
index 3fa54f49919e..3399174fb433 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.hxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.hxx
@@ -66,17 +66,6 @@ class ScMyValidationsContainer
{
private:
ScMyValidationVec aValidationVec;
- const OUString sERRALSTY;
- const OUString sIGNOREBL;
- const OUString sSHOWLIST;
- const OUString sTYPE;
- const OUString sSHOWINP;
- const OUString sSHOWERR;
- const OUString sINPTITLE;
- const OUString sINPMESS;
- const OUString sERRTITLE;
- const OUString sERRMESS;
-
public:
ScMyValidationsContainer();
~ScMyValidationsContainer();
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 10ebe9139ca5..59f4b9bbb572 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -333,6 +333,8 @@ sal_Int16 ScXMLExport::GetMeasureUnit()
return xProperties->getMetric();
}
+static const OUStringLiteral gsLayerID( SC_LAYERID );
+
ScXMLExport::ScXMLExport(
const css::uno::Reference< css::uno::XComponentContext >& rContext,
OUString const & implementationName, SvXMLExportFlags nExportFlag)
@@ -354,7 +356,6 @@ ScXMLExport::ScXMLExport(
pMergedRangesContainer(nullptr),
pValidationsContainer(nullptr),
pChangeTrackingExportHelper(nullptr),
- sLayerID( SC_LAYERID ),
nOpenRow(-1),
nProgressCount(0),
nCurrentTable(0),
@@ -530,7 +531,7 @@ void ScXMLExport::CollectSharedData(SCTAB& nTableCount, sal_Int32& nShapesCount)
continue;
sal_Int16 nLayerID = 0;
- bool bExtracted = xShapeProp->getPropertyValue(sLayerID) >>= nLayerID;
+ bool bExtracted = xShapeProp->getPropertyValue(gsLayerID) >>= nLayerID;
if (!bExtracted)
continue;
diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx
index c551fbe2e96f..14b13ee69a44 100644
--- a/sc/source/filter/xml/xmlexprt.hxx
+++ b/sc/source/filter/xml/xmlexprt.hxx
@@ -110,7 +110,6 @@ class ScXMLExport : public SvXMLExport
std::unique_ptr<ScMyMergedRangesContainer> pMergedRangesContainer;
std::unique_ptr<ScMyValidationsContainer> pValidationsContainer;
std::unique_ptr<ScChangeTrackingExportHelper> pChangeTrackingExportHelper;
- const OUString sLayerID;
OUString sExternalRefTabStyleName;
OUString sAttrName;
OUString sAttrStyleName;
diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx
index 5087bf0591b9..03996c173c32 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -688,16 +688,17 @@ SvXMLStyleContext *XMLTableStylesContext::CreateDefaultStyleStyleChildContext(
return pStyle;
}
+static const OUStringLiteral gsCellStyleServiceName("com.sun.star.style.CellStyle");
+static const OUStringLiteral gsColumnStyleServiceName(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME);
+static const OUStringLiteral gsRowStyleServiceName(XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME);
+static const OUStringLiteral gsTableStyleServiceName(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME);
+
XMLTableStylesContext::XMLTableStylesContext( SvXMLImport& rImport,
sal_uInt16 nPrfx ,
const OUString& rLName ,
const uno::Reference< XAttributeList > & xAttrList,
const bool bTempAutoStyles )
: SvXMLStylesContext( rImport, nPrfx, rLName, xAttrList )
- , sCellStyleServiceName("com.sun.star.style.CellStyle")
- , sColumnStyleServiceName(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME)
- , sRowStyleServiceName(XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME)
- , sTableStyleServiceName(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME)
, nNumberFormatIndex(-1)
, nConditionalFormatIndex(-1)
, nCellStyleIndex(-1)
@@ -860,16 +861,16 @@ OUString XMLTableStylesContext::GetServiceName( sal_uInt16 nFamily ) const
switch( nFamily )
{
case XML_STYLE_FAMILY_TABLE_COLUMN:
- sServiceName = sColumnStyleServiceName;
+ sServiceName = gsColumnStyleServiceName;
break;
case XML_STYLE_FAMILY_TABLE_ROW:
- sServiceName = sRowStyleServiceName;
+ sServiceName = gsRowStyleServiceName;
break;
case XML_STYLE_FAMILY_TABLE_CELL:
- sServiceName = sCellStyleServiceName;
+ sServiceName = gsCellStyleServiceName;
break;
case XML_STYLE_FAMILY_TABLE_TABLE:
- sServiceName = sTableStyleServiceName;
+ sServiceName = gsTableStyleServiceName;
break;
}
}
diff --git a/sc/source/filter/xml/xmlstyli.hxx b/sc/source/filter/xml/xmlstyli.hxx
index f629817246f1..1babf9cd5bfb 100644
--- a/sc/source/filter/xml/xmlstyli.hxx
+++ b/sc/source/filter/xml/xmlstyli.hxx
@@ -126,10 +126,6 @@ class XMLTableStylesContext : public SvXMLStylesContext
css::uno::Reference< css::container::XNameContainer > xColumnStyles;
css::uno::Reference< css::container::XNameContainer > xRowStyles;
css::uno::Reference< css::container::XNameContainer > xTableStyles;
- const OUString sCellStyleServiceName;
- const OUString sColumnStyleServiceName;
- const OUString sRowStyleServiceName;
- const OUString sTableStyleServiceName;
sal_Int32 nNumberFormatIndex;
sal_Int32 nConditionalFormatIndex;
sal_Int32 nCellStyleIndex;
generated by cgit (git 2.34.1) at 2025-02-12 03:02:33 +0000