diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 11:50:04 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 11:50:04 +0000 |
| commit | fad217f3b1dcb55ff6acaac86ccadccbf588fcb6 (patch) | |
| tree | 8f7950d609e2e4dd22f69c0682265055764caa4f /sw/source/ui/utlui/unotools.cxx | |
| parent | 8d39ba10f05a7a40abf819672c14a006d3d88d52 (diff) | |
INTEGRATION: CWS swwarnings (1.25.222); FILE MERGED
2007/06/01 07:17:48 tl 1.25.222.3: #i69287# warning-free code
2007/05/29 15:00:31 os 1.25.222.2: RESYNC: (1.25-1.26); FILE MERGED
2007/03/26 12:09:37 tl 1.25.222.1: #i69287# warning-free code
Diffstat (limited to 'sw/source/ui/utlui/unotools.cxx')
| -rw-r--r-- | sw/source/ui/utlui/unotools.cxx | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/sw/source/ui/utlui/unotools.cxx b/sw/source/ui/utlui/unotools.cxx index a019cdd39335..63bfa08f621c 100644 --- a/sw/source/ui/utlui/unotools.cxx +++ b/sw/source/ui/utlui/unotools.cxx @@ -4,9 +4,9 @@ * * $RCSfile: unotools.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: rt $ $Date: 2007-04-26 09:24:14 $ + * last change: $Author: hr $ $Date: 2007-09-27 12:50:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -119,8 +119,7 @@ #include <doc.hxx> #endif - -#define C2U(cChar) rtl::OUString::createFromAscii(cChar) +#include <unomid.h> using namespace ::com::sun::star; using namespace ::rtl; @@ -141,9 +140,11 @@ SwOneExampleFrame::SwOneExampleFrame( Window& rWin, const Link* pInitializedLink, String* pURL ) : aTopWindow( rWin.GetParent(), 0, this ), - pModuleView(SW_MOD()->GetView()), rWindow(rWin), aMenuRes(SW_RES(RES_FRMEX_MENU)), + + pModuleView(SW_MOD()->GetView()), + nStyleFlags(nFlags), bIsInitialized(sal_False), bServiceAvailable(sal_False) @@ -402,8 +403,8 @@ IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Timer*, pTimer ) uno::Reference< lang::XUnoTunnel> xTunnel( _xCursor, uno::UNO_QUERY); if( xTunnel.is() ) { - OTextCursorHelper* pCrsr = (OTextCursorHelper*)xTunnel->getSomething( - OTextCursorHelper::getUnoTunnelId() ); + OTextCursorHelper* pCrsr = reinterpret_cast<OTextCursorHelper*>( xTunnel->getSomething( + OTextCursorHelper::getUnoTunnelId() )); if( pCrsr ) { SwEditShell* pSh = pCrsr->GetDoc()->GetEditShell(); @@ -429,8 +430,8 @@ void SwOneExampleFrame::ClearDocument( BOOL bStartUpdateTimer ) uno::Reference< lang::XUnoTunnel> xTunnel( _xCursor, uno::UNO_QUERY); if( xTunnel.is() ) { - OTextCursorHelper* pCrsr = (OTextCursorHelper*)xTunnel->getSomething( - OTextCursorHelper::getUnoTunnelId() ); + OTextCursorHelper* pCrsr = reinterpret_cast<OTextCursorHelper*>(xTunnel->getSomething( + OTextCursorHelper::getUnoTunnelId()) ); if( pCrsr ) { SwDoc* pDoc = pCrsr->GetDoc(); |