summaryrefslogtreecommitdiff
path: root/sw/inc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-03-18 09:16:09 +0000
committerCaolán McNamara <caolanm@redhat.com>2012-03-20 12:57:32 +0000
commit6d12d8cab29ff4d9eb19039a183f90e309fa5d82 (patch)
tree637ec963c7a06165561bb3c774fc14913dbc80c0 /sw/inc
parent5c887ee0e48d85ddd7bb17aac6cb87203a188e7a (diff)
reduce UniStrings
Diffstat (limited to 'sw/inc')
-rw-r--r--sw/inc/mdiexp.hxx6
-rw-r--r--sw/inc/swtypes.hxx2
2 files changed, 4 insertions, 4 deletions
diff --git a/sw/inc/mdiexp.hxx b/sw/inc/mdiexp.hxx
index a4e0e15a9eca..08211a269831 100644
--- a/sw/inc/mdiexp.hxx
+++ b/sw/inc/mdiexp.hxx
@@ -28,11 +28,11 @@
#ifndef _MDIEXP_HXX
#define _MDIEXP_HXX
+#include <rtl/ustring.hxx>
#include <tools/solar.h>
#include <tblenum.hxx>
#include <swdllapi.h>
-class UniString;
class SwRect;
class Size;
class Dialog;
@@ -48,7 +48,7 @@ extern void SizeNotify(ViewShell* pVwSh, const Size &);
extern void PageNumNotify( ViewShell* pVwSh,
sal_uInt16 nPhyNum,
sal_uInt16 nVirtNum,
- const UniString& rPg );
+ const rtl::OUString& rPg );
enum FlyMode { FLY_DRAG_START, FLY_DRAG, FLY_DRAG_END };
extern void FrameNotify( ViewShell* pVwSh, FlyMode eMode = FLY_DRAG );
@@ -72,7 +72,7 @@ void DelAllGrfCacheEntries( SwDoc* pDoc );
// Read ChgMode for tables from configuration.
TblChgMode GetTblChgDefaultMode();
-sal_Bool JumpToSwMark( ViewShell* pVwSh, const UniString& rMark );
+sal_Bool JumpToSwMark( ViewShell* pVwSh, const rtl::OUString& rMark );
#endif
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index 2b1ee116b6fb..7e466b40a8e6 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -171,7 +171,7 @@ enum RndStdIds
extern ResMgr* pSwResMgr; // Is in swapp0.cxx.
#define SW_RES(i) ResId(i,*pSwResMgr)
-#define SW_RESSTR(i) UniString(ResId(i,*pSwResMgr))
+#define SW_RESSTR(i) ResId::toString(SW_RES(i))
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XSpellChecker1 > GetSpellChecker();