[Libreoffice-commits] core.git: Branch 'feature/notes-refactoring' - sc/source

[Laurent Godard]

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

New commits:
commit c74e3aea0bd34a953458107d751433db30425dda
Author: Laurent Godard <lgodard.libre at laposte.net>
Date:   Thu Nov 21 18:40:31 2013 +0100

    code cleaning and method renaming
    
    Change-Id: I034b9d1f989a3280db9c35d03e3cfae2d144f076

diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 1cdbaba..e317f58 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -1961,7 +1961,6 @@ void ScXMLExport::_ExportContent()
             sal_Int32 nStartOffset = -1;
             sal_Int32 nEndOffset = -1;
             if (pSheetData && pDoc && pDoc->IsStreamValid((SCTAB)nTable) && !pDoc->GetChangeTrack())
-// LG            if (pSheetData && pDoc && !pDoc->GetChangeTrack())
                 pSheetData->GetStreamPos( nTable, nStartOffset, nEndOffset );
 
             if ( nStartOffset >= 0 && nEndOffset >= 0 && xSourceStream.is() )
@@ -2405,7 +2404,7 @@ void ScXMLExport::_ExportAutoStyles()
             }
 
             // stored notes styles
-            ExportAutoStylesFromNotes(pSheetData);
+            ExportAnnotationsAutoStyles(pSheetData);
 
             UniReference<SvXMLExportPropertyMapper> xTextPropMapper = XMLTextParagraphExport::CreateCharExtPropMapper( *this );
 
@@ -2623,11 +2622,8 @@ void ScXMLExport::_ExportAutoStyles()
         GetTextParagraphExport()->exportTextAutoStyles();
 }
 
-void ScXMLExport::ExportAutoStylesFromNotes(ScSheetSaveData* pSheetData)
+void ScXMLExport::ExportAnnotationsAutoStyles(ScSheetSaveData* pSheetData)
 {
-
-//ScSheetSaveData* pSheetData = ScModelObj::getImplementation(xSpreadDoc)->GetSheetSaveData();
-
     // stored shape styles
 
     UniReference<SvXMLExportPropertyMapper> xShapeMapper = XMLShapeExport::CreateShapePropMapper( *this );
diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx
index 1fec736..c3ddc23 100644
--- a/sc/source/filter/xml/xmlexprt.hxx
+++ b/sc/source/filter/xml/xmlexprt.hxx
@@ -156,7 +156,7 @@ class ScXMLExport : public SvXMLExport
     void ExportColumns(const sal_Int32 nTable, const com::sun::star::table::CellRangeAddress& aColumnHeaderRange, const bool bHasColumnHeader);
     void ExportExternalRefCacheStyles();
     void ExportCellTextAutoStyles(sal_Int32 nTable);
-    void ExportAutoStylesFromNotes(ScSheetSaveData* pSheetData);
+    void ExportAnnotationsAutoStyles(ScSheetSaveData* pSheetData);
     void ExportFormatRanges(const sal_Int32 nStartCol, const sal_Int32 nStartRow,
         const sal_Int32 nEndCol, const sal_Int32 nEndRow, const sal_Int32 nSheet);
     void WriteRowContent();