diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-07-11 09:51:50 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-07-11 18:12:35 +0100 |
| commit | 535e83550e2874c8881a72e3520e8eac0309b537 (patch) | |
| tree | 5b3fbca81caba8a8ad7eb22873b736eb47553595 /slideshow/source/engine/shapes/shapeimporter.cxx | |
| parent | de3d6883f2a8fe9c5c04b8e271a36423f96950bb (diff) | |
re-base on ALv2 code. Includes:
Avoid some uses of non portable #!/bin/bash in shell scripts.
Patch contributed by Pedro Giffuni
http://svn.apache.org/viewvc?view=revision&revision=1235297
remove redundant namespace, patch contributed Mathias Bauer
http://svn.apache.org/viewvc?view=revision&revision=1162610
removal of OS/2 port changes, and preferring our similiar
tools/inc/tools/solar.h DLLPOSTFIX cleanup.
i118595 - Removal of the use of getopt() from rscdep.
Patch contributed by Andre Fische
http://svn.apache.org/viewvc?view=revision&revision=1202270
Diffstat (limited to 'slideshow/source/engine/shapes/shapeimporter.cxx')
| -rw-r--r-- | slideshow/source/engine/shapes/shapeimporter.cxx | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx index 0db069c774b8..1cead4b58d6f 100644 --- a/slideshow/source/engine/shapes/shapeimporter.cxx +++ b/slideshow/source/engine/shapes/shapeimporter.cxx @@ -67,7 +67,6 @@ #include <boost/scoped_ptr.hpp> using namespace com::sun::star; -using namespace ::comphelper; namespace slideshow { namespace internal { |