openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stev...@apache.org
Subject svn commit: r1484083 [11/17] - in /openoffice/branches/ia2: ./ ext_libraries/apr/prj/ ext_libraries/coinmp/prj/ ext_libraries/ratscan/prj/ ext_libraries/serf/prj/ main/ main/avmedia/source/quicktime/ main/bridges/prj/ main/bridges/source/cpp_uno/cxx_ma...
Date Sat, 18 May 2013 10:12:56 GMT
Modified: openoffice/branches/ia2/main/svx/inc/GalleryControl.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/inc/GalleryControl.hxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/inc/GalleryControl.hxx (original)
+++ openoffice/branches/ia2/main/svx/inc/GalleryControl.hxx Sat May 18 10:12:43 2013
@@ -67,12 +67,6 @@ private:
 
 protected:
 	void ThemeSelectionHasChanged (void);
-							
-	INetURLObject GetURL (void) const;
-	String GetFilterName (void) const;
-	Graphic GetGraphic (void) const;
-	sal_Bool GetVCDrawModel (FmFormModel& rModel) const;
-	sal_Bool IsLinkage (void) const;
 };
 
 } } // end of namespace svx::sidebar

Modified: openoffice/branches/ia2/main/svx/inc/galbrws2.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/inc/galbrws2.hxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/inc/galbrws2.hxx (original)
+++ openoffice/branches/ia2/main/svx/inc/galbrws2.hxx Sat May 18 10:12:43 2013
@@ -34,6 +34,9 @@
 #include <svtools/miscopt.hxx>
 #include "svx/galbrws.hxx"
 
+#include <com/sun/star/frame/XDispatch.hpp>
+#include <com/sun/star/util/XURLTransformer.hpp>
+
 // ----------------------
 // - GalleryBrowserMode -
 // ----------------------
@@ -94,6 +97,7 @@ class GalleryListView;
 class GalleryPreview;
 class Menu;
 class SgaObject;
+struct DispatchInfo;
 
 namespace svx { namespace sidebar { class GalleryControl; } }
 
@@ -119,7 +123,9 @@ private:
 	sal_uIntPtr				mnCurActionPos;
     GalleryBrowserMode  meMode;
     GalleryBrowserMode  meLastMode;
-	sal_Bool				mbCurActionIsLinkage;
+
+    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext;
+    com::sun::star::uno::Reference< com::sun::star::util::XURLTransformer > m_xTransformer;
 
     void                InitSettings();
 
@@ -127,7 +133,6 @@ private:
 	void				ImplUpdateInfoBar();
     sal_uIntPtr               ImplGetSelectedItemId( const Point* pSelPosPixel, Point& rSelPos );
     void                ImplSelectItemId( sal_uIntPtr nItemId );
-    void                ImplExecute( sal_uInt16 nId );
 
 	// Control
 	virtual void		Resize();
@@ -136,7 +141,6 @@ private:
 	// SfxListener
 	virtual void		Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 
-						DECL_LINK( MenuSelectHdl, Menu* pMenu );
 						DECL_LINK( SelectObjectHdl, void* );
 						DECL_LINK( SelectTbxHdl, ToolBox* );
 						DECL_LINK( MiscHdl, void* );
@@ -167,14 +171,24 @@ public:
 	String				GetFilterName() const;
 	Graphic				GetGraphic() const;
 	sal_Bool				GetVCDrawModel( FmFormModel& rModel ) const;
-	sal_Bool				IsLinkage() const;
 
 	sal_Int8			AcceptDrop( DropTargetHelper& rTarget, const AcceptDropEvent& rEvt );
 	sal_Int8			ExecuteDrop( DropTargetHelper& rTarget, const ExecuteDropEvent& rEvt );
     void                StartDrag( Window* pWindow, const Point* pDragPoint = NULL );
     void                TogglePreview( Window* pWindow, const Point* pPreviewPoint = NULL );
     void                ShowContextMenu( Window* pWindow, const Point* pContextPoint = NULL );
-    sal_Bool                KeyInput( const KeyEvent& rEvt, Window* pWindow );
+    sal_Bool            KeyInput( const KeyEvent& rEvt, Window* pWindow );
+
+    com::sun::star::uno::Reference< com::sun::star::frame::XFrame > GetFrame() const;
+    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > GetUNOContext() const { return m_xContext; }
+    com::sun::star::uno::Reference< com::sun::star::util::XURLTransformer > GetURLTransformer() const { return m_xTransformer; }
+
+    void Execute( sal_uInt16 nId );
+    void Dispatch( sal_uInt16 nId,
+                   const com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > &rxDispatch = com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >(),
+                   const com::sun::star::util::URL &rURL = com::sun::star::util::URL() );
+
+    DECL_STATIC_LINK( GalleryBrowser2, AsyncDispatch_Impl, DispatchInfo* );
 };
 
 #endif

Modified: openoffice/branches/ia2/main/svx/inc/galobj.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/inc/galobj.hxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/inc/galobj.hxx (original)
+++ openoffice/branches/ia2/main/svx/inc/galobj.hxx Sat May 18 10:12:43 2013
@@ -88,7 +88,6 @@ protected:
 	sal_Bool					CreateThumb( const Graphic& rGraphic );
 
 public:
-
 							SgaObject();
 	virtual					~SgaObject() {};
 
@@ -106,6 +105,8 @@ public:
 
 	friend SvStream& 		operator<<( SvStream& rOut, const SgaObject& rObj );
 	friend SvStream& 		operator>>( SvStream& rIn, SgaObject& rObj );
+
+    BitmapEx createPreviewBitmapEx(const Size& rSizePixel) const;
 };
 
 // ------------------

Modified: openoffice/branches/ia2/main/svx/inc/helpid.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/inc/helpid.hrc?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/inc/helpid.hrc (original)
+++ openoffice/branches/ia2/main/svx/inc/helpid.hrc Sat May 18 10:12:43 2013
@@ -368,6 +368,9 @@
 #define HID_PROPERTYPANEL_POSIZE_SECTION "SVX_HID_PROPERTYPANEL_POSIZE_SECTION"
 #define HID_PROPERTYPANEL_GRAPHIC_SECTION "SVX_HID_PROPERTYPANEL_GRAPHIC_SECTION"
 
+// Insert panel
+#define HID_SIDEBAR_INSERT_PANEL "HID_SIDEBAR_INSERT_PANEL"
+#define HID_SIDEBAR_INSERT_TOOLBOX "HID_SIDEBAR_INSERT_TOOLBOX"
 
 #define HID_PPROPERTYPANEL_PARA_TBX_NUM_BULLET "SVX_HID_PPROPERTYPANEL_PARA_TBX_NUM_BULLET"
 #define HID_PPROPERTYPANEL_PARA_TBI_NUM "SVX_HID_PPROPERTYPANEL_PARA_TBI_NUM"

Modified: openoffice/branches/ia2/main/svx/inc/svx/SvxColorValueSet.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/inc/svx/SvxColorValueSet.hxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/inc/svx/SvxColorValueSet.hxx (original)
+++ openoffice/branches/ia2/main/svx/inc/svx/SvxColorValueSet.hxx Sat May 18 10:12:43 2013
@@ -24,12 +24,12 @@
 
 #include <svtools/valueset.hxx>
 #include "svx/svxdllapi.h"
+#include <boost/shared_ptr.hpp>
 
 //////////////////////////////////////////////////////////////////////////////
 
 class XColorList;
-
-//////////////////////////////////////////////////////////////////////////////
+typedef ::boost::shared_ptr< XColorList > XColorListSharedPtr;
 
 class SVX_DLLPUBLIC SvxColorValueSet : public ValueSet
 {
@@ -43,7 +43,7 @@ public:
     sal_uInt32 getEntryEdgeLength() const;
     sal_uInt32 getColumnCount() const;
 
-    void addEntriesForXColorList(const XColorList& rXColorList, sal_uInt32 nStartIndex = 1);
+    void addEntriesForXColorList(const XColorListSharedPtr aXColorList, sal_uInt32 nStartIndex = 1);
     Size layoutAllVisible(sal_uInt32 nEntryCount);
     Size layoutToGivenHeight(sal_uInt32 nHeight, sal_uInt32 nEntryCount);
 };

Modified: openoffice/branches/ia2/main/svx/inc/svx/bmpmask.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/inc/svx/bmpmask.hxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/inc/svx/bmpmask.hxx (original)
+++ openoffice/branches/ia2/main/svx/inc/svx/bmpmask.hxx Sat May 18 10:12:43 2013
@@ -119,7 +119,7 @@ class SVX_DLLPUBLIC SvxBmpMask : public 
 	CheckBox			aCbxTrans;
 	ColorLB				aLbColorTrans;
 
-	const XColorList* 	pColTab;
+	XColorListSharedPtr maColTab;
 	Color				aPipetteColor;
 	SvxBmpMaskSelectItem aSelItem;
 
@@ -161,7 +161,7 @@ public:
 	void				PipetteClicked();
 
 	sal_Bool				NeedsColorTable() const;
-	void 				SetColorTable( const XColorList* pColorTable );
+	void 				SetColorTable( XColorListSharedPtr aColorTable );
 
 	void				SetExecState( sal_Bool bEnable );
 

Modified: openoffice/branches/ia2/main/svx/inc/svx/colrctrl.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/inc/svx/colrctrl.hxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/inc/svx/colrctrl.hxx (original)
+++ openoffice/branches/ia2/main/svx/inc/svx/colrctrl.hxx Sat May 18 10:12:43 2013
@@ -30,7 +30,6 @@
 #include <svl/lstner.hxx>
 #include "svx/svxdllapi.h"
 
-class XColorList;
 class SvData;
 
 /*************************************************************************
@@ -79,7 +78,7 @@ class SvxColorDockingWindow : public Sfx
  friend class SvxColorChildWindow;
 
 private:
-	XColorList*		pColorTable;
+	XColorListSharedPtr         maColorTable;
 	SvxColorValueSet_docking	aColorSet;
 	sal_uInt16				nLeftSlot;
 	sal_uInt16				nRightSlot;

Modified: openoffice/branches/ia2/main/svx/inc/svx/dialogs.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/inc/svx/dialogs.hrc?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/inc/svx/dialogs.hrc (original)
+++ openoffice/branches/ia2/main/svx/inc/svx/dialogs.hrc Sat May 18 10:12:43 2013
@@ -31,7 +31,7 @@
 // Resource-Id's ------------------------------------------------------------
 
 // !!! IMPORTANT: consider and update FIRSTFREE when introducing new RIDs !!! (not for RIDs for Strings - they have there own)
-#define RID_SVX_FIRSTFREE                   324
+#define RID_SVX_FIRSTFREE                   325
 
 // some strings also used in CUI
 #define RID_SVXERRCTX                       (RID_SVX_START + 351)
@@ -376,6 +376,8 @@
 #define RID_POPUPPANEL_PARAPAGE_NUMBERING   (RID_SVX_START + 322)
 #define RID_POPUPPANEL_PARAPAGE_BACK_COLOR  (RID_SVX_START + 323)
 
+#define RID_SIDEBAR_INSERT_PANEL            (RID_SVX_START + 324)
+
 // !!! IMPORTANT: consider and update RID_SVX_FIRSTFREE when introducing new RIDs !!! (see above)
 
 
@@ -461,24 +463,21 @@
 #define RID_SVXSTR_CLOSE                    (RID_SVX_START + 260)
 
 // Farben-Strings
-#define RID_SVXSTR_BLACK                    (RID_SVX_START + 275)
-#define RID_SVXSTR_BLUE                     (RID_SVX_START + 276)
-#define RID_SVXSTR_GREEN                    (RID_SVX_START + 277)
-#define RID_SVXSTR_CYAN                     (RID_SVX_START + 278)
-#define RID_SVXSTR_RED                      (RID_SVX_START + 279)
-#define RID_SVXSTR_MAGENTA                  (RID_SVX_START + 280)
-#define RID_SVXSTR_BROWN                    (RID_SVX_START + 281)
-#define RID_SVXSTR_GREY                     (RID_SVX_START + 282)
-#define RID_SVXSTR_LIGHTGREY                (RID_SVX_START + 283)
-#define RID_SVXSTR_LIGHTBLUE                (RID_SVX_START + 284)
-#define RID_SVXSTR_LIGHTGREEN               (RID_SVX_START + 285)
-#define RID_SVXSTR_LIGHTCYAN                (RID_SVX_START + 286)
-#define RID_SVXSTR_LIGHTRED                 (RID_SVX_START + 287)
-#define RID_SVXSTR_LIGHTMAGENTA             (RID_SVX_START + 288)
-#define RID_SVXSTR_YELLOW                   (RID_SVX_START + 289)
-#define RID_SVXSTR_WHITE                    (RID_SVX_START + 290)
-#define RID_SVXSTR_BLUEGREY                 (RID_SVX_START + 291)
-#define RID_SVXSTR_ORANGE                   (RID_SVX_START + 292)
+#define RID_SVXSTR_COLOR_BLACK              (RID_SVX_START + 275)
+#define RID_SVXSTR_COLOR_BLUE               (RID_SVX_START + 276)
+#define RID_SVXSTR_COLOR_GREEN              (RID_SVX_START + 277)
+#define RID_SVXSTR_COLOR_CYAN               (RID_SVX_START + 278)
+#define RID_SVXSTR_COLOR_RED                (RID_SVX_START + 279)
+#define RID_SVXSTR_COLOR_MAGENTA            (RID_SVX_START + 280)
+#define RID_SVXSTR_COLOR_GREY               (RID_SVX_START + 282)
+#define RID_SVXSTR_COLOR_YELLOW             (RID_SVX_START + 289)
+#define RID_SVXSTR_COLOR_WHITE              (RID_SVX_START + 290)
+#define RID_SVXSTR_COLOR_BLUEGREY           (RID_SVX_START + 291)
+#define RID_SVXSTR_COLOR_ORANGE             (RID_SVX_START + 292)
+#define RID_SVXSTR_COLOR_TURQUOISE          (RID_SVX_START + 293)
+#define RID_SVXSTR_COLOR_TURQUOISE_DEF      (RID_SVX_START + 294)
+#define RID_SVXSTR_COLOR_BLUE_CLASSIC       (RID_SVX_START + 295)
+#define RID_SVXSTR_COLOR_BLUE_CLASSIC_DEF   (RID_SVX_START + 296)
 
 // Linienenden-Strings
 #define RID_SVXSTR_ARROW                    (RID_SVX_START + 300)
@@ -588,14 +587,13 @@
 #define RID_SVXSTR_BACKGROUND    			(RID_SVX_START + 531)
 
 // BM: some additional standard colors
-#define RID_SVXSTR_VIOLET					(RID_SVX_START + 540)
-#define RID_SVXSTR_BORDEAUX					(RID_SVX_START + 541)
-#define RID_SVXSTR_PALE_YELLOW				(RID_SVX_START + 542)
-#define RID_SVXSTR_PALE_GREEN				(RID_SVX_START + 543)
-#define RID_SVXSTR_DKVIOLET					(RID_SVX_START + 544)
-#define RID_SVXSTR_SALMON					(RID_SVX_START + 545)
-#define RID_SVXSTR_SEABLUE					(RID_SVX_START + 546)
-#define RID_SVXSTR_COLOR_SUN				(RID_SVX_START + 547)
+#define RID_SVXSTR_COLOR_VIOLET				(RID_SVX_START + 540)
+#define RID_SVXSTR_COLOR_BORDEAUX			(RID_SVX_START + 541)
+#define RID_SVXSTR_COLOR_PALE_YELLOW		(RID_SVX_START + 542)
+#define RID_SVXSTR_COLOR_PALE_GREEN			(RID_SVX_START + 543)
+#define RID_SVXSTR_COLOR_DARKVIOLET			(RID_SVX_START + 544)
+#define RID_SVXSTR_COLOR_SALMON				(RID_SVX_START + 545)
+#define RID_SVXSTR_COLOR_SEABLUE			(RID_SVX_START + 546)
 
 // JP: string resource ids for table-autoformat-names, used in SW/SC
 // !!! Urgent: the order of Ids is persistent. New Ids have to append !!!
@@ -631,34 +629,35 @@
 #define RID_SVXSTR_LINEJOINT_ROUND			(RID_SVX_START + 592 )
 
 // Default-Color-Names
-#define RID_SVXSTR_BLACK_DEF                (RID_SVX_START + 595)
-#define RID_SVXSTR_BLUE_DEF                 (RID_SVX_START + 596)
-#define RID_SVXSTR_GREEN_DEF                (RID_SVX_START + 597)
-#define RID_SVXSTR_CYAN_DEF                 (RID_SVX_START + 598)
-#define RID_SVXSTR_RED_DEF                  (RID_SVX_START + 599)
-#define RID_SVXSTR_MAGENTA_DEF              (RID_SVX_START + 600)
-#define RID_SVXSTR_BROWN_DEF                (RID_SVX_START + 601)
-#define RID_SVXSTR_GREY_DEF                 (RID_SVX_START + 602)
-#define RID_SVXSTR_LIGHTGREY_DEF            (RID_SVX_START + 603)
-#define RID_SVXSTR_LIGHTBLUE_DEF            (RID_SVX_START + 604)
-#define RID_SVXSTR_LIGHTGREEN_DEF           (RID_SVX_START + 605)
-#define RID_SVXSTR_LIGHTCYAN_DEF            (RID_SVX_START + 606)
-#define RID_SVXSTR_LIGHTRED_DEF             (RID_SVX_START + 607)
-#define RID_SVXSTR_LIGHTMAGENTA_DEF         (RID_SVX_START + 608)
-#define RID_SVXSTR_YELLOW_DEF               (RID_SVX_START + 609)
-#define RID_SVXSTR_WHITE_DEF                (RID_SVX_START + 610)
-#define RID_SVXSTR_BLUEGREY_DEF             (RID_SVX_START + 611)
-#define RID_SVXSTR_ORANGE_DEF               (RID_SVX_START + 612)
-#define RID_SVXSTR_VIOLET_DEF				(RID_SVX_START + 613)
-#define RID_SVXSTR_BORDEAUX_DEF				(RID_SVX_START + 614)
-#define RID_SVXSTR_PALE_YELLOW_DEF			(RID_SVX_START + 615)
-#define RID_SVXSTR_PALE_GREEN_DEF			(RID_SVX_START + 616)
-#define RID_SVXSTR_DKVIOLET_DEF				(RID_SVX_START + 617)
-#define RID_SVXSTR_SALMON_DEF				(RID_SVX_START + 618)
-#define RID_SVXSTR_SEABLUE_DEF				(RID_SVX_START + 619)
+#define RID_SVXSTR_COLOR_BLACK_DEF          (RID_SVX_START + 595)
+#define RID_SVXSTR_COLOR_BLUE_DEF           (RID_SVX_START + 596)
+#define RID_SVXSTR_COLOR_GREEN_DEF          (RID_SVX_START + 597)
+#define RID_SVXSTR_COLOR_CYAN_DEF           (RID_SVX_START + 598)
+#define RID_SVXSTR_COLOR_RED_DEF            (RID_SVX_START + 599)
+#define RID_SVXSTR_COLOR_MAGENTA_DEF        (RID_SVX_START + 600)
+#define RID_SVXSTR_COLOR_GREY_DEF           (RID_SVX_START + 602)
+#define RID_SVXSTR_COLOR_YELLOW_DEF         (RID_SVX_START + 609)
+#define RID_SVXSTR_COLOR_WHITE_DEF          (RID_SVX_START + 610)
+#define RID_SVXSTR_COLOR_BLUEGREY_DEF       (RID_SVX_START + 611)
+#define RID_SVXSTR_COLOR_ORANGE_DEF         (RID_SVX_START + 612)
+#define RID_SVXSTR_COLOR_VIOLET_DEF			(RID_SVX_START + 613)
+#define RID_SVXSTR_COLOR_BORDEAUX_DEF		(RID_SVX_START + 614)
+#define RID_SVXSTR_COLOR_PALE_YELLOW_DEF	(RID_SVX_START + 615)
+#define RID_SVXSTR_COLOR_PALE_GREEN_DEF		(RID_SVX_START + 616)
+#define RID_SVXSTR_COLOR_DARKVIOLET_DEF		(RID_SVX_START + 617)
+#define RID_SVXSTR_COLOR_SALMON_DEF			(RID_SVX_START + 618)
+#define RID_SVXSTR_COLOR_SEABLUE_DEF		(RID_SVX_START + 619)
 #define RID_SVXSTR_COLOR_SUN_DEF			(RID_SVX_START + 620)
 #define RID_SVXSTR_COLOR_CHART				(RID_SVX_START + 621)
 #define RID_SVXSTR_COLOR_CHART_DEF			(RID_SVX_START + 622)
+#define RID_SVXSTR_COLOR_PURPLE             (RID_SVX_START + 623)
+#define RID_SVXSTR_COLOR_PURPLE_DEF         (RID_SVX_START + 624)
+#define RID_SVXSTR_COLOR_SKYBLUE            (RID_SVX_START + 625)
+#define RID_SVXSTR_COLOR_SKYBLUE_DEF        (RID_SVX_START + 626)
+#define RID_SVXSTR_COLOR_YELLOWGREEN        (RID_SVX_START + 627)
+#define RID_SVXSTR_COLOR_YELLOWGREEN_DEF    (RID_SVX_START + 628)
+#define RID_SVXSTR_COLOR_PINK               (RID_SVX_START + 629)
+#define RID_SVXSTR_COLOR_PINK_DEF           (RID_SVX_START + 630)
 
 // Default-Gradient-Names
 #define RID_SVXSTR_GRDT0_DEF				(RID_SVX_START + 631)

Modified: openoffice/branches/ia2/main/svx/inc/svx/dlgctrl.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/inc/svx/dlgctrl.hxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/inc/svx/dlgctrl.hxx (original)
+++ openoffice/branches/ia2/main/svx/inc/svx/dlgctrl.hxx Sat May 18 10:12:43 2013
@@ -33,20 +33,14 @@
 
 #ifndef _XTABLE_HXX
 class XBitmapEntry;
-class XBitmapList;
 class XColorEntry;
-class XColorList;
 class XDash;
 class XDashEntry;
-class XDashList;
 class XGradient;
 class XGradientEntry;
-class XGradientList;
 class XHatch;
 class XHatchEntry;
-class XHatchList;
 class XLineEndEntry;
-class XLineEndList;
 class XFillAttrSetItem;
 #endif
 
@@ -277,6 +271,10 @@ public:
 |* ColorLB kann mit Farben und Namen gefuellt werden
 |*
 \************************************************************************/
+
+class XColorList;
+typedef ::boost::shared_ptr< XColorList > XColorListSharedPtr;
+
 class SVX_DLLPUBLIC ColorLB : public ColorListBox
 {
 
@@ -284,10 +282,10 @@ public:
 		 ColorLB( Window* pParent, ResId Id ) : ColorListBox( pParent, Id ) {}
 		 ColorLB( Window* pParent, WinBits aWB ) : ColorListBox( pParent, aWB ) {}
 
-	virtual void Fill( const XColorList* pTab );
+	virtual void Fill( const XColorListSharedPtr aTab );
 
-	void Append( XColorEntry* pEntry, Bitmap* pBmp = NULL );
-	void Modify( XColorEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL );
+	void Append( const XColorEntry& rEntry );
+	void Modify( const XColorEntry& rEntry, sal_uInt16 nPos );
 };
 
 /*************************************************************************
@@ -295,21 +293,21 @@ public:
 |* HatchingLB
 |*
 \************************************************************************/
+
+class XHatchList;
+typedef ::boost::shared_ptr< XHatchList > XHatchListSharedPtr;
+
 class SVX_DLLPUBLIC HatchingLB : public ListBox
 {
-
 public:
 	 explicit HatchingLB( Window* pParent, ResId Id);
 	 explicit HatchingLB( Window* pParent, WinBits aWB);
 
-	virtual void Fill( const XHatchList* pList );
-
-	void	Append( XHatchEntry* pEntry, Bitmap* pBmp = NULL );
-	void	Modify( XHatchEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL );
-	void	SelectEntryByList( const XHatchList* pList, const String& rStr, const XHatch& rXHatch, sal_uInt16 nDist = 0 );
+	virtual void Fill( const XHatchListSharedPtr aList );
 
-private:
-	XHatchList*		mpList;
+	void	Append( const XHatchEntry& rEntry, const Bitmap& rBitmap );
+	void	Modify( const XHatchEntry& rEntry, sal_uInt16 nPos, const Bitmap& rBitmap );
+	void	SelectEntryByList( const XHatchListSharedPtr aList, const String& rStr, const XHatch& rXHatch, sal_uInt16 nDist = 0 );
 };
 
 /*************************************************************************
@@ -317,20 +315,24 @@ private:
 |* GradientLB
 |*
 \************************************************************************/
+
+class XGradientList;
+typedef ::boost::shared_ptr< XGradientList > XGradientListSharedPtr;
+
 class SVX_DLLPUBLIC GradientLB : public ListBox
 {
 public:
 	explicit GradientLB( Window* pParent, ResId Id);
 	explicit GradientLB( Window* pParent, WinBits aWB);
 
-	virtual void Fill( const XGradientList* pList );
+	virtual void Fill( const XGradientListSharedPtr aList );
 
-	void	Append( XGradientEntry* pEntry, Bitmap* pBmp = NULL );
-	void	Modify( XGradientEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL );
-	void	SelectEntryByList( const XGradientList* pList, const String& rStr, const XGradient& rXGradient, sal_uInt16 nDist = 0 );
+	void	Append( const XGradientEntry& rEntry, const Bitmap& rBitmap );
+	void	Modify( const XGradientEntry& rEntry, sal_uInt16 nPos, const Bitmap& rBitmap );
+	void	SelectEntryByList( const XGradientListSharedPtr aList, const String& rStr, const XGradient& rXGradient, sal_uInt16 nDist = 0 );
 
 private:
-	XGradientList* mpList;
+	XGradientListSharedPtr maList;
 };
 
 /*************************************************************************
@@ -338,21 +340,23 @@ private:
 |* BitmapLB
 |*
 \************************************************************************/
+
+class XBitmapList;
+typedef ::boost::shared_ptr< XBitmapList > XBitmapListSharedPtr;
+
 class SVX_DLLPUBLIC BitmapLB : public ListBox
 {
 public:
     explicit BitmapLB(Window* pParent, ResId Id);
 
-	virtual void Fill(const XBitmapList* pList);
+	virtual void Fill(const XBitmapListSharedPtr aList);
 
-	void Append(const Size& rSize, const XBitmapEntry& rEntry, BitmapEx* pBmpEx = 0);
-	void Modify(const Size& rSize, const XBitmapEntry& rEntry, sal_uInt16 nPos, BitmapEx* pBmpEx = 0);
-	void SelectEntryByList(const XBitmapList* pList, const String& rStr);
+	void Append(const Size& rSize, const XBitmapEntry& rEntry);
+	void Modify(const Size& rSize, const XBitmapEntry& rEntry, sal_uInt16 nPos);
+	void SelectEntryByList(const XBitmapListSharedPtr aList, const String& rStr);
 
 private:
 	BitmapEx        maBitmapEx;
-
-	XBitmapList*	mpList;
 };
 
 /*************************************************************************
@@ -369,12 +373,12 @@ public:
     FillAttrLB( Window* pParent, ResId Id );
     FillAttrLB( Window* pParent, WinBits aWB );
 
-	virtual void Fill( const XColorList* pTab );
-	virtual void Fill( const XHatchList* pList );
-	virtual void Fill( const XGradientList* pList );
-	virtual void Fill( const XBitmapList* pList );
+	virtual void Fill( const XColorListSharedPtr aTab );
+	virtual void Fill( const XHatchListSharedPtr aList );
+	virtual void Fill( const XGradientListSharedPtr aList );
+	virtual void Fill( const XBitmapListSharedPtr aList );
 
-	void SelectEntryByList(const XBitmapList* pList, const String& rStr);
+	void SelectEntryByList(const XBitmapListSharedPtr aList, const String& rStr);
 };
 
 /*************************************************************************
@@ -397,6 +401,10 @@ public:
 |* LineLB
 |*
 \************************************************************************/
+
+class XDashList;
+typedef ::boost::shared_ptr< XDashList > XDashListSharedPtr;
+
 class SVX_DLLPUBLIC LineLB : public ListBox
 {
 private:
@@ -409,14 +417,14 @@ public:
     LineLB(Window* pParent, WinBits aWB);
     virtual ~LineLB();
 
-    virtual void Fill(const XDashList* pList);
+    virtual void Fill(const XDashListSharedPtr aList);
 
     bool getAddStandardFields() const { return mbAddStandardFields; }
     void setAddStandardFields(bool bNew);
 
-    void Append(XDashEntry* pEntry, const Bitmap* pBmp = 0);
-    void Modify(XDashEntry* pEntry, sal_uInt16 nPos, const Bitmap* pBmp = 0);
-    void SelectEntryByList(const XDashList* pList, const String& rStr, const XDash& rDash, sal_uInt16 nDist = 0);
+    void Append(const XDashEntry& rEntry, const Bitmap& rBitmap );
+    void Modify(const XDashEntry& rEntry, sal_uInt16 nPos, const Bitmap& rBitmap );
+    void SelectEntryByList(const XDashListSharedPtr aList, const String& rStr, const XDash& rDash, sal_uInt16 nDist = 0);
 };
 
 /*************************************************************************
@@ -424,6 +432,10 @@ public:
 |* LineEndsLB
 |*
 \************************************************************************/
+
+class XLineEndList;
+typedef ::boost::shared_ptr< XLineEndList > XLineEndListSharedPtr;
+
 class SVX_DLLPUBLIC LineEndLB : public ListBox
 {
 
@@ -432,12 +444,10 @@ public:
                           LineEndLB( Window* pParent, WinBits aWB );
                  virtual ~LineEndLB (void);
                  
-	virtual void Fill( const XLineEndList* pList, sal_Bool bStart = sal_True );
+	virtual void Fill( const XLineEndListSharedPtr aList, bool bStart = true );
 
-	void	Append( XLineEndEntry* pEntry, const Bitmap* pBmp = NULL,
-					sal_Bool bStart = sal_True );
-	void	Modify( XLineEndEntry* pEntry, sal_uInt16 nPos, const Bitmap* pBmp = NULL,
-					sal_Bool bStart = sal_True );
+	void	Append( const XLineEndEntry& rEntry, const Bitmap& rBitmap, bool bStart = true );
+	void	Modify( const XLineEndEntry& rEntry, sal_uInt16 nPos, const Bitmap& rBitmap, bool bStart = true );
 };
 
 //////////////////////////////////////////////////////////////////////////////

Modified: openoffice/branches/ia2/main/svx/inc/svx/drawitem.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/inc/svx/drawitem.hxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/inc/svx/drawitem.hxx (original)
+++ openoffice/branches/ia2/main/svx/inc/svx/drawitem.hxx Sat May 18 10:12:43 2013
@@ -29,22 +29,23 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/drawing/LineDash.hpp>
 #include "svx/svxdllapi.h"
+#include <boost/shared_ptr.hpp>
 
 //==================================================================
 //	SvxColorTableItem
 //==================================================================
 
 class XColorList;
+typedef ::boost::shared_ptr< XColorList > XColorListSharedPtr;
 
-class SVX_DLLPUBLIC SvxColorTableItem: public SfxPoolItem
+class SVX_DLLPUBLIC SvxColorTableItem : public SfxPoolItem
 {
-	XColorList*			pColorTable;
+	XColorListSharedPtr     maColorTable;
 
 public:
 							TYPEINFO();
 							SvxColorTableItem();
-							SvxColorTableItem( XColorList* pTable,
-                                    sal_uInt16 nWhich  );
+							SvxColorTableItem( XColorListSharedPtr aTable, sal_uInt16 nWhich );
 							SvxColorTableItem( const SvxColorTableItem& );
 
 	virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -57,9 +58,8 @@ public:
 	virtual	sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
     virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId );
 
-	XColorList*			GetColorTable() const { return pColorTable; }
-	void			 		SetColorTable( XColorList* pTable ) {
-									pColorTable = pTable; }
+    XColorListSharedPtr GetColorTable() const { return maColorTable; }
+    void SetColorTable( XColorListSharedPtr aTable ) { maColorTable = aTable; }
 };
 
 
@@ -69,16 +69,16 @@ public:
 
 
 class XGradientList;
+typedef ::boost::shared_ptr< XGradientList > XGradientListSharedPtr;
 
-class SVX_DLLPUBLIC SvxGradientListItem: public SfxPoolItem
+class SVX_DLLPUBLIC SvxGradientListItem : public SfxPoolItem
 {
-	XGradientList*				pGradientList;
+	XGradientListSharedPtr  maGradientList;
 
 public:
 							TYPEINFO();
 							SvxGradientListItem();
-							SvxGradientListItem( XGradientList* pList,
-                                    sal_uInt16 nWhich  );
+							SvxGradientListItem( XGradientListSharedPtr aList, sal_uInt16 nWhich  );
 							SvxGradientListItem( const SvxGradientListItem& );
 
 	virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -91,9 +91,8 @@ public:
 	virtual	sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
     virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId );
 
-	XGradientList*			GetGradientList() const { return pGradientList; }
-	void			 		SetGradientList( XGradientList* pList ) {
-									pGradientList = pList; }
+    XGradientListSharedPtr GetGradientList() const { return maGradientList; }
+    void SetGradientList(XGradientListSharedPtr aList ) { maGradientList = aList; }
 };
 
 
@@ -104,16 +103,16 @@ public:
 
 
 class XHatchList;
+typedef ::boost::shared_ptr< XHatchList > XHatchListSharedPtr;
 
-class SVX_DLLPUBLIC SvxHatchListItem: public SfxPoolItem
+class SVX_DLLPUBLIC SvxHatchListItem : public SfxPoolItem
 {
-	XHatchList*				pHatchList;
+	XHatchListSharedPtr     maHatchList;
 
 public:
 							TYPEINFO();
 							SvxHatchListItem();
-							SvxHatchListItem( XHatchList* pList,
-                                    sal_uInt16 nWhich  );
+							SvxHatchListItem( XHatchListSharedPtr aList, sal_uInt16 nWhich  );
 							SvxHatchListItem( const SvxHatchListItem& );
 
 	virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -126,9 +125,8 @@ public:
 	virtual	sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
     virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId );
 
-	XHatchList*				GetHatchList() const { return pHatchList; }
-	void			 		SetHatchList( XHatchList* pList ) {
-									pHatchList = pList; }
+    XHatchListSharedPtr GetHatchList() const { return maHatchList; }
+    void SetHatchList(XHatchListSharedPtr aList ) { maHatchList = aList; }
 };
 
 
@@ -139,16 +137,16 @@ public:
 
 
 class XBitmapList;
+typedef ::boost::shared_ptr< XBitmapList > XBitmapListSharedPtr;
 
-class SVX_DLLPUBLIC SvxBitmapListItem: public SfxPoolItem
+class SVX_DLLPUBLIC SvxBitmapListItem : public SfxPoolItem
 {
-	XBitmapList*				pBitmapList;
+	XBitmapListSharedPtr    maBitmapList;
 
 public:
 							TYPEINFO();
 							SvxBitmapListItem();
-							SvxBitmapListItem( XBitmapList* pBL,
-                                    sal_uInt16 nWhich  );
+							SvxBitmapListItem( XBitmapListSharedPtr aBL, sal_uInt16 nWhich  );
 							SvxBitmapListItem( const SvxBitmapListItem& );
 
 	virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -161,9 +159,8 @@ public:
 	virtual	sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
     virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId );
 
-	XBitmapList*			GetBitmapList() const { return pBitmapList; }
-	void			 		SetBitmapList( XBitmapList* pList ) {
-									pBitmapList = pList; }
+    XBitmapListSharedPtr GetBitmapList() const { return maBitmapList; }
+    void SetBitmapList(XBitmapListSharedPtr aList ) { maBitmapList = aList; }
 };
 
 
@@ -174,16 +171,16 @@ public:
 
 
 class XDashList;
+typedef ::boost::shared_ptr< XDashList > XDashListSharedPtr;
 
-class SVX_DLLPUBLIC SvxDashListItem: public SfxPoolItem
+class SVX_DLLPUBLIC SvxDashListItem : public SfxPoolItem
 {
-	XDashList*				pDashList;
+	XDashListSharedPtr      maDashList;
 
 public:
 							TYPEINFO();
 							SvxDashListItem();
-							SvxDashListItem( XDashList* pList,
-                                    sal_uInt16 nWhich  );
+							SvxDashListItem( XDashListSharedPtr aList, sal_uInt16 nWhich  );
 							SvxDashListItem( const SvxDashListItem& );
 
 	virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -196,8 +193,8 @@ public:
 	virtual	sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
     virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId );
 
-	XDashList*	  			GetDashList() const { return pDashList; }
-	void			 		SetDashList( XDashList* pList );
+    XDashListSharedPtr GetDashList() const { return maDashList; }
+    void SetDashList(XDashListSharedPtr aList) { maDashList = aList; }
 };
 
 
@@ -208,16 +205,16 @@ public:
 
 
 class XLineEndList;
+typedef ::boost::shared_ptr< XLineEndList > XLineEndListSharedPtr;
 
-class SVX_DLLPUBLIC SvxLineEndListItem: public SfxPoolItem
+class SVX_DLLPUBLIC SvxLineEndListItem : public SfxPoolItem
 {
-	XLineEndList*	 		pLineEndList;
+	XLineEndListSharedPtr   maLineEndList;
 
 public:
 							TYPEINFO();
 							SvxLineEndListItem();
-							SvxLineEndListItem( XLineEndList* pList,
-                                    sal_uInt16 nWhich  );
+							SvxLineEndListItem( XLineEndListSharedPtr aList, sal_uInt16 nWhich  );
 							SvxLineEndListItem( const SvxLineEndListItem& );
 
 	virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -230,9 +227,8 @@ public:
 	virtual	sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
     virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId );
 
-	XLineEndList*			GetLineEndList() const { return pLineEndList; }
-	void			 		SetLineEndList( XLineEndList* pList ) {
-									pLineEndList = pList; }
+    XLineEndListSharedPtr GetLineEndList() const { return maLineEndList; }
+    void SetLineEndList(XLineEndListSharedPtr aList ) { maLineEndList = aList; }
 };
 
 

Modified: openoffice/branches/ia2/main/svx/inc/svx/fmmodel.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/inc/svx/fmmodel.hxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/inc/svx/fmmodel.hxx (original)
+++ openoffice/branches/ia2/main/svx/inc/svx/fmmodel.hxx Sat May 18 10:12:43 2013
@@ -54,12 +54,7 @@ public:
 	TYPEINFO();
 
     FmFormModel(SfxItemPool* pPool=NULL, SfxObjectShell* pPers=NULL );
-	FmFormModel(const XubString& rPath, SfxItemPool* pPool=NULL,
-                SfxObjectShell* pPers=NULL );
-    FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers, FASTBOOL bUseExtColorTable);
-    FmFormModel(const XubString& rPath, SfxItemPool* pPool, SfxObjectShell* pPers,
-				FASTBOOL bUseExtColorTable);
-
+	FmFormModel(const XubString& rPath, SfxItemPool* pPool=NULL, SfxObjectShell* pPers=NULL );
 	virtual ~FmFormModel();
 
 	virtual SdrPage* AllocPage(FASTBOOL bMasterPage);

Modified: openoffice/branches/ia2/main/svx/inc/svx/fontwork.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/inc/svx/fontwork.hxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/inc/svx/fontwork.hxx (original)
+++ openoffice/branches/ia2/main/svx/inc/svx/fontwork.hxx Sat May 18 10:12:43 2013
@@ -132,7 +132,7 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : 
 	ImageList		maImageList;
 	ImageList		maImageListH;
 
-	const XColorList* pColorTable;
+	XColorListSharedPtr   maColorTable;
 
 #ifdef _SVX_FONTWORK_CXX
  friend class SvxFontWorkChildWindow;
@@ -175,7 +175,7 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : 
 						const ResId& rResId );
 	~SvxFontWorkDialog();
 
-	void SetColorTable(const XColorList* pTable);
+	void SetColorTable(XColorListSharedPtr aTable);
 	void SetActive(sal_Bool bActivate = sal_True);
 };
 

Modified: openoffice/branches/ia2/main/svx/inc/svx/galbrws.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/inc/svx/galbrws.hxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/inc/svx/galbrws.hxx (original)
+++ openoffice/branches/ia2/main/svx/inc/svx/galbrws.hxx Sat May 18 10:12:43 2013
@@ -95,12 +95,6 @@ public:						
 											Window* pParent, const ResId& rResId );
 							~GalleryBrowser();
 
-	INetURLObject			GetURL() const;
-	String					GetFilterName() const;
-	Graphic					GetGraphic() const;
-	sal_Bool					GetVCDrawModel( FmFormModel& rModel ) const;
-	sal_Bool					IsLinkage() const;
-
     sal_Bool                    KeyInput( const KeyEvent& rKEvt, Window* pWindow );
 };
 

Modified: openoffice/branches/ia2/main/svx/inc/svx/gallery.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/inc/svx/gallery.hxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/inc/svx/gallery.hxx (original)
+++ openoffice/branches/ia2/main/svx/inc/svx/gallery.hxx Sat May 18 10:12:43 2013
@@ -34,16 +34,6 @@
 // - Defines -
 // -----------
 
-#define SGA_FORMAT_NONE		0x00000000L
-#define	SGA_FORMAT_STRING	0x00000001L
-#define	SGA_FORMAT_GRAPHIC	0x00000010L
-#define	SGA_FORMAT_SOUND	0x00000100L
-#define SGA_FORMAT_OLE          0x00001000L
-#define	SGA_FORMAT_SVDRAW	0x00010000L
-#define	SGA_FORMAT_ALL		0xFFFFFFFFL
-
-#define SVX_GALLERY() (GalleryExplorer::GetGallery())
-
 // Defines for preinstalled themes
 #define GALLERY_THEME_3D                1
 #define GALLERY_THEME_ANIMATIONS	2
@@ -101,22 +91,8 @@ class OutputDevice;
 
 class SVX_DLLPUBLIC GalleryExplorer
 {
-private:
-
-	SVX_DLLPRIVATE static Gallery*				ImplGetGallery();
-
 public:
 
-	static GalleryExplorer*		GetGallery();
-
-public:
-
-	INetURLObject				GetURL() const;
-	String						GetFilterName() const;
-	Graphic						GetGraphic() const;
-	sal_Bool						GetVCDrawModel( FmFormModel& rModel ) const;
-	sal_Bool						IsLinkage() const;
-
 	static sal_Bool					FillThemeList( List& rThemeList );
 
 								// FillObjList is filling rObjList with Strings of the internal Gallery Object URL
@@ -129,11 +105,6 @@ public:
 	static sal_Bool					InsertURL( const String& rThemeName, const String& rURL );
 	static sal_Bool					InsertURL( sal_uIntPtr nThemeId, const String& rURL );
 
-	static sal_Bool					InsertURL( const String& rThemeName, const String& rURL,
-										   const sal_uIntPtr nSgaFormat /* = SGA_FORMAT_ALL */ );
-	static sal_Bool					InsertURL( sal_uIntPtr nThemeId, const String& rURL,
-										   const sal_uIntPtr nSgaFormat /* = SGA_FORMAT_ALL */ );
-
 	static sal_uIntPtr				GetObjCount( const String& rThemeName );
 	static sal_uIntPtr				GetObjCount( sal_uIntPtr nThemeId );
 

Modified: openoffice/branches/ia2/main/svx/inc/svx/galtheme.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/inc/svx/galtheme.hxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/inc/svx/galtheme.hxx (original)
+++ openoffice/branches/ia2/main/svx/inc/svx/galtheme.hxx Sat May 18 10:12:43 2013
@@ -52,7 +52,13 @@ struct GalleryObject
 	INetURLObject	aURL;
 	sal_uInt32		nOffset;
 	SgaObjKind		eObjKind;
-	sal_Bool			bDummy;
+    bool            mbDelete;
+
+    //UI visualization buffering
+    BitmapEx        maPreviewBitmapEx;
+    Size            maPreparedSize;
+    String          maTitle;
+    String          maPath;
 };
 
 DECLARE_LIST( GalleryObjectList, GalleryObject* )
@@ -219,6 +225,10 @@ public:
 	SvStream&					WriteData( SvStream& rOut ) const;
 	SvStream&					ReadData( SvStream& rIn );
 	static SVX_DLLPUBLIC void	InsertAllThemes( ListBox& rListBox );
+
+    // for buffering PreviewBitmaps and strings for object and path
+    void GetPreviewBitmapExAndStrings(sal_uIntPtr nPos, BitmapEx& rBitmapEx, Size& rSize, String& rTitle, String& rPath) const;
+    void SetPreviewBitmapExAndStrings(sal_uIntPtr nPos, const BitmapEx& rBitmapEx, const Size& rSize, const String& rTitle, const String& rPath);
 };
 
 SvStream& operator<<( SvStream& rOut, const GalleryTheme& rTheme );

Modified: openoffice/branches/ia2/main/svx/inc/svx/linectrl.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/inc/svx/linectrl.hxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/inc/svx/linectrl.hxx (original)
+++ openoffice/branches/ia2/main/svx/inc/svx/linectrl.hxx Sat May 18 10:12:43 2013
@@ -35,6 +35,7 @@ class SvxLineBox;
 class SvxMetricField;
 class SvxColorBox;
 class XLineEndList;
+typedef ::boost::shared_ptr< XLineEndList > XLineEndListSharedPtr;
 
 //========================================================================
 // SvxLineStyleController:
@@ -103,7 +104,7 @@ class SvxLineEndWindow : public SfxPopup
 	using FloatingWindow::StateChanged;
 
 private:
-	XLineEndList*	pLineEndList;
+	XLineEndListSharedPtr   maLineEndList;
 	ValueSet		aLineEndSet;
 	sal_uInt16			nCols;
 	sal_uInt16			nLines;

Modified: openoffice/branches/ia2/main/svx/inc/svx/sidebar/SelectionAnalyzer.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/inc/svx/sidebar/SelectionAnalyzer.hxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/inc/svx/sidebar/SelectionAnalyzer.hxx (original)
+++ openoffice/branches/ia2/main/svx/inc/svx/sidebar/SelectionAnalyzer.hxx Sat May 18 10:12:43 2013
@@ -31,6 +31,11 @@ class SdrObject;
 
 namespace svx { namespace sidebar {
 
+/** Analyze the current selection of Calc or Draw/Impress documents
+    and return the associated sidebar context.
+
+    The decision is based on heuristics.  Do not expect pretty code.
+*/
 class SVX_DLLPUBLIC SelectionAnalyzer
 {
 public :

Modified: openoffice/branches/ia2/main/svx/inc/svx/svdmodel.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/inc/svx/svdmodel.hxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/inc/svx/svdmodel.hxx (original)
+++ openoffice/branches/ia2/main/svx/inc/svx/svdmodel.hxx Sat May 18 10:12:43 2013
@@ -35,19 +35,15 @@
 #include <tools/string.hxx>
 #include <tools/datetime.hxx>
 #include <svl/hint.hxx>
-
 #include <svl/style.hxx>
 #include <svx/pageitem.hxx>
 #include <vcl/field.hxx>
-
 #include <boost/shared_ptr.hpp>
-
-class OutputDevice;
 #include <svx/svdtypes.hxx> // fuer enum RepeatFuncts
 #include <vcl/field.hxx>
 #include "svx/svxdllapi.h"
-
 #include <vos/ref.hxx>
+#include <svx/xtable.hxx>
 
 #if defined(UNX) || defined(WNT)
 #define DEGREE_CHAR ((sal_Unicode)176)   /* 0xB0 = Ansi */
@@ -61,6 +57,7 @@ class OutputDevice;
 #error unbekannte Plattrorm
 #endif
 
+class OutputDevice;
 class SdrOutliner;
 class SdrLayerAdmin;
 class SdrObjList;
@@ -77,12 +74,6 @@ class SfxRepeatTarget;
 class SfxStyleSheet;
 class SfxUndoAction;
 class SfxUndoManager;
-class XBitmapList;
-class XColorList;
-class XDashList;
-class XGradientList;
-class XHatchList;
-class XLineEndList;
 class SvxForbiddenCharactersTable;
 class SvNumberFormatter;
 class SotStorage;
@@ -217,7 +208,6 @@ protected:
 	bool			mbUndoEnabled;	// If false no undo is recorded or we are during the execution of an undo action
 	sal_uInt16          nProgressPercent; // fuer den ProgressBar-Handler
 	sal_uInt16          nLoadVersion;   // Versionsnummer der geladenen Datei
-	FASTBOOL        bExtColorTable; // Keinen eigenen ColorTable
 	sal_Bool        mbChanged;
 	FASTBOOL        bInfoChanged;
 	FASTBOOL        bPagNumsDirty;
@@ -281,13 +271,13 @@ public:
     FASTBOOL        mbAddExtLeading;
 	FASTBOOL        mbInDestruction;
 
-	// Zeiger auf Paletten, Listen und Tabellen
-	XColorList*    pColorTable;
-	XDashList*      pDashList;
-	XLineEndList*   pLineEndList;
-	XHatchList*     pHatchList;
-	XGradientList*  pGradientList;
-	XBitmapList*    pBitmapList;
+    // lists for colors, dashes, lineends, hatches, gradients and bitmaps for this model
+    XColorListSharedPtr     maColorTable;
+    XDashListSharedPtr      maDashList;
+    XLineEndListSharedPtr   maLineEndList;
+    XHatchListSharedPtr     maHatchList;
+    XGradientListSharedPtr  maGradientList;
+    XBitmapListSharedPtr    maBitmapList;
 
 	// New src638: NumberFormatter for drawing layer and
 	// method for getting it. It is constructed on demand
@@ -314,9 +304,7 @@ private:
 	SVX_DLLPRIVATE void ImpSetOutlinerDefaults( SdrOutliner* pOutliner, sal_Bool bInit = sal_False );
 	SVX_DLLPRIVATE void ImpReformatAllTextObjects();
 	SVX_DLLPRIVATE void ImpReformatAllEdgeObjects();	// #103122#
-	SVX_DLLPRIVATE void ImpCreateTables();
-	SVX_DLLPRIVATE void ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable,
-		bool bLoadRefCounts = true);
+	SVX_DLLPRIVATE void ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bLoadRefCounts = true);
 
 //#endif // __PRIVATE
 
@@ -342,8 +330,6 @@ public:
 	// Wahl des Pools.
 	SdrModel(SfxItemPool* pPool=NULL, ::comphelper::IEmbeddedHelper* pPers=NULL, sal_Bool bLoadRefCounts = LOADREFCOUNTS);
 	SdrModel(const String& rPath, SfxItemPool* pPool=NULL, ::comphelper::IEmbeddedHelper* pPers=NULL, sal_Bool bLoadRefCounts = LOADREFCOUNTS);
-	SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, FASTBOOL bUseExtColorTable, sal_Bool bLoadRefCounts = LOADREFCOUNTS);
-	SdrModel(const String& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, FASTBOOL bUseExtColorTable, sal_Bool bLoadRefCounts = LOADREFCOUNTS);
 	virtual ~SdrModel();
 	void ClearModel(sal_Bool bCalledFromDestructor);
 
@@ -658,18 +644,23 @@ public:
 	const Link& GetIOProgressHdl() const                     { return aIOProgressLink; }
 
 	// Zugriffsmethoden fuer Paletten, Listen und Tabellen
-	void            SetColorTable(XColorList* pTable)       ;
-	XColorList*    GetColorTable() const                    { return pColorTable; }
-	void            SetDashList(XDashList* pList)            ;
-	XDashList*      GetDashList() const                      { return pDashList; }
-	void            SetLineEndList(XLineEndList* pList)      ;
-	XLineEndList*   GetLineEndList() const                   { return pLineEndList; }
-	void            SetHatchList(XHatchList* pList)          ;
-	XHatchList*     GetHatchList() const                     { return pHatchList; }
-	void            SetGradientList(XGradientList* pList)    ;
-	XGradientList*  GetGradientList() const                  { return pGradientList; }
-	void            SetBitmapList(XBitmapList* pList)        ;
-	XBitmapList*    GetBitmapList() const                    { return pBitmapList; }
+    void SetColorTableAtSdrModel(XColorListSharedPtr aTable);
+    XColorListSharedPtr GetColorTableFromSdrModel() const;
+
+    void SetDashListAtSdrModel(XDashListSharedPtr aList);
+    XDashListSharedPtr GetDashListFromSdrModel() const;
+
+    void SetLineEndListAtSdrModel(XLineEndListSharedPtr aList);
+    XLineEndListSharedPtr GetLineEndListFromSdrModel() const;
+
+    void SetHatchListAtSdrModel(XHatchListSharedPtr aList);
+    XHatchListSharedPtr GetHatchListFromSdrModel() const;
+
+    void SetGradientListAtSdrModel(XGradientListSharedPtr aList);
+    XGradientListSharedPtr GetGradientListFromSdrModel() const;
+
+    void SetBitmapListAtSdrModel(XBitmapListSharedPtr aList);
+    XBitmapListSharedPtr GetBitmapListFromSdrModel() const;
 
 	// Der StyleSheetPool wird der DrawingEngine nur bekanntgemacht.
 	// Zu loeschen hat ihn schliesslich der, der ihn auch konstruiert hat.

Modified: openoffice/branches/ia2/main/svx/inc/svx/svxdlg.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/inc/svx/svxdlg.hxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/inc/svx/svxdlg.hxx (original)
+++ openoffice/branches/ia2/main/svx/inc/svx/svxdlg.hxx Sat May 18 10:12:43 2013
@@ -264,8 +264,6 @@ public:
 
 class AbstractSvxAreaTabDialog :public SfxAbstractTabDialog  //add for SvxAreaTabDialog
 {
-public:
-	virtual void	 DontDeleteColorTable() = 0;
 };
 
 class AbstractSvxTransformTabDialog : public SfxAbstractTabDialog

Modified: openoffice/branches/ia2/main/svx/inc/svx/xattr.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/inc/svx/xattr.hxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/inc/svx/xattr.hxx (original)
+++ openoffice/branches/ia2/main/svx/inc/svx/xattr.hxx Sat May 18 10:12:43 2013
@@ -24,7 +24,6 @@
 #define _XATTR_HXX
 
 // include ---------------------------------------------------------------
-class XColorList;
 class XDashList;
 class XLineEndList;
 class XHatchList;

Modified: openoffice/branches/ia2/main/svx/inc/svx/xcolit.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/inc/svx/xcolit.hxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/inc/svx/xcolit.hxx (original)
+++ openoffice/branches/ia2/main/svx/inc/svx/xcolit.hxx Sat May 18 10:12:43 2013
@@ -26,14 +26,16 @@
 
 #include <tools/color.hxx>
 #include "svx/svxdllapi.h"
-
 #include <svx/xit.hxx>
-
-class XColorList;
+#include <boost/shared_ptr.hpp>
 
 //-----------------
 // class XColorItem
 //-----------------
+
+class XColorList;
+typedef ::boost::shared_ptr< XColorList > XColorListSharedPtr;
+
 class SVX_DLLPUBLIC XColorItem : public NameOrIndex
 {
 	Color   aColor;
@@ -55,7 +57,8 @@ public:
 	virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
 	virtual SvStream&       Store(SvStream& rOut, sal_uInt16 nItemVersion ) const;
 
-	const Color&    GetColorValue(const XColorList* pTable = 0) const;
+	const Color&    GetColorValue() const;
+	const Color&    GetColorValue(const XColorListSharedPtr aTable) const;
 	void            SetColorValue(const Color& rNew) { aColor = rNew; Detach(); }
 };
 

Modified: openoffice/branches/ia2/main/svx/inc/svx/xit.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/inc/svx/xit.hxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/inc/svx/xit.hxx (original)
+++ openoffice/branches/ia2/main/svx/inc/svx/xit.hxx Sat May 18 10:12:43 2013
@@ -30,7 +30,6 @@
 
 /************************************************************************/
 
-class XColorList;
 class XDashList;
 class XLineEndList;
 class XHatchList;

Modified: openoffice/branches/ia2/main/svx/inc/svx/xtable.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/inc/svx/xtable.hxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/inc/svx/xtable.hxx (original)
+++ openoffice/branches/ia2/main/svx/inc/svx/xtable.hxx Sat May 18 10:12:43 2013
@@ -23,25 +23,13 @@
 #define _XTABLE_HXX
 
 // include ---------------------------------------------------------------
-
 #include <svx/xpoly.hxx>
 #include <svx/xdash.hxx>
 #include <svx/xhatch.hxx>
 #include <svx/xgrad.hxx>
-#include <svx/xflasit.hxx>
-#include <svx/xlnasit.hxx>
-#include <tools/color.hxx>
-#include <tools/string.hxx>
-#include <tools/table.hxx>
-#include <svx/svxdllapi.h>
-#include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <svtools/grfmgr.hxx>
 #include <svx/XPropertyEntry.hxx>
-
-class Color;
-class Bitmap;
-class VirtualDevice;
-class XOutdevItemPool;
+#include <vcl/bitmap.hxx>
 
 // Standard-Vergleichsstring
 extern sal_Unicode __FAR_DATA pszStandard[]; // "standard"
@@ -50,279 +38,276 @@ extern sal_Unicode __FAR_DATA pszStandar
 // enum COL_NAME nicht verglichen werden kann.
 SVX_DLLPUBLIC Color RGB_Color( ColorData nColorName );
 
-// ------------------
+//////////////////////////////////////////////////////////////////////////////
 // class XColorEntry
-// ------------------
 
-class XColorEntry : public XPropertyEntry
+class SVX_DLLPUBLIC XColorEntry : public XPropertyEntry
 {
-	Color   aColor;
+private:
+    Color   aColor;
 
 public:
-			XColorEntry(const Color& rColor, const String& rName) :
-				XPropertyEntry(rName), aColor(rColor) {}
-			XColorEntry(const XColorEntry& rOther) :
-				XPropertyEntry(rOther), aColor(rOther.aColor) {}
+    XColorEntry(const Color& rColor, const String& rName);
+    XColorEntry(const XColorEntry& rOther);
 
-	void SetColor(const Color& rColor) { aColor = rColor; }
-	const Color& GetColor() const { return aColor; }
+    const Color& GetColor() const 
+    { 
+        return aColor; 
+    }
 };
 
-// --------------------
+//////////////////////////////////////////////////////////////////////////////
 // class XLineEndEntry
-// --------------------
 
-class XLineEndEntry : public XPropertyEntry
+class SVX_DLLPUBLIC XLineEndEntry : public XPropertyEntry
 {
-	basegfx::B2DPolyPolygon	aB2DPolyPolygon;
+private:
+    basegfx::B2DPolyPolygon	aB2DPolyPolygon;
 
 public:
-	XLineEndEntry(const basegfx::B2DPolyPolygon& rB2DPolyPolygon, const String& rName) 
-	:	XPropertyEntry(rName), 
-		aB2DPolyPolygon(rB2DPolyPolygon) 
-	{}
-
-	XLineEndEntry(const XLineEndEntry& rOther) 
-	:	XPropertyEntry(rOther), 
-		aB2DPolyPolygon(rOther.aB2DPolyPolygon) 
-	{}
+    XLineEndEntry(const basegfx::B2DPolyPolygon& rB2DPolyPolygon, const String& rName);
+    XLineEndEntry(const XLineEndEntry& rOther);
 
-	void SetLineEnd(const basegfx::B2DPolyPolygon& rB2DPolyPolygon) 
-	{ 
-		aB2DPolyPolygon = rB2DPolyPolygon; 
-	}
-
-	const basegfx::B2DPolyPolygon& GetLineEnd() const
-	{ 
-		return aB2DPolyPolygon; 
-	}
+    const basegfx::B2DPolyPolygon& GetLineEnd() const
+    { 
+        return aB2DPolyPolygon; 
+    }
 };
 
-// ------------------
+//////////////////////////////////////////////////////////////////////////////
 // class XDashEntry
-// ------------------
 
-class XDashEntry : public XPropertyEntry
+class SVX_DLLPUBLIC XDashEntry : public XPropertyEntry
 {
-	XDash   aDash;
+private:
+    XDash   aDash;
 
 public:
-			XDashEntry(const XDash& rDash, const String& rName) :
-				XPropertyEntry(rName), aDash(rDash) {}
-			XDashEntry(const XDashEntry& rOther) :
-				XPropertyEntry(rOther), aDash(rOther.aDash) {}
+    XDashEntry(const XDash& rDash, const String& rName);
+    XDashEntry(const XDashEntry& rOther);
 
-	void SetDash(const XDash& rDash) { aDash = rDash; }
-	const XDash& GetDash() const { return aDash; }
+    const XDash& GetDash() const 
+    { 
+        return aDash; 
+    }
 };
 
-// ------------------
+//////////////////////////////////////////////////////////////////////////////
 // class XHatchEntry
-// ------------------
 
-class XHatchEntry : public XPropertyEntry
+class SVX_DLLPUBLIC XHatchEntry : public XPropertyEntry
 {
-	XHatch  aHatch;
+private:
+    XHatch  aHatch;
 
 public:
-			XHatchEntry(const XHatch& rHatch, const String& rName) :
-				XPropertyEntry(rName), aHatch(rHatch) {}
-			XHatchEntry(const XHatchEntry& rOther) :
-				XPropertyEntry(rOther), aHatch(rOther.aHatch) {}
+    XHatchEntry(const XHatch& rHatch, const String& rName);
+    XHatchEntry(const XHatchEntry& rOther);
 
-	void SetHatch(const XHatch& rHatch) { aHatch = rHatch; }
-	const XHatch& GetHatch() const { return aHatch; }
+    const XHatch& GetHatch() const 
+    { 
+        return aHatch; 
+    }
 };
 
-// ---------------------
+//////////////////////////////////////////////////////////////////////////////
 // class XGradientEntry
-// ---------------------
 
-class XGradientEntry : public XPropertyEntry
+class SVX_DLLPUBLIC XGradientEntry : public XPropertyEntry
 {
-	XGradient  aGradient;
+private:
+    XGradient  aGradient;
 
 public:
-				XGradientEntry(const XGradient& rGradient, const String& rName):
-					XPropertyEntry(rName), aGradient(rGradient) {}
-				XGradientEntry(const XGradientEntry& rOther) :
-					XPropertyEntry(rOther), aGradient(rOther.aGradient) {}
+    XGradientEntry(const XGradient& rGradient, const String& rName);
+    XGradientEntry(const XGradientEntry& rOther);
 
-	void SetGradient(const XGradient& rGrad) { aGradient = rGrad; }
-	const XGradient& GetGradient() const { return aGradient; }
+    const XGradient& GetGradient() const 
+    { 
+        return aGradient; 
+    }
 };
 
-// ---------------------
+//////////////////////////////////////////////////////////////////////////////
 // class XBitmapEntry
-// ---------------------
 
-class XBitmapEntry : public XPropertyEntry
+class SVX_DLLPUBLIC XBitmapEntry : public XPropertyEntry
 {
 private:
-	GraphicObject   maGraphicObject;
+    GraphicObject   maGraphicObject;
 
 public:
-	XBitmapEntry(const GraphicObject& rGraphicObject, const String& rName)
-    :   XPropertyEntry(rName), 
-        maGraphicObject(rGraphicObject) 
-    {
-    }
-
-    XBitmapEntry(const XBitmapEntry& rOther) 
-    :   XPropertyEntry(rOther), 
-        maGraphicObject(rOther.maGraphicObject) 
-    {
-    }
+    XBitmapEntry(const GraphicObject& rGraphicObject, const String& rName);
+    XBitmapEntry(const XBitmapEntry& rOther);
 
     const GraphicObject& GetGraphicObject() const
     {
         return maGraphicObject;
     }
-
-    void SetGraphicObject(const GraphicObject& rGraphicObject)
-    {
-        maGraphicObject = rGraphicObject;
-    }
 };
 
-// --------------------
+//////////////////////////////////////////////////////////////////////////////
 // class XPropertyList
-// --------------------
 
 class SVX_DLLPUBLIC XPropertyList
 {
 protected:
-	String              maName; // nicht persistent !
-	String              maPath;
-	XOutdevItemPool*    mpXPool;
+    String              maName; // nicht persistent !
+    String              maPath;
 
-	List                maList;
+    ::std::vector< XPropertyEntry* >    maContent;
 
     /// bitfield
-	bool                mbListDirty : 1;
+    bool                mbListDirty : 1;
 
-    XPropertyList( const String& rPath, XOutdevItemPool* pXPool = 0 );
-	void                Clear();
-	virtual Bitmap      CreateBitmapForUI( long nIndex ) = 0;
+    XPropertyList(const String& rPath);
+    void Clear();
+    virtual Bitmap CreateBitmapForUI(long nIndex) = 0;
 
 public:
-	virtual				~XPropertyList();
+    virtual ~XPropertyList();
 
-	long                Count() const;
+    long Count() const;
 
-	void                Insert( XPropertyEntry* pEntry, long nIndex = LIST_APPEND );
-	XPropertyEntry*     Replace( XPropertyEntry* pEntry, long nIndex );
-	XPropertyEntry*     Remove( long nIndex, sal_uInt16 nDummy );
-	XPropertyEntry*     Get( long nIndex, sal_uInt16 nDummy ) const;
+    void Insert(XPropertyEntry* pEntry, long nIndex = LIST_APPEND);
+    XPropertyEntry* Replace(XPropertyEntry* pEntry, long nIndex);
+    XPropertyEntry* Remove(long nIndex);
+    XPropertyEntry* Get(long nIndex) const;
 
-	long                Get(const String& rName);
-	Bitmap              GetUiBitmap( long nIndex ) const;
+    long GetIndex(const String& rName) const;
+    Bitmap GetUiBitmap(long nIndex) const;
 
-	const String&       GetName() const { return maName; }
-	void                SetName( const String& rString );
-	const String&       GetPath() const { return maPath; }
-	void                SetPath( const String& rString ) { maPath = rString; }
-    bool                IsDirty() const { return mbListDirty; }
-	void                SetDirty( bool bDirty = true ) { mbListDirty = bDirty; }
+    const String& GetName() const { return maName; }
+    void SetName( const String& rString );
 
-	virtual sal_Bool        Load() = 0;
-	virtual sal_Bool        Save() = 0;
-	virtual sal_Bool        Create() = 0;
+    const String& GetPath() const { return maPath; }
+    void SetPath( const String& rString ) { maPath = rString; }
+
+    bool IsDirty() const { return mbListDirty; }
+    void SetDirty( bool bDirty = true ) { mbListDirty = bDirty; }
+
+    virtual bool Load() = 0;
+    virtual bool Save() = 0;
+    virtual bool Create() = 0;
 };
 
-// -------------------
+//////////////////////////////////////////////////////////////////////////////
+// predefines for XList classes and the SharedPtr typedefs for these to have 
+// them in a central place for better overview
+
+class XColorList;
+class XLineEndList;
+class XDashList;
+class XHatchList;
+class XGradientList;
+class XBitmapList;
+
+typedef ::boost::shared_ptr< XColorList > XColorListSharedPtr;
+typedef ::boost::shared_ptr< XLineEndList > XLineEndListSharedPtr;
+typedef ::boost::shared_ptr< XDashList > XDashListSharedPtr;
+typedef ::boost::shared_ptr< XHatchList > XHatchListSharedPtr;
+typedef ::boost::shared_ptr< XGradientList > XGradientListSharedPtr;
+typedef ::boost::shared_ptr< XBitmapList > XBitmapListSharedPtr;
+
+//////////////////////////////////////////////////////////////////////////////
+// XPropertyListFactory to limit XListSharedPtr creation and thus XPropertyList creation
+// to this factory, so noone can instantiate a non-shared instace of XPropertyList
+// or it's derivates
+
+class SVX_DLLPUBLIC XPropertyListFactory
+{
+public:
+    static XColorListSharedPtr CreateSharedXColorList( const String& rPath );
+    static XLineEndListSharedPtr CreateSharedXLineEndList( const String& rPath );
+    static XDashListSharedPtr CreateSharedXDashList( const String& rPath );
+    static XHatchListSharedPtr CreateSharedXHatchList( const String& rPath );
+    static XGradientListSharedPtr CreateSharedXGradientList( const String& rPath );
+    static XBitmapListSharedPtr CreateSharedXBitmapList( const String& rPath );
+};
+
+//////////////////////////////////////////////////////////////////////////////
 // class XColorList
-// -------------------
 
 class SVX_DLLPUBLIC XColorList : public XPropertyList
 {
+private:
+    friend class XPropertyListFactory;
+    XColorList(const String& rPath);
+
 protected:
-	virtual Bitmap  CreateBitmapForUI( long nIndex );
+    virtual Bitmap  CreateBitmapForUI(long nIndex);
 
 public:
-					XColorList( const String& rPath, XOutdevItemPool* pXPool = 0 );
-	virtual			~XColorList();
+    virtual ~XColorList();
 
-	using XPropertyList::Replace;
-	XColorEntry*    Replace(XColorEntry* pEntry, long nIndex );
-	using XPropertyList::Remove;
-	XColorEntry*    Remove(long nIndex);
-	using XPropertyList::Get;
-	XColorEntry*    GetColor(long nIndex) const;
+    using XPropertyList::Replace;
+    XColorEntry* Replace(XColorEntry* pEntry, long nIndex );
+    using XPropertyList::Remove;
+    XColorEntry* Remove(long nIndex);
+    XColorEntry* GetColor(long nIndex) const;
 
-	virtual sal_Bool    Load();
-	virtual sal_Bool    Save();
-	virtual sal_Bool    Create();
+    virtual bool Load();
+    virtual bool Save();
+    virtual bool Create();
 
-	static XColorList*	GetStdColorList();
+    static XColorListSharedPtr GetStdColorList();
 };
 
-// -------------------
+//////////////////////////////////////////////////////////////////////////////
 // class XLineEndList
-// -------------------
-class impXLineEndList;
 
 class SVX_DLLPUBLIC XLineEndList : public XPropertyList
 {
 private:
-    impXLineEndList*    mpData;
-
-    void impCreate();
-    void impDestroy();
+    friend class XPropertyListFactory;
+    XLineEndList(const String& rPath);
 
 protected:
-	virtual Bitmap CreateBitmapForUI(long nIndex);
+    virtual Bitmap CreateBitmapForUI(long nIndex);
 
 public:
-	XLineEndList(const String& rPath, XOutdevItemPool* pXPool = 0);
-	virtual ~XLineEndList();
+    virtual ~XLineEndList();
 
-	using XPropertyList::Replace;
-	XLineEndEntry* Replace(XLineEndEntry* pEntry, long nIndex);
-	using XPropertyList::Remove;
-	XLineEndEntry* Remove(long nIndex);
-	using XPropertyList::Get;
-	XLineEndEntry* GetLineEnd(long nIndex) const;
+    using XPropertyList::Replace;
+    XLineEndEntry* Replace(XLineEndEntry* pEntry, long nIndex);
+    using XPropertyList::Remove;
+    XLineEndEntry* Remove(long nIndex);
+    XLineEndEntry* GetLineEnd(long nIndex) const;
 
-	virtual sal_Bool Load();
-	virtual sal_Bool Save();
-	virtual sal_Bool Create();
+    virtual bool Load();
+    virtual bool Save();
+    virtual bool Create();
 };
 
-// -------------------
+//////////////////////////////////////////////////////////////////////////////
 // class XDashList
-// -------------------
-class impXDashList;
 
 class SVX_DLLPUBLIC XDashList : public XPropertyList
 {
 private:
-    impXDashList*       mpData;
+    friend class XPropertyListFactory;
+    XDashList(const String& rPath);
+
     Bitmap              maBitmapSolidLine;
     String              maStringSolidLine;
     String              maStringNoLine;
 
-    void impCreate();
-    void impDestroy();
-
 protected:
     Bitmap ImpCreateBitmapForXDash(const XDash* pDash);
-	virtual Bitmap CreateBitmapForUI(long nIndex);
+    virtual Bitmap CreateBitmapForUI(long nIndex);
 
 public:
-    XDashList(const String& rPath, XOutdevItemPool* pXPool = 0);
-	virtual ~XDashList();
+    virtual ~XDashList();
+
+    using XPropertyList::Replace;
+    XDashEntry* Replace(XDashEntry* pEntry, long nIndex);
+    using XPropertyList::Remove;
+    XDashEntry* Remove(long nIndex);
+    XDashEntry* GetDash(long nIndex) const;
 
-	using XPropertyList::Replace;
-	XDashEntry* Replace(XDashEntry* pEntry, long nIndex);
-	using XPropertyList::Remove;
-	XDashEntry* Remove(long nIndex);
-	using XPropertyList::Get;
-	XDashEntry* GetDash(long nIndex) const;
-
-	virtual sal_Bool Load();
-	virtual sal_Bool Save();
-	virtual sal_Bool Create();
+    virtual bool Load();
+    virtual bool Save();
+    virtual bool Create();
 
     // Special call to get a bitmap for the solid line representation. It
     // creates a bitmap fitting in size and style to the ones you get by
@@ -335,95 +320,87 @@ public:
     String GetStringForUiNoLine() const;
 };
 
-// -------------------
+//////////////////////////////////////////////////////////////////////////////
 // class XHatchList
-// -------------------
-class impXHatchList;
 
 class SVX_DLLPUBLIC XHatchList : public XPropertyList
 {
 private:
-    impXHatchList*      mpData;
-
-    void impCreate();
-    void impDestroy();
+    friend class XPropertyListFactory;
+    XHatchList(const String& rPath);
 
 protected:
-	virtual Bitmap CreateBitmapForUI(long nIndex);
+    virtual Bitmap CreateBitmapForUI(long nIndex);
 
 public:
-    XHatchList(const String& rPath, XOutdevItemPool* pXPool = 0);
-	~XHatchList();
+    ~XHatchList();
 
-	using XPropertyList::Replace;
-	XHatchEntry* Replace(XHatchEntry* pEntry, long nIndex);
-	using XPropertyList::Remove;
-	XHatchEntry* Remove(long nIndex);
-	using XPropertyList::Get;
-	XHatchEntry* GetHatch(long nIndex) const;
+    using XPropertyList::Replace;
+    XHatchEntry* Replace(XHatchEntry* pEntry, long nIndex);
+    using XPropertyList::Remove;
+    XHatchEntry* Remove(long nIndex);
+    XHatchEntry* GetHatch(long nIndex) const;
 
-	virtual sal_Bool Load();
-	virtual sal_Bool Save();
-	virtual sal_Bool Create();
+    virtual bool Load();
+    virtual bool Save();
+    virtual bool Create();
 };
 
-// -------------------
+//////////////////////////////////////////////////////////////////////////////
 // class XGradientList
-// -------------------
-class impXGradientList;
 
 class SVX_DLLPUBLIC XGradientList : public XPropertyList
 {
 private:
-    impXGradientList*   mpData;
-
-    void impCreate();
-    void impDestroy();
+    friend class XPropertyListFactory;
+    XGradientList(const String& rPath);
 
 protected:
-	virtual Bitmap CreateBitmapForUI(long nIndex);
+    virtual Bitmap CreateBitmapForUI(long nIndex);
 
 public:
-    XGradientList(const String& rPath, XOutdevItemPool* pXPool = 0);
-	virtual ~XGradientList();
+    virtual ~XGradientList();
 
-	using XPropertyList::Replace;
-	XGradientEntry* Replace(XGradientEntry* pEntry, long nIndex);
-	using XPropertyList::Remove;
-	XGradientEntry* Remove(long nIndex);
-	using XPropertyList::Get;
-	XGradientEntry* GetGradient(long nIndex) const;
+    using XPropertyList::Replace;
+    XGradientEntry* Replace(XGradientEntry* pEntry, long nIndex);
+    using XPropertyList::Remove;
+    XGradientEntry* Remove(long nIndex);
+    XGradientEntry* GetGradient(long nIndex) const;
 
-	virtual sal_Bool Load();
-	virtual sal_Bool Save();
-	virtual sal_Bool Create();
+    virtual bool Load();
+    virtual bool Save();
+    virtual bool Create();
 };
 
-// -------------------
+//////////////////////////////////////////////////////////////////////////////
 // class XBitmapList
-// -------------------
 
 class SVX_DLLPUBLIC XBitmapList : public XPropertyList
 {
+private:
+    friend class XPropertyListFactory;
+    XBitmapList(const String& rPath);
+
 protected:
-	virtual Bitmap CreateBitmapForUI( long nIndex );
+    virtual Bitmap CreateBitmapForUI( long nIndex );
 
 public:
-					XBitmapList( const String& rPath, XOutdevItemPool* pXPool = 0);
-	virtual			~XBitmapList();
+    virtual ~XBitmapList();
 
-	using XPropertyList::Replace;
-	XBitmapEntry*   Replace(XBitmapEntry* pEntry, long nIndex );
-	using XPropertyList::Remove;
-	XBitmapEntry*   Remove(long nIndex);
-	using XPropertyList::Get;
-	XBitmapEntry*   GetBitmap(long nIndex) const;
-
-	virtual sal_Bool    Load();
-	virtual sal_Bool    Save();
-	virtual sal_Bool    Create();
+    using XPropertyList::Replace;
+    XBitmapEntry* Replace(XBitmapEntry* pEntry, long nIndex );
+    using XPropertyList::Remove;
+    XBitmapEntry* Remove(long nIndex);
+    XBitmapEntry* GetBitmap(long nIndex) const;
+
+    virtual bool Load();
+    virtual bool Save();
+    virtual bool Create();
 };
 
+//////////////////////////////////////////////////////////////////////////////
+
 #endif // _XTABLE_HXX
 
+//////////////////////////////////////////////////////////////////////////////
 // eof

Modified: openoffice/branches/ia2/main/svx/sdi/svx.sdi
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/sdi/svx.sdi?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/sdi/svx.sdi (original)
+++ openoffice/branches/ia2/main/svx/sdi/svx.sdi Sat May 18 10:12:43 2013
@@ -410,6 +410,35 @@ SfxVoidItem AutoFormat SID_AUTOFORMAT
 
 //--------------------------------------------------------------------------
 
+SfxVoidItem BackgroundImage SID_GALLERY_BG_BRUSH
+(SvxBrushItem Background SID_GALLERY_BG_BRUSH, SfxUInt16Item Position SID_GALLERY_BG_POS)
+[
+    /* flags: */
+    AutoUpdate = FALSE,
+    Cachable = Cachable,
+    FastCall = TRUE,
+    HasCoreId = FALSE,
+    HasDialog = FALSE,
+    ReadOnlyDoc = FALSE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
+    RecordPerSet;
+    Synchron;
+
+    /* status: */
+    SlotType = SfxStringItem
+
+    /* config: */
+    AccelConfig = FALSE,
+    MenuConfig = FALSE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = FALSE,
+    GroupId = GID_INSERT;
+]
+
+//--------------------------------------------------------------------------
+
 SfxStringItem TableStyle SID_TABLE_STYLE
 ()
 [
@@ -6198,13 +6227,13 @@ SfxVoidItem PreviousAnnotation SID_PREVI
 ]
 
 //--------------------------------------------------------------------------
-SfxUInt32Item InsertGalleryPic SID_GALLERY_FORMATS
-()
+SfxVoidItem InsertGalleryPic SID_GALLERY_FORMATS
+(SvxGalleryItem GalleryItem SID_GALLERY_FORMATS)
 [
 	/* flags: */
 	AutoUpdate = FALSE,
 	Cachable = Cachable,
-	FastCall = TRUE,
+	FastCall = FALSE,
 	HasCoreId = FALSE,
 	HasDialog = FALSE,
 	ReadOnlyDoc = FALSE,
@@ -13290,7 +13319,7 @@ SfxBoolItem FontworkKernCharacterPairs S
 ]
 
 //--------------------------------------------------------------------------
-OfaPtrItem GetColorTable SID_GET_COLORTABLE
+SvxColorTableItem GetColorTable SID_GET_COLORTABLE
 ()
 [
 	/* flags: */

Modified: openoffice/branches/ia2/main/svx/sdi/svxitems.sdi
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/sdi/svxitems.sdi?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/sdi/svxitems.sdi (original)
+++ openoffice/branches/ia2/main/svx/sdi/svxitems.sdi Sat May 18 10:12:43 2013
@@ -692,3 +692,5 @@ struct ZoomSlider
     INT16  SvxMaxZoom           MID_ZOOMSLIDER_MAXZOOM;
 };
 item ZoomSlider SvxZoomSliderItem;
+
+item String SvxGalleryItem; // dummy for sequence

Modified: openoffice/branches/ia2/main/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx (original)
+++ openoffice/branches/ia2/main/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx Sat May 18 10:12:43 2013
@@ -19,8 +19,6 @@
  * 
  *************************************************************/
 
-
-
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include "svx/EnhancedCustomShapeTypeNames.hxx"
@@ -34,7 +32,7 @@ struct TCheck
 		return strcmp( s1, s2 ) == 0;
 	}
 };
-typedef std::hash_map< const char*, MSO_SPT, std::hash<const char*>, TCheck> TypeNameHashMap;
+typedef std::hash_map< const char*, MSO_SPT, rtl::CStringHash, rtl::CStringEqual> TypeNameHashMap;
 static TypeNameHashMap* pHashMap = NULL;
 static ::osl::Mutex& getHashMapMutex()
 {

Modified: openoffice/branches/ia2/main/svx/source/dialog/_bmpmask.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/source/dialog/_bmpmask.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/source/dialog/_bmpmask.cxx (original)
+++ openoffice/branches/ia2/main/svx/source/dialog/_bmpmask.cxx Sat May 18 10:12:43 2013
@@ -446,7 +446,7 @@ SvxBmpMask::SvxBmpMask( SfxBindings *pBi
 		pData				( new MaskData( this, *pBindinx ) ),
 		aCbxTrans			( this, BMP_RESID( CBX_TRANS ) ),
 		aLbColorTrans		( this, BMP_RESID ( LB_TRANS ) ),
-		pColTab				( NULL ),
+		maColTab(),
 		aPipetteColor		( COL_WHITE ),
 		aSelItem			( SID_BMPMASK_EXEC, *this, *pBindinx ),
 		maImgPipette		( BMP_RESID ( IMG_PIPETTE ) ),
@@ -634,30 +634,30 @@ sal_Bool SvxBmpMask::NeedsColorTable() c
 
 //-------------------------------------------------------------------------
 
-void SvxBmpMask::SetColorTable( const XColorList* pTable )
+void SvxBmpMask::SetColorTable( XColorListSharedPtr aTable )
 {
-	if ( pTable && ( pTable != pColTab ) )
+	if ( aTable != maColTab )
 	{
 		const String aTransp( BMP_RESID( RID_SVXDLG_BMPMASK_STR_TRANSP ) );
 
-		pColTab = pTable;
+		maColTab = aTable;
 
-		aLbColorTrans.Fill( pColTab );
+		aLbColorTrans.Fill( maColTab );
 		aLbColorTrans.SelectEntryPos( 0 );
 
-		aLbColor1.Fill( pColTab );
+		aLbColor1.Fill( maColTab );
 		aLbColor1.InsertEntry( TRANSP_COL, aTransp, 0 );
 		aLbColor1.SelectEntryPos( 0 );
 
-		aLbColor2.Fill( pColTab );
+		aLbColor2.Fill( maColTab );
 		aLbColor2.InsertEntry( TRANSP_COL, aTransp, 0 );
 		aLbColor2.SelectEntryPos( 0 );
 
-		aLbColor3.Fill( pColTab );
+		aLbColor3.Fill( maColTab );
 		aLbColor3.InsertEntry( TRANSP_COL, aTransp, 0 );
 		aLbColor3.SelectEntryPos( 0 );
 
-		aLbColor4.Fill( pColTab );
+		aLbColor4.Fill( maColTab );
 		aLbColor4.InsertEntry( TRANSP_COL, aTransp, 0 );
 		aLbColor4.SelectEntryPos( 0 );
 	}



Mime
View raw message