sc/inc/dapiuno.hxx | 13 ++++++++-----
sc/source/ui/unoobj/dapiuno.cxx | 8 +++++---
sfx2/uiconfig/ui/templatedlg.ui | 8 ++++----
3 files changed, 17 insertions(+), 12 deletions(-)
New commits:
commit c88d2f6d57ee2ed45fb9a9f36b3a196180e2ccda
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Feb 24 14:10:43 2014 +0000
fix 'delete' not working in the Template Manager
regression from b29c078c7f193dd7dae74baf89fe1abb9264239c because if the
search
view widget is visible then its assumed that we are in search view mode
Change-Id: I8e81ffa06d5d3ac50e110105c9444707fd4c41c6
diff --git a/sfx2/uiconfig/ui/templatedlg.ui b/sfx2/uiconfig/ui/templatedlg.ui
index 5104b66..b6ecee8 100644
--- a/sfx2/uiconfig/ui/templatedlg.ui
+++ b/sfx2/uiconfig/ui/templatedlg.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
+ <requires lib="gtk+" version="3.0"/>
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkWindow" id="TemplateDialog">
<property name="width_request">800</property>
@@ -301,7 +302,6 @@
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="invisible_char">â</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -324,8 +324,8 @@
</child>
<child>
<object class="sfxlo-TemplateSearchView" id="search_view">
- <property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="no_show_all">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
</object>
@@ -337,8 +337,8 @@
</child>
<child>
<object class="sfxlo-TemplateRemoteView" id="remote_view">
- <property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="no_show_all">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
</object>
commit 5eb08bb35395786b39ff1d7def13ce8f10ec9c9b
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Feb 24 14:13:45 2014 +0000
ETOMANY getPropertyValue
Change-Id: I787257603e919b12fda07d3302ceba2a7787a9b9
diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx
index 11d6245..971e2b2 100644
--- a/sc/inc/dapiuno.hxx
+++ b/sc/inc/dapiuno.hxx
@@ -918,9 +918,10 @@ public:
std::exception);
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(
const OUString& PropertyName )
-
throw(::com::sun::star::beans::UnknownPropertyException,
-
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException);
+ throw
(::com::sun::star::beans::UnknownPropertyException,
+
::com::sun::star::lang::WrappedTargetException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL addPropertyChangeListener( const OUString&
aPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener )
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index f5dea82..82ab826 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -916,7 +916,8 @@ void SAL_CALL ScDataPilotDescriptorBase::setPropertyValue(
const OUString& aProp
}
Any SAL_CALL ScDataPilotDescriptorBase::getPropertyValue( const OUString&
aPropertyName )
- throw(UnknownPropertyException, WrappedTargetException,
RuntimeException)
+ throw (UnknownPropertyException, WrappedTargetException,
+ RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
Any aRet;
commit 1067084f15524e918231e039d44ae7157ac7e095
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Feb 24 13:42:28 2014 +0000
coverity#737536 Uncaught exception
Change-Id: Ia59a64934b65dd926c4f95953bc1ddaf00d6f8cf
diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx
index a52497b..11d6245 100644
--- a/sc/inc/dapiuno.hxx
+++ b/sc/inc/dapiuno.hxx
@@ -249,7 +249,8 @@ public:
// XDataPilotDataLayoutFieldSupplier
virtual ::com::sun::star::uno::Reference<
::com::sun::star::sheet::XDataPilotField >
SAL_CALL getDataLayoutField()
- throw(::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
// XUnoTunnel
virtual sal_Int64 SAL_CALL getSomething( const
::com::sun::star::uno::Sequence<
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index 9e1c833..f5dea82 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -1052,7 +1052,8 @@ void SAL_CALL
ScDataPilotDescriptorBase::removeVetoableChangeListener(
// XDataPilotDataLayoutFieldSupplier
-Reference< XDataPilotField > SAL_CALL
ScDataPilotDescriptorBase::getDataLayoutField() throw(RuntimeException)
+Reference< XDataPilotField > SAL_CALL
ScDataPilotDescriptorBase::getDataLayoutField()
+ throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if( ScDPObject* pDPObject = GetDPObject() )
commit f3deb8c27575228f1041feb8154369e6ea451088
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Feb 24 13:41:34 2014 +0000
coverity#737516 Uncaught exception
Change-Id: I7683cd9a27b09ed9d9b57574212cde14f103d53a
diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx
index a826bbd..a52497b 100644
--- a/sc/inc/dapiuno.hxx
+++ b/sc/inc/dapiuno.hxx
@@ -356,7 +356,8 @@ public:
// XModifyBroadcaster
virtual void SAL_CALL addModifyListener( const
::com::sun::star::uno::Reference<
::com::sun::star::util::XModifyListener >& aListener )
- throw
(::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL removeModifyListener( const
::com::sun::star::uno::Reference<
::com::sun::star::util::XModifyListener >& aListener )
throw
(::com::sun::star::uno::RuntimeException);
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index 63cd500..9e1c833 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -1325,7 +1325,7 @@ CellRangeAddress SAL_CALL
ScDataPilotTableObj::getOutputRangeByType( sal_Int32 n
}
void SAL_CALL ScDataPilotTableObj::addModifyListener( const
uno::Reference<util::XModifyListener>& aListener )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
