From 436416a6320037855846fce127a0cfa77ac45270 Mon Sep 17 00:00:00 2001 From: Andre Fischer Date: Thu, 8 Jul 2010 12:27:24 +0200 Subject: renaissance1: resolved merge conflicts, cleanup. --- sd/source/ui/presenter/CanvasUpdateRequester.cxx | 0 sd/source/ui/presenter/CanvasUpdateRequester.hxx | 0 sd/source/ui/presenter/PresenterCanvas.cxx | 0 sd/source/ui/presenter/PresenterCanvas.hxx | 0 sd/source/ui/presenter/PresenterCanvasFactory.cxx | 0 sd/source/ui/presenter/PresenterHelper.cxx | 0 sd/source/ui/presenter/PresenterHelper.hxx | 0 sd/source/ui/presenter/PresenterPreviewCache.cxx | 0 sd/source/ui/presenter/PresenterPreviewCache.hxx | 0 sd/source/ui/presenter/PresenterTextView.cxx | 0 sd/source/ui/presenter/PresenterTextView.hxx | 0 sd/source/ui/presenter/SlideRenderer.cxx | 0 sd/source/ui/presenter/SlideRenderer.hxx | 0 sd/source/ui/presenter/makefile.mk | 0 14 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 sd/source/ui/presenter/CanvasUpdateRequester.cxx mode change 100644 => 100755 sd/source/ui/presenter/CanvasUpdateRequester.hxx mode change 100644 => 100755 sd/source/ui/presenter/PresenterCanvas.cxx mode change 100644 => 100755 sd/source/ui/presenter/PresenterCanvas.hxx mode change 100644 => 100755 sd/source/ui/presenter/PresenterCanvasFactory.cxx mode change 100644 => 100755 sd/source/ui/presenter/PresenterHelper.cxx mode change 100644 => 100755 sd/source/ui/presenter/PresenterHelper.hxx mode change 100644 => 100755 sd/source/ui/presenter/PresenterPreviewCache.cxx mode change 100644 => 100755 sd/source/ui/presenter/PresenterPreviewCache.hxx mode change 100644 => 100755 sd/source/ui/presenter/PresenterTextView.cxx mode change 100644 => 100755 sd/source/ui/presenter/PresenterTextView.hxx mode change 100644 => 100755 sd/source/ui/presenter/SlideRenderer.cxx mode change 100644 => 100755 sd/source/ui/presenter/SlideRenderer.hxx mode change 100644 => 100755 sd/source/ui/presenter/makefile.mk (limited to 'sd/source/ui/presenter') diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.cxx b/sd/source/ui/presenter/CanvasUpdateRequester.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.hxx b/sd/source/ui/presenter/CanvasUpdateRequester.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/presenter/PresenterCanvas.hxx b/sd/source/ui/presenter/PresenterCanvas.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/presenter/PresenterCanvasFactory.cxx b/sd/source/ui/presenter/PresenterCanvasFactory.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/presenter/PresenterHelper.hxx b/sd/source/ui/presenter/PresenterHelper.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/presenter/PresenterPreviewCache.hxx b/sd/source/ui/presenter/PresenterPreviewCache.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/presenter/PresenterTextView.hxx b/sd/source/ui/presenter/PresenterTextView.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/presenter/SlideRenderer.cxx b/sd/source/ui/presenter/SlideRenderer.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/presenter/SlideRenderer.hxx b/sd/source/ui/presenter/SlideRenderer.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/presenter/makefile.mk b/sd/source/ui/presenter/makefile.mk old mode 100644 new mode 100755 -- cgit