GNOME.org
 

ooo-build r13862 - in trunk: . patches/dev300

Author: noelpwer
Date: Tue Sep  9 22:13:13 2008
New Revision: 13862
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13862&view=rev

Log:
2008-09-09  Noel Power  <noel power novell com>

        * patches/dev300/cws-npower11.diff: fix visibility



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/cws-npower11.diff

Modified: trunk/patches/dev300/cws-npower11.diff
==============================================================================
--- trunk/patches/dev300/cws-npower11.diff	(original)
+++ trunk/patches/dev300/cws-npower11.diff	Tue Sep  9 22:13:13 2008
@@ -2725,10 +2725,10 @@
 ===================================================================
 RCS file: /cvs/sc/sc/source/ui/vba/vbacontrol.cxx,v
 retrieving revision 1.3
-retrieving revision 1.2.42.6
-diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.6
+retrieving revision 1.2.42.7
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.7
 --- sc/source/ui/vba/vbacontrol.cxx	11 Apr 2008 00:57:50 -0000	1.3
-+++ sc/source/ui/vba/vbacontrol.cxx	9 Sep 2008 10:22:25 -0000	1.2.42.6
++++ sc/source/ui/vba/vbacontrol.cxx	9 Sep 2008 18:43:44 -0000	1.2.42.7
 @@ -36,7 +36,13 @@
  #include <com/sun/star/frame/XModel.hpp>
  #include <com/sun/star/view/XControlAccess.hpp>
@@ -2744,7 +2744,7 @@
  #include"vbacontrol.hxx"
  #include"vbacombobox.hxx"
  #include "vbabutton.hxx"
-@@ -44,35 +50,39 @@
+@@ -44,35 +50,48 @@
  #include "vbatextbox.hxx"
  #include "vbaradiobutton.hxx"
  #include "vbalistbox.hxx"
@@ -2768,9 +2768,7 @@
 -ScVbaControl::getWindowPeer( const uno::Reference< ::drawing::XControlShape >& xControlShape ) throw (uno::RuntimeException)
 +ScVbaControl::getWindowPeer() throw (uno::RuntimeException)
  {
-+    uno::Reference< drawing::XControlShape > xControlShape( m_xControl, uno::UNO_QUERY );
-+
-     uno::Reference< awt::XControlModel > xControlModel( xControlShape->getControl(), uno::UNO_QUERY_THROW );
+-    uno::Reference< awt::XControlModel > xControlModel( xControlShape->getControl(), uno::UNO_QUERY_THROW );
 -    //init m_xWindowPeer 
 -    uno::Reference< container::XChild > xChild( xControlModel, uno::UNO_QUERY_THROW );
 -    xChild.set( xChild->getParent(), uno::UNO_QUERY_THROW );
@@ -2778,9 +2776,21 @@
 -    uno::Reference< frame::XModel > xModel( xChild->getParent(), uno::UNO_QUERY_THROW );
 -    uno::Reference< view::XControlAccess > xControlAccess( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
 -    uno::Reference< awt::XControl > xControl;
++    uno::Reference< drawing::XControlShape > xControlShape( m_xControl, uno::UNO_QUERY );
 +
-+    uno::Reference< view::XControlAccess > xControlAccess( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
++    uno::Reference< awt::XControlModel > xControlModel;
 +    uno::Reference< css::awt::XWindowPeer >  xWinPeer;
++    if ( !xControlShape.is() ) 
++    { 
++        // would seem to be a Userform control
++        uno::Reference< awt::XControl > xControl( m_xControl, uno::UNO_QUERY_THROW );
++        xWinPeer =  xControl->getPeer();
++	return xWinPeer;
++    }
++    // form control
++    xControlModel.set( xControlShape->getControl(), uno::UNO_QUERY_THROW );
++
++    uno::Reference< view::XControlAccess > xControlAccess( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
      try
      {
 -        xControl.set( xControlAccess->getControl( xControlModel ), uno::UNO_QUERY );
@@ -2797,7 +2807,7 @@
  }
  
  //ScVbaControlListener
-@@ -106,67 +116,44 @@ ScVbaControlListener::disposing( const l
+@@ -106,67 +125,44 @@ ScVbaControlListener::disposing( const l
  
  //ScVbaControl
  
@@ -2827,25 +2837,22 @@
  ScVbaControl::~ScVbaControl()
  {
 -    if( m_xControlShape.is() )
-+    if( m_xControl.is() )
-     {
+-    {
 -        uno::Reference< lang::XComponent > xComponent( m_xControlShape, uno::UNO_QUERY_THROW );
-+        uno::Reference< lang::XComponent > xComponent( m_xControl, uno::UNO_QUERY_THROW );
-         xComponent->removeEventListener( m_xEventListener );
-     }
- }
- 
+-        xComponent->removeEventListener( m_xEventListener );
+-    }
+-}
+-
 -void ScVbaControl::removeResouce() throw( uno::RuntimeException )
-+void 
-+ScVbaControl::setGeometryHelper( AbstractGeometryAttributes* pHelper )
++    if( m_xControl.is() )
  {
 -    uno::Reference< lang::XComponent > xComponent( m_xControlShape, uno::UNO_QUERY_THROW );
--    xComponent->removeEventListener( m_xEventListener );
++        uno::Reference< lang::XComponent > xComponent( m_xControl, uno::UNO_QUERY_THROW );
+     xComponent->removeEventListener( m_xEventListener );
 -    m_xControlShape = NULL;
 -    m_xProps = NULL;
-+    mpGeometryHelper.reset( pHelper );
  }
- 
+-
 -
 -ScVbaControl::ScVbaControl( const uno::Reference< uno::XComponentContext >& xContext, 
 -        const uno::Reference< beans::XPropertySet >& xProps, 
@@ -2855,10 +2862,12 @@
 -    m_xEventListener.set( new ScVbaControlListener( this ) );
 -    uno::Reference< lang::XComponent > xComponent( m_xControlShape, uno::UNO_QUERY_THROW );
 -    xComponent->addEventListener( m_xEventListener );
--}
--
+ }
+ 
 -void ScVbaControl::SetControl( const uno::Reference< uno::XComponentContext > xContext, const uno::Reference< ::drawing::XControlShape > xControlShape )
--{
++void 
++ScVbaControl::setGeometryHelper( AbstractGeometryAttributes* pHelper )
+ {
 -    m_xEventListener.set( new ScVbaControlListener( this ) );
 -    uno::Reference< lang::XComponent > xComponent( m_xControlShape, uno::UNO_QUERY_THROW );
 -    m_xContext.set( xContext, uno::UNO_QUERY_THROW );
@@ -2867,8 +2876,9 @@
 -    uno::Reference< awt::XControlModel > xControlModel( xControlShape->getControl(), uno::UNO_QUERY_THROW );
 -    uno::Reference< beans::XPropertySet > xProps( xControlModel, uno::UNO_QUERY_THROW );
 -    m_xProps = xProps;
--}
--
++    mpGeometryHelper.reset( pHelper );
+ }
+ 
 -void ScVbaControl::SetControl( const uno::Reference< uno::XComponentContext > xContext, 
 -        const uno::Reference< beans::XPropertySet > xProps, 
 -        const uno::Reference< drawing::XControlShape > xControlShape )
@@ -2886,7 +2896,7 @@
  }
  
  //In design model has different behavior
-@@ -189,132 +176,283 @@ void SAL_CALL ScVbaControl::setEnabled( 
+@@ -189,132 +185,283 @@ void SAL_CALL ScVbaControl::setEnabled( 
  
  sal_Bool SAL_CALL ScVbaControl::getVisible() throw (uno::RuntimeException)
  {
@@ -10559,117 +10569,117 @@
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/AutoFilter.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/AutoFilter.xls
-Binary files /dev/null and /tmp/cvsLqaysL differ
+Binary files /dev/null and /tmp/cvs3BaaJ1 differ
 Index: sc/source/ui/vba/testvba/TestDocuments/MiscRangeTests.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/MiscRangeTests.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/MiscRangeTests.xls
-Binary files /dev/null and /tmp/cvsMqaysL differ
+Binary files /dev/null and /tmp/cvs4BaaJ1 differ
 Index: sc/source/ui/vba/testvba/TestDocuments/PageBreaks.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/PageBreaks.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/PageBreaks.xls
-Binary files /dev/null and /tmp/cvsNqaysL differ
+Binary files /dev/null and /tmp/cvs5BaaJ1 differ
 Index: sc/source/ui/vba/testvba/TestDocuments/PageSetup.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/PageSetup.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/PageSetup.xls
-Binary files /dev/null and /tmp/cvsOqaysL differ
+Binary files /dev/null and /tmp/cvs6BaaJ1 differ
 Index: sc/source/ui/vba/testvba/TestDocuments/Ranges-2.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/Ranges-2.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/Ranges-2.xls
-Binary files /dev/null and /tmp/cvsPqaysL differ
+Binary files /dev/null and /tmp/cvs7BaaJ1 differ
 Index: sc/source/ui/vba/testvba/TestDocuments/Ranges-3.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/Ranges-3.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/Ranges-3.xls
-Binary files /dev/null and /tmp/cvsQqaysL differ
+Binary files /dev/null and /tmp/cvs8BaaJ1 differ
 Index: sc/source/ui/vba/testvba/TestDocuments/Ranges.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/Ranges.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/Ranges.xls
-Binary files /dev/null and /tmp/cvsRqaysL differ
+Binary files /dev/null and /tmp/cvs9BaaJ1 differ
 Index: sc/source/ui/vba/testvba/TestDocuments/Shapes.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/Shapes.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/Shapes.xls
-Binary files /dev/null and /tmp/cvsSqaysL differ
+Binary files /dev/null and /tmp/cvs.BaaJ1 differ
 Index: sc/source/ui/vba/testvba/TestDocuments/StrConv-test.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/StrConv-test.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/StrConv-test.xls
-Binary files /dev/null and /tmp/cvsTqaysL differ
+Binary files /dev/null and /tmp/cvs_BaaJ1 differ
 Index: sc/source/ui/vba/testvba/TestDocuments/Template.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/Template.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/Template.xls
-Binary files /dev/null and /tmp/cvsUqaysL differ
+Binary files /dev/null and /tmp/cvsaCaaJ1 differ
 Index: sc/source/ui/vba/testvba/TestDocuments/TestAddress.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/TestAddress.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/TestAddress.xls
-Binary files /dev/null and /tmp/cvsVqaysL differ
+Binary files /dev/null and /tmp/cvsbCaaJ1 differ
 Index: sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest.xls
-Binary files /dev/null and /tmp/cvsWqaysL differ
+Binary files /dev/null and /tmp/cvscCaaJ1 differ
 Index: sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest2.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest2.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest2.xls
-Binary files /dev/null and /tmp/cvsXqaysL differ
+Binary files /dev/null and /tmp/cvsdCaaJ1 differ
 Index: sc/source/ui/vba/testvba/TestDocuments/Window.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/Window.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/Window.xls
-Binary files /dev/null and /tmp/cvsYqaysL differ
+Binary files /dev/null and /tmp/cvseCaaJ1 differ
 Index: sc/source/ui/vba/testvba/TestDocuments/bytearraystring.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/bytearraystring.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/bytearraystring.xls
-Binary files /dev/null and /tmp/cvsZqaysL differ
+Binary files /dev/null and /tmp/cvsfCaaJ1 differ
 Index: sc/source/ui/vba/testvba/TestDocuments/dateserial.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/dateserial.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/dateserial.xls
-Binary files /dev/null and /tmp/cvs0qaysL differ
+Binary files /dev/null and /tmp/cvsgCaaJ1 differ
 Index: sc/source/ui/vba/testvba/TestDocuments/datevalue.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/datevalue.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/datevalue.xls
-Binary files /dev/null and /tmp/cvs1qaysL differ
+Binary files /dev/null and /tmp/cvshCaaJ1 differ
 Index: sc/source/ui/vba/testvba/TestDocuments/format.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/format.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/format.xls
-Binary files /dev/null and /tmp/cvs2qaysL differ
+Binary files /dev/null and /tmp/cvsiCaaJ1 differ
 Index: sc/source/ui/vba/testvba/TestDocuments/partition.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/partition.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/partition.xls
-Binary files /dev/null and /tmp/cvs3qaysL differ
+Binary files /dev/null and /tmp/cvsjCaaJ1 differ
 Index: sc/source/ui/vba/testvba/TestDocuments/range-4.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/range-4.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/range-4.xls
-Binary files /dev/null and /tmp/cvs4qaysL differ
+Binary files /dev/null and /tmp/cvskCaaJ1 differ
 Index: sc/source/ui/vba/testvba/TestDocuments/replace.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/replace.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/replace.xls
-Binary files /dev/null and /tmp/cvs5qaysL differ
+Binary files /dev/null and /tmp/cvslCaaJ1 differ
 Index: sc/source/ui/vba/testvba/TestDocuments/stringplusdouble.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/stringplusdouble.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/stringplusdouble.xls
-Binary files /dev/null and /tmp/cvs6qaysL differ
+Binary files /dev/null and /tmp/cvsmCaaJ1 differ
 Index: sc/source/ui/vba/testvba/TestDocuments/window2.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/window2.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/window2.xls
-Binary files /dev/null and /tmp/cvs7qaysL differ
+Binary files /dev/null and /tmp/cvsnCaaJ1 differ
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/excel/AutoFilter.log
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/logs/excel/AutoFilter.log
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]