ooo-build r13776 - in trunk: . patches/dev300 patches/vba
- From: noelpwer svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r13776 - in trunk: . patches/dev300 patches/vba
- Date: Wed, 3 Sep 2008 17:24:21 +0000 (UTC)
Author: noelpwer
Date: Wed Sep 3 17:24:21 2008
New Revision: 13776
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13776&view=rev
Log:
2008-09-03 Noel Power <noel power novell com>
* patches/dev300/apply:
* patches/vba/vba-fix-userform-hidecontrolcrash.diff: fix * n#422688
* patches/dev300/transogl-pixmap-to-texture.diff: remove *.orig diff
hunks, these are killing my apply
Added:
trunk/patches/vba/vba-fix-userform-hidecontrolcrash.diff
Modified:
trunk/ChangeLog
trunk/patches/dev300/apply
trunk/patches/dev300/transogl-pixmap-to-texture.diff
Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply (original)
+++ trunk/patches/dev300/apply Wed Sep 3 17:24:21 2008
@@ -1617,7 +1617,9 @@
vba-intersect-multi-area.diff
# fix rowheight to return null if any row in a multicell range is
# of a different height to the others, also need to be pulled into npower11
-vba-rowheight-fix.diff
+vba-rowheight-fix.diff, n#422688
+# fix crash when hiding userform controls
+vba-fix-userform-hidecontrolcrash.diff
[ VBAUntested ]
SectionOwner => noelpwer
vba-basic-null.diff i#85349, jjiao
Modified: trunk/patches/dev300/transogl-pixmap-to-texture.diff
==============================================================================
--- trunk/patches/dev300/transogl-pixmap-to-texture.diff (original)
+++ trunk/patches/dev300/transogl-pixmap-to-texture.diff Wed Sep 3 17:24:21 2008
@@ -1087,219 +1087,6 @@
} else if( transitionType == animations::TransitionType::IRISWIPE && transitionSubType == animations::TransitionSubType::DIAMOND ) {
pTransition = new OGLTransitionImpl();
pTransition->makeDiamond();
-diff -rup slideshow/source/engine/OGLTrans-orig/OGLTrans_TransitionerImpl.cxx.orig slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx.orig
---- slideshow/source/engine/OGLTrans-orig/OGLTrans_TransitionerImpl.cxx.orig 2008-08-26 18:06:46.000000000 +0200
-+++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx.orig 2008-08-25 19:10:29.000000000 +0200
-@@ -93,7 +93,7 @@ public:
- explicit OGLTransitionerImpl(OGLTransitionImpl* pOGLTransition);
- bool initWindowFromSlideShowView( const uno::Reference< presentation::XSlideShowView >& xView, double, double);
- void setSlides( const uno::Reference< rendering::XBitmap >& xLeavingSlide , const uno::Reference< rendering::XBitmap >& xEnteringSlide );
-- static void initialize( const uno::Reference< presentation::XSlideShowView >& xView );
-+ static bool initialize( const uno::Reference< presentation::XSlideShowView >& xView );
-
- // XTransition
- virtual void SAL_CALL update( double nTime ) throw (uno::RuntimeException);
-@@ -179,14 +179,20 @@ public:
- /** Whether Mesa is the OpenGL vendor
- */
- static bool cbMesa;
-+
-+ /**
-+ whether the display has GLX extension
-+ */
-+ static bool cbGLXPresent;
- };
-
- // declare the static variables as some gcc versions have problems declaring them automaticaly
- bool OGLTransitionerImpl::cbBrokenTexturesATI;
- float OGLTransitionerImpl::cnGLVersion;
- bool OGLTransitionerImpl::cbMesa;
-+bool OGLTransitionerImpl::cbGLXPresent;
-
--void OGLTransitionerImpl::initialize( const uno::Reference< presentation::XSlideShowView >& xView )
-+bool OGLTransitionerImpl::initialize( const uno::Reference< presentation::XSlideShowView >& xView )
- {
- // not thread safe
- static bool initialized = false;
-@@ -195,28 +201,34 @@ void OGLTransitionerImpl::initialize( co
- OGLTransitionerImpl *instance;
-
- instance = new OGLTransitionerImpl( NULL );
-- instance->initWindowFromSlideShowView( xView, 0, 0 );
-+ if( instance->initWindowFromSlideShowView( xView, 0, 0 ) ) {
-
-- const GLubyte* version = glGetString( GL_VERSION );
-- if( version && version[0] ) {
-- cnGLVersion = version[0] - '0';
-- if( version[1] == '.' && version[2] )
-- cnGLVersion += (version[2] - '0')/10.0;
-- } else
-- cnGLVersion = 1.0;
-- OSL_TRACE("GL version: %s parsed: %f", version, cnGLVersion );
-+ const GLubyte* version = glGetString( GL_VERSION );
-+ if( version && version[0] ) {
-+ cnGLVersion = version[0] - '0';
-+ if( version[1] == '.' && version[2] )
-+ cnGLVersion += (version[2] - '0')/10.0;
-+ } else
-+ cnGLVersion = 1.0;
-+ OSL_TRACE("GL version: %s parsed: %f", version, cnGLVersion );
-+
-+ const GLubyte* vendor = glGetString( GL_VENDOR );
-+ cbMesa = ( vendor && strstr( (const char *) vendor, "Mesa" ) );
-+ OSL_TRACE("GL vendor: %s identified as Mesa: %d", vendor, cbMesa );
-
-- const GLubyte* vendor = glGetString( GL_VENDOR );
-- cbMesa = ( vendor && strstr( (const char *) vendor, "Mesa" ) );
-- OSL_TRACE("GL vendor: %s identified as Mesa: %d", vendor, cbMesa );
-+ /* TODO: check for version once the bug in fglrx driver is fixed */
-+ cbBrokenTexturesATI = (vendor && strcmp( (const char *) vendor, "ATI Technologies Inc." ) == 0 );
-
-- /* TODO: check for version once the bug in fglrx driver is fixed */
-- cbBrokenTexturesATI = (strcmp( (const char *) glGetString( GL_VENDOR ), "ATI Technologies Inc." ) == 0 );
-+ instance->disposing();
-+ cbGLXPresent = true;
-+ } else
-+ cbGLXPresent = false;
-
-- instance->disposing();
- delete instance;
- initialized = true;
- }
-+
-+ return cbGLXPresent;
- }
-
- bool OGLTransitionerImpl::initWindowFromSlideShowView( const uno::Reference< presentation::XSlideShowView >& xView, double, double)
-@@ -243,6 +255,10 @@ bool OGLTransitionerImpl::initWindowFrom
- GLWin.hWnd = sysData->hWnd;
- #elif defined( UNX )
- GLWin.dpy = reinterpret_cast<unx::Display*>(sysData->pDisplay);
-+
-+ if( unx::glXQueryExtension( GLWin.dpy, NULL, NULL ) == false )
-+ return false;
-+
- GLWin.win = sysData->aWindow;
- GLWin.screen = unx::XDefaultScreen(GLWin.dpy);
- unx::XVisualInfo* vi( NULL );
-@@ -553,10 +569,10 @@ void OGLTransitionerImpl::GLInitSlides()
- static const OGLFormat lcl_RGB24[] =
- {
- // 24 bit RGB
-+ {3, GL_BGR, GL_UNSIGNED_BYTE},
- {3, GL_RGB, GL_UNSIGNED_BYTE},
--// {3, GL_BGR, GL_UNSIGNED_BYTE},
-- {3, GL_RGB, GL_UNSIGNED_BYTE},
-- // {3, GL_BGR, GL_UNSIGNED_BYTE}
-+ {3, GL_BGR, GL_UNSIGNED_BYTE},
-+ {3, GL_RGB, GL_UNSIGNED_BYTE}
- };
-
- #if defined(GL_VERSION_1_2) && defined(GLU_VERSION_1_3)
-@@ -564,37 +580,37 @@ void OGLTransitionerImpl::GLInitSlides()
- static const OGLFormat lcl_RGB16[] =
- {
- // 16 bit RGB
-- {3, GL_RGB, GL_UNSIGNED_SHORT_5_6_5},
- {3, GL_RGB, GL_UNSIGNED_SHORT_5_6_5_REV},
- {3, GL_RGB, GL_UNSIGNED_SHORT_5_6_5},
-- {3, GL_RGB, GL_UNSIGNED_SHORT_5_6_5_REV}
-+ {3, GL_RGB, GL_UNSIGNED_SHORT_5_6_5_REV},
-+ {3, GL_RGB, GL_UNSIGNED_SHORT_5_6_5}
- };
-
- static const OGLFormat lcl_ARGB16_4[] =
- {
- // 16 bit ARGB
-- {4, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4},
--// {4, GL_BGRA, GL_UNSIGNED_SHORT_4_4_4_4},
-- // {4, GL_BGRA, GL_UNSIGNED_SHORT_4_4_4_4_REV},
-- {4, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4_REV}
-+ {4, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4_REV},
-+ {4, GL_BGRA, GL_UNSIGNED_SHORT_4_4_4_4_REV},
-+ {4, GL_BGRA, GL_UNSIGNED_SHORT_4_4_4_4},
-+ {4, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4}
- };
-
- static const OGLFormat lcl_ARGB16_5[] =
- {
- // 16 bit ARGB
-- {4, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1},
-- // {4, GL_BGRA, GL_UNSIGNED_SHORT_5_5_5_1},
-- // {4, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV},
-- {4, GL_RGBA, GL_UNSIGNED_SHORT_1_5_5_5_REV}
-+ {4, GL_RGBA, GL_UNSIGNED_SHORT_1_5_5_5_REV},
-+ {4, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV},
-+ {4, GL_BGRA, GL_UNSIGNED_SHORT_5_5_5_1},
-+ {4, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1}
- };
-
- static const OGLFormat lcl_ARGB32[] =
- {
- // 32 bit ARGB
-- {4, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8},
--// {4, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8},
-- // {4, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV},
-- {4, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV}
-+ {4, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV},
-+ {4, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV},
-+ {4, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8},
-+ {4, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8}
- };
-
- const uno::Sequence<sal_Int8> aComponentTags(
-@@ -684,7 +700,7 @@ void OGLTransitionerImpl::GLInitSlides()
- {
- if( pTransition && !cbBrokenTexturesATI && !pTransition->mbUseMipMapLeaving) {
- glTexImage2D(GL_TEXTURE_2D, 0, pDetectedFormat->nInternalFormat, SlideSize.Width,
-- SlideSize.Height, &LeavingBytes[0]);
-+ SlideSize.Height, 0, pDetectedFormat->eFormat, GL_UNSIGNED_BYTE, &LeavingBytes[0]);
- glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_REPEAT);
- glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_REPEAT);
- glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_NEAREST);
-@@ -739,7 +755,7 @@ void OGLTransitionerImpl::GLInitSlides()
- else
- {
- if( pTransition && !cbBrokenTexturesATI && !pTransition->mbUseMipMapEntering ) {
-- glTexImage2D(GL_TEXTURE_2D, 0, pDetectedFormat->nInternalFormat, SlideSize.Width, SlideSize.Height, 0, Format, GL_UNSIGNED_BYTE, &EnteringBytes[0]);
-+ glTexImage2D(GL_TEXTURE_2D, 0, pDetectedFormat->nInternalFormat, SlideSize.Width, SlideSize.Height, 0, pDetectedFormat->eFormat, GL_UNSIGNED_BYTE, &EnteringBytes[0]);
- glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_REPEAT);
- glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_REPEAT);
- glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_NEAREST);
-@@ -770,7 +786,7 @@ void SAL_CALL OGLTransitionerImpl::updat
- {
- osl::MutexGuard const guard( m_aMutex );
-
-- if (isDisposed() || pTransition->mnRequiredGLVersion > cnGLVersion)
-+ if (isDisposed() || !cbGLXPresent || pTransition->mnRequiredGLVersion > cnGLVersion)
- return;
-
- glEnable(GL_DEPTH_TEST);
-@@ -904,7 +920,7 @@ public:
- if( !hasTransition( transitionType, transitionSubType ) )
- return uno::Reference< presentation::XTransition >();
-
-- OGLTransitionerImpl::initialize( view );
-+ bool bGLXPresent = OGLTransitionerImpl::initialize( view );
-
- if( OGLTransitionerImpl::cbMesa && (
- ( transitionType == animations::TransitionType::FADE && transitionSubType == animations::TransitionSubType::CROSSFADE ) ||
-@@ -974,9 +990,11 @@ public:
-
- rtl::Reference<OGLTransitionerImpl> xRes(
- new OGLTransitionerImpl(pTransition) );
-- if(!xRes->initWindowFromSlideShowView(view,slideOffset.X,slideOffset.Y))
-- return uno::Reference< presentation::XTransition >();
-- xRes->setSlides(leavingBitmap,enteringBitmap);
-+ if( bGLXPresent ) {
-+ if( !xRes->initWindowFromSlideShowView(view,slideOffset.X,slideOffset.Y))
-+ return uno::Reference< presentation::XTransition >();
-+ xRes->setSlides(leavingBitmap,enteringBitmap);
-+ }
-
- return uno::Reference<presentation::XTransition>(xRes.get());
- }
-Only in slideshow/source/engine/OGLTrans: OGLTrans_TransitionerImpl.cxx.rej
diff -rup slideshow/source/engine/OGLTrans-orig/OGLTrans_TransitionImpl.cxx slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.cxx
--- slideshow/source/engine/OGLTrans-orig/OGLTrans_TransitionImpl.cxx 2008-08-26 18:06:46.000000000 +0200
+++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.cxx 2008-08-26 18:07:43.000000000 +0200
@@ -1473,7 +1260,6 @@
static const char* basicVertexShader = "\n\
varying vec2 v_texturePosition;\n\
\n\
-Only in slideshow/source/engine/OGLTrans: OGLTrans_TransitionImpl.cxx.orig
diff -rup slideshow/source/engine/OGLTrans-orig/OGLTrans_TransitionImpl.hxx slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.hxx
--- slideshow/source/engine/OGLTrans-orig/OGLTrans_TransitionImpl.hxx 2008-08-26 18:06:46.000000000 +0200
+++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.hxx 2008-08-26 18:10:02.000000000 +0200
@@ -1494,84 +1280,3 @@
void displaySlidesShaders( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale );
void prepareStatic( ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex );
void prepareDissolve( ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex );
-diff -rup slideshow/source/engine/OGLTrans-orig/OGLTrans_TransitionImpl.hxx.orig slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.hxx.orig
---- slideshow/source/engine/OGLTrans-orig/OGLTrans_TransitionImpl.hxx.orig 2008-08-26 18:06:46.000000000 +0200
-+++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.hxx.orig 2008-08-25 19:10:22.000000000 +0200
-@@ -64,18 +64,25 @@ public:
- OGLTransitionImpl() :
- mbUseMipMapLeaving( true ),
- mbUseMipMapEntering( true ),
-+ mnRequiredGLVersion( 1.0 ),
- maLeavingSlidePrimitives(),
- maEnteringSlidePrimitives(),
- maSceneObjects(),
- mbReflectSlides( false ),
-+ mVertexObject( 0 ),
-+ mFragmentObject( 0 ),
-+ mProgramObject( 0 ),
-+ maHelperTexture( 0 ),
- mmPrepare( NULL ),
-+ mmPrepareTransition( NULL ),
-+ mmClearTransition( NULL ),
- mmDisplaySlides( NULL )
- {}
-
- ~OGLTransitionImpl();
-
-- void prepare();
-- void display( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight);
-+ void prepare( ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex );
-+ void display( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight );
- void finish();
-
- void makeOutsideCubeFaceToLeft();
-@@ -89,6 +96,9 @@ public:
- void makeIris();
- void makeRochade();
- void makeVenetianBlinds( bool vertical, int parts );
-+ void makeStatic();
-+ void makeDissolve();
-+ void makeNewsflash();
-
- /** 2D replacements
- */
-@@ -100,6 +110,10 @@ public:
- bool mbUseMipMapLeaving;
- bool mbUseMipMapEntering;
-
-+ /** which GL version does the transition require
-+ */
-+ float mnRequiredGLVersion;
-+
- private:
- /** clears all the primitives and operations
- */
-@@ -138,6 +152,16 @@ private:
- */
- void (OGLTransitionImpl::*mmPrepare)( double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight );
-
-+ /** When this method is not NULL, it is called after glx context is ready to let the transition prepare GL related things, like GLSL program.
-+ ** We might later replace this by cleaner derived class.
-+ */
-+ void (OGLTransitionImpl::*mmPrepareTransition)( ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex );
-+
-+ /** When this method is not NULL, it is called when the transition needs to clear after itself, like delete own textures etc.
-+ ** We might later replace this by cleaner derived class.
-+ */
-+ void (OGLTransitionImpl::*mmClearTransition)();
-+
- /** When this method is not NULL, it is called in display method to display the slides.
- ** We might later replace this by cleaner derived class.
- */
-@@ -152,6 +176,10 @@ private:
- */
- void prepareDiamond( double nTime, double SlideWidth, double SlideHeight,double DispWidth, double DispHeight );
- void displaySlidesFadeSmoothly( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale );
-+ void displaySlidesShaders( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale );
-+ void prepareStatic( ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex );
-+ void prepareDissolve( ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex );
-+ void preparePermShader();
- };
-
- class SceneObject
-Only in slideshow/source/engine/OGLTrans: OGLTrans_TransitionImpl.hxx.rej
Added: trunk/patches/vba/vba-fix-userform-hidecontrolcrash.diff
==============================================================================
--- (empty file)
+++ trunk/patches/vba/vba-fix-userform-hidecontrolcrash.diff Wed Sep 3 17:24:21 2008
@@ -0,0 +1,31 @@
+diff --git sc/source/ui/vba/vbacontrol.cxx sc/source/ui/vba/vbacontrol.cxx
+index df50f65..32b41b1 100644
+--- sc/source/ui/vba/vbacontrol.cxx
++++ sc/source/ui/vba/vbacontrol.cxx
+@@ -64,14 +64,24 @@ ScVbaControl::getWindowPeer() throw (uno::RuntimeException)
+ // at some stage.
+ 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;
++ 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 );
++
+ //init m_xWindowPeer
+ uno::Reference< container::XChild > xChild( xControlModel, uno::UNO_QUERY_THROW );
+ xChild.set( xChild->getParent(), uno::UNO_QUERY_THROW );
+ xChild.set( xChild->getParent(), uno::UNO_QUERY_THROW );
+ uno::Reference< frame::XModel > xModel( xChild->getParent(), uno::UNO_QUERY_THROW );
+ uno::Reference< view::XControlAccess > xControlAccess( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
+- uno::Reference< css::awt::XWindowPeer > xWinPeer;
+ try
+ {
+ uno::Reference< awt::XControl > xControl( xControlAccess->getControl( xControlModel ), uno::UNO_QUERY );
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
