cui/source/inc/align.hxx | 5
cui/source/tabpages/align.cxx | 13 +
dbaccess/AllLangResTarget_dbu.mk | 1
dbaccess/UIConfig_dbaccess.mk | 1
dbaccess/source/ui/control/FieldDescControl.cxx | 3
dbaccess/source/ui/dlg/dlgattr.cxx | 35 +----
dbaccess/source/ui/dlg/dlgattr.src | 77 -----------
dbaccess/source/ui/inc/UITools.hxx | 1
dbaccess/source/ui/inc/dbu_resource.hrc | 1
dbaccess/source/ui/inc/dlgattr.hrc | 30 ----
dbaccess/source/ui/inc/dlgattr.hxx | 7 -
dbaccess/source/ui/misc/UITools.cxx | 16 --
dbaccess/uiconfig/ui/fielddialog.ui | 159 ++++++++++++++++++++++++
13 files changed, 197 insertions(+), 152 deletions(-)
New commits:
commit 2681f6442faa7b50fb49c48d64f64d3fddcc776e
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Jan 17 14:59:01 2014 +0000
fix up logic to hide empty frames for e.g. field format in dbaccess
Change-Id: I85a71cbc3f072940a369c10e13fe40a13008df66
diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx
index c56925e..d6b6937 100644
--- a/cui/source/inc/align.hxx
+++ b/cui/source/inc/align.hxx
@@ -40,6 +40,7 @@
#include <vcl/field.hxx>
#include <vcl/button.hxx>
#include <vcl/fixed.hxx>
+#include <vcl/layout.hxx>
#include <vcl/lstbox.hxx>
#include <sfx2/tabdlg.hxx>
#include <svtools/valueset.hxx>
@@ -80,6 +81,7 @@ private:
ListBox* m_pLbHorAlign;
FixedText* m_pFtIndent;
MetricField* m_pEdIndent;
+ FixedText* m_pFtVerAlign;
ListBox* m_pLbVerAlign;
DialControl* m_pCtrlDial;
@@ -103,6 +105,9 @@ private:
FixedText* m_pFtCelLock;
FixedText* m_pFtABCD;
+ VclContainer* m_pAlignmentFrame;
+ VclContainer* m_pOrientFrame;
+ VclContainer* m_pPropertiesFrame;
};
// ============================================================================
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 5ba830a..7e07163 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -160,6 +160,7 @@ AlignmentTabPage::AlignmentTabPage( Window* pParent, const
SfxItemSet& rCoreAttr
get(m_pLbHorAlign,"comboboxHorzAlign");
get(m_pFtIndent,"labelIndent");
get(m_pEdIndent,"spinIndentFrom");
+ get(m_pFtVerAlign,"labelVertAlign");
get(m_pLbVerAlign,"comboboxVertAlign");
//text rotation
@@ -188,6 +189,10 @@ AlignmentTabPage::AlignmentTabPage( Window* pParent, const
SfxItemSet& rCoreAttr
get(m_pFtCelLock,"labelSTR_CELLLOCK");
get(m_pFtABCD,"labelABCD");
+ get(m_pAlignmentFrame, "alignment");
+ get(m_pOrientFrame, "orientation");
+ get(m_pPropertiesFrame, "properties");
+
m_pCtrlDial->SetText(m_pFtABCD->GetText());
InitVsRefEgde();
@@ -227,6 +232,7 @@ AlignmentTabPage::AlignmentTabPage( Window* pParent, const
SfxItemSet& rCoreAttr
AddItemConnection( new HorJustConnection( SID_ATTR_ALIGN_HOR_JUSTIFY,
*m_pLbHorAlign, s_pHorJustMap, sfx::ITEMCONN_HIDE_UNKNOWN ) );
AddItemConnection( new sfx::DummyItemConnection( SID_ATTR_ALIGN_INDENT,
*m_pFtIndent, sfx::ITEMCONN_HIDE_UNKNOWN ) );
AddItemConnection( new sfx::UInt16MetricConnection( SID_ATTR_ALIGN_INDENT,
*m_pEdIndent, FUNIT_TWIP, sfx::ITEMCONN_HIDE_UNKNOWN ) );
+ AddItemConnection( new sfx::DummyItemConnection(
SID_ATTR_ALIGN_VER_JUSTIFY, *m_pFtVerAlign, sfx::ITEMCONN_HIDE_UNKNOWN ) );
AddItemConnection( new VerJustConnection( SID_ATTR_ALIGN_VER_JUSTIFY,
*m_pLbVerAlign, s_pVerJustMap, sfx::ITEMCONN_HIDE_UNKNOWN ) );
AddItemConnection( new DialControlConnection( SID_ATTR_ALIGN_DEGREES,
*m_pCtrlDial, sfx::ITEMCONN_HIDE_UNKNOWN ) );
AddItemConnection( new sfx::DummyItemConnection( SID_ATTR_ALIGN_DEGREES,
*m_pFtRotate, sfx::ITEMCONN_HIDE_UNKNOWN ) );
@@ -370,6 +376,13 @@ void AlignmentTabPage::UpdateEnableControls()
// shrink only without automatic line break, and not for block, fill or
distribute.
m_pBtnShrink->Enable( (m_pBtnWrap->GetState() == STATE_NOCHECK) &&
!bHorBlock && !bHorFill && !bHorDist );
+ // visibility of frames
+ m_pAlignmentFrame->Show(m_pLbHorAlign->IsVisible() ||
m_pEdIndent->IsVisible() ||
+ m_pLbVerAlign->IsVisible());
+ m_pOrientFrame->Show(m_pCtrlDial->IsVisible() || m_pVsRefEdge->IsVisible()
||
+ m_pCbStacked->IsVisible() || m_pCbAsianMode->IsVisible());
+ m_pPropertiesFrame->Show(m_pBtnWrap->IsVisible() ||
m_pBtnHyphen->IsVisible() ||
+ m_pBtnShrink->IsVisible() || m_pLbFrameDir->IsVisible());
}
bool AlignmentTabPage::HasAlignmentChanged( const SfxItemSet& rNew, sal_uInt16
nWhich ) const
commit 3a806d027cb744cde08e0c4472bec5159d5a541d
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Jan 17 14:06:13 2014 +0000
convert field dialog to .ui
Change-Id: Ic268c17941038319240bb70d59d04c9b9a7a2412
diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk
index 55715cd..16d9431 100644
--- a/dbaccess/AllLangResTarget_dbu.mk
+++ b/dbaccess/AllLangResTarget_dbu.mk
@@ -47,7 +47,6 @@ $(eval $(call gb_SrsTarget_add_files,dbaccess/dbu,\
dbaccess/source/ui/dlg/dbadmin.src \
dbaccess/source/ui/dlg/dbfindex.src \
dbaccess/source/ui/dlg/directsql.src \
- dbaccess/source/ui/dlg/dlgattr.src \
dbaccess/source/ui/dlg/dlgsave.src \
dbaccess/source/ui/dlg/dsselect.src \
dbaccess/source/ui/dlg/indexdialog.src \
diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index 8fee67b..258975f 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_UIConfig_UIConfig,dbaccess))
$(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
dbaccess/uiconfig/ui/colwidthdialog \
dbaccess/uiconfig/ui/directsqldialog \
+ dbaccess/uiconfig/ui/fielddialog \
dbaccess/uiconfig/ui/generalpagedialog \
dbaccess/uiconfig/ui/generalpagewizard \
dbaccess/uiconfig/ui/querypropertiesdialog \
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx
b/dbaccess/source/ui/control/FieldDescControl.cxx
index 9f76105..b5d5584 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -632,8 +632,7 @@ IMPL_LINK( OFieldDescControl, FormatClickHdl, Button *,
/*pButton*/ )
SvNumberFormatsSupplierObj* pSupplierImpl =
SvNumberFormatsSupplierObj::getImplementation( xSupplier );
SvNumberFormatter* pFormatter = pSupplierImpl->GetNumberFormatter();
- sal_uInt16 nFlags;
-
if(::dbaui::callColumnFormatDialog(this,pFormatter,pActFieldDescr->GetType(),nOldFormatKey,rOldJustify,nFlags,sal_True))
+
if(::dbaui::callColumnFormatDialog(this,pFormatter,pActFieldDescr->GetType(),nOldFormatKey,rOldJustify,sal_True))
{
sal_Bool bModified = sal_False;
if(nOldFormatKey != pActFieldDescr->GetFormatKey())
diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx
b/dbaccess/source/ui/dlg/dlgattr.cxx
index f19e877..a882d0c 100644
--- a/dbaccess/source/ui/dlg/dlgattr.cxx
+++ b/dbaccess/source/ui/dlg/dlgattr.cxx
@@ -34,25 +34,21 @@
using namespace dbaui;
DBG_NAME(SbaSbAttrDlg)
-SbaSbAttrDlg::SbaSbAttrDlg(Window* pParent, const SfxItemSet* pCellAttrs,
SvNumberFormatter* pFormatter, sal_uInt16 nFlags, sal_Bool bRow)
- : SfxTabDialog(pParent, ModuleRes( DLG_ATTR ), pCellAttrs )
- ,aTitle(ModuleRes(ST_ROW))
+
+SbaSbAttrDlg::SbaSbAttrDlg(Window* pParent, const SfxItemSet* pCellAttrs,
+ SvNumberFormatter* pFormatter, bool bHasFormat, bool bRow)
+ : SfxTabDialog(pParent, "FieldDialog", "dbaccess/ui/fielddialog.ui",
pCellAttrs)
+ , m_nNumberFormatId(0)
{
DBG_CTOR(SbaSbAttrDlg,NULL);
pNumberInfoItem = new SvxNumberInfoItem( pFormatter, 0 );
if (bRow)
- SetText(aTitle);
- if( nFlags & TP_ATTR_CHAR )
- {
- OSL_FAIL( "found flag TP_ATTR_CHAR" );
- }
- if( nFlags & TP_ATTR_NUMBER )
- AddTabPage(
RID_SVXPAGE_NUMBERFORMAT,OUString(ModuleRes(TP_ATTR_NUMBER)) );
- if( nFlags & TP_ATTR_ALIGN )
- AddTabPage( RID_SVXPAGE_ALIGNMENT,OUString(ModuleRes(TP_ATTR_ALIGN)) );
- FreeResource();
+ SetText(get<FixedText>("alttitle")->GetText());
+ if (bHasFormat)
+ m_nNumberFormatId = AddTabPage("format", RID_SVXPAGE_NUMBERFORMAT);
+ AddTabPage("alignment", RID_SVXPAGE_ALIGNMENT);
}
SbaSbAttrDlg::~SbaSbAttrDlg()
@@ -65,17 +61,10 @@ SbaSbAttrDlg::~SbaSbAttrDlg()
void SbaSbAttrDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage )
{
SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
- switch ( nPageId )
+ if (nPageId == m_nNumberFormatId)
{
- case RID_SVXPAGE_NUMBERFORMAT:
- {
- aSet.Put (SvxNumberInfoItem(
pNumberInfoItem->GetNumberFormatter(), (const
sal_uInt16)SID_ATTR_NUMBERFORMAT_INFO));
- rTabPage.PageCreated(aSet);
- }
- break;
-
- default:
- break;
+ aSet.Put (SvxNumberInfoItem( pNumberInfoItem->GetNumberFormatter(),
(const sal_uInt16)SID_ATTR_NUMBERFORMAT_INFO));
+ rTabPage.PageCreated(aSet);
}
}
diff --git a/dbaccess/source/ui/dlg/dlgattr.src
b/dbaccess/source/ui/dlg/dlgattr.src
deleted file mode 100644
index 5426168..0000000
--- a/dbaccess/source/ui/dlg/dlgattr.src
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#include <svx/dialogs.hrc>
-#include "dbaccess_helpid.hrc"
-#include "dbu_dlg.hrc"
-#include "dlgattr.hrc"
-
- //================================================
- // Der Attributdialog:
-TabDialog DLG_ATTR
-{
- Moveable = TRUE ;
- Closeable = TRUE ;
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Text [ en-US ] = "Field Format" ;
- TabControl 1
- {
- OutputSize = TRUE ;
- };
- OKButton 1
- {
- Size = MAP_APPFONT ( 40 , 12 ) ;
- TabStop = TRUE ;
- DefButton = TRUE;
- };
- CancelButton 1
- {
- Size = MAP_APPFONT ( 40 , 12 ) ;
- TabStop = TRUE ;
- };
- HelpButton 1
- {
- Size = MAP_APPFONT ( 40 , 12 ) ;
- TabStop = TRUE ;
- };
- PushButton 1
- {
- TabStop = TRUE ;
- Size = MAP_APPFONT ( 40 , 12 ) ;
- Text [ en-US ] = "Bac~k" ;
- };
- String TP_ATTR_CHAR
- {
- Text [ en-US ] = "Font" ;
- };
- String TP_ATTR_NUMBER
- {
- Text [ en-US ] = "Format" ;
- };
- String TP_ATTR_ALIGN
- {
- Text [ en-US ] = "Alignment" ;
- };
- String ST_ROW
- {
- Text [ en-US ] = "Table Format" ;
- };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/UITools.hxx
b/dbaccess/source/ui/inc/UITools.hxx
index bb04833..3577d62 100644
--- a/dbaccess/source/ui/inc/UITools.hxx
+++ b/dbaccess/source/ui/inc/UITools.hxx
@@ -196,7 +196,6 @@ namespace dbaui
sal_Int32 _nDataType,
sal_Int32& _nFormatKey,
SvxCellHorJustify& _eJustify,
- sal_uInt16& _nFlags,
sal_Bool _bHasFormat);
/** append a name to tablefilter of a datasource
@param _xConnection the connection is need to get the datasource
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc
b/dbaccess/source/ui/inc/dbu_resource.hrc
index 501828e..dad4a1c 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -83,7 +83,6 @@
#define DLG_PARAMETERS RID_DIALOG_START + 5
#define DLG_FILTERCRIT RID_DIALOG_START + 6
-#define DLG_ATTR RID_DIALOG_START + 10
#define DLG_SAVE_AS RID_DIALOG_START + 11
#define DLG_JOIN_TABADD RID_DIALOG_START + 14
#define DLG_QRY_JOIN RID_DIALOG_START + 15
diff --git a/dbaccess/source/ui/inc/dlgattr.hrc
b/dbaccess/source/ui/inc/dlgattr.hrc
deleted file mode 100644
index 82f8994..0000000
--- a/dbaccess/source/ui/inc/dlgattr.hrc
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef DBAUI_SBATTRDLG_HRC
-#define DBAUI_SBATTRDLG_HRC
-
-#define TP_ATTR_CHAR 1
-#define TP_ATTR_NUMBER 2
-#define TP_ATTR_ALIGN 4
-#define ST_ROW 5
-
-#endif//DBAUI_SBATTRDLG_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/dlgattr.hxx
b/dbaccess/source/ui/inc/dlgattr.hxx
index df3a120..c7c8381 100644
--- a/dbaccess/source/ui/inc/dlgattr.hxx
+++ b/dbaccess/source/ui/inc/dlgattr.hxx
@@ -19,10 +19,7 @@
#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DLGATTR_HXX
#define INCLUDED_DBACCESS_SOURCE_UI_INC_DLGATTR_HXX
-#include "dlgattr.hrc"
-
#include <sfx2/tabdlg.hxx>
-#include <tools/solar.h>
class SvxNumberInfoItem;
class SfxItemSet;
@@ -32,11 +29,11 @@ namespace dbaui
class SbaSbAttrDlg : public SfxTabDialog
{
- OUString aTitle;
SvxNumberInfoItem* pNumberInfoItem;
+ sal_uInt32 m_nNumberFormatId;
public:
- SbaSbAttrDlg( Window * pParent, const SfxItemSet*, SvNumberFormatter*,
sal_uInt16 nFlags = TP_ATTR_CHAR , sal_Bool bRow = sal_False);
+ SbaSbAttrDlg(Window * pParent, const SfxItemSet*, SvNumberFormatter*,
bool bHasFormat, bool bRow = false);
~SbaSbAttrDlg();
virtual void PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage );
diff --git a/dbaccess/source/ui/misc/UITools.cxx
b/dbaccess/source/ui/misc/UITools.cxx
index 9d67f8a..8fd95f2 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -65,7 +65,6 @@
#include <com/sun/star/awt/FontRelief.hpp>
#include <com/sun/star/awt/FontWidth.hpp>
#include <com/sun/star/frame/XModel.hpp>
-#include "dlgattr.hrc"
#include "TypeInfo.hxx"
#include "FieldDescriptions.hxx"
#include <comphelper/processfactory.hxx>
@@ -771,11 +770,10 @@ void callColumnFormatDialog(const
Reference<XPropertySet>& xAffectedCol,
if ( bHasFormat )
nFormatKey =
::comphelper::getINT32(xAffectedCol->getPropertyValue(PROPERTY_FORMATKEY));
- sal_uInt16 nFlags = 0;
-
if(callColumnFormatDialog(_pParent,_pFormatter,nDataType,nFormatKey,eJustify,nFlags,bHasFormat))
+
if(callColumnFormatDialog(_pParent,_pFormatter,nDataType,nFormatKey,eJustify,bHasFormat))
{
xAffectedCol->setPropertyValue(PROPERTY_ALIGN,
makeAny((sal_Int16)dbaui::mapTextAllign(eJustify)));
- if (nFlags & TP_ATTR_NUMBER)
+ if (bHasFormat)
xAffectedCol->setPropertyValue(PROPERTY_FORMATKEY,
makeAny(nFormatKey));
}
@@ -792,15 +790,9 @@ sal_Bool callColumnFormatDialog(Window* _pParent,
sal_Int32 _nDataType,
sal_Int32& _nFormatKey,
SvxCellHorJustify& _eJustify,
- sal_uInt16& _nFlags,
sal_Bool _bHasFormat)
{
sal_Bool bRet = sal_False;
- // the allowed format changes depending on the type of the field ...
- _nFlags = TP_ATTR_ALIGN;
-
- if (_bHasFormat)
- _nFlags |= TP_ATTR_NUMBER;
// UNO->ItemSet
static SfxItemInfo aItemInfos[] =
@@ -859,7 +851,7 @@ sal_Bool callColumnFormatDialog(Window* _pParent,
}
{ // want the dialog to be destroyed before our set
- SbaSbAttrDlg aDlg(_pParent, pFormatDescriptor, _pFormatter, _nFlags);
+ SbaSbAttrDlg aDlg(_pParent, pFormatDescriptor, _pFormatter,
_bHasFormat);
if (RET_OK == aDlg.Execute())
{
// ItemSet->UNO
@@ -874,7 +866,7 @@ sal_Bool callColumnFormatDialog(Window* _pParent,
_eJustify = (SvxCellHorJustify)pHorJustify->GetValue();
// format key
- if (_nFlags & TP_ATTR_NUMBER)
+ if (_bHasFormat)
{
SFX_ITEMSET_GET(*pSet, pFormat, SfxUInt32Item,
SBA_DEF_FMTVALUE, sal_True);
_nFormatKey = (sal_Int32)pFormat->GetValue();
diff --git a/dbaccess/uiconfig/ui/fielddialog.ui
b/dbaccess/uiconfig/ui/fielddialog.ui
new file mode 100644
index 0000000..dc44d2f
--- /dev/null
+++ b/dbaccess/uiconfig/ui/fielddialog.ui
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Fri Jan 17 14:37:18 2014 -->
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="FieldDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Field Format</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox1">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="ok">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancel">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="help">
+ <property name="label">gtk-help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="reset">
+ <property name="label">gtk-revert-to-saved</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkNotebook" id="tabcontrol">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="format">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Format</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="alignment">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0.4699999988079071</property>
+ <property name="label"
translatable="yes">Alignment</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="alttitle">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="label" translatable="yes">Table
Format</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">ok</action-widget>
+ <action-widget response="0">cancel</action-widget>
+ <action-widget response="0">help</action-widget>
+ <action-widget response="0">reset</action-widget>
+ </action-widgets>
+ </object>
+</interface>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
