[Libreoffice-commits] .: 3 commits - cui/AllLangResTarget_cui.mk cui/source sc/source sd/source sfx2/inc sw/inc sw/source sw/uiconfig sw/UI_swriter.mk
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Jan 18 06:35:33 PST 2013
cui/AllLangResTarget_cui.mk | 1
cui/source/factory/dlgfact.cxx | 22 ++
cui/source/factory/dlgfact.hxx | 4
cui/source/inc/helpid.hrc | 3
cui/source/tabpages/backgrnd.cxx | 1
cui/source/tabpages/backgrnd.hrc | 56 -----
cui/source/tabpages/backgrnd.src | 268 ---------------------------
sc/source/ui/attrdlg/scdlgfact.cxx | 5
sc/source/ui/attrdlg/scdlgfact.hxx | 1
sd/source/ui/dlg/sddlgfact.cxx | 17 +
sd/source/ui/dlg/sddlgfact.hxx | 3
sfx2/inc/sfx2/sfxdlg.hxx | 1
sfx2/inc/sfx2/tabdlg.hxx | 15 +
sw/UI_swriter.mk | 1
sw/inc/globals.hrc | 3
sw/inc/helpid.h | 1
sw/inc/swabstdlg.hxx | 4
sw/source/ui/dbui/dbinsdlg.cxx | 2
sw/source/ui/dialog/swdlgfact.cxx | 35 +--
sw/source/ui/dialog/swdlgfact.hxx | 7
sw/source/ui/docvw/PageBreakWin.cxx | 3
sw/source/ui/inc/table.hrc | 3
sw/source/ui/inc/tabledlg.hxx | 5
sw/source/ui/shells/tabsh.cxx | 6
sw/source/ui/table/swtablerep.cxx | 1
sw/source/ui/table/tabledlg.cxx | 35 +--
sw/source/ui/table/tabledlg.hrc | 52 -----
sw/source/ui/table/tabledlg.src | 295 ------------------------------
sw/uiconfig/swriter/ui/tableproperties.ui | 169 +++++++++--------
29 files changed, 209 insertions(+), 810 deletions(-)
New commits:
commit a8eecb6df5f11cbfc8a57b737ad82eacad79ccb4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jan 18 13:33:47 2013 +0000
convert table properties tabdialog to .ui
Change-Id: Ide72fb6bfc604f13e9d01250aac8e9b011bd034b
diff --git a/sw/UI_swriter.mk b/sw/UI_swriter.mk
index e33a4df..b7f8f74 100644
--- a/sw/UI_swriter.mk
+++ b/sw/UI_swriter.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_UI_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/statisticsinfopage \
sw/uiconfig/swriter/ui/stringinput \
sw/uiconfig/swriter/ui/tablecolumnpage \
+ sw/uiconfig/swriter/ui/tableproperties \
sw/uiconfig/swriter/ui/tabletextflowpage \
sw/uiconfig/swriter/ui/titlepage \
sw/uiconfig/swriter/ui/wordcount \
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index 66c2134..21c1232 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -149,7 +149,6 @@
#define TP_FRM_STD (RC_GLOBALS_BEGIN + 31)
-#define TP_FORMAT_TABLE (RC_GLOBALS_BEGIN + 34)
#define TP_GRF_EXT (RC_GLOBALS_BEGIN + 35)
#define DLG_FRM_STD (RC_GLOBALS_BEGIN + 36)
@@ -167,8 +166,6 @@
#define TP_FRM_WRAP (RC_GLOBALS_BEGIN + 49)
#define TP_FRM_ADD (RC_GLOBALS_BEGIN + 51)
-#define TP_TABLE_TEXTFLOW (RC_GLOBALS_BEGIN + 52)
-
#define TP_PARA_ALIGN (RC_GLOBALS_BEGIN + 55)
#define TP_OPTTABLE_PAGE (RC_GLOBALS_BEGIN + 56)
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 298c2fa..bb1816b 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -157,7 +157,6 @@
#define HID_FRM_STD "SW_HID_FRM_STD"
#define HID_GRF_EXT "SW_HID_GRF_EXT"
#define HID_FOOTNOTE_PAGE "SW_HID_FOOTNOTE_PAGE"
-#define HID_FORMAT_TABLE "SW_HID_FORMAT_TABLE"
#define HID_LAB_LAB "SW_HID_LAB_LAB"
#define HID_LAB_PRT "SW_HID_LAB_PRT"
#define HID_ENV_PRT "SW_HID_ENV_PRT"
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 553dcc0..f5aa68c 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -397,8 +397,8 @@ public:
virtual SfxAbstractDialog * CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, sal_Bool bDrawMode, int nResId ) = 0; //add for SwWrapDlg
virtual VclAbstractDialog * CreateSwTableWidthDlg(Window *pParent, SwTableFUNC &rFnc) = 0; //add for SwTableWidthDlg
- virtual SfxAbstractTabDialog* CreateSwTableTabDlg( Window* pParent, SfxItemPool& Pool,
- const SfxItemSet* pItemSet, SwWrtShell* pSh,int nResId ) = 0; //add for SwTableTabDlg
+ virtual SfxAbstractTabDialog* CreateSwTableTabDlg(Window* pParent, SfxItemPool& Pool,
+ const SfxItemSet* pItemSet, SwWrtShell* pSh) = 0; //add for SwTableTabDlg
virtual AbstractSwFldDlg * CreateSwFldDlg ( SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent, int nResId ) = 0; //add for SwFldDlg
virtual SfxAbstractDialog* CreateSwFldEditDlg ( SwView& rVw, int nResId ) = 0; //add for SwFldEditDlg
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 99c0f31..5072489 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -747,7 +747,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, TblFmtHdl, PushButton*, pButton )
SwAbstractDialogFactory* pFact = swui::GetFactory();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- SfxAbstractTabDialog* pDlg = pFact->CreateSwTableTabDlg( pButton, rSh.GetAttrPool(),pTblSet, &rSh, DLG_FORMAT_TABLE );
+ SfxAbstractTabDialog* pDlg = pFact->CreateSwTableTabDlg(pButton, rSh.GetAttrPool(), pTblSet, &rSh);
OSL_ENSURE(pDlg, "Dialogdiet fail!");
if( RET_OK == pDlg->Execute() )
pTblSet->Put( *pDlg->GetOutputItemSet() );
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index c928c8d..541a2ec 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -985,23 +985,11 @@ VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwTableWidthDlg(Window *
return new VclAbstractDialog_Impl( pDlg );
}
-SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwTableTabDlg( Window* pParent, SfxItemPool& Pool,
- const SfxItemSet* pItemSet, SwWrtShell* pSh,int nResId )
+SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwTableTabDlg(Window* pParent, SfxItemPool& Pool,
+ const SfxItemSet* pItemSet, SwWrtShell* pSh)
{
- SfxTabDialog* pDlg=NULL;
- switch ( nResId )
- {
- case DLG_FORMAT_TABLE :
- pDlg = new SwTableTabDlg( pParent, Pool, pItemSet,pSh );
- break;
-
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractTabDialog_Impl( pDlg );
- return 0;
+ SfxTabDialog* pDlg = new SwTableTabDlg(pParent, Pool, pItemSet, pSh);
+ return new AbstractTabDialog_Impl(pDlg);
}
AbstractSwFldDlg * SwAbstractDialogFactory_Impl::CreateSwFldDlg ( SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent, int nResId )
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 880cf8c..670554e 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -481,8 +481,8 @@ public:
virtual SfxAbstractDialog * CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, sal_Bool bDrawMode, int nResId ); //add for SwWrapDlg
virtual VclAbstractDialog * CreateSwTableWidthDlg(Window *pParent, SwTableFUNC &rFnc);
- virtual SfxAbstractTabDialog* CreateSwTableTabDlg( Window* pParent, SfxItemPool& Pool,
- const SfxItemSet* pItemSet, SwWrtShell* pSh,int nResId ); //add for SwTableTabDlg
+ virtual SfxAbstractTabDialog* CreateSwTableTabDlg(Window* pParent, SfxItemPool& Pool,
+ const SfxItemSet* pItemSet, SwWrtShell* pSh); //add for SwTableTabDlg
virtual AbstractSwFldDlg * CreateSwFldDlg ( SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent, int nResId ); //add for SwFldDlg
virtual SfxAbstractDialog* CreateSwFldEditDlg ( SwView& rVw, int nResId ); //add for SwFldEditDlg
virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg( Window* pParent, //add for SwRenameXNamedDlg
diff --git a/sw/source/ui/docvw/PageBreakWin.cxx b/sw/source/ui/docvw/PageBreakWin.cxx
index f945467..0abdb28 100644
--- a/sw/source/ui/docvw/PageBreakWin.cxx
+++ b/sw/source/ui/docvw/PageBreakWin.cxx
@@ -57,6 +57,7 @@
#include <drawinglayer/processor2d/processorfromoutputdevice.hxx>
#include <editeng/brkitem.hxx>
#include <sfx2/dispatch.hxx>
+#include <svl/stritem.hxx>
#include <vcl/svapp.hxx>
@@ -248,7 +249,7 @@ void SwPageBreakWin::Select( )
SwCntntNode* pNd = pCnt->GetNode();
rSh.SetSelection( *pNd );
- SfxUInt16Item aItem( pEditWin->GetView().GetPool( ).GetWhich( FN_FORMAT_TABLE_DLG ), TP_TABLE_TEXTFLOW );
+ SfxStringItem aItem(pEditWin->GetView().GetPool().GetWhich(FN_FORMAT_TABLE_DLG), "textflow");
pEditWin->GetView().GetViewFrame()->GetDispatcher()->Execute(
FN_FORMAT_TABLE_DLG, SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD, &aItem, NULL );
diff --git a/sw/source/ui/inc/table.hrc b/sw/source/ui/inc/table.hrc
index 77af9b4..ff790c1 100644
--- a/sw/source/ui/inc/table.hrc
+++ b/sw/source/ui/inc/table.hrc
@@ -18,8 +18,6 @@
#include "rcid.hrc"
-#define DLG_FORMAT_TABLE (RC_TABLE_BEGIN + 1)
-
#define DLG_ROW_HEIGHT (RC_TABLE_BEGIN + 4)
@@ -27,7 +25,6 @@
-#define TP_TABLE_COLUMN (RC_TABLE_BEGIN + 11)
#define DLG_INSERT_CHART (RC_TABLE_BEGIN + 12)
#define MSG_WRONG_TABLENAME (RC_TABLE_BEGIN + 13)
diff --git a/sw/source/ui/inc/tabledlg.hxx b/sw/source/ui/inc/tabledlg.hxx
index 5905493..5bc5ea0 100644
--- a/sw/source/ui/inc/tabledlg.hxx
+++ b/sw/source/ui/inc/tabledlg.hxx
@@ -34,7 +34,10 @@ struct TColumn;
class SwTableTabDlg : public SfxTabDialog
{
SwWrtShell* pShell;
- sal_uInt16 nHtmlMode;
+ sal_uInt16 m_nHtmlMode;
+ sal_uInt16 m_nTextFlowId;
+ sal_uInt16 m_nBackgroundId;
+ sal_uInt16 m_nBorderId;
virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage);
public:
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index ff1e401..c3ce9a1 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -569,11 +569,11 @@ void SwTableShell::Execute(SfxRequest &rReq)
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- pDlg = pFact->CreateSwTableTabDlg( GetView().GetWindow(), GetPool(), &aCoreSet, &rSh, DLG_FORMAT_TABLE );
+ pDlg = pFact->CreateSwTableTabDlg(GetView().GetWindow(), GetPool(), &aCoreSet, &rSh);
OSL_ENSURE(pDlg, "Dialogdiet fail!");
- if( pItem )
- pDlg->SetCurPageId( ((SfxUInt16Item *)pItem)->GetValue() );
+ if (pItem)
+ pDlg->SetCurPageId(OUStringToOString(((SfxStringItem *)pItem)->GetValue(), RTL_TEXTENCODING_UTF8));
}
aCoreSet.Put(SfxUInt16Item(SID_HTML_MODE, ::GetHtmlMode(GetView().GetDocShell())));
rSh.GetTblAttr(aCoreSet);
diff --git a/sw/source/ui/table/swtablerep.cxx b/sw/source/ui/table/swtablerep.cxx
index 4fddcae..b4d1197 100644
--- a/sw/source/ui/table/swtablerep.cxx
+++ b/sw/source/ui/table/swtablerep.cxx
@@ -50,7 +50,6 @@
#include <SwStyleNameMapper.hxx>
#include <cmdid.h>
-#include <tabledlg.hrc>
#include <table.hrc>
#include "swtablerep.hxx"
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 9dbfeee..cb8f631 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -53,7 +53,6 @@
#include <SwStyleNameMapper.hxx>
#include <cmdid.h>
-#include <tabledlg.hrc>
#include <table.hrc>
#include <svx/svxids.hrc>
#include <svx/dialogs.hrc>
@@ -1236,42 +1235,40 @@ void SwTableColumnPage::SetVisibleWidth(sal_uInt16 nPos, SwTwips nNewWidth)
}
-
-SwTableTabDlg::SwTableTabDlg(Window* pParent, SfxItemPool& ,
- const SfxItemSet* pItemSet, SwWrtShell* pSh ) :
- SfxTabDialog(pParent, SW_RES(DLG_FORMAT_TABLE), pItemSet,0),
- pShell(pSh),
- nHtmlMode(::GetHtmlMode(pSh->GetView().GetDocShell()))
+SwTableTabDlg::SwTableTabDlg(Window* pParent, SfxItemPool&,
+ const SfxItemSet* pItemSet, SwWrtShell* pSh)
+ : SfxTabDialog(0, pParent, "TablePropertiesDialog",
+ "modules/swriter/ui/tableproperties.ui", pItemSet, 0)
+ , pShell(pSh)
+ , m_nHtmlMode(::GetHtmlMode(pSh->GetView().GetDocShell()))
{
- FreeResource();
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialogdiet fail!");
- AddTabPage(TP_FORMAT_TABLE, &SwFormatTablePage::Create, 0 );
- AddTabPage(TP_TABLE_TEXTFLOW, &SwTextFlowPage::Create, 0 );
- AddTabPage(TP_TABLE_COLUMN, &SwTableColumnPage::Create, 0 );
- AddTabPage(TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0 );
- AddTabPage(TP_BORDER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), 0 );
+ AddTabPage("table", &SwFormatTablePage::Create, 0);
+ m_nTextFlowId = AddTabPage("textflow", &SwTextFlowPage::Create, 0);
+ AddTabPage("columns", &SwTableColumnPage::Create, 0);
+ m_nBackgroundId = AddTabPage("background", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BACKGROUND), 0);
+ m_nBorderId = AddTabPage("borders", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BORDER), 0);
}
-
void SwTableTabDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage)
{
SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
- if( TP_BACKGROUND == nId )
+ if (nId == m_nBackgroundId)
{
sal_Int32 nFlagType = SVX_SHOW_TBLCTL;
- if(!( nHtmlMode & HTMLMODE_ON ) ||
- nHtmlMode & HTMLMODE_SOME_STYLES)
+ if(!( m_nHtmlMode & HTMLMODE_ON ) ||
+ m_nHtmlMode & HTMLMODE_SOME_STYLES)
nFlagType |= SVX_SHOW_SELECTOR;
aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, nFlagType));
rPage.PageCreated(aSet);
}
- else if(TP_BORDER == nId)
+ else if (nId == m_nBorderId)
{
aSet.Put (SfxUInt16Item(SID_SWMODE_TYPE,SW_BORDER_MODE_TABLE));
rPage.PageCreated(aSet);
}
- else if(TP_TABLE_TEXTFLOW == nId)
+ else if (nId == m_nTextFlowId)
{
((SwTextFlowPage&)rPage).SetShell(pShell);
const sal_uInt16 eType = pShell->GetFrmType(0,sal_True);
diff --git a/sw/source/ui/table/tabledlg.hrc b/sw/source/ui/table/tabledlg.hrc
deleted file mode 100644
index f801bba..0000000
--- a/sw/source/ui/table/tabledlg.hrc
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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 "globals.hrc"
-
-#define ED_WIDTH 1
-#define FL_WIDTH 3
-#define CB_REL_WIDTH 4
-#define RB_LEFT 10
-#define RB_RIGHT 11
-#define RB_CENTER 12
-#define RB_FREE 13
-#define RB_FULL 14
-#define FL_POS 15
-#define ED_LEFT_DIST 51
-#define ED_RIGHT_DIST 52
-#define FT_RIGHT_DIST 53
-#define FT_LEFT_DIST 54
-#define FT_TOP_DIST 20
-#define ED_TOP_DIST 21
-#define FT_BOTTOM_DIST 22
-#define ED_BOTTOM_DIST 23
-#define FL_DIST 24
-#define FT_WIDTH 25
-#define FT_POS 32
-#define FL_PROPERTIES 42
-#define FT_TEXTORIENTATION 43
-#define LB_TEXTORIENTATION 44
-
-#define BT_OK 100
-#define BT_CANCEL 101
-#define BT_MORE 102
-#define ED_NAME 103
-#define FT_NAME 104
-#define FL_OPTIONS 105
-#define FL_NAME 106
-
-#define RB_FROM_LEFT 127
diff --git a/sw/source/ui/table/tabledlg.src b/sw/source/ui/table/tabledlg.src
index 79140b6..89e2adb 100644
--- a/sw/source/ui/table/tabledlg.src
+++ b/sw/source/ui/table/tabledlg.src
@@ -17,301 +17,6 @@
*/
#include "table.hrc"
-#include "tabledlg.hrc"
-#include "helpid.h"
-#define TEXT_TEXTFLOW \
- Text [ en-US ] = "Text Flow" ; \
-
-TabDialog DLG_FORMAT_TABLE
-{
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Text [ en-US ] = "Table Format" ;
- Moveable = TRUE ;
- TabControl 1
- {
- SVLook = TRUE ;
- PageList =
- {
- PageItem
- {
- Identifier = TP_FORMAT_TABLE ;
- Text [ en-US ] = "Table" ;
- PageResID = TP_FORMAT_TABLE ;
- };
- PageItem
- {
- Identifier = TP_TABLE_TEXTFLOW ;
- TEXT_TEXTFLOW
- };
- PageItem
- {
- Identifier = TP_TABLE_COLUMN ;
- Text [ en-US ] = "Columns" ;
- PageResID = TP_TABLE_COLUMN ;
- };
- PageItem
- {
- Identifier = TP_BORDER ;
- Text [ en-US ] = "Borders" ;
- PageResID = TP_BORDER ;
- };
- PageItem
- {
- Identifier = TP_BACKGROUND ;
- Text [ en-US ] = "Background" ;
- PageResID = TP_BACKGROUND ;
- };
- };
- };
-};
-
-TabPage TP_FORMAT_TABLE
-{
- HelpID = HID_FORMAT_TABLE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
- Hide = TRUE;
- FixedText FT_NAME
- {
- Pos = MAP_APPFONT ( 12 , 16 ) ;
- Size = MAP_APPFONT ( 60 , 8 ) ;
- Text [ en-US ] = "~Name" ;
- };
- Edit ED_NAME
- {
- HelpID = "sw:Edit:TP_FORMAT_TABLE:ED_NAME";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 75 , 14 ) ;
- Size = MAP_APPFONT ( 112 , 12 ) ;
- TabStop = TRUE ;
- };
- FixedText FT_WIDTH
- {
- Pos = MAP_APPFONT ( 12 , 32 ) ;
- Size = MAP_APPFONT ( 60 , 10 ) ;
- Text [ en-US ] = "W~idth" ;
- };
- MetricField ED_WIDTH
- {
- HelpID = "sw:MetricField:TP_FORMAT_TABLE:ED_WIDTH";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 75 , 30 ) ;
- Size = MAP_APPFONT ( 40 , 12 ) ;
- TabStop = TRUE ;
- Left = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = 0 ;
- Maximum = 9999 ;
- DecimalDigits = 2 ;
- Value = 0 ;
- Unit = FUNIT_CM ;
- First = 0 ;
- Last = 9999 ;
- SpinSize = 5 ;
- };
- CheckBox CB_REL_WIDTH
- {
- HelpID = "sw:CheckBox:TP_FORMAT_TABLE:CB_REL_WIDTH";
- Pos = MAP_APPFONT ( 118 , 32 ) ;
- Size = MAP_APPFONT ( 69 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "Relati~ve" ;
- };
- FixedLine FL_OPTIONS
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 184 , 8 ) ;
- Text [ en-US ] = "Properties" ;
- };
- RadioButton RB_FULL
- {
- HelpID = "sw:RadioButton:TP_FORMAT_TABLE:RB_FULL";
- Pos = MAP_APPFONT ( 202 , 14 ) ;
- Size = MAP_APPFONT ( 50 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "A~utomatic" ;
- };
- RadioButton RB_LEFT
- {
- HelpID = "sw:RadioButton:TP_FORMAT_TABLE:RB_LEFT";
- Pos = MAP_APPFONT ( 202 , 28 ) ;
- Size = MAP_APPFONT ( 50 , 10 ) ;
- Text [ en-US ] = "~Left" ;
- TabStop = TRUE ;
- };
- RadioButton RB_FROM_LEFT
- {
- HelpID = "sw:RadioButton:TP_FORMAT_TABLE:RB_FROM_LEFT";
- Pos = MAP_APPFONT ( 202 , 42 ) ;
- Size = MAP_APPFONT ( 50 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "~From left";
- };
- RadioButton RB_RIGHT
- {
- HelpID = "sw:RadioButton:TP_FORMAT_TABLE:RB_RIGHT";
- Pos = MAP_APPFONT ( 202 , 56 ) ;
- Size = MAP_APPFONT ( 50 , 10 ) ;
- Text [ en-US ] = "R~ight" ;
- TabStop = TRUE ;
- };
- RadioButton RB_CENTER
- {
- HelpID = "sw:RadioButton:TP_FORMAT_TABLE:RB_CENTER";
- Pos = MAP_APPFONT ( 202 , 70 ) ;
- Size = MAP_APPFONT ( 50 , 10 ) ;
- Text [ en-US ] = "~Center" ;
- TabStop = TRUE ;
- };
- RadioButton RB_FREE
- {
- HelpID = "sw:RadioButton:TP_FORMAT_TABLE:RB_FREE";
- Pos = MAP_APPFONT ( 202 , 84 ) ;
- Size = MAP_APPFONT ( 50 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "~Manual" ;
- };
- FixedLine FL_POS
- {
- Pos = MAP_APPFONT ( 196 , 3 ) ;
- Size = MAP_APPFONT ( 58 , 8 ) ;
- Text [ en-US ] = "Alignment" ;
- };
- FixedLine FL_DIST
- {
- Pos = MAP_APPFONT ( 6 , 48 ) ;
- Size = MAP_APPFONT ( 184 , 8 ) ;
- Text [ en-US ] = "Spacing" ;
- };
- FixedText FT_LEFT_DIST
- {
- Pos = MAP_APPFONT ( 12 , 61 ) ;
- Size = MAP_APPFONT ( 130 , 8 ) ;
- Text [ en-US ] = "Lef~t" ;
- };
- MetricField ED_LEFT_DIST
- {
- HelpID = "sw:MetricField:TP_FORMAT_TABLE:ED_LEFT_DIST";
- Pos = MAP_APPFONT ( 147 , 59 ) ;
- Size = MAP_APPFONT ( 40 , 12 ) ;
- Border = TRUE ;
- TabStop = TRUE ;
- Left = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = -9999 ;
- Maximum = 9999 ;
- DecimalDigits = 2 ;
- Unit = FUNIT_CM ;
- First = 0 ;
- Last = 9999 ;
- SpinSize = 5 ;
- };
- FixedText FT_RIGHT_DIST
- {
- Pos = MAP_APPFONT ( 12 , 77 ) ;
- Size = MAP_APPFONT ( 130 , 8 ) ;
- Text [ en-US ] = "Ri~ght" ;
- };
-
- MetricField ED_RIGHT_DIST
- {
- HelpID = "sw:MetricField:TP_FORMAT_TABLE:ED_RIGHT_DIST";
- Pos = MAP_APPFONT ( 147 , 75 ) ;
- Size = MAP_APPFONT ( 40 , 12 ) ;
- Border = TRUE ;
- TabStop = TRUE ;
- Left = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = -9999 ;
- Maximum = 9999 ;
- DecimalDigits = 2 ;
- Unit = FUNIT_CM ;
- First = 0 ;
- Last = 9999 ;
- SpinSize = 5 ;
- };
- FixedText FT_TOP_DIST
- {
- Pos = MAP_APPFONT ( 12 , 93 ) ;
- Size = MAP_APPFONT ( 130 , 8 ) ;
- Text [ en-US ] = "~Above" ;
- };
- MetricField ED_TOP_DIST
- {
- HelpID = "sw:MetricField:TP_FORMAT_TABLE:ED_TOP_DIST";
- Pos = MAP_APPFONT ( 147 , 91 ) ;
- Size = MAP_APPFONT ( 40 , 12 ) ;
- Border = TRUE ;
- TabStop = TRUE ;
- Left = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = 0 ;
- Maximum = 9999 ;
- DecimalDigits = 2 ;
- Unit = FUNIT_CM ;
- First = 0 ;
- Last = 9999 ;
- SpinSize = 5 ;
- };
- FixedText FT_BOTTOM_DIST
- {
- Pos = MAP_APPFONT ( 12 , 109 ) ;
- Size = MAP_APPFONT ( 130 , 8 ) ;
- Text [ en-US ] = "~Below" ;
- };
- MetricField ED_BOTTOM_DIST
- {
- HelpID = "sw:MetricField:TP_FORMAT_TABLE:ED_BOTTOM_DIST";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 147 , 107 ) ;
- Size = MAP_APPFONT ( 40 , 12 ) ;
- TabStop = TRUE ;
- Left = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = 0 ;
- Maximum = 1000 ;
- DecimalDigits = 2 ;
- Unit = FUNIT_CM ;
- First = 0 ;
- Last = 9999 ;
- SpinSize = 5 ;
- };
- FixedLine FL_PROPERTIES
- {
- Pos = MAP_APPFONT ( 6 , 125 ) ;
- Size = MAP_APPFONT ( 248 , 8 ) ;
- Hide = TRUE ;
- Text [ en-US ] = "Properties";
- };
- FixedText FT_TEXTORIENTATION
- {
- Pos = MAP_APPFONT ( 12 , 138 ) ;
- Size = MAP_APPFONT ( 60 , 8 ) ;
- Hide = TRUE ;
- Text [ en-US ] = "Text ~direction";
- };
- ListBox LB_TEXTORIENTATION
- {
- HelpID = "sw:ListBox:TP_FORMAT_TABLE:LB_TEXTORIENTATION";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 75 , 136 ) ;
- Size = MAP_APPFONT ( 176 , 50 ) ;
- DropDown = TRUE ;
- Hide = TRUE ;
- StringList [ en-US ] =
- {
- < "Left-to-right" ; 0; > ;
- < "Right-to-left" ; 1; > ;
- < "Use superordinate object settings" ; 4; > ;
- };
- };
-};
InfoBox MSG_WRONG_TABLENAME
{
diff --git a/sw/uiconfig/swriter/ui/tableproperties.ui b/sw/uiconfig/swriter/ui/tableproperties.ui
index 40d7ddb..236bfcc 100644
--- a/sw/uiconfig/swriter/ui/tableproperties.ui
+++ b/sw/uiconfig/swriter/ui/tableproperties.ui
@@ -1,23 +1,97 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <object class="GtkWindow" id="window1">
+ <object class="GtkDialog" id="TablePropertiesDialog">
<property name="can_focus">False</property>
- <child>
- <object class="GtkBox" id="box1">
- <property name="visible">True</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Table 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">5</property>
+ <property name="spacing">2</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="GtkNotebook" id="notebook1">
+ <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="label42">
+ <object class="GtkLabel" id="table">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Table</property>
@@ -30,7 +104,7 @@
<placeholder/>
</child>
<child type="tab">
- <object class="GtkLabel" id="label34">
+ <object class="GtkLabel" id="textflow">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Text Flow</property>
@@ -44,7 +118,7 @@
<placeholder/>
</child>
<child type="tab">
- <object class="GtkLabel" id="label25">
+ <object class="GtkLabel" id="columns">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Columns</property>
@@ -58,7 +132,7 @@
<placeholder/>
</child>
<child type="tab">
- <object class="GtkLabel" id="label1">
+ <object class="GtkLabel" id="borders">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Borders</property>
@@ -72,7 +146,7 @@
<placeholder/>
</child>
<child type="tab">
- <object class="GtkLabel" id="label2">
+ <object class="GtkLabel" id="background">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Background</property>
@@ -86,77 +160,16 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButtonBox" id="buttonbox1">
- <property name="visible">True</property>
- <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="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="button1">
- <property name="label" translatable="yes">Reset</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">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="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>
commit 4b529841d34ffdbcf6befe6f1eb70fe7ff8c159c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jan 18 13:33:18 2013 +0000
add a way to select the current SfxTabPage by name
Change-Id: Ib7a07bc0e6ec9f47b83839fb3eb8f31c014dedff
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 41124d6..8664374 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -196,6 +196,11 @@ void CuiAbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId )
pDlg->SetCurPageId( nId );
}
+void CuiAbstractTabDialog_Impl::SetCurPageId( const OString& rName )
+{
+ pDlg->SetCurPageId( rName );
+}
+
const SfxItemSet* CuiAbstractTabDialog_Impl::GetOutputItemSet() const
{
return pDlg->GetOutputItemSet();
@@ -617,6 +622,12 @@ void AbstractSvxTransformTabDialog_Impl::SetCurPageId( sal_uInt16 nId )
{
pDlg->SetCurPageId( nId );
}
+
+void AbstractSvxTransformTabDialog_Impl::SetCurPageId( const OString& rName )
+{
+ pDlg->SetCurPageId( rName );
+}
+
const SfxItemSet* AbstractSvxTransformTabDialog_Impl::GetOutputItemSet() const
{
return pDlg->GetOutputItemSet();
@@ -650,6 +661,12 @@ void AbstractSvxCaptionDialog_Impl::SetCurPageId( sal_uInt16 nId )
{
pDlg->SetCurPageId( nId );
}
+
+void AbstractSvxCaptionDialog_Impl::SetCurPageId( const OString& rName )
+{
+ pDlg->SetCurPageId( rName );
+}
+
const SfxItemSet* AbstractSvxCaptionDialog_Impl::GetOutputItemSet() const
{
return pDlg->GetOutputItemSet();
@@ -870,6 +887,11 @@ void AbstractSvxAreaTabDialog_Impl::SetCurPageId( sal_uInt16 nId )
pDlg->SetCurPageId( nId );
}
+void AbstractSvxAreaTabDialog_Impl::SetCurPageId( const OString& rName )
+{
+ pDlg->SetCurPageId( rName );
+}
+
const SfxItemSet* AbstractSvxAreaTabDialog_Impl::GetOutputItemSet() const
{
return pDlg->GetOutputItemSet();
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 3c97f2b..080d8b7 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -123,6 +123,7 @@ class CuiAbstractTabDialog_Impl : public SfxAbstractTabDialog
{
DECL_ABSTDLG_BASE(CuiAbstractTabDialog_Impl,SfxTabDialog)
virtual void SetCurPageId( sal_uInt16 nId );
+ virtual void SetCurPageId( const OString& rName );
virtual const SfxItemSet* GetOutputItemSet() const;
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem );
virtual void SetInputSet( const SfxItemSet* pInSet );
@@ -341,6 +342,7 @@ class AbstractSvxTransformTabDialog_Impl : public AbstractSvxTransformTabDialog
DECL_ABSTDLG_BASE(AbstractSvxTransformTabDialog_Impl,SvxTransformTabDialog)
virtual void SetValidateFramePosLink( const Link& rLink );
virtual void SetCurPageId( sal_uInt16 nId );
+ virtual void SetCurPageId( const OString& rName );
virtual const SfxItemSet* GetOutputItemSet() const;
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem );
virtual void SetInputSet( const SfxItemSet* pInSet );
@@ -352,6 +354,7 @@ class AbstractSvxCaptionDialog_Impl : public AbstractSvxCaptionDialog
DECL_ABSTDLG_BASE(AbstractSvxCaptionDialog_Impl,SvxCaptionTabDialog)
virtual void SetValidateFramePosLink( const Link& rLink );
virtual void SetCurPageId( sal_uInt16 nId );
+ virtual void SetCurPageId( const OString& rName );
virtual const SfxItemSet* GetOutputItemSet() const;
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem );
virtual void SetInputSet( const SfxItemSet* pInSet );
@@ -498,6 +501,7 @@ class AbstractSvxAreaTabDialog_Impl :public AbstractSvxAreaTabDialog
{
DECL_ABSTDLG_BASE(AbstractSvxAreaTabDialog_Impl,SvxAreaTabDialog)
virtual void SetCurPageId( sal_uInt16 nId );
+ virtual void SetCurPageId( const OString& rName );
virtual const SfxItemSet* GetOutputItemSet() const;
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem );
virtual void SetInputSet( const SfxItemSet* pInSet );
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index e755318..642acfcf 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -121,6 +121,11 @@ void ScAbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId )
pDlg->SetCurPageId( nId );
}
+void ScAbstractTabDialog_Impl::SetCurPageId( const OString& rName )
+{
+ pDlg->SetCurPageId( rName );
+}
+
const SfxItemSet* ScAbstractTabDialog_Impl::GetOutputItemSet() const
{
return pDlg->GetOutputItemSet();
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index 289bf06..b51439b 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -373,6 +373,7 @@ class ScAbstractTabDialog_Impl : public SfxAbstractTabDialog
{
DECL_ABSTDLG_BASE( ScAbstractTabDialog_Impl,SfxTabDialog )
virtual void SetCurPageId( sal_uInt16 nId );
+ virtual void SetCurPageId( const OString &rName );
virtual const SfxItemSet* GetOutputItemSet() const;
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem );
virtual void SetInputSet( const SfxItemSet* pInSet );
diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx
index 203c759..c42e17b 100644
--- a/sd/source/ui/dlg/sddlgfact.cxx
+++ b/sd/source/ui/dlg/sddlgfact.cxx
@@ -95,6 +95,12 @@ void SdAbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId )
{
pDlg->SetCurPageId( nId );
}
+
+void SdAbstractTabDialog_Impl::SetCurPageId( const OString& rName )
+{
+ pDlg->SetCurPageId( rName );
+}
+
const SfxItemSet* SdAbstractTabDialog_Impl::GetOutputItemSet() const
{
return pDlg->GetOutputItemSet();
@@ -125,6 +131,12 @@ void AbstractBulletDialog_Impl::SetCurPageId( sal_uInt16 nId )
{
static_cast< ::sd::OutlineBulletDlg*>(pDlg)->SetCurPageId( nId );
}
+
+void AbstractBulletDialog_Impl::SetCurPageId( const OString& rName )
+{
+ static_cast< ::sd::OutlineBulletDlg*>(pDlg)->SetCurPageId( rName );
+}
+
const SfxItemSet* AbstractBulletDialog_Impl::GetOutputItemSet() const
{
return static_cast< ::sd::OutlineBulletDlg*>(pDlg)->GetOutputItemSet();
@@ -155,6 +167,11 @@ void SdPresLayoutTemplateDlg_Impl::SetCurPageId( sal_uInt16 nId )
pDlg->SetCurPageId( nId );
}
+void SdPresLayoutTemplateDlg_Impl::SetCurPageId( const OString& rName )
+{
+ pDlg->SetCurPageId( rName );
+}
+
const SfxItemSet* SdPresLayoutTemplateDlg_Impl::GetOutputItemSet() const
{
return pDlg->GetOutputItemSet();
diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx
index dd47cf2..d1c9ef7 100644
--- a/sd/source/ui/dlg/sddlgfact.hxx
+++ b/sd/source/ui/dlg/sddlgfact.hxx
@@ -78,6 +78,7 @@ class SdAbstractTabDialog_Impl : public SfxAbstractTabDialog
{
DECL_ABSTDLG_BASE( SdAbstractTabDialog_Impl,SfxTabDialog )
virtual void SetCurPageId( sal_uInt16 nId );
+ virtual void SetCurPageId( const OString& rName );
virtual const SfxItemSet* GetOutputItemSet() const;
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem );
virtual void SetInputSet( const SfxItemSet* pInSet );
@@ -94,6 +95,7 @@ class AbstractBulletDialog_Impl : public SfxAbstractTabDialog
{
DECL_ABSTDLG_BASE( AbstractBulletDialog_Impl,SfxTabDialog )
virtual void SetCurPageId( sal_uInt16 nId );
+ virtual void SetCurPageId( const OString& rName );
virtual const SfxItemSet* GetOutputItemSet() const;
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem );
virtual void SetInputSet( const SfxItemSet* pInSet );
@@ -108,6 +110,7 @@ class SdPresLayoutTemplateDlg_Impl : public SfxAbstractTabDialog
{
DECL_ABSTDLG_BASE( SdPresLayoutTemplateDlg_Impl,SdPresLayoutTemplateDlg )
virtual void SetCurPageId( sal_uInt16 nId );
+ virtual void SetCurPageId( const OString& rName );
virtual const SfxItemSet* GetOutputItemSet() const;
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem );
virtual void SetInputSet( const SfxItemSet* pInSet );
diff --git a/sfx2/inc/sfx2/sfxdlg.hxx b/sfx2/inc/sfx2/sfxdlg.hxx
index 0465dbb..d119eb7 100644
--- a/sfx2/inc/sfx2/sfxdlg.hxx
+++ b/sfx2/inc/sfx2/sfxdlg.hxx
@@ -67,6 +67,7 @@ class SfxAbstractTabDialog : virtual public SfxAbstractDialog
{
public:
virtual void SetCurPageId( sal_uInt16 nId ) = 0;
+ virtual void SetCurPageId( const OString &rName ) = 0;
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& ) = 0;
virtual void SetInputSet( const SfxItemSet* pInSet ) = 0;
};
diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx
index d9593c0..d25a72c 100644
--- a/sfx2/inc/sfx2/tabdlg.hxx
+++ b/sfx2/inc/sfx2/tabdlg.hxx
@@ -185,9 +185,18 @@ public:
void RemoveTabPage( sal_uInt16 nId );
- void SetCurPageId( sal_uInt16 nId ) { nAppPageId = nId; }
- sal_uInt16 GetCurPageId() const
- { return m_pTabCtrl->GetCurPageId(); }
+ void SetCurPageId(sal_uInt16 nId)
+ {
+ nAppPageId = nId;
+ }
+ void SetCurPageId(const OString& rName)
+ {
+ nAppPageId = m_pTabCtrl->GetPageId(rName);
+ }
+ sal_uInt16 GetCurPageId() const
+ {
+ return m_pTabCtrl->GetCurPageId();
+ }
void ShowPage( sal_uInt16 nId );
// may provide local slots converted by Map
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index dd84f23..c928c8d 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -131,6 +131,11 @@ void AbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId )
pDlg->SetCurPageId( nId );
}
+void AbstractTabDialog_Impl::SetCurPageId( const OString &rName )
+{
+ pDlg->SetCurPageId( rName );
+}
+
const SfxItemSet* AbstractTabDialog_Impl::GetOutputItemSet() const
{
return pDlg->GetOutputItemSet();
@@ -249,6 +254,11 @@ void AbstractSwLabDlg_Impl::SetCurPageId( sal_uInt16 nId )
pDlg->SetCurPageId( nId );
}
+void AbstractSwLabDlg_Impl::SetCurPageId( const OString &rName )
+{
+ pDlg->SetCurPageId( rName );
+}
+
const SfxItemSet* AbstractSwLabDlg_Impl::GetOutputItemSet() const
{
return pDlg->GetOutputItemSet();
@@ -309,6 +319,11 @@ void AbstractSwFldDlg_Impl::SetCurPageId( sal_uInt16 nId )
pDlg->SetCurPageId( nId );
}
+void AbstractSwFldDlg_Impl::SetCurPageId( const OString &rName )
+{
+ pDlg->SetCurPageId( rName );
+}
+
const SfxItemSet* AbstractSwFldDlg_Impl::GetOutputItemSet() const
{
return pDlg->GetOutputItemSet();
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index cf4f469..880cf8c 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -133,6 +133,7 @@ class AbstractTabDialog_Impl : virtual public SfxAbstractTabDialog
{
DECL_ABSTDLG_BASE( AbstractTabDialog_Impl,SfxTabDialog )
virtual void SetCurPageId( sal_uInt16 nId );
+ virtual void SetCurPageId( const OString &rName );
virtual const SfxItemSet* GetOutputItemSet() const;
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem );
virtual void SetInputSet( const SfxItemSet* pInSet );
@@ -189,6 +190,7 @@ class AbstractSwLabDlg_Impl : public AbstractSwLabDlg
{
DECL_ABSTDLG_BASE(AbstractSwLabDlg_Impl,SwLabDlg)
virtual void SetCurPageId( sal_uInt16 nId );
+ virtual void SetCurPageId( const OString &rName );
virtual const SfxItemSet* GetOutputItemSet() const;
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem );
virtual void SetInputSet( const SfxItemSet* pInSet );
@@ -224,6 +226,7 @@ class AbstractSwFldDlg_Impl : public AbstractSwFldDlg //add for SwFldDlg
{
DECL_ABSTDLG_BASE(AbstractSwFldDlg_Impl,SwFldDlg )
virtual void SetCurPageId( sal_uInt16 nId );
+ virtual void SetCurPageId( const OString &rName );
virtual const SfxItemSet* GetOutputItemSet() const;
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem );
virtual void SetInputSet( const SfxItemSet* pInSet );
commit f710a2db4c6d2994e2ab3d44bf5d3f825a8f5da4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jan 18 12:48:37 2013 +0000
remove backgrnd.src
Change-Id: Ic868667955eca21c348a05e49ff30fa6fa8b7043
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 192a911..f8a133e 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -107,7 +107,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/options/webconninfo.src \
cui/source/tabpages/align.src \
cui/source/tabpages/autocdlg.src \
- cui/source/tabpages/backgrnd.src \
cui/source/tabpages/bbdlg.src \
cui/source/tabpages/border.src \
cui/source/tabpages/connect.src \
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 496372f..82c1567 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -273,9 +273,6 @@
#define HID_OFAPAGE_AUTOCORR_EXCEPT "CUI_HID_OFAPAGE_AUTOCORR_EXCEPT"
#define HID_OFAPAGE_AUTOCORR_QUOTE "CUI_HID_OFAPAGE_AUTOCORR_QUOTE"
#define HID_OFAPAGE_AUTOCOMPLETE_OPTIONS "CUI_HID_OFAPAGE_AUTOCOMPLETE_OPTIONS"
-#define HID_BACKGROUND "CUI_HID_BACKGROUND"
-#define HID_BACKGROUND_CTL_BGDCOLORSET "CUI_HID_BACKGROUND_CTL_BGDCOLORSET"
-#define HID_BACKGROUND_CTL_POSITION "CUI_HID_BACKGROUND_CTL_POSITION"
#define HID_PAGE_CONNECTION "CUI_HID_PAGE_CONNECTION"
#define HID_PAGE_CONNECTION_CTL_PREVIEW "CUI_HID_PAGE_CONNECTION_CTL_PREVIEW"
#define HID_PAGE_DISTRIBUTE "CUI_HID_PAGE_DISTRIBUTE"
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 44a5de5..a9c3934 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -31,7 +31,6 @@
#define _SVX_BACKGRND_CXX
#include <cuires.hrc>
-#include "backgrnd.hrc"
#include <svx/dialmgr.hxx>
#include <editeng/memberids.hrc>
#include <editeng/editrids.hrc>
diff --git a/cui/source/tabpages/backgrnd.hrc b/cui/source/tabpages/backgrnd.hrc
deleted file mode 100644
index 0df16aa..0000000
--- a/cui/source/tabpages/backgrnd.hrc
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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 _SVX_BACKGRND_HRC
-#define _SVX_BACKGRND_HRC
-
-// defines ------------------------------------------------------------------
-
-#define FT_SELECTOR 1
-#define LB_SELECTOR 1
-
-#define SET_BGDCOLOR 10
-#define GB_BGDCOLOR 11
-#define CT_BORDER 16
-#define FT_PREVIEW 20
-#define WIN_PREVIEW1 21
-
-#define BTN_BROWSE 20
-#define FT_FILE 21
-#define BTN_LINK 22
-#define BTN_PREVIEW 23
-#define GB_FILE 24
-#define BTN_AREA 25
-#define BTN_TILE 26
-#define BTN_POSITION 27
-#define WND_POSITION 28
-#define GB_POSITION 29
-#define WIN_PREVIEW2 30
-#define LB_TBL_BOX 32
-#define FT_TBL_DESC 33
-#define LB_PARA_BOX 34
-#define FT_COL_TRANS 35
-#define MF_COL_TRANS 36
-#define FL_GRAPH_TRANS 37
-#define MF_GRAPH_TRANS 38
-
-#define STR_BROWSE 1
-#define STR_UNLINKED 2
-
-
-#endif
-
diff --git a/cui/source/tabpages/backgrnd.src b/cui/source/tabpages/backgrnd.src
deleted file mode 100644
index 330337c..0000000
--- a/cui/source/tabpages/backgrnd.src
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * 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 <svtools/controldims.hrc>
-#include "helpid.hrc"
-#include <cuires.hrc>
-#include "backgrnd.hrc"
-#include <svx/dialogs.hrc>
-
- // define ----------------------------------------------------------------
-#define UNLINKED_IMAGE \
- Text [ en-US ] = "Unlinked graphic" ; \
-
- // RID_SVXPAGE_BACKGROUND ------------------------------------------------
-TabPage RID_SVXPAGE_BACKGROUND
-{
- HelpId = HID_BACKGROUND ;
- Hide = TRUE ;
- Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
- Text [ en-US ] = "Background" ;
- FixedText FT_SELECTOR
- {
- Pos = MAP_APPFONT ( 6 , 4 ) ;
- Size = MAP_APPFONT ( 24 , 10 ) ;
- Hide = TRUE ;
- LeftLabel = TRUE ;
- Text [ en-US ] = "A~s" ;
- };
- ListBox LB_SELECTOR
- {
- HelpID = "cui:ListBox:RID_SVXPAGE_BACKGROUND:LB_SELECTOR";
- Hide = TRUE ;
- Border = TRUE ;
- Pos = MAP_APPFONT ( 33 , 3 ) ;
- Size = MAP_APPFONT ( 82 , 48 ) ;
- DropDown = TRUE ;
- StringList [ en-US ] =
- {
- < "Color" ; Default ; > ;
- < "Graphic" ; Default ; > ;
- };
- };
- FixedText FT_TBL_DESC
- {
- Pos = MAP_APPFONT ( 145 , 5 ) ;
- Size = MAP_APPFONT ( 24 , 10 ) ;
- Hide = TRUE ;
- LeftLabel = TRUE ;
- Text [ en-US ] = "F~or" ;
- };
- ListBox LB_TBL_BOX
- {
- HelpID = "cui:ListBox:RID_SVXPAGE_BACKGROUND:LB_TBL_BOX";
- Hide = TRUE ;
- Border = TRUE ;
- Pos = MAP_APPFONT ( 172 , 3 ) ;
- Size = MAP_APPFONT ( 82 , 48 ) ;
- DropDown = TRUE ;
- StringList [ en-US ] =
- {
- < "Cell" ; > ;
- < "Row" ; > ;
- < "Table" ; > ;
- };
- };
- ListBox LB_PARA_BOX
- {
- HelpID = "cui:ListBox:RID_SVXPAGE_BACKGROUND:LB_PARA_BOX";
- Hide = TRUE ;
- Border = TRUE ;
- Pos = MAP_APPFONT ( 172 , 3 ) ;
- Size = MAP_APPFONT ( 82 , 48 ) ;
- DropDown = TRUE ;
- StringList [ en-US ] =
- {
- < "Paragraph" ; > ;
- < "Character" ; > ;
- };
- };
- // Hintergrund-Brush ----------------------------------------------------
- Control CT_BORDER
- {
- Border = TRUE ;
- Pos = MAP_APPFONT ( 12 , 32 ) ;
- Size = MAP_APPFONT ( 116+2 , 145+2 ) ;
- DialogControl = TRUE;
- };
- Control SET_BGDCOLOR
- {
- HelpId = HID_BACKGROUND_CTL_BGDCOLORSET ;
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 116 , 145 ) ;
- TabStop = TRUE ;
- };
- FixedLine GB_BGDCOLOR
- {
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 6 , 21 ) ;
- Size = MAP_APPFONT ( 248 , 8) ;
- Text [ en-US ] = "Background color" ;
- };
- Window WIN_PREVIEW1
- {
- Hide = TRUE ;
- Border = TRUE ;
- Pos = MAP_APPFONT ( 166 , 34 ) ;
- Size = MAP_APPFONT ( 82 , 40 ) ;
- };
- FixedText FT_COL_TRANS
- {
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 166, 74 + RSC_SP_CTRL_Y + 2 ) ;
- Size = MAP_APPFONT ( 50 , 8) ;
- Text [ en-US ] = "~Transparency" ;
- };
- MetricField MF_COL_TRANS
- {
- HelpID = "cui:MetricField:RID_SVXPAGE_BACKGROUND:MF_COL_TRANS";
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 218 , 74 + RSC_SP_CTRL_Y ) ;
- Size = MAP_APPFONT ( 30 , 12) ;
- Border = TRUE ;
- Group = TRUE ;
- Left = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
- SpinSize = 5 ;
- Minimum = 0;
- Maximum = 100;
- };
-
- // Hintergrund-Bitmap ----------------------------------------------------
- FixedLine GB_FILE
- {
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 6 , 23 ) ;
- Size = MAP_APPFONT ( 153 , 8 ) ;
- Text [ en-US ] = "File" ;
- };
- PushButton BTN_BROWSE
- {
- HelpID = "cui:PushButton:RID_SVXPAGE_BACKGROUND:BTN_BROWSE";
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 6 + RSC_SP_FLGR_INNERBORDER_LEFT , 23 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP ) ;
- Size = MAP_APPFONT ( 60 , 14 ) ;
- Text [ en-US ] = "~Browse..." ;
- };
- CheckBox BTN_LINK
- {
- HelpID = "cui:CheckBox:RID_SVXPAGE_BACKGROUND:BTN_LINK";
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 6 + RSC_SP_FLGR_INNERBORDER_LEFT + 60 + 2*RSC_SP_CTRL_X, 23 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP + 3 ) ;
- Size = MAP_APPFONT ( 78 , 10 ) ;
- Text [ en-US ] = "~Link" ;
- };
- FixedText FT_FILE
- {
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 6 + RSC_SP_FLGR_INNERBORDER_LEFT , 23 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP + RSC_CD_PUSHBUTTON_HEIGHT + RSC_SP_CTRL_Y ) ;
- Size = MAP_APPFONT ( 141 , 8 ) ;
- UNLINKED_IMAGE
- };
- FixedLine GB_POSITION
- {
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 6 , 78 ) ;
- Size = MAP_APPFONT ( 153 , 8 ) ;
- Text [ en-US ] = "Type" ;
- };
- RadioButton BTN_POSITION
- {
- HelpID = "cui:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_POSITION";
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 12 , 89 ) ;
- Size = MAP_APPFONT ( 49 , 10 ) ;
- Text [ en-US ] = "~Position" ;
- };
- RadioButton BTN_AREA
- {
- HelpID = "cui:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_AREA";
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 12 , 103 ) ;
- Size = MAP_APPFONT ( 49 , 10 ) ;
- Text [ en-US ] = "Ar~ea" ;
- };
- RadioButton BTN_TILE
- {
- HelpID = "cui:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_TILE";
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 12 , 117 ) ;
- Size = MAP_APPFONT ( 49 , 10 ) ;
- Text [ en-US ] = "~Tile" ;
- };
- Control WND_POSITION
- {
- HelpId = HID_BACKGROUND_CTL_POSITION ;
- Hide = TRUE ;
- Border = TRUE ;
- Pos = MAP_APPFONT ( 64 , 89 ) ;
- Size = MAP_APPFONT ( 90 , 87 ) ;
- TabStop = TRUE ;
- };
- FixedLine FL_GRAPH_TRANS
- {
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 6 , 157 ) ;
- Size = MAP_APPFONT ( 153 , 8) ;
- Text [ en-US ] = "Transparency" ;
- };
- MetricField MF_GRAPH_TRANS
- {
- HelpID = "cui:MetricField:RID_SVXPAGE_BACKGROUND:MF_GRAPH_TRANS";
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 12 , 168 ) ;
- Size = MAP_APPFONT ( 30 , 12) ;
- Border = TRUE ;
- Group = TRUE ;
- Left = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
- SpinSize = 5 ;
- Minimum = 0;
- Maximum = 100;
- };
- Window WIN_PREVIEW2
- {
- Hide = TRUE ;
- Border = TRUE ;
- Pos = MAP_APPFONT ( 170 , 23 + 4 ) ;
- Size = MAP_APPFONT ( 81 , 139 ) ;
- };
- CheckBox BTN_PREVIEW
- {
- HelpID = "cui:CheckBox:RID_SVXPAGE_BACKGROUND:BTN_PREVIEW";
- Pos = MAP_APPFONT ( 170 , 23 + 4 + 139 + RSC_SP_CTRL_GROUP_Y ) ;
- Size = MAP_APPFONT ( 141 , 10 ) ;
- Text [ en-US ] = "Pre~view" ;
- };
- String STR_BROWSE
- {
- Text [ en-US ] = "Find graphics" ;
- };
- String STR_UNLINKED
- {
- UNLINKED_IMAGE
- };
-};
- // ********************************************************************** EOF
More information about the Libreoffice-commits
mailing list