CWS-TOOLING: integrate CWS impress169

2009-05-13 17:37:21 +0200 sj  r271865 : #i100942# applied patch, removed oversafe buffer check (now without warnings on 64 bit platform)
2009-05-13 12:27:18 +0200 sj  r271855 : #i101769# fixed line/fill attributes for graphic objects
2009-05-12 10:25:17 +0200 cl  r271799 : report correct minimum cell hight for empty cells
2009-04-28 17:29:46 +0200 cl  r271334 : fixed merge error
2009-04-28 16:18:01 +0200 cl  r271330 : fixed build error
2009-04-28 12:38:09 +0200 cl  r271320 : #i100129# images for new layouts
2009-04-27 19:12:06 +0200 cl  r271302 : CWS-TOOLING: rebase CWS impress169 to trunk@270723 (milestone: DEV300:m46)
2009-04-20 19:13:28 +0200 sj  r271012 : #i100942# applied patch, removed oversafe buffer check
2009-04-09 18:00:01 +0200 sj  r270719 : #158488# added rectangular gradient support
2009-04-09 17:49:52 +0200 sj  r270718 : #158488# added rectangular gradient support
2009-04-09 17:46:24 +0200 sj  r270717 : #158488# added rectangular gradient support
2009-03-26 18:16:34 +0100 cl  r270098 : #i99867# applied patch from jlcheng to correctly register table design pane
2009-03-26 18:12:11 +0100 cl  r270097 : #i100220# leave some items default so they are not overridden if a new table style is set
2009-03-26 18:11:10 +0100 cl  r270096 : #i100220# clear only those items that are also in the style when assigning a new table layout
2009-03-26 15:56:24 +0100 cl  r270085 : #i99977# listen to outliner and dispose if outliner dies
2009-03-26 15:47:29 +0100 cl  r270084 : #i99977# made the Outliner a SfxBroadcaster so others can listen for its death
2009-03-24 19:10:05 +0100 sj  r269991 : #i100490# fixed text resize problem
2009-03-23 14:31:11 +0100 sj  r269872 : #i96083# added patch, (dubious && and ||)
2009-03-19 17:55:11 +0100 sj  r269764 : #i100275# applied patch, row height is now correct even for rows containing no text
2009-03-18 18:10:52 +0100 sj  r269701 : #i93616# solved performance problem when loading document
2009-03-18 16:20:40 +0100 sj  r269688 : removing unused code
2009-03-18 16:19:22 +0100 sj  r269687 : removing unused code
2009-03-18 16:17:54 +0100 sj  r269686 : removing unused code
2009-03-18 10:28:07 +0100 cl  r269643 : #i100029# let cells be disposed as soon as the table model is disposed
2009-03-17 15:56:50 +0100 cl  r269614 : #i99984# new impress photo layouts 3x2 and 2x2
2009-03-17 15:36:35 +0100 cl  r269611 : #i99984# adding new impress photo layouts 3x2 and 2x2
2009-03-16 18:43:48 +0100 cl  r269564 : #i55224# correct internal links if pages are changed
2009-03-16 16:40:38 +0100 cl  r269559 : #i55224# correct internal hyperlinks if slides are changed/renamed
2009-03-16 15:34:12 +0100 cl  r269553 : #i99427# invalidate slots after promote/demote
2009-03-13 18:18:20 +0100 sj  r269492 : #i92421# fixed loop if loading encrypted ppt file
2009-03-13 14:51:58 +0100 sj  r269481 : #i93002# fixed crash if saving presentation without master title placeholder
2009-03-13 12:26:21 +0100 sj  r269468 : #i100147# do not exceed the max point count if creating simple polygon via ::GetSimple
2009-03-12 17:00:45 +0100 sj  r269427 : #i82518# justifying rectangles for arc/pie and chord actions, fixed round rectangle problem

3 files changed, 12 insertions, 4 deletions

diff --git a/sd/inc/anminfo.hxx b/sd/inc/anminfo.hxx
index e48eee39569f..8acb207d8065 100644
--- a/sd/inc/anminfo.hxx
+++ b/sd/inc/anminfo.hxx
@@ -73,16 +73,19 @@ public:
     String                  maSecondSoundFile; // fuer Objekt ausblenden
     BOOL                    mbSecondSoundOn;    // fuer Objekt ausblenden
     BOOL                    mbSecondPlayFull;// fuer Objekt ausblenden
-    String                  maBookmark;     // Sprung zu Objekt/Seite
+//  String                  maBookmark;     // Sprung zu Objekt/Seite
     USHORT                  mnVerb;         // fuer OLE-Objekt
     ULONG                   mnPresOrder;
+    SdrObject&              mrObject;
 
+    void                    SetBookmark( const String& rBookmark );
+    String                  GetBookmark();
 public:
-                            SdAnimationInfo();
-                            SdAnimationInfo(const SdAnimationInfo& rAnmInfo);
+                            SdAnimationInfo(SdrObject& rObject);
+                            SdAnimationInfo(const SdAnimationInfo& rAnmInfo, SdrObject& rObject);
     virtual                 ~SdAnimationInfo();
 
-    virtual SdrObjUserData* Clone(SdrObject* pObj) const;
+    virtual SdrObjUserData* Clone(SdrObject* pObject) const;
 };
 
 #endif // _SD_ANMINFO_HXX
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 8117e4d55ef3..8ef84f263d98 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -205,6 +205,7 @@ private:
     ::std::auto_ptr<ImpMasterPageListWatcher> mpMasterPageListWatcher;
 
     void                UpdatePageObjectsInNotes(USHORT nStartPos);
+    void                UpdatePageRelativeURLs(SdPage* pPage, USHORT nPos, sal_Int32 nIncrement);
     void                FillOnlineSpellingList(SdPage* pPage);
     void                SpellObject(SdrTextObj* pObj);
 
@@ -588,6 +589,8 @@ public:
     /* converts the given western font height to a corresponding ctl font height, deppending on the system language */
     static sal_uInt32 convertFontHeightToCTL( sal_uInt32 nWesternFontHeight );
 
+       void UpdatePageRelativeURLs(const String& rOldName, const String& rNewName);
+
 private:
     /** This member stores the printer independent layout mode.  Please
         refer to <member>SetPrinterIndependentLayout()</member> for its
diff --git a/sd/inc/pres.hxx b/sd/inc/pres.hxx
index 2e5171a4b14d..bd1d5015e5f4 100644
--- a/sd/inc/pres.hxx
+++ b/sd/inc/pres.hxx
@@ -90,6 +90,8 @@ enum AutoLayout
     AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART,
     AUTOLAYOUT_HANDOUT9,
     AUTOLAYOUT_ONLY_TEXT,
+    AUTOLAYOUT_4CLIPART,
+    AUTOLAYOUT_6CLIPART,
     AUTOLAYOUT__END
 };