diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 14:03:39 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 14:03:39 +0000 |
| commit | ad97ca5b0cef8a971c762e0916c47b58a6298b5e (patch) | |
| tree | b393bcbcfb2d7eeacb18d6b3fc5818c688167ad5 /sfx2/source/appl/shutdowniconw32.cxx | |
| parent | f92ba37c584e73572d2a55d1f07b2e6482683409 (diff) | |
INTEGRATION: CWS mingwport03 (1.36.82); FILE MERGED
2006/11/09 00:37:02 vg 1.36.82.2: RESYNC: (1.36-1.41); FILE MERGED
2006/09/15 14:59:52 vg 1.36.82.1: #i53572# MinGW port
Diffstat (limited to 'sfx2/source/appl/shutdowniconw32.cxx')
| -rw-r--r-- | sfx2/source/appl/shutdowniconw32.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx index 46731d21ac13..a08e211f13ae 100644 --- a/sfx2/source/appl/shutdowniconw32.cxx +++ b/sfx2/source/appl/shutdowniconw32.cxx @@ -4,9 +4,9 @@ * * $RCSfile: shutdowniconw32.cxx,v $ * - * $Revision: 1.41 $ + * $Revision: 1.42 $ * - * last change: $Author: obo $ $Date: 2006-10-19 08:05:15 $ + * last change: $Author: vg $ $Date: 2007-03-26 15:03:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -182,7 +182,7 @@ static bool isNT() // ------------------------------- -static void addMenuItem( HMENU hMenu, UINT id, UINT iconId, OUString& text, int& pos, int bOwnerdraw ) +static void addMenuItem( HMENU hMenu, UINT id, UINT iconId, const OUString& text, int& pos, int bOwnerdraw ) { MENUITEMINFOW mi; memset( &mi, 0, sizeof( MENUITEMINFOW ) ); @@ -711,7 +711,7 @@ void OnMeasureItem(HWND hwnd, LPMEASUREITEMSTRUCT lpmis) HFONT hfntOld = (HFONT) SelectObject(hdc, (HFONT) CreateFontIndirect( &ncm.lfMenuFont )); - GetTextExtentPoint32W(hdc, pMyItem->text.getStr(), + GetTextExtentPoint32W(hdc, reinterpret_cast<LPCWSTR>(pMyItem->text.getStr()), pMyItem->text.getLength(), &size); lpmis->itemWidth = size.cx + 4 + GetSystemMetrics( SM_CXSMICON ); @@ -789,7 +789,7 @@ void OnDrawItem(HWND hwnd, LPDRAWITEMSTRUCT lpdis) SIZE size; - GetTextExtentPointW( lpdis->hDC, pMyItem->text.getStr(), pMyItem->text.getLength(), &size ); + GetTextExtentPointW( lpdis->hDC, reinterpret_cast<LPCWSTR>(pMyItem->text.getStr()), pMyItem->text.getLength(), &size ); DrawStateW( lpdis->hDC, (HBRUSH)NULL, (DRAWSTATEPROC)NULL, (LPARAM)pMyItem->text.getStr(), (WPARAM)0, aRect.left, aRect.top + (height - size.cy)/2, 0, 0, DST_TEXT | (fDisabled && !fSelected ? DSS_DISABLED : DSS_NORMAL) ); @@ -830,7 +830,7 @@ static OUString _SHGetSpecialFolder( int nFolderID ) lpFolderA = ALLOC( WCHAR, 16000 ); SHGetPathFromIDListW( pidl, lpFolderA ); - aFolder = OUString( lpFolderA ); + aFolder = OUString( reinterpret_cast<const sal_Unicode*>(lpFolderA) ); FREE( lpFolderA ); _SHFree( pidl ); @@ -887,7 +887,7 @@ BOOL CreateShortcut( const OUString& rAbsObject, const OUString& rAbsObjectPath, if( SUCCEEDED(hres) ) { - hres = ppf->Save( rAbsShortcut.getStr(), TRUE ); + hres = ppf->Save( reinterpret_cast<LPCOLESTR>(rAbsShortcut.getStr()), TRUE ); ppf->Release(); } else return FALSE; psl->Release(); @@ -934,7 +934,7 @@ bool ShutdownIcon::IsQuickstarterInstalled() MultiByteToWideChar( CP_ACP, 0, szPathA, -1, aPath, nNeededWStrBuffSize ); } - OUString aOfficepath( aPath ); + OUString aOfficepath( reinterpret_cast<const sal_Unicode*>(aPath) ); int i = aOfficepath.lastIndexOf((sal_Char) '\\'); if( i != -1 ) aOfficepath = aOfficepath.copy(0, i); @@ -942,7 +942,7 @@ bool ShutdownIcon::IsQuickstarterInstalled() OUString quickstartExe(aOfficepath); quickstartExe += OUString( RTL_CONSTASCII_USTRINGPARAM( "\\quickstart.exe" ) ); - return FileExistsW( quickstartExe.getStr() ); + return FileExistsW( reinterpret_cast<LPCWSTR>(quickstartExe.getStr()) ); } void ShutdownIcon::EnableAutostartW32( const rtl::OUString &aShortcut ) |