[Libreoffice-commits] .: 9 commits - cairo/prj configure.in connectivity/source dbaccess/source editeng/inc editeng/source framework/source l10ntools/Executable_helpindexer.mk l10ntools/Executable_helplinker.mk Makefile ooo.lst.in reportdesign/inc reportdesign/source sc/inc sc/source sd/inc sd/source solenv/inc starmath/inc starmath/source svl/inc svl/source svtools/inc svtools/source svx/inc svx/source sw/inc sw/source zlib/makefile.mk zlib/zlib-1.2.5.patch zlib/zlib-dmakebuild.patch
Caolán McNamara
caolan at kemper.freedesktop.org
Mon May 14 06:34:43 PDT 2012
Makefile | 1
cairo/prj/build.lst | 2
configure.in | 90 ++++++++++++++--------
connectivity/source/parse/sqlflex.l | 18 ++--
dbaccess/source/ui/inc/GeneralUndo.hxx | 2
editeng/inc/editeng/editund2.hxx | 2
editeng/source/editeng/editundo.cxx | 7 -
framework/source/fwe/helper/undomanagerhelper.cxx | 6 -
l10ntools/Executable_helpindexer.mk | 2
l10ntools/Executable_helplinker.mk | 2
ooo.lst.in | 2
reportdesign/inc/UndoActions.hxx | 4
reportdesign/source/core/sdr/UndoActions.cxx | 5 -
reportdesign/source/ui/inc/RptUndo.hxx | 2
reportdesign/source/ui/misc/RptUndo.cxx | 7 -
sc/inc/undorangename.hxx | 4
sc/source/ui/inc/undobase.hxx | 8 -
sc/source/ui/inc/undoblk.hxx | 70 ++++++++---------
sc/source/ui/inc/undocell.hxx | 22 ++---
sc/source/ui/inc/undodat.hxx | 34 ++++----
sc/source/ui/inc/undodraw.hxx | 8 -
sc/source/ui/inc/undostyl.hxx | 4
sc/source/ui/inc/undotab.hxx | 34 ++++----
sc/source/ui/undo/undobase.cxx | 5 -
sc/source/ui/undo/undoblk.cxx | 32 +++----
sc/source/ui/undo/undoblk2.cxx | 2
sc/source/ui/undo/undoblk3.cxx | 30 +++----
sc/source/ui/undo/undocell.cxx | 22 ++---
sc/source/ui/undo/undodat.cxx | 34 ++++----
sc/source/ui/undo/undodraw.cxx | 5 -
sc/source/ui/undo/undorangename.cxx | 4
sc/source/ui/undo/undostyl.cxx | 4
sc/source/ui/undo/undotab.cxx | 34 ++++----
sd/inc/sdundo.hxx | 2
sd/inc/undoanim.hxx | 6 -
sd/source/core/undoanim.cxx | 12 +-
sd/source/ui/dlg/unchss.cxx | 2
sd/source/ui/func/unmovss.cxx | 4
sd/source/ui/func/unprlout.cxx | 2
sd/source/ui/inc/unchss.hxx | 2
sd/source/ui/inc/unmodpg.hxx | 4
sd/source/ui/inc/unmovss.hxx | 2
sd/source/ui/inc/unprlout.hxx | 2
sd/source/ui/view/unmodpg.cxx | 4
solenv/inc/unxlngppc.mk | 5 -
starmath/inc/action.hxx | 2
starmath/source/action.cxx | 4
svl/inc/svl/undo.hxx | 6 -
svl/source/undo/undo.cxx | 15 +--
svtools/inc/svtools/tabbar.hxx | 12 +-
svtools/source/control/tabbar.cxx | 8 -
svtools/source/edit/textundo.cxx | 5 -
svtools/source/edit/textundo.hxx | 2
svx/inc/svx/svdundo.hxx | 40 ++++-----
svx/source/form/fmundo.cxx | 6 -
svx/source/inc/fmundo.hxx | 4
svx/source/svdraw/svdundo.cxx | 40 ++++-----
sw/inc/undobj.hxx | 4
sw/source/core/inc/UndoDraw.hxx | 2
sw/source/core/undo/undobj.cxx | 2
sw/source/core/undo/undobj1.cxx | 2
sw/source/core/undo/undraw.cxx | 2
zlib/makefile.mk | 10 +-
zlib/zlib-1.2.5.patch | 67 ----------------
zlib/zlib-dmakebuild.patch | 67 ++++++++++++++++
65 files changed, 444 insertions(+), 411 deletions(-)
New commits:
commit 6b3bf27cb56d661725ac3fcfb756562e0ad75564
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon May 14 14:00:59 2012 +0100
ppc: yyinput returns a int, truncating to (unsigned)char does't work
retain this as an int so that on platforms where char is unsigned
we don't mangle the value and get this all wrong.
Fixes database opening tables on ppc if -fsigned-char is removed
Change-Id: I66f0c6b1b19191595f8b348377579f2daabf7ada
diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l
index d5b2f14..fd27cb8 100755
--- a/connectivity/source/parse/sqlflex.l
+++ b/connectivity/source/parse/sqlflex.l
@@ -76,7 +76,7 @@ using namespace connectivity;
static ::rtl::OUString aEmptyString;
-static sal_Int32 gatherString(sal_Int32 delim, sal_Int32 nTyp);
+static sal_Int32 gatherString(int delim, sal_Int32 nTyp);
static sal_Int32 gatherName(const sal_Char*);
static sal_Int32 gatherNamePre(const sal_Char* );
// has to be set before the parser starts
@@ -94,8 +94,8 @@ OSQLScanner* xxx_pGLOBAL_SQLSCAN = NULL;
#define YY_INPUT(buf,result,max_size) \
{ \
- buf[0] = xxx_pGLOBAL_SQLSCAN->SQLyygetc(); \
- result = buf[0] != -1; \
+ int c = xxx_pGLOBAL_SQLSCAN->SQLyygetc(); \
+ result = (c == EOF) ? YY_NULL : (buf[0] = c, 1);\
}
#define YY_FATAL_ERROR(msg) \
@@ -518,9 +518,9 @@ inline bool checkeof(int c) { return c == 0 || c == EOF; }
* nTyp == 1 -> SQL_NODE_STRING
* nTyp == 2 -> SQL_NODE_ACCESS_DATE
*/
-sal_Int32 gatherString( sal_Int32 delim, sal_Int32 nTyp)
+sal_Int32 gatherString(int delim, sal_Int32 nTyp)
{
- sal_Char ch;
+ int ch;
::rtl::OStringBuffer sBuffer(256);
while (!checkeof(ch = yyinput()))
@@ -547,7 +547,7 @@ sal_Int32 gatherString( sal_Int32 delim, sal_Int32 nTyp)
}
else
{
- sBuffer.append(ch);
+ sBuffer.append(static_cast<sal_Char>(ch));
}
}
@@ -555,7 +555,7 @@ sal_Int32 gatherString( sal_Int32 delim, sal_Int32 nTyp)
break;
else
{
- sBuffer.append(ch);
+ sBuffer.append(static_cast<sal_Char>(ch));
}
}
YY_FATAL_ERROR("Unterminated name string");
@@ -746,7 +746,7 @@ void OSQLScanner::SQLyyerror(sal_Char *fmt)
sal_Char *s = Buffer;
sal_Int32 nPos = 1;
- sal_Int32 ch = SQLyytext ? (SQLyytext[0] == 0 ? ' ' : SQLyytext[0]): ' ';
+ int ch = SQLyytext ? (SQLyytext[0] == 0 ? ' ' : SQLyytext[0]): ' ';
*s++ = ch;
while (!checkeof(ch = yyinput()))
{
@@ -800,7 +800,7 @@ void OSQLScanner::prepareScan(const ::rtl::OUString & rNewStatement, const IPars
//------------------------------------------------------------------------------
sal_Int32 OSQLScanner::SQLyygetc(void)
{
- sal_Int32 nPos = (m_nCurrentPos >= m_sStatement.getLength()) ? -1 : m_sStatement.getStr()[m_nCurrentPos];
+ sal_Int32 nPos = (m_nCurrentPos >= m_sStatement.getLength()) ? EOF : m_sStatement.getStr()[m_nCurrentPos];
m_nCurrentPos++;
return nPos;
}
commit 7ef203d2bf72f7d96fd10d1297af06e82550a1c4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon May 14 13:25:24 2012 +0100
Revert "sw34bf03: #i81127#: patch by pmladek: linux/ppc: remove -fsigned-char"
This reverts commit 875c9a28f49c7a73607fcdfac245b648801dccee.
because it doesn't make sense to build the dmake modules
without -fsigned-char and the gbuild modules with -fsigned-char
and we're still got a few bugs where we assume chars are signed
Conflicts:
solenv/inc/unxlngppc.mk
Change-Id: I6ac07fa3ebadd83efd0da1ee69a010b62dfaad59
diff --git a/solenv/inc/unxlngppc.mk b/solenv/inc/unxlngppc.mk
index 2c690b1..39d3028 100644
--- a/solenv/inc/unxlngppc.mk
+++ b/solenv/inc/unxlngppc.mk
@@ -31,3 +31,6 @@ CDEFAULTOPT=-Os
PICSWITCH:=-fPIC
.INCLUDE : unxlng.mk
CDEFS+=-DPOWERPC -DPPC
+CFLAGS+=-fsigned-char
+CFLAGSCC+=-fsigned-char
+CFLAGSCXX+=-fsigned-char
commit bd04c1d896f3213a7cce66829b0ab408e59a2401
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon May 14 12:05:03 2012 +0100
WaE: unsafe mix of bool and sal_Bool
Change-Id: I3854a9958f49dbbabe7a604e4604d5d8f79adc11
diff --git a/svtools/inc/svtools/tabbar.hxx b/svtools/inc/svtools/tabbar.hxx
index 1478b0e..7a71ef4 100644
--- a/svtools/inc/svtools/tabbar.hxx
+++ b/svtools/inc/svtools/tabbar.hxx
@@ -376,7 +376,7 @@ private:
sal_Bool mbInSelect;
sal_Bool mbSelColor;
sal_Bool mbSelTextColor;
- sal_Bool mbMirrored;
+ bool mbMirrored;
bool mbHasInsertTab; // if true, the tab bar has an extra tab at the end.
Link maSelectHdl;
Link maDoubleClickHdl;
@@ -496,16 +496,16 @@ public:
@param bMirrored sal_True = the control will draw itself RTL in LTR GUI,
and vice versa; sal_False = the control behaves according to the
current direction of the GUI. */
- void SetMirrored( sal_Bool bMirrored = sal_True );
+ void SetMirrored(bool bMirrored = true);
/** Returns sal_True, if the control is set to mirrored mode (see SetMirrored()). */
- sal_Bool IsMirrored() const { return mbMirrored; }
+ bool IsMirrored() const { return mbMirrored; }
/** Sets the control to LTR or RTL mode regardless of the GUI direction.
@param bRTL sal_False = the control will draw from left to right;
sal_True = the control will draw from right to left. */
- void SetEffectiveRTL( sal_Bool bRTL );
- /** Returns sal_True, if the control draws from right to left (see SetEffectiveRTL()). */
- sal_Bool IsEffectiveRTL() const;
+ void SetEffectiveRTL( bool bRTL );
+ /** Returns true, if the control draws from right to left (see SetEffectiveRTL()). */
+ bool IsEffectiveRTL() const;
sal_Bool StartDrag( const CommandEvent& rCEvt, Region& rRegion );
sal_uInt16 ShowDropPos( const Point& rPos );
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index fb25b44..a922241 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -2413,24 +2413,24 @@ void TabBar::EndEditMode( sal_Bool bCancel )
// -----------------------------------------------------------------------
-void TabBar::SetMirrored( sal_Bool bMirrored )
+void TabBar::SetMirrored(bool bMirrored)
{
if( mbMirrored != bMirrored )
{
mbMirrored = bMirrored;
- mbSizeFormat = sal_True;
+ mbSizeFormat = true;
ImplInitControls(); // for button images
Resize(); // recalculates control positions
Mirror();
}
}
-void TabBar::SetEffectiveRTL( sal_Bool bRTL )
+void TabBar::SetEffectiveRTL( bool bRTL )
{
SetMirrored( bRTL != Application::GetSettings().GetLayoutRTL() );
}
-sal_Bool TabBar::IsEffectiveRTL() const
+bool TabBar::IsEffectiveRTL() const
{
return IsMirrored() != Application::GetSettings().GetLayoutRTL();
}
commit 2368d3403a57be2e13ef478f00b6981212de0db7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon May 14 11:55:58 2012 +0100
this should have been CDEFAULTOPT, not DEFAULTOPT
Change-Id: Ib119c7bf8e04b8274026159218281cb3f220c8d0
diff --git a/solenv/inc/unxlngppc.mk b/solenv/inc/unxlngppc.mk
index af528d9..2c690b1 100644
--- a/solenv/inc/unxlngppc.mk
+++ b/solenv/inc/unxlngppc.mk
@@ -27,7 +27,7 @@
# mk file for Unix Linux PowerPC using GCC, please make generic modifications to unxlng.mk
-DEFAULTOPT=-Os
+CDEFAULTOPT=-Os
PICSWITCH:=-fPIC
.INCLUDE : unxlng.mk
CDEFS+=-DPOWERPC -DPPC
commit c1239a1e7027fbac86fb2b6aaf03a96fdb68a41a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon May 14 11:04:23 2012 +0100
default unix in general to system libxml2/libxslt like MacOSX
Change-Id: I7cde2a79462c71f4ce6e3ab75152e804ec7260f9
diff --git a/cairo/prj/build.lst b/cairo/prj/build.lst
index 5827e76..b107635 100644
--- a/cairo/prj/build.lst
+++ b/cairo/prj/build.lst
@@ -1,4 +1,4 @@
-lcairo cairo : ZLIB:zlib libpng soltools NULL
+lcairo cairo : ZLIB:zlib LIBPNG:libpng soltools NULL
lcairo cairo usr1 - all lcairo_mkout NULL
lcairo cairo\pixman nmake - all lcairo_pixman NULL
lcairo cairo\cairo nmake - all lcairo_cairo lcairo_pixman NULL
diff --git a/configure.in b/configure.in
index 543f65e..6c71d85 100644
--- a/configure.in
+++ b/configure.in
@@ -1155,11 +1155,7 @@ AC_ARG_WITH(external-thes-dir,
AC_ARG_WITH(system-zlib,
AS_HELP_STRING([--with-system-zlib],
[Use zlib already on system.]),,
- [if test "$_os" != "WINNT"; then
- with_system_zlib=yes
- else
- with_system_zlib="$with_system_libs"
- fi])
+ [with_system_zlib=auto])
AC_ARG_WITH(system-openssl,
AS_HELP_STRING([--with-system-openssl],
@@ -1169,11 +1165,7 @@ AC_ARG_WITH(system-openssl,
AC_ARG_WITH(system-jpeg,
AS_HELP_STRING([--with-system-jpeg],
[Use jpeg already on system.]),,
- [if test "$_os" = "Linux"; then
- with_system_jpeg=yes
- else
- with_system_jpeg="$with_system_libs"
- fi])
+ [with_system_jpeg=auto])
AC_ARG_WITH(system-clucene,
AS_HELP_STRING([--with-system-clucene],
@@ -1223,11 +1215,7 @@ AC_ARG_WITH(system-libwpg,
AC_ARG_WITH(system-libxml,
AS_HELP_STRING([--with-system-libxml],
[Use libxml/libxslt already on system.]),,
- [if test "$_os" = "Darwin"; then
- with_system_libxml=yes
- else
- with_system_libxml="$with_system_libs"
- fi])
+ [with_system_libxml=auto])
AC_ARG_WITH(system-icu,
AS_HELP_STRING([--with-system-icu],
@@ -1450,11 +1438,7 @@ AC_ARG_WITH(system-mesa-headers,
AC_ARG_WITH(system-curl,
AS_HELP_STRING([--with-system-curl],
[Use curl already on system.]),,
- [if test "$_os" = "Darwin"; then
- with_system_curl=yes
- else
- with_system_curl="$with_system_libs"
- fi])
+ [with_system_curl=auto])
AC_ARG_WITH(system-boost,
AS_HELP_STRING([--with-system-boost],
@@ -1535,7 +1519,7 @@ AC_ARG_WITH(system-gettext,
AC_ARG_WITH(system-libpng,
AS_HELP_STRING([--with-system-libpng],
[Use libpng already on system.]),,
- [with_system_libpng="$with_system_libs"])
+ [with_system_libpng=auto])
AC_ARG_WITH(linker-hash-style,
AS_HELP_STRING([--with-linker-hash-style],
@@ -6039,6 +6023,17 @@ AC_SUBST(SYSTEM_STDLIBS)
dnl ===================================================================
dnl Check for system zlib
dnl ===================================================================
+if test "$with_system_zlib" = "auto"; then
+ case "$_os" in
+ WINNT)
+ with_system_zlib="$with_system_libs"
+ ;;
+ *)
+ with_system_zlib=yes
+ ;;
+ esac
+fi
+
AC_MSG_CHECKING([which zlib to use])
if test "$with_system_zlib" = "yes"; then
AC_MSG_RESULT([external])
@@ -6067,6 +6062,17 @@ dnl ===================================================================
dnl Check for system jpeg
dnl ===================================================================
AC_MSG_CHECKING([which jpeg to use])
+if test "$with_system_jpeg" = "auto"; then
+ case "$_os" in
+ WINNT|Darwin|iOS|Android)
+ with_system_jpeg="$with_system_libs"
+ ;;
+ *)
+ with_system_jpeg=yes
+ ;;
+ esac
+fi
+
if test "$with_system_jpeg" = "yes"; then
AC_MSG_RESULT([external])
SYSTEM_JPEG=YES
@@ -6325,6 +6331,17 @@ AC_SUBST(USE_FT_EMBOLDEN)
# to prevent incompatibilities between internal libxml2 and external libxslt,
# or vice versa, use with_system_libxml here
# ===================================================================
+if test "$with_system_libxml" = "auto"; then
+ case "$_os" in
+ WINNT|iOS|Android)
+ with_system_libxml="$with_system_libs"
+ ;;
+ *)
+ with_system_libxml=yes
+ ;;
+ esac
+fi
+
AC_MSG_CHECKING([which libxslt to use])
if test "$with_system_libxml" = "yes"; then
AC_MSG_RESULT([external])
@@ -7075,6 +7092,17 @@ dnl ===================================================================
dnl Check for system curl
dnl ===================================================================
AC_MSG_CHECKING([which libcurl to use])
+if test "$with_system_curl" = "auto"; then
+ case "$_os" in
+ Darwin)
+ with_system_curl=yes
+ ;;
+ *)
+ with_system_curl="$with_system_libs"
+ ;;
+ esac
+fi
+
if test "$with_system_curl" = "yes"; then
AC_MSG_RESULT([external])
SYSTEM_CURL=YES
@@ -10627,21 +10655,25 @@ dnl How should and does this interact with the checks for libpng
dnl related to use of libpng in the quickstarter above? This needs to
dnl be unified.
-if test "$with_system_libpng" = yes; then
- SYSTEM_LIBPNG=YES
- AC_MSG_RESULT([yes])
-else
+if test "$with_system_libpng" = "auto"; then
case "$_os" in
WINNT|Darwin|iOS|Android)
- SYSTEM_LIBPNG=NO
- AC_MSG_RESULT([no])
+ with_system_libpng="$with_system_libs"
;;
*)
- SYSTEM_LIBPNG=YES
- AC_MSG_RESULT([yes])
+ with_system_libpng=yes
;;
esac
fi
+
+if test "$with_system_libpng" = yes; then
+ SYSTEM_LIBPNG=YES
+ AC_MSG_RESULT([yes])
+else
+ SYSTEM_LIBPNG=NO
+ BUILD_TYPE="$BUILD_TYPE LIBPNG"
+ AC_MSG_RESULT([no])
+fi
AC_SUBST(SYSTEM_LIBPNG)
dnl ===================================================================
commit f0997ea3932328d96196e37f0c27c831b321909c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon May 14 10:16:52 2012 +0100
filter unused libwps_tools_win:: methods
Change-Id: I88fca8854db96fdba1ea9069fb95a237c5b02bb2
diff --git a/Makefile b/Makefile
index c4fdc2f..55d3605 100644
--- a/Makefile
+++ b/Makefile
@@ -487,6 +487,7 @@ findunusedcode:
| grep -v ^libcmis:: \
| grep -v ^libvisio:: \
| grep -v ^libwpg:: \
+ | grep -v ^libwps_tools_win:: \
| grep -v ^lucene:: \
| grep -v ^Matrix3d:: \
| grep -v ^salhelper:: \
commit 82d1c1d9ebaf6e2f5eb81c05223d1f6bb7679bce
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon May 14 09:04:26 2012 +0100
bump zlib to 1.2.7
Change-Id: I003d1a8ff86f94c15b295e11ad109929708fa561
diff --git a/ooo.lst.in b/ooo.lst.in
index 64e3d72..e31a791 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -74,7 +74,7 @@ a7d6c5f2fe2d481149ed3ba807b5c043-gdk-pixbuf-2.23.0.tar.gz
d7a242ca43e33e1b63d3073f9d46a6a8-librsvg-2.32.1.tar.gz
9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz
a2c10c04f396a9ce72894beb18b4e1f9-jpeg-8c.tar.gz
-c735eab2d659a96e5a594c9e8541ad63-zlib-1.2.5.tar.gz
+2ab442d169156f34c379c968f3f482dd-zlib-1.2.7.tar.bz2
7c53f83e0327343f4060c0eb83842daf-icu4c-49_1_1-src.tgz
451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
b99fb620b1324b4ce79ee6998b507146-JLanguageTool-1.4.0.tar.bz2
diff --git a/zlib/makefile.mk b/zlib/makefile.mk
index 8ec3a5e..7a677e5 100644
--- a/zlib/makefile.mk
+++ b/zlib/makefile.mk
@@ -44,10 +44,10 @@ all:
# --- Files --------------------------------------------------------
-TARFILE_NAME=zlib-1.2.5
-TARFILE_MD5=c735eab2d659a96e5a594c9e8541ad63
+TARFILE_NAME=zlib-1.2.7
+TARFILE_MD5=2ab442d169156f34c379c968f3f482dd
-PATCH_FILES=zlib-1.2.5.patch
+PATCH_FILES=zlib-dmakebuild.patch
ADDITIONAL_FILES=makefile.mk
#relative to CONFIGURE_DIR
@@ -64,8 +64,8 @@ PATCHED_HEADERS=$(INCCOM)$/patched$/zlib.h
# --- Targets ------------------------------------------------------
.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
+.INCLUDE : target.mk
+.INCLUDE : tg_ext.mk
ALLTAR: $(PATCHED_HEADERS)
diff --git a/zlib/zlib-1.2.5.patch b/zlib/zlib-1.2.5.patch
deleted file mode 100644
index 3389b88..0000000
--- a/zlib/zlib-1.2.5.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- misc/zlib-1.2.5/makefile.mk Fri Mar 14 10:17:06 2008
-+++ misc/build/zlib-1.2.5/makefile.mk Fri Mar 14 10:16:56 2008
-@@ -1 +1,63 @@
--dummy
-+#*************************************************************************
-+#
-+# Copyright according the GNU Public License.
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..$/..
-+
-+PRJNAME=zlib
-+TARGET=zlib
-+LIBTARGET=NO
-+EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE : settings.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+INCEXT=contrib$/minizip
-+
-+SLOFILES= $(SLO)$/adler32.obj \
-+ $(SLO)$/compress.obj \
-+ $(SLO)$/deflate.obj \
-+ $(SLO)$/crc32.obj \
-+ $(SLO)$/inffast.obj \
-+ $(SLO)$/inflate.obj \
-+ $(SLO)$/inftrees.obj \
-+ $(SLO)$/trees.obj \
-+ $(SLO)$/zutil.obj
-+
-+
-+LIB1TARGET=$(SLB)$/$(TARGET).lib
-+LIB1ARCHIV=$(LB)$/lib$(TARGET).a
-+LIB1OBJFILES=$(SLOFILES)
-+
-+.IF "$(BUILD_X64)"!=""
-+SLOFILES_X64= $(SLO_X64)$/adler32.obj \
-+ $(SLO_X64)$/compress.obj \
-+ $(SLO_X64)$/deflate.obj \
-+ $(SLO_X64)$/crc32.obj \
-+ $(SLO_X64)$/inffast.obj \
-+ $(SLO_X64)$/inflate.obj \
-+ $(SLO_X64)$/inftrees.obj \
-+ $(SLO_X64)$/trees.obj \
-+ $(SLO_X64)$/zutil.obj
-+
-+LIB1TARGET_X64=$(SLB_X64)$/$(TARGET).lib
-+LIB1OBJFILES_X64=$(SLOFILES_X64)
-+.ENDIF # "$(BUILD_X64)"!=""
-+
-+
-+# --- Targets ------------------------------------------------------
-+
-+$(MISC)$/%.c : contrib$/minizip$/%.c
-+ @echo ------------------------------
-+ @echo Making: $@
-+ @$(COPY) $< $@
-+
-+.INCLUDE : set_wntx64.mk
-+.INCLUDE : target.mk
-+.INCLUDE : tg_wntx64.mk
-+
diff --git a/zlib/zlib-dmakebuild.patch b/zlib/zlib-dmakebuild.patch
new file mode 100644
index 0000000..6c2de99
--- /dev/null
+++ b/zlib/zlib-dmakebuild.patch
@@ -0,0 +1,67 @@
+--- misc/zlib-1.2.7/makefile.mk Fri Mar 14 10:17:06 2008
++++ misc/build/zlib-1.2.7/makefile.mk Fri Mar 14 10:16:56 2008
+@@ -1 +1,63 @@
+-dummy
++#*************************************************************************
++#
++# Copyright according the GNU Public License.
++#
++#*************************************************************************
++
++PRJ=..$/..$/..$/..
++
++PRJNAME=zlib
++TARGET=zlib
++LIBTARGET=NO
++EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
++
++# --- Settings -----------------------------------------------------
++
++.INCLUDE : settings.mk
++
++# --- Files --------------------------------------------------------
++
++INCEXT=contrib$/minizip
++
++SLOFILES= $(SLO)$/adler32.obj \
++ $(SLO)$/compress.obj \
++ $(SLO)$/deflate.obj \
++ $(SLO)$/crc32.obj \
++ $(SLO)$/inffast.obj \
++ $(SLO)$/inflate.obj \
++ $(SLO)$/inftrees.obj \
++ $(SLO)$/trees.obj \
++ $(SLO)$/zutil.obj
++
++
++LIB1TARGET=$(SLB)$/$(TARGET).lib
++LIB1ARCHIV=$(LB)$/lib$(TARGET).a
++LIB1OBJFILES=$(SLOFILES)
++
++.IF "$(BUILD_X64)"!=""
++SLOFILES_X64= $(SLO_X64)$/adler32.obj \
++ $(SLO_X64)$/compress.obj \
++ $(SLO_X64)$/deflate.obj \
++ $(SLO_X64)$/crc32.obj \
++ $(SLO_X64)$/inffast.obj \
++ $(SLO_X64)$/inflate.obj \
++ $(SLO_X64)$/inftrees.obj \
++ $(SLO_X64)$/trees.obj \
++ $(SLO_X64)$/zutil.obj
++
++LIB1TARGET_X64=$(SLB_X64)$/$(TARGET).lib
++LIB1OBJFILES_X64=$(SLOFILES_X64)
++.ENDIF # "$(BUILD_X64)"!=""
++
++
++# --- Targets ------------------------------------------------------
++
++$(MISC)$/%.c : contrib$/minizip$/%.c
++ @echo ------------------------------
++ @echo Making: $@
++ @$(COPY) $< $@
++
++.INCLUDE : set_wntx64.mk
++.INCLUDE : target.mk
++.INCLUDE : tg_wntx64.mk
++
commit f5e727de55701b655ac98dc8054acfacf0e3cefc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon May 14 08:44:33 2012 +0100
WaE: exceptions used without unwind information
Change-Id: Iaf1606ee8c3e4f07cea3525813712dd25b0627c6
diff --git a/l10ntools/Executable_helpindexer.mk b/l10ntools/Executable_helpindexer.mk
index 71e73e7..c9ce8ba 100644
--- a/l10ntools/Executable_helpindexer.mk
+++ b/l10ntools/Executable_helpindexer.mk
@@ -43,7 +43,7 @@ $(eval $(call gb_Executable_use_externals,HelpIndexer,\
clucene \
))
-$(eval $(call gb_Executable_add_cxxobjects,HelpIndexer,\
+$(eval $(call gb_Executable_add_exception_objects,HelpIndexer,\
l10ntools/source/help/HelpIndexer_main \
))
diff --git a/l10ntools/Executable_helplinker.mk b/l10ntools/Executable_helplinker.mk
index 443a821..534c10a 100644
--- a/l10ntools/Executable_helplinker.mk
+++ b/l10ntools/Executable_helplinker.mk
@@ -43,7 +43,7 @@ $(eval $(call gb_Executable_use_externals,HelpLinker,\
clucene \
))
-$(eval $(call gb_Executable_add_cxxobjects,HelpLinker,\
+$(eval $(call gb_Executable_add_exception_objects,HelpLinker,\
l10ntools/source/help/HelpLinker_main \
))
commit c182a752412aab354aaf02ee0c75b7cb1ee35d66
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon May 14 08:34:58 2012 +0100
convert GetComment family to rtl::OUString
Change-Id: I563ab83a24ca4f839892548b350486e83dd071d3
diff --git a/dbaccess/source/ui/inc/GeneralUndo.hxx b/dbaccess/source/ui/inc/GeneralUndo.hxx
index de99bd3..a5187fb 100644
--- a/dbaccess/source/ui/inc/GeneralUndo.hxx
+++ b/dbaccess/source/ui/inc/GeneralUndo.hxx
@@ -48,7 +48,7 @@ namespace dbaui
TYPEINFO();
OCommentUndoAction(sal_uInt16 nCommentID) { m_strComment = String(ModuleRes(nCommentID)); }
- virtual UniString GetComment() const { return m_strComment; }
+ virtual rtl::OUString GetComment() const { return m_strComment; }
};
}
#endif // DBAUI_GENERALUNDO_HXX
diff --git a/editeng/inc/editeng/editund2.hxx b/editeng/inc/editeng/editund2.hxx
index 6411da8..3ce3cc2 100644
--- a/editeng/inc/editeng/editund2.hxx
+++ b/editeng/inc/editeng/editund2.hxx
@@ -66,7 +66,7 @@ public:
virtual void Redo() = 0;
virtual sal_Bool CanRepeat(SfxRepeatTarget&) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
virtual sal_uInt16 GetId() const;
};
diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx
index d44a173..1db4c18 100644
--- a/editeng/source/editeng/editundo.cxx
+++ b/editeng/source/editeng/editundo.cxx
@@ -148,10 +148,11 @@ sal_Bool EditUndo::CanRepeat(SfxRepeatTarget&) const
return sal_False;
}
-XubString EditUndo::GetComment() const
+rtl::OUString EditUndo::GetComment() const
{
- String aComment;
- if ( mpEditEngine )
+ rtl::OUString aComment;
+
+ if (mpEditEngine)
aComment = mpEditEngine->GetUndoComment( GetId() );
return aComment;
diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx
index f700ee6..fdfc2fd 100644
--- a/framework/source/fwe/helper/undomanagerhelper.cxx
+++ b/framework/source/fwe/helper/undomanagerhelper.cxx
@@ -88,7 +88,7 @@ namespace framework
);
virtual ~UndoActionWrapper();
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
virtual void Undo();
virtual void Redo();
virtual sal_Bool CanRepeat(SfxRepeatTarget&) const;
@@ -121,9 +121,9 @@ namespace framework
}
//------------------------------------------------------------------------------------------------------------------
- String UndoActionWrapper::GetComment() const
+ rtl::OUString UndoActionWrapper::GetComment() const
{
- String sComment;
+ rtl::OUString sComment;
try
{
sComment = m_xUndoAction->getTitle();
diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx
index f63613a..fbdb238 100644
--- a/reportdesign/inc/UndoActions.hxx
+++ b/reportdesign/inc/UndoActions.hxx
@@ -186,7 +186,7 @@ namespace rptui
,sal_uInt16 nCommentID);
virtual ~OCommentUndoAction();
- virtual UniString GetComment() const { return m_strComment; }
+ virtual rtl::OUString GetComment() const { return m_strComment; }
virtual void Undo();
virtual void Redo();
};
@@ -292,7 +292,7 @@ namespace rptui
virtual void Undo();
virtual void Redo();
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
};
//==================================================================
diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx
index 36873ea..26bbb70 100644
--- a/reportdesign/source/core/sdr/UndoActions.cxx
+++ b/reportdesign/source/core/sdr/UndoActions.cxx
@@ -401,15 +401,14 @@ void ORptUndoPropertyAction::setProperty(sal_Bool _bOld)
}
}
-//------------------------------------------------------------------------------
-String ORptUndoPropertyAction::GetComment() const
+rtl::OUString ORptUndoPropertyAction::GetComment() const
{
String aStr(ModuleRes(RID_STR_UNDO_PROPERTY));
aStr.SearchAndReplace( '#', m_aPropertyName );
return aStr;
}
-// -----------------------------------------------------------------------------
+
OUndoPropertyGroupSectionAction::OUndoPropertyGroupSectionAction(SdrModel& _rMod
,const PropertyChangeEvent& evt
,::std::mem_fun_t< uno::Reference< report::XSection >
diff --git a/reportdesign/source/ui/inc/RptUndo.hxx b/reportdesign/source/ui/inc/RptUndo.hxx
index 504de52..81d8878 100644
--- a/reportdesign/source/ui/inc/RptUndo.hxx
+++ b/reportdesign/source/ui/inc/RptUndo.hxx
@@ -132,7 +132,7 @@ namespace rptui
,Action _eAction
,sal_uInt16 nCommentID);
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
};
/** /class OGroupUndo
diff --git a/reportdesign/source/ui/misc/RptUndo.cxx b/reportdesign/source/ui/misc/RptUndo.cxx
index ee5e01a..a57002b 100644
--- a/reportdesign/source/ui/misc/RptUndo.cxx
+++ b/reportdesign/source/ui/misc/RptUndo.cxx
@@ -287,7 +287,7 @@ OGroupSectionUndo::OGroupSectionUndo(OReportModel& _rMod,sal_uInt16 _nSlot
}
}
//----------------------------------------------------------------------------
-String OGroupSectionUndo::GetComment() const
+rtl::OUString OGroupSectionUndo::GetComment() const
{
if ( m_sName.isEmpty() )
{
@@ -298,8 +298,9 @@ String OGroupSectionUndo::GetComment() const
if ( xSection.is() )
m_sName = xSection->getName();
}
- catch(uno::Exception&)
- {}
+ catch (const uno::Exception&)
+ {
+ }
}
return m_strComment + m_sName;
}
diff --git a/sc/inc/undorangename.hxx b/sc/inc/undorangename.hxx
index 8a252c2..4f962dd 100644
--- a/sc/inc/undorangename.hxx
+++ b/sc/inc/undorangename.hxx
@@ -51,7 +51,7 @@ public:
virtual void Redo();
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
void DoChange(const boost::ptr_map<rtl::OUString, ScRangeName>& rNames);
@@ -73,7 +73,7 @@ public:
virtual void Redo();
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
ScRangeData* mpRangeData;
diff --git a/sc/source/ui/inc/undobase.hxx b/sc/source/ui/inc/undobase.hxx
index f997c2a..d625464 100644
--- a/sc/source/ui/inc/undobase.hxx
+++ b/sc/source/ui/inc/undobase.hxx
@@ -187,11 +187,11 @@ public:
virtual void Undo();
virtual void Redo();
virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual sal_Bool Merge( SfxUndoAction *pNextAction );
- virtual String GetComment() const;
+ virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual sal_Bool Merge( SfxUndoAction *pNextAction );
+ virtual rtl::OUString GetComment() const;
virtual String GetRepeatComment(SfxRepeatTarget&) const;
- virtual sal_uInt16 GetId() const;
+ virtual sal_uInt16 GetId() const;
};
diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx
index 255c59a..6d5d20e 100644
--- a/sc/source/ui/inc/undoblk.hxx
+++ b/sc/source/ui/inc/undoblk.hxx
@@ -68,7 +68,7 @@ public:
virtual void Repeat( SfxRepeatTarget& rTarget );
virtual sal_Bool CanRepeat( SfxRepeatTarget& rTarget ) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
virtual sal_Bool Merge( SfxUndoAction *pNextAction );
@@ -101,7 +101,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
ScRange aEffRange;
@@ -132,7 +132,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
sal_Bool bRows;
@@ -164,7 +164,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
ScMarkData aMarkData;
@@ -213,7 +213,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
ScMarkData aMarkData;
@@ -247,7 +247,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
ScRange aSrcRange;
@@ -280,7 +280,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
ScRange aRange;
@@ -314,7 +314,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
ScRange aRange;
@@ -353,7 +353,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
ScEditDataArray* GetDataArray();
private:
@@ -389,9 +389,9 @@ public:
virtual void Undo();
virtual void Redo();
virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
ScMarkData aMarkData;
@@ -427,7 +427,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
ScRange aSource;
@@ -459,7 +459,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
ScCellMergeOption maOption;
@@ -486,7 +486,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
ScDocument* pUndoDoc; // geloeschte Daten
@@ -512,7 +512,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
ScAddress aCursorPos;
@@ -547,7 +547,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
ScRange aRange;
@@ -575,9 +575,9 @@ public:
virtual void Undo();
virtual void Redo();
virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
ScMarkData aMarkData;
@@ -605,9 +605,9 @@ public:
virtual void Undo();
virtual void Redo();
virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
ScMarkData aMarkData;
@@ -637,7 +637,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
ScDocument* pUndoDoc;
@@ -660,9 +660,9 @@ public:
virtual void Undo();
virtual void Redo();
virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
ScDocument* pUndoDoc;
@@ -688,7 +688,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
virtual sal_uInt16 GetId() const;
private:
@@ -714,7 +714,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
ScDocument* pUndoDoc;
@@ -737,7 +737,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
ScDocument* pUndoDoc;
@@ -766,7 +766,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
String aDocName;
@@ -794,7 +794,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
String aDocName;
@@ -828,7 +828,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
String aOldDoc;
@@ -864,7 +864,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
ScMarkData aMarkData;
@@ -886,7 +886,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
ScMarkData aMarkData;
@@ -908,7 +908,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
ScMarkData aMarkData;
@@ -930,7 +930,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
SCTAB nTab;
@@ -952,7 +952,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
void SetCurTab();
@@ -978,7 +978,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
ScDocument* pUndoDoc;
diff --git a/sc/source/ui/inc/undocell.hxx b/sc/source/ui/inc/undocell.hxx
index 3ff3127..0b870c6 100644
--- a/sc/source/ui/inc/undocell.hxx
+++ b/sc/source/ui/inc/undocell.hxx
@@ -60,7 +60,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
/** once the objects are passed to this class, their life-cycle is
managed by this class; the calling function must pass new'ed
@@ -98,7 +98,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
String aNewString;
@@ -132,7 +132,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
ScAddress aPos;
@@ -159,7 +159,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
ScAddress aPos;
@@ -186,7 +186,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
SCCOL nCol;
@@ -211,7 +211,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
SCTAB nTab;
@@ -238,7 +238,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
SCCOL nCol;
@@ -286,7 +286,7 @@ public:
virtual void Repeat( SfxRepeatTarget& rTarget );
virtual sal_Bool CanRepeat( SfxRepeatTarget& rTarget ) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
void DoInsertNote( const ScNoteData& rNoteData );
@@ -314,7 +314,7 @@ public:
virtual void Repeat( SfxRepeatTarget& rTarget );
virtual sal_Bool CanRepeat( SfxRepeatTarget& rTarget ) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
ScAddress maPos;
@@ -337,7 +337,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
sal_Bool bIsDelete;
@@ -362,7 +362,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
ScRangeName* pOldRanges;
diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx
index 9c47c40..6966dd3 100644
--- a/sc/source/ui/inc/undodat.hxx
+++ b/sc/source/ui/inc/undodat.hxx
@@ -66,7 +66,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
SCCOLROW nStart;
@@ -96,7 +96,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
ScAddress aBlockStart;
@@ -122,7 +122,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
SCCOLROW nStart;
@@ -151,7 +151,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
ScAddress aBlockStart;
@@ -177,7 +177,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
ScAddress aBlockStart;
@@ -202,7 +202,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
ScAddress aBlockStart;
@@ -228,7 +228,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
SCTAB nTab;
@@ -257,7 +257,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
SCTAB nTab;
@@ -285,7 +285,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
SdrUndoAction* pDrawUndo;
@@ -320,7 +320,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
};
@@ -337,7 +337,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
ScDBCollection* pUndoColl;
@@ -361,7 +361,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
SCTAB nTab;
@@ -394,7 +394,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
ScAddress aBlockStart;
@@ -426,7 +426,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
ScDocument* pOldUndoDoc;
@@ -453,7 +453,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
ScArea aDestArea;
@@ -483,7 +483,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
String aChartName;
@@ -519,7 +519,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
boost::scoped_ptr<ScMarkData> mpMarkData;
diff --git a/sc/source/ui/inc/undodraw.hxx b/sc/source/ui/inc/undodraw.hxx
index 95b2dc6..7155215 100644
--- a/sc/source/ui/inc/undodraw.hxx
+++ b/sc/source/ui/inc/undodraw.hxx
@@ -53,11 +53,11 @@ public:
virtual void Undo();
virtual void Redo();
virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual sal_Bool Merge( SfxUndoAction *pNextAction );
- virtual String GetComment() const;
+ virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual sal_Bool Merge( SfxUndoAction *pNextAction );
+ virtual rtl::OUString GetComment() const;
virtual String GetRepeatComment(SfxRepeatTarget&) const;
- virtual sal_uInt16 GetId() const;
+ virtual sal_uInt16 GetId() const;
};
diff --git a/sc/source/ui/inc/undostyl.hxx b/sc/source/ui/inc/undostyl.hxx
index f5069ab..03e8819 100644
--- a/sc/source/ui/inc/undostyl.hxx
+++ b/sc/source/ui/inc/undostyl.hxx
@@ -81,7 +81,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
};
class ScUndoApplyPageStyle: public ScSimpleUndo
@@ -98,7 +98,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
struct ApplyStyleEntry
diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx
index d2dfedf..61200da 100644
--- a/sc/source/ui/inc/undotab.hxx
+++ b/sc/source/ui/inc/undotab.hxx
@@ -69,7 +69,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
String sNewName;
@@ -97,7 +97,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
@@ -128,7 +128,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
std::vector<SCTAB> theTabs;
@@ -155,7 +155,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
SCTAB nTab;
@@ -184,7 +184,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
::boost::shared_ptr< ::std::vector<SCTAB> > mpOldTabs;
@@ -213,7 +213,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
::boost::shared_ptr< ::std::vector<SCTAB> > mpOldTabs;
@@ -243,7 +243,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
-virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
ScUndoTabColorInfo::List aTabColorList;
@@ -269,7 +269,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
boost::scoped_ptr<ScMarkData> mpMarkData;
@@ -298,7 +298,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
SCTAB nTab;
@@ -325,7 +325,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
String aDocName;
@@ -355,7 +355,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
SCTAB nTab;
@@ -381,7 +381,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
SAL_WNODEPRECATED_DECLARATIONS_PUSH
@@ -409,7 +409,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
SCTAB mnTab;
@@ -434,7 +434,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
SCTAB nTab;
@@ -463,7 +463,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
SCTAB nTab;
@@ -493,7 +493,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
String aPersistName; // to find object (works only for OLE objects)
@@ -516,7 +516,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
SCTAB nTab;
diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx
index 8cf4e5c..822404c 100644
--- a/sc/source/ui/undo/undobase.cxx
+++ b/sc/source/ui/undo/undobase.cxx
@@ -564,12 +564,11 @@ void ScUndoWrapper::ForgetWrappedUndo()
pWrappedUndo = NULL; // don't delete in dtor - pointer must be stored outside
}
-String ScUndoWrapper::GetComment() const
+rtl::OUString ScUndoWrapper::GetComment() const
{
if (pWrappedUndo)
return pWrappedUndo->GetComment();
- else
- return String();
+ return rtl::OUString();
}
String ScUndoWrapper::GetRepeatComment(SfxRepeatTarget& rTarget) const
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
index 67a36c0..b822bc9 100644
--- a/sc/source/ui/undo/undoblk.cxx
+++ b/sc/source/ui/undo/undoblk.cxx
@@ -136,7 +136,7 @@ ScUndoInsertCells::~ScUndoInsertCells()
delete []pScenarios;
}
-String ScUndoInsertCells::GetComment() const
+rtl::OUString ScUndoInsertCells::GetComment() const
{
return ScGlobal::GetRscString( pPasteUndo ? STR_UNDO_PASTE : STR_UNDO_INSERTCELLS );
}
@@ -374,7 +374,7 @@ ScUndoDeleteCells::~ScUndoDeleteCells()
delete []pScenarios;
}
-String ScUndoDeleteCells::GetComment() const
+rtl::OUString ScUndoDeleteCells::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_DELETECELLS ); // "Loeschen"
}
@@ -596,7 +596,7 @@ ScUndoDeleteMulti::~ScUndoDeleteMulti()
delete [] pRanges;
}
-String ScUndoDeleteMulti::GetComment() const
+rtl::OUString ScUndoDeleteMulti::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_DELETECELLS ); // wie DeleteCells
}
@@ -785,7 +785,7 @@ ScUndoCut::~ScUndoCut()
delete pUndoDoc;
}
-String ScUndoCut::GetComment() const
+rtl::OUString ScUndoCut::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_CUT ); // "Ausschneiden"
}
@@ -906,7 +906,7 @@ ScUndoPaste::~ScUndoPaste()
delete pRefRedoData;
}
-String ScUndoPaste::GetComment() const
+rtl::OUString ScUndoPaste::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_PASTE ); // "Einfuegen"
}
@@ -1183,7 +1183,7 @@ ScUndoDragDrop::~ScUndoDragDrop()
{
}
-String ScUndoDragDrop::GetComment() const
+rtl::OUString ScUndoDragDrop::GetComment() const
{ // "Verschieben" : "Kopieren"
return bCut ?
ScGlobal::GetRscString( STR_UNDO_MOVE ) :
@@ -1412,7 +1412,7 @@ ScUndoListNames::~ScUndoListNames()
delete pRedoDoc;
}
-String ScUndoListNames::GetComment() const
+rtl::OUString ScUndoListNames::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_LISTNAMES );
}
@@ -1485,7 +1485,7 @@ ScUndoUseScenario::~ScUndoUseScenario()
delete pUndoDoc;
}
-String ScUndoUseScenario::GetComment() const
+rtl::OUString ScUndoUseScenario::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_USESCENARIO );
}
@@ -1608,7 +1608,7 @@ ScUndoSelectionStyle::~ScUndoSelectionStyle()
delete pUndoDoc;
}
-String ScUndoSelectionStyle::GetComment() const
+rtl::OUString ScUndoSelectionStyle::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_APPLYCELLSTYLE );
}
@@ -1719,7 +1719,7 @@ ScUndoEnterMatrix::~ScUndoEnterMatrix()
delete pUndoDoc;
}
-String ScUndoEnterMatrix::GetComment() const
+rtl::OUString ScUndoEnterMatrix::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_ENTERMATRIX );
}
@@ -1819,7 +1819,7 @@ ScUndoIndent::~ScUndoIndent()
delete pUndoDoc;
}
-String ScUndoIndent::GetComment() const
+rtl::OUString ScUndoIndent::GetComment() const
{
sal_uInt16 nId = bIsIncrement ? STR_UNDO_INC_INDENT : STR_UNDO_DEC_INDENT;
return ScGlobal::GetRscString( nId );
@@ -1881,7 +1881,7 @@ ScUndoTransliterate::~ScUndoTransliterate()
delete pUndoDoc;
}
-String ScUndoTransliterate::GetComment() const
+rtl::OUString ScUndoTransliterate::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_TRANSLITERATE );
}
@@ -1951,7 +1951,7 @@ ScUndoClearItems::~ScUndoClearItems()
delete pWhich;
}
-String ScUndoClearItems::GetComment() const
+rtl::OUString ScUndoClearItems::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_DELETECONTENTS );
}
@@ -2010,7 +2010,7 @@ ScUndoRemoveBreaks::~ScUndoRemoveBreaks()
delete pUndoDoc;
}
-String ScUndoRemoveBreaks::GetComment() const
+rtl::OUString ScUndoRemoveBreaks::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_REMOVEBREAKS );
}
@@ -2078,7 +2078,7 @@ ScUndoRemoveMerge::~ScUndoRemoveMerge()
delete pUndoDoc;
}
-String ScUndoRemoveMerge::GetComment() const
+rtl::OUString ScUndoRemoveMerge::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_REMERGE ); // "Zusammenfassung aufheben"
}
@@ -2226,7 +2226,7 @@ ScUndoBorder::~ScUndoBorder()
delete pInner;
}
-String ScUndoBorder::GetComment() const
+rtl::OUString ScUndoBorder::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_SELATTRLINES ); //! eigener String?
}
diff --git a/sc/source/ui/undo/undoblk2.cxx b/sc/source/ui/undo/undoblk2.cxx
index d7e37f9..8ae02a8 100644
--- a/sc/source/ui/undo/undoblk2.cxx
+++ b/sc/source/ui/undo/undoblk2.cxx
@@ -91,7 +91,7 @@ ScUndoWidthOrHeight::~ScUndoWidthOrHeight()
DeleteSdrUndoAction( pDrawUndo );
}
-String ScUndoWidthOrHeight::GetComment() const
+rtl::OUString ScUndoWidthOrHeight::GetComment() const
{
// [ "optimale " ] "Spaltenbreite" | "Zeilenhoehe"
return ( bWidth ?
diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx
index 78ea86b..6d00299 100644
--- a/sc/source/ui/undo/undoblk3.cxx
+++ b/sc/source/ui/undo/undoblk3.cxx
@@ -127,7 +127,7 @@ ScUndoDeleteContents::~ScUndoDeleteContents()
//----------------------------------------------------------------------------
-String ScUndoDeleteContents::GetComment() const
+rtl::OUString ScUndoDeleteContents::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_DELETECONTENTS ); // "Loeschen"
}
@@ -304,7 +304,7 @@ ScUndoFillTable::~ScUndoFillTable()
//----------------------------------------------------------------------------
-String ScUndoFillTable::GetComment() const
+rtl::OUString ScUndoFillTable::GetComment() const
{
return ScGlobal::GetRscString( STR_FILL_TAB );
}
@@ -475,7 +475,7 @@ ScUndoSelectionAttr::~ScUndoSelectionAttr()
//----------------------------------------------------------------------------
-String ScUndoSelectionAttr::GetComment() const
+rtl::OUString ScUndoSelectionAttr::GetComment() const
{
//"Attribute" "/Linien"
return ScGlobal::GetRscString( pLineOuter ? STR_UNDO_SELATTRLINES : STR_UNDO_SELATTR );
@@ -631,7 +631,7 @@ ScUndoAutoFill::~ScUndoAutoFill()
//----------------------------------------------------------------------------
-String ScUndoAutoFill::GetComment() const
+rtl::OUString ScUndoAutoFill::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_AUTOFILL ); //"Ausfuellen"
}
@@ -797,7 +797,7 @@ ScUndoMerge::~ScUndoMerge()
//----------------------------------------------------------------------------
-String ScUndoMerge::GetComment() const
+rtl::OUString ScUndoMerge::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_MERGE );
}
@@ -953,7 +953,7 @@ ScUndoAutoFormat::~ScUndoAutoFormat()
//----------------------------------------------------------------------------
-String ScUndoAutoFormat::GetComment() const
+rtl::OUString ScUndoAutoFormat::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_AUTOFORMAT ); //"Auto-Format"
}
@@ -1166,7 +1166,7 @@ void ScUndoReplace::SetChangeTrack()
//----------------------------------------------------------------------------
-String ScUndoReplace::GetComment() const
+rtl::OUString ScUndoReplace::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_REPLACE ); // "Ersetzen"
}
@@ -1344,7 +1344,7 @@ ScUndoTabOp::~ScUndoTabOp()
//----------------------------------------------------------------------------
-String ScUndoTabOp::GetComment() const
+rtl::OUString ScUndoTabOp::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_TABOP ); // "Mehrfachoperation"
}
@@ -1465,9 +1465,9 @@ void ScUndoConversion::SetChangeTrack()
//----------------------------------------------------------------------------
-String ScUndoConversion::GetComment() const
+rtl::OUString ScUndoConversion::GetComment() const
{
- String aText;
+ rtl::OUString aText;
switch( maConvParam.GetType() )
{
case SC_CONVERSION_SPELLCHECK: aText = ScGlobal::GetRscString( STR_UNDO_SPELLING ); break;
@@ -1574,7 +1574,7 @@ ScUndoRefConversion::~ScUndoRefConversion()
delete pRedoDoc;
}
-String ScUndoRefConversion::GetComment() const
+rtl::OUString ScUndoRefConversion::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_ENTERDATA ); // "Eingabe"
}
@@ -1667,7 +1667,7 @@ ScUndoRefreshLink::~ScUndoRefreshLink()
//----------------------------------------------------------------------------
-String ScUndoRefreshLink::GetComment() const
+rtl::OUString ScUndoRefreshLink::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_UPDATELINK );
}
@@ -1824,7 +1824,7 @@ ScUndoInsertAreaLink::~ScUndoInsertAreaLink()
//----------------------------------------------------------------------------
-String ScUndoInsertAreaLink::GetComment() const
+rtl::OUString ScUndoInsertAreaLink::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_INSERTAREALINK );
}
@@ -1914,7 +1914,7 @@ ScUndoRemoveAreaLink::~ScUndoRemoveAreaLink()
//----------------------------------------------------------------------------
-String ScUndoRemoveAreaLink::GetComment() const
+rtl::OUString ScUndoRemoveAreaLink::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_REMOVELINK ); //! eigener Text ??
}
@@ -2018,7 +2018,7 @@ ScUndoUpdateAreaLink::~ScUndoUpdateAreaLink()
//----------------------------------------------------------------------------
-String ScUndoUpdateAreaLink::GetComment() const
+rtl::OUString ScUndoUpdateAreaLink::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_UPDATELINK ); //! eigener Text ??
}
diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx
index 39efce6..0e139df 100644
--- a/sc/source/ui/undo/undocell.cxx
+++ b/sc/source/ui/undo/undocell.cxx
@@ -101,7 +101,7 @@ ScUndoCursorAttr::~ScUndoCursorAttr()
pPool->Remove(*pApplyPattern);
}
-String ScUndoCursorAttr::GetComment() const
+rtl::OUString ScUndoCursorAttr::GetComment() const
{
//! eigener Text fuer automatische Attributierung
@@ -222,7 +222,7 @@ ScUndoEnterData::~ScUndoEnterData()
delete pNewEditData;
}
-String ScUndoEnterData::GetComment() const
+rtl::OUString ScUndoEnterData::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_ENTERDATA ); // "Eingabe"
}
@@ -384,7 +384,7 @@ ScUndoEnterValue::~ScUndoEnterValue()
pOldCell->Delete();
}
-String ScUndoEnterValue::GetComment() const
+rtl::OUString ScUndoEnterValue::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_ENTERDATA ); // "Eingabe"
}
@@ -470,7 +470,7 @@ ScUndoPutCell::~ScUndoPutCell()
pEnteredCell->Delete();
}
-String ScUndoPutCell::GetComment() const
+rtl::OUString ScUndoPutCell::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_ENTERDATA ); // "Eingabe"
}
@@ -556,7 +556,7 @@ ScUndoPageBreak::~ScUndoPageBreak()
{
}
-String ScUndoPageBreak::GetComment() const
+rtl::OUString ScUndoPageBreak::GetComment() const
{
//"Spaltenumbruch" | "Zeilenumbruch" "einfuegen" | "loeschen"
return String ( bColumn ?
@@ -640,7 +640,7 @@ ScUndoPrintZoom::~ScUndoPrintZoom()
{
}
-String ScUndoPrintZoom::GetComment() const
+rtl::OUString ScUndoPrintZoom::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_PRINTSCALE );
}
@@ -730,7 +730,7 @@ ScUndoThesaurus::~ScUndoThesaurus()
delete pRedoTObject;
}
-String ScUndoThesaurus::GetComment() const
+rtl::OUString ScUndoThesaurus::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_THESAURUS ); // "Thesaurus"
}
@@ -886,7 +886,7 @@ sal_Bool ScUndoReplaceNote::CanRepeat( SfxRepeatTarget& /*rTarget*/ ) const
return false;
}
-String ScUndoReplaceNote::GetComment() const
+rtl::OUString ScUndoReplaceNote::GetComment() const
{
return ScGlobal::GetRscString( maNewData.mpCaption ?
(maOldData.mpCaption ? STR_UNDO_EDITNOTE : STR_UNDO_INSERTNOTE) : STR_UNDO_DELETENOTE );
@@ -958,7 +958,7 @@ sal_Bool ScUndoShowHideNote::CanRepeat( SfxRepeatTarget& /*rTarget*/ ) const
return false;
}
-String ScUndoShowHideNote::GetComment() const
+rtl::OUString ScUndoShowHideNote::GetComment() const
{
return ScGlobal::GetRscString( mbShown ? STR_UNDO_SHOWNOTE : STR_UNDO_HIDENOTE );
}
@@ -992,7 +992,7 @@ ScUndoDetective::~ScUndoDetective()
delete pOldList;
}
-String ScUndoDetective::GetComment() const
+rtl::OUString ScUndoDetective::GetComment() const
{
sal_uInt16 nId = STR_UNDO_DETDELALL;
if ( !bIsDelete )
@@ -1096,7 +1096,7 @@ ScUndoRangeNames::~ScUndoRangeNames()
delete pNewRanges;
}
-String ScUndoRangeNames::GetComment() const
+rtl::OUString ScUndoRangeNames::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_RANGENAMES );
}
diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx
index 8e0464e..df76885 100644
--- a/sc/source/ui/undo/undodat.cxx
+++ b/sc/source/ui/undo/undodat.cxx
@@ -104,7 +104,7 @@ ScUndoDoOutline::~ScUndoDoOutline()
delete pUndoDoc;
}
-String ScUndoDoOutline::GetComment() const
+rtl::OUString ScUndoDoOutline::GetComment() const
{ // Detail einblenden" "Detail ausblenden"
return bShow ?
ScGlobal::GetRscString( STR_UNDO_DOOUTLINE ) :
@@ -197,7 +197,7 @@ ScUndoMakeOutline::~ScUndoMakeOutline()
delete pUndoTable;
}
-String ScUndoMakeOutline::GetComment() const
+rtl::OUString ScUndoMakeOutline::GetComment() const
{ // "Gruppierung" "Gruppierung aufheben"
return bMake ?
ScGlobal::GetRscString( STR_UNDO_MAKEOUTLINE ) :
@@ -286,7 +286,7 @@ ScUndoOutlineLevel::~ScUndoOutlineLevel()
delete pUndoTable;
}
-String ScUndoOutlineLevel::GetComment() const
+rtl::OUString ScUndoOutlineLevel::GetComment() const
{ // "Gliederungsebene auswaehlen";
return ScGlobal::GetRscString( STR_UNDO_OUTLINELEVEL );
}
@@ -374,7 +374,7 @@ ScUndoOutlineBlock::~ScUndoOutlineBlock()
delete pUndoTable;
}
-String ScUndoOutlineBlock::GetComment() const
+rtl::OUString ScUndoOutlineBlock::GetComment() const
{ // "Detail einblenden" "Detail ausblenden"
return bShow ?
ScGlobal::GetRscString( STR_UNDO_DOOUTLINEBLK ) :
@@ -481,7 +481,7 @@ ScUndoRemoveAllOutlines::~ScUndoRemoveAllOutlines()
delete pUndoTable;
}
-String ScUndoRemoveAllOutlines::GetComment() const
+rtl::OUString ScUndoRemoveAllOutlines::GetComment() const
{ // "Gliederung entfernen"
return ScGlobal::GetRscString( STR_UNDO_REMOVEALLOTLNS );
}
@@ -572,7 +572,7 @@ ScUndoAutoOutline::~ScUndoAutoOutline()
delete pUndoTable;
}
-String ScUndoAutoOutline::GetComment() const
+rtl::OUString ScUndoAutoOutline::GetComment() const
{ // "Auto-Gliederung"
return ScGlobal::GetRscString( STR_UNDO_AUTOOUTLINE );
}
@@ -687,7 +687,7 @@ ScUndoSubTotals::~ScUndoSubTotals()
delete pUndoDB;
}
-String ScUndoSubTotals::GetComment() const
+rtl::OUString ScUndoSubTotals::GetComment() const
{ // "Teilergebnisse"
return ScGlobal::GetRscString( STR_UNDO_SUBTOTALS );
}
@@ -818,7 +818,7 @@ ScUndoSort::~ScUndoSort()
delete pUndoDB;
}
-String ScUndoSort::GetComment() const
+rtl::OUString ScUndoSort::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_SORT );
}
@@ -949,7 +949,7 @@ ScUndoQuery::~ScUndoQuery()
DeleteSdrUndoAction( pDrawUndo );
}
-String ScUndoQuery::GetComment() const
+rtl::OUString ScUndoQuery::GetComment() const
{ // "Filtern";
return ScGlobal::GetRscString( STR_UNDO_QUERY );
}
@@ -1100,7 +1100,7 @@ ScUndoAutoFilter::~ScUndoAutoFilter()
{
}
-String ScUndoAutoFilter::GetComment() const
+rtl::OUString ScUndoAutoFilter::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_QUERY ); // same as ScUndoQuery
}
@@ -1183,7 +1183,7 @@ ScUndoDBData::~ScUndoDBData()
delete pRedoColl;
}
-String ScUndoDBData::GetComment() const
+rtl::OUString ScUndoDBData::GetComment() const
{ // "Datenbankbereiche aendern";
return ScGlobal::GetRscString( STR_UNDO_DBDATA );
}
@@ -1265,7 +1265,7 @@ ScUndoImportData::~ScUndoImportData()
delete pRedoDBData;
}
-String ScUndoImportData::GetComment() const
+rtl::OUString ScUndoImportData::GetComment() const
{ // "Importieren";
return ScGlobal::GetRscString( STR_UNDO_IMPORTDATA );
}
@@ -1493,7 +1493,7 @@ ScUndoRepeatDB::~ScUndoRepeatDB()
delete pUndoDB;
}
-String ScUndoRepeatDB::GetComment() const
+rtl::OUString ScUndoRepeatDB::GetComment() const
{ // "Wiederholen"; //! bessere Beschreibung!
return ScGlobal::GetRscString( STR_UNDO_REPEATDB );
}
@@ -1657,7 +1657,7 @@ ScUndoDataPilot::~ScUndoDataPilot()
delete pNewUndoDoc;
}
-String ScUndoDataPilot::GetComment() const
+rtl::OUString ScUndoDataPilot::GetComment() const
{
sal_uInt16 nIndex;
if ( pOldUndoDoc && pNewUndoDoc )
@@ -1820,7 +1820,7 @@ ScUndoConsolidate::~ScUndoConsolidate()
delete pUndoData;
}
-String ScUndoConsolidate::GetComment() const
+rtl::OUString ScUndoConsolidate::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_CONSOLIDATE );
}
@@ -1984,7 +1984,7 @@ ScUndoChartData::~ScUndoChartData()
{
}
-String ScUndoChartData::GetComment() const
+rtl::OUString ScUndoChartData::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_CHARTDATA );
}
@@ -2058,7 +2058,7 @@ ScUndoDataForm::~ScUndoDataForm()
delete pRefRedoData;
}
-String ScUndoDataForm::GetComment() const
+rtl::OUString ScUndoDataForm::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_PASTE );
}
diff --git a/sc/source/ui/undo/undodraw.cxx b/sc/source/ui/undo/undodraw.cxx
index 8bc0c1c..aa2444d 100644
--- a/sc/source/ui/undo/undodraw.cxx
+++ b/sc/source/ui/undo/undodraw.cxx
@@ -58,12 +58,11 @@ void ScUndoDraw::ForgetDrawUndo()
pDrawUndo = NULL; // nicht loeschen (Draw-Undo muss dann von aussen gemerkt werden)
}
-String ScUndoDraw::GetComment() const
+rtl::OUString ScUndoDraw::GetComment() const
{
if (pDrawUndo)
return pDrawUndo->GetComment();
- else
- return String();
+ return rtl::OUString();
}
String ScUndoDraw::GetRepeatComment(SfxRepeatTarget& rTarget) const
diff --git a/sc/source/ui/undo/undorangename.cxx b/sc/source/ui/undo/undorangename.cxx
index 9bf31b2..9330c36 100644
--- a/sc/source/ui/undo/undorangename.cxx
+++ b/sc/source/ui/undo/undorangename.cxx
@@ -87,7 +87,7 @@ sal_Bool ScUndoAllRangeNames::CanRepeat(SfxRepeatTarget& /*rTarget*/) const
return sal_False;
}
-String ScUndoAllRangeNames::GetComment() const
+rtl::OUString ScUndoAllRangeNames::GetComment() const
{
return ScGlobal::GetRscString(STR_UNDO_RANGENAMES);
}
@@ -160,7 +160,7 @@ sal_Bool ScUndoAddRangeData::CanRepeat(SfxRepeatTarget& /*rTarget*/) const
return sal_False;
}
-String ScUndoAddRangeData::GetComment() const
+rtl::OUString ScUndoAddRangeData::GetComment() const
{
return ScGlobal::GetRscString(STR_UNDO_RANGENAMES);
}
diff --git a/sc/source/ui/undo/undostyl.cxx b/sc/source/ui/undo/undostyl.cxx
index 48f2fa9..4de3c28 100644
--- a/sc/source/ui/undo/undostyl.cxx
+++ b/sc/source/ui/undo/undostyl.cxx
@@ -115,7 +115,7 @@ ScUndoModifyStyle::~ScUndoModifyStyle()
{
}
-String ScUndoModifyStyle::GetComment() const
+rtl::OUString ScUndoModifyStyle::GetComment() const
{
sal_uInt16 nId = (eFamily == SFX_STYLE_FAMILY_PARA) ?
STR_UNDO_EDITCELLSTYLE :
@@ -269,7 +269,7 @@ void ScUndoApplyPageStyle::AddSheetAction( SCTAB nTab, const String& rOldStyle )
maEntries.push_back( ApplyStyleEntry( nTab, rOldStyle ) );
}
-String ScUndoApplyPageStyle::GetComment() const
+rtl::OUString ScUndoApplyPageStyle::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_APPLYPAGESTYLE );
}
diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx
index a49cae9..ac86110 100644
--- a/sc/source/ui/undo/undotab.cxx
+++ b/sc/source/ui/undo/undotab.cxx
@@ -111,7 +111,7 @@ ScUndoInsertTab::~ScUndoInsertTab()
DeleteSdrUndoAction( pDrawUndo );
}
-String ScUndoInsertTab::GetComment() const
+rtl::OUString ScUndoInsertTab::GetComment() const
{
if (bAppend)
return ScGlobal::GetRscString( STR_UNDO_APPEND_TAB );
@@ -210,7 +210,7 @@ ScUndoInsertTables::~ScUndoInsertTables()
DeleteSdrUndoAction( pDrawUndo );
}
-String ScUndoInsertTables::GetComment() const
+rtl::OUString ScUndoInsertTables::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_INSERT_TAB );
}
@@ -306,7 +306,7 @@ ScUndoDeleteTab::~ScUndoDeleteTab()
theTabs.clear();
}
-String ScUndoDeleteTab::GetComment() const
+rtl::OUString ScUndoDeleteTab::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_DELETE_TAB );
}
@@ -473,7 +473,7 @@ ScUndoRenameTab::~ScUndoRenameTab()
{
}
-String ScUndoRenameTab::GetComment() const
+rtl::OUString ScUndoRenameTab::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_RENAME_TAB );
}
@@ -541,7 +541,7 @@ ScUndoMoveTab::~ScUndoMoveTab()
{
}
-String ScUndoMoveTab::GetComment() const
+rtl::OUString ScUndoMoveTab::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_MOVE_TAB );
}
@@ -654,7 +654,7 @@ ScUndoCopyTab::~ScUndoCopyTab()
DeleteSdrUndoAction( pDrawUndo );
}
-String ScUndoCopyTab::GetComment() const
+rtl::OUString ScUndoCopyTab::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_COPY_TAB );
}
@@ -799,7 +799,7 @@ ScUndoTabColor::~ScUndoTabColor()
{
}
-String ScUndoTabColor::GetComment() const
+rtl::OUString ScUndoTabColor::GetComment() const
{
if (aTabColorList.size() > 1)
return ScGlobal::GetRscString(STR_UNDO_SET_MULTI_TAB_BG_COLOR);
@@ -873,7 +873,7 @@ ScUndoMakeScenario::~ScUndoMakeScenario()
DeleteSdrUndoAction( pDrawUndo );
}
-String ScUndoMakeScenario::GetComment() const
+rtl::OUString ScUndoMakeScenario::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_MAKESCENARIO );
}
@@ -961,7 +961,7 @@ ScUndoImportTab::~ScUndoImportTab()
DeleteSdrUndoAction( pDrawUndo );
}
-String ScUndoImportTab::GetComment() const
+rtl::OUString ScUndoImportTab::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_INSERT_TAB );
}
@@ -1148,7 +1148,7 @@ ScUndoRemoveLink::~ScUndoRemoveLink()
delete[] pTabNames;
}
-String ScUndoRemoveLink::GetComment() const
+rtl::OUString ScUndoRemoveLink::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_REMOVELINK );
}
@@ -1238,7 +1238,7 @@ sal_Bool ScUndoShowHideTab::CanRepeat(SfxRepeatTarget& rTarget) const
return (rTarget.ISA(ScTabViewTarget));
}
-String ScUndoShowHideTab::GetComment() const
+rtl::OUString ScUndoShowHideTab::GetComment() const
{
sal_uInt16 nId = bShow ? STR_UNDO_SHOWTAB : STR_UNDO_HIDETAB;
return ScGlobal::GetRscString( nId );
@@ -1311,7 +1311,7 @@ sal_Bool ScUndoDocProtect::CanRepeat(SfxRepeatTarget& /* rTarget */) const
return false; // gippsnich
}
-String ScUndoDocProtect::GetComment() const
+rtl::OUString ScUndoDocProtect::GetComment() const
{
sal_uInt16 nId = mpProtectSettings->isProtected() ? STR_UNDO_PROTECT_DOC : STR_UNDO_UNPROTECT_DOC;
return ScGlobal::GetRscString( nId );
@@ -1385,7 +1385,7 @@ sal_Bool ScUndoTabProtect::CanRepeat(SfxRepeatTarget& /* rTarget */) const
return false; // gippsnich
}
-String ScUndoTabProtect::GetComment() const
+rtl::OUString ScUndoTabProtect::GetComment() const
{
sal_uInt16 nId = mpProtectSettings->isProtected() ? STR_UNDO_PROTECT_TAB : STR_UNDO_UNPROTECT_TAB;
return ScGlobal::GetRscString( nId );
@@ -1452,7 +1452,7 @@ sal_Bool ScUndoPrintRange::CanRepeat(SfxRepeatTarget& /* rTarget */) const
return false; // gippsnich
}
-String ScUndoPrintRange::GetComment() const
+rtl::OUString ScUndoPrintRange::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_PRINTRANGES );
}
@@ -1485,7 +1485,7 @@ ScUndoScenarioFlags::~ScUndoScenarioFlags()
{
}
-String ScUndoScenarioFlags::GetComment() const
+rtl::OUString ScUndoScenarioFlags::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_EDITSCENARIO );
}
@@ -1554,7 +1554,7 @@ ScUndoRenameObject::~ScUndoRenameObject()
{
}
-String ScUndoRenameObject::GetComment() const
+rtl::OUString ScUndoRenameObject::GetComment() const
{
// string resource shared with title for dialog
return String( ScResId(SCSTR_RENAMEOBJECT) );
@@ -1671,7 +1671,7 @@ sal_Bool ScUndoLayoutRTL::CanRepeat(SfxRepeatTarget& rTarget) const
return (rTarget.ISA(ScTabViewTarget));
}
-String ScUndoLayoutRTL::GetComment() const
+rtl::OUString ScUndoLayoutRTL::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_TAB_RTL );
}
diff --git a/sd/inc/sdundo.hxx b/sd/inc/sdundo.hxx
index bbf39e2..6356dd4 100644
--- a/sd/inc/sdundo.hxx
+++ b/sd/inc/sdundo.hxx
@@ -43,7 +43,7 @@ public:
virtual ~SdUndoAction() {}
void SetComment(String& rStr) { maComment = rStr; }
- virtual String GetComment() const { return maComment; }
+ virtual rtl::OUString GetComment() const { return maComment; }
virtual SdUndoAction* Clone() const { return NULL; }
protected:
diff --git a/sd/inc/undoanim.hxx b/sd/inc/undoanim.hxx
index 9af8027..5bb678c 100644
--- a/sd/inc/undoanim.hxx
+++ b/sd/inc/undoanim.hxx
@@ -51,7 +51,7 @@ public:
virtual void Undo();
virtual void Redo();
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
UndoAnimationImpl* mpImpl;
@@ -67,7 +67,7 @@ public:
virtual void Undo();
virtual void Redo();
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
UndoAnimationPathImpl* mpImpl;
@@ -84,7 +84,7 @@ public:
virtual void Undo();
virtual void Redo();
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
UndoTransitionImpl* mpImpl;
diff --git a/sd/source/core/undoanim.cxx b/sd/source/core/undoanim.cxx
index 79f6ede..f20b831 100644
--- a/sd/source/core/undoanim.cxx
+++ b/sd/source/core/undoanim.cxx
@@ -115,9 +115,9 @@ void UndoAnimation::Redo()
}
}
-String UndoAnimation::GetComment() const
+rtl::OUString UndoAnimation::GetComment() const
{
- return String(SdResId(STR_UNDO_ANIMATION));
+ return SdResId(STR_UNDO_ANIMATION).toString();
}
struct UndoAnimationPathImpl
@@ -193,9 +193,9 @@ void UndoAnimationPath::Redo()
}
}
-String UndoAnimationPath::GetComment() const
+rtl::OUString UndoAnimationPath::GetComment() const
{
- return String(SdResId(STR_UNDO_ANIMATION));
+ return SdResId(STR_UNDO_ANIMATION).toString();
}
struct UndoTransitionImpl
@@ -284,9 +284,9 @@ void UndoTransition::Redo()
mpImpl->mpPage->mbStopSound = mpImpl->mbNewStopSound;
}
-String UndoTransition::GetComment() const
+rtl::OUString UndoTransition::GetComment() const
{
- return String(SdResId(STR_UNDO_SLIDE_PARAMS));
+ return SdResId(STR_UNDO_SLIDE_PARAMS).toString();
}
}
diff --git a/sd/source/ui/dlg/unchss.cxx b/sd/source/ui/dlg/unchss.cxx
index fba5c61..5b53ba0 100644
--- a/sd/source/ui/dlg/unchss.cxx
+++ b/sd/source/ui/dlg/unchss.cxx
@@ -171,7 +171,7 @@ StyleSheetUndoAction::~StyleSheetUndoAction()
|*
\************************************************************************/
-String StyleSheetUndoAction::GetComment() const
+rtl::OUString StyleSheetUndoAction::GetComment() const
{
return aComment;
}
diff --git a/sd/source/ui/func/unmovss.cxx b/sd/source/ui/func/unmovss.cxx
index 2b3d2b0..e849da1 100644
--- a/sd/source/ui/func/unmovss.cxx
+++ b/sd/source/ui/func/unmovss.cxx
@@ -99,9 +99,9 @@ SdMoveStyleSheetsUndoAction::~SdMoveStyleSheetsUndoAction()
{
}
-String SdMoveStyleSheetsUndoAction::GetComment() const
+rtl::OUString SdMoveStyleSheetsUndoAction::GetComment() const
{
- return String();
+ return rtl::OUString();
}
diff --git a/sd/source/ui/func/unprlout.cxx b/sd/source/ui/func/unprlout.cxx
index 60ff3a4..6ace0a2 100644
--- a/sd/source/ui/func/unprlout.cxx
+++ b/sd/source/ui/func/unprlout.cxx
@@ -109,7 +109,7 @@ SdPresentationLayoutUndoAction::~SdPresentationLayoutUndoAction()
|*
\************************************************************************/
-String SdPresentationLayoutUndoAction::GetComment() const
+rtl::OUString SdPresentationLayoutUndoAction::GetComment() const
{
return aComment;
}
diff --git a/sd/source/ui/inc/unchss.hxx b/sd/source/ui/inc/unchss.hxx
index 4810877..64cef96 100644
--- a/sd/source/ui/inc/unchss.hxx
+++ b/sd/source/ui/inc/unchss.hxx
@@ -53,7 +53,7 @@ public:
virtual void Undo();
virtual void Redo();
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
};
#endif // _SD_UNCHSS_HXX
diff --git a/sd/source/ui/inc/unmodpg.hxx b/sd/source/ui/inc/unmodpg.hxx
index 83fc603..8c73346 100644
--- a/sd/source/ui/inc/unmodpg.hxx
+++ b/sd/source/ui/inc/unmodpg.hxx
@@ -63,7 +63,7 @@ public:
virtual void Undo();
virtual void Redo();
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
};
// --------------------------------------------------------------------
@@ -76,7 +76,7 @@ public:
virtual void Undo();
virtual void Redo();
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
private:
String maOldName;
diff --git a/sd/source/ui/inc/unmovss.hxx b/sd/source/ui/inc/unmovss.hxx
index 4299a07..595142b 100644
--- a/sd/source/ui/inc/unmovss.hxx
+++ b/sd/source/ui/inc/unmovss.hxx
@@ -48,7 +48,7 @@ public:
virtual void Undo();
virtual void Redo();
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
};
#endif // _SD_UNMOVSS_HXX
diff --git a/sd/source/ui/inc/unprlout.hxx b/sd/source/ui/inc/unprlout.hxx
index c9130e6..51b0022 100644
--- a/sd/source/ui/inc/unprlout.hxx
+++ b/sd/source/ui/inc/unprlout.hxx
@@ -59,7 +59,7 @@ public:
virtual void Undo();
virtual void Redo();
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
};
#endif // _SD_UNPRLOUT_HXX
diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx
index 615f09c..baead6b 100644
--- a/sd/source/ui/view/unmodpg.cxx
+++ b/sd/source/ui/view/unmodpg.cxx
@@ -203,7 +203,7 @@ ModifyPageUndoAction::~ModifyPageUndoAction()
|*
\************************************************************************/
-String ModifyPageUndoAction::GetComment() const
+rtl::OUString ModifyPageUndoAction::GetComment() const
{
return maComment;
}
@@ -239,7 +239,7 @@ void RenameLayoutTemplateUndoAction::Redo()
mpDoc->RenameLayoutTemplate( aLayoutName, maNewName );
}
-String RenameLayoutTemplateUndoAction::GetComment() const
+rtl::OUString RenameLayoutTemplateUndoAction::GetComment() const
{
return maComment;
}
diff --git a/starmath/inc/action.hxx b/starmath/inc/action.hxx
index 2463edc..332b391 100644
--- a/starmath/inc/action.hxx
+++ b/starmath/inc/action.hxx
@@ -46,7 +46,7 @@ public:
virtual void Undo();
virtual void Redo();
virtual void Repeat(SfxRepeatTarget& rDocSh);
- virtual UniString GetComment() const;
+ virtual rtl::OUString GetComment() const;
};
#endif
diff --git a/starmath/source/action.cxx b/starmath/source/action.cxx
index 0e33d63..5747dff 100644
--- a/starmath/source/action.cxx
+++ b/starmath/source/action.cxx
@@ -58,9 +58,9 @@ void SmFormatAction::Repeat(SfxRepeatTarget& rDocSh)
dynamic_cast< SmDocShell & >(rDocSh).SetFormat(aNewFormat);
}
-UniString SmFormatAction::GetComment() const
+rtl::OUString SmFormatAction::GetComment() const
{
- return (SmResId(RID_UNDOFORMATNAME));
+ return SmResId(RID_UNDOFORMATNAME).toString();
}
diff --git a/svl/inc/svl/undo.hxx b/svl/inc/svl/undo.hxx
index 828810a..a6b3fd6 100644
--- a/svl/inc/svl/undo.hxx
+++ b/svl/inc/svl/undo.hxx
@@ -76,7 +76,7 @@ public:
virtual sal_Bool Merge( SfxUndoAction *pNextAction );
- virtual UniString GetComment() const;
+ virtual rtl::OUString GetComment() const;
virtual UniString GetRepeatComment(SfxRepeatTarget&) const;
virtual sal_uInt16 GetId() const;
@@ -183,7 +183,7 @@ class SVL_DLLPUBLIC SfxListUndoAction : public SfxUndoAction, public SfxUndoArra
virtual sal_Bool Merge( SfxUndoAction *pNextAction );
- virtual UniString GetComment() const;
+ virtual rtl::OUString GetComment() const;
virtual UniString GetRepeatComment(SfxRepeatTarget&) const;
virtual sal_uInt16 GetId() const;
@@ -462,7 +462,7 @@ public:
virtual void Repeat(SfxRepeatTarget&r);
- virtual UniString GetComment() const;
+ virtual rtl::OUString GetComment() const;
virtual UniString GetRepeatComment(SfxRepeatTarget&r) const;
virtual sal_uInt16 GetId() const;
diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx
index 449b79a..9183664 100644
--- a/svl/source/undo/undo.cxx
+++ b/svl/source/undo/undo.cxx
@@ -103,10 +103,10 @@ sal_Bool SfxUndoAction::Merge( SfxUndoAction * )
//------------------------------------------------------------------------
-XubString SfxUndoAction::GetComment() const
+rtl::OUString SfxUndoAction::GetComment() const
{
DBG_CHKTHIS(SfxUndoAction, 0);
- return XubString();
+ return rtl::OUString();
}
//------------------------------------------------------------------------
@@ -1159,11 +1159,11 @@ size_t SfxUndoManager::ImplLeaveListAction( const bool i_merge, UndoManagerGuard
}
// if the undo array has no comment, try to get it from its children
- if ( pListAction->GetComment().Len() == 0 )
+ if ( pListAction->GetComment().isEmpty() )
{
for( size_t n = 0; n < pListAction->aUndoActions.size(); n++ )
{
- if( pListAction->aUndoActions[n].pAction->GetComment().Len() )
+ if (!pListAction->aUndoActions[n].pAction->GetComment().isEmpty())
{
pListAction->SetComment( pListAction->aUndoActions[n].pAction->GetComment() );
break;
@@ -1294,7 +1294,7 @@ sal_uInt16 SfxListUndoAction::GetId() const
//------------------------------------------------------------------------
-XubString SfxListUndoAction::GetComment() const
+rtl::OUString SfxListUndoAction::GetComment() const
{
return aComment;
}
@@ -1454,12 +1454,11 @@ void SfxLinkUndoAction::Repeat(SfxRepeatTarget&r)
//------------------------------------------------------------------------
-XubString SfxLinkUndoAction::GetComment() const
+rtl::OUString SfxLinkUndoAction::GetComment() const
{
if ( pAction )
return pAction->GetComment();
- else
- return XubString();
+ return rtl::OUString();
}
diff --git a/svtools/source/edit/textundo.cxx b/svtools/source/edit/textundo.cxx
index 2de942f..1b82d0f 100644
--- a/svtools/source/edit/textundo.cxx
+++ b/svtools/source/edit/textundo.cxx
@@ -117,10 +117,9 @@ TextUndo::~TextUndo()
{
}
-XubString TextUndo::GetComment() const
+rtl::OUString TextUndo::GetComment() const
{
-// return mpTextEngine->GetUndoComment( this );
- return String();
+ return rtl::OUString();
}
void TextUndo::SetSelection( const TextSelection& rSel )
diff --git a/svtools/source/edit/textundo.hxx b/svtools/source/edit/textundo.hxx
index b8189ea..f86f877 100644
--- a/svtools/source/edit/textundo.hxx
+++ b/svtools/source/edit/textundo.hxx
@@ -77,7 +77,7 @@ public:
virtual void Undo() = 0;
virtual void Redo() = 0;
- virtual XubString GetComment() const;
+ virtual rtl::OUString GetComment() const;
};
#endif // _TEXTUNDO_HXX
diff --git a/svx/inc/svx/svdundo.hxx b/svx/inc/svx/svdundo.hxx
index 5b924a4..3b0436a 100644
--- a/svx/inc/svx/svdundo.hxx
+++ b/svx/inc/svx/svdundo.hxx
@@ -115,7 +115,7 @@ public:
void SetComment(const String& rStr) { aComment=rStr; }
void SetObjDescription(const String& rStr) { aObjDescription=rStr; }
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
virtual String GetSdrRepeatComment(SdrView& rView) const;
virtual void Undo();
@@ -188,7 +188,7 @@ public:
virtual void Undo();
virtual void Redo();
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
virtual String GetSdrRepeatComment(SdrView& rView) const;
virtual void SdrRepeat(SdrView& rView);
@@ -218,7 +218,7 @@ public:
virtual void Undo();
virtual void Redo();
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
virtual String GetSdrRepeatComment(SdrView& rView) const;
virtual void SdrRepeat(SdrView& rView);
@@ -248,7 +248,7 @@ public:
virtual void Undo();
virtual void Redo();
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
};
//************************************************************
@@ -334,7 +334,7 @@ public:
virtual void Undo();
virtual void Redo();
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
virtual String GetSdrRepeatComment(SdrView& rView) const;
virtual void SdrRepeat(SdrView& rView);
@@ -358,9 +358,9 @@ public:
virtual void Undo();
virtual void Redo();
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
- static String GetComment( const SdrObject& _rForObject );
+ static rtl::OUString GetComment( const SdrObject& _rForObject );
};
//************************************************************
@@ -409,7 +409,7 @@ public:
SdrUndoCopyObj(SdrObject& rNewObj, bool bOrdNumDirect = false)
: SdrUndoNewObj(rNewObj,bOrdNumDirect) {}
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
};
//************************************************************
@@ -428,7 +428,7 @@ public:
virtual void Undo();
virtual void Redo();
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
};
//////////////////////////////////////////////////////////////////////////////
@@ -470,7 +470,7 @@ public:
virtual void Undo();
virtual void Redo();
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
virtual String GetSdrRepeatComment(SdrView& rView) const;
virtual void SdrRepeat(SdrView& rView);
@@ -502,7 +502,7 @@ public:
virtual void Undo();
virtual void Redo();
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
};
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -553,7 +553,7 @@ public:
virtual void Undo();
virtual void Redo();
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
};
//************************************************************
@@ -572,7 +572,7 @@ public:
virtual void Undo();
virtual void Redo();
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
};
//************************************************************
@@ -593,7 +593,7 @@ public:
virtual void Undo();
virtual void Redo();
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
};
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -674,7 +674,7 @@ public:
virtual void Undo();
virtual void Redo();
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
virtual String GetSdrRepeatComment(SdrView& rView) const;
virtual void SdrRepeat(SdrView& rView);
@@ -697,7 +697,7 @@ public:
virtual void Undo();
virtual void Redo();
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
};
//************************************************************
@@ -713,7 +713,7 @@ class SdrUndoCopyPage : public SdrUndoNewPage
public:
SdrUndoCopyPage(SdrPage& rNewPg): SdrUndoNewPage(rNewPg) {}
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
virtual String GetSdrRepeatComment(SdrView& rView) const;
virtual void SdrRepeat(SdrView& rView);
@@ -741,7 +741,7 @@ public:
virtual void Undo();
virtual void Redo();
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
};
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -794,7 +794,7 @@ public:
virtual void Undo();
virtual void Redo();
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
};
//************************************************************
@@ -818,7 +818,7 @@ public:
virtual void Undo();
virtual void Redo();
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
};
///////////////////////////////////////////////////////////////////////
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 67f89bc..9c8d965 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -1055,7 +1055,7 @@ void FmUndoPropertyAction::Redo()
}
//------------------------------------------------------------------------------
-String FmUndoPropertyAction::GetComment() const
+rtl::OUString FmUndoPropertyAction::GetComment() const
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmUndoPropertyAction::GetComment" );
String aStr(static_STR_UNDO_PROPERTY);
@@ -1315,10 +1315,10 @@ void FmUndoModelReplaceAction::Undo()
}
//------------------------------------------------------------------------------
-String FmUndoModelReplaceAction::GetComment() const
+rtl::OUString FmUndoModelReplaceAction::GetComment() const
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmUndoModelReplaceAction::GetComment" );
- return SVX_RES(RID_STR_UNDO_MODEL_REPLACE);
+ return SVX_RESSTR(RID_STR_UNDO_MODEL_REPLACE);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx
index 3396bca..c6ef1e3 100644
--- a/svx/source/inc/fmundo.hxx
+++ b/svx/source/inc/fmundo.hxx
@@ -80,7 +80,7 @@ public:
virtual void Undo();
virtual void Redo();
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
};
@@ -142,7 +142,7 @@ public:
virtual void Undo();
virtual void Redo() { Undo(); }
- virtual String GetComment() const;
+ virtual rtl::OUString GetComment() const;
static void DisposeElement( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel>& xReplaced );
};
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 48c4180..b3fca80 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -143,7 +143,7 @@ void SdrUndoGroup::Redo()
}
}
-XubString SdrUndoGroup::GetComment() const
+rtl::OUString SdrUndoGroup::GetComment() const
{
XubString aRet(aComment);
@@ -506,7 +506,7 @@ void SdrUndoAttrObj::Redo()
ImpShowPageOfThisObject();
}
-XubString SdrUndoAttrObj::GetComment() const
+rtl::OUString SdrUndoAttrObj::GetComment() const
{
XubString aStr;
@@ -569,7 +569,7 @@ void SdrUndoMoveObj::Redo()
ImpShowPageOfThisObject();
}
-XubString SdrUndoMoveObj::GetComment() const
+rtl::OUString SdrUndoMoveObj::GetComment() const
{
XubString aStr;
ImpTakeDescriptionStr(STR_EditMove,aStr);
@@ -664,7 +664,7 @@ void SdrUndoGeoObj::Redo()
ImpShowPageOfThisObject();
}
-XubString SdrUndoGeoObj::GetComment() const
+rtl::OUString SdrUndoGeoObj::GetComment() const
{
XubString aStr;
ImpTakeDescriptionStr(STR_DragMethObjOwn,aStr);
@@ -818,7 +818,7 @@ void SdrUndoDelObj::Redo()
SetOwner(sal_True);
}
-XubString SdrUndoDelObj::GetComment() const
+rtl::OUString SdrUndoDelObj::GetComment() const
{
XubString aStr;
ImpTakeDescriptionStr(STR_EditDelete,aStr);
@@ -858,14 +858,14 @@ void SdrUndoNewObj::Redo()
SetOwner(sal_False);
}
-String SdrUndoNewObj::GetComment( const SdrObject& _rForObject )
+rtl::OUString SdrUndoNewObj::GetComment( const SdrObject& _rForObject )
{
String sComment;
GetDescriptionStringForObject( _rForObject, STR_UndoInsertObj, sComment );
return sComment;
}
-XubString SdrUndoNewObj::GetComment() const
+rtl::OUString SdrUndoNewObj::GetComment() const
{
XubString aStr;
ImpTakeDescriptionStr(STR_UndoInsertObj,aStr);
@@ -963,7 +963,7 @@ void SdrUndoReplaceObj::SetOldOwner(bool bNew)
////////////////////////////////////////////////////////////////////////////////////////////////////
-XubString SdrUndoCopyObj::GetComment() const
+rtl::OUString SdrUndoCopyObj::GetComment() const
{
XubString aStr;
ImpTakeDescriptionStr(STR_UndoCopyObj,aStr);
@@ -1027,7 +1027,7 @@ void SdrUndoObjOrdNum::Redo()
ImpShowPageOfThisObject();
}
-XubString SdrUndoObjOrdNum::GetComment() const
+rtl::OUString SdrUndoObjOrdNum::GetComment() const
{
XubString aStr;
ImpTakeDescriptionStr(STR_UndoObjOrdNum,aStr);
@@ -1110,7 +1110,7 @@ void SdrUndoObjSetText::Redo()
ImpShowPageOfThisObject();
}
-XubString SdrUndoObjSetText::GetComment() const
+rtl::OUString SdrUndoObjSetText::GetComment() const
{
XubString aStr;
ImpTakeDescriptionStr(STR_UndoObjSetText,aStr);
@@ -1229,7 +1229,7 @@ void SdrUndoObjStrAttr::Redo()
ImpShowPageOfThisObject();
}
-String SdrUndoObjStrAttr::GetComment() const
+rtl::OUString SdrUndoObjStrAttr::GetComment() const
{
String aStr;
switch ( meObjStrAttr )
@@ -1295,7 +1295,7 @@ void SdrUndoNewLayer::Redo()
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list