mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert include/svx/XPropertyEntry.hxx from String to OUString

Browse Source 
Change-Id: Ie112b2e8af32eba60f67f767dd6a098980d907b4
This commit is contained in:
Noel Grandin
2013-09-03 16:08:30 +02:00
parent 10cbf4838e
commit a5c9304179
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/svx/XPropertyEntry.hxx
View File

@@ -28,18 +28,18 @@
class SVX_DLLPUBLIC XPropertyEntry class SVX_DLLPUBLIC XPropertyEntry
{ {
private: private:
String maName; OUString maName;
Bitmap maUiBitmap; Bitmap maUiBitmap;
protected: protected:
XPropertyEntry(const String& rName); XPropertyEntry(const OUString& rName);
XPropertyEntry(const XPropertyEntry& rOther); XPropertyEntry(const XPropertyEntry& rOther);
public: public:
virtual ~XPropertyEntry(); virtual ~XPropertyEntry();
void SetName(const String& rName) { maName = rName; } void SetName(const OUString& rName) { maName = rName; }
const String& GetName() const { return maName; } const OUString& GetName() const { return maName; }
void SetUiBitmap(const Bitmap& rUiBitmap) { maUiBitmap = rUiBitmap; } void SetUiBitmap(const Bitmap& rUiBitmap) { maUiBitmap = rUiBitmap; }
const Bitmap& GetUiBitmap() const { return maUiBitmap; } const Bitmap& GetUiBitmap() const { return maUiBitmap; }
}; };

2
svx/source/sidebar/line/LinePropertyPanel.cxx
View File

@@ -725,7 +725,7 @@ IMPL_LINK_NOARG(LinePropertyPanel, ChangeLineStyleHdl)
const XDashEntry* pDashEntry = mxLineStyleList->GetDash(nPos - 2); const XDashEntry* pDashEntry = mxLineStyleList->GetDash(nPos - 2);
OSL_ENSURE(pDashEntry, "OOps, got empty XDash from XDashList (!)"); OSL_ENSURE(pDashEntry, "OOps, got empty XDash from XDashList (!)");
const XLineDashItem aItemB( const XLineDashItem aItemB(
pDashEntry ? pDashEntry->GetName() : String(), pDashEntry ? pDashEntry->GetName() : OUString(),
pDashEntry ? pDashEntry->GetDash() : XDash()); pDashEntry ? pDashEntry->GetDash() : XDash());
GetBindings()->GetDispatcher()->Execute(SID_ATTR_LINE_STYLE, SFX_CALLMODE_RECORD, &aItemA, 0L); GetBindings()->GetDispatcher()->Execute(SID_ATTR_LINE_STYLE, SFX_CALLMODE_RECORD, &aItemA, 0L);

2
svx/source/xoutdev/XPropertyEntry.cxx
View File

@@ -19,7 +19,7 @@
#include <svx/XPropertyEntry.hxx> #include <svx/XPropertyEntry.hxx>
XPropertyEntry::XPropertyEntry(const String& rName) XPropertyEntry::XPropertyEntry(const OUString& rName)
: maName(rName), : maName(rName),
maUiBitmap() maUiBitmap()
{ {

2
svx/source/xoutdev/xattr.cxx
View File

@@ -220,7 +220,7 @@ OUString NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_u
} }
else else
{ {
sal_Int32 nThisIndex = pEntry->GetName().Copy( aUser.Len() ).ToInt32(); sal_Int32 nThisIndex = pEntry->GetName().copy( aUser.Len() ).toInt32();
if( nThisIndex >= nUserIndex ) if( nThisIndex >= nUserIndex )
nUserIndex = nThisIndex + 1; nUserIndex = nThisIndex + 1;
} }