summaryrefslogtreecommitdiff
path: root/sc/inc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-08-29 20:44:22 +0100
committerCaolán McNamara <caolanm@redhat.com>2013-08-30 11:39:01 +0100
commit74929bba736cc6cceed3c088e13f5952abb1bd2b (patch)
tree8a026d95bc586ca6a41686dee32dfa53b659b252 /sc/inc
parentfc7e7b683112e9ccd23104f38d4acc3417e9d5b8 (diff)
Related: fdo#38838 remove UniString::ToUpperAscii
things got a little out of hand and I ended up converting quite a bit of calc to OUString Change-Id: I056326d37ffefa8c120cb2e564d166dd9f20f216
Diffstat (limited to 'sc/inc')
-rw-r--r--sc/inc/address.hxx17
-rw-r--r--sc/inc/rangeseq.hxx2
2 files changed, 7 insertions, 12 deletions
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index 2a38827c231e..e998de0f51e4 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -293,9 +293,7 @@ public:
const ::com::sun::star::uno::Sequence<
const ::com::sun::star::sheet::ExternalLinkInfo > * pExternalLinks = NULL );
- SC_DLLPUBLIC void Format( OUString&, sal_uInt16 = 0, const ScDocument* = NULL,
- const Details& rDetails = detailsOOOa1) const;
- SC_DLLPUBLIC void Format( String&, sal_uInt16 = 0, const ScDocument* = NULL,
+ SC_DLLPUBLIC OUString Format( sal_uInt16 = 0, const ScDocument* = NULL,
const Details& rDetails = detailsOOOa1) const;
// The document for the maximum defined sheet number
@@ -494,11 +492,8 @@ public:
const ::com::sun::star::uno::Sequence<
const ::com::sun::star::sheet::ExternalLinkInfo > * pExternalLinks = NULL );
- SC_DLLPUBLIC void Format( String&, sal_uInt16 = 0, const ScDocument* = NULL,
- const ScAddress::Details& rDetails = ScAddress::detailsOOOa1 ) const;
-
- SC_DLLPUBLIC void Format( OUString&, sal_uInt16 = 0, const ScDocument* = NULL,
- const ScAddress::Details& rDetails = ScAddress::detailsOOOa1 ) const;
+ SC_DLLPUBLIC OUString Format(sal_uInt16 = 0, const ScDocument* = NULL,
+ const ScAddress::Details& rDetails = ScAddress::detailsOOOa1) const;
inline void GetVars( SCCOL& nCol1, SCROW& nRow1, SCTAB& nTab1,
SCCOL& nCol2, SCROW& nRow2, SCTAB& nTab2 ) const;
@@ -785,14 +780,14 @@ bool ConvertDoubleRef(ScDocument* pDoc, const String& rRefString,
/// append alpha representation of column to buffer
SC_DLLPUBLIC void ScColToAlpha( OUStringBuffer& rBuffer, SCCOL nCol);
-inline void ScColToAlpha( String& rStr, SCCOL nCol)
+inline void ScColToAlpha( OUString& rStr, SCCOL nCol)
{
OUStringBuffer aBuf(2);
ScColToAlpha( aBuf, nCol);
- rStr.Append( aBuf.getStr(), static_cast<xub_StrLen>(aBuf.getLength()));
+ rStr += aBuf.makeStringAndClear();
}
-inline String ScColToAlpha( SCCOL nCol )
+inline OUString ScColToAlpha( SCCOL nCol )
{
OUStringBuffer aBuf(2);
ScColToAlpha( aBuf, nCol);
diff --git a/sc/inc/rangeseq.hxx b/sc/inc/rangeseq.hxx
index b13233d2705d..64e9f6cfb995 100644
--- a/sc/inc/rangeseq.hxx
+++ b/sc/inc/rangeseq.hxx
@@ -98,7 +98,7 @@ class ScByteSequenceToString
public:
// rAny must contain Sequence<sal_Int8>,
// may or may not contain 0-bytes at the end
- static sal_Bool GetString( String& rString, const com::sun::star::uno::Any& rAny,
+ static sal_Bool GetString( OUString& rString, const com::sun::star::uno::Any& rAny,
sal_uInt16 nEncoding );
};