[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx | 10 +-
writerfilter/source/ooxml/model.xml| 10 +-
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 23 +--
3 files changed, 31 insertions(+), 12 deletions(-)
New commits:
commit 1f486806decc5e8edfe91cda5ef84414113c20b9
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Oct 8 09:17:01 2014 +0200
Use constants for ST_CombineBrackets values
Change-Id: I307d7833fb5556c5509edd698b4b5ecd7b7a5fb3
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 515a1cd..aa0b80e 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3291,27 +3291,27 @@ OUString DomainMapper::getBracketStringFromEnum(const
sal_Int32 nIntValue, const
{
switch(nIntValue)
{
-case 1:
+case NS_ooxml::LN_Value_ST_CombineBrackets_round:
if (bIsPrefix)
return OUString( ( );
return OUString( ) );
-case 2:
+case NS_ooxml::LN_Value_ST_CombineBrackets_square:
if (bIsPrefix)
return OUString( [ );
return OUString( ] );
-case 3:
+case NS_ooxml::LN_Value_ST_CombineBrackets_angle:
if (bIsPrefix)
return OUString( );
return OUString( );
-case 4:
+case NS_ooxml::LN_Value_ST_CombineBrackets_curly:
if (bIsPrefix)
return OUString( { );
return OUString( } );
-case 0:
+case NS_ooxml::LN_Value_ST_CombineBrackets_none:
default:
return OUString();
}
diff --git a/writerfilter/source/ooxml/model.xml
b/writerfilter/source/ooxml/model.xml
index b92777b..58136fa 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -16993,11 +16993,11 @@
attribute name=bidi tokenid=ooxml:CT_Language_bidi/
/resource
resource name=ST_CombineBrackets resource=List
- value tokenid=0none/value
- value tokenid=1round/value
- value tokenid=2square/value
- value tokenid=3angle/value
- value tokenid=4curly/value
+ value tokenid=ooxml:Value_ST_CombineBrackets_nonenone/value
+ value tokenid=ooxml:Value_ST_CombineBrackets_roundround/value
+ value tokenid=ooxml:Value_ST_CombineBrackets_squaresquare/value
+ value tokenid=ooxml:Value_ST_CombineBrackets_angleangle/value
+ value tokenid=ooxml:Value_ST_CombineBrackets_curlycurly/value
/resource
resource name=CT_EastAsianLayout resource=Properties
attribute name=id tokenid=ooxml:CT_EastAsianLayout_id/
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 3caef99..df8ade0 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3831,8 +3831,27 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
{
RTFValue::Pointer_t pValue(new RTFValue(int(true)));
m_aStates.top().aCharacterAttributes.set(NS_ooxml::LN_CT_EastAsianLayout_combine,
pValue);
-if (nParam 0)
-
m_aStates.top().aCharacterAttributes.set(NS_ooxml::LN_CT_EastAsianLayout_combineBrackets,
pIntValue);
+nId = 0;
+switch (nParam)
+{
+case 0:
+nId = NS_ooxml::LN_Value_ST_CombineBrackets_none;
+break;
+case 1:
+nId = NS_ooxml::LN_Value_ST_CombineBrackets_round;
+break;
+case 2:
+nId = NS_ooxml::LN_Value_ST_CombineBrackets_square;
+break;
+case 3:
+nId = NS_ooxml::LN_Value_ST_CombineBrackets_angle;
+break;
+case 4:
+nId = NS_ooxml::LN_Value_ST_CombineBrackets_curly;
+break;
+}
+if (nId 0)
+
m_aStates.top().aCharacterAttributes.set(NS_ooxml::LN_CT_EastAsianLayout_combineBrackets,
RTFValue::Pointer_t(new RTFValue(nId)));
}
break;
case RTF_SL:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
AW: Anti-Virus vendors warnings
Hi Michael, On 06/10/14 17:41, Michael Stahl wrote: actually, only --enable-dbgutil uses the MSVC debug runtime; the -- enable-debug just disables optimizations, turns on PDB files (debuginfo) and enables some assertions. --enable-dbgutil is (nowadays) a super-set of --enable-debug. Thank you for your info, I think that is it. thankfully Caolan has now encrypted the RTF file that caused you trouble in commit bd1be89c1a5fd3457b6bfe8ca78789c047820f17, so that should work now. Now i need no exception for the core-directory in the Symantec-virus-scan, that is great. But I have a other question with the release build? This follow files delete the virus-scanner Malware: Suspicious.Cloud D:\bld\rel\workdir\UnpackedTarball\icu\source\bin\genrb.exe* Malware: Suspicious.Cloud.5 D:\bld\rel\workdir\UnpackedTarball\nss\nss\lib\zlib\out\example.exe* D:\bld\rel\workdir\UnpackedTarball\nss\dist\out\bin\example.exe* D:\bld\rel\instdir\program\reg4allmsdoc.dll D:\bld\rel\instdir\program\sdqsmsi.dll D:\bld\rel\instdir\program\sellangmsi.dll This above files have exclude from the scan The file with * needed for the build But this file-name always changed, but I don't see any results, it is no different between the debug build (almost the same files)!? D:\bld\rel\instdir\program\RCX.tmp D:\bld\rel\instdir\program\RCX.tmp D:\bld\rel\instdir\program\RCX.tmp Why get this files, and can we remove this, too? Juergen ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sysui/desktop
sysui/desktop/menus/base.desktop|2 +- sysui/desktop/menus/calc.desktop|2 +- sysui/desktop/menus/draw.desktop|2 +- sysui/desktop/menus/impress.desktop |2 +- sysui/desktop/menus/math.desktop|2 +- sysui/desktop/menus/qstart.desktop |2 +- sysui/desktop/menus/startcenter.desktop |2 +- sysui/desktop/menus/writer.desktop |2 +- sysui/desktop/menus/xsltfilter.desktop |2 +- 9 files changed, 9 insertions(+), 9 deletions(-) New commits: commit f9f9aa9873c5851da86d33ca75e937ac022206a3 Author: Stephan Bergmann sberg...@redhat.com Date: Wed Oct 8 09:54:55 2014 +0200 Remove smb from X-KDE-Protocols lines smb was included in the set of supported protocols since those X-KDE-Protocol lines got introduced with 673be8e76856c6bc39f448f3374db4ae84258952 add X-KDE-Protocols, but as discussed in the mail thread starting at http://lists.freedesktop.org/archives/libreoffice/2014-September/063621.html X-KDE-Protocols=...,smb,..., actual support for smb URLs in LO under KDE is very fragile and typically requires further steps from the user (which vary across the various LO configure options, --enable-gio vs. --enable-gnome-vfs, and Linux distros) to work at all. So it is probably best to not unconditionally claim smb support in those X-KDE_Protocols lines at least in the vanilla LO sources (esp. since the TDF builds with --enable-gnome-vfs need a really weird OOO_FORCE_DESKTOP=gnome workaround to make it work at all, cf. http://lists.freedesktop.org/archives/libreoffice/2014-October/063876.html Re: X-KDE-Protocols=...,smb,...). Any Linux distros that are confident that smb support in LO under KDE reliably works for them can patch those lines locally. Change-Id: I1c247d85825c96f0d74efcce3003e327a1522fa3 diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop index 26f1c6a..76255fe 100644 --- a/sysui/desktop/menus/base.desktop +++ b/sysui/desktop/menus/base.desktop @@ -31,7 +31,7 @@ X-GIO-NoFuse=true Keywords=Data;SQL; InitialPreference=5 StartupWMClass=libreoffice-base -X-KDE-Protocols=file,http,smb,ftp,webdav +X-KDE-Protocols=file,http,ftp,webdav Actions=NewDocument; [Desktop Action NewDocument] diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop index fca3fe3..5aa48d2 100644 --- a/sysui/desktop/menus/calc.desktop +++ b/sysui/desktop/menus/calc.desktop @@ -31,7 +31,7 @@ X-GIO-NoFuse=true Keywords=Accounting;Stats;OpenDocument Spreadsheet;Chart;Microsoft Excel;Microsoft Works;OpenOffice Calc;ods;xls;xlsx; InitialPreference=5 StartupWMClass=libreoffice-calc -X-KDE-Protocols=file,http,smb,ftp,webdav +X-KDE-Protocols=file,http,ftp,webdav Actions=NewDocument; [Desktop Action NewDocument] diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop index ae57504..3e20e8d 100644 --- a/sysui/desktop/menus/draw.desktop +++ b/sysui/desktop/menus/draw.desktop @@ -31,7 +31,7 @@ X-GIO-NoFuse=true Keywords=Vector;Schema;Diagram;Layout;OpenDocument Graphics;Microsoft Publisher;Corel Draw;cdr;odg;svg; InitialPreference=5 StartupWMClass=libreoffice-draw -X-KDE-Protocols=file,http,smb,ftp,webdav +X-KDE-Protocols=file,http,ftp,webdav Actions=NewDocument; [Desktop Action NewDocument] diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.desktop index c1f6231..b419593 100644 --- a/sysui/desktop/menus/impress.desktop +++ b/sysui/desktop/menus/impress.desktop @@ -31,7 +31,7 @@ X-GIO-NoFuse=true Keywords=Slideshow;Slides;OpenDocument Presentation;Microsoft PowerPoint;Microsoft Works;OpenOffice Impress;odp;ppt;pptx; InitialPreference=5 StartupWMClass=libreoffice-impress -X-KDE-Protocols=file,http,smb,ftp,webdav +X-KDE-Protocols=file,http,ftp,webdav Actions=NewDocument; [Desktop Action NewDocument] diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop index b6981f5..e437d26 100644 --- a/sysui/desktop/menus/math.desktop +++ b/sysui/desktop/menus/math.desktop @@ -32,7 +32,7 @@ X-GIO-NoFuse=true Keywords=Equation;OpenDocument Formula;Formula;odf;MathML; InitialPreference=5 StartupWMClass=libreoffice-math -X-KDE-Protocols=file,http,smb,ftp,webdav +X-KDE-Protocols=file,http,ftp,webdav Actions=NewDocument; [Desktop Action NewDocument] diff --git a/sysui/desktop/menus/qstart.desktop b/sysui/desktop/menus/qstart.desktop index 2669cc3..ec4e9c2 100644 --- a/sysui/desktop/menus/qstart.desktop +++ b/sysui/desktop/menus/qstart.desktop @@ -25,4 +25,4 @@ NoDisplay=true Name=%PRODUCTNAME Quickstarter Comment=Hook for quickstarter startup X-GIO-NoFuse=true -X-KDE-Protocols=file,http,smb,ftp,webdav +X-KDE-Protocols=file,http,ftp,webdav diff --git a/sysui/desktop/menus/startcenter.desktop b/sysui/desktop/menus/startcenter.desktop index 3858c89..08d4a11 100644 --- a/sysui/desktop/menus/startcenter.desktop +++
Re: ESC call Thursday 16:00 central European time ...
Hi Jean-Baptiste, On Wed, 2014-10-08 at 07:28 +0200, Jean-Baptiste Faure wrote: I do not know where to write in the agenda, so I do my suggestion here: Ah - in general anywhere in the middle is fine - the action items we try to do while people turn up - to keep the call short. ESC should study the case of sorting modification made in the case of cells containing references. So - this is IIRC a side-effect of a fix for a sorting performance got a lot worse screamingly urgent MAB ;-) Anything else is up to the calc maintainers / rest of the ESC in the call - you're encouraged to call in to present your view. ATB, Michael. -- michael.me...@collabora.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: X-KDE-Protocols=...,smb,...
On 09/25/2014 02:32 PM, Stephan Bergmann wrote: [...] In light of this, is it helpful that we unconditionally claim smb support in those X-KDE-Protocols lines? On IRC, together with Björn and Rene, we came to the conclusion that it is probably better to remove smb from those X-KDE-Protocols lines, see http://cgit.freedesktop.org/libreoffice/core/commit/?id=f9f9aa9873c5851da86d33ca75e937ac022206a3 Remove smb from X-KDE-Protocols lines. As a data point, I had recently tried to make X-KDE-Protocols=...,smb,... actually work on Fedora, https://bugzilla.redhat.com/show_bug.cgi?id=1054952 libre-office 4.1.4.2 won't open files on SMB shares; build 4.1.4.2-2.fc20 (by adding the necessary gvfs-smb package dependencies at the Fedora LO PRM level), but that was not received too well: For one, the mix of KDE and GIO involved means that when you have an smb share mounted in KDE's Dolphin and request Dolphin to open a document in LO, LO will again ask you for the smb share's credentials (cf. https://bugzilla.redhat.com/show_bug.cgi?id=1054952#c26). (Unlike in the case where LO doesn't claim smb in the X-KDE_Protocols lines, in which case Dolphin downloads the document to /var/tmp first and hands that filepath to LO, see below). For another, the new dependency of LO packages on the gvfs-smb package drags in quite a lot of further packages (cf. https://bugzilla.redhat.com/show_bug.cgi?id=1147649 New dependencies in libreoffice). https://bugs.freedesktop.org/show_bug.cgi?id=67527 FILEOPEN: LO can't open files over SMB from KDE because of missing dependencies - wants to repair! [summary in comment 59] is a bug with a very long history, but which by now probably boils down to the missing deps for KDE (https://bugs.freedesktop.org/show_bug.cgi?id=67527#c68), As that last remaining part of that bug is covered now by http://cgit.freedesktop.org/libreoffice/core/commit/?id=f9f9aa9873c5851da86d33ca75e937ac022206a3, I'll finally mark that bug as fixed. Unfortunately, the fact that Dolphin will communicate documents on smb shares with LO via /var/tmp proxy files again now (see above), will re-open https://bugs.freedesktop.org/show_bug.cgi?id=39591 KDE-Integration, can not save to remote fs supported by kio again---if you modify such a document in LO, Dolphin will ask you whether it shall upload it again only after you close LO (cf. https://bugs.freedesktop.org/show_bug.cgi?id=39591#c6). Ultimately, the best approach (if technically possible) would probably be to have some KDE-specific backend in LO for smb (etc.) URLs, similar to the --enable-gio resp. --enable-gnome-vfs GNOME-specific backends, so that LO could receive smb URLs from Dolphin but would not need to rely on GNOME-related functionality to access them, cf. https://bugs.freedesktop.org/show_bug.cgi?id=70712 KDE: Support of opening and saving to a remote fs via KIO. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: ESC call Thursday 16:00 central European time ...
Hi all, Le 08/10/2014 10:44, Michael Meeks a écrit : Hi Jean-Baptiste, On Wed, 2014-10-08 at 07:28 +0200, Jean-Baptiste Faure wrote: I do not know where to write in the agenda, so I do my suggestion here: Ah - in general anywhere in the middle is fine - the action items we try to do while people turn up - to keep the call short. Just for information, I've added the link to Jean-Baptiste message on the QA part of the pad, so you have it at hand if Jean-Baptiste can't attend. Cheers Sophioe -- Sophie Gautier sophie.gaut...@documentfoundation.org Tel:+33683901545 Co-founder - Release coordinator The Document Foundation ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sal/qa
sal/qa/rtl/uri/rtl_testuri.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 77d86709d5b03caccd8a28fbab7bf752d4bc3243
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Oct 8 10:54:01 2014 +0200
Document how rtl::Uri::convertRelToAbs normalizes an absolute URL's path
Change-Id: Ibf4f2d46bfbb977f0ba27110d86d7b7f1173631c
diff --git a/sal/qa/rtl/uri/rtl_testuri.cxx b/sal/qa/rtl/uri/rtl_testuri.cxx
index 3769062..d798a85 100644
--- a/sal/qa/rtl/uri/rtl_testuri.cxx
+++ b/sal/qa/rtl/uri/rtl_testuri.cxx
@@ -331,7 +331,8 @@ void Test::test_Uri() {
{ http://a/b/../;, ../c, http://a/c; },
{ http://a/b/..;, ../c, http://a/c; },
{ http://a/./b/;, .././.././../c, http://a/c; },
-{ http://a;, b, http://a/b; } };
+{ http://a;, b, http://a/b; },
+{ , http://a/b/../c;, http://a/c; } };
for (std::size_t i = 0; i sizeof aRelToAbsTest / sizeof (RelToAbsTest);
++i)
{
rtl::OUString aAbs;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/control/unoctitm.cxx | 113 +++
1 file changed, 113 insertions(+)
New commits:
commit 35da89fa1428f5286304fc707252242554d49ea6
Author: Jan Holesovsky ke...@collabora.com
Date: Wed Oct 8 10:55:15 2014 +0200
usage info: Code to collect actions that the user performs.
Handles the .uno: and .slot: commands. Cannot load / save the info yet,
only
dumps it to the screen at the application exit.
Disabled in the code now, needs a configuration option.
Change-Id: I4e689f534fe5c8a5af84df472e47f276fb7af89b
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index b9b012a..f0c3c77 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -30,6 +30,7 @@
#include tools/urlobj.hxx
#include com/sun/star/util/URLTransformer.hpp
#include com/sun/star/util/XURLTransformer.hpp
+#include com/sun/star/frame/Desktop.hpp
#include com/sun/star/frame/XController.hpp
#include com/sun/star/frame/XFrameActionListener.hpp
#include com/sun/star/frame/XComponentLoader.hpp
@@ -39,6 +40,7 @@
#include com/sun/star/frame/status/ItemStatus.hpp
#include com/sun/star/frame/status/ItemState.hpp
#include com/sun/star/frame/DispatchResultState.hpp
+#include com/sun/star/frame/ModuleManager.hpp
#include com/sun/star/frame/status/Visibility.hpp
#include comphelper/processfactory.hxx
#include comphelper/sequence.hxx
@@ -62,6 +64,7 @@
#include boost/scoped_ptr.hpp
+using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::util;
@@ -591,11 +594,121 @@ OUString SfxDispatchController_Impl::getSlaveCommand(
const ::com::sun::star::ut
return aSlaveCommand;
}
+namespace {
+
+/// Class that collects the usage information.
+class UsageInfo {
+
+typedef std::mapOUString, int UsageMap;
+
+/// Command vs. how many times it was used
+UsageMap maUsage;
+
+public:
+UsageInfo()
+{
+load();
+}
+
+~UsageInfo()
+{
+save();
+}
+
+/// Increment command's use.
+void increment(const OUString rCommand);
+
+/// Load the usage data from the previous session.
+void load();
+
+/// Save the usage data for the next session.
+void save();
+};
+
+void UsageInfo::increment(const OUString rCommand)
+{
+UsageMap::iterator it = maUsage.find(rCommand);
+
+if (it != maUsage.end())
+++(it-second);
+else
+maUsage[rCommand] = 1;
+}
+
+void UsageInfo::load()
+{
+// TODO - do the real loading here
+}
+
+void UsageInfo::save()
+{
+// TODO - do a real saving here, not only dump to the screen
+std::cerr Usage information: std::endl;
+for (UsageMap::const_iterator it = maUsage.begin(); it != maUsage.end();
++it)
+{
+std::cerr it-first ';' it-second std::endl;
+}
+std::cerr Usage information end std::endl;
+}
+
+class theUsageInfo : public rtl::StaticUsageInfo, theUsageInfo {};
+
+/// Extracts information about the command + args, and stores that.
+void collectUsageInformation(const util::URL rURL, const
uno::Sequencebeans::PropertyValue rArgs)
+{
+if (/*TODO disabled now, bind this to a config option instead*/true)
+return;
+
+OUStringBuffer aBuffer;
+
+// app identification [uh, several UNO calls :-(]
+uno::Referenceuno::XComponentContext xContext =
::comphelper::getProcessComponentContext();
+uno::Referenceframe::XModuleManager2
xModuleManager(frame::ModuleManager::create(xContext));
+uno::Referenceframe::XDesktop2 xDesktop =
frame::Desktop::create(xContext);
+uno::Referenceframe::XFrame xFrame = xDesktop-getCurrentFrame();
+
+OUString aModule(xModuleManager-identify(xFrame));
+sal_Int32 nLastDot = aModule.lastIndexOf('.');
+if (nLastDot = 0)
+aModule = aModule.copy(nLastDot + 1);
+
+aBuffer.append(aModule);
+aBuffer.append(';');
+
+// command
+aBuffer.append(rURL.Protocol);
+aBuffer.append(rURL.Path);
+sal_Int32 nCount = rArgs.getLength();
+
+// parameters - only their names, not the values (could be sensitive!)
+if (nCount 0)
+{
+aBuffer.append('(');
+for (sal_Int32 n = 0; n nCount; n++)
+{
+const ::com::sun::star::beans::PropertyValue rProp = rArgs[n];
+if (n 0)
+aBuffer.append(',');
+aBuffer.append(rProp.Name);
+}
+aBuffer.append(')');
+}
+
+OUString aCommand(aBuffer.makeStringAndClear());
+
+// store
+theUsageInfo::get().increment(aCommand);
+}
+
+}
+
void SAL_CALL SfxDispatchController_Impl::dispatch( const
::com::sun::star::util::URL aURL,
const ::com::sun::star::uno::Sequence
::com::sun::star::beans::PropertyValue aArgs,
const ::com::sun::star::uno::Reference
::com::sun::star::frame::XDispatchResultListener rListener )
throw (css::uno::RuntimeException, std::exception)
{
+
[Libreoffice-commits] core.git: basic/source chart2/source dtrans/source framework/source include/oox include/salhelper include/tubes sc/source svl/source toolkit/test ucbhelper/source ucb/source writ
basic/source/inc/symtbl.hxx |2 +-
chart2/source/view/axes/VCoordinateSystem.cxx |2 +-
chart2/source/view/charttypes/VSeriesPlotter.cxx|2 +-
dtrans/source/win32/clipb/WinClipboard.hxx |2 +-
framework/source/inc/loadenv/loadenv.hxx|2 +-
framework/source/jobs/jobdispatch.cxx |2 +-
include/oox/helper/binaryinputstream.hxx|2 +-
include/oox/helper/binaryoutputstream.hxx |2 +-
include/salhelper/singletonref.hxx |2 +-
include/tubes/manager.hxx |2 +-
sc/source/filter/excel/xeroot.cxx |2 +-
svl/source/numbers/zforlist.cxx |2 +-
toolkit/test/accessibility/MessageArea.java |2 +-
ucb/source/core/ucbstore.cxx|2 +-
ucb/source/ucp/gio/gio_content.cxx |4 ++--
ucb/source/ucp/gvfs/gvfs_content.cxx|6 +++---
ucb/source/ucp/hierarchy/hierarchycontent.cxx |6 +++---
ucb/source/ucp/package/pkgcontent.cxx |6 +++---
ucb/source/ucp/package/pkgprovider.cxx |2 +-
ucb/source/ucp/tdoc/tdoc_content.cxx|6 +++---
ucb/source/ucp/tdoc/tdoc_provider.cxx |4 ++--
ucb/source/ucp/webdav-neon/webdavcontent.cxx|6 +++---
ucb/source/ucp/webdav/webdavcontent.cxx |6 +++---
ucbhelper/source/provider/contenthelper.cxx |2 +-
writerfilter/inc/resourcemodel/WW8ResourceModel.hxx |2 +-
xmloff/source/chart/contexts.cxx|4 ++--
26 files changed, 41 insertions(+), 41 deletions(-)
New commits:
commit fbf3aa391b4c47b00650a868e5ae5cade9025e87
Author: Noel Grandin n...@peralex.com
Date: Wed Oct 8 11:02:03 2014 +0200
spelling: instanciated - instantiated
Change-Id: I99f3010e30f81786b938dc11736ea1597cd5530d
diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx
index a1f98b1..68d85ab 100644
--- a/basic/source/inc/symtbl.hxx
+++ b/basic/source/inc/symtbl.hxx
@@ -177,7 +177,7 @@ class SbiProcDef : public SbiSymDef { // procedure
definition (from basic):
OUString maPropName; // Property name if property procedure
(!= proc name)
bool bCdecl : 1; // true: CDECL given
bool bPublic : 1; // true: proc is PUBLIC
-bool mbProcDecl : 1; // true: instanciated by
SbiParser::ProcDecl
+bool mbProcDecl : 1; // true: instantiated by
SbiParser::ProcDecl
public:
SbiProcDef( SbiParser*, const OUString, bool bProcDecl=false );
virtual ~SbiProcDef();
diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx
b/chart2/source/view/axes/VCoordinateSystem.cxx
index a503703..457ff82 100644
--- a/chart2/source/view/axes/VCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCoordinateSystem.cxx
@@ -56,7 +56,7 @@ VCoordinateSystem* VCoordinateSystem::createCoordinateSystem(
OUString aViewServiceName = xCooSysModel-getViewServiceName();
-//@todo: in future the coordinatesystems should be instanciated via
service factory
+//@todo: in future the coordinatesystems should be instantiated via
service factory
VCoordinateSystem* pRet=NULL;
if( aViewServiceName.equals( CHART2_COOSYSTEM_CARTESIAN_VIEW_SERVICE_NAME
) )
pRet = new VCartesianCoordinateSystem(xCooSysModel);
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx
b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 5bd4125..1d83148 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -44,7 +44,7 @@
#include DiagramHelper.hxx
#include defines.hxx
-//only for creation: @todo remove if all plotter are uno components and
instanciated via servicefactory
+//only for creation: @todo remove if all plotter are uno components and
instantiated via servicefactory
#include BarChart.hxx
#include PieChart.hxx
#include AreaChart.hxx
diff --git a/dtrans/source/win32/clipb/WinClipboard.hxx
b/dtrans/source/win32/clipb/WinClipboard.hxx
index 0ef12f0..6efc608 100644
--- a/dtrans/source/win32/clipb/WinClipboard.hxx
+++ b/dtrans/source/win32/clipb/WinClipboard.hxx
@@ -44,7 +44,7 @@ class CWinClipbImpl;
// and a static member to reasocciate from this static function to the
// class instance
// watch out: we are using only one static member variable and not a list
-// because we assume to be instanciated only once
+// because we assume to be instantiated only once
// this will be asured by an OneInstanceFactory of the service and not
// by this class!
diff --git a/framework/source/inc/loadenv/loadenv.hxx
b/framework/source/inc/loadenv/loadenv.hxx
index 7963ac2..6ad518e 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -451,7 +451,7 @@ private:
/** @short tries to use
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/control/unoctitm.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5a890f4a2cbd05e17bbae40469758848c4081b49
Author: Jan Holesovsky ke...@collabora.com
Date: Wed Oct 8 11:09:00 2014 +0200
usage info: Improve the 'what is this for' comment.
Change-Id: If423bd3fde53695be33a4f890f7d363ccce8dbf0
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index f0c3c77..662114f 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -596,7 +596,7 @@ OUString SfxDispatchController_Impl::getSlaveCommand( const
::com::sun::star::ut
namespace {
-/// Class that collects the usage information.
+/// Class that collects the usage information - how many times what .uno:
command was used.
class UsageInfo {
typedef std::mapOUString, int UsageMap;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/callform.hxx |2 +-
sc/source/core/data/funcdesc.cxx | 20 ++--
sc/source/core/tool/adiasync.cxx |8
sc/source/core/tool/callform.cxx |6 +++---
sc/source/core/tool/interpr4.cxx | 20 ++--
sc/source/core/tool/parclass.cxx |4 ++--
6 files changed, 30 insertions(+), 30 deletions(-)
New commits:
commit 0c57f31a8b15ec0e84d1e3752122664af236a8c3
Author: Noel Grandin n...@peralex.com
Date: Wed Oct 8 10:00:07 2014 +0200
convert ParamType enum in SC to enum class
mostly to get the NONE constant out of the global namespace, so I can
convert other enums which also want to use the NONE constant
Change-Id: I988d5d7e5316dd5e4ca0be0cc8f043f69bbb900c
Reviewed-on: https://gerrit.libreoffice.org/11848
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git a/sc/inc/callform.hxx b/sc/inc/callform.hxx
index e66c4d0..8e19572 100644
--- a/sc/inc/callform.hxx
+++ b/sc/inc/callform.hxx
@@ -37,7 +37,7 @@ extern C {
typedef void (CALLTYPE* AdvData)( double nHandle, void* pData );
}
-enum ParamType
+enum class ParamType
{
PTR_DOUBLE,
PTR_STRING,
diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx
index 7ab1b47..b871c6a 100644
--- a/sc/source/core/data/funcdesc.cxx
+++ b/sc/source/core/data/funcdesc.cxx
@@ -483,19 +483,19 @@ ScFunctionList::ScFunctionList() :
{
switch (pAddInFuncData-GetParamType(j+1))
{
-case PTR_DOUBLE:
+case ParamType::PTR_DOUBLE:
pDesc-maDefArgNames[j] = aDefArgNameValue;
break;
-case PTR_STRING:
+case ParamType::PTR_STRING:
pDesc-maDefArgNames[j] = aDefArgNameString;
break;
-case PTR_DOUBLE_ARR:
+case ParamType::PTR_DOUBLE_ARR:
pDesc-maDefArgNames[j] = aDefArgNameValues;
break;
-case PTR_STRING_ARR:
+case ParamType::PTR_STRING_ARR:
pDesc-maDefArgNames[j] = aDefArgNameStrings;
break;
-case PTR_CELL_ARR:
+case ParamType::PTR_CELL_ARR:
pDesc-maDefArgNames[j] = aDefArgNameCells;
break;
default:
@@ -509,19 +509,19 @@ ScFunctionList::ScFunctionList() :
{
switch (pAddInFuncData-GetParamType(j+1))
{
-case PTR_DOUBLE:
+case ParamType::PTR_DOUBLE:
pDesc-maDefArgDescs[j] = aDefArgDescValue;
break;
-case PTR_STRING:
+case ParamType::PTR_STRING:
pDesc-maDefArgDescs[j] = aDefArgDescString;
break;
-case PTR_DOUBLE_ARR:
+case ParamType::PTR_DOUBLE_ARR:
pDesc-maDefArgDescs[j] = aDefArgDescValues;
break;
-case PTR_STRING_ARR:
+case ParamType::PTR_STRING_ARR:
pDesc-maDefArgDescs[j] = aDefArgDescStrings;
break;
-case PTR_CELL_ARR:
+case ParamType::PTR_CELL_ARR:
pDesc-maDefArgDescs[j] = aDefArgDescCells;
break;
default:
diff --git a/sc/source/core/tool/adiasync.cxx b/sc/source/core/tool/adiasync.cxx
index 727ae42..512d3cd 100644
--- a/sc/source/core/tool/adiasync.cxx
+++ b/sc/source/core/tool/adiasync.cxx
@@ -41,7 +41,7 @@ ScAddInAsync::ScAddInAsync() :
pDocs( NULL ),
mpFuncData( NULL ),
nHandle( 0 ),
-meType( NONE ),
+meType( ParamType::NONE ),
bValid( false )
{ // nur fuer aSeekObj !
}
@@ -66,7 +66,7 @@ ScAddInAsync::~ScAddInAsync()
{
// in dTor because of theAddInAsyncTbl.DeleteAndDestroy in
ScGlobal::Clear
mpFuncData-Unadvice( (double)nHandle );
-if ( meType == PTR_STRING pStr ) // include type comparison
because of union
+if ( meType == ParamType::PTR_STRING pStr ) // include type
comparison because of union
delete pStr;
delete pDocs;
}
@@ -98,10 +98,10 @@ void ScAddInAsync::CallBack( sal_uLong nHandleP, void*
pData )
}
switch ( p-meType )
{
-case PTR_DOUBLE :
+case ParamType::PTR_DOUBLE :
p-nVal = *(double*)pData;
break;
-case
Re: ESC call Thursday 16:00 central European time ...
Le 08/10/2014 10:53, Sophie a écrit : Hi all, Le 08/10/2014 10:44, Michael Meeks a écrit : Hi Jean-Baptiste, On Wed, 2014-10-08 at 07:28 +0200, Jean-Baptiste Faure wrote: I do not know where to write in the agenda, so I do my suggestion here: Ah - in general anywhere in the middle is fine - the action items we try to do while people turn up - to keep the call short. Just for information, I've added the link to Jean-Baptiste message on the QA part of the pad, so you have it at hand if Jean-Baptiste can't attend. Thank you Sophie :-) I can't attend the call because I will have a professional meeting at the same time. I think we will have a big marketink/communication problem with a lot of duplicates of bug 81633 until spring 2015 if the commit for bug 81309 is not reverted in 4.2.7 and 4.3.3 for which it is only a partial fix. So the problem is not a Calc only problem, especially when Calc developers don't want to be in CC for these Calc bugs. In other words, what should I answer on users mailing list when a user says that his spreadsheets that worked fine since years, suddenly do not work anymore? It is not my job to support a decision which is not mine. Best regards. JBF -- Seuls des formats ouverts peuvent assurer la pérennité de vos documents. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: ESC call Thursday 16:00 central European time ...
Hi there, On Wed, 2014-10-08 at 11:28 +0200, Jean-Baptiste Faure wrote: It is not my job to support a decision which is not mine. Please bear in mind that you are trying here to gently persuade a Calc developer to change their mind, and that tone matters -a-lot- in that process. There is some Greek parable about a man with a coat and the wind the sun that comes to mind. Thanks =) Michael. -- michael.me...@collabora.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sd/source
sd/source/ui/animations/CustomAnimationCreateDialog.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit bc0020344c36fbfc7365b5546e209d0356b53580
Author: Noel Grandin n...@peralex.com
Date: Wed Oct 8 12:22:16 2014 +0200
convert PathKind enum in SD to enum class
to get the NONE constant out of the global namespace
Change-Id: Iecbe39126c1ec08aa852fcb903cee1a6e6f4594b
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.hxx
b/sd/source/ui/animations/CustomAnimationCreateDialog.hxx
index 177eb85..b17be88 100644
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.hxx
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.hxx
@@ -23,7 +23,7 @@
#include CustomAnimationPreset.hxx
#include vcl/tabdlg.hxx
-enum PathKind { NONE, CURVE, POLYGON, FREEFORM };
+enum class PathKind { NONE, CURVE, POLYGON, FREEFORM };
class TabControl;
class OKButton;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18npool/source
i18npool/source/localedata/data/ca_ES_valencia.xml | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit e1c946c80fa3d81fcac4428ad8c03a550273ab41 Author: Eike Rathke er...@redhat.com Date: Wed Oct 8 12:28:37 2014 +0200 derive all from ca-ES, fdo#83292 Change-Id: Ia418876b8535cb69b544217fa7976514e77a88b7 diff --git a/i18npool/source/localedata/data/ca_ES_valencia.xml b/i18npool/source/localedata/data/ca_ES_valencia.xml index 96a34c2..94a983d 100644 --- a/i18npool/source/localedata/data/ca_ES_valencia.xml +++ b/i18npool/source/localedata/data/ca_ES_valencia.xml @@ -32,12 +32,12 @@ LC_CTYPE ref=ca_ES/ LC_FORMAT ref=ca_ES replaceFrom=[CURRENCY] replaceTo=[$â§-803]/ LC_COLLATION ref=ca_ES/ - LC_SEARCH ref=en_US/ - LC_INDEX ref=en_US/ + LC_SEARCH ref=ca_ES/ + LC_INDEX ref=ca_ES/ LC_CALENDAR ref=ca_ES/ LC_CURRENCY ref=ca_ES/ - LC_TRANSLITERATION ref=en_US/ + LC_TRANSLITERATION ref=ca_ES/ LC_MISC ref=ca_ES/ - LC_NumberingLevel ref=en_US/ - LC_OutLineNumberingLevel ref=en_US/ + LC_NumberingLevel ref=ca_ES/ + LC_OutLineNumberingLevel ref=ca_ES/ /Locale ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/appl/shutdownicon.cxx | 19 +--
1 file changed, 1 insertion(+), 18 deletions(-)
New commits:
commit d8a0ecc94bfbfc1d9c8403f0e894d3b7e40384f2
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Oct 8 12:57:00 2014 +0200
Do not terminate desktop from a Timer
sberg kendy, as you recently changed Timer handling on Windows: debugging
why
quickstarter no longer works on Windows, I run into the phenomenon that
IdleTerminate::Timeout (sfx2/source/appl/shutdownicon.cxx) executes on the
main
thread, and from within the m_xDesktop-terminate() call
Timer::ImplDeInitTimer
is called which deletes the pTimerData corresponding to our IldeTerminate,
so
that Timer::ImplTimerCallbackProc, after the return from
IdleTerminate::Timeout, will operate on a stale pTimerData and crash; could
that be related to those recent changes?
kendy sberg: I think mst told that we were previously never deleting the
timer, and that he did some changes there [...]
mst__ sberg, IdleTerminate needs a different implementation
mst__ sberg, does it work to do this via PostUserEvent, as
Application::Quit() does?
sberg mst__, do you think calling terminate from a Timer did work in the
past?
[...]
mst__ sberg, perhaps it did before [a recent] commit but i would guess it
would be more by accident than by design
Change-Id: I23b14ba59a963cc2209a261a1459d532a88acdc0
diff --git a/sfx2/source/appl/shutdownicon.cxx
b/sfx2/source/appl/shutdownicon.cxx
index d98b122..6bd93b1 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -63,7 +63,6 @@
#include unistd.h
#include errno.h
#endif
-#include vcl/timer.hxx
#include sfx2/sfxresid.hxx
@@ -183,22 +182,6 @@ bool LoadModule()
}
-class IdleTerminate : Timer
-{
-::com::sun::star::uno::Reference XDesktop2 m_xDesktop;
-public:
-IdleTerminate (::com::sun::star::uno::Reference XDesktop2 xDesktop)
-{
-m_xDesktop = xDesktop;
-Start();
-}
-virtual void Timeout() SAL_OVERRIDE
-{
-m_xDesktop-terminate();
-delete this;
-}
-};
-
void ShutdownIcon::initSystray()
{
if (m_bInitialized)
@@ -564,7 +547,7 @@ void ShutdownIcon::terminateDesktop()
// terminate desktop only if no tasks exist
::com::sun::star::uno::Reference XIndexAccess xTasks (
xDesktop-getFrames(), UNO_QUERY );
if( xTasks.is() xTasks-getCount() 1 )
-new IdleTerminate( xDesktop );
+Application::Quit();
// remove the instance pointer
ShutdownIcon::pShutdownIcon = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/access/acccontext.cxx | 38 +--
1 file changed, 19 insertions(+), 19 deletions(-)
New commits:
commit bea25d181d0581fd7ec3b6e8ae3ea64479066276
Author: Noel Grandin n...@peralex.com
Date: Wed Oct 8 13:18:46 2014 +0200
convert Action enum in SC to enum class
to get the NONE constant out of the global namespace
Change-Id: I68b7ab93fe0d4f8d02beb96798cd79e8aa3a0c71
diff --git a/sw/source/core/access/acccontext.cxx
b/sw/source/core/access/acccontext.cxx
index d9bc3e3..a0126fc 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -124,7 +124,7 @@ const SwCrsrShell* SwAccessibleContext::GetCrsrShell() const
return pCrsrShell;
}
-enum Action { NONE, SCROLLED, SCROLLED_WITHIN,
+enum class Action { NONE, SCROLLED, SCROLLED_WITHIN,
SCROLLED_IN, SCROLLED_OUT };
void SwAccessibleContext::ChildrenScrolled( const SwFrm *pFrm,
@@ -141,23 +141,23 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrm
*pFrm,
const SwRect aBox( rLower.GetBox( *(GetMap()) ) );
if( rLower.IsAccessible( GetShell()-IsPreview() ) )
{
-Action eAction = NONE;
+Action eAction = Action::NONE;
if( aBox.IsOver( rNewVisArea ) )
{
if( aBox.IsOver( rOldVisArea ) )
{
-eAction = SCROLLED_WITHIN;
+eAction = Action::SCROLLED_WITHIN;
}
else
{
if ( bVisibleChildrenOnly
!rLower.AlwaysIncludeAsChild() )
{
-eAction = SCROLLED_IN;
+eAction = Action::SCROLLED_IN;
}
else
{
-eAction = SCROLLED;
+eAction = Action::SCROLLED;
}
}
}
@@ -166,11 +166,11 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrm
*pFrm,
if ( bVisibleChildrenOnly
!rLower.AlwaysIncludeAsChild() )
{
-eAction = SCROLLED_OUT;
+eAction = Action::SCROLLED_OUT;
}
else
{
-eAction = SCROLLED;
+eAction = Action::SCROLLED;
}
}
else if( !bVisibleChildrenOnly ||
@@ -178,9 +178,9 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrm
*pFrm,
{
// This wouldn't be required if the SwAccessibleFrame,
// wouldn't know about the visible area.
-eAction = SCROLLED;
+eAction = Action::SCROLLED;
}
-if( NONE != eAction )
+if( Action::NONE != eAction )
{
if ( rLower.GetSwFrm() )
{
@@ -193,19 +193,19 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrm
*pFrm,
{
switch( eAction )
{
-case SCROLLED:
+case Action::SCROLLED:
xAccImpl-Scrolled( rOldVisArea );
break;
-case SCROLLED_WITHIN:
+case Action::SCROLLED_WITHIN:
xAccImpl-ScrolledWithin( rOldVisArea );
break;
-case SCROLLED_IN:
+case Action::SCROLLED_IN:
xAccImpl-ScrolledIn();
break;
-case SCROLLED_OUT:
+case Action::SCROLLED_OUT:
xAccImpl-ScrolledOut( rOldVisArea );
break;
-case NONE:
+case Action::NONE:
break;
}
}
@@ -226,24 +226,24 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrm
*pFrm,
{
switch( eAction )
{
-case SCROLLED:
-case SCROLLED_WITHIN:
+case Action::SCROLLED:
+case Action::SCROLLED_WITHIN:
xAccImpl-ViewForwarderChanged(
::accessibility::IAccessibleViewForwarderListener::VISIBLE_AREA,
GetMap() );
break;
-case SCROLLED_IN:
+case Action::SCROLLED_IN:
ScrolledInShape( rLower.GetDrawObject(),
xAccImpl.get()
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c592e7dea2e5ac326041b78b9512600c984ccced Author: Stephan Bergmann sberg...@redhat.com Date: Wed Oct 8 13:22:44 2014 +0200 libgcrypt and gnutls are only used by our internal external/neon ...so must not be checked for if --without-system-neon Change-Id: If598108f98d6f94f32650feba7044224a78a4c12 diff --git a/configure.ac b/configure.ac index 35ed2b2..7da6486 100644 --- a/configure.ac +++ b/configure.ac @@ -9194,7 +9194,7 @@ dnl === dnl Check for building gnutls dnl === AC_MSG_CHECKING([whether to use gnutls]) -if test $WITH_WEBDAV = neon test $enable_openssl = no; then +if test $WITH_WEBDAV = neon -a $with_system_neon = no -a $enable_openssl = no; then AC_MSG_RESULT([yes]) AM_PATH_LIBGCRYPT() PKG_CHECK_MODULES(GNUTLS, [gnutls],, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: ESC call Thursday 16:00 central European time ...
On Wed, 2014-10-08 at 11:14 +0100, Michael Meeks wrote: Hi there, On Wed, 2014-10-08 at 11:28 +0200, Jean-Baptiste Faure wrote: It is not my job to support a decision which is not mine. Please bear in mind that you are trying here to gently persuade a Calc developer to change their mind, and that tone matters -a-lot- in that process. BTW, nobody has to work hard to change my mind. If you or anybody else objects to what I did, just go ahead and revert, and pursuade another able developer to vote for it. That's all that's required. I appreciate people wanting to make this project exciting by creating a drama, but the reality of how we run this project is much more boring. Peace, Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: i18npool/source
i18npool/source/localedata/data/es_CR.xml |7 +++ 1 file changed, 7 insertions(+) New commits: commit aa1c549e65d103910904a75d19672240da10cc54 Author: Eike Rathke er...@redhat.com Date: Wed Oct 8 13:48:02 2014 +0200 add missing legacyOnly currency, fdo#84260 aa33dd16b0e3075f28c56656678c0f5cb764 changed the currency symbol from ¢ to ⡠but changed only the symbol. Actually changing the number format codes wasn't necessary at all, but changing only the symbol is wrong, see also the ATTLIST Currency legacyOnly description in i18npool/source/localedata/data/locale.dtd Hopefully nothing relies on the actual symbol used in the number format codes ... Change-Id: I92e79403fbb80f18c44dc3ecf5a3830a52fd2ff8 diff --git a/i18npool/source/localedata/data/es_CR.xml b/i18npool/source/localedata/data/es_CR.xml index 6a04a8e..ff0d73a 100644 --- a/i18npool/source/localedata/data/es_CR.xml +++ b/i18npool/source/localedata/data/es_CR.xml @@ -185,6 +185,13 @@ CurrencyNameColon/CurrencyName DecimalPlaces2/DecimalPlaces /Currency +Currency default=false usedInCompatibleFormatCodes=false legacyOnly=true + CurrencyIDCRC/CurrencyID + CurrencySymbol¢/CurrencySymbol + BankSymbolCRC/BankSymbol + CurrencyNameColon/CurrencyName + DecimalPlaces2/DecimalPlaces +/Currency /LC_CURRENCY LC_TRANSLITERATION ref=en_US/ LC_MISC ref=es_ES/ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - basegfx/source
basegfx/source/inc/stringconversiontools.hxx | 10 ++--
basegfx/source/tools/stringconversiontools.cxx | 57 -
2 files changed, 51 insertions(+), 16 deletions(-)
New commits:
commit f077f99da3cb2903fa903dcf30e6cfd714fd009c
Author: Armin Le Grand a...@apache.org
Date: Wed Oct 8 11:03:03 2014 +
i125447 corrected some string to number conversion tools to correct svg:d
imports
diff --git a/basegfx/source/inc/stringconversiontools.hxx
b/basegfx/source/inc/stringconversiontools.hxx
index 568772f..d18ccd3 100755
--- a/basegfx/source/inc/stringconversiontools.hxx
+++ b/basegfx/source/inc/stringconversiontools.hxx
@@ -38,19 +38,19 @@ namespace basegfx
const ::rtl::OUString rStr,
const sal_Int32 nLen);
-inline bool lcl_isOnNumberChar(const sal_Unicode aChar, bool
bSignAllowed = true)
+inline bool lcl_isOnNumberChar(const sal_Unicode aChar, bool
bSignAllowed = true, bool bDotAllowed = true)
{
const bool bPredicate( (sal_Unicode('0') = aChar
sal_Unicode('9') = aChar)
|| (bSignAllowed sal_Unicode('+') ==
aChar)
-|| (bSignAllowed sal_Unicode('-') ==
aChar) );
+|| (bSignAllowed sal_Unicode('-') ==
aChar)
+|| (bDotAllowed sal_Unicode('.') ==
aChar));
return bPredicate;
}
-inline bool lcl_isOnNumberChar(const ::rtl::OUString rStr, const
sal_Int32 nPos, bool bSignAllowed = true)
+inline bool lcl_isOnNumberChar(const ::rtl::OUString rStr, const
sal_Int32 nPos, bool bSignAllowed = true, bool bDotAllowed = true)
{
-return lcl_isOnNumberChar(rStr[nPos],
-bSignAllowed);
+return lcl_isOnNumberChar(rStr[nPos], bSignAllowed, bDotAllowed);
}
bool lcl_getDoubleChar(double o_fRetval,
diff --git a/basegfx/source/tools/stringconversiontools.cxx
b/basegfx/source/tools/stringconversiontools.cxx
index 01fbf26..08c023b 100755
--- a/basegfx/source/tools/stringconversiontools.cxx
+++ b/basegfx/source/tools/stringconversiontools.cxx
@@ -51,37 +51,53 @@ namespace basegfx
}
}
-bool lcl_getDoubleChar(double o_fRetval,
-sal_Int32 io_rPos,
-const ::rtl::OUString rStr)
+bool lcl_getDoubleChar(double o_fRetval, sal_Int32 io_rPos, const
::rtl::OUString rStr)
{
sal_Unicode aChar( rStr[io_rPos] );
::rtl::OUStringBuffer sNumberString;
+// sign
if(sal_Unicode('+') == aChar || sal_Unicode('-') == aChar)
{
sNumberString.append(rStr[io_rPos]);
aChar = rStr[++io_rPos];
}
-while((sal_Unicode('0') = aChar sal_Unicode('9') = aChar)
-|| sal_Unicode('.') == aChar)
+// numbers before point
+while(sal_Unicode('0') = aChar sal_Unicode('9') = aChar)
{
sNumberString.append(rStr[io_rPos]);
aChar = rStr[++io_rPos];
}
+// point
+if(sal_Unicode('.') == aChar)
+{
+sNumberString.append(rStr[io_rPos]);
+aChar = rStr[++io_rPos];
+}
+
+// numbers after point
+while(sal_Unicode('0') = aChar sal_Unicode('9') = aChar)
+{
+sNumberString.append(rStr[io_rPos]);
+aChar = rStr[++io_rPos];
+}
+
+// 'e'
if(sal_Unicode('e') == aChar || sal_Unicode('E') == aChar)
{
sNumberString.append(rStr[io_rPos]);
aChar = rStr[++io_rPos];
+// sign for 'e'
if(sal_Unicode('+') == aChar || sal_Unicode('-') == aChar)
{
sNumberString.append(rStr[io_rPos]);
aChar = rStr[++io_rPos];
}
+// number for 'e'
while(sal_Unicode('0') = aChar sal_Unicode('9') = aChar)
{
sNumberString.append(rStr[io_rPos]);
@@ -153,34 +169,53 @@ namespace basegfx
{
bool bSignAllowed(true);
-while(io_rPos nLen lcl_isOnNumberChar(rStr, io_rPos,
bSignAllowed))
+while(io_rPos nLen lcl_isOnNumberChar(rStr, io_rPos,
bSignAllowed, true))
{
bSignAllowed = false;
++io_rPos;
}
}
-void lcl_skipDouble(sal_Int32 io_rPos,
-const ::rtl::OUString rStr)
+void lcl_skipDouble(sal_Int32 io_rPos, const
Re: ESC call Thursday 16:00 central European time ...
Hi, On Wed, Oct 08, 2014 at 07:35:30AM -0400, Kohei Yoshida wrote: BTW, nobody has to work hard to change my mind. If you or anybody else objects to what I did, just go ahead and revert, and pursuade another able developer to vote for it. That's all that's required. I totally believe Kohei works on this -- and elsewhere -- with the best intentions, so I see little point in the aggression against the change here. OTOH the prospect of people doing wikipedia-style edit-wars on gerrit with changes and reverts at some point isnt too appealing either. So a sober discussion of this on the ESC to close the topic, while still sucking, isnt too bad an idea at this point IMHO. OTOH a _much_ better point for this discussion would had been when the original patch was still on review. The tricky part is to have more visiblity on that without drowning everyone in noise. If anyone has some good code or tooling to help create better visibility, I guess that would be appreciated[1]. Best, Bjoern [1] E.g. someone volunteering to tweak the daily gerrit digest to: - work on release branches - do a weekly? digest - sorted by the source code module (so some could watch Writer, some Calc, etc.) Could allow QA/supporter guys to have more early visibility of what is happening. Then again, this would need people to actually _read_ that regularly. If anyone volunteers to invest (both in writing/setting up the tooling and creating a group using it) here, it might be worth a few experiments. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: i18npool/source
i18npool/source/calendar/calendar_gregorian.cxx |2 +-
i18npool/source/calendar/calendar_hijri.cxx |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit dbb5345b16ea0c959a91e261ab3b510e08a7bd21
Author: Eike Rathke er...@redhat.com
Date: Wed Oct 8 14:12:54 2014 +0200
back out wrong and confusing tools::Time comment change
Apparently fc04f76336fdf8c96e35382cdeb497e2f939705c used some sed script
to change all ...
Change-Id: I0a8171aa474070bb1a8584e5c8c714fe34694618
diff --git a/i18npool/source/calendar/calendar_gregorian.cxx
b/i18npool/source/calendar/calendar_gregorian.cxx
index c09432d..ee90844 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/i18npool/source/calendar/calendar_gregorian.cxx
@@ -646,7 +646,7 @@ void Calendar_gregorian::setValue() throw(RuntimeException)
DUMP_ICU_CAL_MSG((%s\n,setValue() after Zone/DST glitch
resubmit));
DUMP_I18N_CAL_MSG((%s\n,setValue() after Zone/DST glitch
resubmit));
-// tools::Time zone transition = resubmit.
+// Time zone transition = resubmit.
// TZ=America/St_Johns date = 1935-03-30
// -3:30:52 (!) instead of -3:30
// if first submission included time zone -3:30 that would be
wrong.
diff --git a/i18npool/source/calendar/calendar_hijri.cxx
b/i18npool/source/calendar/calendar_hijri.cxx
index b1381d8..a020041 100644
--- a/i18npool/source/calendar/calendar_hijri.cxx
+++ b/i18npool/source/calendar/calendar_hijri.cxx
@@ -115,7 +115,7 @@ Calendar_hijri::NewMoon(sal_Int32 n)
{
double jd, t, t2, t3, k, ma, sa, tf, xtra;
k = n;
-t = k/1236.85; // tools::Time in Julian centuries from 1900 January 0.5
+t = k/1236.85; // Time in Julian centuries from 1900 January 0.5
t2 = t * t;
t3 = t2 * t;
@@ -160,7 +160,7 @@ Calendar_hijri::NewMoon(sal_Int32 n)
+ 0.0010 * sin(tf - ma)
+ 0.0005 * sin(sa + 2 * ma);
-// convert from Ephemeris tools::Time (ET) to (approximate) Universal
tools::Time (UT)
+// convert from Ephemeris Time (ET) to (approximate) Universal Time (UT)
jd += xtra - (0.41 + 1.2053 * t + 0.4992 * t2)/1440;
return (jd);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/source forms/source fpicker/source oox/source sd/source sfx2/source shell/source slideshow/source sw/source toolkit/source vcl/win xmlsecurity/source
basic/source/comp/sbcomp.cxx |4 ++--
basic/source/sbx/sbxdate.cxx |2 +-
forms/source/component/DatabaseForm.cxx|2 +-
forms/source/xforms/xpathlib/xpathlib.cxx |2 +-
fpicker/source/office/iodlg.cxx|2 +-
oox/source/drawingml/textfield.cxx |8
sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx|2 +-
sfx2/source/doc/SfxDocumentMetaData.cxx|4 ++--
shell/source/win32/shlxthandler/util/iso8601_converter.cxx |2 +-
slideshow/source/engine/slideshowimpl.cxx |2 +-
sw/source/core/doc/docdraw.cxx |2 +-
sw/source/core/layout/layact.cxx |2 +-
toolkit/source/controls/unocontrols.cxx|2 +-
vcl/win/source/app/salinst.cxx |4 ++--
xmlsecurity/source/component/documentdigitalsignatures.cxx |2 +-
15 files changed, 21 insertions(+), 21 deletions(-)
New commits:
commit 04a810cee48d213806f13deb7953caa39ad08628
Author: Eike Rathke er...@redhat.com
Date: Wed Oct 8 14:23:41 2014 +0200
back out more wrong and confusing tools::Time comment changes
Apparently fc04f76336fdf8c96e35382cdeb497e2f939705c used some sed script
to change all ...
Change-Id: Ie609bd02a2c5d70109fc6185cf4440480f29d8f5
diff --git a/basic/source/comp/sbcomp.cxx b/basic/source/comp/sbcomp.cxx
index 183ecbb..8af2d4e 100644
--- a/basic/source/comp/sbcomp.cxx
+++ b/basic/source/comp/sbcomp.cxx
@@ -606,7 +606,7 @@ void dbg_traceStep( SbModule* pModule, sal_uInt32 nPC,
sal_Int32 nCallLvl )
{
double dDiffTime = dCurTime - GdLastTime;
GdLastTime = dCurTime;
-sprintf( TimeBuffer, \t\t// tools::Time = %f ms / += %f ms,
dCurTime*1000.0, dDiffTime*1000.0 );
+sprintf( TimeBuffer, \t\t// Time = %f ms / += %f ms,
dCurTime*1000.0, dDiffTime*1000.0 );
}
#endif
@@ -802,7 +802,7 @@ void dbg_traceNotifyCall( SbModule* pModule, SbMethod*
pMethod, sal_Int32 nCallL
char TimeBuffer[200];
if( GbTimerOn bLeave )
{
-sprintf( TimeBuffer, // Execution tools::Time = %f ms,
dExecutionTime*1000.0 );
+sprintf( TimeBuffer, // Execution Time = %f ms,
dExecutionTime*1000.0 );
pPostStr = TimeBuffer;
}
#endif
diff --git a/basic/source/sbx/sbxdate.cxx b/basic/source/sbx/sbxdate.cxx
index b2f5be0f..5f0bcca 100644
--- a/basic/source/sbx/sbxdate.cxx
+++ b/basic/source/sbx/sbxdate.cxx
@@ -280,7 +280,7 @@ start:
// if the whole-number part is 0, we want no year!
if( n = -1.0 || n = 1.0 )
{
-// tools::Time only if != 00:00:00
+// Time only if != 00:00:00
if( floor( n ) == n )
{
switch( eDate )
diff --git a/forms/source/component/DatabaseForm.cxx
b/forms/source/component/DatabaseForm.cxx
index 26430aa..55c1822 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -790,7 +790,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList
rList, const Referenc
} break;
case FormComponentType::TIMEFIELD:
{
-// name=value // Value is a tools::Time with the format
HH:MM:SS
+// name=value // Value is a Time with the format HH:MM:SS
// no value (NULL) means empty value
if( hasProperty(PROPERTY_TIME, xComponentSet) )
{
diff --git a/forms/source/xforms/xpathlib/xpathlib.cxx
b/forms/source/xforms/xpathlib/xpathlib.cxx
index 776a264..70c473e 100644
--- a/forms/source/xforms/xpathlib/xpathlib.cxx
+++ b/forms/source/xforms/xpathlib/xpathlib.cxx
@@ -233,7 +233,7 @@ void xforms_propertyFunction(xmlXPathParserContextPtr ctxt,
int nargs)
xmlXPathReturnEmptyString(ctxt);
}
-// Date and tools::Time Functions
+// Date and Time Functions
static OString makeDateTimeString (const DateTime aDateTime, bool bUTC = true)
{
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 183bddf..74b612f 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -113,7 +113,7 @@ using namespace InternalFilePickerElementIds;
#define GET_DECODED_NAME(aObj) \
aObj.getName( INetURLObject::LAST_SEGMENT, true,
INetURLObject::DECODE_WITH_CHARSET )
-// tools::Time to wait while traveling in the filterbox until
+// Time to wait while traveling in the filterbox until
// the browsebox gets filtered ( in ms).
#define TRAVELFILTER_TIMEOUT750
diff --git a/oox/source/drawingml/textfield.cxx
b/oox/source/drawingml/textfield.cxx
index b8a6f72..2523156 100644
--- a/oox/source/drawingml/textfield.cxx
+++ b/oox/source/drawingml/textfield.cxx
@@ -97,17 +97,17 @@ void lclCreateTextFields(
[Libreoffice-commits] core.git: basic/source lotuswordpro/source slideshow/source sw/qa unotools/source xmloff/source
basic/source/comp/sbcomp.cxx |2 +-
lotuswordpro/source/filter/xfilter/xftimestyle.cxx |2 +-
slideshow/source/engine/slideshowimpl.cxx |4 ++--
sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx |2 +-
unotools/source/misc/datetime.cxx |2 +-
xmloff/source/core/xmluconv.cxx|8
6 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit f84dac9b1f394b05ceabb54fc77663cd747a3148
Author: Eike Rathke er...@redhat.com
Date: Wed Oct 8 14:34:58 2014 +0200
back out even more wrong tools::Time changes, geez..
Change-Id: I52eb340076d7f554c3bdb8746f65b7990388
diff --git a/basic/source/comp/sbcomp.cxx b/basic/source/comp/sbcomp.cxx
index 8af2d4e..293e8cf 100644
--- a/basic/source/comp/sbcomp.cxx
+++ b/basic/source/comp/sbcomp.cxx
@@ -382,7 +382,7 @@ void lcl_printTimeOutput( void )
{
// Overall time output
lcl_lineOut( );
-lcl_lineOut( * tools::Time Output * );
+lcl_lineOut( * Time Output * );
char TimeBuffer[500];
double dTotalTime = GpTimer-getElapsedTime() - GdStartTime;
sprintf( TimeBuffer, Total execution time = %f ms, dTotalTime*1000.0 );
diff --git a/lotuswordpro/source/filter/xfilter/xftimestyle.cxx
b/lotuswordpro/source/filter/xfilter/xftimestyle.cxx
index 188e94a..73072df 100644
--- a/lotuswordpro/source/filter/xfilter/xftimestyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftimestyle.cxx
@@ -55,7 +55,7 @@
/
/*
* @file
- * tools::Time style. The TIme format for time field.
+ * Time style. The Time format for time field.
/
#include xftimestyle.hxx
diff --git a/slideshow/source/engine/slideshowimpl.cxx
b/slideshow/source/engine/slideshowimpl.cxx
index 3cec24f..21c3213 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -157,11 +157,11 @@ private:
animations.
*/
canvas::tools::ElapsedTime maTimer;
-/** tools::Time between the display of frames. Enforced only when
mbIsActive
+/** Time between the display of frames. Enforced only when mbIsActive
is TRUE/.
*/
const double mnFrameDuration;
-/** tools::Time (of maTimer) when the next frame shall be displayed.
+/** Time (of maTimer) when the next frame shall be displayed.
Synchronize() will wait until this time.
*/
double mnNextFrameTargetTime;
diff --git a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
index ebe5914..923a82f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
@@ -566,7 +566,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo81492, fdo81492.docx)
DECLARE_OOXMLEXPORT_TEST(testEditTime, fdo81341.docx)
{
/* Issue was LO was not able to Import and Export EditTime in seconds
format.
- * It was supporting tools::Time in HH:MM format. But if DOCX conatins
tools::Time in seconds,
+ * It was supporting Time in HH:MM format. But if DOCX conatins Time in
seconds,
* then LO was not able to display time in HH:MM:SS format.
* While exporting LO was writing plian text instead of field entry.
*/
diff --git a/unotools/source/misc/datetime.cxx
b/unotools/source/misc/datetime.cxx
index 559cb3f..fa49c78 100644
--- a/unotools/source/misc/datetime.cxx
+++ b/unotools/source/misc/datetime.cxx
@@ -338,7 +338,7 @@ bool ISO8601parseDate(const OUString aDateStr,
css::util::Date rDate)
return bSuccess;
}
-/** convert ISO8601 tools::Time String to util::Time */
+/** convert ISO8601 Time String to util::Time */
bool ISO8601parseTime(const OUString aTimeStr, css::util::Time rTime)
{
bool bSuccess = true;
diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx
index ce2076e..7bea9ca 100644
--- a/xmloff/source/core/xmluconv.cxx
+++ b/xmloff/source/core/xmluconv.cxx
@@ -305,21 +305,21 @@ bool SvXMLUnitConverter::setNullDate(const
com::sun::star::uno::Reference com::
return false;
}
-/** convert double to ISO Date tools::Time String */
+/** convert double to ISO Date Time String */
void SvXMLUnitConverter::convertDateTime(OUStringBuffer rBuffer,
const double fDateTime, bool const bAddTimeIf0AM)
{
convertDateTime(rBuffer, fDateTime, m_pImpl-m_aNullDate, bAddTimeIf0AM);
}
-/** convert ISO Date tools::Time String to double */
+/** convert ISO Date Time String to double */
bool SvXMLUnitConverter::convertDateTime(double fDateTime,
const OUString rString)
{
return convertDateTime(fDateTime, rString, m_pImpl-m_aNullDate);
}
-/** convert double to ISO Date tools::Time String */
+/** convert double to ISO Date Time
[Libreoffice-commits] core.git: sc/source
sc/source/ui/unoobj/chart2uno.cxx | 41 --
1 file changed, 22 insertions(+), 19 deletions(-)
New commits:
commit deed6dcacd355ce84cada955887a31e7d8cb5fb1
Author: Caolán McNamara caol...@redhat.com
Date: Wed Oct 8 12:57:07 2014 +0100
Resolves: fdo#48405 GetString can call a macro which modifies the document
causing m_aDataArray to be cleared, so the rItem the result of GetString
is being assigned to is invalid
Change-Id: I1dc30d675233ddc53234bdb5349c5f374b036ca8
diff --git a/sc/source/ui/unoobj/chart2uno.cxx
b/sc/source/ui/unoobj/chart2uno.cxx
index 9283ffe..b8a62ab 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -2608,18 +2608,16 @@ void ScChart2DataSequence::BuildDataCache()
continue;
}
-m_aDataArray.push_back(Item());
-Item rItem = m_aDataArray.back();
-++nDataCount;
+Item aItem;
ScAddress aAdr(nCol, nRow, nTab);
-rItem.maString = m_pDocument-GetString(aAdr);
+aItem.maString = m_pDocument-GetString(aAdr);
switch (m_pDocument-GetCellType(aAdr))
{
case CELLTYPE_VALUE:
-rItem.mfValue = m_pDocument-GetValue(aAdr);
-rItem.mbIsValue = true;
+aItem.mfValue = m_pDocument-GetValue(aAdr);
+aItem.mbIsValue = true;
break;
case CELLTYPE_FORMULA:
{
@@ -2632,8 +2630,8 @@ void ScChart2DataSequence::BuildDataCache()
if (pFCell-IsValue())
{
-rItem.mfValue = pFCell-GetValue();
-rItem.mbIsValue = true;
+aItem.mfValue = pFCell-GetValue();
+aItem.mbIsValue = true;
}
}
break;
@@ -2643,6 +2641,9 @@ void ScChart2DataSequence::BuildDataCache()
default:
; // do nothing
}
+
+m_aDataArray.push_back(aItem);
+++nDataCount;
}
}
}
@@ -2714,17 +2715,15 @@ sal_Int32
ScChart2DataSequence::FillCacheFromExternalRef(const ScTokenRef pToke
{
if (pMat-IsValue(nC, nR) || pMat-IsBoolean(nC, nR))
{
-m_aDataArray.push_back(Item());
-Item rItem = m_aDataArray.back();
-++nDataCount;
+Item aItem;
-rItem.mbIsValue = true;
-rItem.mfValue = pMat-GetDouble(nC, nR);
+aItem.mbIsValue = true;
+aItem.mfValue = pMat-GetDouble(nC, nR);
SvNumberFormatter* pFormatter =
m_pDocument-GetFormatTable();
if (pFormatter)
{
-const double fVal = rItem.mfValue;
+const double fVal = aItem.mfValue;
Color* pColor = NULL;
sal_uInt32 nFmt = 0;
if (pTable)
@@ -2734,17 +2733,21 @@ sal_Int32
ScChart2DataSequence::FillCacheFromExternalRef(const ScTokenRef pToke
SCROW nRow = aRange.aStart.Row() +
static_castSCROW(nR);
pTable-getCell(nCol, nRow, nFmt);
}
-pFormatter-GetOutputString(fVal, nFmt,
rItem.maString, pColor);
+pFormatter-GetOutputString(fVal, nFmt,
aItem.maString, pColor);
}
+
+m_aDataArray.push_back(aItem);
+++nDataCount;
}
else if (pMat-IsString(nC, nR))
{
+Item aItem;
+
+aItem.mbIsValue = false;
+aItem.maString = pMat-GetString(nC, nR).getString();
+
m_aDataArray.push_back(Item());
-Item rItem = m_aDataArray.back();
++nDataCount;
-
-rItem.mbIsValue = false;
-rItem.maString = pMat-GetString(nC, nR).getString();
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cppuhelper/source sfx2/source sfx2/util
cppuhelper/source/servicemanager.cxx |1 -
sfx2/source/appl/shutdownicon.cxx| 23 ++-
sfx2/util/sfx.component |1 +
3 files changed, 23 insertions(+), 2 deletions(-)
New commits:
commit 98bb53a5609f8651b0841e8326d7aa53fd56ab3b
Author: Matúš Kukan matus.ku...@collabora.com
Date: Thu Oct 2 15:15:28 2014 +0200
fdo#80927: css.office.Quickstart should be single-instance service.
Incorrectly converted in a384b21cc40818bf3c918951a086a30b5d9d8022
where SFX_IMPL_ONEINSTANCEFACTORY was used.
AFAICS it's the first converted single-instance service which implements
css::lang::XInitialization. That's kind of strange but can do its job.
sberg...@redhat.com: Three things were necessary in order to not call the
~ShutdownIcon code too late during exit now:
* Move the relevant code from ~ShutdownIcon to ShutdownIcon::disposing.
* Add a dummy singleton name=com.sun.star.office.theQuickstart/ so the
service manager will eventually dispose the (single) instance.
* In
cppuhelper::ServiceManager::Data::Implementation::createInstanceWithArguments
do not shortcut updateDisposeSingleton in that odd case of calling
createInstanceWithArguments on an implementation that (effectively) is a
singleton (as otherwise the service manager would still not dispose it).
It
looks to me like that return inst; was an inadvertent leftover in
874c481801434d4fac3c50f076bff0fe3a3988b6 Simplify service manager's
tracking
of singletons and wasn't intended to serve some subtle purpose.
Change-Id: Icd4d3168ec0bbb820b17ac321fe897ac9f9ce7fc
diff --git a/cppuhelper/source/servicemanager.cxx
b/cppuhelper/source/servicemanager.cxx
index ed8e9ec..8a2cdca 100644
--- a/cppuhelper/source/servicemanager.cxx
+++ b/cppuhelper/source/servicemanager.cxx
@@ -711,7 +711,6 @@
cppuhelper::ServiceManager::Data::Implementation::createInstanceWithArguments(
if (init.is()) {
init-initialize(arguments);
}
-return inst;
} else if (factory1.is()) {
inst = factory1-createInstanceWithArgumentsAndContext(
arguments, context);
diff --git a/sfx2/source/appl/shutdownicon.cxx
b/sfx2/source/appl/shutdownicon.cxx
index 6bd93b1..f8f0e2a 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -600,6 +600,8 @@ void SAL_CALL ShutdownIcon::disposing()
{
m_xContext.clear();
m_xDesktop.clear();
+
+deInitSystray();
}
@@ -903,12 +905,31 @@ void SAL_CALL ShutdownIcon::setFastPropertyValue(
::sal_Int32
return aValue;
}
+namespace {
+
+struct Instance {
+explicit Instance(
+css::uno::Referencecss::uno::XComponentContext const context):
+instance(static_castcppu::OWeakObject *(new ShutdownIcon(context)))
+{}
+
+rtl::Referencecss::uno::XInterface instance;
+};
+
+struct Singleton:
+public rtl::StaticWithArg
+Instance, css::uno::Referencecss::uno::XComponentContext, Singleton
+{};
+
+}
+
extern C SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
com_sun_star_comp_desktop_QuickstartWrapper_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequencecss::uno::Any const )
{
-return cppu::acquire(new ShutdownIcon(context));
+return cppu::acquire(static_castcppu::OWeakObject *(
+Singleton::get(context).instance.get()));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/util/sfx.component b/sfx2/util/sfx.component
index 203acc8..91002da 100644
--- a/sfx2/util/sfx.component
+++ b/sfx2/util/sfx.component
@@ -35,6 +35,7 @@
implementation name=com.sun.star.comp.desktop.QuickstartWrapper
constructor=com_sun_star_comp_desktop_QuickstartWrapper_get_implementation
service name=com.sun.star.office.Quickstart/
+singleton name=com.sun.star.office.theQuickstart/
/implementation
implementation name=com.sun.star.comp.document.OwnSubFilter
constructor=com_sun_star_comp_document_OwnSubFilter_get_implementation
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: ESC call Thursday 16:00 central European time ...
Hi, Le 08/10/2014 14:10, Bjoern Michaelsen a écrit : OTOH a _much_ better point for this discussion would had been when the original patch was still on review. The problem is not the original patch (the patch for the master), it works perfectly and Kohei did a fantastic job with it and its complementary patch which added the configuration option allowing the choose between the new behavior and the former. Thank you very much for that. The issue is in the decision to backport the first patch without the configuration option (fdo#81309 only) to 4.3.1 and 4.2.7 as if this former behavior was completely broken. Ok, it is not perfect but many spreadsheets are build on this behavior since many years. With 4.3.2 and 4.2.7 all these spreadsheets do not work anymore and the users have to heavily modify the logic of their spreadsheets if they want to continue to use sort with references. Please try the test file in bug 81633 yourself. Compare sorting in 4.2.6 and in 4.2.7 or the master (with the new behavior). For me (and I am not alone to think that, see the growing number of duplicates of bug 81633), such big change should be done only for a x.y.0 version with a clear information in the release notes. Best regards. JBF -- Seuls des formats ouverts peuvent assurer la pérennité de vos documents. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/Executable_icontest.mk vcl/Module_vcl.mk vcl/workben
vcl/Executable_icontest.mk | 51 +++
vcl/Module_vcl.mk |4
vcl/workben/icontest.cxx | 294 +
3 files changed, 348 insertions(+), 1 deletion(-)
New commits:
commit 80c11d648e88f3195f7e4fb465cd6902bcf46867
Author: Tor Lillqvist t...@collabora.com
Date: Wed Oct 8 16:05:45 2014 +0300
Add a start on a temporary test prog for traditional vcl vs. OpenGL
Does nothing useful so far.
Change-Id: I9d288a8b8ab92e01a28c92bb41162af4410e0163
diff --git a/vcl/Executable_icontest.mk b/vcl/Executable_icontest.mk
new file mode 100644
index 000..76390c8
--- /dev/null
+++ b/vcl/Executable_icontest.mk
@@ -0,0 +1,51 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Executable_Executable,icontest))
+
+$(eval $(call gb_Executable_use_externals,icontest,\
+boost_headers \
+glew \
+ glm_headers \
+ mesa_headers \
+))
+
+$(eval $(call gb_Executable_use_api,icontest,\
+offapi \
+udkapi \
+))
+
+ifeq ($(OS),LINUX)
+
+$(eval $(call gb_Executable_add_libs,icontest,\
+-lGL \
+))
+
+endif
+
+$(eval $(call gb_Executable_use_static_libraries,icontest,\
+vclmain \
+))
+
+$(eval $(call gb_Executable_use_libraries,icontest,\
+comphelper \
+cppu \
+cppuhelper \
+sal \
+tl \
+ucbhelper \
+vcl \
+vclopengl \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,icontest,\
+vcl/workben/icontest \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index d875016..6c087e6 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -24,7 +24,9 @@ $(eval $(call gb_Module_add_targets,vcl,\
Library_vcl \
$(if $(filter DESKTOP,$(BUILD_TYPE)), \
StaticLibrary_vclmain \
-Executable_ui-previewer) \
+Executable_ui-previewer \
+ $(if $(filter LINUX,$(OS)), \
+ Executable_icontest)) \
$(if $(filter-out ANDROID IOS WNT,$(OS)), \
Executable_svdemo \
Executable_svptest \
diff --git a/vcl/workben/icontest.cxx b/vcl/workben/icontest.cxx
new file mode 100644
index 000..c043ae0
--- /dev/null
+++ b/vcl/workben/icontest.cxx
@@ -0,0 +1,294 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include GL/glew.h
+
+#include com/sun/star/lang/XComponent.hpp
+#include com/sun/star/lang/XMultiComponentFactory.hpp
+#include com/sun/star/lang/XMultiServiceFactory.hpp
+#include com/sun/star/ucb/UniversalContentBroker.hpp
+#include comphelper/processfactory.hxx
+#include cppuhelper/bootstrap.hxx
+#include osl/file.hxx
+#include vcl/builder.hxx
+#include vcl/button.hxx
+#include vcl/dialog.hxx
+#include vcl/fixed.hxx
+#include vcl/graph.hxx
+#include vcl/graphicfilter.hxx
+#include vcl/image.hxx
+#include vcl/openglwin.hxx
+#include vcl/opengl/OpenGLContext.hxx
+#include vcl/opengl/OpenGLHelper.hxx
+#include vcl/svapp.hxx
+#include vcl/vclmain.hxx
+#include vcl/wrkwin.hxx
+
+using namespace com::sun::star;
+
+class MyWorkWindow : public WorkWindow
+{
+private:
+bool mbPainted;
+OUString msKind;
+OpenGLWindow *mpOpenGLWindow;
+
+public:
+MyWorkWindow( const char *kind, vcl::Window* pParent, WinBits nWinStyle );
+
+virtual void MouseButtonDown( const MouseEvent rMEvt ) SAL_OVERRIDE;
+virtual void Paint( const Rectangle rRect ) SAL_OVERRIDE;
+virtual void Resize() SAL_OVERRIDE;
+};
+
+MyWorkWindow::MyWorkWindow( const char *kind, vcl::Window* pParent, WinBits
nWinStyle ) :
+WorkWindow( pParent, nWinStyle )
+{
+EnableInput();
+mbPainted = false;
+msKind = OUString( kind, strlen(kind), RTL_TEXTENCODING_UTF8 );
+if( msKind == opengl )
+{
+mpOpenGLWindow = new OpenGLWindow( this );
+mpOpenGLWindow-SetSizePixel( Size( 1000, 800 ) );
+mpOpenGLWindow-Show();
+mpOpenGLWindow-EnableInput();
+ }
+}
+
+void MyWorkWindow::MouseButtonDown( const MouseEvent rMEvt )
+{
+SAL_INFO(vcl.icontest, MouseButtonDown: rMEvt.GetPosPixel() );
+Size aSize( GetSizePixel() );
+Paint( Rectangle( Point( 0, 0 ), aSize ) );
+WorkWindow::MouseButtonDown( rMEvt );
+}
+
+void MyWorkWindow::Paint( const Rectangle rRect )
+{
+if( msKind == opengl )
+{
+SAL_INFO(vcl.icontest, == Paint! (OpenGL) GetSizePixel());
+OpenGLContext aCtx = mpOpenGLWindow-getContext();
+aCtx.requestLegacyContext();
+
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - cppuhelper/source sfx2/source sfx2/util
cppuhelper/source/servicemanager.cxx |1 -
sfx2/source/appl/shutdownicon.cxx| 23 ++-
sfx2/util/sfx.component |1 +
3 files changed, 23 insertions(+), 2 deletions(-)
New commits:
commit e5311e010159d79d83b5c1b42bbfbfe9d8df5189
Author: Matúš Kukan matus.ku...@collabora.com
Date: Thu Oct 2 15:15:28 2014 +0200
fdo#80927: css.office.Quickstart should be single-instance service.
Incorrectly converted in a384b21cc40818bf3c918951a086a30b5d9d8022
where SFX_IMPL_ONEINSTANCEFACTORY was used.
AFAICS it's the first converted single-instance service which implements
css::lang::XInitialization. That's kind of strange but can do its job.
sberg...@redhat.com: Three things were necessary in order to not call the
~ShutdownIcon code too late during exit now:
* Move the relevant code from ~ShutdownIcon to ShutdownIcon::disposing.
* Add a dummy singleton name=com.sun.star.office.theQuickstart/ so the
service manager will eventually dispose the (single) instance.
* In
cppuhelper::ServiceManager::Data::Implementation::createInstanceWithArguments
do not shortcut updateDisposeSingleton in that odd case of calling
createInstanceWithArguments on an implementation that (effectively) is a
singleton (as otherwise the service manager would still not dispose it).
It
looks to me like that return inst; was an inadvertent leftover in
874c481801434d4fac3c50f076bff0fe3a3988b6 Simplify service manager's
tracking
of singletons and wasn't intended to serve some subtle purpose.
Change-Id: Icd4d3168ec0bbb820b17ac321fe897ac9f9ce7fc
(cherry picked from commit 98bb53a5609f8651b0841e8326d7aa53fd56ab3b)
Reviewed-on: https://gerrit.libreoffice.org/11850
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
diff --git a/cppuhelper/source/servicemanager.cxx
b/cppuhelper/source/servicemanager.cxx
index 94d2ec5..20471b7 100644
--- a/cppuhelper/source/servicemanager.cxx
+++ b/cppuhelper/source/servicemanager.cxx
@@ -734,7 +734,6 @@
cppuhelper::ServiceManager::Data::Implementation::createInstanceWithArguments(
if (init.is()) {
init-initialize(arguments);
}
-return inst;
} else if (factory1.is()) {
inst = factory1-createInstanceWithArgumentsAndContext(
arguments, context);
diff --git a/sfx2/source/appl/shutdownicon.cxx
b/sfx2/source/appl/shutdownicon.cxx
index 9a5c9e4..11058e2 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -665,6 +665,8 @@ void SAL_CALL ShutdownIcon::disposing()
{
m_xContext.clear();
m_xDesktop.clear();
+
+deInitSystray();
}
@@ -968,12 +970,31 @@ void SAL_CALL ShutdownIcon::setFastPropertyValue(
::sal_Int32
return aValue;
}
+namespace {
+
+struct Instance {
+explicit Instance(
+css::uno::Referencecss::uno::XComponentContext const context):
+instance(static_castcppu::OWeakObject *(new ShutdownIcon(context)))
+{}
+
+rtl::Referencecss::uno::XInterface instance;
+};
+
+struct Singleton:
+public rtl::StaticWithArg
+Instance, css::uno::Referencecss::uno::XComponentContext, Singleton
+{};
+
+}
+
extern C SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
com_sun_star_comp_desktop_QuickstartWrapper_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequencecss::uno::Any const )
{
-return cppu::acquire(new ShutdownIcon(context));
+return cppu::acquire(static_castcppu::OWeakObject *(
+Singleton::get(context).instance.get()));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/util/sfx.component b/sfx2/util/sfx.component
index 203acc8..91002da 100644
--- a/sfx2/util/sfx.component
+++ b/sfx2/util/sfx.component
@@ -35,6 +35,7 @@
implementation name=com.sun.star.comp.desktop.QuickstartWrapper
constructor=com_sun_star_comp_desktop_QuickstartWrapper_get_implementation
service name=com.sun.star.office.Quickstart/
+singleton name=com.sun.star.office.theQuickstart/
/implementation
implementation name=com.sun.star.comp.document.OwnSubFilter
constructor=com_sun_star_comp_document_OwnSubFilter_get_implementation
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - 2 commits - sfx2/source
sfx2/source/appl/shutdownicon.cxx| 173 ++-
sfx2/source/appl/shutdownicon.hxx|8 -
sfx2/source/appl/shutdowniconunx.cxx |1
3 files changed, 55 insertions(+), 127 deletions(-)
New commits:
commit 8a6275b0b92d959f0b440a73362c7ec0eea4436e
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Oct 8 12:57:00 2014 +0200
Do not terminate desktop from a Timer
sberg kendy, as you recently changed Timer handling on Windows: debugging
why
quickstarter no longer works on Windows, I run into the phenomenon that
IdleTerminate::Timeout (sfx2/source/appl/shutdownicon.cxx) executes on the
main
thread, and from within the m_xDesktop-terminate() call
Timer::ImplDeInitTimer
is called which deletes the pTimerData corresponding to our IldeTerminate,
so
that Timer::ImplTimerCallbackProc, after the return from
IdleTerminate::Timeout, will operate on a stale pTimerData and crash; could
that be related to those recent changes?
kendy sberg: I think mst told that we were previously never deleting the
timer, and that he did some changes there [...]
mst__ sberg, IdleTerminate needs a different implementation
mst__ sberg, does it work to do this via PostUserEvent, as
Application::Quit() does?
sberg mst__, do you think calling terminate from a Timer did work in the
past?
[...]
mst__ sberg, perhaps it did before [a recent] commit but i would guess it
would be more by accident than by design
Change-Id: I23b14ba59a963cc2209a261a1459d532a88acdc0
(cherry picked from commit d8a0ecc94bfbfc1d9c8403f0e894d3b7e40384f2)
Reviewed-on: https://gerrit.libreoffice.org/11852
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
diff --git a/sfx2/source/appl/shutdownicon.cxx
b/sfx2/source/appl/shutdownicon.cxx
index 1ed8c9c..55e1c5e 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -63,7 +63,6 @@
#include unistd.h
#include errno.h
#endif
-#include vcl/timer.hxx
#include sfx2/sfxresid.hxx
@@ -183,22 +182,6 @@ bool LoadModule()
}
-class IdleTerminate : Timer
-{
-::com::sun::star::uno::Reference XDesktop2 m_xDesktop;
-public:
-IdleTerminate (::com::sun::star::uno::Reference XDesktop2 xDesktop)
-{
-m_xDesktop = xDesktop;
-Start();
-}
-virtual void Timeout() SAL_OVERRIDE
-{
-m_xDesktop-terminate();
-delete this;
-}
-};
-
void ShutdownIcon::initSystray()
{
if (m_bInitialized)
@@ -564,7 +547,7 @@ void ShutdownIcon::terminateDesktop()
// terminate desktop only if no tasks exist
::com::sun::star::uno::Reference XIndexAccess xTasks (
xDesktop-getFrames(), UNO_QUERY );
if( xTasks.is() xTasks-getCount() 1 )
-new IdleTerminate( xDesktop );
+Application::Quit();
// remove the instance pointer
ShutdownIcon::pShutdownIcon = 0;
commit 658afeab6e956dc5093d25d734c22327aed3dc60
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Oct 7 17:57:10 2014 +0200
Don't even attempt to unload libqstart_gtklo.so again
...for no apparent gain. IdleUnloader introduced in
a8b42ddd66bba4b6f26a4d2d793051752989938e Fix i#101245# was probably a
misguided reaction to osl::Module's dtor starting to call dlclose back then.
(cherry picked from commit 73aaa3cf5e18d008268f4b67bbb60070b2cafc6a)
Conflicts:
sfx2/source/appl/shutdownicon.cxx
sfx2/source/appl/shutdowniconunx.cxx
Change-Id: I9a5e99d8cfba13e3750331597d64f58135537e9b
Reviewed-on: https://gerrit.libreoffice.org/11851
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
diff --git a/sfx2/source/appl/shutdownicon.cxx
b/sfx2/source/appl/shutdownicon.cxx
index 11058e2..1ed8c9c 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -17,8 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include config_folders.h
+#include sal/config.h
+
+#include cassert
+#include boost/logic/tribool.hpp
+#include config_folders.h
#include shutdownicon.hxx
#include app.hrc
#include sfx2/app.hxx
@@ -80,10 +84,6 @@ extern C { static void SAL_CALL thisModule() {} }
# endif
#endif
-#if defined(UNX) defined(ENABLE_SYSTRAY_GTK) !defined(PLUGIN_NAME)
-#define PLUGIN_NAME libqstart_gtklo.so
-#endif
-
class SfxNotificationListener_Impl : public cppu::WeakImplHelper1
XDispatchResultListener
{
public:
@@ -123,7 +123,7 @@ css::uno::SequenceOUString SAL_CALL
ShutdownIcon::getSupportedServiceNames()
bool ShutdownIcon::bModalMode = false;
ShutdownIcon* ShutdownIcon::pShutdownIcon = NULL;
-#if !defined( ENABLE_QUICKSTART_APPLET ) || defined( UNX )
+#if !defined( ENABLE_QUICKSTART_APPLET )
// To remove conditionals
extern C {
static void
[Libreoffice-commits] core.git: Repository.mk
Repository.mk |2 ++ 1 file changed, 2 insertions(+) New commits: commit 13a5c3a3b921df4688c875bb542f71f625ba82f4 Author: Tor Lillqvist t...@collabora.com Date: Wed Oct 8 16:27:44 2014 +0300 icontest was missing Change-Id: Ie00a983cc93736528e16b4244aaf1361536ed9b6 diff --git a/Repository.mk b/Repository.mk index 16189e4..05365ec 100644 --- a/Repository.mk +++ b/Repository.mk @@ -99,6 +99,8 @@ $(eval $(call gb_Helper_register_executables,OOO, \ ) \ uri-encode \ ui-previewer \ + $(if $(filter LINUX,$(OS)), \ + icontest) \ vcldemo \ tiledrendering \ $(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), gtktiledviewer) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx |2 +-
accessibility/source/extended/accessibletablistboxtable.cxx|2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit e52758fec2a9f406df44495ca52166fb33966b32
Author: Caolán McNamara caol...@redhat.com
Date: Wed Oct 8 13:20:26 2014 +0100
coverity#1242517 Arguments in wrong order (gold ?)
Looks like they are backwards to me
Change-Id: I20f38050172c1671a81d6ab7de80123ad1703528
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
index dfb11b1..562ee96e5 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
@@ -92,7 +92,7 @@ namespace accessibility
Any aOldValue, aNewValue;
aOldValue = rOldName;
aNewValue = rNewName;
-commitEvent( AccessibleEventId::NAME_CHANGED, aOldValue, aNewValue );
+commitEvent( AccessibleEventId::NAME_CHANGED, aNewValue, aOldValue );
}
// XInterface -
diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx
b/accessibility/source/extended/accessibletablistboxtable.cxx
index 95cf2a6..bebfe7a 100644
--- a/accessibility/source/extended/accessibletablistboxtable.cxx
+++ b/accessibility/source/extended/accessibletablistboxtable.cxx
@@ -235,7 +235,7 @@ namespace accessibility
{
AccessibleCheckBoxCell* pCell =
static_cast AccessibleCheckBoxCell* (
xChild.get() );
-pCell-commitEvent(
AccessibleEventId::NAME_CHANGED, aOldValue, aNewValue );
+pCell-commitEvent(
AccessibleEventId::NAME_CHANGED, aNewValue, aOldValue );
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - basic/source sw/source
basic/source/basmgr/basicmanagerrepository.cxx | 18 ++
basic/source/uno/namecont.cxx |4 ++--
sw/source/uibase/docvw/PostItMgr.cxx |2 +-
3 files changed, 13 insertions(+), 11 deletions(-)
New commits:
commit 6edebc078c527112e15c75f253e5f53dc171
Author: Michael Stahl mst...@redhat.com
Date: Wed Oct 8 15:30:54 2014 +0200
SwPostItMgr::RemoveItem(): AddressSanitizer: heap-use-after-free
Calling std::list::remove() iterates over all elements...
Change-Id: I46d00217911c1863f70d3ba72dc7099411714471
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx
b/sw/source/uibase/docvw/PostItMgr.cxx
index 6b1d5c9..5daecba 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -243,7 +243,7 @@ void SwPostItMgr::RemoveItem( SfxBroadcaster* pBroadcast )
SwSidebarItem* p = (*i);
if (GetActiveSidebarWin() == p-pPostIt)
SetActiveSidebarWin(0);
-mvPostItFlds.remove(*i);
+mvPostItFlds.erase(i);
delete p-pPostIt;
delete p;
break;
commit fca62934f492125ea6728fd6d09f0c66c9e4fa69
Author: Michael Stahl mst...@redhat.com
Date: Wed Oct 8 15:21:07 2014 +0200
basic: use SolarMutex to lock SfxLibraryContainer
Originally this used both SolarMutex and an own mutex, then a deadlock
was resolved in 2fe6a4a34b38c05e252c71f4d2f18e4a90e61b29 by not locking
SolarMutex.
Since the class will call event listeners without dropping the mutex
e.g. in insertNoCheck(), using the SolarMutex appears better anyway.
With this, installing a BASIC extension no longer triggers SolarMutex
asserts in SfxBroadcaster.
Change-Id: Ib9a2ee491ef53b1a53855af0fc22e863c5e7cb91
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 55d7327..db22aef 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -417,13 +417,13 @@ void SfxLibraryContainer::checkDisposed() const
void SfxLibraryContainer::enterMethod()
{
-maMutex.acquire();
+Application::GetSolarMutex().acquire();
checkDisposed();
}
void SfxLibraryContainer::leaveMethod()
{
-maMutex.release();
+Application::GetSolarMutex().release();
}
BasicManager* SfxLibraryContainer::getBasicManager()
commit 26b79470cabb191c3291789f99d8737da1a4fbab
Author: Michael Stahl mst...@redhat.com
Date: Wed Oct 8 15:11:34 2014 +0200
basic::ImplRepository: use SolarMutex instead of own mutex
The locking strategy in the basic module is totally unclear to me, there
does not appear to be a dedicated mutex for the core stuff callable via
StarBASIC, just a bunch of SolarMutexGuards at random locations;
let's try to use SolarMutex at the UNO entry points...
Change-Id: Ia9c45fdcfb5ffd0a4acc77ef5d2fabfb8743ad38
diff --git a/basic/source/basmgr/basicmanagerrepository.cxx
b/basic/source/basmgr/basicmanagerrepository.cxx
index bcf0855..d7928d8 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -81,7 +81,6 @@ namespace basic
ImplRepository();
private:
-::osl::Mutexm_aMutex;
BasicManagerStore m_aStore;
CreationListeners m_aCreationListeners;
@@ -222,7 +221,7 @@ namespace basic
BasicManager* ImplRepository::getDocumentBasicManager( const Reference
XModel _rxDocumentModel )
{
-::osl::MutexGuard aGuard( m_aMutex );
+SolarMutexGuard g;
/* #163556# (DR) - This function may be called recursively while
constructing the Basic manager and loading the Basic storage. By
@@ -242,7 +241,7 @@ namespace basic
BasicManager* ImplRepository::getApplicationBasicManager( bool _bCreate )
{
-::osl::MutexGuard aGuard( m_aMutex );
+SolarMutexGuard g;
BasicManager* pAppManager = GetSbData()-pAppBasMgr;
if ( ( pAppManager == NULL ) _bCreate )
@@ -254,7 +253,7 @@ namespace basic
void ImplRepository::setApplicationBasicManager( BasicManager*
_pBasicManager )
{
-::osl::MutexGuard aGuard( m_aMutex );
+SolarMutexGuard g;
BasicManager* pPreviousManager = getApplicationBasicManager( false );
delete pPreviousManager;
@@ -265,7 +264,8 @@ namespace basic
BasicManager* ImplRepository::impl_createApplicationBasicManager()
{
-::osl::MutexGuard aGuard( m_aMutex );
+SolarMutexGuard g;
+
OSL_PRECOND( getApplicationBasicManager( false ) == NULL,
ImplRepository::impl_createApplicationBasicManager: there already is one! );
// Determine Directory
@@ -324,14 +324,16 @@ namespace basic
void ImplRepository::registerCreationListener(
BasicManagerCreationListener _rListener )
{
-::osl::MutexGuard aGuard( m_aMutex );
+SolarMutexGuard g;
+
[Libreoffice-commits] core.git: basegfx/source
basegfx/source/inc/stringconversiontools.hxx | 10 +++
basegfx/source/tools/stringconversiontools.cxx | 32 ++---
2 files changed, 29 insertions(+), 13 deletions(-)
New commits:
commit e6bd33d4425bc568fbb40d5dd9137c72c82d411c
Author: Armin Le Grand a...@apache.org
Date: Wed Oct 8 11:03:03 2014 +
Resolves: #i125447# corrected some string to number conversion...
tools to correct svg:d imports
(cherry picked from commit f077f99da3cb2903fa903dcf30e6cfd714fd009c)
Conflicts:
basegfx/source/inc/stringconversiontools.hxx
basegfx/source/tools/stringconversiontools.cxx
Change-Id: I7de1558682990f83e66fdded3d9d30e21e4f97fe
diff --git a/basegfx/source/inc/stringconversiontools.hxx
b/basegfx/source/inc/stringconversiontools.hxx
index 834c0de..d759bbb 100644
--- a/basegfx/source/inc/stringconversiontools.hxx
+++ b/basegfx/source/inc/stringconversiontools.hxx
@@ -35,19 +35,19 @@ namespace basegfx
const OUString rStr,
const sal_Int32 nLen);
-inline bool lcl_isOnNumberChar(const sal_Unicode aChar, bool
bSignAllowed = true)
+inline bool lcl_isOnNumberChar(const sal_Unicode aChar, bool
bSignAllowed = true, bool bDotAllowed = true)
{
const bool bPredicate( (sal_Unicode('0') = aChar
sal_Unicode('9') = aChar)
|| (bSignAllowed sal_Unicode('+') ==
aChar)
-|| (bSignAllowed sal_Unicode('-') ==
aChar) );
+|| (bSignAllowed sal_Unicode('-') ==
aChar)
+|| (bDotAllowed sal_Unicode('.') ==
aChar));
return bPredicate;
}
-inline bool lcl_isOnNumberChar(const OUString rStr, const sal_Int32
nPos, bool bSignAllowed = true)
+inline bool lcl_isOnNumberChar(const OUString rStr, const sal_Int32
nPos, bool bSignAllowed = true, bool bDotAllowed = true)
{
-return lcl_isOnNumberChar(rStr[nPos],
-bSignAllowed);
+return lcl_isOnNumberChar(rStr[nPos], bSignAllowed, bDotAllowed);
}
bool lcl_getDoubleChar(double o_fRetval,
diff --git a/basegfx/source/tools/stringconversiontools.cxx
b/basegfx/source/tools/stringconversiontools.cxx
index 211f899..df37126 100644
--- a/basegfx/source/tools/stringconversiontools.cxx
+++ b/basegfx/source/tools/stringconversiontools.cxx
@@ -46,35 +46,50 @@ namespace basegfx
}
}
-bool lcl_getDoubleChar(double o_fRetval,
-sal_Int32 io_rPos,
-const OUString rStr)
+bool lcl_getDoubleChar(double o_fRetval, sal_Int32 io_rPos, const
OUString rStr)
{
sal_Unicode aChar( rStr[io_rPos] );
OUStringBuffer sNumberString;
-bool separator_seen=false;
+// sign
if('+' == aChar || '-' == aChar)
{
sNumberString.append(rStr[io_rPos]);
aChar = rStr[++io_rPos];
}
-while(('0' = aChar '9' = aChar)
- || (!separator_seen '.' == aChar))
+// numbers before point
+while('0' = aChar '9' = aChar)
{
-if ('.' == aChar) separator_seen = true;
sNumberString.append(rStr[io_rPos]);
io_rPos++;
aChar = io_rPos rStr.getLength() ? rStr[io_rPos] : 0;
}
+// point
+if('.' == aChar)
+{
+sNumberString.append(rStr[io_rPos]);
+io_rPos++;
+aChar = io_rPos rStr.getLength() ? rStr[io_rPos] : 0;
+}
+
+// numbers after point
+while ('0' = aChar '9' = aChar)
+{
+sNumberString.append(rStr[io_rPos]);
+io_rPos++;
+aChar = io_rPos rStr.getLength() ? rStr[io_rPos] : 0;
+}
+
+// 'e'
if('e' == aChar || 'E' == aChar)
{
sNumberString.append(rStr[io_rPos]);
io_rPos++;
aChar = io_rPos rStr.getLength() ? rStr[io_rPos] : 0;
+// sign for 'e'
if('+' == aChar || '-' == aChar)
{
sNumberString.append(rStr[io_rPos]);
@@ -82,6 +97,7 @@ namespace basegfx
aChar = io_rPos rStr.getLength() ? rStr[io_rPos] : 0;
}
+// number for 'e'
while('0' = aChar '9' = aChar)
{
sNumberString.append(rStr[io_rPos]);
@@ -153,7 +169,7 @@ namespace basegfx
const sal_Int32 aLen( rStr.getLength() );
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f0/77f99da3cb2903fa903dcf30e6cfd714fd009c
f0/77f99da3cb2903fa903dcf30e6cfd714fd009c |1 + 1 file changed, 1 insertion(+) New commits: commit 3b506987d0b0d939c72c18078d70fb609f758d28 Author: Caolán McNamara caol...@redhat.com Date: Wed Oct 8 14:59:31 2014 +0100 Notes added by 'git notes add' diff --git a/f0/77f99da3cb2903fa903dcf30e6cfd714fd009c b/f0/77f99da3cb2903fa903dcf30e6cfd714fd009c new file mode 100644 index 000..63ebb1b --- /dev/null +++ b/f0/77f99da3cb2903fa903dcf30e6cfd714fd009c @@ -0,0 +1 @@ +merged as: e6bd33d4425bc568fbb40d5dd9137c72c82d411c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: SolarMutex assert on adding an extension ?
On 06/10/14 22:10, Caolán McNamara wrote: If I try and install the extension from https://bugs.freedesktop.org/show_bug.cgi?id=46447#c151 in master I get... warn:vcl:29279:9:vcl/generic/app/geninst.cxx:116: CheckYieldMutex: 0!=9 which is SalYieldMutex* pYieldMutex = mpSalYieldMutex; if ( pYieldMutex-GetThreadId() != osl::Thread::getCurrentIdentifier() ) return false; causes this assert to trigger assert(ImplGetSVData()-mpDefInst-CheckYieldMutex()); from DBG_TESTSOLARMUTEX(); in svl/source/notify/SfxBroadcaster.cxx's SfxBroadcaster::AddListener all the way from ExtensionCmdQueue::Thread::execute where everything is happening in a thread to add an extension and so (because this is a basic extension) BasicManagerRepository::getApplicationBasicManager is called from the thread. What should we do here ? despair about the haphazard and inconsistent locking in basic, i guess. after looking at it for a bit i don't see any obvious justification for the SolarMutex not being locked around accesses of core BASIC objects like SbModule etc, i.e. there is no other mutex that is consistently used. so i'd think that using SolarMutex for the purpose is probably the least bad way forward, and have converted some of the existing locking in basic's UNO objects to SolarMutex on master, which apparently fixes the extension installation. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source
sc/source/core/tool/token.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fa00d2ec45aa24a433b832c5287f3e8f41475326 Author: David Tardon dtar...@redhat.com Date: Mon Oct 6 20:24:52 2014 +0200 avoid use of ref. to possibly deleted object Change-Id: If5977b280fed8d8b053f59852d3984a59ce61a69 (cherry picked from commit ce5cc7afb0f1c99237d04e0c754527c725d8491c) Reviewed-on: https://gerrit.libreoffice.org/11831 Reviewed-by: Eike Rathke er...@redhat.com Tested-by: Eike Rathke er...@redhat.com diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 8263380..916a88e 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -2396,9 +2396,9 @@ void ScTokenArray::ReadjustAbsolute3DReferences( const ScDocument* pOldDoc, cons sal_uInt16 nFileId; GetExternalTableData(pOldDoc, pNewDoc, rRef.Tab(), aTabName, nFileId); //replace with ScExternalSingleRefToken and adjust references -pCode[j]-DecRef(); ScExternalSingleRefToken* pToken = new ScExternalSingleRefToken(nFileId, aTabName, rRef); pToken-IncRef(); +pCode[j]-DecRef(); // ATTENTION: rRef can't be used after this point pCode[j] = pToken; } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source
sc/source/ui/view/tabvwshb.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit cd603063f44c152bbc3a1f3eb3796722eb422c0e
Author: Caolán McNamara caol...@redhat.com
Date: Mon Oct 6 16:00:35 2014 +0100
Resolves: fdo#80101 inserting non-chart as chart - unhandled exception
Change-Id: I4d5438292d9a5c49f1336304ebd3dc4e155dd212
(cherry picked from commit 76d4db3181dfd1524620377bb12a8e0332ae8ab0)
Reviewed-on: https://gerrit.libreoffice.org/11833
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index 3871bc8..b8ae65b 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.cxx
@@ -311,6 +311,7 @@ void ScTabViewShell::ExecDrawIns(SfxRequest rReq)
break;
case SID_INSERT_DIAGRAM_FROM_FILE:
+try
{
sfx2::FileDialogHelper
aDlg(ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
0, OUString(com.sun.star.chart2.ChartDocument));
@@ -321,6 +322,10 @@ void ScTabViewShell::ExecDrawIns(SfxRequest rReq)
FuInsertChartFromFile(this, pWin, pView, pDrModel, rReq,
aURL);
}
}
+catch (const uno::Exception e)
+{
+SAL_WARN( sc, Cannot Insert Chart: e.Message);
+}
break;
case SID_OBJECTRESIZE:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/workben
vcl/workben/icontest.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit e7447790e65b61ac212586eacefe3b861ad46628
Author: Tor Lillqvist t...@collabora.com
Date: Wed Oct 8 17:07:17 2014 +0300
ISO C++ forbids in-class initialization of non-const static member 'nRet'
Change-Id: Ia2bfaff2a284c2ea40198f1152716860d5963482
diff --git a/vcl/workben/icontest.cxx b/vcl/workben/icontest.cxx
index c043ae0..2d09231 100644
--- a/vcl/workben/icontest.cxx
+++ b/vcl/workben/icontest.cxx
@@ -116,7 +116,7 @@ public:
virtual int Main() SAL_OVERRIDE;
private:
-int nRet = EXIT_SUCCESS;
+int nRet;
void DoItWithVcl(std::vectorOUString aImageFiles);
void DoItWithOpenGL(std::vectorOUString aImageFiles);
@@ -124,6 +124,8 @@ private:
void IconTestApp::Init()
{
+nRet = EXIT_SUCCESS;
+
uno::Referenceuno::XComponentContext xContext =
cppu::defaultBootstrap_InitialComponentContext();
uno::Referencelang::XMultiComponentFactory xFactory =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/workben
vcl/workben/icontest.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit e1b15a2eec0f28ae8e45354687f86aaf87976fab
Author: Michael Stahl mst...@redhat.com
Date: Wed Oct 8 16:05:39 2014 +0200
vcl: make IconTestApp build with gcc 4.6
Change-Id: I5897a774b8949f336a40096a0727a347bae012ac
diff --git a/vcl/workben/icontest.cxx b/vcl/workben/icontest.cxx
index 2d09231..2df0f9c 100644
--- a/vcl/workben/icontest.cxx
+++ b/vcl/workben/icontest.cxx
@@ -115,6 +115,8 @@ public:
virtual void Init() SAL_OVERRIDE;
virtual int Main() SAL_OVERRIDE;
+IconTestApp() : nRet(EXIT_SUCCESS) {};
+
private:
int nRet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: ESC call Thursday 16:00 central European time ...
On Wed, 2014-10-08 at 15:06 +0200, Jean-Baptiste Faure wrote: Hi, Le 08/10/2014 14:10, Bjoern Michaelsen a écrit : OTOH a _much_ better point for this discussion would had been when the original patch was still on review. The problem is not the original patch (the patch for the master), it works perfectly and Kohei did a fantastic job with it and its complementary patch which added the configuration option allowing the choose between the new behavior and the former. Thank you very much for that. The issue is in the decision to backport the first patch without the configuration option (fdo#81309 only) to 4.3.1 and 4.2.7 It was because of the translation requirement that the backport would add. as if this former behavior was completely broken. There were those users who believed that the former behavior was broken, and fought tooth and nail to get that fixed. Ok, it is not perfect but many spreadsheets are build on this behavior since many years. Which I was not even remotely aware of, but then I'm not aware of 100% of how our users use our software. I get surprised every single day. With 4.3.2 and 4.2.7 all these spreadsheets do not work anymore By the same token, the fix also allows those users wanting the fix to start using Calc to fit their needs. and the users have to heavily modify the logic of their spreadsheets if they want to continue to use sort with references. Sure, any changes are evil. Please try the test file in bug 81633 yourself. Compare sorting in 4.2.6 and in 4.2.7 or the master (with the new behavior). And please do start talking with those users who asked for that fix in the first place. All you are doing right now is shooting the messenger. And I can tell you it's a terrible place to be in. For me (and I am not alone to think that, see the growing number of duplicates of bug 81633), such big change should be done only for a x.y.0 version with a clear information in the release notes. To be fair, there were also a fair number of duplicates for the bug I fixed that you disapprove of. Please make a decision for us then, and work on putting what you think is the correct fix in. I think that's fair. That's all I have to say on this issue. I'll stay out of this from this point on. Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - external/coinmp external/lcms2
external/coinmp/coinmp-msvc-disable-sse2.patch.1 | 14 +++--- external/lcms2/lcms2-msvc-disable-sse2.patch.1 | 14 +++--- 2 files changed, 14 insertions(+), 14 deletions(-) New commits: commit 089b243c8b48aecfd25c79a70b4209a2399dbafa Author: Andras Timar andras.ti...@collabora.com Date: Wed Oct 8 07:33:11 2014 -0700 dos2unix on SSE2 patch files Change-Id: I3e71333647f3cec3a7c014cd4d245d2b8fdc4fc8 Reviewed-on: https://gerrit.libreoffice.org/11856 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/external/coinmp/coinmp-msvc-disable-sse2.patch.1 b/external/coinmp/coinmp-msvc-disable-sse2.patch.1 index 0f518d6..c099494 100644 --- a/external/coinmp/coinmp-msvc-disable-sse2.patch.1 +++ b/external/coinmp/coinmp-msvc-disable-sse2.patch.1 @@ -1,10 +1,10 @@ --- coinmp/BuildTools/MSVisualStudio/v10/Release.props.orig2014-10-02 14:22:21.497268171 +0200 +++ coinmp/BuildTools/MSVisualStudio/v10/Release.props 2014-10-02 14:22:30.193267497 +0200 @@ -6,6 +6,7 @@ - ItemDefinitionGroup - ClCompile - StringPoolingtrue/StringPooling -+ EnableEnhancedInstructionSetStreamingSIMDExtensions/EnableEnhancedInstructionSet - /ClCompile - /ItemDefinitionGroup - ItemGroup / + ItemDefinitionGroup + ClCompile + StringPoolingtrue/StringPooling ++ EnableEnhancedInstructionSetStreamingSIMDExtensions/EnableEnhancedInstructionSet + /ClCompile + /ItemDefinitionGroup + ItemGroup / diff --git a/external/lcms2/lcms2-msvc-disable-sse2.patch.1 b/external/lcms2/lcms2-msvc-disable-sse2.patch.1 index 37ef773..9bfad08 100644 --- a/external/lcms2/lcms2-msvc-disable-sse2.patch.1 +++ b/external/lcms2/lcms2-msvc-disable-sse2.patch.1 @@ -1,10 +1,10 @@ --- lcms2/Projects/VC2010/lcms2_DLL/lcms2_DLL.vcxproj.orig 2014-10-02 15:15:40.228020086 +0200 +++ lcms2/Projects/VC2010/lcms2_DLL/lcms2_DLL.vcxproj 2014-10-02 15:15:42.243019930 +0200 @@ -133,6 +133,7 @@ - /ItemDefinitionGroup - ItemDefinitionGroup Condition='$(Configuration)|$(Platform)'=='Release|Win32' - ClCompile -+ EnableEnhancedInstructionSetStreamingSIMDExtensions/EnableEnhancedInstructionSet - OptimizationFull/Optimization - IntrinsicFunctionstrue/IntrinsicFunctions - FavorSizeOrSpeedSpeed/FavorSizeOrSpeed + /ItemDefinitionGroup + ItemDefinitionGroup Condition='$(Configuration)|$(Platform)'=='Release|Win32' + ClCompile ++ EnableEnhancedInstructionSetStreamingSIMDExtensions/EnableEnhancedInstructionSet + OptimizationFull/Optimization + IntrinsicFunctionstrue/IntrinsicFunctions + FavorSizeOrSpeedSpeed/FavorSizeOrSpeed ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/oox oox/source
include/oox/dump/dumperbase.hxx | 13 +++--
oox/source/dump/dffdumper.cxx |4 ++--
oox/source/dump/dumperbase.cxx |4 ++--
3 files changed, 15 insertions(+), 6 deletions(-)
New commits:
commit 413771fa32815672afc6b7799c1433f523088811
Author: Takeshi Abe t...@fixedpoint.jp
Date: Wed Oct 8 21:48:43 2014 +0900
fdo#75757: remove inheritance to std::map
from ItemFormatMap.
Change-Id: I956b5797e677d22eb71fe801b650db7c982d6d51
Reviewed-on: https://gerrit.libreoffice.org/11854
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx
index 9e72588..a747de5 100644
--- a/include/oox/dump/dumperbase.hxx
+++ b/include/oox/dump/dumperbase.hxx
@@ -808,12 +808,21 @@ static const NameListWrapper NO_LIST;
-class ItemFormatMap : public ::std::map sal_Int64, ItemFormat
+class ItemFormatMap
{
+private:
+::std::map sal_Int64, ItemFormat maMap;
+
public:
- ItemFormatMap() {}
+ItemFormatMap() : maMap() {}
explicit ItemFormatMap( const NameListRef rxNameList ) {
insertFormats( rxNameList ); }
+::std::map sal_Int64, ItemFormat ::const_iterator end() const { return
maMap.end(); }
+::std::map sal_Int64, ItemFormat ::const_iterator find(sal_Int64 nId)
const
+{
+return maMap.find(nId);
+}
+
void insertFormats( const NameListRef rxNameList );
};
diff --git a/oox/source/dump/dffdumper.cxx b/oox/source/dump/dffdumper.cxx
index c4c73ac..318a129 100644
--- a/oox/source/dump/dffdumper.cxx
+++ b/oox/source/dump/dffdumper.cxx
@@ -193,7 +193,7 @@ void DffStreamObject::dumpDffOpt()
writeHexItem( complex-size, nValue, CONV-DEC );
String aName;
PropType eType = PROPTYPE_BINARY;
-ItemFormatMap::const_iterator aIt = maComplexProps.find( nBaseId );
+::std::map sal_Int64, ItemFormat ::const_iterator aIt =
maComplexProps.find( nBaseId );
if( aIt != maComplexProps.end() )
{
const ItemFormat rItemFmt = aIt-second;
@@ -211,7 +211,7 @@ void DffStreamObject::dumpDffOpt()
}
else
{
-ItemFormatMap::const_iterator aIt = maSimpleProps.find( nBaseId );
+::std::map sal_Int64, ItemFormat ::const_iterator aIt =
maSimpleProps.find( nBaseId );
if( aIt != maSimpleProps.end() )
{
const ItemFormat rItemFmt = aIt-second;
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index 1143e6a..aac 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -936,7 +936,7 @@ void ItemFormatMap::insertFormats( const NameListRef
rxNameList )
{
if( Base::isValid( rxNameList ) )
for( NameListBase::const_iterator aIt = rxNameList-begin(), aEnd =
rxNameList-end(); aIt != aEnd; ++aIt )
-(*this)[ aIt-first ].parse( aIt-second );
+maMap[ aIt-first ].parse( aIt-second );
}
ConstList::ConstList( const SharedConfigData rCfgData ) :
@@ -2488,7 +2488,7 @@ void RecordObjectBase::implDump()
// record body
if( !mbBinaryOnly cfg().hasName( xRecNames, mnRecId ) )
{
-ItemFormatMap::const_iterator aIt = aSimpleRecs.find( mnRecId );
+::std::map sal_Int64, ItemFormat ::const_iterator aIt =
aSimpleRecs.find( mnRecId );
if( aIt != aSimpleRecs.end() )
dumpItem( aIt-second );
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - 2 commits - i18npool/source oox/CustomTarget_generated.mk
i18npool/source/localedata/data/es_CR.xml |7 +++ oox/CustomTarget_generated.mk |1 + 2 files changed, 8 insertions(+) New commits: commit d8dde16f6ef8053449d15e29a0d09851f62062f0 Author: Michael Stahl mst...@redhat.com Date: Tue Oct 7 16:39:03 2014 +0200 oox: fix spurious rebuilds of namespacemap.cxx There is a missing dependency on one of the generated header files. Change-Id: Id3fa2ccf2c2a31527b795861afdf557882f56972 (cherry picked from commit 63e6cbc3180047000787a9071513152fdd9ce942) Reviewed-on: https://gerrit.libreoffice.org/11844 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/oox/CustomTarget_generated.mk b/oox/CustomTarget_generated.mk index 70aa0d2..640f4e4 100644 --- a/oox/CustomTarget_generated.mk +++ b/oox/CustomTarget_generated.mk @@ -63,6 +63,7 @@ $(call gb_CustomTarget_get_target,oox/generated) : \ $(oox_INC)/tokenhash.inc \ $(oox_INC)/tokennames.inc \ $(oox_INC)/namespacenames.inc \ + $(oox_INC)/namespaces-strictnames.inc \ $(oox_INC)/propertynames.inc \ $(oox_GENHEADERPATH)/tokens.hxx \ $(oox_GENHEADERPATH)/namespaces.hxx \ commit 41e3663f1a358048d3e8c1dd3f265f3bcbbfcdd1 Author: Eike Rathke er...@redhat.com Date: Wed Oct 8 13:48:02 2014 +0200 add missing legacyOnly currency, fdo#84260 aa33dd16b0e3075f28c56656678c0f5cb764 changed the currency symbol from ¢ to ⡠but changed only the symbol. Actually changing the number format codes wasn't necessary at all, but changing only the symbol is wrong, see also the ATTLIST Currency legacyOnly description in i18npool/source/localedata/data/locale.dtd Hopefully nothing relies on the actual symbol used in the number format codes ... Change-Id: I92e79403fbb80f18c44dc3ecf5a3830a52fd2ff8 (cherry picked from commit aa1c549e65d103910904a75d19672240da10cc54) Reviewed-on: https://gerrit.libreoffice.org/11849 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/i18npool/source/localedata/data/es_CR.xml b/i18npool/source/localedata/data/es_CR.xml index 6a04a8e..ff0d73a 100644 --- a/i18npool/source/localedata/data/es_CR.xml +++ b/i18npool/source/localedata/data/es_CR.xml @@ -185,6 +185,13 @@ CurrencyNameColon/CurrencyName DecimalPlaces2/DecimalPlaces /Currency +Currency default=false usedInCompatibleFormatCodes=false legacyOnly=true + CurrencyIDCRC/CurrencyID + CurrencySymbol¢/CurrencySymbol + BankSymbolCRC/BankSymbol + CurrencyNameColon/CurrencyName + DecimalPlaces2/DecimalPlaces +/Currency /LC_CURRENCY LC_TRANSLITERATION ref=en_US/ LC_MISC ref=es_ES/ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bin/gbuild-to-ide
bin/gbuild-to-ide | 35 ++-
1 file changed, 18 insertions(+), 17 deletions(-)
New commits:
commit 79141e2ce2cac45634d48d13cf07f5d3fad171a6
Author: Peter Foley pefol...@pefoley.com
Date: Fri Oct 3 13:50:27 2014 -0400
gbuild-to-ide improvments
Use gperf instead of ls to find binpath, so that vs2012/3 can be tested
on non-Windows systems.
Output the vcxproj and vcxproj.filters files with indentation and
formatting.
Make some minor changes to improve pep8 compliance.
Change-Id: Ie8ac11ecf75ad170f0756f803c45356685792e5c
Reviewed-on: https://gerrit.libreoffice.org/11797
Tested-by: David Ostrovsky da...@ostrovsky.org
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index dae2313..34ae1fb 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -17,6 +17,7 @@ import sys
import uuid
import json
import xml.etree.ElementTree as ET
+import xml.dom.minidom as minidom
class GbuildParserState:
@@ -86,7 +87,7 @@ class GbuildParser:
srcdirpattern = re.compile('^SRCDIR = (.*)')
builddirpattern = re.compile('^BUILDDIR = (.*)')
instdirpattern = re.compile('^INSTDIR = (.*)')
-binpathpattern = re.compile('^LS = (.*)ls(.exe)?')
+binpathpattern = re.compile('^GPERF = (.*)gperf(.exe)?')
libnamespattern = re.compile('^gb_Library_ILIBFILENAMES := (.*)')
exenamepattern = re.compile('^gb_Executable_FILENAMES_FOR_BUILD := (.*)')
rulepattern = re.compile('^(.+?):( .*)?$')
@@ -214,6 +215,7 @@ class GbuildParser:
state = GbuildParserState()
return self
+
class IdeIntegrationGenerator:
def __init__(self, gbuildparser, ide):
@@ -417,7 +419,6 @@ VersionControl=kdevgit
def write_includepaths(self, path):
includedirfile = open(os.path.join(path, '.kdev_include_paths'), 'w')
-fullpath = '%s/%s' % (self.gbuildparser.srcdir, path)
include = set()
for target in self.target_by_path[path]:
include |= set(target.include)
@@ -658,12 +659,12 @@ class
VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
for target in set(self.gbuildparser.libs) |
set(self.gbuildparser.exes):
if target.is_empty():
continue
-if not target.location in self.target_by_location:
+if target.location not in self.target_by_location:
self.target_by_location[target.location] = set()
self.target_by_location[target.location] |= set([target])
def retrieve_toolset(self, ide):
-ide_toolset_map = {'vs2012':'v110', 'vs2013':'v120'}
+ide_toolset_map = {'vs2012': 'v110', 'vs2013': 'v120'}
return ide_toolset_map[ide]
def module_make_command(self, targets):
@@ -694,9 +695,6 @@ class
VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
nmake_project_guid = '8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942'
-def get_project_directory(self, target):
-return os.path.join(self.solution_directory,
target.location.split('/')[-1])
-
def get_dependency_libs(self, linked_libs, library_projects):
dependency_libs = {}
for linked_lib in linked_libs:
@@ -713,7 +711,6 @@ class
VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
for project in projects:
target = project.target
print(' %s' % target.name, end='')
-module = target.location.split('/')[-1]
proj_path = os.path.relpath(project.path,
os.path.abspath(os.path.dirname(solution_path)))
f.write('Project({%s}) = %s, %s, {%s}\n' %
(VisualStudioIntegrationGenerator.nmake_project_guid,
@@ -783,15 +780,15 @@ class
VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
platform_toolset_node = ET.SubElement(conf_node,
'{%s}PlatformToolset' % ns)
platform_toolset_node.text = self.toolset
-import_node = ET.SubElement(proj_node, '{%s}Import' % ns,
Project='$(VCTargetsPath)\Microsoft.Cpp.props')
+ET.SubElement(proj_node, '{%s}Import' % ns,
Project='$(VCTargetsPath)\Microsoft.Cpp.props')
ET.SubElement(proj_node, '{%s}ImportGroup' % ns,
Label='ExtensionSettings')
for configuration in self.configurations:
prop_sheets_node = ET.SubElement(proj_node, '{%s}ImportGroup' %
ns, Label='Configuration',
Condition='$(Configuration)|$(Platform)'=='%s|%s' % (configuration, platform))
-import_node = ET.SubElement(prop_sheets_node, '{%s}Import' % ns,
-
Project='$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props',
-
Condition=exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props'),
-
[Libreoffice-commits] core.git: filter/source include/filter sw/source
filter/source/msfilter/msdffimp.cxx | 12 +++-
include/filter/msfilter/msdffimp.hxx |8 ++--
sw/source/filter/ww8/ww8graf2.cxx|2 +-
sw/source/filter/ww8/ww8par.cxx |2 +-
4 files changed, 7 insertions(+), 17 deletions(-)
New commits:
commit ad8c2f7090ea2e77bb9afe77b2764f1b4560ad76
Author: Takeshi Abe t...@fixedpoint.jp
Date: Tue Oct 7 18:46:56 2014 +0900
fdo#75757: remove inheritance to std::vector
from SvxMSDffShapeOrders.
Change-Id: Idf551f1fbde907759d6a296141e2837264dbbb10
Reviewed-on: https://gerrit.libreoffice.org/11840
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index f76de8c..1fe026c 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5419,7 +5419,7 @@ void SvxMSDffManager::StoreShapeOrder(sal_uLong
nId,
sal_uInt16 nShpCnt = pShapeOrders-size();
for (sal_uInt16 nShapeNum=0; nShapeNum nShpCnt; nShapeNum++)
{
-SvxMSDffShapeOrder rOrder = *(*pShapeOrders)[ nShapeNum ];
+SvxMSDffShapeOrder rOrder = (*pShapeOrders)[ nShapeNum ];
if( rOrder.nShapeId == nId )
{
@@ -5440,7 +5440,7 @@ void SvxMSDffManager::ExchangeInShapeOrder( SdrObject*
pOldObject,
sal_uInt16 nShpCnt = pShapeOrders-size();
for (sal_uInt16 nShapeNum=0; nShapeNum nShpCnt; nShapeNum++)
{
-SvxMSDffShapeOrder rOrder = *(*pShapeOrders)[ nShapeNum ];
+SvxMSDffShapeOrder rOrder = (*pShapeOrders)[ nShapeNum ];
if( rOrder.pObj == pOldObject )
{
@@ -5457,7 +5457,7 @@ void SvxMSDffManager::RemoveFromShapeOrder( SdrObject*
pObject ) const
sal_uInt16 nShpCnt = pShapeOrders-size();
for (sal_uInt16 nShapeNum=0; nShapeNum nShpCnt; nShapeNum++)
{
-SvxMSDffShapeOrder rOrder = *(*pShapeOrders)[ nShapeNum ];
+SvxMSDffShapeOrder rOrder = (*pShapeOrders)[ nShapeNum ];
if( rOrder.pObj == pObject )
{
@@ -7345,10 +7345,4 @@ SdrObject* SvxMSDffManager::getShapeForId( sal_Int32
nShapeId )
return aIter != maShapeIdContainer.end() ? (*aIter).second : 0;
}
-SvxMSDffShapeOrders::~SvxMSDffShapeOrders()
-{
-for( const_iterator it = begin(); it != end(); ++it )
-delete *it;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/filter/msfilter/msdffimp.hxx
b/include/filter/msfilter/msdffimp.hxx
index 33cbc41..4523462 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -111,11 +111,7 @@ typedef ::std::map sal_Int32, SdrObject*
SvxMSDffShapeIdContainer;
// the following two will be sorted by the order of their appearance:
typedef boost::ptr_vectorSvxMSDffBLIPInfo SvxMSDffBLIPInfos;
-class SvxMSDffShapeOrders : public std::vectorSvxMSDffShapeOrder*
-{
-public:
-~SvxMSDffShapeOrders();
-};
+typedef boost::ptr_vectorSvxMSDffShapeOrder SvxMSDffShapeOrders;
struct MSFILTER_DLLPUBLIC CompareSvxMSDffShapeInfoById
{
@@ -695,7 +691,7 @@ public:
inline const SvxMSDffShapeInfos_ById* GetShapeInfos( void ) const
{ return m_pShapeInfosById.get(); }
-inline const SvxMSDffShapeOrders* GetShapeOrders( void ) const
+inline SvxMSDffShapeOrders* GetShapeOrders( void ) const
{ return pShapeOrders; }
void StoreShapeOrder(sal_uLong nId,
diff --git a/sw/source/filter/ww8/ww8graf2.cxx
b/sw/source/filter/ww8/ww8graf2.cxx
index 0e3a491..6be482c 100644
--- a/sw/source/filter/ww8/ww8graf2.cxx
+++ b/sw/source/filter/ww8/ww8graf2.cxx
@@ -99,7 +99,7 @@ sal_uInt16 wwZOrderer::GetEscherObjectIdx(sal_uLong nSpId)
// First, find out what position this shape is in in the Escher order.
for (sal_uInt16 nShapePos=0; nShapePos nShapeCount; nShapePos++)
{
-const SvxMSDffShapeOrder rOrder = *(*mpShapeOrders)[nShapePos];
+const SvxMSDffShapeOrder rOrder = (*mpShapeOrders)[nShapePos];
if (rOrder.nShapeId == nSpId)
{
nFound = nShapePos;
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 7c1331e..df76c20 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -5203,7 +5203,7 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss,
const SwPosition rPos)
for (sal_uInt16 nShapeNum=0; nShapeNum nShapeCount; nShapeNum++)
{
SvxMSDffShapeOrder *pOrder =
-(*pMSDffManager-GetShapeOrders())[nShapeNum];
+(*pMSDffManager-GetShapeOrders())[nShapeNum];
// Insert Pointer into new Sort array
if (pOrder-nTxBxComp pOrder-pFly)
aTxBxSort.insert(pOrder);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - bin/unpack-sources
bin/unpack-sources | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) New commits: commit ebccd2dc8092ff873affceb1f17c0c11e0ad9e2b Author: David Tardon dtar...@redhat.com Date: Fri Oct 3 08:00:37 2014 +0200 fdo#82144 fix unpacking of additional tarballs Change-Id: I74a61005fa9534b3f96cd392c6e38c54c5fd35e1 (cherry picked from commit 0ad5604c91cdd593739b4af5dd3168d9b23b016b) Reviewed-on: https://gerrit.libreoffice.org/11783 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/bin/unpack-sources b/bin/unpack-sources index a6a14ab..f7b5225 100644 --- a/bin/unpack-sources +++ b/bin/unpack-sources @@ -52,7 +52,7 @@ if test -z $start_dir ; then echo Error: Please, define where to unpack sources, try --help fi -if ! test -f $start_dir/Repository.mk -a -f $start_dir/solenv/inc/target.mk ; then +if ! test -f $start_dir/Repository.mk ; then echo Error: $start_dir is not a valid LibreOffice core source directory exit 1; fi @@ -74,8 +74,12 @@ for tarball in $tarballs ; do fi echo Unpacking $tarname... -echo tar -xf $tarball -C $lo_src_dir -if ! tar -xf $tarball -C $lo_src_dir; then +echo mkdir -p $lo_src_dir/$tarname +if ! mkdir -p $lo_src_dir/$tarname ; then +echo Error: could not create directory $lo_src_dir/$tarname +fi +echo tar -xf $tarball -C $lo_src_dir/$tarname --strip-components=1 +if ! tar -xf $tarball -C $lo_src_dir/$tarname --strip-components=1; then echo Error: could not unpack $tarname exit 1 fi ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - 2 commits - sw/qa sw/source writerfilter/source
sw/qa/core/data/rtf/pass/fdo84536.rtf | 16 +++
sw/source/core/uibase/docvw/edtwin.cxx | 38 +++-
writerfilter/source/rtftok/rtfsdrimport.cxx |5 ++-
3 files changed, 41 insertions(+), 18 deletions(-)
New commits:
commit 1eba4cd1e95d13d256378cdf736c00a36d1fdea3
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Oct 1 16:45:03 2014 +0200
fdo#84536 RTF import: don't try to rotate TextFrames
Regression from 818d80eb0cee65d1bcc4fdb74b32a7c42cc1336e (RTF import:
support shapes inside tables, 2013-06-28).
(cherry picked from commit 53b9a9bc7c84738545b5c7b791cea1e3d6a16c72)
Change-Id: I05eb2f4f2e3467e35f96b280e3a79f69906a56de
Reviewed-on: https://gerrit.libreoffice.org/11746
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/qa/core/data/rtf/pass/fdo84536.rtf
b/sw/qa/core/data/rtf/pass/fdo84536.rtf
new file mode 100644
index 000..a8eaacf
--- /dev/null
+++ b/sw/qa/core/data/rtf/pass/fdo84536.rtf
@@ -0,0 +1,16 @@
+{\rtf1
+{\shp
+{\*\shpinst\shpleft0\shptop0\shpright10557\shpbottom2639\shpfhdr0\shpbxmargin\shpbxignore\shpbymargin\shpbyignore\shpwr3\shpwrk0\shpfblwtxt1\shpz2\shplid2054
+{\sp
+{\sn shapeType}
+{\sv 202}
+}
+{\sp
+{\sn rotation}
+{\sv -2949120}
+}
+{\shptxt hello\par}
+}
+}
+\par
+}
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx
b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 19353fb..3d62a447 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -15,6 +15,7 @@
#include com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp
#include com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp
#include com/sun/star/drawing/FillStyle.hpp
+#include com/sun/star/lang/XServiceInfo.hpp
#include com/sun/star/table/BorderLine2.hpp
#include com/sun/star/text/HoriOrientation.hpp
#include com/sun/star/text/RelOrientation.hpp
@@ -195,7 +196,9 @@ void
RTFSdrImport::applyProperty(uno::Referencedrawing::XShape xShape, const O
// See DffPropertyReader::Fix16ToAngle(): in RTF, positive rotation
angles are clockwise, we have them as counter-clockwise.
// Additionally, RTF type is 0..360*2^16, our is 0..360*100.
sal_Int32 nRotation = aValue.toInt32()*100/65536;
-xPropertySet-setPropertyValue(RotateAngle,
uno::makeAny(sal_Int32(NormAngle360(nRotation * -1;
+uno::Referencelang::XServiceInfo xServiceInfo(xShape,
uno::UNO_QUERY);
+if (!xServiceInfo-supportsService(com.sun.star.text.TextFrame))
+xPropertySet-setPropertyValue(RotateAngle,
uno::makeAny(sal_Int32(NormAngle360(nRotation * -1;
}
if (nHoriOrient != 0 xPropertySet.is())
commit fd41d725b596968e04fc4788a4481d7dc7e488df
Author: Michael Stahl mst...@redhat.com
Date: Mon Oct 6 23:37:18 2014 +0200
fdo#79604: sw: fix clicking on hyper-links in Draw objects
The URL is dispatched in MouseButtonUp(), but this relies on
MouseButtonDown() not selecting the drawing object when the cursor is
over an URL field.
(probably regression from commit 7e2f98d0a0c4a0f36a94353a256e7cc5caa3113b
and commit 5ed14025645200c77249da364870f5772c01df17)
Change-Id: Ib1504baff5d1fffd6ce53b41d3ff726d8e4d5c9d
(cherry picked from commit 5284e44ed0594a79b0cc22090a9a82b19962f6c2)
Reviewed-on: https://gerrit.libreoffice.org/11834
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/core/uibase/docvw/edtwin.cxx
b/sw/source/core/uibase/docvw/edtwin.cxx
index d4294af..e35b688 100644
--- a/sw/source/core/uibase/docvw/edtwin.cxx
+++ b/sw/source/core/uibase/docvw/edtwin.cxx
@@ -3114,8 +3114,27 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
case MOUSE_LEFT + KEY_MOD2:
{
+// fdo#79604: first, check if a link has been clicked - do not
+// select fly in this case!
+if (1 == nNumberOfClicks)
+{
+UpdatePointer( aDocPos, rMEvt.GetModifier() );
+SwEditWin::m_nDDStartPosY = aDocPos.Y();
+SwEditWin::m_nDDStartPosX = aDocPos.X();
+
+// hit an URL in DrawText object?
+if (bExecHyperlinks pSdrView)
+{
+SdrViewEvent aVEvt;
+pSdrView-PickAnything(rMEvt, SDRMOUSEBUTTONDOWN,
aVEvt);
+
+if (aVEvt.eEvent == SDREVENT_EXECUTEURL)
+bExecDrawTextLink = true;
+}
+}
+
bool bHandledFlyClick = false;
-if ( nNumberOfClicks == nNbFlyClicks )
+if (!bExecDrawTextLink nNumberOfClicks == nNbFlyClicks)
{
bHandledFlyClick = true;
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/linenumbering.ui |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit c3b4c17cd6b91c7e0115b1c701e4fb45ece7658e Author: Caolán McNamara caol...@redhat.com Date: Wed Oct 8 16:28:46 2014 +0100 0.6002384185791-0.5, scrollwheel in glade panel wobble Change-Id: I4fd649ee20f76063784cea5f46e42cadb350077e diff --git a/sw/uiconfig/swriter/ui/linenumbering.ui b/sw/uiconfig/swriter/ui/linenumbering.ui index 941b709..bab1cef 100644 --- a/sw/uiconfig/swriter/ui/linenumbering.ui +++ b/sw/uiconfig/swriter/ui/linenumbering.ui @@ -492,7 +492,7 @@ property name=can_focusTrue/property property name=receives_defaultFalse/property property name=xalign0/property -property name=yalign0.6002384185791/property +property name=yalign0.5/property property name=draw_indicatorTrue/property /object packing @@ -508,7 +508,7 @@ property name=can_focusTrue/property property name=receives_defaultFalse/property property name=xalign0/property -property name=yalign0.6002384185791/property +property name=yalign0.5/property property name=draw_indicatorTrue/property /object packing ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - scp2/Module_scp2.mk
scp2/Module_scp2.mk |1 + 1 file changed, 1 insertion(+) New commits: commit fa7ce6df6218dfc7ff18fabe8e6f7a5b4038c77b Author: Andras Timar andras.ti...@collabora.com Date: Wed Oct 8 05:46:07 2014 -0700 Revert fdo#80927 - quickstart causing trouble on windows, disable it This reverts commit e10e1b06cbbf337e8277063651b6e48011df5fd4. The real solution to fdo#80927 is available now. Change-Id: I25166a348cb0a76cccfa49c82190aad88deb3c47 Reviewed-on: https://gerrit.libreoffice.org/11853 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk index 767e443..be02cd8 100644 --- a/scp2/Module_scp2.mk +++ b/scp2/Module_scp2.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Module_add_targets,scp2,\ ) \ $(if $(filter WNT,$(OS)),\ $(if $(DISABLE_ACTIVEX),,InstallModule_activex) \ + InstallModule_quickstart \ InstallModule_windows \ $(if $(filter MSC,$(COM)),\ InstallModule_winexplorerext \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - 2 commits - sw/source
sw/source/core/crsr/crstrvl.cxx | 34
sw/source/core/uibase/shells/basesh.cxx |6 +
2 files changed, 32 insertions(+), 8 deletions(-)
New commits:
commit 659194b946f3c2d31ffe715fb2232257cf0424e0
Author: Jan-Marek Glogowski glo...@fbihome.de
Date: Fri Aug 8 11:21:14 2014 +0200
Fix input field tab handling
When searching for the current field in the field list to find the
previous or next one, we check the field start and compare it with
the cursor position.
But with the new input fields, the cursor can actually be anywhere
in the field, so we actually have to search for the start position
of the input field at the cursor position.
Change-Id: I26526524eccfdbea41c6bf69a460fa64248f50ca
Reviewed-on: https://gerrit.libreoffice.org/10837
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit d33db207e27198df7af9fc007d7532ec76c80991)
Reviewed-on: https://gerrit.libreoffice.org/11781
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 80febe1..c9b11c0 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -670,6 +670,8 @@ bool SwCrsrShell::MoveFldType(
SwTxtFld * pTxtFld = pTNd-GetFldTxtAttrAt( rPos.nContent.GetIndex(),
true );
const bool bDelFld = ( pTxtFld == NULL );
+sal_Int32 nContentOffset = -1;
+
if( bDelFld )
{
// create dummy for the search
@@ -680,23 +682,47 @@ bool SwCrsrShell::MoveFldType(
mpDoc-IsClipBoard() );
pTxtFld-ChgTxtNode( pTNd );
}
+else
+{
+// the cursor might be anywhere inside the input field,
+// but we will be searching for the field start
+if (pTxtFld-Which() == RES_TXTATR_INPUTFIELD
+ rPos.nContent.GetIndex() != *pTxtFld-GetStart())
+nContentOffset = *pTxtFld-GetStart();
+}
+
+_SetGetExpFld *pSrch = NULL;
+SwIndex *pIndex = NULL;
+if( -1 == nContentOffset )
+{
+pSrch = new _SetGetExpFld( rPos.nNode, pTxtFld, rPos.nContent );
+}
+else
+{
+pIndex = new SwIndex( rPos.nNode.GetNode().GetCntntNode(),
nContentOffset );
+pSrch = new _SetGetExpFld( rPos.nNode, pTxtFld, pIndex );
+}
-_SetGetExpFld aSrch( rPos.nNode, pTxtFld, rPos.nContent );
if( rPos.nNode.GetIndex()
mpDoc-GetNodes().GetEndOfExtras().GetIndex() )
{
// also at collection use only the first frame
Point aPt;
-aSrch.SetBodyPos( *pTNd-getLayoutFrm( GetLayout(), aPt, rPos,
false ) );
+pSrch-SetBodyPos( *pTNd-getLayoutFrm( GetLayout(), aPt, rPos,
false ) );
}
-it = aSrtLst.lower_bound( aSrch );
+it = aSrtLst.lower_bound( pSrch );
+
+bool isSrch = (**it == *pSrch);
+delete pIndex;
+delete pSrch;
+
if( bDelFld )
{
delete (SwFmtFld*)pTxtFld-GetAttr();
delete pTxtFld;
}
-if( it != aSrtLst.end() **it == aSrch ) // found
+if( it != aSrtLst.end() isSrch ) // found
{
if( bNext )
{
commit dfde5b967b27d9a44f35ce96cf99554722985bc5
Author: Jan-Marek Glogowski glo...@fbihome.de
Date: Thu Aug 7 15:18:19 2014 +0200
fdo#76565 Allow pasting into input fields
Reviewed-on: https://gerrit.libreoffice.org/10835
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit 3f26ab24e0bfd27645c97ff7915fba2db409930a)
Conflicts:
sw/source/uibase/shells/basesh.cxx
Change-Id: If996284aeea4b430cceaaf264035aa9e4ec0f2f0
Reviewed-on: https://gerrit.libreoffice.org/11780
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/core/uibase/shells/basesh.cxx
b/sw/source/core/uibase/shells/basesh.cxx
index e7dba76..0ec0312 100644
--- a/sw/source/core/uibase/shells/basesh.cxx
+++ b/sw/source/core/uibase/shells/basesh.cxx
@@ -267,8 +267,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest rReq)
TransferableDataHelper aDataHelper(
TransferableDataHelper::CreateFromSystemClipboard(
rSh.GetView().GetEditWin() ) );
if( aDataHelper.GetXTransferable().is()
- SwTransferable::IsPaste( rSh, aDataHelper )
- !rSh.CrsrInsideInputFld() )
+ SwTransferable::IsPaste( rSh, aDataHelper ) )
{
// Temporary variables, because the shell could already be
// destroyed after the paste.
@@ -416,8 +415,7 @@ void SwBaseShell::StateClpbrd(SfxItemSet rSet)
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/source
sw/source/core/doc/doc.cxx | 49 ++---
1 file changed, 38 insertions(+), 11 deletions(-)
New commits:
commit 35166b42fdefd18a0d06b8053bae549466457c08
Author: Jan-Marek Glogowski glo...@fbihome.de
Date: Thu Aug 7 14:49:36 2014 +0200
fdo#81750 MM: correctly convert inline-edit fields
The new inline-editable input fields contain real content in the
node, therefore a single SwPaM::Move isn't sufficient to select
the field or move after the field.
For the input fields we can directly go to the end of the field.
Reviewed-on: https://gerrit.libreoffice.org/10834
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit 2579adb13188d276701b1504b4a10bed4d8d4b6f)
Conflicts:
sw/source/core/doc/doc.cxx
Change-Id: Ic1bce415ce45e49456121b6db003ded0733e195c
Reviewed-on: https://gerrit.libreoffice.org/11782
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 1c419fe..3079d8e 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -112,6 +112,7 @@
#include wdocsh.hxx
#include prtopt.hxx
+#include wrtsh.hxx
#include vector
#include map
@@ -2027,21 +2028,47 @@ bool SwDoc::ConvertFieldsToText()
nWhich != RES_REFPAGESETFLD))
{
OUString sText = pField-ExpandField(true);
-//database fields should not convert their command into
text
+
+// database fields should not convert their command into
text
if( RES_DBFLD == pCurType-Which() !static_castconst
SwDBField*(pField)-IsInitialized())
sText = ;
-//now remove the field and insert the string
-SwPaM aPam1(*pTxtFld-GetpTxtNode(), *pTxtFld-GetStart());
-aPam1.Move();
-//insert first to keep the field's attributes
+SwPaM aInsertPam(*pTxtFld-GetpTxtNode(),
*pTxtFld-GetStart());
+aInsertPam.SetMark();
+
+// go to the end of the field
+const SwTxtFld *pTxtField = GetTxtFldAtPos(
*aInsertPam.End() );
+if (pTxtField pTxtField-Which() ==
RES_TXTATR_INPUTFIELD)
+{
+SwPosition rEndPos = *aInsertPam.GetPoint();
+rEndPos.nContent =
GetDocShell()-GetWrtShell()-EndOfInputFldAtPos( *aInsertPam.End() );
+}
+else
+{
+aInsertPam.Move();
+}
+
+// first insert the text after field to keep the field's
attributes,
+// then delete the field
if (!sText.isEmpty())
-InsertString( aPam1, sText );
-SwPaM aPam2(*pTxtFld-GetpTxtNode(), *pTxtFld-GetStart());
-aPam2.SetMark();
-aPam2.Move();
-DeleteAndJoin(aPam2);//remove the field
-bRet=true;
+{
+// to keep the position after insert
+SwPaM aDelPam( *aInsertPam.GetMark(),
*aInsertPam.GetPoint() );
+aDelPam.Move( fnMoveBackward );
+aInsertPam.DeleteMark();
+
+InsertString( aInsertPam, sText );
+
+aDelPam.Move();
+// finally remove the field
+DeleteAndJoin( aDelPam );
+}
+else
+{
+DeleteAndJoin( aInsertPam );
+}
+
+bRet = true;
}
}
++aBegin;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/table2.cxx | 16
1 file changed, 12 insertions(+), 4 deletions(-)
New commits:
commit 1e721077b43de84edab2a3ed2f316ddcbec6e3ec
Author: Seyeong Kim seyeong@canonical.com
Date: Tue Oct 7 00:22:32 2014 +0900
fdo#83141: optimize slow performance after when using replaceall or
searchall
- problem was hang after replaceall or searchall function
- fix slow performance by looping only selected cols.
Change-Id: Ic0178af33bf381e52584bd4366bff9e128891b64
Reviewed-on: https://gerrit.libreoffice.org/11829
Tested-by: LibreOffice gerrit bot ger...@libreoffice.org
Reviewed-by: Matthew Francis mjay.fran...@gmail.com
Tested-by: Matthew Francis mjay.fran...@gmail.com
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 882c481..f603c8b 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -50,6 +50,7 @@
#include refupdatecontext.hxx
#include scopetools.hxx
#include tabprotection.hxx
+#include columnspanset.hxx
#include rowheightcontext.hxx
#include refhint.hxx
@@ -2119,10 +2120,17 @@ bool ScTable::HasBlockMatrixFragment( SCCOL nCol1,
SCROW nRow1, SCCOL nCol2, SCR
bool ScTable::HasSelectionMatrixFragment( const ScMarkData rMark ) const
{
-bool bFound = false;
-for (SCCOL i=0; i=MAXCOL !bFound; i++)
-bFound |= aCol[i].HasSelectionMatrixFragment(rMark);
-return bFound;
+std::vectorsc::ColRowSpan aSpans = rMark.GetMarkedColSpans();
+
+for ( size_t i=0; iaSpans.size(); i++ )
+{
+for ( SCCOLROW j=aSpans[i].mnStart; jaSpans[i].mnEnd; j++ )
+{
+if ( aCol[j].HasSelectionMatrixFragment(rMark) )
+return true;
+}
+}
+return false;
}
bool ScTable::IsBlockEditable( SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-7' - sw/qa sw/source
sw/qa/extras/odfimport/data/fdo79269.odt|binary
sw/qa/extras/odfimport/data/fdo79269_header.odt |binary
sw/qa/extras/odfimport/odfimport.cxx| 35
sw/source/core/unocore/unostyle.cxx | 35 +---
4 files changed, 55 insertions(+), 15 deletions(-)
New commits:
commit 31328c9bb0ea5802773094250350e8ad4c76
Author: Michael Stahl mst...@redhat.com
Date: Tue Sep 30 17:59:08 2014 +0200
fdo#79269: fix ODF import of style:footer-first
The implementation of SwXStyle's FirstIsShared property is busted, and
that causes xmloff to write the footer-first content into the master
footer.
This is a re-implementation of 0f21f932081471b2a5eda820fa1a194fbf3ab85c
because unostyle.cxx is very different on master...
Reviewed-on: https://gerrit.libreoffice.org/11722
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
(cherry picked from commit 902de8a1cbdb86c1eb1a05c8307b109fd75f493c)
Conflicts:
sw/source/core/unocore/unostyle.cxx
Change-Id: I485d8089c1fb5ba3ca369fbfe8f3115bf700ba13
Reviewed-on: https://gerrit.libreoffice.org/11752
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit ccfea9417df8e628a76e019712e862f5f0840caa)
diff --git a/sw/qa/extras/odfimport/data/fdo79269.odt
b/sw/qa/extras/odfimport/data/fdo79269.odt
new file mode 100644
index 000..2e3bf1e
Binary files /dev/null and b/sw/qa/extras/odfimport/data/fdo79269.odt differ
diff --git a/sw/qa/extras/odfimport/data/fdo79269_header.odt
b/sw/qa/extras/odfimport/data/fdo79269_header.odt
new file mode 100644
index 000..6f1a839
Binary files /dev/null and b/sw/qa/extras/odfimport/data/fdo79269_header.odt
differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx
b/sw/qa/extras/odfimport/odfimport.cxx
index e7fa8fb..68ec3c1 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -271,6 +271,41 @@ DECLARE_ODFIMPORT_TEST(testFdo60842, fdo60842.odt)
getCell(xTable, E1, 01/04/2012);
}
+DECLARE_ODFIMPORT_TEST(testFdo79269, fdo79269.odt)
+{
+uno::Referenceframe::XModel xModel(mxComponent, uno::UNO_QUERY);
+uno::Referencetext::XTextViewCursorSupplier
xTextViewCursorSupplier(xModel-getCurrentController(), uno::UNO_QUERY);
+uno::Referencetext::XPageCursor
xCursor(xTextViewCursorSupplier-getViewCursor(), uno::UNO_QUERY);
+xCursor-jumpToLastPage();
+CPPUNIT_ASSERT_EQUAL(sal_Int16(2), xCursor-getPage());
+
+// The problem was that the first-footer was shared.
+uno::Referencebeans::XPropertySet
xPropSet(getStyles(PageStyles)-getByName(DEFAULT_STYLE), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(false, getPropertybool(xPropSet, FirstIsShared));
+
+uno::Referencetext::XTextRange xFooter1 = getProperty
uno::Referencetext::XTextRange (xPropSet, FooterTextFirst);
+CPPUNIT_ASSERT_EQUAL(OUString(forst), xFooter1-getString());
+uno::Referencetext::XTextRange xFooter = getProperty
uno::Referencetext::XTextRange (xPropSet, FooterText);
+CPPUNIT_ASSERT_EQUAL(OUString(second), xFooter-getString());
+}
+
+DECLARE_ODFIMPORT_TEST(testFdo79269_header, fdo79269_header.odt)
+{
+uno::Referenceframe::XModel xModel(mxComponent, uno::UNO_QUERY);
+uno::Referencetext::XTextViewCursorSupplier
xTextViewCursorSupplier(xModel-getCurrentController(), uno::UNO_QUERY);
+uno::Referencetext::XPageCursor
xCursor(xTextViewCursorSupplier-getViewCursor(), uno::UNO_QUERY);
+xCursor-jumpToLastPage();
+CPPUNIT_ASSERT_EQUAL(sal_Int16(2), xCursor-getPage());
+
+uno::Referencebeans::XPropertySet
xPropSet(getStyles(PageStyles)-getByName(DEFAULT_STYLE), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(false, getPropertybool(xPropSet, FirstIsShared));
+
+uno::Referencetext::XTextRange xFooter1 = getProperty
uno::Referencetext::XTextRange (xPropSet, HeaderTextFirst);
+CPPUNIT_ASSERT_EQUAL(OUString(forst), xFooter1-getString());
+uno::Referencetext::XTextRange xFooter = getProperty
uno::Referencetext::XTextRange (xPropSet, HeaderText);
+CPPUNIT_ASSERT_EQUAL(OUString(second), xFooter-getString());
+}
+
DECLARE_ODFIMPORT_TEST(testFdo56272, fdo56272.odt)
{
uno::Referencedrawing::XShape xShape = getShape(1);
diff --git a/sw/source/core/unocore/unostyle.cxx
b/sw/source/core/unocore/unostyle.cxx
index 4963b68..35b929c 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -466,6 +466,24 @@ SwXStyleFamily::~SwXStyleFamily()
}
+static bool lcl_GetHeaderFooterItem(
+SfxItemSet const rSet, OUString const rPropName, bool const bFooter,
+SvxSetItem const* o_rpItem)
+{
+SfxItemState eState = rSet.GetItemState(
+(bFooter) ? SID_ATTR_PAGE_FOOTERSET :
[Libreoffice-commits] core.git: svx/Library_svxcore.mk svx/source
svx/Library_svxcore.mk | 12
svx/source/gallery2/gallery1.cxx | 20 +++-
2 files changed, 31 insertions(+), 1 deletion(-)
New commits:
commit 96d091d43428472c2c68054ed5dca22f79adc705
Author: Tor Lillqvist t...@collabora.com
Date: Wed Oct 8 11:28:00 2014 +0300
Don't try to create cdefghij.klm inside the app bundle on OS X when
sandboxed
Actually, we check HAVE_FEATURE_READONLY_INSTALLSET and not
HAVE_FEATURE_MACOSX_SANDBOX, but in practice we set the former only
for the latter case.
We could do this test cross-platform but I didn't bother now. Nobody
uses --enable-readonly-installset when building for Linux or Windows
anyway, I think.
(There must be more places where we could and should check
HAVE_FEATURE_READONLY_INSTALLSET.)
Change-Id: Ie54f436616a1db3119b0bc0148149784127b156d
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 7efaf27..1536ee6 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -90,6 +90,18 @@ $(eval $(call gb_Library_use_externals,svxcore,\
glew \
))
+ifeq ($(OS),MACOSX)
+
+$(eval $(call gb_Library_add_cxxflags,svxcore,\
+$(gb_OBJCXXFLAGS) \
+))
+
+$(eval $(call gb_Library_use_system_darwin_frameworks,svxcore,\
+ Foundation \
+))
+
+endif
+
$(eval $(call gb_Library_add_exception_objects,svxcore,\
svx/source/core/coreservices \
svx/source/core/extedit \
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 20fa438..e9ce8b6 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -17,6 +17,15 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include config_features.h
+
+#if defined(MACOSX) defined(HAVE_FEATURE_READONLY_INSTALLSET)
+#define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
+#include premac.h
+#include Foundation/Foundation.h
+#include postmac.h
+#endif
+
#include sal/config.h
#include comphelper/processfactory.hxx
@@ -236,6 +245,15 @@ void Gallery::ImplLoadSubDirs( const INetURLObject
rBaseURL, bool rbDirIsReadO
uno::Reference sdbc::XResultSet xResultSet( aCnt.createCursor(
aProps, ::ucbhelper::INCLUDE_DOCUMENTS_ONLY ) );
+#if defined(MACOSX) defined(HAVE_FEATURE_READONLY_INSTALLSET)
+if( rBaseURL.GetProtocol() == INET_PROT_FILE )
+{
+const char *appBundle = [[[NSBundle mainBundle] bundlePath]
UTF8String];
+OUString path = rBaseURL.GetURLPath();
+if( path.startsWith( OUString( appBundle, strlen( appBundle ),
RTL_TEXTENCODING_UTF8 ) + / ) )
+rbDirIsReadOnly = true;
+}
+#else
try
{
// check readonlyness the very hard way
@@ -267,7 +285,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject
rBaseURL, bool rbDirIsReadO
catch( const uno::Exception )
{
}
-
+#endif
if( xResultSet.is() )
{
uno::Reference ucb::XContentAccess xContentAccess( xResultSet,
uno::UNO_QUERY );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/gallery2/gallery1.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d61f8185e660a6820351b8cea3ac51d344f0ab3e
Author: Tor Lillqvist t...@collabora.com
Date: Wed Oct 8 19:08:22 2014 +0300
Fix thinko. Thanks to vmiklos for noticing
Change-Id: Id4e65908cc73978205bc0858a3a809b882864b62
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index e9ce8b6..ba7c761 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -19,7 +19,7 @@
#include config_features.h
-#if defined(MACOSX) defined(HAVE_FEATURE_READONLY_INSTALLSET)
+#if defined(MACOSX) HAVE_FEATURE_READONLY_INSTALLSET
#define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
#include premac.h
#include Foundation/Foundation.h
@@ -245,7 +245,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject
rBaseURL, bool rbDirIsReadO
uno::Reference sdbc::XResultSet xResultSet( aCnt.createCursor(
aProps, ::ucbhelper::INCLUDE_DOCUMENTS_ONLY ) );
-#if defined(MACOSX) defined(HAVE_FEATURE_READONLY_INSTALLSET)
+#if defined(MACOSX) HAVE_FEATURE_READONLY_INSTALLSET
if( rBaseURL.GetProtocol() == INET_PROT_FILE )
{
const char *appBundle = [[[NSBundle mainBundle] bundlePath]
UTF8String];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/textbox-table.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 11 +
sw/source/filter/ww8/docxattributeoutput.cxx | 27 +++
sw/source/filter/ww8/docxattributeoutput.hxx | 16 +
4 files changed, 54 insertions(+)
New commits:
commit ab52bb712c335e88cf100b3b8336a46b7673eb98
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Oct 8 18:00:34 2014 +0200
DOCX export: fix handling of shapes containing and also anchored inside
tables
Change-Id: I6f23bd0e0553b8f6435537b542fc82ee55a64c03
diff --git a/sw/qa/extras/ooxmlexport/data/textbox-table.docx
b/sw/qa/extras/ooxmlexport/data/textbox-table.docx
new file mode 100644
index 000..8c06f5e
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/textbox-table.docx
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 9b49339..279be00 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -424,6 +424,17 @@ DECLARE_OOXMLEXPORT_TEST(testMultiPageToc,
multi-page-toc.docx)
CPPUNIT_ASSERT_EQUAL(OUString(TextFieldStart),
getPropertyOUString(getRun(getParagraphOfText(1, xHeaderText), 1),
TextPortionType));
}
+DECLARE_OOXMLEXPORT_TEST(testTextboxTable, textbox-table.docx)
+{
+// We wrote not-well-formed XML during export for this one:
+// Shape with textbox, having a table and also anchored inside a table.
+
+// Just make sure that we have both tables.
+uno::Referencetext::XTextTablesSupplier xTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xTables(xTablesSupplier-getTextTables(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xTables-getCount());
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 95b0ea4..2529b1a 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -5090,20 +5090,47 @@ void DocxAttributeOutput::WriteOutliner(const
OutlinerParaObject rParaObj)
m_pSerializer-endElementNS( XML_w, XML_txbxContent );
}
+DocxTableExportContext::DocxTableExportContext(ww8::WW8TableInfo::Pointer_t
pTableInfo, bool bTableCellOpen, sal_uInt32 nTableDepth)
+{
+m_pTableInfo = pTableInfo;
+pTableInfo = ww8::WW8TableInfo::Pointer_t(new ww8::WW8TableInfo());
+
+m_bTableCellOpen = bTableCellOpen;
+bTableCellOpen = false;
+
+m_nTableDepth = nTableDepth;
+nTableDepth = 0;
+}
+
+void DocxTableExportContext::restore(ww8::WW8TableInfo::Pointer_t pTableInfo,
bool bTableCellOpen, sal_uInt32 nTableDepth)
+{
+pTableInfo = m_pTableInfo;
+bTableCellOpen = m_bTableCellOpen;
+nTableDepth = m_nTableDepth;
+}
+
void DocxAttributeOutput::WriteTextBox(uno::Referencedrawing::XShape xShape)
{
+DocxTableExportContext aTableExportContext(m_rExport.mpTableInfo,
m_tableReference-m_bTableCellOpen, m_tableReference-m_nTableDepth);
+
SwFrmFmt* pTextBox = SwTextBoxHelper::findTextBox(xShape);
const SwPosition* pAnchor = pTextBox-GetAnchor().GetCntntAnchor();
sw::Frame aFrame(*pTextBox, *pAnchor);
m_rExport.SdrExporter().writeDMLTextFrame(aFrame, m_anchorId++,
/*bTextBoxOnly=*/true);
+
+aTableExportContext.restore(m_rExport.mpTableInfo,
m_tableReference-m_bTableCellOpen, m_tableReference-m_nTableDepth);
}
void DocxAttributeOutput::WriteVMLTextBox(uno::Referencedrawing::XShape
xShape)
{
+DocxTableExportContext aTableExportContext(m_rExport.mpTableInfo,
m_tableReference-m_bTableCellOpen, m_tableReference-m_nTableDepth);
+
SwFrmFmt* pTextBox = SwTextBoxHelper::findTextBox(xShape);
const SwPosition* pAnchor = pTextBox-GetAnchor().GetCntntAnchor();
sw::Frame aFrame(*pTextBox, *pAnchor);
m_rExport.SdrExporter().writeVMLTextFrame(aFrame, /*bTextBoxOnly=*/true);
+
+aTableExportContext.restore(m_rExport.mpTableInfo,
m_tableReference-m_bTableCellOpen, m_tableReference-m_nTableDepth);
}
oox::drawingml::DrawingML DocxAttributeOutput::GetDrawingML()
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 30faa7f..eebee0e 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -106,6 +106,22 @@ struct PageMargins
};
/**
+ * All the information that should be stashed away when we're in the middle of
+ * of a table export and still have to do something else, e.g. export a shape.
+ */
+class DocxTableExportContext
+{
+ww8::WW8TableInfo::Pointer_t m_pTableInfo;
+bool m_bTableCellOpen;
+sal_uInt32 m_nTableDepth;
+public:
+/// Stores the passed parameters and resets them to their default value.
+DocxTableExportContext(ww8::WW8TableInfo::Pointer_t pTableInfo, bool
Re: ESC call Thursday 16:00 central European time ...
On Wed, 2014-10-08 at 11:28 +0200, Jean-Baptiste Faure wrote: Le 08/10/2014 10:53, Sophie a écrit : Hi all, Le 08/10/2014 10:44, Michael Meeks a écrit : Hi Jean-Baptiste, On Wed, 2014-10-08 at 07:28 +0200, Jean-Baptiste Faure wrote: I do not know where to write in the agenda, so I do my suggestion here: Ah - in general anywhere in the middle is fine - the action items we try to do while people turn up - to keep the call short. Just for information, I've added the link to Jean-Baptiste message on the QA part of the pad, so you have it at hand if Jean-Baptiste can't attend. Thank you Sophie :-) I can't attend the call because I will have a professional meeting at the same time. I think we will have a big marketink/communication problem with a lot of duplicates of bug 81633 until spring 2015 if the commit for bug 81309 is not reverted in 4.2.7 and 4.3.3 for which it is only a partial fix. So the problem is not a Calc only problem, especially when Calc developers don't want to be in CC for these Calc bugs. A large number of random people put us on CC on a large number of bugs. Handling those incoming notifications diligently takes an enormous amount of time especially when the number of those who has to answer those CC notification is an order of magnitude lower than the number of those who liberally put us on CC. Spending time handling those individual requests means we don't have time to actually work on fixing bugs, making improvement etc. Is that really what you want us to do? I can only speak for myself, but I've made a concious decision to disable notification to give up on getting up-to-the-minute updates on bugs in order to focus my time on working on the code. Note that disabling notification doesn't mean I don't go to bugzilla. I do go to bugzilla in between my tasks when I have some extra time. And I can always run bugzilla query to search for bugs where I'm on CC when I choose to. In other words, what should I answer on users mailing list when a user says that his spreadsheets that worked fine since years, suddenly do not work anymore? What works and not work is very subjective, and as I keep repeating in many other places, one person's bug is another's precious feature. I wish I had the power to keep everyone happy, but unfortunately I have no such power, nor do anyone else. If anyone reading this knows exactly what to do to solve this conundrum, please do speak up. I personally don't have any solution to offer other than what I've already done. Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: ESC call Thursday 16:00 central European time ...
On Wed, 2014-10-08 at 10:53 +0200, Sophie wrote: Hi all, Le 08/10/2014 10:44, Michael Meeks a écrit : Hi Jean-Baptiste, On Wed, 2014-10-08 at 07:28 +0200, Jean-Baptiste Faure wrote: I do not know where to write in the agenda, so I do my suggestion here: Ah - in general anywhere in the middle is fine - the action items we try to do while people turn up - to keep the call short. Just for information, I've added the link to Jean-Baptiste message on the QA part of the pad, so you have it at hand if Jean-Baptiste can't attend. FYI, not having the stake holder (i.e. either JBF or anyone who is equally affected) in the discussion would make the discussion less meaningful. Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: scripting/java
scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.java
|6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 1df9d5767b3222cace051a75259dea5d951cbfaf
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date: Wed Oct 8 18:22:16 2014 +0200
scripting: as of release 5, 'enum' is a keyword
Change-Id: Ia45890892f3a0fa89b4c1f97a4c169de5e25c593
Reviewed-on: https://gerrit.libreoffice.org/11860
Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
Tested-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
diff --git
a/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.java
b/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.java
index 1caa883..4a91798 100644
---
a/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.java
+++
b/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.java
@@ -52,11 +52,11 @@ public class OfficeSettings extends SystemOption {
SVersionRCFile sversion = SVersionRCFile.createInstance();
try {
-Enumeration enum = sversion.getVersions();
+Enumeration enumeration = sversion.getVersions();
OfficeInstallation oi;
-while (enum.hasMoreElements()) {
-oi = (OfficeInstallation)enum.nextElement();
+while (enumeration.hasMoreElements()) {
+oi = (OfficeInstallation)enumeration.nextElement();
setOfficeDirectory(oi);
return;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Crash test update
On Tue, 2014-10-07 at 20:00 +, Miklos Vajna wrote: New crashtest update available at http://dev-builds.libreoffice.org/crashtest/24fb87501ef9d5aa715d572de7eb5efe49a0d9c3/ FWIW the jump in rtf import crashes appears (e.g. ooo84172-1.rtf) appears to be triggered by 9dbf817fe5c5253fba0831aefa17575ae0ba3af1 which now asserts in DomainMapper_Impl::RemoveTopRedline on an empty m_aRedlines stack. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svgio/inc svgio/source
svgio/inc/svgio/svgreader/svgstyleattributes.hxx |8 +
svgio/inc/svgio/svgreader/svgtoken.hxx |2
svgio/inc/svgio/svgreader/svgtools.hxx | 16 +++
svgio/source/svgreader/svgcirclenode.cxx |2
svgio/source/svgreader/svgclippathnode.cxx |2
svgio/source/svgreader/svgdocumenthandler.cxx|4
svgio/source/svgreader/svgellipsenode.cxx|2
svgio/source/svgreader/svggnode.cxx |2
svgio/source/svgreader/svggradientnode.cxx |2
svgio/source/svgreader/svggradientstopnode.cxx |2
svgio/source/svgreader/svgimagenode.cxx |2
svgio/source/svgreader/svglinenode.cxx |2
svgio/source/svgreader/svgmarkernode.cxx |2
svgio/source/svgreader/svgmasknode.cxx |2
svgio/source/svgreader/svgnode.cxx |4
svgio/source/svgreader/svgpathnode.cxx |2
svgio/source/svgreader/svgpatternnode.cxx|2
svgio/source/svgreader/svgpolynode.cxx |2
svgio/source/svgreader/svgrectnode.cxx |2
svgio/source/svgreader/svgstyleattributes.cxx| 95 +--
svgio/source/svgreader/svgstylenode.cxx |2
svgio/source/svgreader/svgsvgnode.cxx|2
svgio/source/svgreader/svgsymbolnode.cxx |2
svgio/source/svgreader/svgtextnode.cxx |2
svgio/source/svgreader/svgtextpathnode.cxx |2
svgio/source/svgreader/svgtoken.cxx | 29 ++-
svgio/source/svgreader/svgtools.cxx | 30 +--
svgio/source/svgreader/svgtrefnode.cxx |2
svgio/source/svgreader/svgtspannode.cxx |2
svgio/source/svgreader/svgusenode.cxx|2
30 files changed, 151 insertions(+), 81 deletions(-)
New commits:
commit 2b179313ac95f4ae9dc2cf8f6b6d577ea893c7a8
Author: Armin Le Grand a...@apache.org
Date: Wed Oct 8 16:36:47 2014 +
i125332 made css style stuff aware that it is case independent
diff --git a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
index 36e60ac..3911e6b 100644
--- a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
+++ b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
@@ -259,7 +259,11 @@ namespace svgio
public:
/// local attribute scanner
-void parseStyleAttribute(const rtl::OUString rTokenName, SVGToken
aSVGToken, const rtl::OUString aContent);
+void parseStyleAttribute(
+const rtl::OUString rTokenName,
+SVGToken aSVGToken,
+const rtl::OUString aContent,
+bool bCaseIndependent);
/// helper which does the necessary with a given path
void add_text(
@@ -279,7 +283,7 @@ namespace svgio
const SvgStyleAttributes* getCssStyleParent() const { return
mpCssStyleParent; }
/// scan helpers
-void readStyle(const rtl::OUString rCandidate);
+void readCssStyle(const rtl::OUString rCandidate);
const SvgStyleAttributes* getParentStyle() const;
SvgStyleAttributes(SvgNode rOwner);
diff --git a/svgio/inc/svgio/svgreader/svgtoken.hxx
b/svgio/inc/svgio/svgreader/svgtoken.hxx
index 19c5653..a20ae26 100644
--- a/svgio/inc/svgio/svgreader/svgtoken.hxx
+++ b/svgio/inc/svgio/svgreader/svgtoken.hxx
@@ -186,7 +186,7 @@ namespace svgio
SVGTokenLast
};
-SVGToken StrToSVGToken(const rtl::OUString rStr);
+SVGToken StrToSVGToken(const rtl::OUString rStr, bool
bCaseIndependent);
const rtl::OUString getStrTitle();
const rtl::OUString getStrDesc();
diff --git a/svgio/inc/svgio/svgreader/svgtools.hxx
b/svgio/inc/svgio/svgreader/svgtools.hxx
index c7b0dca..a138d83 100644
--- a/svgio/inc/svgio/svgreader/svgtools.hxx
+++ b/svgio/inc/svgio/svgreader/svgtools.hxx
@@ -203,13 +203,23 @@ namespace svgio
bool readNumberAndUnit(const rtl::OUString rCandidate, sal_Int32
nPos, SvgNumber aNum, const sal_Int32 nLen);
bool readAngle(const rtl::OUString rCandidate, sal_Int32 nPos,
double fAngle, const sal_Int32 nLen);
sal_Int32 read_hex(const sal_Unicode rChar);
-bool match_colorKeyword(basegfx::BColor rColor, const rtl::OUString
rName);
-bool read_color(const rtl::OUString rCandidate, basegfx::BColor
rColor);
+bool match_colorKeyword(
+basegfx::BColor rColor,
+const rtl::OUString rName,
+bool bCaseIndependent);
+bool read_color(
+const rtl::OUString rCandidate,
+basegfx::BColor rColor,
+bool bCaseIndependent);
basegfx::B2DRange readViewBox(const rtl::OUString rCandidate,
InfoProvider rInfoProvider);
basegfx::B2DHomMatrix readTransform(const rtl::OUString rCandidate,
InfoProvider rInfoProvider);
bool readSingleNumber(const
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/ooxml/model.xml | 280 ++-- 1 file changed, 140 insertions(+), 140 deletions(-) New commits: commit faea61ed3d11678c698e9679fb44b0a81a07cacd Author: Miklos Vajna vmik...@collabora.co.uk Date: Wed Oct 8 20:11:28 2014 +0200 Use constants for ST_PresetColorVal values Again no need to adapt dmapper/rtftok for these, see commit 020f46d17065b8b00365eab7a809ce980ebfb59a (Use constants for ST_Em values, 2014-10-07). Change-Id: Ie67f7a4d251525b5f8799cf613bea56ad82f7a57 diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index 58136fa..c85267c 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -3568,146 +3568,146 @@ attribute name=val tokenid=ooxml:CT_SchemeColor_val/ /resource resource name=ST_PresetColorVal resource=List - value tokenid=0xf0f8ffaliceBlue/value - value tokenid=0xfaebd7antiqueWhite/value - value tokenid=0x00aqua/value - value tokenid=0x7fffd4aquamarine/value - value tokenid=0xf0azure/value - value tokenid=0xf5f5dcbeige/value - value tokenid=0xffe4c4bisque/value - value tokenid=0x00black/value - value tokenid=0xffebcdblanchedAlmond/value - value tokenid=0xffblue/value - value tokenid=0x8a2be2blueViolet/value - value tokenid=0xa52a2abrown/value - value tokenid=0xdeb887burlyWood/value - value tokenid=0x5f9ea0cadetBlue/value - value tokenid=0x7fff00chartreuse/value - value tokenid=0xd2691echocolate/value - value tokenid=0xff7f50coral/value - value tokenid=0x6495edcornflowerBlue/value - value tokenid=0xfff8dccornsilk/value - value tokenid=0xdc143ccrimson/value - value tokenid=0x00cyan/value - value tokenid=0xff1493deepPink/value - value tokenid=0x00bfffdeepSkyBlue/value - value tokenid=0x696969dimGray/value - value tokenid=0x8bdkBlue/value - value tokenid=0x008b8bdkCyan/value - value tokenid=0xb8860bdkGoldenrod/value - value tokenid=0xa9a9a9dkGray/value - value tokenid=0x006400dkGreen/value - value tokenid=0xbdb76bdkKhaki/value - value tokenid=0x8b008bdkMagenta/value - value tokenid=0x556b2fdkOliveGreen/value - value tokenid=0xff8c00dkOrange/value - value tokenid=0x9932ccdkOrchid/value - value tokenid=0x8bdkRed/value - value tokenid=0xe9967adkSalmon/value - value tokenid=0x8fbc8bdkSeaGreen/value - value tokenid=0x483d8bdkSlateBlue/value - value tokenid=0x2f4f4fdkSlateGray/value - value tokenid=0x00ced1dkTurquoise/value - value tokenid=0x9400d3dkViolet/value - value tokenid=0x1e90ffdodgerBlue/value - value tokenid=0xb2firebrick/value - value tokenid=0xfffaf0floralWhite/value - value tokenid=0x228b22forestGreen/value - value tokenid=0xff00fffuchsia/value - value tokenid=0xdcdcdcgainsboro/value - value tokenid=0xf8f8ffghostWhite/value - value tokenid=0xffd700gold/value - value tokenid=0xdaa520goldenrod/value - value tokenid=0x808080gray/value - value tokenid=0x008000green/value - value tokenid=0xadff2fgreenYellow/value - value tokenid=0xf0fff0honeydew/value - value tokenid=0xff69b4hotPink/value - value tokenid=0xcd5c5cindianRed/value - value tokenid=0x4b0082indigo/value - value tokenid=0xf0ivory/value - value tokenid=0xf0e68ckhaki/value - value tokenid=0xe6e6falavender/value - value tokenid=0xfff0f5lavenderBlush/value - value tokenid=0x7cfc00lawnGreen/value - value tokenid=0xfffacdlemonChiffon/value - value tokenid=0x00ff00lime/value - value tokenid=0x32cd32limeGreen/value - value tokenid=0xfaf0e6linen/value - value tokenid=0xadd8e6ltBlue/value - value tokenid=0xf08080ltCoral/value - value tokenid=0xe0ltCyan/value - value tokenid=0xfafa78ltGoldenrodYellow/value - value tokenid=0xd3d3d3ltGray/value - value tokenid=0x90ee90ltGreen/value - value tokenid=0xffb6c1ltPink/value - value tokenid=0xffa07altSalmon/value - value tokenid=0x20b2aaltSeaGreen/value - value tokenid=0x87cefaltSkyBlue/value - value tokenid=0x778899ltSlateGray/value - value tokenid=0xb0c4deltSteelBlue/value - value tokenid=0xe0ltYellow/value - value tokenid=0xff00ffmagenta/value - value tokenid=0x80maroon/value - value tokenid=0x66cdaamedAquamarine/value - value tokenid=0xcdmedBlue/value - value tokenid=0xba55d3medOrchid/value - value tokenid=0x9370dbmedPurple/value - value tokenid=0x3cb371medSeaGreen/value - value tokenid=0x7b68eemedSlateBlue/value - value tokenid=0x00fa9amedSpringGreen/value - value tokenid=0x48d1ccmedTurquoise/value - value tokenid=0xc71585medVioletRed/value - value tokenid=0x191970midnightBlue/value - value tokenid=0xf5fffamintCream/value
[Libreoffice-commits] core.git: sw/source
sw/source/ui/misc/linenum.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ea79176e31c5b05fea25ff7b5e10fafde37642d9
Author: Eike Rathke er...@redhat.com
Date: Wed Oct 8 20:51:44 2014 +0200
pass const OUString, Clang loplugin:passstuffbyref
Change-Id: Ia3bf8a59c38b32a9ed24d21432f95e7141d72072
diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx
index 0828625..c71ae9e 100644
--- a/sw/source/ui/misc/linenum.cxx
+++ b/sw/source/ui/misc/linenum.cxx
@@ -35,7 +35,7 @@
#include IDocumentStylePoolAccess.hxx
-static rtl::ReferenceSwDocStyleSheet lcl_getDocStyleSheet(OUString rName,
SwWrtShell *pSh)
+static rtl::ReferenceSwDocStyleSheet lcl_getDocStyleSheet(const OUString
rName, SwWrtShell *pSh)
{
sal_uInt16 nFamily = SFX_STYLE_FAMILY_PARA;
SfxStyleSheetBasePool* mpBase =
pSh-GetView().GetDocShell()-GetStyleSheetPool();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/ui/misc/linenum.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6bc7b0748741d58724310e8fd09d31a5557aa031
Author: Eike Rathke er...@redhat.com
Date: Wed Oct 8 20:57:15 2014 +0200
pass const OUString, Clang loplugin:passstuffbyref
Change-Id: I7fdd4541ac61729878149bd47080e9ffbd43bc98
diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx
index c71ae9e..b28b2a7 100644
--- a/sw/source/ui/misc/linenum.cxx
+++ b/sw/source/ui/misc/linenum.cxx
@@ -46,7 +46,7 @@ static rtl::ReferenceSwDocStyleSheet
lcl_getDocStyleSheet(const OUString rNam
return new SwDocStyleSheet(*(SwDocStyleSheet*)pStyle);
}
-static void lcl_setLineNumbering(OUString rName, SwWrtShell* pSh, bool
bLineNumber)
+static void lcl_setLineNumbering(const OUString rName, SwWrtShell* pSh, bool
bLineNumber)
{
rtl::ReferenceSwDocStyleSheet xStyleSheet = lcl_getDocStyleSheet(rName,
pSh);
if(!xStyleSheet.is())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source
desktop/source/app/dispatchwatcher.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 9a35c05ac58ac2d3e6d76bf21e3cce9d407e7997
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Oct 8 21:42:41 2014 +0200
desktop: let --convert-to dump its exception message on stderr
Change-Id: Ic906740ddeab04a9acfee997a31a2249f23de65f
diff --git a/desktop/source/app/dispatchwatcher.cxx
b/desktop/source/app/dispatchwatcher.cxx
index f26d17c..5b6e911 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -562,9 +562,12 @@ bool DispatchWatcher::executeDispatchRequests( const
DispatchList aDispatchRequ
{
xStorable-storeToURL( aOutFile,
conversionProperties );
}
-catch (const Exception)
+catch (const Exception rException)
{
-fprintf( stderr, Error: Please reverify input
parameters...\n );
+std::cerr Error: Please reverify input
parameters...;
+if (!rException.Message.isEmpty())
+std::cerr ( rException.Message
);
+std::cerr std::endl;
}
if( aDispatchRequest.aRequestType == REQUEST_CAT )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 11 commits - bridges/source chart2/source comphelper/source cppu/source include/cppuhelper sw/source tools/source vcl/source
bridges/source/jni_uno/jni_java2uno.cxx|2
chart2/source/view/charttypes/GL3DBarChart.cxx |8 -
comphelper/source/misc/sequenceashashmap.cxx | 13 --
comphelper/source/property/opropertybag.cxx|4
comphelper/source/property/opropertybag.hxx|2
cppu/source/typelib/typelib.cxx|6 -
include/cppuhelper/propshlp.hxx|1
sw/source/core/text/txtdrop.cxx| 11 --
tools/source/inet/inetmime.cxx |1
vcl/source/gdi/pdfwriter_impl.cxx | 125 -
vcl/source/gdi/pdfwriter_impl.hxx |4
11 files changed, 80 insertions(+), 97 deletions(-)
New commits:
commit 9df8d2a922b85d76011c8ab67a1ded8f367e7aec
Author: Caolán McNamara caol...@redhat.com
Date: Wed Oct 8 16:13:02 2014 +0100
coverity#704183 Resource leak in object
Change-Id: I64b995c15a83d71aaa6745323141e71cc55cf000
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx
b/vcl/source/gdi/pdfwriter_impl.cxx
index bbacab8..fcaa685 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -1143,9 +1143,9 @@ void PDFWriterImpl::PDFPage::beginStream()
aLine.append( \nstream\n );
if( ! m_pWriter-writeBuffer( aLine.getStr(), aLine.getLength() ) )
return;
-if( osl_File_E_None != osl_getFilePos( m_pWriter-m_aFile,
m_nBeginStreamPos ) )
+if (osl::File::E_None != m_pWriter-m_aFile.getPos(m_nBeginStreamPos))
{
-osl_closeFile( m_pWriter-m_aFile );
+m_pWriter-m_aFile.close();
m_pWriter-m_bOpen = false;
}
#if defined ( COMPRESS_PAGES ) !defined ( DEBUG_DISABLE_PDFCOMPRESSION )
@@ -1160,9 +1160,9 @@ void PDFWriterImpl::PDFPage::endStream()
m_pWriter-endCompression();
#endif
sal_uInt64 nEndStreamPos;
-if( osl_File_E_None != osl_getFilePos( m_pWriter-m_aFile, nEndStreamPos
) )
+if (osl::File::E_None != m_pWriter-m_aFile.getPos(nEndStreamPos))
{
-osl_closeFile( m_pWriter-m_aFile );
+m_pWriter-m_aFile.close();
m_pWriter-m_bOpen = false;
return;
}
@@ -1720,7 +1720,8 @@ void PDFWriterImpl::PDFPage::appendWaveLine( sal_Int32
nWidth, sal_Int32 nY, sal
m_nSignatureLastByteRangeNoOffset( 0 ),
m_nResourceDict( -1 ),
m_nFontDictObject( -1 ),
-m_aFile(0),
+m_aContext(rContext),
+m_aFile(m_aContext.URL),
m_bOpen(false),
m_pCodec( NULL ),
m_pMemStream(NULL),
@@ -1744,7 +1745,6 @@ void PDFWriterImpl::PDFPage::appendWaveLine( sal_Int32
nWidth, sal_Int32 nY, sal
doTestCode();
}
#endif
-m_aContext = rContext;
m_aStructure.push_back( PDFStructureElement() );
m_aStructure[0].m_nOwnElement = 0;
m_aStructure[0].m_nParentElement= 0;
@@ -1758,17 +1758,17 @@ void PDFWriterImpl::PDFPage::appendWaveLine( sal_Int32
nWidth, sal_Int32 nY, sal
aState.m_aFont = aFont;
m_aGraphicsStack.push_front( aState );
-oslFileError aError = osl_openFile( m_aContext.URL.pData, m_aFile,
osl_File_OpenFlag_Write | osl_File_OpenFlag_Create );
-if( aError != osl_File_E_None )
+osl::File::RC aError = m_aFile.open(osl_File_OpenFlag_Write |
osl_File_OpenFlag_Create);
+if (aError != osl::File::E_None)
{
-if( aError == osl_File_E_EXIST )
+if (aError == osl::File::E_EXIST)
{
-aError = osl_openFile( m_aContext.URL.pData, m_aFile,
osl_File_OpenFlag_Write );
-if( aError == osl_File_E_None )
-aError = osl_setFileSize( m_aFile, 0 );
+aError = m_aFile.open(osl_File_OpenFlag_Write);
+if (aError == osl::File::E_None)
+aError = m_aFile.setSize(0);
}
}
-if( aError != osl_File_E_None )
+if (aError != osl::File::E_None)
return;
m_bOpen = true;
@@ -1820,7 +1820,7 @@ void PDFWriterImpl::PDFPage::appendWaveLine( sal_Int32
nWidth, sal_Int32 nY, sal
aBuffer.append( \n%\303\244\303\274\303\266\303\237\n );
if( !writeBuffer( aBuffer.getStr(), aBuffer.getLength() ) )
{
-osl_closeFile( m_aFile );
+m_aFile.close();
m_bOpen = false;
return;
}
@@ -2166,14 +2166,12 @@ bool PDFWriterImpl::writeBuffer( const void* pBuffer,
sal_uInt64 nBytes )
if( m_aDocDigest )
rtl_digest_updateMD5( m_aDocDigest, pWriteBuffer,
static_castsal_uInt32(nBytes) );
-if( osl_writeFile( m_aFile,
- pWriteBuffer,
- nBytes, nWritten ) != osl_File_E_None )
+if (m_aFile.write(pWriteBuffer, nBytes, nWritten) != osl::File::E_None)
nWritten = 0;
if( nWritten != nBytes )
{
-osl_closeFile( m_aFile );
+m_aFile.close();
m_bOpen = false;
}
}
@@ -2352,15 +2350,15 @@ bool PDFWriterImpl::updateObject( sal_Int32 n )
return
Re: Crash test update
On Wed, Oct 08, 2014 at 05:37:33PM +0100, Caolán McNamara caol...@redhat.com wrote: FWIW the jump in rtf import crashes appears (e.g. ooo84172-1.rtf) appears to be triggered by 9dbf817fe5c5253fba0831aefa17575ae0ba3af1 which now asserts in DomainMapper_Impl::RemoveTopRedline on an empty m_aRedlines stack. I *think* the assert is correct and the RTF tokenizer has to be adjusted, but first I wanted to see how much does e1cbaebe7fe36690e192778c87b5eb63790017d7 help. In any case, it's good to see that this time the jump is around 5 documents and not 1000. :) Regards, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - vcl/workben
vcl/workben/icontest.cxx | 191 ---
1 file changed, 133 insertions(+), 58 deletions(-)
New commits:
commit a8ade0a201d4b57140a35300e0e87bca292580b3
Author: Tor Lillqvist t...@collabora.com
Date: Wed Oct 8 21:00:46 2014 +0300
More hacking on the 'icontest' test program
Use correct aspect ratio for the images.
Change-Id: I99c676c8c843c48633b5f17fd9333d0e0af4753f
diff --git a/vcl/workben/icontest.cxx b/vcl/workben/icontest.cxx
index 4d06aa2..208864b 100644
--- a/vcl/workben/icontest.cxx
+++ b/vcl/workben/icontest.cxx
@@ -34,76 +34,110 @@ using namespace com::sun::star;
class MyWorkWindow : public WorkWindow
{
+public:
+MyWorkWindow( vcl::Window* pParent, WinBits nWinStyle );
+
+virtual void Resize() SAL_OVERRIDE;
+};
+
+class MyOpenGLWorkWindow : public MyWorkWindow
+{
private:
-bool mbPainted;
-OUString msKind;
OpenGLWindow *mpOpenGLWindow;
public:
-MyWorkWindow( const char *kind, vcl::Window* pParent, WinBits nWinStyle );
+MyOpenGLWorkWindow( vcl::Window* pParent, WinBits nWinStyle );
-virtual void MouseButtonDown( const MouseEvent rMEvt ) SAL_OVERRIDE;
virtual void Paint( const Rectangle rRect ) SAL_OVERRIDE;
-virtual void Resize() SAL_OVERRIDE;
-std::vectorBitmap*maBitmaps;
+std::vectorGLuintmaTextureName;
+std::vectorfloatmaTextureAspect;
};
-MyWorkWindow::MyWorkWindow( const char *kind, vcl::Window* pParent, WinBits
nWinStyle ) :
+MyWorkWindow::MyWorkWindow( vcl::Window* pParent, WinBits nWinStyle ) :
WorkWindow( pParent, nWinStyle )
{
EnableInput();
-mbPainted = false;
-msKind = OUString( kind, strlen(kind), RTL_TEXTENCODING_UTF8 );
-if( msKind == opengl )
-{
-mpOpenGLWindow = new OpenGLWindow( this );
-mpOpenGLWindow-SetSizePixel( Size( 1000, 800 ) );
-mpOpenGLWindow-Show();
-mpOpenGLWindow-EnableInput();
- }
}
-void MyWorkWindow::MouseButtonDown( const MouseEvent rMEvt )
+MyOpenGLWorkWindow::MyOpenGLWorkWindow( vcl::Window* pParent, WinBits
nWinStyle ) :
+MyWorkWindow( pParent, nWinStyle )
{
-SAL_INFO(vcl.icontest, MouseButtonDown: rMEvt.GetPosPixel() );
-Size aSize( GetSizePixel() );
-Paint( Rectangle( Point( 0, 0 ), aSize ) );
-WorkWindow::MouseButtonDown( rMEvt );
+mpOpenGLWindow = new OpenGLWindow( this );
+mpOpenGLWindow-SetSizePixel( Size( 1000, 800 ) );
+mpOpenGLWindow-Show();
+mpOpenGLWindow-EnableInput();
}
-void MyWorkWindow::Paint( const Rectangle rRect )
+void MyOpenGLWorkWindow::Paint( const Rectangle )
{
-if( msKind == opengl )
-{
-SAL_INFO(vcl.icontest, == Paint! (OpenGL) GetSizePixel());
-OpenGLContext aCtx = mpOpenGLWindow-getContext();
-aCtx.requestLegacyContext();
-aCtx.setWinSize( Size( 1000, 800 ) );
+const int WIDTH = 1000, HEIGHT = 800;
-CHECK_GL_ERROR();
+SAL_INFO(vcl.icontest, == Paint! (OpenGL) GetSizePixel());
+OpenGLContext aCtx = mpOpenGLWindow-getContext();
+aCtx.requestLegacyContext();
+aCtx.setWinSize( Size( WIDTH, HEIGHT ) );
-aCtx.makeCurrent();
-CHECK_GL_ERROR();
+CHECK_GL_ERROR();
+
+aCtx.makeCurrent();
+CHECK_GL_ERROR();
-glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+Size aSize(WIDTH, HEIGHT);
+glViewport( 0, 0, aSize.Width(), aSize.Height() );
+
+glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+CHECK_GL_ERROR();
+
+float nThumbWidth = 2.0 / (WIDTH / 100.0);
+float nThumbHeight = 2.0 / (HEIGHT / 100.0);
+
+float nStepX = 2.0 / (WIDTH / (100.0 + 10));
+float nStepY = 2.0 / (HEIGHT / (100.0 + 10));
+
+float nX = -1, nY = -1;
+
+for (size_t i = 0; i maTextureName.size(); ++i)
+{
+glBindTexture(GL_TEXTURE_2D, maTextureName[i]);
CHECK_GL_ERROR();
-Size aSize = GetSizePixel();
-glViewport( 0, 0, aSize.Width(), aSize.Height() );
+
+glPushMatrix();
CHECK_GL_ERROR();
-glColor3f( 1, 0.7, 0.2 );
+
+glTranslatef(nX, nY, 0);
+
+if (maTextureAspect[i] = 1)
+glScalef(1, 1/maTextureAspect[i], 1);
+else
+glScalef(1*maTextureAspect[i], 1, 1);
CHECK_GL_ERROR();
-glRectf(-0.75, 0.75, 0.75, -0.75);
+
+glBegin(GL_QUADS);
+glTexCoord2f(0, 0);
+glVertex3f(0, 0, 0);
+glTexCoord2f(0, 1);
+glVertex3f(0, nThumbHeight, 0);
+glTexCoord2f(1, 1);
+glVertex3f(nThumbWidth, nThumbHeight, 0);
+glTexCoord2f(1, 0);
+glVertex3f(nThumbWidth, 0, 0);
+glEnd();
CHECK_GL_ERROR();
-aCtx.swapBuffers();
+
+glPopMatrix();
CHECK_GL_ERROR();
+
+nX += nStepX;
+if (nX + nThumbWidth = 1)
+{
+nX = -1;
+nY += nStepY;
+}
}
-else
-{
-SAL_INFO(vcl.icontest, == Paint! (vcl));
-
[Libreoffice-commits] core.git: bean/README ios/shared o3tl/README
bean/README |2 +-
ios/shared/ios_sharedlo/objective_c/MLOManager.m |2 +-
o3tl/README |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit b77b1ba8f0ec18d37c0bfdd795a1a9726df01482
Author: Tor Lillqvist t...@collabora.com
Date: Mon Oct 6 17:15:26 2014 +0300
We should know what our name is
Change-Id: I4e4d9c9aea5bb9387dbb2e69d94c48f4988c3346
diff --git a/bean/README b/bean/README
index 213e8be..74fe284 100644
--- a/bean/README
+++ b/bean/README
@@ -1,3 +1,3 @@
-To use Libre Office from Java applications.
+To use LibreOffice from Java applications.
LibreOffice's API is completely exposed so that all office components can be
fully controlled.
diff --git a/ios/shared/ios_sharedlo/objective_c/MLOManager.m
b/ios/shared/ios_sharedlo/objective_c/MLOManager.m
index d12162e..466f9f3 100644
--- a/ios/shared/ios_sharedlo/objective_c/MLOManager.m
+++ b/ios/shared/ios_sharedlo/objective_c/MLOManager.m
@@ -73,7 +73,7 @@ static const NSTimeInterval FADE_IN_DURATION = 0.3;
-(void)start{
-NSLog(@L O : START LIBRE OFFICE);
+NSLog(@L O : START LIBREOFFICE);
if (![self isInit]) {
diff --git a/o3tl/README b/o3tl/README
index a017dfe..9a222f5 100644
--- a/o3tl/README
+++ b/o3tl/README
@@ -26,4 +26,4 @@ Simple vector-based memory pool allocator.
[git:o3tl/inc/o3tl/compat_functional.hxx]
Some more templates. Contains also templates from STLport's functional header
that are not part of the
-C++ standard (STLport has been replaced by direct use of the C++ STL in Libre
Office).
+C++ standard (STLport has been replaced by direct use of the C++ STL in
LibreOffice).
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - svgio/inc svgio/source sw/uiconfig
svgio/inc/svgio/svgreader/svgstyleattributes.hxx |5 -
svgio/inc/svgio/svgreader/svgtoken.hxx |2
svgio/inc/svgio/svgreader/svgtools.hxx |6 -
svgio/source/svgreader/svgcirclenode.cxx |2
svgio/source/svgreader/svgclippathnode.cxx |2
svgio/source/svgreader/svgdocumenthandler.cxx|5 -
svgio/source/svgreader/svgellipsenode.cxx|2
svgio/source/svgreader/svggnode.cxx |2
svgio/source/svgreader/svggradientnode.cxx |2
svgio/source/svgreader/svggradientstopnode.cxx |2
svgio/source/svgreader/svgimagenode.cxx |2
svgio/source/svgreader/svglinenode.cxx |2
svgio/source/svgreader/svgmarkernode.cxx |2
svgio/source/svgreader/svgmasknode.cxx |2
svgio/source/svgreader/svgnode.cxx |4
svgio/source/svgreader/svgpathnode.cxx |2
svgio/source/svgreader/svgpatternnode.cxx|2
svgio/source/svgreader/svgpolynode.cxx |2
svgio/source/svgreader/svgrectnode.cxx |2
svgio/source/svgreader/svgstyleattributes.cxx| 95 +--
svgio/source/svgreader/svgstylenode.cxx |2
svgio/source/svgreader/svgsvgnode.cxx|2
svgio/source/svgreader/svgsymbolnode.cxx |2
svgio/source/svgreader/svgtextnode.cxx |2
svgio/source/svgreader/svgtextpathnode.cxx |2
svgio/source/svgreader/svgtoken.cxx | 29 ++-
svgio/source/svgreader/svgtools.cxx | 20 +++-
svgio/source/svgreader/svgtrefnode.cxx |2
svgio/source/svgreader/svgtspannode.cxx |2
svgio/source/svgreader/svgusenode.cxx|2
sw/uiconfig/swriter/toolbar/textobjectbar.xml|2
31 files changed, 129 insertions(+), 83 deletions(-)
New commits:
commit bb29c5723a6053476b6f398c8550b2a839aa07fc
Author: Jan Holesovsky ke...@collabora.com
Date: Wed Oct 8 21:32:48 2014 +0200
fdo#81475: Show the Background color too.
Unfortunately it means something a bit different than the highlighting, and
it
is hard to achieve it by other means...
Change-Id: I6aced1e33ba8a9cfd73e092a90e9f45e50f5bb20
diff --git a/sw/uiconfig/swriter/toolbar/textobjectbar.xml
b/sw/uiconfig/swriter/toolbar/textobjectbar.xml
index 1caaf45..acf3752 100644
--- a/sw/uiconfig/swriter/toolbar/textobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/textobjectbar.xml
@@ -37,7 +37,7 @@
toolbar:toolbarseparator/
toolbar:toolbaritem xlink:href=.uno:FontColor/
toolbar:toolbaritem xlink:href=.uno:BackColor/
- toolbar:toolbaritem xlink:href=.uno:BackgroundColor
toolbar:visible=false/
+ toolbar:toolbaritem xlink:href=.uno:BackgroundColor/
toolbar:toolbarseparator/
toolbar:toolbaritem xlink:href=.uno:DefaultNumbering/
toolbar:toolbaritem xlink:href=.uno:DefaultBullet/
commit 78775257a338bb348d9bd55f32ab77ba399abca9
Author: Armin Le Grand a...@apache.org
Date: Wed Oct 8 16:36:47 2014 +
Resolves: #i125332# made css style stuff aware that it is case independent
(cherry picked from commit 2b179313ac95f4ae9dc2cf8f6b6d577ea893c7a8)
Conflicts:
svgio/inc/svgio/svgreader/svgstyleattributes.hxx
svgio/inc/svgio/svgreader/svgtoken.hxx
svgio/inc/svgio/svgreader/svgtools.hxx
svgio/source/svgreader/svgdocumenthandler.cxx
svgio/source/svgreader/svgnode.cxx
svgio/source/svgreader/svgstyleattributes.cxx
svgio/source/svgreader/svgtoken.cxx
svgio/source/svgreader/svgtools.cxx
Change-Id: I8bac5a185feb0c7a54aa7bf816ab7aabd71a2e19
diff --git a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
index 345eb65..ab40e9d 100644
--- a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
+++ b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
@@ -256,7 +256,8 @@ namespace svgio
public:
/// local attribute scanner
-void parseStyleAttribute(const OUString rTokenName, SVGToken
aSVGToken, const OUString aContent);
+void parseStyleAttribute(const OUString rTokenName, SVGToken
aSVGToken, const OUString rContent,
+ bool bCaseIndependent);
/// helper which does the necessary with a given path
void add_text(
@@ -276,7 +277,7 @@ namespace svgio
const SvgStyleAttributes* getCssStyleParent() const { return
mpCssStyleParent; }
/// scan helpers
-void readStyle(const OUString rCandidate);
+void readCssStyle(const OUString rCandidate);
const SvgStyleAttributes* getParentStyle() const;
SvgStyleAttributes(SvgNode rOwner);
diff --git a/svgio/inc/svgio/svgreader/svgtoken.hxx
b/svgio/inc/svgio/svgreader/svgtoken.hxx
index 4596fb2..87d23b6 100644
--- a/svgio/inc/svgio/svgreader/svgtoken.hxx
+++
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2b/179313ac95f4ae9dc2cf8f6b6d577ea893c7a8
2b/179313ac95f4ae9dc2cf8f6b6d577ea893c7a8 |1 + 1 file changed, 1 insertion(+) New commits: commit 4ad08bbd9b63a17366cc04c744eb6186248c4d7d Author: Caolán McNamara caol...@redhat.com Date: Wed Oct 8 20:59:19 2014 +0100 Notes added by 'git notes add' diff --git a/2b/179313ac95f4ae9dc2cf8f6b6d577ea893c7a8 b/2b/179313ac95f4ae9dc2cf8f6b6d577ea893c7a8 new file mode 100644 index 000..7d04983 --- /dev/null +++ b/2b/179313ac95f4ae9dc2cf8f6b6d577ea893c7a8 @@ -0,0 +1 @@ +merged as: 78775257a338bb348d9bd55f32ab77ba399abca9 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/source
sw/source/ui/frmdlg/column.cxx |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 6090777883be55a0650b19096bc3975def44120e
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 7 17:41:32 2014 +0100
Resolves: fdo#84757 1~ instead of ~1 and 10~ instead of 1~0
regression from 3351ebde48a31173c2fea9f7270224017e1f4412
Date: Sat Mar 29 22:22:42 2014 +0100
OUString: remove temporaries and repeated expressions
but understandable as it was unreadable goo originally
(cherry picked from commit 4289c346de432cc94f05aab78a9464350334b11f)
Change-Id: I3ce161bd2628f3a49b14df886ee8d684b248db1c
Reviewed-on: https://gerrit.libreoffice.org/11847
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index d32551a..ff71b0b 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -914,16 +914,17 @@ void SwColumnPage::UpdateCols()
void SwColumnPage::SetLabels( sal_uInt16 nVis )
{
+//insert ~ before the last character, e.g. 1 - ~1, 10 - 1~0
const OUString sLbl( '~' );
const OUString sLbl1(OUString::number( nVis + 1 ));
-m_pLbl1-SetText(sLbl1 + sLbl);
+m_pLbl1-SetText(sLbl1.replaceAt(sLbl1.getLength()-1, 0, sLbl));
const OUString sLbl2(OUString::number( nVis + 2 ));
-m_pLbl2-SetText(sLbl2 + sLbl);
+m_pLbl2-SetText(sLbl2.replaceAt(sLbl2.getLength()-1, 0, sLbl));
const OUString sLbl3(OUString::number( nVis + 3 ));
-m_pLbl3-SetText(sLbl3 + sLbl);
+m_pLbl3-SetText(sLbl3.replaceAt(sLbl3.getLength()-1, 0, sLbl));
const OUString sColumnWidth = SW_RESSTR( STR_ACCESS_COLUMN_WIDTH ) ;
aEd1.SetAccessibleName(sColumnWidth.replaceFirst(%1, sLbl1));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||84810 --- Comment #72 from tommy27 ba...@quipo.it --- I add Bug 84810 - crash in paste special when combine options link and format 4.3.x regression causing crash in very simple paste special action. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|84810 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: jurt/com
jurt/com/sun/star/lib/uno/protocols/urp/Marshal.java |1 - 1 file changed, 1 deletion(-) New commits: commit c2b5affc135a3dd202b8d9ca3a4317a1d05203cd Author: Robert Antoni Buj i Gelonch robert@gmail.com Date: Wed Oct 8 22:24:19 2014 +0200 jurt: remove unused import Change-Id: I597dac3cae7eafef75982789ab1b0d3d8d6999d2 Reviewed-on: https://gerrit.libreoffice.org/11863 Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com Tested-by: Samuel Mehrbrodt s.mehrbr...@gmail.com diff --git a/jurt/com/sun/star/lib/uno/protocols/urp/Marshal.java b/jurt/com/sun/star/lib/uno/protocols/urp/Marshal.java index 8a42b4a..c226e3a 100644 --- a/jurt/com/sun/star/lib/uno/protocols/urp/Marshal.java +++ b/jurt/com/sun/star/lib/uno/protocols/urp/Marshal.java @@ -31,7 +31,6 @@ import java.io.ByteArrayOutputStream; import java.io.DataOutput; import java.io.DataOutputStream; import java.io.IOException; -import java.io.UnsupportedEncodingException; import java.lang.reflect.Array; import java.lang.reflect.InvocationTargetException; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: toolkit/qa
toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 22248b89c07533e28026dea66c5cb73d023293c6
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date: Wed Oct 8 22:27:34 2014 +0200
complex: Use 'import com.sun.star.beans.UnknownPropertyException;'
Change-Id: Ib42baf6f18fd407a879313c042efd74c8f724aa4
Reviewed-on: https://gerrit.libreoffice.org/11864
Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
Tested-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
diff --git a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java
b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java
index 4d54ef1..56d072c 100644
--- a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java
+++ b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java
@@ -236,7 +236,7 @@ public class _XAccessibleText {
} catch(com.sun.star.lang.IndexOutOfBoundsException e) {
System.out.println(Expected exception);
res = true;
-} catch(com.sun.star.beans.UnknownPropertyException e) {
+} catch(UnknownPropertyException e) {
System.out.println(unexpected exception = FAILED);
res = false;
}
@@ -249,7 +249,7 @@ public class _XAccessibleText {
} catch(com.sun.star.lang.IndexOutOfBoundsException e) {
System.out.println(Expected exception);
res = true;
-} catch(com.sun.star.beans.UnknownPropertyException e) {
+} catch(UnknownPropertyException e) {
System.out.println(unexpected exception = FAILED);
res = false;
}
@@ -264,7 +264,7 @@ public class _XAccessibleText {
System.out.println(Unexpected exception);
e.printStackTrace();
res = false;
-} catch(com.sun.star.beans.UnknownPropertyException e) {
+} catch(UnknownPropertyException e) {
System.out.println(unexpected exception = FAILED);
res = false;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/appl/linksrc.cxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit 281cd4c4a0d4ffb0a99ae8239b11a2ebbb872a8c
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Oct 8 22:35:22 2014 +0200
loplugin:unreffun
Change-Id: I686835f07525fa77caf292d8ee746c120e3331e3
diff --git a/sfx2/source/appl/linksrc.cxx b/sfx2/source/appl/linksrc.cxx
index d5ff585..d89f4a8 100644
--- a/sfx2/source/appl/linksrc.cxx
+++ b/sfx2/source/appl/linksrc.cxx
@@ -101,8 +101,6 @@ public:
size_t size() const { return mvData.size(); }
SvLinkSource_Entry_Impl *operator[](size_t idx) const { return
mvData[idx]; }
-std::vectorSvLinkSource_Entry_Impl*::iterator begin() { return
mvData.begin(); }
-std::vectorSvLinkSource_Entry_Impl*::iterator end() { return
mvData.end(); }
std::vectorSvLinkSource_Entry_Impl*::const_iterator cbegin() const {
return mvData.cbegin(); }
std::vectorSvLinkSource_Entry_Impl*::const_iterator cend() const {
return mvData.cend(); }
void clear() { mvData.clear(); }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] buildbot.git: 3 commits - tb/tb_internals.sh tb/tb_phases.sh
tb/tb_internals.sh | 13 +
tb/tb_phases.sh|5 +
2 files changed, 14 insertions(+), 4 deletions(-)
New commits:
commit 8e6023cd0d52746070ed629414d54f12864c3338
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Wed Oct 8 17:52:20 2014 -0500
tb: support TB_LOCALTEMPDIR=1 to isolate temp files of a build
diff --git a/tb/tb_phases.sh b/tb/tb_phases.sh
index 39fbace..1472e62 100644
--- a/tb/tb_phases.sh
+++ b/tb/tb_phases.sh
@@ -11,6 +11,11 @@ canonical_pre_autogen()
if [ ! -f autogen.lastrun -o ${tb_KEEP_AUTOGEN} != YES ] ; then
copy_autogen_config
fi
+if [ ${TB_LOCALTEMPDIR} = 1 ] ; then
+rm -fr tempdir
+mkdir tempdir
+export TMPDIR=$(pwd)/tempdir
+fi
fi
}
commit 4a5aaa340acec46a68145998d25cced805ae22ba
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Wed Oct 8 17:51:33 2014 -0500
tb: support and use autogen.input
diff --git a/tb/tb_internals.sh b/tb/tb_internals.sh
index c08cf23..028e99a 100644
--- a/tb/tb_internals.sh
+++ b/tb/tb_internals.sh
@@ -95,7 +95,11 @@ collect_current_head()
#
copy_autogen_config()
{
-cp ${tb_CONFIG_DIR?}/profiles/${P?}/autogen.lastrun autogen.lastrun
+if [ -f ${tb_CONFIG_DIR?}/profiles/${P?}/autogen.lastrun ] ; then
+cp ${tb_CONFIG_DIR?}/profiles/${P?}/autogen.lastrun autogen.input
+else
+cp ${tb_CONFIG_DIR?}/profiles/${P?}/autogen.input autogen.input
+fi
}
deliver_lo_to_bibisect()
commit b81602d8914f2e00d14087ea710f0fbde39a1ca6
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Wed Oct 8 16:04:32 2014 -0500
try to make sure that R is forwared up
diff --git a/tb/tb_internals.sh b/tb/tb_internals.sh
index 3e3ae9a..c08cf23 100644
--- a/tb/tb_internals.sh
+++ b/tb/tb_internals.sh
@@ -857,7 +857,7 @@ run_gerrit_task()
# run the build
do_build ${phase_list?}
fi
-# tell teh gerrit buildbot of the result of the build
+# tell the gerrit buildbot of the result of the build
# R contain the overall result
report_gerrit
@@ -940,8 +940,9 @@ run_primer()
tb_SEND_MAIL=none
pushd ${TB_GIT_DIR?} /dev/null || die Cannot cd to git repo
${TB_GIT_DIR?} for profile ${P?}
run_tb_task
+exit $R
)
-R=$?
+R=$?
done
}
@@ -1276,7 +1277,7 @@ try_run_task()
rm -f ${TB_TRIGGER_FILE?}
fi
fi
-return $R
+exit $R
)
R=$?
# check we we intercepted a signal, if so bail
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] buildbot.git: tb/tb_phases.sh
tb/tb_phases.sh |2 ++ 1 file changed, 2 insertions(+) New commits: commit 91fd00e7e7f8d55af11bcbdce67e5e12bbddbe16 Author: Norbert Thiebaud nthieb...@gmail.com Date: Wed Oct 8 18:36:26 2014 -0500 tb TMP and TEMP are also used as TMPDIR diff --git a/tb/tb_phases.sh b/tb/tb_phases.sh index 1472e62..20e4409 100644 --- a/tb/tb_phases.sh +++ b/tb/tb_phases.sh @@ -15,6 +15,8 @@ canonical_pre_autogen() rm -fr tempdir mkdir tempdir export TMPDIR=$(pwd)/tempdir +export TMP=$(pwd)/tempdir +export TEMP=$(pwd)/tempdir fi fi } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4ff42ee7b6cb16eab844662cc657a92944ead975 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Thu Oct 9 01:55:36 2014 +0200 Updated core Project: translations 68c8a26642c7e59474b4f1d3e13564a9c1503d05 diff --git a/translations b/translations index 7f56743..68c8a26 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 7f56743634e9f5c271a0feb83bc7efa9a12367ad +Subproject commit 68c8a26642c7e59474b4f1d3e13564a9c1503d05 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-4-3-3'
New branch 'libreoffice-4-3-3' available with the following commits: commit d89033edb515653c9b148efeca09b49ca636be23 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Thu Oct 9 02:32:48 2014 +0200 Branch libreoffice-4-3-3 This is 'libreoffice-4-3-3' - the stable branch for the 4.3.3 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.3.x release, please use the 'libreoffice-4-3' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: Ib767f34be437cf90f0e37b39972cb3ff544a7a5f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'libreoffice-4-3-3'
New branch 'libreoffice-4-3-3' available with the following commits: commit e6535cd5a1409200333865a1dbecf3408758023c Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Thu Oct 9 02:32:49 2014 +0200 Branch libreoffice-4-3-3 This is 'libreoffice-4-3-3' - the stable branch for the 4.3.3 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.3.x release, please use the 'libreoffice-4-3' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I300f9775dfbbbabafec85dfc0b1a4a0381c58208 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'libreoffice-4-3-3'
New branch 'libreoffice-4-3-3' available with the following commits: commit fa4406435262b0927129c50679d72b56692d7a9c Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Thu Oct 9 02:32:49 2014 +0200 Branch libreoffice-4-3-3 This is 'libreoffice-4-3-3' - the stable branch for the 4.3.3 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.3.x release, please use the 'libreoffice-4-3' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I5726a9808fa2d9ed8c70350e3cba303323905acd ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'libreoffice-4-3-3'
New branch 'libreoffice-4-3-3' available with the following commits: commit d041e1bfe51db36f66dd36c855f1ac982e855518 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Thu Oct 9 02:33:05 2014 +0200 Branch libreoffice-4-3-3 This is 'libreoffice-4-3-3' - the stable branch for the 4.3.3 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.3.x release, please use the 'libreoffice-4-3' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I2b2fff74d3a2c478d4f5d27fe24e2316db446690 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b8a2833b3dd077b77231a950c1c5ff9df92654eb Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Thu Oct 9 02:34:19 2014 +0200 bump product version to 4.3.4.0.0+ Change-Id: I8ce476cb1d5e63044f6f4d809ea08409636dcffc diff --git a/configure.ac b/configure.ac index 363eb2f..331a1ee 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.3.3.0.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.3.4.0.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-3' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3759f3896da5473d42f055b794481fe1c7a2964d Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Thu Oct 9 02:38:02 2014 +0200 bump product version to 4.3.3.1.0+ Change-Id: I8d99eb615bd74dde88d8dc679b304eaad7021914 diff --git a/configure.ac b/configure.ac index 363eb2f..5e24398 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.3.3.0.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.3.3.1.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4.3.3.1'
Tag 'libreoffice-4.3.3.1' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-10-09 01:37 -0700 Tag libreoffice-4.3.3.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJUNdjFAAoJEPQ0oe+v7q6jutIP/A5QdRxZAKl6nrWi8u2QXInp ybiT2zO0B2cVyik4mnVG8HKMELdb/kyrAIrFG0RMeluY56eh8zxuGK5vnZEz0zx2 uN6v9bsK3jSFOpTfuC8QurX851Q1242AVmrMbZMGGwajOrA2jl74t06sbi2PHYQW 7/wCTIRxezFypBfUSifx5/Lp4YEdWT3uVbmE3SftsNJj17QpgQC7mxqiv2D3+KW5 UI3ZMaUW6ggNBrmUHA22ZFxElq1mcg7nru8AsiQD4CdFlwwHqtA0YEMf0IV+k/oN Rdn+Sl29ElQsEt5N0UULEW9B6+8WOxOJ1ig49Ekwu16B3ouSTj4Zg9QM9tzaKzrE 5HCAb6rVNbjc0pOv9Uxb/eyLJ3RxKCSa5B2rkUevWFQ5WIcoiTGnWmE2KLUF+67y hjxRDjdtK9s+6xznk467tEIJf9uhfKiUELvDQniHJo7c5dkkxUVIfieCE/aoMXZK 4AHC2yQROV7AOIPC/XAMn4Y2Y6KysIrYvpTq9xaeu1oQMc2YM6iUey2Ii5hgZ0Ya wR+Hd2OQwe7j1TR4se+pZ7GDSIoPScdZKweN3Y0Meusc1z37bdX72KkK7qxWnL45 3KG/8yoL3RKOXs/5uBPUOVCDDHx7zujNCFW+3JIEQln1JUF31+UN/Jm7aa3Puz0M 60P+AT060e/Nng8ZQFWo =GUXQ -END PGP SIGNATURE- Changes since lof-4.3-branch-point-71: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.3.3.1'
Tag 'libreoffice-4.3.3.1' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-10-09 01:37 -0700 Tag libreoffice-4.3.3.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJUNdjCAAoJEPQ0oe+v7q6jEdcP/jfoFtQeN9kSo39rolQwJY5x UT2mmOTLwzupLuYNDY8z/lxGyYxuTZ/WQA+E3HCAxda0EujtNiTey7khqazPWsRQ TGaZ1j21Kt1FYWAxq27E5nEpaVtJZXVgG5IORBdibjNiQJxajP6T5Dv3UB7U66jH sIUyaElbRjbw9srUL2I/cK2RUunvr9SmQp3ZMcipK+DJGTD2tGToxSRKXfYnhJ/0 scT3FvutHZEK3y9xtE3o9l2OhNdQVLDZc9DTlA8fXQyPjYe1yDWNekjJZJKR1CzR GFMTFg45ieEdqRseOdETYmtDmp3dNFg+lFe3+0N0C4o9fWMkz++QFOKiD5CT/6/9 XCOjIV9TIQ2qdvrFCYCbk5QvYGIFAQQ/6eIy5+NOY9ZoOo6afsQEzrpRe1ML8l90 0NLf3KRe93sy2jITR7lybOklw25+oYBSIBKNxJQMlyId0+qBkp9kW0FpK948i4v9 nKGutLpu0AAssck9T7Oixrp/bqEC2G+AaxJ7A2YD/knBSUtQl+xpbmnI3KRrwDS6 QqipUfLDNlJ48/sDUSvS39jp98VDnt985hFUmYKG3rK7iC2/DX/ysGvii7oP4WTs yYU5KZ+CyCvCW9Fa6fmNokqg6mj2qjXiIGcluNE3d6Wgy9Xco2nAkcfH+gMIYTd6 061GpVfcYN/NyTTlzifS =a1VR -END PGP SIGNATURE- Changes since lof-4.3-branch-point-2: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.3.3.1'
Tag 'libreoffice-4.3.3.1' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-10-09 01:37 -0700 Tag libreoffice-4.3.3.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJUNdi/AAoJEPQ0oe+v7q6jP4AP/jpCRnf1zXBQJBVTOa7M+Rnu m3QNPPKwxF3GhXr6ITUA0kvpcE99OI9A/t+1bRgehYr3jSaldDMRcSzsoUbGqXHJ UXhYRHed8ihbw03N+XVNho6eNN8kcyMzhp2HExhlR0/cNZcKd2gnSQ5VGMMZLNye ad41rB6uG/y8XAaHCCmdSBzms3HcozeYCb4fzVporObK71Cq7eI7GmmZnEJ6bwfS q1ZorKAhMPgSC4+6m93UUJyMIaNALkS+PP8Xs/9E5JIxzbRRJlAl7anyiHBZ5soz BGMnY9lK591BfC5rT7grWHtrddyqCgdYKdurTw96Iq9FGXhmvxZu0tiAFaDXwsul /YHmIWx0mPDCfDJaacDBb9LwLB9V/5ut9/qOsNpFHg1NHrSti7fpwdT6PS4YIifg kHc8uALVJ2ngCAeDI2y9D22ryjyur1nEAZY+gnSz/g7+Iv2IkiwJJiBjMWkkWScD 3mDq+d5x5IGRMDC2KLIz4L/qh0Mj4ir0SyNDtOi4etUA3OWa3wYbJGfJEB4c4jw4 TwLF3YACO2DyPo0MZxF3/kwlNQDxrZo5EarJywPltDYl230ikUPqJly+QTRNwYt3 /kdtUXTeffxVhyWvrvLMpWs7rUB5njRpXNalAamKfgbkU6oiE7jwNPKVb1lacNbM M/3btWxUEMLMHgmOJy6c =Xyme -END PGP SIGNATURE- Changes since lof-4.3-branch-point-1: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4.3.3.1'
Tag 'libreoffice-4.3.3.1' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-10-09 01:37 -0700 Tag libreoffice-4.3.3.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJUNdi6AAoJEPQ0oe+v7q6jzUIQAIdaYkeozmqCcEEC/39aqPH2 I9eeaeM0bwkkqpUTJ/MbD4ww7aB6QQYGDme/scGno5GlinrrA2ZEDV36uERWzm2V So9nnUDL1VSB4vYrU8Am7xT5g8N7aCi4gJcnRLMBKrZ7YyG372eDZ7dHbaGE+Kw2 biJeec8K5BgypkbsyS7xhhuBdomXh+V8cd5r4HIoIxyvXw7g0vJki8wjpbVr2J6I ilusW7kNKjLDtxD0KlljTdyJAfPG+TNMsMMJTgKvdU+DfZ416M0COVgOmOWElyF3 6sG5LD2EeXy2861Ue9uJD9Bpy5KaR4wmzx5q1RImywWrJ+ErOmTHCDF74YWGnT6m FSItkHPlULEVFKpGXr3S/X/xVj9YQwR6dhAsnGq9ZSktuF/eWzTXFqsquw/hxVZt dNvnp29A5uSDn1FwEsDRvkecEyVMJh57uoYZuK1qtZY3wlrt50c125uPrw4Qqu0v hjvYQ9nlXs7nvsfOAZjofwpOaLJfGO1ytTXawIgWPw1byKU90oR++V5XuorGi1+j ZgcYjCTbL4uNK6xD5cT2lTcAUOVQdcbMluEkngoGg9ArIVnZslnyyDJYjZ6mU+Aq GrkjygYzHoEtJHDrrjSSLqtlhUjM6cXpRkbZZuHuTbPss1O2dClxmapQ87YmfiqQ 8Nz+NjBhDF1F4IZIMP/F =yDhF -END PGP SIGNATURE- Changes since lof-4.3-branch-point-1: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.3.3.1-buildfix1'
Tag 'libreoffice-4.3.3.1-buildfix1' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-10-09 02:35 -0700 Tag libreoffice-4.3.3.1-buildfix1 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJUNeZmAAoJEPQ0oe+v7q6j4t4P/1Z5/Qxjj8uuXnGdNgN7XIJ4 Yi2C4IHaGpZTLL/eRuQY3F+ZdB/JQUYxrvui6FrFbjBEmCTmyAqtXn73U1P7F2po JX5DcNd+7B8qyrm2Y/AtfFe3y+Of7KJ3OBUUkkBhgh/Z+hAUd9uy0sEXJRf6L+NK eBlA45i+cdqL2dV1Us2bgVEzF0Ad9fx9pbAy7RuUGjcrr2W+T7Xw6RI1JTouV44l cbZ+YewXWPXTcXOzFRTDLLLInB/mirBLCZkss/GfR1sUht7NIE0Il590jKSQjzyz +83nt5Xq+ceHD8zVHDQWoFbryIWkwqQgPFsrwxttk2sUckKiGN4taBTOYCDNlEHy VSfA1gE/fx8wVEyQdzQrVZuEo9NKlL+0EfcaVF18eKrudOTOYiHveC49VJqxWeUI e13L4h7UVYP4uNTm3s53JdgflAUxYwe/dtGo88JWCOnGvoc26G+YKMViMMYhTBZa WJXTs5HmiXtiUe3GjLgXEhwiyfct8TwGlMaGLMTMMvPkEsLeBiNR35XLUaXv/7w2 BAw/J1B7mvlvSZ/7HIUCrf1gA/IPZE9P2nbDZAuZDMFiM+QGHfqcZOIdPF+wIutb aYyaLry1tmk6SxCvmV6lRw/Oz0+R6VP8J1J6qyj12jbXnKuMeSdXa4daAQEukT3x bCk2qX77uheufvamQl/Y =5UKX -END PGP SIGNATURE- Changes since libreoffice-4.3.3.1: Christian Lohmaier (1): Version 4.3.3.1, tag libreoffice-4.3.3.1-buildfix1 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4.3.3.1-buildfix1'
Tag 'libreoffice-4.3.3.1-buildfix1' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-10-09 02:35 -0700 Tag libreoffice-4.3.3.1-buildfix1 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJUNeZuAAoJEPQ0oe+v7q6jYA8P/jOD/ODz7cTsWb8kx4WTu6ai Fi5j7OL0lYQM6O29gfKX8Ug6UfwGRiQulWzyaP+uFSqUzwPnCKDFWog5wZVNoDq1 ElJ9IuX/2xy6mC91Ogs06G2JXVbfMmY/Cal1PNROZSyV/UQiZ9o5gWr7LjyZ2F8G W9819CRIB9kYNdrYQgIUzTm6ZCXYiXgs/IrhMF409jPg65WujFRliKR+KZU8UUhz amXajWTv/71j8YyPGev0OtRxkN/Je18aWZr8/KSHmVa40CEGjFdAhH3grYb4wcsg jVYS5r4nky3ZuRj5mHLCVhLRmQBYkxZGvcam4sZvFUzswhSe/j1Qhj8qnFhGLqXj +qyjA41JTLmpR8d9RP5N4hVzFzb8pHk3X+l7PozHYOnnQuiwCmY0XWgOez39PJxy wC3Wf0KlZumUtQss/0nSm+VRpPnbQ3kYMUW8//LRGv0pNdxskVKLqjB3RNaVSPmn HzliaUzuqCStxQ3POQiL6heXmO/bfzi98Ox2+GFhfOI5i8yWBwOjzgwbyooVS4Pw Bjm6sON3mVrbaKom6d25AXJgLwBBR8wtihzE7MzFJDqu+tSUKYisc6M5tV7amj4p dyxCFAdCbWmuJlMPPKZxlXeFR/Yz85uRW6p4DkueAbtre5p8TjbfR2/QlDDcEMtO JoXlz4zTa0j6WoVllgQB =kiw0 -END PGP SIGNATURE- Changes since libreoffice-4.3.3.1-1: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.3.3.1-buildfix1'
Tag 'libreoffice-4.3.3.1-buildfix1' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-10-09 02:35 -0700 Tag libreoffice-4.3.3.1-buildfix1 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJUNeZqAAoJEPQ0oe+v7q6jfugP/329TQcSLLrK13sNW3iea0wz LoNsBZGblqlV9uSjvUAOtWYdGYA4ts7g3BvsNtiwJC0HwLLjz0jjRJKJ9lEsOS7X zN2UKWjzMGK0bKixTBa3/TMGb0sRLMV3Eu+EqH6ToH5bJaofKj4VxqSUzUTM6YTc Bmb3HwGw+Pu2nYZNQipxKhCFOqB/J5VWnQ1F8parDtzwXC9WwYiKYOhGqnbw4HUd SHKltrfLymn7QQxbkA+IIgYKdTYaxH/YmQGEPJ2lqO3SGTw5mlrnEAYA3RZVjavs IjincpQJKiyBNOaDagc0U4lVfd5qCabd6/HkCXe1akbI0szRqwJkIjhVfOOkxb7c uyyApBsfZ8YmDGVMup3SHo072M+pIfyIBxgAhjl1IJMI9ouArjuNtUoAgNC3iqmr 5PU5+YxdQ63sOuxvK7MSq0b39jsKQejdQZz2KKy6qy+bF939SnGxjAJGVxJBX7Ev e407cAs3RunlRM6cgiQzjNI6belXjWLb8LPMAjMc5METfzdViL2O1xspGb95JBqm jfT254GA4IkWC5n1Sxb73v+rDiDClLly/MZzoUkQrkb5Cbnv34XvZA0ED7ZZkZJc ivO7dyjlps9ICXqZLUFd5gVsRI2+FPPMofRA3nsiCjRTBVoQ3MmV0iZxZ6i2b+X5 OKKAcZx3DCWvZs2FuGnc =6EJz -END PGP SIGNATURE- Changes since libreoffice-4.3.3.1: Christian Lohmaier (1): Version 4.3.3.1, tag libreoffice-4.3.3.1-buildfix1 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4.3.3.1-buildfix1'
Tag 'libreoffice-4.3.3.1-buildfix1' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-10-09 02:35 -0700 Tag libreoffice-4.3.3.1-buildfix1 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJUNeZiAAoJEPQ0oe+v7q6jEVgP/RtOmmDHLcl5QRISZ+APATZG kwykUmSMfznqnxtk0UMA5nxCpJugYFSl21wy5lQdpTciPOnjrj+v//vKb06wJs0K 3nkKg2GQZx8ZCrUEQd0xB8fwlZ+zQMWBPWyAxaQstwqs4TEE2c2tY9qdqH+hRlQa tf4HA+U8Rt1KeafsJacEuNOhFahORwTOzhWK3MrtGj7s+yAH06kzQjMr+JAWJrcf mbyXD0LtWKsKVaXLrFaLcBx2PZnNyleR1fLjcTT1oQWSvF7bOylLpGtz1veOBVsZ 9z1BI9+wbsM/Vlpzih5xB//20dILfm1hAIVbApvOkS0dPJbhQUO5mQYs5xdTm9QD 2Z3MjBkL+4sT8ACvh577mKHwl59fqe9AUHha1HEEisYkjT28mXV5ictnbuorC127 X/4cWN5PELFfj6ROC0GojJZTbmMx0GqkntD3jsM6UAzLpv7QBMgBV3ipGW56Ulrg aKziLTUfZcd0NFXgO+lVDId4ndmEDgwweZ0lBgm3+jOHbCxYI7Ge+Mn0vYyIjZpV xD5uIIDDs1HWuEBNEIITzcAy+zkuDrJXJoJ2N2gndpbKumRV8Hn/a1deVADwlgNR t3GEQHF1DuZaahLiJZeFHd/eZ/XSUE5ubkixUPQmoG4miDpHf5dL+js6TB0hZfkc PrALJi/U+J8DJwvhUA4j =Jspd -END PGP SIGNATURE- Changes since libreoffice-4.3.3.1: Christian Lohmaier (1): Version 4.3.3.1, tag libreoffice-4.3.3.1-buildfix1 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - external/coinmp external/lcms2
external/coinmp/coinmp-msvc-disable-sse2.patch.1 | 14 +++--- external/lcms2/lcms2-msvc-disable-sse2.patch.1 | 14 +++--- 2 files changed, 14 insertions(+), 14 deletions(-) New commits: commit d592b453cdb420bf7fabfc4e9722e3e0440807cd Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Thu Oct 9 03:27:06 2014 +0200 Revert dos2unix on SSE2 patch files content need to be dos, otherwise patch fails to apply This reverts commit 089b243c8b48aecfd25c79a70b4209a2399dbafa. diff --git a/external/coinmp/coinmp-msvc-disable-sse2.patch.1 b/external/coinmp/coinmp-msvc-disable-sse2.patch.1 index c099494..0f518d6 100644 --- a/external/coinmp/coinmp-msvc-disable-sse2.patch.1 +++ b/external/coinmp/coinmp-msvc-disable-sse2.patch.1 @@ -1,10 +1,10 @@ --- coinmp/BuildTools/MSVisualStudio/v10/Release.props.orig2014-10-02 14:22:21.497268171 +0200 +++ coinmp/BuildTools/MSVisualStudio/v10/Release.props 2014-10-02 14:22:30.193267497 +0200 @@ -6,6 +6,7 @@ - ItemDefinitionGroup - ClCompile - StringPoolingtrue/StringPooling -+ EnableEnhancedInstructionSetStreamingSIMDExtensions/EnableEnhancedInstructionSet - /ClCompile - /ItemDefinitionGroup - ItemGroup / + ItemDefinitionGroup + ClCompile + StringPoolingtrue/StringPooling ++ EnableEnhancedInstructionSetStreamingSIMDExtensions/EnableEnhancedInstructionSet + /ClCompile + /ItemDefinitionGroup + ItemGroup / diff --git a/external/lcms2/lcms2-msvc-disable-sse2.patch.1 b/external/lcms2/lcms2-msvc-disable-sse2.patch.1 index 9bfad08..37ef773 100644 --- a/external/lcms2/lcms2-msvc-disable-sse2.patch.1 +++ b/external/lcms2/lcms2-msvc-disable-sse2.patch.1 @@ -1,10 +1,10 @@ --- lcms2/Projects/VC2010/lcms2_DLL/lcms2_DLL.vcxproj.orig 2014-10-02 15:15:40.228020086 +0200 +++ lcms2/Projects/VC2010/lcms2_DLL/lcms2_DLL.vcxproj 2014-10-02 15:15:42.243019930 +0200 @@ -133,6 +133,7 @@ - /ItemDefinitionGroup - ItemDefinitionGroup Condition='$(Configuration)|$(Platform)'=='Release|Win32' - ClCompile -+ EnableEnhancedInstructionSetStreamingSIMDExtensions/EnableEnhancedInstructionSet - OptimizationFull/Optimization - IntrinsicFunctionstrue/IntrinsicFunctions - FavorSizeOrSpeedSpeed/FavorSizeOrSpeed + /ItemDefinitionGroup + ItemDefinitionGroup Condition='$(Configuration)|$(Platform)'=='Release|Win32' + ClCompile ++ EnableEnhancedInstructionSetStreamingSIMDExtensions/EnableEnhancedInstructionSet + OptimizationFull/Optimization + IntrinsicFunctionstrue/IntrinsicFunctions + FavorSizeOrSpeedSpeed/FavorSizeOrSpeed ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-3' - external/coinmp external/lcms2
external/coinmp/coinmp-msvc-disable-sse2.patch.1 | 14 +++--- external/lcms2/lcms2-msvc-disable-sse2.patch.1 | 14 +++--- 2 files changed, 14 insertions(+), 14 deletions(-) New commits: commit 275ed1fa438a8902ba45d76470a3dd05f5372b2e Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Thu Oct 9 03:27:06 2014 +0200 Revert dos2unix on SSE2 patch files content need to be dos, otherwise patch fails to apply This reverts commit 089b243c8b48aecfd25c79a70b4209a2399dbafa. (cherry picked from commit d592b453cdb420bf7fabfc4e9722e3e0440807cd) diff --git a/external/coinmp/coinmp-msvc-disable-sse2.patch.1 b/external/coinmp/coinmp-msvc-disable-sse2.patch.1 index c099494..0f518d6 100644 --- a/external/coinmp/coinmp-msvc-disable-sse2.patch.1 +++ b/external/coinmp/coinmp-msvc-disable-sse2.patch.1 @@ -1,10 +1,10 @@ --- coinmp/BuildTools/MSVisualStudio/v10/Release.props.orig2014-10-02 14:22:21.497268171 +0200 +++ coinmp/BuildTools/MSVisualStudio/v10/Release.props 2014-10-02 14:22:30.193267497 +0200 @@ -6,6 +6,7 @@ - ItemDefinitionGroup - ClCompile - StringPoolingtrue/StringPooling -+ EnableEnhancedInstructionSetStreamingSIMDExtensions/EnableEnhancedInstructionSet - /ClCompile - /ItemDefinitionGroup - ItemGroup / + ItemDefinitionGroup + ClCompile + StringPoolingtrue/StringPooling ++ EnableEnhancedInstructionSetStreamingSIMDExtensions/EnableEnhancedInstructionSet + /ClCompile + /ItemDefinitionGroup + ItemGroup / diff --git a/external/lcms2/lcms2-msvc-disable-sse2.patch.1 b/external/lcms2/lcms2-msvc-disable-sse2.patch.1 index 9bfad08..37ef773 100644 --- a/external/lcms2/lcms2-msvc-disable-sse2.patch.1 +++ b/external/lcms2/lcms2-msvc-disable-sse2.patch.1 @@ -1,10 +1,10 @@ --- lcms2/Projects/VC2010/lcms2_DLL/lcms2_DLL.vcxproj.orig 2014-10-02 15:15:40.228020086 +0200 +++ lcms2/Projects/VC2010/lcms2_DLL/lcms2_DLL.vcxproj 2014-10-02 15:15:42.243019930 +0200 @@ -133,6 +133,7 @@ - /ItemDefinitionGroup - ItemDefinitionGroup Condition='$(Configuration)|$(Platform)'=='Release|Win32' - ClCompile -+ EnableEnhancedInstructionSetStreamingSIMDExtensions/EnableEnhancedInstructionSet - OptimizationFull/Optimization - IntrinsicFunctionstrue/IntrinsicFunctions - FavorSizeOrSpeedSpeed/FavorSizeOrSpeed + /ItemDefinitionGroup + ItemDefinitionGroup Condition='$(Configuration)|$(Platform)'=='Release|Win32' + ClCompile ++ EnableEnhancedInstructionSetStreamingSIMDExtensions/EnableEnhancedInstructionSet + OptimizationFull/Optimization + IntrinsicFunctionstrue/IntrinsicFunctions + FavorSizeOrSpeedSpeed/FavorSizeOrSpeed ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - sc/Library_sc.mk sc/source
sc/Library_sc.mk |1
sc/source/ui/docshell/docfunc.cxx | 61 ++
sc/source/ui/docshell/docfuncutil.cxx | 115 ++
sc/source/ui/inc/docfuncutil.hxx | 46 +
sc/source/ui/view/viewfunc.cxx| 67 ++-
5 files changed, 178 insertions(+), 112 deletions(-)
New commits:
commit 9aa36a1ad39e37c372cc833a44fba450b8cc30cd
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Wed Oct 8 23:21:17 2014 -0400
Move this one to a common place too.
Change-Id: I7f4e007cfc861dc323b42be353c6ba11091e8fa1
diff --git a/sc/source/ui/docshell/docfunc.cxx
b/sc/source/ui/docshell/docfunc.cxx
index 6de4d7a..c529527 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -637,11 +637,9 @@ bool ScDocFunc::DeleteContents( const ScMarkData rMark,
InsertDeleteFlags nFlag
// add undo action after drawing undo is complete (objects and note
captions)
if( bRecord )
{
-ScUndoDeleteContents* pUndo =
-new ScUndoDeleteContents(
-rDocShell, aMultiMark, aExtendedRange, pUndoDoc, bMulti,
nFlags, bDrawUndo);
-rDocShell.GetUndoManager()-AddUndoAction(pUndo);
-pUndo-SetDataSpans(pDataSpans);
+sc::DocFuncUtil::addDeleteContentsUndo(
+rDocShell.GetUndoManager(), rDocShell, aMultiMark, aExtendedRange,
+pUndoDoc, nFlags, pDataSpans, bMulti, bDrawUndo);
}
if (!AdjustRowHeight( aExtendedRange ))
diff --git a/sc/source/ui/docshell/docfuncutil.cxx
b/sc/source/ui/docshell/docfuncutil.cxx
index 35f3fb2..1adb135 100644
--- a/sc/source/ui/docshell/docfuncutil.cxx
+++ b/sc/source/ui/docshell/docfuncutil.cxx
@@ -22,6 +22,7 @@
#include markdata.hxx
#include undobase.hxx
#include global.hxx
+#include undoblk.hxx
#include memory
@@ -70,6 +71,20 @@ ScDocument* DocFuncUtil::createDeleteContentsUndoDoc(
return pUndoDoc.release();
}
+void DocFuncUtil::addDeleteContentsUndo(
+svl::IUndoManager* pUndoMgr, ScDocShell* pDocSh, const ScMarkData rMark,
+const ScRange rRange, ScDocument* pUndoDoc, InsertDeleteFlags nFlags,
+const boost::shared_ptrScSimpleUndo::DataSpansType pSpans,
+bool bMulti, bool bDrawUndo )
+{
+std::unique_ptrScUndoDeleteContents pUndo(
+new ScUndoDeleteContents(
+pDocSh, rMark, rRange, pUndoDoc, bMulti, nFlags, bDrawUndo));
+pUndo-SetDataSpans(pSpans);
+
+pUndoMgr-AddUndoAction(pUndo.release());
+}
+
ScSimpleUndo::DataSpansType* DocFuncUtil::getNonEmptyCellSpans(
const ScDocument rDoc, const ScMarkData rMark, const ScRange rRange )
{
diff --git a/sc/source/ui/inc/docfuncutil.hxx b/sc/source/ui/inc/docfuncutil.hxx
index 553bab6..65bf820 100644
--- a/sc/source/ui/inc/docfuncutil.hxx
+++ b/sc/source/ui/inc/docfuncutil.hxx
@@ -10,6 +10,8 @@
#include undobase.hxx
+#include boost/shared_ptr.hpp
+
class ScDocument;
class ScMarkData;
class ScRange;
@@ -27,6 +29,12 @@ public:
ScDocument rDoc, const ScMarkData rMark, const ScRange rRange,
InsertDeleteFlags nFlags, bool bOnlyMarked );
+static void addDeleteContentsUndo(
+svl::IUndoManager* pUndoMgr, ScDocShell* pDocSh, const ScMarkData
rMark,
+const ScRange rRange, ScDocument* pUndoDoc, InsertDeleteFlags nFlags,
+const boost::shared_ptrScSimpleUndo::DataSpansType pSpans,
+bool bMulti, bool bDrawUndo );
+
static ScSimpleUndo::DataSpansType* getNonEmptyCellSpans(
const ScDocument rDoc, const ScMarkData rMark, const ScRange rRange
);
};
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index cb3db19..f1ab1eb 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -1850,12 +1850,9 @@ void ScViewFunc::DeleteContents( InsertDeleteFlags
nFlags, bool bRecord )
if ( bRecord )
{
-ScUndoDeleteContents* pUndo =
-new ScUndoDeleteContents(
-pDocSh, aFuncMark, aExtendedRange, pUndoDoc, bMulti, nFlags,
bDrawUndo);
-pUndo-SetDataSpans(pDataSpans);
-
-pDocSh-GetUndoManager()-AddUndoAction(pUndo);
+sc::DocFuncUtil::addDeleteContentsUndo(
+pDocSh-GetUndoManager(), pDocSh, aFuncMark, aExtendedRange,
pUndoDoc,
+nFlags, pDataSpans, bMulti, bDrawUndo);
}
if (!AdjustRowHeight( aExtendedRange.aStart.Row(),
aExtendedRange.aEnd.Row() ))
commit 7adef94b82f5c71da483f238d05df7800b8da38b
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Wed Oct 8 22:33:47 2014 -0400
Share undo doc creation code.
Change-Id: I55f27b61637ba0284479c63c2fa48b0bd8938c0f
diff --git a/sc/source/ui/docshell/docfunc.cxx
b/sc/source/ui/docshell/docfunc.cxx
index fedbd20..6de4d7a 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -628,42 +628,8 @@ bool ScDocFunc::DeleteContents( const ScMarkData rMark,
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||84810 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
