diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-06-24 21:01:13 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-06-25 05:41:08 +0200 |
| commit | 78f6407978aa48c3cbb116bc281940dbf1f2dcbc (patch) | |
| tree | 9be6625c9795a1c04ff0023a50b233c7e3e017c9 /sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx | |
| parent | de61b526192cf99f6753eff4bf9ce2ab60da69bf (diff) | |
fix build after rebase
Conflicts:
sd/source/ui/slidesorter/view/SlideSorterView.cxx
sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx
sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
Change-Id: Id014a49dbbb33123d2d04f9f33954b77575f2e9e
Diffstat (limited to 'sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx')
| -rw-r--r-- | sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx index dc92d007ec0e..a54e1328ee12 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx @@ -114,7 +114,8 @@ public: /// the maximum size of each tile, also position independent Size GetGridMaxSize(const CoordinateSystem eCoordinateSystem); - Image GetTransitionEffectIcon (void) const; + Image GetTransitionEffectIcon (void) const { return maTransitionEffectIcon;} + Image GetCustomAnimationEffectIcon (void) const { return maCustomAnimationEffectIcon;} private: Rectangle GetBoundingBox ( @@ -122,9 +123,6 @@ private: const Part ePart, const CoordinateSystem eCoordinateSystem); - Image GetTransitionEffectIcon (void) const { return maTransitionEffectIcon;} - Image GetCustomAnimationEffectIcon (void) const { return maCustomAnimationEffectIcon;} - private: SharedSdWindow mpWindow; Size maPageObjectSize; |