diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-12-05 18:06:04 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-12-05 18:11:09 +0200 |
| commit | a0a903892ca93615c1460cebbfbac579999233f2 (patch) | |
| tree | d3ad382b8db2a5a78be1291c444cee5c89eeb987 /winaccessibility/source | |
| parent | 2ad141be95c9e8d60c874b013464ab057ab93d71 (diff) | |
Avoid multiple definitions of two lovingly copy-pasted functions
Multple external definitions of a symbol causes problems when linking
statically, as for Android. Just make the functions static for now, as they
are only used locally in the files where defined anyway.
Change-Id: I8ddbaf01497c171bed4e15f6183ba43461c672d1
Diffstat (limited to 'winaccessibility/source')
| -rw-r--r-- | winaccessibility/source/UAccCOM/AccTextBase.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/winaccessibility/source/UAccCOM/AccTextBase.cxx b/winaccessibility/source/UAccCOM/AccTextBase.cxx index e63afe468a31..756bce9b8cc3 100644 --- a/winaccessibility/source/UAccCOM/AccTextBase.cxx +++ b/winaccessibility/source/UAccCOM/AccTextBase.cxx @@ -39,7 +39,7 @@ using namespace rtl; // Construction/Destruction ////////////////////////////////////////////////////////////////////// -OUString ReplaceFourChar(OUString oldOUString); +static OUString ReplaceFourChar(OUString oldOUString); CAccTextBase::CAccTextBase() {} @@ -962,7 +962,7 @@ STDMETHODIMP CAccTextBase::put_XInterface(hyper pXInterface) LEAVE_PROTECTED_BLOCK } -OUString ReplaceOneChar(OUString oldOUString, OUString replacedChar, OUString replaceStr) +static OUString ReplaceOneChar(OUString oldOUString, OUString replacedChar, OUString replaceStr) { int iReplace = -1; iReplace = oldOUString.lastIndexOf(replacedChar); @@ -975,9 +975,9 @@ OUString ReplaceOneChar(OUString oldOUString, OUString replacedChar, OUString re } } return oldOUString; - } -OUString ReplaceFourChar(OUString oldOUString) + +static OUString ReplaceFourChar(OUString oldOUString) { oldOUString = ReplaceOneChar(oldOUString, OUString("\\"), OUString("\\\\")); oldOUString = ReplaceOneChar(oldOUString, OUString(";"), OUString("\\;")); |