[Libreoffice-commits] .: 11 commits - cui/AllLangResTarget_cui.mk cui/source cui/uiconfig cui/UI_cui.mk cui/util dbaccess/source editeng/source framework/source sc/qa sfx2/inc sfx2/source svtools/source svx/inc svx/source sw/AllLangResTarget_sw.mk sw/source sw/uiconfig toolkit/source unusedcode.easy vcl/inc vcl/source vcl/unx writerfilter/inc writerfilter/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Jan 7 08:18:35 PST 2013
cui/AllLangResTarget_cui.mk | 1
cui/UI_cui.mk | 8
cui/source/dialogs/SpellDialog.cxx | 10
cui/source/dialogs/cuires.src | 5
cui/source/inc/SpellDialog.hxx | 1
cui/source/inc/cuires.hrc | 6
cui/source/inc/helpid.hrc | 8
cui/source/inc/numpages.hxx | 192 +--
cui/source/tabpages/numfmt.cxx | 4
cui/source/tabpages/numpages.cxx | 1133 +++++++++----------
cui/source/tabpages/numpages.hrc | 76 -
cui/source/tabpages/numpages.src | 794 -------------
cui/source/tabpages/tpline.cxx | 2
cui/uiconfig/ui/numberformatpage.ui | 590 ---------
cui/uiconfig/ui/numberingformatpage.ui | 590 +++++++++
cui/uiconfig/ui/numberingoptionspage.ui | 785 +++++++++++++
cui/uiconfig/ui/numberingpositionpage.ui | 447 +++++++
cui/uiconfig/ui/pickbulletpage.ui | 40
cui/uiconfig/ui/pickgraphicpage.ui | 85 +
cui/uiconfig/ui/picknumberingpage.ui | 40
cui/uiconfig/ui/pickoutlinepage.ui | 40
cui/uiconfig/ui/positionpage.ui | 2
cui/util/hidother.src | 3
dbaccess/source/ui/browser/sbagrid.cxx | 18
dbaccess/source/ui/control/dbtreelistbox.cxx | 2
editeng/source/editeng/editview.cxx | 6
framework/source/fwe/classes/addonmenu.cxx | 10
framework/source/uielement/controlmenucontroller.cxx | 2
framework/source/uielement/headermenucontroller.cxx | 2
framework/source/uielement/menubarmanager.cxx | 2
framework/source/uielement/menubarmerger.cxx | 14
sc/qa/unoapi/sc.sce | 2
sfx2/inc/sfx2/tabdlg.hxx | 20
sfx2/source/dialog/tabdlg.cxx | 71 -
sfx2/source/view/viewsh.cxx | 3
svtools/source/control/stdmenu.cxx | 2
svx/inc/svx/numvset.hxx | 42
svx/source/dialog/svxbmpnumvalueset.cxx | 20
svx/source/fmcomp/fmgridcl.cxx | 3
svx/source/form/fmshimp.cxx | 3
svx/source/mnuctrls/SmartTagCtl.cxx | 10
sw/AllLangResTarget_sw.mk | 1
sw/source/ui/inc/num.hxx | 6
sw/source/ui/lingu/olmenu.cxx | 22
sw/source/ui/misc/num.cxx | 121 --
sw/source/ui/misc/num.hrc | 19
sw/source/ui/misc/num.src | 80 -
sw/source/ui/smartmenu/stmenu.cxx | 8
sw/uiconfig/swriter/ui/bulletsandnumbering.ui | 1098 ------------------
sw/uiconfig/swriter/ui/outlinenumberingpage.ui | 436 +++----
sw/uiconfig/swriter/ui/outlinepositionpage.ui | 611 +++++-----
toolkit/source/awt/vclxmenu.cxx | 4
unusedcode.easy | 4
vcl/inc/vcl/menu.hxx | 9
vcl/source/window/builder.cxx | 8
vcl/source/window/menu.cxx | 74 -
vcl/unx/gtk/fpicker/SalGtkPicker.cxx | 5
vcl/unx/gtk/fpicker/SalGtkPicker.hxx | 1
writerfilter/inc/doctok/WW8Document.hxx | 4
writerfilter/source/doctok/analyzer.xsl | 27
writerfilter/source/doctok/qnametostr.xsl | 2
writerfilter/source/doctok/resourcetools.xsl | 105 -
writerfilter/source/ooxml/qnametostr.xsl | 34
63 files changed, 3521 insertions(+), 4252 deletions(-)
New commits:
commit ca100d7bacf63b595723698af58f165eb8e79887
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 7 13:50:57 2013 +0000
adapt code to bullets and numbering dialog .ui
Change-Id: I219f851d570dcfb54a6162d2a881dff70ae10e79
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index a57daca..f554549 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -141,7 +141,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/misc/docfnote.src \
sw/source/ui/misc/glosbib.src \
sw/source/ui/misc/glossary.src \
- sw/source/ui/misc/num.src \
sw/source/ui/misc/numberingtypelistbox.src \
sw/source/ui/misc/outline.src \
sw/source/ui/misc/pgfnote.src \
diff --git a/sw/source/ui/inc/num.hxx b/sw/source/ui/inc/num.hxx
index 379cc23..2af7c5f 100644
--- a/sw/source/ui/inc/num.hxx
+++ b/sw/source/ui/inc/num.hxx
@@ -147,8 +147,10 @@ public:
class SwSvxNumBulletTabDialog : public SfxTabDialog
{
SwWrtShell& rWrtSh;
-
- String sRemoveText;
+ sal_uInt16 m_nSingleNumPageId;
+ sal_uInt16 m_nBulletPageId;
+ sal_uInt16 m_nOptionsPageId;
+ sal_uInt16 m_nPositionPageId;
protected:
virtual short Ok();
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index bd74e07..c3bbaa6 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -45,7 +45,6 @@
#include <misc.hrc>
#include <frmui.hrc>
-#include <num.hrc>
#include <globals.hrc>
#include <helpid.h>
#include <SwStyleNameMapper.hxx>
@@ -916,24 +915,20 @@ void SwNumPositionTabPage::SetModified(sal_Bool bRepaint)
#endif
SwSvxNumBulletTabDialog::SwSvxNumBulletTabDialog(Window* pParent,
- const SfxItemSet* pSwItemSet, SwWrtShell & rSh) :
- SfxTabDialog(pParent, SW_RES(DLG_SVXTEST_NUM_BULLET), pSwItemSet, sal_False, &aEmptyStr),
- rWrtSh(rSh),
- sRemoveText(SW_RES(ST_RESET))
+ const SfxItemSet* pSwItemSet, SwWrtShell & rSh)
+ : SfxTabDialog(pParent, "BulletsAndNumberingDialog",
+ "modules/swriter/ui/bulletsandnumbering.ui",
+ pSwItemSet, sal_False)
+ , rWrtSh(rSh)
{
- FreeResource();
- GetUserButton()->SetText(sRemoveText);
- GetUserButton()->SetHelpId(HID_NUM_RESET);
GetUserButton()->SetClickHdl(LINK(this, SwSvxNumBulletTabDialog, RemoveNumberingHdl));
- if(!rWrtSh.GetCurNumRule())
- GetUserButton()->Enable(sal_False);
- 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 );
-
+ GetUserButton()->Enable(rWrtSh.GetCurNumRule() != NULL);
+ m_nSingleNumPageId = AddTabPage("singlenum", RID_SVXPAGE_PICK_SINGLE_NUM );
+ m_nBulletPageId = AddTabPage("bullets", RID_SVXPAGE_PICK_BULLET );
+ AddTabPage("outlinenum", RID_SVXPAGE_PICK_NUM );
+ AddTabPage("graphics", RID_SVXPAGE_PICK_BMP );
+ m_nOptionsPageId = AddTabPage("options", RID_SVXPAGE_NUM_OPTIONS );
+ m_nPositionPageId = AddTabPage("position", RID_SVXPAGE_NUM_POSITION );
}
SwSvxNumBulletTabDialog::~SwSvxNumBulletTabDialog()
@@ -947,56 +942,48 @@ void SwSvxNumBulletTabDialog::PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage)
SwStyleNameMapper::FillUIName( RES_POOLCHR_NUM_LEVEL, sNumCharFmt );
SwStyleNameMapper::FillUIName( RES_POOLCHR_BUL_LEVEL, sBulletCharFmt );
- switch ( nPageId )
+ if (nPageId == m_nSingleNumPageId)
{
- case RID_SVXPAGE_PICK_NUM:
- {
- SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
- aSet.Put (SfxStringItem(SID_NUM_CHAR_FMT,sNumCharFmt));
- aSet.Put (SfxStringItem(SID_BULLET_CHAR_FMT,sBulletCharFmt));
- rPage.PageCreated(aSet);
- }
- break;
- case RID_SVXPAGE_PICK_BULLET :
- {
- SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
- aSet.Put (SfxStringItem(SID_BULLET_CHAR_FMT,sBulletCharFmt));
- rPage.PageCreated(aSet);
- }
- break;
+ SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
+ aSet.Put (SfxStringItem(SID_NUM_CHAR_FMT,sNumCharFmt));
+ aSet.Put (SfxStringItem(SID_BULLET_CHAR_FMT,sBulletCharFmt));
+ rPage.PageCreated(aSet);
+ }
+ else if (nPageId == m_nBulletPageId)
+ {
+ SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
+ aSet.Put (SfxStringItem(SID_BULLET_CHAR_FMT,sBulletCharFmt));
+ rPage.PageCreated(aSet);
+ }
+ else if (nPageId == m_nOptionsPageId)
+ {
+ SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
+ aSet.Put (SfxStringItem(SID_NUM_CHAR_FMT,sNumCharFmt));
+ aSet.Put (SfxStringItem(SID_BULLET_CHAR_FMT,sBulletCharFmt));
+ // collect char styles
+ ListBox rCharFmtLB(this);
+ rCharFmtLB.Clear();
+ rCharFmtLB.InsertEntry( ViewShell::GetShellRes()->aStrNone );
+ SwDocShell* pDocShell = rWrtSh.GetView().GetDocShell();
+ ::FillCharStyleListBox(rCharFmtLB, pDocShell);
- case RID_SVXPAGE_NUM_OPTIONS:
- {
- SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
- aSet.Put (SfxStringItem(SID_NUM_CHAR_FMT,sNumCharFmt));
- aSet.Put (SfxStringItem(SID_BULLET_CHAR_FMT,sBulletCharFmt));
- // collect char styles
- ListBox rCharFmtLB(this);
- rCharFmtLB.Clear();
- rCharFmtLB.InsertEntry( ViewShell::GetShellRes()->aStrNone );
- SwDocShell* pDocShell = rWrtSh.GetView().GetDocShell();
- ::FillCharStyleListBox(rCharFmtLB, pDocShell);
-
- std::vector<String> aList;
- for(sal_uInt16 j = 0; j < rCharFmtLB.GetEntryCount(); j++)
- aList.push_back( String(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);
- }
- break;
- case RID_SVXPAGE_NUM_POSITION:
- {
- SwDocShell* pDocShell = rWrtSh.GetView().GetDocShell();
- FieldUnit eMetric = ::GetDfltMetric(0 != PTR_CAST(SwWebDocShell, pDocShell));
- SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
- aSet.Put ( SfxAllEnumItem(SID_METRIC_ITEM, static_cast< sal_uInt16 >(eMetric)) );
- rPage.PageCreated(aSet);
- }
- break;
+ std::vector<String> aList;
+ for(sal_uInt16 j = 0; j < rCharFmtLB.GetEntryCount(); j++)
+ aList.push_back( String(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 (nPageId == m_nPositionPageId)
+ {
+ SwDocShell* pDocShell = rWrtSh.GetView().GetDocShell();
+ FieldUnit eMetric = ::GetDfltMetric(0 != PTR_CAST(SwWebDocShell, pDocShell));
+ SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
+ aSet.Put ( SfxAllEnumItem(SID_METRIC_ITEM, static_cast< sal_uInt16 >(eMetric)) );
+ rPage.PageCreated(aSet);
}
}
diff --git a/sw/source/ui/misc/num.hrc b/sw/source/ui/misc/num.hrc
deleted file mode 100644
index c2c9c4a..0000000
--- a/sw/source/ui/misc/num.hrc
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#define ST_RESET 1
diff --git a/sw/source/ui/misc/num.src b/sw/source/ui/misc/num.src
deleted file mode 100644
index f6efa09..0000000
--- a/sw/source/ui/misc/num.src
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-/* StarView resource file */
-
-
-#include "globals.hrc"
-#include "misc.hrc"
-#include "num.hrc"
-#include "cmdid.h"
-#include "helpid.h"
-#include "svx/dialogs.hrc"
-
-/**************************************************************************/
-/* */
-/* dialog for Svx-implementation's test */
-/* */
-/**************************************************************************/
-TabDialog DLG_SVXTEST_NUM_BULLET
-{
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Text [ en-US ] = "Bullets and Numbering";
- Moveable = TRUE ;
- TabControl 1
- {
- SVLook = TRUE ;
- PageList =
- {
- PageItem
- {
- Identifier = RID_SVXPAGE_PICK_BULLET ;
- Text [ en-US ] = "Bullets" ;
- };
- PageItem
- {
- Identifier = RID_SVXPAGE_PICK_SINGLE_NUM ;
- Text [ en-US ] = "Numbering type" ;
- };
- 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" ;
- };
- };
- };
- String ST_RESET
- {
- Text [ en-US ] = "~Remove" ;
- };
-};
diff --git a/sw/uiconfig/swriter/ui/bulletsandnumbering.ui b/sw/uiconfig/swriter/ui/bulletsandnumbering.ui
index 5bea0aa..eeb90ff 100644
--- a/sw/uiconfig/swriter/ui/bulletsandnumbering.ui
+++ b/sw/uiconfig/swriter/ui/bulletsandnumbering.ui
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <object class="GtkDialog" id="Bullets And Numbering ">
+ <object class="GtkDialog" id="BulletsAndNumberingDialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
+ <property name="title" translatable="yes">Bullets and Numbering</property>
<property name="window_position">mouse</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -16,10 +17,12 @@
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="button2">
+ <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>
@@ -30,11 +33,12 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="button3">
- <property name="label" translatable="yes">Remove</property>
+ <object class="GtkButton" id="user">
+ <property name="label" translatable="yes">_Remove</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>
@@ -43,7 +47,7 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="button4">
+ <object class="GtkButton" id="cancel">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -57,7 +61,7 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="button5">
+ <object class="GtkButton" id="help">
<property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -71,7 +75,7 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="button6">
+ <object class="GtkButton" id="reset">
<property name="label" translatable="yes">Reset</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -92,14 +96,16 @@
</packing>
</child>
<child>
- <object class="GtkNotebook" id="notebook1">
+ <object class="GtkNotebook" id="tabcontrol">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<child>
<placeholder/>
</child>
<child type="tab">
- <object class="GtkLabel" id="label24">
+ <object class="GtkLabel" id="bullets">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Bullets</property>
@@ -112,7 +118,7 @@
<placeholder/>
</child>
<child type="tab">
- <object class="GtkLabel" id="label22">
+ <object class="GtkLabel" id="singlenum">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0.49000000953674316</property>
@@ -127,7 +133,7 @@
<placeholder/>
</child>
<child type="tab">
- <object class="GtkLabel" id="label20">
+ <object class="GtkLabel" id="outlinenum">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Outline</property>
@@ -141,7 +147,7 @@
<placeholder/>
</child>
<child type="tab">
- <object class="GtkLabel" id="label18">
+ <object class="GtkLabel" id="graphics">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Graphics</property>
@@ -155,7 +161,7 @@
<placeholder/>
</child>
<child type="tab">
- <object class="GtkLabel" id="label10">
+ <object class="GtkLabel" id="position">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Position</property>
@@ -169,7 +175,7 @@
<placeholder/>
</child>
<child type="tab">
- <object class="GtkLabel" id="label3">
+ <object class="GtkLabel" id="options">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Options</property>
@@ -181,7 +187,7 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
@@ -189,11 +195,11 @@
</object>
</child>
<action-widgets>
- <action-widget response="0">button2</action-widget>
- <action-widget response="0">button3</action-widget>
- <action-widget response="0">button4</action-widget>
- <action-widget response="0">button5</action-widget>
- <action-widget response="0">button6</action-widget>
+ <action-widget response="0">ok</action-widget>
+ <action-widget response="0">user</action-widget>
+ <action-widget response="0">cancel</action-widget>
+ <action-widget response="0">help</action-widget>
+ <action-widget response="0">reset</action-widget>
</action-widgets>
</object>
</interface>
commit 6b3686e54520b5cf02d6ce03aa421c755a33b140
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 7 14:31:56 2013 +0000
allow associating tab page names and tab page creation ids
so we can refer to the .ui name of the tab dialog and pass
in the page creation id to associate with that
Change-Id: If3df6d3de9dc7da482a45d7d91b610b81981d5ed
diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx
index a7068d8..69c7d89 100644
--- a/sfx2/inc/sfx2/tabdlg.hxx
+++ b/sfx2/inc/sfx2/tabdlg.hxx
@@ -130,22 +130,30 @@ protected:
void SavePosAndId();
public:
+ SfxTabDialog( Window* pParent,
+ const OString& rID, const OUString& rUIXMLDescription,
+ const SfxItemSet * = 0, sal_Bool bEditFmt = sal_False );
+ SfxTabDialog( SfxViewFrame *pViewFrame, Window* pParent,
+ const OString& rID, const OUString& rUIXMLDescription,
+ const SfxItemSet * = 0, sal_Bool bEditFmt = sal_False );
+
+
SfxTabDialog( Window* pParent, const ResId &rResId, const SfxItemSet * = 0,
sal_Bool bEditFmt = sal_False, const String *pUserButtonText = 0 );
SfxTabDialog( SfxViewFrame *pViewFrame, Window* pParent, const ResId &rResId,
const SfxItemSet * = 0, sal_Bool bEditFmt = sal_False,
const String *pUserButtonText = 0 );
- SfxTabDialog( SfxViewFrame *pViewFrame, Window* pParent,
- const rtl::OString& rID, const rtl::OUString& rUIXMLDescription,
- const SfxItemSet * = 0, sal_Bool bEditFmt = sal_False,
- const String *pUserButtonText = 0 );
~SfxTabDialog();
- void AddTabPage( sal_uInt16 nId,
+ sal_uInt16 AddTabPage( const OString& rName, // Name of the label for the page in the notebook .ui
CreateTabPage pCreateFunc, // != 0
GetTabPageRanges pRangesFunc, // can be 0
sal_Bool bItemsOnDemand = sal_False);
- sal_uInt16 AddTabPage( const OString& rName,
+
+ sal_uInt16 AddTabPage ( const OString &rName, // Name of the label for the page in the notebook .ui
+ sal_uInt16 nPageCreateId ); // Identifier of the Factory Method to create the page
+
+ void AddTabPage( sal_uInt16 nId,
CreateTabPage pCreateFunc, // != 0
GetTabPageRanges pRangesFunc, // can be 0
sal_Bool bItemsOnDemand = sal_False);
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index aca2b19..68d001d 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -434,13 +434,11 @@ SfxTabDialog::SfxTabDialog
(
SfxViewFrame* pViewFrame, // Frame, to which the Dialog belongs
Window* pParent, // Parent Window
- const rtl::OString& rID, const rtl::OUString& rUIXMLDescription, //Dialog Name, Dialog .ui path
+ const OString& rID, const OUString& rUIXMLDescription, //Dialog Name, Dialog .ui path
const SfxItemSet* pItemSet, // Itemset with the data;
// can be NULL, when Pages are onDemand
- sal_Bool bEditFmt, // Flag: templates are processed
+ sal_Bool bEditFmt // Flag: templates are processed
// when yes -> additional Button for standard
- const String* pUserButtonText // Text for UserButton;
- // if != 0, the UserButton is created
)
: TabDialog(pParent, rID, rUIXMLDescription)
, pFrame(pViewFrame)
@@ -453,7 +451,7 @@ SfxTabDialog::SfxTabDialog
, bFmt(bEditFmt)
, pExampleSet(0)
{
- Init_Impl( bFmt, pUserButtonText, NULL );
+ Init_Impl( bFmt, NULL, NULL );
}
// -----------------------------------------------------------------------
@@ -483,6 +481,36 @@ SfxTabDialog::SfxTabDialog
DBG_WARNING( "Please use the Construtor with the ViewFrame" );
}
+SfxTabDialog::SfxTabDialog
+
+/* [Description]
+
+ Constructor, temporary without Frame
+*/
+
+(
+ Window* pParent, // Parent Window
+ const OString& rID, const OUString& rUIXMLDescription, //Dialog Name, Dialog .ui path
+ const SfxItemSet* pItemSet, // Itemset with the data;
+ // can be NULL, when Pages are onDemand
+ sal_Bool bEditFmt // Flag: templates are processed
+ // when yes -> additional Button for standard
+)
+ : TabDialog(pParent, rID, rUIXMLDescription)
+ , pFrame(0)
+ , pSet(pItemSet)
+ , pOutSet(0)
+ , pRanges(0)
+ , nResId(0)
+ , nAppPageId(USHRT_MAX)
+ , bItemsReset(sal_False)
+ , bFmt(bEditFmt)
+ , pExampleSet(0)
+{
+ Init_Impl(bFmt, NULL, NULL);
+ DBG_WARNING( "Please use the Construtor with the ViewFrame" );
+}
+
// -----------------------------------------------------------------------
SfxTabDialog::~SfxTabDialog()
@@ -629,7 +657,8 @@ void SfxTabDialog::Init_Impl( sal_Bool bFmtFlag, const String* pUserButtonText,
if ( m_pUserBtn )
{
- m_pUserBtn->SetText( *pUserButtonText );
+ if (pUserButtonText)
+ m_pUserBtn->SetText(*pUserButtonText);
m_pUserBtn->SetClickHdl( LINK( this, SfxTabDialog, UserHdl ) );
m_pUserBtn->Show();
}
@@ -826,16 +855,14 @@ void SfxTabDialog::AddTabPage
new Data_Impl( nId, pCreateFunc, pRangesFunc, bItemsOnDemand ) );
}
-sal_uInt16 SfxTabDialog::AddTabPage
-
-/* [Description]
- Adding a page to the dialogue. Must correspond to a entry in the
+/*
+ Adds a page to the dialog. The Name must correspond to a entry in the
TabControl in the dialog .ui
*/
-
+sal_uInt16 SfxTabDialog::AddTabPage
(
- const OString &rName, // Page ID
+ const OString &rName, // Page ID
CreateTabPage pCreateFunc, // Pointer to the Factory Method
GetTabPageRanges pRangesFunc, // Pointer to the Method for quering
// Ranges onDemand
@@ -849,6 +876,26 @@ sal_uInt16 SfxTabDialog::AddTabPage
return nId;
}
+/*
+ Adds a page to the dialog. The Name must correspond to a entry in the
+ TabControl in the dialog .ui
+ */
+sal_uInt16 SfxTabDialog::AddTabPage
+(
+ const OString &rName, // Page ID
+ sal_uInt16 nPageCreateId // Identifier of the Factory Method to create the page
+)
+{
+ SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
+ assert(pFact);
+ CreateTabPage pCreateFunc = pFact->GetTabPageCreatorFunc(nPageCreateId);
+ assert(pCreateFunc);
+ GetTabPageRanges pRangesFunc = pFact->GetTabPageRangesFunc(nPageCreateId);
+ sal_uInt16 nPageId = m_pTabCtrl->GetPageId(rName);
+ pImpl->pData->Append(new Data_Impl(nPageId, pCreateFunc, pRangesFunc, false));
+ return nPageId;
+}
+
// -----------------------------------------------------------------------
void SfxTabDialog::AddTabPage
commit 0cdf12e0ee217916e25593184d38306a05388fbb
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 3 14:43:49 2013 +0000
split out numbering options page to cui and adapt code
Change-Id: Ib2fedda13ff0b0d94f818bf6d9daf40a02fa8302
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 59d82a5..192a911 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -117,7 +117,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/tabpages/labdlg.src \
cui/source/tabpages/macroass.src \
cui/source/tabpages/measure.src \
- cui/source/tabpages/numpages.src \
cui/source/tabpages/page.src \
cui/source/tabpages/paragrph.src \
cui/source/tabpages/strings.src \
diff --git a/cui/UI_cui.mk b/cui/UI_cui.mk
index 9c51ec0..7bfe39a 100644
--- a/cui/UI_cui.mk
+++ b/cui/UI_cui.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UI_add_uifiles,cui,\
cui/uiconfig/ui/insertrowcolumn \
cui/uiconfig/ui/macroselectordialog \
cui/uiconfig/ui/numberingformatpage \
+ cui/uiconfig/ui/numberingoptionspage \
cui/uiconfig/ui/numberingpositionpage \
cui/uiconfig/ui/personalization_tab \
cui/uiconfig/ui/pickbulletpage \
diff --git a/cui/source/dialogs/cuires.src b/cui/source/dialogs/cuires.src
index b229605..4534764 100644
--- a/cui/source/dialogs/cuires.src
+++ b/cui/source/dialogs/cuires.src
@@ -54,6 +54,11 @@ String RID_SVXSTR_AUTO_ENTRY
Text [ en-US ] = "Automatic";
};
+String RID_SVXSTR_EDIT_GRAPHIC
+{
+ Text [ en-US ] = "Link" ;
+};
+
#define MASKCOLOR MaskColor = \
Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index f461881..8b3ce61 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -66,8 +66,8 @@
#define RID_SVXSTR_SHADOW_STYLE_TOPRIGHT (RID_SVX_START + 981)
#define RID_SVXSTR_SHADOW_STYLE_BOTTOMLEFT (RID_SVX_START + 982)
#define RID_SVXSTR_SHADOW_STYLE_TOPLEFT (RID_SVX_START + 983)
-#define RID_SVXSTR_HOR_PRESET_ONLYHOR (RID_SVX_START + 1113)
-#define RID_SVXSTR_VER_PRESET_ONLYVER (RID_SVX_START + 1114)
+#define RID_SVXSTR_HOR_PRESET_ONLYHOR (RID_SVX_START + 1113)
+#define RID_SVXSTR_VER_PRESET_ONLYVER (RID_SVX_START + 1114)
#define RID_SVXSTR_FRAMEDIR_LTR (RID_SVX_START + 960)
#define RID_SVXSTR_FRAMEDIR_RTL (RID_SVX_START + 961)
#define RID_SVXSTR_FRAMEDIR_SUPER (RID_SVX_START + 962)
@@ -75,7 +75,7 @@
#define RID_SVXSTR_PAGEDIR_RTL_HORI (RID_SVX_START + 966)
#define RID_SVXSTR_PAGEDIR_RTL_VERT (RID_SVX_START + 967)
#define RID_SVXSTR_PAGEDIR_LTR_VERT (RID_SVX_START + 968)
-#define RID_STR_EDIT_GRAPHIC (RID_SVX_START + 509)
+#define RID_SVXSTR_EDIT_GRAPHIC (RID_SVX_START + 509)
#define RID_SVXSTR_DESC_GRADIENT (RID_SVX_START + 163)
#define RID_SVXSTR_ASK_DEL_GRADIENT (RID_SVX_START + 165)
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 6bafaf9..5e8bfd4 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -295,7 +295,6 @@
#define HID_FORMAT_PARAGRAPH_STD "CUI_HID_FORMAT_PARAGRAPH_STD"
#define HID_VALUESET_NUM "CUI_HID_VALUESET_NUM"
#define HID_VALUESET_NUMBMP "CUI_HID_VALUESET_NUMBMP"
-#define HID_SVXPAGE_NUM_OPTIONS "CUI_HID_SVXPAGE_NUM_OPTIONS"
#define HID_MEASURE_CTL_PREVIEW "CUI_HID_MEASURE_CTL_PREVIEW"
#define HID_FORMAT_PARAGRAPH_EXT "CUI_HID_FORMAT_PARAGRAPH_EXT"
#define HID_FORMAT_PARAGRAPH_ALIGN "CUI_HID_FORMAT_PARAGRAPH_ALIGN"
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index e396d8f..952635d 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -253,48 +253,49 @@ class SvxNumOptionsTabPage : public SfxTabPage
using TabPage::ActivatePage;
using TabPage::DeactivatePage;
- FixedLine aFormatFL;
- FixedText aLevelFT;
- MultiListBox aLevelLB;
-
- FixedText aFmtFT;
- ListBox aFmtLB;
- FixedText aPrefixFT;
- Edit aPrefixED;
- FixedText aSuffixFT;
- Edit aSuffixED;
- FixedText aCharFmtFT;
- ListBox aCharFmtLB;
- FixedText aBulColorFT;
- ColorListBox aBulColLB;
- FixedText aBulRelSizeFT;
- MetricField aBulRelSizeMF;
- FixedText aAllLevelFT;
- NumericField aAllLevelNF;
- FixedText aStartFT;
- NumericField aStartED;
- PushButton aBulletPB;
- FixedText aAlignFT;
- ListBox aAlignLB;
- FixedText aBitmapFT;
- MenuButton aBitmapMB;
- FixedText aSizeFT;
- MetricField aWidthMF;
- FixedText aMultFT;
- MetricField aHeightMF;
- CheckBox aRatioCB;
- FixedText aOrientFT;
- ListBox aOrientLB;
-
- FixedLine aSameLevelFL;
- CheckBox aSameLevelCB;
-
- String sNumCharFmtName;
- String sBulletCharFmtName;
+ ListBox* m_pLevelLB;
+
+ ListBox* m_pFmtLB;
+
+ FixedText* m_pSeperatorFT;
+ FixedText* m_pPrefixFT;
+ Edit* m_pPrefixED;
+ FixedText* m_pSuffixFT;
+ Edit* m_pSuffixED;
+ FixedText* m_pCharFmtFT;
+ ListBox* m_pCharFmtLB;
+ FixedText* m_pBulColorFT;
+ ColorListBox* m_pBulColLB;
+ FixedText* m_pBulRelSizeFT;
+ MetricField* m_pBulRelSizeMF;
+ FixedText* m_pAllLevelFT;
+ NumericField* m_pAllLevelNF;
+ FixedText* m_pStartFT;
+ NumericField* m_pStartED;
+ FixedText* m_pBulletFT;
+ PushButton* m_pBulletPB;
+ FixedText* m_pAlignFT;
+ ListBox* m_pAlignLB;
+ FixedText* m_pBitmapFT;
+ MenuButton* m_pBitmapMB;
+ sal_uInt16 m_nGalleryId;
+ FixedText* m_pWidthFT;
+ MetricField* m_pWidthMF;
+ FixedText* m_pHeightFT;
+ MetricField* m_pHeightMF;
+ CheckBox* m_pRatioCB;
+ FixedText* m_pOrientFT;
+ ListBox* m_pOrientLB;
+
+ VclContainer* m_pAllLevelsFrame;
+ CheckBox* m_pSameLevelCB;
- Timer aInvalidateTimer;
+ SvxNumberingPreview* m_pPreviewWIN;
- SvxNumberingPreview* pPreviewWIN;
+ OUString m_sNumCharFmtName;
+ OUString m_sBulletCharFmtName;
+
+ Timer aInvalidateTimer;
SvxNumRule* pActNum;
SvxNumRule* pSaveNum;
@@ -310,8 +311,6 @@ class SvxNumOptionsTabPage : public SfxTabPage
std::vector<String> aGrfNames;
Font aActBulletFont;
- String sBullet;
- String sStartWith;
sal_uInt8 nBullet;
sal_uInt16 nActNumLvl;
@@ -357,14 +356,14 @@ class SvxNumOptionsTabPage : public SfxTabPage
virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
- void SetCharFmts(const String& rNumName, const String& rBulletName )
- {
- sNumCharFmtName = rNumName;
- sBulletCharFmtName = rBulletName;
- }
+ void SetCharFmts(const OUString& rNumName, const OUString& rBulletName)
+ {
+ m_sNumCharFmtName = rNumName;
+ m_sBulletCharFmtName = rBulletName;
+ }
void SetMetric(FieldUnit eSet);
- ListBox& GetCharFmtListBox() {return aCharFmtLB;}
+ ListBox& GetCharFmtListBox() {return *m_pCharFmtLB;}
void SetModified(sal_Bool bRepaint = sal_True);
virtual void PageCreated(SfxAllItemSet aSet);
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 8f0215c..afdacc6 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1054,110 +1054,113 @@ void SvxNumOptionsTabPage::GetI18nNumbering( ListBox& rFmtLB, sal_uInt16 nDoNotR
}
}
-// tabpage numeration options
-#define NUM_NO_GRAPHIC 1000
+// tabpage numbering options
SvxNumOptionsTabPage::SvxNumOptionsTabPage(Window* pParent,
- const SfxItemSet& rSet) :
- SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_NUM_OPTIONS ), rSet ),
-
- aFormatFL( this, CUI_RES(FL_FORMAT )),
- aLevelFT( this, CUI_RES(FT_LEVEL )),
- aLevelLB( this, CUI_RES(LB_LEVEL )),
- aFmtFT( this, CUI_RES(FT_FMT )),
- aFmtLB( this, CUI_RES(LB_FMT )),
- aPrefixFT( this, CUI_RES(FT_PREFIX )),
- aPrefixED( this, CUI_RES(ED_PREFIX )),
- aSuffixFT( this, CUI_RES(FT_SUFFIX )),
- aSuffixED( this, CUI_RES(ED_SUFFIX )),
- aCharFmtFT( this, CUI_RES(FT_CHARFMT )),
- aCharFmtLB( this, CUI_RES(LB_CHARFMT )),
- aBulColorFT( this, CUI_RES(FT_BUL_COLOR)),
- aBulColLB( this, CUI_RES(LB_BUL_COLOR)),
- aBulRelSizeFT( this, CUI_RES(FT_BUL_REL_SIZE)),
- aBulRelSizeMF( this, CUI_RES(MF_BUL_REL_SIZE)),
- aAllLevelFT( this, CUI_RES(FT_ALL_LEVEL)),
- aAllLevelNF( this, CUI_RES(NF_ALL_LEVEL)),
- aStartFT( this, CUI_RES(FT_START )),
- aStartED( this, CUI_RES(ED_START )),
- aBulletPB( this, CUI_RES(PB_BULLET )),
- aAlignFT( this, CUI_RES(FT_ALIGN )),
- aAlignLB( this, CUI_RES(LB_ALIGN )),
- aBitmapFT( this, CUI_RES(FT_BITMAP )),
- aBitmapMB( this, CUI_RES(MB_BITMAP )),
- aSizeFT( this, CUI_RES(FT_SIZE )),
- aWidthMF( this, CUI_RES(MF_WIDTH )),
- aMultFT( this, CUI_RES(FT_MULT )),
- aHeightMF( this, CUI_RES(MF_HEIGHT )),
- aRatioCB( this, CUI_RES(CB_RATIO )),
- aOrientFT( this, CUI_RES(FT_ORIENT )),
- aOrientLB( this, CUI_RES(LB_ORIENT )),
- aSameLevelFL( this, CUI_RES(FL_SAME_LEVEL)),
- aSameLevelCB( this, CUI_RES(CB_SAME_LEVEL)),
- pPreviewWIN( new SvxNumberingPreview(this, CUI_RES(WIN_PREVIEW ))),
- pActNum(0),
- pSaveNum(0),
- bLastWidthModified(sal_False),
- bModified(sal_False),
- bPreset(sal_False),
- bAutomaticCharStyles(sal_True),
- bHTMLMode(sal_False),
- bMenuButtonInitialized(sal_False),
- sBullet(CUI_RES(STR_BULLET)),
- nBullet(0xff),
- nActNumLvl(USHRT_MAX),
- nNumItemId(SID_ATTR_NUMBERING_RULE)
-{
- sStartWith = aStartFT.GetText();
- pPreviewWIN->SetBackground(Wallpaper(Color(COL_TRANSPARENT)));
+ const SfxItemSet& rSet)
+ : SfxTabPage(pParent, "NumberingOptionsPage", "cui/ui/numberingoptionspage.ui", rSet)
+ , pActNum(0)
+ , pSaveNum(0)
+ , bLastWidthModified(sal_False)
+ , bModified(sal_False)
+ , bPreset(sal_False)
+ , bAutomaticCharStyles(sal_True)
+ , bHTMLMode(sal_False)
+ , bMenuButtonInitialized(sal_False)
+ , nBullet(0xff)
+ , nActNumLvl(USHRT_MAX)
+ , nNumItemId(SID_ATTR_NUMBERING_RULE)
+{
+ get(m_pLevelLB, "levellb");
+ get(m_pFmtLB, "numfmtlb");
+
+ get(m_pSeperatorFT, "separator");
+ get(m_pPrefixFT, "prefixft");
+ get(m_pPrefixED, "prefix");
+ get(m_pSuffixFT, "suffixft");
+ get(m_pSuffixED, "suffix");
+
+ get(m_pCharFmtFT, "charstyleft");
+ get(m_pCharFmtLB, "charstyle");
+
+ get(m_pBulColorFT, "colorft");
+ get(m_pBulColLB, "color");
+
+ get(m_pBulRelSizeFT, "relsizeft");
+ get(m_pBulRelSizeMF, "relsize");
+
+ get(m_pAllLevelFT, "sublevelsft");
+ get(m_pAllLevelNF, "sublevels");
+
+ get(m_pStartFT, "startatft");
+ get(m_pStartED, "startat");
+
+ get(m_pBulletFT, "bulletft");
+ get(m_pBulletPB, "bullet");
+
+ get(m_pAlignFT, "numalignft");
+ get(m_pAlignLB, "numalign");
+
+ get(m_pBitmapFT, "bitmapft");
+ get(m_pBitmapMB, "bitmap");
+
+ get(m_pWidthFT, "widthft");
+ get(m_pWidthMF, "widthmf");
+ get(m_pHeightFT, "heightft");
+ get(m_pHeightMF, "heightmf");
+
+ get(m_pRatioCB, "keepratio");
+
+ get(m_pOrientFT, "orientft");
+ get(m_pOrientLB, "orientlb");
+
+ get(m_pAllLevelsFrame, "levelsframe");
+ get(m_pSameLevelCB, "allsame");
+
+ get(m_pPreviewWIN, "preview");
+
+ m_pPreviewWIN->SetBackground(Wallpaper(Color(COL_TRANSPARENT)));
SetExchangeSupport();
aActBulletFont = lcl_GetDefaultBulletFont();
- aBulletPB.SetClickHdl(LINK(this, SvxNumOptionsTabPage, BulletHdl_Impl));
- aFmtLB.SetSelectHdl(LINK(this, SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl));
- aBitmapMB.SetSelectHdl(LINK(this, SvxNumOptionsTabPage, GraphicHdl_Impl));
- aLevelLB.SetSelectHdl(LINK(this, SvxNumOptionsTabPage, LevelHdl_Impl));
- aCharFmtLB.SetSelectHdl(LINK(this, SvxNumOptionsTabPage, CharFmtHdl_Impl));
- aWidthMF.SetModifyHdl(LINK(this, SvxNumOptionsTabPage, SizeHdl_Impl));
- aHeightMF.SetModifyHdl(LINK(this, SvxNumOptionsTabPage, SizeHdl_Impl));
- aRatioCB.SetClickHdl(LINK(this, SvxNumOptionsTabPage, RatioHdl_Impl));
- aStartED.SetModifyHdl(LINK(this, SvxNumOptionsTabPage, EditModifyHdl_Impl));
- aPrefixED.SetModifyHdl(LINK(this, SvxNumOptionsTabPage, EditModifyHdl_Impl));
- aSuffixED.SetModifyHdl(LINK(this, SvxNumOptionsTabPage, EditModifyHdl_Impl));
- aAllLevelNF.SetModifyHdl(LINK(this,SvxNumOptionsTabPage, AllLevelHdl_Impl));
- aOrientLB.SetSelectHdl(LINK(this, SvxNumOptionsTabPage, OrientHdl_Impl));
- aSameLevelCB.SetClickHdl(LINK(this, SvxNumOptionsTabPage, SameLevelHdl_Impl));
- aBulRelSizeMF.SetModifyHdl(LINK(this,SvxNumOptionsTabPage, BulRelSizeHdl_Impl));
- aBulColLB.SetSelectHdl(LINK(this, SvxNumOptionsTabPage, BulColorHdl_Impl));
+ m_pBulletPB->SetClickHdl(LINK(this, SvxNumOptionsTabPage, BulletHdl_Impl));
+ m_pFmtLB->SetSelectHdl(LINK(this, SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl));
+ m_pBitmapMB->SetSelectHdl(LINK(this, SvxNumOptionsTabPage, GraphicHdl_Impl));
+ m_pLevelLB->EnableMultiSelection(true);
+ m_pLevelLB->SetSelectHdl(LINK(this, SvxNumOptionsTabPage, LevelHdl_Impl));
+ m_pCharFmtLB->SetSelectHdl(LINK(this, SvxNumOptionsTabPage, CharFmtHdl_Impl));
+ m_pWidthMF->SetModifyHdl(LINK(this, SvxNumOptionsTabPage, SizeHdl_Impl));
+ m_pHeightMF->SetModifyHdl(LINK(this, SvxNumOptionsTabPage, SizeHdl_Impl));
+ m_pRatioCB->SetClickHdl(LINK(this, SvxNumOptionsTabPage, RatioHdl_Impl));
+ m_pStartED->SetModifyHdl(LINK(this, SvxNumOptionsTabPage, EditModifyHdl_Impl));
+ m_pPrefixED->SetModifyHdl(LINK(this, SvxNumOptionsTabPage, EditModifyHdl_Impl));
+ m_pSuffixED->SetModifyHdl(LINK(this, SvxNumOptionsTabPage, EditModifyHdl_Impl));
+ m_pAllLevelNF->SetModifyHdl(LINK(this,SvxNumOptionsTabPage, AllLevelHdl_Impl));
+ m_pOrientLB->SetSelectHdl(LINK(this, SvxNumOptionsTabPage, OrientHdl_Impl));
+ m_pSameLevelCB->SetClickHdl(LINK(this, SvxNumOptionsTabPage, SameLevelHdl_Impl));
+ m_pBulRelSizeMF->SetModifyHdl(LINK(this,SvxNumOptionsTabPage, BulRelSizeHdl_Impl));
+ m_pBulColLB->SetSelectHdl(LINK(this, SvxNumOptionsTabPage, BulColorHdl_Impl));
aInvalidateTimer.SetTimeoutHdl(LINK(this, SvxNumOptionsTabPage, PreviewInvalidateHdl_Impl));
aInvalidateTimer.SetTimeout(50);
- aBitmapMB.GetPopupMenu()->SetHighlightHdl(LINK(this, SvxNumOptionsTabPage, PopupActivateHdl_Impl));
- PopupMenu* pPopup = new PopupMenu;
- aBitmapMB.GetPopupMenu()->SetPopupMenu( MN_GALLERY, pPopup );
+ Menu *pBitmapMenu = m_pBitmapMB->GetPopupMenu();
- pPopup->InsertItem( NUM_NO_GRAPHIC, String(CUI_RES(ST_POPUP_EMPTY_ENTRY)) );
- pPopup->EnableItem( NUM_NO_GRAPHIC, sal_False );
+ pBitmapMenu->SetHighlightHdl(LINK(this, SvxNumOptionsTabPage, PopupActivateHdl_Impl));
+ m_nGalleryId = pBitmapMenu->GetItemId("gallery");
+ assert(m_nGalleryId != MENU_ITEM_NOTFOUND);
+ PopupMenu* pPopup = new PopupMenu;
+ pBitmapMenu->SetPopupMenu(m_nGalleryId, pPopup);
eCoreUnit = rSet.GetPool()->GetMetric(rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE));
- aBitmapMB.SetAccessibleRelationLabeledBy( &aBitmapFT );
-
- FreeResource();
-
// Get advanced numbering types from the component.
// Watch out for the ugly 0x88/*SVX_NUM_BITMAP|0x80*/ to not remove that.
- GetI18nNumbering( aFmtLB, (SVX_NUM_BITMAP | 0x80));
-
- aBulletPB.SetAccessibleRelationMemberOf(&aFormatFL);
- aBulletPB.SetAccessibleRelationLabeledBy(&aStartFT);
- aBulletPB.SetAccessibleName(aStartFT.GetText());
+ GetI18nNumbering( *m_pFmtLB, (SVX_NUM_BITMAP | 0x80));
}
SvxNumOptionsTabPage::~SvxNumOptionsTabPage()
{
- delete aBitmapMB.GetPopupMenu()->GetPopupMenu( MN_GALLERY );
+ delete m_pBitmapMB->GetPopupMenu()->GetPopupMenu(m_nGalleryId);
delete pActNum;
- delete pPreviewWIN;
delete pSaveNum;
}
@@ -1165,11 +1168,11 @@ void SvxNumOptionsTabPage::SetMetric(FieldUnit eMetric)
{
if(eMetric == FUNIT_MM)
{
- aWidthMF .SetDecimalDigits(1);
- aHeightMF .SetDecimalDigits(1);
+ m_pWidthMF->SetDecimalDigits(1);
+ m_pHeightMF->SetDecimalDigits(1);
}
- aWidthMF .SetUnit( eMetric );
- aHeightMF .SetUnit( eMetric );
+ m_pWidthMF->SetUnit( eMetric );
+ m_pHeightMF->SetUnit( eMetric );
}
SfxTabPage* SvxNumOptionsTabPage::Create( Window* pParent,
@@ -1202,17 +1205,17 @@ void SvxNumOptionsTabPage::ActivatePage(const SfxItemSet& rSet)
{
nActNumLvl = nTmpNumLvl;
sal_uInt16 nMask = 1;
- aLevelLB.SetUpdateMode(sal_False);
- aLevelLB.SetNoSelection();
- aLevelLB.SelectEntryPos( pActNum->GetLevelCount(), nActNumLvl == USHRT_MAX);
+ m_pLevelLB->SetUpdateMode(sal_False);
+ m_pLevelLB->SetNoSelection();
+ m_pLevelLB->SelectEntryPos( pActNum->GetLevelCount(), nActNumLvl == USHRT_MAX);
if(nActNumLvl != USHRT_MAX)
for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
{
if(nActNumLvl & nMask)
- aLevelLB.SelectEntryPos( i, sal_True);
+ m_pLevelLB->SelectEntryPos( i, sal_True);
nMask <<= 1 ;
}
- aLevelLB.SetUpdateMode(sal_True);
+ m_pLevelLB->SetUpdateMode(sal_True);
*pActNum = *pSaveNum;
InitControls();
}
@@ -1260,45 +1263,45 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet )
pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule());
// insert levels
- if(!aLevelLB.GetEntryCount())
+ if(!m_pLevelLB->GetEntryCount())
{
for(sal_uInt16 i = 1; i <= pSaveNum->GetLevelCount(); i++)
- aLevelLB.InsertEntry( OUString::valueOf(static_cast<sal_Int32>(i)));
+ m_pLevelLB->InsertEntry( OUString::valueOf(static_cast<sal_Int32>(i)));
if(pSaveNum->GetLevelCount() > 1)
{
OUString sEntry( "1 - " );
sEntry += OUString::valueOf( static_cast<sal_Int32>(pSaveNum->GetLevelCount()) );
- aLevelLB.InsertEntry(sEntry);
- aLevelLB.SelectEntry(sEntry);
+ m_pLevelLB->InsertEntry(sEntry);
+ m_pLevelLB->SelectEntry(sEntry);
}
else
- aLevelLB.SelectEntryPos(0);
+ m_pLevelLB->SelectEntryPos(0);
}
else
- aLevelLB.SelectEntryPos(aLevelLB.GetEntryCount() - 1);
+ m_pLevelLB->SelectEntryPos(m_pLevelLB->GetEntryCount() - 1);
sal_uInt16 nMask = 1;
- aLevelLB.SetUpdateMode(sal_False);
- aLevelLB.SetNoSelection();
+ m_pLevelLB->SetUpdateMode(sal_False);
+ m_pLevelLB->SetNoSelection();
if(nActNumLvl == USHRT_MAX)
{
- aLevelLB.SelectEntryPos( pSaveNum->GetLevelCount(), sal_True);
+ m_pLevelLB->SelectEntryPos( pSaveNum->GetLevelCount(), sal_True);
}
else
for(sal_uInt16 i = 0; i < pSaveNum->GetLevelCount(); i++)
{
if(nActNumLvl & nMask)
- aLevelLB.SelectEntryPos( i, sal_True);
+ m_pLevelLB->SelectEntryPos( i, sal_True);
nMask <<= 1 ;
}
- aLevelLB.SetUpdateMode(sal_True);
+ m_pLevelLB->SetUpdateMode(sal_True);
if(!pActNum)
pActNum = new SvxNumRule(*pSaveNum);
else if(*pSaveNum != *pActNum)
*pActNum = *pSaveNum;
- pPreviewWIN->SetNumRule(pActNum);
- aSameLevelCB.Check(pActNum->IsContinuousNumbering());
+ m_pPreviewWIN->SetNumRule(pActNum);
+ m_pSameLevelCB->Check(pActNum->IsContinuousNumbering());
// fill ColorListBox as needed
if ( pActNum->IsFeatureSupported( NUM_BULLET_COLOR ) )
@@ -1316,12 +1319,12 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet )
if ( !pColorTable.is() )
pColorTable = XColorList::CreateStdColorList();
- aBulColLB.InsertEntry( Color( COL_AUTO ), SVX_RESSTR( RID_SVXSTR_AUTOMATIC ));
+ m_pBulColLB->InsertEntry( Color( COL_AUTO ), SVX_RESSTR( RID_SVXSTR_AUTOMATIC ));
for ( long i = 0; i < pColorTable->Count(); i++ )
{
XColorEntry* pEntry = pColorTable->GetColor(i);
- aBulColLB.InsertEntry( pEntry->GetColor(), pEntry->GetName() );
+ m_pBulColLB->InsertEntry( pEntry->GetColor(), pEntry->GetName() );
}
}
@@ -1335,66 +1338,68 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet )
}
sal_Bool bCharFmt = pActNum->IsFeatureSupported(NUM_CHAR_STYLE);
- aCharFmtFT.Show(bCharFmt);
- aCharFmtLB.Show(bCharFmt);
+ m_pCharFmtFT->Show(bCharFmt);
+ m_pCharFmtLB->Show(bCharFmt);
sal_Bool bContinuous = pActNum->IsFeatureSupported(NUM_CONTINUOUS);
sal_Bool bAllLevel = bContinuous && !bHTMLMode;
- aAllLevelFT.Show(bAllLevel);
- aAllLevelNF.Show(bAllLevel);
+ m_pAllLevelFT->Show(bAllLevel);
+ m_pAllLevelNF->Show(bAllLevel);
+
+ m_pAllLevelsFrame->Show(bContinuous);
- aSameLevelFL.Show(bContinuous);
- aSameLevelCB.Show(bContinuous);
// again misusage: in Draw there is numeration only until the bitmap
// without SVX_NUM_NUMBER_NONE
//remove types that are unsupported by Draw/Impress
if(!bContinuous)
{
- sal_uInt16 nFmtCount = aFmtLB.GetEntryCount();
+ sal_uInt16 nFmtCount = m_pFmtLB->GetEntryCount();
for(sal_uInt16 i = nFmtCount; i; i--)
{
- sal_uInt16 nEntryData = (sal_uInt16)(sal_uLong)aFmtLB.GetEntryData(i - 1);
+ sal_uInt16 nEntryData = (sal_uInt16)(sal_uLong)m_pFmtLB->GetEntryData(i - 1);
if(/*SVX_NUM_NUMBER_NONE == nEntryData ||*/
((SVX_NUM_BITMAP|LINK_TOKEN) == nEntryData))
- aFmtLB.RemoveEntry(i - 1);
+ m_pFmtLB->RemoveEntry(i - 1);
}
}
//one must be enabled
if(!pActNum->IsFeatureSupported(NUM_ENABLE_LINKED_BMP))
{
long nData = SVX_NUM_BITMAP|LINK_TOKEN;
- sal_uInt16 nPos = aFmtLB.GetEntryPos((void*)nData);
+ sal_uInt16 nPos = m_pFmtLB->GetEntryPos((void*)nData);
if(LISTBOX_ENTRY_NOTFOUND != nPos)
- aFmtLB.RemoveEntry(nPos);
+ m_pFmtLB->RemoveEntry(nPos);
}
else if(!pActNum->IsFeatureSupported(NUM_ENABLE_EMBEDDED_BMP))
{
long nData = SVX_NUM_BITMAP;
- sal_uInt16 nPos = aFmtLB.GetEntryPos((void*)nData);
+ sal_uInt16 nPos = m_pFmtLB->GetEntryPos((void*)nData);
if(LISTBOX_ENTRY_NOTFOUND != nPos)
- aFmtLB.RemoveEntry(nPos);
+ m_pFmtLB->RemoveEntry(nPos);
}
if(pActNum->IsFeatureSupported(NUM_SYMBOL_ALIGNMENT))
{
- aAlignFT.Show();
- aAlignLB.Show();
- Size aSz(aFormatFL.GetSizePixel());
- aSz.Height() = aLevelFT.GetSizePixel().Height();
- aFormatFL.SetSizePixel(aSz);
- aAlignLB.SetSelectHdl(LINK(this, SvxNumOptionsTabPage, EditModifyHdl_Impl));
+ m_pAlignFT->Show();
+ m_pAlignLB->Show();
+ m_pAlignLB->SetSelectHdl(LINK(this, SvxNumOptionsTabPage, EditModifyHdl_Impl));
+ }
+ else
+ {
+ m_pAlignFT->Hide();
+ m_pAlignLB->Hide();
}
// MegaHack: because of a not-fixable 'design mistake/error' in Impress
// delete all kinds of numeric enumerations
if(pActNum->IsFeatureSupported(NUM_NO_NUMBERS))
{
- sal_uInt16 nFmtCount = aFmtLB.GetEntryCount();
+ sal_uInt16 nFmtCount = m_pFmtLB->GetEntryCount();
for(sal_uInt16 i = nFmtCount; i; i--)
{
- sal_uInt16 nEntryData = (sal_uInt16)(sal_uLong)aFmtLB.GetEntryData(i - 1);
+ sal_uInt16 nEntryData = (sal_uInt16)(sal_uLong)m_pFmtLB->GetEntryData(i - 1);
if( /*nEntryData >= SVX_NUM_CHARS_UPPER_LETTER &&*/ nEntryData <= SVX_NUM_NUMBER_NONE)
- aFmtLB.RemoveEntry(i - 1);
+ m_pFmtLB->RemoveEntry(i - 1);
}
}
@@ -1474,41 +1479,41 @@ void SvxNumOptionsTabPage::InitControls()
if(bShowBitmap)
{
if(!bSameVOrient || eFirstOrient == text::VertOrientation::NONE)
- aOrientLB.SetNoSelection();
+ m_pOrientLB->SetNoSelection();
else
- aOrientLB.SelectEntryPos(
+ m_pOrientLB->SelectEntryPos(
sal::static_int_cast< sal_uInt16 >(eFirstOrient - 1));
// no text::VertOrientation::NONE
if(bSameSize)
{
- SetMetricValue(aHeightMF, aFirstSize.Height(), eCoreUnit);
- SetMetricValue(aWidthMF, aFirstSize.Width(), eCoreUnit);
+ SetMetricValue(*m_pHeightMF, aFirstSize.Height(), eCoreUnit);
+ SetMetricValue(*m_pWidthMF, aFirstSize.Width(), eCoreUnit);
}
else
{
- aHeightMF.SetText(aEmptyStr);
- aWidthMF.SetText(aEmptyStr);
+ m_pHeightMF->SetText(aEmptyStr);
+ m_pWidthMF->SetText(aEmptyStr);
}
}
if(bSameType)
{
sal_uInt16 nLBData = (sal_uInt16) aNumFmtArr[nLvl]->GetNumberingType();
- aFmtLB.SelectEntryPos(aFmtLB.GetEntryPos( (void*)sal::static_int_cast<sal_uIntPtr>( nLBData ) ));
+ m_pFmtLB->SelectEntryPos(m_pFmtLB->GetEntryPos( (void*)sal::static_int_cast<sal_uIntPtr>( nLBData ) ));
}
else
- aFmtLB.SetNoSelection();
+ m_pFmtLB->SetNoSelection();
- aAllLevelNF.Enable(nHighestLevel > 0 && !aSameLevelCB.IsChecked());
- aAllLevelNF.SetMax(nHighestLevel + 1);
+ m_pAllLevelNF->Enable(nHighestLevel > 0 && !m_pSameLevelCB->IsChecked());
+ m_pAllLevelNF->SetMax(nHighestLevel + 1);
if(bAllLevel)
{
- aAllLevelNF.SetValue(aNumFmtArr[nLvl]->GetIncludeUpperLevels());
+ m_pAllLevelNF->SetValue(aNumFmtArr[nLvl]->GetIncludeUpperLevels());
}
else
{
- aAllLevelNF.SetText(aEmptyStr);
+ m_pAllLevelNF->SetText(aEmptyStr);
}
if(bSameAdjust)
{
@@ -1517,36 +1522,36 @@ void SvxNumOptionsTabPage::InitControls()
nPos = 0;
else if(aNumFmtArr[nLvl]->GetNumAdjust() == SVX_ADJUST_RIGHT)
nPos = 2;
- aAlignLB.SelectEntryPos(nPos);
+ m_pAlignLB->SelectEntryPos(nPos);
}
else
{
- aAlignLB.SetNoSelection();
+ m_pAlignLB->SetNoSelection();
}
if(bBullRelSize)
{
if(bSameBulRelSize)
- aBulRelSizeMF.SetValue(aNumFmtArr[nLvl]->GetBulletRelSize());
+ m_pBulRelSizeMF->SetValue(aNumFmtArr[nLvl]->GetBulletRelSize());
else
- aBulRelSizeMF.SetText(aEmptyStr);
+ m_pBulRelSizeMF->SetText(aEmptyStr);
}
if(bBullColor)
{
if(bSameBulColor)
- aBulColLB.SelectEntry(aNumFmtArr[nLvl]->GetBulletColor());
+ m_pBulColLB->SelectEntry(aNumFmtArr[nLvl]->GetBulletColor());
else
- aBulColLB.SetNoSelection();
+ m_pBulColLB->SetNoSelection();
}
switch(nBullet)
{
case SHOW_NUMBERING:
if(bSameStart)
{
- aStartED.SetValue(aNumFmtArr[nLvl]->GetStart());
+ m_pStartED->SetValue(aNumFmtArr[nLvl]->GetStart());
}
else
- aStartED.SetText(aEmptyStr);
+ m_pStartED->SetText(aEmptyStr);
break;
case SHOW_BULLET:
break;
@@ -1555,26 +1560,26 @@ void SvxNumOptionsTabPage::InitControls()
}
if(bSamePrefix)
- aPrefixED.SetText(aNumFmtArr[nLvl]->GetPrefix());
+ m_pPrefixED->SetText(aNumFmtArr[nLvl]->GetPrefix());
else
- aPrefixED.SetText(aEmptyStr);
+ m_pPrefixED->SetText(aEmptyStr);
if(bSameSuffix)
- aSuffixED.SetText(aNumFmtArr[nLvl]->GetSuffix());
+ m_pSuffixED->SetText(aNumFmtArr[nLvl]->GetSuffix());
else
- aSuffixED.SetText(aEmptyStr);
+ m_pSuffixED->SetText(aEmptyStr);
if(bSameCharFmt)
{
if(sFirstCharFmt.Len())
- aCharFmtLB.SelectEntry(sFirstCharFmt);
+ m_pCharFmtLB->SelectEntry(sFirstCharFmt);
else
- aCharFmtLB.SelectEntryPos( 0 );
+ m_pCharFmtLB->SelectEntryPos( 0 );
}
else
- aCharFmtLB.SetNoSelection();
+ m_pCharFmtLB->SetNoSelection();
- pPreviewWIN->SetLevel(nActNumLvl);
- pPreviewWIN->Invalidate();
+ m_pPreviewWIN->SetLevel(nActNumLvl);
+ m_pPreviewWIN->Invalidate();
}
// 0 - Number; 1 - Bullet; 2 - Bitmap
@@ -1583,74 +1588,58 @@ void SvxNumOptionsTabPage::SwitchNumberType( sal_uInt8 nType, sal_Bool )
if(nBullet == nType)
return;
nBullet = nType;
- sal_Bool bBitmap = sal_False;
- sal_Bool bBullet = sal_False;
- sal_Bool bEnableBitmap = sal_False;
- if(nType == SHOW_NUMBERING)
- {
- // switch label, memorize old text
- aStartFT.SetText(sStartWith);
-
- }
- else if(nType == SHOW_BULLET)
- {
- // switch label, memorize old text
- aStartFT.SetText(sBullet);
- bBullet = sal_True;
- }
- else
- {
- bBitmap = sal_True;
- bEnableBitmap = sal_True;
- }
+ sal_Bool bBullet = (nType == SHOW_BULLET);
+ sal_Bool bBitmap = (nType == SHOW_BITMAP);
+ sal_Bool bEnableBitmap = (nType == SHOW_BITMAP);
sal_Bool bNumeric = !(bBitmap||bBullet);
- aPrefixFT.Show(bNumeric);
- aPrefixED.Show(bNumeric);
- aSuffixFT.Show(bNumeric);
- aSuffixED.Show(bNumeric);
+ m_pSeperatorFT->Show(bNumeric);
+ m_pPrefixFT->Show(bNumeric);
+ m_pPrefixED->Show(bNumeric);
+ m_pSuffixFT->Show(bNumeric);
+ m_pSuffixED->Show(bNumeric);
sal_Bool bCharFmt = pActNum->IsFeatureSupported(NUM_CHAR_STYLE);
- aCharFmtFT.Show(!bBitmap && bCharFmt);
- aCharFmtLB.Show(!bBitmap && bCharFmt);
+ m_pCharFmtFT->Show(!bBitmap && bCharFmt);
+ m_pCharFmtLB->Show(!bBitmap && bCharFmt);
// this is rather misusage, as there is no own flag
// for complete numeration
sal_Bool bAllLevelFeature = pActNum->IsFeatureSupported(NUM_CONTINUOUS);
sal_Bool bAllLevel = bNumeric && bAllLevelFeature && !bHTMLMode;
- aAllLevelFT.Show(bAllLevel);
- aAllLevelNF.Show(bAllLevel);
+ m_pAllLevelFT->Show(bAllLevel);
+ m_pAllLevelNF->Show(bAllLevel);
- aStartFT.Show(!bBitmap);
- aStartED.Show(!(bBullet||bBitmap));
+ m_pStartFT->Show(!(bBullet||bBitmap));
+ m_pStartED->Show(!(bBullet||bBitmap));
- aBulletPB.Show(bBullet);
+ m_pBulletFT->Show(bBullet);
+ m_pBulletPB->Show(bBullet);
sal_Bool bBullColor = pActNum->IsFeatureSupported(NUM_BULLET_COLOR);
- aBulColorFT.Show( !bBitmap && bBullColor );
- aBulColLB.Show( !bBitmap && bBullColor );
+ m_pBulColorFT->Show(!bBitmap && bBullColor);
+ m_pBulColLB->Show(!bBitmap && bBullColor);
sal_Bool bBullResSize = pActNum->IsFeatureSupported(NUM_BULLET_REL_SIZE);
- aBulRelSizeFT.Show( !bBitmap && bBullResSize );
- aBulRelSizeMF.Show( !bBitmap && bBullResSize );
-
- aBitmapFT .Show(bBitmap);
- aBitmapMB .Show(bBitmap);
+ m_pBulRelSizeFT->Show(!bBitmap && bBullResSize);
+ m_pBulRelSizeMF->Show(!bBitmap && bBullResSize);
- aSizeFT .Show(bBitmap);
- aWidthMF .Show(bBitmap);
- aMultFT .Show(bBitmap);
- aHeightMF .Show(bBitmap);
- aRatioCB .Show(bBitmap);
+ m_pBitmapFT->Show(bBitmap);
+ m_pBitmapMB->Show(bBitmap);
- aOrientFT .Show(bBitmap && bAllLevelFeature);
- aOrientLB .Show(bBitmap && bAllLevelFeature);
+ m_pWidthFT->Show(bBitmap);
+ m_pWidthMF->Show(bBitmap);
+ m_pHeightFT->Show(bBitmap);
+ m_pHeightMF->Show(bBitmap);
+ m_pRatioCB->Show(bBitmap);
- aSizeFT .Enable(bEnableBitmap);
- aWidthMF .Enable(bEnableBitmap);
- aMultFT .Enable(bEnableBitmap);
- aHeightMF .Enable(bEnableBitmap);
- aRatioCB .Enable(bEnableBitmap);
- aOrientFT .Enable(bEnableBitmap);
- aOrientLB .Enable(bEnableBitmap);
+ m_pOrientFT->Show(bBitmap && bAllLevelFeature);
+ m_pOrientLB->Show(bBitmap && bAllLevelFeature);
+ m_pWidthFT->Enable(bEnableBitmap);
+ m_pWidthMF->Enable(bEnableBitmap);
+ m_pHeightFT->Enable(bEnableBitmap);
+ m_pHeightMF->Enable(bEnableBitmap);
+ m_pRatioCB->Enable(bEnableBitmap);
+ m_pOrientFT->Enable(bEnableBitmap);
+ m_pOrientLB->Enable(bEnableBitmap);
}
IMPL_LINK( SvxNumOptionsTabPage, LevelHdl_Impl, ListBox *, pBox )
@@ -1697,7 +1686,7 @@ IMPL_LINK( SvxNumOptionsTabPage, LevelHdl_Impl, ListBox *, pBox )
IMPL_LINK_NOARG(SvxNumOptionsTabPage, PreviewInvalidateHdl_Impl)
{
- pPreviewWIN->Invalidate();
+ m_pPreviewWIN->Invalidate();
return 0;
}
@@ -1763,13 +1752,13 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox )
// allocation of the drawing pattern is automatic
if(bAutomaticCharStyles)
{
- sSelectStyle = sBulletCharFmtName;
+ sSelectStyle = m_sBulletCharFmtName;
}
}
else
{
- aNumFmt.SetPrefix( aPrefixED.GetText() );
- aNumFmt.SetSuffix( aSuffixED.GetText() );
+ aNumFmt.SetPrefix( m_pPrefixED->GetText() );
+ aNumFmt.SetSuffix( m_pSuffixED->GetText() );
SwitchNumberType(SHOW_NUMBERING);
pActNum->SetLevel(i, aNumFmt);
CheckForStartValue_Impl(nNumberingType);
@@ -1777,7 +1766,7 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox )
// allocation of the drawing pattern is automatic
if(bAutomaticCharStyles)
{
- sSelectStyle = sNumCharFmtName;
+ sSelectStyle = m_sNumCharFmtName;
}
}
}
@@ -1786,19 +1775,19 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox )
sal_Bool bAllLevelFeature = pActNum->IsFeatureSupported(NUM_CONTINUOUS);
if(bShowOrient && bAllLevelFeature)
{
- aOrientFT.Show();
- aOrientLB.Show();
+ m_pOrientFT->Show();
+ m_pOrientLB->Show();
}
else
{
- aOrientFT.Hide();
- aOrientLB.Hide();
+ m_pOrientFT->Hide();
+ m_pOrientLB->Hide();
}
SetModified();
if(sSelectStyle.Len())
{
- aCharFmtLB.SelectEntry(sSelectStyle);
- CharFmtHdl_Impl(&aCharFmtLB);
+ m_pCharFmtLB->SelectEntry(sSelectStyle);
+ CharFmtHdl_Impl(m_pCharFmtLB);
bAutomaticCharStyles = sal_True;
}
return 0;
@@ -1806,13 +1795,13 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox )
void SvxNumOptionsTabPage::CheckForStartValue_Impl(sal_uInt16 nNumberingType)
{
- sal_Bool bIsNull = aStartED.GetValue() == 0;
+ sal_Bool bIsNull = m_pStartED->GetValue() == 0;
sal_Bool bNoZeroAllowed = nNumberingType < SVX_NUM_ARABIC ||
SVX_NUM_CHARS_UPPER_LETTER_N == nNumberingType ||
SVX_NUM_CHARS_LOWER_LETTER_N == nNumberingType;
- aStartED.SetMin(bNoZeroAllowed ? 1 : 0);
+ m_pStartED->SetMin(bNoZeroAllowed ? 1 : 0);
if(bIsNull && bNoZeroAllowed)
- aStartED.GetModifyHdl().Call(&aStartED);
+ m_pStartED->GetModifyHdl().Call(m_pStartED);
}
IMPL_LINK( SvxNumOptionsTabPage, OrientHdl_Impl, ListBox *, pBox )
@@ -1905,7 +1894,7 @@ IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton )
String aGrfName;
Size aSize;
sal_Bool bSucc(sal_False);
- SvxOpenGraphicDialog aGrfDlg( CUI_RES(RID_STR_EDIT_GRAPHIC) );
+ SvxOpenGraphicDialog aGrfDlg( CUI_RES(RID_SVXSTR_EDIT_GRAPHIC) );
if(MN_GALLERY_ENTRY <= nItemId )
{
@@ -1948,7 +1937,7 @@ IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton )
if(nActNumLvl & nMask)
{
SvxNumberFormat aNumFmt(pActNum->GetLevel(i));
- aNumFmt.SetCharFmtName(sNumCharFmtName);
+ aNumFmt.SetCharFmtName(m_sNumCharFmtName);
aNumFmt.SetGraphic(aGrfName);
// set size for a later comparison
@@ -1962,15 +1951,15 @@ IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton )
}
nMask <<= 1;
}
- aRatioCB .Enable();
- aSizeFT .Enable();
- aMultFT.Enable();
- aWidthMF .Enable();
- aHeightMF.Enable();
- SetMetricValue(aWidthMF, aSize.Width(), eCoreUnit);
- SetMetricValue(aHeightMF, aSize.Height(), eCoreUnit);
- aOrientFT.Enable();
- aOrientLB.Enable();
+ m_pRatioCB->Enable();
+ m_pWidthFT->Enable();
+ m_pHeightFT->Enable();
+ m_pWidthMF->Enable();
+ m_pHeightMF->Enable();
+ SetMetricValue(*m_pWidthMF, aSize.Width(), eCoreUnit);
+ SetMetricValue(*m_pHeightMF, aSize.Height(), eCoreUnit);
+ m_pOrientFT->Enable();
+ m_pOrientLB->Enable();
SetModified();
//needed due to asynchronous loading of graphics in the SvxBrushItem
aInvalidateTimer.Start();
@@ -1984,11 +1973,12 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage, PopupActivateHdl_Impl)
{
bMenuButtonInitialized = sal_True;
EnterWait();
- PopupMenu* pPopup = aBitmapMB.GetPopupMenu()->GetPopupMenu( MN_GALLERY );
+ PopupMenu* pMenu = m_pBitmapMB->GetPopupMenu();
+ PopupMenu* pPopup = pMenu->GetPopupMenu(m_nGalleryId);
- if(GalleryExplorer::FillObjList(GALLERY_THEME_BULLETS, aGrfNames))
+ if (GalleryExplorer::FillObjList(GALLERY_THEME_BULLETS, aGrfNames))
{
- pPopup->RemoveItem( pPopup->GetItemPos( NUM_NO_GRAPHIC ));
+ pPopup->Clear();
GalleryExplorer::BeginLocking(GALLERY_THEME_BULLETS);
Graphic aGraphic;
@@ -2095,11 +2085,11 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage, BulletHdl_Impl)
IMPL_LINK( SvxNumOptionsTabPage, SizeHdl_Impl, MetricField *, pField)
{
- sal_Bool bWidth = pField == &aWidthMF;
+ sal_Bool bWidth = pField == m_pWidthMF;
bLastWidthModified = bWidth;
- sal_Bool bRatio = aRatioCB.IsChecked();
- long nWidthVal = static_cast<long>(aWidthMF.Denormalize(aWidthMF.GetValue(FUNIT_100TH_MM)));
- long nHeightVal = static_cast<long>(aHeightMF.Denormalize(aHeightMF.GetValue(FUNIT_100TH_MM)));
+ sal_Bool bRatio = m_pRatioCB->IsChecked();
+ long nWidthVal = static_cast<long>(m_pWidthMF->Denormalize(m_pWidthMF->GetValue(FUNIT_100TH_MM)));
+ long nHeightVal = static_cast<long>(m_pHeightMF->Denormalize(m_pHeightMF->GetValue(FUNIT_100TH_MM)));
nWidthVal = OutputDevice::LogicToLogic( nWidthVal ,
MAP_100TH_MM, (MapUnit)eCoreUnit );
nHeightVal = OutputDevice::LogicToLogic( nHeightVal,
@@ -2130,7 +2120,7 @@ IMPL_LINK( SvxNumOptionsTabPage, SizeHdl_Impl, MetricField *, pField)
if (bRatio)
{
aSize.Height() = aInitSize[i].Height() + (long)((double)nDelta / fSizeRatio);
- aHeightMF.SetUserValue(aHeightMF.Normalize(
+ m_pHeightMF->SetUserValue(m_pHeightMF->Normalize(
OutputDevice::LogicToLogic( aSize.Height(), (MapUnit)eCoreUnit, MAP_100TH_MM )),
FUNIT_100TH_MM);
}
@@ -2142,7 +2132,7 @@ IMPL_LINK( SvxNumOptionsTabPage, SizeHdl_Impl, MetricField *, pField)
if (bRatio)
{
aSize.Width() = aInitSize[i].Width() + (long)((double)nDelta * fSizeRatio);
- aWidthMF.SetUserValue(aWidthMF.Normalize(
+ m_pWidthMF->SetUserValue(m_pWidthMF->Normalize(
OutputDevice::LogicToLogic( aSize.Width(), (MapUnit)eCoreUnit, MAP_100TH_MM )),
FUNIT_100TH_MM);
}
@@ -2166,9 +2156,9 @@ IMPL_LINK( SvxNumOptionsTabPage, RatioHdl_Impl, CheckBox *, pBox )
if (pBox->IsChecked())
{
if (bLastWidthModified)
- SizeHdl_Impl(&aWidthMF);
+ SizeHdl_Impl(m_pWidthMF);
else
- SizeHdl_Impl(&aHeightMF);
+ SizeHdl_Impl(m_pHeightMF);
}
return 0;
}
@@ -2176,8 +2166,8 @@ IMPL_LINK( SvxNumOptionsTabPage, RatioHdl_Impl, CheckBox *, pBox )
IMPL_LINK_NOARG(SvxNumOptionsTabPage, CharFmtHdl_Impl)
{
bAutomaticCharStyles = sal_False;
- sal_uInt16 nEntryPos = aCharFmtLB.GetSelectEntryPos();
- String sEntry = aCharFmtLB.GetSelectEntry();
+ sal_uInt16 nEntryPos = m_pCharFmtLB->GetSelectEntryPos();
+ String sEntry = m_pCharFmtLB->GetSelectEntry();
sal_uInt16 nMask = 1;
String aEmptyStr;
for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
@@ -2203,9 +2193,9 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage, CharFmtHdl_Impl)
IMPL_LINK( SvxNumOptionsTabPage, EditModifyHdl_Impl, Edit *, pEdit )
{
- sal_Bool bPrefix = pEdit == &aPrefixED;
- sal_Bool bSuffix = pEdit == &aSuffixED;
- sal_Bool bStart = pEdit == &aStartED;
+ sal_Bool bPrefix = pEdit == m_pPrefixED;
+ sal_Bool bSuffix = pEdit == m_pSuffixED;
+ sal_Bool bStart = pEdit == m_pStartED;
sal_uInt16 nMask = 1;
for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
{
@@ -2213,14 +2203,14 @@ IMPL_LINK( SvxNumOptionsTabPage, EditModifyHdl_Impl, Edit *, pEdit )
{
SvxNumberFormat aNumFmt(pActNum->GetLevel(i));
if(bPrefix)
- aNumFmt.SetPrefix( aPrefixED.GetText() );
+ aNumFmt.SetPrefix( m_pPrefixED->GetText() );
else if(bSuffix)
- aNumFmt.SetSuffix( aSuffixED.GetText() );
+ aNumFmt.SetSuffix( m_pSuffixED->GetText() );
else if(bStart)
- aNumFmt.SetStart( (sal_uInt16)aStartED.GetValue() );
+ aNumFmt.SetStart( (sal_uInt16)m_pStartED->GetValue() );
else //align
{
- sal_uInt16 nPos = aAlignLB.GetSelectEntryPos();
+ sal_uInt16 nPos = m_pAlignLB->GetSelectEntryPos();
SvxAdjust eAdjust = SVX_ADJUST_CENTER;
if(nPos == 0)
eAdjust = SVX_ADJUST_LEFT;
@@ -3526,12 +3516,11 @@ void SvxNumOptionsTabPage::SetModified(sal_Bool bRepaint)
bModified = sal_True;
if(bRepaint)
{
- pPreviewWIN->SetLevel(nActNumLvl);
- pPreviewWIN->Invalidate();
+ m_pPreviewWIN->SetLevel(nActNumLvl);
+ m_pPreviewWIN->Invalidate();
}
}
-
void SvxNumOptionsTabPage::PageCreated(SfxAllItemSet aSet)
{
SFX_ITEMSET_ARG (&aSet,pListItem,SfxStringListItem,SID_CHAR_FMT_LIST_BOX,sal_False);
diff --git a/cui/source/tabpages/numpages.hrc b/cui/source/tabpages/numpages.hrc
index ef90df0..a8343b2 100644
--- a/cui/source/tabpages/numpages.hrc
+++ b/cui/source/tabpages/numpages.hrc
@@ -16,68 +16,4 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#define FT_ALIGN 50
-#define LB_ALIGN 51
-
-#define FT_WIDTH 67
-#define FT_HEIGHT 70
-
-#define STR_BULLET 200
-
-#define LB_FORM 210
-#define ED_FORM 211
-
-#define FT_LEVEL 151
-#define LB_LEVEL 152
-#define FL_FORMAT 153
-#define FL_POSITION 154
-#define FT_PREFIX 155
-#define ED_PREFIX 156
-#define FT_FMT 157
-#define LB_FMT 158
-#define FT_SUFFIX 159
-#define ED_SUFFIX 160
-#define FT_INDENT 165
-#define MF_INDENT 166
-#define FT_CHARFMT 167
-#define LB_CHARFMT 168
-#define NF_ALL_LEVEL 169
-#define FT_START 170
-#define ED_START 171
-#define PB_BULLET 173
-#define WIN_PREVIEW 174
-#define FT_BITMAP 175
-#define PB_SEARCH 176
-#define CB_RATIO 177
-#define FT_SIZE 178
-#define MF_WIDTH 179
-#define FT_MULT 180
-#define MF_HEIGHT 181
-#define FT_ORIENT 182
-#define LB_ORIENT 183
-#define MB_BITMAP 184
-#define FT_ALL_LEVEL 186
-#define CB_SAME_LEVEL 188
-#define FL_SAME_LEVEL 189
-#define FT_BUL_COLOR 190
-#define LB_BUL_COLOR 191
-#define FT_BUL_REL_SIZE 192
-#define MF_BUL_REL_SIZE 193
-// 194 removed
-#define ST_POPUP_EMPTY_ENTRY 195
-
-#define MN_GRAPHIC_DLG 1
-#define MN_GALLERY 2
#define MN_GALLERY_ENTRY 100
-
-#define FT_LABEL_FOLLOWED_BY 250
-#define LB_LABEL_FOLLOWED_BY 251
-#define FT_LISTTAB 252
-#define MF_LISTTAB 253
-#define FT_ALIGN_2 254
-#define LB_ALIGN_2 255
-#define FT_ALIGNED_AT 256
-#define MF_ALIGNED_AT 257
-#define FT_INDENT_AT 258
-#define MF_INDENT_AT 259
-
diff --git a/cui/source/tabpages/numpages.src b/cui/source/tabpages/numpages.src
deleted file mode 100644
index be5b9ff..0000000
--- a/cui/source/tabpages/numpages.src
+++ /dev/null
@@ -1,422 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <cuires.hrc>
-#include <helpid.hrc>
-#include "numpages.hrc"
-#include <svx/dialogs.hrc>
-
-/**************************************************************************/
-/* */
-/* TabPage Numerierungsoptionen */
-/* */
-/**************************************************************************/
-TabPage RID_SVXPAGE_NUM_OPTIONS
-{
- HelpID = HID_SVXPAGE_NUM_OPTIONS ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
- Hide = TRUE;
- FixedText FT_LEVEL
- {
- Pos = MAP_APPFONT ( 12 , 14 ) ;
- Size = MAP_APPFONT ( 50 , 8 ) ;
- Text [ en-US ] = "Level" ;
- };
- MultiListBox LB_LEVEL
- {
- HelpID = "cui:MultiListBox:RID_SVXPAGE_NUM_OPTIONS:LB_LEVEL";
- Pos = MAP_APPFONT ( 12 , 25 ) ;
- Size = MAP_APPFONT ( 26 , 154 ) ;
- TabStop = TRUE ;
- DropDown = FALSE ;
- Border = TRUE ;
- SimpleMode = TRUE ;
- };
- FixedLine FL_FORMAT
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 248 , 8 ) ;
- Text [ en-US ] = "Format" ;
- };
- FixedText FT_FMT
- {
- Pos = MAP_APPFONT ( 50 , 27 ) ;
- Size = MAP_APPFONT ( 50, 8 ) ;
- Text [ en-US ] = "~Numbering" ;
- };
- ListBox LB_FMT
- {
- HelpID = "cui:ListBox:RID_SVXPAGE_NUM_OPTIONS:LB_FMT";
- Pos = MAP_APPFONT ( 103 , 25 ) ;
- Size = MAP_APPFONT ( 67 , 72 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- CurPos = 0 ;
- StringList [ en-US ] =
- {
- < "1, 2, 3, ..." ; 4/*SVX_NUM_ARABIC */; > ;
- < "A, B, C, ..." ; 0/*SVX_NUM_CHARS_UPPER_LETTER */; > ;
- < "a, b, c, ..." ; 1/*SVX_NUM_CHARS_LOWER_LETTER */; > ;
- < "I, II, III, ..." ; 2/*SVX_NUM_ROMAN_UPPER */; > ;
- < "i, ii, iii, ..." ; 3/*SVX_NUM_ROMAN_LOWER */; > ;
- < "A, .., AA, .., AAA, ..." ; 9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
- < "a, .., aa, .., aaa, ..." ; 10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ;
- < "Bullet" ; 6/*SVX_NUM_CHAR_SPECIAL */; > ;
- < "Graphics" ; 8/*SVX_NUM_BITMAP */; > ;
- < "Linked graphics" ; 0x88/*SVX_NUM_BITMAP|0x80 */; > ;
- < "None" ; 5/*SVX_NUM_NUMBER_NONE */; > ;
- < "Native Numbering" ; 12 /*NATIVE_NUMBERING */; > ;
- < "Ð, Б, .., Ðа, Ðб, ... (Bulgarian)" ; 38 /*CHARS_CYRILLIC_UPPER_LETTER_BG */; > ;
- < "а, б, .., аа, аб, ... (Bulgarian)" ; 39 /*CHARS_CYRILLIC_LOWER_LETTER_BG */; > ;
- < "Ð, Б, .., Ðа, Бб, ... (Bulgarian)" ; 40 /*CHARS_CYRILLIC_UPPER_LETTER_N_BG */; > ;
- < "а, б, .., аа, бб, ... (Bulgarian)" ; 41 /*CHARS_CYRILLIC_LOWER_LETTER_N_BG */; > ;
- < "Ð, Б, .., Ðа, Ðб, ... (Russian)" ; 42 /*CHARS_CYRILLIC_UPPER_LETTER_RU */; > ;
- < "а, б, .., аа, аб, ... (Russian)" ; 43 /*CHARS_CYRILLIC_LOWER_LETTER_RU */; > ;
- < "Ð, Б, .., Ðа, Бб, ... (Russian)" ; 44 /*CHARS_CYRILLIC_UPPER_LETTER_N_RU */; > ;
- < "а, б, .., аа, бб, ... (Russian)" ; 45 /*CHARS_CYRILLIC_LOWER_LETTER_N_RU */; > ;
- < "Ð, Б, .., Ðа, Ðб, ... (Serbian)" ; 48 /*CHARS_CYRILLIC_UPPER_LETTER_SR */; > ;
- < "а, б, .., аа, аб, ... (Serbian)" ; 49 /*CHARS_CYRILLIC_LOWER_LETTER_SR */; > ;
- < "Ð, Б, .., Ðа, Бб, ... (Serbian)" ; 50 /*CHARS_CYRILLIC_UPPER_LETTER_N_SR */; > ;
- < "а, б, .., аа, бб, ... (Serbian)" ; 51 /*CHARS_CYRILLIC_LOWER_LETTER_N_SR */; > ;
- < "Α, Β, Γ, ... (Greek Upper Letter)"; 52 /*CHARS_GREEK_UPPER_LETTER */; > ;
- < "α, β, γ, ... (Greek Lower Letter)"; 53 /*CHARS_GREEK_LOWER_LETTER */; > ;
- };
- };
- FixedText FT_PREFIX
- {
- Pos = MAP_APPFONT ( 50 , 43 ) ;
- Size = MAP_APPFONT ( 50 , 8 ) ;
- Text [ en-US ] = "Before" ;
- Left = TRUE ;
- };
- Edit ED_PREFIX
- {
- HelpID = "cui:Edit:RID_SVXPAGE_NUM_OPTIONS:ED_PREFIX";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 103 , 41 ) ;
- Size = MAP_APPFONT ( 67 , 12 ) ;
- TabStop = TRUE ;
- Left = TRUE ;
- MaxTextLength = 50 ;
- };
- FixedText FT_SUFFIX
- {
- Pos = MAP_APPFONT ( 50 , 59 ) ;
- Size = MAP_APPFONT ( 50 , 8 ) ;
- Text [ en-US ] = "After" ;
- Left = TRUE ;
- };
- Edit ED_SUFFIX
- {
- HelpID = "cui:Edit:RID_SVXPAGE_NUM_OPTIONS:ED_SUFFIX";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 103 , 57 ) ;
- Size = MAP_APPFONT ( 67 , 12 ) ;
- TabStop = TRUE ;
- Left = TRUE ;
- MaxTextLength = 50 ;
- };
- FixedText FT_CHARFMT
- {
- Pos = MAP_APPFONT ( 50 , 75 ) ;
- Size = MAP_APPFONT ( 50 , 8 ) ;
- Text [ en-US ] = "~Character Style" ;
- };
- ListBox LB_CHARFMT
- {
- HelpID = "cui:ListBox:RID_SVXPAGE_NUM_OPTIONS:LB_CHARFMT";
- TabStop = TRUE ;
- DropDown = TRUE ;
- Pos = MAP_APPFONT ( 103 , 73 ) ;
- Size = MAP_APPFONT ( 67 , 72 ) ;
- };
- FixedText FT_BUL_COLOR
- {
- Pos = MAP_APPFONT ( 50 , 75 ) ;
- Size = MAP_APPFONT ( 50 , 8 ) ;
- Hide = TRUE;
- Text [ en-US ] = "Color";
- };
- ListBox LB_BUL_COLOR
- {
- HelpID = "cui:ListBox:RID_SVXPAGE_NUM_OPTIONS:LB_BUL_COLOR";
- TabStop = TRUE ;
- DropDown = TRUE ;
- Pos = MAP_APPFONT ( 103 , 73 ) ;
- Size = MAP_APPFONT ( 67 , 100 ) ;
- Hide = TRUE;
- };
- FixedText FT_BUL_REL_SIZE
- {
- Pos = MAP_APPFONT ( 50 , 91 ) ;
- Size = MAP_APPFONT ( 50 , 8 ) ;
- Hide = TRUE;
- Text [ en-US ] = "~Relative size";
- };
- MetricField MF_BUL_REL_SIZE
- {
- HelpID = "cui:MetricField:RID_SVXPAGE_NUM_OPTIONS:MF_BUL_REL_SIZE";
- Pos = MAP_APPFONT ( 103 , 89 ) ;
- Size = MAP_APPFONT ( 67 , 12 ) ;
- Border = TRUE ;
- Group = TRUE ;
- Left = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
- SpinSize = 1 ;
- Minimum = 1;
- Maximum = 250;
- Hide = TRUE;
- };
- FixedText FT_ALL_LEVEL
- {
- Pos = MAP_APPFONT ( 50 , 91 ) ;
- Size = MAP_APPFONT ( 50 , 8 ) ;
- Text [ en-US ] = "Show sublevels" ;
- };
- NumericField NF_ALL_LEVEL
- {
- HelpID = "cui:NumericField:RID_SVXPAGE_NUM_OPTIONS:NF_ALL_LEVEL";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 103 , 89 ) ;
- Size = MAP_APPFONT ( 67 , 12 ) ;
- TabStop = TRUE ;
- Left = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = 1 ;
- Maximum = 10 ;
- Value = 1 ;
- First = 1 ;
- Last = 10 ;
- };
- FixedText FT_START
- {
- Pos = MAP_APPFONT ( 50 , 107 ) ;
- Size = MAP_APPFONT ( 50 , 8 ) ;
- Text [ en-US ] = "Start at" ;
- Left = TRUE ;
- };
- NumericField ED_START
- {
- HelpID = "cui:NumericField:RID_SVXPAGE_NUM_OPTIONS:ED_START";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 103 , 105 ) ;
- Size = MAP_APPFONT ( 67 , 12 ) ;
- TabStop = TRUE ;
- Left = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = 0 ;
- Maximum = 65535 ;
- Value = 1 ;
- First = 0 ;
- Last = 65535 ;
- };
- FixedText FT_ALIGN
- {
- Pos = MAP_APPFONT ( 50 , 135 ) ;
- Size = MAP_APPFONT ( 50 , 8 ) ;
- Text [ en-US ] = "~Alignment" ;
- Hide = TRUE;
- };
- ListBox LB_ALIGN
- {
- HelpID = "cui:ListBox:RID_SVXPAGE_NUM_OPTIONS:LB_ALIGN";
- Pos = MAP_APPFONT ( 103 , 133 ) ;
- Size = MAP_APPFONT ( 40 , 40 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- Hide = TRUE;
- StringList [ en-US ] =
- {
- < "Left" ; > ;
- < "Centered" ; > ;
- < "Right" ; > ;
- };
- };
- String STR_BULLET
- {
- Text [ en-US ] = "Character" ;
- };
- PushButton PB_BULLET
- {
- HelpID = "cui:PushButton:RID_SVXPAGE_NUM_OPTIONS:PB_BULLET";
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 103 , 105 ) ;
- Size = MAP_APPFONT ( 12 , 12 ) ;
- Text = "..." ;
- TabStop = TRUE ;
- };
- FixedText FT_BITMAP
- {
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 50 , 43 ) ;
- Size = MAP_APPFONT ( 50 , 8 ) ;
- Text [ en-US ] = "Graphics" ;
- };
- MenuButton MB_BITMAP
- {
- HelpID = "cui:MenuButton:RID_SVXPAGE_NUM_OPTIONS:MB_BITMAP";
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 103 , 41 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- ButtonMenu = Menu
- {
- ItemList =
- {
- MenuItem
- {
- Identifier = MN_GRAPHIC_DLG ;
- // HelpID = HID_NUM_NAMED_NUMS ;
- Text [ en-US ] = "From file..." ;
- };
- MenuItem
- {
- Identifier = MN_GALLERY ;
- Text [ en-US ] = "Gallery";
- };
- };
- };
- Text [ en-US ] = "Select..." ;
- };
- FixedText FT_SIZE
- {
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 50 , 61 ) ;
- Size = MAP_APPFONT ( 50 , 8 ) ;
- Text [ en-US ] = "Width" ;
- };
- MetricField MF_WIDTH
- {
- HelpID = "cui:MetricField:RID_SVXPAGE_NUM_OPTIONS:MF_WIDTH";
- Pos = MAP_APPFONT ( 103 , 59 ) ;
- Size = MAP_APPFONT ( 67 , 12 ) ;
- Border = TRUE ;
- TabStop = TRUE ;
- Left = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = 0 ;
- Maximum = 1999 ;
- DecimalDigits = 2 ;
- Value = 0 ;
- Unit = FUNIT_CM ;
- First = 0 ;
- Last = 1999 ;
- SpinSize = 5 ;
- Hide = TRUE ;
- };
- FixedText FT_MULT
- {
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 50 , 77 ) ;
- Size = MAP_APPFONT ( 50 , 8 ) ;
- Text [ en-US ] = "Height" ;
- };
- MetricField MF_HEIGHT
- {
- HelpID = "cui:MetricField:RID_SVXPAGE_NUM_OPTIONS:MF_HEIGHT";
- Pos = MAP_APPFONT ( 103 , 75 ) ;
- Size = MAP_APPFONT ( 67 , 12 ) ;
- Border = TRUE ;
- TabStop = TRUE ;
- Left = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = 0 ;
- Maximum = 1999 ;
- DecimalDigits = 2 ;
- Value = 0 ;
- Unit = FUNIT_CM ;
- First = 0 ;
- Last = 1999 ;
- SpinSize = 5 ;
- Hide = TRUE ;
- };
- CheckBox CB_RATIO
- {
- HelpID = "cui:CheckBox:RID_SVXPAGE_NUM_OPTIONS:CB_RATIO";
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 50 , 91 ) ;
- Size = MAP_APPFONT ( 100 , 10 ) ;
- Text [ en-US ] = "Keep ratio" ;
- };
- FixedText FT_ORIENT
- {
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 50 , 105 ) ;
- Size = MAP_APPFONT ( 50 , 8 ) ;
- Text [ en-US ] = "Alignment" ;
- };
- ListBox LB_ORIENT
- {
- HelpID = "cui:ListBox:RID_SVXPAGE_NUM_OPTIONS:LB_ORIENT";
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 103 , 103 ) ;
- Size = MAP_APPFONT ( 67 , 72 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- CurPos = 0 ;
- StringList [ en-US ] =
- {
- < "Top of baseline" ; > ;
- < "Center of baseline" ; > ;
- < "Bottom of baseline" ; > ;
- < "Top of character" ; > ;
- < "Center of character" ; > ;
- < "Bottom of character" ; > ;
- < "Top of line" ; > ;
- < "Center of line" ; > ;
- < "Bottom of line" ; > ;
- };
- };
- FixedLine FL_SAME_LEVEL
- {
- Pos = MAP_APPFONT ( 47 , 156 ) ;
- Size = MAP_APPFONT ( 126 , 8 ) ;
- Text [ en-US ] = "All levels" ;
- };
- CheckBox CB_SAME_LEVEL
- {
- HelpID = "cui:CheckBox:RID_SVXPAGE_NUM_OPTIONS:CB_SAME_LEVEL";
- Pos = MAP_APPFONT ( 53 , 167 ) ;
- Size = MAP_APPFONT ( 114 , 10 ) ;
- Text [ en-US ] = "~Consecutive numbering" ;
- };
- Window WIN_PREVIEW
- {
- Pos = MAP_APPFONT ( 179 , 25 ) ;
- Size = MAP_APPFONT ( 69 , 154 ) ;
- Border = TRUE ;
- };
- String ST_POPUP_EMPTY_ENTRY
- {
- Text [ en-US ] = "There are no graphics in the 'Bullets' Gallery theme.";
- };
-
-};
-
-String RID_STR_EDIT_GRAPHIC
-{
- Text [ en-US ] = "Link" ;
-};
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 991ae9d..8e65d47 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -456,7 +456,7 @@ void SvxLineTabPage::SymbolSelected(MenuButton* pButton)
break;
default:
{
- SvxOpenGraphicDialog aGrfDlg(CUI_RES(RID_STR_EDIT_GRAPHIC));
+ SvxOpenGraphicDialog aGrfDlg(CUI_RES(RID_SVXSTR_EDIT_GRAPHIC));
aGrfDlg.EnableLink(false);
aGrfDlg.AsLink(false);
if( !aGrfDlg.Execute() )
diff --git a/cui/uiconfig/ui/numberingoptionspage.ui b/cui/uiconfig/ui/numberingoptionspage.ui
new file mode 100644
index 0000000..aecf877
--- /dev/null
+++ b/cui/uiconfig/ui/numberingoptionspage.ui
@@ -0,0 +1,785 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">19.989999999999998</property>
+ <property name="step_increment">0.050000000000000003</property>
+ <property name="page_increment">1</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment2">
+ <property name="upper">65535</property>
+ <property name="value">1</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment3">
+ <property name="lower">1</property>
+ <property name="upper">10</property>
+ <property name="value">1</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">1</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment4">
+ <property name="lower">1</property>
+ <property name="upper">250</property>
+ <property name="value">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkBox" id="NumberingOptionsPage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">10</property>
+ <property name="margin_right">10</property>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkTreeView" id="levellb">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">False</property>
+ <property name="search_column">0</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection4"/>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Level</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkFrame" id="frame2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkBox" id="box2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">10</property>
+ <child>
+ <object class="GtkGrid" id="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">12</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Number</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="charstyleft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Character Style</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="sublevelsft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Show sublevels</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="separator">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Separator</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">7</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="charstyle">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="sublevels">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment3</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">6</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="prefix">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="invisible_char_set">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">8</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="suffix">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="invisible_char_set">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">9</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="startat">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment2</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">10</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">20</property>
+ <child>
+ <object class="GtkLabel" id="prefixft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Before</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">8</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list