[Libreoffice-commits] .: sd/source slideshow/source

[Gert Faller]

 sd/source/ui/view/GraphicViewShellBase.cxx                       |    2 +-
 sd/source/ui/view/ImpressViewShellBase.cxx                       |    2 +-
 sd/source/ui/view/OutlineViewShellBase.cxx                       |    2 +-
 sd/source/ui/view/PresentationViewShellBase.cxx                  |    2 +-
 sd/source/ui/view/SlideSorterViewShellBase.cxx                   |    2 +-
 sd/source/ui/view/ViewShellBase.cxx                              |    2 +-
 slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx |    8 ++++----
 7 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 9e432adbde6205175b2f639cb71fc7d75e8c7a5d
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date:   Sat Dec 11 19:19:18 2010 +0100

    cleaning of __EXPORT define

diff --git a/sd/source/ui/view/GraphicViewShellBase.cxx b/sd/source/ui/view/GraphicViewShellBase.cxx
index 3c09a5d..5f08237 100644
--- a/sd/source/ui/view/GraphicViewShellBase.cxx
+++ b/sd/source/ui/view/GraphicViewShellBase.cxx
@@ -53,7 +53,7 @@ SFX_IMPL_VIEWFACTORY(GraphicViewShellBase, SdResId(STR_DEFAULTVIEW))
 }
 */
 SfxViewFactory* GraphicViewShellBase::pFactory;
-SfxViewShell* __EXPORT GraphicViewShellBase::CreateInstance (
+SfxViewShell* GraphicViewShellBase::CreateInstance (
     SfxViewFrame *pFrame, SfxViewShell *pOldView)
 {
     GraphicViewShellBase* pBase = new GraphicViewShellBase(pFrame, pOldView);
diff --git a/sd/source/ui/view/ImpressViewShellBase.cxx b/sd/source/ui/view/ImpressViewShellBase.cxx
index 840b6dc..9053bec 100644
--- a/sd/source/ui/view/ImpressViewShellBase.cxx
+++ b/sd/source/ui/view/ImpressViewShellBase.cxx
@@ -53,7 +53,7 @@ SFX_IMPL_VIEWFACTORY(ImpressViewShellBase, SdResId(STR_DEFAULTVIEW))
 }
 */
 SfxViewFactory* ImpressViewShellBase::pFactory;
-SfxViewShell* __EXPORT ImpressViewShellBase::CreateInstance (
+SfxViewShell* ImpressViewShellBase::CreateInstance (
     SfxViewFrame *pFrame, SfxViewShell *pOldView)
 {
     ImpressViewShellBase* pBase = new ImpressViewShellBase(pFrame, pOldView);
diff --git a/sd/source/ui/view/OutlineViewShellBase.cxx b/sd/source/ui/view/OutlineViewShellBase.cxx
index 57fb37e..493255e 100644
--- a/sd/source/ui/view/OutlineViewShellBase.cxx
+++ b/sd/source/ui/view/OutlineViewShellBase.cxx
@@ -51,7 +51,7 @@ SFX_IMPL_VIEWFACTORY(OutlineViewShellBase, SdResId(STR_DEFAULTVIEW))
 }
 */
 SfxViewFactory* OutlineViewShellBase::pFactory;
-SfxViewShell* __EXPORT OutlineViewShellBase::CreateInstance (
+SfxViewShell* OutlineViewShellBase::CreateInstance (
     SfxViewFrame *pFrame, SfxViewShell *pOldView)
 {
     OutlineViewShellBase* pBase = new OutlineViewShellBase(pFrame, pOldView);
diff --git a/sd/source/ui/view/PresentationViewShellBase.cxx b/sd/source/ui/view/PresentationViewShellBase.cxx
index 2770d85..adad9e7 100644
--- a/sd/source/ui/view/PresentationViewShellBase.cxx
+++ b/sd/source/ui/view/PresentationViewShellBase.cxx
@@ -60,7 +60,7 @@ SFX_IMPL_VIEWFACTORY(PresentationViewShellBase, SdResId(STR_DEFAULTVIEW))
 }
 */
 SfxViewFactory* PresentationViewShellBase::pFactory;
-SfxViewShell* __EXPORT PresentationViewShellBase::CreateInstance (
+SfxViewShell* PresentationViewShellBase::CreateInstance (
     SfxViewFrame *_pFrame, SfxViewShell *pOldView)
 {
     PresentationViewShellBase* pBase = 
diff --git a/sd/source/ui/view/SlideSorterViewShellBase.cxx b/sd/source/ui/view/SlideSorterViewShellBase.cxx
index e499542..4640c52 100644
--- a/sd/source/ui/view/SlideSorterViewShellBase.cxx
+++ b/sd/source/ui/view/SlideSorterViewShellBase.cxx
@@ -51,7 +51,7 @@ SFX_IMPL_VIEWFACTORY(SlideSorterViewShellBase, SdResId(STR_DEFAULTVIEW))
 }
 */
 SfxViewFactory* SlideSorterViewShellBase::pFactory;
-SfxViewShell* __EXPORT SlideSorterViewShellBase::CreateInstance (
+SfxViewShell* SlideSorterViewShellBase::CreateInstance (
     SfxViewFrame *pFrame, SfxViewShell *pOldView)
 {
     SlideSorterViewShellBase* pBase = new SlideSorterViewShellBase(pFrame, pOldView);
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 0aae6fc..5aa9dde 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -249,7 +249,7 @@ SFX_IMPL_VIEWFACTORY(ViewShellBase, SdResId(STR_DEFAULTVIEW))
 }
 */
 SfxViewFactory* ViewShellBase::pFactory;
-SfxViewShell* __EXPORT ViewShellBase::CreateInstance (
+SfxViewShell* ViewShellBase::CreateInstance (
     SfxViewFrame *pFrame, SfxViewShell *pOldView)
 {
     ViewShellBase* pBase = new ViewShellBase(pFrame, pOldView);
diff --git a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx
index 3a56dfa..38c2d26 100644
--- a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx
@@ -1205,10 +1205,10 @@ void OGLTransitionImpl::preparePermShader()
             OGLShaders::glUniform1i( location, 0 );  // texture unit 0
         }
 
-        glActiveTexture(GL_TEXTURE1);
+        //glActiveTexture(GL_TEXTURE1);
         if( !maHelperTexture )
             initPermTexture( &maHelperTexture );
-        glActiveTexture(GL_TEXTURE0);
+        //glActiveTexture(GL_TEXTURE0);
 
         location = OGLShaders::glGetUniformLocation( mProgramObject, "permTexture" );
         if( location != -1 ) {
@@ -1243,9 +1243,9 @@ void OGLTransitionImpl::displaySlidesShaders( double nTime, ::sal_Int32 glLeavin
         }
     }
 
-    glActiveTexture( GL_TEXTURE2 );
+    //glActiveTexture( GL_TEXTURE2 );
     glBindTexture( GL_TEXTURE_2D, glEnteringSlideTex );
-    glActiveTexture( GL_TEXTURE0 );
+    //glActiveTexture( GL_TEXTURE0 );
 #endif
 
     displaySlide( nTime, glLeavingSlideTex, maLeavingSlidePrimitives, SlideWidthScale, SlideHeightScale );