CWS-TOOLING: integrate CWS sw32a11y01

2009-08-27 10:11:46 +0200 hde  r275457 : new testcase i103265
2009-08-27 08:24:31 +0200 hde  r275454 : new testcase i103265
2009-08-27 08:23:05 +0200 hde  r275453 : new document for testcase i103265
2009-08-26 13:43:33 +0200 hde  r275421 : added new autotest
2009-08-26 13:36:28 +0200 hde  r275420 : added new autotest
2009-08-18 15:41:18 +0200 od  r275113 : #i104300# method <SwEditWin::RequestHelp(..)>
- improve help tip for hyperlinks to cross-reference bookmarks.
2009-08-10 15:18:41 +0200 od  r274816 : #i73249# method <SwFrameShell::Execute(..)>
- no update of fly frame manager on dialog "Title and Description"
2009-08-10 14:24:15 +0200 od  r274813 : #i92125# correction of end of file - missing newline end
2009-08-10 14:10:14 +0200 od  r274811 : #i92125# correction of end of file - newline missing
2009-08-10 14:00:30 +0200 od  r274808 : #i92125# - correct end of file - new line missing
2009-08-10 09:12:30 +0200 od  r274794 : CWS-TOOLING: rebase CWS sw32a11y01 to trunk@274622 (milestone: DEV300:m54)
2009-08-07 15:52:59 +0200 od  r274775 : #i73249# minor adjustment due to compiler warning
2009-08-07 15:40:38 +0200 od  r274774 : #i92125# method <MarkManager::deleteMarks(..)>
- do not delete cross-reference bookmark, if deletion occurs inside a certain node
2009-08-06 12:53:05 +0200 od  r274717 : #i92125# method <MarkManager::deleteMarks(..)
- no move of position for cross-reference bookmark, if move occurs inside certain node.
2009-08-06 12:50:27 +0200 od  r274716 : #i92125# method <SwUndoSaveCntnt::DelCntntIndex(..)>
- keep cross-reference bookmarks, if deletion occurs inside a certain node.
2009-08-06 09:53:29 +0200 od  r274705 : #i103265# method <SwTOXPara::GetURL()>
- For outline and template entries create link to bookmark.
The bookmark of type CROSSREF_HEADING_BOOKMARK is created, if needed
2009-07-22 13:57:04 +0200 od  r274236 : #i73249# adjustment for export of svg:title and svg:description
2009-07-22 13:51:58 +0200 od  r274234 : #i73249# adjust and enhance import/export of svg:title and svg:description
for Writer's text frames, graphics and embedded objects
2009-07-21 10:26:27 +0200 od  r274168 : #i73249# implement support for attributes Title and Description for
text frames, graphics and embedded objects in Writer
- core, UNO-API, undo/redo and UI
2009-07-21 10:05:15 +0200 od  r274164 : #i73249# new optional properties Title and Description as basis frame properties in text documents
2009-07-13 12:19:54 +0200 od  r273928 : #i73249# Implementation of Undo/Redo of drawing object's name, title and description

9 files changed, 51 insertions, 11 deletions

diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 1fab6f1d15d4..6ae8e73cfb8d 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -1258,6 +1258,10 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
 #define FN_IID_COLRIGHT                 (FN_FRAME + 17)
 
 #define FN_SET_FRM_ALT_NAME             (FN_FRAME + 18)
+// --> OD 2009-07-13 #i73249#
+#define FN_UNO_TITLE                    (FN_FRAME + 19)
+#define FN_UNO_DESCRIPTION              (FN_FRAME + 20)
+// <--
 
 
 //Member-Ids fuer Fill/SetVariable an Items
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 9784f43dfe94..faa2d226b672 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1091,7 +1091,12 @@ public:
 
     sal_Bool SetFrmFmtToFly( SwFrmFmt& rFlyFmt, SwFrmFmt& rNewFmt,
                         SfxItemSet* pSet = 0, sal_Bool bKeepOrient = sal_False );
-
+    // --> OD 2009-07-20 #i73249#
+    void SetFlyFrmTitle( SwFlyFrmFmt& rFlyFrmFmt,
+                         const String& sNewTitle );
+    void SetFlyFrmDescription( SwFlyFrmFmt& rFlyFrmFmt,
+                               const String& sNewDescription );
+    // <--
 
     /** Footnotes
     */
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 83b0e5242a9e..a3c7b7489dd1 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -622,9 +622,9 @@ public:
                   const Graphic* pGraphic = 0,
                   const GraphicObject* pGrafObj = 0 );
 
-    // alternativen Text einer Grafik/OLe-Objectes abfragen/setzen
-    const String& GetAlternateText() const;
-    void SetAlternateText( const String& rTxt );
+//    // alternativen Text einer Grafik/OLe-Objectes abfragen/setzen
+//    const String& GetAlternateText() const;
+//    void SetAlternateText( const String& rTxt );
 
     //eindeutige Identifikation des Objektes (fuer ImageMapDlg)
     void    *GetIMapInventor() const;
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 8697ee2833d1..e75d4baec8d0 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -353,6 +353,13 @@ public:
     const Graphic *GetGrfAtPos( const Point &rDocPos,
                                 String &rName, BOOL &rbLink ) const;
 
+    // --> OD 2009-07-13 #i73249#
+    const String GetObjTitle() const;
+    void SetObjTitle( const String& rTitle );
+    const String GetObjDescription() const;
+    void SetObjDescription( const String& rDescription );
+    // <--
+
 //SS fuer Rahmen --------------------------------------------
 
     BOOL IsFrmSelected() const;
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index 608ac7ac7174..a86b1c6689a0 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -176,6 +176,15 @@ public:
 
     virtual BOOL GetInfo( SfxPoolItem& rInfo ) const;
 
+    // --> OD 2009-07-14 #i73249#
+    const String GetObjTitle() const;
+    void SetObjTitle( const String& rTitle,
+                      bool bBroadcast = false );
+    const String GetObjDescription() const;
+    void SetObjDescription( const String& rDescription,
+                            bool bBroadcast = false );
+    // <--
+
     /** SwFlyFrmFmt::IsBackgroundTransparent - for #99657#
 
         OD 22.08.2002 - overloading virtual method and its default implementation,
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index 9e847064eaaf..325638b5df00 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -337,7 +337,8 @@ RES_MSG_BEGIN = RES_FMT_END,
     RES_GRAPHIC_SWAPIN,
     RES_FIELD_DELETED,
     RES_NAME_CHANGED,
-    RES_ALT_TEXT_CHANGED,
+    RES_TITLE_CHANGED,
+    RES_DESCRIPTION_CHANGED,
     RES_UNOCURSOR_LEAVES_SECTION,
     RES_LINKED_GRAPHIC_STREAM_ARRIVED,
 RES_MSG_END
diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx
index 3ae3ae88c8b6..7150e1319c30 100644
--- a/sw/inc/ndnotxt.hxx
+++ b/sw/inc/ndnotxt.hxx
@@ -43,7 +43,7 @@ class SW_DLLPUBLIC SwNoTxtNode : public SwCntntNode
     friend class SwNodes;
     friend class SwNoTxtFrm;
 
-    String aAlternateText;      // alternativer Text  (HTML)
+//    String aAlternateText;      // alternativer Text  (HTML)
 
     PolyPolygon *pContour;      // Polygon fuer Konturumlauf
     BOOL bAutomaticContour : 1; // automatic contour polygon, not manipulated
@@ -75,9 +75,16 @@ public:
     virtual BOOL SavePersistentData();
     virtual BOOL RestorePersistentData();
 
-    // alternativen Text abfragen/setzen
-    const String& GetAlternateText() const      { return aAlternateText; }
-    void SetAlternateText( const String& rTxt, sal_Bool bBroadcast=sal_False );
+    const String GetTitle() const;
+    void SetTitle( const String& rTitle,
+                   bool bBroadcast = false );
+    const String GetDescription() const;
+    void SetDescription( const String& rDescription,
+                         bool bBroadcast = false );
+
+//    const String GetAlternateText() const;
+//    void SetAlternateText( const String& rTxt,
+//                           sal_Bool bBroadcast=sal_False );
 
     void               SetContour( const PolyPolygon *pPoly,
                                    BOOL bAutomatic = FALSE );
diff --git a/sw/inc/swundo.hxx b/sw/inc/swundo.hxx
index 3c5fdec1e739..ce997cc3f43d 100644
--- a/sw/inc/swundo.hxx
+++ b/sw/inc/swundo.hxx
@@ -156,7 +156,11 @@ enum SwUndoId
     UNDO_ROW_DELETE, // 109
     UNDO_RENAME_PAGEDESC, // 110
     UNDO_NUMDOWN, // 111
-    UNDO_STD_END= UNDO_NUMDOWN,
+    // --> OD 2009-07-16 #i73249#
+    UNDO_FLYFRMFMT_TITLE,           // 112
+    UNDO_FLYFRMFMT_DESCRIPTION,     // 113
+    // <--
+    UNDO_STD_END= UNDO_FLYFRMFMT_DESCRIPTION,
 
     // UI undo ID's...
     UNDO_UI_REPLACE             =  UNDO_STD_END + 1,
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx
index 16cb57764515..c9f4d1d01265 100644
--- a/sw/inc/unoprnms.hxx
+++ b/sw/inc/unoprnms.hxx
@@ -804,7 +804,10 @@ enum SwPropNameIds
 /* 0734 */  UNO_NAME_CHAR_OVERLINE_COLOR,
 /* 0735 */  UNO_NAME_CHAR_OVERLINE_HAS_COLOR,
 /* 0736 */  UNO_NAME_OUTLINE_LEVEL,  //#outline level,add<-zhaojianwei outlinelevel
-/* 0737 */  SW_PROPNAME_END
+// --> OD 2009-07-13 #i73249#
+/* 0737 */  UNO_NAME_DESCRIPTION,
+// <--
+/* 0738 */  SW_PROPNAME_END
 };