[Libreoffice-commits] core.git: 2 commits - sfx2/source sw/source

[Michael Stahl]

 sfx2/source/dialog/tabdlg.cxx          |    3 ++-
 sfx2/source/sidebar/ControllerItem.cxx |    4 ++++
 sw/source/ui/chrdlg/pardlg.cxx         |    2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 4950c30e633ac2d1a12a9e4b086478ac7d4f790c
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Nov 24 17:53:08 2014 +0100

    sfx2: add missing locks to FrameActionListener
    
    Change-Id: I67db5c42d1aea39cbf650de7854be853fc78e8a9

diff --git a/sfx2/source/sidebar/ControllerItem.cxx b/sfx2/source/sidebar/ControllerItem.cxx
index a0de0e3..b2cdc72 100644
--- a/sfx2/source/sidebar/ControllerItem.cxx
+++ b/sfx2/source/sidebar/ControllerItem.cxx
@@ -62,6 +62,7 @@ namespace
         }
         virtual void SAL_CALL disposing (void) SAL_OVERRIDE
         {
+            SolarMutexGuard g;
             if (mxFrame.is())
                 mxFrame->removeFrameActionListener(this);
         }
@@ -69,12 +70,15 @@ namespace
             throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
         {
             (void)rEvent;
+
+            SolarMutexGuard g;
             mrControllerItem.ResetFrame();
             mxFrame = NULL;
         }
         virtual void SAL_CALL frameAction (const css::frame::FrameActionEvent& rEvent)
             throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
         {
+            SolarMutexGuard g;
             if (rEvent.Action == frame::FrameAction_CONTEXT_CHANGED)
                 mrControllerItem.NotifyFrameContextChange();
         }
commit 5c31a1b5474f5284cf694d04de5734921891915c
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Nov 24 17:40:26 2014 +0100

    fdo#86633: sw: remove bad tab pages from SwParaDlg for drawing objects
    
    "Area" and "Transparence" only supported by Writer paragraphs.
    
    (regression from 7d9bb549d498d6beed2c4050c402d09643febdfa)
    
    Change-Id: I732e8d40fdeafaebf219fc7c5ddd53b850d8eca6

diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 1481fbd..d533f35 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -551,7 +551,8 @@ void SfxTabDialog::SetApplyHandler(const Link& _rHdl)
 
 void SfxTabDialog::Start_Impl()
 {
-    DBG_ASSERT( pImpl->aData.size() == m_pTabCtrl->GetPageCount(), "not all pages registered" );
+    assert(pImpl->aData.size() == m_pTabCtrl->GetPageCount()
+            && "not all pages registered");
     sal_uInt16 nActPage = m_pTabCtrl->GetPageId( 0 );
 
     // load old settings, when exists
diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx
index 58b4a43..3b007ca 100644
--- a/sw/source/ui/chrdlg/pardlg.cxx
+++ b/sw/source/ui/chrdlg/pardlg.cxx
@@ -129,6 +129,8 @@ SwParaDlg::SwParaDlg(vcl::Window *pParent,
         RemoveTabPage("labelTP_DROPCAPS");
         RemoveTabPage("labelTP_BACKGROUND");
         RemoveTabPage("labelTP_BORDER");
+        RemoveTabPage("area");
+        RemoveTabPage("transparence");
     }
     else
     {