[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sc/source

[Eike Rathke]

 sc/source/filter/xml/xmlexprt.cxx |    6 +++---
 sc/source/filter/xml/xmlexprt.hxx |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 1093721a260d25f986fd794acd914b8fb7bcf92a
Author: Eike Rathke <erack at redhat.com>
Date:   Sat Dec 10 00:03:42 2016 +0100

    rename to RegisterDefinedStyleNames() to clarify, tdf#104097 follow-up
    
    Change-Id: Iecb64ab1e25913180bcb53a133f9dd6777ffb17b
    (cherry picked from commit 7b1c8fa23342f847c7bbc99627dbb3fec0a57205)
    Reviewed-on: https://gerrit.libreoffice.org/31825
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index b1ea373..2dca58b 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -1839,7 +1839,7 @@ const ScXMLEditAttributeMap& ScXMLExport::GetEditAttributeMap() const
     return *mpEditAttrMap;
 }
 
-void ScXMLExport::RegisterDefinedNames( uno::Reference< css::sheet::XSpreadsheetDocument > & xSpreadDoc )
+void ScXMLExport::RegisterDefinedStyleNames( uno::Reference< css::sheet::XSpreadsheetDocument > & xSpreadDoc )
 {
     ScFormatSaveData* pFormatData = ScModelObj::getImplementation(xSpreadDoc)->GetFormatSaveData();
     auto xAutoStylePool = GetAutoStylePool();
@@ -1946,7 +1946,7 @@ void ScXMLExport::ExportStyles_( bool bUsed )
 {
     Reference <sheet::XSpreadsheetDocument> xSpreadDoc( GetModel(), uno::UNO_QUERY );
     if (xSpreadDoc.is())
-        RegisterDefinedNames( xSpreadDoc);
+        RegisterDefinedStyleNames( xSpreadDoc);
 
     if (!pSharedData)
     {
@@ -2274,7 +2274,7 @@ void ScXMLExport::ExportAutoStyles_()
     if (getExportFlags() & SvXMLExportFlags::CONTENT)
     {
         // Reserve the loaded cell style names.
-        RegisterDefinedNames( xSpreadDoc);
+        RegisterDefinedStyleNames( xSpreadDoc);
 
         //  re-create automatic styles with old names from stored data
         ScSheetSaveData* pSheetData = ScModelObj::getImplementation(xSpreadDoc)->GetSheetSaveData();
diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx
index fb14aa8..833163d 100644
--- a/sc/source/filter/xml/xmlexprt.hxx
+++ b/sc/source/filter/xml/xmlexprt.hxx
@@ -131,7 +131,7 @@ class ScXMLExport : public SvXMLExport
     sal_Int32       GetNumberFormatStyleIndex(sal_Int32 nNumFmt) const;
     void            CollectSharedData(SCTAB& nTableCount, sal_Int32& nShapesCount);
     void            CollectShapesAutoStyles(SCTAB nTableCount);
-    void            RegisterDefinedNames( css::uno::Reference< css::sheet::XSpreadsheetDocument > & xSpreadDoc );
+    void            RegisterDefinedStyleNames( css::uno::Reference< css::sheet::XSpreadsheetDocument > & xSpreadDoc );
     virtual void ExportFontDecls_() override;
     virtual void ExportStyles_( bool bUsed ) override;
     virtual void ExportAutoStyles_() override;