diff options
-rw-r--r-- | sfx2/source/view/impviewframe.hxx | 4 | ||||
-rw-r--r-- | sfx2/source/view/viewfrm2.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sfx2/source/view/impviewframe.hxx b/sfx2/source/view/impviewframe.hxx index c3acee2b1b37..8eee2a344c02 100644 --- a/sfx2/source/view/impviewframe.hxx +++ b/sfx2/source/view/impviewframe.hxx @@ -33,7 +33,7 @@ struct SfxViewFrame_Impl Size aMargin; Size aSize; TypeId aLastType; - String aActualURL; + OUString aActualURL; SfxFrame& rFrame; svtools::AsynchronLink* pReloader; Window* pWindow; @@ -50,7 +50,7 @@ struct SfxViewFrame_Impl sal_Bool bEnabled:1; sal_Bool bWindowWasEnabled:1; sal_Bool bActive; - String aFactoryName; + OUString aFactoryName; ::boost::optional< bool > aHasToolPanels; diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx index 7eb0c2854781..0614a75ff72d 100644 --- a/sfx2/source/view/viewfrm2.cxx +++ b/sfx2/source/view/viewfrm2.cxx @@ -211,7 +211,7 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq ) String aFactName; if ( pFactoryItem ) aFactName = pFactoryItem->GetValue(); - else if ( pImp->aFactoryName.Len() ) + else if ( !pImp->aFactoryName.isEmpty() ) aFactName = pImp->aFactoryName; else { @@ -295,7 +295,7 @@ void SfxViewFrame::GetState_Impl( SfxItemSet &rSet ) { case SID_NEWDOCDIRECT : { - if ( pImp->aFactoryName.Len() ) + if ( !pImp->aFactoryName.isEmpty() ) { String aFact = OUString("private:factory/"); aFact += pImp->aFactoryName; |