Re: OSX Daily Builds
Not trying to hijack this thread but what does one need to do to become a daily build provider? On Thu, Jul 18, 2013 at 1:17 PM, Thorsten Behrens < t...@documentfoundation.org> wrote: > Alexander Thurgood wrote: > > Have the OSX daily builds stopped working, or are we out of resources ? > > > Hi Alex, > > we still have: > > > http://dev-builds.libreoffice.org/daily/libreoffice-4-0/MacOSX-Intel@27-OSX_10.7.0-gcc_4.2.1_llvm/ > > , I was moving, so had to switch off my box, hopefully back online in > a bit. Beyond that, probably worth asking one of the several Mac bot > admins if enabling daily build uploads would be ok with them. > > Cheers, > > -- Thorsten > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice > > -- Jonathan Aquilina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/android-remote-ng' - 5 commits - android/sdremote
android/sdremote/res/drawable-hdpi/ic_logo.png |binary android/sdremote/res/drawable-mdpi/ic_logo.png |binary android/sdremote/res/drawable-xhdpi/ic_logo.png |binary android/sdremote/res/layout/activity_computer_creation.xml | 12 android/sdremote/res/layout/activity_computers.xml |6 android/sdremote/res/values/dimens.xml |1 android/sdremote/res/values/strings.xml |2 android/sdremote/src/org/libreoffice/impressremote/activity/ComputerCreationActivity.java | 12 android/sdremote/src/org/libreoffice/impressremote/activity/ComputersActivity.java | 62 +++ android/sdremote/src/org/libreoffice/impressremote/adapter/ComputersPagerAdapter.java | 42 ++ android/sdremote/src/org/libreoffice/impressremote/fragment/ComputerConnectionFragment.java | 26 + android/sdremote/src/org/libreoffice/impressremote/fragment/ComputersFragment.java | 158 +- android/sdremote/src/org/libreoffice/impressremote/util/ActionBarTabListener.java | 46 -- android/sdremote/src/org/libreoffice/impressremote/util/Intents.java |5 dev/null |binary 15 files changed, 233 insertions(+), 139 deletions(-) New commits: commit 7f2bc03638f62a1bad4caaad888320c6b05b8eb4 Author: Artur Dryomov Date: Sun Jul 21 03:59:00 2013 +0300 Improve the ComputerConnectionFragment. Show reconnection action bar button only when it is necessary, i. e. when there is a connection error. Change-Id: Iecb86f7a1bf0b094f2fffbe12c03bea474774417 diff --git a/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputerConnectionFragment.java b/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputerConnectionFragment.java index ee9c75b..c70599e 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputerConnectionFragment.java +++ b/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputerConnectionFragment.java @@ -82,8 +82,7 @@ public class ComputerConnectionFragment extends SherlockFragment implements Serv } private void bindService() { -Intent aServiceIntent = new Intent(getActivity(), CommunicationService.class); - +Intent aServiceIntent = Intents.buildCommunicationServiceIntent(getActivity()); getActivity().bindService(aServiceIntent, this, Context.BIND_AUTO_CREATE); } @@ -140,18 +139,21 @@ public class ComputerConnectionFragment extends SherlockFragment implements Serv String aPin = aIntent.getStringExtra(Intents.Extras.PIN); mComputerConnectionFragment.setUpPinValidationInstructions(aPin); +mComputerConnectionFragment.refreshActionBarMenu(); return; } if (Intents.Actions.PAIRING_SUCCESSFUL.equals(aIntent.getAction())) { mComputerConnectionFragment.setUpPresentation(); +mComputerConnectionFragment.refreshActionBarMenu(); return; } if (Intents.Actions.CONNECTION_FAILED.equals(aIntent.getAction())) { mComputerConnectionFragment.setUpErrorMessage(); +mComputerConnectionFragment.refreshActionBarMenu(); } } } @@ -219,17 +221,37 @@ public class ComputerConnectionFragment extends SherlockFragment implements Serv aViewAnimator.setDisplayedChild(aViewAnimator.indexOfChild(aMessageLayout)); } +private void refreshActionBarMenu() { +getSherlockActivity().supportInvalidateOptionsMenu(); +} + @Override public void onCreateOptionsMenu(Menu aMenu, MenuInflater aMenuInflater) { +if (!shouldActionBarMenuBeDisplayed()) { +aMenu.clear(); +return; +} + aMenuInflater.inflate(R.menu.menu_action_bar_computer_connection, aMenu); } +private boolean shouldActionBarMenuBeDisplayed() { +if (getView() == null) { +return false; +} + +ViewAnimator aViewAnimator = (ViewAnimator) getView().findViewById(R.id.view_animator); + +return aViewAnimator.getCurrentView().getId() == R.id.layout_error_message; +} + @Override public boolean onOptionsItemSelected(MenuItem aMenuItem) { switch (aMenuItem.getItemId()) { case R.id.menu_reconnect: showProgressBar(); connectToComputer(); +refreshActionBarMenu(); return true; default: commit 9cf32ba887192394870ff28dcc3
[PUSHED] fdo#67093 Change traduction of Title in french to avoid conf...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4994 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4994 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia87132d3593097cc9d7b81a254c300de8b9fa3a5 Gerrit-PatchSet: 3 Gerrit-Project: translations Gerrit-Branch: master Gerrit-Owner: Arnaud Versini Gerrit-Reviewer: Fridrich Strba ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-1] fdo#67093 Change traduction of Title in french to avoid conf...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4995 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4995 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia87132d3593097cc9d7b81a254c300de8b9fa3a5 Gerrit-PatchSet: 3 Gerrit-Project: translations Gerrit-Branch: libreoffice-4-1 Gerrit-Owner: Arnaud Versini Gerrit-Reviewer: Fridrich Strba ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] translations.git: source/fr
source/fr/sw/source/ui/utlui.po |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d3cf882e3bc074447bbe708b914b1566d0e8b0d1 Author: Arnaud Versini Date: Sat Jul 20 15:16:51 2013 +0200 fdo#67093 Change traduction of Title in french to avoid conflict with Heading. Change-Id: Ia87132d3593097cc9d7b81a254c300de8b9fa3a5 Reviewed-on: https://gerrit.libreoffice.org/4994 Reviewed-by: Fridrich Strba Tested-by: Fridrich Strba diff --git a/source/fr/sw/source/ui/utlui.po b/source/fr/sw/source/ui/utlui.po index 07f591c..f697c52 100644 --- a/source/fr/sw/source/ui/utlui.po +++ b/source/fr/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ msgctxt "" "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "Titre" +msgstr "Titre principal" #: poolfmt.src msgctxt "" ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2d9e26dfa7a6e7599e9e484922c6793674d230a8 Author: Arnaud Versini Date: Sat Jul 20 15:16:51 2013 +0200 Updated core Project: translations d3cf882e3bc074447bbe708b914b1566d0e8b0d1 fdo#67093 Change traduction of Title in french to avoid conflict with Heading. Change-Id: Ia87132d3593097cc9d7b81a254c300de8b9fa3a5 Reviewed-on: https://gerrit.libreoffice.org/4994 Reviewed-by: Fridrich Strba Tested-by: Fridrich Strba diff --git a/translations b/translations index 05ab1fe..d3cf882 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 05ab1fefb5b317f213960a06fcab7dc1afdcb7e0 +Subproject commit d3cf882e3bc074447bbe708b914b1566d0e8b0d1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3926e686b06ca78f7ca5cf5fbda924bc92e5b92c Author: Arnaud Versini Date: Sat Jul 20 15:16:51 2013 +0200 Updated core Project: translations 0d21655cbcf22cd378725e2d23086ec51f746dd7 fdo#67093 Change traduction of Title in french to avoid conflict with Heading Change-Id: Ia87132d3593097cc9d7b81a254c300de8b9fa3a5 Reviewed-on: https://gerrit.libreoffice.org/4995 Reviewed-by: Fridrich Strba Tested-by: Fridrich Strba diff --git a/translations b/translations index 9ee1d9e..0d21655 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 9ee1d9e42eeb75b893617ff6b7de99ac44169bc3 +Subproject commit 0d21655cbcf22cd378725e2d23086ec51f746dd7 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Branch 'libreoffice-4-1' - source/fr
source/fr/sw/source/ui/utlui.po |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0d21655cbcf22cd378725e2d23086ec51f746dd7 Author: Arnaud Versini Date: Sat Jul 20 15:16:51 2013 +0200 fdo#67093 Change traduction of Title in french to avoid conflict with Heading Change-Id: Ia87132d3593097cc9d7b81a254c300de8b9fa3a5 Reviewed-on: https://gerrit.libreoffice.org/4995 Reviewed-by: Fridrich Strba Tested-by: Fridrich Strba diff --git a/source/fr/sw/source/ui/utlui.po b/source/fr/sw/source/ui/utlui.po index 07f591c..f697c52 100644 --- a/source/fr/sw/source/ui/utlui.po +++ b/source/fr/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ msgctxt "" "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "Titre" +msgstr "Titre principal" #: poolfmt.src msgctxt "" ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/win32 framework/source scp2/source vcl/inc vcl/Library_vcl.mk vcl/win
desktop/win32/source/applauncher/launcher.cxx | 39 - framework/source/helper/titlebarupdate.cxx| 32 ++- scp2/source/base/registryitem_base.scp|2 scp2/source/calc/registryitem_calc.scp|8 +- scp2/source/draw/registryitem_draw.scp|8 +- scp2/source/impress/registryitem_impress.scp |8 +- scp2/source/math/registryitem_math.scp|4 - scp2/source/writer/registryitem_writer.scp| 14 ++-- vcl/Library_vcl.mk|1 vcl/inc/win/salframe.h|7 +- vcl/win/source/window/salframe.cxx| 75 +- 11 files changed, 131 insertions(+), 67 deletions(-) New commits: commit 19f3d9310caef84fe2815eb89af448a81937bddd Author: Jesús Corrius Date: Sat Jul 20 17:10:43 2013 +0200 fdo#35785 LibreOffice's support of recent documents in Windows 7 broken Change-Id: I916ba1335b0a0420f568ab9340632f273e3c9516 Reviewed-on: https://gerrit.libreoffice.org/4997 Reviewed-by: Fridrich Strba Tested-by: Fridrich Strba diff --git a/desktop/win32/source/applauncher/launcher.cxx b/desktop/win32/source/applauncher/launcher.cxx index c6a40d3..b0f031a 100644 --- a/desktop/win32/source/applauncher/launcher.cxx +++ b/desktop/win32/source/applauncher/launcher.cxx @@ -34,51 +34,12 @@ #include #include -#define PACKVERSION(major,minor) MAKELONG(minor,major) -#define APPUSERMODELID L"TheDocumentFoundation.LibreOffice" - - #ifdef __MINGW32__ extern "C" int APIENTRY WinMain( HINSTANCE, HINSTANCE, LPSTR, int ) #else extern "C" int APIENTRY _tWinMain( HINSTANCE, HINSTANCE, LPTSTR, int ) #endif { -// Set an explicit Application User Model ID for the process - -WCHAR szShell32[MAX_PATH]; -GetSystemDirectoryW(szShell32, MAX_PATH); -wcscat(szShell32, L"\\Shell32.dll"); - -HINSTANCE hinstDll = LoadLibraryW(szShell32); - -if(hinstDll) -{ -DLLVERSIONINFO dvi; -ZeroMemory(&dvi, sizeof(dvi)); -dvi.cbSize = sizeof(dvi); - -DLLGETVERSIONPROC pDllGetVersion; -pDllGetVersion = (DLLGETVERSIONPROC)GetProcAddress(hinstDll, "DllGetVersion"); -HRESULT hr = (*pDllGetVersion)(&dvi); - -if(SUCCEEDED(hr)) -{ -DWORD dwVersion = PACKVERSION(dvi.dwMajorVersion, dvi.dwMinorVersion); -if(dwVersion >= PACKVERSION(6,1)) // Shell32 version in Windows 7 -{ -typedef HRESULT (WINAPI *SETCURRENTPROCESSEXPLICITAPPUSERMODELID)(PCWSTR); -SETCURRENTPROCESSEXPLICITAPPUSERMODELID pSetCurrentProcessExplicitAppUserModelID; -pSetCurrentProcessExplicitAppUserModelID = - (SETCURRENTPROCESSEXPLICITAPPUSERMODELID)GetProcAddress(hinstDll, "SetCurrentProcessExplicitAppUserModelID"); - -if(pSetCurrentProcessExplicitAppUserModelID) -(*pSetCurrentProcessExplicitAppUserModelID) (APPUSERMODELID); -} -} -} -FreeLibrary(hinstDll); - // Retreive startup info STARTUPINFO aStartupInfo; diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx index 6833933..f5506a1 100644 --- a/framework/source/helper/titlebarupdate.cxx +++ b/framework/source/helper/titlebarupdate.cxx @@ -172,7 +172,7 @@ void TitleBarUpdate::impl_updateApplicationID(const css::uno::Reference< css::fr OUString aModuleId = xModuleManager->identify(xFrame); OUString sDesktopName; - +#if defined(UNX) && !defined(MACOSX) if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.TextDocument")) || aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.GlobalDocument")) || aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.WebDocument")) || @@ -198,6 +198,34 @@ void TitleBarUpdate::impl_updateApplicationID(const css::uno::Reference< css::fr sApplicationID = utl::ConfigManager::getProductName().toAsciiLowerCase(); sApplicationID += OUString(sal_Unicode('-')); sApplicationID += sDesktopName; +#elif defined(WNT) +if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.TextDocument")) || + aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.GlobalDocument")) || + aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.WebDocument")) || + aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.xforms.XMLFormDocument")) ) +sDesktopName = OUString("Writer"); +else if ( aModuleId == "com.sun.star.sheet.SpreadsheetDocument" ) +sDesktopName = OUString("Calc"); +else if ( aModuleId == "com.sun.star.presentation.PresentationDocument" ) +sDesktopName = OUString("Impress"); +else if ( aModuleId == "com.sun.star.drawing.DrawingDocume
[Libreoffice-commits] core.git: Branch 'feature/cmis' - ucb/source
ucb/source/ucp/cmis/cmis_content.cxx | 29 + 1 file changed, 29 insertions(+) New commits: commit a5846f3fe77912cba30abbc3aaaba634b04d5f8a Author: Cao Cuong Ngo Date: Fri Jul 19 13:57:49 2013 +0200 Resolves CMIS file picker propertyset out of range warning Add missing properties Change-Id: Id3475fe4d07b33c4c0b31f54075dc011122b15bd diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx index 812bb1a..43f3554 100644 --- a/ucb/source/ucp/cmis/cmis_content.cxx +++ b/ucb/source/ucp/cmis/cmis_content.cxx @@ -670,6 +670,35 @@ namespace cmis xRow->appendVoid( rProp ); } } +else if ( rProp.Name == "IsVolume" ) +{ +xRow->appendBoolean( rProp, sal_False ); +} +else if ( rProp.Name == "IsRemote" ) +{ +xRow->appendBoolean( rProp, sal_False ); +} +else if ( rProp.Name == "IsRemoveable" ) +{ +xRow->appendBoolean( rProp, sal_False ); +} +else if ( rProp.Name == "IsFloppy" ) +{ +xRow->appendBoolean( rProp, sal_False ); +} +else if ( rProp.Name == "IsCompactDisc" ) +{ +xRow->appendBoolean( rProp, sal_False ); +} +else if ( rProp.Name == "IsHidden" ) +{ +xRow->appendBoolean( rProp, sal_False ); +} +else if ( rProp.Name == "TargetURL" ) +{ +xRow->appendString( rProp, "" ); +} + else if ( rProp.Name == "CmisProperties" ) { try ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libvisio.git: src/lib
src/lib/VSDXTheme.cpp | 18 ++- src/lib/tokens.txt| 78 ++ 2 files changed, 94 insertions(+), 2 deletions(-) New commits: commit 35be22a86d0cf1c2384cd1730350e0934cba0897 Author: Fridrich Å trba Date: Sat Jul 20 21:05:56 2013 +0200 Add tokens related to theme diff --git a/src/lib/VSDXTheme.cpp b/src/lib/VSDXTheme.cpp index 616737c..9110173 100644 --- a/src/lib/VSDXTheme.cpp +++ b/src/lib/VSDXTheme.cpp @@ -27,6 +27,8 @@ * instead of those above. */ +#include "VSDXMLHelper.h" +#include "VSDXMLTokenMap.h" #include "VSDXTheme.h" libvisio::VSDXTheme::VSDXTheme() @@ -42,15 +44,27 @@ bool libvisio::VSDXTheme::parse(WPXInputStream *input) if (!input) return false; + xmlTextReaderPtr reader = xmlReaderForStream(input, 0, 0, XML_PARSE_NOBLANKS|XML_PARSE_NOENT|XML_PARSE_NONET); + if (!reader) +return false; + try { -return true; +int ret = xmlTextReaderRead(reader); +while (1 == ret) +{ + /*int tokenId = VSDXMLTokenMap::getTokenId(xmlTextReaderConstName(reader)); +int tokenType = xmlTextReaderNodeType(reader); */ + ret = xmlTextReaderRead(reader); +} } catch (...) { +xmlFreeTextReader(reader); return false; } - return false; + xmlFreeTextReader(reader); + return true; } diff --git a/src/lib/tokens.txt b/src/lib/tokens.txt index 88bdc2c..ead1950 100644 --- a/src/lib/tokens.txt +++ b/src/lib/tokens.txt @@ -1,6 +1,54 @@ A +a:accent1 +a:accent2 +a:accent3 +a:accent4 +a:accent5 +a:accent6 +a:alpha +a:bgFillStyleLst +a:clrScheme +a:cs +a:dk1 +a:dk2 +a:ea +a:effectLst +a:effectStyle +a:effectStyleLst +a:ext +a:extLst +a:extraClrSchemeLst +a:fillStyleLst +a:fmtScheme +a:folHlink +a:font +a:fontScheme +a:gradFill +a:gs +a:gsLst +a:hlink +a:latin +a:lin +a:ln +a:lnStyleLst +a:lt1 +a:lt2 +a:lumMod +a:majorFont +a:minorFont Angle +a:objectDefaults +a:outerShdw +a:prstDash ArcTo +a:satMod +a:schemeClr +a:shade +a:solidFill +a:srgbClr +a:theme +a:themeElements +a:tint B BeginArrow BottomMargin @@ -128,6 +176,36 @@ TxtPinX TxtPinY TxtWidth VerticalAlign +vt:bkgnd +vt:color +vt:connectorFontStyles +vt:fillProps +vt:fillStyles +vt:fmtConnectorScheme +vt:fmtConnectorSchemeEx +vt:fmtConnectorSchemeLineStyles +vt:fmtSchemeEx +vt:fmtSchemeLineStyles +vt:fontProps +vt:fontStyles +vt:fontStylesGroup +vt:lineEx +vt:lineStyle +vt:lineStyles +vt:schemeID +vt:themeScheme +vt:varColor1 +vt:varColor2 +vt:varColor3 +vt:varColor4 +vt:varColor5 +vt:varColor6 +vt:varColor7 +vt:variationClrScheme +vt:variationClrSchemeLst +vt:variationStyleScheme +vt:variationStyleSchemeLst +vt:varStyle Width X XForm ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 sfx2/source unusedcode.easy
include/sfx2/sidebar/ControlFactory.hxx | 29 - sfx2/source/sidebar/ControlFactory.cxx | 43 unusedcode.easy |4 -- 3 files changed, 1 insertion(+), 75 deletions(-) New commits: commit 822577f412214f282588b627fd6addb489f6a9f0 Author: Caolán McNamara Date: Sat Jul 20 18:56:01 2013 +0100 callcatcher: update unused code Change-Id: Id12614722ed106ca595df13d22b6c5e315deb2ac diff --git a/include/sfx2/sidebar/ControlFactory.hxx b/include/sfx2/sidebar/ControlFactory.hxx index 2e68730..be66aecb3 100644 --- a/include/sfx2/sidebar/ControlFactory.hxx +++ b/include/sfx2/sidebar/ControlFactory.hxx @@ -43,35 +43,6 @@ public: static ImageRadioButton* CreateTabItem (Window* pParentWindow); -/** Create a tool box that does *not* handle its items. The -caller has to register callbacks to process, among others, -click and selection events. -*/ -static SidebarToolBox* CreateToolBox ( -Window* pParentWindow, -const ResId& rResId); - -/** Create a tool box that *does* handle its items. All event -processing is done by toolbox controllers. -*/ -static SidebarToolBox* CreateToolBox ( -Window* pParentWindow, -const ResId& rResId, -const ::com::sun::star::uno::Reference& rxFrame); - -/** Create a window that acts as background of a tool box. -In general it is slightly larger than the tool box. -@param pParentWindow -The parent window of the new background control. -@param bShowBorder -When then the background control is made slightly -larger then its tool box child, once that is created. -Otherwise the background control will not be visible. -*/ -static Window* CreateToolBoxBackground ( -Window* pParentWindow, -const bool bShowBorder = true); - static ImageRadioButton* CreateCustomImageRadionButton( Window* pParentWindow, const ResId& rResId ); diff --git a/sfx2/source/sidebar/ControlFactory.cxx b/sfx2/source/sidebar/ControlFactory.cxx index 4825ca7..1b79267 100644 --- a/sfx2/source/sidebar/ControlFactory.cxx +++ b/sfx2/source/sidebar/ControlFactory.cxx @@ -45,49 +45,6 @@ ImageRadioButton* ControlFactory::CreateTabItem (Window* pParentWindow) -SidebarToolBox* ControlFactory::CreateToolBox ( -Window* pParentWindow, -const ResId& rResId) -{ -SidebarToolBox* pToolBox = new SidebarToolBox(pParentWindow, rResId, NULL); -pToolBox->SetBorderWindow(pParentWindow); - -pToolBox->Invalidate(); - -return pToolBox; -} - - - - -SidebarToolBox* ControlFactory::CreateToolBox ( -Window* pParentWindow, -const ResId& rResId, -const cssu::Reference& rxFrame) -{ -SidebarToolBox* pToolBox = new SidebarToolBox(pParentWindow, rResId, rxFrame); -pToolBox->SetBorderWindow(pParentWindow); - -pToolBox->Invalidate(); - -return pToolBox; -} - - - - -Window* ControlFactory::CreateToolBoxBackground ( -Window* pParentWindow, -const bool bShowBorder) -{ -ToolBoxBackground* pBorderWindow = new ToolBoxBackground(pParentWindow, bShowBorder); -pBorderWindow->Show(); -return pBorderWindow; -} - - - - ImageRadioButton* ControlFactory::CreateCustomImageRadionButton( Window* pParentWindow, const ResId& rResId ) diff --git a/unusedcode.easy b/unusedcode.easy index 9dfa7a3..6f80115 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -49,7 +49,7 @@ ScDocument::GetFormulaTokens(ScAddress const&) const ScDocument::GetStringCell(ScAddress const&) const ScDocument::IsEmptyData(short, short) const ScExtIButton::GetSelected() const -ScFilterDlg::LinkStubMoreClickHdl(void*, void*) +ScFormulaCell::GetResultDouble() const ScFormulaCell::HasColRowName() const ScFormulaCell::IsSharedInvariant() const ScFormulaCell::SetResultToken(formula::FormulaToken const*) @@ -179,8 +179,6 @@ sdr::table::SdrTableObj::getRowCount() const sfx2::sidebar::AsynchronousCall::RequestCall(boost::function const&) sfx2::sidebar::Context::EvaluateMatch(std::__debug::vector > const&) const sfx2::sidebar::ContextList::IsEmpty() -sfx2::sidebar::ControlFactory::CreateToolBox(Window*, ResId const&) -sfx2::sidebar::ControlFactory::CreateToolBox(Window*, ResId const&, com::sun::star::uno::Reference const&) sfx2::sidebar::ControlFactory::CreateToolBoxBackground(Window*, bool) sfx2::sidebar::Deck::GetIconURL(bool) const sfx2::sidebar::Deck::PrintWindowTree(std::__debug::vector > const&) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - 2 commits - sc/qa sc/source
sc/qa/unit/ucalc.hxx|2 sc/qa/unit/ucalc_formula.cxx| 95 sc/source/core/data/formulacell.cxx | 19 ++- sc/source/core/tool/interpr1.cxx| 14 ++--- 4 files changed, 111 insertions(+), 19 deletions(-) New commits: commit 7b5c33c33886b2a4f5487d2716b5ae536946d5db Author: Kohei Yoshida Date: Sat Jul 20 13:32:07 2013 -0400 More on removing CalcAbsIfRel(). Almost there... Change-Id: Ife87377a8f157750c61fc81baa81a3cb4734419b diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index 4defffd..773c474 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -3318,24 +3318,24 @@ public: case svDoubleRef: { ScComplexRefData aRef = pToken->GetDoubleRef(); -aRef.CalcAbsIfRel(mrCell.aPos); +ScRange aAbs = aRef.toAbs(mrCell.aPos); // Row reference is relative. bool bAbsFirst = !aRef.Ref1.IsRowRel(); bool bAbsLast = !aRef.Ref2.IsRowRel(); -ScAddress aRefPos(aRef.Ref1.nCol, aRef.Ref1.nRow, aRef.Ref1.nTab); -size_t nCols = aRef.Ref2.nCol - aRef.Ref1.nCol + 1; +ScAddress aRefPos = aAbs.aStart; +size_t nCols = aAbs.aEnd.Col() - aAbs.aStart.Col() + 1; std::vector aArrays; aArrays.reserve(nCols); SCROW nArrayLength = mrCell.GetCellGroup()->mnLength; -SCROW nRefRowSize = aRef.Ref2.nRow - aRef.Ref1.nRow + 1; +SCROW nRefRowSize = aAbs.aEnd.Row() - aAbs.aStart.Row() + 1; if (!bAbsLast) { // range end position is relative. Extend the array length. nArrayLength += nRefRowSize - 1; } -for (SCCOL i = aRef.Ref1.nCol; i <= aRef.Ref2.nCol; ++i) +for (SCCOL i = aAbs.aStart.Col(); i <= aAbs.aEnd.Col(); ++i) { aRefPos.SetCol(i); const double* pArray = mrDoc.FetchDoubleArray(mrCxt, aRefPos, nArrayLength); @@ -3456,8 +3456,7 @@ bool ScFormulaCell::InterpretInvariantFormulaGroup() case svSingleRef: { ScSingleRefData aRef = pToken->GetSingleRef(); -aRef.CalcAbsIfRel(aPos); // column may be relative. -ScAddress aRefPos(aRef.nCol, aRef.nRow, aRef.nTab); +ScAddress aRefPos = aRef.toAbs(aPos); formula::FormulaTokenRef pNewToken = pDocument->ResolveStaticReference(aRefPos); if (!pNewToken) return false; @@ -3468,11 +3467,7 @@ bool ScFormulaCell::InterpretInvariantFormulaGroup() case svDoubleRef: { ScComplexRefData aRef = pToken->GetDoubleRef(); -aRef.CalcAbsIfRel(aPos); // column may be relative. -ScRange aRefRange( -aRef.Ref1.nCol, aRef.Ref1.nRow, aRef.Ref1.nTab, -aRef.Ref2.nCol, aRef.Ref2.nRow, aRef.Ref2.nTab); - +ScRange aRefRange = aRef.toAbs(aPos); formula::FormulaTokenRef pNewToken = pDocument->ResolveStaticReference(aRefRange); if (!pNewToken) return false; diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index 209c5ac..8fabd38 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -7615,13 +7615,13 @@ void ScInterpreter::ScOffset() String aTabName; ScComplexRefData aRef; PopExternalDoubleRef(nFileId, aTabName, aRef); -aRef.CalcAbsIfRel(aPos); -nCol1 = aRef.Ref1.nCol; -nRow1 = aRef.Ref1.nRow; -nTab1 = aRef.Ref1.nTab; -nCol2 = aRef.Ref2.nCol; -nRow2 = aRef.Ref2.nRow; -nTab2 = aRef.Ref2.nTab; +ScRange aAbs = aRef.toAbs(aPos); +nCol1 = aAbs.aStart.Col(); +nRow1 = aAbs.aStart.Row(); +nTab1 = aAbs.aStart.Tab(); +nCol2 = aAbs.aEnd.Col(); +nRow2 = aAbs.aEnd.Row(); +nTab2 = aAbs.aEnd.Tab(); if (nColNew < 0) nColNew = nCol2 - nCol1 + 1; if (nRowNew < 0) commit b4009f7397a89ef51fc7763b017fd995953e2465 Author: Kohei Yoshida Date: Sat Jul 20 12:55:50 2013 -0400 Add test for updating reference on sheet change. Change-Id: I5ef6d9ed0fb45ea674d14cca98d3be2f4bfe4345 diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx index 09e3891..478c5bc 100644 --- a/sc/qa/unit/ucalc.hxx +++ b/sc/qa/unit/u
[Libreoffice-commits] buildbot.git: 11 commits - tb3/build-scripts tb3/Makefile tb3/replay-branch tb3/tb3-local-client tb3/tests
tb3/Makefile |7 -- tb3/build-scripts/dev-bibisect-build | 72 +++ tb3/replay-branch| 14 ++--- tb3/tb3-local-client | 93 +++ tb3/tests/build-script.sh| 11 tb3/tests/tb3-local-client.py| 67 + 6 files changed, 252 insertions(+), 12 deletions(-) New commits: commit 9d3441d50c1b9b10a2508c60ada127b6e53ea0cf Author: Bjoern Michaelsen Date: Sat Jul 20 19:00:43 2013 +0200 disable dependency-tracking -- this does full builds anyway diff --git a/tb3/build-scripts/dev-bibisect-build b/tb3/build-scripts/dev-bibisect-build index 3f01c8e..8e7326f 100755 --- a/tb3/build-scripts/dev-bibisect-build +++ b/tb3/build-scripts/dev-bibisect-build @@ -44,7 +44,7 @@ echo echo " Configuring build " echo "configuring commit $COMMIT from repo $REPO in workdir $BUILDER_HOME on platform $PLATFORM as builder $BUILDER with script $0." > $BUILDER_HOME/artifactdir/autogen.log -(cd $BUILDER_HOME/builddir && ./autogen.sh --with-external-tar=$BUILDER_HOME/tarballs --disable-linkoo --disable-option-checking) 2>&1 | tee --append $BUILDER_HOME/artifactdir/autogen.log +(cd $BUILDER_HOME/builddir && ./autogen.sh --with-external-tar=$BUILDER_HOME/tarballs --disable-linkoo --disable-option-checking --disable-dependency-tracking) 2>&1 | tee --append $BUILDER_HOME/artifactdir/autogen.log echo echo commit a1983dfefe3b0de5c649601481b5e8b0e153edbb Author: Bjoern Michaelsen Date: Sat Jul 20 18:48:35 2013 +0200 clear binrepo before repopulating diff --git a/tb3/build-scripts/dev-bibisect-build b/tb3/build-scripts/dev-bibisect-build index 69ef534..3f01c8e 100755 --- a/tb3/build-scripts/dev-bibisect-build +++ b/tb3/build-scripts/dev-bibisect-build @@ -27,6 +27,7 @@ export BINREPO_BRANCH=builder-$BUILDER export BINREPO_TAG=source-hash-$COMMIT (cd $BINREPO && git branch $BINREPO_BRANCH initial) || true git clone $BINREPO $BUILDER_HOME/artifactdir --branch $BINREPO_BRANCH +(cd $BUILDER_HOME/artifactdir && git rm -r `git ls-tree --name-only HEAD`) git --git-dir=$REPO log -1 --pretty=format:"source-hash-%H%n%n" $COMMIT > $BUILDER_HOME/commitmsg git --git-dir=$REPO log -1 --pretty=fuller $COMMIT >> $BUILDER_HOME/commitmsg ccache -M$CCACHE_SIZE commit 11b07643516d1ed8566531b89aa018a08a62f6e3 Author: Bjoern Michaelsen Date: Sat Jul 20 18:44:45 2013 +0200 failing to tag shouldnt abort the build diff --git a/tb3/build-scripts/dev-bibisect-build b/tb3/build-scripts/dev-bibisect-build index ecb2330..69ef534 100755 --- a/tb3/build-scripts/dev-bibisect-build +++ b/tb3/build-scripts/dev-bibisect-build @@ -62,7 +62,7 @@ echo " Storing bibisect " echo archiving installation at $DEVINSTALLDIR ... git --git-dir=$BUILDER_HOME/artifactdir/.git --work-tree=$DEVINSTALLDIR add -A git --git-dir=$BUILDER_HOME/artifactdir/.git --work-tree=$DEVINSTALLDIR commit -F $BUILDER_HOME/commitmsg -git --git-dir=$BUILDER_HOME/artifactdir/.git tag $BINREPO_TAG +git --git-dir=$BUILDER_HOME/artifactdir/.git tag $BINREPO_TAG || true git --git-dir=$BUILDER_HOME/artifactdir/.git push origin $BINREPO_TAG:$BINREPO_TAG $BINREPO_BRANCH:$BINREPO_BRANCH echo done. echo commit feb42e8d99017f7d15e64467407402b00021a679 Author: Bjoern Michaelsen Date: Sat Jul 20 16:34:34 2013 +0200 tweak parms order diff --git a/tb3/build-scripts/dev-bibisect-build b/tb3/build-scripts/dev-bibisect-build index 21ce9b4..ecb2330 100755 --- a/tb3/build-scripts/dev-bibisect-build +++ b/tb3/build-scripts/dev-bibisect-build @@ -12,41 +12,45 @@ CCACHE_SIZE=10G echo " Setting up environment " -echo "building commit $1 from repo $3 in workdir $2 on platform $4 as builder $5 with script $0." set -e -export BUILDER_HOME=`readlink -f $2` +COMMIT=$1 +REPO=$2 +PLATFORM=$3 +BUILDER=$4 +export BUILDER_HOME=`readlink -f $5` +echo "building commit $COMMIT from repo $REPO in workdir $BUILDER_HOME on platform $PLATFORM as builder $BUILDER with script $0." cd $BUILDER_HOME rm -rf builddir artifactdir mkdir -p builddir tarballs ccache export CCACHE_DIR=$BUILDER_HOME/ccache -export BINREPO_BRANCH=builder-$5 -export BINREPO_TAG=source-hash-$1 +export BINREPO_BRANCH=builder-$BUILDER +export BINREPO_TAG=source-hash-$COMMIT (cd $BINREPO && git branch $BINREPO_BRANCH initial) || true git clone $BINREPO $BUILDER_HOME/artifactdir --branch $BINREPO_BRANCH -git --git-dir=$3 log -1 --pretty=format:"source-hash-%H%n%n" $1 > $BUILDER_HOME/commitmsg -git --git-dir=$3 log -1 --pretty=fuller $1 >> $BUILDER_HOME/commitmsg +git --git-dir=$REPO log -1 --pretty=format:"source-hash-%H%n%n" $COMMIT > $BUILDER_HOME/commitmsg +git --git-dir=$REPO log -1 --pretty=fuller $COMMIT >> $BUILDER_HOME/commitmsg ccache -M$CCACHE_SIZE echo echo echo " Unpacking source " echo Unpacking source ... -(cd $3 && git archive --format tar $1)| tar --extract --directory $BUILDER_HOME/bu
[RESTORED] Downgraded the Dutch spellchecker to version 2.00 ( fdo#6303...
Thomas van der meulen has restored this change. Change subject: Downgraded the Dutch spellchecker to version 2.00 ( fdo#63033 fdo#65994 ) .. Patch Set 3: Restored Just needs to downgrade because it won't work under Windows 8 -- To view, visit https://gerrit.libreoffice.org/4987 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: restore Gerrit-Change-Id: I2e21a40f03b44a336355500bb617865ca2704125 Gerrit-PatchSet: 3 Gerrit-Project: dictionaries Gerrit-Branch: master Gerrit-Owner: Thomas van der meulen ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-1-0] Change traduction of Title in french to avoid conflict with ...
Hi, I would like you to review the following patch: https://gerrit.libreoffice.org/4996 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/translations refs/changes/96/4996/1 Change traduction of Title in french to avoid conflict with Heading Change-Id: Ia87132d3593097cc9d7b81a254c300de8b9fa3a5 --- M source/fr/sw/source/ui/utlui.po 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/fr/sw/source/ui/utlui.po b/source/fr/sw/source/ui/utlui.po index 07f591c..f697c52 100644 --- a/source/fr/sw/source/ui/utlui.po +++ b/source/fr/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "Titre" +msgstr "Titre principal" #: poolfmt.src msgctxt "" -- To view, visit https://gerrit.libreoffice.org/4996 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia87132d3593097cc9d7b81a254c300de8b9fa3a5 Gerrit-PatchSet: 1 Gerrit-Project: translations Gerrit-Branch: libreoffice-4-1-0 Gerrit-Owner: Arnaud Versini ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-1] Change traduction of Title in french to avoid conflict with ...
Hi, I would like you to review the following patch: https://gerrit.libreoffice.org/4995 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/translations refs/changes/95/4995/1 Change traduction of Title in french to avoid conflict with Heading Change-Id: Ia87132d3593097cc9d7b81a254c300de8b9fa3a5 --- M source/fr/sw/source/ui/utlui.po 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/fr/sw/source/ui/utlui.po b/source/fr/sw/source/ui/utlui.po index 07f591c..f697c52 100644 --- a/source/fr/sw/source/ui/utlui.po +++ b/source/fr/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "Titre" +msgstr "Titre principal" #: poolfmt.src msgctxt "" -- To view, visit https://gerrit.libreoffice.org/4995 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia87132d3593097cc9d7b81a254c300de8b9fa3a5 Gerrit-PatchSet: 1 Gerrit-Project: translations Gerrit-Branch: libreoffice-4-1 Gerrit-Owner: Arnaud Versini ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: ios/iosremote
ios/iosremote/iosremote.xcodeproj/project.pbxproj |8 --- ios/iosremote/iosremote/Communication/Client.h|2 - ios/iosremote/iosremote/serverList_vc.m | 23 ++ 3 files changed, 17 insertions(+), 16 deletions(-) New commits: commit 5e723eb8477264d0ea6a2d0f467bce67e2423fde Author: Siqi LIU Date: Sat Jul 20 15:42:51 2013 +0200 differ the resolution of service address Change-Id: I68e620939f27708cc483c584bf7aa389f6ec1199 diff --git a/ios/iosremote/iosremote.xcodeproj/project.pbxproj b/ios/iosremote/iosremote.xcodeproj/project.pbxproj index bba51b0..63d5412 100644 --- a/ios/iosremote/iosremote.xcodeproj/project.pbxproj +++ b/ios/iosremote/iosremote.xcodeproj/project.pbxproj @@ -491,6 +491,7 @@ CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -506,6 +507,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 6.1; ONLY_ACTIVE_ARCH = YES; + PROVISIONING_PROFILE = ""; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -523,8 +525,8 @@ CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "iPhone Distribution"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; + CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Siqi Liu (SS3MXKAL2F)"; COPY_PHASE_STRIP = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -533,7 +535,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 6.1; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; PROVISIONING_PROFILE = ""; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; + "PROVISIONING_PROFILE[sdk=iphoneos*]" = "141469F2-2E5D-43DA-9152-98C3F3CFEF69"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; diff --git a/ios/iosremote/iosremote/Communication/Client.h b/ios/iosremote/iosremote/Communication/Client.h index 50f1d40..12a3641 100644 --- a/ios/iosremote/iosremote/Communication/Client.h +++ b/ios/iosremote/iosremote/Communication/Client.h @@ -17,7 +17,7 @@ @property BOOL connected; @property (nonatomic, strong) NSNumber* pin; @property (nonatomic, strong) NSString* name; -@property (nonatomic, weak) Server* server; +@property (nonatomic, strong) Server* server; - (void) connect; - (void) disconnect; diff --git a/ios/iosremote/iosremote/serverList_vc.m b/ios/iosremote/iosremote/serverList_vc.m index 78f5d3b..5c158e8 100644 --- a/ios/iosremote/iosremote/serverList_vc.m +++ b/ios/iosremote/iosremote/serverList_vc.m @@ -46,15 +46,19 @@ int port = socketAddress->sin_port; NSLog(@"Resolved at %@:%u", ipString, port); -[self.comManager.autoDiscoveryServers replaceObjectAtIndex:[self.comManager.autoDiscoveryServers count]-1 - withObject:[[Server alloc] initWithProtocol:NETWORK atAddress:ipString ofName:sender.name]]; -[self.tableView reloadData]; +[self.comManager connectToServer:[[Server alloc] initWithProtocol:NETWORK atAddress:ipString ofName:sender.name]]; } } -(void) netService:(NSNetService *)sender didNotResolve:(NSDictionary *)errorDict { NSLog(@"Failed to resolve"); +UIAlertView *message = [[UIAlertView alloc] initWithTitle:@"Failed to reach the computer" + message:@"Please restart your application or wait the application to refresh. " + delegate:self +cancelButtonTitle:@"OK" +otherButtonTitles:nil]; +[message show]; } #pragma mark - bonjour service discovery @@ -89,7 +93,6 @@ NSLog(@"Got service %p
[PATCH] Change traduction of Title in french to avoid conflict with ...
Hi, I would like you to review the following patch: https://gerrit.libreoffice.org/4994 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/translations refs/changes/94/4994/1 Change traduction of Title in french to avoid conflict with Heading Change-Id: Ia87132d3593097cc9d7b81a254c300de8b9fa3a5 --- M source/fr/sw/source/ui/utlui.po 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/fr/sw/source/ui/utlui.po b/source/fr/sw/source/ui/utlui.po index 07f591c..f697c52 100644 --- a/source/fr/sw/source/ui/utlui.po +++ b/source/fr/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "Titre" +msgstr "Titre principal" #: poolfmt.src msgctxt "" -- To view, visit https://gerrit.libreoffice.org/4994 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia87132d3593097cc9d7b81a254c300de8b9fa3a5 Gerrit-PatchSet: 1 Gerrit-Project: translations Gerrit-Branch: master Gerrit-Owner: Arnaud Versini ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Improve Gerrit Daily Digest
Hi, I send this patch to the list, don't know how to submit that to gerrit (since it's not the core project, but dev-tools). Thanks Samuel >From db232dcfc2baec8bd176e93f115c0493f4157f0d Mon Sep 17 00:00:00 2001 From: Samuel Mehrbrodt Date: Sat, 20 Jul 2013 14:37:39 +0200 Subject: [PATCH] Improve Gerrit Daily Digest Mail Put the URL at the end of the line to give focus to the commit message. Now it looks like this: + This is the commit message (Author, https://gerrit.libreoffice.org/1234) --- gerritbot/send-daily-digest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gerritbot/send-daily-digest b/gerritbot/send-daily-digest index 5f8d937..87899b4 100755 --- a/gerritbot/send-daily-digest +++ b/gerritbot/send-daily-digest @@ -27,7 +27,7 @@ def get_digest(gerrit, query): for line in sh.ssh(gerrit, 'gerrit query --format=JSON -- \'%s\'' % query).strip().split('\n'): change = json.loads(line) if 'url' in change.keys(): -digest += '+ %s\n in %s from %s\n' % (change['subject'][:73], change['url'], change['owner']['name']) +digest += '+ %s (%s, %s)\n' % (change['subject'][:73], change['owner']['name'], change['url']) if digest == '': digest = 'None' return digest -- 1.8.1.2 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] libvisio.git: build/win32 src/lib
build/win32/libvisio.dsp |8 build/win32/libvisio.vcproj | 25 + build/win32/libvisio.vcxproj |7 +++ src/lib/makefile.mk |1 + 4 files changed, 41 insertions(+) New commits: commit 0aa5d64dadf5342a54a9443091c32bac863f4e2a Author: Fridrich Å trba Date: Sat Jul 20 14:26:47 2013 +0200 Update alternative build systems diff --git a/build/win32/libvisio.dsp b/build/win32/libvisio.dsp index b7d3330..a111ca8 100644 --- a/build/win32/libvisio.dsp +++ b/build/win32/libvisio.dsp @@ -183,6 +183,10 @@ SOURCE=..\..\src\lib\VSDXParser.cpp # End Source File # Begin Source File +SOURCE=..\..\src\lib\VSDXTheme.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\lib\VSDZipStream.cpp # End Source File # End Group @@ -315,6 +319,10 @@ SOURCE=..\..\src\lib\VSDXParser.h # End Source File # Begin Source File +SOURCE=..\..\src\lib\VSDXTheme.h +# End Source File +# Begin Source File + SOURCE=..\..\src\lib\VSDZipStream.h # End Source File # End Group diff --git a/build/win32/libvisio.vcproj b/build/win32/libvisio.vcproj index f2d6b01..dd703f3 100644 --- a/build/win32/libvisio.vcproj +++ b/build/win32/libvisio.vcproj @@ -701,6 +701,28 @@ + + + + + + + + + diff --git a/build/win32/libvisio.vcxproj b/build/win32/libvisio.vcxproj index 665e890..d7b09a8 100644 --- a/build/win32/libvisio.vcxproj +++ b/build/win32/libvisio.vcxproj @@ -246,6 +246,12 @@ %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -284,6 +290,7 @@ + diff --git a/src/lib/makefile.mk b/src/lib/makefile.mk index 0e361b9..a46dab9 100644 --- a/src/lib/makefile.mk +++ b/src/lib/makefile.mk @@ -63,6 +63,7 @@ SLOFILES= \ $(SLO)$/VSDXMLParserBase.obj \ $(SLO)$/VSDXMLTokenMap.obj \ $(SLO)$/VSDXParser.obj \ + $(SLO)$/VSDXTheme.obj \ $(SLO)$/VSDZipStream.obj LIB1ARCHIV=$(LB)$/libvisiolib.a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libvisio.git: src/lib
src/lib/Makefile.am|2 + src/lib/VSDXParser.cpp | 15 ++-- src/lib/VSDXParser.h |2 + src/lib/VSDXTheme.cpp | 57 + src/lib/VSDXTheme.h| 55 +++ 5 files changed, 123 insertions(+), 8 deletions(-) New commits: commit 232fedbe3421dc256a77ac49519cce9322479ce3 Author: Fridrich Å trba Date: Sat Jul 20 14:22:39 2013 +0200 Stub the theme class to keep theme information diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 869beec..c5b5d45 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -75,6 +75,8 @@ libtokenmap_la_SOURCES = \ VSDXMLTokenMap.h \ VSDXParser.cpp \ VSDXParser.h \ + VSDXTheme.cpp \ + VSDXTheme.h \ $(generated_files) diff --git a/src/lib/VSDXParser.cpp b/src/lib/VSDXParser.cpp index b1dee7d..730a353 100644 --- a/src/lib/VSDXParser.cpp +++ b/src/lib/VSDXParser.cpp @@ -67,7 +67,12 @@ std::string getRelationshipsForTarget(const char *target) libvisio::VSDXParser::VSDXParser(WPXInputStream *input, libwpg::WPGPaintInterface *painter) - : VSDXMLParserBase(), m_input(input), m_painter(painter), m_currentDepth(0), m_rels(0) + : VSDXMLParserBase(), +m_input(input), +m_painter(painter), +m_currentDepth(0), +m_rels(0), +m_currentTheme() { input->seek(0, WPX_SEEK_CUR); m_input = new VSDZipStream(input); @@ -294,14 +299,8 @@ bool libvisio::VSDXParser::parseTheme(WPXInputStream *input, const char *name) WPXInputStream *stream = input->getDocumentOLEStream(name); if (!stream) return false; - WPXInputStream *relStream = input->getDocumentOLEStream(getRelationshipsForTarget(name).c_str()); - input->seek(0, WPX_SEEK_SET); - VSDXRelationships rels(relStream); - if (relStream) -delete relStream; - rels.rebaseTargets(getTargetBaseDirectory(name).c_str()); - processXmlDocument(stream, rels); + m_currentTheme.parse(stream); delete stream; return true; diff --git a/src/lib/VSDXParser.h b/src/lib/VSDXParser.h index 40c8847..dec2bbb 100644 --- a/src/lib/VSDXParser.h +++ b/src/lib/VSDXParser.h @@ -32,6 +32,7 @@ #include #include +#include "VSDXTheme.h" #include "VSDXMLParserBase.h" namespace libvisio @@ -99,6 +100,7 @@ private: libwpg::WPGPaintInterface *m_painter; int m_currentDepth; VSDXRelationships *m_rels; + VSDXTheme m_currentTheme; }; } // namespace libvisio diff --git a/src/lib/VSDXTheme.cpp b/src/lib/VSDXTheme.cpp new file mode 100644 index 000..616737c --- /dev/null +++ b/src/lib/VSDXTheme.cpp @@ -0,0 +1,57 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* libvisio + * Version: MPL 1.1 / GPLv2+ / LGPLv2+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License or as specified alternatively below. You may obtain a copy of + * the License at http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * Major Contributor(s): + * Copyright (C) 2013 Fridrich Strba + * + * + * All Rights Reserved. + * + * For minor contributions see the git repository. + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPLv2+"), or + * the GNU Lesser General Public License Version 2 or later (the "LGPLv2+"), + * in which case the provisions of the GPLv2+ or the LGPLv2+ are applicable + * instead of those above. + */ + +#include "VSDXTheme.h" + +libvisio::VSDXTheme::VSDXTheme() +{ +} + +libvisio::VSDXTheme::~VSDXTheme() +{ +} + +bool libvisio::VSDXTheme::parse(WPXInputStream *input) +{ + if (!input) +return false; + + try + { +return true; + } + catch (...) + { +return false; + } + return false; +} + + +/* vim:set shiftwidth=2 softtabstop=2 expandtab: */ diff --git a/src/lib/VSDXTheme.h b/src/lib/VSDXTheme.h new file mode 100644 index 000..41e806c --- /dev/null +++ b/src/lib/VSDXTheme.h @@ -0,0 +1,55 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* libvisio + * Version: MPL 1.1 / GPLv2+ / LGPLv2+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License or as specified alternatively below. You may obtain a copy of + * the License at http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + *
GSOC work weekly report
Hi all, I've got a very productive week. Here's what I've made: replaced the single ListBox to a Window containing custom ListBox implementation. I've encountered with several problems around KeyInput function, so I had to implement key action is PreNotify() function: ESC key closes the window, tab/space also (beacuse I assume that the user typed in the whole procedure/function name), not-exsisting procedure types are deleted, the ListBox filters entries when typing. The window is declared as boost::scoped_ptr to avoid memory leaks. So it works like in MS basic ide :D . Now, to the non-visibe parts. My first "cache" was a single vector containig a struct: this have chages to use boost::unordered_map, and wrapped into a class called CodeCompleteDataCache. I got here some link errors, but thank to Andras I could solve that. There are some things that I'me thinking on: - the ctor of CodeCompleteWindow gets an EditorWindow* as it's parameter, but the only thing I need from it it it's ExtTextEngine, which is a scoped pointer. Using this inside the CodeCompleteWindow(instreas of storing EditorWindow*) was a failure. Any advice? Regards, Gergő ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/gsoc-basic-ide-completion-and-other-bits' - basctl/source basic/source include/basic
basctl/source/basicide/baside2.hxx | 55 -- basctl/source/basicide/baside2b.cxx| 149 ++--- basic/source/classes/codecompletecache.cxx | 22 basic/source/classes/sbxmod.cxx| 40 ++- include/basic/codecompletecache.hxx| 10 + include/basic/sbmod.hxx|1 6 files changed, 114 insertions(+), 163 deletions(-) New commits: commit 623f0ecd35f96f2d047ae2f0461967407bb56cea Author: Gergo Mocsi Date: Sat Jul 20 13:03:42 2013 +0200 GSOC work, some code fixes Fixed the link error: declared CodeCompleteDataCache as BASIC_DLLPUBLIC and it worked fine. Fixed sergmentation fault error in CodeCompleteWindow. The new cache implementation is fully functional. CodeCompleteWindow is now being used as boost::scoped_ptr. Change-Id: I76a0fc7407d589e7f94280fc4d50cea51b9639db diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index 8f361be..eaf700b 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -115,9 +115,7 @@ private: virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > GetComponentInterface(sal_Bool bCreate = true); -//std::vector< CodeCompleteData > aCodeCompleteCache; CodeCompleteDataCache aCodeCompleteCache; -//CodeCompleteWindow* pCodeCompleteWnd; boost::scoped_ptr< CodeCompleteWindow > pCodeCompleteWnd; OUString GetActualSubName( sal_uLong nLine ); // gets the actual subroutine name according to line number @@ -474,32 +472,6 @@ private: } aSyntaxColors; }; -class CodeCompleteWindow: public Window -{ -friend class CodeCompleteListBox; -private: -EditorWindow* pParent; // parent window -TextSelection aTextSelection; -CodeCompleteListBox* pListBox; - -void InitListBox(); // initialize the ListBox - -public: -CodeCompleteWindow( EditorWindow* pPar ); -virtual ~CodeCompleteWindow(); - -void InsertEntry( const OUString& aStr ); -void ClearListBox(); -void SetTextSelection( const TextSelection& aSel ); -const TextSelection& GetTextSelection() const; -void ResizeListBox(); -void SelectFirstEntry(); //selects first entry in ListBox - -/*protected: -//virtual void KeyInput( const KeyEvent& rKeyEvt ); -virtual void LoseFocus();*/ -}; - class CodeCompleteListBox: public ListBox { friend class CodeCompleteWindow; @@ -517,16 +489,35 @@ private: void SetVisibleEntries(); // sets the visible entries based on aFuncBuffer variable public: -CodeCompleteListBox(CodeCompleteWindow* pPar); -virtual ~CodeCompleteListBox(); +CodeCompleteListBox( CodeCompleteWindow* pPar ); void InsertSelectedEntry(); //insert the selected entry DECL_LINK(ImplDoubleClickHdl, void*); virtual long PreNotify( NotifyEvent& rNEvt ); -/*protected: -virtual void LoseFocus();*/ +}; + +class CodeCompleteWindow: public Window +{ +friend class CodeCompleteListBox; +private: +EditorWindow* pParent; // parent window +TextSelection aTextSelection; +CodeCompleteListBox* pListBox; + +void InitListBox(); // initialize the ListBox + +public: +CodeCompleteWindow( EditorWindow* pPar ); +~CodeCompleteWindow(){ delete pListBox; } + +void InsertEntry( const OUString& aStr ); +void ClearListBox(); +void SetTextSelection( const TextSelection& aSel ); +const TextSelection& GetTextSelection() const; +void ResizeListBox(); +void SelectFirstEntry(); //selects first entry in ListBox }; diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 6c099c8..c21be94 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -512,65 +512,57 @@ void EditorWindow::KeyInput( const KeyEvent& rKEvt ) aVect.push_back( aLine.copy(r.nBegin, r.nEnd - r.nBegin) ); } OUString sBaseName = aVect[0];//variable name -OUString sVarType = aCodeCompleteCache.GetVariableType(sBaseName, sActSub); - -/*for( unsigned int i = 0; i < aCodeCompleteCache.size(); ++i) -{*/ -/*if( aCodeCompleteCache[i].sVarName.equalsIgnoreAsciiCase( sBaseName ) && -( aCodeCompleteCache[i].sVarParent == sActSub || aCodeCompleteCache[i].IsGlobal() ) ) -{*/ -if( sVarType != aCodeCompleteCache.NOT_FOUND ) -{ -Reference< lang::XMultiServiceFactory > xFactory( comphelper::getProcessServiceFactory(), UNO_SET_THROW ); -Reference< reflection::XIdlReflection > xRefl( xFactory->createInstance("com.sun.star.reflection.CoreReflection"), UNO_QUERY_THROW ); +OUString sVarType = aCodeCompleteCache.GetVariableType(sBaseName, aCodeCompleteCache.GLOB_KEY); +if( sVarType == aCodeCompleteCache.NOT_FOUND ) +sVarType = aCodeCompleteCache.GetVariableType(sBa
Re: [GSoC] Impress Remote and Bonjour
Hello all, Sorry if I've broken something unexpectedly :P Actually I've commented the current implementation out since it doesn't seem to work during my tests with the android app... I mean, the auto discovery for Bluetooth connections works well but the one with WiFi doesn't seem to work for me (correct me here since I've done the tests before the gsoc actually, maybe I've missed something :-P). Also need confirmation from Ahunt (I've cc Ahunt also), since he has implemented this part I guess. Do let me know if it works in your tests, in that case I will try to put them back to keep it compatible with older implementation. Concerning the backward compatibility, it doesn't seem to be an issue for now because I've basically replaced some code that doesn't seem to work (for me) with a new version backed by Bonjour/Avahi service, but in case it prevents some functionalities to work, please let me know ^^. On the server end, what I've done for now is: 1. Bonjour service publishing for Mac OSX 2. I've add some code to handle pointer feature, which follow the protocol like this: pointer_coordination\nx\ny\n\n, where x and y are in percentage (0-1), taking upper left corner as the origin. 3. Try to correct the bug which gives the remote control false currentSlideIndex in the "presentation_started" message What I'm doing now: 1. Implement Avahi service publish for Linux and Bonjour for Windows build. Still need a lot of research here :-P What I've wanted to do but failed: 1. Draw a point on the running slideshow (like the pen feature), based on the "pointer_coordination x y" command. I've tried to find out how to do some drawing on the canvas but I didn't really understand the code there... not sure if we can add a small red rectangle and move that to the position corresponding to the "pointer_coordination", for now it just prints out the coordination received. 2. The problem with currentSlideIndex seems to take place whenever we connect the PC to an external display and we start a presentation for middle. The remote app will always receive 0 instead of the real "currentSlideIndex". The reasons, as far as I know, is related to the UpdateCurrentSlide(0); in sdext/source/presenter/PresenterController.cxx. Actually every time we launch the presentation, the thread which initiate the presenter will reset currentSlide to 0 due to some reasons (don't know why we need to UpdatecurrentSlide(0);) and the thread which sends "presentation_started" to the remote will ask for the currentSlideIndex after that, so it gets 0. What would be great to improve on the server-end: 1. Add some version information during the hand-shake phase. 2. Add some screen size information (or just small, medium, big flags) during the handshake, so that we can modify the preview size in the ImagePreparer.cxx accordingly. In case when I build the iPad version of the app, we will have some beautiful previews pictures instead of an over-enlarged one... On the android end, it seems that it's also possible to benefit from the Bonjour Service discovery http://developer.android.com/training/connect-devices-wirelessly/nsd-wifi-direct.html maybe this can help ^^ But if the old implementation of WiFi auto-discovery works already on your device, I will try to restore it so that we don't need to change anything on the android app. All the best! and Happy Coding! Siqi On Saturday, July 20, 2013, Michael Meeks wrote: > Hi guys, > > On Sat, 2013-07-20 at 03:11 +0300, Artur Dryomov wrote:Hi guys, > > I noticed your commit which comments the current discovery service and > > replaces it with the Bonjour calls. Probably it is not a great idea — > > I mean commenting the current version — because it will break all > > Android applications which expect to get responses from server. > > First - Siqi - just to say I've been really impressed with your > work :-) it's great to see the iOS remote looking so nice & making good > progress. > > > Or I just don’t understand the idea? I thought Bonjour could work for > > OS X as an addition and not as a replacement. > > I guess we would want to add Bonjour support for all platforms > (perhaps > via some cleanish platform abstraction ?) since the iOS remote really > has to use WiFi / Bonjour IIRC to work. > > Siqi - clearly we want to keep back-wards compatibility; though my > greatest concern is only one-directional: IMHO it is trivial for people > to update their remote on their mobile: it's a tiny app and updates in a > few tens of seconds, also I think we can expect them to test that before > they present (at least after a LibreOffice upgrade). So - we should put > most effort into making sure that newer remotes talk to older > libreoffice's - rather than the other way around :-) > > > It would be great to hear Michael’s thoughts. Should we CC the devs > > list ? > > Yes of course; I've added that :-) > > > I also thought to plac
[ABANDONED] Downgraded the Dutch spellchecker to version 2.00 ( fdo#6303...
Thomas van der meulen has abandoned this change. Change subject: Downgraded the Dutch spellchecker to version 2.00 ( fdo#63033 fdo#65994 ) .. Patch Set 3: Abandoned maby a bit to soon to downgrade -- To view, visit https://gerrit.libreoffice.org/4987 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I2e21a40f03b44a336355500bb617865ca2704125 Gerrit-PatchSet: 3 Gerrit-Project: dictionaries Gerrit-Branch: master Gerrit-Owner: Thomas van der meulen ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [GSoC] Android Impress Remote: Weekly Report #4, #5
Hi Michael, I have created a wiki page — https://wiki.documentfoundation.org/Development/Impress/Remote_2 It is WIP of course but I’ll try to update screenshots when future steps will be done. Regards, Artur.___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice