Kaydet (Commit) b55efb51 authored tarafından Noel Grandin's avatar Noel Grandin

fix windows build

after my XubString->OUString changes

Change-Id: If62db5a82a01d1883dcc2d4e6efea4668930447b
üst d15ca2d8
...@@ -4678,7 +4678,7 @@ static int ImplMeasureItem( HWND hWnd, WPARAM wParam, LPARAM lParam ) ...@@ -4678,7 +4678,7 @@ static int ImplMeasureItem( HWND hWnd, WPARAM wParam, LPARAM lParam )
// menu text and accelerator // menu text and accelerator
String aStr(pSalMenuItem->mText); String aStr(pSalMenuItem->mText);
if( pSalMenuItem->mAccelText.Len() ) if( pSalMenuItem->mAccelText.getLength() )
{ {
aStr.AppendAscii(" "); aStr.AppendAscii(" ");
aStr.Append( pSalMenuItem->mAccelText ); aStr.Append( pSalMenuItem->mAccelText );
...@@ -4830,7 +4830,7 @@ static int ImplDrawItem(HWND, WPARAM wParam, LPARAM lParam ) ...@@ -4830,7 +4830,7 @@ static int ImplDrawItem(HWND, WPARAM wParam, LPARAM lParam )
DST_PREFIXTEXT | (fDisabled && !fSelected ? DSS_DISABLED : DSS_NORMAL) ) ) DST_PREFIXTEXT | (fDisabled && !fSelected ? DSS_DISABLED : DSS_NORMAL) ) )
ImplWriteLastError(GetLastError(), "ImplDrawItem"); ImplWriteLastError(GetLastError(), "ImplDrawItem");
if( pSalMenuItem->mAccelText.Len() ) if( pSalMenuItem->mAccelText.getLength() )
{ {
SIZE strSizeA; SIZE strSizeA;
aStr = pSalMenuItem->mAccelText; aStr = pSalMenuItem->mAccelText;
......
...@@ -100,7 +100,7 @@ SalMenuItem* WinSalInstance::CreateMenuItem( const SalItemParams* pItemData ) ...@@ -100,7 +100,7 @@ SalMenuItem* WinSalInstance::CreateMenuItem( const SalItemParams* pItemData )
pSalMenuItem->mnId = pItemData->nId; pSalMenuItem->mnId = pItemData->nId;
// 'translate' mnemonics // 'translate' mnemonics
pSalMenuItem->mText.SearchAndReplace( '~', '&' ); pSalMenuItem->mText = pSalMenuItem->mText.replaceAll( "~", "&" );
pSalMenuItem->mInfo.fMask = MIIM_TYPE | MIIM_STATE | MIIM_ID | MIIM_DATA; pSalMenuItem->mInfo.fMask = MIIM_TYPE | MIIM_STATE | MIIM_ID | MIIM_DATA;
pSalMenuItem->mInfo.fType = MFT_STRING; pSalMenuItem->mInfo.fType = MFT_STRING;
...@@ -109,8 +109,8 @@ SalMenuItem* WinSalInstance::CreateMenuItem( const SalItemParams* pItemData ) ...@@ -109,8 +109,8 @@ SalMenuItem* WinSalInstance::CreateMenuItem( const SalItemParams* pItemData )
pSalMenuItem->mInfo.fType |= MFT_OWNERDRAW; pSalMenuItem->mInfo.fType |= MFT_OWNERDRAW;
pSalMenuItem->mInfo.fState = MFS_ENABLED; pSalMenuItem->mInfo.fState = MFS_ENABLED;
#endif #endif
pSalMenuItem->mInfo.dwTypeData = (LPWSTR) pSalMenuItem->mText.GetBuffer(); pSalMenuItem->mInfo.dwTypeData = (LPWSTR) pSalMenuItem->mText.getStr();
pSalMenuItem->mInfo.cch = pSalMenuItem->mText.Len(); pSalMenuItem->mInfo.cch = pSalMenuItem->mText.getLength();
pSalMenuItem->mInfo.wID = pItemData->nId; pSalMenuItem->mInfo.wID = pItemData->nId;
pSalMenuItem->mInfo.dwItemData = (ULONG_PTR) pSalMenuItem; // user data pSalMenuItem->mInfo.dwItemData = (ULONG_PTR) pSalMenuItem; // user data
...@@ -319,7 +319,7 @@ void WinSalMenu::SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OU ...@@ -319,7 +319,7 @@ void WinSalMenu::SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OU
WinSalMenuItem* pWItem = static_cast<WinSalMenuItem*>(pSalMenuItem); WinSalMenuItem* pWItem = static_cast<WinSalMenuItem*>(pSalMenuItem);
pWItem->mText = rText; pWItem->mText = rText;
// 'translate' mnemonics // 'translate' mnemonics
pWItem->mText.SearchAndReplace( '~', '&' ); pWItem->mText = pWItem->mText.replaceAll( "~", "&" );
pWItem->mInfo.fMask = MIIM_TYPE | MIIM_DATA; pWItem->mInfo.fMask = MIIM_TYPE | MIIM_DATA;
pWItem->mInfo.fType = MFT_STRING; pWItem->mInfo.fType = MFT_STRING;
#ifdef OWNERDRAW #ifdef OWNERDRAW
...@@ -329,7 +329,7 @@ void WinSalMenu::SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OU ...@@ -329,7 +329,7 @@ void WinSalMenu::SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OU
// combine text and accelerator text // combine text and accelerator text
XubString aStr( pWItem->mText ); XubString aStr( pWItem->mText );
if( pWItem->mAccelText.Len() ) if( pWItem->mAccelText.getLength() )
{ {
aStr.AppendAscii("\t"); aStr.AppendAscii("\t");
aStr.Append( pWItem->mAccelText ); aStr.Append( pWItem->mAccelText );
...@@ -358,7 +358,7 @@ void WinSalMenu::SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const ...@@ -358,7 +358,7 @@ void WinSalMenu::SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const
#endif #endif
// combine text and accelerator text // combine text and accelerator text
XubString aStr( pWItem->mText ); XubString aStr( pWItem->mText );
if( pWItem->mAccelText.Len() ) if( pWItem->mAccelText.getLength() )
{ {
aStr.AppendAscii("\t"); aStr.AppendAscii("\t");
aStr.Append( pWItem->mAccelText ); aStr.Append( pWItem->mAccelText );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment