diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-08-09 14:20:59 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-08-09 20:46:24 +0100 |
commit | f41e7c704898fa0e86d6d128f5bd28f37c081e92 (patch) | |
tree | 660ac1f3e0f2dcbd869c557a10ece4a5facdde94 | |
parent | e3cf54875031b8740b3ed76d6f530c44d2d8c44e (diff) |
convert SfxStyleDialogs to .ui
Change-Id: I32aa538026669e22e0756cd062b72e67f8d179e5
46 files changed, 2370 insertions, 1393 deletions
diff --git a/include/sfx2/styledlg.hxx b/include/sfx2/styledlg.hxx index 0580e4cae25c..da2e2a04233c 100644 --- a/include/sfx2/styledlg.hxx +++ b/include/sfx2/styledlg.hxx @@ -31,13 +31,13 @@ class SFX2_DLLPUBLIC SfxStyleDialog: public SfxTabDialog private: SfxStyleSheetBase* pStyle; DECL_DLLPRIVATE_LINK( CancelHdl, Button * ); + sal_uInt16 m_nOrganizerId; protected: virtual const SfxItemSet* GetRefreshedSet(); public: -#define ID_TABPAGE_MANAGESTYLES 1 - SfxStyleDialog( Window* pParent, const ResId& rResId, SfxStyleSheetBase&, - sal_Bool bFreeRes = sal_True, const String* pUserBtnTxt = 0 ); + SfxStyleDialog(Window* pParent, const OString& rID, + const OUString& rUIXMLDescription, SfxStyleSheetBase&); ~SfxStyleDialog(); diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk index 55ad9d2727b6..4147daf4b90d 100644 --- a/sc/AllLangResTarget_sc.mk +++ b/sc/AllLangResTarget_sc.mk @@ -61,7 +61,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\ sc/source/ui/navipi/navipi.src \ sc/source/ui/pagedlg/pagedlg.src \ sc/source/ui/styleui/scstyles.src \ - sc/source/ui/styleui/styledlg.src \ sc/source/ui/dbgui/pivot.src \ sc/source/ui/dbgui/dpgroupdlg.src \ sc/source/ui/dbgui/pvfundlg.src \ diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index 43dee8422468..7776682f0c42 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -95,6 +95,8 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\ sc/uiconfig/scalc/ui/optdlg \ sc/uiconfig/scalc/ui/optformula \ sc/uiconfig/scalc/ui/optsortlists \ + sc/uiconfig/scalc/ui/pagetemplatedialog \ + sc/uiconfig/scalc/ui/paratemplatedialog \ sc/uiconfig/scalc/ui/printareasdialog \ sc/uiconfig/scalc/ui/printeroptions \ sc/uiconfig/scalc/ui/protectsheetdlg \ diff --git a/sc/source/ui/inc/styledlg.hrc b/sc/source/ui/inc/styledlg.hrc deleted file mode 100644 index e45322972a08..000000000000 --- a/sc/source/ui/inc/styledlg.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 . - */ -#define TP_NUMBER 2 -#define TP_FONT 3 -#define TP_ALIGNMENT 4 -#define TP_BORDER 5 -#define TP_BACKGROUND 6 -#define TP_PROTECTION 7 -#define TP_PAGE_STD 8 -#define TP_PAGE_HEADER 9 -#define TP_PAGE_FOOTER 10 -#define TP_TABLE 11 -#define TP_FONTEFF 12 -#define TP_ASIAN 13 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/styledlg.hxx b/sc/source/ui/inc/styledlg.hxx index e99e0563e345..5201fecee35e 100644 --- a/sc/source/ui/inc/styledlg.hxx +++ b/sc/source/ui/inc/styledlg.hxx @@ -29,10 +29,9 @@ class SfxStyleSheetBase; class ScStyleDlg : public SfxStyleDialog { public: - ScStyleDlg( Window* pParent, - SfxStyleSheetBase& rStyleBase, - sal_uInt16 nRscId ); - ~ScStyleDlg(); + ScStyleDlg( Window* pParent, + SfxStyleSheetBase& rStyleBase, + sal_uInt16 nRscId ); protected: virtual void PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ); @@ -40,6 +39,19 @@ protected: private: sal_uInt16 nDlgRsc; + + sal_uInt16 m_nNumberId; + sal_uInt16 m_nFontId; + sal_uInt16 m_nFontEffectId; + sal_uInt16 m_nAlignmentId; + sal_uInt16 m_nAsianId; + sal_uInt16 m_nBorderId; + sal_uInt16 m_nBackgroundId; + sal_uInt16 m_nProtectId; + sal_uInt16 m_nPageId; + sal_uInt16 m_nHeaderId; + sal_uInt16 m_nFooterId; + sal_uInt16 m_nSheetId; }; diff --git a/sc/source/ui/pagedlg/pagedlg.hrc b/sc/source/ui/pagedlg/pagedlg.hrc index 6d2d79265a94..99ae92003e75 100644 --- a/sc/source/ui/pagedlg/pagedlg.hrc +++ b/sc/source/ui/pagedlg/pagedlg.hrc @@ -21,10 +21,6 @@ #include "sc.hrc" // -> RID_SCDLG_PAGE // -> RID_SCPAGE_AREAS -#define TP_PAGE_STD 1 -#define TP_PAGE_HEADER 2 -#define TP_PAGE_FOOTER 3 - //================================================ // TabPage: Tabelle diff --git a/sc/source/ui/styleui/styledlg.cxx b/sc/source/ui/styleui/styledlg.cxx index 1a24d15389a0..fcbc7aefb4c5 100644 --- a/sc/source/ui/styleui/styledlg.cxx +++ b/sc/source/ui/styleui/styledlg.cxx @@ -36,7 +36,6 @@ #include "tptable.hxx" // Seitenvorlage: Tabelle #include "scresid.hxx" #include "sc.hrc" -#include "styledlg.hrc" #include <svx/svxdlg.hxx> #include <svx/svxids.hrc> #include <svx/dialogs.hrc> @@ -50,11 +49,27 @@ ScStyleDlg::ScStyleDlg( Window* pParent, SfxStyleSheetBase& rStyleBase, sal_uInt16 nRscId ) - : SfxStyleDialog ( pParent, - ScResId( nRscId ), - rStyleBase, - false ), - nDlgRsc ( nRscId ) + : SfxStyleDialog ( pParent, + nRscId == RID_SCDLG_STYLES_PAR ? + OString("ParaTemplateDialog") : + OString("PageTemplateDialog"), + nRscId == RID_SCDLG_STYLES_PAR ? + OUString("modules/scalc/ui/paratemplatedialog.ui") : + OUString("modules/scalc/ui/pagetemplatedialog.ui"), + rStyleBase ) + , nDlgRsc ( nRscId ) + , m_nNumberId(0) + , m_nFontId(0) + , m_nFontEffectId(0) + , m_nAlignmentId(0) + , m_nAsianId(0) + , m_nBorderId(0) + , m_nBackgroundId(0) + , m_nProtectId(0) + , m_nPageId(0) + , m_nHeaderId(0) + , m_nFooterId(0) + , m_nSheetId(0) { SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "Dialogdiet fail!"); @@ -65,31 +80,31 @@ ScStyleDlg::ScStyleDlg( Window* pParent, SvtCJKOptions aCJKOptions; OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_NUMBERFORMAT ), "GetTabPageRangesFunc fail!"); - AddTabPage( TP_NUMBER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_NUMBERFORMAT ) ); + m_nNumberId = AddTabPage("numbers", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_NUMBERFORMAT )); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME ), "GetTabPageRangesFunc fail!"); - AddTabPage( TP_FONT, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME ) ); + m_nFontId = AddTabPage("font", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME )); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_EFFECTS ), "GetTabPageRangesFunc fail!"); - AddTabPage( TP_FONTEFF, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_EFFECTS ) ); + m_nFontEffectId = AddTabPage("fonteffects", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_EFFECTS )); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), "GetTabPageCreatorFunc fail!"); OSL_ENSURE( pFact->GetTabPageRangesFunc( RID_SVXPAGE_ALIGNMENT ), "GetTabPageRangesFunc fail!"); - AddTabPage( TP_ALIGNMENT, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_ALIGNMENT ) ); + m_nAlignmentId = AddTabPage("alignment", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_ALIGNMENT )); if ( aCJKOptions.IsAsianTypographyEnabled() ) { OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageRangesFunc fail!"); - AddTabPage( TP_ASIAN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN) ); + m_nAsianId = AddTabPage("asiantypo", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN)); } else - RemoveTabPage( TP_ASIAN ); + RemoveTabPage("asiantypo"); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ), "GetTabPageRangesFunc fail!"); - AddTabPage( TP_BORDER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) ); + m_nBorderId = AddTabPage("borders", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER )); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageRangesFunc fail!"); - AddTabPage( TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) ); - AddTabPage( TP_PROTECTION, &ScTabPageProtection::Create, &ScTabPageProtection::GetRanges ); + m_nBackgroundId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND )); + m_nProtectId = AddTabPage("protection", &ScTabPageProtection::Create, &ScTabPageProtection::GetRanges); } break; @@ -97,31 +112,22 @@ ScStyleDlg::ScStyleDlg( Window* pParent, { OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ), "GetTabPageRangesFunc fail!"); - AddTabPage( TP_PAGE_STD, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ) ); + m_nPageId = AddTabPage("page", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ) ); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ), "GetTabPageRangesFunc fail!"); - AddTabPage( TP_BORDER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) ); + m_nBorderId = AddTabPage("borders", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) ); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageRangesFunc fail!"); - AddTabPage( TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) ); - AddTabPage( TP_PAGE_HEADER, &ScHeaderPage::Create, &ScHeaderPage::GetRanges ); - AddTabPage( TP_PAGE_FOOTER, &ScFooterPage::Create, &ScFooterPage::GetRanges ); - AddTabPage( TP_TABLE, &ScTablePage::Create, &ScTablePage::GetRanges ); + m_nBackgroundId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) ); + m_nHeaderId = AddTabPage("header", &ScHeaderPage::Create, &ScHeaderPage::GetRanges ); + m_nFooterId = AddTabPage("footer", &ScFooterPage::Create, &ScFooterPage::GetRanges ); + m_nSheetId = AddTabPage("sheet", &ScTablePage::Create, &ScTablePage::GetRanges ); } break; default: OSL_FAIL( "Family not supported" ); } - - //-------------------------------------------------------------------- - FreeResource(); -} - -// ----------------------------------------------------------------------- - -ScStyleDlg::~ScStyleDlg() -{ } // ----------------------------------------------------------------------- @@ -132,62 +138,45 @@ void ScStyleDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) { SfxObjectShell* pDocSh = SfxObjectShell::Current(); SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); - switch ( nPageId ) + if (nPageId == m_nNumberId) { - case TP_NUMBER: - { - const SfxPoolItem* pInfoItem - = pDocSh->GetItem( SID_ATTR_NUMBERFORMAT_INFO ); - - OSL_ENSURE( pInfoItem, "NumberInfoItem nicht gefunden!" ); + const SfxPoolItem* pInfoItem + = pDocSh->GetItem( SID_ATTR_NUMBERFORMAT_INFO ); - aSet.Put (SvxNumberInfoItem( (const SvxNumberInfoItem&)*pInfoItem ) ); - rTabPage.PageCreated(aSet); - } - break; - - case TP_FONT: - { - const SfxPoolItem* pInfoItem - = pDocSh->GetItem( SID_ATTR_CHAR_FONTLIST ); + OSL_ENSURE( pInfoItem, "NumberInfoItem nicht gefunden!" ); - OSL_ENSURE( pInfoItem, "FontListItem nicht gefunden!" ); + aSet.Put (SvxNumberInfoItem( (const SvxNumberInfoItem&)*pInfoItem ) ); + rTabPage.PageCreated(aSet); + } + else if (nPageId == m_nFontId) + { + const SfxPoolItem* pInfoItem + = pDocSh->GetItem( SID_ATTR_CHAR_FONTLIST ); - aSet.Put (SvxFontListItem(((const SvxFontListItem&)*pInfoItem).GetFontList(), SID_ATTR_CHAR_FONTLIST)); - rTabPage.PageCreated(aSet); - } - break; + OSL_ENSURE( pInfoItem, "FontListItem nicht gefunden!" ); - default: - break; + aSet.Put (SvxFontListItem(((const SvxFontListItem&)*pInfoItem).GetFontList(), SID_ATTR_CHAR_FONTLIST)); + rTabPage.PageCreated(aSet); } } else if ( nDlgRsc == RID_SCDLG_STYLES_PAGE ) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); - switch ( nPageId ) + if (nPageId == m_nPageId) + { + aSet.Put (SfxAllEnumItem((const sal_uInt16)SID_ENUM_PAGE_MODE, SVX_PAGE_MODE_CENTER)); + rTabPage.PageCreated(aSet); + } + else if (nPageId == m_nHeaderId || nPageId == m_nFooterId) + { + ((ScHFPage&)rTabPage).SetStyleDlg( this ); + ((ScHFPage&)rTabPage).SetPageStyle( GetStyleSheet().GetName() ); + ((ScHFPage&)rTabPage).DisableDeleteQueryBox(); + } + else if (nPageId == m_nBackgroundId) { - case TP_PAGE_STD: - aSet.Put (SfxAllEnumItem((const sal_uInt16)SID_ENUM_PAGE_MODE, SVX_PAGE_MODE_CENTER)); - rTabPage.PageCreated(aSet); - break; - - case TP_PAGE_HEADER: - case TP_PAGE_FOOTER: - ((ScHFPage&)rTabPage).SetStyleDlg( this ); - ((ScHFPage&)rTabPage).SetPageStyle( GetStyleSheet().GetName() ); - ((ScHFPage&)rTabPage).DisableDeleteQueryBox(); - break; - case TP_BACKGROUND: - if( nDlgRsc == RID_SCDLG_STYLES_PAGE) - { - aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, SVX_SHOW_SELECTOR)); - rTabPage.PageCreated(aSet); - } - break; - - default: - break; + aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, SVX_SHOW_SELECTOR)); + rTabPage.PageCreated(aSet); } } } @@ -203,6 +192,4 @@ const SfxItemSet* ScStyleDlg::GetRefreshedSet() return pItemSet; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/styleui/styledlg.src b/sc/source/ui/styleui/styledlg.src deleted file mode 100644 index 9df424a22432..000000000000 --- a/sc/source/ui/styleui/styledlg.src +++ /dev/null @@ -1,131 +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" -#include "styledlg.hrc" // -> TP_xxx - -TabDialog RID_SCDLG_STYLES_PAR -{ - OutputSize = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 289 , 176 ) ; - Text [ en-US ] = "Cell Style" ; - Moveable = TRUE ; - Closeable = FALSE ; - TabControl 1 - { - OutputSize = TRUE ; - Pos = MAP_APPFONT ( 3 , 3 ) ; - Size = MAP_APPFONT ( 260 , 135 ) ; - PageList = - { - PageItem - { - Identifier = TP_NUMBER ; - Text [ en-US ] = "Numbers" ; - }; - PageItem - { - Identifier = TP_FONT ; - Text [ en-US ] = "Font" ; - }; - PageItem - { - Identifier = TP_FONTEFF ; - Text [ en-US ] = "Font Effects"; - }; - PageItem - { - Identifier = TP_ALIGNMENT ; - Text [ en-US ] = "Alignment" ; - }; - PageItem - { - Identifier = TP_ASIAN ; - Text [ en-US ] = "Asian Typography"; - }; - PageItem - { - Identifier = TP_BORDER ; - Text [ en-US ] = "Borders" ; - }; - PageItem - { - Identifier = TP_BACKGROUND ; - Text [ en-US ] = "Background" ; - }; - PageItem - { - Identifier = TP_PROTECTION ; - Text [ en-US ] = "Cell Protection" ; - }; - }; - }; -}; - -TabDialog RID_SCDLG_STYLES_PAGE -{ - OutputSize = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 280 , 165 ) ; - Text [ en-US ] = "Page Style" ; - Moveable = TRUE ; - Closeable = FALSE ; - TabControl 1 - { - OutputSize = TRUE ; - Pos = MAP_APPFONT ( 3 , 6 ) ; - Size = MAP_APPFONT ( 260 , 135 ) ; - PageList = - { - PageItem - { - Identifier = TP_PAGE_STD ; - Text [ en-US ] = "Page" ; - }; - PageItem - { - Identifier = TP_BORDER ; - Text [ en-US ] = "Borders" ; - }; - PageItem - { - Identifier = TP_BACKGROUND ; - Text [ en-US ] = "Background" ; - }; - PageItem - { - Identifier = TP_PAGE_HEADER ; - Text [ en-US ] = "Header" ; - }; - PageItem - { - Identifier = TP_PAGE_FOOTER ; - Text [ en-US ] = "Footer" ; - }; - PageItem - { - Identifier = TP_TABLE ; - Text [ en-US ] = "Sheet" ; - }; - }; - }; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/uiconfig/scalc/ui/pagetemplatedialog.ui b/sc/uiconfig/scalc/ui/pagetemplatedialog.ui new file mode 100644 index 000000000000..192ed97eeb5b --- /dev/null +++ b/sc/uiconfig/scalc/ui/pagetemplatedialog.ui @@ -0,0 +1,203 @@ +<?xml version="1.0" encoding="UTF-8"?> +<interface> + <!-- interface-requires gtk+ 3.0 --> + <object class="GtkDialog" id="PageTemplateDialog"> + <property name="can_focus">False</property> + <property name="border_width">6</property> + <property name="title" translatable="yes">Page Style</property> + <property name="type_hint">dialog</property> + <child internal-child="vbox"> + <object class="GtkBox" id="dialog-vbox1"> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <child internal-child="action_area"> + <object class="GtkButtonBox" id="dialog-action_area1"> + <property name="can_focus">False</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="ok"> + <property name="label">gtk-ok</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="cancel"> + <property name="label">gtk-cancel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="help"> + <property name="label">gtk-help</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="reset"> + <property name="label">gtk-revert-to-saved</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="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="organizer"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Organizer</property> + </object> + <packing> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="page"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Page</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="borders"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Borders</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="background"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Background</property> + </object> + <packing> + <property name="position">3</property> + <property name="tab_fill">False</property> + </packing> + </child> + <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="position">4</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">5</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="sheet"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Sheet</property> + </object> + <packing> + <property name="position">6</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/paratemplatedialog.ui b/sc/uiconfig/scalc/ui/paratemplatedialog.ui new file mode 100644 index 000000000000..3551b398f614 --- /dev/null +++ b/sc/uiconfig/scalc/ui/paratemplatedialog.ui @@ -0,0 +1,246 @@ +<?xml version="1.0" encoding="UTF-8"?> +<interface> + <!-- interface-requires gtk+ 3.0 --> + <object class="GtkDialog" id="ParaTemplateDialog"> + <property name="can_focus">False</property> + <property name="border_width">6</property> + <property name="title" translatable="yes">Cell Style</property> + <property name="type_hint">dialog</property> + <child internal-child="vbox"> + <object class="GtkBox" id="dialog-vbox1"> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <child internal-child="action_area"> + <object class="GtkButtonBox" id="dialog-action_area1"> + <property name="can_focus">False</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="ok"> + <property name="label">gtk-ok</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="cancel"> + <property name="label">gtk-cancel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="help"> + <property name="label">gtk-help</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="reset"> + <property name="label">gtk-revert-to-saved</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkButton" id="standard"> + <property name="label">_Standard</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">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="organizer"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Organizer</property> + </object> + <packing> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="numbers"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Numbers</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="font"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Font</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="fonteffects"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Font Effects</property> + </object> + <packing> + <property name="position">3</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="alignment"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Alignment</property> + </object> + <packing> + <property name="position">4</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="asiantypo"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Asian Typography</property> + </object> + <packing> + <property name="position">5</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="borders"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Borders</property> + </object> + <packing> + <property name="position">6</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="background"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Background</property> + </object> + <packing> + <property name="position">7</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="protection"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Cell Protection</property> + </object> + <packing> + <property name="position">8</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-widget response="0">standard</action-widget> + </action-widgets> + </object> +</interface> diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk index f9ab04ec49d9..cf72ea4a6044 100644 --- a/sd/AllLangResTarget_sd.mk +++ b/sd/AllLangResTarget_sd.mk @@ -61,7 +61,6 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\ sd/source/ui/dlg/prltempl.src \ sd/source/ui/dlg/RemoteDialog.src \ sd/source/ui/dlg/sdpreslt.src \ - sd/source/ui/dlg/tabtempl.src \ sd/source/ui/dlg/tpaction.src \ sd/source/ui/dlg/vectdlg.src \ sd/source/ui/slideshow/slideshow.src \ diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk index 5706e465ba72..5485effce17d 100644 --- a/sd/UIConfig_simpress.mk +++ b/sd/UIConfig_simpress.mk @@ -70,18 +70,19 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/simpress,\ )) $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\ + sd/uiconfig/simpress/ui/customanimationcreatedialog \ + sd/uiconfig/simpress/ui/customanimationcreatetab \ + sd/uiconfig/simpress/ui/customanimationspanel \ + sd/uiconfig/simpress/ui/customslideshows \ sd/uiconfig/simpress/ui/definecustomslideshow \ sd/uiconfig/simpress/ui/masterlayoutdlg \ - sd/uiconfig/simpress/ui/sdviewpage \ + sd/uiconfig/simpress/ui/optimpressgeneralpage \ + sd/uiconfig/simpress/ui/photoalbum \ sd/uiconfig/simpress/ui/presentationdialog \ sd/uiconfig/simpress/ui/printeroptions \ - sd/uiconfig/simpress/ui/photoalbum \ - sd/uiconfig/simpress/ui/customslideshows \ - sd/uiconfig/simpress/ui/optimpressgeneralpage \ sd/uiconfig/simpress/ui/prntopts \ - sd/uiconfig/simpress/ui/customanimationspanel \ - sd/uiconfig/simpress/ui/customanimationcreatedialog \ - sd/uiconfig/simpress/ui/customanimationcreatetab \ + sd/uiconfig/simpress/ui/sdviewpage \ + sd/uiconfig/simpress/ui/templatedialog \ )) # vim: set noet sw=4 ts=4: diff --git a/sd/source/ui/dlg/tabtempl.cxx b/sd/source/ui/dlg/tabtempl.cxx index 33b34cda31f4..7077321ccc26 100644 --- a/sd/source/ui/dlg/tabtempl.cxx +++ b/sd/source/ui/dlg/tabtempl.cxx @@ -38,7 +38,6 @@ #include "DrawDocShell.hxx" #include "tabtempl.hxx" -#include "tabtempl.hrc" #include "sdresid.hxx" #include "dlg_char.hxx" #include "paragr.hxx" @@ -51,39 +50,53 @@ SdTabTemplateDlg::SdTabTemplateDlg( Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, - SdrView* pView ) : - SfxStyleDialog ( pParent, SdResId( TAB_TEMPLATE ), rStyleBase, sal_False ), - rDocShell ( *pDocShell ), - pSdrView ( pView ), - pColorList ( pModel->GetColorList() ), - pGradientList ( pModel->GetGradientList() ), - pHatchingList ( pModel->GetHatchList() ), - pBitmapList ( pModel->GetBitmapList() ), - pDashList ( pModel->GetDashList() ), - pLineEndList ( pModel->GetLineEndList() ) + SdrView* pView ) + : SfxStyleDialog(pParent, "TemplateDialog", + "modules/simpress/ui/templatedialog.ui", + rStyleBase) + , rDocShell(*pDocShell) + , pSdrView(pView) + , pColorList(pModel->GetColorList()) + , pGradientList(pModel->GetGradientList()) + , pHatchingList(pModel->GetHatchList()) + , pBitmapList(pModel->GetBitmapList()) + , pDashList(pModel->GetDashList()) + , pLineEndList(pModel->GetLineEndList()) + , m_nLineId(0) + , m_nAreaId(0) + , m_nShadowId(0) + , m_nTransparencyId(0) + , m_nFontId(0) + , m_nFontEffectId(0) + , m_nIndentsId(0) + , m_nTextId(0) + , m_nAnimationId(0) + , m_nDimensionId(0) + , m_nConnectorId(0) + , m_nAlignId(0) + , m_nTabId(0) + , m_nAsianTypoId(0) { - FreeResource(); - // fill Listbox and overload Select-Handler - AddTabPage( RID_SVXPAGE_LINE); - AddTabPage( RID_SVXPAGE_AREA); - AddTabPage( RID_SVXPAGE_SHADOW); - AddTabPage( RID_SVXPAGE_TRANSPARENCE); - AddTabPage( RID_SVXPAGE_CHAR_NAME ); - AddTabPage( RID_SVXPAGE_CHAR_EFFECTS ); - AddTabPage( RID_SVXPAGE_STD_PARAGRAPH ); - AddTabPage( RID_SVXPAGE_TEXTATTR ); - AddTabPage( RID_SVXPAGE_TEXTANIMATION ); - AddTabPage( RID_SVXPAGE_MEASURE); - AddTabPage( RID_SVXPAGE_CONNECTION); - AddTabPage( RID_SVXPAGE_ALIGN_PARAGRAPH ); - AddTabPage( RID_SVXPAGE_TABULATOR ); + m_nLineId = AddTabPage("line", RID_SVXPAGE_LINE); + m_nAreaId = AddTabPage("area", RID_SVXPAGE_AREA); + m_nShadowId = AddTabPage("shadowing", RID_SVXPAGE_SHADOW); + m_nTransparencyId = AddTabPage("transparency", RID_SVXPAGE_TRANSPARENCE); + m_nFontId = AddTabPage("font", RID_SVXPAGE_CHAR_NAME); + m_nFontEffectId = AddTabPage("fonteffect", RID_SVXPAGE_CHAR_EFFECTS); + m_nIndentsId = AddTabPage("indents", RID_SVXPAGE_STD_PARAGRAPH); + m_nTextId = AddTabPage("text", RID_SVXPAGE_TEXTATTR); + m_nAnimationId = AddTabPage("animation", RID_SVXPAGE_TEXTANIMATION); + m_nDimensionId = AddTabPage("dimensioning", RID_SVXPAGE_MEASURE); + m_nConnectorId = AddTabPage("connector", RID_SVXPAGE_CONNECTION); + m_nAlignId = AddTabPage("alignment", RID_SVXPAGE_ALIGN_PARAGRAPH); + m_nTabId = AddTabPage("tabs", RID_SVXPAGE_TABULATOR); SvtCJKOptions aCJKOptions; if( aCJKOptions.IsAsianTypographyEnabled() ) - AddTabPage( RID_SVXPAGE_PARA_ASIAN ); + m_nAsianTypoId = AddTabPage("asiantype", RID_SVXPAGE_PARA_ASIAN); else - RemoveTabPage( RID_SVXPAGE_PARA_ASIAN ); + RemoveTabPage("asiantypo"); nDlgType = 1; nPageType = 0; @@ -97,90 +110,68 @@ SdTabTemplateDlg::SdTabTemplateDlg( Window* pParent, // ----------------------------------------------------------------------- -SdTabTemplateDlg::~SdTabTemplateDlg() -{ -} - -// ----------------------------------------------------------------------- - void SdTabTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); - switch( nId ) + if (nId == m_nLineId) + { + aSet.Put (SvxColorListItem(pColorList,SID_COLOR_TABLE)); + aSet.Put (SvxDashListItem(pDashList,SID_DASH_LIST)); + aSet.Put (SvxLineEndListItem(pLineEndList,SID_LINEEND_LIST)); + aSet.Put (SfxUInt16Item(SID_DLG_TYPE,nDlgType)); + rPage.PageCreated(aSet); + } + else if (nId == m_nAreaId) + { + aSet.Put (SvxColorListItem(pColorList,SID_COLOR_TABLE)); + aSet.Put (SvxGradientListItem(pGradientList,SID_GRADIENT_LIST)); + aSet.Put (SvxHatchListItem(pHatchingList,SID_HATCH_LIST)); + aSet.Put (SvxBitmapListItem(pBitmapList,SID_BITMAP_LIST)); + aSet.Put (SfxUInt16Item(SID_PAGE_TYPE,nPageType)); + aSet.Put (SfxUInt16Item(SID_DLG_TYPE,nDlgType)); + aSet.Put (SfxUInt16Item(SID_TABPAGE_POS,nPos)); + rPage.PageCreated(aSet); + } + else if (nId == m_nShadowId) + { + aSet.Put (SvxColorListItem(pColorList,SID_COLOR_TABLE)); + aSet.Put (SfxUInt16Item(SID_PAGE_TYPE,nPageType)); + aSet.Put (SfxUInt16Item(SID_DLG_TYPE,nDlgType)); + rPage.PageCreated(aSet); + } + else if (nId == m_nTransparencyId) + { + aSet.Put (SfxUInt16Item(SID_PAGE_TYPE,nPageType)); + aSet.Put (SfxUInt16Item(SID_DLG_TYPE,nDlgType)); + rPage.PageCreated(aSet); + } + else if (nId == m_nFontId) + { + SvxFontListItem aItem(*( (const SvxFontListItem*) + ( rDocShell.GetItem( SID_ATTR_CHAR_FONTLIST) ) ) ); + + aSet.Put (SvxFontListItem( aItem.GetFontList(), SID_ATTR_CHAR_FONTLIST)); + rPage.PageCreated(aSet); + } + else if (nId == m_nFontEffectId) + { + aSet.Put (SfxUInt16Item(SID_DISABLE_CTL,DISABLE_CASEMAP)); + rPage.PageCreated(aSet); + } + else if (nId == m_nTextId) + { + aSet.Put(OfaPtrItem(SID_SVXTEXTATTRPAGE_VIEW,pSdrView)); + rPage.PageCreated(aSet); + } + else if (nId == m_nDimensionId) + { + aSet.Put (OfaPtrItem(SID_OBJECT_LIST,pSdrView)); + rPage.PageCreated(aSet); + } + else if (nId == m_nConnectorId) { - case RID_SVXPAGE_LINE: - aSet.Put (SvxColorListItem(pColorList,SID_COLOR_TABLE)); - aSet.Put (SvxDashListItem(pDashList,SID_DASH_LIST)); - aSet.Put (SvxLineEndListItem(pLineEndList,SID_LINEEND_LIST)); - aSet.Put (SfxUInt16Item(SID_DLG_TYPE,nDlgType)); - rPage.PageCreated(aSet); - break; - - case RID_SVXPAGE_AREA: - aSet.Put (SvxColorListItem(pColorList,SID_COLOR_TABLE)); - aSet.Put (SvxGradientListItem(pGradientList,SID_GRADIENT_LIST)); - aSet.Put (SvxHatchListItem(pHatchingList,SID_HATCH_LIST)); - aSet.Put (SvxBitmapListItem(pBitmapList,SID_BITMAP_LIST)); - aSet.Put (SfxUInt16Item(SID_PAGE_TYPE,nPageType)); - aSet.Put (SfxUInt16Item(SID_DLG_TYPE,nDlgType)); - aSet.Put (SfxUInt16Item(SID_TABPAGE_POS,nPos)); - rPage.PageCreated(aSet); - - - break; - - case RID_SVXPAGE_SHADOW: - aSet.Put (SvxColorListItem(pColorList,SID_COLOR_TABLE)); - aSet.Put (SfxUInt16Item(SID_PAGE_TYPE,nPageType)); - aSet.Put (SfxUInt16Item(SID_DLG_TYPE,nDlgType)); - rPage.PageCreated(aSet); - break; - - case RID_SVXPAGE_TRANSPARENCE: - aSet.Put (SfxUInt16Item(SID_PAGE_TYPE,nPageType)); - aSet.Put (SfxUInt16Item(SID_DLG_TYPE,nDlgType)); - rPage.PageCreated(aSet); - break; - - case RID_SVXPAGE_CHAR_NAME: - { - SvxFontListItem aItem(*( (const SvxFontListItem*) - ( rDocShell.GetItem( SID_ATTR_CHAR_FONTLIST) ) ) ); - - aSet.Put (SvxFontListItem( aItem.GetFontList(), SID_ATTR_CHAR_FONTLIST)); - rPage.PageCreated(aSet); - } - break; - - case RID_SVXPAGE_CHAR_EFFECTS: - aSet.Put (SfxUInt16Item(SID_DISABLE_CTL,DISABLE_CASEMAP)); - rPage.PageCreated(aSet); - break; - - case RID_SVXPAGE_STD_PARAGRAPH: - break; - - case RID_SVXPAGE_TEXTATTR: - { - aSet.Put(OfaPtrItem(SID_SVXTEXTATTRPAGE_VIEW,pSdrView)); - rPage.PageCreated(aSet); - } - break; - - case RID_SVXPAGE_TEXTANIMATION: - break; - - case RID_SVXPAGE_MEASURE: - aSet.Put (OfaPtrItem(SID_OBJECT_LIST,pSdrView)); - rPage.PageCreated(aSet); - break; - - case RID_SVXPAGE_CONNECTION: - { - aSet.Put (OfaPtrItem(SID_OBJECT_LIST,pSdrView)); - rPage.PageCreated(aSet); - } - break; + aSet.Put (OfaPtrItem(SID_OBJECT_LIST,pSdrView)); + rPage.PageCreated(aSet); } } diff --git a/sd/source/ui/dlg/tabtempl.src b/sd/source/ui/dlg/tabtempl.src deleted file mode 100644 index be905b9d12b6..000000000000 --- a/sd/source/ui/dlg/tabtempl.src +++ /dev/null @@ -1,148 +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 "tabtempl.hrc" -#include <svx/dialogs.hrc> -TabDialog TAB_TEMPLATE -{ - OutputSize = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 289 , 176 ) ; - Text [ en-US ] = "Graphics Styles" ; - Moveable = TRUE ; - // Closeable = TRUE; // This dialog has an OK and/or a Cancel button! (KH) - TabControl 1 - { - OutputSize = TRUE ; - Pos = MAP_APPFONT ( 3 , 3 ) ; - Size = MAP_APPFONT ( 260 , 135 ) ; - PageList = - { - PageItem - { - Identifier = RID_SVXPAGE_LINE ; - Text [ en-US ] = "Line" ; - PageResID = RID_SVXPAGE_LINE ; - }; - PageItem - { - Identifier = RID_SVXPAGE_AREA ; - Text [ en-US ] = "Area" ; - PageResID = RID_SVXPAGE_AREA ; - }; - PageItem - { - Identifier = RID_SVXPAGE_SHADOW ; - PageResID = RID_SVXPAGE_SHADOW ; - Text [ en-US ] = "Shadowing" ; - }; - PageItem - { - Identifier = RID_SVXPAGE_TRANSPARENCE ; - Text [ en-US ] = "Transparency"; - }; - PageItem - { - Identifier = RID_SVXPAGE_CHAR_NAME; - Text [ en-US ] = "Font" ; - PageResID = RID_SVXPAGE_CHAR_NAME ; - }; - PageItem - { - Identifier = RID_SVXPAGE_CHAR_EFFECTS ; - Text [ en-US ] = "Font Effect" ; - PageResID = RID_SVXPAGE_CHAR_EFFECTS ; - }; - PageItem - { - Identifier = RID_SVXPAGE_STD_PARAGRAPH ; - Text [ en-US ] = "Indents & Spacing" ; - PageResID = RID_SVXPAGE_STD_PARAGRAPH ; - }; - PageItem - { - Identifier = RID_SVXPAGE_TEXTATTR ; - PageResID = RID_SVXPAGE_TEXTATTR ; - Text [ en-US ] = "Text" ; - }; - PageItem - { - Identifier = RID_SVXPAGE_TEXTANIMATION ; - PageResID = RID_SVXPAGE_TEXTANIMATION ; - Text [ en-US ] = "Text Animation" ; - }; - PageItem - { - Identifier = RID_SVXPAGE_MEASURE ; - Text [ en-US ] = "Dimensioning" ; - PageResID = RID_SVXPAGE_MEASURE ; - }; - PageItem - { - Identifier = RID_SVXPAGE_CONNECTION ; - Text [ en-US ] = "Connector" ; - }; - PageItem - { - Identifier = RID_SVXPAGE_ALIGN_PARAGRAPH ; - PageResID = RID_SVXPAGE_ALIGN_PARAGRAPH ; - Text [ en-US ] = "Alignment" ; - }; - PageItem - { - Identifier = RID_SVXPAGE_PARA_ASIAN ; - PageResID = RID_SVXPAGE_PARA_ASIAN ; - Text[ en-US ] = "Asian Typography"; - }; - PageItem - { - Identifier = RID_SVXPAGE_TABULATOR ; - Text [ en-US ] = "Tabs" ; - PageResID = RID_SVXPAGE_TABULATOR ; - }; - }; - }; - OKButton 1 - { - Pos = MAP_APPFONT ( 6 , 151 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - }; - CancelButton 1 - { - Pos = MAP_APPFONT ( 60 , 151 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - }; - HelpButton 1 - { - Pos = MAP_APPFONT ( 114 , 151 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - }; - PushButton 1 - { - Pos = MAP_APPFONT ( 169 , 151 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - Text [ en-US ] = "Back" ; - TabStop = TRUE ; - }; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/tabtempl.hrc b/sd/source/ui/inc/tabtempl.hrc deleted file mode 100644 index f477747b18b1..000000000000 --- a/sd/source/ui/inc/tabtempl.hrc +++ /dev/null @@ -1,23 +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 <sfx2/sfx.hrc> -/* #define TAB_TEMPLATE RID_APP_START+??? */ -#define TAB_TEMPLATE 637 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/tabtempl.hxx b/sd/source/ui/inc/tabtempl.hxx index b11828284dd7..37288709984f 100644 --- a/sd/source/ui/inc/tabtempl.hxx +++ b/sd/source/ui/inc/tabtempl.hxx @@ -52,17 +52,30 @@ private: ChangeType nGradientListState; ChangeType nHatchingListState; + sal_uInt16 m_nLineId; + sal_uInt16 m_nAreaId; + sal_uInt16 m_nShadowId; + sal_uInt16 m_nTransparencyId; + sal_uInt16 m_nFontId; + sal_uInt16 m_nFontEffectId; + sal_uInt16 m_nIndentsId; + sal_uInt16 m_nTextId; + sal_uInt16 m_nAnimationId; + sal_uInt16 m_nDimensionId; + sal_uInt16 m_nConnectorId; + sal_uInt16 m_nAlignId; + sal_uInt16 m_nTabId; + sal_uInt16 m_nAsianTypoId; + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); virtual const SfxItemSet* GetRefreshedSet(); public: - SdTabTemplateDlg( Window* pParent, - const SfxObjectShell* pDocShell, - SfxStyleSheetBase& rStyleBase, - SdrModel* pModel, - SdrView* pView ); - ~SdTabTemplateDlg(); - + SdTabTemplateDlg(Window* pParent, + const SfxObjectShell* pDocShell, + SfxStyleSheetBase& rStyleBase, + SdrModel* pModel, + SdrView* pView); }; diff --git a/sfx2/source/dialog/dialog.hrc b/sfx2/source/dialog/dialog.hrc index 1e36560a4374..6f9a8d13f086 100644 --- a/sfx2/source/dialog/dialog.hrc +++ b/sfx2/source/dialog/dialog.hrc @@ -35,7 +35,6 @@ #define RID_DLG_ALIEN_WARNING ( RC_DIALOG_BEGIN + 0) #define STR_RESET ( RC_DIALOG_BEGIN + 0) -#define STR_TABPAGE_MANAGESTYLES ( RC_DIALOG_BEGIN + 12) #define MSG_TABPAGE_INVALIDNAME ( RC_DIALOG_BEGIN + 13) #define MSG_TABPAGE_INVALIDSTYLE ( RC_DIALOG_BEGIN + 14) #define DLG_NEW_STYLE_BY_EXAMPLE ( RC_DIALOG_BEGIN + 15) diff --git a/sfx2/source/dialog/dialog.src b/sfx2/source/dialog/dialog.src index d137b57f7502..b1fffdb64541 100644 --- a/sfx2/source/dialog/dialog.src +++ b/sfx2/source/dialog/dialog.src @@ -30,10 +30,6 @@ String STR_APPLY { Text [ en-US ] = "Apply"; }; -String STR_TABPAGE_MANAGESTYLES -{ - Text [ en-US ] = "Organizer" ; -}; InfoBox MSG_TABPAGE_INVALIDNAME { BUTTONS = WB_OK ; diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx index 35236caf9d52..933b4dacaffb 100644 --- a/sfx2/source/dialog/styledlg.cxx +++ b/sfx2/source/dialog/styledlg.cxx @@ -32,36 +32,31 @@ SfxStyleDialog::SfxStyleDialog ( - Window* pParent, // Parent - const ResId& rResId, // ResId - SfxStyleSheetBase& rStyle, // stylesheet to be processed - sal_Bool bFreeRes, // Flag release resources - const String* pUserBtnTxt -) : + Window* pParent, // Parent + const OString& rID, const OUString& rUIXMLDescription, + SfxStyleSheetBase& rStyle // stylesheet to be processed +) /* [Description] Constructor: Add Manage TabPage, set ExampleSet from style. */ - SfxTabDialog( pParent, rResId, + : SfxTabDialog( pParent, rID, rUIXMLDescription, rStyle.GetItemSet().Clone(), // return TRUE also without ParentSupport , but extended // to suppress the standardButton - rStyle.HasParentSupport() ? sal_True : 2, - pUserBtnTxt ), + rStyle.HasParentSupport() ? sal_True : 2 ) - pStyle( &rStyle ) + , pStyle( &rStyle ) { - AddTabPage( ID_TABPAGE_MANAGESTYLES, - SfxResId( STR_TABPAGE_MANAGESTYLES ).toString(), - SfxManageStyleSheetPage::Create, 0, sal_False, 0 ); + m_nOrganizerId = AddTabPage("organizer", SfxManageStyleSheetPage::Create, 0); // With new template always set the management page as the current page if( rStyle.GetName().isEmpty() ) - SetCurPageId( ID_TABPAGE_MANAGESTYLES ); + SetCurPageId(m_nOrganizerId); else { OUString sTxt = OUString(GetText()) + ": " + rStyle.GetName(); @@ -70,8 +65,6 @@ SfxStyleDialog::SfxStyleDialog delete pExampleSet; // in SfxTabDialog::Ctor() already created pExampleSet = &pStyle->GetItemSet(); - if ( bFreeRes ) - FreeResource(); GetCancelButton().SetClickHdl( LINK(this, SfxStyleDialog, CancelHdl) ); } @@ -131,7 +124,7 @@ IMPL_LINK( SfxStyleDialog, CancelHdl, Button *, pButton ) { (void)pButton; //unused - SfxTabPage* pPage = GetTabPage( ID_TABPAGE_MANAGESTYLES ); + SfxTabPage* pPage = GetTabPage(m_nOrganizerId); const SfxItemSet* pInSet = GetInputSetImpl(); SfxWhichIter aIter( *pInSet ); diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk index 0d1cc07b0b59..c847ef765268 100644 --- a/sw/AllLangResTarget_sw.mk +++ b/sw/AllLangResTarget_sw.mk @@ -111,7 +111,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\ sw/source/ui/fldui/fldtdlg.src \ sw/source/ui/fldui/fldui.src \ sw/source/ui/fldui/fldvar.src \ - sw/source/ui/fmtui/tmpdlg.src \ sw/source/ui/frmdlg/frmpage.src \ sw/source/ui/frmdlg/frmui.src \ sw/source/ui/globdoc/globdoc.src \ diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk index 634ee531d7dc..f573d7159102 100644 --- a/sw/UIConfig_swriter.mk +++ b/sw/UIConfig_swriter.mk @@ -144,6 +144,11 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\ sw/uiconfig/swriter/ui/tablecolumnpage \ sw/uiconfig/swriter/ui/tableproperties \ sw/uiconfig/swriter/ui/tabletextflowpage \ + sw/uiconfig/swriter/ui/templatedialog1 \ + sw/uiconfig/swriter/ui/templatedialog2 \ + sw/uiconfig/swriter/ui/templatedialog4 \ + sw/uiconfig/swriter/ui/templatedialog8 \ + sw/uiconfig/swriter/ui/templatedialog16 \ sw/uiconfig/swriter/ui/textgridpage \ sw/uiconfig/swriter/ui/titlepage \ sw/uiconfig/swriter/ui/viewoptionspage \ diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index 48c5612f7747..e060cb7cd04e 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -111,7 +111,7 @@ class SW_DLLPUBLIC SwDocShell: public SfxObjectShell, public SfxListener const sal_uInt16 nFamily, sal_uInt16 nMask, const sal_Bool bNew, - const sal_uInt16 nSlot = 0, + const OString sPageId = OString(), SwWrtShell* pActShell = 0, const sal_Bool bBasic = sal_False ); @@ -241,7 +241,7 @@ public: // Identifies slot by which the dialog is triggered. Used to activate certain dialog pane void FormatPage( const String& rPage, - const sal_uInt16 nSlot, + const OString& rPageId, SwWrtShell& rActShell ); // #i59688# diff --git a/sw/inc/fmtui.hrc b/sw/inc/fmtui.hrc deleted file mode 100644 index 7e9f5fad093d..000000000000 --- a/sw/inc/fmtui.hrc +++ /dev/null @@ -1,52 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef _FMTUI_HRC -#define _FMTUI_HRC - -#include "rcid.hrc" - -#define DLG_NEW_FILE (RC_FMTUI_BEGIN + 1) -#define STR_PAGE_STD (RC_FMTUI_BEGIN + 2) -#define STR_PAGE_BORDER (RC_FMTUI_BEGIN + 3) -#define STR_PAGE_HEADER (RC_FMTUI_BEGIN + 4) -#define STR_PAGE_FOOTER (RC_FMTUI_BEGIN + 5) -#define STR_PAGE_COLUMN (RC_FMTUI_BEGIN + 6) -#define STR_PAGE_FOOTNOTE (RC_FMTUI_BEGIN + 7) -#define STR_PAGE_TEXTGRID (RC_FMTUI_BEGIN + 8) - -#define ST_CUSTOMIZE 1 - -// Do not change relations to base 2!!! -#define DLG_TEMPLATE_BASE (RC_FMTUI_BEGIN + 40) -#define DLG_TEMPLATE_1 (RC_FMTUI_BEGIN + 41) -#define DLG_TEMPLATE_2 (RC_FMTUI_BEGIN + 42) -#define DLG_TEMPLATE_3 (RC_FMTUI_BEGIN + 44) -#define DLG_TEMPLATE_4 (RC_FMTUI_BEGIN + 48) -#define DLG_TEMPLATE_5 (RC_FMTUI_BEGIN + 56) - - -#if DLG_TEMPLATE_5 > RC_FMTUI_END -#error Resource-Id Ueberlauf in #file, #line -#endif - - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc index a68ef4e1f7fb..1d117977127c 100644 --- a/sw/inc/globals.hrc +++ b/sw/inc/globals.hrc @@ -129,26 +129,12 @@ // TABPAGES ----------------------------------------------------------- -#define TP_PAGE_STD (RC_GLOBALS_BEGIN + 1) - -#define TP_PARA_STD (RC_GLOBALS_BEGIN + 3) -#define TP_PARA_EXT (RC_GLOBALS_BEGIN + 4) - -#define TP_CHAR_STD (RC_GLOBALS_BEGIN + 7) -#define TP_CHAR_EXT (RC_GLOBALS_BEGIN + 8) - -#define TP_TABULATOR (RC_GLOBALS_BEGIN + 9) -#define TP_DROPCAPS (RC_GLOBALS_BEGIN + 10) #define TP_BACKGROUND (RC_GLOBALS_BEGIN + 11) #define TP_BORDER (RC_GLOBALS_BEGIN + 12) #define TP_COLUMN (RC_GLOBALS_BEGIN + 13) #define TP_DOC_STAT (RC_GLOBALS_BEGIN + 15) -#define TP_HEADER_PAGE (RC_GLOBALS_BEGIN + 16) -#define TP_FOOTER_PAGE (RC_GLOBALS_BEGIN + 17) -#define TP_FOOTNOTE_PAGE (RC_GLOBALS_BEGIN + 18) - // Sw-pages #define TP_OPTTEST_PAGE (RC_GLOBALS_BEGIN + 25) #define TP_OPTPRINT_PAGE (RC_GLOBALS_BEGIN + 26) @@ -171,8 +157,6 @@ #define TP_FRM_WRAP (RC_GLOBALS_BEGIN + 49) #define TP_FRM_ADD (RC_GLOBALS_BEGIN + 51) -#define TP_PARA_ALIGN (RC_GLOBALS_BEGIN + 55) - #define TP_NUMBER (RC_GLOBALS_BEGIN + 57) #define TP_FLD_DB (RC_GLOBALS_BEGIN + 64) @@ -183,8 +167,6 @@ #define TP_FLD_REF (RC_GLOBALS_BEGIN + 69) #define TP_OPTSHDWCRSR (RC_GLOBALS_BEGIN + 70) -#define TP_NUMPARA (RC_GLOBALS_BEGIN + 73) - #define TP_OPTCAPTION_PAGE (RC_GLOBALS_BEGIN + 78) @@ -198,10 +180,6 @@ #define DLG_ADD_IDX_STYLES (RC_GLOBALS_BEGIN + 94) #define TP_PRIVATE_DATA (RC_GLOBALS_BEGIN + 95) #define TP_BUSINESS_DATA (RC_GLOBALS_BEGIN + 96) -#define TP_CHAR_POS (RC_GLOBALS_BEGIN + 98) -#define TP_CHAR_TWOLN (RC_GLOBALS_BEGIN + 99) -#define TP_PARA_ASIAN (RC_GLOBALS_BEGIN + 100) -#define TP_TEXTGRID_PAGE (RC_GLOBALS_BEGIN + 101) #define TP_OPTCOMPATIBILITY_PAGE (RC_GLOBALS_BEGIN + 103) #define TP_MAILCONFIG (RC_GLOBALS_BEGIN + 104) //maximum: RC_GLOBALS_BEGIN + 120 diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index ad7c3f14d550..1d372b2027de 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -367,7 +367,7 @@ public: sal_uInt8 nDialogMode, const String *pCollName = 0, sal_Bool bDraw = sal_False, - sal_uInt16 nDefPage = 0) = 0; + OString sDefPage = OString() ) = 0; virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(Window * pParent, const String &rShortName) = 0; //add for SwSelGlossaryDlg @@ -406,9 +406,9 @@ public: Window* pParent, SfxStyleSheetBase& rBase, sal_uInt16 nRegion, - const sal_uInt16 nSlot = 0, + OString sPage = OString(), SwWrtShell* pActShell = 0, - sal_Bool bNew = sal_False ) = 0; //add for SwTemplateDlg + bool bNew = false) = 0; //add for SwTemplateDlg virtual AbstractGlossaryDlg* CreateGlossaryDlg(SfxViewFrame* pViewFrame, SwGlossaryHdl* pGlosHdl, SwWrtShell *pWrtShell) = 0; //add for SwGlossaryDlg diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx index 6e0594ffdce1..18095f96427a 100644 --- a/sw/source/ui/app/docst.cxx +++ b/sw/source/ui/app/docst.cxx @@ -73,7 +73,6 @@ #include "unochart.hxx" #include "app.hrc" -#include <fmtui.hrc> #include "swabstdlg.hxx" #include <list.hxx> @@ -620,7 +619,7 @@ sal_uInt16 SwDocShell::Edit( const sal_uInt16 nFamily, sal_uInt16 nMask, const sal_Bool bNew, - const sal_uInt16 nSlot, + const OString sPage, SwWrtShell* pActShell, const sal_Bool bBasic ) { @@ -785,7 +784,7 @@ sal_uInt16 SwDocShell::Edit( SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "Dialogdiet fail!"); SfxAbstractApplyTabDialog* pDlg = pFact->CreateTemplateDialog( - 0, *(xTmp.get()), nFamily, nSlot, + 0, *(xTmp.get()), nFamily, sPage, pActShell ? pActShell : pWrtShell, bNew); OSL_ENSURE(pDlg, "Dialogdiet fail!"); ApplyStyle aApplyStyleHelper(*this, bNew, pStyle, nRet, xTmp, nFamily, pDlg, mxBasePool, bModified); @@ -1314,10 +1313,10 @@ void SwDocShell::_LoadStyles( SfxObjectShell& rSource, sal_Bool bPreserveCurrent void SwDocShell::FormatPage( const String& rPage, - const sal_uInt16 nSlot, + const OString& rPageId, SwWrtShell& rActShell ) { - Edit( rPage, aEmptyStr, SFX_STYLE_FAMILY_PAGE, 0, sal_False, nSlot, &rActShell); + Edit( rPage, aEmptyStr, SFX_STYLE_FAMILY_PAGE, 0, sal_False, rPageId, &rActShell); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx index 20b4f957de30..7686e40b77d7 100644 --- a/sw/source/ui/chrdlg/pardlg.cxx +++ b/sw/source/ui/chrdlg/pardlg.cxx @@ -50,7 +50,7 @@ SwParaDlg::SwParaDlg(Window *pParent, sal_uInt8 nDialogMode, const String *pTitle, sal_Bool bDraw, - sal_uInt16 nDefPage) + OString sDefPage) : SfxTabDialog(pParent, "ParagraphPropertiesDialog", "modules/swriter/ui/paradialog.ui", @@ -162,8 +162,8 @@ SwParaDlg::SwParaDlg(Window *pParent, m_nParaBorder = AddTabPage("labelTP_BORDER", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) ); } - if (nDefPage) - SetCurPageId(nDefPage); + if (!sDefPage.isEmpty()) + SetCurPageId(sDefPage); } diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index ea0dd39b5e2c..5192ddb8b333 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -32,7 +32,6 @@ #include "dochdl.hrc" #include <index.hrc> #include <regionsw.hrc> -#include <fmtui.hrc> #include <wordcountdialog.hxx> #include "abstract.hxx" // add for SwInsertAbstractDlg @@ -822,9 +821,9 @@ SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwParaDlg ( Window *pP sal_uInt8 nDialogMode, const String *pCollName, sal_Bool bDraw , - sal_uInt16 nDefPage) + OString sDefPage) { - SfxTabDialog* pDlg = new SwParaDlg( pParent, rVw, rCoreSet,nDialogMode, pCollName, bDraw, nDefPage ); + SfxTabDialog* pDlg = new SwParaDlg( pParent, rVw, rCoreSet,nDialogMode, pCollName, bDraw, sDefPage ); return new AbstractTabDialog_Impl( pDlg ); } @@ -987,11 +986,11 @@ SfxAbstractApplyTabDialog* SwAbstractDialogFactory_Impl::CreateTemplateDialog( Window* pParent, SfxStyleSheetBase& rBase, sal_uInt16 nRegion, - const sal_uInt16 nSlot, + OString sPage, SwWrtShell* pActShell, - sal_Bool bNew ) //add for SwTemplateDlg + bool bNew ) //add for SwTemplateDlg { - SfxTabDialog* pDlg = new SwTemplateDlg( pParent, rBase, nRegion, nSlot, pActShell, bNew ); + SfxTabDialog* pDlg = new SwTemplateDlg( pParent, rBase, nRegion, sPage, pActShell, bNew ); return new AbstractApplyTabDialog_Impl( pDlg ); } diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index e0060494ef55..3d2c25a7e89a 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -468,7 +468,7 @@ public: sal_uInt8 nDialogMode, const String *pCollName = 0, sal_Bool bDraw = sal_False, - sal_uInt16 nDefPage = 0); + OString sDefPage = OString() ); virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(Window * pParent, const String &rShortName); //add for SwSelGlossaryDlg virtual VclAbstractDialog * CreateVclAbstractDialog ( Window * pParent, SwWrtShell &rSh, int nResId ); //add for SwTableHeightDlg SwSortDlg @@ -501,10 +501,10 @@ public: virtual SfxAbstractApplyTabDialog* CreateTemplateDialog( Window* pParent, SfxStyleSheetBase& rBase, - sal_uInt16 nRegion, - const sal_uInt16 nSlot = 0, + sal_uInt16 nRegion, + OString sPage = OString(), SwWrtShell* pActShell = 0, - sal_Bool bNew = sal_False ); //add for SwTemplateDlg + bool bNew = false); //add for SwTemplateDlg virtual AbstractGlossaryDlg* CreateGlossaryDlg(SfxViewFrame* pViewFrame, SwGlossaryHdl* pGlosHdl, SwWrtShell *pWrtShell); //add for SwGlossaryDlg diff --git a/sw/source/ui/docvw/HeaderFooterWin.cxx b/sw/source/ui/docvw/HeaderFooterWin.cxx index b4b7ec708fd4..edb65e6b7b64 100644 --- a/sw/source/ui/docvw/HeaderFooterWin.cxx +++ b/sw/source/ui/docvw/HeaderFooterWin.cxx @@ -401,13 +401,8 @@ void SwHeaderFooterWin::ExecuteCommand( sal_uInt16 nSlot ) { case FN_HEADERFOOTER_EDIT: { - sal_uInt16 nPageId = TP_FOOTER_PAGE; - if ( m_bIsHeader ) - nPageId = TP_HEADER_PAGE; - - rView.GetDocShell()->FormatPage( - rStyleName, - nPageId, rSh ); + OString sPageId = m_bIsHeader ? OString("header") : OString("footer"); + rView.GetDocShell()->FormatPage(rStyleName, sPageId, rSh); } break; case FN_HEADERFOOTER_BORDERBACK: diff --git a/sw/source/ui/docvw/PageBreakWin.cxx b/sw/source/ui/docvw/PageBreakWin.cxx index e61c90132b63..507f3f556038 100644 --- a/sw/source/ui/docvw/PageBreakWin.cxx +++ b/sw/source/ui/docvw/PageBreakWin.cxx @@ -243,7 +243,7 @@ void SwPageBreakWin::Select( ) SwPaM aPaM( *pNd ); SwPaMItem aPaMItem( pEditWin->GetView().GetPool( ).GetWhich( FN_PARAM_PAM ), &aPaM ); - SfxUInt16Item aItem( pEditWin->GetView().GetPool( ).GetWhich( SID_PARA_DLG ), TP_PARA_EXT ); + SfxStringItem aItem( pEditWin->GetView().GetPool( ).GetWhich( SID_PARA_DLG ), "textflow" ); pEditWin->GetView().GetViewFrame()->GetDispatcher()->Execute( SID_PARA_DLG, SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD, &aItem, &aPaMItem, NULL ); } diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index 7ad860ec76c9..7e977dc8173c 100644 --- a/sw/source/ui/fmtui/tmpdlg.cxx +++ b/sw/source/ui/fmtui/tmpdlg.cxx @@ -55,7 +55,6 @@ #include <cmdid.h> #include <helpid.h> #include <globals.hrc> -#include <fmtui.hrc> #include <SwStyleNameMapper.hxx> #include <svx/svxids.hrc> #include <svl/stritem.hxx> @@ -73,23 +72,51 @@ extern SW_DLLPUBLIC SwWrtShell* GetActiveWrtShell(); Description: the dialog's carrier --------------------------------------------------------------------*/ -SwTemplateDlg::SwTemplateDlg(Window* pParent, +SwTemplateDlg::SwTemplateDlg(Window* pParent, SfxStyleSheetBase& rBase, - sal_uInt16 nRegion, - const sal_uInt16 nSlot, - SwWrtShell* pActShell, - sal_Bool bNew ) : - SfxStyleDialog( pParent, - SW_RES(DLG_TEMPLATE_BASE + nRegion), - rBase, - sal_False, - 0 ), - nType( nRegion ), - pWrtShell(pActShell), - bNewStyle(bNew) + sal_uInt16 nRegion, + OString sPage, + SwWrtShell* pActShell, + bool bNew) + : SfxStyleDialog(pParent, + OString("TemplateDialog") + OString::number(nRegion), + OUString("modules/swriter/ui/templatedialog") + + OUString::number(nRegion) + OUString(".ui"), + rBase) + , nType(nRegion) + , pWrtShell(pActShell) + , bNewStyle(bNew) + , m_nIndentsId(0) + , m_nAlignId(0) + , m_nTextFlowId(0) + , m_nAsianTypo(0) + , m_nFontId(0) + , m_nFontEffectId(0) + , m_nPositionId(0) + , m_nAsianLayoutId(0) + , m_nTabId(0) + , m_nOutlineId(0) + , m_nDropCapsId(0) + , m_nBackgroundId(0) + , m_nBorderId(0) + , m_nConditionId(0) + , m_nTypeId(0) + , m_nOptionsId(0) + , m_nWrapId(0) + , m_nColumnId(0) + , m_nMacroId(0) + , m_nHeaderId(0) + , m_nFooterId(0) + , m_nPageId(0) + , m_nFootNoteId(0) + , m_nTextGridId(0) + , m_nSingleId(0) + , m_nBulletId(0) + , m_nNumId(0) + , m_nBmpId(0) + , m_nNumOptId(0) + , m_nNumPosId(0) { - FreeResource(); - nHtmlMode = ::GetHtmlMode(pWrtShell->GetView().GetDocShell()); SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "Dialogdiet fail!"); @@ -101,136 +128,134 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent, { OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME ) , "GetTabPageRangesFunc fail!"); - AddTabPage(TP_CHAR_STD, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME ) ); + m_nFontId = AddTabPage("font", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME )); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_EFFECTS ) , "GetTabPageRangesFunc fail!"); - AddTabPage(TP_CHAR_EXT, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_EFFECTS ) ); + m_nFontEffectId = AddTabPage("fonteffect", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_EFFECTS )); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_POSITION ) , "GetTabPageRangesFunc fail!"); - AddTabPage(TP_CHAR_POS, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_POSITION ) ); + m_nPositionId = AddTabPage("position", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_POSITION )); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_TWOLINES ) , "GetTabPageRangesFunc fail!"); - AddTabPage(TP_CHAR_TWOLN, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_TWOLINES ) ); + m_nAsianLayoutId = AddTabPage("asianlayout", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_TWOLINES )); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) , "GetTabPageRangesFunc fail!"); - AddTabPage(TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) ); + m_nBackgroundId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND )); SAL_WARN_IF(!pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "sw.ui", "GetTabPageCreatorFunc fail!"); SAL_WARN_IF(!pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ), "sw.ui", "GetTabPageRangesFunc fail!"); - AddTabPage(TP_BORDER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) ); + m_nBorderId = AddTabPage("borders", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER )); SvtCJKOptions aCJKOptions; if(nHtmlMode & HTMLMODE_ON || !aCJKOptions.IsDoubleLinesEnabled()) - RemoveTabPage(TP_CHAR_TWOLN); + RemoveTabPage("asianlayout"); } break; // paragraph styles case SFX_STYLE_FAMILY_PARA: { - OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_STD_PARAGRAPH), "GetTabPageCreatorFunc fail!"); - OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_STD_PARAGRAPH), "GetTabPageRangesFunc fail!"); - AddTabPage( TP_PARA_STD, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_STD_PARAGRAPH), pFact->GetTabPageRangesFunc(RID_SVXPAGE_STD_PARAGRAPH) ); - - OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_ALIGN_PARAGRAPH), "GetTabPageCreatorFunc fail!"); - OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_ALIGN_PARAGRAPH), "GetTabPageRangesFunc fail!"); - AddTabPage( TP_PARA_ALIGN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_ALIGN_PARAGRAPH), pFact->GetTabPageRangesFunc(RID_SVXPAGE_ALIGN_PARAGRAPH) ); + OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_STD_PARAGRAPH), "GetTabPageCreatorFunc fail!"); + OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_STD_PARAGRAPH), "GetTabPageRangesFunc fail!"); + m_nIndentsId = AddTabPage("indents", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_STD_PARAGRAPH), pFact->GetTabPageRangesFunc(RID_SVXPAGE_STD_PARAGRAPH) ); - OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_EXT_PARAGRAPH), "GetTabPageCreatorFunc fail!"); - OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_EXT_PARAGRAPH), "GetTabPageRangesFunc fail!"); - AddTabPage( TP_PARA_EXT, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_EXT_PARAGRAPH), pFact->GetTabPageRangesFunc(RID_SVXPAGE_EXT_PARAGRAPH) ); + OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_ALIGN_PARAGRAPH), "GetTabPageCreatorFunc fail!"); + OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_ALIGN_PARAGRAPH), "GetTabPageRangesFunc fail!"); + m_nAlignId = AddTabPage("alignment", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_ALIGN_PARAGRAPH), pFact->GetTabPageRangesFunc(RID_SVXPAGE_ALIGN_PARAGRAPH) ); - OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageCreatorFunc fail!"); - OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageRangesFunc fail!"); - AddTabPage( TP_PARA_ASIAN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN) ); + OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_EXT_PARAGRAPH), "GetTabPageCreatorFunc fail!"); + OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_EXT_PARAGRAPH), "GetTabPageRangesFunc fail!"); + m_nTextFlowId = AddTabPage("textflow", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_EXT_PARAGRAPH), pFact->GetTabPageRangesFunc(RID_SVXPAGE_EXT_PARAGRAPH) ); - OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), "GetTabPageCreatorFunc fail!"); - OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME ), "GetTabPageRangesFunc fail!"); - AddTabPage(TP_CHAR_STD, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME ) ); + OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageCreatorFunc fail!"); + OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageRangesFunc fail!"); + m_nAsianTypo = AddTabPage("asiantypo", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN) ); - OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), "GetTabPageCreatorFunc fail!"); - OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_EFFECTS ), "GetTabPageRangesFunc fail!"); - AddTabPage(TP_CHAR_EXT, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_EFFECTS ) ); + OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), "GetTabPageCreatorFunc fail!"); + OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME ), "GetTabPageRangesFunc fail!"); + m_nFontId = AddTabPage("font", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME ) ); - OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), "GetTabPageCreatorFunc fail!"); - OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_POSITION ) , "GetTabPageRangesFunc fail!"); - AddTabPage(TP_CHAR_POS, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_POSITION ) ); + OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), "GetTabPageCreatorFunc fail!"); + OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_EFFECTS ), "GetTabPageRangesFunc fail!"); + m_nFontEffectId = AddTabPage("fonteffect", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_EFFECTS ) ); - OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), "GetTabPageCreatorFunc fail!"); - OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_TWOLINES ) , "GetTabPageRangesFunc fail!"); - AddTabPage(TP_CHAR_TWOLN, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_TWOLINES ) ); + OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), "GetTabPageCreatorFunc fail!"); + OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_POSITION ) , "GetTabPageRangesFunc fail!"); + m_nPositionId = AddTabPage("position", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_POSITION ) ); + OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), "GetTabPageCreatorFunc fail!"); + OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_TWOLINES ) , "GetTabPageRangesFunc fail!"); + m_nAsianLayoutId = AddTabPage("asianlayout", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_TWOLINES ) ); OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR), "GetTabPageRangesFunc fail!"); - AddTabPage( TP_TABULATOR, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR), pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR) ); - + m_nTabId = AddTabPage("tabs", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR), pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR) ); - AddTabPage(TP_NUMPARA, SwParagraphNumTabPage::Create, + m_nOutlineId = AddTabPage("outline", SwParagraphNumTabPage::Create, SwParagraphNumTabPage::GetRanges); - AddTabPage(TP_DROPCAPS, SwDropCapsPage::Create, + m_nDropCapsId = AddTabPage("dropcaps", SwDropCapsPage::Create, SwDropCapsPage::GetRanges ); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageRangesFunc fail!"); - AddTabPage(TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) ); + m_nBackgroundId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) ); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ), "GetTabPageRangesFunc fail!"); - AddTabPage(TP_BORDER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) ); + m_nBorderId = AddTabPage("borders", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) ); - AddTabPage( TP_CONDCOLL, SwCondCollPage::Create, + m_nConditionId = AddTabPage("condition", SwCondCollPage::Create, SwCondCollPage::GetRanges ); if( (!bNewStyle && RES_CONDTXTFMTCOLL != ((SwDocStyleSheet&)rBase).GetCollection()->Which()) || nHtmlMode & HTMLMODE_ON ) - RemoveTabPage(TP_CONDCOLL); + RemoveTabPage("condition"); SvtCJKOptions aCJKOptions; if(nHtmlMode & HTMLMODE_ON) { SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get(); if (!rHtmlOpt.IsPrintLayoutExtension()) - RemoveTabPage(TP_PARA_EXT); - RemoveTabPage(TP_PARA_ASIAN); - RemoveTabPage(TP_TABULATOR); - RemoveTabPage(TP_NUMPARA); - RemoveTabPage(TP_CHAR_TWOLN); + RemoveTabPage("textflow"); + RemoveTabPage("asiantypo"); + RemoveTabPage("tabs"); + RemoveTabPage("outline"); + RemoveTabPage("asianlayout"); if(!(nHtmlMode & HTMLMODE_FULL_STYLES)) { - RemoveTabPage(TP_BACKGROUND); - RemoveTabPage(TP_DROPCAPS); + RemoveTabPage("background"); + RemoveTabPage("dropcaps"); } } else { if(!aCJKOptions.IsAsianTypographyEnabled()) - RemoveTabPage(TP_PARA_ASIAN); + RemoveTabPage("asiantypo"); if(!aCJKOptions.IsDoubleLinesEnabled()) - RemoveTabPage(TP_CHAR_TWOLN); + RemoveTabPage("asianlayout"); } } break; // frame styles case SFX_STYLE_FAMILY_FRAME: { - AddTabPage(TP_FRM_STD, SwFrmPage::Create, - SwFrmPage::GetRanges ); - AddTabPage(TP_FRM_ADD, SwFrmAddPage::Create, - SwFrmAddPage::GetRanges ); - AddTabPage(TP_FRM_WRAP, SwWrapTabPage::Create, - SwWrapTabPage::GetRanges ); + m_nTypeId = AddTabPage("type", SwFrmPage::Create, + SwFrmPage::GetRanges); + m_nOptionsId = AddTabPage("options", SwFrmAddPage::Create, + SwFrmAddPage::GetRanges); + m_nWrapId = AddTabPage("wrap", SwWrapTabPage::Create, + SwWrapTabPage::GetRanges); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageRangesFunc fail!"); - AddTabPage(TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) ); + m_nBackgroundId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) ); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ), "GetTabPageRangesFunc fail!"); - AddTabPage(TP_BORDER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) ); + m_nBorderId = AddTabPage("borders", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) ); - AddTabPage(TP_COLUMN, SwColumnPage::Create, + m_nColumnId = AddTabPage("columns", SwColumnPage::Create, SwColumnPage::GetRanges ); - AddTabPage( TP_MACRO_ASSIGN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_MACROASSIGN), 0); + m_nMacroId = AddTabPage("macros", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_MACROASSIGN), 0); break; } @@ -239,74 +264,52 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent, { OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageRangesFunc fail!"); - AddTabPage(TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) ); - AddTabPage(TP_HEADER_PAGE, String(SW_RES(STR_PAGE_HEADER)), - SvxHeaderPage::Create, - SvxHeaderPage::GetRanges ); - AddTabPage(TP_FOOTER_PAGE, String(SW_RES(STR_PAGE_FOOTER)), - SvxFooterPage::Create, - SvxFooterPage::GetRanges ); - if ( nSlot == FN_FORMAT_PAGE_COLUMN_DLG ) - { - SetCurPageId(TP_COLUMN); - } - else if ( nSlot == FN_FORMAT_PAGE_SETTING_DLG ) - { - SetCurPageId(TP_PAGE_STD); - } + m_nBackgroundId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) ); + m_nHeaderId = AddTabPage("header", SvxHeaderPage::Create, SvxHeaderPage::GetRanges); + m_nFooterId = AddTabPage("footer", SvxFooterPage::Create, SvxFooterPage::GetRanges); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ), "GetTabPageRangesFunc fail!"); - AddTabPage(TP_PAGE_STD, String(SW_RES(STR_PAGE_STD)), + m_nPageId = AddTabPage("page", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), - pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ), - sal_False, - 1 ); // after the manage-page + pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ) ); if(!pActShell || 0 == ::GetHtmlMode(pWrtShell->GetView().GetDocShell())) { OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ), "GetTabPageRangesFunc fail!"); - AddTabPage(TP_BORDER, String(SW_RES(STR_PAGE_BORDER)), + m_nBorderId = AddTabPage("borders", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) ); - AddTabPage(TP_COLUMN, String(SW_RES(STR_PAGE_COLUMN)), - SwColumnPage::Create, - SwColumnPage::GetRanges ); - AddTabPage(TP_FOOTNOTE_PAGE, String(SW_RES(STR_PAGE_FOOTNOTE)), + m_nColumnId = AddTabPage("columns", SwColumnPage::Create, SwColumnPage::GetRanges ); + m_nFootNoteId = AddTabPage("footnotes", SwFootNotePage::Create, SwFootNotePage::GetRanges ); - AddTabPage(TP_TEXTGRID_PAGE, String(SW_RES(STR_PAGE_TEXTGRID)), + m_nTextGridId = AddTabPage("textgrid", SwTextGridPage::Create, SwTextGridPage::GetRanges ); SvtCJKOptions aCJKOptions; if(!aCJKOptions.IsAsianTypographyEnabled()) - RemoveTabPage(TP_TEXTGRID_PAGE); + RemoveTabPage("textgrid"); } - - } break; // numbering styles case SFX_STYLE_FAMILY_PSEUDO: { - AddTabPage( RID_SVXPAGE_PICK_SINGLE_NUM ); - AddTabPage( RID_SVXPAGE_PICK_BULLET ); - AddTabPage( RID_SVXPAGE_PICK_NUM ); - AddTabPage( RID_SVXPAGE_PICK_BMP); - AddTabPage( RID_SVXPAGE_NUM_OPTIONS ); - AddTabPage( RID_SVXPAGE_NUM_POSITION ); - + m_nSingleId = AddTabPage("numbering", RID_SVXPAGE_PICK_SINGLE_NUM); + m_nBulletId = AddTabPage("bullets", RID_SVXPAGE_PICK_BULLET); + m_nNumId = AddTabPage("outline", RID_SVXPAGE_PICK_NUM); + m_nBmpId = AddTabPage("graphics", RID_SVXPAGE_PICK_BMP); + m_nNumOptId = AddTabPage("options", RID_SVXPAGE_NUM_OPTIONS ); + m_nNumPosId = AddTabPage("position", RID_SVXPAGE_NUM_POSITION ); } break; default: OSL_ENSURE(!this, "wrong family"); - } - EnableApplyButton( true ); -} -SwTemplateDlg::~SwTemplateDlg() -{ + if (!sPage.isEmpty()) + SetCurPageId(sPage); } short SwTemplateDlg::Ok() @@ -351,233 +354,215 @@ void SwTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SwStyleNameMapper::FillUIName( RES_POOLCHR_BUL_LEVEL, sBulletCharFmt); SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); - switch( nId ) + if (nId == m_nFontId) { - case TP_CHAR_STD: - { - OSL_ENSURE(::GetActiveView(), "no active view"); - - SvxFontListItem aFontListItem( *( (SvxFontListItem*)::GetActiveView()-> - GetDocShell()->GetItem( SID_ATTR_CHAR_FONTLIST ) ) ); - - aSet.Put (SvxFontListItem( aFontListItem.GetFontList(), SID_ATTR_CHAR_FONTLIST)); - sal_uInt32 nFlags = 0; - if(rPage.GetItemSet().GetParent() && 0 == (nHtmlMode & HTMLMODE_ON )) - nFlags = SVX_RELATIVE_MODE; - if( SFX_STYLE_FAMILY_CHAR == nType ) - nFlags = nFlags|SVX_PREVIEW_CHARACTER; - aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, nFlags)); - rPage.PageCreated(aSet); - } - break; - - case TP_CHAR_EXT: - { - sal_uInt32 nFlags = SVX_ENABLE_FLASH; - if( SFX_STYLE_FAMILY_CHAR == nType ) - nFlags = nFlags|SVX_PREVIEW_CHARACTER; - aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, nFlags)); + OSL_ENSURE(::GetActiveView(), "no active view"); + + SvxFontListItem aFontListItem( *( (SvxFontListItem*)::GetActiveView()-> + GetDocShell()->GetItem( SID_ATTR_CHAR_FONTLIST ) ) ); + + aSet.Put (SvxFontListItem( aFontListItem.GetFontList(), SID_ATTR_CHAR_FONTLIST)); + sal_uInt32 nFlags = 0; + if(rPage.GetItemSet().GetParent() && 0 == (nHtmlMode & HTMLMODE_ON )) + nFlags = SVX_RELATIVE_MODE; + if( SFX_STYLE_FAMILY_CHAR == nType ) + nFlags = nFlags|SVX_PREVIEW_CHARACTER; + aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, nFlags)); + rPage.PageCreated(aSet); + } + else if (nId == m_nFontEffectId) + { + sal_uInt32 nFlags = SVX_ENABLE_FLASH; + if( SFX_STYLE_FAMILY_CHAR == nType ) + nFlags = nFlags|SVX_PREVIEW_CHARACTER; + aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, nFlags)); + rPage.PageCreated(aSet); + } + else if (nId == m_nPositionId) + { + if( SFX_STYLE_FAMILY_CHAR == nType ) + { + aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, SVX_PREVIEW_CHARACTER)); rPage.PageCreated(aSet); - } - break; - - case TP_CHAR_POS: - if( SFX_STYLE_FAMILY_CHAR == nType ) - { - aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, SVX_PREVIEW_CHARACTER)); - rPage.PageCreated(aSet); - } - break; - - case TP_CHAR_TWOLN: - if( SFX_STYLE_FAMILY_CHAR == nType ) - { - aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, SVX_PREVIEW_CHARACTER)); - rPage.PageCreated(aSet); - } - break; - - case TP_PARA_STD: - { - if( rPage.GetItemSet().GetParent() ) - { - aSet.Put(SfxUInt32Item(SID_SVXSTDPARAGRAPHTABPAGE_ABSLINEDIST,MM50/10)); - aSet.Put(SfxUInt32Item(SID_SVXSTDPARAGRAPHTABPAGE_FLAGSET,0x000F)); - rPage.PageCreated(aSet); - } - - } - break; - case TP_NUMPARA: - { - //-->#outlinelevel added by zhaojianwei - // handle if the current paragraph style is assigned to a list level of outline style, - SwTxtFmtColl* pTmpColl = pWrtShell->FindTxtFmtCollByName( GetStyleSheet().GetName() ); - if( pTmpColl && pTmpColl->IsAssignedToListLevelOfOutlineStyle() ) - { - ((SwParagraphNumTabPage&)rPage).DisableOutline() ; - ((SwParagraphNumTabPage&)rPage).DisableNumbering(); - }//<-end - ListBox & rBox = ((SwParagraphNumTabPage&)rPage).GetStyleBox(); - SfxStyleSheetBasePool* pPool = pWrtShell->GetView().GetDocShell()->GetStyleSheetPool(); - pPool->SetSearchMask(SFX_STYLE_FAMILY_PSEUDO, SFXSTYLEBIT_ALL); - const SfxStyleSheetBase* pBase = pPool->First(); - std::set<String> aNames; - while(pBase) - { - aNames.insert(pBase->GetName()); - pBase = pPool->Next(); - } - for(std::set<String>::const_iterator it = aNames.begin(); it != aNames.end(); ++it) - rBox.InsertEntry(*it); } - break; - case TP_PARA_ALIGN: - { - aSet.Put(SfxBoolItem(SID_SVXPARAALIGNTABPAGE_ENABLEJUSTIFYEXT,sal_True)); - rPage.PageCreated(aSet); - } - break; - - case TP_FRM_STD: - ((SwFrmPage&)rPage).SetNewFrame( sal_True ); - ((SwFrmPage&)rPage).SetFormatUsed( sal_True ); - break; - - case TP_FRM_ADD: - ((SwFrmAddPage&)rPage).SetFormatUsed(sal_True); - ((SwFrmAddPage&)rPage).SetNewFrame(sal_True); - break; - - case TP_FRM_WRAP: - ((SwWrapTabPage&)rPage).SetFormatUsed( sal_True, sal_False ); - break; - - case TP_COLUMN: - if( nType == SFX_STYLE_FAMILY_FRAME ) - ((SwColumnPage&)rPage).SetFrmMode(sal_True); - ((SwColumnPage&)rPage).SetFormatUsed( sal_True ); - break; - - case TP_BACKGROUND: + } + else if (nId == m_nAsianLayoutId) + { + if( SFX_STYLE_FAMILY_CHAR == nType ) { - sal_Int32 nFlagType = 0; - if( SFX_STYLE_FAMILY_PARA == nType ) - nFlagType |= SVX_SHOW_PARACTL; - if( SFX_STYLE_FAMILY_CHAR != nType ) - nFlagType |= SVX_SHOW_SELECTOR; - if( SFX_STYLE_FAMILY_FRAME == nType ) - nFlagType |= SVX_ENABLE_TRANSPARENCY; - aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, nFlagType)); + aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, SVX_PREVIEW_CHARACTER)); + rPage.PageCreated(aSet); + } + } + else if (nId == m_nIndentsId) + { + if( rPage.GetItemSet().GetParent() ) + { + aSet.Put(SfxUInt32Item(SID_SVXSTDPARAGRAPHTABPAGE_ABSLINEDIST,MM50/10)); + aSet.Put(SfxUInt32Item(SID_SVXSTDPARAGRAPHTABPAGE_FLAGSET,0x000F)); rPage.PageCreated(aSet); } - break; - case TP_CONDCOLL: - ((SwCondCollPage&)rPage).SetCollection( - ((SwDocStyleSheet&)GetStyleSheet()).GetCollection(), bNewStyle ); - break; - case TP_PAGE_STD: - if(0 == (nHtmlMode & HTMLMODE_ON )) + } + else if (nId == m_nOutlineId) + { + //-->#outlinelevel added by zhaojianwei + // handle if the current paragraph style is assigned to a list level of outline style, + SwTxtFmtColl* pTmpColl = pWrtShell->FindTxtFmtCollByName( GetStyleSheet().GetName() ); + if( pTmpColl && pTmpColl->IsAssignedToListLevelOfOutlineStyle() ) + { + ((SwParagraphNumTabPage&)rPage).DisableOutline() ; + ((SwParagraphNumTabPage&)rPage).DisableNumbering(); + }//<-end + ListBox & rBox = ((SwParagraphNumTabPage&)rPage).GetStyleBox(); + SfxStyleSheetBasePool* pPool = pWrtShell->GetView().GetDocShell()->GetStyleSheetPool(); + pPool->SetSearchMask(SFX_STYLE_FAMILY_PSEUDO, SFXSTYLEBIT_ALL); + const SfxStyleSheetBase* pBase = pPool->First(); + std::set<String> aNames; + while(pBase) + { + aNames.insert(pBase->GetName()); + pBase = pPool->Next(); + } + for(std::set<String>::const_iterator it = aNames.begin(); it != aNames.end(); ++it) + rBox.InsertEntry(*it); + } + else if (nId == m_nAlignId) + { + aSet.Put(SfxBoolItem(SID_SVXPARAALIGNTABPAGE_ENABLEJUSTIFYEXT,sal_True)); + rPage.PageCreated(aSet); + } + else if (nId == m_nTypeId) + { + ((SwFrmPage&)rPage).SetNewFrame( sal_True ); + ((SwFrmPage&)rPage).SetFormatUsed( sal_True ); + } + else if (nId == m_nOptionsId) + { + ((SwFrmAddPage&)rPage).SetFormatUsed(sal_True); + ((SwFrmAddPage&)rPage).SetNewFrame(sal_True); + } + else if (nId == m_nWrapId) + { + ((SwWrapTabPage&)rPage).SetFormatUsed( sal_True, sal_False ); + } + else if (nId == m_nColumnId) + { + if( nType == SFX_STYLE_FAMILY_FRAME ) + ((SwColumnPage&)rPage).SetFrmMode(sal_True); + ((SwColumnPage&)rPage).SetFormatUsed( sal_True ); + } + else if (nId == m_nBackgroundId) + { + sal_Int32 nFlagType = 0; + if( SFX_STYLE_FAMILY_PARA == nType ) + nFlagType |= SVX_SHOW_PARACTL; + if( SFX_STYLE_FAMILY_CHAR != nType ) + nFlagType |= SVX_SHOW_SELECTOR; + if( SFX_STYLE_FAMILY_FRAME == nType ) + nFlagType |= SVX_ENABLE_TRANSPARENCY; + aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, nFlagType)); + rPage.PageCreated(aSet); + } + else if (nId == m_nConditionId) + { + ((SwCondCollPage&)rPage).SetCollection( + ((SwDocStyleSheet&)GetStyleSheet()).GetCollection(), bNewStyle ); + } + else if (nId == m_nPageId) + { + if(0 == (nHtmlMode & HTMLMODE_ON )) + { + std::vector<OUString> aList; + OUString aNew; + SwStyleNameMapper::FillUIName( RES_POOLCOLL_TEXT, aNew ); + aList.push_back( aNew ); + if( pWrtShell ) { - std::vector<OUString> aList; - OUString aNew; - SwStyleNameMapper::FillUIName( RES_POOLCOLL_TEXT, aNew ); - aList.push_back( aNew ); - if( pWrtShell ) + SfxStyleSheetBasePool* pStyleSheetPool = pWrtShell-> + GetView().GetDocShell()->GetStyleSheetPool(); + pStyleSheetPool->SetSearchMask(SFX_STYLE_FAMILY_PARA); + SfxStyleSheetBase *pFirstStyle = pStyleSheetPool->First(); + while(pFirstStyle) { - SfxStyleSheetBasePool* pStyleSheetPool = pWrtShell-> - GetView().GetDocShell()->GetStyleSheetPool(); - pStyleSheetPool->SetSearchMask(SFX_STYLE_FAMILY_PARA); - SfxStyleSheetBase *pFirstStyle = pStyleSheetPool->First(); - while(pFirstStyle) - { - aList.push_back( pFirstStyle->GetName() ); - pFirstStyle = pStyleSheetPool->Next(); - } + aList.push_back( pFirstStyle->GetName() ); + pFirstStyle = pStyleSheetPool->Next(); } - aSet.Put (SfxStringListItem(SID_COLLECT_LIST, &aList)); - rPage.PageCreated(aSet); } - break; - - case TP_MACRO_ASSIGN: - { - SfxAllItemSet aNewSet(*aSet.GetPool()); - aNewSet.Put( SwMacroAssignDlg::AddEvents(MACASSGN_ALLFRM) ); - if ( pWrtShell ) - rPage.SetFrame( pWrtShell->GetView().GetViewFrame()->GetFrame().GetFrameInterface() ); - rPage.PageCreated(aNewSet); - break; + aSet.Put (SfxStringListItem(SID_COLLECT_LIST, &aList)); + rPage.PageCreated(aSet); } + } + else if (nId == m_nMacroId) + { + SfxAllItemSet aNewSet(*aSet.GetPool()); + aNewSet.Put( SwMacroAssignDlg::AddEvents(MACASSGN_ALLFRM) ); + if ( pWrtShell ) + rPage.SetFrame( pWrtShell->GetView().GetViewFrame()->GetFrame().GetFrameInterface() ); + rPage.PageCreated(aNewSet); + } + else if (nId == m_nNumId) + { + aSet.Put (SfxStringItem(SID_NUM_CHAR_FMT,sNumCharFmt)); + aSet.Put (SfxStringItem(SID_BULLET_CHAR_FMT,sBulletCharFmt)); + rPage.PageCreated(aSet); + } + else if (nId == m_nNumOptId) + { - case RID_SVXPAGE_PICK_NUM: - { - aSet.Put (SfxStringItem(SID_NUM_CHAR_FMT,sNumCharFmt)); - aSet.Put (SfxStringItem(SID_BULLET_CHAR_FMT,sBulletCharFmt)); - rPage.PageCreated(aSet); - } - break; - case RID_SVXPAGE_NUM_OPTIONS: - { - - aSet.Put (SfxStringItem(SID_NUM_CHAR_FMT,sNumCharFmt)); - aSet.Put (SfxStringItem(SID_BULLET_CHAR_FMT,sBulletCharFmt)); - // collect character styles - ListBox rCharFmtLB(this); - rCharFmtLB.Clear(); - rCharFmtLB.InsertEntry( ViewShell::GetShellRes()->aStrNone ); - SwDocShell* pDocShell = ::GetActiveWrtShell()->GetView().GetDocShell(); - ::FillCharStyleListBox(rCharFmtLB, pDocShell); - - std::vector<OUString> aList; - for(sal_uInt16 j = 0; j < rCharFmtLB.GetEntryCount(); j++) - aList.push_back( rCharFmtLB.GetEntry(j) ); + aSet.Put (SfxStringItem(SID_NUM_CHAR_FMT,sNumCharFmt)); + aSet.Put (SfxStringItem(SID_BULLET_CHAR_FMT,sBulletCharFmt)); + // collect character styles + ListBox rCharFmtLB(this); + rCharFmtLB.Clear(); + rCharFmtLB.InsertEntry( ViewShell::GetShellRes()->aStrNone ); + SwDocShell* pDocShell = ::GetActiveWrtShell()->GetView().GetDocShell(); + ::FillCharStyleListBox(rCharFmtLB, pDocShell); + + std::vector<OUString> aList; + for(sal_uInt16 j = 0; j < rCharFmtLB.GetEntryCount(); j++) + aList.push_back( rCharFmtLB.GetEntry(j) ); + + aSet.Put( SfxStringListItem( SID_CHAR_FMT_LIST_BOX,&aList ) ) ; + FieldUnit eMetric = ::GetDfltMetric(0 != PTR_CAST(SwWebDocShell, pDocShell)); + aSet.Put ( SfxAllEnumItem(SID_METRIC_ITEM, static_cast< sal_uInt16 >(eMetric))); + rPage.PageCreated(aSet); + } + else if (nId == m_nNumPosId) + { + SwDocShell* pDocShell = ::GetActiveWrtShell()->GetView().GetDocShell(); + FieldUnit eMetric = ::GetDfltMetric(0 != PTR_CAST(SwWebDocShell, pDocShell)); - aSet.Put( SfxStringListItem( SID_CHAR_FMT_LIST_BOX,&aList ) ) ; - FieldUnit eMetric = ::GetDfltMetric(0 != PTR_CAST(SwWebDocShell, pDocShell)); - aSet.Put ( SfxAllEnumItem(SID_METRIC_ITEM, static_cast< sal_uInt16 >(eMetric))); - rPage.PageCreated(aSet); + aSet.Put ( SfxAllEnumItem(SID_METRIC_ITEM, static_cast< sal_uInt16 >(eMetric))); + rPage.PageCreated(aSet); + } + else if (nId == m_nBulletId) + { + aSet.Put (SfxStringItem(SID_BULLET_CHAR_FMT,sBulletCharFmt)); + rPage.PageCreated(aSet); + } + else if (nId == m_nHeaderId) + { + if(0 == (nHtmlMode & HTMLMODE_ON )) + ((SvxHeaderPage&)rPage).EnableDynamicSpacing(); + } + else if (nId == m_nFooterId) + { + if(0 == (nHtmlMode & HTMLMODE_ON )) + ((SvxFooterPage&)rPage).EnableDynamicSpacing(); + } + else if (nId == m_nBorderId) + { + if( SFX_STYLE_FAMILY_PARA == nType ) + { + aSet.Put (SfxUInt16Item(SID_SWMODE_TYPE,SW_BORDER_MODE_PARA)); } - break; - case RID_SVXPAGE_NUM_POSITION: + else if( SFX_STYLE_FAMILY_FRAME == nType ) { - SwDocShell* pDocShell = ::GetActiveWrtShell()->GetView().GetDocShell(); - FieldUnit eMetric = ::GetDfltMetric(0 != PTR_CAST(SwWebDocShell, pDocShell)); - - aSet.Put ( SfxAllEnumItem(SID_METRIC_ITEM, static_cast< sal_uInt16 >(eMetric))); - rPage.PageCreated(aSet); + aSet.Put (SfxUInt16Item(SID_SWMODE_TYPE,SW_BORDER_MODE_FRAME)); } - break; - case RID_SVXPAGE_PICK_BULLET : - { - aSet.Put (SfxStringItem(SID_BULLET_CHAR_FMT,sBulletCharFmt)); - rPage.PageCreated(aSet); - } - break; - case TP_HEADER_PAGE: - if(0 == (nHtmlMode & HTMLMODE_ON )) - ((SvxHeaderPage&)rPage).EnableDynamicSpacing(); - break; - case TP_FOOTER_PAGE: - if(0 == (nHtmlMode & HTMLMODE_ON )) - ((SvxFooterPage&)rPage).EnableDynamicSpacing(); - break; - case TP_BORDER : - if( SFX_STYLE_FAMILY_PARA == nType ) - { - aSet.Put (SfxUInt16Item(SID_SWMODE_TYPE,SW_BORDER_MODE_PARA)); - } - else if( SFX_STYLE_FAMILY_FRAME == nType ) - { - aSet.Put (SfxUInt16Item(SID_SWMODE_TYPE,SW_BORDER_MODE_FRAME)); - } - rPage.PageCreated(aSet); - - break; + rPage.PageCreated(aSet); } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/fmtui/tmpdlg.src b/sw/source/ui/fmtui/tmpdlg.src deleted file mode 100644 index 0a6ae79e43c7..000000000000 --- a/sw/source/ui/fmtui/tmpdlg.src +++ /dev/null @@ -1,373 +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 <sfx2/sfx.hrc> -#include "fmtui.hrc" -#include "globals.hrc" -#include "svx/dialogs.hrc" -TabDialog DLG_TEMPLATE_1 -{ - OutputSize = TRUE ; - SVLook = TRUE ; - Text [ en-US ] = "Character Style" ; - Moveable = TRUE ; - TabControl 1 - { - OutputSize = TRUE ; - PageList = - { - PageItem - { - Identifier = TP_CHAR_STD ; - Text [ en-US ] = "Font" ; - PageResID = TP_CHAR_STD ; - }; - PageItem - { - Identifier = TP_CHAR_EXT ; - Text [ en-US ] = "Font Effects" ; - PageResID = TP_CHAR_EXT ; - }; - PageItem - { - Identifier = TP_CHAR_POS ; - PageResID = TP_CHAR_POS ; - Text [ en-US ] = "Position"; - }; - PageItem - { - Identifier = TP_CHAR_TWOLN ; - PageResID = TP_CHAR_TWOLN; - Text [ en-US ] = "Asian Layout"; - }; - PageItem - { - Identifier = TP_BACKGROUND ; - Text [ en-US ] = "Background" ; - PageResID = TP_BACKGROUND ; - }; - PageItem - { - Identifier = TP_BORDER ; - Text [ en-US ] = "Borders" ; - PageResID = TP_BORDER ; - }; - }; - }; -}; -TabDialog DLG_TEMPLATE_2 -{ - OutputSize = TRUE ; - SVLook = TRUE ; - Text [ en-US ] = "Paragraph Style" ; - Moveable = TRUE ; - TabControl 1 - { - OutputSize = TRUE ; - PageList = - { - PageItem - { - Identifier = TP_PARA_STD ; - Text [ en-US ] = "Indents & Spacing" ; - PageResID = TP_PARA_STD ; - }; - PageItem - { - Identifier = TP_PARA_ALIGN ; - PageResID = TP_PARA_ALIGN ; - Text [ en-US ] = "Alignment" ; - }; - PageItem - { - Identifier = TP_PARA_EXT ; - Text [ en-US ] = "Text Flow" ; - PageResID = TP_PARA_EXT ; - }; - PageItem - { - Identifier = TP_PARA_ASIAN; - Text [ en-US ] = "Asian Typography"; - }; - PageItem - { - Identifier = TP_CHAR_STD ; - Text [ en-US ] = "Font" ; - PageResID = TP_CHAR_STD ; - }; - PageItem - { - Identifier = TP_CHAR_EXT ; - Text [ en-US ] = "Font Effects" ; - PageResID = TP_CHAR_EXT ; - }; - PageItem - { - Identifier = TP_CHAR_POS ; - PageResID = TP_CHAR_POS ; - Text [ en-US ] = "Position"; - }; - PageItem - { - Identifier = TP_CHAR_TWOLN ; - PageResID = TP_CHAR_TWOLN; - Text [ en-US ] = "Asian Layout"; - }; - PageItem - { - Identifier = TP_NUMPARA ; - Text [ en-US ] = "Outline & Numbering" ; - }; - PageItem - { - Identifier = TP_TABULATOR ; - Text [ en-US ] = "Tabs" ; - PageResID = TP_TABULATOR ; - }; - PageItem - { - Identifier = TP_DROPCAPS ; - Text [ en-US ] = "Drop Caps" ; - PageResID = TP_DROPCAPS ; - }; - PageItem - { - Identifier = TP_BACKGROUND ; - Text [ en-US ] = "Background" ; - PageResID = TP_BACKGROUND ; - }; - PageItem - { - Identifier = TP_BORDER ; - Text [ en-US ] = "Borders" ; - PageResID = TP_BORDER ; - }; - PageItem - { - Identifier = TP_CONDCOLL ; - PageResID = TP_CONDCOLL ; - Text [ en-US ] = "Condition" ; - }; - }; - }; -}; -TabDialog DLG_TEMPLATE_4 -{ - OutputSize = TRUE ; - SVLook = TRUE ; - // Text[norwegian_wrong] = "Sidetyper"; - // Text[italian_wrong] = "Stili pagina"; - // Text[portuguese_brazilian_wrong] = "Estilos da Página "; - // Text[portuguese_wrong] = "Estilos da Página "; - // Text[finnish_wrong] = "Sivutyylit"; - // Text[danish_wrong] = "Sidelayout"; - // Text[french_wrong] = "Styles de page"; - // Text[swedish_wrong] = "Sidformat"; - // Text[dutch_wrong] = "Pagina-opmaakprofielen"; - // Text[spanish_wrong] = "Estilos de página"; - Text [ en-US ] = "Page Style" ; - Moveable = TRUE ; - TabControl 1 - { - OutputSize = TRUE ; - PageList = - { - /* PageItem - { - Identifier = TP_PAGE_STD ; - Text [ en-US ] = "Page" ; - PageResID = TP_PAGE_STD ; - };*/ - PageItem - { - Identifier = TP_BACKGROUND ; - Text [ en-US ] = "Background" ; - PageResID = TP_BACKGROUND ; - }; - /* PageItem - { - Identifier = TP_BORDER ; - Text [ en-US ] = "Borders" ; - PageResID = TP_BORDER ; - }; - PageItem - { - Identifier = TP_HEADER_PAGE ; - Text [ en-US ] = "Header" ; - PageResID = TP_HEADER_PAGE ; - }; - PageItem - { - Identifier = TP_FOOTER_PAGE ; - Text [ en-US ] = "Footer" ; - PageResID = TP_FOOTER_PAGE ; - }; - PageItem - { - Identifier = TP_COLUMN ; - Text [ en-US ] = "Columns" ; - PageResID = TP_COLUMN ; - }; - PageItem - { - Identifier = TP_FOOTNOTE_PAGE ; - Text [ en-US ] = "Footnote" ; - PageResID = TP_FOOTNOTE_PAGE ; - };*/ - }; - }; -}; -String STR_PAGE_STD -{ - Text [ en-US ] = "Page" ; -}; -String STR_PAGE_BORDER -{ - Text [ en-US ] = "Borders" ; -}; -String STR_PAGE_HEADER -{ - Text [ en-US ] = "Header" ; -}; -String STR_PAGE_FOOTER -{ - Text [ en-US ] = "Footer" ; -}; -String STR_PAGE_TEXTGRID -{ - Text [ en-US ] = "Text Grid"; -}; -String STR_PAGE_COLUMN -{ - Text [ en-US ] = "Columns" ; -}; -String STR_PAGE_FOOTNOTE -{ - Text [ en-US ] = "Footnote" ; -}; -TabDialog DLG_TEMPLATE_3 -{ - OutputSize = TRUE ; - SVLook = TRUE ; - // Text[norwegian_wrong] = "Rammemaler"; - // Text[italian_wrong] = "Stili cornice"; - // Text[portuguese_brazilian_wrong] = "Estilos de Moldura"; - // Text[portuguese_wrong] = "Estilos de Moldura"; - // Text[finnish_wrong] = "Kehystyylit"; - // Text[danish_wrong] = "Rammelayout"; - // Text[french_wrong] = "Styles d'encadrement"; - // Text[swedish_wrong] = "Ramformat"; - // Text[dutch_wrong] = "Kaderopmaakprofielen"; - // Text[spanish_wrong] = "Estilos de marco"; - Text [ en-US ] = "Frame Style" ; - Moveable = TRUE ; - TabControl 1 - { - OutputSize = TRUE ; - PageList = - { - PageItem - { - Identifier = TP_FRM_STD ; - Text [ en-US ] = "Type" ; - PageResID = TP_FRM_STD ; - }; - PageItem - { - Identifier = TP_FRM_ADD ; - PageResID = TP_FRM_ADD ; - Text [ en-US ] = "Options" ; - }; - PageItem - { - Identifier = TP_FRM_WRAP ; - Text [ en-US ] = "Wrap" ; - PageResID = TP_FRM_WRAP ; - }; - PageItem - { - Identifier = TP_BACKGROUND ; - Text [ en-US ] = "Background" ; - PageResID = TP_BACKGROUND ; - }; - PageItem - { - Identifier = TP_BORDER ; - Text [ en-US ] = "Borders" ; - PageResID = TP_BORDER ; - }; - PageItem - { - Identifier = TP_COLUMN ; - Text [ en-US ] = "Columns" ; - PageResID = TP_COLUMN ; - }; - PageItem - { - Identifier = TP_MACRO_ASSIGN ; - Text [ en-US ] = "Macro" ; - }; - }; - }; -}; -TabDialog DLG_TEMPLATE_5 -{ - OutputSize = TRUE ; - SVLook = TRUE ; - Moveable = TRUE ; - TabControl 1 - { - PageList = - { - PageItem - { - Identifier = RID_SVXPAGE_PICK_BULLET ; - Text [ en-US ] = "Bullets" ; - }; - PageItem - { - Identifier = RID_SVXPAGE_PICK_SINGLE_NUM; - Text [ en-US ] = "Numbering Style" ; - }; - PageItem - { - Identifier = RID_SVXPAGE_PICK_NUM ; - Text [ en-US ] = "Outline" ; - }; - PageItem - { - Identifier = RID_SVXPAGE_PICK_BMP; - Text [ en-US ] = "Graphics" ; - }; - PageItem - { - Identifier = RID_SVXPAGE_NUM_POSITION ; - Text [ en-US ] = "Position" ; - }; - PageItem - { - Identifier = RID_SVXPAGE_NUM_OPTIONS; - Text [ en-US ] = "Options" ; - }; - }; - }; - Text [ en-US ] = "Numbering Style" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/swuipardlg.hxx b/sw/source/ui/inc/swuipardlg.hxx index 75ad5616a57a..e76c63117849 100644 --- a/sw/source/ui/inc/swuipardlg.hxx +++ b/sw/source/ui/inc/swuipardlg.hxx @@ -44,7 +44,7 @@ public: sal_uInt8 nDialogMode, const String *pCollName = 0, sal_Bool bDraw = sal_False, - sal_uInt16 nDefPage = 0); + OString sDefPage = OString()); ~SwParaDlg(); }; diff --git a/sw/source/ui/inc/tmpdlg.hxx b/sw/source/ui/inc/tmpdlg.hxx index d66b208251f3..25ac34d01b34 100644 --- a/sw/source/ui/inc/tmpdlg.hxx +++ b/sw/source/ui/inc/tmpdlg.hxx @@ -37,18 +37,47 @@ class SwTemplateDlg: public SfxStyleDialog DECL_LINK( NumOptionsHdl, PushButton* ); + sal_uInt16 m_nIndentsId; + sal_uInt16 m_nAlignId; + sal_uInt16 m_nTextFlowId; + sal_uInt16 m_nAsianTypo; + sal_uInt16 m_nFontId; + sal_uInt16 m_nFontEffectId; + sal_uInt16 m_nPositionId; + sal_uInt16 m_nAsianLayoutId; + sal_uInt16 m_nTabId; + sal_uInt16 m_nOutlineId; + sal_uInt16 m_nDropCapsId; + sal_uInt16 m_nBackgroundId; + sal_uInt16 m_nBorderId; + sal_uInt16 m_nConditionId; + sal_uInt16 m_nTypeId; + sal_uInt16 m_nOptionsId; + sal_uInt16 m_nWrapId; + sal_uInt16 m_nColumnId; + sal_uInt16 m_nMacroId; + sal_uInt16 m_nHeaderId; + sal_uInt16 m_nFooterId; + sal_uInt16 m_nPageId; + sal_uInt16 m_nFootNoteId; + sal_uInt16 m_nTextGridId; + sal_uInt16 m_nSingleId; + sal_uInt16 m_nBulletId; + sal_uInt16 m_nNumId; + sal_uInt16 m_nBmpId; + sal_uInt16 m_nNumOptId; + sal_uInt16 m_nNumPosId; + public: - // @param nSlot - // Identifies optional Slot by which the creation of the Template (Style) dialog is triggered. - // Currently used, if nRegion == SFX_STYLE_FAMILY_PAGE in order to activate certain dialog pane + // @param sPage + // Identifies name of page to open at by default SwTemplateDlg( Window* pParent, SfxStyleSheetBase& rBase, sal_uInt16 nRegion, - const sal_uInt16 nSlot = 0, + OString sPage = OString(), SwWrtShell* pActShell = 0, - sal_Bool bNew = sal_False ); + bool bNew = false ); - ~SwTemplateDlg(); const SfxItemSet* GetRefreshedSet(); virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx index f76e11bf9812..d42d48d6dce7 100644 --- a/sw/source/ui/misc/titlepage.cxx +++ b/sw/source/ui/misc/titlepage.cxx @@ -252,7 +252,7 @@ SwTitlePageDlg::~SwTitlePageDlg() IMPL_LINK_NOARG(SwTitlePageDlg, EditHdl) { SwView& rView = mpSh->GetView(); - rView.GetDocShell()->FormatPage(m_pPagePropertiesLB->GetSelectEntry(), false, *mpSh); + rView.GetDocShell()->FormatPage(m_pPagePropertiesLB->GetSelectEntry(), "page", *mpSh); rView.InvalidateRulerPos(); return 0; diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx index 3c8ceeb2aed1..13da065de283 100644 --- a/sw/source/ui/shells/annotsh.cxx +++ b/sw/source/ui/shells/annotsh.cxx @@ -483,7 +483,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq ) OSL_ENSURE(pDlg, "Dialogdiet fail!"); if (nSlot == SID_CHAR_DLG_EFFECT) { - pDlg->SetCurPageId(TP_CHAR_EXT); + pDlg->SetCurPageId("fonteffect"); } sal_uInt16 nRet = pDlg->Execute(); if(RET_OK == nRet ) diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx index b97027529ebe..87c393c4a667 100644 --- a/sw/source/ui/shells/basesh.cxx +++ b/sw/source/ui/shells/basesh.cxx @@ -2343,10 +2343,20 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq) // Temporary view, because the shell does not need to be valid after the dialogue // for example disable header SwView& rTempView = GetView(); + + OString sPageId; + switch (nSlot) + { + case FN_FORMAT_PAGE_COLUMN_DLG: + sPageId = "columns"; + break; + case FN_FORMAT_PAGE_SETTING_DLG: + sPageId = "page"; + break; + } + rTempView.GetDocShell()->FormatPage( - rPageDesc.GetName(), - nSlot, - rSh ); + rPageDesc.GetName(), sPageId, rSh); rTempView.InvalidateRulerPos(); } } diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx index 63684dc1bde3..24bdeb8d2d09 100644 --- a/sw/source/ui/shells/drwtxtex.cxx +++ b/sw/source/ui/shells/drwtxtex.cxx @@ -326,7 +326,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) OSL_ENSURE(pDlg, "Dialogdiet fail!"); if (nSlot == SID_CHAR_DLG_EFFECT) { - pDlg->SetCurPageId(TP_CHAR_EXT); + pDlg->SetCurPageId("fonteffect"); } sal_uInt16 nRet = pDlg->Execute(); if(RET_OK == nRet ) diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx index 80fe613a33be..4d0263198e11 100644 --- a/sw/source/ui/shells/textsh1.cxx +++ b/sw/source/ui/shells/textsh1.cxx @@ -209,7 +209,7 @@ void sw_CharDialog( SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot,const } if (nSlot == SID_CHAR_DLG_EFFECT) { - pDlg->SetCurPageId(TP_CHAR_EXT); + pDlg->SetCurPageId("fonteffect"); } const SfxItemSet* pSet = NULL; @@ -966,9 +966,9 @@ void SwTextShell::Execute(SfxRequest &rReq) // Current page format ::SwToSfxPageDescAttr( aCoreSet ); - sal_uInt16 nDefPage = 0; - if( pItem ) - nDefPage = ((SfxUInt16Item *)pItem)->GetValue(); + OString sDefPage; + if (pItem) + sDefPage = OUStringToOString(((const SfxStringItem*)pItem)->GetValue(), RTL_TEXTENCODING_UTF8); // Properties of numbering if( rWrtSh.GetDoc()->GetCurrNumRule( *pPaM->GetPoint() ) ) @@ -986,7 +986,7 @@ void SwTextShell::Execute(SfxRequest &rReq) SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); - pDlg = pFact->CreateSwParaDlg( GetView().GetWindow(),GetView(), aCoreSet, DLG_STD, NULL, sal_False, nDefPage ); + pDlg = pFact->CreateSwParaDlg( GetView().GetWindow(),GetView(), aCoreSet, DLG_STD, NULL, sal_False, sDefPage ); OSL_ENSURE(pDlg, "Dialogdiet fail!"); } SfxItemSet* pSet = NULL; diff --git a/sw/source/ui/uiview/viewmdi.cxx b/sw/source/ui/uiview/viewmdi.cxx index aa6d41ce48f9..881eabf84c38 100644 --- a/sw/source/ui/uiview/viewmdi.cxx +++ b/sw/source/ui/uiview/viewmdi.cxx @@ -26,6 +26,7 @@ #include <svx/ruler.hxx> #include <editeng/lrspitem.hxx> #include <svl/srchitem.hxx> +#include <svl/stritem.hxx> #include <sfx2/request.hxx> #include <swmodule.hxx> #include <view.hxx> @@ -573,7 +574,7 @@ int SwView::KillVRuler() IMPL_LINK( SwView, ExecRulerClick, Ruler *, pRuler ) { - sal_uInt16 nDefPage = 0; + OUString sDefPage; switch( pRuler->GetClickType() ) { case RULER_TYPE_DONTKNOW: @@ -581,14 +582,14 @@ IMPL_LINK( SwView, ExecRulerClick, Ruler *, pRuler ) case RULER_TYPE_INDENT: case RULER_TYPE_MARGIN1: case RULER_TYPE_MARGIN2: - nDefPage = TP_PARA_STD; + sDefPage = "indents"; break; default: - nDefPage = TP_TABULATOR; + sDefPage = "tabs"; } - SfxUInt16Item aDefPage(SID_PARA_DLG, nDefPage); + SfxStringItem aDefPage(SID_PARA_DLG, sDefPage); GetViewFrame()->GetDispatcher()->Execute( SID_PARA_DLG, SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD, &aDefPage, 0L ); diff --git a/sw/uiconfig/swriter/ui/templatedialog1.ui b/sw/uiconfig/swriter/ui/templatedialog1.ui new file mode 100644 index 000000000000..2a6b579b9c9f --- /dev/null +++ b/sw/uiconfig/swriter/ui/templatedialog1.ui @@ -0,0 +1,235 @@ +<?xml version="1.0" encoding="UTF-8"?> +<interface> + <!-- interface-requires gtk+ 3.0 --> + <object class="GtkDialog" id="TemplateDialog1"> + <property name="can_focus">False</property> + <property name="border_width">6</property> + <property name="title" translatable="yes">Character Style</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="apply"> + <property name="label">gtk-apply</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">1</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">2</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> + <child> + <object class="GtkButton" id="standard"> + <property name="label">_Standard</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</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="organizer"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Organizer</property> + </object> + <packing> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="font"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Font</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="fonteffect"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Font Effect</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="position"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Position</property> + </object> + <packing> + <property name="position">3</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="asianlayout"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Asian Layout</property> + </object> + <packing> + <property name="position">4</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="background"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Background</property> + </object> + <packing> + <property name="position">5</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="borders"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Borders</property> + </object> + <packing> + <property name="position">6</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">apply</action-widget> + <action-widget response="0">cancel</action-widget> + <action-widget response="0">help</action-widget> + <action-widget response="0">reset</action-widget> + <action-widget response="0">standard</action-widget> + </action-widgets> + </object> +</interface> diff --git a/sw/uiconfig/swriter/ui/templatedialog16.ui b/sw/uiconfig/swriter/ui/templatedialog16.ui new file mode 100644 index 000000000000..0c6739ba74ac --- /dev/null +++ b/sw/uiconfig/swriter/ui/templatedialog16.ui @@ -0,0 +1,220 @@ +<?xml version="1.0" encoding="UTF-8"?> +<interface> + <!-- interface-requires gtk+ 3.0 --> + <object class="GtkDialog" id="TemplateDialog16"> + <property name="can_focus">False</property> + <property name="border_width">6</property> + <property name="title" translatable="yes">Numbering Style</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="apply"> + <property name="label">gtk-apply</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">1</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">2</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="organizer"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Organizer</property> + </object> + <packing> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="bullets"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Bullets</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="numbering"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Numbering Style</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="outline"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Outline</property> + </object> + <packing> + <property name="position">3</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="graphics"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Graphics</property> + </object> + <packing> + <property name="position">4</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="position"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Position</property> + </object> + <packing> + <property name="position">5</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="options"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Options</property> + </object> + <packing> + <property name="position">6</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">apply</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/sw/uiconfig/swriter/ui/templatedialog2.ui b/sw/uiconfig/swriter/ui/templatedialog2.ui new file mode 100644 index 000000000000..8b736299ee51 --- /dev/null +++ b/sw/uiconfig/swriter/ui/templatedialog2.ui @@ -0,0 +1,347 @@ +<?xml version="1.0" encoding="UTF-8"?> +<interface> + <!-- interface-requires gtk+ 3.0 --> + <object class="GtkDialog" id="TemplateDialog2"> + <property name="can_focus">False</property> + <property name="border_width">6</property> + <property name="title" translatable="yes">Paragraph Style</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="apply"> + <property name="label">gtk-apply</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">1</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">2</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> + <child> + <object class="GtkButton" id="standard"> + <property name="label">_Standard</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</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="organizer"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Organizer</property> + </object> + <packing> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="indents"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Indents & Spacing</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="alignment"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Alignment</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="textflow"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Text Flow</property> + </object> + <packing> + <property name="position">3</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="asiantypo"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Asian Typography</property> + </object> + <packing> + <property name="position">4</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="font"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Font</property> + </object> + <packing> + <property name="position">5</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="fonteffect"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Font Effect</property> + </object> + <packing> + <property name="position">6</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="position"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Position</property> + </object> + <packing> + <property name="position">7</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="asianlayout"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Asian Layout</property> + </object> + <packing> + <property name="position">8</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="outline"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Outline & Numbering</property> + </object> + <packing> + <property name="position">9</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="tabs"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Tabs</property> + </object> + <packing> + <property name="position">10</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="dropcaps"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Drop Caps</property> + </object> + <packing> + <property name="position">11</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="background"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Background</property> + </object> + <packing> + <property name="position">12</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="borders"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Borders</property> + </object> + <packing> + <property name="position">13</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="condition"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Condition</property> + </object> + <packing> + <property name="position">14</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">apply</action-widget> + <action-widget response="0">cancel</action-widget> + <action-widget response="0">help</action-widget> + <action-widget response="0">reset</action-widget> + <action-widget response="0">standard</action-widget> + </action-widgets> + </object> +</interface> diff --git a/sw/uiconfig/swriter/ui/templatedialog4.ui b/sw/uiconfig/swriter/ui/templatedialog4.ui new file mode 100644 index 000000000000..0ea7cbea7ebe --- /dev/null +++ b/sw/uiconfig/swriter/ui/templatedialog4.ui @@ -0,0 +1,249 @@ +<?xml version="1.0" encoding="UTF-8"?> +<interface> + <!-- interface-requires gtk+ 3.0 --> + <object class="GtkDialog" id="TemplateDialog4"> + <property name="can_focus">False</property> + <property name="border_width">6</property> + <property name="title" translatable="yes">Frame Style</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="apply"> + <property name="label">gtk-apply</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">1</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">2</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> + <child> + <object class="GtkButton" id="standard"> + <property name="label">_Standard</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</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="organizer"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Organizer</property> + </object> + <packing> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="type"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Type</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="options"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Options</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="wrap"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Wrap</property> + </object> + <packing> + <property name="position">3</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="background"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Background</property> + </object> + <packing> + <property name="position">4</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="borders"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Borders</property> + </object> + <packing> + <property name="position">5</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="columns"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Columns</property> + </object> + <packing> + <property name="position">6</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="macros"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Macro</property> + </object> + <packing> + <property name="position">7</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">apply</action-widget> + <action-widget response="0">cancel</action-widget> + <action-widget response="0">help</action-widget> + <action-widget response="0">reset</action-widget> + <action-widget response="0">standard</action-widget> + </action-widgets> + </object> +</interface> diff --git a/sw/uiconfig/swriter/ui/templatedialog8.ui b/sw/uiconfig/swriter/ui/templatedialog8.ui new file mode 100644 index 000000000000..9ae594200448 --- /dev/null +++ b/sw/uiconfig/swriter/ui/templatedialog8.ui @@ -0,0 +1,248 @@ +<?xml version="1.0" encoding="UTF-8"?> +<interface> + <!-- interface-requires gtk+ 3.0 --> + <object class="GtkDialog" id="TemplateDialog8"> + <property name="can_focus">False</property> + <property name="border_width">6</property> + <property name="title" translatable="yes">Page Style</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="apply"> + <property name="label">gtk-apply</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">1</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">2</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="organizer"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Organizer</property> + </object> + <packing> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="page"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Page</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="background"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Background</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="header"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Header</property> + </object> + <packing> + <property name="position">3</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">4</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="borders"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Borders</property> + </object> + <packing> + <property name="position">5</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="columns"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Columns</property> + </object> + <packing> + <property name="position">6</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="footnotes"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Footnote</property> + </object> + <packing> + <property name="position">7</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="textgrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Text Grid</property> + </object> + <packing> + <property name="position">8</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">apply</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> |