User: ihi     
Date: 2007-11-20 18:58:58+0000
Modified:
   dba/reportdesign/source/core/sdr/ReportDrawPage.cxx

Log:
 INTEGRATION: CWS reportdesign01 (1.2.28); FILE MERGED
 2007/09/06 09:07:43 oj 1.2.28.1: #i77507# check for width, height of a fixed 
line

File Changes:

Directory: /dba/reportdesign/source/core/sdr/
=============================================

File [changed]: ReportDrawPage.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/sdr/ReportDrawPage.cxx?r1=1.2&r2=1.3
Delta lines:  +16 -10
---------------------
--- ReportDrawPage.cxx  2007-07-09 11:56:16+0000        1.2
+++ ReportDrawPage.cxx  2007-11-20 18:58:55+0000        1.3
@@ -39,6 +39,7 @@
 #include "corestrings.hrc"
 
 #include <com/sun/star/report/XFixedLine.hpp>
+#include <com/sun/star/beans/NamedValue.hpp>
 
 #include <tools/diagnose_ex.h>
 #include <svx/unoshape.hxx>
@@ -113,16 +114,21 @@
 
         try
         {
-            uno::Sequence< uno::Any > aArgs(1);
-            aArgs[0] <<= xShape; xShape.clear();    // keep exactly *one* 
reference!
-            xRet.set( xFactory->createInstanceWithArguments( sServiceName, 
aArgs ), uno::UNO_QUERY_THROW );
-
+            uno::Sequence< uno::Any > aArgs(bChangeOrientation ? 2 : 1);
+            {
+                beans::NamedValue aValue;
+                aValue.Name = PROPERTY_SHAPE;
+                aValue.Value <<= xShape; xShape.clear();    // keep exactly 
*one* reference!
+                aArgs[0] <<= aValue;
             if ( bChangeOrientation )
             {
-                uno::Reference< report::XFixedLine > xFixedLine( xRet, 
uno::UNO_QUERY_THROW );
-                xFixedLine->setOrientation(0);
+                    aValue.Name = PROPERTY_ORIENTATION;
+                    aValue.Value <<= sal_Int32(0);
+                    aArgs[1] <<= aValue;
             }
         }
+            xRet.set( xFactory->createInstanceWithArguments( sServiceName, 
aArgs ), uno::UNO_QUERY_THROW );
+        }
         catch( const uno::Exception& )
         {
             DBG_UNHANDLED_EXCEPTION();




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to