[Libreoffice-commits] core.git: 5 commits - sc/AllLangResTarget_sc.mk sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk svx/source
Caolán McNamara
caolanm at redhat.com
Tue May 14 05:52:07 PDT 2013
sc/AllLangResTarget_sc.mk | 1
sc/UIConfig_scalc.mk | 12
sc/inc/helpids.h | 18
sc/inc/sc.hrc | 5
sc/inc/scabstdlg.hxx | 1
sc/source/ui/attrdlg/scdlgfact.cxx | 44 +
sc/source/ui/attrdlg/scdlgfact.hxx | 1
sc/source/ui/docshell/docsh4.cxx | 2
sc/source/ui/inc/hfedtdlg.hxx | 79 +++
sc/source/ui/pagedlg/hfedtdlg.cxx | 223 +++++----
sc/source/ui/pagedlg/hfedtdlg.hrc | 32 -
sc/source/ui/pagedlg/hfedtdlg.src | 589 --------------------------
sc/source/ui/pagedlg/scuitphfedit.cxx | 1
sc/source/ui/pagedlg/tphf.cxx | 11
sc/source/ui/pagedlg/tphfedit.cxx | 1
sc/uiconfig/scalc/ui/allheaderfooterdialog.ui | 161 +++++++
sc/uiconfig/scalc/ui/footerdialog.ui | 133 +++++
sc/uiconfig/scalc/ui/headerdialog.ui | 133 +++++
sc/uiconfig/scalc/ui/headerfooterdialog.ui | 133 +++++
sc/uiconfig/scalc/ui/leftfooterdialog.ui | 119 +++++
sc/uiconfig/scalc/ui/leftheaderdialog.ui | 119 +++++
sc/uiconfig/scalc/ui/rightfooterdialog.ui | 119 +++++
sc/uiconfig/scalc/ui/rightheaderdialog.ui | 119 +++++
sc/uiconfig/scalc/ui/sharedfooterdialog.ui | 147 ++++++
sc/uiconfig/scalc/ui/sharedheaderdialog.ui | 147 ++++++
svx/source/dialog/hdft.cxx | 16
26 files changed, 1599 insertions(+), 767 deletions(-)
New commits:
commit 80e8a10ef26be310b14df431f68ce9283ef59f0c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue May 14 13:50:28 2013 +0100
work harder to hide shared first page stuff in calc
Change-Id: I0710f1e2f826580a6cb24644517a4bb110d91a7d
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 1c2d2fb..606c797 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -328,6 +328,14 @@ void SvxHFPage::Reset( const SfxItemSet& rSet )
DBG_ASSERT( pPool, "Where is the pool" );
SfxMapUnit eUnit = pPool->GetMetric( GetWhich( SID_ATTR_PAGE_SIZE ) );
+ //hide "same content on first page when this is calc
+ bool bIsCalc = false;
+ const SfxPoolItem* pExt1 = GetItem(rSet, SID_ATTR_PAGE_EXT1);
+ const SfxPoolItem* pExt2 = GetItem(rSet, SID_ATTR_PAGE_EXT2);
+ if (pExt1 && pExt1->ISA(SfxBoolItem) && pExt2 && pExt2->ISA(SfxBoolItem))
+ bIsCalc = true;
+ m_pCntSharedFirstBox->Show(!bIsCalc);
+
// Evaluate header-/footer- attributes
const SvxSetItem* pSetItem = 0;
@@ -389,13 +397,7 @@ void SvxHFPage::Reset( const SfxItemSet& rSet )
else
{
// defaults for distance and height
- long nDefaultDist = DEF_DIST_WRITER;
- const SfxPoolItem* pExt1 = GetItem( rSet, SID_ATTR_PAGE_EXT1 );
- const SfxPoolItem* pExt2 = GetItem( rSet, SID_ATTR_PAGE_EXT2 );
-
- if ( pExt1 && pExt1->ISA(SfxBoolItem) && pExt2 && pExt2->ISA(SfxBoolItem) )
- nDefaultDist = DEF_DIST_CALC;
-
+ long nDefaultDist = bIsCalc ? DEF_DIST_CALC : DEF_DIST_WRITER;
SetMetricValue( *m_pDistEdit, nDefaultDist, SFX_MAPUNIT_100TH_MM );
SetMetricValue( *m_pHeightEdit, 500, SFX_MAPUNIT_100TH_MM );
}
commit 75ee75cd5e6b2bf98f4918bb586eac8af935e0c7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue May 14 13:01:23 2013 +0100
convert army of header/footer dialogs to .ui format
Change-Id: Iee43ce2020faeaa87b6f60d1c7af70f3e1e9c70f
diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index 2a3adcc..8a48637 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -65,7 +65,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
sc/source/ui/docshell/tpstat.src \
sc/source/ui/optdlg/calcoptionsdlg.src \
sc/source/ui/pagedlg/pagedlg.src \
- sc/source/ui/pagedlg/hfedtdlg.src \
sc/source/ui/styleui/scstyles.src \
sc/source/ui/styleui/styledlg.src \
sc/source/ui/dbgui/pivot.src \
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index b9ecfbb..40a7160 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -59,6 +59,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/scalc,\
))
$(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
+ sc/uiconfig/scalc/ui/allheaderfooterdialog \
sc/uiconfig/scalc/ui/cellprotectionpage \
sc/uiconfig/scalc/ui/createnamesdialog \
sc/uiconfig/scalc/ui/dataform \
@@ -66,18 +67,27 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/deletecells \
sc/uiconfig/scalc/ui/deletecontents \
sc/uiconfig/scalc/ui/externaldata \
+ sc/uiconfig/scalc/ui/footerdialog \
sc/uiconfig/scalc/ui/formatcellsdialog \
sc/uiconfig/scalc/ui/goalseekdlg \
+ sc/uiconfig/scalc/ui/headerdialog \
sc/uiconfig/scalc/ui/headerfootercontent \
+ sc/uiconfig/scalc/ui/headerfooterdialog \
sc/uiconfig/scalc/ui/insertname \
sc/uiconfig/scalc/ui/insertsheet \
+ sc/uiconfig/scalc/ui/leftfooterdialog \
+ sc/uiconfig/scalc/ui/leftheaderdialog \
sc/uiconfig/scalc/ui/managenamesdialog \
sc/uiconfig/scalc/ui/printeroptions \
- sc/uiconfig/scalc/ui/protectsheetdlg \
+ sc/uiconfig/scalc/ui/protectsheetdlg \
sc/uiconfig/scalc/ui/sheetprintpage \
+ sc/uiconfig/scalc/ui/rightfooterdialog \
+ sc/uiconfig/scalc/ui/rightheaderdialog \
sc/uiconfig/scalc/ui/selectrange \
sc/uiconfig/scalc/ui/selectsource \
sc/uiconfig/scalc/ui/sharedocumentdlg \
+ sc/uiconfig/scalc/ui/sharedfooterdialog \
+ sc/uiconfig/scalc/ui/sharedheaderdialog \
sc/uiconfig/scalc/ui/solverdlg \
sc/uiconfig/scalc/ui/sortcriteriapage \
sc/uiconfig/scalc/ui/sortkey \
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 9dcf44b..e94b67f 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -34,19 +34,6 @@
#define HID_SC_WIN_PREVIEW "SC_HID_SC_WIN_PREVIEW"
// Hilfe IDs fuer einzelne Controls (max.30) ---------------------------------
-// Kopf/Fusszeilen Editfenster: Header/Footer links/rechts links/mitte/rechts
-#define HID_SC_HF_HLL "SC_HID_SC_HF_HLL"
-#define HID_SC_HF_HLC "SC_HID_SC_HF_HLC"
-#define HID_SC_HF_HLR "SC_HID_SC_HF_HLR"
-#define HID_SC_HF_HRL "SC_HID_SC_HF_HRL"
-#define HID_SC_HF_HRC "SC_HID_SC_HF_HRC"
-#define HID_SC_HF_HRR "SC_HID_SC_HF_HRR"
-#define HID_SC_HF_FLL "SC_HID_SC_HF_FLL"
-#define HID_SC_HF_FLC "SC_HID_SC_HF_FLC"
-#define HID_SC_HF_FLR "SC_HID_SC_HF_FLR"
-#define HID_SC_HF_FRL "SC_HID_SC_HF_FRL"
-#define HID_SC_HF_FRC "SC_HID_SC_HF_FRC"
-#define HID_SC_HF_FRR "SC_HID_SC_HF_FRR"
// Eintraege im Navigator
#define HID_SC_NAVIPI_ENTRIES "SC_HID_SC_NAVIPI_ENTRIES"
#define HID_SC_NAVIPI_ROW "SC_HID_SC_NAVIPI_ROW"
@@ -84,11 +71,6 @@
#define HID_SCPAGE_SUBT_GROUP2 "SC_HID_SCPAGE_SUBT_GROUP2"
#define HID_SCPAGE_SUBT_GROUP3 "SC_HID_SCPAGE_SUBT_GROUP3"
-#define HID_SCPAGE_HFED_HL "SC_HID_SCPAGE_HFED_HL"
-#define HID_SCPAGE_HFED_HR "SC_HID_SCPAGE_HFED_HR"
-#define HID_SCPAGE_HFED_FL "SC_HID_SCPAGE_HFED_FL"
-#define HID_SCPAGE_HFED_FR "SC_HID_SCPAGE_HFED_FR"
-
#define HID_SCPAGE_CONTENT "SC_HID_SCPAGE_CONTENT"
#define HID_SCPAGE_LAYOUT "SC_HID_SCPAGE_LAYOUT"
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index efa6f55..23a5088 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1023,11 +1023,6 @@
#define RID_SCPAGE_SUBT_GROUP2 (SC_DIALOGS_START + 98)
#define RID_SCPAGE_SUBT_GROUP3 (SC_DIALOGS_START + 99)
-#define RID_SCPAGE_HFED_HL (SC_DIALOGS_START + 100)
-#define RID_SCPAGE_HFED_HR (SC_DIALOGS_START + 101)
-#define RID_SCPAGE_HFED_FL (SC_DIALOGS_START + 102)
-#define RID_SCPAGE_HFED_FR (SC_DIALOGS_START + 103)
-
// derivations from RID_SCDLG_MTRINPUT
#define RID_SCDLG_COL_MAN (SC_DIALOGS_START + 104)
#define RID_SCDLG_COL_OPT (SC_DIALOGS_START + 105)
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index 1474953..2e1ca49 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -1246,36 +1246,36 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScHFEditDlg( SfxViewF
{
case RID_SCDLG_HFED_HEADER:
case RID_SCDLG_HFEDIT_HEADER:
- pDlg = new ScHFEditHeaderDlg( pFrame, pParent, rCoreSet, rPageStyle, nResId );
+ pDlg = new ScHFEditHeaderDlg(pFrame, pParent, rCoreSet, rPageStyle);
break;
case RID_SCDLG_HFED_FOOTER:
case RID_SCDLG_HFEDIT_FOOTER:
- pDlg = new ScHFEditFooterDlg( pFrame, pParent, rCoreSet, rPageStyle, nResId );
+ pDlg = new ScHFEditFooterDlg(pFrame, pParent, rCoreSet, rPageStyle);
break;
case RID_SCDLG_HFEDIT_LEFTHEADER:
- pDlg = new ScHFEditLeftHeaderDlg( pFrame, pParent, rCoreSet, rPageStyle, nResId );
+ pDlg = new ScHFEditLeftHeaderDlg(pFrame, pParent, rCoreSet, rPageStyle);
break;
case RID_SCDLG_HFEDIT_RIGHTHEADER:
- pDlg = new ScHFEditRightHeaderDlg( pFrame, pParent, rCoreSet, rPageStyle, nResId );
+ pDlg = new ScHFEditRightHeaderDlg(pFrame, pParent, rCoreSet, rPageStyle);
break;
case RID_SCDLG_HFEDIT_LEFTFOOTER:
- pDlg = new ScHFEditLeftFooterDlg( pFrame, pParent, rCoreSet, rPageStyle, nResId );
+ pDlg = new ScHFEditLeftFooterDlg(pFrame, pParent, rCoreSet, rPageStyle);
break;
case RID_SCDLG_HFEDIT_RIGHTFOOTER:
- pDlg = new ScHFEditRightFooterDlg( pFrame, pParent, rCoreSet, rPageStyle, nResId );
+ pDlg = new ScHFEditRightFooterDlg(pFrame, pParent, rCoreSet, rPageStyle);
break;
case RID_SCDLG_HFEDIT_SHDR:
- pDlg = new ScHFEditSharedHeaderDlg( pFrame, pParent, rCoreSet, rPageStyle, nResId );
+ pDlg = new ScHFEditSharedHeaderDlg(pFrame, pParent, rCoreSet, rPageStyle);
break;
case RID_SCDLG_HFEDIT_SFTR:
- pDlg = new ScHFEditSharedFooterDlg( pFrame, pParent, rCoreSet, rPageStyle, nResId );
+ pDlg = new ScHFEditSharedFooterDlg(pFrame, pParent, rCoreSet, rPageStyle);
break;
case RID_SCDLG_HFEDIT_ALL:
- pDlg = new ScHFEditAllDlg( pFrame, pParent, rCoreSet, rPageStyle, nResId );
+ pDlg = new ScHFEditAllDlg(pFrame, pParent, rCoreSet, rPageStyle);
break;
default:
case RID_SCDLG_HFEDIT:
- pDlg = new ScHFEditActiveDlg( pFrame, pParent, rCoreSet, rPageStyle, nResId );
+ pDlg = new ScHFEditActiveDlg(pFrame, pParent, rCoreSet, rPageStyle);
break;
}
diff --git a/sc/source/ui/inc/hfedtdlg.hxx b/sc/source/ui/inc/hfedtdlg.hxx
index 8159243..cd8335b 100644
--- a/sc/source/ui/inc/hfedtdlg.hxx
+++ b/sc/source/ui/inc/hfedtdlg.hxx
@@ -35,7 +35,7 @@ class ScHFEditDlg : public SfxTabDialog
protected:
ScHFEditDlg(SfxViewFrame* pFrame, Window* pParent,
const SfxItemSet& rCoreSet, const OUString& rPageStyle,
- sal_uInt16 nResId = RID_SCDLG_HFEDIT );
+ const OString& rID, const OUString& rUIXMLDescription );
public:
virtual void PageCreated( sal_uInt16 nId, SfxTabPage& rPage );
};
@@ -44,80 +44,70 @@ class ScHFEditHeaderDlg : public ScHFEditDlg
{
public:
ScHFEditHeaderDlg(SfxViewFrame* pFrame, Window* pParent,
- const SfxItemSet& rCoreSet, const OUString& rPageStyle,
- sal_uInt16 nResId);
+ const SfxItemSet& rCoreSet, const OUString& rPageStyle);
};
class ScHFEditFooterDlg : public ScHFEditDlg
{
public:
ScHFEditFooterDlg(SfxViewFrame* pFrame, Window* pParent,
- const SfxItemSet& rCoreSet, const OUString& rPageStyle,
- sal_uInt16 nResId);
+ const SfxItemSet& rCoreSet, const OUString& rPageStyle);
};
class ScHFEditLeftHeaderDlg : public ScHFEditDlg
{
public:
ScHFEditLeftHeaderDlg(SfxViewFrame* pFrame, Window* pParent,
- const SfxItemSet& rCoreSet, const OUString& rPageStyle,
- sal_uInt16 nResId);
+ const SfxItemSet& rCoreSet, const OUString& rPageStyle);
};
class ScHFEditRightHeaderDlg : public ScHFEditDlg
{
public:
ScHFEditRightHeaderDlg(SfxViewFrame* pFrame, Window* pParent,
- const SfxItemSet& rCoreSet, const OUString& rPageStyle,
- sal_uInt16 nResId);
+ const SfxItemSet& rCoreSet, const OUString& rPageStyle);
};
class ScHFEditLeftFooterDlg : public ScHFEditDlg
{
public:
ScHFEditLeftFooterDlg(SfxViewFrame* pFrame, Window* pParent,
- const SfxItemSet& rCoreSet, const OUString& rPageStyle,
- sal_uInt16 nResId);
+ const SfxItemSet& rCoreSet, const OUString& rPageStyle);
};
class ScHFEditRightFooterDlg : public ScHFEditDlg
{
public:
ScHFEditRightFooterDlg(SfxViewFrame* pFrame, Window* pParent,
- const SfxItemSet& rCoreSet, const OUString& rPageStyle,
- sal_uInt16 nResId);
+ const SfxItemSet& rCoreSet, const OUString& rPageStyle);
};
class ScHFEditSharedHeaderDlg : public ScHFEditDlg
{
public:
ScHFEditSharedHeaderDlg(SfxViewFrame* pFrame, Window* pParent,
- const SfxItemSet& rCoreSet, const OUString& rPageStyle,
- sal_uInt16 nResId);
+ const SfxItemSet& rCoreSet, const OUString& rPageStyle);
};
class ScHFEditSharedFooterDlg : public ScHFEditDlg
{
public:
ScHFEditSharedFooterDlg(SfxViewFrame* pFrame, Window* pParent,
- const SfxItemSet& rCoreSet, const OUString& rPageStyle,
- sal_uInt16 nResId);
+ const SfxItemSet& rCoreSet, const OUString& rPageStyle);
};
class ScHFEditAllDlg : public ScHFEditDlg
{
public:
ScHFEditAllDlg(SfxViewFrame* pFrame, Window* pParent,
- const SfxItemSet& rCoreSet, const OUString& rPageStyle,
- sal_uInt16 nResId);
+ const SfxItemSet& rCoreSet, const OUString& rPageStyle);
};
class ScHFEditActiveDlg : public ScHFEditDlg
{
public:
ScHFEditActiveDlg(SfxViewFrame* pFrame, Window* pParent,
- const SfxItemSet& rCoreSet, const OUString& rPageStyle,
- sal_uInt16 nResId);
+ const SfxItemSet& rCoreSet, const OUString& rPageStyle);
};
#endif // SC_HFEDTDLG_HXX
diff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx b/sc/source/ui/pagedlg/hfedtdlg.cxx
index 817ee4f..d3d8fa3 100644
--- a/sc/source/ui/pagedlg/hfedtdlg.cxx
+++ b/sc/source/ui/pagedlg/hfedtdlg.cxx
@@ -31,7 +31,6 @@
#include "global.hxx"
#include "globstr.hrc"
#include "scresid.hxx"
-#include "hfedtdlg.hrc"
#include "scuitphfedit.hxx"
//------------------------------------------------------------------
@@ -54,8 +53,8 @@ ScHFEditDlg::ScHFEditDlg( SfxViewFrame* pFrameP,
Window* pParent,
const SfxItemSet& rCoreSet,
const OUString& rPageStyle,
- sal_uInt16 nResIdP )
- : SfxTabDialog( pFrameP, pParent, ScResId( nResIdP ), &rCoreSet )
+ const OString& rID, const OUString& rUIXMLDescription )
+ : SfxTabDialog( pFrameP, pParent, rID, rUIXMLDescription, &rCoreSet )
{
eNumType = ((const SvxPageItem&)rCoreSet.Get(ATTR_PAGE)).GetNumType();
@@ -72,124 +71,108 @@ ScHFEditDlg::ScHFEditDlg( SfxViewFrame* pFrameP,
ScHFEditHeaderDlg::ScHFEditHeaderDlg( SfxViewFrame* pFrameP,
Window* pParent,
const SfxItemSet& rCoreSet,
- const OUString& rPageStyle,
- sal_uInt16 nResIdP )
- : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle, nResIdP )
+ const OUString& rPageStyle)
+ : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle,
+ "HeaderDialog", "modules/scalc/ui/headerdialog.ui" )
{
- AddTabPage( 1, ScRightHeaderEditPage::Create, NULL );
- AddTabPage( 2, ScLeftHeaderEditPage::Create, NULL );
-
- FreeResource();
+ AddTabPage( "headerright", ScRightHeaderEditPage::Create, NULL );
+ AddTabPage( "headerleft", ScLeftHeaderEditPage::Create, NULL );
}
ScHFEditFooterDlg::ScHFEditFooterDlg( SfxViewFrame* pFrameP,
Window* pParent,
const SfxItemSet& rCoreSet,
- const OUString& rPageStyle,
- sal_uInt16 nResIdP )
- : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle, nResIdP )
+ const OUString& rPageStyle)
+ : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle,
+ "FooterDialog", "modules/scalc/ui/footerdialog.ui" )
{
- AddTabPage( 1, ScRightFooterEditPage::Create, NULL );
- AddTabPage( 2, ScLeftFooterEditPage::Create, NULL );
-
- FreeResource();
+ AddTabPage( "footerright", ScRightFooterEditPage::Create, NULL );
+ AddTabPage( "footerleft", ScLeftFooterEditPage::Create, NULL );
}
ScHFEditLeftHeaderDlg::ScHFEditLeftHeaderDlg( SfxViewFrame* pFrameP,
Window* pParent,
const SfxItemSet& rCoreSet,
- const OUString& rPageStyle,
- sal_uInt16 nResIdP )
- : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle, nResIdP )
+ const OUString& rPageStyle)
+ : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle,
+ "LeftHeaderDialog", "modules/scalc/ui/leftheaderdialog.ui" )
{
- AddTabPage( 1, ScLeftHeaderEditPage::Create, NULL );
-
- FreeResource();
+ AddTabPage( "headerleft", ScLeftHeaderEditPage::Create, NULL );
}
ScHFEditRightHeaderDlg::ScHFEditRightHeaderDlg( SfxViewFrame* pFrameP,
Window* pParent,
const SfxItemSet& rCoreSet,
- const OUString& rPageStyle,
- sal_uInt16 nResIdP )
- : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle, nResIdP )
+ const OUString& rPageStyle)
+ : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle,
+ "RightHeaderDialog", "modules/scalc/ui/rightheaderdialog.ui" )
{
- AddTabPage( 1, ScRightHeaderEditPage::Create, NULL );
-
- FreeResource();
+ AddTabPage( "headerright", ScRightHeaderEditPage::Create, NULL );
}
ScHFEditLeftFooterDlg::ScHFEditLeftFooterDlg( SfxViewFrame* pFrameP,
Window* pParent,
const SfxItemSet& rCoreSet,
- const OUString& rPageStyle,
- sal_uInt16 nResIdP )
- : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle, nResIdP )
+ const OUString& rPageStyle)
+ : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle,
+ "LeftFooterDialog", "modules/scalc/ui/leftfooterdialog.ui" )
{
- AddTabPage( 1, ScLeftFooterEditPage::Create, NULL );
+ AddTabPage( "footerleft", ScLeftFooterEditPage::Create, NULL );
}
ScHFEditRightFooterDlg::ScHFEditRightFooterDlg( SfxViewFrame* pFrameP,
Window* pParent,
const SfxItemSet& rCoreSet,
- const OUString& rPageStyle,
- sal_uInt16 nResIdP )
- : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle, nResIdP )
+ const OUString& rPageStyle)
+ : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle,
+ "RightFooterDialog", "modules/scalc/ui/rightfooterdialog.ui" )
{
- AddTabPage( 1, ScRightFooterEditPage::Create, NULL );
-
- FreeResource();
+ AddTabPage( "footerright", ScRightFooterEditPage::Create, NULL );
}
ScHFEditSharedHeaderDlg::ScHFEditSharedHeaderDlg( SfxViewFrame* pFrameP,
Window* pParent,
const SfxItemSet& rCoreSet,
- const OUString& rPageStyle,
- sal_uInt16 nResIdP )
- : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle, nResIdP )
+ const OUString& rPageStyle)
+ : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle,
+ "SharedHeaderDialog", "modules/scalc/ui/sharedheaderdialog.ui" )
{
- AddTabPage( 1, ScRightHeaderEditPage::Create, NULL );
- AddTabPage( 2, ScRightFooterEditPage::Create, NULL );
- AddTabPage( 3, ScLeftFooterEditPage::Create, NULL );
-
- FreeResource();
+ AddTabPage( "header", ScRightHeaderEditPage::Create, NULL );
+ AddTabPage( "footerright", ScRightFooterEditPage::Create, NULL );
+ AddTabPage( "footerleft", ScLeftFooterEditPage::Create, NULL );
}
ScHFEditSharedFooterDlg::ScHFEditSharedFooterDlg( SfxViewFrame* pFrameP,
Window* pParent,
const SfxItemSet& rCoreSet,
- const OUString& rPageStyle,
- sal_uInt16 nResIdP )
- : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle, nResIdP )
+ const OUString& rPageStyle)
+ : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle,
+ "SharedFooterDialog", "modules/scalc/ui/sharedfooterdialog.ui" )
{
- AddTabPage( 1, ScRightHeaderEditPage::Create, NULL );
- AddTabPage( 2, ScLeftHeaderEditPage::Create, NULL );
- AddTabPage( 3, ScRightFooterEditPage::Create, NULL );
-
- FreeResource();
+ AddTabPage( "headerright", ScRightHeaderEditPage::Create, NULL );
+ AddTabPage( "headerleft", ScLeftHeaderEditPage::Create, NULL );
+ AddTabPage( "footer", ScRightFooterEditPage::Create, NULL );
}
ScHFEditAllDlg::ScHFEditAllDlg( SfxViewFrame* pFrameP,
Window* pParent,
const SfxItemSet& rCoreSet,
- const OUString& rPageStyle,
- sal_uInt16 nResIdP )
- : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle, nResIdP )
+ const OUString& rPageStyle)
+ : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle,
+ "AllHeaderFooterDialog", "modules/scalc/ui/allheaderfooterdialog.ui" )
{
- AddTabPage( 1, ScRightHeaderEditPage::Create, NULL );
- AddTabPage( 2, ScLeftHeaderEditPage::Create, NULL );
- AddTabPage( 3, ScRightFooterEditPage::Create, NULL );
- AddTabPage( 4, ScLeftFooterEditPage::Create, NULL );
-
- FreeResource();
+ AddTabPage( "headerright", ScRightHeaderEditPage::Create, NULL );
+ AddTabPage( "headerleft", ScLeftHeaderEditPage::Create, NULL );
+ AddTabPage( "footerright", ScRightFooterEditPage::Create, NULL );
+ AddTabPage( "footerleft", ScLeftFooterEditPage::Create, NULL );
}
ScHFEditActiveDlg::ScHFEditActiveDlg( SfxViewFrame* pFrameP,
Window* pParent,
const SfxItemSet& rCoreSet,
- const OUString& rPageStyle,
- sal_uInt16 nResIdP )
- : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle, nResIdP )
+ const OUString& rPageStyle)
+ : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle,
+ "HeaderFooterDialog", "modules/scalc/ui/headerfooterdialog.ui" )
{
const SvxPageItem& rPageItem = (const SvxPageItem&)
rCoreSet.Get(
@@ -200,8 +183,8 @@ ScHFEditActiveDlg::ScHFEditActiveDlg( SfxViewFrame* pFrameP,
if ( bRightPage )
{
- AddTabPage( 1, ScRightHeaderEditPage::Create, NULL );
- AddTabPage( 2, ScRightFooterEditPage::Create, NULL );
+ AddTabPage( "header", ScRightHeaderEditPage::Create, NULL );
+ AddTabPage( "footer", ScRightFooterEditPage::Create, NULL );
}
else
{
@@ -209,22 +192,18 @@ ScHFEditActiveDlg::ScHFEditActiveDlg( SfxViewFrame* pFrameP,
sal_Bool bShareHeader = IS_SHARE_HEADER(rCoreSet);
if ( bShareHeader )
- AddTabPage( 1, ScRightHeaderEditPage::Create, NULL );
+ AddTabPage( "header", ScRightHeaderEditPage::Create, NULL );
else
- AddTabPage( 1, ScLeftHeaderEditPage::Create, NULL );
+ AddTabPage( "header", ScLeftHeaderEditPage::Create, NULL );
sal_Bool bShareFooter = IS_SHARE_FOOTER(rCoreSet);
if ( bShareFooter )
- AddTabPage( 2, ScRightFooterEditPage::Create, NULL );
+ AddTabPage( "footer", ScRightFooterEditPage::Create, NULL );
else
- AddTabPage( 2, ScLeftFooterEditPage::Create, NULL );
+ AddTabPage( "footer", ScLeftFooterEditPage::Create, NULL );
}
-
- FreeResource();
}
-
-
// -----------------------------------------------------------------------
void ScHFEditDlg::PageCreated( sal_uInt16 /* nId */, SfxTabPage& rPage )
diff --git a/sc/source/ui/pagedlg/hfedtdlg.hrc b/sc/source/ui/pagedlg/hfedtdlg.hrc
deleted file mode 100644
index ff78535..0000000
--- a/sc/source/ui/pagedlg/hfedtdlg.hrc
+++ /dev/null
@@ -1,32 +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 "sc.hrc"
-
-#define WND_LEFT 1
-#define WND_CENTER 2
-#define WND_RIGHT 3
-
-#define FL_INFO 14
-
-#define FT_HF_DEFINED 28
-#define LB_DEFINED 29
-#define FT_HF_CUSTOM 30
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/pagedlg/hfedtdlg.src b/sc/source/ui/pagedlg/hfedtdlg.src
deleted file mode 100644
index 489a138..0000000
--- a/sc/source/ui/pagedlg/hfedtdlg.src
+++ /dev/null
@@ -1,589 +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 .
- */
-/* StarView resource file */
-#include "hfedtdlg.hrc"
-#define HFEDIT_DLGTITLE \
- Text [ en-US ] = "Headers/Footers" ; \
-
-#define HEADER \
- Text [ en-US ] = "Header" ; \
-
-#define FOOTER \
- Text [ en-US ] = "Footer" ; \
-
-#define HEADER_RIGHT \
- Text [ en-US ] = "Header (right)" ; \
-
-#define HEADER_LEFT \
- Text [ en-US ] = "Header (left)" ; \
-
-#define FOOTER_RIGHT \
- Text [ en-US ] = "Footer (right)" ; \
-
-#define FOOTER_LEFT \
- Text [ en-US ] = "Footer (left)" ; \
-
- //------------------------------------------------------------------------
- // Bearbeiten vom Seitendialog aus aufgerufen
- //------------------------------------------------------------------------
-TabDialog RID_SCDLG_HFED_HEADER
-{
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 270 , 140 ) ;
- Text [ en-US ] = "Headers" ;
- Moveable = TRUE ;
- // Closeable = TRUE;
- TabControl 1
- {
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 260 , 135 ) ;
- PageList =
- {
- PageItem
- {
- Identifier = 1 ;
- HEADER_RIGHT
- PageResID = RID_SCPAGE_HFED_HR ;
- };
- PageItem
- {
- Identifier = 2 ;
- HEADER_LEFT
- PageResID = RID_SCPAGE_HFED_HL ;
- };
- };
- };
-};
-
-TabDialog RID_SCDLG_HFED_FOOTER
-{
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 270 , 140 ) ;
- Text [ en-US ] = "Footers" ;
- Moveable = TRUE ;
- // Closeable = TRUE;
- TabControl 1
- {
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 260 , 135 ) ;
- PageList =
- {
- PageItem
- {
- Identifier = 1 ;
- FOOTER_RIGHT
- PageResID = RID_SCPAGE_HFED_FR ;
- };
- PageItem
- {
- Identifier = 2 ;
- FOOTER_LEFT
- PageResID = RID_SCPAGE_HFED_FL ;
- };
- };
- };
-};
-
- //------------------------------------------------------------------------
- // Bearbeiten/Kopf-Fusszeile:
- //------------------------------------------------------------------------
-TabDialog RID_SCDLG_HFEDIT_ALL
-{
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 270 , 140 ) ;
- Moveable = TRUE ;
- // Closeable = TRUE;
- HFEDIT_DLGTITLE
- TabControl 1
- {
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 260 , 135 ) ;
- PageList =
- {
- PageItem
- {
- Identifier = 1 ;
- HEADER_RIGHT
- PageResID = RID_SCPAGE_HFED_HR ;
- };
- PageItem
- {
- Identifier = 2 ;
- HEADER_LEFT
- PageResID = RID_SCPAGE_HFED_HL ;
- };
- PageItem
- {
- Identifier = 3 ;
- FOOTER_RIGHT
- PageResID = RID_SCPAGE_HFED_FR ;
- };
- PageItem
- {
- Identifier = 4 ;
- FOOTER_LEFT
- PageResID = RID_SCPAGE_HFED_FL ;
- };
- };
- };
-};
-
-TabDialog RID_SCDLG_HFEDIT_SHDR
-{
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 270 , 140 ) ;
- Moveable = TRUE ;
- // Closeable = TRUE;
- HFEDIT_DLGTITLE
- TabControl 1
- {
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 260 , 135 ) ;
- PageList =
- {
- PageItem
- {
- Identifier = 1 ;
- HEADER
- PageResID = RID_SCPAGE_HFED_HR ;
- };
- PageItem
- {
- Identifier = 2 ;
- FOOTER_RIGHT
- PageResID = RID_SCPAGE_HFED_FR ;
- };
- PageItem
- {
- Identifier = 3 ;
- FOOTER_LEFT
- PageResID = RID_SCPAGE_HFED_FL ;
- };
- };
- };
-};
-
-TabDialog RID_SCDLG_HFEDIT_SFTR
-{
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 270 , 140 ) ;
- Moveable = TRUE ;
- // Closeable = TRUE;
- HFEDIT_DLGTITLE
- TabControl 1
- {
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 260 , 135 ) ;
- PageList =
- {
- PageItem
- {
- Identifier = 1 ;
- HEADER_RIGHT
- PageResID = RID_SCPAGE_HFED_HR ;
- };
- PageItem
- {
- Identifier = 2 ;
- HEADER_LEFT
- PageResID = RID_SCPAGE_HFED_HL ;
- };
- PageItem
- {
- Identifier = 3 ;
- FOOTER
- PageResID = RID_SCPAGE_HFED_FR ;
- };
- };
- };
-};
-
-TabDialog RID_SCDLG_HFEDIT
-{
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 270 , 140 ) ;
- Moveable = TRUE ;
- // Closeable = TRUE;
- HFEDIT_DLGTITLE
- TabControl 1
- {
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 260 , 135 ) ;
- PageList =
- {
- PageItem
- {
- Identifier = 1 ;
- HEADER
- PageResID = RID_SCPAGE_HFED_HR ;
- };
- PageItem
- {
- Identifier = 2 ;
- FOOTER
- PageResID = RID_SCPAGE_HFED_FR ;
- };
- };
- };
-};
-
-TabDialog RID_SCDLG_HFEDIT_HEADER
-{
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 270 , 140 ) ;
- Moveable = TRUE ;
- // Closeable = TRUE;
- HFEDIT_DLGTITLE
- TabControl 1
- {
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 260 , 135 ) ;
- PageList =
- {
- PageItem
- {
- Identifier = 1 ;
- HEADER_RIGHT
- PageResID = RID_SCPAGE_HFED_HR ;
- };
- PageItem
- {
- Identifier = 2 ;
- HEADER_LEFT
- PageResID = RID_SCPAGE_HFED_HL ;
- };
- };
- };
-};
-
-TabDialog RID_SCDLG_HFEDIT_FOOTER
-{
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 270 , 140 ) ;
- Moveable = TRUE ;
- // Closeable = TRUE;
- HFEDIT_DLGTITLE
- TabControl 1
- {
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 260 , 135 ) ;
- PageList =
- {
- PageItem
- {
- Identifier = 1 ;
- FOOTER_RIGHT
- PageResID = RID_SCPAGE_HFED_FR ;
- };
- PageItem
- {
- Identifier = 2 ;
- FOOTER_LEFT
- PageResID = RID_SCPAGE_HFED_FL ;
- };
- };
- };
-};
-
-TabDialog RID_SCDLG_HFEDIT_RIGHTHEADER
-{
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 270 , 140 ) ;
- Moveable = TRUE ;
- // Closeable = TRUE;
- HFEDIT_DLGTITLE
- TabControl 1
- {
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 260 , 135 ) ;
- PageList =
- {
- PageItem
- {
- Identifier = 1 ;
- HEADER_RIGHT
- PageResID = RID_SCPAGE_HFED_HR ;
- };
- };
- };
-};
-
-TabDialog RID_SCDLG_HFEDIT_LEFTHEADER
-{
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 270 , 140 ) ;
- Moveable = TRUE ;
- // Closeable = TRUE;
- HFEDIT_DLGTITLE
- TabControl 1
- {
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 260 , 135 ) ;
- PageList =
- {
- PageItem
- {
- Identifier = 1 ;
- HEADER_LEFT
- PageResID = RID_SCPAGE_HFED_HL ;
- };
- };
- };
-};
-
-TabDialog RID_SCDLG_HFEDIT_RIGHTFOOTER
-{
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 270 , 140 ) ;
- Moveable = TRUE ;
- // Closeable = TRUE;
- HFEDIT_DLGTITLE
- TabControl 1
- {
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 260 , 135 ) ;
- PageList =
- {
- PageItem
- {
- Identifier = 1 ;
- FOOTER_RIGHT
- PageResID = RID_SCPAGE_HFED_FR ;
- };
- };
- };
-};
-
-TabDialog RID_SCDLG_HFEDIT_LEFTFOOTER
-{
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 270 , 140 ) ;
- Moveable = TRUE ;
- // Closeable = TRUE;
- HFEDIT_DLGTITLE
- TabControl 1
- {
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 260 , 135 ) ;
- PageList =
- {
- PageItem
- {
- Identifier = 1 ;
- FOOTER_LEFT
- PageResID = RID_SCPAGE_HFED_FL ;
- };
- };
- };
-};
-
- // Kombinationen: Header/Footer links/rechts
-TabPage RID_SCPAGE_HFED_HL
-{
- Hide = TRUE ;
- HelpId = HID_SCPAGE_HFED_HL ;
- Control WND_LEFT
- {
- HelpId = HID_SC_HF_HLL ;
- Border = TRUE ;
- Pos = MAP_APPFONT ( 6 , 18 ) ;
- Size = MAP_APPFONT ( 80 , 72 ) ;
- TabStop = TRUE ;
- };
- Control WND_CENTER
- {
- HelpId = HID_SC_HF_HLC ;
- Border = TRUE ;
- Pos = MAP_APPFONT ( 90 , 18 ) ;
- Size = MAP_APPFONT ( 80 , 72 ) ;
- TabStop = TRUE ;
- };
- Control WND_RIGHT
- {
- HelpId = HID_SC_HF_HLR ;
- Border = TRUE ;
- Pos = MAP_APPFONT ( 174 , 18 ) ;
- Size = MAP_APPFONT ( 80 , 72 ) ;
- TabStop = TRUE ;
- };
- ListBox LB_DEFINED
- {
- HelpId = HID_SC_HF_HL_DEFINED ;
- Border = TRUE ;
- Pos = MAP_APPFONT ( 90 , 100 ) ;
- Size = MAP_APPFONT ( 130 , 80 ) ;
- DropDown = TRUE ;
- TabStop = TRUE ;
- };
-};
-
-TabPage RID_SCPAGE_HFED_HR
-{
- Hide = TRUE ;
- HelpId = HID_SCPAGE_HFED_HR ;
- Control WND_LEFT
- {
- HelpId = HID_SC_HF_HRL ;
- Border = TRUE ;
- Pos = MAP_APPFONT ( 6 , 18 ) ;
- Size = MAP_APPFONT ( 80 , 72 ) ;
- TabStop = TRUE ;
- };
- Control WND_CENTER
- {
- HelpId = HID_SC_HF_HRC ;
- Border = TRUE ;
- Pos = MAP_APPFONT ( 90 , 18 ) ;
- Size = MAP_APPFONT ( 80 , 72 ) ;
- TabStop = TRUE ;
- };
- Control WND_RIGHT
- {
- HelpId = HID_SC_HF_HRR ;
- Border = TRUE ;
- Pos = MAP_APPFONT ( 174 , 18 ) ;
- Size = MAP_APPFONT ( 80 , 72 ) ;
- TabStop = TRUE ;
- };
- ListBox LB_DEFINED
- {
- HelpId = HID_SC_HF_HR_DEFINED ;
- Border = TRUE ;
- Pos = MAP_APPFONT ( 90 , 100 ) ;
- Size = MAP_APPFONT ( 130 , 80 ) ;
- DropDown = TRUE ;
- TabStop = TRUE ;
- };
-};
-
-TabPage RID_SCPAGE_HFED_FL
-{
- Hide = TRUE ;
- HelpId = HID_SCPAGE_HFED_FL ;
- Control WND_LEFT
- {
- HelpId = HID_SC_HF_FLL ;
- Border = TRUE ;
- Pos = MAP_APPFONT ( 6 , 18 ) ;
- Size = MAP_APPFONT ( 80 , 72 ) ;
- TabStop = TRUE ;
- };
- Control WND_CENTER
- {
- HelpId = HID_SC_HF_FLC ;
- Border = TRUE ;
- Pos = MAP_APPFONT ( 90 , 18 ) ;
- Size = MAP_APPFONT ( 80 , 72 ) ;
- TabStop = TRUE ;
- };
- Control WND_RIGHT
- {
- HelpId = HID_SC_HF_FLR ;
- Border = TRUE ;
- Pos = MAP_APPFONT ( 174 , 18 ) ;
- Size = MAP_APPFONT ( 80 , 72 ) ;
- TabStop = TRUE ;
- };
- ListBox LB_DEFINED
- {
- HelpId = HID_SC_HF_FL_DEFINED ;
- Border = TRUE ;
- Pos = MAP_APPFONT ( 90 , 100 ) ;
- Size = MAP_APPFONT ( 130 , 80 ) ;
- DropDown = TRUE ;
- TabStop = TRUE ;
- };
-};
-
-TabPage RID_SCPAGE_HFED_FR
-{
- Hide = TRUE ;
- HelpId = HID_SCPAGE_HFED_FR ;
- Control WND_LEFT
- {
- HelpId = HID_SC_HF_FRL ;
- Border = TRUE ;
- Pos = MAP_APPFONT ( 6 , 18 ) ;
- Size = MAP_APPFONT ( 80 , 72 ) ;
- TabStop = TRUE ;
- };
- Control WND_CENTER
- {
- HelpId = HID_SC_HF_FRC ;
- Border = TRUE ;
- Pos = MAP_APPFONT ( 90 , 18 ) ;
- Size = MAP_APPFONT ( 80 , 72 ) ;
- TabStop = TRUE ;
- };
- Control WND_RIGHT
- {
- HelpId = HID_SC_HF_FRR ;
- Border = TRUE ;
- Pos = MAP_APPFONT ( 174 , 18 ) ;
- Size = MAP_APPFONT ( 80 , 72 ) ;
- TabStop = TRUE ;
- };
- ListBox LB_DEFINED
- {
- HelpId = HID_SC_HF_FR_DEFINED ;
- Border = TRUE ;
- Pos = MAP_APPFONT ( 90 , 100 ) ;
- Size = MAP_APPFONT ( 130 , 80 ) ;
- DropDown = TRUE ;
- TabStop = TRUE ;
- };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx
index bc4b071..a481c71 100644
--- a/sc/source/ui/pagedlg/scuitphfedit.cxx
+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx
@@ -47,7 +47,6 @@
#include "globstr.hrc"
#include "tabvwsh.hxx"
#include "prevwsh.hxx"
-#include "hfedtdlg.hrc"
#include "textdlgs.hxx"
#include "AccessibleEditObject.hxx"
diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx
index 717c493..255dad3 100644
--- a/sc/source/ui/pagedlg/tphfedit.cxx
+++ b/sc/source/ui/pagedlg/tphfedit.cxx
@@ -41,7 +41,6 @@
#include "globstr.hrc"
#include "tabvwsh.hxx"
#include "prevwsh.hxx"
-#include "hfedtdlg.hrc"
#include "AccessibleEditObject.hxx"
#include "scabstdlg.hxx"
diff --git a/sc/uiconfig/scalc/ui/allheaderfooterdialog.ui b/sc/uiconfig/scalc/ui/allheaderfooterdialog.ui
new file mode 100644
index 0000000..9b64ef9
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/allheaderfooterdialog.ui
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="AllHeaderFooterDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Headers/Footers</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">3</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">4</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="GtkNotebook" id="tabcontrol">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="headerright">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Header (right)</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="headerleft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Header (left)</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="footerright">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Footer (right)</property>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="footerleft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Footer (left)</property>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ <property name="tab_fill">False</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>
diff --git a/sc/uiconfig/scalc/ui/footerdialog.ui b/sc/uiconfig/scalc/ui/footerdialog.ui
new file mode 100644
index 0000000..c987b4a
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/footerdialog.ui
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="FooterDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Footers</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">3</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">4</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="GtkNotebook" id="tabcontrol">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="footerright">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Footer (right)</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="footerleft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Footer (left)</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">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>
diff --git a/sc/uiconfig/scalc/ui/headerdialog.ui b/sc/uiconfig/scalc/ui/headerdialog.ui
new file mode 100644
index 0000000..7697a81
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/headerdialog.ui
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="HeaderDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Headers</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">3</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">4</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="GtkNotebook" id="tabcontrol">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="headerright">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Header (right)</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="headerleft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Header (left)</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">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>
diff --git a/sc/uiconfig/scalc/ui/headerfooterdialog.ui b/sc/uiconfig/scalc/ui/headerfooterdialog.ui
new file mode 100644
index 0000000..5da4582
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/headerfooterdialog.ui
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="HeaderFooterDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Headers/Footers</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">3</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">4</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="GtkNotebook" id="tabcontrol">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="header">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Header</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="footer">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Footer</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">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>
diff --git a/sc/uiconfig/scalc/ui/leftfooterdialog.ui b/sc/uiconfig/scalc/ui/leftfooterdialog.ui
new file mode 100644
index 0000000..90577f3
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/leftfooterdialog.ui
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="LeftFooterDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Footer (left)</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">3</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">4</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="GtkNotebook" id="tabcontrol">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="footerleft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Footer (left)</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</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>
diff --git a/sc/uiconfig/scalc/ui/leftheaderdialog.ui b/sc/uiconfig/scalc/ui/leftheaderdialog.ui
new file mode 100644
index 0000000..959c78f
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/leftheaderdialog.ui
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="Left Header">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Header (left)</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">3</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">4</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="GtkNotebook" id="tabcontrol">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="headerleft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Header (left)</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</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>
diff --git a/sc/uiconfig/scalc/ui/rightfooterdialog.ui b/sc/uiconfig/scalc/ui/rightfooterdialog.ui
new file mode 100644
index 0000000..61c492f
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/rightfooterdialog.ui
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="RightFooterDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Footer (right)</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">3</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">4</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="GtkNotebook" id="tabcontrol">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="footerright">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Footer (right)</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</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>
diff --git a/sc/uiconfig/scalc/ui/rightheaderdialog.ui b/sc/uiconfig/scalc/ui/rightheaderdialog.ui
new file mode 100644
index 0000000..958e954
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/rightheaderdialog.ui
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="RightHeaderDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Header (right)</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">3</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">4</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="GtkNotebook" id="tabcontrol">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="headerright">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Header (right)</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</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>
diff --git a/sc/uiconfig/scalc/ui/sharedfooterdialog.ui b/sc/uiconfig/scalc/ui/sharedfooterdialog.ui
new file mode 100644
index 0000000..af5e760
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/sharedfooterdialog.ui
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="SharedFooterDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Headers/Footers</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">3</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">4</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="GtkNotebook" id="tabcontrol">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="headerright">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Header (right)</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="headerleft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Header (left)</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="footer">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Footer</property>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ <property name="tab_fill">False</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>
diff --git a/sc/uiconfig/scalc/ui/sharedheaderdialog.ui b/sc/uiconfig/scalc/ui/sharedheaderdialog.ui
new file mode 100644
index 0000000..08adc9f
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/sharedheaderdialog.ui
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="SharedHeaderDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Headers/Footers</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">3</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">4</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="GtkNotebook" id="tabcontrol">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="header">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Header</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list