CWS-TOOLING: integrate CWS dr70

2009-06-09 13:52:02 +0200 dr  r272770 : #i101930# SXC import broken
2009-06-05 11:50:16 +0200 dr  r272675 : #i10000# compiler warning
2009-06-05 11:24:39 +0200 dr  r272674 : #i10000# compiler warning
2009-06-05 10:35:22 +0200 dr  r272668 : #i10000# compiler warning
2009-06-04 16:53:32 +0200 dr  r272646 : CWS-TOOLING: rebase CWS dr70 to trunk@272291 (milestone: DEV300:m49)
2009-06-04 14:50:45 +0200 dr  r272633 : #i10000# compiler warning
2009-06-03 18:50:57 +0200 dr  r272603 : #i101930# fix ODS export of uninit'ed notes, do not craete note captions in UpdatePendingRowHeights
2009-05-28 11:11:17 +0200 dr  r272384 : #i101930# note captions must be created before changing row/column size
2009-05-27 15:48:44 +0200 iha  r272356 : #i101925# metafile creation is requested superfluously during inplace editing
2009-05-27 15:46:44 +0200 iha  r272355 : #i101925# metafile creation is requested superfluously during inplace editing
2009-05-27 15:06:58 +0200 iha  r272349 : #i101928# superfluous paint calls while entering and editing charts
2009-05-27 15:01:08 +0200 iha  r272348 : #i101928# superfluous paint calls while entering and editing charts
2009-05-26 14:43:39 +0200 dr  r272303 : #i101930# import performance: invisible cell notes cache caption data
2009-05-22 18:44:19 +0200 dr  r272205 : #i101930# preparations for uninitialized notes (performance), adapted ODF import filter
2009-05-14 19:50:43 +0200 dr  r271918 : #i101930# 'recycle' the shapes already created while loading cell notes
2009-05-06 16:07:45 +0200 dr  r271598 : #i100827# improve performance of HTML query filter, patch by mmeeks, slightly modified
2009-05-06 11:02:38 +0200 dr  r271577 : #i100827# improve performance of HTML query filter, patch by mmeeks
2009-05-06 10:50:13 +0200 dr  r271575 : #i86650# improve performance of HTML query filter
2009-05-05 10:09:44 +0200 nn  r271502 : #i101428# better handling of non-existing view data
2009-04-29 16:42:57 +0200 nn  r271384 : #i101428# after loading, update row heights per sheet on demand

1 files changed, 34 insertions, 17 deletions

diff --git a/sc/source/filter/xml/xmlannoi.hxx b/sc/source/filter/xml/xmlannoi.hxx
index 3a65d5b444ff..c509b72124ed 100644
--- a/sc/source/filter/xml/xmlannoi.hxx
+++ b/sc/source/filter/xml/xmlannoi.hxx
@@ -30,6 +30,7 @@
 #ifndef SC_XMLANNOI_HXX
 #define SC_XMLANNOI_HXX
 
+#include <memory>
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -39,30 +40,31 @@
 class ScXMLImport;
 class ScXMLTableRowCellContext;
 
-class ScXMLAnnotationContext : public SvXMLImportContext
+struct ScXMLAnnotationData
 {
-    rtl::OUStringBuffer sOUText;
-    rtl::OUStringBuffer sAuthorBuffer;
-    rtl::OUStringBuffer sCreateDateBuffer;
-    rtl::OUStringBuffer sCreateDateStringBuffer;
-    sal_Int32       nParagraphCount;
-    sal_Bool        bDisplay;
-    sal_Bool        bHasTextP;
-    sal_Bool        bHasPos;
-    ScXMLTableRowCellContext*   pCellContext;
-    SvXMLImportContext*         pShapeContext;
-    com::sun::star::uno::Reference< com::sun::star::drawing::XShape > xShape;
-    com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > xShapes;
+    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
+                        mxShape;
+    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >
+                        mxShapes;
+    ::rtl::OUString     maAuthor;
+    ::rtl::OUString     maCreateDate;
+    ::rtl::OUString     maSimpleText;
+    bool                mbUseShapePos;
+    bool                mbShown;
 
-    const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
-    ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
+    explicit            ScXMLAnnotationData();
+                        ~ScXMLAnnotationData();
+};
 
+class ScXMLAnnotationContext : public SvXMLImportContext
+{
 public:
 
     ScXMLAnnotationContext( ScXMLImport& rImport, USHORT nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
+                        ScXMLAnnotationData& rAnnotationData,
                         ScXMLTableRowCellContext* pCellContext);
 
     virtual ~ScXMLAnnotationContext();
@@ -78,8 +80,23 @@ public:
 
     virtual void EndElement();
 
-    void SetShape(const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xTempShape,
-        const com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& xTempShapes) { xShape.set(xTempShape); xShapes.set(xTempShapes); }
+    void SetShape(
+        const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape,
+        const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes );
+
+private:
+    ScXMLAnnotationData& mrAnnotationData;
+    rtl::OUStringBuffer maTextBuffer;
+    rtl::OUStringBuffer maAuthorBuffer;
+    rtl::OUStringBuffer maCreateDateBuffer;
+    rtl::OUStringBuffer maCreateDateStringBuffer;
+    sal_Int32           nParagraphCount;
+    sal_Bool            bHasTextP;
+    ScXMLTableRowCellContext* pCellContext;
+    SvXMLImportContext* pShapeContext;
+
+    const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
+    ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
 };