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

convert sfx2/source/view/impviewframe.hxx from String to OUString

Change-Id: I4b6be16e7355303f653228d3f97ba7903db02cb2
üst eeac8047
...@@ -33,7 +33,7 @@ struct SfxViewFrame_Impl ...@@ -33,7 +33,7 @@ struct SfxViewFrame_Impl
Size aMargin; Size aMargin;
Size aSize; Size aSize;
TypeId aLastType; TypeId aLastType;
String aActualURL; OUString aActualURL;
SfxFrame& rFrame; SfxFrame& rFrame;
svtools::AsynchronLink* pReloader; svtools::AsynchronLink* pReloader;
Window* pWindow; Window* pWindow;
...@@ -50,7 +50,7 @@ struct SfxViewFrame_Impl ...@@ -50,7 +50,7 @@ struct SfxViewFrame_Impl
sal_Bool bEnabled:1; sal_Bool bEnabled:1;
sal_Bool bWindowWasEnabled:1; sal_Bool bWindowWasEnabled:1;
sal_Bool bActive; sal_Bool bActive;
String aFactoryName; OUString aFactoryName;
::boost::optional< bool > ::boost::optional< bool >
aHasToolPanels; aHasToolPanels;
......
...@@ -211,7 +211,7 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq ) ...@@ -211,7 +211,7 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq )
String aFactName; String aFactName;
if ( pFactoryItem ) if ( pFactoryItem )
aFactName = pFactoryItem->GetValue(); aFactName = pFactoryItem->GetValue();
else if ( pImp->aFactoryName.Len() ) else if ( !pImp->aFactoryName.isEmpty() )
aFactName = pImp->aFactoryName; aFactName = pImp->aFactoryName;
else else
{ {
...@@ -295,7 +295,7 @@ void SfxViewFrame::GetState_Impl( SfxItemSet &rSet ) ...@@ -295,7 +295,7 @@ void SfxViewFrame::GetState_Impl( SfxItemSet &rSet )
{ {
case SID_NEWDOCDIRECT : case SID_NEWDOCDIRECT :
{ {
if ( pImp->aFactoryName.Len() ) if ( !pImp->aFactoryName.isEmpty() )
{ {
String aFact = OUString("private:factory/"); String aFact = OUString("private:factory/");
aFact += pImp->aFactoryName; aFact += pImp->aFactoryName;
......
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