diff options
| author | Andre Fischer <Andre.W.Fischer <Andre Fischer<Andre.W.Fischer@Sun.COM> | 2010-07-08 12:27:24 +0200 |
|---|---|---|
| committer | Andre Fischer <Andre.W.Fischer <Andre Fischer<Andre.W.Fischer@Sun.COM> | 2010-07-08 12:27:24 +0200 |
| commit | 436416a6320037855846fce127a0cfa77ac45270 (patch) | |
| tree | 2a6326eecb06a6996d68580df4b8260515c46b4c /sd/source/ui/presenter | |
| parent | df76bfb0695d19d201936df80192108e7ce51b8c (diff) | |
renaissance1: resolved merge conflicts, cleanup.
Diffstat (limited to 'sd/source/ui/presenter')
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/presenter/CanvasUpdateRequester.cxx | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/presenter/CanvasUpdateRequester.hxx | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/presenter/PresenterCanvas.cxx | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/presenter/PresenterCanvas.hxx | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/presenter/PresenterCanvasFactory.cxx | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/presenter/PresenterHelper.cxx | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/presenter/PresenterHelper.hxx | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/presenter/PresenterPreviewCache.cxx | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/presenter/PresenterPreviewCache.hxx | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/presenter/PresenterTextView.cxx | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/presenter/PresenterTextView.hxx | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/presenter/SlideRenderer.cxx | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/presenter/SlideRenderer.hxx | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/presenter/makefile.mk | 0 |
14 files changed, 0 insertions, 0 deletions
diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.cxx b/sd/source/ui/presenter/CanvasUpdateRequester.cxx index 4435c265e989..4435c265e989 100644..100755 --- a/sd/source/ui/presenter/CanvasUpdateRequester.cxx +++ b/sd/source/ui/presenter/CanvasUpdateRequester.cxx diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.hxx b/sd/source/ui/presenter/CanvasUpdateRequester.hxx index 6a93f5e85d27..6a93f5e85d27 100644..100755 --- a/sd/source/ui/presenter/CanvasUpdateRequester.hxx +++ b/sd/source/ui/presenter/CanvasUpdateRequester.hxx diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx index a1f583a4e40c..a1f583a4e40c 100644..100755 --- a/sd/source/ui/presenter/PresenterCanvas.cxx +++ b/sd/source/ui/presenter/PresenterCanvas.cxx diff --git a/sd/source/ui/presenter/PresenterCanvas.hxx b/sd/source/ui/presenter/PresenterCanvas.hxx index 6cc97d14c6fa..6cc97d14c6fa 100644..100755 --- a/sd/source/ui/presenter/PresenterCanvas.hxx +++ b/sd/source/ui/presenter/PresenterCanvas.hxx diff --git a/sd/source/ui/presenter/PresenterCanvasFactory.cxx b/sd/source/ui/presenter/PresenterCanvasFactory.cxx index 7ce6bb4815b7..7ce6bb4815b7 100644..100755 --- a/sd/source/ui/presenter/PresenterCanvasFactory.cxx +++ b/sd/source/ui/presenter/PresenterCanvasFactory.cxx diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx index 6157c47c0d66..6157c47c0d66 100644..100755 --- a/sd/source/ui/presenter/PresenterHelper.cxx +++ b/sd/source/ui/presenter/PresenterHelper.cxx diff --git a/sd/source/ui/presenter/PresenterHelper.hxx b/sd/source/ui/presenter/PresenterHelper.hxx index 75b3bb9f7a75..75b3bb9f7a75 100644..100755 --- a/sd/source/ui/presenter/PresenterHelper.hxx +++ b/sd/source/ui/presenter/PresenterHelper.hxx diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx index aa55bc9e07ed..aa55bc9e07ed 100644..100755 --- a/sd/source/ui/presenter/PresenterPreviewCache.cxx +++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx diff --git a/sd/source/ui/presenter/PresenterPreviewCache.hxx b/sd/source/ui/presenter/PresenterPreviewCache.hxx index 115212e0281c..115212e0281c 100644..100755 --- a/sd/source/ui/presenter/PresenterPreviewCache.hxx +++ b/sd/source/ui/presenter/PresenterPreviewCache.hxx diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index ba90a92939ca..ba90a92939ca 100644..100755 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx diff --git a/sd/source/ui/presenter/PresenterTextView.hxx b/sd/source/ui/presenter/PresenterTextView.hxx index 85c7d87efeb4..85c7d87efeb4 100644..100755 --- a/sd/source/ui/presenter/PresenterTextView.hxx +++ b/sd/source/ui/presenter/PresenterTextView.hxx diff --git a/sd/source/ui/presenter/SlideRenderer.cxx b/sd/source/ui/presenter/SlideRenderer.cxx index 92c570604dcd..92c570604dcd 100644..100755 --- a/sd/source/ui/presenter/SlideRenderer.cxx +++ b/sd/source/ui/presenter/SlideRenderer.cxx diff --git a/sd/source/ui/presenter/SlideRenderer.hxx b/sd/source/ui/presenter/SlideRenderer.hxx index e5705dbb3cfb..e5705dbb3cfb 100644..100755 --- a/sd/source/ui/presenter/SlideRenderer.hxx +++ b/sd/source/ui/presenter/SlideRenderer.hxx diff --git a/sd/source/ui/presenter/makefile.mk b/sd/source/ui/presenter/makefile.mk index fe6232098bd2..fe6232098bd2 100644..100755 --- a/sd/source/ui/presenter/makefile.mk +++ b/sd/source/ui/presenter/makefile.mk |