diff options
| author | Ariel Constenla-Haile <arielch@apache.org> | 2013-05-07 05:39:15 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-07-01 16:47:03 +0100 |
| commit | b9ebdadf5a6ebf22b4df7589d86dd8fdfb675b1e (patch) | |
| tree | 78792de2fda38e4fc2b2e5ba9b79fcdb4e517830 /svx/sdi | |
| parent | bc51be7e7f2fc55456e1ce7dcdc70e6a15c53c0e (diff) | |
Resolves: fdo#66027 #i122116# Remove GalleryExplorer member functions
(cherry picked from commit e94681fb47e3c5bdba486cd8feca92705d44840d)
Conflicts:
sc/source/ui/app/typemap.cxx
sc/source/ui/view/galwrap.cxx
sc/source/ui/view/makefile.mk
sc/source/ui/view/tabvwsh9.cxx
sd/source/ui/view/drviews9.cxx
svx/Package_inc.mk
svx/inc/GalleryControl.hxx
svx/inc/galbrws2.hxx
svx/inc/svx/galbrws.hxx
svx/inc/svx/gallery.hxx
svx/source/gallery2/GalleryControl.cxx
svx/source/gallery2/galbrws.cxx
svx/source/gallery2/galbrws2.cxx
svx/source/gallery2/galexpl.cxx
sw/source/ui/shells/basesh.cxx
Change-Id: I49c2b99ca551f058b852c0e5e28cc2fe8c205031
Diffstat (limited to 'svx/sdi')
| -rw-r--r-- | svx/sdi/svx.sdi | 35 | ||||
| -rw-r--r-- | svx/sdi/svxitems.sdi | 2 |
2 files changed, 34 insertions, 3 deletions
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi index 7f286fd78b44..4b410e3236f4 100644 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -405,6 +405,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 () [ @@ -6338,13 +6367,13 @@ SfxVoidItem PreviousAnnotation SID_PREVIOUS_POSTIT ] //-------------------------------------------------------------------------- -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, diff --git a/svx/sdi/svxitems.sdi b/svx/sdi/svxitems.sdi index 174af905c068..6d1c9544820d 100644 --- a/svx/sdi/svxitems.sdi +++ b/svx/sdi/svxitems.sdi @@ -681,3 +681,5 @@ struct ZoomSlider INT16 SvxMaxZoom MID_ZOOMSLIDER_MAXZOOM; }; item ZoomSlider SvxZoomSliderItem; + +item String SvxGalleryItem; // dummy for sequence |