commit 33526481788137d959f27ae32910127d1436c1a8
author Noel Grandin <noel@peralex.com> Tue Sep 17 14:30:05 2013 +0200
committer Noel Grandin <noel@peralex.com> Thu Sep 19 10:14:15 2013 +0200
tree 7eb5ea68a398dd2bbd52ab1e60d0bb483d24609b
parent ffc782c23cf5a0b32f42ab4877062966e154cb74

convert sw/inc/IDocumentRedlineAccess.hxx from String to OUString

Change-Id: If3f918bba1571b99588d62148f7ac446d72de6c9

sw/inc/IDocumentRedlineAccess.hxx

diff --git a/sw/inc/IDocumentRedlineAccess.hxx b/sw/inc/IDocumentRedlineAccess.hxx
index 29430cb0..191d820 100644
--- a/sw/inc/IDocumentRedlineAccess.hxx
+++ b/sw/inc/IDocumentRedlineAccess.hxx
@@ -33,7 +33,6 @@
 struct SwPosition;
 class SwStartNode;
 class SwNode;
 class String;

typedef sal_uInt16 RedlineMode_t;
namespace nsRedlineMode_t
@@ -188,12 +187,12 @@ public:
    virtual sal_uInt16 GetRedlineAuthor() = 0;

    // For Readers etc.: register new Author in table.
    virtual sal_uInt16 InsertRedlineAuthor(const String& rAuthor) = 0;
    virtual sal_uInt16 InsertRedlineAuthor(const OUString& rAuthor) = 0;

    // Place a comment at Redline at given position.
    virtual bool SetRedlineComment(
        /*[in]*/const SwPaM& rPam,
        /*[in]*/const String& rComment) = 0;
        /*[in]*/const OUString& rComment) = 0;

    virtual const ::com::sun::star::uno::Sequence <sal_Int8>& GetRedlinePassword() const = 0;

sw/inc/doc.hxx

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 831fcba..57af662 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -781,8 +781,8 @@ public:
    virtual const SwRedline* SelPrevRedline(/*[in]*/SwPaM& rPam) const;
    virtual void UpdateRedlineAttr();
    virtual sal_uInt16 GetRedlineAuthor();
    virtual sal_uInt16 InsertRedlineAuthor(const String& rAuthor);
    virtual bool SetRedlineComment(/*[in]*/const SwPaM& rPam, /*[in]*/const String& rComment);
    virtual sal_uInt16 InsertRedlineAuthor(const OUString& rAuthor);
    virtual bool SetRedlineComment(/*[in]*/const SwPaM& rPam, /*[in]*/const OUString& rComment);
    virtual const ::com::sun::star::uno::Sequence <sal_Int8>& GetRedlinePassword() const;
    virtual void SetRedlinePassword(/*[in]*/const ::com::sun::star::uno::Sequence <sal_Int8>& rNewPassword);

sw/source/core/doc/docredln.cxx

diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 1ac94ad..4fb60c0 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -2483,7 +2483,7 @@ const SwRedline* SwDoc::SelPrevRedline( SwPaM& rPam ) const
}

// Set comment at the Redline
bool SwDoc::SetRedlineComment( const SwPaM& rPaM, const String& rS )
bool SwDoc::SetRedlineComment( const SwPaM& rPaM, const OUString& rS )
{
    bool bRet = false;
    const SwPosition* pStt = rPaM.Start(),
@@ -2517,7 +2517,7 @@ sal_uInt16 SwDoc::GetRedlineAuthor()
}

/// Insert new author into the Table for the Readers etc.
sal_uInt16 SwDoc::InsertRedlineAuthor( const String& rNew )
sal_uInt16 SwDoc::InsertRedlineAuthor( const OUString& rNew )
{
    return SW_MOD()->InsertRedlineAuthor(rNew);
}