[Libreoffice-commits] .: sw/inc sw/source

[Caolán McNamara]

 sw/inc/undobj.hxx              |    6 +++---
 sw/source/core/undo/undobj.cxx |    4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 794a523c2112a6f99344f2dad13e50d638b95fc1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jan 16 16:37:00 2011 +0000

    reduce the amount of __cxa_atexit activity

diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index 71e66b5..2252de9 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -114,9 +114,9 @@ namespace utl {
     class TransliterationWrapper;
 }
 
-const String UNDO_ARG1("$1", RTL_TEXTENCODING_ASCII_US);
-const String UNDO_ARG2("$2", RTL_TEXTENCODING_ASCII_US);
-const String UNDO_ARG3("$3", RTL_TEXTENCODING_ASCII_US);
+SW_DLLPUBLIC extern const String UNDO_ARG1;
+SW_DLLPUBLIC extern const String UNDO_ARG2;
+SW_DLLPUBLIC extern const String UNDO_ARG3;
 
 typedef SwRedlineSaveData* SwRedlineSaveDataPtr;
 SV_DECL_PTRARR_DEL( SwRedlineSaveDatas, SwRedlineSaveDataPtr, 8, 8 )
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index bb751d6..f57b440 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -1401,4 +1401,8 @@ bool IsDestroyFrameAnchoredAtChar(SwPosition const & rAnchorPos,
             );
 }
 
+const String UNDO_ARG1("$1", RTL_TEXTENCODING_ASCII_US);
+const String UNDO_ARG2("$2", RTL_TEXTENCODING_ASCII_US);
+const String UNDO_ARG3("$3", RTL_TEXTENCODING_ASCII_US);
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */