set_soenv.in | 3 ++- sw/source/ui/utlui/navipi.cxx | 1 + 2 files changed, 3 insertions(+), 1 deletion(-)
New commits: commit a6c044e24a397fa303989f1180c7bc944cbde1f7 Author: Herbert Dürr <h...@apache.org> Date: Thu May 8 08:36:03 2014 +0000 #i124422# adjust include path for libc++ headers to the selected XCode folder While XCode5's xcode-select supports the -p and --print-path options, XCode4 officially only knows -print-path. XCode4 seems to tolerate --print-path though (tested on XCode4.6), so this can be universally used. Patch-by: Thorsten Wagner <thorsten.wagne...@gmail.com> Review-by: Herbert Duerr <h...@apache.org> diff --git a/set_soenv.in b/set_soenv.in index 2364a60..80fb9d2 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -1441,7 +1441,8 @@ elsif ($platform =~ m/cygwin/) elsif ($platform =~ m/darwin/) { $FRAMEWORKSHOME = "@MACOSX_SDK_PATH@/System/Library/Frameworks"; - my $STLINC .= $I."/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/c++/v1/"; + chomp( my $TOOLSPATH = `xcode-select --print-path` ); + my $STLINC .= $I."$TOOLSPATH/Toolchains/XcodeDefault.xctoolchain/usr/lib/c++/v1/"; $SOLARINC .= $STLINC . $I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Headers"; $GUIBASE = "aqua"; } commit c104272ea1274dea87cd66cfaa61b34806708521 Author: Tsutomu Uchino <ha...@apache.org> Date: Thu May 8 08:08:57 2014 +0000 #i27364# set line count of dropdown to 9 for document list of navigator on Writer diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx index 0ae216d..d3aea70 100644 --- a/sw/source/ui/utlui/navipi.cxx +++ b/sw/source/ui/utlui/navipi.cxx @@ -803,6 +803,7 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings, aContentToolBox.SetHelpId(HID_NAVIGATOR_TOOLBOX ); aGlobalToolBox.SetHelpId(HID_NAVIGATOR_GLOBAL_TOOLBOX); aDocListBox.SetHelpId(HID_NAVIGATOR_LISTBOX ); + aDocListBox.SetDropDownLineCount(9); nDocLBIniHeight = aDocListBox.GetSizePixel().Height(); nZoomOutInit = nZoomOut = Resource::ReadShortRes();
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits