summaryrefslogtreecommitdiff
path: root/sw/source/ui/frmdlg
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui/frmdlg')
-rw-r--r--sw/source/ui/frmdlg/colex.cxx4
-rw-r--r--sw/source/ui/frmdlg/colmgr.cxx12
-rw-r--r--sw/source/ui/frmdlg/column.cxx76
-rw-r--r--sw/source/ui/frmdlg/column.hrc68
-rw-r--r--sw/source/ui/frmdlg/column.src12
-rw-r--r--sw/source/ui/frmdlg/cption.cxx36
-rw-r--r--sw/source/ui/frmdlg/cption.hrc14
-rw-r--r--sw/source/ui/frmdlg/cption.src2
-rw-r--r--sw/source/ui/frmdlg/frmdlg.cxx30
-rw-r--r--sw/source/ui/frmdlg/frmmgr.cxx52
-rw-r--r--sw/source/ui/frmdlg/frmpage.cxx172
-rw-r--r--sw/source/ui/frmdlg/frmpage.hrc100
-rw-r--r--sw/source/ui/frmdlg/frmpage.src2
-rw-r--r--sw/source/ui/frmdlg/frmui.src2
-rw-r--r--sw/source/ui/frmdlg/pattern.cxx2
-rw-r--r--sw/source/ui/frmdlg/pattern.hrc28
-rw-r--r--sw/source/ui/frmdlg/uiborder.cxx2
-rw-r--r--sw/source/ui/frmdlg/wrap.cxx38
-rw-r--r--sw/source/ui/frmdlg/wrap.hrc50
-rw-r--r--sw/source/ui/frmdlg/wrap.src2
20 files changed, 352 insertions, 352 deletions
diff --git a/sw/source/ui/frmdlg/colex.cxx b/sw/source/ui/frmdlg/colex.cxx
index 7b419132736c..f9636aad1112 100644
--- a/sw/source/ui/frmdlg/colex.cxx
+++ b/sw/source/ui/frmdlg/colex.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -495,7 +495,7 @@ void SwPageGridExample::DrawPage( const Point& rOrg,
Rectangle aRect;
aRect.Right() = rOrg.X() + GetSize().Width() - nR;
aRect.Left() = rOrg.X() + nL;
- aRect.Top() = rOrg.Y() + GetTop()
+ aRect.Top() = rOrg.Y() + GetTop()
+ GetHdHeight() + GetHdDist();
aRect.Bottom()= rOrg.Y() + GetSize().Height() - GetBottom()
- GetFtHeight() - GetFtDist();
diff --git a/sw/source/ui/frmdlg/colmgr.cxx b/sw/source/ui/frmdlg/colmgr.cxx
index a13083735773..6ea6307e9461 100644
--- a/sw/source/ui/frmdlg/colmgr.cxx
+++ b/sw/source/ui/frmdlg/colmgr.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -41,7 +41,7 @@
// PRIVATE METHODES ------------------------------------------------------
/*------------------------------------------------------------------------
- Beschreibung: Spaltenbreite auf aktuelle Breite einstellen
+ Beschreibung: Spaltenbreite auf aktuelle Breite einstellen
------------------------------------------------------------------------*/
void FitToActualSize(SwFmtCol& rCol, USHORT nWidth)
{
@@ -56,7 +56,7 @@ void FitToActualSize(SwFmtCol& rCol, USHORT nWidth)
// PUBLIC METHODES -------------------------------------------------------
/*------------------------------------------------------------------------
- Beschreibung: Setzen Spaltenanzahl und Gutterwidth
+ Beschreibung: Setzen Spaltenanzahl und Gutterwidth
------------------------------------------------------------------------*/
void SwColMgr::SetCount(USHORT nCount, USHORT nGutterWidth)
{
@@ -94,7 +94,7 @@ void SwColMgr::SetGutterWidth(USHORT nGutterWidth, USHORT nPos )
}
/*------------------------------------------------------------------------
- Beschreibung: Hoehe Trennlinie
+ Beschreibung: Hoehe Trennlinie
------------------------------------------------------------------------*/
short SwColMgr::GetLineHeightPercent() const
{
@@ -108,7 +108,7 @@ void SwColMgr::SetLineHeightPercent(short nPercent)
}
/*------------------------------------------------------------------------
- Beschreibung: Spaltenbreite
+ Beschreibung: Spaltenbreite
------------------------------------------------------------------------*/
USHORT SwColMgr::GetColWidth(USHORT nIdx) const
{
@@ -124,7 +124,7 @@ void SwColMgr::SetColWidth(USHORT nIdx, USHORT nWd)
}
/*--------------------------------------------------------------------
- Beschreibung: Groesse neu setzen
+ Beschreibung: Groesse neu setzen
--------------------------------------------------------------------*/
void SwColMgr::SetActualWidth(USHORT nW)
{
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 47c4e6a177bb..87069fca0477 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -99,9 +99,9 @@ inline BOOL IsMarkInSameSection( SwWrtShell& rWrtSh, const SwSection* pSect )
SwColumnDlg::SwColumnDlg(Window* pParent, SwWrtShell& rSh) :
SfxModalDialog(pParent, SW_RES(DLG_COLUMN)),
- aOK(this, SW_RES(PB_OK)),
- aCancel(this, SW_RES(PB_CANCEL)),
- aHelp(this, SW_RES(PB_HELP)),
+ aOK(this, SW_RES(PB_OK)),
+ aCancel(this, SW_RES(PB_CANCEL)),
+ aHelp(this, SW_RES(PB_HELP)),
aApplyToFT(this, SW_RES(FT_APPLY_TO)),
aApplyToLB(this, SW_RES(LB_APPLY_TO)),
rWrtShell(rSh),
@@ -243,15 +243,15 @@ IMPL_LINK(SwColumnDlg, ObjectHdl, ListBox*, pBox)
case LISTBOX_SELECTION :
pSet = pSelectionSet;
break;
- case LISTBOX_SECTION :
+ case LISTBOX_SECTION :
pSet = pSectionSet;
bSectionChanged = TRUE;
break;
- case LISTBOX_SECTIONS :
+ case LISTBOX_SECTIONS :
pSet = pSectionSet;
bSelSectionChanged = TRUE;
break;
- case LISTBOX_PAGE :
+ case LISTBOX_PAGE :
pSet = pPageSet;
bPageChanged = TRUE;
break;
@@ -273,12 +273,12 @@ IMPL_LINK(SwColumnDlg, ObjectHdl, ListBox*, pBox)
if( pSelectionSet )
pSet->Put(SwFmtFrmSize(ATT_VAR_SIZE, nWidth, nWidth));
break;
- case LISTBOX_SECTION :
- case LISTBOX_SECTIONS :
+ case LISTBOX_SECTION :
+ case LISTBOX_SECTIONS :
pSet = pSectionSet;
pSet->Put(SwFmtFrmSize(ATT_VAR_SIZE, nWidth, nWidth));
break;
- case LISTBOX_PAGE :
+ case LISTBOX_PAGE :
nWidth = nPageWidth;
pSet = pPageSet;
pSet->Put(SwFmtFrmSize(ATT_VAR_SIZE, nWidth, nWidth));
@@ -307,15 +307,15 @@ IMPL_LINK(SwColumnDlg, OkHdl, OKButton*, EMPTYARG)
case LISTBOX_SELECTION :
pSet = pSelectionSet;
break;
- case LISTBOX_SECTION :
+ case LISTBOX_SECTION :
pSet = pSectionSet;
bSectionChanged = TRUE;
break;
- case LISTBOX_SECTIONS :
+ case LISTBOX_SECTIONS :
pSet = pSectionSet;
bSelSectionChanged = TRUE;
break;
- case LISTBOX_PAGE :
+ case LISTBOX_PAGE :
pSet = pPageSet;
bPageChanged = TRUE;
break;
@@ -420,7 +420,7 @@ void SwColumnPage::ResetColWidth()
}
/*--------------------------------------------------------------------
- Beschreibung: Jetzt als TabPage
+ Beschreibung: Jetzt als TabPage
--------------------------------------------------------------------*/
SwColumnPage::SwColumnPage(Window *pParent, const SfxItemSet &rSet)
@@ -567,7 +567,7 @@ void SwColumnPage::Reset(const SfxItemSet &rSet)
delete pColMgr;
pColMgr = new SwColMgr(rSet);
- nCols = pColMgr->GetCount() ;
+ nCols = pColMgr->GetCount() ;
aCLNrEdt.SetMax(Max((USHORT)aCLNrEdt.GetMax(), (USHORT)nCols));
aCLNrEdt.SetLast(Max(nCols,(USHORT)aCLNrEdt.GetMax()));
@@ -606,7 +606,7 @@ void SwColumnPage::Reset(const SfxItemSet &rSet)
}
/*--------------------------------------------------------------------
- Beschreibung: TabPage erzeugen
+ Beschreibung: TabPage erzeugen
--------------------------------------------------------------------*/
SfxTabPage* SwColumnPage::Create(Window *pParent, const SfxItemSet &rSet)
{
@@ -614,7 +614,7 @@ SfxTabPage* SwColumnPage::Create(Window *pParent, const SfxItemSet &rSet)
}
/*--------------------------------------------------------------------
- Beschreibung: Attribute in den Set stopfen bei OK
+ Beschreibung: Attribute in den Set stopfen bei OK
--------------------------------------------------------------------*/
BOOL SwColumnPage::FillItemSet(SfxItemSet &rSet)
{
@@ -646,7 +646,7 @@ BOOL SwColumnPage::FillItemSet(SfxItemSet &rSet)
}
/*--------------------------------------------------------------------
- Beschreibung: ColumnManager updaten
+ Beschreibung: ColumnManager updaten
--------------------------------------------------------------------*/
IMPL_LINK( SwColumnPage, UpdateColMgr, void *, /*pField*/ )
{
@@ -736,7 +736,7 @@ IMPL_LINK( SwColumnPage, UpdateColMgr, void *, /*pField*/ )
}
/*------------------------------------------------------------------------
- Beschreibung: Initialisierung
+ Beschreibung: Initialisierung
------------------------------------------------------------------------*/
void SwColumnPage::Init()
{
@@ -766,7 +766,7 @@ void SwColumnPage::Init()
nColWidth[i] = nColumnWidthSum;
}
SwColLineAdj eAdj = pColMgr->GetAdjust();
- if( COLADJ_NONE == eAdj ) // der Dialog kennt kein NONE!
+ if( COLADJ_NONE == eAdj ) // der Dialog kennt kein NONE!
{
eAdj = COLADJ_TOP;
//ohne Adjust auch kein Linientyp
@@ -797,7 +797,7 @@ void SwColumnPage::Init()
}
/*------------------------------------------------------------------------
- Beschreibung: Die Anzahl der Spalten hat sich veraendert -- hier werden
+ Beschreibung: Die Anzahl der Spalten hat sich veraendert -- hier werden
die Controls fuer die Bearbeitung der Spalten entsprechend
der Spaltenzahl en- oder disabled.
Falls es mehr als nVisCols (= 3) Spalten gibt, werden
@@ -809,8 +809,8 @@ void SwColumnPage::Init()
void SwColumnPage::UpdateCols()
{
BOOL bEnableBtns= FALSE;
- BOOL bEnable12 = FALSE;
- BOOL bEnable3 = FALSE;
+ BOOL bEnable12 = FALSE;
+ BOOL bEnable3 = FALSE;
const BOOL bEdit = !aAutoWidthBox.IsChecked();
if ( nCols > nVisCols )
{
@@ -869,7 +869,7 @@ void SwColumnPage::SetLabels( USHORT nVis )
}
/*------------------------------------------------------------------------
- Beschreibung: Handler, der bei einer Veraenderung der Spaltenzahl
+ Beschreibung: Handler, der bei einer Veraenderung der Spaltenzahl
gerufen wird.
Eine Aenderung der Spaltenzahl ueberschreibt eventuelle
Breiteneinstellungen des Benutzers; alle Spalten sind
@@ -902,7 +902,7 @@ IMPL_LINK( SwColumnPage, ColModify, NumericField *, pNF )
}
/*------------------------------------------------------------------------
- Beschreibung: Modify- Handler fuer eine Aenderung der Spaltenbreite
+ Beschreibung: Modify- Handler fuer eine Aenderung der Spaltenbreite
oder des Spaltenabstandes.
Diese Aenderungen wirken sich erst zeitversetzt aus.
Durch eine Aenderung der Spaltenbreite wird die automatische
@@ -989,7 +989,7 @@ IMPL_LINK( SwColumnPage, EdModify, PercentField *, pField )
}
/*------------------------------------------------------------------------
- Beschreibung: Handler hinter der Checkbox fuer automatische Breite.
+ Beschreibung: Handler hinter der Checkbox fuer automatische Breite.
Ist die Box gecheckt, koennen keine expliziten Werte
fuer die Spaltenbreite eingegeben werden.
------------------------------------------------------------------------*/
@@ -1011,7 +1011,7 @@ IMPL_LINK( SwColumnPage, AutoWidthHdl, CheckBox *, pBox )
}
/*------------------------------------------------------------------------
- Beschreibung: Raufscrollen der Inhalte der Edits.
+ Beschreibung: Raufscrollen der Inhalte der Edits.
------------------------------------------------------------------------*/
IMPL_LINK( SwColumnPage, Up, Button *, EMPTYARG )
{
@@ -1025,7 +1025,7 @@ IMPL_LINK( SwColumnPage, Up, Button *, EMPTYARG )
}
/*------------------------------------------------------------------------
- Beschreibung: Runterscrollen der Inhalte der Edits.
+ Beschreibung: Runterscrollen der Inhalte der Edits.
------------------------------------------------------------------------*/
IMPL_LINK( SwColumnPage, Down, Button *, EMPTYARG )
{
@@ -1039,8 +1039,8 @@ IMPL_LINK( SwColumnPage, Down, Button *, EMPTYARG )
}
/*------------------------------------------------------------------------
- Beschreibung: Relikt aus alten Zeiten - jetzt direkt ohne time
- * Timer- Handler; angetriggert durch eine Aenderung der
+ Beschreibung: Relikt aus alten Zeiten - jetzt direkt ohne time
+ * Timer- Handler; angetriggert durch eine Aenderung der
Spaltenbreite oder des Spaltenabstandes.
------------------------------------------------------------------------*/
IMPL_LINK( SwColumnPage, Timeout, Timer *, EMPTYARG )
@@ -1090,7 +1090,7 @@ IMPL_LINK( SwColumnPage, Timeout, Timer *, EMPTYARG )
}
/*------------------------------------------------------------------------
- Beschreibung: Aktualisierung der Anzeige
+ Beschreibung: Aktualisierung der Anzeige
------------------------------------------------------------------------*/
void SwColumnPage::Update()
{
@@ -1123,7 +1123,7 @@ void SwColumnPage::Update()
}
/*--------------------------------------------------------------------
- Beschreibung: Update Bsp
+ Beschreibung: Update Bsp
--------------------------------------------------------------------*/
void SwColumnPage::ActivatePage(const SfxItemSet& rSet)
{
@@ -1285,7 +1285,7 @@ void ColumnValueSet::UserDraw( const UserDrawEvent& rUDEvt )
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
Rectangle aRect = rUDEvt.GetRect();
- USHORT nItemId = rUDEvt.GetItemId();
+ USHORT nItemId = rUDEvt.GetItemId();
long nRectWidth = aRect.GetWidth();
long nRectHeight = aRect.GetHeight();
@@ -1313,11 +1313,11 @@ void ColumnValueSet::UserDraw( const UserDrawEvent& rUDEvt )
nEnds[1] = nRectWidth * 9 / 10;
break;
case 3: nCols = 3;
- nEnds[0] = nRectWidth * 30 / 100;
- nStarts[1] = nEnds[0] + nStep;
- nEnds[1] = nRectWidth * 63 / 100;
- nStarts[2] = nEnds[1] + nStep;
- nEnds[2] = nRectWidth * 9 / 10;
+ nEnds[0] = nRectWidth * 30 / 100;
+ nStarts[1] = nEnds[0] + nStep;
+ nEnds[1] = nRectWidth * 63 / 100;
+ nStarts[2] = nEnds[1] + nStep;
+ nEnds[2] = nRectWidth * 9 / 10;
break;
case 4: nCols = 2;
nEnds[0] = nRectWidth * 63 / 100;
diff --git a/sw/source/ui/frmdlg/column.hrc b/sw/source/ui/frmdlg/column.hrc
index dd8b81e0c91a..172674a6b3f6 100644
--- a/sw/source/ui/frmdlg/column.hrc
+++ b/sw/source/ui/frmdlg/column.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -24,41 +24,41 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#define FT_NUMBER 1
-#define ED_NUMBER 2
-#define FT_DISTANCE 3
-#define ED_DISTANCE 4
-#define CB_AUTO_WIDTH 4
+#define FT_NUMBER 1
+#define ED_NUMBER 2
+#define FT_DISTANCE 3
+#define ED_DISTANCE 4
+#define CB_AUTO_WIDTH 4
#define FL_COLUMNS 6
-#define FT_1 20
-#define FT_2 21
-#define FT_3 22
+#define FT_1 20
+#define FT_2 21
+#define FT_3 22
-#define ED_1 25
-#define ED_2 26
-#define ED_3 27
+#define ED_1 25
+#define ED_2 26
+#define ED_3 27
-#define BTN_UP 30
-#define BTN_DOWN 31
-#define FL_LAYOUT 32
+#define BTN_UP 30
+#define BTN_DOWN 31
+#define FL_LAYOUT 32
-#define FT_STYLE 33
-#define LB_STYLE 34
-#define FT_HEIGHT 35
-#define ED_HEIGHT 36
-#define FT_POSITION 37
-#define LB_POSITION 38
-#define FL_LINETYPE 39
+#define FT_STYLE 33
+#define LB_STYLE 34
+#define FT_HEIGHT 35
+#define ED_HEIGHT 36
+#define FT_POSITION 37
+#define LB_POSITION 38
+#define FL_LINETYPE 39
-#define WN_BSP 41
+#define WN_BSP 41
-#define LB_REFERENCE 42
+#define LB_REFERENCE 42
#define CB_REGISTER 43
#define FL_REGISTER 44
-#define FT_REFERENCE 45
+#define FT_REFERENCE 45
#define ED_DIST1 46
#define ED_DIST2 47
@@ -67,21 +67,21 @@
#define FT_WIDTH 49
#define FT_DIST 50
#define VS_DEFAULTS 51
-#define IL_PRE_COLS 52
+#define IL_PRE_COLS 52
-#define FT_APPLY_TO 53
+#define FT_APPLY_TO 53
#define LB_APPLY_TO 54
-#define PB_HELP 55
+#define PB_HELP 55
#define PB_CANCEL 56
#define PB_OK 57
-#define CB_BALANCECOLS 58
+#define CB_BALANCECOLS 58
#define FL_PROPERTIES 59
#define FT_TEXTDIRECTION 60
#define LB_TEXTDIRECTION 61
#define FL_VERT 62
-#define LISTBOX_SELECTION 0
-#define LISTBOX_SECTION 1
-#define LISTBOX_SECTIONS 2
-#define LISTBOX_PAGE 3
-#define LISTBOX_FRAME 4
+#define LISTBOX_SELECTION 0
+#define LISTBOX_SECTION 1
+#define LISTBOX_SECTIONS 2
+#define LISTBOX_PAGE 3
+#define LISTBOX_FRAME 4
diff --git a/sw/source/ui/frmdlg/column.src b/sw/source/ui/frmdlg/column.src
index 7f260501cbbe..449fbbf121ea 100644
--- a/sw/source/ui/frmdlg/column.src
+++ b/sw/source/ui/frmdlg/column.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -391,11 +391,11 @@ ModalDialog DLG_COLUMN
DropDown = TRUE ;
StringList [ en-US ] =
{
- < "Selection" ; LISTBOX_SELECTION; > ;
- < "Current Section" ; LISTBOX_SECTION ; > ;
- < "Selected section" ; LISTBOX_SECTIONS ; > ;
- < "Frame" ; LISTBOX_FRAME ; > ;
- < "Page Style: " ; LISTBOX_PAGE ; > ;
+ < "Selection" ; LISTBOX_SELECTION; > ;
+ < "Current Section" ; LISTBOX_SECTION ; > ;
+ < "Selected section" ; LISTBOX_SECTIONS ; > ;
+ < "Frame" ; LISTBOX_FRAME ; > ;
+ < "Page Style: " ; LISTBOX_PAGE ; > ;
};
};
Text [ en-US ] = "Columns";
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index 8bcc2912717b..c15fe954b812 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -73,14 +73,14 @@ extern String* GetOldDrwCat();
class SwSequenceOptionDialog : public SvxStandardDialog
{
FixedLine aFlHeader;
- FixedText aFtLevel;
- ListBox aLbLevel;
- FixedText aFtDelim;
- Edit aEdDelim;
+ FixedText aFtLevel;
+ ListBox aLbLevel;
+ FixedText aFtDelim;
+ Edit aEdDelim;
FixedLine aFlCatAndFrame;
- FixedText aFtCharStyle;
- ListBox aLbCharStyle;
+ FixedText aFtCharStyle;
+ ListBox aLbCharStyle;
CheckBox aApplyBorderAndShadowCB;
//#i61007# order of captions
@@ -89,11 +89,11 @@ class SwSequenceOptionDialog : public SvxStandardDialog
ListBox aLbCaptionOrder;
OKButton aOKButton;
- CancelButton aCancelButton;
- HelpButton aHelpButton;
+ CancelButton aCancelButton;
+ HelpButton aHelpButton;
SwView& rView;
- String aFldTypeName;
+ String aFldTypeName;
public:
SwSequenceOptionDialog( Window *pParent, SwView &rV,
@@ -157,13 +157,13 @@ SwCaptionDialog::SwCaptionDialog( Window *pParent, SwView &rV ) :
Link aLk = LINK( this, SwCaptionDialog, ModifyHdl );
aCategoryBox.SetModifyHdl( aLk );
- aTextEdit .SetModifyHdl( aLk );
+ aTextEdit .SetModifyHdl( aLk );
aNumberingSeparatorED.SetModifyHdl ( aLk );
- aSepEdit .SetModifyHdl( aLk );
+ aSepEdit .SetModifyHdl( aLk );
aLk = LINK(this, SwCaptionDialog, SelectHdl);
aCategoryBox.SetSelectHdl( aLk );
- aFormatBox .SetSelectHdl( aLk );
+ aFormatBox .SetSelectHdl( aLk );
aOptionButton.SetClickHdl( LINK( this, SwCaptionDialog, OptionHdl ) );
aAutoCaptionButton.SetClickHdl(LINK(this, SwCaptionDialog, CaptionHdl));
@@ -267,7 +267,7 @@ SwCaptionDialog::SwCaptionDialog( Window *pParent, SwView &rV ) :
case nsSelectionType::SEL_FRM:
case nsSelectionType::SEL_TXT:
aPosBox.InsertEntry(SW_RESSTR(STR_BEGINNING));
- aPosBox.InsertEntry(SW_RESSTR(STR_END ));
+ aPosBox.InsertEntry(SW_RESSTR(STR_END ));
break;
}
aPosBox.SelectEntryPos(1);
@@ -365,7 +365,7 @@ IMPL_LINK( SwCaptionDialog, ModifyHdl, Edit *, EMPTYARG )
IMPL_LINK(SwCaptionDialog, CaptionHdl, PushButton*, EMPTYARG)
{
- SfxItemSet aSet( rView.GetDocShell()->GetDoc()->GetAttrPool() );
+ SfxItemSet aSet( rView.GetDocShell()->GetDoc()->GetAttrPool() );
SwCaptionOptDlg aDlg( this, aSet );
aDlg.Execute();
@@ -492,9 +492,9 @@ SwSequenceOptionDialog::SwSequenceOptionDialog( Window *pParent, SwView &rV,
aFlCaptionOrder(this, SW_RES( FL_ORDER )), //#i61007# order of captions
aFtCaptionOrder(this, SW_RES( FT_ORDER )),
aLbCaptionOrder(this, SW_RES( LB_ORDER )),
- aOKButton (this, SW_RES(BTN_OK )),
- aCancelButton (this, SW_RES(BTN_CANCEL )),
- aHelpButton (this, SW_RES(BTN_HELP )),
+ aOKButton (this, SW_RES(BTN_OK )),
+ aCancelButton (this, SW_RES(BTN_CANCEL )),
+ aHelpButton (this, SW_RES(BTN_HELP )),
rView( rV ),
aFldTypeName( rSeqFldType )
diff --git a/sw/source/ui/frmdlg/cption.hrc b/sw/source/ui/frmdlg/cption.hrc
index 1487171f0c01..b85b6215a5d1 100644
--- a/sw/source/ui/frmdlg/cption.hrc
+++ b/sw/source/ui/frmdlg/cption.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -41,7 +41,7 @@
#define BOX_POS 11
#define FL_SETTINGS 12
#define BTN_HELP 13
-#define BTN_OPTION 14
+#define BTN_OPTION 14
#define FL_HEADER 15
#define FT_LEVEL 16
#define LB_LEVEL 17
@@ -66,11 +66,11 @@
#define FT_NUM_SEP 34
#define ED_NUM_SEP 35
-#define STR_BEGINNING 1
-#define STR_END 2
-#define STR_ABOVE 3
-#define STR_CP_BELOW 4
-#define STR_CATEGORY_NONE 5
+#define STR_BEGINNING 1
+#define STR_END 2
+#define STR_ABOVE 3
+#define STR_CP_BELOW 4
+#define STR_CATEGORY_NONE 5
#endif
diff --git a/sw/source/ui/frmdlg/cption.src b/sw/source/ui/frmdlg/cption.src
index 711bf796e2a7..9440c7859f28 100644
--- a/sw/source/ui/frmdlg/cption.src
+++ b/sw/source/ui/frmdlg/cption.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx
index e2b5c13d1c57..2fdf235a3964 100644
--- a/sw/source/ui/frmdlg/frmdlg.cxx
+++ b/sw/source/ui/frmdlg/frmdlg.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -56,16 +56,16 @@
#include <svx/svxdlg.hxx>
/*--------------------------------------------------------------------
- Beschreibung: Der Traeger des Dialoges
+ Beschreibung: Der Traeger des Dialoges
--------------------------------------------------------------------*/
SwFrmDlg::SwFrmDlg( SfxViewFrame* pViewFrame,
- Window* pParent,
- const SfxItemSet& rCoreSet,
- BOOL bNewFrm,
- USHORT nResType,
+ Window* pParent,
+ const SfxItemSet& rCoreSet,
+ BOOL bNewFrm,
+ USHORT nResType,
BOOL bFormat,
- UINT16 nDefPage,
- const String* pStr) :
+ UINT16 nDefPage,
+ const String* pStr) :
SfxTabDialog(pViewFrame, pParent, SW_RES(nResType), &rCoreSet, pStr != 0),
m_bFormat(bFormat),
@@ -87,18 +87,18 @@ SwFrmDlg::SwFrmDlg( SfxViewFrame* pViewFrame,
aTmp += *pStr;
aTmp += ')';
}
- AddTabPage(TP_FRM_STD, SwFrmPage::Create, 0);
- AddTabPage(TP_FRM_ADD, SwFrmAddPage::Create, 0);
- AddTabPage(TP_FRM_WRAP, SwWrapTabPage::Create, 0);
- AddTabPage(TP_FRM_URL, SwFrmURLPage::Create, 0);
+ AddTabPage(TP_FRM_STD, SwFrmPage::Create, 0);
+ AddTabPage(TP_FRM_ADD, SwFrmAddPage::Create, 0);
+ AddTabPage(TP_FRM_WRAP, SwWrapTabPage::Create, 0);
+ AddTabPage(TP_FRM_URL, SwFrmURLPage::Create, 0);
if(m_nDlgType == DLG_FRM_GRF)
{
- AddTabPage( TP_GRF_EXT, SwGrfExtPage::Create, 0 );
+ AddTabPage( TP_GRF_EXT, SwGrfExtPage::Create, 0 );
AddTabPage( RID_SVXPAGE_GRFCROP );
}
if (m_nDlgType == DLG_FRM_STD)
{
- AddTabPage(TP_COLUMN, SwColumnPage::Create, 0);
+ AddTabPage(TP_COLUMN, SwColumnPage::Create, 0);
}
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialogdiet fail!");
@@ -177,7 +177,7 @@ void SwFrmDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
case TP_MACRO_ASSIGN:
{
SfxAllItemSet aNewSet(*aSet.GetPool());
- aNewSet.Put( SwMacroAssignDlg::AddEvents(
+ aNewSet.Put( SwMacroAssignDlg::AddEvents(
DLG_FRM_GRF == m_nDlgType ? MACASSGN_GRAPHIC : DLG_FRM_OLE == m_nDlgType ? MACASSGN_OLE : MACASSGN_FRMURL ) );
if ( m_pWrtShell )
rPage.SetFrame( m_pWrtShell->GetView().GetViewFrame()->GetFrame().GetFrameInterface() );
diff --git a/sw/source/ui/frmdlg/frmmgr.cxx b/sw/source/ui/frmdlg/frmmgr.cxx
index a9fd394c5d77..321f7726438f 100644
--- a/sw/source/ui/frmdlg/frmmgr.cxx
+++ b/sw/source/ui/frmdlg/frmmgr.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -79,9 +79,9 @@ SwFlyFrmAttrMgr::SwFlyFrmAttrMgr( BOOL bNew, SwWrtShell* pSh, BYTE nType ) :
USHORT nId = 0;
switch ( nType )
{
- case FRMMGR_TYPE_TEXT: nId = RES_POOLFRM_FRAME; break;
- case FRMMGR_TYPE_OLE: nId = RES_POOLFRM_OLE; break;
- case FRMMGR_TYPE_GRF: nId = RES_POOLFRM_GRAPHIC; break;
+ case FRMMGR_TYPE_TEXT: nId = RES_POOLFRM_FRAME; break;
+ case FRMMGR_TYPE_OLE: nId = RES_POOLFRM_OLE; break;
+ case FRMMGR_TYPE_GRF: nId = RES_POOLFRM_GRAPHIC; break;
}
aSet.SetParent( &pOwnSh->GetFmtFromPool( nId )->GetAttrSet());
aSet.Put( SwFmtFrmSize( ATT_MIN_SIZE, DFLT_WIDTH, DFLT_HEIGHT ));
@@ -112,7 +112,7 @@ SwFlyFrmAttrMgr::SwFlyFrmAttrMgr( BOOL bNew, SwWrtShell* pSh, const SfxItemSet &
}
/*--------------------------------------------------------------------
- Beschreibung: Initialisieren
+ Beschreibung: Initialisieren
--------------------------------------------------------------------*/
void SwFlyFrmAttrMgr::UpdateAttrMgr()
{
@@ -171,7 +171,7 @@ void SwFlyFrmAttrMgr::UpdateFlyFrm()
}
/*--------------------------------------------------------------------
- Beschreibung: Rahmen einfuegen
+ Beschreibung: Rahmen einfuegen
--------------------------------------------------------------------*/
BOOL SwFlyFrmAttrMgr::InsertFlyFrm()
{
@@ -191,14 +191,14 @@ BOOL SwFlyFrmAttrMgr::InsertFlyFrm()
}
/*------------------------------------------------------------------------
- Beschreibung: Rahmen des Typs eAnchorType einfuegen. Position und
+ Beschreibung: Rahmen des Typs eAnchorType einfuegen. Position und
Groesse werden explizit angegeben.
Nicht erlaubte Werte des Aufzaehlungstypes werden
korrigiert.
------------------------------------------------------------------------*/
-void SwFlyFrmAttrMgr::InsertFlyFrm(RndStdIds eAnchorType,
- const Point &rPos,
- const Size &rSize,
+void SwFlyFrmAttrMgr::InsertFlyFrm(RndStdIds eAnchorType,
+ const Point &rPos,
+ const Size &rSize,
BOOL bAbs )
{
OSL_ENSURE( eAnchorType == FLY_AT_PAGE ||
@@ -218,7 +218,7 @@ void SwFlyFrmAttrMgr::InsertFlyFrm(RndStdIds eAnchorType,
}
/*--------------------------------------------------------------------
- Beschreibung: Anker setzen
+ Beschreibung: Anker setzen
--------------------------------------------------------------------*/
void SwFlyFrmAttrMgr::SetAnchor( RndStdIds eId )
{
@@ -239,7 +239,7 @@ void SwFlyFrmAttrMgr::SetAnchor( RndStdIds eId )
}
/*------------------------------------------------------------------------
- Beschreibung: Setzen des Attributs fuer Spalten
+ Beschreibung: Setzen des Attributs fuer Spalten
------------------------------------------------------------------------*/
void SwFlyFrmAttrMgr::SetCol( const SwFmtCol &rCol )
{
@@ -247,7 +247,7 @@ void SwFlyFrmAttrMgr::SetCol( const SwFmtCol &rCol )
}
/*--------------------------------------------------------------------
- Beschreibung: Absolute Position setzen
+ Beschreibung: Absolute Position setzen
--------------------------------------------------------------------*/
void SwFlyFrmAttrMgr::SetAbsPos( const Point& rPoint )
{
@@ -348,11 +348,11 @@ void SwFlyFrmAttrMgr::ValidateMetrics( SvxSwFrameValidation& rVal,
if ( rVal.nHoriOrient != text::HoriOrientation::NONE )
nH = aBoundRect.Left();
- rVal.nMaxHPos = aBoundRect.Right() - rVal.nWidth;
+ rVal.nMaxHPos = aBoundRect.Right() - rVal.nWidth;
rVal.nMaxHeight = aBoundRect.Bottom() - nV;
- rVal.nMaxVPos = aBoundRect.Bottom() - rVal.nHeight;
- rVal.nMaxWidth = aBoundRect.Right() - nH;
+ rVal.nMaxVPos = aBoundRect.Bottom() - rVal.nHeight;
+ rVal.nMaxWidth = aBoundRect.Right() - nH;
}
// OD 12.11.2003 #i22341# - handle to character anchored objects vertical
// aligned at character or top of line in a special case
@@ -418,7 +418,7 @@ void SwFlyFrmAttrMgr::ValidateMetrics( SvxSwFrameValidation& rVal,
? aBoundRect.Top()
: rVal.nVPos;
rVal.nMaxHeight = rVal.nMaxVPos + rVal.nHeight - nV;
- rVal.nMaxWidth = rVal.nMaxHPos + rVal.nWidth - nH;
+ rVal.nMaxWidth = rVal.nMaxHPos + rVal.nWidth - nH;
}
// OD 12.11.2003 #i22341# - special case for to character anchored objects
// vertical aligned at character or top of line.
@@ -477,10 +477,10 @@ void SwFlyFrmAttrMgr::ValidateMetrics( SvxSwFrameValidation& rVal,
rVal.nMaxHPos = 0;
rVal.nMaxHeight = aBoundRect.Height();
- rVal.nMaxWidth = aBoundRect.Width();
+ rVal.nMaxWidth = aBoundRect.Width();
- rVal.nMaxVPos = aBoundRect.Height();
- rVal.nMinVPos = -aBoundRect.Height() + rVal.nHeight;
+ rVal.nMaxVPos = aBoundRect.Height();
+ rVal.nMinVPos = -aBoundRect.Height() + rVal.nHeight;
if (rVal.nMaxVPos < rVal.nMinVPos)
{
rVal.nMinVPos = rVal.nMaxVPos;
@@ -507,28 +507,28 @@ void SwFlyFrmAttrMgr::ValidateMetrics( SvxSwFrameValidation& rVal,
SwTwips SwFlyFrmAttrMgr::CalcTopSpace()
{
const SvxShadowItem& rShadow = GetShadow();
- const SvxBoxItem& rBox = GetBox();
+ const SvxBoxItem& rBox = GetBox();
return rShadow.CalcShadowSpace(SHADOW_TOP ) + rBox.CalcLineSpace(BOX_LINE_TOP);
}
SwTwips SwFlyFrmAttrMgr::CalcBottomSpace()
{
const SvxShadowItem& rShadow = GetShadow();
- const SvxBoxItem& rBox = GetBox();
+ const SvxBoxItem& rBox = GetBox();
return rShadow.CalcShadowSpace(SHADOW_BOTTOM) + rBox.CalcLineSpace(BOX_LINE_BOTTOM);
}
SwTwips SwFlyFrmAttrMgr::CalcLeftSpace()
{
const SvxShadowItem& rShadow = GetShadow();
- const SvxBoxItem& rBox = GetBox();
+ const SvxBoxItem& rBox = GetBox();
return rShadow.CalcShadowSpace(SHADOW_LEFT) + rBox.CalcLineSpace(BOX_LINE_LEFT);
}
SwTwips SwFlyFrmAttrMgr::CalcRightSpace()
{
const SvxShadowItem& rShadow = GetShadow();
- const SvxBoxItem& rBox = GetBox();
+ const SvxBoxItem& rBox = GetBox();
return rShadow.CalcShadowSpace(SHADOW_RIGHT) + rBox.CalcLineSpace(BOX_LINE_RIGHT);
}
@@ -569,10 +569,10 @@ void SwFlyFrmAttrMgr::SetPos( const Point& rPoint )
SwFmtVertOrient aVertOrient( GetVertOrient() );
SwFmtHoriOrient aHoriOrient( GetHoriOrient() );
- aHoriOrient.SetPos ( rPoint.X() );
+ aHoriOrient.SetPos ( rPoint.X() );
aHoriOrient.SetHoriOrient( text::HoriOrientation::NONE );
- aVertOrient.SetPos ( rPoint.Y() );
+ aVertOrient.SetPos ( rPoint.Y() );
aVertOrient.SetVertOrient( text::VertOrientation::NONE );
aSet.Put( aVertOrient );
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 6cc805ecae33..099e6ba366a3 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -116,7 +116,7 @@ struct StringIdPair_Impl
// OD 19.09.2003 #i18732# - change order of alignments
#define LB_FRAME 0x00000001L // Textbereich des Absatzes
-#define LB_PRTAREA 0x00000002L // Textbereich des Absatzes + Einzuege
+#define LB_PRTAREA 0x00000002L // Textbereich des Absatzes + Einzuege
#define LB_VERT_FRAME 0x00000004L // Vertikaler Textbereich des Absatzes
#define LB_VERT_PRTAREA 0x00000008L // Vertikaler Textbereich des Absatzes + Einzuege
#define LB_REL_FRM_LEFT 0x00000010L // Linker Absatzrand
@@ -132,9 +132,9 @@ struct StringIdPair_Impl
#define LB_FLY_REL_PG_FRAME 0x00001000L // Gesamte Rahmen
#define LB_FLY_REL_PG_PRTAREA 0x00002000L // Rahmeninneres
-#define LB_REL_BASE 0x00010000L // Zeichenausrichtung Basis
-#define LB_REL_CHAR 0x00020000L // Zeichenausrichtung Zeichen
-#define LB_REL_ROW 0x00040000L // Zeichenausrichtung Zeile
+#define LB_REL_BASE 0x00010000L // Zeichenausrichtung Basis
+#define LB_REL_CHAR 0x00020000L // Zeichenausrichtung Zeichen
+#define LB_REL_ROW 0x00040000L // Zeichenausrichtung Zeile
// OD 10.11.2003 #i22305#
#define LB_FLY_VERT_FRAME 0x00100000L // vertical entire frame
@@ -181,7 +181,7 @@ static RelationMap __FAR_DATA aAsCharRelationMap[] =
/*--------------------------------------------------------------------
Beschreibung: Seite verankert
--------------------------------------------------------------------*/
-#define HORI_PAGE_REL (LB_REL_PG_FRAME|LB_REL_PG_PRTAREA|LB_REL_PG_LEFT| \
+#define HORI_PAGE_REL (LB_REL_PG_FRAME|LB_REL_PG_PRTAREA|LB_REL_PG_LEFT| \
LB_REL_PG_RIGHT)
static FrmMap __FAR_DATA aHPageMap[] =
@@ -197,7 +197,7 @@ static FrmMap __FAR_DATA aHPageHtmlMap[] =
{SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, text::HoriOrientation::NONE, LB_REL_PG_FRAME}
};
-#define VERT_PAGE_REL (LB_REL_PG_FRAME|LB_REL_PG_PRTAREA)
+#define VERT_PAGE_REL (LB_REL_PG_FRAME|LB_REL_PG_PRTAREA)
static FrmMap __FAR_DATA aVPageMap[] =
{
@@ -215,7 +215,7 @@ static FrmMap __FAR_DATA aVPageHtmlMap[] =
/*--------------------------------------------------------------------
Beschreibung: Rahmen verankert
--------------------------------------------------------------------*/
-#define HORI_FRAME_REL (LB_FLY_REL_PG_FRAME|LB_FLY_REL_PG_PRTAREA| \
+#define HORI_FRAME_REL (LB_FLY_REL_PG_FRAME|LB_FLY_REL_PG_PRTAREA| \
LB_FLY_REL_PG_LEFT|LB_FLY_REL_PG_RIGHT)
static FrmMap __FAR_DATA aHFrameMap[] =
@@ -254,7 +254,7 @@ static FrmMap __FAR_DATA aVFlyHtmlMap[] =
/*--------------------------------------------------------------------
Beschreibung: Absatz verankert
--------------------------------------------------------------------*/
-#define HORI_PARA_REL (LB_FRAME|LB_PRTAREA|LB_REL_PG_LEFT|LB_REL_PG_RIGHT| \
+#define HORI_PARA_REL (LB_FRAME|LB_PRTAREA|LB_REL_PG_LEFT|LB_REL_PG_RIGHT| \
LB_REL_PG_FRAME|LB_REL_PG_PRTAREA|LB_REL_FRM_LEFT| \
LB_REL_FRM_RIGHT)
@@ -266,7 +266,7 @@ static FrmMap __FAR_DATA aHParaMap[] =
{SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, text::HoriOrientation::NONE, HORI_PARA_REL}
};
-#define HTML_HORI_PARA_REL (LB_FRAME|LB_PRTAREA)
+#define HTML_HORI_PARA_REL (LB_FRAME|LB_PRTAREA)
static FrmMap __FAR_DATA aHParaHtmlMap[] =
{
@@ -300,7 +300,7 @@ static FrmMap __FAR_DATA aVParaHtmlMap[] =
/*--------------------------------------------------------------------
Beschreibung: Relativ zum Zeichen verankert
--------------------------------------------------------------------*/
-#define HORI_CHAR_REL (LB_FRAME|LB_PRTAREA|LB_REL_PG_LEFT|LB_REL_PG_RIGHT| \
+#define HORI_CHAR_REL (LB_FRAME|LB_PRTAREA|LB_REL_PG_LEFT|LB_REL_PG_RIGHT| \
LB_REL_PG_FRAME|LB_REL_PG_PRTAREA|LB_REL_FRM_LEFT| \
LB_REL_FRM_RIGHT|LB_REL_CHAR)
@@ -312,7 +312,7 @@ static FrmMap __FAR_DATA aHCharMap[] =
{SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, text::HoriOrientation::NONE, HORI_CHAR_REL}
};
-#define HTML_HORI_CHAR_REL (LB_FRAME|LB_PRTAREA|LB_REL_CHAR)
+#define HTML_HORI_CHAR_REL (LB_FRAME|LB_PRTAREA|LB_REL_CHAR)
static FrmMap __FAR_DATA aHCharHtmlMap[] =
{
@@ -403,10 +403,10 @@ static USHORT __FAR_DATA aPageRg[] = {
0
};
static USHORT __FAR_DATA aAddPgRg[] = {
- RES_PROTECT, RES_PROTECT,
- RES_PRINT, RES_PRINT,
- FN_SET_FRM_NAME, FN_SET_FRM_NAME,
- FN_SET_FRM_ALT_NAME, FN_SET_FRM_ALT_NAME,
+ RES_PROTECT, RES_PROTECT,
+ RES_PRINT, RES_PRINT,
+ FN_SET_FRM_NAME, FN_SET_FRM_NAME,
+ FN_SET_FRM_ALT_NAME, FN_SET_FRM_ALT_NAME,
0
};
@@ -584,7 +584,7 @@ ULONG lcl_GetLBRelationsForStrID( const FrmMap* _pMap,
}
/*--------------------------------------------------------------------
- Beschreibung: StandardRahmenTabPage
+ Beschreibung: StandardRahmenTabPage
--------------------------------------------------------------------*/
namespace
{
@@ -596,41 +596,41 @@ namespace
}
SwFrmPage::SwFrmPage ( Window *pParent, const SfxItemSet &rSet ) :
- SfxTabPage (pParent, SW_RES(TP_FRM_STD), rSet),
+ SfxTabPage (pParent, SW_RES(TP_FRM_STD), rSet),
aWidthFT (this, SW_RES(FT_WIDTH)),
- aWidthAutoFT (this, SW_RES(FT_WIDTH_AUTO)),
- aWidthED (this, SW_RES(ED_WIDTH)),
- aRelWidthCB (this, SW_RES(CB_REL_WIDTH)),
- aAutoWidthCB (this, SW_RES(CB_AUTOWIDTH)),
- aHeightFT (this, SW_RES(FT_HEIGHT)),
- aHeightAutoFT (this, SW_RES(FT_HEIGHT_AUTO)),
- aHeightED (this, SW_RES(ED_HEIGHT)),
- aRelHeightCB (this, SW_RES(CB_REL_HEIGHT)),
- aAutoHeightCB (this, SW_RES(CB_AUTOHEIGHT)),
- aFixedRatioCB (this, SW_RES(CB_FIXEDRATIO)),
+ aWidthAutoFT (this, SW_RES(FT_WIDTH_AUTO)),
+ aWidthED (this, SW_RES(ED_WIDTH)),
+ aRelWidthCB (this, SW_RES(CB_REL_WIDTH)),
+ aAutoWidthCB (this, SW_RES(CB_AUTOWIDTH)),
+ aHeightFT (this, SW_RES(FT_HEIGHT)),
+ aHeightAutoFT (this, SW_RES(FT_HEIGHT_AUTO)),
+ aHeightED (this, SW_RES(ED_HEIGHT)),
+ aRelHeightCB (this, SW_RES(CB_REL_HEIGHT)),
+ aAutoHeightCB (this, SW_RES(CB_AUTOHEIGHT)),
+ aFixedRatioCB (this, SW_RES(CB_FIXEDRATIO)),
aRealSizeBT (this, SW_RES(BT_REALSIZE)),
aSizeFL (this, SW_RES(FL_SIZE)),
aTypeFL (this, SW_RES(FL_TYPE)),
aTypeSepFL (this, SW_RES(FL_TYPE_SEP)),
aAnchorAtPageRB (this, SW_RES(RB_ANCHOR_PAGE)),
- aAnchorAtParaRB (this, SW_RES(RB_ANCHOR_PARA)),
- aAnchorAtCharRB (this, SW_RES(RB_ANCHOR_AT_CHAR)),
- aAnchorAsCharRB (this, SW_RES(RB_ANCHOR_AS_CHAR)),
+ aAnchorAtParaRB (this, SW_RES(RB_ANCHOR_PARA)),
+ aAnchorAtCharRB (this, SW_RES(RB_ANCHOR_AT_CHAR)),
+ aAnchorAsCharRB (this, SW_RES(RB_ANCHOR_AS_CHAR)),
aAnchorAtFrameRB(this, SW_RES(RB_ANCHOR_FRAME)),
- aHorizontalFT (this, SW_RES(FT_HORIZONTAL)),
- aHorizontalDLB (this, SW_RES(DLB_HORIZONTAL)),
- aAtHorzPosFT (this, SW_RES(FT_AT_HORZ_POS)),
- aAtHorzPosED (this, SW_RES(ED_AT_HORZ_POS)),
+ aHorizontalFT (this, SW_RES(FT_HORIZONTAL)),
+ aHorizontalDLB (this, SW_RES(DLB_HORIZONTAL)),
+ aAtHorzPosFT (this, SW_RES(FT_AT_HORZ_POS)),
+ aAtHorzPosED (this, SW_RES(ED_AT_HORZ_POS)),
aHoriRelationFT (this, SW_RES(FT_HORI_RELATION)),
aHoriRelationLB (this, SW_RES(LB_HORI_RELATION)),
aMirrorPagesCB (this, SW_RES(CB_MIRROR)),
- aVerticalFT (this, SW_RES(FT_VERTICAL)),
- aVerticalDLB (this, SW_RES(DLB_VERTICAL)),
- aAtVertPosFT (this, SW_RES(FT_AT_VERT_POS)),
- aAtVertPosED (this, SW_RES(ED_AT_VERT_POS)),
+ aVerticalFT (this, SW_RES(FT_VERTICAL)),
+ aVerticalDLB (this, SW_RES(DLB_VERTICAL)),
+ aAtVertPosFT (this, SW_RES(FT_AT_VERT_POS)),
+ aAtVertPosED (this, SW_RES(ED_AT_VERT_POS)),
aVertRelationFT (this, SW_RES(FT_VERT_RELATION)),
aVertRelationLB (this, SW_RES(LB_VERT_RELATION)),
// OD 19.09.2003 #i18732# - new checkbox
@@ -668,16 +668,16 @@ SwFrmPage::SwFrmPage ( Window *pParent, const SfxItemSet &rSet ) :
SetExchangeSupport();
Link aLk = LINK(this, SwFrmPage, RangeModifyHdl);
- aWidthED. SetLoseFocusHdl( aLk );
- aHeightED. SetLoseFocusHdl( aLk );
+ aWidthED. SetLoseFocusHdl( aLk );
+ aHeightED. SetLoseFocusHdl( aLk );
aAtHorzPosED.SetLoseFocusHdl( aLk );
aAtVertPosED.SetLoseFocusHdl( aLk );
// OD 25.09.2003 #i18732# - click handler for new checkbox
aFollowTextFlowCB.SetClickHdl( aLk );
aLk = LINK(this, SwFrmPage, ModifyHdl);
- aWidthED. SetModifyHdl( aLk );
- aHeightED. SetModifyHdl( aLk );
+ aWidthED. SetModifyHdl( aLk );
+ aHeightED. SetModifyHdl( aLk );
aAtHorzPosED.SetModifyHdl( aLk );
aAtVertPosED.SetModifyHdl( aLk );
@@ -705,7 +705,7 @@ SwFrmPage::SwFrmPage ( Window *pParent, const SfxItemSet &rSet ) :
}
/*--------------------------------------------------------------------
- Beschreibung: Dtor
+ Beschreibung: Dtor
--------------------------------------------------------------------*/
SwFrmPage::~SwFrmPage()
{
@@ -808,7 +808,7 @@ void SwFrmPage::Reset( const SfxItemSet &rSet )
aRealSizeBT.SetClickHdl(LINK(this, SwFrmPage, RealSizeHdl));
EnableGraficMode();
}
-// else
+// else
// aTypeFL.SetSizePixel(Size(aTypeFL.GetSizePixel().Width(), aSizeFL.GetSizePixel().Height()));
if ( nDlgType == DLG_FRM_GRF )
@@ -876,8 +876,8 @@ void SwFrmPage::Reset( const SfxItemSet &rSet )
if(nDlgType == DLG_FRM_STD &&
0 == (nHtmlMode & HTMLMODE_FULL_ABS_POS))
{
- aHeightFT .Enable( FALSE );
- aHeightED .Enable( FALSE );
+ aHeightFT .Enable( FALSE );
+ aHeightED .Enable( FALSE );
aRelHeightCB.Enable( FALSE );
}
if( 0 == (nHtmlMode & HTMLMODE_SOME_ABS_POS))
@@ -932,7 +932,7 @@ void SwFrmPage::Reset( const SfxItemSet &rSet )
}
/*--------------------------------------------------------------------
- Beschreibung: Attribute in den Set stopfen bei OK
+ Beschreibung: Attribute in den Set stopfen bei OK
--------------------------------------------------------------------*/
BOOL SwFrmPage::FillItemSet(SfxItemSet &rSet)
{
@@ -1048,7 +1048,7 @@ BOOL SwFrmPage::FillItemSet(SfxItemSet &rSet)
const SwFmtFrmSize& rOldSize = (const SwFmtFrmSize& )rOldSet.Get(RES_FRM_SIZE);
SwFmtFrmSize aSz( rOldSize );
-/* // Folgende Zeilen nur zum debuggen:
+/* // Folgende Zeilen nur zum debuggen:
BOOL bModified = aWidthED.IsValueModified();
USHORT nOldWidth = rOldSize.GetWidth ();
USHORT nWidth = aWidthED .GetValue();
@@ -1127,7 +1127,7 @@ BOOL SwFrmPage::FillItemSet(SfxItemSet &rSet)
}
/*--------------------------------------------------------------------
- Beschreibung: Horizontale und vertikale Pos initialisieren
+ Beschreibung: Horizontale und vertikale Pos initialisieren
--------------------------------------------------------------------*/
void SwFrmPage::InitPos(RndStdIds eId,
USHORT nH,
@@ -1140,7 +1140,7 @@ void SwFrmPage::InitPos(RndStdIds eId,
USHORT nPos = aVerticalDLB.GetSelectEntryPos();
if ( nPos != LISTBOX_ENTRY_NOTFOUND && pVMap )
{
- nOldV = pVMap[nPos].nAlign;
+ nOldV = pVMap[nPos].nAlign;
nPos = aVertRelationLB.GetSelectEntryPos();
if (nPos != LISTBOX_ENTRY_NOTFOUND)
@@ -1150,7 +1150,7 @@ void SwFrmPage::InitPos(RndStdIds eId,
nPos = aHorizontalDLB.GetSelectEntryPos();
if ( nPos != LISTBOX_ENTRY_NOTFOUND && pHMap )
{
- nOldH = pHMap[nPos].nAlign;
+ nOldH = pHMap[nPos].nAlign;
nPos = aHoriRelationLB.GetSelectEntryPos();
if (nPos != LISTBOX_ENTRY_NOTFOUND)
@@ -1187,8 +1187,8 @@ void SwFrmPage::InitPos(RndStdIds eId,
{
if(bHtmlMode)
{
- pVMap = nHtmlMode & HTMLMODE_SOME_ABS_POS ? aVCharHtmlAbsMap : aVCharHtmlMap;
- pHMap = nHtmlMode & HTMLMODE_SOME_ABS_POS ? aHCharHtmlAbsMap : aHCharHtmlMap;
+ pVMap = nHtmlMode & HTMLMODE_SOME_ABS_POS ? aVCharHtmlAbsMap : aVCharHtmlMap;
+ pHMap = nHtmlMode & HTMLMODE_SOME_ABS_POS ? aHCharHtmlAbsMap : aHCharHtmlMap;
}
else
{
@@ -1198,7 +1198,7 @@ void SwFrmPage::InitPos(RndStdIds eId,
}
else if ( eId == FLY_AS_CHAR )
{
- pVMap = bHtmlMode ? aVAsCharHtmlMap : aVAsCharMap;
+ pVMap = bHtmlMode ? aVAsCharHtmlMap : aVAsCharMap;
pHMap = 0;
bEnable = FALSE;
}
@@ -1209,7 +1209,7 @@ void SwFrmPage::InitPos(RndStdIds eId,
// Horizontal
if ( nH == USHRT_MAX )
{
- nH = nOldH;
+ nH = nOldH;
nHRel = nOldHRel;
}
// OD 12.11.2003 #i22341# - pass <nHRel> as 3rd parameter to method <FillPosLB>
@@ -1219,7 +1219,7 @@ void SwFrmPage::InitPos(RndStdIds eId,
// Vertikal
if ( nV == USHRT_MAX )
{
- nV = nOldV;
+ nV = nOldV;
nVRel = nOldVRel;
}
// OD 12.11.2003 #i22341# - pass <nVRel> as 3rd parameter to method <FillPosLB>
@@ -1286,7 +1286,7 @@ USHORT SwFrmPage::FillPosLB(const FrmMap* _pMap,
size_t nCount = ::lcl_GetFrmMapCount(_pMap);
for (size_t i = 0; _pMap && i < nCount; ++i)
{
-// #61359# Warum nicht von links/von innen bzw. von oben?
+// #61359# Warum nicht von links/von innen bzw. von oben?
// if (!bFormat || (pMap[i].eStrId != SwFPos::FROMLEFT && pMap[i].eStrId != SwFPos::FROMTOP))
{
SvxSwFramePosString::StringId eStrId = aMirrorPagesCB.IsChecked() ? _pMap[i].eMirrorStrId : _pMap[i].eStrId;
@@ -1373,7 +1373,7 @@ ULONG SwFrmPage::FillRelLB( const FrmMap* _pMap,
for (USHORT i = 0; i < _rLB.GetEntryCount(); i++)
{
RelationMap *pEntry = (RelationMap *)_rLB.GetEntryData(i);
- if (pEntry->nLBRelation == LB_REL_CHAR) // Default
+ if (pEntry->nLBRelation == LB_REL_CHAR) // Default
{
_rLB.SelectEntryPos(i);
break;
@@ -1576,7 +1576,7 @@ RndStdIds SwFrmPage::GetAnchor()
}
/*--------------------------------------------------------------------
- Beschreibung: Bsp - Update
+ Beschreibung: Bsp - Update
--------------------------------------------------------------------*/
void SwFrmPage::ActivatePage(const SfxItemSet& rSet)
{
@@ -1637,8 +1637,8 @@ IMPL_LINK( SwFrmPage, RelSizeClickHdl, CheckBox *, pBtn )
aHeightED.MetricField::SetMax(MAX_PERCENT_HEIGHT);
}
- if (pBtn) // Nur wenn Handler durch Aenderung des Controllers gerufen wurde
- RangeModifyHdl(&aWidthED); // Werte wieder korrigieren
+ if (pBtn) // Nur wenn Handler durch Aenderung des Controllers gerufen wurde
+ RangeModifyHdl(&aWidthED); // Werte wieder korrigieren
if (pBtn == &aRelWidthCB)
ModifyHdl(&aWidthED);
@@ -1649,7 +1649,7 @@ IMPL_LINK( SwFrmPage, RelSizeClickHdl, CheckBox *, pBtn )
}
/*--------------------------------------------------------------------
- Beschreibung: Bereichspruefung
+ Beschreibung: Bereichspruefung
--------------------------------------------------------------------*/
IMPL_LINK( SwFrmPage, RangeModifyHdl, Edit *, EMPTYARG )
{
@@ -1827,7 +1827,7 @@ IMPL_LINK( SwFrmPage, PosHdl, ListBox *, pLB )
aAtVertPosFT.Enable( bEnable );
}
- if (pLB) // Nur wenn Handler durch Aenderung des Controllers gerufen wurde
+ if (pLB) // Nur wenn Handler durch Aenderung des Controllers gerufen wurde
RangeModifyHdl( 0 );
USHORT nRel = 0;
@@ -1909,7 +1909,7 @@ IMPL_LINK( SwFrmPage, PosHdl, ListBox *, pLB )
}
/*--------------------------------------------------------------------
- Beschreibung: Horizontale Pos
+ Beschreibung: Horizontale Pos
--------------------------------------------------------------------*/
IMPL_LINK( SwFrmPage, RelHdl, ListBox *, pLB )
{
@@ -1937,7 +1937,7 @@ IMPL_LINK( SwFrmPage, RelHdl, ListBox *, pLB )
}
}
}
- if (pLB) // Nur wenn Handler durch Aenderung des Controllers gerufen wurde
+ if (pLB) // Nur wenn Handler durch Aenderung des Controllers gerufen wurde
RangeModifyHdl(0);
return 0;
@@ -2153,9 +2153,9 @@ void SwFrmPage::Init(const SfxItemSet& rSet, BOOL bReset)
{
const SwFmtHoriOrient& rHori = (const SwFmtHoriOrient&)rSet.Get(RES_HORI_ORIENT);
const SwFmtVertOrient& rVert = (const SwFmtVertOrient&)rSet.Get(RES_VERT_ORIENT);
- nOldH = rHori.GetHoriOrient();
+ nOldH = rHori.GetHoriOrient();
nOldHRel = rHori.GetRelationOrient();
- nOldV = rVert.GetVertOrient(),
+ nOldV = rVert.GetVertOrient(),
nOldVRel = rVert.GetRelationOrient();
if (eAnchorId == FLY_AT_PAGE)
@@ -2194,7 +2194,7 @@ void SwFrmPage::Init(const SfxItemSet& rSet, BOOL bReset)
}
// ggf auf Prozent umschalten
- RangeModifyHdl(&aWidthED); // Referenzwerte setzen (fuer 100%)
+ RangeModifyHdl(&aWidthED); // Referenzwerte setzen (fuer 100%)
if (rSize.GetWidthPercent() == 0xff || rSize.GetHeightPercent() == 0xff)
aFixedRatioCB.Check(TRUE);
@@ -2223,7 +2223,7 @@ USHORT* SwFrmPage::GetRanges()
void SwFrmPage::SetFormatUsed(BOOL bFmt)
{
- bFormat = bFmt;
+ bFormat = bFmt;
if(bFormat)
{
aAnchorAtPageRB.Hide();
@@ -2262,7 +2262,7 @@ SwGrfExtPage::SwGrfExtPage(Window *pParent, const SfxItemSet &rSet) :
SetExchangeSupport();
aMirrorHorzBox.SetClickHdl( LINK(this, SwGrfExtPage, MirrorHdl));
aMirrorVertBox.SetClickHdl( LINK(this, SwGrfExtPage, MirrorHdl));
- aBrowseBT.SetClickHdl ( LINK(this, SwGrfExtPage, BrowseHdl));
+ aBrowseBT.SetClickHdl ( LINK(this, SwGrfExtPage, BrowseHdl));
}
SwGrfExtPage::~SwGrfExtPage()
@@ -2329,14 +2329,14 @@ void SwGrfExtPage::ActivatePage(const SfxItemSet& rSet)
switch (nPos)
{
- case 1: // Auf linken bzw geraden Seiten spiegeln
+ case 1: // Auf linken bzw geraden Seiten spiegeln
aLeftPagesRB.Check();
aMirrorHorzBox.Check(TRUE);
break;
- case 2: // Auf allen Seiten spiegeln
+ case 2: // Auf allen Seiten spiegeln
aAllPagesRB.Check();
break;
- case 3: // Auf rechten bzw ungeraden Seiten spiegeln
+ case 3: // Auf rechten bzw ungeraden Seiten spiegeln
aRightPagesRB.Check();
break;
default:
@@ -2437,7 +2437,7 @@ IMPL_LINK( SwGrfExtPage, BrowseHdl, Button *, EMPTYARG )
xCtrlAcc->setValue( ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_LINK, 0, aVal);
if ( pGrfDlg->Execute() == ERRCODE_NONE )
- { // ausgewaehlten Filter merken
+ { // ausgewaehlten Filter merken
aFilterName = pGrfDlg->GetCurrentFilter();
aNewGrfName = INetURLObject::decode( pGrfDlg->GetPath(),
INET_HEX_ESCAPE,
@@ -2561,16 +2561,16 @@ void BmpWindow::SetGraphic(const Graphic& rGrf)
}
/***************************************************************************
- Beschreibung: URL und ImageMap an Rahmen einstellen
+ Beschreibung: URL und ImageMap an Rahmen einstellen
***************************************************************************/
SwFrmURLPage::SwFrmURLPage( Window *pParent, const SfxItemSet &rSet ) :
- SfxTabPage(pParent, SW_RES(TP_FRM_URL), rSet),
+ SfxTabPage(pParent, SW_RES(TP_FRM_URL), rSet),
aHyperLinkFL (this, SW_RES( FL_HYPERLINK )),
- aURLFT (this, SW_RES( FT_URL )),
- aURLED (this, SW_RES( ED_URL )),
+ aURLFT (this, SW_RES( FT_URL )),
+ aURLED (this, SW_RES( ED_URL )),
aSearchPB (this, SW_RES( PB_SEARCH )),
- aNameFT (this, SW_RES( FT_NAME )),
- aNameED (this, SW_RES( ED_NAME )),
+ aNameFT (this, SW_RES( FT_NAME )),
+ aNameED (this, SW_RES( ED_NAME )),
aFrameFT (this, SW_RES( FT_FRAME )),
aFrameCB (this, SW_RES( CB_FRAME )),
@@ -2707,7 +2707,7 @@ void lcl_Move(Window& rWin, sal_Int32 nDiff)
}
SwFrmAddPage::SwFrmAddPage(Window *pParent, const SfxItemSet &rSet ) :
- SfxTabPage(pParent, SW_RES(TP_FRM_ADD), rSet),
+ SfxTabPage(pParent, SW_RES(TP_FRM_ADD), rSet),
aNameFT (this, SW_RES(FT_NAME)),
aNameED (this, SW_RES(ED_NAME)),
@@ -2727,7 +2727,7 @@ SwFrmAddPage::SwFrmAddPage(Window *pParent, const SfxItemSet &rSet ) :
aEditInReadonlyCB (this, SW_RES(CB_EDIT_IN_READONLY)),
aPrintFrameCB (this, SW_RES(CB_PRINT_FRAME)),
aTextFlowFT (this, SW_RES(FT_TEXTFLOW)),
- aTextFlowLB (this, SW_RES(LB_TEXTFLOW)),
+ aTextFlowLB (this, SW_RES(LB_TEXTFLOW)),
aExtFL (this, SW_RES(FL_EXT)),
@@ -2913,11 +2913,11 @@ void SwFrmAddPage::Reset(const SfxItemSet &rSet )
aProtectSizeCB.Check(rProt.IsSizeProtected());
const SwFmtEditInReadonly& rEdit = (const SwFmtEditInReadonly& )rSet.Get(RES_EDIT_IN_READONLY);
- aEditInReadonlyCB.Check(rEdit.GetValue()); aEditInReadonlyCB.SaveValue();
+ aEditInReadonlyCB.Check(rEdit.GetValue()); aEditInReadonlyCB.SaveValue();
// drucken
const SvxPrintItem& rPrt = (const SvxPrintItem&)rSet.Get(RES_PRINT);
- aPrintFrameCB.Check(rPrt.GetValue()); aPrintFrameCB.SaveValue();
+ aPrintFrameCB.Check(rPrt.GetValue()); aPrintFrameCB.SaveValue();
// textflow
SfxItemState eState;
@@ -3025,7 +3025,7 @@ IMPL_LINK(SwFrmAddPage, EditModifyHdl, Edit*, EMPTYARG)
return 0;
}
-void SwFrmAddPage::SetFormatUsed(BOOL bFmt)
+void SwFrmAddPage::SetFormatUsed(BOOL bFmt)
{
bFormat = bFmt;
if(bFormat)
diff --git a/sw/source/ui/frmdlg/frmpage.hrc b/sw/source/ui/frmdlg/frmpage.hrc
index 044d2fdd4e05..a1f213ee6b4c 100644
--- a/sw/source/ui/frmdlg/frmpage.hrc
+++ b/sw/source/ui/frmdlg/frmpage.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -27,7 +27,7 @@
#include <svtools/controldims.hrc>
-#define RB_ANCHOR_PAGE 1
+#define RB_ANCHOR_PAGE 1
#define RB_ANCHOR_PARA 2
#define RB_ANCHOR_AT_CHAR 3
#define RB_ANCHOR_AS_CHAR 4
@@ -48,63 +48,63 @@
#define DLB_HORIZONTAL 34
#define FT_AT_HORZ_POS 35
#define ED_AT_HORZ_POS 36
-#define FT_HORI_RELATION 1
-#define LB_HORI_RELATION 2
-#define CB_MIRROR 37
+#define FT_HORI_RELATION 1
+#define LB_HORI_RELATION 2
+#define CB_MIRROR 37
#define FT_VERTICAL 38
#define DLB_VERTICAL 39
#define FT_AT_VERT_POS 40
#define ED_AT_VERT_POS 41
-#define FT_VERT_RELATION 3
-#define LB_VERT_RELATION 4
+#define FT_VERT_RELATION 3
+#define LB_VERT_RELATION 4
#define FL_POSITION 43
-#define BT_REALSIZE 44
-#define BT_MANUAL 45
-#define CB_AUTOWIDTH 46
-#define FT_WIDTH_AUTO 47
-#define FT_HEIGHT_AUTO 48
+#define BT_REALSIZE 44
+#define BT_MANUAL 45
+#define CB_AUTOWIDTH 46
+#define FT_WIDTH_AUTO 47
+#define FT_HEIGHT_AUTO 48
// metrics
-#define SWFRMPG_COL_0 RSC_SP_TBPG_INNERBORDER_LEFT
-#define SWFRMPG_COL_1 (SWFRMPG_COL_0+RSC_SP_FLGR_INNERBORDER_LEFT)
-#define SWFRMPG_COL_2 (SWFRMPG_COL_1+RSC_SP_FLGR_INNERBORDER_LEFT)
-#define SWFRMPG_COL_3 76
-#define SWFRMPG_COL_4 109
+#define SWFRMPG_COL_0 RSC_SP_TBPG_INNERBORDER_LEFT
+#define SWFRMPG_COL_1 (SWFRMPG_COL_0+RSC_SP_FLGR_INNERBORDER_LEFT)
+#define SWFRMPG_COL_2 (SWFRMPG_COL_1+RSC_SP_FLGR_INNERBORDER_LEFT)
+#define SWFRMPG_COL_3 76
+#define SWFRMPG_COL_4 109
-#define SWFRMPG_ROW_CONDENSE 1
-#define SWFRMPG_ROW_0 RSC_SP_TBPG_INNERBORDER_TOP
-#define SWFRMPG_ROW_1 (SWFRMPG_ROW_0+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_FLGR_INNERBORDER_TOP-SWFRMPG_ROW_CONDENSE)
-#define SWFRMPG_ROW_2 (SWFRMPG_ROW_1+((RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2))
-#define SWFRMPG_ROW_3 (SWFRMPG_ROW_1+RSC_CD_TEXTBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y-SWFRMPG_ROW_CONDENSE)
-#define SWFRMPG_ROW_4 (SWFRMPG_ROW_3+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y-SWFRMPG_ROW_CONDENSE)
-#define SWFRMPG_ROW_5 (SWFRMPG_ROW_4+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y-SWFRMPG_ROW_CONDENSE)
-#define SWFRMPG_ROW_6 (SWFRMPG_ROW_5+((RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2))
-#define SWFRMPG_ROW_7 (SWFRMPG_ROW_5+RSC_CD_TEXTBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y-SWFRMPG_ROW_CONDENSE)
-#define SWFRMPG_ROW_8 (SWFRMPG_ROW_7+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y-SWFRMPG_ROW_CONDENSE)
-#define SWFRMPG_ROW_9 (SWFRMPG_ROW_8+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y)
-#define SWFRMPG_ROW_10 (SWFRMPG_ROW_9+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_CTRL_Y-SWFRMPG_ROW_CONDENSE)
-#define SWFRMPG_ROW_11 (SWFRMPG_ROW_10+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_FLGR_INNERBORDER_TOP)
-#define SWFRMPG_ROW_12 (SWFRMPG_ROW_11+((RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2))
-#define SWFRMPG_ROW_13 (SWFRMPG_ROW_11+RSC_CD_TEXTBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y)
-#define SWFRMPG_ROW_14 (SWFRMPG_ROW_13+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y)
-#define SWFRMPG_ROW_15 (SWFRMPG_ROW_14+((RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2))
-#define SWFRMPG_ROW_16 (SWFRMPG_ROW_14+RSC_CD_TEXTBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y)
+#define SWFRMPG_ROW_CONDENSE 1
+#define SWFRMPG_ROW_0 RSC_SP_TBPG_INNERBORDER_TOP
+#define SWFRMPG_ROW_1 (SWFRMPG_ROW_0+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_FLGR_INNERBORDER_TOP-SWFRMPG_ROW_CONDENSE)
+#define SWFRMPG_ROW_2 (SWFRMPG_ROW_1+((RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2))
+#define SWFRMPG_ROW_3 (SWFRMPG_ROW_1+RSC_CD_TEXTBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y-SWFRMPG_ROW_CONDENSE)
+#define SWFRMPG_ROW_4 (SWFRMPG_ROW_3+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y-SWFRMPG_ROW_CONDENSE)
+#define SWFRMPG_ROW_5 (SWFRMPG_ROW_4+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y-SWFRMPG_ROW_CONDENSE)
+#define SWFRMPG_ROW_6 (SWFRMPG_ROW_5+((RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2))
+#define SWFRMPG_ROW_7 (SWFRMPG_ROW_5+RSC_CD_TEXTBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y-SWFRMPG_ROW_CONDENSE)
+#define SWFRMPG_ROW_8 (SWFRMPG_ROW_7+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y-SWFRMPG_ROW_CONDENSE)
+#define SWFRMPG_ROW_9 (SWFRMPG_ROW_8+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y)
+#define SWFRMPG_ROW_10 (SWFRMPG_ROW_9+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_CTRL_Y-SWFRMPG_ROW_CONDENSE)
+#define SWFRMPG_ROW_11 (SWFRMPG_ROW_10+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_FLGR_INNERBORDER_TOP)
+#define SWFRMPG_ROW_12 (SWFRMPG_ROW_11+((RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2))
+#define SWFRMPG_ROW_13 (SWFRMPG_ROW_11+RSC_CD_TEXTBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y)
+#define SWFRMPG_ROW_14 (SWFRMPG_ROW_13+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y)
+#define SWFRMPG_ROW_15 (SWFRMPG_ROW_14+((RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2))
+#define SWFRMPG_ROW_16 (SWFRMPG_ROW_14+RSC_CD_TEXTBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y)
-#define CB_HOR 46
-#define CB_VERT 47
-//#define LB_MIRROR_PAGES 49
-//#define FT_MIRROR_PAGES 50
+#define CB_HOR 46
+#define CB_VERT 47
+//#define LB_MIRROR_PAGES 49
+//#define FT_MIRROR_PAGES 50
#define FL_MIRROR 51
-#define WN_BMP 52
+#define WN_BMP 52
#define PB_BROWSE 53
#define ED_CONNECT 54
#define FL_CONNECT 55
-#define FT_CONNECT 57
-#define FT_URL 58
-#define ED_URL 59
+#define FT_CONNECT 57
+#define FT_URL 58
+#define ED_URL 59
-#define BMP_EXAMPLE 62
+#define BMP_EXAMPLE 62
#define BMP_EXAMPLE_HC 63
#define RB_MIRROR_ALL_PAGES 64
#define RB_MIRROR_LEFT_PAGES 65
@@ -117,14 +117,14 @@
#define CB_SERVER 98
#define CB_CLIENT 99
-#define CB_REL_WIDTH 100
-#define CB_REL_HEIGHT 101
-#define CB_FIXEDRATIO 102
-#define PB_SEARCH 103
+#define CB_REL_WIDTH 100
+#define CB_REL_HEIGHT 101
+#define CB_FIXEDRATIO 102
+#define PB_SEARCH 103
-#define CB_ANCHOR_ONLY 103
+#define CB_ANCHOR_ONLY 103
-#define FT_NAME 110
+#define FT_NAME 110
#define ED_NAME 111
#define FT_ALT_NAME 112
#define ED_ALT_NAME 113
diff --git a/sw/source/ui/frmdlg/frmpage.src b/sw/source/ui/frmdlg/frmpage.src
index 20a2d1702a46..5ce84d4552a5 100644
--- a/sw/source/ui/frmdlg/frmpage.src
+++ b/sw/source/ui/frmdlg/frmpage.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/sw/source/ui/frmdlg/frmui.src b/sw/source/ui/frmdlg/frmui.src
index 5e3abb1286e4..2b58742fc055 100644
--- a/sw/source/ui/frmdlg/frmui.src
+++ b/sw/source/ui/frmdlg/frmui.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/sw/source/ui/frmdlg/pattern.cxx b/sw/source/ui/frmdlg/pattern.cxx
index d59d6778f919..b9ca694a3b47 100644
--- a/sw/source/ui/frmdlg/pattern.cxx
+++ b/sw/source/ui/frmdlg/pattern.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
diff --git a/sw/source/ui/frmdlg/pattern.hrc b/sw/source/ui/frmdlg/pattern.hrc
index f9eabe9bb3c5..1a4750e23493 100644
--- a/sw/source/ui/frmdlg/pattern.hrc
+++ b/sw/source/ui/frmdlg/pattern.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -25,22 +25,22 @@
*
************************************************************************/
-#define BRUSH_LBL 1
-#define BRUSH_LBOX 2
+#define BRUSH_LBL 1
+#define BRUSH_LBOX 2
-#define COLOR_LBL 3
-#define COLOR_LBOX 4
+#define COLOR_LBL 3
+#define COLOR_LBOX 4
-#define FILLIN_COLOR_LBL 5
-#define FILLIN_COLOR_LBOX 6
+#define FILLIN_COLOR_LBL 5
+#define FILLIN_COLOR_LBOX 6
-#define NO_PATTERN_BOX 7
+#define NO_PATTERN_BOX 7
-#define PATTERN_FRM 8
-#define EXAMPLE_FRM 9
-#define EXAMPLE_WIN 10
+#define PATTERN_FRM 8
+#define EXAMPLE_FRM 9
+#define EXAMPLE_WIN 10
-#define OK_BTN 11
-#define CANCEL_BTN 12
-#define RESET_BTN 13
+#define OK_BTN 11
+#define CANCEL_BTN 12
+#define RESET_BTN 13
diff --git a/sw/source/ui/frmdlg/uiborder.cxx b/sw/source/ui/frmdlg/uiborder.cxx
index 58b468a8612d..9ef529790d5c 100644
--- a/sw/source/ui/frmdlg/uiborder.cxx
+++ b/sw/source/ui/frmdlg/uiborder.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index 29cd08234e18..dee3c62e01a4 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -91,12 +91,12 @@ SwWrapTabPage::SwWrapTabPage(Window *pParent, const SfxItemSet &rSet) :
SfxTabPage(pParent, SW_RES(TP_FRM_WRAP), rSet),
aWrapFLC (this, SW_RES(C_WRAP_FL)),
- aNoWrapRB (this, SW_RES(RB_NO_WRAP)),
- aWrapLeftRB (this, SW_RES(RB_WRAP_LEFT)),
- aWrapRightRB (this, SW_RES(RB_WRAP_RIGHT)),
- aWrapParallelRB (this, SW_RES(RB_WRAP_PARALLEL)),
- aWrapThroughRB (this, SW_RES(RB_WRAP_THROUGH)),
- aIdealWrapRB (this, SW_RES(RB_WRAP_IDEAL)),
+ aNoWrapRB (this, SW_RES(RB_NO_WRAP)),
+ aWrapLeftRB (this, SW_RES(RB_WRAP_LEFT)),
+ aWrapRightRB (this, SW_RES(RB_WRAP_RIGHT)),
+ aWrapParallelRB (this, SW_RES(RB_WRAP_PARALLEL)),
+ aWrapThroughRB (this, SW_RES(RB_WRAP_THROUGH)),
+ aIdealWrapRB (this, SW_RES(RB_WRAP_IDEAL)),
aMarginFL (this, SW_RES(FL_MARGIN)),
aLeftMarginFT (this, SW_RES(FT_LEFT_MARGIN)),
@@ -111,9 +111,9 @@ SwWrapTabPage::SwWrapTabPage(Window *pParent, const SfxItemSet &rSet) :
aOptionsSepFL (this, SW_RES(FL_OPTION_SEP)),
aOptionsFL (this, SW_RES(FL_OPTION)),
aWrapAnchorOnlyCB (this, SW_RES(CB_ANCHOR_ONLY)),
- aWrapTransparentCB (this, SW_RES(CB_TRANSPARENT)),
- aWrapOutlineCB (this, SW_RES(CB_OUTLINE)),
- aWrapOutsideCB (this, SW_RES(CB_ONLYOUTSIDE)),
+ aWrapTransparentCB (this, SW_RES(CB_TRANSPARENT)),
+ aWrapOutlineCB (this, SW_RES(CB_OUTLINE)),
+ aWrapOutsideCB (this, SW_RES(CB_ONLYOUTSIDE)),
aWrapIL (SW_RES(IL_WRAP)),
aWrapILH (SW_RES(ILH_WRAP)),
@@ -307,7 +307,7 @@ void SwWrapTabPage::Reset(const SfxItemSet &rSet)
}
/*--------------------------------------------------------------------
- Beschreibung: Attribute in den Set stopfen bei OK
+ Beschreibung: Attribute in den Set stopfen bei OK
--------------------------------------------------------------------*/
BOOL SwWrapTabPage::FillItemSet(SfxItemSet &rSet)
{
@@ -412,7 +412,7 @@ BOOL SwWrapTabPage::FillItemSet(SfxItemSet &rSet)
}
/*--------------------------------------------------------------------
- Beschreibung: Bsp - Update
+ Beschreibung: Bsp - Update
--------------------------------------------------------------------*/
void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet)
{
@@ -476,10 +476,10 @@ void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet)
SwTwips nTop;
SwTwips nBottom;
- nLeft = aVal.nHPos - aVal.nMinHPos;
- nRight = aVal.nMaxWidth - aVal.nWidth;
- nTop = aVal.nVPos - aVal.nMinVPos;
- nBottom = aVal.nMaxHeight - aVal.nHeight;
+ nLeft = aVal.nHPos - aVal.nMinHPos;
+ nRight = aVal.nMaxWidth - aVal.nWidth;
+ nTop = aVal.nVPos - aVal.nMinVPos;
+ nBottom = aVal.nMaxHeight - aVal.nHeight;
if (bHtmlMode && 0 == (nHtmlMode & HTMLMODE_FULL_ABS_POS))
{
@@ -497,7 +497,7 @@ void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet)
if (aVal.nVPos <= aVal.nMaxHeight)
nTop = aVal.nMaxVPos - aVal.nHeight;
else
- nTop = nBottom = 0; // Kein Umlauf
+ nTop = nBottom = 0; // Kein Umlauf
}
else
nTop = aVal.nMaxVPos - aVal.nHeight - aVal.nVPos;
@@ -508,7 +508,7 @@ void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet)
nTop += nBottom;
}
- nBottom = nTop;
+ nBottom = nTop;
nRight = nLeft;
}
@@ -617,7 +617,7 @@ int SwWrapTabPage::DeactivatePage(SfxItemSet* _pSet)
}
/*--------------------------------------------------------------------
- Beschreibung: Bereichspruefung
+ Beschreibung: Bereichspruefung
--------------------------------------------------------------------*/
IMPL_LINK( SwWrapTabPage, RangeModifyHdl, MetricField *, pEdit )
{
diff --git a/sw/source/ui/frmdlg/wrap.hrc b/sw/source/ui/frmdlg/wrap.hrc
index be19dbe702c2..077d8af65987 100644
--- a/sw/source/ui/frmdlg/wrap.hrc
+++ b/sw/source/ui/frmdlg/wrap.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -24,40 +24,40 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#define RB_NO_WRAP 2
-#define RB_WRAP_LEFT 3
-#define RB_WRAP_RIGHT 4
-#define RB_WRAP_PARALLEL 5
-#define RB_WRAP_THROUGH 6
-#define RB_WRAP_IDEAL 7
-#define CB_ANCHOR_ONLY 8
-#define FT_LEFT_MARGIN 13
-#define ED_LEFT_MARGIN 14
-#define FT_RIGHT_MARGIN 15
-#define ED_RIGHT_MARGIN 16
-#define FT_TOP_MARGIN 17
-#define ED_TOP_MARGIN 18
-#define ED_BOTTOM_MARGIN 19
-#define FT_BOTTOM_MARGIN 20
+#define RB_NO_WRAP 2
+#define RB_WRAP_LEFT 3
+#define RB_WRAP_RIGHT 4
+#define RB_WRAP_PARALLEL 5
+#define RB_WRAP_THROUGH 6
+#define RB_WRAP_IDEAL 7
+#define CB_ANCHOR_ONLY 8
+#define FT_LEFT_MARGIN 13
+#define ED_LEFT_MARGIN 14
+#define FT_RIGHT_MARGIN 15
+#define ED_RIGHT_MARGIN 16
+#define FT_TOP_MARGIN 17
+#define ED_TOP_MARGIN 18
+#define ED_BOTTOM_MARGIN 19
+#define FT_BOTTOM_MARGIN 20
#define FL_MARGIN 21
-#define CB_TRANSPARENT 22
-#define CB_OUTLINE 23
+#define CB_TRANSPARENT 22
+#define CB_OUTLINE 23
#define FL_OPTION 24
-#define CB_ONLYOUTSIDE 25
+#define CB_ONLYOUTSIDE 25
#define FL_OPTION_SEP 26
#define C_WRAP_FL 31
-#define IL_WRAP 32
+#define IL_WRAP 32
#define ILH_WRAP 33
// nur fuer die ImageList
-#define IMG_BEGIN 1
-#define IMG_NONE (IMG_BEGIN)
-#define IMG_LEFT (IMG_BEGIN + 1)
+#define IMG_BEGIN 1
+#define IMG_NONE (IMG_BEGIN)
+#define IMG_LEFT (IMG_BEGIN + 1)
#define IMG_RIGHT (IMG_BEGIN + 2)
#define IMG_PARALLEL (IMG_BEGIN + 3)
#define IMG_THROUGH (IMG_BEGIN + 4)
-#define IMG_IDEAL (IMG_BEGIN + 5)
-#define IMG_KON_NONE (IMG_BEGIN + 6)
+#define IMG_IDEAL (IMG_BEGIN + 5)
+#define IMG_KON_NONE (IMG_BEGIN + 6)
#define IMG_KON_LEFT (IMG_BEGIN + 7)
#define IMG_KON_RIGHT (IMG_BEGIN + 8)
#define IMG_KON_PARALLEL (IMG_BEGIN + 9)
diff --git a/sw/source/ui/frmdlg/wrap.src b/sw/source/ui/frmdlg/wrap.src
index bd779308178d..6810f55e1ade 100644
--- a/sw/source/ui/frmdlg/wrap.src
+++ b/sw/source/ui/frmdlg/wrap.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 18:24:00 +0000