[Libreoffice-commits] core.git: 2 commits - toolkit/source vcl/headless vcl/inc vcl/source
Tor Lillqvist
tml at iki.fi
Tue Mar 26 16:49:24 PDT 2013
toolkit/source/awt/vclxsystemdependentwindow.cxx | 3 ++
toolkit/source/awt/vclxtoolkit.cxx | 4 +++
toolkit/source/awt/vclxtopwindow.cxx | 3 ++
toolkit/source/awt/vclxwindow1.cxx | 2 +
vcl/headless/svpframe.cxx | 6 +++-
vcl/headless/svpgdi.cxx | 29 -----------------------
vcl/headless/svptext.cxx | 21 +++++++++++++++-
vcl/inc/vcl/sysdata.hxx | 13 +++++++++-
vcl/source/window/syschild.cxx | 4 +--
9 files changed, 50 insertions(+), 35 deletions(-)
New commits:
commit baeccb02dabe525217593f9f575d36882c36be76
Author: Tor Lillqvist <tml at iki.fi>
Date: Wed Mar 27 00:38:36 2013 +0200
Bypass fields that are meaningless for iOS
Change-Id: I66acafc1f7302242a2a43271b909bba331062bce
diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx
index e156879..b54cca2 100644
--- a/toolkit/source/awt/vclxsystemdependentwindow.cxx
+++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx
@@ -84,6 +84,9 @@ IMPL_XTYPEPROVIDER_END
{
aRet <<= (sal_IntPtr)pSysData->pView;
}
+#elif (defined IOS)
+ // Nothing
+ (void) SystemType;
#elif (defined UNX)
if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_XWINDOW )
{
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 31fdb3a..8620144 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -936,6 +936,8 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
aParentData.nSize = sizeof( aParentData );
#if defined MACOSX
aParentData.pView = reinterpret_cast<NSView*>(nWindowHandle);
+ #elif defined IOS
+ // Nothing
#elif defined UNX
aParentData.aWindow = nWindowHandle;
aParentData.bXEmbedSupport = bXEmbed;
@@ -1181,6 +1183,8 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow(
aParentData.nSize = sizeof( aParentData );
#if defined MACOSX
aParentData.pView = reinterpret_cast<NSView*>(nWindowHandle);
+ #elif defined IOS
+ // Nothing
#elif defined UNX
aParentData.aWindow = nWindowHandle;
aParentData.bXEmbedSupport = bXEmbed;
diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx
index a4758ac..0f61b49 100644
--- a/toolkit/source/awt/vclxtopwindow.cxx
+++ b/toolkit/source/awt/vclxtopwindow.cxx
@@ -96,6 +96,9 @@ Sequence< Type > VCLXTopWindow_Base::getTypes() throw(RuntimeException)
{
aRet <<= (sal_IntPtr)pSysData->pView;
}
+#elif (defined IOS)
+ // Nothing
+ (void) SystemType;
#elif (defined UNX)
if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_XWINDOW )
{
diff --git a/toolkit/source/awt/vclxwindow1.cxx b/toolkit/source/awt/vclxwindow1.cxx
index 029c3bc..ce5efb1 100644
--- a/toolkit/source/awt/vclxwindow1.cxx
+++ b/toolkit/source/awt/vclxwindow1.cxx
@@ -85,6 +85,8 @@ void VCLXWindow::SetSystemParent_Impl( const com::sun::star::uno::Any& rHandle )
aSysParentData.hWnd = (HWND) nHandle;
#elif defined( MACOSX )
aSysParentData.pView = reinterpret_cast<NSView*>(nHandle);
+#elif defined( IOS )
+ // Nothing
#elif defined( UNX )
aSysParentData.aWindow = (long)nHandle;
aSysParentData.bXEmbedSupport = bXEmbed;
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index 8a234df..dfe96a0 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -82,9 +82,11 @@ SvpSalFrame::SvpSalFrame( SvpSalInstance* pInstance,
// fast and easy cross-platform wiping of the data
memset( (void *)&m_aSystemChildData, 0, sizeof( SystemChildData ) );
m_aSystemChildData.nSize = sizeof( SystemChildData );
-#ifdef UNX
+#ifdef IOS
+ // Nothing
+#else
m_aSystemChildData.pSalFrame = this;
-#if defined(ANDROID) || defined(IOS)
+#ifdef ANDROID
// We want 32-bit RGBA bitmaps
m_aSystemChildData.nDepth = 32;
#else
diff --git a/vcl/inc/vcl/sysdata.hxx b/vcl/inc/vcl/sysdata.hxx
index a1db487..be17b95 100644
--- a/vcl/inc/vcl/sysdata.hxx
+++ b/vcl/inc/vcl/sysdata.hxx
@@ -64,6 +64,8 @@ struct SystemEnvData
HWND hWnd; // the window hwnd
#elif defined( MACOSX )
NSView* pView; // the cocoa (NSView *) implementing this object
+#elif defined( IOS )
+ // Nothing
#elif defined( UNX )
void* pDisplay; // the relevant display connection
long aWindow; // the window of the object
@@ -92,6 +94,8 @@ struct SystemParentData
HWND hWnd; // the window hwnd
#elif defined( MACOSX )
NSView* pView; // the cocoa (NSView *) implementing this object
+#elif defined( IOS )
+ // Nothing
#elif defined( UNX )
long aWindow; // the window of the object
bool bXEmbedSupport:1; // decides whether the object in question
@@ -109,7 +113,9 @@ struct SystemMenuData
#if defined( WNT )
HMENU hMenu; // the menu handle of the menu bar
#elif defined( MACOSX )
- //not defined
+ // Nothing
+#elif defined( IOS )
+ // Nothing
#elif defined( UNX )
long aMenu; // ???
#endif
@@ -127,6 +133,7 @@ struct SystemGraphicsData
#elif defined( MACOSX )
CGContextRef rCGContext; // CoreGraphics graphic context
#elif defined( IOS )
+ // Nothing
#elif defined( UNX )
void* pDisplay; // the relevant display connection
long hDrawable; // a drawable
@@ -141,7 +148,9 @@ struct SystemGraphicsData
#if defined( WNT )
, hDC( 0 )
#elif defined( MACOSX )
+ // Nothing
#elif defined( IOS )
+ // Nothing
#elif defined( UNX )
, pDisplay( NULL )
, hDrawable( 0 )
@@ -164,7 +173,9 @@ struct SystemWindowData
unsigned long nSize; // size in bytes of this structure
#if defined( WNT ) // meaningless on Windows
#elif defined( MACOSX ) // meaningless on Mac OS X
+ // Nothing
#elif defined( IOS ) // and maybe on iOS, too, then
+ // Nothing
#elif defined( UNX )
void* pVisual; // the visual to be used
#endif
diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx
index 93086e9..7cca679 100644
--- a/vcl/source/window/syschild.cxx
+++ b/vcl/source/window/syschild.cxx
@@ -221,11 +221,11 @@ sal_IntPtr SystemChildWindow::GetParentWindowHandle( sal_Bool bUseJava )
(void)bUseJava;
#if defined WNT
nRet = reinterpret_cast< sal_IntPtr >( GetSystemData()->hWnd );
- (void)bUseJava;
#elif defined MACOSX
// FIXME: this is wrong
nRet = reinterpret_cast< sal_IntPtr >( GetSystemData()->pView );
- (void)bUseJava;
+#elif defined IOS
+ // Nothing
#elif defined UNX
if( !bUseJava )
{
commit 5ea1466c4f06737669bedbaa4ee608d6a6060bf9
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Mar 26 23:54:45 2013 +0200
Move two text-related functions to svptext.cxx
Change-Id: I6c45d44fd38d9fde8cad7f712973f11bde51675a
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 0fc3529..ca95dc3 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -358,15 +358,6 @@ void SvpSalGraphics::SetROPFillColor( SalROPColor nROPColor )
}
}
-#ifndef IOS
-
-void SvpSalGraphics::SetTextColor( SalColor nSalColor )
-{
- m_aTextColor = basebmp::Color( nSalColor );
-}
-
-#endif
-
void SvpSalGraphics::drawPixel( long nX, long nY )
{
if( m_bUseLineColor )
@@ -703,26 +694,6 @@ sal_Bool SvpSalGraphics::drawEPS( long, long, long, long, void*, sal_uLong )
return sal_False;
}
-#ifndef IOS
-
-SystemFontData SvpSalGraphics::GetSysFontData( int nFallbacklevel ) const
-{
- SystemFontData aSysFontData;
-
- if (nFallbacklevel >= MAX_FALLBACK) nFallbacklevel = MAX_FALLBACK - 1;
- if (nFallbacklevel < 0 ) nFallbacklevel = 0;
-
- aSysFontData.nSize = sizeof( SystemFontData );
- aSysFontData.nFontId = 0;
- aSysFontData.nFontFlags = 0;
- aSysFontData.bFakeBold = false;
- aSysFontData.bFakeItalic = false;
- aSysFontData.bAntialias = true;
- return aSysFontData;
-}
-
-#endif
-
SystemGraphicsData SvpSalGraphics::GetGraphicsData() const
{
return SystemGraphicsData();
diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx
index 834f6a0..b4429b2 100644
--- a/vcl/headless/svptext.cxx
+++ b/vcl/headless/svptext.cxx
@@ -539,6 +539,25 @@ void SvpSalGraphics::DrawServerFontLayout( const ServerFontLayout& rSalLayout )
}
}
-// ===========================================================================
+void SvpSalGraphics::SetTextColor( SalColor nSalColor )
+{
+ m_aTextColor = basebmp::Color( nSalColor );
+}
+
+SystemFontData SvpSalGraphics::GetSysFontData( int nFallbacklevel ) const
+{
+ SystemFontData aSysFontData;
+
+ if (nFallbacklevel >= MAX_FALLBACK) nFallbacklevel = MAX_FALLBACK - 1;
+ if (nFallbacklevel < 0 ) nFallbacklevel = 0;
+
+ aSysFontData.nSize = sizeof( SystemFontData );
+ aSysFontData.nFontId = 0;
+ aSysFontData.nFontFlags = 0;
+ aSysFontData.bFakeBold = false;
+ aSysFontData.bFakeItalic = false;
+ aSysFontData.bAntialias = true;
+ return aSysFontData;
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list