[Libreoffice-commits] core.git: sc/source sw/source winaccessibility/source

[Tor Lillqvist]

 sc/source/ui/Accessibility/AccessibleCell.cxx   |    4 ++--
 sw/source/core/access/acccell.cxx               |    5 +++--
 winaccessibility/source/UAccCOM/AccTextBase.cxx |    8 ++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit a0a903892ca93615c1460cebbfbac579999233f2
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Dec 5 18:06:04 2013 +0200

    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

diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx
index efd178b..74c9d72 100644
--- a/sc/source/ui/Accessibility/AccessibleCell.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCell.cxx
@@ -470,7 +470,7 @@ void ScAccessibleCell::AddRelation(const ScRange& rRange,
     }
 }
 
-OUString ReplaceOneChar(OUString oldOUString, OUString replacedChar, OUString replaceStr)
+static OUString ReplaceOneChar(OUString oldOUString, OUString replacedChar, OUString replaceStr)
 {
     int iReplace = -1;
     iReplace = oldOUString.lastIndexOf(replacedChar);
@@ -485,7 +485,7 @@ OUString ReplaceOneChar(OUString oldOUString, OUString replacedChar, OUString re
     return oldOUString;
 }
 
-OUString ReplaceFourChar(OUString oldOUString)
+static OUString ReplaceFourChar(OUString oldOUString)
 {
     oldOUString = ReplaceOneChar(oldOUString, "\\", "\\\\");
     oldOUString = ReplaceOneChar(oldOUString, ";", "\\;");
diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx
index 97e1460..137fa4c 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -399,7 +399,7 @@ uno::Any SwAccessibleCell::getMinimumValue(  )
     return aAny;
 }
 
-OUString ReplaceOneChar(OUString oldOUString, OUString replacedChar, OUString replaceStr)
+static OUString ReplaceOneChar(OUString oldOUString, OUString replacedChar, OUString replaceStr)
 {
     int iReplace = -1;
     iReplace = oldOUString.lastIndexOf(replacedChar);
@@ -413,7 +413,8 @@ 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("\\;"));
diff --git a/winaccessibility/source/UAccCOM/AccTextBase.cxx b/winaccessibility/source/UAccCOM/AccTextBase.cxx
index e63afe4..756bce9 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("\\;"));