[Libreoffice-commits] core.git: 3 commits - cui/source sc/inc sc/source

[Caolán McNamara]

 cui/source/inc/autocdlg.hxx      |    2 ++
 cui/source/tabpages/autocdlg.cxx |   19 +++++++++++++++++--
 sc/inc/dapiuno.hxx               |    3 ++-
 sc/inc/dispuno.hxx               |    3 ++-
 sc/source/ui/unoobj/dapiuno.cxx  |    6 +++---
 sc/source/ui/unoobj/dispuno.cxx  |    6 +++---
 6 files changed, 29 insertions(+), 10 deletions(-)

New commits:
commit 58dfc97ca697875c36b7ddf14f5505a93d7b9cf8
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jan 27 12:12:04 2014 +0000

    Resolves: fdo#74057 wordlist truncated on left
    
    Change-Id: Ia6b8c02fc0d79fef974f5a0462856f05256c76f8

diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 58f7851..943ad09 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -258,6 +258,7 @@ private:
                                 LanguageType eOldLanguage,
                                 LanguageType eNewLanguage);
 
+        void setTabs();
 public:
                         OfaAutocorrReplacePage( Window* pParent, const SfxItemSet& rSet );
                         ~OfaAutocorrReplacePage();
@@ -269,6 +270,7 @@ public:
     virtual void        ActivatePage( const SfxItemSet& );
     virtual int         DeactivatePage( SfxItemSet* pSet = 0 );
     virtual void        Resize();
+    virtual void        StateChanged(StateChangedType nStateChange);
 
     void    SetLanguage(LanguageType eSet);
     void    DeleteEntry(OUString sShort, OUString sLong);
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 73348d7..3a4acaf 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -872,13 +872,28 @@ OfaAutocorrReplacePage::OfaAutocorrReplacePage( Window* pParent,
     m_pShortED->SetSpaces(true);
 }
 
-void OfaAutocorrReplacePage::Resize()
+void OfaAutocorrReplacePage::setTabs()
 {
-    SfxTabPage::Resize();
     m_pReplaceTLB->SetTab(0, m_pShortED->GetPosPixel().X(), MAP_PIXEL);
     m_pReplaceTLB->SetTab(1, m_pReplaceED->GetPosPixel().X(), MAP_PIXEL);
 }
 
+void OfaAutocorrReplacePage::StateChanged(StateChangedType nStateChange)
+{
+    SfxTabPage::StateChanged(nStateChange);
+
+    if (nStateChange == STATE_CHANGE_INITSHOW)
+    {
+        setTabs();
+    }
+}
+
+void OfaAutocorrReplacePage::Resize()
+{
+    SfxTabPage::Resize();
+    setTabs();
+}
+
 OfaAutocorrReplacePage::~OfaAutocorrReplacePage()
 {
     aDoubleStringTable.clear();
commit 953ab9e94d08cdca97ccd451b45593df602227c8
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jan 27 11:53:21 2014 +0000

    coverity#1158326 Uncaught exception
    
    Change-Id: Id9e7ce99f9451392ae5c67f93f7a30dc77865924

diff --git a/sc/inc/dispuno.hxx b/sc/inc/dispuno.hxx
index 4a97e38..841d234 100644
--- a/sc/inc/dispuno.hxx
+++ b/sc/inc/dispuno.hxx
@@ -123,7 +123,8 @@ public:
     virtual void SAL_CALL   addStatusListener( const ::com::sun::star::uno::Reference<
                                     ::com::sun::star::frame::XStatusListener >& xControl,
                                 const ::com::sun::star::util::URL& aURL )
-                                throw(::com::sun::star::uno::RuntimeException);
+                                throw(::com::sun::star::uno::RuntimeException,
+                                      std::exception);
     virtual void SAL_CALL   removeStatusListener( const ::com::sun::star::uno::Reference<
                                     ::com::sun::star::frame::XStatusListener >& xControl,
                                 const ::com::sun::star::util::URL& aURL )
diff --git a/sc/source/ui/unoobj/dispuno.cxx b/sc/source/ui/unoobj/dispuno.cxx
index 6ee045a..2ac9435 100644
--- a/sc/source/ui/unoobj/dispuno.cxx
+++ b/sc/source/ui/unoobj/dispuno.cxx
@@ -275,9 +275,9 @@ static void lcl_FillDataSource( frame::FeatureStateEvent& rEvent, const ScImport
 }
 
 void SAL_CALL ScDispatch::addStatusListener(
-                                const uno::Reference<frame::XStatusListener>& xListener,
-                                const util::URL& aURL )
-                                throw(uno::RuntimeException)
+    const uno::Reference<frame::XStatusListener>& xListener,
+    const util::URL& aURL)
+        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
commit dc752ba6e447fd5fa93ca4e94fab9606a229a271
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jan 27 11:51:48 2014 +0000

    coverity#1158327 Uncaught exception
    
    Change-Id: I90d8361712e6d403444a53478e2a8e874c82e02e

diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx
index 8fd2a23..590f60f 100644
--- a/sc/inc/dapiuno.hxx
+++ b/sc/inc/dapiuno.hxx
@@ -111,7 +111,8 @@ public:
                                     const ::com::sun::star::table::CellAddress& aOutputAddress,
                                     const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::sheet::XDataPilotDescriptor >& xDescriptor )
-                                    throw(::com::sun::star::uno::RuntimeException);
+                                    throw(::com::sun::star::uno::RuntimeException,
+                                          std::exception);
     virtual void SAL_CALL   removeByName( const OUString& aName )
                                     throw(::com::sun::star::uno::RuntimeException);
 
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index 8913cef..3eb8198 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -407,9 +407,9 @@ static OUString lcl_GetOriginalName( const Reference< XNamed > xDim )
 }
 
 void SAL_CALL ScDataPilotTablesObj::insertNewByName( const OUString& aNewName,
-                                    const CellAddress& aOutputAddress,
-                                    const Reference<XDataPilotDescriptor>& xDescriptor )
-                                throw(RuntimeException)
+    const CellAddress& aOutputAddress,
+    const Reference<XDataPilotDescriptor>& xDescriptor )
+        throw(RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (!xDescriptor.is()) return;