[Libreoffice-commits] .: 3 commits - sdext/source vcl/source

[David Tardon]

 sdext/source/presenter/PresenterSlideShowView.cxx |   33 ++++++++++++----------
 sdext/source/presenter/PresenterSlideShowView.hxx |    2 +
 vcl/source/gdi/print3.cxx                         |    1 
 3 files changed, 21 insertions(+), 15 deletions(-)

New commits:
commit a4b8a1c9f50bca3b557efca75100d9532a404ec6
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Apr 4 14:21:25 2012 +0200

    fdo#33914 do not play sound in presenter console

diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx
index 0bd0a56..b1dad09 100644
--- a/sdext/source/presenter/PresenterSlideShowView.cxx
+++ b/sdext/source/presenter/PresenterSlideShowView.cxx
@@ -165,17 +165,7 @@ void PresenterSlideShowView::LateInit (void)
     // Add the new slide show view to the slide show.
     if (mxSlideShow.is() && ! mbIsViewAdded)
     {
-        Reference<presentation::XSlideShowView> xView (this);
-        mxSlideShow->addView(xView);
-        // Prevent embeded sounds being played twice at the same time by
-        // disabling sound for the new slide show view.
-        beans::PropertyValue aProperty;
-        aProperty.Name = A2S("IsSoundEnabled");
-        Sequence<Any> aValues (2);
-        aValues[0] <<= xView;
-        aValues[1] <<= sal_False;
-        aProperty.Value <<= aValues;
-        mxSlideShow->setProperty(aProperty);
+        impl_addAndConfigureView();
         mbIsViewAdded = true;
     }
 
@@ -690,7 +680,7 @@ void PresenterSlideShowView::ActivatePresenterView (void)
 {
     if (mxSlideShow.is() && ! mbIsViewAdded)
     {
-        mxSlideShow->addView(this);
+        impl_addAndConfigureView();
         mbIsViewAdded = true;
     }
 }
@@ -958,7 +948,7 @@ void PresenterSlideShowView::ForceRepaint (void)
     if (mxSlideShow.is() && mbIsViewAdded)
     {
         mxSlideShow->removeView(this);
-        mxSlideShow->addView(this);
+        impl_addAndConfigureView();
     }
 }
 
@@ -1020,6 +1010,21 @@ void PresenterSlideShowView::ThrowIfDisposed (void)
     }
 }
 
+void PresenterSlideShowView::impl_addAndConfigureView()
+{
+    Reference<presentation::XSlideShowView> xView (this);
+    mxSlideShow->addView(xView);
+    // Prevent embeded sounds being played twice at the same time by
+    // disabling sound for the new slide show view.
+    beans::PropertyValue aProperty;
+    aProperty.Name = A2S("IsSoundEnabled");
+    Sequence<Any> aValues (2);
+    aValues[0] <<= xView;
+    aValues[1] <<= sal_False;
+    aProperty.Value <<= aValues;
+    mxSlideShow->setProperty(aProperty);
+}
+
 } } // end of namespace ::sd::presenter
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterSlideShowView.hxx b/sdext/source/presenter/PresenterSlideShowView.hxx
index 8a1b034..c081627 100644
--- a/sdext/source/presenter/PresenterSlideShowView.hxx
+++ b/sdext/source/presenter/PresenterSlideShowView.hxx
@@ -282,6 +282,8 @@ private:
     */
     void ThrowIfDisposed (void)
         throw (css::lang::DisposedException);
+
+    void impl_addAndConfigureView();
 };
 
 } } // end of namespace ::sd::presenter
commit 6ab4fac5a518fe7405936b753011dfd8c413bb62
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Apr 4 12:48:14 2012 +0200

    set alpha too

diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx
index 7c7b8e6..0bd0a56 100644
--- a/sdext/source/presenter/PresenterSlideShowView.cxx
+++ b/sdext/source/presenter/PresenterSlideShowView.cxx
@@ -360,7 +360,7 @@ void SAL_CALL PresenterSlideShowView::clear (void)
         rendering::ViewState aViewState (
             geometry::AffineMatrix2D(1,0,0, 0,1,0),
             NULL);
-        double aColor[3] = {0,0,0};
+        double aColor[4] = {0,0,0,0};
         rendering::RenderState aRenderState(
             geometry::AffineMatrix2D(1,0,0, 0,1,0),
             NULL,
commit 2049940bac74a5230decedacbd95407d93c116db
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Apr 2 13:59:14 2012 +0200

    remove useless line (probably mis-merge)

diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 260fdc0..017681a 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -451,7 +451,6 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr
             PrintDialog aDlg( NULL, i_pController );
             if( ! aDlg.Execute() )
             {
-                GDIMetaFile aPageFile;
                 i_pController->abortJob();
                 return;
             }