configure.ac | 15 +++++++++++++++ sw/source/core/text/frmpaint.cxx | 25 ++++++++++++++++++------- sysui/desktop/macosx/Info.plist.in | 2 ++ 3 files changed, 35 insertions(+), 7 deletions(-)
New commits: commit 0c9e4d9b223a0593686bee800484de3c23095d4f Author: Norbert Thiebaud <[email protected]> Date: Sun Jan 26 22:05:38 2014 -0600 macosx: add --enable-macosx-retina this tell the info.plist that the application is 'high resolution enabled' Change-Id: I8e43e20f78c822d1cebab873f340143fe2dee4ea diff --git a/configure.ac b/configure.ac index fb51308..4707ab2 100644 --- a/configure.ac +++ b/configure.ac @@ -1211,6 +1211,12 @@ AC_ARG_ENABLE(silent-msi, [Enable MSI with LIMITUI=1 (silent install).]), ,) +AC_ARG_ENABLE(macosx-retina, + AS_HELP_STRING([--enable-macosx-retina], + [Declare the application as High Resolution Capable. (retina display) + ]), +,) + AC_ARG_ENABLE(macosx-code-signing, AS_HELP_STRING([--enable-macosx-code-signing<=identity>], [Sign executables, dylibs, frameworks and the app bundle. If you @@ -2916,6 +2922,14 @@ if test $_os = Darwin; then MACOSX_BUNDLE_IDENTIFIER=$with_macosx_bundle_identifier AC_MSG_RESULT([$MACOSX_BUNDLE_IDENTIFIER]) + + AC_MSG_CHECKING([build with mac retina support]) + if test "$enable_macosx_retina" = yes ; then + MACOSX_HIGH_RESOLUTION_VALUE=true + else + MACOSX_HIGH_RESOLUTION_VALUE=false + fi + AC_MSG_RESULT([$MACOSX_HIGH_RESOLUTION_VALUE]) fi AC_SUBST(MACOSX_SDK_PATH) AC_SUBST(MACOSX_SDK_VERSION) @@ -2927,6 +2941,7 @@ AC_SUBST(LIBTOOL) # Note that the OS X libtool command is unrelated to GNU libto AC_SUBST(MACOSX_CODESIGNING_IDENTITY) AC_SUBST(ENABLE_MACOSX_SANDBOX) AC_SUBST(MACOSX_BUNDLE_IDENTIFIER) +AC_SUBST(MACOSX_HIGH_RESOLUTION_VALUE) dnl =================================================================== dnl Check iOS SDK and compiler diff --git a/sysui/desktop/macosx/Info.plist.in b/sysui/desktop/macosx/Info.plist.in index 16f9eae..a7cb96f 100755 --- a/sysui/desktop/macosx/Info.plist.in +++ b/sysui/desktop/macosx/Info.plist.in @@ -1424,6 +1424,8 @@ <string>public.app-category.productivity</string> <key>LSMinimumSystemVersion</key> <string>@[email protected]</string> + <key>NSHighResolutionCapable</key> + <@MACOSX_HIGH_RESOLUTION_VALUE@/> </dict> </plist> commit 121d5d545b256333543b4679ef64313fac4ad109 Author: Norbert Thiebaud <[email protected]> Date: Sun Jan 26 05:32:35 2014 -0600 coverity#1130487 : Unitialized scalar field Change-Id: Iea976b917c41b7557b18298e20adf2ccd6663670 diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx index 8890404..422a049 100644 --- a/sw/source/core/text/frmpaint.cxx +++ b/sw/source/core/text/frmpaint.cxx @@ -94,11 +94,20 @@ public: SwExtraPainter::SwExtraPainter( const SwTxtFrm *pFrm, SwViewShell *pVwSh, - const SwLineNumberInfo &rLnInf, const SwRect &rRct, - sal_Int16 eHor, bool bLnNm ) - : aClip( pVwSh->GetWin() || pFrm->IsUndersized() ? pVwSh->GetOut() : 0 ), - aRect( rRct ), pTxtFrm( pFrm ), pSh( pVwSh ), pFnt( 0 ), rLineInf( rLnInf ), - nLineNr( 1L ), bLineNum( bLnNm ) + const SwLineNumberInfo &rLnInf, const SwRect &rRct, + sal_Int16 eHor, bool bLnNm ) + : aClip( pVwSh->GetWin() || pFrm->IsUndersized() ? pVwSh->GetOut() : 0 ) + , aRect( rRct ) + , pTxtFrm( pFrm ) + , pSh( pVwSh ) + , pFnt( 0 ) + , rLineInf( rLnInf ) + , nX(0) + , nRedX(0) + , nLineNr( 1L ) + , nDivider(0) + , bGoLeft(false) + , bLineNum( bLnNm ) { if( pFrm->IsUndersized() ) { @@ -108,14 +117,16 @@ SwExtraPainter::SwExtraPainter( const SwTxtFrm *pFrm, SwViewShell *pVwSh, } MSHORT nVirtPageNum = 0; if( bLineNum ) - {/* Initializes the Members necessary for line numbering: + { + /* Initializes the Members necessary for line numbering: nDivider, how often do we want a substring; 0 == never nX, line number's x position pFnt, line number's font nLineNr, the first line number bLineNum is set back to sal_False if the numbering is completely - outside of the paint rect */ + outside of the paint rect + */ nDivider = !rLineInf.GetDivider().isEmpty() ? rLineInf.GetDividerCountBy() : 0; nX = pFrm->Frm().Left(); SwCharFmt* pFmt = rLineInf.GetCharFmt( const_cast<IDocumentStylePoolAccess&>(*pFrm->GetNode()->getIDocumentStylePoolAccess()) ); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
