[Libreoffice-commits] core.git: include/svx svx/source
Caolán McNamara
caolanm at redhat.com
Sun Sep 1 02:36:51 PDT 2013
include/svx/svdoole2.hxx | 2 +-
svx/source/form/filtnav.cxx | 4 ++--
svx/source/items/numfmtsh.cxx | 10 +++++-----
svx/source/items/pageitem.cxx | 6 +++---
svx/source/sdr/contact/viewcontactofgraphic.cxx | 8 ++++----
svx/source/svdraw/svdoole2.cxx | 2 +-
6 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit 5042636bf462ee6839ec6ab467dfe15f775af97f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Sep 1 10:09:54 2013 +0100
XubString->OUString
Change-Id: I2067b78e10e1805bb678879e3fd54636d848b15c
diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx
index 3f3b3d4..af3c0f74 100644
--- a/include/svx/svdoole2.hxx
+++ b/include/svx/svdoole2.hxx
@@ -83,7 +83,7 @@ public:
TYPEINFO();
SdrOle2Obj(bool bFrame_ = false);
- SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, const String& rNewObjName, const Rectangle& rNewRect, bool bFrame_ = false);
+ SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, const OUString& rNewObjName, const Rectangle& rNewRect, bool bFrame_ = false);
virtual ~SdrOle2Obj();
// access to svt::EmbeddedObjectRef
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 7e9218d..1ebc6c2 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -1024,7 +1024,7 @@ void FmFilterModel::EnsureEmptyFilterRows( FmParentData& _rItem )
class FmFilterItemsString : public SvLBoxString
{
public:
- FmFilterItemsString( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const XubString& rStr )
+ FmFilterItemsString( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString& rStr )
:SvLBoxString(pEntry,nFlags,rStr){}
virtual void Paint(const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry);
@@ -1085,7 +1085,7 @@ class FmFilterString : public SvLBoxString
OUString m_aName;
public:
- FmFilterString( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const XubString& rStr, const OUString& aName)
+ FmFilterString( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString& rStr, const OUString& aName)
:SvLBoxString(pEntry,nFlags,rStr)
,m_aName(aName)
{
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index 7a824d2..0c7e03f 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -914,7 +914,7 @@ short SvxNumberFormatShell::FillEListWithUserCurrencys( std::vector<String*>& rL
&pTmpCurrencyEntry,
&bTmpBanking);
- XubString rShortSymbol;
+ OUString rShortSymbol;
if(pCurCurrencyEntry==NULL)
{
@@ -1559,8 +1559,8 @@ void SvxNumberFormatShell::GetCurrencySymbols(std::vector<OUString>& rList, bool
sal_uInt16 nStart=1;
- XubString aString( ApplyLreOrRleEmbedding( rCurrencyTable[0].GetSymbol()));
- aString += sal_Unicode(' ');
+ OUString aString( ApplyLreOrRleEmbedding( rCurrencyTable[0].GetSymbol()));
+ aString += " ";
aString += ApplyLreOrRleEmbedding( pLanguageTable->GetString( rCurrencyTable[0].GetLanguage()));
rList.push_back(aString);
@@ -1577,11 +1577,11 @@ void SvxNumberFormatShell::GetCurrencySymbols(std::vector<OUString>& rList, bool
CollatorWrapper aCollator( ::comphelper::getProcessComponentContext());
aCollator.loadDefaultCollator( Application::GetSettings().GetLanguageTag().getLocale(), 0);
- const String aTwoSpace( RTL_CONSTASCII_USTRINGPARAM( " "));
+ const OUString aTwoSpace(" ");
for(sal_uInt16 i = 1; i < nCount; ++i)
{
- XubString aStr( ApplyLreOrRleEmbedding( rCurrencyTable[i].GetBankSymbol()));
+ OUString aStr( ApplyLreOrRleEmbedding( rCurrencyTable[i].GetBankSymbol()));
aStr += aTwoSpace;
aStr += ApplyLreOrRleEmbedding( rCurrencyTable[i].GetSymbol());
aStr += aTwoSpace;
diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx
index ce4a265..87d5c45 100644
--- a/svx/source/items/pageitem.cxx
+++ b/svx/source/items/pageitem.cxx
@@ -82,7 +82,7 @@ int SvxPageItem::operator==( const SfxPoolItem& rAttr ) const
eUse == rItem.eUse );
}
-inline XubString GetUsageText( const sal_uInt16 eU )
+inline OUString GetUsageText( const sal_uInt16 eU )
{
switch( eU & 0x000f )
{
@@ -90,7 +90,7 @@ inline XubString GetUsageText( const sal_uInt16 eU )
case SVX_PAGE_RIGHT : return SVX_RESSTR(RID_SVXITEMS_PAGE_USAGE_RIGHT);
case SVX_PAGE_ALL : return SVX_RESSTR(RID_SVXITEMS_PAGE_USAGE_ALL);
case SVX_PAGE_MIRROR: return SVX_RESSTR(RID_SVXITEMS_PAGE_USAGE_MIRROR);
- default: return String();
+ default: return OUString();
}
}
@@ -243,7 +243,7 @@ SfxPoolItem* SvxPageItem::Create( SvStream& rStream, sal_uInt16 ) const
sal_uInt16 nUse;
// UNICODE: rStream >> sStr;
- XubString sStr = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
+ OUString sStr = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
rStream >> eType;
rStream >> bLand;
diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx
index 05e709d..0a1061a 100644
--- a/svx/source/sdr/contact/viewcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx
@@ -232,15 +232,15 @@ namespace sdr
}
// Build the text for the draft object
- XubString aDraftText = GetGrafObject().GetFileName();
+ OUString aDraftText = GetGrafObject().GetFileName();
- if(!aDraftText.Len())
+ if (aDraftText.isEmpty())
{
aDraftText = GetGrafObject().GetName();
- aDraftText.AppendAscii(" ...");
+ aDraftText += " ...";
}
- if(aDraftText.Len() && GetGrafObject().GetModel())
+ if (!aDraftText.isEmpty() && GetGrafObject().GetModel())
{
// #i103255# Goal is to produce TextPrimitives which hold the given text as
// BlockText in the available space. It would be very tricky to do
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index e8ea094..82389c4 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -752,7 +752,7 @@ SdrOle2Obj::SdrOle2Obj(bool bFrame_) : m_bTypeAsked(false)
// -----------------------------------------------------------------------------
-SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const XubString& rNewObjName, const Rectangle& rNewRect, bool bFrame_)
+SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const OUString& rNewObjName, const Rectangle& rNewRect, bool bFrame_)
: SdrRectObj(rNewRect)
, xObjRef( rNewObjRef )
, m_bTypeAsked(false)
More information about the Libreoffice-commits
mailing list