include/svx/ctredlin.hxx | 2
include/svx/fmmodel.hxx | 4 -
include/svx/fontlb.hxx | 6 +-
include/svx/svdomeas.hxx | 2
svx/source/dialog/ctredlin.cxx | 9 +--
svx/source/dialog/fontlb.cxx | 6 +-
svx/source/form/fmmodel.cxx | 34 +++++++-------
svx/source/svdraw/svdomeas.cxx | 39 ++++++++---------
sw/UIConfig_swriter.mk | 2
sw/inc/helpid.h | 2
sw/source/ui/config/config.hrc | 1
sw/source/ui/config/mailconfigpage.cxx | 14 ++----
sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui | 17 +++----
sw/uiconfig/swriter/ui/mailconfigpage.ui | 4 +
14 files changed, 67 insertions(+), 75 deletions(-)
New commits:
commit 3c6bd79a2c8d778030562e1cce118c6ca2b6c67c
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Jul 10 15:25:44 2013 +0100
missing dialog title and some minor tweaks
Change-Id: I79a2db0843597f9f1ba2408792d7bc6994e595a0
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 2bc1905..c528f47 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -61,7 +61,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/swriter,\
$(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/abstractdialog \
sw/uiconfig/swriter/ui/asciifilterdialog \
- sw/uiconfig/swriter/ui/authenticationsettingsdialog \
+ sw/uiconfig/swriter/ui/authenticationsettingsdialog \
sw/uiconfig/swriter/ui/autoformattable \
sw/uiconfig/swriter/ui/autotext \
sw/uiconfig/swriter/ui/bibliographyentry \
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index ad7704f..bcbc0e9 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -461,7 +461,6 @@
#define HID_MM_COPYTO
"SW_HID_MM_COPYTO"
#define HID_MM_ADDRESSLIST_HB
"SW_HID_MM_ADDRESSLIST_HB"
#define HID_MM_ADDRESSLIST_TLB
"SW_HID_MM_ADDRESSLIST_TLB"
-#define HID_TP_MAILCONFIG
"SW_HID_TP_MAILCONFIG"
#define HID_MM_TESTACCOUNTSETTINGS
"SW_HID_MM_TESTACCOUNTSETTINGS"
#define HID_MM_TESTACCOUNTSETTINGS_TLB
"SW_HID_MM_TESTACCOUNTSETTINGS_TLB"
#define HID_MM_TESTACCOUNTSETTINGS_HB
"SW_HID_MM_TESTACCOUNTSETTINGS_HB"
@@ -475,7 +474,6 @@
#define HID_MM_SAVEWARNING
"SW_HID_MM_SAVEWARNING"
#define HID_MM_QUERY
"SW_HID_MM_QUERY"
#define HID_MM_SENDWARNING
"SW_HID_MM_SENDWARNING"
-#define HID_MM_SERVERAUTHENTICATION
"SW_HID_MM_SERVERAUTHENTICATION"
#define HID_NID_TBL
"SW_HID_NID_TBL"
#define HID_NID_FRM
"SW_HID_NID_FRM"
diff --git a/sw/source/ui/config/config.hrc b/sw/source/ui/config/config.hrc
index 00d3add..5878018 100644
--- a/sw/source/ui/config/config.hrc
+++ b/sw/source/ui/config/config.hrc
@@ -27,7 +27,6 @@
#define DLG_MM_TESTACCOUNTSETTINGS (RC_CONFIG_BEGIN + 19)
-#define DLG_MM_SERVERAUTHENTICATION (RC_CONFIG_BEGIN + 20)
#define STR_ARR_METRIC (RC_CONFIG_BEGIN + 26)
#define CONFIG_ACT_END STR_ARR_METRIC
diff --git a/sw/source/ui/config/mailconfigpage.cxx
b/sw/source/ui/config/mailconfigpage.cxx
index 95bc42c..c5379dd 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -87,13 +87,13 @@ class SwAuthenticationSettingsDialog : public SfxModalDialog
RadioButton* m_pSeparateAuthenticationRB;
RadioButton* m_pSMTPAfterPOPRB;
- FixedInfo* m_pOutgoingServerFT;
+ FixedText* m_pOutgoingServerFT;
FixedText* m_pUserNameFT;
Edit* m_pUserNameED;
FixedText* m_pOutPasswordFT;
Edit* m_pOutPasswordED;
- FixedInfo* m_pIncomingServerFT;
+ FixedText* m_pIncomingServerFT;
FixedText* m_pServerFT;
Edit* m_pServerED;
FixedText* m_pPortFT;
@@ -136,7 +136,6 @@ SwMailConfigPage::SwMailConfigPage( Window* pParent, const
SfxItemSet& rSet ) :
get(m_pServerAuthenticationPB,"serverauthentication");
get(m_pTestPB,"test");
- //FreeResource();
m_pReplyToCB->SetClickHdl(LINK(this, SwMailConfigPage, ReplyToHdl));
m_pServerAuthenticationPB->SetClickHdl(LINK(this, SwMailConfigPage,
AuthenticationHdl));
m_pTestPB->SetClickHdl(LINK(this, SwMailConfigPage, TestHdl));
@@ -422,12 +421,9 @@ SwMailConfigDlg::~SwMailConfigDlg()
}
SwAuthenticationSettingsDialog::SwAuthenticationSettingsDialog(
- SwMailConfigPage* pParent, SwMailMergeConfigItem& rItem) :
- SfxModalDialog(pParent, "AuthenticationSettingsDialog",
"modules/swriter/ui/authenticationsettingsdialog.ui"),
-#ifdef _MSC_VER
-#pragma warning (default : 4355)
-#endif
- rConfigItem( rItem )
+ SwMailConfigPage* pParent, SwMailMergeConfigItem& rItem)
+ : SfxModalDialog(pParent, "AuthenticationSettingsDialog",
"modules/swriter/ui/authenticationsettingsdialog.ui")
+ , rConfigItem( rItem )
{
get(m_pAuthenticationCB,"authentication");
get(m_pSeparateAuthenticationRB,"seperateauthentication");
diff --git a/sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui
b/sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui
index 7b67cc2..78644cb 100644
--- a/sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui
+++ b/sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui
@@ -9,7 +9,8 @@
</object>
<object class="GtkDialog" id="AuthenticationSettingsDialog">
<property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Server Authentication</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -86,7 +87,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="hexpand">True</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -99,18 +99,17 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="seperateauthentication">
+ <object class="GtkRadioButton" id="seperateauthentication:wrap">
<property name="label" translatable="yes">The outgoing mail
server (SMTP) requires _separate authentication</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="margin_left">12</property>
- <property name="hexpand">True</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
- <property name="group">smtpafterpop</property>
+ <property name="group">smtpafterpop:wrap</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -200,19 +199,17 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="smtpafterpop">
- <property name="label" translatable="yes">The outgoing mail
server uses the same authentication as the _incoming mail server. Enter the
-settings of the incoming mail server.</property>
+ <object class="GtkRadioButton" id="smtpafterpop:wrap">
+ <property name="label" translatable="yes">The outgoing mail
server uses the same authentication as the _incoming mail server</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="margin_left">12</property>
- <property name="hexpand">True</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
- <property name="group">seperateauthentication</property>
+ <property name="group">seperateauthentication:wrap</property>
</object>
<packing>
<property name="left_attach">0</property>
diff --git a/sw/uiconfig/swriter/ui/mailconfigpage.ui
b/sw/uiconfig/swriter/ui/mailconfigpage.ui
index 387a2ca..b57ae14 100644
--- a/sw/uiconfig/swriter/ui/mailconfigpage.ui
+++ b/sw/uiconfig/swriter/ui/mailconfigpage.ui
@@ -10,6 +10,9 @@
<object class="GtkBox" id="MailConfigPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="border_width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
@@ -117,7 +120,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="hexpand">True</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
commit 39f392e41a2c1c856251e886042a30a5089d5200
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Jul 10 10:20:24 2013 +0100
drop some more XubStrings
Change-Id: Ibca2e4a0cfd1b504f87fea1d4e47536c1abd8ac0
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index c88b742..861c050 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -74,7 +74,7 @@ private:
Color aPrivColor;
public:
- SvLBoxColorString( SvTreeListEntry*,sal_uInt16
nFlags,const XubString& rStr,
+ SvLBoxColorString( SvTreeListEntry*, sal_uInt16 nFlags,
const OUString& rStr,
const Color& rCol);
SvLBoxColorString();
~SvLBoxColorString();
diff --git a/include/svx/fmmodel.hxx b/include/svx/fmmodel.hxx
index 980f2a5..0d0fe0b 100644
--- a/include/svx/fmmodel.hxx
+++ b/include/svx/fmmodel.hxx
@@ -49,9 +49,9 @@ public:
TYPEINFO();
FmFormModel(SfxItemPool* pPool=NULL, SfxObjectShell* pPers=NULL );
- FmFormModel(const XubString& rPath, SfxItemPool* pPool=NULL,
+ FmFormModel(const OUString& rPath, SfxItemPool* pPool=NULL,
SfxObjectShell* pPers=NULL );
- FmFormModel(const XubString& rPath, SfxItemPool* pPool, SfxObjectShell*
pPers,
+ FmFormModel(const OUString& rPath, SfxItemPool* pPool, SfxObjectShell*
pPers,
bool bUseExtColorTable);
virtual ~FmFormModel();
diff --git a/include/svx/fontlb.hxx b/include/svx/fontlb.hxx
index b45ed08..5d9cc80 100644
--- a/include/svx/fontlb.hxx
+++ b/include/svx/fontlb.hxx
@@ -39,7 +39,7 @@ public:
SvLBoxFontString(
SvTreeListEntry* pEntry,
sal_uInt16 nFlags,
- const XubString& rString,
+ const OUString& rString,
const Font& rFont,
const Color* pColor = NULL );
@@ -83,9 +83,9 @@ public:
void SetNoSelection();
/** Returns the position of the entry currently selected or LIST_APPEND. */
- sal_uLong GetSelectEntryPos() const;
+ sal_uLong GetSelectEntryPos() const;
/** Returns the text of the selected entry or an empty string. */
- XubString GetSelectEntry() const;
+ OUString GetSelectEntry() const;
protected:
/** Initializes a new SvLBoxFontString entry.
diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx
index 8076635..ad3e737 100644
--- a/include/svx/svdomeas.hxx
+++ b/include/svx/svdomeas.hxx
@@ -73,7 +73,7 @@ protected:
protected:
void ImpTakeAttr(ImpMeasureRec& rRec) const;
- void TakeRepresentation( XubString& rStr, SdrMeasureFieldKind
eMeasureFieldKind ) const;
+ OUString TakeRepresentation(SdrMeasureFieldKind eMeasureFieldKind) const;
void ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly& rPol)
const;
basegfx::B2DPolyPolygon ImpCalcXPoly(const ImpMeasurePoly& rPol) const;
void ImpEvalDrag(ImpMeasureRec& rRec, const SdrDragStat& rDrag) const;
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index e084b04..d6c2a92 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -63,7 +63,7 @@ RedlinData::~RedlinData()
//----------------------------------------------------------------------------
SvxRedlinEntry::SvxRedlinEntry()
- :SvTreeListEntry()
+ : SvTreeListEntry()
{
}
@@ -77,10 +77,9 @@ SvxRedlinEntry::~SvxRedlinEntry()
DBG_NAME(SvLBoxColorString);
-SvLBoxColorString::SvLBoxColorString( SvTreeListEntry*pEntry,sal_uInt16
nFlags,const XubString& rStr,
- const Color& rCol)
-
-: SvLBoxString( pEntry, nFlags, rStr )
+SvLBoxColorString::SvLBoxColorString(SvTreeListEntry*pEntry, sal_uInt16
nFlags, const OUString& rStr,
+ const Color& rCol)
+ : SvLBoxString(pEntry, nFlags, rStr)
{
DBG_CTOR(SvLBoxColorString,0);
aPrivColor=rCol;
diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx
index f5a4d32..a778744 100644
--- a/svx/source/dialog/fontlb.cxx
+++ b/svx/source/dialog/fontlb.cxx
@@ -34,7 +34,7 @@ SvLBoxFontString::SvLBoxFontString() :
}
SvLBoxFontString::SvLBoxFontString(
- SvTreeListEntry* pEntry, sal_uInt16 nFlags, const XubString& rString,
+ SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString& rString,
const Font& rFont, const Color* pColor ) :
SvLBoxString( pEntry, nFlags, rString ),
maFont( rFont ),
@@ -136,9 +136,9 @@ sal_uLong SvxFontListBox::GetSelectEntryPos() const
return pSvLBoxEntry ? GetModel()->GetAbsPos( pSvLBoxEntry ) : LIST_APPEND;
}
-XubString SvxFontListBox::GetSelectEntry() const
+OUString SvxFontListBox::GetSelectEntry() const
{
- return GetEntryText( GetSelectEntryPos() );
+ return GetEntryText(GetSelectEntryPos());
}
void SvxFontListBox::InitEntry(
diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx
index b84f8b6..434c213 100644
--- a/svx/source/form/fmmodel.cxx
+++ b/svx/source/form/fmmodel.cxx
@@ -59,11 +59,11 @@ struct FmFormModelImplData
|*
\************************************************************************/
FmFormModel::FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers)
- :SdrModel(pPool, pPers, LOADREFCOUNTS)
- ,m_pImpl(NULL)
- ,m_pObjShell(0)
- ,m_bOpenInDesignMode(sal_False)
- ,m_bAutoControlFocus(sal_False)
+ : SdrModel(pPool, pPers, LOADREFCOUNTS)
+ , m_pImpl(NULL)
+ , m_pObjShell(0)
+ , m_bOpenInDesignMode(false)
+ , m_bAutoControlFocus(false)
{
m_pImpl = new FmFormModelImplData;
m_pImpl->pUndoEnv = new FmXUndoEnvironment(*this);
@@ -75,12 +75,12 @@ FmFormModel::FmFormModel(SfxItemPool* pPool,
SfxObjectShell* pPers)
|* Ctor
|*
\************************************************************************/
-FmFormModel::FmFormModel(const XubString& rPath, SfxItemPool* pPool,
SfxObjectShell* pPers)
- :SdrModel(rPath, pPool, pPers)
- ,m_pImpl(NULL)
- ,m_pObjShell(0)
- ,m_bOpenInDesignMode(sal_False)
- ,m_bAutoControlFocus(sal_False)
+FmFormModel::FmFormModel(const OUString& rPath, SfxItemPool* pPool,
SfxObjectShell* pPers)
+ : SdrModel(rPath, pPool, pPers)
+ , m_pImpl(NULL)
+ , m_pObjShell(0)
+ , m_bOpenInDesignMode(false)
+ , m_bAutoControlFocus(false)
{
m_pImpl = new FmFormModelImplData;
m_pImpl->pUndoEnv = new FmXUndoEnvironment(*this);
@@ -92,13 +92,13 @@ FmFormModel::FmFormModel(const XubString& rPath,
SfxItemPool* pPool, SfxObjectSh
|* Ctor
|*
\************************************************************************/
-FmFormModel::FmFormModel(const XubString& rPath, SfxItemPool* pPool,
SfxObjectShell* pPers,
+FmFormModel::FmFormModel(const OUString& rPath, SfxItemPool* pPool,
SfxObjectShell* pPers,
bool bUseExtColorTable)
- :SdrModel(rPath, pPool, pPers, bUseExtColorTable, LOADREFCOUNTS)
- ,m_pImpl( NULL )
- ,m_pObjShell(0)
- ,m_bOpenInDesignMode(sal_False)
- ,m_bAutoControlFocus(sal_False)
+ : SdrModel(rPath, pPool, pPers, bUseExtColorTable, LOADREFCOUNTS)
+ , m_pImpl(NULL)
+ , m_pObjShell(0)
+ , m_bOpenInDesignMode(false)
+ , m_bAutoControlFocus(false)
{
m_pImpl = new FmFormModelImplData;
m_pImpl->pUndoEnv = new FmXUndoEnvironment(*this);
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index 7b3c34c..d6077cc 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -78,9 +78,9 @@
SdrMeasureObjGeoData::SdrMeasureObjGeoData() {}
SdrMeasureObjGeoData::~SdrMeasureObjGeoData() {}
-void SdrMeasureObj::TakeRepresentation( XubString& rStr, SdrMeasureFieldKind
eMeasureFieldKind ) const
+OUString SdrMeasureObj::TakeRepresentation(SdrMeasureFieldKind
eMeasureFieldKind) const
{
- rStr.Erase();
+ String aStr;
Fraction aMeasureScale(1, 1);
sal_Bool bTextRota90(sal_False);
sal_Bool bShowUnit(sal_False);
@@ -127,41 +127,41 @@ void SdrMeasureObj::TakeRepresentation( XubString& rStr,
SdrMeasureFieldKind eMe
OUString aTmp;
pModel->TakeMetricStr(nLen, aTmp, true, nNumDigits);
- rStr = aTmp;
+ aStr = aTmp;
if(!aFact.IsValid())
{
- rStr = String();
- rStr += sal_Unicode('?');
+ aStr = String();
+ aStr += sal_Unicode('?');
}
sal_Unicode
cDec(SvtSysLocale().GetLocaleData().getNumDecimalSep()[0]);
- if(rStr.Search(cDec) != STRING_NOTFOUND)
+ if(aStr.Search(cDec) != STRING_NOTFOUND)
{
- xub_StrLen nLen2(rStr.Len() - 1);
+ xub_StrLen nLen2(aStr.Len() - 1);
- while(rStr.GetChar(nLen2) == sal_Unicode('0'))
+ while(aStr.GetChar(nLen2) == sal_Unicode('0'))
{
- rStr.Erase(nLen2);
+ aStr.Erase(nLen2);
nLen2--;
}
- if(rStr.GetChar(nLen2) == cDec)
+ if(aStr.GetChar(nLen2) == cDec)
{
- rStr.Erase(nLen2);
+ aStr.Erase(nLen2);
nLen2--;
}
- if(!rStr.Len())
- rStr += sal_Unicode('0');
+ if(!aStr.Len())
+ aStr += sal_Unicode('0');
}
}
else
{
// if there's no Model ... (e. g. preview in dialog)
- rStr = String();
- rStr.AppendAscii("4711");
+ aStr = String();
+ aStr.AppendAscii("4711");
}
break;
@@ -178,7 +178,7 @@ void SdrMeasureObj::TakeRepresentation( XubString& rStr,
SdrMeasureFieldKind eMe
eMeasureUnit = eModUIUnit;
if(bShowUnit)
- pModel->TakeUnitStr(eMeasureUnit, rStr);
+ pModel->TakeUnitStr(eMeasureUnit, aStr);
}
}
@@ -188,13 +188,14 @@ void SdrMeasureObj::TakeRepresentation( XubString& rStr,
SdrMeasureFieldKind eMe
{
if(bTextRota90)
{
- rStr = String();
- rStr += sal_Unicode(' ');
+ aStr = String();
+ aStr += sal_Unicode(' ');
}
break;
}
}
+ return aStr;
}
//////////////////////////////////////////////////////////////////////////////
@@ -591,7 +592,7 @@ bool SdrMeasureObj::CalcFieldValue(const SvxFieldItem&
rField, sal_Int32 nPara,
const SvxFieldData* pField=rField.GetField();
SdrMeasureField* pMeasureField=PTR_CAST(SdrMeasureField,pField);
if (pMeasureField!=NULL) {
- TakeRepresentation(rRet, pMeasureField->GetMeasureFieldKind());
+ rRet = TakeRepresentation(pMeasureField->GetMeasureFieldKind());
if (rpFldColor!=NULL) {
if (!bEdit)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
