[Libreoffice-commits] .: 4 commits - chart2/source cui/source sc/source sd/source sfx2/inc sfx2/Package_inc.mk sfx2/source solenv/gbuild starmath/source svx/source sw/inc sw/source
David Tardon
dtardon at kemper.freedesktop.org
Wed May 16 22:59:45 PDT 2012
chart2/source/controller/dialogs/TabPages.hrc | 2
chart2/source/controller/dialogs/tp_AxisLabel.src | 2
chart2/source/controller/dialogs/tp_AxisPositions.src | 2
chart2/source/controller/dialogs/tp_DataLabel.src | 2
chart2/source/controller/dialogs/tp_ErrorBars.src | 2
chart2/source/controller/dialogs/tp_LegendPosition.src | 2
chart2/source/controller/dialogs/tp_PointGeometry.src | 2
chart2/source/controller/dialogs/tp_PolarOptions.src | 4 +
chart2/source/controller/dialogs/tp_Scale.src | 5 +-
chart2/source/controller/dialogs/tp_SeriesToAxis.src | 5 +-
chart2/source/controller/dialogs/tp_TitleRotation.src | 2
chart2/source/controller/dialogs/tp_Trendline.src | 2
cui/source/dialogs/gallery.src | 4 -
cui/source/options/dbregister.src | 2
cui/source/options/fontsubs.src | 2
cui/source/options/optasian.src | 2
cui/source/options/optchart.src | 2
cui/source/options/optcolor.src | 2
cui/source/options/optctl.src | 2
cui/source/options/optfltr.src | 4 -
cui/source/options/optgdlg.src | 6 +-
cui/source/options/optgenrl.src | 2
cui/source/options/opthtml.src | 2
cui/source/options/optinet2.hrc | 4 -
cui/source/options/optinet2.src | 6 +-
cui/source/options/optjava.src | 2
cui/source/options/optjsearch.src | 2
cui/source/options/optlingu.src | 2
cui/source/options/optmemory.src | 2
cui/source/options/optpath.src | 2
cui/source/options/optsave.src | 2
cui/source/options/optupdt.src | 2
cui/source/tabpages/align.src | 2
cui/source/tabpages/autocdlg.src | 14 +++---
cui/source/tabpages/backgrnd.src | 2
cui/source/tabpages/border.src | 2
cui/source/tabpages/chardlg.src | 8 +--
cui/source/tabpages/connect.src | 2
cui/source/tabpages/grfpage.src | 2
cui/source/tabpages/labdlg.src | 2
cui/source/tabpages/measure.src | 2
cui/source/tabpages/numfmt.src | 2
cui/source/tabpages/numpages.src | 12 ++---
cui/source/tabpages/page.src | 2
cui/source/tabpages/paragrph.src | 8 +--
cui/source/tabpages/swpossizetabpage.src | 2
cui/source/tabpages/tabarea.src | 14 +++---
cui/source/tabpages/tabline.src | 6 +-
cui/source/tabpages/tabstpge.src | 2
cui/source/tabpages/textanim.src | 2
cui/source/tabpages/textattr.src | 2
sc/source/ui/dbgui/validate.src | 8 ++-
sc/source/ui/docshell/tpstat.src | 2
sc/source/ui/pagedlg/hfedtdlg.src | 2
sc/source/ui/pagedlg/pagedlg.src | 2
sc/source/ui/src/attrdlg.src | 2
sc/source/ui/src/opredlin.src | 2
sc/source/ui/src/optdlg.src | 16 +++---
sc/source/ui/src/sortdlg.src | 4 -
sc/source/ui/src/subtdlg.src | 4 -
sd/source/ui/dlg/paragr.src | 2
sd/source/ui/dlg/prntopts.src | 4 +
sd/source/ui/dlg/tpoption.src | 7 ++-
sfx2/Package_inc.mk | 1
sfx2/inc/sfx2/dialogs.hrc | 1
sfx2/inc/sfx2/tabpage.hrc | 39 +++++++++++++++++
sfx2/source/dialog/dinfdlg.src | 11 ++--
sfx2/source/dialog/mgetempl.src | 3 -
sfx2/source/dialog/printopt.src | 3 -
sfx2/source/dialog/securitypage.src | 3 -
solenv/gbuild/Extension.mk | 2
solenv/gbuild/UnoApi.mk | 13 -----
solenv/gbuild/gbuild.mk | 3 -
starmath/source/smres.src | 3 -
svx/source/dialog/hdft.src | 4 -
svx/source/dialog/optgrid.src | 2
sw/inc/envelp.hrc | 2
sw/inc/globals.hrc | 2
sw/source/ui/chrdlg/ccoll.src | 2
sw/source/ui/chrdlg/chardlg.src | 2
sw/source/ui/chrdlg/drpcps.src | 2
sw/source/ui/chrdlg/numpara.src | 2
sw/source/ui/config/mailconfigpage.src | 2
sw/source/ui/config/optcomp.src | 2
sw/source/ui/config/optdlg.src | 12 ++---
sw/source/ui/config/optload.src | 4 -
sw/source/ui/config/redlopt.src | 2
sw/source/ui/dialog/docstdlg.src | 2
sw/source/ui/dialog/regionsw.src | 6 +-
sw/source/ui/envelp/envfmt.src | 2
sw/source/ui/envelp/envlop.src | 2
sw/source/ui/envelp/envprt.src | 2
sw/source/ui/envelp/label.src | 8 +--
sw/source/ui/envelp/labfmt.src | 2
sw/source/ui/envelp/labprt.src | 2
sw/source/ui/fldui/flddb.src | 2
sw/source/ui/fldui/flddinf.src | 2
sw/source/ui/fldui/flddok.src | 2
sw/source/ui/fldui/fldfunc.src | 2
sw/source/ui/fldui/fldref.src | 2
sw/source/ui/fldui/fldvar.src | 2
sw/source/ui/frmdlg/column.src | 2
sw/source/ui/frmdlg/frmpage.src | 8 +--
sw/source/ui/frmdlg/wrap.src | 2
sw/source/ui/index/cnttab.src | 6 +-
sw/source/ui/misc/docfnote.src | 4 -
sw/source/ui/misc/linenum.src | 2
sw/source/ui/misc/num.src | 2
sw/source/ui/misc/outline.src | 2
sw/source/ui/misc/pgfnote.src | 2
sw/source/ui/misc/pggrid.src | 2
sw/source/ui/table/tabledlg.src | 6 +-
112 files changed, 241 insertions(+), 186 deletions(-)
New commits:
commit 3378c2d3b88a8413deeb8365ce40d4ee0716eff6
Author: David Tardon <dtardon at redhat.com>
Date: Thu May 17 07:48:03 2012 +0200
fix spurious delivery of rdb files (better way)
The only task of the UnoApi class is to deliver a RDB file and all the
stuff related to it (i.e., the IDL files and the generated headers). For
that purpose, order-only dependecies are sufficient.
Change-Id: Ibe0a58d1e8ceaad62ff71773e372fb8dfb921fbd
diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk
index 9ecf1ed..6455999 100644
--- a/solenv/gbuild/UnoApi.mk
+++ b/solenv/gbuild/UnoApi.mk
@@ -40,9 +40,8 @@ $(call gb_UnoApiTarget_set_root,$(1),UCR)
$(call gb_UnoApi_get_target,$(1)) :| $(dir $(call gb_UnoApi_get_target,$(1))).dir
$(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1))
-$(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_target,$(1))
-$(call gb_UnoApi_get_target,$(1)) : $(call gb_Package_get_target,$(1)_idl)
-$(call gb_UnoApi_get_target,$(1)) : $(call gb_Package_get_target,$(1)_inc)
+$(call gb_UnoApi_get_target,$(1)) :| $(call gb_Package_get_target,$(1)_idl)
+$(call gb_UnoApi_get_target,$(1)) :| $(call gb_Package_get_target,$(1)_inc)
$(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1))
$(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_clean_target,$(1))
$(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_idl)
commit 06c8ad5197d1e2c7a418a7a5b48bc1ad20ce1754
Author: David Tardon <dtardon at redhat.com>
Date: Thu May 17 07:38:11 2012 +0200
Revert "fix spurious re-delivery of RDB files:"
This reverts commit 07c0b800d9d70857882238204820f75b8dc98b26.
diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk
index 41bfc9f..9ecf1ed 100644
--- a/solenv/gbuild/UnoApi.mk
+++ b/solenv/gbuild/UnoApi.mk
@@ -30,14 +30,6 @@ $(call gb_UnoApi_get_clean_target,%) :
$(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_UnoApi_get_target,$*))
-# override the rule from Package.mk:44:
-# preserving timestamps is not desirable here, because the OUTDIR target
-# depends on package targets _inc and _idl, and those depend on the WORKDIR
-# target, so with timestamps preserved the RDB always gets delivered again
-$(call gb_UnoApi_get_target,%) : $(call gb_UnoApiTarget_get_target,%)
- $(gb_Deliver_GNUCOPY) $(if $(gb_Deliver_CLEARONDELIVER),--remove-destination) --no-dereference --force $< $@
-
-
define gb_UnoApi_UnoApi
$(call gb_UnoApiTarget_UnoApiTarget,$(1))
$(call gb_UnoApiHeadersTarget_UnoApiHeadersTarget,$(1))
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index b570cec..8d35ab3 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -285,7 +285,6 @@ include $(SOLARENV)/inc/minor.mk
# For example:
# $(OUTDIR)/bin/% for executables collides
# with $(OUTDIR)/bin/%.res for resources on unix
-# with $(OUTDIR)/bin/%.rdb for UnoApi
# $(OUTDIR)/lib/%.lib collides
# on windows (static and dynamic libs)
# $(OUTDIR)/xml/% for packageparts collides
@@ -304,7 +303,6 @@ include $(foreach class, \
StaticLibrary \
Executable \
SdiTarget \
- UnoApi \
Package \
CustomTarget \
ExternalLib \
@@ -317,6 +315,7 @@ include $(foreach class, \
JunitTest \
Module \
UnoApiTarget \
+ UnoApi \
UnoApiMerge \
InternalUnoApi \
Zip \
commit 47b6d27c2d6f2c224fa693f3c883644e650e57ca
Author: David Tardon <dtardon at redhat.com>
Date: Thu May 17 07:37:37 2012 +0200
remove duplicated dependency
Change-Id: I4cfe3ce7b7dab5d3fb2d3ddfa28f0fa263593667
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 5029a20..583a9a7 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -189,7 +189,7 @@ $(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_rootdir,$(1))/$(2
$(call gb_Extension_get_rootdir,$(1))/$(2) : SDF := $(gb_SDFLOCATION)$(subst $(SRCDIR),,$(subst $(WORKDIR)/CustomTarget,,$(dir $(3))))localize.sdf
$(call gb_Extension_get_rootdir,$(1))/$(2) : $$(SDF)
$(call gb_Extension_get_rootdir,$(1))/$(2) : $(gb_Extension_HELPEXTARGET)
-$(call gb_Extension_get_rootdir,$(1))/$(2) : $(3) $(gb_Extension_HELPEXTARGET)
+$(call gb_Extension_get_rootdir,$(1))/$(2) : $(3)
$$(call gb_Output_announce,$(2),$(true),XHP,3)
mkdir -p $$(dir $$@) && \
$(gb_Extension_HELPEXCOMMAND) -i $$< -o $$@ -l $(4) -m $$(SDF)
commit f70fe6e651eefbc69c434256f7e74ad53519a36c
Author: David Tardon <dtardon at redhat.com>
Date: Tue May 15 10:10:18 2012 +0200
fdo#49921 make sure all tab pages have the same dimensions
The reason is that they can be combined arbitrarily in dialogs, so
changing, e.g., height of one tab can lead to "interesting" results. Cf.
commits 8631dbf85fb5ed56d225e32ea5a9c36c96b0d649 and
29042d096a2c5812ae179e1553367afd21b0f71e that were the cause of the
problem described fdo#49921.
Change-Id: I9995002a2bd5c3604bdfa06dc817916ce61c558d
diff --git a/chart2/source/controller/dialogs/TabPages.hrc b/chart2/source/controller/dialogs/TabPages.hrc
index c43ef24..30f292a 100644
--- a/chart2/source/controller/dialogs/TabPages.hrc
+++ b/chart2/source/controller/dialogs/TabPages.hrc
@@ -27,6 +27,8 @@
#ifndef CHART_TABPAGES_HRC
#define CHART_TABPAGES_HRC
+#include <sfx2/tabpage.hrc>
+
#include "ResourceIds.hrc"
//see attrib.hrc in old chart
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.src b/chart2/source/controller/dialogs/tp_AxisLabel.src
index 75da7dc..5fac557 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.src
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.src
@@ -30,7 +30,7 @@
TabPage TP_AXIS_LABEL
{
HelpID = HID_SCH_TP_AXIS_LABEL;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE;
CheckBox CB_AXIS_LABEL_SCHOW_DESCR
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.src b/chart2/source/controller/dialogs/tp_AxisPositions.src
index 1173b84..c112837 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.src
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.src
@@ -63,7 +63,7 @@ TabPage TP_AXIS_POSITIONS
HelpID = "chart2:TabPage:TP_AXIS_POSITIONS";
Hide = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine FL_AXIS_LINE
{
diff --git a/chart2/source/controller/dialogs/tp_DataLabel.src b/chart2/source/controller/dialogs/tp_DataLabel.src
index 0f8f12c..8e0dd0d 100644
--- a/chart2/source/controller/dialogs/tp_DataLabel.src
+++ b/chart2/source/controller/dialogs/tp_DataLabel.src
@@ -33,6 +33,6 @@ TabPage TP_DATA_DESCR
Hide = TRUE ;
HelpID = HID_SCH_DATA_DESCR ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
RESOURCE_DATALABEL( 6, 8 )
};
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.src b/chart2/source/controller/dialogs/tp_ErrorBars.src
index b649cb4..60fd5cb 100644
--- a/chart2/source/controller/dialogs/tp_ErrorBars.src
+++ b/chart2/source/controller/dialogs/tp_ErrorBars.src
@@ -33,6 +33,6 @@ TabPage TP_YERRORBAR
HelpID = "chart2:TabPage:TP_YERRORBAR";
Hide = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
RESOURCE_ERRORBARS( 260 - 12, 0 )
};
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.src b/chart2/source/controller/dialogs/tp_LegendPosition.src
index 2b0f938..dde4889 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.src
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.src
@@ -33,7 +33,7 @@ TabPage TP_LEGEND_POS
Hide = TRUE ;
HelpID = HID_SCH_LEGEND_POS ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine GRP_LEGEND
{
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.src b/chart2/source/controller/dialogs/tp_PointGeometry.src
index b6862cb..a655f5a 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.src
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.src
@@ -32,5 +32,5 @@ TabPage TP_LAYOUT
HelpID = "chart2:TabPage:TP_LAYOUT";
Hide = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
};
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.src b/chart2/source/controller/dialogs/tp_PolarOptions.src
index 96463a9..64596fb 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.src
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.src
@@ -25,6 +25,8 @@
*
************************************************************************/
+#include <sfx2/tabpage.hrc>
+
#include "tp_PolarOptions.hrc"
#include "HelpIds.hrc"
@@ -33,7 +35,7 @@ TabPage TP_POLAROPTIONS
HelpID = "chart2:TabPage:TP_POLAROPTIONS";
Hide = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
CheckBox CB_CLOCKWISE
{
diff --git a/chart2/source/controller/dialogs/tp_Scale.src b/chart2/source/controller/dialogs/tp_Scale.src
index eb27b58..399dbac 100644
--- a/chart2/source/controller/dialogs/tp_Scale.src
+++ b/chart2/source/controller/dialogs/tp_Scale.src
@@ -24,6 +24,9 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
+#include <sfx2/tabpage.hrc>
+
#include "HelpIds.hrc"
#include "tp_Scale.hrc"
@@ -59,7 +62,7 @@ TabPage TP_SCALE
HelpID = "chart2:TabPage:TP_SCALE";
Hide = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine FL_SCALE
{
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.src b/chart2/source/controller/dialogs/tp_SeriesToAxis.src
index f307d47..a1ccfa4 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.src
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.src
@@ -24,6 +24,9 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
+#include <sfx2/tabpage.hrc>
+
#include "HelpIds.hrc"
#include "tp_SeriesToAxis.hrc"
@@ -32,7 +35,7 @@ TabPage TP_OPTIONS
HelpID = "chart2:TabPage:TP_OPTIONS";
Hide = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine 1
{
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.src b/chart2/source/controller/dialogs/tp_TitleRotation.src
index c77d915..9529546 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.src
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.src
@@ -33,7 +33,7 @@ TabPage TP_ALIGNMENT
Hide = TRUE ;
HelpID = HID_SCH_ALIGNMENT ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Control CTR_DIAL
{
HelpId = HID_SCH_ALIGNMENT_CTR_DIAL ;
diff --git a/chart2/source/controller/dialogs/tp_Trendline.src b/chart2/source/controller/dialogs/tp_Trendline.src
index 1a28384..b78cead 100644
--- a/chart2/source/controller/dialogs/tp_Trendline.src
+++ b/chart2/source/controller/dialogs/tp_Trendline.src
@@ -33,6 +33,6 @@ TabPage TP_TRENDLINE
HelpID = "chart2:TabPage:TP_TRENDLINE";
Hide = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
RESOURCE_TRENDLINE( 260 - 12, 0 )
};
diff --git a/cui/source/dialogs/gallery.src b/cui/source/dialogs/gallery.src
index 0108027..c60f31a 100644
--- a/cui/source/dialogs/gallery.src
+++ b/cui/source/dialogs/gallery.src
@@ -86,7 +86,7 @@ TabPage RID_SVXTABPAGE_GALLERY_GENERAL
HelpId = HID_GALLERY_PROPERTIES_GENERAL;
SVLook = TRUE ;
Hide = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedImage FI_MS_IMAGE
{
Pos = MAP_APPFONT ( 6 , 6 ) ;
@@ -166,7 +166,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES
HelpId = HID_GALLERY_BROWSER ;
Hide = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedText FT_FILETYPE
{
Pos = MAP_APPFONT ( 6 , 8 ) ;
diff --git a/cui/source/options/dbregister.src b/cui/source/options/dbregister.src
index e2ad56c..3b518ee 100644
--- a/cui/source/options/dbregister.src
+++ b/cui/source/options/dbregister.src
@@ -38,7 +38,7 @@ TabPage RID_SFXPAGE_DBREGISTER
OutputSize = TRUE ;
SVLook = TRUE ;
Hide = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Text [ en-US ] = "Registered databases" ;
FixedText FT_TYPE
diff --git a/cui/source/options/fontsubs.src b/cui/source/options/fontsubs.src
index 5938efe..a99f9ef 100644
--- a/cui/source/options/fontsubs.src
+++ b/cui/source/options/fontsubs.src
@@ -35,7 +35,7 @@ TabPage RID_SVX_FONT_SUBSTITUTION
HelpID = HID_OFA_FONT_SUBSTITUTION ;
SVLook = TRUE ;
Hide = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
CheckBox CB_USETABLE
{
HelpID = "cui:CheckBox:RID_SVX_FONT_SUBSTITUTION:CB_USETABLE";
diff --git a/cui/source/options/optasian.src b/cui/source/options/optasian.src
index 80da631..82ebe28 100644
--- a/cui/source/options/optasian.src
+++ b/cui/source/options/optasian.src
@@ -34,7 +34,7 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT
{
HelpId = HID_OPTIONS_ASIAN_LAYOUT ;
OutputSize = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
SVLook = TRUE ;
Hide = TRUE ;
FixedLine GB_KERNING
diff --git a/cui/source/options/optchart.src b/cui/source/options/optchart.src
index 7c95d04..5b5fe34 100644
--- a/cui/source/options/optchart.src
+++ b/cui/source/options/optchart.src
@@ -34,7 +34,7 @@
TabPage RID_OPTPAGE_CHART_DEFCOLORS
{
HelpID = HID_OPTIONS_CHART_DEFCOLORS;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE;
Text [ en-US ] = "Default Colors";
FixedLine FL_CHART_COLOR_LIST
diff --git a/cui/source/options/optcolor.src b/cui/source/options/optcolor.src
index 4313415..fdfb109 100644
--- a/cui/source/options/optcolor.src
+++ b/cui/source/options/optcolor.src
@@ -36,7 +36,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
OutputSize = TRUE ;
SVLook = TRUE ;
Hide = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine FL_COLORSCHEME
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
diff --git a/cui/source/options/optctl.src b/cui/source/options/optctl.src
index a920770..97769ce 100644
--- a/cui/source/options/optctl.src
+++ b/cui/source/options/optctl.src
@@ -35,7 +35,7 @@ TabPage RID_SVXPAGE_OPTIONS_CTL
{
HelpId = HID_OPTIONS_CTL ;
OutputSize = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
SVLook = TRUE ;
Hide = TRUE ;
Text [ en-US ] = "Complex Text Layout" ;
diff --git a/cui/source/options/optfltr.src b/cui/source/options/optfltr.src
index 60c4030..1523a01 100644
--- a/cui/source/options/optfltr.src
+++ b/cui/source/options/optfltr.src
@@ -33,7 +33,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT
{
HelpID = "cui:TabPage:RID_OFAPAGE_MSFILTEROPT";
OutputSize = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
SVLook = TRUE ;
Hide = TRUE ;
@@ -127,7 +127,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT2
{
HelpID = "cui:TabPage:RID_OFAPAGE_MSFILTEROPT2";
OutputSize = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
SVLook = TRUE ;
Hide = TRUE ;
diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src
index 0e01fe0..4319a95 100644
--- a/cui/source/options/optgdlg.src
+++ b/cui/source/options/optgdlg.src
@@ -40,7 +40,7 @@ TabPage OFA_TP_MISC
{
HelpID = HID_OFA_TP_MISC ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedLine FL_HELP
{
@@ -204,7 +204,7 @@ TabPage OFA_TP_VIEW
{
HelpID = HID_OFA_TP_VIEW ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedLine FL_USERINTERFACE
{
@@ -485,7 +485,7 @@ TabPage OFA_TP_LANGUAGES
{
HelpID = HID_OFA_TP_LANGUAGES ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedLine FL_UI_LANG
{
diff --git a/cui/source/options/optgenrl.src b/cui/source/options/optgenrl.src
index bc57210..5e40efe 100644
--- a/cui/source/options/optgenrl.src
+++ b/cui/source/options/optgenrl.src
@@ -41,7 +41,7 @@ TabPage RID_SFXPAGE_GENERAL
OutputSize = TRUE ;
SVLook = TRUE ;
Hide = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Text [ en-US ] = "User Data" ;
FixedText FT_COMPANY
{
diff --git a/cui/source/options/opthtml.src b/cui/source/options/opthtml.src
index 4d8c0b5..cc47103 100644
--- a/cui/source/options/opthtml.src
+++ b/cui/source/options/opthtml.src
@@ -34,7 +34,7 @@ TabPage RID_OFAPAGE_HTMLOPT
{
HelpID = "cui:TabPage:RID_OFAPAGE_HTMLOPT";
OutputSize = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
SVLook = TRUE ;
Hide = TRUE ;
FixedText FT_SIZE1
diff --git a/cui/source/options/optinet2.hrc b/cui/source/options/optinet2.hrc
index a4c1781..64bf526 100644
--- a/cui/source/options/optinet2.hrc
+++ b/cui/source/options/optinet2.hrc
@@ -27,6 +27,8 @@
#ifndef _SVX_OPTINET_HRC
#define _SVX_OPTINET_HRC
+#include <sfx2/tabpage.hrc>
+
#ifndef _SVT_CONTROLDIMS_HRC_
#include <svtools/controldims.hrc>
#endif
@@ -99,8 +101,6 @@
#define STR_SEC_NOPASSWDSAVE 12
-#define TP_WIDTH 260
-#define TP_HEIGHT 185
#define OFFS_BUTTON_Y (-6)
#define BORDER_OFFSET 8
#define COL_0 (RSC_SP_TBPG_INNERBORDER_LEFT)
diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src
index 029c46e..03688e2 100644
--- a/cui/source/options/optinet2.src
+++ b/cui/source/options/optinet2.src
@@ -40,7 +40,7 @@ TabPage RID_SVXPAGE_INET_MOZPLUGIN
{
HelpID = "cui:TabPage:RID_SVXPAGE_INET_MOZPLUGIN";
OutputSize = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
SVLook = TRUE ;
Hide = TRUE ;
@@ -64,7 +64,7 @@ TabPage RID_SVXPAGE_INET_PROXY
{
HelpId = HID_OPTIONS_PROXY ;
OutputSize = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
SVLook = TRUE ;
Hide = TRUE ;
Text [ en-US ] = "Proxy" ;
@@ -450,7 +450,7 @@ TabPage RID_SVXPAGE_INET_MAIL
{
HelpID = HID_OPTIONS_MAIL ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedLine FL_MAIL
diff --git a/cui/source/options/optjava.src b/cui/source/options/optjava.src
index 6e7a429..0044646 100644
--- a/cui/source/options/optjava.src
+++ b/cui/source/options/optjava.src
@@ -39,7 +39,7 @@ TabPage RID_SVXPAGE_OPTIONS_JAVA
OutputSize = TRUE ;
SVLook = TRUE ;
Hide = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Text [ en-US ] = "Java" ;
FixedLine FL_JAVA
diff --git a/cui/source/options/optjsearch.src b/cui/source/options/optjsearch.src
index 463e688..21f97c0 100644
--- a/cui/source/options/optjsearch.src
+++ b/cui/source/options/optjsearch.src
@@ -36,7 +36,7 @@ TabPage RID_SVXPAGE_JSEARCH_OPTIONS
HelpId = HID_SVXPAGE_JSEARCH_OPTIONS ;
SVLook = TRUE ;
Hide = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine FL_TREAT_AS_EQUAL
{
Pos = MAP_APPFONT( 6, 3 );
diff --git a/cui/source/options/optlingu.src b/cui/source/options/optlingu.src
index 1187295..cc8fb16 100644
--- a/cui/source/options/optlingu.src
+++ b/cui/source/options/optlingu.src
@@ -201,7 +201,7 @@ TabPage RID_SFXPAGE_LINGU
HelpId = HID_OPTIONS_LINGU ;
SVLook = TRUE ;
Hide = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Text [ en-US ] = "Options";
FixedLine FL_LINGUISTIC
{
diff --git a/cui/source/options/optmemory.src b/cui/source/options/optmemory.src
index c1e748b..3d05709 100644
--- a/cui/source/options/optmemory.src
+++ b/cui/source/options/optmemory.src
@@ -35,7 +35,7 @@ TabPage OFA_TP_MEMORY
{
HelpID = HID_OFA_TP_MEMORY ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedLine GB_UNDO
{
diff --git a/cui/source/options/optpath.src b/cui/source/options/optpath.src
index c6400a2..60fc5b1 100644
--- a/cui/source/options/optpath.src
+++ b/cui/source/options/optpath.src
@@ -40,7 +40,7 @@ TabPage RID_SFXPAGE_PATH
OutputSize = TRUE ;
SVLook = TRUE ;
Hide = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Text [ en-US ] = "Paths" ;
FixedText FT_TYPE
{
diff --git a/cui/source/options/optsave.src b/cui/source/options/optsave.src
index eafb980..8bce711 100644
--- a/cui/source/options/optsave.src
+++ b/cui/source/options/optsave.src
@@ -42,7 +42,7 @@ TabPage RID_SFXPAGE_SAVE
SVLook = TRUE ;
Hide = TRUE ;
TEXT_SAVEPAGE
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine LB_LOAD
{
Pos = MAP_APPFONT ( 6 , 2 ) ;
diff --git a/cui/source/options/optupdt.src b/cui/source/options/optupdt.src
index 6b271b9..900ece4 100644
--- a/cui/source/options/optupdt.src
+++ b/cui/source/options/optupdt.src
@@ -37,7 +37,7 @@ TabPage RID_SVXPAGE_ONLINEUPDATE
OutputSize = TRUE ;
SVLook = TRUE ;
Hide = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Text [ en-US ] = "OnlineUpdate" ;
FixedLine FL_OPTIONS
{
diff --git a/cui/source/tabpages/align.src b/cui/source/tabpages/align.src
index 05d4b39..5f922bc 100644
--- a/cui/source/tabpages/align.src
+++ b/cui/source/tabpages/align.src
@@ -41,7 +41,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
HelpId = HID_ALIGNMENT ;
Hide = TRUE ;
Text [ en-US ] = "Alignment" ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
SVLook = TRUE ;
FixedLine FL_ALIGNMENT
{
diff --git a/cui/source/tabpages/autocdlg.src b/cui/source/tabpages/autocdlg.src
index 67dd19b..9c45fd3 100644
--- a/cui/source/tabpages/autocdlg.src
+++ b/cui/source/tabpages/autocdlg.src
@@ -143,7 +143,7 @@ TabPage RID_OFAPAGE_AUTOCORR_OPTIONS
{
HelpId = HID_OFAPAGE_AUTOCORR_OPTIONS ;
OutputSize = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
SVLook = TRUE ;
Text [ en-US ] = "Settings" ;
@@ -166,7 +166,7 @@ TabPage RID_OFAPAGE_AUTOFMT_APPLY
HelpID = HID_OFAPAGE_AUTOFMT_OPTIONS ;
SVLook = TRUE ;
Hide = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Control CLB_SETTINGS
{
Pos = MAP_APPFONT ( 6 , 6 ) ;
@@ -301,7 +301,7 @@ TabPage RID_OFAPAGE_AUTOCORR_REPLACE
{
HelpId = HID_OFAPAGE_AUTOCORR_REPLACE ;
OutputSize = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
SVLook = TRUE ;
Hide = TRUE ;
FixedText FT_SHORT
@@ -380,7 +380,7 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT
{
HelpId = HID_OFAPAGE_AUTOCORR_EXCEPT ;
OutputSize = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
SVLook = TRUE ;
Hide = TRUE ;
FixedLine FL_ABBREV
@@ -506,7 +506,7 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE
{
HelpId = HID_OFAPAGE_AUTOCORR_QUOTE ;
OutputSize = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
SVLook = TRUE ;
Hide = TRUE ;
Text [ en-US ] = "Localized Options" ;
@@ -699,7 +699,7 @@ TabPage RID_OFAPAGE_AUTOCOMPLETE_OPTIONS
{
HelpId = HID_OFAPAGE_AUTOCOMPLETE_OPTIONS ;
OutputSize = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
SVLook = TRUE ;
Hide = TRUE ;
CheckBox CB_ACTIV
@@ -832,7 +832,7 @@ TabPage RID_OFAPAGE_SMARTTAG_OPTIONS
{
HelpId = HID_OFAPAGE_SMARTTAG_OPTIONS ;
OutputSize = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
SVLook = TRUE ;
Hide = TRUE ;
Text [ en-US ] = "Smart Tags";
diff --git a/cui/source/tabpages/backgrnd.src b/cui/source/tabpages/backgrnd.src
index 98de175..adcf7e4 100644
--- a/cui/source/tabpages/backgrnd.src
+++ b/cui/source/tabpages/backgrnd.src
@@ -40,7 +40,7 @@ TabPage RID_SVXPAGE_BACKGROUND
{
HelpId = HID_BACKGROUND ;
Hide = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Text [ en-US ] = "Background" ;
FixedText FT_SELECTOR
{
diff --git a/cui/source/tabpages/border.src b/cui/source/tabpages/border.src
index 45b412d..a7c239e 100644
--- a/cui/source/tabpages/border.src
+++ b/cui/source/tabpages/border.src
@@ -35,7 +35,7 @@
// RID_SVXPAGE_BORDER ---------------------------------------------------
TabPage RID_SVXPAGE_BORDER
{
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Helpid = HID_BORDER ;
Hide = TRUE ;
Text [ en-US ] = "Borders" ;
diff --git a/cui/source/tabpages/chardlg.src b/cui/source/tabpages/chardlg.src
index abf9edc..38553d4 100644
--- a/cui/source/tabpages/chardlg.src
+++ b/cui/source/tabpages/chardlg.src
@@ -36,7 +36,7 @@
TabPage RID_SVXPAGE_CHAR_NAME
{
HelpId = HID_SVXPAGE_CHAR_NAME ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedLine FL_WEST
{
@@ -385,7 +385,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
TabPage RID_SVXPAGE_CHAR_EFFECTS
{
HelpId = HID_SVXPAGE_CHAR_EFFECTS ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedText FT_FONTCOLOR
{
@@ -710,7 +710,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
TabPage RID_SVXPAGE_CHAR_POSITION
{
HelpId = HID_SVXPAGE_CHAR_POSITION ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedLine FL_POSITION
{
@@ -931,7 +931,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
TabPage RID_SVXPAGE_CHAR_TWOLINES
{
HelpId = HID_SVXPAGE_CHAR_TWOLINES ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedLine FL_SWITCHON
{
diff --git a/cui/source/tabpages/connect.src b/cui/source/tabpages/connect.src
index 1414cf0..3ce6de6 100644
--- a/cui/source/tabpages/connect.src
+++ b/cui/source/tabpages/connect.src
@@ -37,7 +37,7 @@ TabPage RID_SVXPAGE_CONNECTION
HelpId = HID_PAGE_CONNECTION ;
SVLook = TRUE ;
Hide = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Text [ en-US ] = "Connector" ;
FixedText FT_TYPE
{
diff --git a/cui/source/tabpages/grfpage.src b/cui/source/tabpages/grfpage.src
index 6e1b5af..d9d2fde 100644
--- a/cui/source/tabpages/grfpage.src
+++ b/cui/source/tabpages/grfpage.src
@@ -43,7 +43,7 @@ TabPage RID_SVXPAGE_GRFCROP
HelpID = HID_SVXPAGE_GRFCROP;
SVLook = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine FL_CROP
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
diff --git a/cui/source/tabpages/labdlg.src b/cui/source/tabpages/labdlg.src
index b096b01..3bbafdf 100644
--- a/cui/source/tabpages/labdlg.src
+++ b/cui/source/tabpages/labdlg.src
@@ -35,7 +35,7 @@ TabPage RID_SVXPAGE_CAPTION
HelpId = HID_CAPTION ;
Hide = TRUE ;
//Size = MAP_APPFONT ( 189 , 97 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Text [ en-US ] = "Callouts" ;
Control CT_CAPTTYPE
{
diff --git a/cui/source/tabpages/measure.src b/cui/source/tabpages/measure.src
index 624cf3e..325949f 100644
--- a/cui/source/tabpages/measure.src
+++ b/cui/source/tabpages/measure.src
@@ -37,7 +37,7 @@ TabPage RID_SVXPAGE_MEASURE
{
HelpId = HID_PAGE_MEASURE ;
Hide = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Text [ en-US ] = "Dimensioning" ;
FixedLine FL_LINE
diff --git a/cui/source/tabpages/numfmt.src b/cui/source/tabpages/numfmt.src
index 867f93c..a182936 100644
--- a/cui/source/tabpages/numfmt.src
+++ b/cui/source/tabpages/numfmt.src
@@ -36,7 +36,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
HelpId = HID_NUMBERFORMAT ;
Hide = TRUE ;
Text [ en-US ] = "Number Format" ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedText FT_CATEGORY
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
diff --git a/cui/source/tabpages/numpages.src b/cui/source/tabpages/numpages.src
index ef3426b..834d3c7 100644
--- a/cui/source/tabpages/numpages.src
+++ b/cui/source/tabpages/numpages.src
@@ -39,7 +39,7 @@ TabPage RID_SVXPAGE_PICK_BULLET
{
HelpID = HID_SVXPAGE_PICK_BULLET ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE;
FixedLine FL_VALUES
{
@@ -63,7 +63,7 @@ TabPage RID_SVXPAGE_PICK_SINGLE_NUM
{
HelpID = HID_SVXPAGE_PICK_SINGLE_NUM ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE;
FixedLine FL_VALUES
{
@@ -87,7 +87,7 @@ TabPage RID_SVXPAGE_PICK_NUM
{
HelpID = HID_SVXPAGE_PICK_NUM;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE;
FixedLine FL_VALUES
{
@@ -111,7 +111,7 @@ TabPage RID_SVXPAGE_PICK_BMP
{
HelpID = HID_SVXPAGE_PICK_BMP;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE;
FixedLine FL_VALUES
{
@@ -152,7 +152,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
{
HelpID = HID_SVXPAGE_NUM_OPTIONS ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE;
FixedText FT_LEVEL
{
@@ -546,7 +546,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
{
HelpID = HID_SVXPAGE_NUM_POSITION ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE;
FixedText FT_LEVEL
{
diff --git a/cui/source/tabpages/page.src b/cui/source/tabpages/page.src
index 2137ff2..367c98a 100644
--- a/cui/source/tabpages/page.src
+++ b/cui/source/tabpages/page.src
@@ -39,7 +39,7 @@ TabPage RID_SVXPAGE_PAGE
{
HelpId = HID_FORMAT_PAGE ;
Hide = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine FL_PAPER_SIZE
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
diff --git a/cui/source/tabpages/paragrph.src b/cui/source/tabpages/paragrph.src
index e064ac7..3ac2c7f 100644
--- a/cui/source/tabpages/paragrph.src
+++ b/cui/source/tabpages/paragrph.src
@@ -36,7 +36,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
HelpId = HID_FORMAT_PARAGRAPH_STD ;
Hide = TRUE ;
Text [ en-US ] = "Indents and Spacing" ;
- Size = MAP_APPFONT ( 260 , 199 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedText FT_LEFTINDENT
{
Pos = MAP_APPFONT ( 12 , 16 ) ;
@@ -282,7 +282,7 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH
HelpId = HID_FORMAT_PARAGRAPH_ALIGN ;
Hide = TRUE ;
Text [ en-US ] = "Alignment" ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine FL_ALIGN
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
@@ -431,7 +431,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
HelpId = HID_FORMAT_PARAGRAPH_EXT ;
Hide = TRUE ;
Text [ en-US ] = "Text Flow" ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
TriStateBox BTN_HYPHEN
{
HelpID = "cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_HYPHEN";
@@ -708,7 +708,7 @@ TabPage RID_SVXPAGE_PARA_ASIAN
HelpId = HID_SVXPAGE_PARA_ASIAN ;
Hide = TRUE ;
Text [ en-US ] = "Asian Typography";
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine FL_AS_OPTIONS
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
diff --git a/cui/source/tabpages/swpossizetabpage.src b/cui/source/tabpages/swpossizetabpage.src
index f22227a..619fe86 100644
--- a/cui/source/tabpages/swpossizetabpage.src
+++ b/cui/source/tabpages/swpossizetabpage.src
@@ -36,7 +36,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE
HelpId = HID_SVXPAGE_SWPOSSIZE;
Hide = TRUE ;
Text[ en-US ] = "Position and Size" ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine FL_SIZE
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
diff --git a/cui/source/tabpages/tabarea.src b/cui/source/tabpages/tabarea.src
index fe22673..3bc0ca8 100644
--- a/cui/source/tabpages/tabarea.src
+++ b/cui/source/tabpages/tabarea.src
@@ -41,7 +41,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE
{
HelpID = HID_AREA_TRANSPARENCE;
Hide = TRUE;
- Size = MAP_APPFONT ( 260 , 185 );
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT );
FixedLine FL_PROP
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
@@ -258,7 +258,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE
// ------------------------------------------------------
TabPage RID_SVXPAGE_AREA
{
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
HelpID = HID_AREA_AREA ;
Hide = TRUE ;
Text [ en-US ] = "Area" ;
@@ -581,7 +581,7 @@ TabPage RID_SVXPAGE_SHADOW
{
HelpID = HID_AREA_SHADOW ;
Hide = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Text [ en-US ] = "Shadow" ;
FixedLine FL_PROP
{
@@ -688,7 +688,7 @@ TabPage RID_SVXPAGE_HATCH
HelpID = HID_AREA_HATCH ;
Hide = TRUE ;
Text [ en-US ] = "Hatching" ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine FL_PROP
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
@@ -868,7 +868,7 @@ TabPage RID_SVXPAGE_BITMAP
HelpID = HID_AREA_BITMAP ;
Hide = TRUE ;
Text [ en-US ] = "Bitmap Patterns" ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine FL_PROP
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
@@ -1017,7 +1017,7 @@ TabPage RID_SVXPAGE_GRADIENT
HelpID = HID_AREA_GRADIENT ;
Hide = TRUE ;
Text [ en-US ] = "Gradients" ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine FL_PROP
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
@@ -1283,7 +1283,7 @@ TabPage RID_SVXPAGE_COLOR
Hide = TRUE ;
Text [ en-US ] = "Colors" ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine FL_PROP
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
diff --git a/cui/source/tabpages/tabline.src b/cui/source/tabpages/tabline.src
index de03c1b..5e0108e 100644
--- a/cui/source/tabpages/tabline.src
+++ b/cui/source/tabpages/tabline.src
@@ -37,7 +37,7 @@
TabPage RID_SVXPAGE_LINE
{
- Size = MAP_APPFONT ( 260 , 185 );
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT );
HelpId = HID_LINE_LINE ;
Hide = TRUE ;
Text [ en-US ] = "Lines" ;
@@ -419,7 +419,7 @@ TabPage RID_SVXPAGE_LINE
TabPage RID_SVXPAGE_LINE_DEF
{
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
HelpId = HID_LINE_DEF ;
Hide = TRUE ;
Text [ en-US ] = "Define line styles" ;
@@ -693,7 +693,7 @@ TabPage RID_SVXPAGE_LINE_DEF
TabPage RID_SVXPAGE_LINEEND_DEF
{
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
HelpId = HID_LINE_ENDDEF ;
Hide = TRUE ;
Text [ en-US ] = "Arrowheads" ;
diff --git a/cui/source/tabpages/tabstpge.src b/cui/source/tabpages/tabstpge.src
index e4f2c60..1b30983 100644
--- a/cui/source/tabpages/tabstpge.src
+++ b/cui/source/tabpages/tabstpge.src
@@ -36,7 +36,7 @@ TabPage RID_SVXPAGE_TABULATOR
HelpId = HID_TABULATOR ;
Hide = TRUE ;
Text [ en-US ] = "Tabs" ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine FL_TABPOS
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
diff --git a/cui/source/tabpages/textanim.src b/cui/source/tabpages/textanim.src
index b330565..f923f81 100644
--- a/cui/source/tabpages/textanim.src
+++ b/cui/source/tabpages/textanim.src
@@ -289,7 +289,7 @@ TabDialog RID_SVXDLG_TEXT
{
OutputSize = TRUE ;
Pos = MAP_APPFONT ( 3 , 3 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
PageList =
{
PageItem
diff --git a/cui/source/tabpages/textattr.src b/cui/source/tabpages/textattr.src
index c4ae4b5..0d8d7b1 100644
--- a/cui/source/tabpages/textattr.src
+++ b/cui/source/tabpages/textattr.src
@@ -36,7 +36,7 @@ TabPage RID_SVXPAGE_TEXTATTR
{
HelpId = HID_PAGE_TEXTATTR ;
Hide = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Text [ en-US ] = "Text" ;
FixedLine FL_TEXT
{
diff --git a/sc/source/ui/dbgui/validate.src b/sc/source/ui/dbgui/validate.src
index 62e7f59..4611224 100644
--- a/sc/source/ui/dbgui/validate.src
+++ b/sc/source/ui/dbgui/validate.src
@@ -25,6 +25,8 @@
*
************************************************************************/
+#include <sfx2/tabpage.hrc>
+
#include "validate.hrc"
TabDialog TAB_DLG_VALIDATION
@@ -69,7 +71,7 @@ TabPage TP_VALIDATION_VALUES
HelpID = "sc:TabPage:TP_VALIDATION_VALUES";
Hide = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Text [ en-US ] = "Values" ;
FixedText FT_ALLOW
{
@@ -204,7 +206,7 @@ TabPage TP_VALIDATION_INPUTHELP
HelpID = "sc:TabPage:TP_VALIDATION_INPUTHELP";
Hide = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Text = "Eingabehilfe" ;
TriStateBox TSB_HELP
{
@@ -257,7 +259,7 @@ TabPage TP_VALIDATION_ERROR
HelpID = "sc:TabPage:TP_VALIDATION_ERROR";
Hide = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine FL_CONTENT
{
Pos = MAP_APPFONT ( 6 , 22 ) ;
diff --git a/sc/source/ui/docshell/tpstat.src b/sc/source/ui/docshell/tpstat.src
index 3ee5b91..90beef2 100644
--- a/sc/source/ui/docshell/tpstat.src
+++ b/sc/source/ui/docshell/tpstat.src
@@ -30,7 +30,7 @@ TabPage RID_SCPAGE_STAT
{
// HelpID = HID_DOC_STAT;
Hide = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedText FT_TABLES_LBL
{
Pos = MAP_APPFONT ( 12 , 17 ) ;
diff --git a/sc/source/ui/pagedlg/hfedtdlg.src b/sc/source/ui/pagedlg/hfedtdlg.src
index bcfdef6..3c3236d 100644
--- a/sc/source/ui/pagedlg/hfedtdlg.src
+++ b/sc/source/ui/pagedlg/hfedtdlg.src
@@ -445,7 +445,7 @@ TabPage RID_HFBASE
Hide = TRUE ;
HelpId = HID_SCPAGE_HFEDIT ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedText FT_LEFT
{
Pos = MAP_APPFONT ( 6 , 6 ) ;
diff --git a/sc/source/ui/pagedlg/pagedlg.src b/sc/source/ui/pagedlg/pagedlg.src
index 0a56d70..d1026a1 100644
--- a/sc/source/ui/pagedlg/pagedlg.src
+++ b/sc/source/ui/pagedlg/pagedlg.src
@@ -164,7 +164,7 @@ TabPage RID_SCPAGE_TABLE
HelpId = HID_SCPAGE_TABLE ;
SVLook = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
CheckBox BTN_HEADER
{
HelpID = "sc:CheckBox:RID_SCPAGE_TABLE:BTN_HEADER";
diff --git a/sc/source/ui/src/attrdlg.src b/sc/source/ui/src/attrdlg.src
index d228a0c..a96bad9 100644
--- a/sc/source/ui/src/attrdlg.src
+++ b/sc/source/ui/src/attrdlg.src
@@ -106,7 +106,7 @@ TabPage RID_SCPAGE_PROTECTION
SVLook = TRUE ;
HelpId = HID_SCPAGE_PROTECTION ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
TriStateBox BTN_PROTECTED
{
HelpID = "sc:TriStateBox:RID_SCPAGE_PROTECTION:BTN_PROTECTED";
diff --git a/sc/source/ui/src/opredlin.src b/sc/source/ui/src/opredlin.src
index fc29e8b..c37de89 100644
--- a/sc/source/ui/src/opredlin.src
+++ b/sc/source/ui/src/opredlin.src
@@ -32,7 +32,7 @@ TabPage RID_SCPAGE_OPREDLINE
SVLook = TRUE ;
Hide = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedText FT_CONTENT
{
HelpID = HID_SCPAGE_OPREDLINBE_FT_CONTENT ;
diff --git a/sc/source/ui/src/optdlg.src b/sc/source/ui/src/optdlg.src
index 013c476..7bb561d 100644
--- a/sc/source/ui/src/optdlg.src
+++ b/sc/source/ui/src/optdlg.src
@@ -38,7 +38,7 @@ TabPage RID_SCPAGE_CALC
SVLook = TRUE ;
Hide = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
CheckBox BTN_ITERATE
{
HelpID = "sc:CheckBox:RID_SCPAGE_CALC:BTN_ITERATE";
@@ -191,7 +191,7 @@ TabPage RID_SCPAGE_FORMULA
SVLook = TRUE ;
Hide = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine FL_FORMULA_OPTIONS
{
@@ -291,7 +291,7 @@ TabPage RID_SCPAGE_COMPATIBILITY
SVLook = TRUE ;
Hide = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine FL_KEY_BINDINGS
{
@@ -334,7 +334,7 @@ TabPage RID_SCPAGE_USERLISTS
SVLook = TRUE ;
Hide = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedText FT_LISTS
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
@@ -439,7 +439,7 @@ TabPage RID_SCPAGE_CONTENT
SVLook = TRUE ;
Hide = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine GB_LINES
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
@@ -696,7 +696,7 @@ TabPage RID_SCPAGE_LAYOUT
SVLook = TRUE ;
Hide = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine GB_UNIT
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
@@ -881,7 +881,7 @@ TabPage RID_SCPAGE_PRINT
SVLook = TRUE ;
Hide = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine FL_PAGES
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
@@ -916,7 +916,7 @@ TabPage RID_SCPAGE_DEFAULTS
SVLook = TRUE ;
Hide = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine FL_INIT_SPREADSHEET
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
diff --git a/sc/source/ui/src/sortdlg.src b/sc/source/ui/src/sortdlg.src
index 466ab7a..7d7a19b 100644
--- a/sc/source/ui/src/sortdlg.src
+++ b/sc/source/ui/src/sortdlg.src
@@ -31,7 +31,7 @@ TabPage RID_SCPAGE_SORT_FIELDS
Hide = TRUE ;
SVLook = TRUE ;
HelpId = HID_SCPAGE_SORT_FIELDS ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
ListBox LB_SORT1
{
HelpID = "sc:ListBox:RID_SCPAGE_SORT_FIELDS:LB_SORT1";
@@ -133,7 +133,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS
SVLook = TRUE ;
HelpId = HID_SCPAGE_SORT_OPTIONS ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
CheckBox BTN_CASESENSITIVE
{
HelpID = "sc:CheckBox:RID_SCPAGE_SORT_OPTIONS:BTN_CASESENSITIVE";
diff --git a/sc/source/ui/src/subtdlg.src b/sc/source/ui/src/subtdlg.src
index 7f3d01e..7b9f8f1 100644
--- a/sc/source/ui/src/subtdlg.src
+++ b/sc/source/ui/src/subtdlg.src
@@ -31,7 +31,7 @@ TabPage RID_SCPAGE_SUBT_OPTIONS
{
HelpId = HID_SCPAGE_SUBT_OPTIONS ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedLine FL_GROUP
{
@@ -119,7 +119,7 @@ TabPage RID_SUBTBASE
// aus den Ableitungen nicht in der HID-Liste auftauchen wuerden
HelpId = HID_SCPAGE_SUBT_GROUP ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedText FT_GROUP
{
diff --git a/sd/source/ui/dlg/paragr.src b/sd/source/ui/dlg/paragr.src
index 99a9d4f..db9d22c 100644
--- a/sd/source/ui/dlg/paragr.src
+++ b/sd/source/ui/dlg/paragr.src
@@ -109,7 +109,7 @@ TabPage RID_TABPAGE_PARA_NUMBERING
HelpId = HID_TABPAGE_PARA_NUMBERING ;
Hide = TRUE ;
Text = "Numbering" ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
TriStateBox CB_NEW_START
{
diff --git a/sd/source/ui/dlg/prntopts.src b/sd/source/ui/dlg/prntopts.src
index 7a4f880..3987a97 100644
--- a/sd/source/ui/dlg/prntopts.src
+++ b/sd/source/ui/dlg/prntopts.src
@@ -25,13 +25,15 @@
*
************************************************************************/
+#include <sfx2/tabpage.hrc>
+
#include "prntopts.hrc"
#include "helpids.h"
TabPage TP_PRINT_OPTIONS
{
HelpID = HID_SD_PRINT_OPTIONS ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Text [ en-US ] = "Options" ;
Hide = TRUE;
FixedLine GRP_PRINT
diff --git a/sd/source/ui/dlg/tpoption.src b/sd/source/ui/dlg/tpoption.src
index 4738231..62e5f3d 100644
--- a/sd/source/ui/dlg/tpoption.src
+++ b/sd/source/ui/dlg/tpoption.src
@@ -24,6 +24,9 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
+#include <sfx2/tabpage.hrc>
+
#include "tpoption.hrc"
#include "helpids.h"
@@ -34,7 +37,7 @@
TabPage TP_OPTIONS_CONTENTS
{
HelpID = HID_SD_OPTIONS_CONTENTS ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE;
Text [ en-US ] = "Contents" ;
FixedLine GRP_DISPLAY
@@ -80,7 +83,7 @@ TabPage TP_OPTIONS_CONTENTS
TabPage TP_OPTIONS_MISC
{
HelpID = HID_SD_OPTIONS_MISC ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE;
Text [ en-US ] = "Other" ;
FixedLine GRP_TEXT
diff --git a/sfx2/Package_inc.mk b/sfx2/Package_inc.mk
index 4dd559d..4c2594c 100644
--- a/sfx2/Package_inc.mk
+++ b/sfx2/Package_inc.mk
@@ -122,6 +122,7 @@ $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/stbitem.hxx,sfx2/stbitem.hxx
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/styfitem.hxx,sfx2/styfitem.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/styledlg.hxx,sfx2/styledlg.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tabdlg.hxx,sfx2/tabdlg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tabpage.hrc,sfx2/tabpage.hrc))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/taskpane.hxx,sfx2/taskpane.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tbxctrl.hxx,sfx2/tbxctrl.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/templdlg.hxx,sfx2/templdlg.hxx))
diff --git a/sfx2/inc/sfx2/dialogs.hrc b/sfx2/inc/sfx2/dialogs.hrc
index 97e9dd7..17ebfdd 100644
--- a/sfx2/inc/sfx2/dialogs.hrc
+++ b/sfx2/inc/sfx2/dialogs.hrc
@@ -30,6 +30,7 @@
// include ------------------------------------------------------------------
#include <sfx2/sfxsids.hrc>
+#include <sfx2/tabpage.hrc>
#define RID_OFA_AUTOCORR_DLG (RID_OFA_START + 101)
#define RID_SVXDLG_CUSTOMIZE (RID_SVX_START + 291)
diff --git a/sfx2/inc/sfx2/tabpage.hrc b/sfx2/inc/sfx2/tabpage.hrc
new file mode 100644
index 0000000..e4fdea1
--- /dev/null
+++ b/sfx2/inc/sfx2/tabpage.hrc
@@ -0,0 +1,39 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_SFX2_TABPAGE_HRC
+#define INCLUDED_SFX2_TABPAGE_HRC
+
+// Width and height of all tab pages used in dialogs. Because tab pages
+// can be combined arbitrarily in tab dialogs, they have to have the
+// same dimensions. If you need to adjust either dimension of any tab
+// page (when adding new controls), do the change here.
+
+#define TP_WIDTH 260
+#define TP_HEIGHT 199
+
+#endif
diff --git a/sfx2/source/dialog/dinfdlg.src b/sfx2/source/dialog/dinfdlg.src
index 45ef821..7d5c297 100644
--- a/sfx2/source/dialog/dinfdlg.src
+++ b/sfx2/source/dialog/dinfdlg.src
@@ -28,6 +28,7 @@
// include ---------------------------------------------------------------
#include "sfx2/sfx.hrc"
+#include "sfx2/tabpage.hrc"
#include "helpid.hrc"
#include "sfxlocal.hrc"
#include "dinfdlg.hrc"
@@ -43,7 +44,7 @@ TabPage TP_DOCINFODESC
{
HelpId = HID_DOCINFODESC ;
Hide = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedText FT_TITLE
{
Pos = MAP_APPFONT ( 6 , 7 ) ;
@@ -117,7 +118,7 @@ TabPage TP_DOCINFODOC
{
HelpId = HID_DOCINFODOC ;
Hide = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedImage BMP_FILE_1
{
Pos = MAP_APPFONT ( 6 , 7 ) ;
@@ -323,7 +324,7 @@ TabPage TP_DOCINFOUSER
{
HelpId = HID_DOCINFOUSER ;
Hide = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedText FT_INFO1
{
Pos = MAP_APPFONT ( 6 , 6 ) ;
@@ -395,7 +396,7 @@ TabPage TP_DOCINFORELOAD
{
HelpId = HID_DOCINFORELOAD ;
Hide = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
RadioButton RB_NOAUTOUPDATE
{
HelpID = "sfx2:RadioButton:TP_DOCINFORELOAD:RB_NOAUTOUPDATE";
@@ -520,7 +521,7 @@ TabPage TP_CUSTOMPROPERTIES
{
HelpId = HID_TP_CUSTOMPROPERTIES ;
Hide = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedText FT_PROPERTIES
{
Pos = MAP_APPFONT ( 6 , 7 ) ;
diff --git a/sfx2/source/dialog/mgetempl.src b/sfx2/source/dialog/mgetempl.src
index df024ca..9d0a8e2 100644
--- a/sfx2/source/dialog/mgetempl.src
+++ b/sfx2/source/dialog/mgetempl.src
@@ -26,6 +26,7 @@
************************************************************************/
#include <sfx2/sfx.hrc>
+#include <sfx2/tabpage.hrc>
#include "helpid.hrc"
#include "mgetempl.hrc"
@@ -34,7 +35,7 @@ TabPage TP_MANAGE_STYLES
{
HelpId = HID_MANAGE_STYLES ;
Hide = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedText FT_NAME
{
Pos = MAP_APPFONT ( 6 , 8 ) ;
diff --git a/sfx2/source/dialog/printopt.src b/sfx2/source/dialog/printopt.src
index 586d8a8..e3d75ab 100644
--- a/sfx2/source/dialog/printopt.src
+++ b/sfx2/source/dialog/printopt.src
@@ -28,6 +28,7 @@
// include ---------------------------------------------------------------
#include <sfx2/sfx.hrc>
+#include <sfx2/tabpage.hrc>
#include "printopt.hrc"
#include "dialog.hrc"
#include "helpid.hrc"
@@ -40,7 +41,7 @@ TabPage TP_COMMONPRINTOPTIONS
{
HelpID = HID_TP_COMMONPRINTOPTIONS;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedLine GB_REDUCE
diff --git a/sfx2/source/dialog/securitypage.src b/sfx2/source/dialog/securitypage.src
index 87cc2e1..b4a3be1 100644
--- a/sfx2/source/dialog/securitypage.src
+++ b/sfx2/source/dialog/securitypage.src
@@ -26,6 +26,7 @@
************************************************************************/
#include "sfx2/sfx.hrc"
+#include "sfx2/tabpage.hrc"
#include "securitypage.hrc"
#include "helpid.hrc"
#include "dialog.hrc"
@@ -38,7 +39,7 @@ TabPage TP_DOCINFOSECURITY
{
HelpId = HID_DOCINFOSECURITY ;
Hide = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine PASSWORD_TO_OPEN_FL
{
diff --git a/starmath/source/smres.src b/starmath/source/smres.src
index 5683b93..2dea5fd 100644
--- a/starmath/source/smres.src
+++ b/starmath/source/smres.src
@@ -27,6 +27,7 @@
#include <sfx2/sfx.hrc>
+#include <sfx2/tabpage.hrc>
#include <svx/globlmn.hrc>
#include "starmath.hrc"
#include "dialog.hrc"
@@ -950,7 +951,7 @@ TabPage RID_PRINTOPTIONPAGE
HelpID = "starmath:TabPage:RID_PRINTOPTIONPAGE";
OutputSize = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Text [ en-US ] = "Formula Options:Settings";
FixedLine FL_PRINTOPTIONS
{
diff --git a/svx/source/dialog/hdft.src b/svx/source/dialog/hdft.src
index 2527827..263761e 100644
--- a/svx/source/dialog/hdft.src
+++ b/svx/source/dialog/hdft.src
@@ -42,7 +42,7 @@ TabPage RID_SVXPAGE_HEADER
HelpId = HID_FORMAT_HEADER ;
Hide = TRUE ;
Text [ en-US ] = "Header" ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
CheckBox CB_TURNON
{
HelpID = "svx:CheckBox:RID_SVXPAGE_HEADER:CB_TURNON";
@@ -190,7 +190,7 @@ TabPage RID_SVXPAGE_FOOTER
HelpId = HID_FORMAT_FOOTER ;
Hide = TRUE ;
Text [ en-US ] = "Footer" ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
CheckBox CB_TURNON
{
HelpID = "svx:CheckBox:RID_SVXPAGE_FOOTER:CB_TURNON";
diff --git a/svx/source/dialog/optgrid.src b/svx/source/dialog/optgrid.src
index 0d5cfd0..ecf45dd 100644
--- a/svx/source/dialog/optgrid.src
+++ b/svx/source/dialog/optgrid.src
@@ -35,7 +35,7 @@ TabPage RID_SVXPAGE_GRID
HelpId = HID_OPTIONS_GRID ;
SVLook = TRUE ;
Hide = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine GRP_DRAWGRID
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
diff --git a/sw/inc/envelp.hrc b/sw/inc/envelp.hrc
index 1aa09e0..08c4c7d 100644
--- a/sw/inc/envelp.hrc
+++ b/sw/inc/envelp.hrc
@@ -28,6 +28,8 @@
#ifndef _ENVELP_HRC
#define _ENVELP_HRC
+#include <sfx2/tabpage.hrc>
+
#include "rcid.hrc"
// Dialoge --------------------------------------------------------------------
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index 1f022a0..ece258b 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -28,7 +28,7 @@
#ifndef _GLOBALS_HRC
#define _GLOBALS_HRC
-
+#include <sfx2/tabpage.hrc>
#include "rcid.hrc"
diff --git a/sw/source/ui/chrdlg/ccoll.src b/sw/source/ui/chrdlg/ccoll.src
index 278019c..f9d2f4e 100644
--- a/sw/source/ui/chrdlg/ccoll.src
+++ b/sw/source/ui/chrdlg/ccoll.src
@@ -33,7 +33,7 @@
TabPage TP_CONDCOLL
{
HelpID = HID_COND_COLL ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedLine FL_CONDITION
{
diff --git a/sw/source/ui/chrdlg/chardlg.src b/sw/source/ui/chrdlg/chardlg.src
index 2117a90..75bc248 100644
--- a/sw/source/ui/chrdlg/chardlg.src
+++ b/sw/source/ui/chrdlg/chardlg.src
@@ -104,7 +104,7 @@ TabPage TP_CHAR_URL
{
HelpID = HID_CHAR_URL ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedLine FL_URL
{
diff --git a/sw/source/ui/chrdlg/drpcps.src b/sw/source/ui/chrdlg/drpcps.src
index 82cdc5e..9ddb5be 100644
--- a/sw/source/ui/chrdlg/drpcps.src
+++ b/sw/source/ui/chrdlg/drpcps.src
@@ -54,7 +54,7 @@ TabDialog DLG_DROPCAPS
TabPage TP_DROPCAPS
{
HelpID = HID_DROPCAPS ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
CheckBox CB_SWITCH
{
diff --git a/sw/source/ui/chrdlg/numpara.src b/sw/source/ui/chrdlg/numpara.src
index cd27ac8..030cab2 100644
--- a/sw/source/ui/chrdlg/numpara.src
+++ b/sw/source/ui/chrdlg/numpara.src
@@ -33,7 +33,7 @@
TabPage TP_NUMPARA
{
HelpID = HID_NUMPARA ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedLine FL_OUTLINE_START
{
diff --git a/sw/source/ui/config/mailconfigpage.src b/sw/source/ui/config/mailconfigpage.src
index 523f25e..b23b856 100644
--- a/sw/source/ui/config/mailconfigpage.src
+++ b/sw/source/ui/config/mailconfigpage.src
@@ -34,7 +34,7 @@
TabPage TP_MAILCONFIG
{
HelpID = HID_TP_MAILCONFIG;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
Text[ en-US ] = "Mail Merge E-mail";
diff --git a/sw/source/ui/config/optcomp.src b/sw/source/ui/config/optcomp.src
index bdaa609..cf7d72e 100644
--- a/sw/source/ui/config/optcomp.src
+++ b/sw/source/ui/config/optcomp.src
@@ -34,7 +34,7 @@
TabPage TP_OPTCOMPATIBILITY_PAGE
{
HelpID = HID_OPTCOMPATIBILITY_PAGE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedLine FL_MAIN
{
diff --git a/sw/source/ui/config/optdlg.src b/sw/source/ui/config/optdlg.src
index 347bd8b..94c5d62 100644
--- a/sw/source/ui/config/optdlg.src
+++ b/sw/source/ui/config/optdlg.src
@@ -45,7 +45,7 @@ TabPage TP_CONTENT_OPT
{
HelpID = HID_CONTENT_OPT ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedLine FL_LINE
{
@@ -207,7 +207,7 @@ TabPage TP_CONTENT_OPT
TabPage TP_OPTPRINT_PAGE
{
HelpID = HID_OPTPRINT_PAGE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedLine FL_1
{
@@ -439,7 +439,7 @@ TabPage TP_OPTPRINT_PAGE
TabPage TP_STD_FONT
{
HelpID = HID_STD_FONT ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedLine FL_STDCHR
{
@@ -614,7 +614,7 @@ TabPage TP_STD_FONT
TabPage TP_OPTTABLE_PAGE
{
HelpID = HID_OPTTABLE_PAGE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedLine FL_TABLE
{
@@ -858,7 +858,7 @@ TabPage TP_OPTSHDWCRSR
{
HelpID = HID_OPTSHDWCRSR ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
//_----------------------------
FixedLine FL_NOPRINT
@@ -1068,7 +1068,7 @@ TabPage TP_COMPARISON_OPT
HelpID = HID_COMPARISON_OPT;
SVLook = TRUE ;
Hide = TRUE;
- Size = MAP_APPFONT ( 260 , 185 );
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT );
FixedLine FL_CMP
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
diff --git a/sw/source/ui/config/optload.src b/sw/source/ui/config/optload.src
index cca4373..ebfbd72 100644
--- a/sw/source/ui/config/optload.src
+++ b/sw/source/ui/config/optload.src
@@ -37,7 +37,7 @@
TabPage TP_OPTLOAD_PAGE
{
HelpID = HID_OPTLOAD_PAGE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedLine FL_UPDATE
{
@@ -162,7 +162,7 @@ TabPage TP_OPTLOAD_PAGE
TabPage TP_OPTCAPTION_PAGE
{
HelpID = HID_OPTCAPTION_PAGE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
Text [ en-US ] = "Caption" ;
diff --git a/sw/source/ui/config/redlopt.src b/sw/source/ui/config/redlopt.src
index b7ec8c4..d599415 100644
--- a/sw/source/ui/config/redlopt.src
+++ b/sw/source/ui/config/redlopt.src
@@ -44,7 +44,7 @@ TabPage TP_REDLINE_OPT
HelpID = HID_REDLINE_OPT ;
SVLook = TRUE ;
Hide = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine FL_TE
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
diff --git a/sw/source/ui/dialog/docstdlg.src b/sw/source/ui/dialog/docstdlg.src
index 7170617..3d67571 100644
--- a/sw/source/ui/dialog/docstdlg.src
+++ b/sw/source/ui/dialog/docstdlg.src
@@ -33,7 +33,7 @@ TabPage TP_DOC_STAT
{
HelpID = HID_DOC_STAT ;
Hide = TRUE;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedText FT_PAGE
{
Pos = MAP_APPFONT ( 6 , 6 ) ;
diff --git a/sw/source/ui/dialog/regionsw.src b/sw/source/ui/dialog/regionsw.src
index 97d7dab..f97ec06 100644
--- a/sw/source/ui/dialog/regionsw.src
+++ b/sw/source/ui/dialog/regionsw.src
@@ -409,7 +409,7 @@ TabPage TP_INSERT_SECTION
HelpID = HID_INSERT_SECTION_PAGE;
SVLook = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedLine FL_NAME
{
@@ -624,7 +624,7 @@ TabPage TP_SECTION_FTNENDNOTES
HelpID = HID_SECTION_FTNENDNOTES_PAGE;
SVLook = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedLine FL_FTN
{
@@ -828,7 +828,7 @@ TabPage TP_SECTION_INDENTS
HelpID = HID_SECTION_INDENTS_PAGE;
SVLook = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedLine FL_INDENT
{
diff --git a/sw/source/ui/envelp/envfmt.src b/sw/source/ui/envelp/envfmt.src
index ed5b532..059eb54 100644
--- a/sw/source/ui/envelp/envfmt.src
+++ b/sw/source/ui/envelp/envfmt.src
@@ -31,7 +31,7 @@
TabPage TP_ENV_FMT
{
HelpID = HID_ENV_FMT ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedLine FL_ADDRESSEE
{
diff --git a/sw/source/ui/envelp/envlop.src b/sw/source/ui/envelp/envlop.src
index 05f9fb9..5c1539d 100644
--- a/sw/source/ui/envelp/envlop.src
+++ b/sw/source/ui/envelp/envlop.src
@@ -72,7 +72,7 @@ TabDialog DLG_ENV
TabPage TP_ENV_ENV
{
HelpID = HID_ENV_ENV ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedText TXT_ADDR
{
diff --git a/sw/source/ui/envelp/envprt.src b/sw/source/ui/envelp/envprt.src
index 5c0b606..83a7743 100644
--- a/sw/source/ui/envelp/envprt.src
+++ b/sw/source/ui/envelp/envprt.src
@@ -31,7 +31,7 @@
TabPage TP_ENV_PRT
{
HelpID = HID_ENV_PRT ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedLine FL_NONAME
{
diff --git a/sw/source/ui/envelp/label.src b/sw/source/ui/envelp/label.src
index 18360ed..d93d5a8 100644
--- a/sw/source/ui/envelp/label.src
+++ b/sw/source/ui/envelp/label.src
@@ -96,7 +96,7 @@ TabDialog DLG_LAB
TabPage TP_LAB_LAB
{
HelpID = HID_LAB_LAB ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedText TXT_WRITING
{
@@ -282,7 +282,7 @@ String STR_CUSTOM
TabPage TP_VISITING_CARDS
{
HelpID = HID_TP_VISITING_CARDS ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
Control LB_AUTO_TEXT
@@ -326,7 +326,7 @@ TabPage TP_VISITING_CARDS
TabPage TP_PRIVATE_DATA
{
HelpID = HID_TP_PRIVATE_DATA ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedLine FL_DATA
{
@@ -518,7 +518,7 @@ TabPage TP_PRIVATE_DATA
TabPage TP_BUSINESS_DATA
{
HelpID = HID_TP_BUSINESS_DATA;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedLine FL_DATA
{
diff --git a/sw/source/ui/envelp/labfmt.src b/sw/source/ui/envelp/labfmt.src
index ba2578e..3dfff19 100644
--- a/sw/source/ui/envelp/labfmt.src
+++ b/sw/source/ui/envelp/labfmt.src
@@ -31,7 +31,7 @@
TabPage TP_LAB_FMT
{
HelpID = HID_LAB_FMT ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedText FI_MAKE
{
diff --git a/sw/source/ui/envelp/labprt.src b/sw/source/ui/envelp/labprt.src
index 69cd336..c04009c 100644
--- a/sw/source/ui/envelp/labprt.src
+++ b/sw/source/ui/envelp/labprt.src
@@ -31,7 +31,7 @@
TabPage TP_LAB_PRT
{
HelpID = HID_LAB_PRT ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
RadioButton BTN_PAGE
{
diff --git a/sw/source/ui/fldui/flddb.src b/sw/source/ui/fldui/flddb.src
index 6e715c4..3f8ad19 100644
--- a/sw/source/ui/fldui/flddb.src
+++ b/sw/source/ui/fldui/flddb.src
@@ -33,7 +33,7 @@ TabPage TP_FLD_DB
HelpID = HID_FLD_DB ;
SVLook = TRUE ;
Hide = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedText FT_DBTYPE
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
diff --git a/sw/source/ui/fldui/flddinf.src b/sw/source/ui/fldui/flddinf.src
index 824345a..3391e96 100644
--- a/sw/source/ui/fldui/flddinf.src
+++ b/sw/source/ui/fldui/flddinf.src
@@ -33,7 +33,7 @@ TabPage TP_FLD_DOKINF
HelpID = HID_FLD_DOKINF ;
SVLook = TRUE ;
Hide = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedText FT_DOKINFTYPE
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
diff --git a/sw/source/ui/fldui/flddok.src b/sw/source/ui/fldui/flddok.src
index fe59526..9e84857 100644
--- a/sw/source/ui/fldui/flddok.src
+++ b/sw/source/ui/fldui/flddok.src
@@ -33,7 +33,7 @@ TabPage TP_FLD_DOK
HelpID = HID_FLD_DOK ;
SVLook = TRUE ;
Hide = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedText FT_DOKTYPE
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
diff --git a/sw/source/ui/fldui/fldfunc.src b/sw/source/ui/fldui/fldfunc.src
index 538aeb8..472704d 100644
--- a/sw/source/ui/fldui/fldfunc.src
+++ b/sw/source/ui/fldui/fldfunc.src
@@ -33,7 +33,7 @@ TabPage TP_FLD_FUNC
HelpID = HID_FLD_FUNC ;
SVLook = TRUE ;
Hide = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedText FT_FUNCTYPE
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
diff --git a/sw/source/ui/fldui/fldref.src b/sw/source/ui/fldui/fldref.src
index 5a589e2..2b0df83 100644
--- a/sw/source/ui/fldui/fldref.src
+++ b/sw/source/ui/fldui/fldref.src
@@ -33,7 +33,7 @@ TabPage TP_FLD_REF
HelpID = HID_FLD_REF ;
SVLook = TRUE ;
Hide = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedText FT_REFTYPE
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
diff --git a/sw/source/ui/fldui/fldvar.src b/sw/source/ui/fldui/fldvar.src
index 7057096..6c68b2d 100644
--- a/sw/source/ui/fldui/fldvar.src
+++ b/sw/source/ui/fldui/fldvar.src
@@ -34,7 +34,7 @@ TabPage TP_FLD_VAR
HelpID = HID_FLD_VAR ;
SVLook = TRUE ;
Hide = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedText FT_VARTYPE
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
diff --git a/sw/source/ui/frmdlg/column.src b/sw/source/ui/frmdlg/column.src
index 89962c3..3d42fcf 100644
--- a/sw/source/ui/frmdlg/column.src
+++ b/sw/source/ui/frmdlg/column.src
@@ -37,7 +37,7 @@ TabPage TP_COLUMN
{
HelpID = HID_COLUMN ;
Hide = TRUE;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Text [ en-US ] = "Columns" ;
FixedText FT_NUMBER
{
diff --git a/sw/source/ui/frmdlg/frmpage.src b/sw/source/ui/frmdlg/frmpage.src
index 4bd99ca..a38cc8b 100644
--- a/sw/source/ui/frmdlg/frmpage.src
+++ b/sw/source/ui/frmdlg/frmpage.src
@@ -225,7 +225,7 @@ TabPage TP_FRM_STD
HelpID = HID_FRM_STD ;
SVLook = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedText FT_WIDTH
{
@@ -538,7 +538,7 @@ TabPage TP_GRF_EXT
HelpID = HID_GRF_EXT ;
SVLook = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Bitmap BMP_EXAMPLE
{
File = "image-example.bmp" ;
@@ -639,7 +639,7 @@ TabPage TP_FRM_URL
SVLook = TRUE ;
HelpID = HID_FRM_URL ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedText FT_URL
{
Pos = MAP_APPFONT ( 12 , 16 ) ;
@@ -726,7 +726,7 @@ TabPage TP_FRM_ADD
SVLook = TRUE ;
HelpID = HID_FRM_ADD ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedText FT_NAME
{
Pos = MAP_APPFONT ( 12 , 16 ) ;
diff --git a/sw/source/ui/frmdlg/wrap.src b/sw/source/ui/frmdlg/wrap.src
index 5b4bbd1..50cc124 100644
--- a/sw/source/ui/frmdlg/wrap.src
+++ b/sw/source/ui/frmdlg/wrap.src
@@ -34,7 +34,7 @@ TabPage TP_FRM_WRAP
SVLook = TRUE ;
HelpID = HID_FRM_EXT ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE;
FixedLine C_WRAP_FL
{
diff --git a/sw/source/ui/index/cnttab.src b/sw/source/ui/index/cnttab.src
index c2ce533..6ee087b 100644
--- a/sw/source/ui/index/cnttab.src
+++ b/sw/source/ui/index/cnttab.src
@@ -115,7 +115,7 @@ TabDialog DLG_MULTI_TOX
TabPage TP_TOX_SELECT
{
HelpID = HID_TP_TOX_SELECT;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedLine FL_TYPETITLE
@@ -548,7 +548,7 @@ TabPage TP_TOX_SELECT
TabPage TP_TOX_ENTRY
{
HelpID = HID_TP_TOX_ENTRY;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedText FT_LEVEL
{
@@ -1096,7 +1096,7 @@ TabPage TP_TOX_ENTRY
TabPage TP_TOX_STYLES
{
HelpID = HID_TOX_STYLES_PAGE;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedText FT_LEVEL
{
diff --git a/sw/source/ui/misc/docfnote.src b/sw/source/ui/misc/docfnote.src
index 171cb5b..e9c77c6 100644
--- a/sw/source/ui/misc/docfnote.src
+++ b/sw/source/ui/misc/docfnote.src
@@ -62,7 +62,7 @@ TabPage TP_FOOTNOTEOPTION
Hide = TRUE;
HelpID = HID_FOOTNOTE_OPTIONS ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine FL_NUM
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
@@ -313,7 +313,7 @@ TabPage TP_ENDNOTEOPTION
Hide = TRUE;
HelpID = HID_ENDNOTE_OPTIONS ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine FL_NUM
{
Pos = MAP_APPFONT ( 6 , 2 ) ;
diff --git a/sw/source/ui/misc/linenum.src b/sw/source/ui/misc/linenum.src
index 1b2db40..c56a4f3 100644
--- a/sw/source/ui/misc/linenum.src
+++ b/sw/source/ui/misc/linenum.src
@@ -44,7 +44,7 @@ TabPage TP_LINENUMBERING
HelpID = HID_LINENUMBERING ;
SVLook = TRUE ;
Hide = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
CheckBox CB_NUMBERING_ON
{
HelpID = "sw:CheckBox:TP_LINENUMBERING:CB_NUMBERING_ON";
diff --git a/sw/source/ui/misc/num.src b/sw/source/ui/misc/num.src
index 33d3c53..482c4e0 100644
--- a/sw/source/ui/misc/num.src
+++ b/sw/source/ui/misc/num.src
@@ -43,7 +43,7 @@ TabPage TP_NUM_POSITION
{
HelpID = HID_NUM_POSITION ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE;
FixedLine FL_LEVEL
{
diff --git a/sw/source/ui/misc/outline.src b/sw/source/ui/misc/outline.src
index f84fd67..819c57b 100644
--- a/sw/source/ui/misc/outline.src
+++ b/sw/source/ui/misc/outline.src
@@ -208,7 +208,7 @@ TabPage TP_OUTLINE_NUM
{
HelpID = HID_TP_OUTLINE_NUM ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE;
ListBox LB_LEVEL
{
diff --git a/sw/source/ui/misc/pgfnote.src b/sw/source/ui/misc/pgfnote.src
index 6164a68..eea9464 100644
--- a/sw/source/ui/misc/pgfnote.src
+++ b/sw/source/ui/misc/pgfnote.src
@@ -31,7 +31,7 @@ TabPage TP_FOOTNOTE_PAGE
{
HelpID = HID_FOOTNOTE_PAGE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE;
RadioButton RB_MAXHEIGHT_PAGE
{
diff --git a/sw/source/ui/misc/pggrid.src b/sw/source/ui/misc/pggrid.src
index 6d8fbc0..2b3a551 100644
--- a/sw/source/ui/misc/pggrid.src
+++ b/sw/source/ui/misc/pggrid.src
@@ -31,7 +31,7 @@ TabPage TP_TEXTGRID_PAGE
{
HelpID = HID_TEXTGRID_PAGE;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE;
FixedLine FL_GRID_TYPE
{
diff --git a/sw/source/ui/table/tabledlg.src b/sw/source/ui/table/tabledlg.src
index ded80e1..d352775 100644
--- a/sw/source/ui/table/tabledlg.src
+++ b/sw/source/ui/table/tabledlg.src
@@ -88,7 +88,7 @@ TabPage TP_FORMAT_TABLE
{
HelpID = HID_FORMAT_TABLE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE;
FixedText FT_NAME
{
@@ -339,7 +339,7 @@ TabPage TP_TABLE_COLUMN
{
HelpID = HID_TABLE_COLUMN ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE;
CheckBox CB_MOD_TBL
{
@@ -582,7 +582,7 @@ TabPage TP_TABLE_COLUMN
TabPage TP_TABLE_TEXTFLOW
{
HelpId = HID_TABLE_TEXTFLOW ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
TEXT_TEXTFLOW
Hide = TRUE;
FixedLine FL_FLOW
More information about the Libreoffice-commits
mailing list