CWS-TOOLING: integrate CWS calcsheetdata

2009-08-13 16:18:48 +0200 nn  r274950 : #i102616# shared/remote files, better handling of formula results
2009-08-12 11:17:30 +0200 nn  r274884 : CWS-TOOLING: rebase CWS calcsheetdata to trunk@274622 (milestone: DEV300:m54)
2009-08-12 10:30:47 +0200 nn  r274881 : #i102616# some clean-up
2009-08-11 19:01:18 +0200 nn  r274876 : #i102616# store loaded namespaces, so prefixes remain valid
2009-08-11 19:00:49 +0200 nn  r274875 : #i102616# store loaded namespaces, so prefixes remain valid
2009-08-10 19:12:04 +0200 nn  r274835 : #i102616# detective, notes, encoding, error handling
2009-08-07 11:18:46 +0200 nn  r274751 : #i102616# use new method SvXMLAutoStylePoolP::AddNamed
2009-08-07 11:18:15 +0200 nn  r274750 : #i102616# new method SvXMLAutoStylePoolP::AddNamed
2009-08-06 18:02:42 +0200 nn  r274740 : #i102616# modification: shapes, notes, pending row heights; skip sheets in export iterator
2009-08-05 18:41:59 +0200 nn  r274694 : #i102616# handle text styles in notes
2009-08-03 18:55:59 +0200 nn  r274594 : #i102616# handle text styles in cells
2009-07-31 19:00:06 +0200 nn  r274548 : #i102616# handle styles for notes
2009-07-28 16:46:20 +0200 nn  r274414 : missed a conflict
2009-07-28 14:01:56 +0200 nn  r274404 : CWS-TOOLING: rebase CWS calcsheetdata to trunk@274203 (milestone: DEV300:m53)
2009-07-23 18:28:47 +0200 nn  r274278 : #i102616# handle table styles
2009-07-22 15:40:24 +0200 nn  r274244 : #i102616# handle row styles
2009-07-21 20:09:37 +0200 nn  r274211 : #i102616# handle column styles
2009-07-16 13:00:18 +0200 nn  r274043 : #i102616# invalidate all stream positions when inserting/deleting sheets
2009-07-15 17:41:15 +0200 nn  r274021 : #i102616# don't collect cell styles twice for copied sheets
2009-07-14 18:36:11 +0200 nn  r273985 : #i102616# allow to query stream position, clear buffer
2009-07-14 18:32:10 +0200 nn  r273984 : #i102616# allow to specify a name for an autostyle
2009-07-09 22:01:23 +0200 nn  r273870 : #i102616# copy stream for unchanged sheets
2009-07-08 18:11:42 +0200 nn  r273844 : #i102616# store stream positions of sheets
2009-06-24 19:08:18 +0200 nn  r273363 : #i102616# detect changed sheets since loading
2009-06-09 15:53:32 +0200 nn  r272774 : #i102616# store automatic cell style information after loading

1 files changed, 18 insertions, 0 deletions

diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx
index f0a4569cc86e..6a42d505cdc8 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -44,6 +44,7 @@
 #include "docuno.hxx"
 #include "unonames.hxx"
 #include "postit.hxx"
+#include "sheetdata.hxx"
 
 #include "XMLTableShapeImportHelper.hxx"
 #include "XMLTextPContext.hxx"
@@ -550,6 +551,11 @@ void ScXMLTableRowCellContext::SetContentValidation(com::sun::star::uno::Referen
                 }
             }
             xPropSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_VALIXML)), uno::makeAny(xPropertySet));
+
+            // For now, any sheet with validity is blocked from stream-copying.
+            // Later, the validation names could be stored along with the style names.
+            ScSheetSaveData* pSheetData = ScModelObj::getImplementation(GetImport().GetModel())->GetSheetSaveData();
+            pSheetData->BlockSheet( GetScImport().GetTables().GetCurrentSheet() );
         }
     }
 }
@@ -676,6 +682,18 @@ void ScXMLTableRowCellContext::SetAnnotation(const table::CellAddress& aCellAddr
         uno::Reference< drawing::XShape > xShape;
         rXMLImport.GetShapeImport()->shapeWithZIndexAdded( xShape, xShapesIA->getCount() );
     }
+
+    // store the style names for stream copying
+    ScSheetSaveData* pSheetData = ScModelObj::getImplementation(rXMLImport.GetModel())->GetSheetSaveData();
+    pSheetData->HandleNoteStyles( mxAnnotationData->maStyleName, mxAnnotationData->maTextStyle, aPos );
+
+    std::vector<ScXMLAnnotationStyleEntry>::const_iterator aIter = mxAnnotationData->maContentStyles.begin();
+    std::vector<ScXMLAnnotationStyleEntry>::const_iterator aEnd = mxAnnotationData->maContentStyles.end();
+    while (aIter != aEnd)
+    {
+        pSheetData->AddNoteContentStyle( aIter->mnFamily, aIter->maName, aPos, aIter->maSelection );
+        ++aIter;
+    }
 }
 
 // core implementation