diff options
Diffstat (limited to 'sw/source/ui/envelp')
33 files changed, 639 insertions, 639 deletions
diff --git a/sw/source/ui/envelp/envelp.src b/sw/source/ui/envelp/envelp.src index 20cbcebff32a..94cc2d40e654 100644 --- a/sw/source/ui/envelp/envelp.src +++ b/sw/source/ui/envelp/envelp.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/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index e59868232826..26389566ddf1 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.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 @@ -81,29 +81,29 @@ SwEnvFmtPage::SwEnvFmtPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, SW_RES(TP_ENV_FMT), rSet), aAddrFL (this, SW_RES( FL_ADDRESSEE )), - aAddrPosInfo (this, SW_RES( TXT_ADDR_POS )), - aAddrLeftText (this, SW_RES( TXT_ADDR_LEFT )), - aAddrLeftField (this, SW_RES( FLD_ADDR_LEFT )), - aAddrTopText (this, SW_RES( TXT_ADDR_TOP )), - aAddrTopField (this, SW_RES( FLD_ADDR_TOP )), - aAddrFormatInfo (this, SW_RES( TXT_ADDR_FORMAT )), - aAddrEditButton (this, SW_RES( BTN_ADDR_EDIT )), + aAddrPosInfo (this, SW_RES( TXT_ADDR_POS )), + aAddrLeftText (this, SW_RES( TXT_ADDR_LEFT )), + aAddrLeftField (this, SW_RES( FLD_ADDR_LEFT )), + aAddrTopText (this, SW_RES( TXT_ADDR_TOP )), + aAddrTopField (this, SW_RES( FLD_ADDR_TOP )), + aAddrFormatInfo (this, SW_RES( TXT_ADDR_FORMAT )), + aAddrEditButton (this, SW_RES( BTN_ADDR_EDIT )), aSendFL (this, SW_RES( FL_SENDER )), - aSendPosInfo (this, SW_RES( TXT_SEND_POS )), - aSendLeftText (this, SW_RES( TXT_SEND_LEFT )), - aSendLeftField (this, SW_RES( FLD_SEND_LEFT )), - aSendTopText (this, SW_RES( TXT_SEND_TOP )), - aSendTopField (this, SW_RES( FLD_SEND_TOP )), - aSendFormatInfo (this, SW_RES( TXT_SEND_FORMAT )), - aSendEditButton (this, SW_RES( BTN_SEND_EDIT )), + aSendPosInfo (this, SW_RES( TXT_SEND_POS )), + aSendLeftText (this, SW_RES( TXT_SEND_LEFT )), + aSendLeftField (this, SW_RES( FLD_SEND_LEFT )), + aSendTopText (this, SW_RES( TXT_SEND_TOP )), + aSendTopField (this, SW_RES( FLD_SEND_TOP )), + aSendFormatInfo (this, SW_RES( TXT_SEND_FORMAT )), + aSendEditButton (this, SW_RES( BTN_SEND_EDIT )), aSizeFL (this, SW_RES( FL_SIZE )), - aSizeFormatText (this, SW_RES( TXT_SIZE_FORMAT )), - aSizeFormatBox (this, SW_RES( BOX_SIZE_FORMAT )), - aSizeWidthText (this, SW_RES( TXT_SIZE_WIDTH )), - aSizeWidthField (this, SW_RES( FLD_SIZE_WIDTH )), - aSizeHeightText (this, SW_RES( TXT_SIZE_HEIGHT )), - aSizeHeightField (this, SW_RES( FLD_SIZE_HEIGHT )), - aPreview (this, SW_RES( WIN_PREVIEW )) + aSizeFormatText (this, SW_RES( TXT_SIZE_FORMAT )), + aSizeFormatBox (this, SW_RES( BOX_SIZE_FORMAT )), + aSizeWidthText (this, SW_RES( TXT_SIZE_WIDTH )), + aSizeWidthField (this, SW_RES( FLD_SIZE_WIDTH )), + aSizeHeightText (this, SW_RES( TXT_SIZE_HEIGHT )), + aSizeHeightField (this, SW_RES( FLD_SIZE_HEIGHT )), + aPreview (this, SW_RES( WIN_PREVIEW )) { FreeResource(); diff --git a/sw/source/ui/envelp/envfmt.hrc b/sw/source/ui/envelp/envfmt.hrc index 2517d50207c9..d2d7011caa83 100644 --- a/sw/source/ui/envelp/envfmt.hrc +++ b/sw/source/ui/envelp/envfmt.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 @@ -33,32 +33,32 @@ // Lokale Resourcen ********************************************************* #define FL_ADDRESSEE 11 -#define TXT_ADDR_POS 12 -#define TXT_ADDR_LEFT 13 -#define FLD_ADDR_LEFT 14 -#define TXT_ADDR_TOP 15 -#define FLD_ADDR_TOP 16 -#define TXT_ADDR_FORMAT 17 -#define BTN_ADDR_EDIT 18 +#define TXT_ADDR_POS 12 +#define TXT_ADDR_LEFT 13 +#define FLD_ADDR_LEFT 14 +#define TXT_ADDR_TOP 15 +#define FLD_ADDR_TOP 16 +#define TXT_ADDR_FORMAT 17 +#define BTN_ADDR_EDIT 18 #define FL_SENDER 21 -#define TXT_SEND_POS 22 -#define TXT_SEND_LEFT 23 -#define FLD_SEND_LEFT 24 -#define TXT_SEND_TOP 25 -#define FLD_SEND_TOP 26 -#define TXT_SEND_FORMAT 27 -#define BTN_SEND_EDIT 28 +#define TXT_SEND_POS 22 +#define TXT_SEND_LEFT 23 +#define FLD_SEND_LEFT 24 +#define TXT_SEND_TOP 25 +#define FLD_SEND_TOP 26 +#define TXT_SEND_FORMAT 27 +#define BTN_SEND_EDIT 28 #define FL_SIZE 31 -#define TXT_SIZE_FORMAT 32 -#define BOX_SIZE_FORMAT 33 -#define TXT_SIZE_WIDTH 34 -#define FLD_SIZE_WIDTH 35 -#define TXT_SIZE_HEIGHT 36 -#define FLD_SIZE_HEIGHT 37 - -#define WIN_PREVIEW 41 +#define TXT_SIZE_FORMAT 32 +#define BOX_SIZE_FORMAT 33 +#define TXT_SIZE_WIDTH 34 +#define FLD_SIZE_WIDTH 35 +#define TXT_SIZE_HEIGHT 36 +#define FLD_SIZE_HEIGHT 37 + +#define WIN_PREVIEW 41 #define MID_CHAR 1 diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx index 71159e904b05..96fb9a68e8fe 100644 --- a/sw/source/ui/envelp/envfmt.hxx +++ b/sw/source/ui/envelp/envfmt.hxx @@ -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 @@ -48,20 +48,20 @@ class SwEnvFmtPage : public SfxTabPage { FixedLine aAddrFL; - FixedInfo aAddrPosInfo; + FixedInfo aAddrPosInfo; FixedText aAddrLeftText; MetricField aAddrLeftField; FixedText aAddrTopText; MetricField aAddrTopField; - FixedInfo aAddrFormatInfo; + FixedInfo aAddrFormatInfo; MenuButton aAddrEditButton; FixedLine aSendFL; - FixedInfo aSendPosInfo; + FixedInfo aSendPosInfo; FixedText aSendLeftText; MetricField aSendLeftField; FixedText aSendTopText; MetricField aSendTopField; - FixedInfo aSendFormatInfo; + FixedInfo aSendFormatInfo; MenuButton aSendEditButton; FixedLine aSizeFL; FixedText aSizeFormatText; @@ -83,10 +83,10 @@ class SwEnvFmtPage : public SfxTabPage void SetMinMax(); - SfxItemSet *GetCollItemSet(SwTxtFmtColl* pColl, BOOL bSender); - + SfxItemSet *GetCollItemSet(SwTxtFmtColl* pColl, BOOL bSender); + using Window::GetParent; - SwEnvDlg *GetParent() {return (SwEnvDlg*) SfxTabPage::GetParent()->GetParent();} + SwEnvDlg *GetParent() {return (SwEnvDlg*) SfxTabPage::GetParent()->GetParent();} using TabPage::ActivatePage; using TabPage::DeactivatePage; diff --git a/sw/source/ui/envelp/envfmt.src b/sw/source/ui/envelp/envfmt.src index d87223fee066..57132b77543c 100644 --- a/sw/source/ui/envelp/envfmt.src +++ b/sw/source/ui/envelp/envfmt.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/envelp/envimg.cxx b/sw/source/ui/envelp/envimg.cxx index a4cdf03f6f0b..a0a06419a181 100644 --- a/sw/source/ui/envelp/envimg.cxx +++ b/sw/source/ui/envelp/envimg.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 @@ -251,7 +251,7 @@ SwEnvCfgItem::~SwEnvCfgItem() { } -void SwEnvCfgItem::Commit() +void SwEnvCfgItem::Commit() { Sequence<OUString> aNames = GetPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -286,19 +286,19 @@ Sequence<rtl::OUString> SwEnvCfgItem::GetPropertyNames() { static const char* aPropNames[] = { - "Inscription/Addressee", // 0 - "Inscription/Sender", // 1 - "Inscription/UseSender", // 2 - "Format/AddresseeFromLeft", // 3 - "Format/AddresseeFromTop", // 4 - "Format/SenderFromLeft", // 5 - "Format/SenderFromTop", // 6 - "Format/Width", // 7 - "Format/Height", // 8 - "Print/Alignment", // 9 - "Print/FromAbove", // 10 - "Print/Right", // 11 - "Print/Down" // 12 + "Inscription/Addressee", // 0 + "Inscription/Sender", // 1 + "Inscription/UseSender", // 2 + "Format/AddresseeFromLeft", // 3 + "Format/AddresseeFromTop", // 4 + "Format/SenderFromLeft", // 5 + "Format/SenderFromTop", // 6 + "Format/Width", // 7 + "Format/Height", // 8 + "Print/Alignment", // 9 + "Print/FromAbove", // 10 + "Print/Right", // 11 + "Print/Down" // 12 }; const int nCount = 13; Sequence<OUString> aNames(nCount); diff --git a/sw/source/ui/envelp/envlop.hrc b/sw/source/ui/envelp/envlop.hrc index ac83f2c9c0bd..1974387e5e91 100644 --- a/sw/source/ui/envelp/envlop.hrc +++ b/sw/source/ui/envelp/envlop.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 @@ -44,8 +44,8 @@ #define BOX_SEND 10 #define EDT_SEND 11 #define WIN_PREVIEW 12 -#define ST_INSERT 13 -#define ST_CHANGE 14 +#define ST_INSERT 13 +#define ST_CHANGE 14 // Globale Resourcen ******************************************************** #define STR_DOC_TITLE (RC_ENVLOP_BEGIN) diff --git a/sw/source/ui/envelp/envlop.src b/sw/source/ui/envelp/envlop.src index 951d1eb10ccc..9c9107935353 100644 --- a/sw/source/ui/envelp/envlop.src +++ b/sw/source/ui/envelp/envlop.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/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx index 36fe09debedf..6c5bac1af551 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.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,7 +99,7 @@ void SwEnvPreview::Paint(const Rectangle &) Color aBack = rSettings.GetWindowColor( ); Color aFront = SwViewOption::GetFontColor(); - Color aMedium = Color( ( aBack.GetRed() + aFront.GetRed() ) / 2, + Color aMedium = Color( ( aBack.GetRed() + aFront.GetRed() ) / 2, ( aBack.GetGreen() + aFront.GetGreen() ) / 2, ( aBack.GetBlue() + aFront.GetBlue() ) / 2 ); @@ -160,7 +160,7 @@ SwEnvDlg::SwEnvDlg(Window* pParent, const SfxItemSet& rSet, GetOKButton().SetText(String(SW_RES(STR_BTN_NEWDOC))); GetOKButton().SetHelpId(HID_ENVELOP_PRINT); - GetOKButton().SetHelpText(aEmptyStr); // Damit generierter Hilfetext verwendet wird + GetOKButton().SetHelpText(aEmptyStr); // Damit generierter Hilfetext verwendet wird if (GetUserButton()) { GetUserButton()->SetText(bInsert ? sInsert : sChange); @@ -230,10 +230,10 @@ SwEnvPage::SwEnvPage(Window* pParent, const SfxItemSet& rSet) : pSh = GetParent()->pSh; // Install handlers - aDatabaseLB .SetSelectHdl(LINK(this, SwEnvPage, DatabaseHdl )); - aTableLB .SetSelectHdl(LINK(this, SwEnvPage, DatabaseHdl )); - aInsertBT .SetClickHdl (LINK(this, SwEnvPage, FieldHdl )); - aSenderBox .SetClickHdl (LINK(this, SwEnvPage, SenderHdl )); + aDatabaseLB .SetSelectHdl(LINK(this, SwEnvPage, DatabaseHdl )); + aTableLB .SetSelectHdl(LINK(this, SwEnvPage, DatabaseHdl )); + aInsertBT .SetClickHdl (LINK(this, SwEnvPage, FieldHdl )); + aSenderBox .SetClickHdl (LINK(this, SwEnvPage, SenderHdl )); aPreview.SetBorderStyle( WINDOW_BORDER_MONO ); SwDBData aData = pSh->GetDBData(); diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx index 68d72c129afc..58544cc07435 100644 --- a/sw/source/ui/envelp/envprt.cxx +++ b/sw/source/ui/envelp/envprt.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/envelp/envprt.hrc b/sw/source/ui/envelp/envprt.hrc index 64d90dfdf93f..32e5e623bc94 100644 --- a/sw/source/ui/envelp/envprt.hrc +++ b/sw/source/ui/envelp/envprt.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 diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx index e309aa02c4c7..2d2de052860a 100644 --- a/sw/source/ui/envelp/envprt.hxx +++ b/sw/source/ui/envelp/envprt.hxx @@ -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/envelp/envprt.src b/sw/source/ui/envelp/envprt.src index f409614f7965..e38f7ca505f9 100644 --- a/sw/source/ui/envelp/envprt.src +++ b/sw/source/ui/envelp/envprt.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/envelp/label.hrc b/sw/source/ui/envelp/label.hrc index 6c4770c5c10f..c74d9fbe51b5 100644 --- a/sw/source/ui/envelp/label.hrc +++ b/sw/source/ui/envelp/label.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 @@ -51,68 +51,68 @@ #define FT_DBFIELD 17 #define LB_DBFIELD 18 #define BTN_INSERT 19 -#define BTN_SYNC 20 +#define BTN_SYNC 20 -#define RB_FROM_AUTO_TEXT 1 -#define RB_FROM_EDIT 2 -#define LB_AUTO_TEXT 3 +#define RB_FROM_AUTO_TEXT 1 +#define RB_FROM_EDIT 2 +#define LB_AUTO_TEXT 3 #define FT_AUTO_TEXT_GROUP 4 #define LB_AUTO_TEXT_GROUP 5 -#define ED_TEXT 6 +#define ED_TEXT 6 #define FL_CONTENT 7 -#define WIN_EXAMPLE 8 -#define ST_VISCARD_GROUP 10 +#define WIN_EXAMPLE 8 +#define ST_VISCARD_GROUP 10 #define FL_DATA 30 -#define FT_NAME 31 -#define ED_FIRSTNAME 32 -#define ED_NAME 33 -#define ED_SHORTCUT 34 -#define FT_STREET 35 -#define ED_STREET 36 -#define FT_ZIPCITY 37 -#define ED_ZIP 38 -#define ED_CITY 39 -#define FT_COUNTRYSTATE 40 -#define ED_COUNTRY 41 -#define FT_TITLEPROF 42 -#define ED_PROFESSION 43 -#define ED_TITLE 44 - -#define ED_PHONE 46 -#define ED_MOBILE 47 - -#define ED_FAX 49 -#define FT_WWWMAIL 50 -#define ED_WWW 51 -#define ED_MAIL 52 -#define ED_STATE 53 -#define FT_COMP 54 -#define ED_COMP 55 +#define FT_NAME 31 +#define ED_FIRSTNAME 32 +#define ED_NAME 33 +#define ED_SHORTCUT 34 +#define FT_STREET 35 +#define ED_STREET 36 +#define FT_ZIPCITY 37 +#define ED_ZIP 38 +#define ED_CITY 39 +#define FT_COUNTRYSTATE 40 +#define ED_COUNTRY 41 +#define FT_TITLEPROF 42 +#define ED_PROFESSION 43 +#define ED_TITLE 44 + +#define ED_PHONE 46 +#define ED_MOBILE 47 + +#define ED_FAX 49 +#define FT_WWWMAIL 50 +#define ED_WWW 51 +#define ED_MAIL 52 +#define ED_STATE 53 +#define FT_COMP 54 +#define ED_COMP 55 #define FT_COMP_EXT 56 #define ED_COMP_EXT 57 -#define FT_SLOGAN 58 -#define ED_SLOGAN 59 +#define FT_SLOGAN 58 +#define ED_SLOGAN 59 #define FT_POSITION 60 #define ED_POSITION 61 -#define ST_BUSINESSCARDDLG 62 +#define ST_BUSINESSCARDDLG 62 #define ST_FIRSTPAGE_LAB 63 #define ST_FIRSTPAGE_BC 64 -#define FT_NAME_2 65 -#define ED_FIRSTNAME_2 66 -#define ED_NAME_2 67 -#define ED_SHORTCUT_2 68 +#define FT_NAME_2 65 +#define ED_FIRSTNAME_2 66 +#define ED_NAME_2 67 +#define ED_SHORTCUT_2 68 -#define FT_PHONE_MOBILE 70 -//#define FT_PHONE 71 -//#define FT_MOBILE 72 -#define FT_FAX 73 +#define FT_PHONE_MOBILE 70 +//#define FT_PHONE 71 +//#define FT_MOBILE 72 +#define FT_FAX 73 // Globale Resourcen ******************************************************** -#define STR_DOC_TITLE (RC_LABEL_BEGIN) -#define STR_CUSTOM (RC_LABEL_BEGIN + 1) +#define STR_DOC_TITLE (RC_LABEL_BEGIN) +#define STR_CUSTOM (RC_LABEL_BEGIN + 1) // Ueberlaufpruefung ******************************************************** diff --git a/sw/source/ui/envelp/label.src b/sw/source/ui/envelp/label.src index 13081f7604a6..2d3d9c319bbb 100644 --- a/sw/source/ui/envelp/label.src +++ b/sw/source/ui/envelp/label.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 @@ -30,7 +30,7 @@ #include "globals.hrc" #include "helpid.h" // ----- defined strings ----------------------------------------------------- -#define LABEL_STRING \ +#define LABEL_STRING \ Text [ en-US ] = "Labels" ; \ #define BUSINESS_CARD_STRING \ diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index 8cbf3bc650ed..bdc0ca159b25 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.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 @@ -126,7 +126,7 @@ SwLabDlg::SwLabDlg(Window* pParent, const SfxItemSet& rSet, GetOKButton().SetText(String(SW_RES(STR_BTN_NEW_DOC))); GetOKButton().SetHelpId(HID_LABEL_INSERT); - GetOKButton().SetHelpText(aEmptyStr); // Damit generierter Hilfetext verwendet wird + GetOKButton().SetHelpText(aEmptyStr); // Damit generierter Hilfetext verwendet wird AddTabPage(TP_LAB_LAB, m_bLabel ? sFormat : sMedium ,SwLabPage ::Create, 0, sal_False, 0); AddTabPage(TP_VISITING_CARDS, SwVisitingCardPage::Create, 0); @@ -278,7 +278,7 @@ SwLabPage::SwLabPage(Window* pParent, const SfxItemSet& rSet) : aAddrBox .SetClickHdl (LINK(this, SwLabPage, AddrHdl )); aDatabaseLB .SetSelectHdl(LINK(this, SwLabPage, DatabaseHdl )); aTableLB .SetSelectHdl(LINK(this, SwLabPage, DatabaseHdl )); - aInsertBT .SetClickHdl (LINK(this, SwLabPage, FieldHdl )); + aInsertBT .SetClickHdl (LINK(this, SwLabPage, FieldHdl )); aContButton .SetClickHdl (LINK(this, SwLabPage, PageHdl )); aSheetButton .SetClickHdl (LINK(this, SwLabPage, PageHdl )); aMakeBox .SetSelectHdl(LINK(this, SwLabPage, MakeHdl )); @@ -418,7 +418,7 @@ IMPL_LINK( SwLabPage, MakeHdl, ListBox *, EMPTYARG ) GetParent()->ReplaceGroup( aMake ); aItem.aLstMake = aMake; - const sal_Bool bCont = aContButton.IsChecked(); + const sal_Bool bCont = aContButton.IsChecked(); const sal_uInt16 nCount = GetParent()->Recs().Count(); sal_uInt16 nLstType = 0; @@ -474,8 +474,8 @@ void SwLabPage::DisplayFormat() FieldUnit aMetric = ::GetDfltMetric(FALSE); SetMetric(aField, aMetric); aField.SetDecimalDigits(2); - aField.SetMin (0); - aField.SetMax (LONG_MAX); + aField.SetMin (0); + aField.SetMax (LONG_MAX); SwLabRec* pRec = GetSelectedEntryPos(); aItem.aLstType = pRec->aType; @@ -577,8 +577,8 @@ void SwLabPage::Reset(const SfxItemSet& rSet) String aWriting( aItem.aWriting ); - aAddrBox .Check ( aItem.bAddr ); - aWritingEdit.SetText ( aWriting.ConvertLineEnd() ); + aAddrBox .Check ( aItem.bAddr ); + aWritingEdit.SetText ( aWriting.ConvertLineEnd() ); const sal_uInt16 nCount = (sal_uInt16)GetParent()->Makes().Count(); for (sal_uInt16 i = 0; i < nCount; ++i) @@ -589,7 +589,7 @@ void SwLabPage::Reset(const SfxItemSet& rSet) } - aMakeBox .SelectEntry( aItem.aMake ); + aMakeBox .SelectEntry( aItem.aMake ); //save the current type String sType(aItem.aType); aMakeBox.GetSelectHdl().Call( &aMakeBox ); @@ -636,11 +636,11 @@ void SwVisitingCardPage::SetUserData( sal_uInt32 nCnt, SwVisitingCardPage::SwVisitingCardPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, SW_RES(TP_VISITING_CARDS), rSet), - aAutoTextLB(this, SW_RES( LB_AUTO_TEXT )), - aAutoTextGroupFT(this, SW_RES( FT_AUTO_TEXT_GROUP )), - aAutoTextGroupLB(this, SW_RES( LB_AUTO_TEXT_GROUP )), + aAutoTextLB(this, SW_RES( LB_AUTO_TEXT )), + aAutoTextGroupFT(this, SW_RES( FT_AUTO_TEXT_GROUP )), + aAutoTextGroupLB(this, SW_RES( LB_AUTO_TEXT_GROUP )), aContentFL(this, SW_RES( FL_CONTENT )), - aExampleWIN(this, SW_RES( WIN_EXAMPLE )), + aExampleWIN(this, SW_RES( WIN_EXAMPLE )), sVisCardGroup(SW_RES(ST_VISCARD_GROUP)), pExampleFrame(0) { @@ -844,24 +844,24 @@ sal_Bool SwPrivateDataPage::FillItemSet(SfxItemSet& rSet) { SwLabItem aItem = (const SwLabItem&) GetTabDialog()->GetExampleSet()->Get(FN_LABEL); - aItem.aPrivFirstName = aFirstNameED .GetText(); - aItem.aPrivName = aNameED .GetText( ); - aItem.aPrivShortCut = aShortCutED .GetText( ); - aItem.aPrivFirstName2 = aFirstName2ED .GetText(); - aItem.aPrivName2 = aName2ED .GetText( ); + aItem.aPrivFirstName = aFirstNameED .GetText(); + aItem.aPrivName = aNameED .GetText( ); + aItem.aPrivShortCut = aShortCutED .GetText( ); + aItem.aPrivFirstName2 = aFirstName2ED .GetText(); + aItem.aPrivName2 = aName2ED .GetText( ); aItem.aPrivShortCut2 = aShortCut2ED .GetText( ); - aItem.aPrivStreet = aStreetED .GetText( ); - aItem.aPrivZip = aZipED .GetText( ); - aItem.aPrivCity = aCityED .GetText( ); - aItem.aPrivCountry = aCountryED .GetText( ); - aItem.aPrivState = aStateED .GetText( ); - aItem.aPrivTitle = aTitleED .GetText( ); - aItem.aPrivProfession= aProfessionED.GetText( ); - aItem.aPrivPhone = aPhoneED .GetText( ); - aItem.aPrivMobile = aMobilePhoneED.GetText( ); - aItem.aPrivFax = aFaxED .GetText( ); - aItem.aPrivWWW = aHomePageED .GetText( ); - aItem.aPrivMail = aMailED .GetText( ); + aItem.aPrivStreet = aStreetED .GetText( ); + aItem.aPrivZip = aZipED .GetText( ); + aItem.aPrivCity = aCityED .GetText( ); + aItem.aPrivCountry = aCountryED .GetText( ); + aItem.aPrivState = aStateED .GetText( ); + aItem.aPrivTitle = aTitleED .GetText( ); + aItem.aPrivProfession= aProfessionED.GetText( ); + aItem.aPrivPhone = aPhoneED .GetText( ); + aItem.aPrivMobile = aMobilePhoneED.GetText( ); + aItem.aPrivFax = aFaxED .GetText( ); + aItem.aPrivWWW = aHomePageED .GetText( ); + aItem.aPrivMail = aMailED .GetText( ); rSet.Put(aItem); return sal_True; @@ -893,30 +893,30 @@ void SwPrivateDataPage::Reset(const SfxItemSet& rSet) SwBusinessDataPage::SwBusinessDataPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, SW_RES(TP_BUSINESS_DATA), rSet), aDataFL (this, SW_RES( FL_DATA )), - aCompanyFT (this, SW_RES( FT_COMP )), - aCompanyED (this, SW_RES( ED_COMP )), - aCompanyExtFT (this, SW_RES( FT_COMP_EXT )), - aCompanyExtED (this, SW_RES( ED_COMP_EXT )), - aSloganFT (this, SW_RES( FT_SLOGAN )), - aSloganED (this, SW_RES( ED_SLOGAN )), - aStreetFT (this, SW_RES( FT_STREET )), - aStreetED (this, SW_RES( ED_STREET )), - aZipCityFT (this, SW_RES( FT_ZIPCITY )), - aZipED (this, SW_RES( ED_ZIP )), - aCityED (this, SW_RES( ED_CITY )), - aCountryStateFT (this, SW_RES( FT_COUNTRYSTATE )), - aCountryED (this, SW_RES( ED_COUNTRY )), - aStateED (this, SW_RES( ED_STATE )), - aPositionFT (this, SW_RES( FT_POSITION )), - aPositionED (this, SW_RES( ED_POSITION )), - aPhoneFT (this, SW_RES( FT_PHONE_MOBILE )), - aPhoneED (this, SW_RES( ED_PHONE )), - aMobilePhoneED (this, SW_RES( ED_MOBILE )), - aFaxFT (this, SW_RES( FT_FAX )), - aFaxED (this, SW_RES( ED_FAX )), - aWWWMailFT (this, SW_RES( FT_WWWMAIL )), - aHomePageED (this, SW_RES( ED_WWW )), - aMailED (this, SW_RES( ED_MAIL )) + aCompanyFT (this, SW_RES( FT_COMP )), + aCompanyED (this, SW_RES( ED_COMP )), + aCompanyExtFT (this, SW_RES( FT_COMP_EXT )), + aCompanyExtED (this, SW_RES( ED_COMP_EXT )), + aSloganFT (this, SW_RES( FT_SLOGAN )), + aSloganED (this, SW_RES( ED_SLOGAN )), + aStreetFT (this, SW_RES( FT_STREET )), + aStreetED (this, SW_RES( ED_STREET )), + aZipCityFT (this, SW_RES( FT_ZIPCITY )), + aZipED (this, SW_RES( ED_ZIP )), + aCityED (this, SW_RES( ED_CITY )), + aCountryStateFT (this, SW_RES( FT_COUNTRYSTATE )), + aCountryED (this, SW_RES( ED_COUNTRY )), + aStateED (this, SW_RES( ED_STATE )), + aPositionFT (this, SW_RES( FT_POSITION )), + aPositionED (this, SW_RES( ED_POSITION )), + aPhoneFT (this, SW_RES( FT_PHONE_MOBILE )), + aPhoneED (this, SW_RES( ED_PHONE )), + aMobilePhoneED (this, SW_RES( ED_MOBILE )), + aFaxFT (this, SW_RES( FT_FAX )), + aFaxED (this, SW_RES( ED_FAX )), + aWWWMailFT (this, SW_RES( FT_WWWMAIL )), + aHomePageED (this, SW_RES( ED_WWW )), + aMailED (this, SW_RES( ED_MAIL )) { FreeResource(); SetExchangeSupport(); @@ -948,20 +948,20 @@ sal_Bool SwBusinessDataPage::FillItemSet(SfxItemSet& rSet) { SwLabItem aItem = (const SwLabItem&) GetTabDialog()->GetExampleSet()->Get(FN_LABEL); - aItem.aCompCompany = aCompanyED .GetText(); + aItem.aCompCompany = aCompanyED .GetText(); aItem.aCompCompanyExt= aCompanyExtED .GetText(); - aItem.aCompSlogan = aSloganED .GetText(); - aItem.aCompStreet = aStreetED .GetText(); - aItem.aCompZip = aZipED .GetText(); - aItem.aCompCity = aCityED .GetText(); - aItem.aCompCountry = aCountryED .GetText(); - aItem.aCompState = aStateED .GetText(); - aItem.aCompPosition = aPositionED .GetText(); - aItem.aCompPhone = aPhoneED .GetText(); - aItem.aCompMobile = aMobilePhoneED .GetText(); - aItem.aCompFax = aFaxED .GetText(); - aItem.aCompWWW = aHomePageED .GetText(); - aItem.aCompMail = aMailED .GetText(); + aItem.aCompSlogan = aSloganED .GetText(); + aItem.aCompStreet = aStreetED .GetText(); + aItem.aCompZip = aZipED .GetText(); + aItem.aCompCity = aCityED .GetText(); + aItem.aCompCountry = aCountryED .GetText(); + aItem.aCompState = aStateED .GetText(); + aItem.aCompPosition = aPositionED .GetText(); + aItem.aCompPhone = aPhoneED .GetText(); + aItem.aCompMobile = aMobilePhoneED .GetText(); + aItem.aCompFax = aFaxED .GetText(); + aItem.aCompWWW = aHomePageED .GetText(); + aItem.aCompMail = aMailED .GetText(); rSet.Put(aItem); return sal_True; diff --git a/sw/source/ui/envelp/labelcfg.cxx b/sw/source/ui/envelp/labelcfg.cxx index 4b2dba3ef7b6..e2afb7cfbcda 100644 --- a/sw/source/ui/envelp/labelcfg.cxx +++ b/sw/source/ui/envelp/labelcfg.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 @@ -52,7 +52,7 @@ SwLabelConfig::~SwLabelConfig() { } -void SwLabelConfig::Commit() +void SwLabelConfig::Commit() { // the config item is not writable yet } @@ -116,11 +116,11 @@ SwLabRec* lcl_CreateSwLabRec(Sequence<Any>& rValues, const OUString& rManufactur return pNewRec; } -Sequence<PropertyValue> lcl_CreateProperties( +Sequence<PropertyValue> lcl_CreateProperties( Sequence<OUString>& rPropNames, const SwLabRec& rRec) { const OUString* pNames = rPropNames.getConstArray(); - Sequence<PropertyValue> aRet(rPropNames.getLength()); + Sequence<PropertyValue> aRet(rPropNames.getLength()); PropertyValue* pValues = aRet.getArray(); OUString sColon(C2U(";")); @@ -150,7 +150,7 @@ Sequence<PropertyValue> lcl_CreateProperties( return aRet; } -void SwLabelConfig::FillLabels(const OUString& rManufacturer, SwLabRecs& rLabArr) +void SwLabelConfig::FillLabels(const OUString& rManufacturer, SwLabRecs& rLabArr) { OUString sManufacturer(wrapConfigurationElementName(rManufacturer)); const Sequence<OUString> aLabels = GetNodeNames(sManufacturer); @@ -162,13 +162,13 @@ void SwLabelConfig::FillLabels(const OUString& rManufacturer, SwLabRecs& rLab sPrefix += pLabels[nLabel]; sPrefix += C2U("/"); Sequence<OUString> aPropNames = lcl_CreatePropertyNames(sPrefix); - Sequence<Any> aValues = GetProperties(aPropNames); + Sequence<Any> aValues = GetProperties(aPropNames); SwLabRec* pNewRec = lcl_CreateSwLabRec(aValues, rManufacturer); rLabArr.C40_INSERT( SwLabRec, pNewRec, rLabArr.Count() ); } } -sal_Bool SwLabelConfig::HasLabel(const rtl::OUString& rManufacturer, const rtl::OUString& rType) +sal_Bool SwLabelConfig::HasLabel(const rtl::OUString& rManufacturer, const rtl::OUString& rType) { const OUString* pNode = aNodeNames.getConstArray(); sal_Bool bFound = sal_False; @@ -191,7 +191,7 @@ sal_Bool SwLabelConfig::HasLabel(const rtl::OUString& rManufacturer, const rt Sequence<OUString> aProperties(1); aProperties.getArray()[0] = sPrefix; aProperties.getArray()[0] += C2U("Name"); - Sequence<Any> aValues = GetProperties(aProperties); + Sequence<Any> aValues = GetProperties(aProperties); const Any* pValues = aValues.getConstArray(); if(pValues[0].hasValue()) { @@ -214,8 +214,8 @@ sal_Bool lcl_Exists(const OUString& rNode, const Sequence<OUString>& rLabels) return sal_False; } -void SwLabelConfig::SaveLabel( const rtl::OUString& rManufacturer, - const rtl::OUString& rType, const SwLabRec& rRec) +void SwLabelConfig::SaveLabel( const rtl::OUString& rManufacturer, + const rtl::OUString& rType, const SwLabRec& rRec) { const OUString* pNode = aNodeNames.getConstArray(); sal_Bool bFound = sal_False; @@ -250,7 +250,7 @@ void SwLabelConfig::SaveLabel( const rtl::OUString& rManufacturer, Sequence<OUString> aProperties(1); aProperties.getArray()[0] = sPrefix; aProperties.getArray()[0] += C2U("Name"); - Sequence<Any> aValues = GetProperties(aProperties); + Sequence<Any> aValues = GetProperties(aProperties); const Any* pValues = aValues.getConstArray(); if(pValues[0].hasValue()) { @@ -281,7 +281,7 @@ void SwLabelConfig::SaveLabel( const rtl::OUString& rManufacturer, sPrefix += sFoundNode; sPrefix += C2U("/"); Sequence<OUString> aPropNames = lcl_CreatePropertyNames(sPrefix); - Sequence<PropertyValue> aPropValues = lcl_CreateProperties(aPropNames, rRec); + Sequence<PropertyValue> aPropValues = lcl_CreateProperties(aPropNames, rRec); SetSetProperties(wrapConfigurationElementName(rManufacturer), aPropValues); } diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx index 88744e583f77..e935cf786ed5 100644 --- a/sw/source/ui/envelp/labelexp.cxx +++ b/sw/source/ui/envelp/labelexp.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/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index 4937037a3056..23b0bc60ec61 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.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 @@ -78,7 +78,7 @@ SwLabPreview::SwLabPreview( const SwLabFmtPage* pParent, const ResId& rResID ) : Font aFont = GetFont(); aFont.SetTransparent(TRUE); - aFont.SetWeight (WEIGHT_NORMAL); + aFont.SetWeight (WEIGHT_NORMAL); SetFont(aFont); const Size aSz(GetOutputSizePixel()); @@ -90,9 +90,9 @@ SwLabPreview::SwLabPreview( const SwLabFmtPage* pParent, const ResId& rResID ) : lHDistWidth = GetTextWidth(aHDistStr ); lVDistWidth = GetTextWidth(aVDistStr ); lHeightWidth = GetTextWidth(aHeightStr); - lLeftWidth = GetTextWidth(aLeftStr ); + lLeftWidth = GetTextWidth(aLeftStr ); lUpperWidth = GetTextWidth(aUpperStr ); - lColsWidth = GetTextWidth(aColsStr ); + lColsWidth = GetTextWidth(aColsStr ); lXHeight = GetTextHeight(); lXWidth = GetTextWidth('X'); @@ -150,8 +150,8 @@ void SwLabPreview::Paint(const Rectangle &) long lX0 = (lOutWPix - lOutlineW) / 2; long lY0 = (lOutHPix - lOutlineH) / 2; - long lX1 = ROUND(lX0 + f * aItem.lLeft ); - long lY1 = ROUND(lY0 + f * aItem.lUpper); + long lX1 = ROUND(lX0 + f * aItem.lLeft ); + long lY1 = ROUND(lY0 + f * aItem.lUpper); long lX2 = ROUND(lX0 + f * (aItem.lLeft + aItem.lWidth )); long lY2 = ROUND(lY0 + f * (aItem.lUpper + aItem.lHeight)); long lX3 = ROUND(lX0 + f * (aItem.lLeft + aItem.lHDist )); @@ -344,20 +344,20 @@ SwLabFmtPage::SwLabFmtPage(Window* pParent, const SfxItemSet& rSet) : aVDistField .SetModifyHdl( aLk ); aWidthField .SetModifyHdl( aLk ); aHeightField.SetModifyHdl( aLk ); - aLeftField .SetModifyHdl( aLk ); + aLeftField .SetModifyHdl( aLk ); aUpperField .SetModifyHdl( aLk ); - aColsField .SetModifyHdl( aLk ); - aRowsField .SetModifyHdl( aLk ); + aColsField .SetModifyHdl( aLk ); + aRowsField .SetModifyHdl( aLk ); aLk = LINK(this, SwLabFmtPage, LoseFocusHdl); aHDistField .SetLoseFocusHdl( aLk ); aVDistField .SetLoseFocusHdl( aLk ); aWidthField .SetLoseFocusHdl( aLk ); aHeightField.SetLoseFocusHdl( aLk ); - aLeftField .SetLoseFocusHdl( aLk ); + aLeftField .SetLoseFocusHdl( aLk ); aUpperField .SetLoseFocusHdl( aLk ); - aColsField .SetLoseFocusHdl( aLk ); - aRowsField .SetLoseFocusHdl( aLk ); + aColsField .SetLoseFocusHdl( aLk ); + aRowsField .SetLoseFocusHdl( aLk ); aSavePB.SetClickHdl( LINK (this, SwLabFmtPage, SaveHdl)); // Set timer @@ -410,7 +410,7 @@ void SwLabFmtPage::ChangeMinMax() lHDist = static_cast< long >(GETFLDVAL(aHDistField)), lVDist = static_cast< long >(GETFLDVAL(aVDistField)); - long nMinSize = 10; // 0,1cm + long nMinSize = 10; // 0,1cm aHDistField .SetMin(nMinSize, FUNIT_CM); aVDistField .SetMin(nMinSize, FUNIT_CM); @@ -424,11 +424,11 @@ void SwLabFmtPage::ChangeMinMax() aWidthField .SetMax((long) 100 * (lHDist), FUNIT_TWIP); aHeightField.SetMax((long) 100 * (lVDist), FUNIT_TWIP); - aLeftField .SetMax((long) 100 * (lMax - (long) aColsField.GetValue() * GETFLDVAL(aHDistField)), FUNIT_TWIP); + aLeftField .SetMax((long) 100 * (lMax - (long) aColsField.GetValue() * GETFLDVAL(aHDistField)), FUNIT_TWIP); aUpperField .SetMax((long) 100 * (lMax - (long) aRowsField.GetValue() * GETFLDVAL(aVDistField)), FUNIT_TWIP); - aColsField .SetMax((lMax - lLeft ) / Max(1L, lHDist)); - aRowsField .SetMax((lMax - lUpper) / Max(1L, lVDist)); + aColsField .SetMax((lMax - lLeft ) / Max(1L, lHDist)); + aRowsField .SetMax((lMax - lUpper) / Max(1L, lVDist)); // First und Last @@ -444,20 +444,20 @@ void SwLabFmtPage::ChangeMinMax() aWidthField .SetLast (aWidthField .GetMax()); aHeightField.SetLast (aHeightField.GetMax()); - aLeftField .SetLast (aLeftField .GetMax()); + aLeftField .SetLast (aLeftField .GetMax()); aUpperField .SetLast (aUpperField .GetMax()); - aColsField .SetLast (aColsField .GetMax()); - aRowsField .SetLast (aRowsField .GetMax()); + aColsField .SetLast (aColsField .GetMax()); + aRowsField .SetLast (aRowsField .GetMax()); aHDistField .Reformat(); aVDistField .Reformat(); aWidthField .Reformat(); aHeightField.Reformat(); - aLeftField .Reformat(); + aLeftField .Reformat(); aUpperField .Reformat(); - aColsField .Reformat(); - aRowsField .Reformat(); + aColsField .Reformat(); + aRowsField .Reformat(); } SfxTabPage* SwLabFmtPage::Create(Window* pParent, const SfxItemSet& rSet) @@ -492,8 +492,8 @@ void SwLabFmtPage::FillItem(SwLabItem& rItem) rItem.lHeight = rRec.lHeight = static_cast< long >(GETFLDVAL(aHeightField)); rItem.lLeft = rRec.lLeft = static_cast< long >(GETFLDVAL(aLeftField )); rItem.lUpper = rRec.lUpper = static_cast< long >(GETFLDVAL(aUpperField )); - rItem.nCols = rRec.nCols = (USHORT) aColsField.GetValue(); - rItem.nRows = rRec.nRows = (USHORT) aRowsField.GetValue(); + rItem.nCols = rRec.nCols = (USHORT) aColsField.GetValue(); + rItem.nRows = rRec.nRows = (USHORT) aRowsField.GetValue(); } } @@ -514,7 +514,7 @@ void SwLabFmtPage::Reset(const SfxItemSet& ) aVDistField .SetMax(100 * aItem.lVDist , FUNIT_TWIP); aWidthField .SetMax(100 * aItem.lWidth , FUNIT_TWIP); aHeightField.SetMax(100 * aItem.lHeight, FUNIT_TWIP); - aLeftField .SetMax(100 * aItem.lLeft , FUNIT_TWIP); + aLeftField .SetMax(100 * aItem.lLeft , FUNIT_TWIP); aUpperField .SetMax(100 * aItem.lUpper , FUNIT_TWIP); SETFLDVAL(aHDistField , aItem.lHDist ); @@ -527,8 +527,8 @@ void SwLabFmtPage::Reset(const SfxItemSet& ) aColsField.SetMax(aItem.nCols); aRowsField.SetMax(aItem.nRows); - aColsField .SetValue(aItem.nCols); - aRowsField .SetValue(aItem.nRows); + aColsField .SetValue(aItem.nCols); + aRowsField .SetValue(aItem.nRows); aMakeFI.SetText(aItem.aMake); aTypeFI.SetText(aItem.aType); PreviewHdl(0); @@ -543,8 +543,8 @@ IMPL_LINK( SwLabFmtPage, SaveHdl, PushButton *, EMPTYARG ) aRec.lHeight = static_cast< long >(GETFLDVAL(aHeightField)); aRec.lLeft = static_cast< long >(GETFLDVAL(aLeftField )); aRec.lUpper = static_cast< long >(GETFLDVAL(aUpperField )); - aRec.nCols = (USHORT) aColsField.GetValue(); - aRec.nRows = (USHORT) aRowsField.GetValue(); + aRec.nCols = (USHORT) aColsField.GetValue(); + aRec.nRows = (USHORT) aRowsField.GetValue(); aRec.bCont = aItem.bCont; SwSaveLabelDlg* pSaveDlg = new SwSaveLabelDlg(this, aRec); pSaveDlg->SetLabel(aItem.aLstMake, aItem.aLstType); diff --git a/sw/source/ui/envelp/labfmt.hrc b/sw/source/ui/envelp/labfmt.hrc index bf47c0c9ccd4..399b9062b63c 100644 --- a/sw/source/ui/envelp/labfmt.hrc +++ b/sw/source/ui/envelp/labfmt.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 @@ -50,9 +50,9 @@ #define TXT_ROWS 16 #define FLD_ROWS 17 #define FL_NONAME 18 -#define PB_SAVE 19 +#define PB_SAVE 19 #define FI_MAKE 20 -#define FI_TYPE 21 +#define FI_TYPE 21 #define FL_OPTIONS 1 #define FT_MAKE 2 @@ -62,7 +62,7 @@ #define PB_OK 6 #define PB_CANCEL 7 #define PB_HELP 8 -#define MB_QUERY 9 +#define MB_QUERY 9 // Globale Resourcen ******************************************************** diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx index 5d24909b5376..d4f9a1b577f8 100644 --- a/sw/source/ui/envelp/labfmt.hxx +++ b/sw/source/ui/envelp/labfmt.hxx @@ -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 @@ -86,31 +86,31 @@ public: class SwLabFmtPage : public SfxTabPage { - FixedInfo aMakeFI; - FixedInfo aTypeFI; + FixedInfo aMakeFI; + FixedInfo aTypeFI; SwLabPreview aPreview; - FixedText aHDistText; - MetricField aHDistField; - FixedText aVDistText; - MetricField aVDistField; - FixedText aWidthText; - MetricField aWidthField; - FixedText aHeightText; - MetricField aHeightField; - FixedText aLeftText; - MetricField aLeftField; - FixedText aUpperText; - MetricField aUpperField; - FixedText aColsText; + FixedText aHDistText; + MetricField aHDistField; + FixedText aVDistText; + MetricField aVDistField; + FixedText aWidthText; + MetricField aWidthField; + FixedText aHeightText; + MetricField aHeightField; + FixedText aLeftText; + MetricField aLeftField; + FixedText aUpperText; + MetricField aUpperField; + FixedText aColsText; NumericField aColsField; - FixedText aRowsText; + FixedText aRowsText; NumericField aRowsField; - PushButton aSavePB; + PushButton aSavePB; Timer aPreviewTimer; BOOL bModified; - SwLabItem aItem; + SwLabItem aItem; SwLabFmtPage(Window* pParent, const SfxItemSet& rSet); ~SwLabFmtPage(); @@ -144,20 +144,20 @@ public: class SwSaveLabelDlg : public ModalDialog { FixedLine aOptionsFL; - FixedText aMakeFT; - ComboBox aMakeCB; - FixedText aTypeFT; - Edit aTypeED; + FixedText aMakeFT; + ComboBox aMakeCB; + FixedText aTypeFT; + Edit aTypeED; - OKButton aOKPB; - CancelButton aCancelPB; - HelpButton aHelpPB; + OKButton aOKPB; + CancelButton aCancelPB; + HelpButton aHelpPB; - QueryBox aQueryMB; + QueryBox aQueryMB; - sal_Bool bSuccess; - SwLabFmtPage* pLabPage; - SwLabRec& rLabRec; + sal_Bool bSuccess; + SwLabFmtPage* pLabPage; + SwLabRec& rLabRec; DECL_LINK(OkHdl, OKButton*); DECL_LINK(ModifyHdl, Edit*); @@ -165,7 +165,7 @@ class SwSaveLabelDlg : public ModalDialog public: SwSaveLabelDlg(SwLabFmtPage* pParent, SwLabRec& rRec); - void SetLabel(const rtl::OUString& rMake, const rtl::OUString& rType) + void SetLabel(const rtl::OUString& rMake, const rtl::OUString& rType) { aMakeCB.SetText(String(rMake)); aTypeED.SetText(String(rType)); diff --git a/sw/source/ui/envelp/labfmt.src b/sw/source/ui/envelp/labfmt.src index 2ad95e2b65a9..49b5e5515488 100644 --- a/sw/source/ui/envelp/labfmt.src +++ b/sw/source/ui/envelp/labfmt.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 @@ -213,7 +213,7 @@ TabPage TP_LAB_FMT Minimum = 1 ; First = 1 ; }; - PushButton PB_SAVE + PushButton PB_SAVE { Pos = MAP_APPFONT ( 50 , 148 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; diff --git a/sw/source/ui/envelp/labimg.cxx b/sw/source/ui/envelp/labimg.cxx index 9a6e45e0e208..1f6b9a7b9e1c 100644 --- a/sw/source/ui/envelp/labimg.cxx +++ b/sw/source/ui/envelp/labimg.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 @@ -58,9 +58,9 @@ SwLabItem::SwLabItem() : { bAddr = bCont = bSynchron = FALSE; bPage = TRUE; - lHDist = - lVDist = - lWidth = + lHDist = + lVDist = + lWidth = lHeight = 5669; // 10 cm } @@ -72,31 +72,31 @@ SwLabItem::SwLabItem(const SwLabItem& rItem) : SwLabItem& SwLabItem::operator =(const SwLabItem& rItem) { - bAddr = rItem.bAddr; + bAddr = rItem.bAddr; aWriting = rItem.aWriting; - bCont = rItem.bCont; + bCont = rItem.bCont; sDBName = rItem.sDBName; aLstMake = rItem.aLstMake; aLstType = rItem.aLstType; - aMake = rItem.aMake; - aType = rItem.aType; - bPage = rItem.bPage; + aMake = rItem.aMake; + aType = rItem.aType; + bPage = rItem.bPage; bSynchron = rItem.bSynchron; - aBin = rItem.aBin; - nCol = rItem.nCol; - nRow = rItem.nRow; - lHDist = rItem.lHDist; - lVDist = rItem.lVDist; - lWidth = rItem.lWidth; + aBin = rItem.aBin; + nCol = rItem.nCol; + nRow = rItem.nRow; + lHDist = rItem.lHDist; + lVDist = rItem.lVDist; + lWidth = rItem.lWidth; lHeight = rItem.lHeight; - lLeft = rItem.lLeft; - lUpper = rItem.lUpper; - nCols = rItem.nCols; - nRows = rItem.nRows; - aPrivFirstName = rItem.aPrivFirstName; + lLeft = rItem.lLeft; + lUpper = rItem.lUpper; + nCols = rItem.nCols; + nRows = rItem.nRows; + aPrivFirstName = rItem.aPrivFirstName; aPrivName = rItem.aPrivName; aPrivShortCut = rItem.aPrivShortCut; - aPrivFirstName2 = rItem.aPrivFirstName2; + aPrivFirstName2 = rItem.aPrivFirstName2; aPrivName2 = rItem.aPrivName2; aPrivShortCut2 = rItem.aPrivShortCut2; aPrivStreet = rItem.aPrivStreet; @@ -134,31 +134,31 @@ int SwLabItem::operator ==(const SfxPoolItem& rItem) const { const SwLabItem& rLab = (const SwLabItem&) rItem; - return bAddr == rLab.bAddr && - bCont == rLab.bCont && - bPage == rLab.bPage && + return bAddr == rLab.bAddr && + bCont == rLab.bCont && + bPage == rLab.bPage && bSynchron == rLab.bSynchron && - aBin == rLab.aBin && - nCol == rLab.nCol && - nRow == rLab.nRow && - lHDist == rLab.lHDist && - lVDist == rLab.lVDist && - lWidth == rLab.lWidth && - lHeight == rLab.lHeight && - lLeft == rLab.lLeft && - lUpper == rLab.lUpper && - nCols == rLab.nCols && - nRows == rLab.nRows && + aBin == rLab.aBin && + nCol == rLab.nCol && + nRow == rLab.nRow && + lHDist == rLab.lHDist && + lVDist == rLab.lVDist && + lWidth == rLab.lWidth && + lHeight == rLab.lHeight && + lLeft == rLab.lLeft && + lUpper == rLab.lUpper && + nCols == rLab.nCols && + nRows == rLab.nRows && aWriting == rLab.aWriting&& - aMake == rLab.aMake && - aType == rLab.aType && - aLstMake == rLab.aLstMake&& - aLstType == rLab.aLstType&& + aMake == rLab.aMake && + aType == rLab.aType && + aLstMake == rLab.aLstMake&& + aLstType == rLab.aLstType&& sDBName == rLab.sDBName && - aPrivFirstName == rLab.aPrivFirstName&& + aPrivFirstName == rLab.aPrivFirstName&& aPrivName == rLab.aPrivName&& aPrivShortCut == rLab.aPrivShortCut&& - aPrivFirstName2 == rLab.aPrivFirstName2&& + aPrivFirstName2 == rLab.aPrivFirstName2&& aPrivName2 == rLab.aPrivName2&& aPrivShortCut2 == rLab.aPrivShortCut2&& aPrivStreet == rLab.aPrivStreet&& @@ -200,61 +200,61 @@ Sequence<rtl::OUString> SwLabCfgItem::GetPropertyNames() { static const char* aLabelPropNames[] = { - "Medium/Continous", // 0 - "Medium/Brand", // 1 - "Medium/Type", // 2 - "Format/Column", // 3 - "Format/Row", // 4 + "Medium/Continous", // 0 + "Medium/Brand", // 1 + "Medium/Type", // 2 + "Format/Column", // 3 + "Format/Row", // 4 "Format/HorizontalDistance",// 5 - "Format/VerticalDistance", // 6 - "Format/Width", // 7 - "Format/Height", // 8 - "Format/LeftMargin", // 9 - "Format/TopMargin", //10 - "Option/Synchronize", //11 - "Option/Page", //12 - "Option/Column", //13 - "Option/Row", //14 - "Inscription/UseAddress", //15 - "Inscription/Address", //16 - "Inscription/Database" //17 + "Format/VerticalDistance", // 6 + "Format/Width", // 7 + "Format/Height", // 8 + "Format/LeftMargin", // 9 + "Format/TopMargin", //10 + "Option/Synchronize", //11 + "Option/Page", //12 + "Option/Column", //13 + "Option/Row", //14 + "Inscription/UseAddress", //15 + "Inscription/Address", //16 + "Inscription/Database" //17 }; static const char* aBusinessPropNames[] = { - "PrivateAddress/FirstName", // 0 - "PrivateAddress/Name", // 1 - "PrivateAddress/ShortCut", // 2 - "PrivateAddress/SecondFirstName", // 3 - "PrivateAddress/SecondName", // 4 - "PrivateAddress/SecondShortCut", // 5 - "PrivateAddress/Street", // 6 - "PrivateAddress/Zip", // 7 - "PrivateAddress/City", // 8 - "PrivateAddress/Country", // 9 - "PrivateAddress/State", // 10 - "PrivateAddress/Title", // 11 - "PrivateAddress/Profession", // 12 - "PrivateAddress/Phone", // 13 - "PrivateAddress/Mobile", // 14 - "PrivateAddress/Fax", // 15 - "PrivateAddress/WebAddress", // 16 - "PrivateAddress/Email", // 17 - "BusinessAddress/Company", // 18 - "BusinessAddress/CompanyExt", // 19 - "BusinessAddress/Slogan", // 20 - "BusinessAddress/Street", // 21 - "BusinessAddress/Zip", // 22 - "BusinessAddress/City", // 23 - "BusinessAddress/Country", // 24 - "BusinessAddress/State", // 25 - "BusinessAddress/Position", // 26 - "BusinessAddress/Phone", // 27 - "BusinessAddress/Mobile", // 28 - "BusinessAddress/Fax", // 29 - "BusinessAddress/WebAddress", // 30 - "BusinessAddress/Email", // 31 - "AutoText/Group", // 32 - "AutoText/Block" // 33 + "PrivateAddress/FirstName", // 0 + "PrivateAddress/Name", // 1 + "PrivateAddress/ShortCut", // 2 + "PrivateAddress/SecondFirstName", // 3 + "PrivateAddress/SecondName", // 4 + "PrivateAddress/SecondShortCut", // 5 + "PrivateAddress/Street", // 6 + "PrivateAddress/Zip", // 7 + "PrivateAddress/City", // 8 + "PrivateAddress/Country", // 9 + "PrivateAddress/State", // 10 + "PrivateAddress/Title", // 11 + "PrivateAddress/Profession", // 12 + "PrivateAddress/Phone", // 13 + "PrivateAddress/Mobile", // 14 + "PrivateAddress/Fax", // 15 + "PrivateAddress/WebAddress", // 16 + "PrivateAddress/Email", // 17 + "BusinessAddress/Company", // 18 + "BusinessAddress/CompanyExt", // 19 + "BusinessAddress/Slogan", // 20 + "BusinessAddress/Street", // 21 + "BusinessAddress/Zip", // 22 + "BusinessAddress/City", // 23 + "BusinessAddress/Country", // 24 + "BusinessAddress/State", // 25 + "BusinessAddress/Position", // 26 + "BusinessAddress/Phone", // 27 + "BusinessAddress/Mobile", // 28 + "BusinessAddress/Fax", // 29 + "BusinessAddress/WebAddress", // 30 + "BusinessAddress/Email", // 31 + "AutoText/Group", // 32 + "AutoText/Block" // 33 }; const int nBusinessCount = bIsLabel ? 0 : 34; const int nLabelCount = bIsLabel ? 18 : 15; @@ -293,10 +293,10 @@ SwLabCfgItem::SwLabCfgItem(sal_Bool bLabel) : switch(nProperty) { case 0: aItem.bCont = *(sal_Bool*)pValues[nProp].getValue(); break;// "Medium/Continous", - case 1: pValues[nProp] >>= aItem.aMake; break;// "Medium/Brand", - case 2: pValues[nProp] >>= aItem.aType; break;// "Medium/Type", - case 3: pValues[nProp] >>= aItem.nCols; break;// "Format/Column", - case 4: pValues[nProp] >>= aItem.nRows; break;// "Format/Row", + case 1: pValues[nProp] >>= aItem.aMake; break;// "Medium/Brand", + case 2: pValues[nProp] >>= aItem.aType; break;// "Medium/Type", + case 3: pValues[nProp] >>= aItem.nCols; break;// "Format/Column", + case 4: pValues[nProp] >>= aItem.nRows; break;// "Format/Row", case 5: pValues[nProp] >>= aItem.lHDist; aItem.lHDist = MM100_TO_TWIP(aItem.lHDist); @@ -323,44 +323,44 @@ SwLabCfgItem::SwLabCfgItem(sal_Bool bLabel) : break;// "Format/TopMargin", case 11: aItem.bSynchron = *(sal_Bool*)pValues[nProp].getValue(); break;// "Option/Synchronize", case 12: aItem.bPage = *(sal_Bool*)pValues[nProp].getValue(); break;// "Option/Page", - case 13: pValues[nProp] >>= aItem.nCol; break;// "Option/Column", - case 14: pValues[nProp] >>= aItem.nRow; break;// "Option/Row" - case 15: aItem.bAddr = *(sal_Bool*)pValues[nProp].getValue(); break;// "Inscription/UseAddress", - case 16: pValues[nProp] >>= aItem.aWriting; break;// "Inscription/Address", - case 17: pValues[nProp] >>= aItem.sDBName; break;// "Inscription/Database" - case 18: pValues[nProp] >>= aItem.aPrivFirstName; break;// "PrivateAddress/FirstName", - case 19: pValues[nProp] >>= aItem.aPrivName; break;// "PrivateAddress/Name", - case 20: pValues[nProp] >>= aItem.aPrivShortCut; break;// "PrivateAddress/ShortCut", - case 21: pValues[nProp] >>= aItem.aPrivFirstName2; break;// "PrivateAddress/SecondFirstName", - case 22: pValues[nProp] >>= aItem.aPrivName2; break;// "PrivateAddress/SecondName", - case 23: pValues[nProp] >>= aItem.aPrivShortCut2; break;// "PrivateAddress/SecondShortCut", - case 24: pValues[nProp] >>= aItem.aPrivStreet; break;// "PrivateAddress/Street", - case 25: pValues[nProp] >>= aItem.aPrivZip; break;// "PrivateAddress/Zip", - case 26: pValues[nProp] >>= aItem.aPrivCity; break;// "PrivateAddress/City", - case 27: pValues[nProp] >>= aItem.aPrivCountry; break;// "PrivateAddress/Country", - case 28: pValues[nProp] >>= aItem.aPrivState; break;// "PrivateAddress/State", - case 29: pValues[nProp] >>= aItem.aPrivTitle; break;// "PrivateAddress/Title", - case 30: pValues[nProp] >>= aItem.aPrivProfession; break;// "PrivateAddress/Profession", - case 31: pValues[nProp] >>= aItem.aPrivPhone; break;// "PrivateAddress/Phone", - case 32: pValues[nProp] >>= aItem.aPrivMobile; break;// "PrivateAddress/Mobile", - case 33: pValues[nProp] >>= aItem.aPrivFax; break;// "PrivateAddress/Fax", - case 34: pValues[nProp] >>= aItem.aPrivWWW; break;// "PrivateAddress/WebAddress", - case 35: pValues[nProp] >>= aItem.aPrivMail; break;// "PrivateAddress/Email", - case 36: pValues[nProp] >>= aItem.aCompCompany; break;// "BusinessAddress/Company", - case 37: pValues[nProp] >>= aItem.aCompCompanyExt; break;// "BusinessAddress/CompanyExt", - case 38: pValues[nProp] >>= aItem.aCompSlogan; break;// "BusinessAddress/Slogan", - case 39: pValues[nProp] >>= aItem.aCompStreet; break;// "BusinessAddress/Street", - case 40: pValues[nProp] >>= aItem.aCompZip; break;// "BusinessAddress/Zip", - case 41: pValues[nProp] >>= aItem.aCompCity; break;// "BusinessAddress/City", - case 42: pValues[nProp] >>= aItem.aCompCountry; break;// "BusinessAddress/Country", - case 43: pValues[nProp] >>= aItem.aCompState; break;// "BusinessAddress/State", - case 44: pValues[nProp] >>= aItem.aCompPosition; break;// "BusinessAddress/Position", - case 45: pValues[nProp] >>= aItem.aCompPhone; break;// "BusinessAddress/Phone", - case 46: pValues[nProp] >>= aItem.aCompMobile; break;// "BusinessAddress/Mobile", - case 47: pValues[nProp] >>= aItem.aCompFax; break;// "BusinessAddress/Fax", - case 48: pValues[nProp] >>= aItem.aCompWWW; break;// "BusinessAddress/WebAddress", - case 49: pValues[nProp] >>= aItem.aCompMail; break;// "BusinessAddress/Email", - case 50: pValues[nProp] >>= aItem.sGlossaryGroup; break;// "AutoText/Group" + case 13: pValues[nProp] >>= aItem.nCol; break;// "Option/Column", + case 14: pValues[nProp] >>= aItem.nRow; break;// "Option/Row" + case 15: aItem.bAddr = *(sal_Bool*)pValues[nProp].getValue(); break;// "Inscription/UseAddress", + case 16: pValues[nProp] >>= aItem.aWriting; break;// "Inscription/Address", + case 17: pValues[nProp] >>= aItem.sDBName; break;// "Inscription/Database" + case 18: pValues[nProp] >>= aItem.aPrivFirstName; break;// "PrivateAddress/FirstName", + case 19: pValues[nProp] >>= aItem.aPrivName; break;// "PrivateAddress/Name", + case 20: pValues[nProp] >>= aItem.aPrivShortCut; break;// "PrivateAddress/ShortCut", + case 21: pValues[nProp] >>= aItem.aPrivFirstName2; break;// "PrivateAddress/SecondFirstName", + case 22: pValues[nProp] >>= aItem.aPrivName2; break;// "PrivateAddress/SecondName", + case 23: pValues[nProp] >>= aItem.aPrivShortCut2; break;// "PrivateAddress/SecondShortCut", + case 24: pValues[nProp] >>= aItem.aPrivStreet; break;// "PrivateAddress/Street", + case 25: pValues[nProp] >>= aItem.aPrivZip; break;// "PrivateAddress/Zip", + case 26: pValues[nProp] >>= aItem.aPrivCity; break;// "PrivateAddress/City", + case 27: pValues[nProp] >>= aItem.aPrivCountry; break;// "PrivateAddress/Country", + case 28: pValues[nProp] >>= aItem.aPrivState; break;// "PrivateAddress/State", + case 29: pValues[nProp] >>= aItem.aPrivTitle; break;// "PrivateAddress/Title", + case 30: pValues[nProp] >>= aItem.aPrivProfession; break;// "PrivateAddress/Profession", + case 31: pValues[nProp] >>= aItem.aPrivPhone; break;// "PrivateAddress/Phone", + case 32: pValues[nProp] >>= aItem.aPrivMobile; break;// "PrivateAddress/Mobile", + case 33: pValues[nProp] >>= aItem.aPrivFax; break;// "PrivateAddress/Fax", + case 34: pValues[nProp] >>= aItem.aPrivWWW; break;// "PrivateAddress/WebAddress", + case 35: pValues[nProp] >>= aItem.aPrivMail; break;// "PrivateAddress/Email", + case 36: pValues[nProp] >>= aItem.aCompCompany; break;// "BusinessAddress/Company", + case 37: pValues[nProp] >>= aItem.aCompCompanyExt; break;// "BusinessAddress/CompanyExt", + case 38: pValues[nProp] >>= aItem.aCompSlogan; break;// "BusinessAddress/Slogan", + case 39: pValues[nProp] >>= aItem.aCompStreet; break;// "BusinessAddress/Street", + case 40: pValues[nProp] >>= aItem.aCompZip; break;// "BusinessAddress/Zip", + case 41: pValues[nProp] >>= aItem.aCompCity; break;// "BusinessAddress/City", + case 42: pValues[nProp] >>= aItem.aCompCountry; break;// "BusinessAddress/Country", + case 43: pValues[nProp] >>= aItem.aCompState; break;// "BusinessAddress/State", + case 44: pValues[nProp] >>= aItem.aCompPosition; break;// "BusinessAddress/Position", + case 45: pValues[nProp] >>= aItem.aCompPhone; break;// "BusinessAddress/Phone", + case 46: pValues[nProp] >>= aItem.aCompMobile; break;// "BusinessAddress/Mobile", + case 47: pValues[nProp] >>= aItem.aCompFax; break;// "BusinessAddress/Fax", + case 48: pValues[nProp] >>= aItem.aCompWWW; break;// "BusinessAddress/WebAddress", + case 49: pValues[nProp] >>= aItem.aCompMail; break;// "BusinessAddress/Email", + case 50: pValues[nProp] >>= aItem.sGlossaryGroup; break;// "AutoText/Group" case 51: pValues[nProp] >>= aItem.sGlossaryBlockName; break;// "AutoText/Block" } } @@ -393,7 +393,7 @@ SwLabCfgItem::SwLabCfgItem(sal_Bool bLabel) : void SwLabCfgItem::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {} -void SwLabCfgItem::Commit() +void SwLabCfgItem::Commit() { Sequence<OUString> aNames = GetPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -408,56 +408,56 @@ void SwLabCfgItem::Commit() switch(nProperty) { case 0: pValues[nProp].setValue(&aItem.bCont, rType); break;// "Medium/Continous", - case 1: pValues[nProp] <<= aItem.aMake; break;// "Medium/Brand", - case 2: pValues[nProp] <<= aItem.aType; break;// "Medium/Type", - case 3: pValues[nProp] <<= aItem.nCols; break;// "Format/Column", - case 4: pValues[nProp] <<= aItem.nRows; break;// "Format/Row", + case 1: pValues[nProp] <<= aItem.aMake; break;// "Medium/Brand", + case 2: pValues[nProp] <<= aItem.aType; break;// "Medium/Type", + case 3: pValues[nProp] <<= aItem.nCols; break;// "Format/Column", + case 4: pValues[nProp] <<= aItem.nRows; break;// "Format/Row", case 5: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(aItem.lHDist));break;// "Format/HorizontalDistance", case 6: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(aItem.lVDist));break;// "Format/VerticalDistance", - case 7: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(aItem.lWidth)); break;// "Format/Width", - case 8: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(aItem.lHeight)); break;// "Format/Height", - case 9: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(aItem.lLeft)); break;// "Format/LeftMargin", - case 10: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(aItem.lUpper)); break;// "Format/TopMargin", + case 7: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(aItem.lWidth)); break;// "Format/Width", + case 8: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(aItem.lHeight)); break;// "Format/Height", + case 9: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(aItem.lLeft)); break;// "Format/LeftMargin", + case 10: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(aItem.lUpper)); break;// "Format/TopMargin", case 11: pValues[nProp].setValue(&aItem.bSynchron, rType); break;// "Option/Synchronize", case 12: pValues[nProp].setValue(&aItem.bPage, rType); break;// "Option/Page", - case 13: pValues[nProp] <<= aItem.nCol; break;// "Option/Column", - case 14: pValues[nProp] <<= aItem.nRow; break;// "Option/Row" - case 15: pValues[nProp].setValue(&aItem.bAddr, rType); break;// "Inscription/UseAddress", - case 16: pValues[nProp] <<= aItem.aWriting; break;// "Inscription/Address", - case 17: pValues[nProp] <<= aItem.sDBName; break;// "Inscription/Database" - case 18: pValues[nProp] <<= aItem.aPrivFirstName; break;// "PrivateAddress/FirstName", - case 19: pValues[nProp] <<= aItem.aPrivName; break;// "PrivateAddress/Name", - case 20: pValues[nProp] <<= aItem.aPrivShortCut; break;// "PrivateAddress/ShortCut", - case 21: pValues[nProp] <<= aItem.aPrivFirstName2; break;// "PrivateAddress/SecondFirstName", - case 22: pValues[nProp] <<= aItem.aPrivName2; break;// "PrivateAddress/SecondName", - case 23: pValues[nProp] <<= aItem.aPrivShortCut2; break;// "PrivateAddress/SecondShortCut", - case 24: pValues[nProp] <<= aItem.aPrivStreet; break;// "PrivateAddress/Street", - case 25: pValues[nProp] <<= aItem.aPrivZip; break;// "PrivateAddress/Zip", - case 26: pValues[nProp] <<= aItem.aPrivCity; break;// "PrivateAddress/City", - case 27: pValues[nProp] <<= aItem.aPrivCountry; break;// "PrivateAddress/Country", - case 28: pValues[nProp] <<= aItem.aPrivState; break;// "PrivateAddress/State", - case 29: pValues[nProp] <<= aItem.aPrivTitle; break;// "PrivateAddress/Title", - case 30: pValues[nProp] <<= aItem.aPrivProfession; break;// "PrivateAddress/Profession", - case 31: pValues[nProp] <<= aItem.aPrivPhone; break;// "PrivateAddress/Phone", - case 32: pValues[nProp] <<= aItem.aPrivMobile; break;// "PrivateAddress/Mobile", - case 33: pValues[nProp] <<= aItem.aPrivFax; break;// "PrivateAddress/Fax", - case 34: pValues[nProp] <<= aItem.aPrivWWW; break;// "PrivateAddress/WebAddress", - case 35: pValues[nProp] <<= aItem.aPrivMail; break;// "PrivateAddress/Email", - case 36: pValues[nProp] <<= aItem.aCompCompany; break;// "BusinessAddress/Company", - case 37: pValues[nProp] <<= aItem.aCompCompanyExt; break;// "BusinessAddress/CompanyExt", - case 38: pValues[nProp] <<= aItem.aCompSlogan; break;// "BusinessAddress/Slogan", - case 39: pValues[nProp] <<= aItem.aCompStreet; break;// "BusinessAddress/Street", - case 40: pValues[nProp] <<= aItem.aCompZip; break;// "BusinessAddress/Zip", - case 41: pValues[nProp] <<= aItem.aCompCity; break;// "BusinessAddress/City", - case 42: pValues[nProp] <<= aItem.aCompCountry; break;// "BusinessAddress/Country", - case 43: pValues[nProp] <<= aItem.aCompState; break;// "BusinessAddress/State", - case 44: pValues[nProp] <<= aItem.aCompPosition; break;// "BusinessAddress/Position", - case 45: pValues[nProp] <<= aItem.aCompPhone; break;// "BusinessAddress/Phone", - case 46: pValues[nProp] <<= aItem.aCompMobile; break;// "BusinessAddress/Mobile", - case 47: pValues[nProp] <<= aItem.aCompFax; break;// "BusinessAddress/Fax", - case 48: pValues[nProp] <<= aItem.aCompWWW; break;// "BusinessAddress/WebAddress", - case 49: pValues[nProp] <<= aItem.aCompMail; break;// "BusinessAddress/Email", - case 50: pValues[nProp] <<= aItem.sGlossaryGroup; break;// "AutoText/Group" + case 13: pValues[nProp] <<= aItem.nCol; break;// "Option/Column", + case 14: pValues[nProp] <<= aItem.nRow; break;// "Option/Row" + case 15: pValues[nProp].setValue(&aItem.bAddr, rType); break;// "Inscription/UseAddress", + case 16: pValues[nProp] <<= aItem.aWriting; break;// "Inscription/Address", + case 17: pValues[nProp] <<= aItem.sDBName; break;// "Inscription/Database" + case 18: pValues[nProp] <<= aItem.aPrivFirstName; break;// "PrivateAddress/FirstName", + case 19: pValues[nProp] <<= aItem.aPrivName; break;// "PrivateAddress/Name", + case 20: pValues[nProp] <<= aItem.aPrivShortCut; break;// "PrivateAddress/ShortCut", + case 21: pValues[nProp] <<= aItem.aPrivFirstName2; break;// "PrivateAddress/SecondFirstName", + case 22: pValues[nProp] <<= aItem.aPrivName2; break;// "PrivateAddress/SecondName", + case 23: pValues[nProp] <<= aItem.aPrivShortCut2; break;// "PrivateAddress/SecondShortCut", + case 24: pValues[nProp] <<= aItem.aPrivStreet; break;// "PrivateAddress/Street", + case 25: pValues[nProp] <<= aItem.aPrivZip; break;// "PrivateAddress/Zip", + case 26: pValues[nProp] <<= aItem.aPrivCity; break;// "PrivateAddress/City", + case 27: pValues[nProp] <<= aItem.aPrivCountry; break;// "PrivateAddress/Country", + case 28: pValues[nProp] <<= aItem.aPrivState; break;// "PrivateAddress/State", + case 29: pValues[nProp] <<= aItem.aPrivTitle; break;// "PrivateAddress/Title", + case 30: pValues[nProp] <<= aItem.aPrivProfession; break;// "PrivateAddress/Profession", + case 31: pValues[nProp] <<= aItem.aPrivPhone; break;// "PrivateAddress/Phone", + case 32: pValues[nProp] <<= aItem.aPrivMobile; break;// "PrivateAddress/Mobile", + case 33: pValues[nProp] <<= aItem.aPrivFax; break;// "PrivateAddress/Fax", + case 34: pValues[nProp] <<= aItem.aPrivWWW; break;// "PrivateAddress/WebAddress", + case 35: pValues[nProp] <<= aItem.aPrivMail; break;// "PrivateAddress/Email", + case 36: pValues[nProp] <<= aItem.aCompCompany; break;// "BusinessAddress/Company", + case 37: pValues[nProp] <<= aItem.aCompCompanyExt; break;// "BusinessAddress/CompanyExt", + case 38: pValues[nProp] <<= aItem.aCompSlogan; break;// "BusinessAddress/Slogan", + case 39: pValues[nProp] <<= aItem.aCompStreet; break;// "BusinessAddress/Street", + case 40: pValues[nProp] <<= aItem.aCompZip; break;// "BusinessAddress/Zip", + case 41: pValues[nProp] <<= aItem.aCompCity; break;// "BusinessAddress/City", + case 42: pValues[nProp] <<= aItem.aCompCountry; break;// "BusinessAddress/Country", + case 43: pValues[nProp] <<= aItem.aCompState; break;// "BusinessAddress/State", + case 44: pValues[nProp] <<= aItem.aCompPosition; break;// "BusinessAddress/Position", + case 45: pValues[nProp] <<= aItem.aCompPhone; break;// "BusinessAddress/Phone", + case 46: pValues[nProp] <<= aItem.aCompMobile; break;// "BusinessAddress/Mobile", + case 47: pValues[nProp] <<= aItem.aCompFax; break;// "BusinessAddress/Fax", + case 48: pValues[nProp] <<= aItem.aCompWWW; break;// "BusinessAddress/WebAddress", + case 49: pValues[nProp] <<= aItem.aCompMail; break;// "BusinessAddress/Email", + case 50: pValues[nProp] <<= aItem.sGlossaryGroup; break;// "AutoText/Group" case 51: pValues[nProp] <<= aItem.sGlossaryBlockName; break;// "AutoText/Block" } } diff --git a/sw/source/ui/envelp/labimp.hxx b/sw/source/ui/envelp/labimp.hxx index 603ec3f88e97..f0a2b6b425d3 100644 --- a/sw/source/ui/envelp/labimp.hxx +++ b/sw/source/ui/envelp/labimp.hxx @@ -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 @@ -84,7 +84,7 @@ #include <label.hxx> #include <labimg.hxx> -#define GETFLDVAL(rField) (rField).Denormalize((rField).GetValue(FUNIT_TWIP)) +#define GETFLDVAL(rField) (rField).Denormalize((rField).GetValue(FUNIT_TWIP)) #define SETFLDVAL(rField, lValue) (rField).SetValue((rField).Normalize(lValue), FUNIT_TWIP) class SwNewDBMgr; @@ -97,17 +97,17 @@ public: void SetFromItem( const SwLabItem& rItem ); void FillItem( SwLabItem& rItem ) const; - String aMake; - String aType; - long lHDist; - long lVDist; - long lWidth; - long lHeight; - long lLeft; - long lUpper; - sal_Int32 nCols; - sal_Int32 nRows; - sal_Bool bCont; + String aMake; + String aType; + long lHDist; + long lVDist; + long lWidth; + long lHeight; + long lLeft; + long lUpper; + sal_Int32 nCols; + sal_Int32 nRows; + sal_Bool bCont; }; /* -------------------------------------------------- diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx index 7dce45446dec..3e7b756c3539 100644 --- a/sw/source/ui/envelp/labprt.cxx +++ b/sw/source/ui/envelp/labprt.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 @@ -53,14 +53,14 @@ SwLabPrtPage::SwLabPrtPage(Window* pParent, const SfxItemSet& rSet) : pPrinter( 0 ), aPageButton (this, SW_RES(BTN_PAGE )), aSingleButton (this, SW_RES(BTN_SINGLE )), - aColText (this, SW_RES(TXT_COL )), - aColField (this, SW_RES(FLD_COL )), - aRowText (this, SW_RES(TXT_ROW )), - aRowField (this, SW_RES(FLD_ROW )), - aSynchronCB (this, SW_RES(CB_SYNCHRON)), + aColText (this, SW_RES(TXT_COL )), + aColField (this, SW_RES(FLD_COL )), + aRowText (this, SW_RES(TXT_ROW )), + aRowField (this, SW_RES(FLD_ROW )), + aSynchronCB (this, SW_RES(CB_SYNCHRON)), aFLDontKnow (this, SW_RES(FL_DONTKNOW)), aPrinterInfo (this, SW_RES(INF_PRINTER)), - aPrtSetup (this, SW_RES(BTN_PRTSETUP)), + aPrtSetup (this, SW_RES(BTN_PRTSETUP)), aFLPrinter (this, SW_RES(FL_PRINTER )) { @@ -144,8 +144,8 @@ int SwLabPrtPage::DeactivatePage(SfxItemSet* _pSet) void SwLabPrtPage::FillItem(SwLabItem& rItem) { rItem.bPage = aPageButton.IsChecked(); - rItem.nCol = (USHORT) aColField.GetValue(); - rItem.nRow = (USHORT) aRowField.GetValue(); + rItem.nCol = (USHORT) aColField.GetValue(); + rItem.nRow = (USHORT) aRowField.GetValue(); rItem.bSynchron = aSynchronCB.IsChecked() && aSynchronCB.IsEnabled(); } @@ -164,8 +164,8 @@ void SwLabPrtPage::Reset(const SfxItemSet& ) SwLabItem aItem; GetParent()->GetLabItem(aItem); - aColField.SetValue (aItem.nCol); - aRowField.SetValue (aItem.nRow); + aColField.SetValue (aItem.nCol); + aRowField.SetValue (aItem.nRow); if (aItem.bPage) { diff --git a/sw/source/ui/envelp/labprt.hrc b/sw/source/ui/envelp/labprt.hrc index 31cb373dc817..6e3a19154706 100644 --- a/sw/source/ui/envelp/labprt.hrc +++ b/sw/source/ui/envelp/labprt.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 @@ -42,7 +42,7 @@ #define BTN_PRTSETUP 8 #define FL_PRINTER 9 #define FL_DONTKNOW 10 -#define CB_SYNCHRON 11 +#define CB_SYNCHRON 11 // Ueberlaufpruefung ******************************************************** diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx index 5cb0be6cbb47..1dd96b78ae79 100644 --- a/sw/source/ui/envelp/labprt.hxx +++ b/sw/source/ui/envelp/labprt.hxx @@ -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 @@ -42,7 +42,7 @@ class SwLabItem; class SwLabPrtPage : public SfxTabPage { - Printer* pPrinter; //Fuer die Schachteinstellug - leider. + Printer* pPrinter; //Fuer die Schachteinstellug - leider. RadioButton aPageButton; RadioButton aSingleButton; @@ -50,7 +50,7 @@ class SwLabPrtPage : public SfxTabPage NumericField aColField; FixedText aRowText; NumericField aRowField; - CheckBox aSynchronCB; + CheckBox aSynchronCB; FixedLine aFLDontKnow; FixedInfo aPrinterInfo; diff --git a/sw/source/ui/envelp/labprt.src b/sw/source/ui/envelp/labprt.src index 4095b3af3750..7d663f9ccb7c 100644 --- a/sw/source/ui/envelp/labprt.src +++ b/sw/source/ui/envelp/labprt.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/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index 0fa5c4d8981a..517b0a326df3 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.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 @@ -156,20 +156,20 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell, pBeamerWin (new Window(this, SW_RES(WIN_BEAMER))), aAllRB (this, SW_RES(RB_ALL)), - aMarkedRB (this, SW_RES(RB_MARKED)), - aFromRB (this, SW_RES(RB_FROM)), - aFromNF (this, SW_RES(NF_FROM)), - aBisFT (this, SW_RES(FT_BIS)), - aToNF (this, SW_RES(NF_TO)), + aMarkedRB (this, SW_RES(RB_MARKED)), + aFromRB (this, SW_RES(RB_FROM)), + aFromNF (this, SW_RES(NF_FROM)), + aBisFT (this, SW_RES(FT_BIS)), + aToNF (this, SW_RES(NF_TO)), aRecordFL (this, SW_RES(FL_RECORD)), aSeparatorFL (this, SW_RES(FL_SEPARATOR)), aPrinterRB (this, SW_RES(RB_PRINTER)), - aMailingRB (this, SW_RES(RB_MAILING)), - aFileRB (this, SW_RES(RB_FILE)), + aMailingRB (this, SW_RES(RB_MAILING)), + aFileRB (this, SW_RES(RB_FILE)), - aSingleJobsCB (this, SW_RES(CB_SINGLE_JOBS)), + aSingleJobsCB (this, SW_RES(CB_SINGLE_JOBS)), aSaveMergedDocumentFL(this, SW_RES( FL_SAVE_MERGED_DOCUMENT)), aSaveSingleDocRB(this, SW_RES( RB_SAVE_SINGLE_DOC )), @@ -180,34 +180,34 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell, aColumnLB (this, SW_RES(LB_COLUMN)), aPathFT (this, SW_RES(FT_PATH)), - aPathED (this, SW_RES(ED_PATH)), - aPathPB (this, SW_RES(PB_PATH)), + aPathED (this, SW_RES(ED_PATH)), + aPathPB (this, SW_RES(PB_PATH)), aFilterFT (this, SW_RES(FT_FILTER)), aFilterLB (this, SW_RES(LB_FILTER)), - aAddressFldLB (this, SW_RES(LB_ADDRESSFLD)), - aSubjectFT (this, SW_RES(FT_SUBJECT)), - aSubjectED (this, SW_RES(ED_SUBJECT)), - aFormatFT (this, SW_RES(FT_FORMAT)), - aAttachFT (this, SW_RES(FT_ATTACH)), - aAttachED (this, SW_RES(ED_ATTACH)), - aAttachPB (this, SW_RES(PB_ATTACH)), - aFormatHtmlCB (this, SW_RES(CB_FORMAT_HTML)), - aFormatRtfCB (this, SW_RES(CB_FORMAT_RTF)), + aAddressFldLB (this, SW_RES(LB_ADDRESSFLD)), + aSubjectFT (this, SW_RES(FT_SUBJECT)), + aSubjectED (this, SW_RES(ED_SUBJECT)), + aFormatFT (this, SW_RES(FT_FORMAT)), + aAttachFT (this, SW_RES(FT_ATTACH)), + aAttachED (this, SW_RES(ED_ATTACH)), + aAttachPB (this, SW_RES(PB_ATTACH)), + aFormatHtmlCB (this, SW_RES(CB_FORMAT_HTML)), + aFormatRtfCB (this, SW_RES(CB_FORMAT_RTF)), aFormatSwCB (this, SW_RES(CB_FORMAT_SW)), aDestFL (this, SW_RES(FL_DEST)), aBottomSeparatorFL(this, SW_RES(FL_BOTTOM_SEPARATOR)), - aOkBTN (this, SW_RES(BTN_OK)), - aCancelBTN (this, SW_RES(BTN_CANCEL)), - aHelpBTN (this, SW_RES(BTN_HELP)), + aOkBTN (this, SW_RES(BTN_OK)), + aCancelBTN (this, SW_RES(BTN_CANCEL)), + aHelpBTN (this, SW_RES(BTN_HELP)), pImpl (new SwMailMergeDlg_Impl), rSh (rShell), - rDBName (rSourceName), - rTableName (rTblName), + rDBName (rSourceName), + rTableName (rTblName), nMergeType (DBMGR_MERGE_MAILING), m_aDialogSize( GetSizePixel() ) { diff --git a/sw/source/ui/envelp/mailmrge.hrc b/sw/source/ui/envelp/mailmrge.hrc index 0bc31c20e7eb..5f3ef3778e59 100644 --- a/sw/source/ui/envelp/mailmrge.hrc +++ b/sw/source/ui/envelp/mailmrge.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 @@ -33,33 +33,33 @@ // Elemente ----------------------------------------------------------------- #define FL_RECORD 1 -#define RB_ALL 2 -#define RB_MARKED 3 -#define RB_FROM 4 -#define NF_FROM 5 -#define FT_BIS 6 -#define NF_TO 7 -#define BTN_OK 8 -#define BTN_CANCEL 9 -#define BTN_HELP 10 -#define RB_PRINTER 11 -#define RB_MAILING 12 -#define FT_ADDRESS 13 -#define LB_ADDRESSFLD 14 -#define FT_SUBJECT 15 -#define ED_SUBJECT 16 +#define RB_ALL 2 +#define RB_MARKED 3 +#define RB_FROM 4 +#define NF_FROM 5 +#define FT_BIS 6 +#define NF_TO 7 +#define BTN_OK 8 +#define BTN_CANCEL 9 +#define BTN_HELP 10 +#define RB_PRINTER 11 +#define RB_MAILING 12 +#define FT_ADDRESS 13 +#define LB_ADDRESSFLD 14 +#define FT_SUBJECT 15 +#define ED_SUBJECT 16 #define FL_DEST 17 -#define CB_SINGLE_JOBS 18 -#define FT_FORMAT 19 -#define CB_FORMAT_SW 20 -#define CB_FORMAT_HTML 21 -#define CB_FORMAT_RTF 22 -#define RB_FILE 23 -#define FT_PATH 24 -#define ED_PATH 25 -#define PB_PATH 26 -#define LB_COLUMN 30 -#define FT_ATTACH 32 +#define CB_SINGLE_JOBS 18 +#define FT_FORMAT 19 +#define CB_FORMAT_SW 20 +#define CB_FORMAT_HTML 21 +#define CB_FORMAT_RTF 22 +#define RB_FILE 23 +#define FT_PATH 24 +#define ED_PATH 25 +#define PB_PATH 26 +#define LB_COLUMN 30 +#define FT_ATTACH 32 #define ED_ATTACH 33 #define PB_ATTACH 34 #define WIN_BEAMER 35 @@ -70,7 +70,7 @@ #define RB_SAVE_INDIVIDUAL 40 #define RB_GENERATE_FROM_DATABASE 41 #define FT_COLUMN 42 -#define FT_FILTER 43 +#define FT_FILTER 43 #define LB_FILTER 44 #define FL_CREATEFROM 1 diff --git a/sw/source/ui/envelp/mailmrge.src b/sw/source/ui/envelp/mailmrge.src index 81291c3da94a..146fd02d0938 100644 --- a/sw/source/ui/envelp/mailmrge.src +++ b/sw/source/ui/envelp/mailmrge.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 @@ -30,7 +30,7 @@ #include "helpid.h" #define _MAIL_MERGE_STRING_ \ - Text [ en-US ] = "Mail Merge" ; \ + Text [ en-US ] = "Mail Merge" ; \ ModalDialog DLG_MAILMERGE { @@ -135,14 +135,14 @@ ModalDialog DLG_MAILMERGE Size = MAP_APPFONT ( 156 , 8 ) ; Text [ en-US ] = "Save merged document" ; }; - RadioButton RB_SAVE_SINGLE_DOC + RadioButton RB_SAVE_SINGLE_DOC { Pos = MAP_APPFONT ( 150, 139 ) ; Size = MAP_APPFONT ( 150 , 10 ) ; TabStop = TRUE ; Text [ en-US ] = "S~ave as single document"; }; - RadioButton RB_SAVE_INDIVIDUAL + RadioButton RB_SAVE_INDIVIDUAL { Pos = MAP_APPFONT ( 150, 152 ) ; Size = MAP_APPFONT ( 150 , 10 ) ; @@ -300,7 +300,7 @@ ModalDialog DLG_MAILMERGE Size = MAP_APPFONT ( 162 , 8 ) ; Text [ en-US ] = "Output" ; }; - FixedLine FL_BOTTOM_SEPARATOR + FixedLine FL_BOTTOM_SEPARATOR { Pos = MAP_APPFONT ( 0, 232 ) ; Size = MAP_APPFONT ( 312 , 8 ) ; diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx index c5d7c150d9ee..b8e9fe348e0b 100644 --- a/sw/source/ui/envelp/swuilabimp.hxx +++ b/sw/source/ui/envelp/swuilabimp.hxx @@ -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 @@ -33,32 +33,32 @@ class SwLabPage : public SfxTabPage { SwNewDBMgr* pNewDBMgr; String sActDBName; - SwLabItem aItem; + SwLabItem aItem; - FixedText aWritingText; - CheckBox aAddrBox; + FixedText aWritingText; + CheckBox aAddrBox; MultiLineEdit aWritingEdit; - FixedText aDatabaseFT; - ListBox aDatabaseLB; - FixedText aTableFT; - ListBox aTableLB; + FixedText aDatabaseFT; + ListBox aDatabaseLB; + FixedText aTableFT; + ListBox aTableLB; ImageButton aInsertBT; - FixedText aDBFieldFT; - ListBox aDBFieldLB; -// PushButton aDatabaseButton; + FixedText aDBFieldFT; + ListBox aDBFieldLB; +// PushButton aDatabaseButton; FixedLine aWritingFL; RadioButton aContButton; RadioButton aSheetButton; - FixedText aMakeText; - ListBox aMakeBox; - FixedText aTypeText; - ListBox aTypeBox; + FixedText aMakeText; + ListBox aMakeBox; + FixedText aTypeText; + ListBox aTypeBox; ListBox aHiddenSortTypeBox; FixedInfo aFormatInfo; FixedLine aFormatFL; - sal_Bool m_bLabel; + sal_Bool m_bLabel; SwLabPage(Window* pParent, const SfxItemSet& rSet); ~SwLabPage(); @@ -71,7 +71,7 @@ class SwLabPage : public SfxTabPage DECL_LINK( MakeHdl, ListBox * ); DECL_LINK( TypeHdl, ListBox * ); - void DisplayFormat (); + void DisplayFormat (); SwLabRec* GetSelectedEntryPos(); using TabPage::ActivatePage; @@ -90,7 +90,7 @@ public: SwLabDlg* GetParent() {return (SwLabDlg*) SfxTabPage::GetParent()->GetParent();} - void SetToBusinessCard(); + void SetToBusinessCard(); void InitDatabaseBox(); inline void SetNewDBMgr(SwNewDBMgr* pDBMgr) { pNewDBMgr = pDBMgr; } @@ -103,33 +103,33 @@ public: class SwOneExampleFrame; class SwVisitingCardPage : public SfxTabPage { - SvTreeListBox aAutoTextLB; - FixedText aAutoTextGroupFT; - ListBox aAutoTextGroupLB; + SvTreeListBox aAutoTextLB; + FixedText aAutoTextGroupFT; + ListBox aAutoTextGroupLB; FixedLine aContentFL; - Window aExampleWIN; + Window aExampleWIN; - String sVisCardGroup; - String sTempURL; + String sVisCardGroup; + String sTempURL; - SwLabItem aLabItem; + SwLabItem aLabItem; - SwOneExampleFrame* pExampleFrame; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > _xAutoText; + SwOneExampleFrame* pExampleFrame; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > _xAutoText; DECL_LINK( AutoTextSelectHdl, void* ); DECL_LINK( FrameControlInitializedHdl, void* ); - void InitFrameControl(); - void UpdateFields(); - - void ClearUserData(); + void InitFrameControl(); + void UpdateFields(); + void ClearUserData(); + using SfxTabPage::SetUserData; - void SetUserData( sal_uInt32 nCnt, + void SetUserData( sal_uInt32 nCnt, const rtl::OUString* pNames, const rtl::OUString* pValues ); @@ -155,35 +155,35 @@ class SwPrivateDataPage : public SfxTabPage { FixedLine aDataFL; - FixedText aNameFT; - Edit aFirstNameED; - Edit aNameED; - Edit aShortCutED; - - FixedText aName2FT; - Edit aFirstName2ED; - Edit aName2ED; - Edit aShortCut2ED; - - FixedText aStreetFT; - Edit aStreetED; - FixedText aZipCityFT; - Edit aZipED; - Edit aCityED; - FixedText aCountryStateFT; - Edit aCountryED; - Edit aStateED; - FixedText aTitleProfessionFT; - Edit aTitleED; - Edit aProfessionED; - FixedText aPhoneFT; - Edit aPhoneED; - Edit aMobilePhoneED; - FixedText aFaxFT; - Edit aFaxED; - FixedText aWWWMailFT; - Edit aHomePageED; - Edit aMailED; + FixedText aNameFT; + Edit aFirstNameED; + Edit aNameED; + Edit aShortCutED; + + FixedText aName2FT; + Edit aFirstName2ED; + Edit aName2ED; + Edit aShortCut2ED; + + FixedText aStreetFT; + Edit aStreetED; + FixedText aZipCityFT; + Edit aZipED; + Edit aCityED; + FixedText aCountryStateFT; + Edit aCountryED; + Edit aStateED; + FixedText aTitleProfessionFT; + Edit aTitleED; + Edit aProfessionED; + FixedText aPhoneFT; + Edit aPhoneED; + Edit aMobilePhoneED; + FixedText aFaxFT; + Edit aFaxED; + FixedText aWWWMailFT; + Edit aHomePageED; + Edit aMailED; SwPrivateDataPage(Window* pParent, const SfxItemSet& rSet); ~SwPrivateDataPage(); @@ -206,34 +206,34 @@ public: class SwBusinessDataPage : public SfxTabPage { FixedLine aDataFL; - FixedText aCompanyFT; - Edit aCompanyED; - FixedText aCompanyExtFT; - Edit aCompanyExtED; - FixedText aSloganFT; - Edit aSloganED; - - FixedText aStreetFT; - Edit aStreetED; - FixedText aZipCityFT; - Edit aZipED; - Edit aCityED; - FixedText aCountryStateFT; - Edit aCountryED; - Edit aStateED; - - FixedText aPositionFT; - Edit aPositionED; - - FixedText aPhoneFT; - Edit aPhoneED; - Edit aMobilePhoneED; - FixedText aFaxFT; - Edit aFaxED; - - FixedText aWWWMailFT; - Edit aHomePageED; - Edit aMailED; + FixedText aCompanyFT; + Edit aCompanyED; + FixedText aCompanyExtFT; + Edit aCompanyExtED; + FixedText aSloganFT; + Edit aSloganED; + + FixedText aStreetFT; + Edit aStreetED; + FixedText aZipCityFT; + Edit aZipED; + Edit aCityED; + FixedText aCountryStateFT; + Edit aCountryED; + Edit aStateED; + + FixedText aPositionFT; + Edit aPositionED; + + FixedText aPhoneFT; + Edit aPhoneED; + Edit aMobilePhoneED; + FixedText aFaxFT; + Edit aFaxED; + + FixedText aWWWMailFT; + Edit aHomePageED; + Edit aMailED; SwBusinessDataPage(Window* pParent, const SfxItemSet& rSet); ~SwBusinessDataPage(); diff --git a/sw/source/ui/envelp/syncbtn.cxx b/sw/source/ui/envelp/syncbtn.cxx index c0e7d2965943..9af664364515 100644 --- a/sw/source/ui/envelp/syncbtn.cxx +++ b/sw/source/ui/envelp/syncbtn.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 @@ -78,7 +78,7 @@ SwSyncBtnDlg::SwSyncBtnDlg( SfxBindings* _pBindings, SfxChildWindow* pChild, Window *pParent) : SfxFloatingWindow(_pBindings, pChild, pParent, SW_RES(DLG_SYNC_BTN)), - aSyncBtn (this, SW_RES(BTN_SYNC )) + aSyncBtn (this, SW_RES(BTN_SYNC )) { FreeResource(); aSyncBtn.SetClickHdl(LINK(this, SwSyncBtnDlg, BtnHdl)); |