[Libreoffice-commits] core.git: 4 commits - chart2/uiconfig framework/source svx/source
Caolán McNamara
caolanm at redhat.com
Mon Feb 10 06:49:16 PST 2014
chart2/uiconfig/ui/tp_RangeChooser.ui | 14 +++++++-------
framework/source/uielement/popuptoolbarcontroller.cxx | 18 ++++++++++++++----
svx/source/stbctrls/insctrl.cxx | 5 ++++-
3 files changed, 25 insertions(+), 12 deletions(-)
New commits:
commit b7c89c53a0769236c67f8802f63eab6e5b94560b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 13:36:14 2014 +0000
set mnemonic widgets
Change-Id: Ia093bcd93bd453f039b0dcba744cb8608158ed43
diff --git a/chart2/uiconfig/ui/tp_RangeChooser.ui b/chart2/uiconfig/ui/tp_RangeChooser.ui
index bc3a1b3..0d32774 100644
--- a/chart2/uiconfig/ui/tp_RangeChooser.ui
+++ b/chart2/uiconfig/ui/tp_RangeChooser.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"/>
<object class="GtkImage" id="imageIB_RANGE">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -76,7 +77,6 @@
<property name="can_focus">False</property>
<property name="receives_default">True</property>
<property name="tooltip_markup" translatable="yes">Select data range</property>
- <property name="use_action_appearance">False</property>
<property name="image">imageIB_RANGE</property>
</object>
<packing>
@@ -99,7 +99,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="active">True</property>
@@ -119,7 +118,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="active">True</property>
@@ -139,7 +137,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -157,7 +154,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -186,7 +182,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -200,6 +195,7 @@
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkEntry" id="ED_TIME_BASED_START">
<property name="visible">True</property>
@@ -237,6 +233,8 @@
<property name="can_focus">False</property>
<property name="xpad">4</property>
<property name="label" translatable="yes">Start Table Index</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">ED_TIME_BASED_START</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -251,6 +249,8 @@
<property name="can_focus">False</property>
<property name="xpad">8</property>
<property name="label" translatable="yes">End Table Index</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">ED_TIME_BASED_END</property>
</object>
<packing>
<property name="left_attach">2</property>
commit c218eb9d4070811eb5b543317bc4c1ba6252062b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 13:05:42 2014 +0000
coverity#1169805 Unchecked return value
Change-Id: I3eef47e4debc6cfde1ef881a3d525f5ec0adf431
diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx
index 7139d68..8a9c8a6 100644
--- a/svx/source/stbctrls/insctrl.cxx
+++ b/svx/source/stbctrls/insctrl.cxx
@@ -79,9 +79,12 @@ void SvxInsertStatusBarControl::Click()
SfxBoolItem aIns( GetSlotId(), bInsert );
::com::sun::star::uno::Any a;
+ bool bHasValue = aIns.QueryValue( a );
+ if (!bHasValue)
+ return;
+
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 );
aArgs[0].Name = "InsertMode";
- aIns.QueryValue( a );
aArgs[0].Value = a;
execute( aArgs );
commit 6e73260a306b3b711f110f0d36dfbddb6623d102
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 12:50:52 2014 +0000
coverity#1169845 Uncaught exception
Change-Id: Ifec059d66b92233fbff967a5da6fdc88915eefb1
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx
index debc181..36c38e2 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -38,6 +38,7 @@
#include <com/sun/star/frame/XPopupMenuController.hpp>
#include <com/sun/star/frame/XUIControllerFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/ucb/CommandFailedException.hpp>
#define UNO_COMMAND_RECENT_FILE_LIST ".uno:RecentFileList"
@@ -405,9 +406,15 @@ void SAL_CALL NewToolbarController::statusChanged( const css::frame::FeatureStat
{
OUString aState;
rEvent.State >>= aState;
- // set the image even if the state is not a string
- // this will set the image of the default module
- setItemImage( aState );
+ try
+ {
+ // set the image even if the state is not a string
+ // this will set the image of the default module
+ setItemImage( aState );
+ }
+ catch (const css::ucb::CommandFailedException&)
+ {
+ }
}
enable( rEvent.IsEnabled );
commit b78efa182a1130935f699c5f8972895e34a8bd87
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 12:48:36 2014 +0000
add modelines
Change-Id: I5d96a2d1e4c1ffcc736af0666d33a1a62ba628c5
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx
index 33f73ec..debc181 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -398,7 +399,7 @@ throw ( css::uno::Exception, css::uno::RuntimeException )
}
void SAL_CALL NewToolbarController::statusChanged( const css::frame::FeatureStateEvent& rEvent )
-throw ( css::uno::RuntimeException )
+ throw ( css::uno::RuntimeException )
{
if ( rEvent.IsEnabled )
{
@@ -593,3 +594,5 @@ org_apache_openoffice_comp_framework_NewToolbarController_get_implementation(
{
return cppu::acquire(new NewToolbarController(context));
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list