dbaccess/inc/dbaccess_helpid.hrc | 7
dbaccess/source/ui/dlg/indexdialog.cxx | 75 +++++--
dbaccess/source/ui/inc/indexdialog.hxx | 31 ++-
dbaccess/source/ui/misc/ToolBoxHelper.cxx | 5
dbaccess/uiconfig/ui/indexdesigndialog.ui | 260 +++++++++++++++++----------
include/dbaccess/ToolBoxHelper.hxx | 9
reportdesign/source/ui/dlg/AddField.cxx | 4
reportdesign/source/ui/dlg/Condition.cxx | 5
reportdesign/source/ui/dlg/Condition.hxx | 4
reportdesign/source/ui/dlg/GroupsSorting.cxx | 5
reportdesign/source/ui/inc/AddField.hxx | 4
reportdesign/source/ui/inc/GroupsSorting.hxx | 4
sc/inc/cellsuno.hxx | 2
sc/source/ui/unoobj/cellsuno.cxx | 5
14 files changed, 274 insertions(+), 146 deletions(-)
New commits:
commit 0dc13e9c06bf5bc188b427f0760d0dc2eee8f75e
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Jun 10 12:32:03 2014 +0100
tweak things to allow switching between small and large toolbar icons
Change-Id: Ife4da4c6f4acc3b3f9fde18cdfc09635cf9b6776
diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc
index 407c414..873e657 100644
--- a/dbaccess/inc/dbaccess_helpid.hrc
+++ b/dbaccess/inc/dbaccess_helpid.hrc
@@ -126,12 +126,6 @@
#define HID_DSADMIN_MOZILLA_PROFILE_NAME
"DBACCESS_HID_DSADMIN_MOZILLA_PROFILE_NAME"
#define HID_DSADMIN_THUNDERBIRD_PROFILE_NAME
"DBACCESS_HID_DSADMIN_THUNDERBIRD_PROFILE_NAME"
-#define HID_DLGIDX_NEWINDEX
"DBACCESS_HID_DLGIDX_NEWINDEX"
-#define HID_DLGIDX_DROPINDEX
"DBACCESS_HID_DLGIDX_DROPINDEX"
-#define HID_DLGIDX_RENAMEINDEX
"DBACCESS_HID_DLGIDX_RENAMEINDEX"
-#define HID_DLGIDX_SAVEINDEX
"DBACCESS_HID_DLGIDX_SAVEINDEX"
-#define HID_DLGIDX_RESETINDEX
"DBACCESS_HID_DLGIDX_RESETINDEX"
-#define HID_DLGIDX_INDEXLIST
"DBACCESS_HID_DLGIDX_INDEXLIST"
#define UID_DLGINDEX_INDEXDETAILS_BACK
"DBACCESS_UID_DLGINDEX_INDEXDETAILS_BACK"
#define UID_DLGINDEX_INDEXDETAILS_MAIN
"DBACCESS_UID_DLGINDEX_INDEXDETAILS_MAIN"
#define HID_DLGINDEX_INDEXDETAILS_FIELD
"DBACCESS_HID_DLGINDEX_INDEXDETAILS_FIELD"
@@ -249,7 +243,6 @@
#define HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE
"DBACCESS_HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE"
#define HID_PAGE_DBWIZARD_USERDEFINED_BROWSE
"DBACCESS_HID_PAGE_DBWIZARD_USERDEFINED_BROWSE"
-#define HID_INDEX_DIALOG_ACTION_TB
"DBACCESS_HID_INDEX_DIALOG_ACTION_TB"
#define HID_DLG_DATABASE_WIZARD
"DBACCESS_HID_DLG_DATABASE_WIZARD"
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx
b/dbaccess/source/ui/dlg/indexdialog.cxx
index 3c5cfac..7de55fa 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -177,14 +177,38 @@ namespace dbaui
,m_xContext(_rxContext)
{
get(m_pActions, "ACTIONS");
+
+ mnNewCmdId = m_pActions->GetItemId(INDEX_NEW_CMD);
+ mnDropCmdId = m_pActions->GetItemId(INDEX_DROP_CMD);
+ mnRenameCmdId = m_pActions->GetItemId(INDEX_RENAME_CMD);
+ mnSaveCmdId = m_pActions->GetItemId(INDEX_SAVE_CMD);
+ mnResetCmdId = m_pActions->GetItemId(INDEX_RESET_CMD);
+
+ maScNewCmdImg = m_pActions->GetItemImage(mnNewCmdId);
+ maScDropCmdImg = m_pActions->GetItemImage(mnDropCmdId);
+ maScRenameCmdImg = m_pActions->GetItemImage(mnRenameCmdId);
+ maScSaveCmdImg = m_pActions->GetItemImage(mnSaveCmdId);
+ maScResetCmdImg = m_pActions->GetItemImage(mnResetCmdId);
+ maLcNewCmdImg = get<FixedImage>("image1")->GetImage();
+ maLcDropCmdImg = get<FixedImage>("image2")->GetImage();
+ maLcRenameCmdImg = get<FixedImage>("image3")->GetImage();
+ maLcSaveCmdImg = get<FixedImage>("image4")->GetImage();
+ maLcResetCmdImg = get<FixedImage>("image5")->GetImage();
+
get(m_pIndexList, "INDEX_LIST");
+ Size aSize(LogicToPixel(Size(70, 97), MAP_APPFONT));
+ m_pIndexList->set_width_request(aSize.Width());
+ m_pIndexList->set_height_request(aSize.Height());
get(m_pIndexDetails, "INDEX_DETAILS");
get(m_pDescriptionLabel, "DESC_LABEL");
get(m_pDescription, "DESCRIPTION");
get(m_pUnique, "UNIQUE");
get(m_pFieldsLabel, "FIELDS_LABEL");
get(m_pFields, "FIELDS");
- get(m_pClose, "CLOSE");
+ aSize = LogicToPixel(Size(128, 61), MAP_APPFONT);
+ m_pFields->set_width_request(aSize.Width());
+ m_pFields->set_height_request(aSize.Height());
+ get(m_pClose, "close");
m_pActions->SetSelectHdl(LINK(this, DbaIndexDialog, OnIndexAction));
@@ -242,7 +266,7 @@ namespace dbaui
void DbaIndexDialog::updateToolbox()
{
- m_pActions->EnableItem(m_pActions->GetItemId(INDEX_NEW_CMD),
!m_pIndexList->IsEditingActive());
+ m_pActions->EnableItem(mnNewCmdId, !m_pIndexList->IsEditingActive());
SvTreeListEntry* pSelected = m_pIndexList->FirstSelected();
bool bSelectedAnything = NULL != pSelected;
@@ -251,17 +275,17 @@ namespace dbaui
{
// is the current entry modified?
Indexes::const_iterator aSelectedPos = m_pIndexes->begin() +
reinterpret_cast<sal_IntPtr>(pSelected->GetUserData());
- m_pActions->EnableItem(m_pActions->GetItemId(INDEX_SAVE_CMD),
aSelectedPos->isModified() || aSelectedPos->isNew());
- m_pActions->EnableItem(m_pActions->GetItemId(INDEX_RESET_CMD),
aSelectedPos->isModified() || aSelectedPos->isNew());
+ m_pActions->EnableItem(mnSaveCmdId, aSelectedPos->isModified() ||
aSelectedPos->isNew());
+ m_pActions->EnableItem(mnResetCmdId, aSelectedPos->isModified() ||
aSelectedPos->isNew());
bSelectedAnything = bSelectedAnything &&
!aSelectedPos->bPrimaryKey;
}
else
{
- m_pActions->EnableItem(m_pActions->GetItemId(INDEX_SAVE_CMD),
false);
- m_pActions->EnableItem(m_pActions->GetItemId(INDEX_RESET_CMD),
false);
+ m_pActions->EnableItem(mnSaveCmdId, false);
+ m_pActions->EnableItem(mnResetCmdId, false);
}
- m_pActions->EnableItem(m_pActions->GetItemId(INDEX_DROP_CMD),
bSelectedAnything);
- m_pActions->EnableItem(m_pActions->GetItemId(INDEX_RENAME_CMD),
bSelectedAnything);
+ m_pActions->EnableItem(mnDropCmdId, bSelectedAnything);
+ m_pActions->EnableItem(mnRenameCmdId, bSelectedAnything);
}
void DbaIndexDialog::fillIndexList()
@@ -508,17 +532,16 @@ namespace dbaui
IMPL_LINK( DbaIndexDialog, OnIndexAction, ToolBox*, /*NOTINTERESTEDIN*/ )
{
- const OUString
sClicked(m_pActions->GetItemCommand(m_pActions->GetCurItemId()));
-
- if(sClicked == INDEX_NEW_CMD)
+ sal_uInt16 nClicked = m_pActions->GetCurItemId();
+ if (nClicked == mnNewCmdId)
OnNewIndex();
- else if(sClicked == INDEX_DROP_CMD)
+ else if (nClicked == mnDropCmdId)
OnDropIndex();
- else if(sClicked == INDEX_RENAME_CMD)
+ else if (nClicked == mnRenameCmdId)
OnRenameIndex();
- else if(sClicked == INDEX_SAVE_CMD)
+ else if (nClicked == mnSaveCmdId)
OnSaveIndex();
- else if(sClicked == INDEX_RESET_CMD)
+ else if (nClicked == mnResetCmdId)
OnResetIndex();
return 0L;
@@ -804,16 +827,28 @@ namespace dbaui
checkImageList();
}
}
- ImageList DbaIndexDialog::getImageList(sal_Int16 _eBitmapSet) const
+
+ void DbaIndexDialog::setImageList(sal_Int16 _eBitmapSet)
{
- sal_Int16 nN = IMG_INDEX_DLG_SC;
if ( _eBitmapSet == SFX_SYMBOLS_SIZE_LARGE )
{
- nN = IMG_INDEX_DLG_LC;
+ m_pActions->SetItemImage(mnNewCmdId, maLcNewCmdImg);
+ m_pActions->SetItemImage(mnDropCmdId, maLcDropCmdImg);
+ m_pActions->SetItemImage(mnRenameCmdId, maLcRenameCmdImg);
+ m_pActions->SetItemImage(mnSaveCmdId, maLcSaveCmdImg);
+ m_pActions->SetItemImage(mnResetCmdId, maLcResetCmdImg);
+ }
+ else
+ {
+ m_pActions->SetItemImage(mnNewCmdId, maScNewCmdImg);
+ m_pActions->SetItemImage(mnDropCmdId, maScDropCmdImg);
+ m_pActions->SetItemImage(mnRenameCmdId, maScRenameCmdImg);
+ m_pActions->SetItemImage(mnSaveCmdId, maScSaveCmdImg);
+ m_pActions->SetItemImage(mnResetCmdId, maScResetCmdImg);
}
- return ImageList(ModuleRes(nN));
}
- void DbaIndexDialog::resizeControls(const Size& _rDiff)
+
+ void DbaIndexDialog::resizeControls(const Size&)
{
}
diff --git a/dbaccess/source/ui/inc/indexdialog.hxx
b/dbaccess/source/ui/inc/indexdialog.hxx
index 057c6a4..3aa05ff 100644
--- a/dbaccess/source/ui/inc/indexdialog.hxx
+++ b/dbaccess/source/ui/inc/indexdialog.hxx
@@ -115,18 +115,14 @@ namespace dbaui
virtual void StateChanged( StateChangedType nStateChange )
SAL_OVERRIDE;
virtual void DataChanged( const DataChangedEvent& rDCEvt )
SAL_OVERRIDE;
- /** will be called whenthe id of the image list is needed.
+ //TO-DO, remove when all other OToolBoxHelper are converted to .ui
+ virtual void resizeControls(const Size&) SAL_OVERRIDE;
+
+ /** will be called when the id of the image list needs to change
@param _eBitmapSet
<svtools/imgdef.hxx>
- @param _bHiContast
- <TRUE/> when in high contrast mode.
- */
- virtual ImageList getImageList(sal_Int16 _eBitmapSet) const
SAL_OVERRIDE;
-
- /** will be called when the controls need to be resized.
*/
- virtual void resizeControls(const Size& _rDiff) SAL_OVERRIDE;
-
+ virtual void setImageList(sal_Int16 _eBitmapSet) SAL_OVERRIDE;
protected:
void fillIndexList();
void updateToolbox();
@@ -142,6 +138,23 @@ namespace dbaui
DECL_LINK( OnEditIndexAgain, SvTreeListEntry* );
private:
+ sal_uInt16 mnNewCmdId;
+ sal_uInt16 mnDropCmdId;
+ sal_uInt16 mnRenameCmdId;
+ sal_uInt16 mnSaveCmdId;
+ sal_uInt16 mnResetCmdId;
+
+ Image maScNewCmdImg;
+ Image maScDropCmdImg;
+ Image maScRenameCmdImg;
+ Image maScSaveCmdImg;
+ Image maScResetCmdImg;
+ Image maLcNewCmdImg;
+ Image maLcDropCmdImg;
+ Image maLcRenameCmdImg;
+ Image maLcSaveCmdImg;
+ Image maLcResetCmdImg;
+
void OnNewIndex();
void OnDropIndex(bool _bConfirm = true);
void OnRenameIndex();
diff --git a/dbaccess/source/ui/misc/ToolBoxHelper.cxx
b/dbaccess/source/ui/misc/ToolBoxHelper.cxx
index c9e0df3..0e05165 100644
--- a/dbaccess/source/ui/misc/ToolBoxHelper.cxx
+++ b/dbaccess/source/ui/misc/ToolBoxHelper.cxx
@@ -29,7 +29,7 @@
namespace dbaui
{
OToolBoxHelper::OToolBoxHelper()
- : m_nSymbolsSize(-1 )
+ : m_nSymbolsSize(-1)
, m_pToolBox(NULL)
{
@@ -51,8 +51,8 @@ namespace dbaui
if ( nCurSymbolsSize != m_nSymbolsSize )
{
m_nSymbolsSize = nCurSymbolsSize;
+ setImageList(m_nSymbolsSize);
- m_pToolBox->SetImageList( getImageList(m_nSymbolsSize) );
Size aTbOldSize = m_pToolBox->GetSizePixel();
adjustToolBoxSize(m_pToolBox);
Size aTbNewSize = m_pToolBox->GetSizePixel();
@@ -62,6 +62,7 @@ namespace dbaui
}
}
}
+
IMPL_LINK(OToolBoxHelper, ConfigOptionsChanged, SvtMiscOptions*,
/*_pOptions*/)
{
if ( m_pToolBox )
diff --git a/dbaccess/uiconfig/ui/indexdesigndialog.ui
b/dbaccess/uiconfig/ui/indexdesigndialog.ui
index 0c6b91d..3068894 100755
--- a/dbaccess/uiconfig/ui/indexdesigndialog.ui
+++ b/dbaccess/uiconfig/ui/indexdesigndialog.ui
@@ -1,11 +1,11 @@
<?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="GtkDialog" id="IndexDesignDialog">
- <property name="width_request">500</property>
- <property name="height_request">300</property>
<property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Indexes</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -18,13 +18,12 @@
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="CLOSE">
- <property name="label">gtk-cancel</property>
+ <object class="GtkButton" id="close">
+ <property name="label">gtk-close</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -34,13 +33,12 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="HELP">
+ <object class="GtkButton" id="help">
<property name="label">gtk-help</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -64,92 +62,175 @@
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkToolbar" id="ACTIONS">
+ <object class="GtkGrid" id="grid3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkToolButton" id="ID_INDEX_NEW">
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">start</property>
- <property name="use_action_appearance">False</property>
- <property name="action_name">.index:createNew</property>
- <property name="label" translatable="yes">New
Index</property>
- <property name="use_underline">True</property>
- <property
name="icon_name">dbaccess/res/lc036.png</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="ID_INDEX_DROP">
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">start</property>
- <property name="use_action_appearance">False</property>
- <property name="action_name">.index:dropCurrent</property>
- <property name="label" translatable="yes">Delete Current
Index</property>
- <property name="use_underline">True</property>
- <property
name="icon_name">dbaccess/res/lc037.png</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="ID_INDEX_RENAME">
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">start</property>
- <property name="use_action_appearance">False</property>
- <property
name="action_name">.index:renameCurrent</property>
- <property name="label" translatable="yes">Rename Current
Index</property>
- <property name="use_underline">True</property>
- <property
name="icon_name">dbaccess/res/lc038.png</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="ID_INDEX_SAVE">
- <property name="use_action_appearance">False</property>
+ <object class="GtkToolbar" id="ACTIONS">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign">start</property>
- <property name="use_action_appearance">False</property>
- <property name="action_name">.index:saveCurrent</property>
- <property name="label" translatable="yes">Save Current
Index</property>
- <property name="use_underline">True</property>
- <property
name="icon_name">dbaccess/res/lc039.png</property>
+ <child>
+ <object class="GtkToolButton" id="ID_INDEX_NEW">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property
name="action_name">.index:createNew</property>
+ <property name="label" translatable="yes">New
Index</property>
+ <property name="use_underline">True</property>
+ <property
name="icon_name">dbaccess/res/sc036.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="ID_INDEX_DROP">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property
name="action_name">.index:dropCurrent</property>
+ <property name="label" translatable="yes">Delete
Current Index</property>
+ <property name="use_underline">True</property>
+ <property
name="icon_name">dbaccess/res/sc037.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="ID_INDEX_RENAME">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property
name="action_name">.index:renameCurrent</property>
+ <property name="label" translatable="yes">Rename
Current Index</property>
+ <property name="use_underline">True</property>
+ <property
name="icon_name">dbaccess/res/sc038.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="ID_INDEX_SAVE">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property
name="action_name">.index:saveCurrent</property>
+ <property name="label" translatable="yes">Save Current
Index</property>
+ <property name="use_underline">True</property>
+ <property
name="icon_name">dbaccess/res/sc039.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="ID_INDEX_RESET">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property
name="action_name">.index:resetCurrent</property>
+ <property name="label" translatable="yes">Reset
Current Index</property>
+ <property name="use_underline">True</property>
+ <property
name="icon_name">dbaccess/res/sc040.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkToolButton" id="ID_INDEX_RESET">
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
+ <object class="GtkGrid" id="grid2">
<property name="can_focus">False</property>
- <property name="valign">start</property>
- <property name="use_action_appearance">False</property>
- <property name="action_name">.index:resetCurrent</property>
- <property name="label" translatable="yes">Reset Current
Index</property>
- <property name="use_underline">True</property>
- <property
name="icon_name">dbaccess/res/lc040.png</property>
+ <property name="no_show_all">True</property>
+ <property name="halign">end</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="pixbuf">dbaccess/res/lc036.png</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="image2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="pixbuf">dbaccess/res/lc037.png</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="image3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="pixbuf">dbaccess/res/lc038.png</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="image4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="pixbuf">dbaccess/res/lc039.png</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="image5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="pixbuf">dbaccess/res/lc040.png</property>
+ </object>
+ <packing>
+ <property name="left_attach">4</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
@@ -231,7 +312,6 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="halign">start</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>
@@ -248,6 +328,8 @@
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label"
translatable="yes">Fields</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">FIELDS</property>
</object>
<packing>
<property name="expand">False</property>
@@ -257,12 +339,13 @@
</child>
<child>
<object class="dbulo-DbaIndexFieldsControl" id="FIELDS">
- <property name="width_request">210</property>
- <property name="height_request">100</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"
id="IndexFieldsControl-selection1"/>
+ </child>
</object>
<packing>
<property name="expand">True</property>
@@ -284,6 +367,9 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"
id="DbaIndexList-selection1"/>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -309,8 +395,8 @@
</object>
</child>
<action-widgets>
- <action-widget response="0">CLOSE</action-widget>
- <action-widget response="0">HELP</action-widget>
+ <action-widget response="0">close</action-widget>
+ <action-widget response="0">help</action-widget>
</action-widgets>
</object>
</interface>
diff --git a/include/dbaccess/ToolBoxHelper.hxx
b/include/dbaccess/ToolBoxHelper.hxx
index e06dc30..6fe04d5 100644
--- a/include/dbaccess/ToolBoxHelper.hxx
+++ b/include/dbaccess/ToolBoxHelper.hxx
@@ -42,16 +42,17 @@ namespace dbaui
/** will be called when the controls need to be resized.
@param _rDiff
Contains the difference of the old and new toolbox size.
+
+ TO-DO: remove this when all implmentations
+ are converted to .ui format
*/
virtual void resizeControls(const Size& _rDiff) = 0;
- /** will be called when the image list is needed.
+ /** will be called when the image list needs to change
@param _eSymbolsSize
<svtools/imgdef.hxx>
- @param _bHiContast
- <TRUE/> when in high contrast mode.
*/
- virtual ImageList getImageList(sal_Int16 _eSymbolsSize) const = 0;
+ virtual void setImageList(sal_Int16 _eSymbolsSize) = 0;
/** only the member will be set, derived classes can overload this
function and do what need to be done.
@param _pTB
diff --git a/reportdesign/source/ui/dlg/AddField.cxx
b/reportdesign/source/ui/dlg/AddField.cxx
index c8bb5cf..1b447be 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -490,12 +490,12 @@ IMPL_LINK( OAddFieldWindow, OnDoubleClickHdl, void*
,/*_pAddFieldDlg*/)
return 0L;
}
-ImageList OAddFieldWindow::getImageList(sal_Int16 _eBitmapSet) const
+void OAddFieldWindow::setImageList(sal_Int16 _eBitmapSet)
{
sal_Int16 nN = IMG_ADDFIELD_DLG_SC;
if ( _eBitmapSet == SFX_SYMBOLS_SIZE_LARGE )
nN = IMG_ADDFIELD_DLG_LC;
- return ImageList(ModuleRes(nN));
+ m_aActions.SetImageList(ImageList(ModuleRes(nN)));
}
void OAddFieldWindow::resizeControls(const Size& _rDiff)
diff --git a/reportdesign/source/ui/dlg/Condition.cxx
b/reportdesign/source/ui/dlg/Condition.cxx
index 3d22579..d41009d 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -365,7 +365,6 @@ IMPL_LINK( Condition, OnConditionAction, Button*,
_pClickedButton )
return 0L;
}
-
void Condition::ApplyCommand( sal_uInt16 _nCommandId, const ::Color& _rColor)
{
if ( _nCommandId == SID_ATTR_CHAR_COLOR2 )
@@ -376,12 +375,12 @@ void Condition::ApplyCommand( sal_uInt16 _nCommandId,
const ::Color& _rColor)
m_rAction.applyCommand( m_nCondIndex, _nCommandId, _rColor );
}
-ImageList Condition::getImageList(sal_Int16 _eBitmapSet) const
+void Condition::setImageList(sal_Int16 _eBitmapSet)
{
sal_Int16 nN = IMG_CONDFORMAT_DLG_SC;
if ( _eBitmapSet == SFX_SYMBOLS_SIZE_LARGE )
nN = IMG_CONDFORMAT_DLG_LC;
- return ImageList(ModuleRes(nN));
+ m_aActions.SetImageList(ImageList(ModuleRes(nN)));
}
void Condition::resizeControls(const Size& _rDiff)
diff --git a/reportdesign/source/ui/dlg/Condition.hxx
b/reportdesign/source/ui/dlg/Condition.hxx
index 2e1b66d..b28b43a 100644
--- a/reportdesign/source/ui/dlg/Condition.hxx
+++ b/reportdesign/source/ui/dlg/Condition.hxx
@@ -98,11 +98,11 @@ namespace rptui
Condition( Window* _pParent, IConditionalFormatAction& _rAction,
::rptui::OReportController& _rController );
virtual ~Condition();
- /** will be called when the id of the image list is needed.
+ /** will be called when the id of the image list needs to change.
@param _eBitmapSet
<svtools/imgdef.hxx>
*/
- virtual ImageList getImageList(sal_Int16 _eBitmapSet) const
SAL_OVERRIDE;
+ virtual void setImageList(sal_Int16 _eBitmapSet) SAL_OVERRIDE;
/** will be called when the controls need to be resized.
*/
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx
b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index c25262f..a77fcad 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -1404,15 +1404,14 @@ void OGroupsSortingDialog::checkButtons(sal_Int32 _nRow)
}
}
-ImageList OGroupsSortingDialog::getImageList(sal_Int16 _eBitmapSet) const
+void OGroupsSortingDialog::setImageList(sal_Int16 _eBitmapSet)
{
sal_Int16 nN = IMG_CONDFORMAT_DLG_SC;
if ( _eBitmapSet == SFX_SYMBOLS_SIZE_LARGE )
nN = IMG_CONDFORMAT_DLG_LC;
- return ImageList(ModuleRes( nN ));
+ m_aToolBox.SetImageList(ImageList(ModuleRes(nN)));
}
-
void OGroupsSortingDialog::resizeControls(const Size& _rDiff)
{
// we use large images so we must change them
diff --git a/reportdesign/source/ui/inc/AddField.hxx
b/reportdesign/source/ui/inc/AddField.hxx
index 524c08a..3c188f9 100644
--- a/reportdesign/source/ui/inc/AddField.hxx
+++ b/reportdesign/source/ui/inc/AddField.hxx
@@ -94,11 +94,11 @@ public:
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
getSelectedFieldDescriptors();
- /** will be called when the id of the image list is needed.
+ /** will be called when the id of the image list needs to change.
@param _eBitmapSet
<svtools/imgdef.hxx>
*/
- virtual ImageList getImageList(sal_Int16 _eBitmapSet) const SAL_OVERRIDE;
+ virtual void setImageList(sal_Int16 _eBitmapSet) SAL_OVERRIDE;
/** will be called when the controls need to be resized.
*/
diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx
b/reportdesign/source/ui/inc/GroupsSorting.hxx
index a36d64e..feb4d4d 100644
--- a/reportdesign/source/ui/inc/GroupsSorting.hxx
+++ b/reportdesign/source/ui/inc/GroupsSorting.hxx
@@ -172,11 +172,11 @@ public:
*/
virtual void resizeControls(const Size& _rDiff) SAL_OVERRIDE;
- /** will be called when the image list is needed.
+ /** will be called when the image list needs to change
@param _eSymbolsSize
<svtools/imgdef.hxx>
*/
- virtual ImageList getImageList(sal_Int16 _eSymbolsSize) const SAL_OVERRIDE;
+ virtual void setImageList(sal_Int16 _eSymbolsSize) SAL_OVERRIDE;
// ImageListProvider interface
virtual ImageList getImageList(vcl::ImageListType) SAL_OVERRIDE;
commit ae4da7d36b66bfdf9c253ba69d2bcff979c71d9e
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Jun 10 12:33:01 2014 +0100
coverity#1187810 Uncaught exception
Change-Id: Icfd867bbe24ca738ad409001115d1b0470041de4
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index da32472..d7648f1 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -657,7 +657,7 @@ protected:
void SetArrayFormula_Impl( const OUString& rFormula,
const OUString& rFormulaNmsp,
const formula::FormulaGrammar::Grammar
eGrammar )
-
throw(::com::sun::star::uno::RuntimeException);
+ throw (css::uno::RuntimeException,
std::exception);
public:
ScCellRangeObj(ScDocShell* pDocSh, const ScRange&
rR);
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index dd3a0e2..699bb65 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -5054,8 +5054,9 @@ OUString SAL_CALL ScCellRangeObj::getArrayFormula()
throw(uno::RuntimeException,
return aFormula;
}
-void ScCellRangeObj::SetArrayFormula_Impl( const OUString& rFormula,
- const OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar
eGrammar ) throw(uno::RuntimeException)
+void ScCellRangeObj::SetArrayFormula_Impl(const OUString& rFormula,
+ const OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar
eGrammar)
+ throw (uno::RuntimeException, std::exception)
{
ScDocShell* pDocSh = GetDocShell();
if (pDocSh)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
