Skip to content

C
core
Kaydet (Commit) 92cda0a9 authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

convert include/sfx2/mgetempl.hxx from String to OUString 

Change-Id: Iaa9e8f22df79a2cd300ce6a89592e38b20613553
üst e8fb35b9
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
include/sfx2/mgetempl.hxx
Dosyayı görüntüle @ 92cda0a9
...@@ -55,13 +55,13 @@ class SfxManageStyleSheetPage : public SfxTabPage ...@@ -55,13 +55,13 @@ class SfxManageStyleSheetPage : public SfxTabPage
SfxStyleSheetBase *pStyle; SfxStyleSheetBase *pStyle;
SfxStyleFamilies *pFamilies; SfxStyleFamilies *pFamilies;
const SfxStyleFamilyItem *pItem; const SfxStyleFamilyItem *pItem;
String aBuf; OUString aBuf;
sal_Bool bModified; sal_Bool bModified;
// initial data for the style // initial data for the style
String aName; OUString aName;
String aFollow; OUString aFollow;
String aParent; OUString aParent;
sal_uInt16 nFlags; sal_uInt16 nFlags;
private: private:
...@@ -70,7 +70,7 @@ friend class SfxStyleDialog; ...@@ -70,7 +70,7 @@ friend class SfxStyleDialog;
DECL_LINK( GetFocusHdl, Edit * ); DECL_LINK( GetFocusHdl, Edit * );
DECL_LINK( LoseFocusHdl, Edit * ); DECL_LINK( LoseFocusHdl, Edit * );
void UpdateName_Impl(ListBox *, const String &rNew); void UpdateName_Impl(ListBox *, const OUString &rNew);
void SetDescriptionText_Impl(); void SetDescriptionText_Impl();
SfxManageStyleSheetPage(Window *pParent, const SfxItemSet &rAttrSet ); SfxManageStyleSheetPage(Window *pParent, const SfxItemSet &rAttrSet );
......
sfx2/source/dialog/mgetempl.cxx
Dosyayı görüntüle @ 92cda0a9
...@@ -246,7 +246,7 @@ SfxManageStyleSheetPage::~SfxManageStyleSheetPage() ...@@ -246,7 +246,7 @@ SfxManageStyleSheetPage::~SfxManageStyleSheetPage()
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
void SfxManageStyleSheetPage::UpdateName_Impl( ListBox* pBox, void SfxManageStyleSheetPage::UpdateName_Impl( ListBox* pBox,
const String& rNew ) const OUString& rNew )
/* [Description] /* [Description]
...@@ -424,7 +424,7 @@ void SfxManageStyleSheetPage::Reset( const SfxItemSet& /*rAttrSet*/ ) ...@@ -424,7 +424,7 @@ void SfxManageStyleSheetPage::Reset( const SfxItemSet& /*rAttrSet*/ )
if ( sCmp != aFollow ) if ( sCmp != aFollow )
pStyle->SetFollow( aFollow ); pStyle->SetFollow( aFollow );
if ( !aFollow.Len() ) if ( aFollow.isEmpty() )
m_pFollowLb->SelectEntry( aName ); m_pFollowLb->SelectEntry( aName );
else else
m_pFollowLb->SelectEntry( aFollow ); m_pFollowLb->SelectEntry( aFollow );
...@@ -437,7 +437,7 @@ void SfxManageStyleSheetPage::Reset( const SfxItemSet& /*rAttrSet*/ ) ...@@ -437,7 +437,7 @@ void SfxManageStyleSheetPage::Reset( const SfxItemSet& /*rAttrSet*/ )
if ( sCmp != aParent ) if ( sCmp != aParent )
pStyle->SetParent( aParent ); pStyle->SetParent( aParent );
if ( !aParent.Len() ) if ( aParent.isEmpty() )
m_pBaseLb->SelectEntry( SfxResId(STR_NONE).toString() ); m_pBaseLb->SelectEntry( SfxResId(STR_NONE).toString() );
else else
m_pBaseLb->SelectEntry( aParent ); m_pBaseLb->SelectEntry( aParent );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment