summaryrefslogtreecommitdiff
path: root/cui/source/inc
diff options
context:
space:
mode:
Diffstat (limited to 'cui/source/inc')
-rw-r--r--cui/source/inc/backgrnd.hxx25
-rw-r--r--cui/source/inc/cuigaldlg.hxx6
-rw-r--r--cui/source/inc/cuigrfflt.hxx10
-rw-r--r--cui/source/inc/cuitabline.hxx10
-rw-r--r--cui/source/inc/gallery.hrc1
-rw-r--r--cui/source/inc/hlinettp.hxx4
-rw-r--r--cui/source/inc/insdlg.hxx13
-rw-r--r--cui/source/inc/linkdlg.hxx20
-rw-r--r--cui/source/inc/numfmt.hxx7
-rw-r--r--cui/source/inc/optdict.hxx4
-rw-r--r--cui/source/inc/page.hxx2
-rw-r--r--cui/source/inc/paragrph.hxx10
-rw-r--r--cui/source/inc/pastedlg.hxx2
-rw-r--r--cui/source/inc/splitcelldlg.hxx4
-rw-r--r--cui/source/inc/tabstpge.hxx7
15 files changed, 60 insertions, 65 deletions
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index 01172af4a435..921e104110ec 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -84,6 +84,13 @@ private:
SvxBackgroundTabPage( Window* pParent, const SfxItemSet& rCoreSet );
~SvxBackgroundTabPage();
+ FixedText aSelectTxt;
+ ListBox aLbSelect;
+ const String aStrBrowse;
+ const String aStrUnlinked;
+ FixedText aTblDesc;
+ ListBox aTblLBox;
+ ListBox aParaLBox;
// Hintergrundfarbe ------------------------------------
Control aBorderWin;
ValueSet aBackgroundColorSet;
@@ -92,34 +99,24 @@ private:
//color transparency
FixedText aColTransFT;
MetricField aColTransMF;
+ CheckBox aBtnPreview;
// Hintergrund-Bitmap ----------------------------------
+ FixedLine aGbFile;
PushButton aBtnBrowse;
CheckBox aBtnLink;
- CheckBox aBtnPreview;
- FixedInfo aFtFile;
- FixedLine aGbFile;
+ FixedLine aGbPosition;
RadioButton aBtnPosition;
RadioButton aBtnArea;
RadioButton aBtnTile;
SvxRectCtl aWndPosition;
- FixedLine aGbPosition;
+ FixedInfo aFtFile;
//transparency of graphics
FixedLine aGraphTransFL;
MetricField aGraphTransMF;
BackgroundPreviewImpl* pPreviewWin2;
- // Selektor --------------------------------------------
- FixedText aSelectTxt;
- ListBox aLbSelect;
- const String aStrBrowse;
- const String aStrUnlinked;
// DDListBox fuer Writer -------------------------------
-
- FixedText aTblDesc;
- ListBox aTblLBox;
- ListBox aParaLBox;
-
//------------------------------------------------------
Color aBgdColor;
sal_uInt16 nHtmlMode;
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 459e927eff3e..b3d426df7173 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -309,13 +309,13 @@ class TPGalleryThemeProperties : public SfxTabPage
friend class TakeProgress;
friend class TakeThread;
+ FixedText aFtFileType;
+ ComboBox aCbbFileType;
+ MultiListBox aLbxFound;
PushButton aBtnSearch;
PushButton aBtnTake;
PushButton aBtnTakeAll;
CheckBox aCbxPreview;
- ComboBox aCbbFileType;
- MultiListBox aLbxFound;
- FixedText aFtFileType;
GalleryPreview aWndPreview;
ExchangeData* pData;
diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx
index 455ebd021f4c..ea34511cb298 100644
--- a/cui/source/inc/cuigrfflt.hxx
+++ b/cui/source/inc/cuigrfflt.hxx
@@ -97,16 +97,16 @@ private:
double mfScaleX;
double mfScaleY;
Size maSizePixel;
- PreviewWindow maPreview;
- FixedLine maFlParameter;
- OKButton maBtnOK;
- CancelButton maBtnCancel;
- HelpButton maBtnHelp;
DECL_LINK( ImplPreviewTimeoutHdl, Timer* pTimer );
DECL_LINK( ImplModifyHdl, void* p );
protected:
+ PreviewWindow maPreview;
+ OKButton maBtnOK;
+ CancelButton maBtnCancel;
+ HelpButton maBtnHelp;
+ FixedLine maFlParameter;
const Link& GetModifyHdl() const { return maModifyHdl; }
const Size& GetGraphicSizePixel() const { return maSizePixel; }
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index 360c2bc99750..d80239da302c 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -104,6 +104,7 @@ class SvxLineTabPage : public SvxTabPage
using TabPage::ActivatePage;
using TabPage::DeactivatePage;
private:
+ FixedLine aFlLine;
FixedText aFtLineStyle;
LineLB aLbLineStyle;
FixedText aFtColor;
@@ -112,19 +113,18 @@ private:
MetricField aMtrLineWidth;
FixedText aFtTransparent;
MetricField aMtrTransparent;
- FixedLine aFlLine;
- FixedText aFtLineEndsStyle;
+ FixedLine aFlLineEnds;
LineEndLB aLbStartStyle;
- FixedText aFtLineEndsWidth;
MetricField aMtrStartWidth;
TriStateBox aTsbCenterStart;
+ FixedText aFtLineEndsStyle;
LineEndLB aLbEndStyle;
+ FixedText aFtLineEndsWidth;
MetricField aMtrEndWidth;
TriStateBox aTsbCenterEnd;
CheckBox aCbxSynchronize;
- FixedLine aFlLineEnds;
- SvxXLinePreview aCtlPreview;
FixedLine aFLSeparator;
+ SvxXLinePreview aCtlPreview;
// #116827#
FixedLine maFLEdgeStyle;
diff --git a/cui/source/inc/gallery.hrc b/cui/source/inc/gallery.hrc
index c9d6729be447..d813fa7c7f56 100644
--- a/cui/source/inc/gallery.hrc
+++ b/cui/source/inc/gallery.hrc
@@ -44,7 +44,6 @@
#define RID_SVXSTR_GALLERY_NOFILES (RID_CUI_GALLERY_START + 12)
#define RID_SVXSTR_GALLERY_SEARCH (RID_CUI_GALLERY_START + 30)
#define RID_SVXSTR_GALLERYPROPS_OBJECT (RID_CUI_GALLERY_START + 39)
-#define RID_SVXSTR_GALLERYPROPS_GALTHEME (RID_CUI_GALLERY_START + 40)
#define RID_SVXSTR_GALLERY_READONLY (RID_CUI_GALLERY_START + 43)
#define RID_SVXSTR_GALLERY_ALLFILES (RID_CUI_GALLERY_START + 44)
#define RID_SVXSTR_GALLERY_ID_EXISTS (RID_CUI_GALLERY_START + 81)
diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx
index 36f5919c02e7..c69e6021d215 100644
--- a/cui/source/inc/hlinettp.hxx
+++ b/cui/source/inc/hlinettp.hxx
@@ -46,13 +46,13 @@ private:
RadioButton maRbtLinktypTelnet;
FixedText maFtTarget;
SvxHyperURLBox maCbbTarget;
+ ImageButton maBtBrowse;
FixedText maFtLogin;
Edit maEdLogin;
+ ImageButton maBtTarget;
FixedText maFtPassword;
Edit maEdPassword;
CheckBox maCbAnonymous;
- ImageButton maBtBrowse;
- ImageButton maBtTarget;
String maStrOldUser;
String maStrOldPassword;
diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx
index aeab4d94dbf8..b6d8dbafd6d5 100644
--- a/cui/source/inc/insdlg.hxx
+++ b/cui/source/inc/insdlg.hxx
@@ -63,11 +63,11 @@ class SvInsertOleDlg : public InsertObjectDialog_Impl
{
RadioButton aRbNewObject;
RadioButton aRbObjectFromfile;
+ FixedLine aGbObject;
ListBox aLbObjecttype;
Edit aEdFilepath;
PushButton aBtnFilepath;
CheckBox aCbFilelink;
- FixedLine aGbObject;
OKButton aOKButton1;
CancelButton aCancelButton1;
HelpButton aHelpButton1;
@@ -103,11 +103,11 @@ public:
class SvInsertPlugInDialog : public InsertObjectDialog_Impl
{
private:
+ FixedLine aGbFileurl;
Edit aEdFileurl;
PushButton aBtnFileurl;
- FixedLine aGbFileurl;
- MultiLineEdit aEdPluginsOptions;
FixedLine aGbPluginsOptions;
+ MultiLineEdit aEdPluginsOptions;
OKButton aOKButton1;
CancelButton aCancelButton1;
HelpButton aHelpButton1;
@@ -174,24 +174,25 @@ private:
Edit aEDURL;
PushButton aBTOpen;
+ FixedLine aFLScrolling;
RadioButton aRBScrollingOn;
RadioButton aRBScrollingOff;
RadioButton aRBScrollingAuto;
- FixedLine aFLScrolling;
+
FixedLine aFLSepLeft;
+ FixedLine aFLFrameBorder;
RadioButton aRBFrameBorderOn;
RadioButton aRBFrameBorderOff;
- FixedLine aFLFrameBorder;
FixedLine aFLSepRight;
+ FixedLine aFLMargin;
FixedText aFTMarginWidth;
NumericField aNMMarginWidth;
CheckBox aCBMarginWidthDefault;
FixedText aFTMarginHeight;
NumericField aNMMarginHeight;
CheckBox aCBMarginHeightDefault;
- FixedLine aFLMargin;
OKButton aOKButton1;
CancelButton aCancelButton1;
diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx
index 114e62679844..57cf02ec982d 100644
--- a/cui/source/inc/linkdlg.hxx
+++ b/cui/source/inc/linkdlg.hxx
@@ -57,21 +57,22 @@ class SvBaseLinksDlg : public ModalDialog
FixedText aFtLinks;
FixedText aFtType;
FixedText aFtStatus;
- CancelButton aCancelButton1;
- HelpButton aHelpButton1;
- PushButton aPbUpdateNow;
- PushButton aPbOpenSource;
- PushButton aPbChangeSource;
- PushButton aPbBreakLink;
+ SvTabListBox aTbLinks;
FixedText aFtFiles2;
+ FixedText aFtFullFileName;
FixedText aFtSource2;
+ FixedText aFtFullSourceName;
FixedText aFtType2;
+ FixedText aFtFullTypeName;
FixedText aFtUpdate;
RadioButton aRbAutomatic;
RadioButton aRbManual;
- FixedText aFtFullFileName;
- FixedText aFtFullSourceName;
- FixedText aFtFullTypeName;
+ CancelButton aCancelButton1;
+ HelpButton aHelpButton1;
+ PushButton aPbUpdateNow;
+ PushButton aPbOpenSource;
+ PushButton aPbChangeSource;
+ PushButton aPbBreakLink;
String aStrAutolink;
String aStrManuallink;
String aStrBrokenlink;
@@ -82,7 +83,6 @@ class SvBaseLinksDlg : public ModalDialog
String aStrWaitinglink;
sfx2::LinkManager* pLinkMgr;
sal_Bool bHtmlMode;
- SvTabListBox aTbLinks;
Timer aUpdateTimer;
#if _SOLAR__PRIVATE
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index b6f092788116..bc9fe65eaf48 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -116,14 +116,14 @@ private:
FixedText aFtLanguage;
SvxLanguageBox aLbLanguage;
CheckBox aCbSourceFormat;
-
+ SvxNumberPreviewImpl aWndPreview;
+ FixedLine aFlOptions;
FixedText aFtDecimals;
NumericField aEdDecimals;
+ CheckBox aBtnNegRed;
FixedText aFtLeadZeroes;
NumericField aEdLeadZeroes;
- CheckBox aBtnNegRed;
CheckBox aBtnThousand;
- FixedLine aFlOptions;
FixedText aFtEdFormat;
Edit aEdFormat;
@@ -135,7 +135,6 @@ private:
Edit aEdComment;
Timer aResetWinTimer;
- SvxNumberPreviewImpl aWndPreview;
SvxNumberInfoItem* pNumItem;
SvxNumberFormatShell* pNumFmtShell;
diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx
index 27627b96c9f3..295483f042e0 100644
--- a/cui/source/inc/optdict.hxx
+++ b/cui/source/inc/optdict.hxx
@@ -63,12 +63,12 @@ namespace linguistic2{
class SvxNewDictionaryDialog : public ModalDialog
{
private:
+ FixedLine aNewDictBox;
FixedText aNameText;
Edit aNameEdit;
FixedText aLanguageText;
SvxLanguageBox aLanguageLB;
CheckBox aExceptBtn;
- FixedLine aNewDictBox;
OKButton aOKBtn;
CancelButton aCancelBtn;
HelpButton aHelpBtn;
@@ -132,8 +132,8 @@ private:
PushButton aDeletePB;
FixedLine aEditDictsBox;
- CancelButton aCloseBtn;
HelpButton aHelpBtn;
+ CancelButton aCloseBtn;
String sModify;
String sNew;
DecorationView aDecoView;
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index 053cbdcad8dc..87d02d36f860 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -125,6 +125,7 @@ class SvxPageDescPage : public SfxTabPage
FixedText aBottomMarginLbl;
MetricField aBottomMarginEdit;
+ FixedLine aBottomSeparatorFl;
// layout settings
FixedLine aLayoutFL;
FixedText aPageText;
@@ -132,7 +133,6 @@ class SvxPageDescPage : public SfxTabPage
FixedText aNumberFormatText;
ListBox aNumberFormatBox;
- FixedLine aBottomSeparatorFl;
//Extras Calc
FixedText aTblAlignFT;
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index 49778aec5e81..7f7eae0c2641 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -71,6 +71,7 @@ class SvxStdParagraphTabPage: public SfxTabPage
private:
SvxStdParagraphTabPage( Window* pParent, const SfxItemSet& rSet );
+ FixedLine aIndentFrm;
// Einzug
FixedText aLeftLabel;
SvxRelativeField aLeftIndent;
@@ -82,27 +83,26 @@ private:
SvxRelativeField aFLineIndent;
CheckBox aAutoCB;
- FixedLine aIndentFrm;
+ FixedLine aDistFrm;
// Abstaende
FixedText aTopLabel;
SvxRelativeField aTopDist;
FixedText aBottomLabel;
SvxRelativeField aBottomDist;
- FixedLine aDistFrm;
// Zeilenabstand
+ FixedLine aLineDistFrm;
ListBox aLineDist;
FixedText aLineDistAtLabel;
MetricField aLineDistAtPercentBox;
MetricField aLineDistAtMetricBox;
- FixedLine aLineDistFrm;
String sAbsDist;
SvxParaPrevWindow aExampleWin;
//Registerhaltigkeit - nur Writer
- CheckBox aRegisterCB;
FixedLine aRegisterFL;
+ CheckBox aRegisterCB;
Edit* pActLineDistFld;
long nAbst;
@@ -237,6 +237,7 @@ private:
SvxExtParagraphTabPage( Window* pParent, const SfxItemSet& rSet );
// Silbentrennung
+ FixedLine aExtFL;
TriStateBox aHyphenBox;
FixedText aBeforeText;
NumericField aExtHyphenBeforeBox;
@@ -246,7 +247,6 @@ private:
// FixedText aHyphenAfterLabel;
FixedText aMaxHyphenLabel;
NumericField aMaxHyphenEdit;
- FixedLine aExtFL;
// Seitenumbruch
FixedLine aBreaksFL;
diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx
index f59c3612dc91..2568ab9b2b5e 100644
--- a/cui/source/inc/pastedlg.hxx
+++ b/cui/source/inc/pastedlg.hxx
@@ -54,10 +54,10 @@ class SvPasteObjectDialog : public ModalDialog
FixedText aFtObjectSource;
RadioButton aRbPaste;
RadioButton aRbPasteLink;
- ListBox aLbInsertList;
CheckBox aCbDisplayAsIcon;
PushButton aPbChangeIcon;
FixedLine aFlChoice;
+ ListBox aLbInsertList;
OKButton aOKButton1;
CancelButton aCancelButton1;
HelpButton aHelpButton1;
diff --git a/cui/source/inc/splitcelldlg.hxx b/cui/source/inc/splitcelldlg.hxx
index 4e08cebf2866..b9aa0a030d20 100644
--- a/cui/source/inc/splitcelldlg.hxx
+++ b/cui/source/inc/splitcelldlg.hxx
@@ -37,13 +37,13 @@
class SvxSplitTableDlg : public SvxAbstractSplittTableDialog, public SvxStandardDialog
{
+ FixedLine maCountFL;
FixedText maCountLbl;
NumericField maCountEdit;
- FixedLine maCountFL;
+ FixedLine maDirFL;
ImageRadioButton maHorzBox;
ImageRadioButton maVertBox;
CheckBox maPropCB;
- FixedLine maDirFL;
OKButton maOKBtn;
CancelButton maCancelBtn;
HelpButton maHelpBtn;
diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx
index 5aa7703862b2..f195ccdc9ea6 100644
--- a/cui/source/inc/tabstpge.hxx
+++ b/cui/source/inc/tabstpge.hxx
@@ -94,10 +94,11 @@ private:
SvxTabulatorTabPage( Window* pParent, const SfxItemSet& rSet );
// Tabulatoren und Positionen
- MetricBox aTabBox;
FixedLine aTabLabel;
+ MetricBox aTabBox;
FixedLine aTabLabelVert;
+ FixedLine aTabTypeLabel;
// TabType
RadioButton aLeftTab;
RadioButton aRightTab;
@@ -111,8 +112,8 @@ private:
FixedText aDezCharLabel;
Edit aDezChar;
- FixedLine aTabTypeLabel;
+ FixedLine aFillLabel;
// Fuellzeichen
RadioButton aNoFillChar;
RadioButton aFillPoints;
@@ -120,8 +121,6 @@ private:
RadioButton aFillSolidLine;
RadioButton aFillSpecial;
Edit aFillChar;
- FixedLine aFillLabel;
-
// Buttons
PushButton aNewBtn;
PushButton aDelAllBtn;