summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2013-10-10 11:51:22 +0200
committerThomas Arnhold <thomas@arnhold.org>2013-10-10 17:58:31 +0000
commit39022b8b7de60b139a9d21991ae10593e1829e43 (patch)
tree8259c20ef49792b4356934d95ed75108e1e34a0b
parentc18dc12f292a504b0a6f3d402cbfee77d64a40af (diff)
little String to OUString + documentation
Change-Id: I982e44150fd2909da0571409f16051d79377d7a3 Reviewed-on: https://gerrit.libreoffice.org/6192 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
-rw-r--r--basic/source/comp/sbcomp.cxx2
-rw-r--r--desktop/source/app/cmdlinehelp.cxx4
-rw-r--r--sdext/source/presenter/PresenterTheme.hxx2
3 files changed, 3 insertions, 5 deletions
diff --git a/basic/source/comp/sbcomp.cxx b/basic/source/comp/sbcomp.cxx
index e4d95f1dfb85..fe7d7e61a643 100644
--- a/basic/source/comp/sbcomp.cxx
+++ b/basic/source/comp/sbcomp.cxx
@@ -281,7 +281,7 @@ static OString lcl_toOStringSkipLeadingWhites( const OUString& aStr )
return aORetStr;
}
-String lcl_dumpMethodParameters( SbMethod* pMethod )
+OUString lcl_dumpMethodParameters( SbMethod* pMethod )
{
OUString aStr;
if( pMethod == NULL )
diff --git a/desktop/source/app/cmdlinehelp.cxx b/desktop/source/app/cmdlinehelp.cxx
index 119f9737fd5d..8311c5d494d9 100644
--- a/desktop/source/app/cmdlinehelp.cxx
+++ b/desktop/source/app/cmdlinehelp.cxx
@@ -167,9 +167,7 @@ namespace desktop
#else
// rest gets a dialog box
CmdlineHelpDialog aDlg;
- String head = aHelpMessage_version;
- head.Append(aHelpMessage_head);
- aDlg.m_pftHead->SetText(head);
+ aDlg.m_pftHead->SetText(aHelpMessage_version + aHelpMessage_head);
aDlg.m_pftLeft->SetText(aHelpMessage_left);
aDlg.m_pftRight->SetText(aHelpMessage_right);
aDlg.m_pftBottom->SetText(aHelpMessage_bottom);
diff --git a/sdext/source/presenter/PresenterTheme.hxx b/sdext/source/presenter/PresenterTheme.hxx
index 45bb5da01b46..24a2c4aeb919 100644
--- a/sdext/source/presenter/PresenterTheme.hxx
+++ b/sdext/source/presenter/PresenterTheme.hxx
@@ -47,7 +47,7 @@ namespace sdext { namespace presenter {
Example: you want to access the top left bitmap of a pane border
(simplified code):
- String sStyleName = getPropertyValue("private:resource/pane/Presenter/Pane1");
+ OUString sStyleName = getPropertyValue("private:resource/pane/Presenter/Pane1");
XBitmap xBitmap = getPropertyValue(sStyleName + "_TopLeftBitmap");
For the offset of the bitmap you can call