configure.ac | 4 ++-- filter/source/msfilter/msvbahelper.cxx | 8 ++++++++ sfx2/source/doc/sfxbasemodel.cxx | 3 +++ sfx2/source/view/viewfrm.cxx | 4 ++++ 4 files changed, 17 insertions(+), 2 deletions(-)
New commits: commit b6fa941a62c1f301982732f4d7ec1b42f9330af0 Author: Tor Lillqvist <t...@iki.fi> AuthorDate: Wed Sep 19 13:21:56 2018 +0300 Commit: Tor Lillqvist <t...@iki.fi> CommitDate: Wed Sep 19 13:21:56 2018 +0300 Avoid unused functions in the !HAVE_FEATURE_SCRIPTING case Change-Id: I4b3cb1d696adb7f9a6f35b8529e49d55bd5d957b diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx index 6e611824e163..33ec4e3ce63a 100644 --- a/filter/source/msfilter/msvbahelper.cxx +++ b/filter/source/msfilter/msvbahelper.cxx @@ -78,6 +78,8 @@ static OUString trimMacroName( const OUString& rMacroName ) return aMacroName; } +#if HAVE_FEATURE_SCRIPTING + static SfxObjectShell* findShellForUrl( const OUString& sMacroURLOrPath ) { SfxObjectShell* pFoundShell=nullptr; @@ -224,6 +226,8 @@ static bool hasMacro( SfxObjectShell const * pShell, const OUString& sLibrary, O return bFound; } +#endif + OUString getDefaultProjectName( SfxObjectShell const * pShell ) { OUString aPrjName; @@ -236,6 +240,8 @@ OUString getDefaultProjectName( SfxObjectShell const * pShell ) return aPrjName; } +#if HAVE_FEATURE_SCRIPTING + static void parseMacro( const OUString& sMacro, OUString& sContainer, OUString& sModule, OUString& sProcedure ) { sal_Int32 nMacroDot = sMacro.lastIndexOf( '.' ); @@ -257,6 +263,8 @@ static void parseMacro( const OUString& sMacro, OUString& sContainer, OUString& sProcedure = sMacro; } +#endif + OUString resolveVBAMacro( SfxObjectShell const * pShell, const OUString& rLibName, const OUString& rModuleName, const OUString& rMacroName ) { #if !HAVE_FEATURE_SCRIPTING commit 83dd72cb85dc8bcd797e62d7a28b8ec2cfdb700a Author: Tor Lillqvist <t...@iki.fi> AuthorDate: Wed Sep 19 13:07:05 2018 +0300 Commit: Tor Lillqvist <t...@iki.fi> CommitDate: Wed Sep 19 13:19:23 2018 +0300 Avoid unused function in the !HAVE_FEATURE_SCRIPTING case Change-Id: Ic41be9447a8ac068d9616252ad3b17451234956e diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 76b24debb328..d1629aff7e8d 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -579,6 +579,7 @@ Sequence< sal_Int8 > SAL_CALL SfxBaseModel::getImplementationId() // XStarBasicAccess +#if HAVE_FEATURE_SCRIPTING static Reference< script::XStarBasicAccess > implGetStarBasicAccess( SfxObjectShell const * pObjectShell ) { @@ -596,6 +597,8 @@ static Reference< script::XStarBasicAccess > implGetStarBasicAccess( SfxObjectSh return xRet; } +#endif + Reference< container::XNameContainer > SAL_CALL SfxBaseModel::getLibraryContainer() { #if !HAVE_FEATURE_SCRIPTING diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 32665471a75c..da991c1ee635 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -2400,6 +2400,8 @@ void SfxViewFrame::Resize( bool bForce ) } } +#if HAVE_FEATURE_SCRIPTING + #define LINE_SEP 0x0A static void CutLines( OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines ) @@ -2443,6 +2445,8 @@ static void CutLines( OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines ) } } +#endif + /* add new recorded dispatch macro script into the application global basic lib container. It generates a new unique id for it and insert the macro commit 4a827917373377a99b2207bdb39ac266257215c4 Author: Tor Lillqvist <t...@iki.fi> AuthorDate: Wed Sep 19 12:44:29 2018 +0300 Commit: Tor Lillqvist <t...@iki.fi> CommitDate: Wed Sep 19 13:19:22 2018 +0300 iOS SDK 12.0 is the current now Also, I don't see why we would want to use -miphoneos-version-min=12.0 just because we build against the 12.0 SDK. Use 11.0 as the minimum runtime iOS version for now. Change-Id: I36b9696ce367249e7e8d0a51ee61791e32972390 diff --git a/configure.ac b/configure.ac index 45773e34e15e..ec9d8b34d416 100644 --- a/configure.ac +++ b/configure.ac @@ -2946,13 +2946,13 @@ dnl =================================================================== if test $_os = iOS; then AC_MSG_CHECKING([what iOS SDK to use]) - current_sdk_ver=11.4 + current_sdk_ver=12.0 if test "$enable_ios_simulator" = "yes"; then platform=iPhoneSimulator versionmin=-mios-simulator-version-min=$current_sdk_ver else platform=iPhoneOS - versionmin=-miphoneos-version-min=$current_sdk_ver + versionmin=-miphoneos-version-min=11.0 fi xcode_developer=`xcode-select -print-path` _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits