[Libreoffice-commits] core.git: 4 commits - configure.ac desktop/source postprocess/Rdb_services.mk vcl/headless vcl/inc vcl/ios vcl/source
Tor Lillqvist
tml at collabora.com
Wed Oct 7 11:34:32 PDT 2015
configure.ac | 2 +-
desktop/source/lib/init.cxx | 19 ++++++++++---------
postprocess/Rdb_services.mk | 2 +-
vcl/headless/svpframe.cxx | 7 ++++---
vcl/inc/headless/svpframe.hxx | 4 ++--
vcl/inc/ios/iosinst.hxx | 2 --
vcl/inc/sft.hxx | 2 +-
vcl/ios/iosinst.cxx | 38 +-------------------------------------
vcl/source/fontsubset/sft.cxx | 2 +-
9 files changed, 21 insertions(+), 57 deletions(-)
New commits:
commit 99b935ff7dd069f2a0aad5054d07bc6f71411d84
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Oct 7 21:26:06 2015 +0300
Make this compile for iOS again
Change-Id: Idd4a1e6d50652a879493d8411c59605ca1a53dfb
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index 408e05d..b4acde5 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -77,11 +77,11 @@ SvpSalFrame::SvpSalFrame( SvpSalInstance* pInstance,
m_pParent( static_cast<SvpSalFrame*>(pParent) ),
m_nStyle( nSalFrameStyle ),
m_bVisible( false ),
- m_bTopDown( bTopDown ),
#ifndef IOS
+ m_bTopDown( bTopDown ),
m_bDamageTracking( false ),
-#endif
m_nScanlineFormat( nScanlineFormat ),
+#endif
m_nMinWidth( 0 ),
m_nMinHeight( 0 ),
m_nMaxWidth( 0 ),
@@ -92,7 +92,8 @@ SvpSalFrame::SvpSalFrame( SvpSalInstance* pInstance,
memset( static_cast<void *>(&m_aSystemChildData), 0, sizeof( SystemEnvData ) );
m_aSystemChildData.nSize = sizeof( SystemEnvData );
#ifdef IOS
- // Nothing
+ (void) bTopDown;
+ (void) nScanlineFormat;
#elif defined ANDROID
// Nothing
#else
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index 16ff7e254..d7e9b01 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -43,12 +43,12 @@ class VCL_DLLPUBLIC SvpSalFrame : public SalFrame
std::list< SvpSalFrame* > m_aChildren; // List of child frames
SalFrameStyleFlags m_nStyle;
bool m_bVisible;
- bool m_bTopDown;
#ifndef IOS
+ bool m_bTopDown;
basebmp::BitmapDeviceSharedPtr m_aFrame;
bool m_bDamageTracking;
-#endif
basebmp::Format m_nScanlineFormat;
+#endif
long m_nMinWidth;
long m_nMinHeight;
long m_nMaxWidth;
diff --git a/vcl/inc/ios/iosinst.hxx b/vcl/inc/ios/iosinst.hxx
index 1693986..fb987c1 100644
--- a/vcl/inc/ios/iosinst.hxx
+++ b/vcl/inc/ios/iosinst.hxx
@@ -42,8 +42,6 @@ public:
void GetWorkArea( Rectangle& rRect );
SalFrame* CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) SAL_OVERRIDE;
SalFrame* CreateChildFrame( SystemParentData* pParent, SalFrameStyleFlags nStyle ) SAL_OVERRIDE;
-
- SalFrame *getFocusFrame() const;
};
#endif // INCLUDED_VCL_INC_IOS_IOSINST_HXX
diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index f65cdc2..5d17e09 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -474,7 +474,7 @@ namespace vcl
*/
int VCL_DLLPUBLIC MapString(TrueTypeFont *ttf, sal_uInt16 *str, int nchars, sal_uInt16 *glyphArray, bool bvertical);
-#if defined(WNT) || defined(MACOSX)
+#if defined(WNT) || defined(MACOSX) || defined(IOS)
/**
* Maps a Unicode (UCS-2) character to a glyph ID and returns it. Missing glyph has
* a glyphID of 0 so this function can be used to test if a character is encoded in the font.
diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index 2b58ed7..c94330c 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -47,28 +47,6 @@ void IosSalInstance::GetWorkArea( Rectangle& rRect )
Size( viewWidth, viewHeight ) );
}
-/*
- * Try too hard to get a frame, in the absence of anything better to do
- */
-SalFrame *IosSalInstance::getFocusFrame() const
-{
- SalFrame *pFocus = SvpSalFrame::GetFocusFrame();
- if (!pFocus) {
- const std::list< SalFrame* >& rFrames( getFrames() );
- for( std::list< SalFrame* >::const_iterator it = rFrames.begin(); it != rFrames.end(); ++it )
- {
- SvpSalFrame *pFrame = const_cast<SvpSalFrame*>(static_cast<const SvpSalFrame*>(*it));
- if( pFrame->IsVisible() )
- {
- pFrame->GetFocus();
- pFocus = pFrame;
- break;
- }
- }
- }
- return pFocus;
-}
-
IosSalInstance *IosSalInstance::getInstance()
{
if (!ImplGetSVData())
@@ -88,20 +66,6 @@ IosSalInstance::~IosSalInstance()
{
}
-#if 0
-
-bool IosSalInstance::AnyInput( VclInputFlags nType )
-{
- if( nType & VclInputFlags::TIMER )
- return CheckTimeout( false );
-
- // Unfortunately there is no way to check for a specific type of
- // input being queued. That information is too hidden, sigh.
- return SvpSalInstance::s_pDefaultInstance->PostedEventsInQueue();
-}
-
-#endif
-
class IosSalSystem : public SvpSalSystem {
public:
IosSalSystem() : SvpSalSystem() {}
@@ -122,7 +86,7 @@ class IosSalFrame : public SvpSalFrame
public:
IosSalFrame( IosSalInstance *pInstance,
SalFrame *pParent,
- sal_uLong nSalFrameStyle,
+ SalFrameStyleFlags nSalFrameStyle,
SystemParentData *pSysParent )
: SvpSalFrame( pInstance, pParent, nSalFrameStyle,
true, basebmp::Format::ThirtyTwoBitTcMaskRGBA,
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index d901cc8..171d910 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -2413,7 +2413,7 @@ int MapString(TrueTypeFont *ttf, sal_uInt16 *str, int nchars, sal_uInt16 *glyphA
return nchars;
}
-#if defined(WNT) || defined(MACOSX)
+#if defined(WNT) || defined(MACOSX) || defined(IOS)
sal_uInt16 MapChar(TrueTypeFont *ttf, sal_uInt16 ch, bool bvertical)
{
switch (ttf->cmapType) {
commit 3c9da1fbfae9c00a5eb9ddcb106a01b075703fcd
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Oct 7 21:25:50 2015 +0300
Make this compile for iOS again
Change-Id: I36f88d7e1114096d1e7a7a1d29077c387c21a10a
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 03fc12f..5883857 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -775,15 +775,6 @@ void doc_paintTile (LibreOfficeKitDocument* pThis,
pDoc->paintTile(*pDevice.get(), nCanvasWidth, nCanvasHeight,
nTilePosX, nTilePosY, nTileWidth, nTileHeight);
-#else
- SystemGraphicsData aData;
- aData.rCGContext = reinterpret_cast<CGContextRef>(pBuffer);
- // the Size argument is irrelevant, I hope
- ScopedVclPtrInstance<VirtualDevice> pDevice(&aData, Size(1, 1), (sal_uInt16)0);
-
- pDoc->paintTile(*pDevice.get(), nCanvasWidth, nCanvasHeight,
- nTilePosX, nTilePosY, nTileWidth, nTileHeight);
-#endif
// Overwrite pBuffer's alpha channel with the separate alpha buffer.
for (int nRow = 0; nRow < nCanvasHeight; ++nRow)
@@ -796,6 +787,16 @@ void doc_paintTile (LibreOfficeKitDocument* pThis,
}
}
+#else
+ SystemGraphicsData aData;
+ aData.rCGContext = reinterpret_cast<CGContextRef>(pBuffer);
+ // the Size argument is irrelevant, I hope
+ ScopedVclPtrInstance<VirtualDevice> pDevice(&aData, Size(1, 1), (sal_uInt16)0);
+
+ pDoc->paintTile(*pDevice.get(), nCanvasWidth, nCanvasHeight,
+ nTilePosX, nTilePosY, nTileWidth, nTileHeight);
+#endif
+
static bool bDebug = getenv("LOK_DEBUG") != 0;
if (bDebug)
{
commit 5e1bf627b4751b6bc319bdad3166bc7bc1b3ae88
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Oct 7 20:40:15 2015 +0300
No xsec_xmlsec built for iOS either
Change-Id: Ic76111b2e3ff62b00b24e02b2b492530a567c562
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index c9d6e0e..8ae952e 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -110,7 +110,7 @@ $(eval $(call gb_Rdb_add_components,services,\
xmlscript/util/xmlscript \
xmlsecurity/util/xmlsecurity \
xmlsecurity/util/xsec_fw \
- $(if $(filter-out ANDROID,$(OS)), \
+ $(if $(filter-out ANDROID IOS,$(OS)), \
xmlsecurity/util/xsec_xmlsec$(if $(filter WNT,$(OS)),.windows)) \
$(if $(ENABLE_COINMP), \
sccomp/source/solver/coinmpsolver \
commit 07d0d308e008f733a40ca6166ab96311d7ac6c09
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Oct 7 17:48:45 2015 +0300
Look for iOS SDK 9.1, too
Change-Id: Idd8fff8b6fabd24e5f88b47360f582fee3bd17c2
diff --git a/configure.ac b/configure.ac
index 8554d05..d85ca53 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3031,7 +3031,7 @@ if test $_os = iOS; then
xcode_developer=`xcode-select -print-path`
current_sdk_ver=8.3
- for sdkver in 9.0 8.4 8.3 8.2 8.1 8.0; do
+ for sdkver in 9.1 9.0 8.4 8.3 8.2 8.1 8.0; do
t=$xcode_developer/Platforms/$platform.platform/Developer/SDKs/$platform$sdkver.sdk
if test -d $t; then
ios_sdk=$sdkver
More information about the Libreoffice-commits
mailing list