diff options
| -rw-r--r-- | sc/inc/editutil.hxx | 12 | ||||
| -rw-r--r-- | sc/source/core/tool/editutil.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/view/prevwsh.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/view/printfun.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/view/tabvwsh4.cxx | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx index bf296c067821..2d3d4ce36cc2 100644 --- a/sc/inc/editutil.hxx +++ b/sc/inc/editutil.hxx @@ -167,10 +167,10 @@ public: /// Overwritten method to be able to apply defaults already set void SetText( const OUString& rText ); /// Current defaults are not applied, new defaults are applied - void SetTextNewDefaults( const String& rText, + void SetTextNewDefaults( const OUString& rText, const SfxItemSet& rDefaults, sal_Bool bRememberCopy = sal_True ); /// Current defaults are not applied, new defaults are applied - void SetTextNewDefaults( const String& rText, + void SetTextNewDefaults( const OUString& rText, SfxItemSet* pDefaults, sal_Bool bTakeOwnership = sal_True ); /// Paragraph attributes that are not defaults are copied to @@ -198,10 +198,10 @@ public: struct ScHeaderFieldData { - String aTitle; // title or file name (if no title) - String aLongDocName; // path and file name - String aShortDocName; // pure file name - String aTabName; + OUString aTitle; // title or file name (if no title) + OUString aLongDocName; // path and file name + OUString aShortDocName; // pure file name + OUString aTabName; Date aDate; Time aTime; long nPageNo; diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx index 563e91a147f2..7afa142f52d4 100644 --- a/sc/source/core/tool/editutil.cxx +++ b/sc/source/core/tool/editutil.cxx @@ -587,7 +587,7 @@ void ScEditEngineDefaulter::SetText( const OUString& rText ) SetUpdateMode( sal_True ); } -void ScEditEngineDefaulter::SetTextNewDefaults( const String& rText, +void ScEditEngineDefaulter::SetTextNewDefaults( const OUString& rText, const SfxItemSet& rSet, sal_Bool bRememberCopy ) { sal_Bool bUpdateMode = GetUpdateMode(); @@ -599,7 +599,7 @@ void ScEditEngineDefaulter::SetTextNewDefaults( const String& rText, SetUpdateMode( sal_True ); } -void ScEditEngineDefaulter::SetTextNewDefaults( const String& rText, +void ScEditEngineDefaulter::SetTextNewDefaults( const OUString& rText, SfxItemSet* pSet, sal_Bool bTakeOwnership ) { sal_Bool bUpdateMode = GetUpdateMode(); diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index b3f725a25189..da931900baac 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -907,7 +907,7 @@ void ScPreviewShell::FillFieldData( ScHeaderFieldData& rData ) const INetURLObject& rURLObj = pDocShell->GetMedium()->GetURLObject(); rData.aLongDocName = rURLObj.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ); - if ( rData.aLongDocName.Len() ) + if ( !rData.aLongDocName.isEmpty() ) rData.aShortDocName = rURLObj.GetName( INetURLObject::DECODE_UNAMBIGUOUS ); else rData.aShortDocName = rData.aLongDocName = rData.aTitle; diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index 388f08d7dcdc..93488e1a094f 100644 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.cxx @@ -1033,7 +1033,7 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) const INetURLObject& rURLObj = pDocShell->GetMedium()->GetURLObject(); aFieldData.aLongDocName = rURLObj.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ); - if ( aFieldData.aLongDocName.Len() ) + if ( !aFieldData.aLongDocName.isEmpty() ) aFieldData.aShortDocName = rURLObj.GetName( INetURLObject::DECODE_UNAMBIGUOUS ); else aFieldData.aShortDocName = aFieldData.aLongDocName = aFieldData.aTitle; diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 053f887f9576..aed5251ab522 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -1792,7 +1792,7 @@ void ScTabViewShell::FillFieldData( ScHeaderFieldData& rData ) const INetURLObject& rURLObj = pDocShell->GetMedium()->GetURLObject(); rData.aLongDocName = rURLObj.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ); - if ( rData.aLongDocName.Len() ) + if ( !rData.aLongDocName.isEmpty() ) rData.aShortDocName = rURLObj.GetName( INetURLObject::DECODE_UNAMBIGUOUS ); else rData.aShortDocName = rData.aLongDocName = rData.aTitle; |