stable version from working GIT repository for unxlngi6 build

3 files changed, 22 insertions, 15 deletions

diff --git a/drawinglayer/source/processor3d/defaultprocessor3d.cxx b/drawinglayer/source/processor3d/defaultprocessor3d.cxx
index 3186ce607eae..5e4435c91aa5 100644
--- a/drawinglayer/source/processor3d/defaultprocessor3d.cxx
+++ b/drawinglayer/source/processor3d/defaultprocessor3d.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: defaultprocessor3d.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: aw $ $Date: 2008-01-30 12:25:05 $
+ *  last change: $Author: aw $ $Date: 2008-02-07 13:41:59 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -117,6 +117,10 @@
 
 //////////////////////////////////////////////////////////////////////////////
 
+using namespace com::sun::star;
+
+//////////////////////////////////////////////////////////////////////////////
+
 namespace basegfx
 {
     class BDInterpolator
@@ -957,6 +961,12 @@ namespace drawinglayer
                 }
             }
         }
+
+        const ::rtl::OUString& getNamePropertyTime()
+        {
+            static ::rtl::OUString s_sNamePropertyTime(RTL_CONSTASCII_USTRINGPARAM("Time"));
+            return s_sNamePropertyTime;
+        }
     } // end of anonymous namespace
 } // end of namespace drawinglayer
 
@@ -1820,9 +1830,8 @@ namespace drawinglayer
                         else
                         {
                             // unknown implementation, use UNO API call instead and process recursively
-                            com::sun::star::graphic::Primitive3DParameters aPrimitive3DParameters;
-                            aPrimitive3DParameters.Time = getTime();
-                            process(xReference->getDecomposition(aPrimitive3DParameters));
+                            const uno::Sequence< beans::PropertyValue > xViewParameters(primitive3d::TimeToViewParameters(getTime()));
+                            process(xReference->getDecomposition(xViewParameters));
                         }
                     }
                 }
diff --git a/drawinglayer/source/processor3d/geometry2dextractor.cxx b/drawinglayer/source/processor3d/geometry2dextractor.cxx
index ffeb1ddfd1f8..6fd9b5e48d5d 100644
--- a/drawinglayer/source/processor3d/geometry2dextractor.cxx
+++ b/drawinglayer/source/processor3d/geometry2dextractor.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: geometry2dextractor.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: aw $ $Date: 2008-01-30 12:26:48 $
+ *  last change: $Author: aw $ $Date: 2008-02-07 13:41:59 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -213,9 +213,8 @@ namespace drawinglayer
                         else
                         {
                             // unknown implementation, use UNO API call instead and process recursively
-                            com::sun::star::graphic::Primitive3DParameters aPrimitive3DParameters;
-                            aPrimitive3DParameters.Time = getTime();
-                            process(xReference->getDecomposition(aPrimitive3DParameters));
+                            const uno::Sequence< beans::PropertyValue > xViewParameters(primitive3d::TimeToViewParameters(getTime()));
+                            process(xReference->getDecomposition(xViewParameters));
                         }
                     }
                 }
diff --git a/drawinglayer/source/processor3d/shadow3dextractor.cxx b/drawinglayer/source/processor3d/shadow3dextractor.cxx
index 109e4cb40faa..fd16f89d6866 100644
--- a/drawinglayer/source/processor3d/shadow3dextractor.cxx
+++ b/drawinglayer/source/processor3d/shadow3dextractor.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: shadow3dextractor.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: aw $ $Date: 2007-03-06 12:35:55 $
+ *  last change: $Author: aw $ $Date: 2008-02-07 13:41:59 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -310,9 +310,8 @@ namespace drawinglayer
                         else
                         {
                             // unknown implementation, use UNO API call instead and process recursively
-                            com::sun::star::graphic::Primitive3DParameters aPrimitive3DParameters;
-                            aPrimitive3DParameters.Time = getTime();
-                            process(xReference->getDecomposition(aPrimitive3DParameters));
+                            const uno::Sequence< beans::PropertyValue > xViewParameters(primitive3d::TimeToViewParameters(getTime()));
+                            process(xReference->getDecomposition(xViewParameters));
                         }
                     }
                 }