[Libreoffice-commits] core.git: sw/inc sw/source
Matteo Casalin
matteo.casalin at yahoo.com
Wed Aug 21 02:43:27 PDT 2013
sw/inc/PostItMgr.hxx | 13 +++++--------
sw/inc/postithelper.hxx | 1 -
sw/source/ui/docvw/PostItMgr.cxx | 8 +++-----
3 files changed, 8 insertions(+), 14 deletions(-)
New commits:
commit bb145132b87be8690d4b3b23f15bba11a2a0d94c
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Mon Aug 19 01:57:24 2013 +0200
String to OUString
Change-Id: I87b26b5eb3314cd2129f9e23870a59ccff53a02a
Reviewed-on: https://gerrit.libreoffice.org/5556
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 6a605a3..888a5ac 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -17,13 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _POSTITMGR_HXX
-#define _POSTITMGR_HXX
+#ifndef POSTITMGR_HXX
+#define POSTITMGR_HXX
#include <list>
#include <vector>
#include <editeng/outlobj.hxx>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
#include <tools/link.hxx>
#include <swrect.hxx>
#include <unotools/configitem.hxx>
@@ -215,10 +215,10 @@ class SwPostItMgr: public SfxListener
void CorrectPositions();
void SetLayout() { mbLayout = true; };
- void Delete(String aAuthor);
+ void Delete(OUString aAuthor);
void Delete();
- void Hide( const String& rAuthor );
+ void Hide( const OUString& rAuthor );
void Hide();
void Show();
@@ -283,7 +283,4 @@ class SwPostItMgr: public SfxListener
#endif
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/postithelper.hxx b/sw/inc/postithelper.hxx
index 2a304d5..7648015 100644
--- a/sw/inc/postithelper.hxx
+++ b/sw/inc/postithelper.hxx
@@ -29,7 +29,6 @@
class SwTxtFld;
class SwRootFrm;
-class String;
class SwPostItMgr;
class SwEditWin;
namespace sw { namespace sidebarwindows {
diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/ui/docvw/PostItMgr.cxx
index d45e5bd..ef6ad1f 100644
--- a/sw/source/ui/docvw/PostItMgr.cxx
+++ b/sw/source/ui/docvw/PostItMgr.cxx
@@ -1152,7 +1152,7 @@ void SwPostItMgr::RemoveSidebarWin()
// copy to new vector, otherwise RemoveItem would operate and delete stuff on mvPostItFlds as well
// RemoveItem will clean up the core field and visible postit if necessary
// we cannot just delete everything as before, as postits could move into change tracking
-void SwPostItMgr::Delete(String aAuthor)
+void SwPostItMgr::Delete(OUString aAuthor)
{
mpWrtShell->StartAllAction();
if ( HasActiveSidebarWin() && (GetActiveSidebarWin()->GetAuthor()==aAuthor) )
@@ -1160,9 +1160,7 @@ void SwPostItMgr::Delete(String aAuthor)
SetActiveSidebarWin(0);
}
SwRewriter aRewriter;
- String aUndoString = SW_RES(STR_DELETE_AUTHOR_NOTES);
- aUndoString += aAuthor;
- aRewriter.AddRule(UndoArg1, aUndoString);
+ aRewriter.AddRule(UndoArg1, SW_RESSTR(STR_DELETE_AUTHOR_NOTES) + aAuthor);
mpWrtShell->StartUndo( UNDO_DELETE, &aRewriter );
std::vector<SwFmtFld*> aTmp;
@@ -1213,7 +1211,7 @@ void SwPostItMgr::Delete()
CalcRects();
LayoutPostIts();
}
-void SwPostItMgr::Hide( const String& rAuthor )
+void SwPostItMgr::Hide( const OUString& rAuthor )
{
for(SwSidebarItem_iterator i = mvPostItFlds.begin(); i != mvPostItFlds.end() ; ++i)
{
More information about the Libreoffice-commits
mailing list