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 [27/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/inc/unx/pspgraphics.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/inc/unx/pspgraphics.h?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/inc/unx/pspgraphics.h (original)
+++ openoffice/branches/ooxml-osba/main/vcl/inc/unx/pspgraphics.h Wed Dec 18 13:27:09 2013
@@ -104,7 +104,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,
@@ -121,8 +121,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;
@@ -130,8 +130,8 @@ public:
virtual void drawPixel( long nX, long nY, SalColor nSalColor );
virtual void drawLine( long nX1, long nY1, long nX2, long nY2 );
virtual void drawRect( long nX, long nY, long nWidth, long nHeight );
- virtual void drawPolyLine( sal_uIntPtr nPoints, const SalPoint* pPtAry );
- virtual void drawPolygon( sal_uIntPtr 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 );
@@ -142,10 +142,10 @@ public:
const basegfx::B2DVector& rLineWidths,
basegfx::B2DLineJoin,
com::sun::star::drawing::LineCap);
- virtual sal_Bool drawPolyLineBezier( sal_uIntPtr nPoints,
+ virtual sal_Bool drawPolyLineBezier( sal_uInt32 nPoints,
const SalPoint* pPtAry,
const sal_uInt8* pFlgAry );
- virtual sal_Bool drawPolygonBezier( sal_uIntPtr nPoints,
+ virtual sal_Bool drawPolygonBezier( sal_uInt32 nPoints,
const SalPoint* pPtAry,
const sal_uInt8* pFlgAry );
virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly,
@@ -175,7 +175,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_uIntPtr 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_uIntPtr nSize );
virtual bool filterText( const String& rOrigText, String& rNewText, xub_StrLen nIndex, xub_StrLen& rLen, xub_StrLen& rCutStart, xub_StrLen& rCutStop );
Modified: openoffice/branches/ooxml-osba/main/vcl/inc/unx/salgdi.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/inc/unx/salgdi.h?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/inc/unx/salgdi.h (original)
+++ openoffice/branches/ooxml-osba/main/vcl/inc/unx/salgdi.h Wed Dec 18 13:27:09 2013
@@ -251,7 +251,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,
@@ -268,8 +268,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 nIndex, Rectangle& );
+ virtual bool GetGlyphOutline( sal_GlyphId nIndex, ::basegfx::B2DPolyPolygon& );
virtual SalLayout* GetTextLayout( ImplLayoutArgs&, int nFallbackLevel );
virtual void DrawServerFontLayout( const ServerFontLayout& );
virtual bool supportsOperation( OutDevSupportType ) const;
@@ -277,9 +277,9 @@ public:
virtual void drawPixel( long nX, long nY, SalColor nSalColor );
virtual void drawLine( long nX1, long nY1, long nX2, long nY2 );
virtual void drawRect( long nX, long nY, long nWidth, long nHeight );
- void drawPolyLine( sal_uIntPtr nPoints, const SalPoint* pPtAry, bool bClose );
- virtual void drawPolyLine( sal_uIntPtr nPoints, const SalPoint* pPtAry );
- virtual void drawPolygon( sal_uIntPtr nPoints, const SalPoint* pPtAry );
+ void drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry, bool bClose );
+ 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 );
@@ -293,10 +293,10 @@ public:
virtual bool drawFilledTrapezoids( const ::basegfx::B2DTrapezoid*, int nTrapCount, double fTransparency );
#if 1 // TODO: remove these obselete methods
- virtual sal_Bool drawPolyLineBezier( sal_uIntPtr nPoints,
+ virtual sal_Bool drawPolyLineBezier( sal_uInt32 nPoints,
const SalPoint* pPtAry,
const sal_uInt8* pFlgAry );
- virtual sal_Bool drawPolygonBezier( sal_uIntPtr nPoints,
+ virtual sal_Bool drawPolygonBezier( sal_uInt32 nPoints,
const SalPoint* pPtAry,
const sal_uInt8* pFlgAry );
virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly,
@@ -328,7 +328,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_uIntPtr 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_uIntPtr nSize );
Modified: openoffice/branches/ooxml-osba/main/vcl/inc/vcl/combobox.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/inc/vcl/combobox.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/inc/vcl/combobox.hxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/inc/vcl/combobox.hxx Wed Dec 18 13:27:09 2013
@@ -67,9 +67,7 @@ private:
DECL_DLLPRIVATE_LINK( ImplSelectionChangedHdl, void* );
DECL_DLLPRIVATE_LINK( ImplUserDrawHdl, UserDrawEvent* );
DECL_DLLPRIVATE_LINK( ImplAutocompleteHdl, Edit* );
- //IAccessibility2 Implementation 2009-----
DECL_DLLPRIVATE_LINK( ImplListItemSelectHdl , void* );
- //-----IAccessibility2 Implementation 2009
protected:
using Window::ImplInit;
@@ -185,9 +183,7 @@ public:
XubString GetMRUEntries( xub_Unicode cSep = ';' ) const;
void SetMaxMRUCount( sal_uInt16 n );
sal_uInt16 GetMaxMRUCount() const;
-//IAccessibility2 Implementation 2009-----
sal_uInt16 GetMRUCount() const;
-//-----IAccessibility2 Implementation 2009
void SetEntryData( sal_uInt16 nPos, void* pNewData );
void* GetEntryData( sal_uInt16 nPos ) const;
@@ -227,9 +223,7 @@ public:
*/
using Control::GetIndexForPoint;
long GetIndexForPoint( const Point& rPoint, sal_uInt16& rPos ) const;
-//IAccessibility2 Implementation 2009-----
void SetMpSubEditAccessibleName(String &aName);
-//-----IAccessibility2 Implementation 2009
};
#endif // _COMBOBOX_HXX
Modified: openoffice/branches/ooxml-osba/main/vcl/inc/vcl/fontmanager.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/inc/vcl/fontmanager.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/inc/vcl/fontmanager.hxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/inc/vcl/fontmanager.hxx Wed Dec 18 13:27:09 2013
@@ -32,6 +32,7 @@
#include "vcl/dllapi.h"
#include "vcl/helper.hxx"
+#include "salglyphid.hxx"
#include "com/sun/star/lang/Locale.hpp"
@@ -643,7 +644,7 @@ public:
bool createFontSubset( FontSubsetInfo&,
fontID nFont,
const rtl::OUString& rOutFile,
- sal_Int32* pGlyphIDs,
+ sal_GlyphId* pGlyphIds,
sal_uInt8* pNewEncoding,
sal_Int32* pWidths,
int nGlyphs,
Modified: openoffice/branches/ooxml-osba/main/vcl/inc/vcl/lstbox.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/inc/vcl/lstbox.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/inc/vcl/lstbox.hxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/inc/vcl/lstbox.hxx Wed Dec 18 13:27:09 2013
@@ -67,10 +67,8 @@ private:
DECL_DLLPRIVATE_LINK( ImplPopupModeEndHdl, void* );
DECL_DLLPRIVATE_LINK( ImplSelectionChangedHdl, void* );
DECL_DLLPRIVATE_LINK( ImplUserDrawHdl, UserDrawEvent* );
-//IAccessibility2 Implementation 2009-----
DECL_DLLPRIVATE_LINK( ImplFocusHdl, void* );
DECL_DLLPRIVATE_LINK( ImplListItemSelectHdl , void* );
-//-----IAccessibility2 Implementation 2009
protected:
using Window::ImplInit;
SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle );
@@ -220,9 +218,7 @@ public:
XubString GetMRUEntries( xub_Unicode cSep = ';' ) const;
void SetMaxMRUCount( sal_uInt16 n );
sal_uInt16 GetMaxMRUCount() const;
-//IAccessibility2 Implementation 2009-----
sal_uInt16 GetMRUCount() const;
-//-----IAccessibility2 Implementation 2009
sal_uInt16 GetDisplayLineCount() const;
void EnableMirroring();
Modified: openoffice/branches/ooxml-osba/main/vcl/inc/vcl/menu.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/inc/vcl/menu.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/inc/vcl/menu.hxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/inc/vcl/menu.hxx Wed Dec 18 13:27:09 2013
@@ -151,9 +151,7 @@ private:
sal_uInt16 nMenuFlags;
sal_uInt16 nDefaultItem; // Id vom Default-Item
sal_uInt16 nSelectedId;
-//IAccessibility2 Implementation 2009-----
sal_uInt16 nHighlightedItem;
-//-----IAccessibility2 Implementation 2009
// Fuer Ausgabe:
sal_uInt16 nCheckPos;
sal_uInt16 nImagePos;
@@ -244,14 +242,12 @@ public:
sal_uInt16 GetItemPos( sal_uInt16 nItemId ) const;
MenuItemType GetItemType( sal_uInt16 nPos ) const;
sal_uInt16 GetCurItemId() const;
-//IAccessibility2 Implementation 2009-----
void SetHightlightItem( sal_uInt16 nHighlightedItem );
sal_uInt16 GetHighlightItem() const;
XubString GetItemAccKeyStrFromPos(sal_uInt16 nPos ) const ;
sal_Bool IsTemporaryItemFromPos(sal_uInt16 nPos ) const;
-//-----IAccessibility2 Implementation 2009
void SetDefaultItem( sal_uInt16 nItemId ) { nDefaultItem = nItemId; }
sal_uInt16 GetDefaultItem() const { return nDefaultItem; }
@@ -380,9 +376,7 @@ public:
void SetAccessibleDescription( sal_uInt16 nItemId, const XubString& rStr );
XubString GetAccessibleDescription( sal_uInt16 nItemId ) const;
-//IAccessibility2 Implementation 2009
Menu* GetStartedFromMenu(){ return pStartedFrom ;}
-//-----IAccessibility2 Implementation 2009
// returns whether the item a position nItemPos is highlighted or not.
bool IsHighlighted( sal_uInt16 nItemPos ) const;
Modified: openoffice/branches/ooxml-osba/main/vcl/inc/vcl/msgbox.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/inc/vcl/msgbox.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/inc/vcl/msgbox.hxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/inc/vcl/msgbox.hxx Wed Dec 18 13:27:09 2013
@@ -120,6 +120,8 @@ private:
public:
InfoBox( Window* pParent, const XubString& rMessage );
InfoBox( Window* pParent, const ResId & rResId );
+ InfoBox( Window* pParent, WinBits nStyle,
+ const XubString& rMessage );
static Image GetStandardImage();
static Image GetStandardImageHC();
Modified: openoffice/branches/ooxml-osba/main/vcl/inc/vcl/svapp.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/inc/vcl/svapp.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/inc/vcl/svapp.hxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/inc/vcl/svapp.hxx Wed Dec 18 13:27:09 2013
@@ -448,10 +448,8 @@ public:
static void ShowNativeErrorBox(const String& sTitle ,
const String& sMessage);
-//IAccessibility2 Implementation 2009-----
static bool EnableAccessInterface(bool bEnable);
static bool IsEnableAccessInterface();
-//-----IAccessibility2 Implementation 2009
// IME Status Window Control:
@@ -518,7 +516,6 @@ inline void Application::EndYield()
PostUserEvent( Link() );
}
-//IAccessibility2 Implementation 2009-----
#ifdef WNT
VCL_DLLPUBLIC sal_Bool HasAtHook();
VCL_DLLPUBLIC bool IsWNTInitAccessBridge();
@@ -540,5 +537,4 @@ private:
bool m_bIsEnableAccessInterface;
};
#endif
-//-----IAccessibility2 Implementation 2009
#endif // _APP_HXX
Modified: openoffice/branches/ooxml-osba/main/vcl/inc/vcl/sysdata.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/inc/vcl/sysdata.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/inc/vcl/sysdata.hxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/inc/vcl/sysdata.hxx Wed Dec 18 13:27:09 2013
@@ -47,7 +47,7 @@ struct SystemEnvData
#if defined( WNT ) || defined( OS2 )
HWND hWnd; // the window hwnd
#elif defined( QUARTZ )
- NSView* pView; // the cocoa (NSView *) implementing this object
+ NSView* mpNSView; // the cocoa (NSView *) implementing this object
#elif defined( UNX )
void* pDisplay; // the relevant display connection
long aWindow; // the window of the object
Modified: openoffice/branches/ooxml-osba/main/vcl/inc/vcl/vclevent.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/inc/vcl/vclevent.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/inc/vcl/vclevent.hxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/inc/vcl/vclevent.hxx Wed Dec 18 13:27:09 2013
@@ -154,10 +154,8 @@ namespace com { namespace sun { namespac
#define VCLEVENT_ITEM_COLLAPSED 1175
// <--
#define VCLEVENT_DROPDOWN_PRE_OPEN 1176
-//IAccessibility2 Implementation 2009-----
#define VCLEVENT_LISTBOX_FOCUSITEMCHANGED 1180
// #define VCLEVENT_EDIT_CARETCHANGED xxxx // IA2 CWS. MT: VCL only has selection API - difference for selection_changed vs. caret_changed is handled in accessibility wrapper since OOo 3.2
-//-----IAccessibility2 Implementation 2009
// VclMenuEvent
#define VCLEVENT_MENU_ACTIVATE 1200
@@ -176,16 +174,13 @@ namespace com { namespace sun { namespac
#define VCLEVENT_MENU_ITEMCHECKED 1213
#define VCLEVENT_MENU_ITEMUNCHECKED 1214
#define VCLEVENT_MENU_ACCESSIBLENAMECHANGED 1215
-//IAccessibility2 Implementation 2009-----
#define VCLEVENT_TOOLBOX_ITEMWINDOWCHANGED 1216
#define VCLEVENT_TOOLBOX_ITEMUPDATED 1217
-//-----IAccessibility2 Implementation 2009
#define VCLEVENT_MENU_SHOW 1250
#define VCLEVENT_MENU_HIDE 1251
#define VCLEVENT_TOOLBOX_ITEMWINDOWCHANGED 1216
-//IAccessibility2 Implementation 2009-----
#define VCLEVENT_LISTBOX_TREEEXPAND 1218
#define VCLEVENT_LISTBOX_TREECOLLAPSE 1219
#define VCLEVENT_LISTBOX_TREEFOCUS 1220
@@ -195,7 +190,6 @@ namespace com { namespace sun { namespac
#define VCLEVENT_LISTBOX_FOCUS 1224
#define VCLEVENT_LISTBOX_CLEAR 1225
-//-----IAccessibility2 Implementation 2009
// DockingWindow
#define VCLEVENT_WINDOW_STARTDOCKING 1227 // pData = DockingData
#define VCLEVENT_WINDOW_DOCKING 1228
@@ -207,7 +201,6 @@ namespace com { namespace sun { namespac
#define VCLEVENT_TOOLBOX_BUTTONSTATECHANGED 1233 // pData = itempos
#define VCLEVENT_TABLECELL_NAMECHANGED 1234 // pData = struct(Entry, Column, oldText)
#define VCLEVENT_TABLEROW_SELECT 1235
-// IAccessible2 implementation 2009
#define VCLEVENT_LISTBOX_STATEUPDATE 1236
class VCL_DLLPUBLIC VclSimpleEvent
{
Modified: openoffice/branches/ooxml-osba/main/vcl/inc/vcl/window.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/inc/vcl/window.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/inc/vcl/window.hxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/inc/vcl/window.hxx Wed Dec 18 13:27:09 2013
@@ -629,11 +629,9 @@ public:
virtual void DataChanged( const DataChangedEvent& rDCEvt );
virtual long PreNotify( NotifyEvent& rNEvt );
virtual long Notify( NotifyEvent& rNEvt );
-//IAccessibility2 Implementation 2009-----
virtual void NotifyVCLEvent( sal_uLong nEvent ,void* pData = NULL);
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > GetAccFlowToSequence();
virtual void SwitchView() {}
-//-----IAccessibility2 Implementation 2009
virtual Window* GetPreferredKeyInputWindow();
/*virtual*/ void AddEventListener( const Link& rEventListener );
Modified: openoffice/branches/ooxml-osba/main/vcl/inc/win/salgdi.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/inc/win/salgdi.h?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/inc/win/salgdi.h (original)
+++ openoffice/branches/ooxml-osba/main/vcl/inc/win/salgdi.h Wed Dec 18 13:27:09 2013
@@ -190,8 +190,8 @@ protected:
virtual void drawPixel( long nX, long nY, SalColor nSalColor );
virtual void drawLine( long nX1, long nY1, long nX2, long nY2 );
virtual void drawRect( long nX, long nY, long nWidth, long nHeight );
- virtual void drawPolyLine( sal_uIntPtr nPoints, const SalPoint* pPtAry );
- virtual void drawPolygon( sal_uIntPtr 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 bool drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency );
virtual bool drawPolyLine(
@@ -200,8 +200,8 @@ protected:
const ::basegfx::B2DVector& rLineWidth,
basegfx::B2DLineJoin,
com::sun::star::drawing::LineCap);
- virtual sal_Bool drawPolyLineBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry );
- virtual sal_Bool drawPolygonBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry );
+ virtual sal_Bool drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry );
+ virtual sal_Bool drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry );
virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const BYTE* const* pFlgAry );
// CopyArea --> No RasterOp, but ClipRegion
@@ -227,7 +227,7 @@ protected:
// invert --> ClipRegion (only Windows or VirDevs)
virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags);
- virtual void invert( sal_uIntPtr 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_uIntPtr nSize );
@@ -263,7 +263,7 @@ public:
// public SalGraphics methods, the interface to teh independent vcl part
// get device resolution
- virtual void GetResolution( long& rDPIX, long& rDPIY );
+ virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY );
// get the depth of the device
virtual sal_uInt16 GetBitCount();
// get the width of the device
@@ -318,7 +318,7 @@ public:
// as "undefined character"
virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile,
const ImplFontData*,
- long* pGlyphIDs,
+ sal_GlyphId* pGlyphIds,
sal_uInt8* pEncoding,
sal_Int32* pWidths,
int nGlyphs,
@@ -354,8 +354,8 @@ public:
Ucs2UIntMap& rUnicodeEnc );
virtual int GetMinKashidaWidth();
- 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& );
Modified: openoffice/branches/ooxml-osba/main/vcl/os2/source/gdi/os2layout.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/os2/source/gdi/os2layout.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/os2/source/gdi/os2layout.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/os2/source/gdi/os2layout.cxx Wed Dec 18 13:27:09 2013
@@ -507,7 +507,7 @@ bool Os2SalLayout::LayoutText( ImplLayou
// -----------------------------------------------------------------------
-int Os2SalLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point& rPos, int& nStart,
+int Os2SalLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIds, Point& rPos, int& nStart,
sal_Int32* pGlyphAdvances, int* pCharIndexes ) const
{
// return zero if no more glyph found
@@ -527,29 +527,29 @@ int Os2SalLayout::GetNextGlyphs( int nLe
int nCount = 0;
while( nCount < nLen )
{
- // update return values {nGlyphIndex,nCharPos,nGlyphAdvance}
- long nGlyphIndex = mpOutGlyphs[ nStart ];
+ // update return values {aGlyphId,nCharPos,nGlyphAdvance}
+ sal_GlyphId aGlyphId = mpOutGlyphs[ nStart ];
if( mbDisableGlyphs )
{
if( mnLayoutFlags & SAL_LAYOUT_VERTICAL )
{
- sal_Unicode cChar = (sal_Unicode)(nGlyphIndex & GF_IDXMASK);
+ sal_Unicode cChar = (sal_Unicode)(aGlyphId & GF_IDXMASK);
#ifdef GNG_VERT_HACK
if( mrOs2FontData.HasGSUBstitutions( mhPS )
&& mrOs2FontData.IsGSUBstituted( cChar ) )
- nGlyphIndex |= GF_ROTL | GF_GSUB;
+ aGlyphId |= GF_ROTL | GF_GSUB;
else
#endif // GNG_VERT_HACK
{
- nGlyphIndex |= GetVerticalFlags( cChar );
- if( !(nGlyphIndex & GF_ROTMASK) )
- nGlyphIndex |= GF_VERT;
+ aGlyphId |= GetVerticalFlags( cChar );
+ if( !(aGlyphId & GF_ROTMASK) )
+ aGlyphId |= GF_VERT;
}
}
- nGlyphIndex |= GF_ISCHAR;
+ aGlyphId |= GF_ISCHAR;
}
++nCount;
- *(pGlyphs++) = nGlyphIndex;
+ *(pGlyphIds++) = aGlyphId;
if( pGlyphAdvances )
*(pGlyphAdvances++) = mpGlyphAdvances[ nStart ];
if( pCharIndexes )
Modified: openoffice/branches/ooxml-osba/main/vcl/os2/source/gdi/salgdi.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/os2/source/gdi/salgdi.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/os2/source/gdi/salgdi.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/os2/source/gdi/salgdi.cxx Wed Dec 18 13:27:09 2013
@@ -151,13 +151,16 @@ static SalColor ImplGetROPSalColor( SalR
// -----------------------------------------------------------------------
-void Os2SalGraphics::GetResolution( long& rDPIX, long& rDPIY )
+void Os2SalGraphics::GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY )
{
// since OOo asks for DPI, I will query FONT_RES, which seems to be
// more correct than _RESOLUTION fields (on my wide screen lcd)
// and does not require conversion
- DevQueryCaps( mhDC, CAPS_HORIZONTAL_FONT_RES, 1, &rDPIX );
- DevQueryCaps( mhDC, CAPS_VERTICAL_FONT_RES, 1, &rDPIY );
+ long nDPIX = 72, nDPIY = 72;
+ DevQueryCaps( mhDC, CAPS_HORIZONTAL_FONT_RES, 1, &nDPIX );
+ DevQueryCaps( mhDC, CAPS_VERTICAL_FONT_RES, 1, &nDPIY );
+ rDPIX = nDPIX;
+ rDPIY = nDPIY;
}
// -----------------------------------------------------------------------
@@ -501,13 +504,13 @@ void Os2SalGraphics::drawRect( long nX,
// -----------------------------------------------------------------------
-void Os2SalGraphics::drawPolyLine( ULONG nPoints, const SalPoint* pPtAry )
+void Os2SalGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
// convert all points to sys orientation
POINTL* pOS2PtAry = new POINTL[ nPoints ];
POINTL* pTempOS2PtAry = pOS2PtAry;
const SalPoint* pTempPtAry = pPtAry;
- ULONG nTempPoints = nPoints;
+ sal_uInt32 nTempPoints = nPoints;
long nHeight = mnHeight - 1;
while( nTempPoints-- )
@@ -525,7 +528,7 @@ void Os2SalGraphics::drawPolyLine( ULONG
// -----------------------------------------------------------------------
-void Os2SalGraphics::drawPolygon( ULONG nPoints, const SalPoint* pPtAry )
+void Os2SalGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
PM_POLYGON aPolygon;
@@ -536,7 +539,7 @@ void Os2SalGraphics::drawPolygon( ULONG
// convert all points to sys orientation
POINTL* pTempOS2PtAry = aPolygon.aPointl;
const SalPoint* pTempPtAry = pPtAry;
- ULONG nTempPoints = nPoints;
+ sal_uInt32 nTempPoints = nPoints;
long nHeight = mnHeight - 1;
while( nTempPoints-- )
@@ -593,7 +596,7 @@ void Os2SalGraphics::drawPolygon( ULONG
// -----------------------------------------------------------------------
-void Os2SalGraphics::drawPolyPolygon( ULONG nPoly, const ULONG* pPoints,
+void Os2SalGraphics::drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints,
PCONSTSALPOINT* pPtAry )
{
ULONG i;
@@ -691,21 +694,21 @@ bool Os2SalGraphics::drawPolyLine(
// -----------------------------------------------------------------------
-sal_Bool Os2SalGraphics::drawPolyLineBezier( ULONG nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry )
+sal_Bool Os2SalGraphics::drawPolyLineBezier( sal_uInt32 /*nPoints*/, const SalPoint* pPtAry, const sal_uInt8* pFlgAry )
{
return sal_False;
}
// -----------------------------------------------------------------------
-sal_Bool Os2SalGraphics::drawPolygonBezier( ULONG nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry )
+sal_Bool Os2SalGraphics::drawPolygonBezier( sal_uInt32 /*nPoints*/, const SalPoint* pPtAry, const sal_uInt8* pFlgAry )
{
return sal_False;
}
// -----------------------------------------------------------------------
-sal_Bool Os2SalGraphics::drawPolyPolygonBezier( ULONG nPoly, const ULONG* pPoints,
+sal_Bool Os2SalGraphics::drawPolyPolygonBezier( sal_uInt32 /*nPoly*/, const sal_uInt32* /*pPoints*/,
const SalPoint* const* pPtAry, const sal_uInt8* const* pFlgAry )
{
return sal_False;
Modified: openoffice/branches/ooxml-osba/main/vcl/os2/source/gdi/salgdi2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/os2/source/gdi/salgdi2.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/os2/source/gdi/salgdi2.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/os2/source/gdi/salgdi2.cxx Wed Dec 18 13:27:09 2013
@@ -743,7 +743,7 @@ void Os2SalGraphics::invert( long nX, lo
// -----------------------------------------------------------------------
-void Os2SalGraphics::invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert nFlags )
+void Os2SalGraphics::invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags )
{
if( nFlags & SAL_INVERT_TRACKFRAME )
{
Modified: openoffice/branches/ooxml-osba/main/vcl/os2/source/gdi/salgdi3.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/os2/source/gdi/salgdi3.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/os2/source/gdi/salgdi3.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/os2/source/gdi/salgdi3.cxx Wed Dec 18 13:27:09 2013
@@ -1198,7 +1198,7 @@ void Os2SalGraphics::GetDevFontSubstList
// -----------------------------------------------------------------------
-sal_Bool Os2SalGraphics::GetGlyphBoundRect( long nIndex, Rectangle& rRect )
+bool Os2SalGraphics::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect )
{
// use unity matrix
MAT2 aMat;
@@ -1206,13 +1206,13 @@ sal_Bool Os2SalGraphics::GetGlyphBoundRe
aMat.eM12 = aMat.eM21 = FixedFromDouble( 0.0 );
UINT nGGOFlags = GGO_METRICS;
- if( !(nIndex & GF_ISCHAR) )
+ if( !(aGlyphId & GF_ISCHAR) )
nGGOFlags |= GGO_GLYPH_INDEX;
- nIndex &= GF_IDXMASK;
+ aGlyphId &= GF_IDXMASK;
GLYPHMETRICS aGM;
DWORD nSize = FT2_ERROR;
- nSize = Ft2GetGlyphOutline( mhPS, nIndex, nGGOFlags, &aGM, 0, NULL, &aMat );
+ nSize = Ft2GetGlyphOutline( mhPS, aGlyphId, nGGOFlags, &aGM, 0, NULL, &aMat );
if( nSize == FT2_ERROR )
return false;
@@ -1227,7 +1227,7 @@ sal_Bool Os2SalGraphics::GetGlyphBoundRe
// -----------------------------------------------------------------------
-sal_Bool Os2SalGraphics::GetGlyphOutline( long nIndex, ::basegfx::B2DPolyPolygon& rB2DPolyPoly )
+bool Os2SalGraphics::GetGlyphOutline( sal_GlyphId aGlyphId, ::basegfx::B2DPolyPolygon& rB2DPolyPoly )
{
#if OSL_DEBUG_LEVEL>0
debug_printf("Os2SalGraphics::GetGlyphOutline\n");
@@ -1242,13 +1242,13 @@ sal_Bool Os2SalGraphics::GetGlyphOutline
aMat.eM12 = aMat.eM21 = FixedFromDouble( 0.0 );
UINT nGGOFlags = GGO_NATIVE;
- if( !(nIndex & GF_ISCHAR) )
+ if( !(aGlyphId & GF_ISCHAR) )
nGGOFlags |= GGO_GLYPH_INDEX;
- nIndex &= GF_IDXMASK;
+ aGlyphId &= GF_IDXMASK;
GLYPHMETRICS aGlyphMetrics;
DWORD nSize1 = FT2_ERROR;
- nSize1 = Ft2GetGlyphOutline( mhPS, nIndex, nGGOFlags, &aGlyphMetrics, 0, NULL, &aMat );
+ nSize1 = Ft2GetGlyphOutline( mhPS, aGlyphId, nGGOFlags, &aGlyphMetrics, 0, NULL, &aMat );
if( !nSize1 ) // blank glyphs are ok
bRet = TRUE;
@@ -1257,7 +1257,7 @@ sal_Bool Os2SalGraphics::GetGlyphOutline
PM_BYTE* pData = new PM_BYTE[ nSize1 ];
ULONG nTotalCount = 0;
DWORD nSize2;
- nSize2 = Ft2GetGlyphOutline( mhPS, nIndex, nGGOFlags,
+ nSize2 = Ft2GetGlyphOutline( mhPS, aGlyphId, nGGOFlags,
&aGlyphMetrics, nSize1, pData, &aMat );
if( nSize1 == nSize2 )
@@ -1497,7 +1497,7 @@ int ScopedTrueTypeFont::open(void * pBuf
}
sal_Bool Os2SalGraphics::CreateFontSubset( const rtl::OUString& rToFile,
- const ImplFontData* pFont, long* pGlyphIDs, sal_uInt8* pEncoding,
+ const ImplFontData* pFont, sal_GlyphId* pGlyphIds, sal_uInt8* pEncoding,
sal_Int32* pGlyphWidths, int nGlyphCount, FontSubsetInfo& rInfo )
{
// TODO: use more of the central font-subsetting code, move stuff there if needed
@@ -1536,25 +1536,25 @@ sal_Bool Os2SalGraphics::CreateFontSubse
const RawFontData aRawCffData( mhPS, nCffTag );
if( aRawCffData.get() )
{
- long nRealGlyphIds[ 256 ];
+ sal_GlyphId aRealGlyphIds[ 256 ];
for( int i = 0; i < nGlyphCount; ++i )
{
// TODO: remap notdef glyph if needed
// TODO: use GDI's GetGlyphIndices instead? Does it handle GSUB properly?
- sal_uInt32 nGlyphIdx = pGlyphIDs[i] & GF_IDXMASK;
- if( pGlyphIDs[i] & GF_ISCHAR ) // remaining pseudo-glyphs need to be translated
- nGlyphIdx = pImplFontCharMap->GetGlyphIndex( nGlyphIdx );
- if( (pGlyphIDs[i] & (GF_ROTMASK|GF_GSUB)) != 0) // TODO: vertical substitution
+ sal_uInt32 aGlyphIdx = pGlyphIds[i] & GF_IDXMASK;
+ if( pGlyphIds[i] & GF_ISCHAR ) // remaining pseudo-glyphs need to be translated
+ aGlyphId = pImplFontCharMap->GetGlyphIndex( aGlyphId );
+ if( (pGlyphIds[i] & (GF_ROTMASK|GF_GSUB)) != 0) // TODO: vertical substitution
{/*####*/}
- nRealGlyphIds[i] = nGlyphIdx;
+ aRealGlyphIds[i] = aGlyphId;
}
// provide a font subset from the CFF-table
FILE* pOutFile = fopen( aToFile.GetBuffer(), "wb" );
rInfo.LoadFont( FontSubsetInfo::CFF_FONT, aRawCffData.get(), aRawCffData.size() );
bool bRC = rInfo.CreateFontSubset( FontSubsetInfo::TYPE1_PFB, pOutFile, NULL,
- nRealGlyphIds, pEncoding, nGlyphCount, pGlyphWidths );
+ aRealGlyphIds, pEncoding, nGlyphCount, pGlyphWidths );
fclose( pOutFile );
return bRC;
}
@@ -1594,21 +1594,21 @@ sal_Bool Os2SalGraphics::CreateFontSubse
for( i = 0; i < nGlyphCount; ++i )
{
aTempEncs[i] = pEncoding[i];
- sal_uInt32 nGlyphIdx = pGlyphIDs[i] & GF_IDXMASK;
- if( pGlyphIDs[i] & GF_ISCHAR )
+ sal_GlyphId aGlyphId = pGlyphIds[i] & GF_IDXMASK;
+ if( pGlyphIds[i] & GF_ISCHAR )
{
- sal_Unicode cChar = static_cast<sal_Unicode>(nGlyphIdx); // TODO: sal_UCS4
- const bool bVertical = ((pGlyphIDs[i] & (GF_ROTMASK|GF_GSUB)) != 0);
- nGlyphIdx = ::MapChar( aSftTTF.get(), cChar, bVertical );
- if( (nGlyphIdx == 0) && pFont->IsSymbolFont() )
+ sal_Unicode cChar = static_cast<sal_Unicode>(aGlyphId); // TODO: sal_UCS4
+ const bool bVertical = ((pGlyphIds[i] & (GF_ROTMASK|GF_GSUB)) != 0);
+ aGlyphId = ::MapChar( aSftTTF.get(), cChar, bVertical );
+ if( (aGlyphId == 0) && pFont->IsSymbolFont() )
{
// #i12824# emulate symbol aliasing U+FXXX <-> U+0XXX
cChar = (cChar & 0xF000) ? (cChar & 0x00FF) : (cChar | 0xF000);
- nGlyphIdx = ::MapChar( aSftTTF.get(), cChar, bVertical );
+ aGlyphId = ::MapChar( aSftTTF.get(), cChar, bVertical );
}
}
- aShortIDs[i] = static_cast<USHORT>( nGlyphIdx );
- if( !nGlyphIdx )
+ aShortIDs[i] = static_cast<USHORT>( aGlyphId );
+ if( !aGlyphId )
if( nNotDef < 0 )
nNotDef = i; // first NotDef glyph found
}
Modified: openoffice/branches/ooxml-osba/main/vcl/source/app/svapp.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/source/app/svapp.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/source/app/svapp.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/source/app/svapp.cxx Wed Dec 18 13:27:09 2013
@@ -2049,13 +2049,11 @@ void Application::AddToRecentDocumentLis
sal_Bool Application::IsAccessibilityEnabled()
{
-//IAccessible2 Implementation 2009-----
#ifdef WNT
return IsWNTInitAccessBridge();
#else
return sal_False;
#endif
-//-----IAccessible2 Implementation 2009
}
sal_Bool InitAccessBridge( sal_Bool bShowCancel, sal_Bool &rCancelled )
@@ -2091,7 +2089,6 @@ sal_Bool InitAccessBridge( sal_Bool bSho
return bRet;
}
-//IAccessible2 Implementation 2009-----
#ifdef WNT
sal_Bool HasAtHook()
{
@@ -2112,7 +2109,6 @@ sal_Bool HasAtHook()
return sal_False;
}
#endif
-//-----IAccessible2 Implementation 2009
// MT: AppProperty, AppEvent was in oldsv.cxx, but is still needed...
// ------------------------------------------------------------------------
@@ -2134,7 +2130,6 @@ void Application::SetPropertyHandler( Pr
delete pHandler;
pHandler = p;
}
-//IAccessible2 Implementation 2009-----
bool Application::EnableAccessInterface(bool bEnable)
{
#ifdef WNT
@@ -2148,7 +2143,6 @@ bool Application::IsEnableAccessInterfac
{
return ImplGetSVData()->maAppData.m_bEnableAccessInterface;
}
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/ooxml-osba/main/vcl/source/app/svdata.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/source/app/svdata.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/source/app/svdata.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/source/app/svdata.cxx Wed Dec 18 13:27:09 2013
@@ -36,7 +36,6 @@
#include "unotools/fontcfg.hxx"
-//IAccessible2 Implementation 2009-----
#ifdef WNT
#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_HPP_
#include <com/sun/star/accessibility/XAccessible.hpp>
@@ -45,7 +44,6 @@
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#endif
#endif
-//-----IAccessible2 Implementation 2009
#include "vos/mutex.hxx"
#include "cppuhelper/implbase1.hxx"
@@ -77,13 +75,11 @@
#include "com/sun/star/java/JavaDisabledException.hpp"
#include <stdio.h>
-//IAccessible2 Implementation 2009-----
#ifdef WNT
#include <unotools/processfactory.hxx>
#include <com/sun/star/accessibility/XMSAAService.hpp>
#include <win/g_msaasvc.h>
#endif
-//-----IAccessible2 Implementation 2009
namespace {
@@ -149,12 +145,10 @@ void ImplInitSVData()
break;
}
}
-//IAccessible2 Implementation 2009-----
#ifdef WNT
//Default enable the acc bridge interface
pImplSVData->maAppData.m_bEnableAccessInterface =true;
#endif
-//-----IAccessible2 Implementation 2009
// mark default layout border as unitialized
pImplSVData->maAppData.mnDefaultLayoutBorder = -1;
@@ -362,7 +356,6 @@ com::sun::star::uno::Any AccessBridgeCur
}
return ret;
}
-//IAccessible2 Implementation 2009-----
#ifdef WNT
void AccessBridgehandleExistingWindow(Window * pWindow, bool bShow)
{
@@ -444,7 +437,6 @@ void AccessBridgeupdateOldTopWindows()
}
}
#endif
-//-----IAccessible2 Implementation 2009
bool ImplInitAccessBridge(sal_Bool bAllowCancel, sal_Bool &rCancelled)
{
@@ -476,7 +468,6 @@ bool ImplInitAccessBridge(sal_Bool bAllo
if( xFactory.is() )
{
-//IAccessible2 Implementation 2009-----
#ifdef WNT
pSVData->mxAccessBridge = xFactory->createInstance(
OUString::createFromAscii( "com.sun.star.accessibility.MSAAService" ) );
@@ -491,7 +482,6 @@ bool ImplInitAccessBridge(sal_Bool bAllo
bSuccess = false;
return bSuccess;
#endif
-//-----IAccessible2 Implementation 2009
css::uno::Reference< XExtendedToolkit > xToolkit =
css::uno::Reference< XExtendedToolkit >(Application::GetVCLToolkit(), UNO_QUERY);
Modified: openoffice/branches/ooxml-osba/main/vcl/source/app/svmain.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/source/app/svmain.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/source/app/svmain.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/source/app/svmain.cxx Wed Dec 18 13:27:09 2013
@@ -55,11 +55,9 @@
#include <process.h> // for _beginthreadex
#include <ole2.h> // for _beginthreadex
#include <tools/postwin.h>
-//IAccessibility2 Implementation 2009-----
#include <com/sun/star/accessibility/XMSAAService.hpp>
#include <win/g_msaasvc.h>
using namespace com::sun::star::accessibility;
-//-----IAccessibility2 Implementation 2009
#endif
// [ed 5/14/02 Add in explicit check for quartz graphics. OS X will define
@@ -220,12 +218,10 @@ sal_Bool ImplSVMain()
}
DeInitVCL();
-//IAccessibility2 Implementation 2009-----
#ifdef WNT
if( g_acc_manager1 )
g_acc_manager1->release();
#endif
-//-----IAccessibility2 Implementation 2009
return bInit;
}
Modified: openoffice/branches/ooxml-osba/main/vcl/source/control/combobox.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/source/control/combobox.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/source/control/combobox.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/source/control/combobox.cxx Wed Dec 18 13:27:09 2013
@@ -215,9 +215,7 @@ void ComboBox::ImplInit( Window* pParent
mpImplLB->SetDoubleClickHdl( LINK( this, ComboBox, ImplDoubleClickHdl ) );
mpImplLB->SetUserDrawHdl( LINK( this, ComboBox, ImplUserDrawHdl ) );
mpImplLB->SetSelectionChangedHdl( LINK( this, ComboBox, ImplSelectionChangedHdl ) );
-//IAccessibility2 Implementation 2009-----
mpImplLB->SetListItemSelectHdl( LINK( this, ComboBox, ImplListItemSelectHdl ) );
-//-----IAccessibility2 Implementation 2009
mpImplLB->Show();
if ( mpFloatWin )
@@ -276,13 +274,11 @@ sal_Bool ComboBox::IsAutocompleteEnabled
{
return mpSubEdit->GetAutocompleteHdl().IsSet();
}
-//IAccessibility2 Implementation 2009-----
void ComboBox::SetMpSubEditAccessibleName(String &aName)
{
if(mpSubEdit!=NULL)
mpSubEdit->SetAccessibleName(aName);
}
-//-----IAccessibility2 Implementation 2009
// -----------------------------------------------------------------------
IMPL_LINK( ComboBox, ImplClickBtnHdl, void*, EMPTYARG )
@@ -477,13 +473,11 @@ IMPL_LINK( ComboBox, ImplSelectHdl, void
return 0;
}
-//IAccessibility2 Implementation 2009-----
IMPL_LINK( ComboBox, ImplListItemSelectHdl, void*, EMPTYARG )
{
ImplCallEventListeners( VCLEVENT_LISTBOX_SELECT );
return 1;
}
-//-----IAccessibility2 Implementation 2009
// -----------------------------------------------------------------------
IMPL_LINK( ComboBox, ImplCancelHdl, void*, EMPTYARG )
@@ -1435,12 +1429,10 @@ sal_uInt16 ComboBox::GetMaxMRUCount() co
return mpImplLB->GetMaxMRUCount();
}
-//IAccessibility2 Implementation 2009-----
sal_uInt16 ComboBox::GetMRUCount() const
{
return mpImplLB->GetEntryList()->GetMRUCount();
}
-//-----IAccessibility2 Implementation 2009
// -----------------------------------------------------------------------
sal_uInt16 ComboBox::GetDisplayLineCount() const
Modified: openoffice/branches/ooxml-osba/main/vcl/source/control/edit.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/source/control/edit.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/source/control/edit.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/source/control/edit.cxx Wed Dec 18 13:27:09 2013
@@ -954,7 +954,7 @@ void Edit::ImplInsertText( const XubStri
++nChgPos;
xub_StrLen nChgLen = static_cast< xub_StrLen >( nTmpLen - nChgPos );
- String aChgText( aTmpText.copy( nChgPos ), nChgLen );
+ String aChgText( aTmpText.copy( nChgPos ).getStr(), nChgLen );
// remove text from first pos to be changed to current pos
maText.Erase( static_cast< xub_StrLen >( nChgPos ), static_cast< xub_StrLen >( nTmpPos - nChgPos ) );
@@ -2498,10 +2498,8 @@ void Edit::Modify()
return;
// #i13677# notify edit listeners about caret position change
-//IAccessibility2 Implementation 2009-----
//ImplCallEventListeners( VCLEVENT_EDIT_SELECTIONCHANGED );
ImplCallEventListeners( VCLEVENT_EDIT_CARETCHANGED );
-//-----IAccessibility2 Implementation 2009
// FIXME: this is currently only on aqua
// check for other platforms that need similar handling
if( ImplGetSVData()->maNWFData.mbNoFocusRects &&
@@ -2656,15 +2654,12 @@ void Edit::ImplSetSelection( const Selec
if ( aNew != maSelection )
{
ImplClearLayoutData();
-//IAccessibility2 Implementation 2009-----
Selection aTemp = maSelection;
-//-----IAccessibility2 Implementation 2009
maSelection = aNew;
if ( bPaint && ( aOld.Len() || aNew.Len() || IsPaintTransparent() ) )
ImplInvalidateOrRepaint( 0, maText.Len() );
ImplShowCursor();
-//IAccessibility2 Implementation 2009-----
sal_Bool bCaret = sal_False, bSelection = sal_False;
long nB=aNew.Max(), nA=aNew.Min(),oB=aTemp.Max(), oA=aTemp.Min();
long nGap = nB-nA, oGap = oB-oA;
@@ -2686,7 +2681,6 @@ void Edit::ImplSetSelection( const Selec
else
ImplCallEventListeners( VCLEVENT_EDIT_SELECTIONCHANGED );
}
-//-----IAccessibility2 Implementation 2009
// #103511# notify combobox listeners of deselection
if( !maSelection && GetParent() && GetParent()->GetType() == WINDOW_COMBOBOX )
((Edit*)GetParent())->ImplCallEventListeners( VCLEVENT_COMBOBOX_DESELECT );
Modified: openoffice/branches/ooxml-osba/main/vcl/source/control/ilstbox.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/source/control/ilstbox.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/source/control/ilstbox.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/source/control/ilstbox.cxx Wed Dec 18 13:27:09 2013
@@ -917,11 +917,9 @@ void ImplListBoxWindow::MouseButtonDown(
mnCurrentPos = nSelect;
mbTrackingSelect = true;
- //IAccessibility2 Impplementaton 2009-----
sal_Bool bCurPosChange = (mnCurrentPos != nSelect);
//SelectEntries( nSelect, LET_MBDOWN, rMEvt.IsShift(), rMEvt.IsMod1() );
SelectEntries( nSelect, LET_MBDOWN, rMEvt.IsShift(), rMEvt.IsMod1() ,bCurPosChange);
- //-----IAccessibility2 Impplementaton 2009
mbTrackingSelect = false;
if ( mbGrabFocus )
GrabFocus();
@@ -992,14 +990,12 @@ void ImplListBoxWindow::MouseMove( const
ImplCallSelect();
mbTravelSelect = false;
}
-//IAccessibility2 Implementation 2009----
// When list box selection change by mouse move, notity
// VCLEVENT_LISTBOX_SELECT vcl event.
else
{
maListItemSelectHdl.Call(NULL);
}
-//----IAccessibility2 Implementation 2009
}
mbTrackingSelect = false;
}
@@ -1232,12 +1228,10 @@ sal_Bool ImplListBoxWindow::SelectEntrie
maFocusRect.SetSize( aSz );
if( HasFocus() )
ImplShowFocusRect();
-//IAccessibility2 Implementation 2009----
if (bSelectPosChange)
{
maFocusHdl.Call(reinterpret_cast<void*>(nSelect));
}
-//----IAccessibility2 Implementation 2009
}
ImplClearLayoutData();
}
@@ -1700,12 +1694,10 @@ sal_Bool ImplListBoxWindow::ProcessKeyIn
DBG_ASSERT( !mpEntryList->IsEntryPosSelected( nSelect ) || mbMulti, "ImplListBox: Selecting same Entry" );
if( nSelect >= mpEntryList->GetEntryCount() )
nSelect = mpEntryList->GetEntryCount()-1;
-//IAccessibility2 Implementation 2009-----
sal_Bool bCurPosChange = (mnCurrentPos != nSelect);
mnCurrentPos = nSelect;
//if ( SelectEntries( nSelect, eLET, bShift, bCtrl ) )
if(SelectEntries( nSelect, eLET, bShift, bCtrl ,bCurPosChange))
-//-----IAccessibility2 Implementation 2009
{
mbTravelSelect = true;
mnSelectModifier = rKEvt.GetKeyCode().GetModifier();
@@ -2181,9 +2173,7 @@ Rectangle ImplListBoxWindow::GetBounding
const ImplEntryType* pEntry = mpEntryList->GetEntryPtr( nItem );
Size aSz( GetSizePixel().Width(), pEntry ? pEntry->mnHeight : GetEntryHeight() );
//long nY = mpEntryList->GetAddedHeight( nItem, GetTopEntry() ) - mpEntryList->GetAddedHeight( GetTopEntry() );
- //IAccessibility2 Impplementaton 2009-----
long nY = mpEntryList->GetAddedHeight( nItem, GetTopEntry() ) + GetEntryList()->GetMRUCount()*GetEntryHeight();
- //-----IAccessibility2 Impplementaton 2009
Rectangle aRect( Point( 0, nY ), aSz );
return aRect;
}
Modified: openoffice/branches/ooxml-osba/main/vcl/source/control/lstbox.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/source/control/lstbox.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/source/control/lstbox.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/source/control/lstbox.cxx Wed Dec 18 13:27:09 2013
@@ -170,10 +170,8 @@ void ListBox::ImplInit( Window* pParent,
mpImplLB->SetCancelHdl( LINK( this, ListBox, ImplCancelHdl ) );
mpImplLB->SetDoubleClickHdl( LINK( this, ListBox, ImplDoubleClickHdl ) );
mpImplLB->SetUserDrawHdl( LINK( this, ListBox, ImplUserDrawHdl ) );
-//IAccessibility2 Implementation 2009-----
mpImplLB->SetFocusHdl( LINK( this, ListBox, ImplFocusHdl ) );
mpImplLB->SetListItemSelectHdl( LINK( this, ListBox, ImplListItemSelectHdl ) );
-//-----IAccessibility2 Implementation 2009
mpImplLB->SetPosPixel( Point() );
mpImplLB->SetEdgeBlending(GetEdgeBlending());
mpImplLB->Show();
@@ -253,7 +251,6 @@ IMPL_LINK( ListBox, ImplSelectHdl, void*
return 1;
}
-//IAccessibility2 Implementation 2009-----
IMPL_LINK( ListBox, ImplFocusHdl, void *, nPos )
{
ImplCallEventListeners( VCLEVENT_LISTBOX_FOCUS , nPos);
@@ -264,7 +261,6 @@ IMPL_LINK( ListBox, ImplListItemSelectHd
ImplCallEventListeners( VCLEVENT_LISTBOX_SELECT );
return 1;
}
-//-----IAccessibility2 Implementation 2009
// -----------------------------------------------------------------------
@@ -1076,7 +1072,6 @@ void ListBox::SetNoSelection()
mpImplWin->SetImage( aImage );
mpImplWin->Invalidate();
}
- // IAccessible2 implementation 2009
NotifyVCLEvent( VCLEVENT_LISTBOX_STATEUPDATE);
}
@@ -1223,7 +1218,6 @@ void ListBox::SelectEntryPos( sal_uInt16
{
if ( nPos < mpImplLB->GetEntryList()->GetEntryCount() )
{
- // IAccessible2 implementation 2009
sal_uInt16 oldSelectCount = GetSelectEntryCount(), newSelectCount = 0, nCurrentPos = mpImplLB->GetCurrentPos();
mpImplLB->SelectEntry( nPos + mpImplLB->GetEntryList()->GetMRUCount(), bSelect );
newSelectCount = GetSelectEntryCount();
@@ -1637,12 +1631,10 @@ sal_uInt16 ListBox::GetMaxMRUCount() con
{
return mpImplLB->GetMaxMRUCount();
}
-//IAccessibility2 Implementation 2009-----
sal_uInt16 ListBox::GetMRUCount() const
{
return mpImplLB->GetEntryList()->GetMRUCount();
}
-//-----IAccessibility2 Implementation 2009
// -----------------------------------------------------------------------
Modified: openoffice/branches/ooxml-osba/main/vcl/source/control/morebtn.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/source/control/morebtn.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/source/control/morebtn.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/source/control/morebtn.cxx Wed Dec 18 13:27:09 2013
@@ -153,10 +153,6 @@ void MoreButton::Click()
mbState = !mbState;
ShowState();
- // Hier den Click-Handler rufen, damit vorher die Controls initialisiert
- // werden koennen
- //PushButton::Click(); // IAccessibility2 Implementation 2009
-
// Je nach Status die Fenster updaten
if ( mbState )
{
@@ -197,9 +193,7 @@ void MoreButton::Click()
pWindow = mpMBData->mpItemList->Next();
}
}
-//IAccessibility2 Implementation 2009-----
PushButton::Click();
-//-----IAccessibility2 Implementation 2009
}
// -----------------------------------------------------------------------
Modified: openoffice/branches/ooxml-osba/main/vcl/source/control/tabctrl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/source/control/tabctrl.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/source/control/tabctrl.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/source/control/tabctrl.cxx Wed Dec 18 13:27:09 2013
@@ -619,9 +619,7 @@ void TabControl::ImplChangeTabPage( sal_
}
pPage->ActivatePage();
-//IAccessibility2 Implementation 2009-----
pPage->Show();
-//-----IAccessibility2 Implementation 2009
if ( pOldPage && pOldPage->HasChildPathFocus() )
{
@@ -633,9 +631,7 @@ void TabControl::ImplChangeTabPage( sal_
GrabFocus();
}
-//IAccessibility2 Implementation 2009-----
// pPage->Show();
-//-----IAccessibility2 Implementation 2009
}
if ( pOldPage )
Modified: openoffice/branches/ooxml-osba/main/vcl/source/fontsubset/cff.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/source/fontsubset/cff.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/source/fontsubset/cff.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/source/fontsubset/cff.cxx Wed Dec 18 13:27:09 2013
@@ -28,7 +28,7 @@
#include <cstring>
#include <assert.h>
-#include <fontsubset.hxx>
+#include "fontsubset.hxx"
#include <vcl/strhelper.hxx>
@@ -358,7 +358,7 @@ class SubsetterContext
public:
virtual ~SubsetterContext( void);
virtual bool emitAsType1( class Type1Emitter&,
- const long* pGlyphIDs, const U8* pEncoding,
+ const sal_GlyphId* pGlyphIds, const U8* pEncoding,
GlyphWidth* pGlyphWidths, int nGlyphCount, FontSubsetInfo& ) = 0;
};
@@ -383,7 +383,7 @@ public:
void initialCffRead( void);
bool emitAsType1( class Type1Emitter&,
- const long* pGlyphIDs, const U8* pEncoding,
+ const sal_GlyphId* pGlyphIds, const U8* pEncoding,
GlyphWidth* pGlyphWidths, int nGlyphCount, FontSubsetInfo& );
// used by charstring converter
@@ -2081,7 +2081,7 @@ void Type1Emitter::emitValVector( const
// --------------------------------------------------------------------
bool CffSubsetterContext::emitAsType1( Type1Emitter& rEmitter,
- const long* pReqGlyphIDs, const U8* pReqEncoding,
+ const sal_GlyphId* pReqGlyphIds, const U8* pReqEncoding,
GlyphWidth* pGlyphWidths, int nGlyphCount, FontSubsetInfo& rFSInfo)
{
// prepare some fontdirectory details
@@ -2163,7 +2163,7 @@ bool CffSubsetterContext::emitAsType1( T
"/Encoding 256 array\n"
"0 1 255 {1 index exch /.notdef put} for\n");
for( int i = 1; (i < nGlyphCount) && (i < 256); ++i) {
- const char* pGlyphName = getGlyphName( pReqGlyphIDs[i]);
+ const char* pGlyphName = getGlyphName( pReqGlyphIds[i]);
pOut += sprintf( pOut, "dup %d /%s put\n", pReqEncoding[i], pGlyphName);
}
pOut += sprintf( pOut, "readonly def\n");
@@ -2314,20 +2314,20 @@ bool CffSubsetterContext::emitAsType1( T
"2 index /CharStrings %d dict dup begin\n", nGlyphCount);
rEmitter.emitAllCrypted();
for( int i = 0; i < nGlyphCount; ++i) {
- const int nGlyphId = pReqGlyphIDs[i];
- assert( (nGlyphId >= 0) && (nGlyphId < mnCharStrCount));
+ const int nCffGlyphId = pReqGlyphIds[i];
+ assert( (nCffGlyphId >= 0) && (nCffGlyphId < mnCharStrCount));
// get privdict context matching to the glyph
- const int nFDSelect = getFDSelect( nGlyphId);
+ const int nFDSelect = getFDSelect( nCffGlyphId);
if( nFDSelect < 0)
continue;
mpCffLocal = &maCffLocal[ nFDSelect];
// convert the Type2op charstring to its Type1op counterpart
- const int nT2Len = seekIndexData( mnCharStrBase, nGlyphId);
+ const int nT2Len = seekIndexData( mnCharStrBase, nCffGlyphId);
assert( nT2Len > 0);
U8 aType1Ops[ MAX_T1OPS_SIZE]; // TODO: dynamic allocation
const int nT1Len = convert2Type1Ops( mpCffLocal, mpReadPtr, nT2Len, aType1Ops);
// get the glyph name
- const char* pGlyphName = getGlyphName( nGlyphId);
+ const char* pGlyphName = getGlyphName( nCffGlyphId);
// emit the encrypted Type1op charstring
pOut += sprintf( pOut, "/%s %d RD ", pGlyphName, nT1Len);
memcpy( pOut, aType1Ops, nT1Len);
Modified: openoffice/branches/ooxml-osba/main/vcl/source/fontsubset/fontsubset.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/source/fontsubset/fontsubset.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/source/fontsubset/fontsubset.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/source/fontsubset/fontsubset.cxx Wed Dec 18 13:27:09 2013
@@ -77,7 +77,7 @@ bool FontSubsetInfo::LoadFont( vcl::_Tru
bool FontSubsetInfo::CreateFontSubset(
int nReqFontTypeMask,
FILE* pOutFile, const char* pReqFontName,
- const long* pReqGlyphIds, const sal_uInt8* pReqEncodedIds, int nReqGlyphCount,
+ const sal_GlyphId* pReqGlyphIds, const sal_uInt8* pReqEncodedIds, int nReqGlyphCount,
sal_Int32* pOutGlyphWidths)
{
// prepare request details needed by all underlying subsetters
Modified: openoffice/branches/ooxml-osba/main/vcl/source/gdi/configsettings.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/source/gdi/configsettings.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/source/gdi/configsettings.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/source/gdi/configsettings.cxx Wed Dec 18 13:27:09 2013
@@ -131,7 +131,7 @@ void SettingsConfigItem::getValues()
m_aSettings.clear();
Sequence< OUString > aNames( GetNodeNames( OUString() ) );
- m_aSettings.resize( aNames.getLength() );
+ m_aSettings.rehash( aNames.getLength() );
for( int j = 0; j < aNames.getLength(); j++ )
{
Modified: openoffice/branches/ooxml-osba/main/vcl/source/gdi/outdev3.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/source/gdi/outdev3.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/source/gdi/outdev3.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/source/gdi/outdev3.cxx Wed Dec 18 13:27:09 2013
@@ -4165,12 +4165,12 @@ void OutputDevice::ImplDrawTextLines( Sa
for( int nStart = 0;;)
{
// iterate through the layouted glyphs
- sal_GlyphId nGlyphIndex;
- if( !rSalLayout.GetNextGlyphs( 1, &nGlyphIndex, aPos, nStart, &nAdvance ) )
+ sal_GlyphId aGlyphId;
+ if( !rSalLayout.GetNextGlyphs( 1, &aGlyphId, aPos, nStart, &nAdvance ) )
break;
// calculate the boundaries of each word
- if( !rSalLayout.IsSpacingGlyph( nGlyphIndex ) )
+ if( !rSalLayout.IsSpacingGlyph( aGlyphId ) )
{
if( !nWidth )
{
@@ -4490,14 +4490,14 @@ void OutputDevice::ImplDrawEmphasisMarks
Rectangle aRectangle;
for( int nStart = 0;;)
{
- sal_GlyphId nGlyphIndex;
- if( !rSalLayout.GetNextGlyphs( 1, &nGlyphIndex, aOutPoint, nStart ) )
+ sal_GlyphId aGlyphId;
+ if( !rSalLayout.GetNextGlyphs( 1, &aGlyphId, aOutPoint, nStart ) )
break;
- if( !mpGraphics->GetGlyphBoundRect( nGlyphIndex, aRectangle ) )
+ if( !mpGraphics->GetGlyphBoundRect( aGlyphId, aRectangle ) )
continue;
- if( !rSalLayout.IsSpacingGlyph( nGlyphIndex ) )
+ if( !rSalLayout.IsSpacingGlyph( aGlyphId ) )
{
Point aAdjPoint = aOffset;
aAdjPoint.X() += aRectangle.Left() + (aRectangle.GetWidth() - nEmphasisWidth) / 2;
Modified: openoffice/branches/ooxml-osba/main/vcl/source/gdi/pdfwriter_impl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/source/gdi/pdfwriter_impl.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/source/gdi/pdfwriter_impl.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/source/gdi/pdfwriter_impl.cxx Wed Dec 18 13:27:09 2013
@@ -3155,12 +3155,12 @@ std::map< sal_Int32, sal_Int32 > PDFWrit
OUString aTmpName;
osl_createTempFile( NULL, NULL, &aTmpName.pData );
- sal_Int32 pGlyphIDs[ 256 ];
+ sal_GlyphId aGlyphIds[ 256 ];
sal_uInt8 pEncoding[ 256 ];
sal_Ucs pUnicodes[ 256 ];
sal_Int32 pDuWidths[ 256 ];
- memset( pGlyphIDs, 0, sizeof( pGlyphIDs ) );
+ memset( aGlyphIds, 0, sizeof( aGlyphIds ) );
memset( pEncoding, 0, sizeof( pEncoding ) );
memset( pUnicodes, 0, sizeof( pUnicodes ) );
memset( pDuWidths, 0, sizeof( pDuWidths ) );
@@ -3169,12 +3169,12 @@ std::map< sal_Int32, sal_Int32 > PDFWrit
{
pUnicodes[c] = c;
pEncoding[c] = c;
- pGlyphIDs[c] = 0;
+ aGlyphIds[c] = 0;
if( aUnicodeMap.find( c ) != aUnicodeMap.end() )
pWidths[ c ] = aGlyphWidths[ aUnicodeMap[ c ] ];
}
- m_pReferenceDevice->mpGraphics->CreateFontSubset( aTmpName, pFont, pGlyphIDs, pEncoding, pDuWidths, 256, aInfo );
+ m_pReferenceDevice->mpGraphics->CreateFontSubset( aTmpName, pFont, aGlyphIds, pEncoding, pDuWidths, 256, aInfo );
osl_removeFile( aTmpName.pData );
}
else
@@ -4051,7 +4051,7 @@ bool PDFWriterImpl::emitFonts()
{
for( FontEmitList::iterator lit = it->second.m_aSubsets.begin(); lit != it->second.m_aSubsets.end(); ++lit )
{
- sal_Int32 pGlyphIDs[ 256 ];
+ sal_GlyphId aGlyphIds[ 256 ];
sal_Int32 pWidths[ 256 ];
sal_uInt8 pEncoding[ 256 ];
sal_Int32 pEncToUnicodeIndex[ 256 ];
@@ -4062,7 +4062,7 @@ bool PDFWriterImpl::emitFonts()
// fill arrays and prepare encoding index map
sal_Int32 nToUnicodeStream = 0;
- rtl_zeroMemory( pGlyphIDs, sizeof( pGlyphIDs ) );
+ rtl_zeroMemory( aGlyphIds, sizeof( aGlyphIds ) );
rtl_zeroMemory( pEncoding, sizeof( pEncoding ) );
rtl_zeroMemory( pUnicodesPerGlyph, sizeof( pUnicodesPerGlyph ) );
rtl_zeroMemory( pEncToUnicodeIndex, sizeof( pEncToUnicodeIndex ) );
@@ -4070,10 +4070,10 @@ bool PDFWriterImpl::emitFonts()
{
sal_uInt8 nEnc = fit->second.getGlyphId();
- DBG_ASSERT( pGlyphIDs[nEnc] == 0 && pEncoding[nEnc] == 0, "duplicate glyph" );
+ DBG_ASSERT( aGlyphIds[nEnc] == 0 && pEncoding[nEnc] == 0, "duplicate glyph" );
DBG_ASSERT( nEnc <= lit->m_aMapping.size(), "invalid glyph encoding" );
- pGlyphIDs[ nEnc ] = fit->first;
+ aGlyphIds[ nEnc ] = fit->first;
pEncoding[ nEnc ] = nEnc;
pEncToUnicodeIndex[ nEnc ] = static_cast<sal_Int32>(aUnicodes.size());
pUnicodesPerGlyph[ nEnc ] = fit->second.countCodes();
@@ -4089,7 +4089,7 @@ bool PDFWriterImpl::emitFonts()
}
}
FontSubsetInfo aSubsetInfo;
- if( m_pReferenceDevice->mpGraphics->CreateFontSubset( aTmpName, it->first, pGlyphIDs, pEncoding, pWidths, nGlyphs, aSubsetInfo ) )
+ if( m_pReferenceDevice->mpGraphics->CreateFontSubset( aTmpName, it->first, aGlyphIds, pEncoding, pWidths, nGlyphs, aSubsetInfo ) )
{
// create font stream
oslFileHandle aFontFile;
@@ -7575,11 +7575,11 @@ void PDFWriterImpl::drawLayout( SalLayou
sal_Int32 nWidth = 0, nAdvance=0;
for( int nStart = 0;;)
{
- sal_GlyphId nGlyphIndex;
- if( !rLayout.GetNextGlyphs( 1, &nGlyphIndex, aPos, nStart, &nAdvance ) )
+ sal_GlyphId aGlyphId;
+ if( !rLayout.GetNextGlyphs( 1, &aGlyphId, aPos, nStart, &nAdvance ) )
break;
- if( !rLayout.IsSpacingGlyph( nGlyphIndex ) )
+ if( !rLayout.IsSpacingGlyph( aGlyphId ) )
{
if( !nWidth )
aStartPt = aPos;
@@ -7674,12 +7674,12 @@ void PDFWriterImpl::drawLayout( SalLayou
for( int nStart = 0;;)
{
Point aPos;
- sal_GlyphId nGlyphIndex;
+ sal_GlyphId aGlyphId;
sal_Int32 nAdvance;
- if( !rLayout.GetNextGlyphs( 1, &nGlyphIndex, aPos, nStart, &nAdvance ) )
+ if( !rLayout.GetNextGlyphs( 1, &aGlyphId, aPos, nStart, &nAdvance ) )
break;
- if( !rLayout.IsSpacingGlyph( nGlyphIndex ) )
+ if( !rLayout.IsSpacingGlyph( aGlyphId ) )
{
Point aAdjOffset = aOffset;
aAdjOffset.X() += (nAdvance - nEmphWidth) / 2;
Modified: openoffice/branches/ooxml-osba/main/vcl/source/gdi/salgdilayout.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/source/gdi/salgdilayout.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/source/gdi/salgdilayout.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/source/gdi/salgdilayout.cxx Wed Dec 18 13:27:09 2013
@@ -440,7 +440,7 @@ bool SalGraphics::drawPolyLine(
return false;
}
-void SalGraphics::DrawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry, const OutputDevice *pOutDev )
+void SalGraphics::DrawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry, const OutputDevice *pOutDev )
{
if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) )
{
@@ -453,7 +453,7 @@ void SalGraphics::DrawPolyLine( sal_uLon
drawPolyLine( nPoints, pPtAry );
}
-void SalGraphics::DrawPolygon( sal_uLong nPoints, const SalPoint* pPtAry, const OutputDevice *pOutDev )
+void SalGraphics::DrawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry, const OutputDevice *pOutDev )
{
if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) )
{
@@ -508,7 +508,7 @@ bool SalGraphics::drawPolyPolygon( const
return false;
}
-sal_Bool SalGraphics::DrawPolyLineBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry, const OutputDevice* pOutDev )
+sal_Bool SalGraphics::DrawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry, const OutputDevice* pOutDev )
{
sal_Bool bResult = sal_False;
if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) )
@@ -523,7 +523,7 @@ sal_Bool SalGraphics::DrawPolyLineBezier
return bResult;
}
-sal_Bool SalGraphics::DrawPolygonBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry, const OutputDevice* pOutDev )
+sal_Bool SalGraphics::DrawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry, const OutputDevice* pOutDev )
{
sal_Bool bResult = sal_False;
if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) )
@@ -681,7 +681,7 @@ void SalGraphics::Invert( long nX, long
mirror( nX, nWidth, pOutDev );
invert( nX, nY, nWidth, nHeight, nFlags );
}
-void SalGraphics::Invert( sal_uLong nPoints, const SalPoint* pPtAry, SalInvert nFlags, const OutputDevice *pOutDev )
+void SalGraphics::Invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags, const OutputDevice *pOutDev )
{
if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) )
{
Modified: openoffice/branches/ooxml-osba/main/vcl/source/gdi/sallayout.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/source/gdi/sallayout.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/source/gdi/sallayout.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/source/gdi/sallayout.cxx Wed Dec 18 13:27:09 2013
@@ -949,10 +949,10 @@ bool SalLayout::IsSpacingGlyph( sal_Glyp
// -----------------------------------------------------------------------
-const ImplFontData* SalLayout::GetFallbackFontData( sal_GlyphId /*nGlyphId*/ ) const
+const ImplFontData* SalLayout::GetFallbackFontData( sal_GlyphId /*aGlyphId*/ ) const
{
#if 0
- int nFallbackLevel = (nGlyphId & GF_FONTMASK) >> GF_FONTSHIFT
+ int nFallbackLevel = (aGlyphId & GF_FONTMASK) >> GF_FONTSHIFT
assert( nFallbackLevel == 0 );
#endif
return NULL;
@@ -1363,7 +1363,7 @@ void GenericSalLayout::KashidaJustify( l
if( !pG1->IsRTLGlyph() )
continue;
// no kashida-injection for blank justified expansion either
- if( IsSpacingGlyph( pG1->mnGlyphIndex ) )
+ if( IsSpacingGlyph( pG1->maGlyphId ) )
continue;
// calculate gap, ignore if too small
@@ -1391,7 +1391,7 @@ void GenericSalLayout::KashidaJustify( l
if( !pG1->IsRTLGlyph() )
continue;
// no kashida-injection for blank justified expansion either
- if( IsSpacingGlyph( pG1->mnGlyphIndex ) )
+ if( IsSpacingGlyph( pG1->maGlyphId ) )
continue;
// calculate gap, skip if too small
@@ -1513,12 +1513,12 @@ int GenericSalLayout::GetNextGlyphs( int
// find more glyphs which can be merged into one drawing instruction
int nCount = 0;
long nYPos = pG->maLinearPos.Y();
- long nOldFlags = pG->mnGlyphIndex;
+ long nOldFlags = pG->maGlyphId;
for(;;)
{
// update return data with glyph info
++nCount;
- *(pGlyphs++) = pG->mnGlyphIndex;
+ *(pGlyphs++) = pG->maGlyphId;
if( pCharPosAry )
*(pCharPosAry++) = pG->mnCharPos;
if( pGlyphAdvAry )
@@ -1557,10 +1557,10 @@ int GenericSalLayout::GetNextGlyphs( int
break;
// stop when glyph flags change
- if( (nOldFlags ^ pG->mnGlyphIndex) & GF_FLAGMASK )
+ if( (nOldFlags ^ pG->maGlyphId) & GF_FLAGMASK )
break;
- nOldFlags = pG->mnGlyphIndex; // &GF_FLAGMASK not needed for test above
+ nOldFlags = pG->maGlyphId; // &GF_FLAGMASK not needed for test above
}
aRelativePos.X() /= mnUnitsPerPixel;
@@ -1601,7 +1601,7 @@ void GenericSalLayout::DropGlyph( int nS
if( nStart >= mnGlyphCount )
return;
GlyphItem* pG = mpGlyphItems + nStart;
- pG->mnGlyphIndex = GF_DROPPED;
+ pG->maGlyphId = GF_DROPPED;
pG->mnCharPos = -1;
}
@@ -1617,7 +1617,7 @@ void GenericSalLayout::Simplify( bool bI
const GlyphItem* pGEnd = mpGlyphItems + mnGlyphCount;
for(; pGSrc < pGEnd; ++pGSrc )
{
- if( pGSrc->mnGlyphIndex == nDropMarker )
+ if( pGSrc->maGlyphId == nDropMarker )
continue;
if( pGDst != pGSrc )
*pGDst = *pGSrc;
@@ -2097,9 +2097,9 @@ void MultiSalLayout::InitFont() const
// -----------------------------------------------------------------------
-const ImplFontData* MultiSalLayout::GetFallbackFontData( sal_GlyphId nGlyphId ) const
+const ImplFontData* MultiSalLayout::GetFallbackFontData( sal_GlyphId aGlyphId ) const
{
- int nFallbackLevel = (nGlyphId & GF_FONTMASK) >> GF_FONTSHIFT;
+ int nFallbackLevel = (aGlyphId & GF_FONTMASK) >> GF_FONTSHIFT;
return mpFallbackFonts[ nFallbackLevel ];
}
Modified: openoffice/branches/ooxml-osba/main/vcl/source/glyphs/gcach_ftyp.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/source/glyphs/gcach_ftyp.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/source/glyphs/gcach_ftyp.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/source/glyphs/gcach_ftyp.cxx Wed Dec 18 13:27:09 2013
@@ -1080,13 +1080,13 @@ void FreetypeServerFont::FetchFontMetric
// -----------------------------------------------------------------------
-static inline void SplitGlyphFlags( const FreetypeServerFont& rFont, int& nGlyphIndex, int& nGlyphFlags )
+static inline void SplitGlyphFlags( const FreetypeServerFont& rFont, sal_GlyphId& rGlyphId, int& nGlyphFlags )
{
- nGlyphFlags = nGlyphIndex & GF_FLAGMASK;
- nGlyphIndex &= GF_IDXMASK;
+ nGlyphFlags = rGlyphId & GF_FLAGMASK;
+ rGlyphId &= GF_IDXMASK;
- if( nGlyphIndex & GF_ISCHAR )
- nGlyphIndex = rFont.GetRawGlyphIndex( nGlyphIndex );
+ if( rGlyphId & GF_ISCHAR )
+ rGlyphId = rFont.GetRawGlyphIndex( rGlyphId );
}
// -----------------------------------------------------------------------
@@ -1174,7 +1174,7 @@ int FreetypeServerFont::ApplyGlyphTransf
// -----------------------------------------------------------------------
-int FreetypeServerFont::GetRawGlyphIndex( sal_UCS4 aChar ) const
+sal_GlyphId FreetypeServerFont::GetRawGlyphIndex( sal_UCS4 aChar ) const
{
if( mpFontInfo->IsSymbolFont() )
{
@@ -1232,12 +1232,12 @@ int FreetypeServerFont::GetRawGlyphIndex
mpFontInfo->CacheGlyphIndex( aChar, nGlyphIndex );
}
- return nGlyphIndex;
+ return sal_GlyphId( nGlyphIndex);
}
// -----------------------------------------------------------------------
-int FreetypeServerFont::FixupGlyphIndex( int nGlyphIndex, sal_UCS4 aChar ) const
+sal_GlyphId FreetypeServerFont::FixupGlyphIndex( sal_GlyphId aGlyphId, sal_UCS4 aChar ) const
{
int nGlyphFlags = GF_NONE;
@@ -1246,21 +1246,21 @@ int FreetypeServerFont::FixupGlyphIndex(
if( GetFontSelData().mbVertical )
{
// TODO: rethink when GSUB is used for non-vertical case
- GlyphSubstitution::const_iterator it = maGlyphSubstitution.find( nGlyphIndex );
+ GlyphSubstitution::const_iterator it = maGlyphSubstitution.find( aGlyphId );
if( it == maGlyphSubstitution.end() )
{
- int nTemp = GetVerticalChar( aChar );
+ sal_GlyphId nTemp = GetVerticalChar( aChar );
if( nTemp ) // is substitution possible
nTemp = GetRawGlyphIndex( nTemp );
if( nTemp ) // substitute manually if sensible
- nGlyphIndex = nTemp | (GF_GSUB | GF_ROTL);
+ aGlyphId = nTemp | (GF_GSUB | GF_ROTL);
else
nGlyphFlags |= GetVerticalFlags( aChar );
}
else
{
// for vertical GSUB also compensate for nOrientation=2700
- nGlyphIndex = (*it).second;
+ aGlyphId = (*it).second;
nGlyphFlags |= GF_GSUB | GF_ROTL;
}
}
@@ -1276,20 +1276,20 @@ int FreetypeServerFont::FixupGlyphIndex(
}
#endif
- if( nGlyphIndex != 0 )
- nGlyphIndex |= nGlyphFlags;
+ if( aGlyphId != 0 )
+ aGlyphId |= nGlyphFlags;
- return nGlyphIndex;
+ return aGlyphId;
}
// -----------------------------------------------------------------------
-int FreetypeServerFont::GetGlyphIndex( sal_UCS4 aChar ) const
+sal_GlyphId FreetypeServerFont::GetGlyphIndex( sal_UCS4 aChar ) const
{
- int nGlyphIndex = GetRawGlyphIndex( aChar );
- nGlyphIndex = FixupGlyphIndex( nGlyphIndex, aChar );
- return nGlyphIndex;
+ sal_GlyphId aGlyphId = GetRawGlyphIndex( aChar );
+ aGlyphId = FixupGlyphIndex( aGlyphId, aChar );
+ return aGlyphId;
}
// -----------------------------------------------------------------------
@@ -1313,13 +1313,13 @@ static int lcl_GetCharWidth( FT_FaceRec_
// -----------------------------------------------------------------------
-void FreetypeServerFont::InitGlyphData( int nGlyphIndex, GlyphData& rGD ) const
+void FreetypeServerFont::InitGlyphData( sal_GlyphId aGlyphId, GlyphData& rGD ) const
{
if( maSizeFT )
pFTActivateSize( maSizeFT );
int nGlyphFlags;
- SplitGlyphFlags( *this, nGlyphIndex, nGlyphFlags );
+ SplitGlyphFlags( *this, aGlyphId, nGlyphFlags );
int nLoadFlags = mnLoadFlags;
@@ -1332,7 +1332,7 @@ void FreetypeServerFont::InitGlyphData(
// => first we have to try without hinting
if( (nLoadFlags & (FT_LOAD_NO_HINTING | FT_LOAD_NO_BITMAP)) == 0 )
{
- rc = FT_Load_Glyph( maFaceFT, nGlyphIndex, nLoadFlags|FT_LOAD_NO_HINTING );
+ rc = FT_Load_Glyph( maFaceFT, aGlyphId, nLoadFlags|FT_LOAD_NO_HINTING );
if( (rc==FT_Err_Ok) && (maFaceFT->glyph->format!=FT_GLYPH_FORMAT_BITMAP) )
rc = -1; // mark as "loading embedded bitmap" was unsuccessful
nLoadFlags |= FT_LOAD_NO_BITMAP;
@@ -1340,7 +1340,7 @@ void FreetypeServerFont::InitGlyphData(
if( rc != FT_Err_Ok )
#endif
- rc = FT_Load_Glyph( maFaceFT, nGlyphIndex, nLoadFlags );
+ rc = FT_Load_Glyph( maFaceFT, aGlyphId, nLoadFlags );
if( rc != FT_Err_Ok )
{
@@ -1393,13 +1393,13 @@ bool FreetypeServerFont::GetAntialiasAdv
// -----------------------------------------------------------------------
-bool FreetypeServerFont::GetGlyphBitmap1( int nGlyphIndex, RawBitmap& rRawBitmap ) const
+bool FreetypeServerFont::GetGlyphBitmap1( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap ) const
{
if( maSizeFT )
pFTActivateSize( maSizeFT );
int nGlyphFlags;
- SplitGlyphFlags( *this, nGlyphIndex, nGlyphFlags );
+ SplitGlyphFlags( *this, aGlyphId, nGlyphFlags );
FT_Int nLoadFlags = mnLoadFlags;
// #i70930# force mono-hinting for monochrome text
@@ -1428,7 +1428,7 @@ bool FreetypeServerFont::GetGlyphBitmap1
// => first we have to try without hinting
if( (nLoadFlags & (FT_LOAD_NO_HINTING | FT_LOAD_NO_BITMAP)) == 0 )
{
- rc = FT_Load_Glyph( maFaceFT, nGlyphIndex, nLoadFlags|FT_LOAD_NO_HINTING );
+ rc = FT_Load_Glyph( maFaceFT, aGlyphId, nLoadFlags|FT_LOAD_NO_HINTING );
if( (rc==FT_Err_Ok) && (maFaceFT->glyph->format != FT_GLYPH_FORMAT_BITMAP) )
rc = -1; // mark as "loading embedded bitmap" was unsuccessful
nLoadFlags |= FT_LOAD_NO_BITMAP;
@@ -1436,7 +1436,7 @@ bool FreetypeServerFont::GetGlyphBitmap1
if( rc != FT_Err_Ok )
#endif
- rc = FT_Load_Glyph( maFaceFT, nGlyphIndex, nLoadFlags );
+ rc = FT_Load_Glyph( maFaceFT, aGlyphId, nLoadFlags );
if( rc != FT_Err_Ok )
return false;
@@ -1567,13 +1567,13 @@ bool FreetypeServerFont::GetGlyphBitmap1
// -----------------------------------------------------------------------
-bool FreetypeServerFont::GetGlyphBitmap8( int nGlyphIndex, RawBitmap& rRawBitmap ) const
+bool FreetypeServerFont::GetGlyphBitmap8( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap ) const
{
if( maSizeFT )
pFTActivateSize( maSizeFT );
int nGlyphFlags;
- SplitGlyphFlags( *this, nGlyphIndex, nGlyphFlags );
+ SplitGlyphFlags( *this, aGlyphId, nGlyphFlags );
FT_Int nLoadFlags = mnLoadFlags;
@@ -1597,7 +1597,7 @@ bool FreetypeServerFont::GetGlyphBitmap8
// => first we have to try without hinting
if( (nLoadFlags & (FT_LOAD_NO_HINTING | FT_LOAD_NO_BITMAP)) == 0 )
{
- rc = FT_Load_Glyph( maFaceFT, nGlyphIndex, nLoadFlags|FT_LOAD_NO_HINTING );
+ rc = FT_Load_Glyph( maFaceFT, aGlyphId, nLoadFlags|FT_LOAD_NO_HINTING );
if( (rc==FT_Err_Ok) && (maFaceFT->glyph->format != FT_GLYPH_FORMAT_BITMAP) )
rc = -1; // mark as "loading embedded bitmap" was unsuccessful
nLoadFlags |= FT_LOAD_NO_BITMAP;
@@ -1605,7 +1605,7 @@ bool FreetypeServerFont::GetGlyphBitmap8
if( rc != FT_Err_Ok )
#endif
- rc = FT_Load_Glyph( maFaceFT, nGlyphIndex, nLoadFlags );
+ rc = FT_Load_Glyph( maFaceFT, aGlyphId, nLoadFlags );
if( rc != FT_Err_Ok )
return false;
@@ -2273,7 +2273,7 @@ static int FT_cubic_to( FT_Vector_CPtr p
// -----------------------------------------------------------------------
-bool FreetypeServerFont::GetGlyphOutline( int nGlyphIndex,
+bool FreetypeServerFont::GetGlyphOutline( sal_GlyphId aGlyphId,
::basegfx::B2DPolyPolygon& rB2DPolyPoly ) const
{
if( maSizeFT )
@@ -2282,7 +2282,7 @@ bool FreetypeServerFont::GetGlyphOutline
rB2DPolyPoly.clear();
int nGlyphFlags;
- SplitGlyphFlags( *this, nGlyphIndex, nGlyphFlags );
+ SplitGlyphFlags( *this, aGlyphId, nGlyphFlags );
FT_Int nLoadFlags = FT_LOAD_DEFAULT | FT_LOAD_IGNORE_TRANSFORM;
@@ -2292,7 +2292,7 @@ bool FreetypeServerFont::GetGlyphOutline
nLoadFlags |= FT_LOAD_TARGET_LIGHT;
#endif
- FT_Error rc = FT_Load_Glyph( maFaceFT, nGlyphIndex, nLoadFlags );
+ FT_Error rc = FT_Load_Glyph( maFaceFT, aGlyphId, nLoadFlags );
if( rc != FT_Err_Ok )
return false;
Modified: openoffice/branches/ooxml-osba/main/vcl/source/glyphs/gcach_ftyp.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/source/glyphs/gcach_ftyp.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/source/glyphs/gcach_ftyp.hxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/source/glyphs/gcach_ftyp.hxx Wed Dec 18 13:27:09 2013
@@ -184,14 +184,14 @@ public:
virtual void FetchFontMetric( ImplFontMetricData&, long& rFactor ) const;
virtual const ImplFontCharMap* GetImplFontCharMap( void ) const;
- virtual int GetGlyphIndex( sal_UCS4 ) const;
- int GetRawGlyphIndex( sal_UCS4 ) const;
- int FixupGlyphIndex( int nGlyphIndex, sal_UCS4 ) const;
+ virtual sal_GlyphId GetGlyphIndex( sal_UCS4 ) const;
+ sal_GlyphId GetRawGlyphIndex( sal_UCS4 ) const;
+ sal_GlyphId FixupGlyphIndex( sal_GlyphId, sal_UCS4 ) const;
virtual bool GetAntialiasAdvice( void ) const;
- virtual bool GetGlyphBitmap1( int nGlyphIndex, RawBitmap& ) const;
- virtual bool GetGlyphBitmap8( int nGlyphIndex, RawBitmap& ) const;
- virtual bool GetGlyphOutline( int nGlyphIndex, ::basegfx::B2DPolyPolygon& ) const;
+ virtual bool GetGlyphBitmap1( sal_GlyphId, RawBitmap& ) const;
+ virtual bool GetGlyphBitmap8( sal_GlyphId, RawBitmap& ) const;
+ virtual bool GetGlyphOutline( sal_GlyphId, ::basegfx::B2DPolyPolygon& ) const;
virtual int GetGlyphKernValue( int nLeftGlyph, int nRightGlyph ) const;
virtual sal_uLong GetKernPairs( ImplKernPairData** ) const;
@@ -204,7 +204,7 @@ protected:
friend class GlyphCache;
int ApplyGlyphTransform( int nGlyphFlags, FT_GlyphRec_*, bool ) const;
- virtual void InitGlyphData( int nGlyphIndex, GlyphData& ) const;
+ virtual void InitGlyphData( sal_GlyphId, GlyphData& ) const;
bool ApplyGSUB( const ImplFontSelectData& );
virtual ServerFontLayoutEngine* GetLayoutEngine();
Modified: openoffice/branches/ooxml-osba/main/vcl/source/glyphs/gcach_layout.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/source/glyphs/gcach_layout.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/source/glyphs/gcach_layout.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/source/glyphs/gcach_layout.cxx Wed Dec 18 13:27:09 2013
@@ -99,7 +99,7 @@ bool ServerFontLayoutEngine::operator()(
FreetypeServerFont& rFont = static_cast<FreetypeServerFont&>(rLayout.GetServerFont());
Point aNewPos( 0, 0 );
- int nOldGlyphId = -1;
+ sal_GlyphId nOldGlyphId( GF_DROPPED);
int nGlyphWidth = 0;
GlyphItem aPrevItem;
bool bRightToLeft;
@@ -116,9 +116,9 @@ bool ServerFontLayoutEngine::operator()(
if( bRightToLeft )
cChar = GetMirroredChar( cChar );
- int nGlyphIndex = rFont.GetGlyphIndex( cChar );
+ sal_GlyphId aGlyphId = rFont.GetGlyphIndex( cChar );
// when glyph fallback is needed update LayoutArgs
- if( !nGlyphIndex ) {
+ if( !aGlyphId ) {
rArgs.NeedFallback( nCharPos, bRightToLeft );
if( cChar >= 0x10000 ) // handle surrogate pairs
rArgs.NeedFallback( nCharPos+1, bRightToLeft );
@@ -127,26 +127,26 @@ bool ServerFontLayoutEngine::operator()(
// apply pair kerning to prev glyph if requested
if( SAL_LAYOUT_KERNING_PAIRS & rArgs.mnFlags )
{
- int nKernValue = rFont.GetGlyphKernValue( nOldGlyphId, nGlyphIndex );
+ int nKernValue = rFont.GetGlyphKernValue( nOldGlyphId, aGlyphId );
nGlyphWidth += nKernValue;
aPrevItem.mnNewWidth = nGlyphWidth;
}
// finish previous glyph
- if( nOldGlyphId >= 0 )
+ if( nOldGlyphId != GF_DROPPED )
rLayout.AppendGlyph( aPrevItem );
aNewPos.X() += nGlyphWidth;
// prepare GlyphItem for appending it in next round
- nOldGlyphId = nGlyphIndex;
- const GlyphMetric& rGM = rFont.GetGlyphMetric( nGlyphIndex );
+ nOldGlyphId = aGlyphId;
+ const GlyphMetric& rGM = rFont.GetGlyphMetric( aGlyphId );
nGlyphWidth = rGM.GetCharWidth();
int nGlyphFlags = bRightToLeft ? GlyphItem::IS_RTL_GLYPH : 0;
- aPrevItem = GlyphItem( nCharPos, nGlyphIndex, aNewPos, nGlyphFlags, nGlyphWidth );
+ aPrevItem = GlyphItem( nCharPos, aGlyphId, aNewPos, nGlyphFlags, nGlyphWidth );
}
// append last glyph item if any
- if( nOldGlyphId >= 0 )
+ if( nOldGlyphId != GF_DROPPED )
rLayout.AppendGlyph( aPrevItem );
return true;