Kaydet (Commit) 9909daaa authored tarafından Noel Grandin's avatar Noel Grandin

convert sc/source/ui/inc/viewutil.hxx from String to OUString

Change-Id: Ic7bc275a80bcbb6dd6b25eaaec2b8cebac90e822
üst 0ddb8a1c
...@@ -214,7 +214,7 @@ void ScDrawTextObjectBar::Execute( SfxRequest &rReq ) ...@@ -214,7 +214,7 @@ void ScDrawTextObjectBar::Execute( SfxRequest &rReq )
const SvxFontItem& rItem = (const SvxFontItem&) const SvxFontItem& rItem = (const SvxFontItem&)
pOutView->GetAttribs().Get(EE_CHAR_FONTINFO); pOutView->GetAttribs().Get(EE_CHAR_FONTINFO);
String aString; OUString aString;
SvxFontItem aNewItem( EE_CHAR_FONTINFO ); SvxFontItem aNewItem( EE_CHAR_FONTINFO );
const SfxItemSet *pArgs = rReq.GetArgs(); const SfxItemSet *pArgs = rReq.GetArgs();
...@@ -242,7 +242,7 @@ void ScDrawTextObjectBar::Execute( SfxRequest &rReq ) ...@@ -242,7 +242,7 @@ void ScDrawTextObjectBar::Execute( SfxRequest &rReq )
else else
ScViewUtil::ExecuteCharMap( rItem, *pViewData->GetViewShell()->GetViewFrame(), aNewItem, aString ); ScViewUtil::ExecuteCharMap( rItem, *pViewData->GetViewShell()->GetViewFrame(), aNewItem, aString );
if ( aString.Len() ) if ( !aString.isEmpty() )
{ {
SfxItemSet aSet( pOutliner->GetEmptyItemSet() ); SfxItemSet aSet( pOutliner->GetEmptyItemSet() );
aSet.Put( aNewItem ); aSet.Put( aNewItem );
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include <tools/solar.h> #include <tools/solar.h>
#include <sal/types.h> #include <sal/types.h>
class String;
class SfxItemSet; class SfxItemSet;
class SfxBindings; class SfxBindings;
class SvxFontItem; class SvxFontItem;
...@@ -47,7 +46,7 @@ public: ...@@ -47,7 +46,7 @@ public:
static sal_Bool ExecuteCharMap( const SvxFontItem& rOldFont, static sal_Bool ExecuteCharMap( const SvxFontItem& rOldFont,
SfxViewFrame& rFrame, SfxViewFrame& rFrame,
SvxFontItem& rNewFont, SvxFontItem& rNewFont,
String& rString ); OUString& rString );
static sal_Bool IsActionShown( const ScChangeAction& rAction, static sal_Bool IsActionShown( const ScChangeAction& rAction,
const ScChangeViewSettings& rSettings, const ScChangeViewSettings& rSettings,
......
...@@ -338,7 +338,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) ...@@ -338,7 +338,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
const SvxFontItem& rItem = (const SvxFontItem&) const SvxFontItem& rItem = (const SvxFontItem&)
pTableView->GetAttribs().Get(nFontWhich); pTableView->GetAttribs().Get(nFontWhich);
String aString; OUString aString;
SvxFontItem aNewItem( EE_CHAR_FONTINFO ); SvxFontItem aNewItem( EE_CHAR_FONTINFO );
const SfxItemSet *pArgs = rReq.GetArgs(); const SfxItemSet *pArgs = rReq.GetArgs();
...@@ -372,7 +372,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) ...@@ -372,7 +372,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
return; return;
} }
if ( aString.Len() ) if ( !aString.isEmpty() )
{ {
// if string contains WEAK characters, set all fonts // if string contains WEAK characters, set all fonts
sal_uInt8 nSetScript; sal_uInt8 nSetScript;
......
...@@ -342,7 +342,7 @@ void ScViewUtil::HideDisabledSlot( SfxItemSet& rSet, SfxBindings& rBindings, sal ...@@ -342,7 +342,7 @@ void ScViewUtil::HideDisabledSlot( SfxItemSet& rSet, SfxBindings& rBindings, sal
sal_Bool ScViewUtil::ExecuteCharMap( const SvxFontItem& rOldFont, sal_Bool ScViewUtil::ExecuteCharMap( const SvxFontItem& rOldFont,
SfxViewFrame& rFrame, SfxViewFrame& rFrame,
SvxFontItem& rNewFont, SvxFontItem& rNewFont,
String& rString ) OUString& rString )
{ {
sal_Bool bRet = false; sal_Bool bRet = false;
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
......
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