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/tools | |
| parent | df76bfb0695d19d201936df80192108e7ce51b8c (diff) | |
renaissance1: resolved merge conflicts, cleanup.
Diffstat (limited to 'sd/source/ui/tools')
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/tools/AsynchronousCall.cxx | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/tools/ConfigurationAccess.cxx | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/tools/EventMultiplexer.cxx | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/tools/IconCache.cxx | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/tools/IdleDetection.cxx | 0 | ||||
| -rw-r--r-- | sd/source/ui/tools/PreviewRenderer.cxx | 1 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/tools/PropertySet.cxx | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/tools/SdGlobalResourceContainer.cxx | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/tools/SlotStateListener.cxx | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/tools/TimerBasedTaskExecution.cxx | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/tools/makefile.mk | 0 |
11 files changed, 1 insertions, 0 deletions
diff --git a/sd/source/ui/tools/AsynchronousCall.cxx b/sd/source/ui/tools/AsynchronousCall.cxx index 3527b74fbeda..3527b74fbeda 100644..100755 --- a/sd/source/ui/tools/AsynchronousCall.cxx +++ b/sd/source/ui/tools/AsynchronousCall.cxx diff --git a/sd/source/ui/tools/ConfigurationAccess.cxx b/sd/source/ui/tools/ConfigurationAccess.cxx index bf4fbc6e6ebe..bf4fbc6e6ebe 100644..100755 --- a/sd/source/ui/tools/ConfigurationAccess.cxx +++ b/sd/source/ui/tools/ConfigurationAccess.cxx diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx index 81678d1af7c0..81678d1af7c0 100644..100755 --- a/sd/source/ui/tools/EventMultiplexer.cxx +++ b/sd/source/ui/tools/EventMultiplexer.cxx diff --git a/sd/source/ui/tools/IconCache.cxx b/sd/source/ui/tools/IconCache.cxx index 12e7b6b52e95..12e7b6b52e95 100644..100755 --- a/sd/source/ui/tools/IconCache.cxx +++ b/sd/source/ui/tools/IconCache.cxx diff --git a/sd/source/ui/tools/IdleDetection.cxx b/sd/source/ui/tools/IdleDetection.cxx index 46ac4174cbe7..46ac4174cbe7 100644..100755 --- a/sd/source/ui/tools/IdleDetection.cxx +++ b/sd/source/ui/tools/IdleDetection.cxx diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx index 4b53dd8e1f1d..3b6e8339c22d 100644 --- a/sd/source/ui/tools/PreviewRenderer.cxx +++ b/sd/source/ui/tools/PreviewRenderer.cxx @@ -42,6 +42,7 @@ #include <editeng/editstat.hxx> #include <tools/link.hxx> #include <vcl/svapp.hxx> +#include <tools/diagnose_ex.h> #include <svx/sdr/contact/viewobjectcontact.hxx> #include <svx/sdr/contact/viewcontact.hxx> diff --git a/sd/source/ui/tools/PropertySet.cxx b/sd/source/ui/tools/PropertySet.cxx index 9cf24dccd508..9cf24dccd508 100644..100755 --- a/sd/source/ui/tools/PropertySet.cxx +++ b/sd/source/ui/tools/PropertySet.cxx diff --git a/sd/source/ui/tools/SdGlobalResourceContainer.cxx b/sd/source/ui/tools/SdGlobalResourceContainer.cxx index 4ed95bbf5b99..4ed95bbf5b99 100644..100755 --- a/sd/source/ui/tools/SdGlobalResourceContainer.cxx +++ b/sd/source/ui/tools/SdGlobalResourceContainer.cxx diff --git a/sd/source/ui/tools/SlotStateListener.cxx b/sd/source/ui/tools/SlotStateListener.cxx index b3175b7fdb4a..b3175b7fdb4a 100644..100755 --- a/sd/source/ui/tools/SlotStateListener.cxx +++ b/sd/source/ui/tools/SlotStateListener.cxx diff --git a/sd/source/ui/tools/TimerBasedTaskExecution.cxx b/sd/source/ui/tools/TimerBasedTaskExecution.cxx index 87ff4d318132..87ff4d318132 100644..100755 --- a/sd/source/ui/tools/TimerBasedTaskExecution.cxx +++ b/sd/source/ui/tools/TimerBasedTaskExecution.cxx diff --git a/sd/source/ui/tools/makefile.mk b/sd/source/ui/tools/makefile.mk index 67ea9e718b91..67ea9e718b91 100644..100755 --- a/sd/source/ui/tools/makefile.mk +++ b/sd/source/ui/tools/makefile.mk |