You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by or...@apache.org on 2013/12/18 14:27:25 UTC
svn commit: r1551937 [28/29] - in /openoffice/branches/ooxml-osba: ./
extras/l10n/source/bg/ extras/l10n/source/de/ extras/l10n/source/nb/
extras/l10n/source/th/ main/ main/accessibility/inc/accessibility/extended/
main/accessibility/inc/accessibility/...
Modified: openoffice/branches/ooxml-osba/main/vcl/source/glyphs/glyphcache.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/source/glyphs/glyphcache.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/source/glyphs/glyphcache.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/source/glyphs/glyphcache.cxx Wed Dec 18 13:27:09 2013
@@ -384,9 +384,9 @@ void GlyphCache::GrowNotify()
// -----------------------------------------------------------------------
-inline void GlyphCache::RemovingGlyph( ServerFont& rSF, GlyphData& rGD, int nGlyphIndex )
+inline void GlyphCache::RemovingGlyph( ServerFont& rSF, GlyphData& rGD, sal_GlyphId aGlyphId )
{
- mrPeer.RemovingGlyph( rSF, rGD, nGlyphIndex );
+ mrPeer.RemovingGlyph( rSF, rGD, aGlyphId );
mnBytesUsed -= sizeof( GlyphData );
--mnGlyphCount;
}
@@ -451,10 +451,10 @@ long ServerFont::Release() const
// -----------------------------------------------------------------------
-GlyphData& ServerFont::GetGlyphData( int nGlyphIndex )
+GlyphData& ServerFont::GetGlyphData( sal_GlyphId aGlyphId )
{
// usually the GlyphData is cached
- GlyphList::iterator it = maGlyphList.find( nGlyphIndex );
+ GlyphList::iterator it = maGlyphList.find( aGlyphId );
if( it != maGlyphList.end() ) {
GlyphData& rGlyphData = it->second;
GlyphCache::GetInstance().UsingGlyph( *this, rGlyphData );
@@ -462,9 +462,9 @@ GlyphData& ServerFont::GetGlyphData( int
}
// sometimes not => we need to create and initialize it ourselves
- GlyphData& rGlyphData = maGlyphList[ nGlyphIndex ];
+ GlyphData& rGlyphData = maGlyphList[ aGlyphId ];
mnBytesUsed += sizeof( GlyphData );
- InitGlyphData( nGlyphIndex, rGlyphData );
+ InitGlyphData( aGlyphId, rGlyphData );
GlyphCache::GetInstance().AddedGlyph( *this, rGlyphData );
return rGlyphData;
}
@@ -503,7 +503,7 @@ Point ServerFont::TransformPoint( const
return Point( nX, nY );
}
-bool ServerFont::IsGlyphInvisible( int nGlyphIndex )
+bool ServerFont::IsGlyphInvisible( sal_GlyphId aGlyphId )
{
if (!mbCollectedZW)
{
@@ -512,9 +512,9 @@ bool ServerFont::IsGlyphInvisible( int n
mbCollectedZW = true;
}
- if( !nGlyphIndex ) // don't hide the NotDef glyph
+ if( !aGlyphId ) // don't hide the NotDef glyph
return false;
- if( (nGlyphIndex == mnZWNJ) || (nGlyphIndex == mnZWJ) )
+ if( (aGlyphId == mnZWNJ) || (aGlyphId == mnZWJ) )
return true;
return false;
Modified: openoffice/branches/ooxml-osba/main/vcl/source/glyphs/graphite_layout.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/source/glyphs/graphite_layout.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/source/glyphs/graphite_layout.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/source/glyphs/graphite_layout.cxx Wed Dec 18 13:27:09 2013
@@ -955,7 +955,7 @@ long GraphiteLayout::FillDXArray( sal_In
assert( (mvChar2BaseGlyph[i] == -1) ||
((signed)(mvChar2BaseGlyph[i] & GLYPH_INDEX_MASK) < (signed)mvGlyphs.size()));
if (mvChar2BaseGlyph[i] != -1 &&
- mvGlyphs[mvChar2BaseGlyph[i] & GLYPH_INDEX_MASK].mnGlyphIndex == GF_DROPPED)
+ mvGlyphs[mvChar2BaseGlyph[i] & GLYPH_INDEX_MASK].maGlyphId == GF_DROPPED)
{
// when used in MultiSalLayout::GetTextBreak dropped glyphs
// must have zero width
@@ -1165,7 +1165,7 @@ void GraphiteLayout::ApplyDXArray(ImplLa
#endif
assert((nLastGlyph > -1) && (nLastGlyph < (signed)mvGlyphs.size()));
mvGlyphs[nLastGlyph].mnNewWidth += nDWidth;
- if (gi.mnGlyphIndex != GF_DROPPED)
+ if (gi.maGlyphId != GF_DROPPED)
mvGlyphs[nLastGlyph].mnNewWidth += nDWidth;
else
nDGlyphOrigin += nDWidth;
@@ -1226,7 +1226,7 @@ void GraphiteLayout::kashidaJustify(std:
continue;
}
// no kashida-injection for blank justified expansion either
- if( IsSpacingGlyph( (*i).mnGlyphIndex ) )
+ if( IsSpacingGlyph( (*i).maGlyphId ) )
{
++i;
continue;
@@ -1241,7 +1241,7 @@ void GraphiteLayout::kashidaJustify(std:
}
nKashidaCount = 1 + (nGapWidth / nKashidaWidth);
#ifdef GRLAYOUT_DEBUG
- printf("inserting %d kashidas at %u\n", nKashidaCount, (*i).mnGlyphIndex);
+ printf("inserting %d kashidas at %u\n", nKashidaCount, (*i).maGlyphId);
#endif
GlyphItem glyphItem = *i;
Point aPos(0, 0);
@@ -1296,7 +1296,7 @@ void GraphiteLayout::GetCaretPositions(
int nChar2Base = mvChar2BaseGlyph[nCharSlot] & GLYPH_INDEX_MASK;
assert((mvChar2BaseGlyph[nCharSlot] > -1) && (nChar2Base < (signed)mvGlyphs.size()));
GlyphItem gi = mvGlyphs[nChar2Base];
- if (gi.mnGlyphIndex == GF_DROPPED)
+ if (gi.maGlyphId == GF_DROPPED)
{
continue;
}
@@ -1412,7 +1412,7 @@ int GraphiteLayout::GetNextGlyphs( int l
assert(glyph_slot >= 0);
// Find the first glyph in the substring.
for (; glyph_slot < signed(mvGlyphs.size()) &&
- ((mvGlyphs.begin() + glyph_slot)->mnGlyphIndex == GF_DROPPED);
+ ((mvGlyphs.begin() + glyph_slot)->maGlyphId == GF_DROPPED);
++glyph_slot) {};
// Update the length
@@ -1448,7 +1448,7 @@ int GraphiteLayout::GetNextGlyphs( int l
}
// Copy out this glyphs data.
++glyph_slot;
- *glyph_out++ = glyph_itr->mnGlyphIndex;
+ *glyph_out++ = glyph_itr->maGlyphId;
// Find the actual advance - this must be correct if called from
// MultiSalLayout::AdjustLayout which requests one glyph at a time.
@@ -1477,13 +1477,13 @@ int GraphiteLayout::GetNextGlyphs( int l
break;
// Stop if glyph dropped
- if (glyph_itr->mnGlyphIndex == GF_DROPPED)
+ if (glyph_itr->maGlyphId == GF_DROPPED)
break;
}
int numGlyphs = glyph_slot - glyph_slot_begin;
// move the next glyph_slot to a glyph that hasn't been dropped
while (glyph_slot < static_cast<int>(mvGlyphs.size()) &&
- (mvGlyphs.begin() + glyph_slot)->mnGlyphIndex == GF_DROPPED)
+ (mvGlyphs.begin() + glyph_slot)->maGlyphId == GF_DROPPED)
++glyph_slot;
return numGlyphs;
}
@@ -1495,7 +1495,7 @@ void GraphiteLayout::MoveGlyph( int nGly
// needs to be done carefully so the glyph/char maps are maintained
// If a glyph has been dropped then it wasn't returned by GetNextGlyphs, so
// the index here may be wrong
- while ((mvGlyphs[nGlyphIndex].mnGlyphIndex == GF_DROPPED) &&
+ while ((mvGlyphs[nGlyphIndex].maGlyphId == GF_DROPPED) &&
(nGlyphIndex < (signed)mvGlyphs.size()))
{
nGlyphIndex++;
@@ -1522,7 +1522,7 @@ void GraphiteLayout::DropGlyph( int nGly
return;
GlyphItem & glyph = mvGlyphs[nGlyphIndex];
- glyph.mnGlyphIndex = GF_DROPPED;
+ glyph.maGlyphId = GF_DROPPED;
#ifdef GRLAYOUT_DEBUG
fprintf(grLog(),"Dropped %d\n", nGlyphIndex);
#endif
@@ -1538,7 +1538,7 @@ void GraphiteLayout::Simplify( bool isBa
long deltaX = 0;
while (gi != mvGlyphs.end())
{
- if (gi->mnGlyphIndex == dropMarker)
+ if (gi->maGlyphId == dropMarker)
{
deltaX += gi->mnNewWidth;
gi->mnNewWidth = 0;
Modified: openoffice/branches/ooxml-osba/main/vcl/source/window/btndlg.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/source/window/btndlg.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/source/window/btndlg.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/source/window/btndlg.cxx Wed Dec 18 13:27:09 2013
@@ -289,7 +289,6 @@ void ButtonDialog::StateChanged( StateCh
if ( nType == STATE_CHANGE_INITSHOW )
{
ImplPosControls();
-//IAccessibility2 Implementation 2009-----
ImplBtnDlgItem* pItem = mpItemList->First();
while ( pItem )
{
@@ -297,7 +296,6 @@ void ButtonDialog::StateChanged( StateCh
pItem->mpPushButton->SetZOrder(0, WINDOW_ZORDER_LAST);
pItem = mpItemList->Next();
}
-//-----IAccessibility2 Implementation 2009
// Focus evt. auf den entsprechenden Button setzen
if ( mnFocusButtonId != BUTTONDIALOG_BUTTON_NOTFOUND )
Modified: openoffice/branches/ooxml-osba/main/vcl/source/window/dlgctrl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/source/window/dlgctrl.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/source/window/dlgctrl.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/source/window/dlgctrl.cxx Wed Dec 18 13:27:09 2013
@@ -835,7 +835,6 @@ sal_Bool Window::ImplDlgCtrl( const KeyE
if ( nStyle & WB_GROUP )
break;
-//IAccessibility2 Implementation 2009-----
//Solution:Pure window shouldn't get window after controls such as buttons.
//if ( pWindow->IsVisible() && pWindow->IsEnabled() && pWindow->IsInputEnabled() )
if ( pWindow->IsVisible() && pWindow->IsEnabled() &&
@@ -846,7 +845,6 @@ sal_Bool Window::ImplDlgCtrl( const KeyE
pWindow->GetType() != WINDOW_CONTROL
)
)
-//-----IAccessibility2 Implementation 2009
{
pWindow->ImplControlFocus( GETFOCUS_CURSOR | GETFOCUS_BACKWARD );
return sal_True;
@@ -1309,7 +1307,6 @@ Window* Window::GetAccessibleRelationMem
}
return pWindow;
}
-//-----IAccessibility2 Implementation 2009
// -----------------------------------------------------------------------
Modified: openoffice/branches/ooxml-osba/main/vcl/source/window/dockwin.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/source/window/dockwin.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/source/window/dockwin.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/source/window/dockwin.cxx Wed Dec 18 13:27:09 2013
@@ -864,6 +864,11 @@ void DockingWindow::SetFloatingMode( sal
// BorderWindow den Parent umsetzen
if ( mpOldBorderWin )
mpOldBorderWin->SetParent( pWin );
+
+ // #123765# reset the buffered DropTargets when undocking, else it may not
+ // be correctly initialized
+ mpWindowImpl->mxDNDListenerContainer.clear();
+
SetParent( pWin );
SetPosPixel( Point() );
mpWindowImpl->mpBorderWindow = pWin;
Modified: openoffice/branches/ooxml-osba/main/vcl/source/window/menu.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/source/window/menu.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/source/window/menu.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/source/window/menu.cxx Wed Dec 18 13:27:09 2013
@@ -1573,7 +1573,6 @@ sal_uInt16 Menu::GetCurItemId() const
{
return nSelectedId;
}
-//IAccessibility2 Implementation 2009
void Menu::SetHightlightItem( sal_uInt16 nHighlightedItem )
{
this->nHighlightedItem = nHighlightedItem;
@@ -3758,12 +3757,10 @@ sal_uInt16 PopupMenu::ImplExecute( Windo
String aTmpEntryText( ResId( SV_RESID_STRING_NOSELECTIONPOSSIBLE, *pResMgr ) );
MenuItemData* pData = pItemList->Insert(
0xFFFF, MENUITEM_STRING, 0, aTmpEntryText, Image(), NULL, 0xFFFF );
-//IAccessibility2 Implementation 2009-----
sal_uInt16 nmPos;
pData = pItemList->GetData( pData->nId, nmPos );
pData->bIsTemporary = sal_True;
ImplCallEventListeners(VCLEVENT_MENU_SUBMENUCHANGED,nmPos);
-//-----IAccessibility2 Implementation 2009
}
}
else if ( Application::GetSettings().GetStyleSettings().GetAutoMnemonic() && !( nMenuFlags & MENU_FLAG_NOAUTOMNEMONICS ) )
@@ -4040,9 +4037,7 @@ void MenuFloatingWindow::doShutdown()
// otherwise the entry will not be read when the menu is opened again
if( nHighlightedItem != ITEMPOS_INVALID )
pMenu->ImplCallEventListeners( VCLEVENT_MENU_DEHIGHLIGHT, nHighlightedItem );
-//IAccessibility2 Implementation 2009-----
pMenu->SetHightlightItem(ITEMPOS_INVALID);
-//-----IAccessibility2 Implementation 2009
if( !bKeyInput && pMenu && pMenu->pStartedFrom && !pMenu->pStartedFrom->bIsMenuBar )
{
// #102461# remove highlight in parent
@@ -4713,9 +4708,7 @@ void MenuFloatingWindow::ChangeHighlight
}
}
HighlightItem( nHighlightedItem, sal_True );
-//IAccessibility2 Implementation 2009-----
pMenu->SetHightlightItem(nHighlightedItem);
-//-----IAccessibility2 Implementation 2009
pMenu->ImplCallHighlight( nHighlightedItem );
}
else
@@ -5017,10 +5010,8 @@ void MenuFloatingWindow::KeyInput( const
MenuFloatingWindow* pFloat = ((PopupMenu*)pMenu->pStartedFrom)->ImplGetFloatingWindow();
pFloat->GrabFocus();
pFloat->KillActivePopup();
-//IAccessibility2 Implementation 2009-----
sal_uInt16 highlightItem = pFloat->GetHighlightedItem();
pFloat->ChangeHighlightItem(highlightItem, sal_False);
-//-----IAccessibility2 Implementation 2009
}
}
}
@@ -5610,9 +5601,7 @@ void MenuBarWindow::ChangeHighlightItem(
nHighlightedItem = (sal_uInt16)n;
DBG_ASSERT( ( nHighlightedItem == ITEMPOS_INVALID ) || pMenu->ImplIsVisible( nHighlightedItem ), "ChangeHighlightItem: Not visible!" );
HighlightItem( nHighlightedItem, sal_True );
-//IAccessibility2 Implementation 2009-----
pMenu->SetHightlightItem(nHighlightedItem);
-//-----IAccessibility2 Implementation 2009
pMenu->ImplCallHighlight( nHighlightedItem );
if( mbAutoPopup )
Modified: openoffice/branches/ooxml-osba/main/vcl/source/window/msgbox.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/source/window/msgbox.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/source/window/msgbox.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/source/window/msgbox.cxx Wed Dec 18 13:27:09 2013
@@ -515,6 +515,14 @@ InfoBox::InfoBox( Window* pParent, const
// -----------------------------------------------------------------------
+InfoBox::InfoBox( Window* pParent, WinBits nStyle, const XubString& rMessage ) :
+ MessBox( pParent, nStyle, ImplGetSVEmptyStr(), rMessage )
+{
+ ImplInitInfoBoxData();
+}
+
+// -----------------------------------------------------------------------
+
Image InfoBox::GetStandardImage()
{
ImplInitMsgBoxImageList();
Modified: openoffice/branches/ooxml-osba/main/vcl/source/window/syschild.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/source/window/syschild.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/source/window/syschild.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/source/window/syschild.cxx Wed Dec 18 13:27:09 2013
@@ -244,7 +244,7 @@ sal_IntPtr SystemChildWindow::GetParentW
nRet = reinterpret_cast< sal_IntPtr >( GetSystemData()->hWnd );
#elif defined QUARTZ
// FIXME: this is wrong
- nRet = reinterpret_cast< sal_IntPtr >( GetSystemData()->pView );
+ nRet = reinterpret_cast< sal_IntPtr >( GetSystemData()->mpNSView );
#elif defined UNX
if( !bUseJava )
{
Modified: openoffice/branches/ooxml-osba/main/vcl/source/window/toolbox.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/source/window/toolbox.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/source/window/toolbox.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/source/window/toolbox.cxx Wed Dec 18 13:27:09 2013
@@ -6065,11 +6065,9 @@ void ToolBox::ImplChangeHighlight( ImplT
mnCurPos = aPos;
ImplShowFocus();
-//IAccessibility2 Implementation 2009-----
if( pItem->mpWindow )
pItem->mpWindow->GrabFocus();
if( pItem != pOldItem )
-//-----IAccessibility2 Implementation 2009
ImplCallEventListeners( VCLEVENT_TOOLBOX_HIGHLIGHT );
}
}
Modified: openoffice/branches/ooxml-osba/main/vcl/source/window/toolbox2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/source/window/toolbox2.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/source/window/toolbox2.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/source/window/toolbox2.cxx Wed Dec 18 13:27:09 2013
@@ -1737,11 +1737,9 @@ void ToolBox::SetItemState( sal_uInt16 n
ImplCallEventListeners( VCLEVENT_TOOLBOX_BUTTONSTATECHANGED, reinterpret_cast< void* >( nPos ) );
// Notify
-//IAccessibility2 Implementation 2009-----
//Solution:Call accessivle listener to notify state_changed event
ImplCallEventListeners( VCLEVENT_TOOLBOX_ITEMUPDATED,reinterpret_cast< void* >(nPos) );
//ImplCallEventListeners( VCLEVENT_TOOLBOX_CLICK, reinterpret_cast< void* >( nPos ) );
-//-----IAccessibility2 Implementation 2009
}
}
}
Modified: openoffice/branches/ooxml-osba/main/vcl/source/window/window.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/source/window/window.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/source/window/window.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/source/window/window.cxx Wed Dec 18 13:27:09 2013
@@ -5397,7 +5397,6 @@ long Window::Notify( NotifyEvent& rNEvt
return nRet;
}
-// IAccessible2 implementation, 2009
void Window::NotifyVCLEvent( sal_uLong nEvent ,void* pData /*= NULL*/)
{
ImplCallEventListeners( nEvent ,pData);
@@ -8622,8 +8621,8 @@ uno::Reference< XDragSource > Window::Ge
* Using Windows based dnd as a temporary solution */
aDragSourceSN = OUString::createFromAscii( "com.sun.star.datatransfer.dnd.OleDragSource" );
aDropTargetSN = OUString::createFromAscii( "com.sun.star.datatransfer.dnd.OleDropTarget" );
- aDragSourceAL[ 1 ] = makeAny( static_cast<sal_uInt64>( reinterpret_cast<sal_IntPtr>(pEnvData->pView) ) );
- aDropTargetAL[ 0 ] = makeAny( static_cast<sal_uInt64>( reinterpret_cast<sal_IntPtr>(pEnvData->pView) ) );
+ aDragSourceAL[ 1 ] = makeAny( static_cast<sal_uInt64>( reinterpret_cast<sal_IntPtr>(pEnvData->mpNSView) ) );
+ aDropTargetAL[ 0 ] = makeAny( static_cast<sal_uInt64>( reinterpret_cast<sal_IntPtr>(pEnvData->mpNSView) ) );
#elif defined UNX
aDropTargetAL.realloc( 3 );
aDragSourceAL.realloc( 3 );
@@ -9125,7 +9124,6 @@ sal_uInt16 Window::GetAccessibleRole() c
case WINDOW_MULTILINEEDIT: nRole = accessibility::AccessibleRole::SCROLL_PANE; break;
case WINDOW_PATTERNFIELD:
-//IAccessibility2 Impplementaton 2009-----
// Need to set the role of those window control to spinbox
/*
case WINDOW_NUMERICFIELD:
@@ -9133,7 +9131,6 @@ sal_uInt16 Window::GetAccessibleRole() c
case WINDOW_CURRENCYFIELD:
case WINDOW_LONGCURRENCYFIELD:
*/
-//-----IAccessibility2 Impplementaton 2009
case WINDOW_EDIT: nRole = ( GetStyle() & WB_PASSWORD ) ? (accessibility::AccessibleRole::PASSWORD_TEXT) : (accessibility::AccessibleRole::TEXT); break;
case WINDOW_PATTERNBOX:
@@ -9151,7 +9148,6 @@ sal_uInt16 Window::GetAccessibleRole() c
case WINDOW_FIXEDTEXT: nRole = accessibility::AccessibleRole::LABEL; break;
case WINDOW_FIXEDBORDER:
nRole = accessibility::AccessibleRole::SEPARATOR; break;
- //IAccessibility2 Impplementaton 2009-----
case WINDOW_FIXEDLINE:
{ if( GetText().Len() > 0 )
nRole = accessibility::AccessibleRole::LABEL;
@@ -9160,7 +9156,6 @@ sal_uInt16 Window::GetAccessibleRole() c
break;
}
//case WINDOW_FIXEDLINE: nRole = accessibility::AccessibleRole::SEPARATOR; break;
- //-----IAccessibility2 Impplementaton 2009
case WINDOW_FIXEDBITMAP:
case WINDOW_FIXEDIMAGE: nRole = accessibility::AccessibleRole::ICON; break;
case WINDOW_GROUPBOX: nRole = accessibility::AccessibleRole::GROUP_BOX; break;
@@ -9175,13 +9170,11 @@ sal_uInt16 Window::GetAccessibleRole() c
case WINDOW_DATEFIELD:
case WINDOW_TIMEFIELD: nRole = accessibility::AccessibleRole::DATE_EDITOR; break;
-//IAccessibility2 Impplementaton 2009-----
// Need to set the role of those window control to spinbox
case WINDOW_NUMERICFIELD:
case WINDOW_METRICFIELD:
case WINDOW_CURRENCYFIELD:
case WINDOW_LONGCURRENCYFIELD:
-//-----IAccessibility2 Impplementaton 2009
case WINDOW_SPINFIELD: nRole = accessibility::AccessibleRole::SPIN_BOX; break;
case WINDOW_TOOLBOX: nRole = accessibility::AccessibleRole::TOOL_BAR; break;
@@ -9233,12 +9226,10 @@ void Window::SetAccessibleName( const St
if ( !mpWindowImpl->mpAccessibleInfos )
mpWindowImpl->mpAccessibleInfos = new ImplAccessibleInfos;
-//IAccessibility2 Implementation 2009-----
String oldName = GetAccessibleName();
delete mpWindowImpl->mpAccessibleInfos->pAccessibleName;
mpWindowImpl->mpAccessibleInfos->pAccessibleName = new String( rName );
ImplCallEventListeners( VCLEVENT_WINDOW_FRAMETITLECHANGED, &oldName );
-//-----IAccessibility2 Implementation 2009
}
String Window::GetAccessibleName() const
@@ -9283,12 +9274,10 @@ String Window::GetAccessibleName() const
if ( pLabel && pLabel != this )
aAccessibleName = pLabel->GetText();
}
- //IAccessibility2 Implementation 2009-----
if ( !aAccessibleName.Len() )
{
aAccessibleName = GetQuickHelpText();
}
- //-----IAccessibility2 Implementation 2009
break;
case WINDOW_IMAGEBUTTON:
@@ -9302,7 +9291,6 @@ String Window::GetAccessibleName() const
}
break;
-//IAccessibility2 Implementation 2009-----
case WINDOW_TOOLBOX:
aAccessibleName = GetText();
if( aAccessibleName.Len() == 0 )
@@ -9311,7 +9299,6 @@ String Window::GetAccessibleName() const
case WINDOW_MOREBUTTON:
aAccessibleName = mpWindowImpl->maText;
break;
-//-----IAccessibility2 Implementation 2009
default:
aAccessibleName = GetText();
break;
Modified: openoffice/branches/ooxml-osba/main/vcl/unx/generic/app/i18n_xkb.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/unx/generic/app/i18n_xkb.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/unx/generic/app/i18n_xkb.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/unx/generic/app/i18n_xkb.cxx Wed Dec 18 13:27:09 2013
@@ -31,16 +31,10 @@
#include "unx/saldata.hxx"
#include "unx/i18n_xkb.hxx"
-SalI18N_KeyboardExtension::SalI18N_KeyboardExtension( Display*
-#if __XKeyboardExtension__
-pDisplay
-#endif
-)
- : mbUseExtension( (sal_Bool)__XKeyboardExtension__ ),
- mnDefaultGroup( 0 )
+SalI18N_KeyboardExtension::SalI18N_KeyboardExtension( Display* pDisplay)
+: mbUseExtension( true )
+, mnDefaultGroup( 0 )
{
- #if __XKeyboardExtension__
-
mpDisplay = pDisplay;
// allow user to set the default keyboard group idx or to disable the usage
@@ -89,19 +83,11 @@ pDisplay
XkbGetState( mpDisplay, XkbUseCoreKbd, &aStateRecord );
mnGroup = aStateRecord.group;
}
-
- #endif // __XKeyboardExtension__
}
void
-SalI18N_KeyboardExtension::Dispatch( XEvent*
-#if __XKeyboardExtension__
-pEvent
-#endif
-)
+SalI18N_KeyboardExtension::Dispatch( XEvent* pEvent)
{
- #if __XKeyboardExtension__
-
// must the event be handled?
if ( !mbUseExtension
|| (pEvent->type != mnEventBase) )
@@ -119,41 +105,21 @@ pEvent
default:
- #if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 1
fprintf(stderr, "Got unrequested XkbAnyEvent %#x/%i\n",
- static_cast<unsigned int>(nXKBType), static_cast<int>(nXKBType) );
- #endif
+ static_cast<unsigned int>(nXKBType), static_cast<int>(nXKBType) );
+#endif
break;
}
- #endif // __XKeyboardExtension__
}
-#if __XKeyboardExtension__
-sal_uInt32
-SalI18N_KeyboardExtension::LookupKeysymInGroup( sal_uInt32 nKeyCode,
- sal_uInt32 nShiftState,
- sal_uInt32 nGroup ) const
-#else
-sal_uInt32
-SalI18N_KeyboardExtension::LookupKeysymInGroup( sal_uInt32,sal_uInt32,sal_uInt32 ) const
-#endif
+sal_uInt32 SalI18N_KeyboardExtension::LookupKeysymInGroup( sal_uInt32 nKeyCode,
+ sal_uInt32 nShiftState, sal_uInt32 nGroup ) const
{
- #if __XKeyboardExtension__
-
- if ( !mbUseExtension )
- return NoSymbol;
-
nShiftState &= ShiftMask;
- KeySym nKeySymbol;
- nKeySymbol = XkbKeycodeToKeysym( mpDisplay, nKeyCode, nGroup, nShiftState );
+ KeySym nKeySymbol = XkbKeycodeToKeysym( mpDisplay, nKeyCode, nGroup, nShiftState );
return nKeySymbol;
-
- #else
-
- return NoSymbol;
-
- #endif // __XKeyboardExtension__
}
Modified: openoffice/branches/ooxml-osba/main/vcl/unx/generic/dtrans/X11_selection.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/unx/generic/dtrans/X11_selection.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/unx/generic/dtrans/X11_selection.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/unx/generic/dtrans/X11_selection.cxx Wed Dec 18 13:27:09 2013
@@ -739,8 +739,8 @@ Atom SelectionManager::getAtom( const OU
::std::hash_map< OUString, Atom, OUStringHash >::const_iterator it;
if( ( it = m_aStringToAtom.find( rString ) ) == m_aStringToAtom.end() )
{
- static Atom nNoDisplayAtoms = 1;
- Atom aAtom = m_pDisplay ? XInternAtom( m_pDisplay, OUStringToOString( rString, RTL_TEXTENCODING_ISO_8859_1 ), False ) : nNoDisplayAtoms++;
+ static Atom nNoDisplayAtoms = 1;
+ Atom aAtom = m_pDisplay ? XInternAtom( m_pDisplay, OUStringToOString( rString, RTL_TEXTENCODING_ISO_8859_1).getStr(), False ) : nNoDisplayAtoms++;
m_aStringToAtom[ rString ] = aAtom;
m_aAtomToString[ aAtom ] = rString;
}
Modified: openoffice/branches/ooxml-osba/main/vcl/unx/generic/fontmanager/fontmanager.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/unx/generic/fontmanager/fontmanager.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/unx/generic/fontmanager/fontmanager.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/unx/generic/fontmanager/fontmanager.cxx Wed Dec 18 13:27:09 2013
@@ -3626,7 +3626,7 @@ bool PrintFontManager::createFontSubset(
FontSubsetInfo& rInfo,
fontID nFont,
const OUString& rOutFile,
- sal_Int32* pGlyphIDs,
+ sal_GlyphId* pGlyphIds,
sal_uInt8* pNewEncoding,
sal_Int32* pWidths,
int nGlyphs,
@@ -3666,11 +3666,11 @@ bool PrintFontManager::createFontSubset(
}
else
{
- DBG_ASSERT( !(pGlyphIDs[i] & 0x007f0000), "overlong glyph id" );
+ DBG_ASSERT( !(pGlyphIds[i] & 0x007f0000), "overlong glyph id" );
DBG_ASSERT( (int)pNewEncoding[i] < nGlyphs, "encoding wrong" );
DBG_ASSERT( pEnc[pNewEncoding[i]] == 0 && pGID[pNewEncoding[i]] == 0, "duplicate encoded glyph" );
pEnc[ pNewEncoding[i] ] = pNewEncoding[i];
- pGID[ pNewEncoding[i] ] = (sal_uInt16)pGlyphIDs[ i ];
+ pGID[ pNewEncoding[i] ] = (sal_uInt16)pGlyphIds[ i ];
pOldIndex[ pNewEncoding[i] ] = i;
nChar++;
}
@@ -3700,9 +3700,9 @@ bool PrintFontManager::createFontSubset(
{
rInfo.LoadFont( FontSubsetInfo::CFF_FONT, pCffBytes, nCffLength );
#if 1 // TODO: remove 16bit->long conversion when related methods handle non-16bit glyphids
- long aRequestedGlyphs[256];
+ sal_GlyphId aRequestedGlyphIds[256];
for( int i = 0; i < nGlyphs; ++i )
- aRequestedGlyphs[i] = pGID[i];
+ aRequestedGlyphIds[i] = pGID[i];
#endif
// create subset file at requested path
FILE* pOutFile = fopen( aToFile.GetBuffer(), "wb" );
@@ -3711,7 +3711,7 @@ bool PrintFontManager::createFontSubset(
const bool bOK = rInfo.CreateFontSubset(
FontSubsetInfo::TYPE1_PFB,
pOutFile, pGlyphSetName,
- aRequestedGlyphs, pEnc, nGlyphs, pWidths );
+ aRequestedGlyphIds, pEnc, nGlyphs, pWidths );
fclose( pOutFile );
// cleanup before early return
CloseTTFont( pTTFont );
@@ -3820,9 +3820,9 @@ void PrintFontManager::getGlyphWidths( f
break;
#endif
// get the matching glyph index
- const sal_uInt32 nGlyphId = aCharMap.GetGlyphIndex( c );
+ const sal_GlyphId aGlyphId = aCharMap.GetGlyphIndex( c );
// update the requested map
- rUnicodeEnc[ (sal_Unicode)c ] = nGlyphId;
+ rUnicodeEnc[ (sal_Unicode)c ] = aGlyphId;
}
}
}
Modified: openoffice/branches/ooxml-osba/main/vcl/unx/generic/gdi/gcach_xpeer.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/unx/generic/gdi/gcach_xpeer.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/unx/generic/gdi/gcach_xpeer.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/unx/generic/gdi/gcach_xpeer.cxx Wed Dec 18 13:27:09 2013
@@ -327,7 +327,7 @@ void X11GlyphPeer::RemovingFont( ServerF
// ---------------------------------------------------------------------------
// notification to clean up GlyphPeer resources for this glyph
-void X11GlyphPeer::RemovingGlyph( ServerFont& /*rServerFont*/, GlyphData& rGlyphData, int /*nGlyphIndex*/ )
+void X11GlyphPeer::RemovingGlyph( ServerFont& /*rServerFont*/, GlyphData& rGlyphData, sal_GlyphId /*aGlyphId*/ )
{
// nothing to do if the GlyphPeer hasn't allocated resources for the glyph
if( rGlyphData.ExtDataRef().meInfo == INFO_EMPTY )
@@ -364,8 +364,8 @@ void X11GlyphPeer::RemovingGlyph( Server
mnBytesUsed -= nHeight * ((nWidth + 7) >> 3);
}
delete pMSGlyph->mpRawBitmap;
- // Glyph nGlyphId = (Glyph)rGlyphData.GetExtPointer();
- // XRenderPeer::GetInstance().FreeGlyph( aGlyphSet, &nGlyphId );
+ // XRenderGlyph nXRGlyph = (XRenderGlyph)rGlyphData.GetExtPointer();
+ // XRenderPeer::GetInstance().FreeGlyph( aGlyphSet, &nXRGlyph );
delete[] pMSGlyph; // it was allocated with new char[]
}
break;
@@ -384,8 +384,8 @@ void X11GlyphPeer::RemovingGlyph( Server
case INFO_XRENDER:
{
- // Glyph nGlyphId = (Glyph)rGlyphData.GetExtPointer();
- // XRenderPeer::GetInstance().FreeGlyph( aGlyphSet, &nGlyphId );
+ // XRenderGlyph nXRGlyph = (XRenderGlyph)rGlyphData.GetExtPointer();
+ // XRenderPeer::GetInstance().FreeGlyph( aGlyphSet, &nXRGlyph );
mnBytesUsed -= nHeight * ((nWidth + 3) & ~3);
}
break;
@@ -449,17 +449,17 @@ GlyphSet X11GlyphPeer::GetGlyphSet( Serv
// ---------------------------------------------------------------------------
-Pixmap X11GlyphPeer::GetPixmap( ServerFont& rServerFont, int nGlyphIndex, int nReqScreen )
+Pixmap X11GlyphPeer::GetPixmap( ServerFont& rServerFont, sal_GlyphId aGlyphId, int nReqScreen )
{
- if( rServerFont.IsGlyphInvisible( nGlyphIndex ) )
+ if( rServerFont.IsGlyphInvisible( aGlyphId ) )
return None;
- GlyphData& rGlyphData = rServerFont.GetGlyphData( nGlyphIndex );
+ GlyphData& rGlyphData = rServerFont.GetGlyphData( aGlyphId );
Pixmap aPixmap = GetPixmap( rGlyphData, nReqScreen );
if( aPixmap == NO_PIXMAP )
{
aPixmap = None;
- if( rServerFont.GetGlyphBitmap1( nGlyphIndex, maRawBitmap ) )
+ if( rServerFont.GetGlyphBitmap1( aGlyphId, maRawBitmap ) )
{
// #94666# circumvent bug in some X11 systems, e.g. XF410.LynxEM.v163
sal_uLong nPixmapWidth = 8 * maRawBitmap.mnScanlineSize - 1;
@@ -541,7 +541,7 @@ Pixmap X11GlyphPeer::GetPixmap( ServerFo
else
{
// fall back to .notdef glyph
- if( nGlyphIndex != 0 ) // recurse only once
+ if( aGlyphId != 0 ) // recurse only once
aPixmap = GetPixmap( rServerFont, 0, nReqScreen );
if( aPixmap == NO_PIXMAP )
@@ -554,19 +554,18 @@ Pixmap X11GlyphPeer::GetPixmap( ServerFo
// ---------------------------------------------------------------------------
-const RawBitmap* X11GlyphPeer::GetRawBitmap( ServerFont& rServerFont,
- int nGlyphIndex )
+const RawBitmap* X11GlyphPeer::GetRawBitmap( ServerFont& rServerFont, sal_GlyphId aGlyphId )
{
- if( rServerFont.IsGlyphInvisible( nGlyphIndex ) )
+ if( rServerFont.IsGlyphInvisible( aGlyphId ) )
return NO_RAWBMP;
- GlyphData& rGlyphData = rServerFont.GetGlyphData( nGlyphIndex );
+ GlyphData& rGlyphData = rServerFont.GetGlyphData( aGlyphId );
const RawBitmap* pRawBitmap = GetRawBitmap( rGlyphData );
if( pRawBitmap == NO_RAWBMP )
{
RawBitmap* pNewBitmap = new RawBitmap;
- if( rServerFont.GetGlyphBitmap8( nGlyphIndex, *pNewBitmap ) )
+ if( rServerFont.GetGlyphBitmap8( aGlyphId, *pNewBitmap ) )
{
pRawBitmap = pNewBitmap;
mnBytesUsed += pNewBitmap->mnScanlineSize * pNewBitmap->mnHeight;
@@ -576,7 +575,7 @@ const RawBitmap* X11GlyphPeer::GetRawBit
{
delete pNewBitmap;
// fall back to .notdef glyph
- if( nGlyphIndex != 0 ) // recurse only once
+ if( aGlyphId != 0 ) // recurse only once
pRawBitmap = GetRawBitmap( rServerFont, 0 );
}
@@ -588,18 +587,18 @@ const RawBitmap* X11GlyphPeer::GetRawBit
// ---------------------------------------------------------------------------
-Glyph X11GlyphPeer::GetGlyphId( ServerFont& rServerFont, int nGlyphIndex )
+XRenderGlyph X11GlyphPeer::GetXRGlyph( ServerFont& rServerFont, sal_GlyphId aGlyphId )
{
- if( rServerFont.IsGlyphInvisible( nGlyphIndex ) )
+ if( rServerFont.IsGlyphInvisible( aGlyphId ) )
return NO_GLYPHID;
- GlyphData& rGlyphData = rServerFont.GetGlyphData( nGlyphIndex );
+ GlyphData& rGlyphData = rServerFont.GetGlyphData( aGlyphId );
- Glyph aGlyphId = GetRenderGlyph( rGlyphData );
- if( aGlyphId == NO_GLYPHID )
+ XRenderGlyph nXRGlyph = GetRenderGlyph( rGlyphData );
+ if( nXRGlyph == NO_GLYPHID )
{
// prepare GlyphInfo and Bitmap
- if( rServerFont.GetGlyphBitmap8( nGlyphIndex, maRawBitmap ) )
+ if( rServerFont.GetGlyphBitmap8( aGlyphId, maRawBitmap ) )
{
XGlyphInfo aGlyphInfo;
aGlyphInfo.width = maRawBitmap.mnWidth;
@@ -617,23 +616,23 @@ Glyph X11GlyphPeer::GetGlyphId( ServerFo
// upload glyph bitmap to server
GlyphSet aGlyphSet = GetGlyphSet( rServerFont, -1 );
- aGlyphId = nGlyphIndex & 0x00FFFFFF;
+ nXRGlyph = aGlyphId & 0x00FFFFFF;
const sal_uLong nBytes = maRawBitmap.mnScanlineSize * maRawBitmap.mnHeight;
- XRenderPeer::GetInstance().AddGlyph( aGlyphSet, aGlyphId,
+ XRenderPeer::GetInstance().AddGlyph( aGlyphSet, nXRGlyph,
aGlyphInfo, (char*)maRawBitmap.mpBits, nBytes );
mnBytesUsed += nBytes;
}
else
{
// fall back to .notdef glyph
- if( nGlyphIndex != 0 ) // recurse only once
- aGlyphId = GetGlyphId( rServerFont, 0 );
+ if( nXRGlyph != 0 ) // recurse only once
+ nXRGlyph = GetXRGlyph( rServerFont, 0 );
}
- SetRenderGlyph( rGlyphData, aGlyphId );
+ SetRenderGlyph( rGlyphData, nXRGlyph );
}
- return aGlyphId;
+ return nXRGlyph;
}
// ===========================================================================
Modified: openoffice/branches/ooxml-osba/main/vcl/unx/generic/gdi/gcach_xpeer.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/unx/generic/gdi/gcach_xpeer.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/unx/generic/gdi/gcach_xpeer.hxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/unx/generic/gdi/gcach_xpeer.hxx Wed Dec 18 13:27:09 2013
@@ -32,6 +32,7 @@
class SalDisplay;
struct MultiScreenGlyph;
+typedef Glyph XRenderGlyph;
class X11GlyphPeer
: public GlyphCachePeer
@@ -40,24 +41,24 @@ public:
X11GlyphPeer();
virtual ~X11GlyphPeer();
- Pixmap GetPixmap( ServerFont&, int nGlyphIndex, int nScreen );
- const RawBitmap* GetRawBitmap( ServerFont&, int nGlyphIndex );
+ Pixmap GetPixmap( ServerFont&, sal_GlyphId, int nScreen );
+ const RawBitmap* GetRawBitmap( ServerFont&, sal_GlyphId );
bool ForcedAntialiasing( const ServerFont&, int nScreen ) const;
GlyphSet GetGlyphSet( ServerFont&, int nScreen );
- Glyph GetGlyphId( ServerFont&, int nGlyphIndex );
+ XRenderGlyph GetXRGlyph( ServerFont&, sal_GlyphId );
protected:
void InitAntialiasing();
virtual void RemovingFont( ServerFont& );
- virtual void RemovingGlyph( ServerFont&, GlyphData&, int nGlyphIndex );
+ virtual void RemovingGlyph( ServerFont&, GlyphData&, sal_GlyphId );
MultiScreenGlyph* PrepareForMultiscreen( ExtGlyphData& ) const;
void SetRenderGlyph( GlyphData&, Glyph ) const;
void SetRawBitmap( GlyphData&, const RawBitmap* ) const;
void SetPixmap( GlyphData&, Pixmap, int nScreen ) const;
- Glyph GetRenderGlyph( const GlyphData& ) const;
+ XRenderGlyph GetRenderGlyph( const GlyphData& ) const;
const RawBitmap* GetRawBitmap( const GlyphData& ) const;
Pixmap GetPixmap( const GlyphData&, int nScreen ) const;
Modified: openoffice/branches/ooxml-osba/main/vcl/unx/generic/gdi/pspgraphics.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/unx/generic/gdi/pspgraphics.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/unx/generic/gdi/pspgraphics.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/unx/generic/gdi/pspgraphics.cxx Wed Dec 18 13:27:09 2013
@@ -401,12 +401,12 @@ void PspGraphics::drawRect( long nX, lon
m_pPrinterGfx->DrawRect (Rectangle(Point(nX, nY), Size(nDX, nDY)));
}
-void PspGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint *pPtAry )
+void PspGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint *pPtAry )
{
m_pPrinterGfx->DrawPolyLine (nPoints, (Point*)pPtAry);
}
-void PspGraphics::drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry )
+void PspGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
// Point must be equal to SalPoint! see vcl/inc/salgtype.hxx
m_pPrinterGfx->DrawPolygon (nPoints, (Point*)pPtAry);
@@ -436,13 +436,13 @@ bool PspGraphics::drawPolyLine(
return false;
}
-sal_Bool PspGraphics::drawPolyLineBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry )
+sal_Bool PspGraphics::drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry )
{
m_pPrinterGfx->DrawPolyLineBezier (nPoints, (Point*)pPtAry, pFlgAry);
return sal_True;
}
-sal_Bool PspGraphics::drawPolygonBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry )
+sal_Bool PspGraphics::drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry )
{
m_pPrinterGfx->DrawPolygonBezier (nPoints, (Point*)pPtAry, pFlgAry);
return sal_True;
@@ -458,12 +458,11 @@ sal_Bool PspGraphics::drawPolyPolygonBez
return sal_True;
}
-void PspGraphics::invert( sal_uLong,
- const SalPoint*,
- SalInvert )
+void PspGraphics::invert( sal_uInt32, const SalPoint*, SalInvert )
{
DBG_ASSERT( 0, "Error: PrinterGfx::Invert() not implemented" );
}
+
sal_Bool PspGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize )
{
return m_pPrinterGfx->DrawEPS( Rectangle( Point( nX, nY ), Size( nWidth, nHeight ) ), pPtr, nSize );
@@ -603,7 +602,7 @@ bool PspFontLayout::LayoutText( ImplLayo
mbVertical = ((rArgs.mnFlags & SAL_LAYOUT_VERTICAL) != 0);
long nUnitsPerPixel = 1;
- int nOldGlyphId = -1;
+ sal_GlyphId aOldGlyphId( GF_DROPPED);
long nGlyphWidth = 0;
int nCharPos = -1;
Point aNewPos( 0, 0 );
@@ -622,7 +621,7 @@ bool PspFontLayout::LayoutText( ImplLayo
if( aFontEnc == RTL_TEXTENCODING_SYMBOL )
if( cChar < 256 )
cChar += 0xf000;
- int nGlyphIndex = cChar; // printer glyphs = unicode
+ sal_GlyphId aGlyphId( cChar); // printer glyphs = unicode
// update fallback_runs if needed
psp::CharacterMetric aMetric;
@@ -633,13 +632,13 @@ bool PspFontLayout::LayoutText( ImplLayo
// apply pair kerning to prev glyph if requested
if( SAL_LAYOUT_KERNING_PAIRS & rArgs.mnFlags )
{
- if( nOldGlyphId > 0 )
+ if( aOldGlyphId > 0 )
{
const std::list< KernPair >& rKernPairs = mrPrinterGfx.getKernPairs(mbVertical);
for( std::list< KernPair >::const_iterator it = rKernPairs.begin();
it != rKernPairs.end(); ++it )
{
- if( it->first == nOldGlyphId && it->second == nGlyphIndex )
+ if( (it->first == aOldGlyphId) && (it->second == aGlyphId) )
{
int nTextScale = mrPrinterGfx.GetFontWidth();
if( ! nTextScale )
@@ -654,25 +653,25 @@ bool PspFontLayout::LayoutText( ImplLayo
}
// finish previous glyph
- if( nOldGlyphId >= 0 )
+ if( aOldGlyphId != GF_DROPPED )
AppendGlyph( aPrevItem );
- nOldGlyphId = nGlyphIndex;
+ aOldGlyphId = aGlyphId;
aNewPos.X() += nGlyphWidth;
// prepare GlyphItem for appending it in next round
nUnitsPerPixel = mrPrinterGfx.GetCharWidth( cChar, cChar, &nGlyphWidth );
int nGlyphFlags = bRightToLeft ? GlyphItem::IS_RTL_GLYPH : 0;
- nGlyphIndex |= GF_ISCHAR;
- aPrevItem = GlyphItem( nCharPos, nGlyphIndex, aNewPos, nGlyphFlags, nGlyphWidth );
+ aGlyphId |= GF_ISCHAR;
+ aPrevItem = GlyphItem( nCharPos, aGlyphId, aNewPos, nGlyphFlags, nGlyphWidth );
}
// append last glyph item if any
- if( nOldGlyphId >= 0 )
+ if( aOldGlyphId != GF_DROPPED )
AppendGlyph( aPrevItem );
SetOrientation( mrPrinterGfx.GetFontAngle() );
SetUnitsPerPixel( nUnitsPerPixel );
- return (nOldGlyphId >= 0);
+ return (aOldGlyphId != GF_DROPPED);
}
class PspServerFontLayout : public ServerFontLayout
@@ -721,7 +720,7 @@ void PspServerFontLayout::InitFont() con
static void DrawPrinterLayout( const SalLayout& rLayout, ::psp::PrinterGfx& rGfx, bool bIsPspServerFontLayout )
{
const int nMaxGlyphs = 200;
- sal_uInt32 aGlyphAry[ nMaxGlyphs ]; // TODO: use sal_GlyphId
+ sal_GlyphId aGlyphAry[ nMaxGlyphs ];
sal_Int32 aWidthAry[ nMaxGlyphs ];
sal_Int32 aIdxAry [ nMaxGlyphs ];
sal_Unicode aUnicodes[ nMaxGlyphs ];
@@ -769,15 +768,15 @@ static void DrawPrinterLayout( const Sal
{
nXOffset += aWidthAry[ i ];
aIdxAry[ i ] = nXOffset / nUnitsPerPixel;
- sal_Int32 nGlyphIdx = aGlyphAry[i] & (GF_IDXMASK | GF_ROTMASK);
+ sal_GlyphId aGlyphId = aGlyphAry[i] & (GF_IDXMASK | GF_ROTMASK);
if( pText )
aUnicodes[i] = (aCharPosAry[i] >= nMinCharPos && aCharPosAry[i] <= nMaxCharPos) ? pText[ aCharPosAry[i] ] : 0;
else
- aUnicodes[i] = (aGlyphAry[i] & GF_ISCHAR) ? nGlyphIdx : 0;
- aGlyphAry[i] = nGlyphIdx;
+ aUnicodes[i] = (aGlyphAry[i] & GF_ISCHAR) ? aGlyphId : 0;
+ aGlyphAry[i] = aGlyphId;
}
- rGfx.DrawGlyphs( aPos, (sal_uInt32 *)aGlyphAry, aUnicodes, nGlyphCount, aIdxAry );
+ rGfx.DrawGlyphs( aPos, aGlyphAry, aUnicodes, nGlyphCount, aIdxAry );
}
}
@@ -964,38 +963,36 @@ sal_uLong PspGraphics::GetKernPairs( sal
return nHavePairs;
}
-sal_Bool PspGraphics::GetGlyphBoundRect( long nGlyphIndex, Rectangle& rRect )
+bool PspGraphics::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect )
{
- int nLevel = nGlyphIndex >> GF_FONTSHIFT;
+ const int nLevel = aGlyphId >> GF_FONTSHIFT;
if( nLevel >= MAX_FALLBACK )
- return sal_False;
+ return false;
ServerFont* pSF = m_pServerFont[ nLevel ];
if( !pSF )
- return sal_False;
+ return false;
- nGlyphIndex &= ~GF_FONTMASK;
- const GlyphMetric& rGM = pSF->GetGlyphMetric( nGlyphIndex );
+ aGlyphId &= ~GF_FONTMASK;
+ const GlyphMetric& rGM = pSF->GetGlyphMetric( aGlyphId );
rRect = Rectangle( rGM.GetOffset(), rGM.GetSize() );
- return sal_True;
+ return true;
}
-sal_Bool PspGraphics::GetGlyphOutline( long nGlyphIndex,
+bool PspGraphics::GetGlyphOutline( sal_GlyphId aGlyphId,
::basegfx::B2DPolyPolygon& rB2DPolyPoly )
{
- int nLevel = nGlyphIndex >> GF_FONTSHIFT;
+ const int nLevel = aGlyphId >> GF_FONTSHIFT;
if( nLevel >= MAX_FALLBACK )
- return sal_False;
+ return false;
ServerFont* pSF = m_pServerFont[ nLevel ];
if( !pSF )
- return sal_False;
-
- nGlyphIndex &= ~GF_FONTMASK;
- if( pSF->GetGlyphOutline( nGlyphIndex, rB2DPolyPoly ) )
- return sal_True;
+ return false;
- return sal_False;
+ aGlyphId &= ~GF_FONTMASK;
+ bool bOK = pSF->GetGlyphOutline( aGlyphId, rB2DPolyPoly );
+ return bOK;
}
SalLayout* PspGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLevel )
@@ -1037,7 +1034,7 @@ SalLayout* PspGraphics::GetTextLayout( I
sal_Bool PspGraphics::CreateFontSubset(
const rtl::OUString& rToFile,
const ImplFontData* pFont,
- sal_Int32* pGlyphIDs,
+ sal_GlyphId* pGlyphIds,
sal_uInt8* pEncoding,
sal_Int32* pWidths,
int nGlyphCount,
@@ -1055,7 +1052,7 @@ sal_Bool PspGraphics::CreateFontSubset(
bool bSuccess = rMgr.createFontSubset( rInfo,
aFont,
rToFile,
- pGlyphIDs,
+ pGlyphIds,
pEncoding,
pWidths,
nGlyphCount );
Modified: openoffice/branches/ooxml-osba/main/vcl/unx/generic/gdi/salgdi.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/unx/generic/gdi/salgdi.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/unx/generic/gdi/salgdi.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/unx/generic/gdi/salgdi.cxx Wed Dec 18 13:27:09 2013
@@ -843,13 +843,13 @@ void X11SalGraphics::drawRect( long nX,
}
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-void X11SalGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint *pPtAry )
+void X11SalGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint *pPtAry )
{
drawPolyLine( nPoints, pPtAry, false );
}
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-void X11SalGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint *pPtAry, bool bClose )
+void X11SalGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint *pPtAry, bool bClose )
{
if( nPenColor_ != SALCOLOR_NONE)
{
@@ -860,7 +860,7 @@ void X11SalGraphics::drawPolyLine( sal_u
}
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-void X11SalGraphics::drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry )
+void X11SalGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
if( nPoints == 0 )
return;
@@ -927,7 +927,7 @@ void X11SalGraphics::drawPolygon( sal_uL
}
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-void X11SalGraphics::drawPolyPolygon( sal_uInt32 nPoly,
+void X11SalGraphics::drawPolyPolygon( sal_uInt32 nPoly,
const sal_uInt32 *pPoints,
PCONSTSALPOINT *pPtAry )
{
@@ -976,14 +976,14 @@ void X11SalGraphics::drawPolyPolygon( sa
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-sal_Bool X11SalGraphics::drawPolyLineBezier( sal_uLong, const SalPoint*, const BYTE* )
+sal_Bool X11SalGraphics::drawPolyLineBezier( sal_uInt32, const SalPoint*, const BYTE* )
{
return sal_False;
}
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-sal_Bool X11SalGraphics::drawPolygonBezier( sal_uLong, const SalPoint*, const BYTE* )
+sal_Bool X11SalGraphics::drawPolygonBezier( sal_uInt32, const SalPoint*, const BYTE* )
{
return sal_False;
}
@@ -998,7 +998,7 @@ sal_Bool X11SalGraphics::drawPolyPolygon
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-void X11SalGraphics::invert( sal_uLong nPoints,
+void X11SalGraphics::invert( sal_uInt32 nPoints,
const SalPoint* pPtAry,
SalInvert nFlags )
{
Modified: openoffice/branches/ooxml-osba/main/vcl/unx/generic/gdi/salgdi3.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/unx/generic/gdi/salgdi3.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/unx/generic/gdi/salgdi3.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/unx/generic/gdi/salgdi3.cxx Wed Dec 18 13:27:09 2013
@@ -131,7 +131,7 @@ void PspKernInfo::Initialize() const
return;
// feed psprint's kerning list into a lookup-friendly container
- maUnicodeKernPairs.resize( rKernPairs.size() );
+ maUnicodeKernPairs.rehash( rKernPairs.size() );
PspKernPairs::const_iterator it = rKernPairs.begin();
for(; it != rKernPairs.end(); ++it )
{
@@ -638,7 +638,7 @@ void X11SalGraphics::DrawServerAAFontStr
unsigned int aRenderAry[ MAXGLYPHS ];
for( int i = 0; i < nGlyphs; ++i )
- aRenderAry[ i ] = rGlyphPeer.GetGlyphId( rFont, aGlyphAry[i] );
+ aRenderAry[ i ] = rGlyphPeer.GetXRGlyph( rFont, aGlyphAry[i] );
rRenderPeer.CompositeString32( rEntry.m_aPicture, aDstPic,
aGlyphSet, aPos.X(), aPos.Y(), aRenderAry, nGlyphs );
}
@@ -1231,40 +1231,38 @@ X11SalGraphics::GetKernPairs( sal_uLong
// ---------------------------------------------------------------------------
-sal_Bool X11SalGraphics::GetGlyphBoundRect( long nGlyphIndex, Rectangle& rRect )
+bool X11SalGraphics::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect )
{
- int nLevel = nGlyphIndex >> GF_FONTSHIFT;
+ const int nLevel = aGlyphId >> GF_FONTSHIFT;
if( nLevel >= MAX_FALLBACK )
- return sal_False;
+ return false;
ServerFont* pSF = mpServerFont[ nLevel ];
if( !pSF )
- return sal_False;
+ return false;
- nGlyphIndex &= ~GF_FONTMASK;
- const GlyphMetric& rGM = pSF->GetGlyphMetric( nGlyphIndex );
+ aGlyphId &= ~GF_FONTMASK;
+ const GlyphMetric& rGM = pSF->GetGlyphMetric( aGlyphId );
rRect = Rectangle( rGM.GetOffset(), rGM.GetSize() );
- return sal_True;
+ return true;
}
// ---------------------------------------------------------------------------
-sal_Bool X11SalGraphics::GetGlyphOutline( long nGlyphIndex,
+bool X11SalGraphics::GetGlyphOutline( sal_GlyphId aGlyphId,
::basegfx::B2DPolyPolygon& rPolyPoly )
{
- int nLevel = nGlyphIndex >> GF_FONTSHIFT;
+ const int nLevel = aGlyphId >> GF_FONTSHIFT;
if( nLevel >= MAX_FALLBACK )
- return sal_False;
+ return false;
ServerFont* pSF = mpServerFont[ nLevel ];
if( !pSF )
- return sal_False;
-
- nGlyphIndex &= ~GF_FONTMASK;
- if( pSF->GetGlyphOutline( nGlyphIndex, rPolyPoly ) )
- return sal_True;
+ return false;
- return sal_False;
+ aGlyphId &= ~GF_FONTMASK;
+ bool bOK = pSF->GetGlyphOutline( aGlyphId, rPolyPoly );
+ return bOK;
}
//--------------------------------------------------------------------------
@@ -1281,10 +1279,8 @@ SalLayout* X11SalGraphics::GetTextLayout
if (!bDisableGraphite_ &&
GraphiteFontAdaptor::IsGraphiteEnabledFont(*mpServerFont[nFallbackLevel]))
{
- sal_Int32 xdpi, ydpi;
-
- xdpi = GetDisplay()->GetResolution().A();
- ydpi = GetDisplay()->GetResolution().B();
+ sal_Int32 xdpi = GetDisplay()->GetResolution().A();
+ sal_Int32 ydpi = GetDisplay()->GetResolution().B();
GraphiteFontAdaptor * pGrfont = new GraphiteFontAdaptor( *mpServerFont[nFallbackLevel], xdpi, ydpi);
if (!pGrfont) return NULL;
@@ -1328,7 +1324,7 @@ SystemFontData X11SalGraphics::GetSysFon
sal_Bool X11SalGraphics::CreateFontSubset(
const rtl::OUString& rToFile,
const ImplFontData* pFont,
- sal_Int32* pGlyphIDs,
+ sal_GlyphId* pGlyphIds,
sal_uInt8* pEncoding,
sal_Int32* pWidths,
int nGlyphCount,
@@ -1346,7 +1342,7 @@ sal_Bool X11SalGraphics::CreateFontSubse
bool bSuccess = rMgr.createFontSubset( rInfo,
aFont,
rToFile,
- pGlyphIDs,
+ pGlyphIds,
pEncoding,
pWidths,
nGlyphCount );
Modified: openoffice/branches/ooxml-osba/main/vcl/unx/generic/gdi/xrender_peer.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/unx/generic/gdi/xrender_peer.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/unx/generic/gdi/xrender_peer.hxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/unx/generic/gdi/xrender_peer.hxx Wed Dec 18 13:27:09 2013
@@ -32,6 +32,8 @@ struct _XTrap; // on some older systems
#include <vcl/salgtype.hxx>
#include <osl/module.h>
+typedef Glyph XRenderGlyph;
+
class XRenderPeer
{
public:
@@ -70,9 +72,9 @@ public:
GlyphSet CreateGlyphSet() const;
void FreeGlyphSet( GlyphSet ) const;
- void AddGlyph( GlyphSet, Glyph nGlyphId, const XGlyphInfo&,
+ void AddGlyph( GlyphSet, XRenderGlyph nXRGlyph, const XGlyphInfo&,
const char* pBuffer, int nBufSize ) const;
- void FreeGlyph( GlyphSet, Glyph nGlyphId ) const;
+ void FreeGlyph( GlyphSet, XRenderGlyph nXRGlyphId ) const;
void CompositeString32( Picture aSrc, Picture aDst, GlyphSet,
int nDstX, int nDstY, const unsigned* pText, int nTextLen ) const;
void FillRectangle( int nOp, Picture aDst, const XRenderColor*,
@@ -253,21 +255,21 @@ inline void XRenderPeer::FreeGlyphSet( G
#endif
}
-inline void XRenderPeer::AddGlyph( GlyphSet aGS, Glyph nGlyphId,
+inline void XRenderPeer::AddGlyph( GlyphSet aGS, XRenderGlyph nXRGlyph,
const XGlyphInfo& rGI, const char* pBuffer, int nBufSize ) const
{
#ifdef XRENDER_LINK
- XRenderAddGlyphs( mpDisplay, aGS, &nGlyphId, &rGI, 1,
+ XRenderAddGlyphs( mpDisplay, aGS, &nXRGlyph, &rGI, 1,
const_cast<char*>(pBuffer), nBufSize );
#else
- (*mpXRenderAddGlyphs)( mpDisplay, aGS, &nGlyphId, &rGI, 1,
+ (*mpXRenderAddGlyphs)( mpDisplay, aGS, &nXRGlyph, &rGI, 1,
const_cast<char*>(pBuffer), nBufSize );
#endif
}
-inline void XRenderPeer::FreeGlyph( GlyphSet aGS, Glyph nGlyphId ) const
+inline void XRenderPeer::FreeGlyph( GlyphSet aGS, XRenderGlyph nXRGlyph ) const
{
- (void)aGS; (void)nGlyphId;
+ (void)aGS; (void)nXRGlyph;
// XRenderFreeGlyphs not implemented yet for version<=0.2
// #108209# disabled because of crash potential,
@@ -277,9 +279,9 @@ inline void XRenderPeer::FreeGlyph( Glyp
if( mnRenderVersion >= 0x05 )
{
#ifdef XRENDER_LINK
- XRenderFreeGlyphs( mpDisplay, aGS, &nGlyphId, 1 );
+ XRenderFreeGlyphs( mpDisplay, aGS, &nXRGlyph, 1 );
#else
- (*mpXRenderFreeGlyphs)( mpDisplay, aGS, &nGlyphId, 1 );
+ (*mpXRenderFreeGlyphs)( mpDisplay, aGS, &nXRGlyph, 1 );
#endif
}
#endif
Modified: openoffice/branches/ooxml-osba/main/vcl/unx/generic/printer/cupsmgr.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/unx/generic/printer/cupsmgr.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/unx/generic/printer/cupsmgr.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/unx/generic/printer/cupsmgr.cxx Wed Dec 18 13:27:09 2013
@@ -274,7 +274,7 @@ struct GetPPDAttribs
{
// This CUPS method is not at all thread-safe we need
// to dup the pointer to a static buffer it returns ASAP
- OString aResult = m_pFunction( m_aParameter );
+ OString aResult = m_pFunction( m_aParameter.getStr() );
MutexGuard aGuard( *m_pSyncMutex );
m_aResult = aResult;
m_aCondition.set();
@@ -289,9 +289,7 @@ struct GetPPDAttribs
)
{
#if OSL_DEBUG_LEVEL > 1
- fprintf( stderr, "cupsGetPPD %s timed out\n",
- (const sal_Char *) m_aParameter
- );
+ fprintf( stderr, "cupsGetPPD %s timed out\n", m_aParameter.getStr() );
#endif
}
m_pSyncMutex->acquire();
Modified: openoffice/branches/ooxml-osba/main/vcl/unx/generic/printergfx/glyphset.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/unx/generic/printergfx/glyphset.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/unx/generic/printergfx/glyphset.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/unx/generic/printergfx/glyphset.cxx Wed Dec 18 13:27:09 2013
@@ -121,7 +121,7 @@ GlyphSet::GetCharID (
sal_Bool
GlyphSet::GetGlyphID (
- sal_uInt32 nGlyph,
+ sal_GlyphId nGlyph,
sal_Unicode nUnicode,
sal_uChar* nOutGlyphID,
sal_Int32* nOutGlyphSetID
@@ -164,7 +164,7 @@ GlyphSet::LookupCharID (
sal_Bool
GlyphSet::LookupGlyphID (
- sal_uInt32 nGlyph,
+ sal_GlyphId nGlyph,
sal_uChar* nOutGlyphID,
sal_Int32* nOutGlyphSetID
)
@@ -298,7 +298,7 @@ GlyphSet::AddCharID (
sal_Bool
GlyphSet::AddGlyphID (
- sal_uInt32 nGlyph,
+ sal_GlyphId nGlyph,
sal_Unicode nUnicode,
sal_uChar* nOutGlyphID,
sal_Int32* nOutGlyphSetID
@@ -494,7 +494,7 @@ GlyphSet::GetReencodedFontName (sal_Int3
void GlyphSet::DrawGlyphs(
PrinterGfx& rGfx,
const Point& rPoint,
- const sal_uInt32* pGlyphIds,
+ const sal_GlyphId* pGlyphIds,
const sal_Unicode* pUnicodes,
sal_Int16 nLen,
const sal_Int32* pDeltaArray )
@@ -814,7 +814,7 @@ static void CreatePSUploadableFont( True
std::stable_sort( aSorted.begin(), aSorted.end() );
std::vector< sal_uChar > aEncoding( nGlyphCount );
- std::vector< long > aRequestedGlyphs( nGlyphCount );
+ std::vector< sal_GlyphId> aRequestedGlyphs( nGlyphCount );
for( int i = 0; i < nGlyphCount; i++ )
{
Modified: openoffice/branches/ooxml-osba/main/vcl/unx/generic/printergfx/glyphset.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/unx/generic/printergfx/glyphset.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/unx/generic/printergfx/glyphset.hxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/unx/generic/printergfx/glyphset.hxx Wed Dec 18 13:27:09 2013
@@ -53,7 +53,7 @@ private:
typedef std::hash_map< sal_Unicode, sal_uInt8 > char_map_t;
typedef std::list< char_map_t > char_list_t;
- typedef std::hash_map< sal_uInt32, sal_uInt8 > glyph_map_t;
+ typedef std::hash_map< sal_GlyphId, sal_uInt8 > glyph_map_t;
typedef std::list< glyph_map_t > glyph_list_t;
char_list_t maCharList;
@@ -75,11 +75,11 @@ private:
sal_Bool AddCharID (sal_Unicode nChar,
sal_uChar* nOutGlyphID,
sal_Int32* nOutGlyphSetID);
- sal_Bool GetGlyphID (sal_uInt32 nGlyph, sal_Unicode nUnicode,
+ sal_Bool GetGlyphID( sal_GlyphId nGlyphId, sal_Unicode nUnicode,
sal_uChar* nOutGlyphID, sal_Int32* nOutGlyphSetID);
- sal_Bool LookupGlyphID (sal_uInt32 nGlyph,
+ sal_Bool LookupGlyphID( sal_GlyphId nGlyphId,
sal_uChar* nOutGlyphID, sal_Int32* nOutGlyphSetID);
- sal_Bool AddGlyphID (sal_uInt32 nGlyph, sal_Unicode nUnicode,
+ sal_Bool AddGlyphID (sal_GlyphId nGlyphId, sal_Unicode nUnicode,
sal_uChar* nOutGlyphID,
sal_Int32* nOutGlyphSetID);
void AddNotdef (char_map_t &rCharMap);
@@ -116,7 +116,7 @@ public:
const sal_Int32* pDeltaArray = NULL);
void DrawGlyphs (PrinterGfx& rGfx,
const Point& rPoint,
- const sal_uInt32* pGlyphIds,
+ const sal_GlyphId* pGlyphIds,
const sal_Unicode* pUnicodes,
sal_Int16 nLen,
const sal_Int32* pDeltaArray );
Modified: openoffice/branches/ooxml-osba/main/vcl/unx/generic/printergfx/printerjob.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/unx/generic/printergfx/printerjob.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/unx/generic/printergfx/printerjob.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/unx/generic/printergfx/printerjob.cxx Wed Dec 18 13:27:09 2013
@@ -361,7 +361,7 @@ getLocalTime(sal_Char* pBuffer)
static bool isAscii( const rtl::OUString& rStr )
{
- const sal_Unicode* pStr = rStr;
+ const sal_Unicode* pStr = rStr.getStr();
sal_Int32 nLen = rStr.getLength();
for( sal_Int32 i = 0; i < nLen; i++ )
if( pStr[i] > 127 )
Modified: openoffice/branches/ooxml-osba/main/vcl/unx/generic/printergfx/psputil.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/unx/generic/printergfx/psputil.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/unx/generic/printergfx/psputil.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/unx/generic/printergfx/psputil.cxx Wed Dec 18 13:27:09 2013
@@ -181,7 +181,7 @@ WritePS (osl::File* pFile, const rtl::OS
sal_uInt64 nOutLength = 0;
if (nInLength > 0 && pFile)
- pFile->write (rString, nInLength, nOutLength);
+ pFile->write( rString.getStr(), nInLength, nOutLength);
return nInLength == nOutLength;
}
Modified: openoffice/branches/ooxml-osba/main/vcl/unx/generic/printergfx/psputil.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/unx/generic/printergfx/psputil.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/unx/generic/printergfx/psputil.hxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/unx/generic/printergfx/psputil.hxx Wed Dec 18 13:27:09 2013
@@ -45,6 +45,7 @@ sal_Int32 getAlignedHexValueOf (sal_In
sal_Int32 getValueOf (sal_Int32 nValue, sal_Char* pBuffer);
sal_Int32 appendStr (const sal_Char* pSrc, sal_Char* pDst);
sal_Int32 appendStr (const sal_Char* pSrc, sal_Char* pDst, sal_Int32 nBytes);
+inline sal_Int32 appendStr( const ::rtl::OString& rSrc, sal_Char* pDst) { return appendStr( rSrc.getStr(), pDst);}
sal_Bool WritePS (osl::File* pFile, const sal_Char* pString);
sal_Bool WritePS (osl::File* pFile, const sal_Char* pString, sal_uInt64 nInLength);
Modified: openoffice/branches/ooxml-osba/main/vcl/unx/generic/printergfx/text_gfx.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/unx/generic/printergfx/text_gfx.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/unx/generic/printergfx/text_gfx.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/unx/generic/printergfx/text_gfx.cxx Wed Dec 18 13:27:09 2013
@@ -164,7 +164,7 @@ PrinterGfx::SetFallbackFont ( sal_Int32
void PrinterGfx::drawGlyphs(
const Point& rPoint,
- sal_uInt32* pGlyphIds,
+ sal_GlyphId* pGlyphIds,
sal_Unicode* pUnicodes,
sal_Int16 nLen,
sal_Int32* pDeltaArray
@@ -233,7 +233,7 @@ void PrinterGfx::DrawGlyphs(
// vertical glyphs can have an additional rotation ... sigh.
// so break up text in chunks of normal glyphs and print out
// specially rotated glyphs extra
- sal_uInt32* pTempGlyphIds = (sal_uInt32*)alloca(sizeof(sal_Int32)*nLen);
+ sal_GlyphId* pTempGlyphIds = (sal_GlyphId*)alloca(sizeof(sal_Int32)*nLen);
sal_Int32* pTempDelta = (sal_Int32*)alloca(sizeof(sal_Int32)*nLen);
sal_Unicode* pTempUnicodes = (sal_Unicode*)alloca(sizeof(sal_Unicode)*nLen);
sal_Int16 nTempLen = 0;
Modified: openoffice/branches/ooxml-osba/main/vcl/unx/gtk/a11y/atkaction.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/unx/gtk/a11y/atkaction.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/unx/gtk/a11y/atkaction.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/unx/gtk/a11y/atkaction.cxx Wed Dec 18 13:27:09 2013
@@ -49,7 +49,7 @@ getAsConst( const rtl::OString& rString
static int nIdx = 0;
nIdx = (nIdx + 1) % nMax;
aUgly[nIdx] = rString;
- return aUgly[ nIdx ];
+ return aUgly[ nIdx ].getStr();
}
static accessibility::XAccessibleAction*
Modified: openoffice/branches/ooxml-osba/main/vcl/unx/gtk/a11y/atkimage.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/unx/gtk/a11y/atkimage.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/unx/gtk/a11y/atkimage.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/unx/gtk/a11y/atkimage.cxx Wed Dec 18 13:27:09 2013
@@ -41,7 +41,7 @@ getAsConst( rtl::OUString rString )
static int nIdx = 0;
nIdx = (nIdx + 1) % nMax;
aUgly[nIdx] = rtl::OUStringToOString( rString, RTL_TEXTENCODING_UTF8 );
- return aUgly[ nIdx ];
+ return aUgly[ nIdx ].getStr();
}
static accessibility::XAccessibleImage*
Modified: openoffice/branches/ooxml-osba/main/vcl/unx/gtk/a11y/atktable.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/unx/gtk/a11y/atktable.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/unx/gtk/a11y/atktable.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/unx/gtk/a11y/atktable.cxx Wed Dec 18 13:27:09 2013
@@ -58,7 +58,7 @@ getAsConst( rtl::OUString rString )
static int nIdx = 0;
nIdx = (nIdx + 1) % nMax;
aUgly[nIdx] = rtl::OUStringToOString( rString, RTL_TEXTENCODING_UTF8 );
- return aUgly[ nIdx ];
+ return aUgly[ nIdx ].getStr();
}
/*****************************************************************************/
Modified: openoffice/branches/ooxml-osba/main/vcl/unx/gtk/a11y/atkwrapper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/unx/gtk/a11y/atkwrapper.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/unx/gtk/a11y/atkwrapper.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/unx/gtk/a11y/atkwrapper.cxx Wed Dec 18 13:27:09 2013
@@ -784,7 +784,7 @@ ensureTypeFor( uno::XInterface *pAccessi
// pAccessible, aTypeTable[i].name, bTypes[i] );
}
- GType nType = g_type_from_name( aTypeName );
+ GType nType = g_type_from_name( aTypeName.getStr() );
if( nType == G_TYPE_INVALID )
{
GTypeInfo aTypeInfo = {
@@ -794,7 +794,7 @@ ensureTypeFor( uno::XInterface *pAccessi
0, NULL, NULL
} ;
nType = g_type_register_static( ATK_TYPE_OBJECT_WRAPPER,
- aTypeName, &aTypeInfo, (GTypeFlags)0 ) ;
+ aTypeName.getStr(), &aTypeInfo, (GTypeFlags)0 ) ;
for( int j = 0; j < aTypeTableSize; j++ )
if( bTypes[j] )
Modified: openoffice/branches/ooxml-osba/main/vcl/unx/gtk/a11y/atkwrapper.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/unx/gtk/a11y/atkwrapper.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/unx/gtk/a11y/atkwrapper.hxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/unx/gtk/a11y/atkwrapper.hxx Wed Dec 18 13:27:09 2013
@@ -113,7 +113,7 @@ static inline gchar *
OUStringToGChar(const rtl::OUString& rString )
{
rtl::OString aUtf8 = rtl::OUStringToOString( rString, RTL_TEXTENCODING_UTF8 );
- return g_strdup( aUtf8 );
+ return g_strdup( aUtf8.getStr() );
}
#define OUStringToConstGChar( string ) rtl::OUStringToOString( string, RTL_TEXTENCODING_UTF8 ).getStr()
Modified: openoffice/branches/ooxml-osba/main/vcl/unx/gtk/app/gtkdata.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/unx/gtk/app/gtkdata.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/unx/gtk/app/gtkdata.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/unx/gtk/app/gtkdata.cxx Wed Dec 18 13:27:09 2013
@@ -638,7 +638,7 @@ void GtkXLib::Init()
if( aAppName.getLength() > 0 )
{
rtl::OString aPrgName = rtl::OUStringToOString(aAppName, aEnc);
- g_set_prgname(aPrgName);
+ g_set_prgname( aPrgName.getStr());
}
// init gtk/gdk
Modified: openoffice/branches/ooxml-osba/main/vcl/unx/gtk/app/gtkinst.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/unx/gtk/app/gtkinst.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/unx/gtk/app/gtkinst.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/unx/gtk/app/gtkinst.cxx Wed Dec 18 13:27:09 2013
@@ -231,7 +231,7 @@ void GtkInstance::AddToRecentDocumentLis
}
#if GTK_CHECK_VERSION(2,10,0)
GtkRecentManager *manager = gtk_recent_manager_get_default ();
- gtk_recent_manager_add_item (manager, sGtkURL);
+ gtk_recent_manager_add_item( manager, sGtkURL.getStr());
(void)rMimeType;
#else
static getDefaultFnc sym_gtk_recent_manager_get_default =
Modified: openoffice/branches/ooxml-osba/main/vcl/unx/gtk/window/gtkframe.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/unx/gtk/window/gtkframe.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/unx/gtk/window/gtkframe.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/unx/gtk/window/gtkframe.cxx Wed Dec 18 13:27:09 2013
@@ -984,7 +984,7 @@ void GtkSalFrame::SetExtendedFrameStyle(
}
else
gtk_window_set_wmclass( GTK_WINDOW(m_pWindow),
- X11SalData::getFrameResName( m_nExtStyle ),
+ X11SalData::getFrameResName( m_nExtStyle).getStr(),
X11SalData::getFrameClassName() );
}
}
@@ -3785,7 +3785,7 @@ gboolean GtkSalFrame::IMHandler::signalI
if (!sAllText.getLength())
return sal_False;
rtl::OString sUTF = rtl::OUStringToOString(sAllText, RTL_TEXTENCODING_UTF8);
- rtl::OUString sCursorText(sAllText, nPosition);
+ rtl::OUString sCursorText( sAllText.getStr(), nPosition);
gtk_im_context_set_surrounding(pContext, sUTF.getStr(), sUTF.getLength(),
rtl::OUStringToOString(sCursorText, RTL_TEXTENCODING_UTF8).getLength());
return sal_True;
Modified: openoffice/branches/ooxml-osba/main/vcl/unx/headless/svpgdi.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/unx/headless/svpgdi.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/unx/headless/svpgdi.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/unx/headless/svpgdi.cxx Wed Dec 18 13:27:09 2013
@@ -341,7 +341,7 @@ void SvpSalGraphics::drawRect( long nX,
dbgOut( m_aDevice );
}
-void SvpSalGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry )
+void SvpSalGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
if( m_bUseLineColor && nPoints )
{
@@ -355,7 +355,7 @@ void SvpSalGraphics::drawPolyLine( sal_u
dbgOut( m_aDevice );
}
-void SvpSalGraphics::drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry )
+void SvpSalGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
if( ( m_bUseLineColor || m_bUseFillColor ) && nPoints )
{
@@ -377,7 +377,7 @@ void SvpSalGraphics::drawPolygon( sal_uL
dbgOut( m_aDevice );
}
-void SvpSalGraphics::drawPolyPolygon( sal_uInt32 nPoly,
+void SvpSalGraphics::drawPolyPolygon( sal_uInt32 nPoly,
const sal_uInt32* pPointCounts,
PCONSTSALPOINT* pPtAry )
{
@@ -425,14 +425,14 @@ bool SvpSalGraphics::drawPolyLine(
return false;
}
-sal_Bool SvpSalGraphics::drawPolyLineBezier( sal_uLong,
+sal_Bool SvpSalGraphics::drawPolyLineBezier( sal_uInt32,
const SalPoint*,
const sal_uInt8* )
{
return sal_False;
}
-sal_Bool SvpSalGraphics::drawPolygonBezier( sal_uLong,
+sal_Bool SvpSalGraphics::drawPolygonBezier( sal_uInt32,
const SalPoint*,
const sal_uInt8* )
{
@@ -574,7 +574,7 @@ void SvpSalGraphics::invert( long nX, lo
dbgOut( m_aDevice );
}
-void SvpSalGraphics::invert( sal_uLong nPoints, const SalPoint* pPtAry, SalInvert /*nFlags*/ )
+void SvpSalGraphics::invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert /*nFlags*/ )
{
// FIXME: handle SAL_INVERT_50 and SAL_INVERT_TRACKFRAME
B2DPolygon aPoly;
Modified: openoffice/branches/ooxml-osba/main/vcl/unx/headless/svpgdi.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/unx/headless/svpgdi.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/unx/headless/svpgdi.hxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/unx/headless/svpgdi.hxx Wed Dec 18 13:27:09 2013
@@ -94,7 +94,7 @@ public:
virtual bool AddTempDevFont( ImplDevFontList*, const String& rFileURL, const String& rFontName );
virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile,
const ImplFontData*,
- sal_Int32* pGlyphIDs,
+ sal_GlyphId* pGlyphIds,
sal_uInt8* pEncoding,
sal_Int32* pWidths,
int nGlyphs,
@@ -111,8 +111,8 @@ public:
bool bVertical,
Int32Vector& rWidths,
Ucs2UIntMap& rUnicodeEnc );
- virtual sal_Bool GetGlyphBoundRect( long nIndex, Rectangle& );
- virtual sal_Bool GetGlyphOutline( long nIndex, ::basegfx::B2DPolyPolygon& );
+ virtual bool GetGlyphBoundRect( sal_GlyphId, Rectangle& );
+ virtual bool GetGlyphOutline( sal_GlyphId, ::basegfx::B2DPolyPolygon& );
virtual SalLayout* GetTextLayout( ImplLayoutArgs&, int nFallbackLevel );
virtual void DrawServerFontLayout( const ServerFontLayout& );
virtual bool supportsOperation( OutDevSupportType ) const;
@@ -127,15 +127,15 @@ public:
const ::basegfx::B2DVector& rLineWidths,
basegfx::B2DLineJoin,
com::sun::star::drawing::LineCap);
- virtual void drawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry );
- virtual void drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry );
+ virtual void drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry );
+ virtual void drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry );
virtual void drawPolyPolygon( sal_uInt32 nPoly,
const sal_uInt32* pPoints,
PCONSTSALPOINT* pPtAry );
- virtual sal_Bool drawPolyLineBezier( sal_uLong nPoints,
+ virtual sal_Bool drawPolyLineBezier( sal_uInt32 nPoints,
const SalPoint* pPtAry,
const sal_uInt8* pFlgAry );
- virtual sal_Bool drawPolygonBezier( sal_uLong nPoints,
+ virtual sal_Bool drawPolygonBezier( sal_uInt32 nPoints,
const SalPoint* pPtAry,
const sal_uInt8* pFlgAry );
virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly,
@@ -166,7 +166,7 @@ public:
virtual SalBitmap* getBitmap( long nX, long nY, long nWidth, long nHeight );
virtual SalColor getPixel( long nX, long nY );
virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags );
- virtual void invert( sal_uLong nPoints, const SalPoint* pPtAry, SalInvert nFlags );
+ virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags );
virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize );