[Libreoffice-commits] core.git: svx/source
svx/source/inc/GraphCtlAccessibleContext.hxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit a8a8cb216fd2b25a1ed8b9c217685dccacaa428e
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Nov 25 09:06:36 2014 +0100
-Werror,-Wuninitialized
(in SvxGraphCtrlAccessibleContext ctor: base class 'comphelper::OBaseMutex'
is
uninitialized when used here to access 'comphelper::OBaseMutex::m_aMutex')
Change-Id: Ic6791043828b7b9f69c76867e26ee02a5ee66817
diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx
b/svx/source/inc/GraphCtlAccessibleContext.hxx
index 95cbf3a..b2c6650 100644
--- a/svx/source/inc/GraphCtlAccessibleContext.hxx
+++ b/svx/source/inc/GraphCtlAccessibleContext.hxx
@@ -77,7 +77,9 @@ typedef ::cppu::WeakAggComponentImplHelper7
::com::sun::star::lang::XServiceName
SvxGraphCtrlAccessibleContext_Base;
-class SvxGraphCtrlAccessibleContext : public
SvxGraphCtrlAccessibleContext_Base, ::comphelper::OBaseMutex, SfxListener,
::accessibility::IAccessibleViewForwarder
+class SvxGraphCtrlAccessibleContext:
+comphelper::OBaseMutex, public SvxGraphCtrlAccessibleContext_Base,
+SfxListener, accessibility::IAccessibleViewForwarder
{
public:
friend class GraphCtrl;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
C++11 on master (towards LO 4.5)
Until now, our minimum C++ compiler requirements on master are: * Clang 3.1 * GCC 4.6 (specifically for Munich; preferred 4.7) * MSVC 2012 Branch-off of LO 4.4 from master seems like a good time to re-visit. And natural candidates for consideration appear to be dropping MSVC 2012 for 2013, and/or the feasibility of dropping GCC 4.6 for 4.7. What could that buy us in terms of newly available C++ features? Based on the progress from MSVC 2012 to 2013, the following list shows which core language features became available where: Feature:MSVC 2012 - 2013; GCC (Clang) Non-static data member initializersNo - Yes; 4.7 (3.0) Variadic templates No - Yes; 4.3/4.4 (2.9) Initializer lists No - Yes; 4.4 (3.1) decltype v1.0, v1.1v1.1** - v1.1; 4.3/4.8.1 (2.9/3.1) Default template argumetns for function templates No - Yes; 4.3 (2.9) Alias templatesNo - Yes; 4.7 (3.0) Delegating constructorsNo - Yes; 4.7 (3.0) Explicit conversion operators No - Yes; 4.5 (3.0) Raw string literalsNo - Yes; 4.5 (3.0) Defaulted and deleted functionsNo - Yes*; 4.4 (2.9/3.0) (Taken from http://msdn.microsoft.com/en-us/library/hh567368.aspx Support For C++11 Features (Modern C++): Visual Studio 2013,https://gcc.gnu.org/projects/cxx0x.html C++0x/C++11 Support in GCC. and http://clang.llvm.org/cxx_status.html C++ Support in Clang.) So dropping MSVC 2012 for 2013 would give us six new features: * Variadic templates * Initializer lists * Default template argumetns for function templates * Explicit conversion operators * Raw string literals * Defaulted and deleted functions And additionally dropping GCC 4.6 for 4.7 would give us an additional three new features: * Non-static data member initializers * Alias templates * Delegating constructors Thoughts? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit fb914bac36b1e6cf3313dae1f0f317f3c06694cb Author: Miklos Vajna vmik...@collabora.co.uk Date: Tue Nov 25 09:31:48 2014 +0100 writerfilter: Value stored to 'nPos' is never read Change-Id: Ic5b871e0e71b72b4aacc678200c26939a0065063 diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index fe4c870..fdb5ee2 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -368,7 +368,6 @@ void RTFDocumentImpl::resolveSubstream(sal_Size nPos, Id nId, OUString rIgnoreF Mapper().substream(nId, pImpl); SAL_INFO(writerfilter, substream end); Strm().Seek(nCurrent); -nPos = 0; } void RTFDocumentImpl::checkFirstRun() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sc/source
sc/source/filter/oox/condformatbuffer.cxx | 18 ++
1 file changed, 10 insertions(+), 8 deletions(-)
New commits:
commit 2987635da7c46874c3d1b7979b70dec0de4b69b1
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Nov 23 00:51:10 2014 +0100
make sure to check for formula first, fdo#80301
Cherry-picked from 37ac70c117a7b8b9ac66b583a793096c3ad87a11
Change-Id: Ie822d1a154b7b25437ce7e5d09eb399460823acf
Reviewed-on: https://gerrit.libreoffice.org/13081
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/sc/source/filter/oox/condformatbuffer.cxx
b/sc/source/filter/oox/condformatbuffer.cxx
index 60e3e7c..754c36c 100644
--- a/sc/source/filter/oox/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -121,8 +121,16 @@ void SetCfvoData( ColorScaleRuleModelEntry* pEntry, const
AttributeList rAttrib
{
OUString aType = rAttribs.getString( XML_type, OUString() );
-double nVal = rAttribs.getDouble( XML_val, 0.0 );
-pEntry-mnVal = nVal;
+if( aType == formula )
+{
+OUString aFormula = rAttribs.getString( XML_val, OUString() );
+pEntry-maFormula = aFormula;
+}
+else
+{
+double nVal = rAttribs.getDouble( XML_val, 0.0 );
+pEntry-mnVal = nVal;
+}
if (aType == num)
{
// nothing to do
@@ -143,12 +151,6 @@ void SetCfvoData( ColorScaleRuleModelEntry* pEntry, const
AttributeList rAttrib
{
pEntry-mbPercentile = true;
}
-else if( aType == formula )
-{
-OUString aFormula = rAttribs.getString( XML_val, OUString() );
-pEntry-maFormula = aFormula;
-}
-
}
}
___
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/filter/oox/condformatbuffer.cxx | 18 ++
1 file changed, 10 insertions(+), 8 deletions(-)
New commits:
commit 008c0fe0f9b489a10ecc81e0205f2ac9e25b60ff
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Nov 23 00:51:10 2014 +0100
make sure to check for formula first, fdo#80301
Change-Id: Ie822d1a154b7b25437ce7e5d09eb399460823acf
Reviewed-on: https://gerrit.libreoffice.org/13082
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/sc/source/filter/oox/condformatbuffer.cxx
b/sc/source/filter/oox/condformatbuffer.cxx
index ca87185..46a2a94 100644
--- a/sc/source/filter/oox/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -129,8 +129,16 @@ void SetCfvoData( ColorScaleRuleModelEntry* pEntry, const
AttributeList rAttrib
{
OUString aType = rAttribs.getString( XML_type, OUString() );
-double nVal = rAttribs.getDouble( XML_val, 0.0 );
-pEntry-mnVal = nVal;
+if( aType == formula )
+{
+OUString aFormula = rAttribs.getString( XML_val, OUString() );
+pEntry-maFormula = aFormula;
+}
+else
+{
+double nVal = rAttribs.getDouble( XML_val, 0.0 );
+pEntry-mnVal = nVal;
+}
if (aType == num)
{
// nothing to do
@@ -151,12 +159,6 @@ void SetCfvoData( ColorScaleRuleModelEntry* pEntry, const
AttributeList rAttrib
{
pEntry-mbPercentile = true;
}
-else if( aType == formula )
-{
-OUString aFormula = rAttribs.getString( XML_val, OUString() );
-pEntry-maFormula = aFormula;
-}
-
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 9 commits - connectivity/com connectivity/qa filter/qa forms/qa javaunohelper/com odk/examples qadevOOo/runner qadevOOo/tests stoc/test wizards/com wizards/Jar_commonwi
connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java |6 connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java |7 connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java |6 connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java |7 connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java |8 filter/qa/complex/filter/misc/TypeDetection6FileFormat.java |6 forms/qa/integration/forms/CellBinding.java |7 forms/qa/integration/forms/ImageComparison.java |7 forms/qa/integration/forms/SpreadsheetView.java |6 javaunohelper/com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter.java |7 javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java |7 odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/ImageShrink.java |8 odk/examples/DevelopersGuide/Database/OpenQuery.java |8 odk/examples/DevelopersGuide/Drawing/Organigram.java |6 odk/examples/DevelopersGuide/Forms/SpreadsheetView.java |5 odk/examples/DevelopersGuide/Text/TextDocuments.java |5 qadevOOo/runner/helper/WindowListener.java |7 qadevOOo/tests/java/ifc/configuration/backend/_XSingleLayerStratum.java |7 stoc/test/javavm/testapplet/TestApplet.java |5 wizards/Jar_commonwizards.mk |1 wizards/com/sun/star/wizards/common/Indexable.java |6 wizards/com/sun/star/wizards/common/Properties.java |5 wizards/com/sun/star/wizards/common/XMLHelper.java |6 wizards/com/sun/star/wizards/common/XMLProvider.java |6 wizards/com/sun/star/wizards/form/DataEntrySetter.java | 22 wizards/com/sun/star/wizards/form/Finalizer.java | 11 wizards/com/sun/star/wizards/form/FormConfiguration.java | 46 + wizards/com/sun/star/wizards/form/StyleApplier.java | 40 + wizards/com/sun/star/wizards/form/UIControlArranger.java | 18 wizards/com/sun/star/wizards/query/Finalizer.java | 11 wizards/com/sun/star/wizards/report/ReportFinalizer.java | 58 +- wizards/com/sun/star/wizards/table/FieldFormatter.java | 51 +- wizards/com/sun/star/wizards/table/Finalizer.java | 12 wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java | 58 +- wizards/com/sun/star/wizards/table/ScenarioSelector.java | 18 wizards/com/sun/star/wizards/ui/ButtonList.java | 31 - wizards/com/sun/star/wizards/ui/ImageList.java | 46 + wizards/com/sun/star/wizards/ui/PathSelection.java | 23 wizards/com/sun/star/wizards/ui/UnoDialog.java |1 wizards/com/sun/star/wizards/ui/UnoDialog2.java | 186 --- wizards/com/sun/star/wizards/ui/WizardDialog.java | 147 +++-- wizards/com/sun/star/wizards/ui/event/CommonListener.java | 254 -- wizards/com/sun/star/wizards/ui/event/XItemListenerAdapter.java | 32 + wizards/com/sun/star/wizards/ui/event/XMouseListenerAdapter.java | 39 + wizards/com/sun/star/wizards/ui/event/XWindowListenerAdapter.java | 41 + 45 files changed, 560 insertions(+), 734 deletions(-) New commits: commit 5d602146785669063af11a96c6f716c22e0208ee Author: Noel Grandin n...@peralex.com Date: Tue Nov 25 10:31:08 2014 +0200 java: remove some comment noise Change-Id: I1c258b853097448d4a59334d915e94dba4c7eb34 diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java index 1ea9cd2..5a9bc8b 100644 ---
Re: C++11 on master (towards LO 4.5)
Thoughts? I am all for it! I already tried using initializer lists (which IMHO seem quite useful and not obscure at all;) but was then saddened to notice that MSVS2012 did not support them. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Formatting of README files
Hi Chris, On Tue, Nov 25, 2014 at 01:17:07PM +1100, Chris Sherlock chris.sherloc...@gmail.com wrote: I noticed that there is some minor formatting capabilities on the docs.libreoffice.org website for readmes. e.g. http://docs.libreoffice.org/vcl.html shows headings, which uses Wikimedia style double-equals signs before and after the heading text. Are there any other formatting marks? If there are, are they documented anywhere? Also, what would the feasibility of using Markdown syntax, ala github.io? As I noted on IRC, solenv/bin/mkdocs.sh takes care of processing these README files. If you want to tweak the syntax there, please submit a patch against mkdocs.sh (and ideally the same patch adjusting the existing README files if the syntax is not backwards-compatible). 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: extensions/source
extensions/source/propctrlr/propertycomposer.hxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit da9fd02a4d1a36cf9d22d5b36ba36240585284f6
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Nov 25 09:46:13 2014 +0100
-Werror,-Wuninitialized
(in PropertyComposer ctor: base class 'comphelper::OBaseMutex' is
uninitialized when used here to access 'comphelper::OBaseMutex::m_aMutex')
Change-Id: I41ede9ab34e89c8dde23ce2e4fd6393b05c979c6
diff --git a/extensions/source/propctrlr/propertycomposer.hxx
b/extensions/source/propctrlr/propertycomposer.hxx
index 4c71696..159d437 100644
--- a/extensions/source/propctrlr/propertycomposer.hxx
+++ b/extensions/source/propctrlr/propertycomposer.hxx
@@ -50,8 +50,8 @@ namespace pcr
/** implements an typeXPropertyHandler/type which composes it's
information
from a set of other property handlers
*/
-class PropertyComposer :public PropertyComposer_Base
-,public ::comphelper::OBaseMutex
+class PropertyComposer :public ::comphelper::OBaseMutex
+,public PropertyComposer_Base
,public IPropertyExistenceCheck
{
public:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: wizards/com wizards/Jar_commonwizards.mk
wizards/Jar_commonwizards.mk |5 +
wizards/com/sun/star/wizards/ui/event/XActionListenerAdapter.java | 32
++
wizards/com/sun/star/wizards/ui/event/XTextListenerAdapter.java | 32
++
3 files changed, 69 insertions(+)
New commits:
commit 0c4e9e6b7e4f7155e00f40e31a73a928ce4fad38
Author: Noel Grandin n...@peralex.com
Date: Tue Nov 25 10:49:50 2014 +0200
java,wizards: forgot to commit some files
Change-Id: Ie4532343cf964ade848454d89b44e381eadb6582
diff --git a/wizards/Jar_commonwizards.mk b/wizards/Jar_commonwizards.mk
index 0958a71..ad1ac03 100644
--- a/wizards/Jar_commonwizards.mk
+++ b/wizards/Jar_commonwizards.mk
@@ -86,6 +86,11 @@ $(eval $(call gb_Jar_add_sourcefiles,commonwizards,\
wizards/com/sun/star/wizards/ui/event/TaskEvent
\
wizards/com/sun/star/wizards/ui/event/TaskListener
\
wizards/com/sun/star/wizards/ui/event/UnoDataAware
\
+ wizards/com/sun/star/wizards/ui/event/XActionListenerAdapter\
+ wizards/com/sun/star/wizards/ui/event/XItemListenerAdapter \
+ wizards/com/sun/star/wizards/ui/event/XMouseListenerAdapter \
+ wizards/com/sun/star/wizards/ui/event/XTextListenerAdapter \
+ wizards/com/sun/star/wizards/ui/event/XWindowListenerAdapter\
wizards/com/sun/star/wizards/ui/AggregateComponent
\
wizards/com/sun/star/wizards/ui/CommandFieldSelection
\
wizards/com/sun/star/wizards/ui/ControlScroller
\
diff --git a/wizards/com/sun/star/wizards/ui/event/XActionListenerAdapter.java
b/wizards/com/sun/star/wizards/ui/event/XActionListenerAdapter.java
new file mode 100644
index 000..b7dfddb
--- /dev/null
+++ b/wizards/com/sun/star/wizards/ui/event/XActionListenerAdapter.java
@@ -0,0 +1,32 @@
+/*
+ * 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/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the License); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+package com.sun.star.wizards.ui.event;
+
+import com.sun.star.awt.ActionEvent;
+import com.sun.star.awt.XActionListener;
+import com.sun.star.lang.EventObject;
+
+public class XActionListenerAdapter implements XActionListener {
+
+public void disposing(EventObject event) {
+}
+
+public void actionPerformed(ActionEvent event) {
+}
+
+}
diff --git a/wizards/com/sun/star/wizards/ui/event/XTextListenerAdapter.java
b/wizards/com/sun/star/wizards/ui/event/XTextListenerAdapter.java
new file mode 100644
index 000..af95771
--- /dev/null
+++ b/wizards/com/sun/star/wizards/ui/event/XTextListenerAdapter.java
@@ -0,0 +1,32 @@
+/*
+ * 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/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the License); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+package com.sun.star.wizards.ui.event;
+
+import com.sun.star.awt.TextEvent;
+import com.sun.star.awt.XTextListener;
+import com.sun.star.lang.EventObject;
+
+public class XTextListenerAdapter implements XTextListener {
+
+public void disposing(EventObject event) {
+}
+
+public void textChanged(TextEvent event) {
+}
+
+}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libvisio.git: src/lib
src/lib/Makefile.am |3 +
src/lib/VSDCollector.h |3 +
src/lib/VSDContentCollector.cpp |5 +
src/lib/VSDContentCollector.h |2
src/lib/VSDPages.cpp|6 ++
src/lib/VSDPages.h |2
src/lib/VSDStylesCollector.h|2
src/lib/VSDXMetaData.cpp| 113
src/lib/VSDXMetaData.h | 41 ++
src/lib/VSDXParser.cpp | 24
src/lib/VSDXParser.h|1
src/lib/tokens.txt |2
12 files changed, 204 insertions(+)
New commits:
commit 2060d364bc0f7df97b864bf01fc5a27da12061c3
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Nov 25 09:49:05 2014 +0100
fdo#86664 VSDX: import metadata
Only title as a start.
Change-Id: Id1b92992c75058f99b9c0c72d53c254110917ed7
Reviewed-on: https://gerrit.libreoffice.org/13108
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 618f83a..e2daff8 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -75,6 +75,8 @@ libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_SOURCES =
\
VSDXParser.h \
VSDXTheme.cpp \
VSDXTheme.h \
+ VSDXMetaData.cpp \
+ VSDXMetaData.h \
$(generated_files)
@@ -83,6 +85,7 @@ VSDXMLParserBase.lo : $(generated_files)
VSDXMLTokenMap.lo : $(generated_files)
VSDXParser.lo : $(generated_files)
VSDXTheme.lo : $(generated_files)
+VSDXMetaData.lo : $(generated_files)
$(top_builddir)/src/lib/tokens.h : $(top_builddir)/src/lib/tokens.gperf
diff --git a/src/lib/VSDCollector.h b/src/lib/VSDCollector.h
index 26875f5..594fcf0 100644
--- a/src/lib/VSDCollector.h
+++ b/src/lib/VSDCollector.h
@@ -139,6 +139,9 @@ public:
virtual void collectTextField(unsigned id, unsigned level, int nameId, int
formatStringId) = 0;
virtual void collectNumericField(unsigned id, unsigned level, unsigned short
format, double number, int formatStringId) = 0;
+ // Metadata
+ virtual void collectMetaData(const librevenge::RVNGPropertyList metaData) =
0;
+
// Temporary hack
virtual void startPage(unsigned pageId) = 0;
virtual void endPage() = 0;
diff --git a/src/lib/VSDContentCollector.cpp b/src/lib/VSDContentCollector.cpp
index 87a5042..e617244 100644
--- a/src/lib/VSDContentCollector.cpp
+++ b/src/lib/VSDContentCollector.cpp
@@ -2732,6 +2732,11 @@ void
libvisio::VSDContentCollector::_handleLevelChange(unsigned level)
m_currentLevel = level;
}
+void libvisio::VSDContentCollector::collectMetaData(const
librevenge::RVNGPropertyList metaData)
+{
+ m_pages.setMetaData(metaData);
+}
+
void libvisio::VSDContentCollector::startPage(unsigned pageId)
{
if (m_isShapeStarted)
diff --git a/src/lib/VSDContentCollector.h b/src/lib/VSDContentCollector.h
index 38c6f72..a7d148a 100644
--- a/src/lib/VSDContentCollector.h
+++ b/src/lib/VSDContentCollector.h
@@ -155,6 +155,8 @@ public:
void collectStyleThemeReference(unsigned level, const boost::optionallong
lineColour, const boost::optionallong fillColour,
const boost::optionallong shadowColour,
const boost::optionallong fontColour);
+ virtual void collectMetaData(const librevenge::RVNGPropertyList metaData);
+
// Field list
void collectFieldList(unsigned id, unsigned level);
diff --git a/src/lib/VSDPages.cpp b/src/lib/VSDPages.cpp
index e4a7792..544123b 100644
--- a/src/lib/VSDPages.cpp
+++ b/src/lib/VSDPages.cpp
@@ -68,6 +68,11 @@ void libvisio::VSDPages::addBackgroundPage(const
libvisio::VSDPage page)
m_backgroundPages[page.m_currentPageID] = page;
}
+void libvisio::VSDPages::setMetaData(const librevenge::RVNGPropertyList
metaData)
+{
+ m_metaData = metaData;
+}
+
void libvisio::VSDPages::draw(librevenge::RVNGDrawingInterface *painter)
{
if (!painter)
@@ -76,6 +81,7 @@ void
libvisio::VSDPages::draw(librevenge::RVNGDrawingInterface *painter)
return;
painter-startDocument(librevenge::RVNGPropertyList());
+ painter-setDocumentMetaData(m_metaData);
for (unsigned i = 0; i m_pages.size(); ++i)
{
diff --git a/src/lib/VSDPages.h b/src/lib/VSDPages.h
index e87fd31..56358c2 100644
--- a/src/lib/VSDPages.h
+++ b/src/lib/VSDPages.h
@@ -39,10 +39,12 @@ public:
void addPage(const VSDPage page);
void addBackgroundPage(const VSDPage page);
void draw(librevenge::RVNGDrawingInterface *painter);
+ void setMetaData(const librevenge::RVNGPropertyList metaData);
private:
void _drawWithBackground(librevenge::RVNGDrawingInterface *painter, const
VSDPage page);
std::vectorVSDPage m_pages;
std::mapunsigned, VSDPage m_backgroundPages;
+ librevenge::RVNGPropertyList m_metaData;
};
diff --git a/src/lib/VSDStylesCollector.h b/src/lib/VSDStylesCollector.h
index 38c9082..22f73a1 100644
--- a/src/lib/VSDStylesCollector.h
+++
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/UnpackedTarball.mk |8 1 file changed, 8 insertions(+) New commits: commit a9a81a23009b2fc9b1552f367cb04996a99bf704 Author: Tor Lillqvist t...@collabora.com Date: Tue Nov 25 10:50:47 2014 +0200 Add comment about a bug but how this stuff still works by luck The 'suffix' GNU Make function returns the file name suffix including the period. The test comparing to the string 'zip' will thus never match, and gb_UnpackedTarget_STRIP_COMPONENTS_ZIP_DEFAULT will not be used, but gb_UnpackedTarget_STRIP_COMPONENTS_TAR_DEFAULT. But as most of the Zip archives we unpack do have a top-level with a single directory anyway, that we want to strip, that works out fine. Apparently those that don't have a such directory level pass a 0 as second argument to gb_UnpackedTarget_STRIP_COMPONENTS_ZIP_DEFAULT which has the effect of avoiding the stripping. Not sure what to actually do here, so I just commented the situation... Should the code be fixed to do what it thinks it is doing, but then to keep things working as before, should gb_UnpackedTarget_STRIP_COMPONENTS_ZIP_DEFAULT be changed to 1? Change-Id: I6436865dafe47e21e1365a602889cedab3c09784 diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk index da2e967..b9070b5 100644 --- a/solenv/gbuild/UnpackedTarball.mk +++ b/solenv/gbuild/UnpackedTarball.mk @@ -16,9 +16,17 @@ # NOTE: only for commands; targets should use TARFILE_LOCATION directly gb_UnpackedTarget_STRIP_COMPONENTS_TAR_DEFAULT := 1 + +# Note that because of a bug in +# gb_UnpackedTarget__get_strip_components, this _ZIP_DEFAULT is +# actually not used, but the above _TAR_DEFAULT is used for .zip +# archives, too. gb_UnpackedTarget_STRIP_COMPONENTS_ZIP_DEFAULT := 0 # gb_UnpackedTarget__get_strip_components target strip-components? +# Note: the suiffix function returns also the period, like .zip, +# so the condition below is never true. I don't dare fix this as this +# stuff seems to work anyway by accident... define gb_UnpackedTarget__get_strip_components $(strip $(if $(2),\ $(2),\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/UnpackedTarball.mk | 24 +--- 1 file changed, 1 insertion(+), 23 deletions(-) New commits: commit 761e40251f23b2e66dfe86d329ed6345b272bd89 Author: David Tardon dtar...@redhat.com Date: Tue Nov 25 10:29:10 2014 +0100 always use 1 as default for strip-components Change-Id: Id5f22ac0f9fcfd7ab064111aec9abb00707d3e67 diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk index b9070b5..e2e3ce1 100644 --- a/solenv/gbuild/UnpackedTarball.mk +++ b/solenv/gbuild/UnpackedTarball.mk @@ -15,28 +15,6 @@ # gb_UnpackedTarget_TARFILE_LOCATION # NOTE: only for commands; targets should use TARFILE_LOCATION directly -gb_UnpackedTarget_STRIP_COMPONENTS_TAR_DEFAULT := 1 - -# Note that because of a bug in -# gb_UnpackedTarget__get_strip_components, this _ZIP_DEFAULT is -# actually not used, but the above _TAR_DEFAULT is used for .zip -# archives, too. -gb_UnpackedTarget_STRIP_COMPONENTS_ZIP_DEFAULT := 0 - -# gb_UnpackedTarget__get_strip_components target strip-components? -# Note: the suiffix function returns also the period, like .zip, -# so the condition below is never true. I don't dare fix this as this -# stuff seems to work anyway by accident... -define gb_UnpackedTarget__get_strip_components -$(strip $(if $(2),\ - $(2),\ - $(if $(filter zip,$(suffix $(1))),\ - $(gb_UnpackedTarget_STRIP_COMPONENTS_ZIP_DEFAULT),\ - $(gb_UnpackedTarget_STRIP_COMPONENTS_TAR_DEFAULT) \ - ) \ -)) -endef - define gb_UnpackedTarget__command_untar $(GNUTAR) \ -x \ @@ -96,7 +74,7 @@ $(call gb_UnpackedTarget_get_clean_target,%) : define gb_UnpackedTarget_UnpackedTarget $(call gb_UnpackedTarget_get_target,$(1)) : UNPACKED_DIR := $(2) $(call gb_UnpackedTarget_get_target,$(1)) : UNPACKED_TARBALL := $(gb_UnpackedTarget_TARFILE_LOCATION)/$(1) -$(call gb_UnpackedTarget_get_target,$(1)) : UNPACKED_STRIP_COMPONENTS := $(call gb_UnpackedTarget__get_strip_components,$(1),$(3)) +$(call gb_UnpackedTarget_get_target,$(1)) : UNPACKED_STRIP_COMPONENTS := $(if $(strip $(3)),$(strip $(3)),1) $(call gb_UnpackedTarget_get_target,$(1)) : $(TARFILE_LOCATION)/$(1) $(call gb_UnpackedTarget_get_target,$(1)) :| $(dir $(call gb_UnpackedTarget_get_target,$(1))).dir ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: slideshow/source
slideshow/source/engine/shapes/gdimtftools.cxx |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 34d464316872fec13fc024d630cbfcc26b77185a
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Nov 25 10:34:30 2014 +0100
-Werror,-Wuninitialized
(in DummyRenderer ctor: base class 'comphelper::OBaseMutex' is
uninitialized when used here to access 'comphelper::OBaseMutex::m_aMutex')
Change-Id: I5b151176c676a58593933b3f2e33a3e2dfdcc630
diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx
b/slideshow/source/engine/shapes/gdimtftools.cxx
index 4d2b046..f3a52ca 100644
--- a/slideshow/source/engine/shapes/gdimtftools.cxx
+++ b/slideshow/source/engine/shapes/gdimtftools.cxx
@@ -107,9 +107,7 @@ namespace {
typedef ::cppu::WeakComponentImplHelper1 graphic::XGraphicRenderer
DummyRenderer_Base;
-class DummyRenderer :
-public DummyRenderer_Base,
-public cppu::BaseMutex
+class DummyRenderer: public cppu::BaseMutex, public DummyRenderer_Base
{
public:
DummyRenderer() :
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scp2/source
scp2/source/ooo/ure.scp | 11 +++ 1 file changed, 3 insertions(+), 8 deletions(-) New commits: commit 836a93e24e4b1db3aa508ed8554ab13bc8788e74 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Nov 25 10:38:12 2014 +0100 Simplify some #if Change-Id: I9d3239bdbb92f715b050fd91238add5588969bf0 diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 6dd8e7e..9da2e26 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -20,23 +20,18 @@ #include AutoInstall/ure -#ifndef MACOSX +#if !defined MACOSX + Directory gid_Dir_Common_Ure #ifdef WNT ParentID = gid_Dir_Brand_Root; - #else -ParentID = PREDEFINED_PROGDIR; - #endif - #ifdef WNT HostName = URE; #else +ParentID = PREDEFINED_PROGDIR; HostName = ure; #endif Styles = (UREDIRECTORY); End -#endif - -#if !defined MACOSX Directory gid_Dir_Ure_Bin ParentID = gid_Dir_Common_Ure; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/objface.hxx |2 --
sfx2/source/control/shell.cxx |6 ++
2 files changed, 2 insertions(+), 6 deletions(-)
New commits:
commit 1452734589500a7c4da3ebf0e5946f976ad2e79d
Author: Caolán McNamara caol...@redhat.com
Date: Mon Nov 24 21:05:12 2014 +
only use of SfxInterface::GetName is for debugging info
where GetClasName is good enough
Change-Id: I242d5792d3ce1323da59a354cae47933cf90569b
diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx
index a667c15..db88e6f 100644
--- a/include/sfx2/objface.hxx
+++ b/include/sfx2/objface.hxx
@@ -63,8 +63,6 @@ public:
const char* GetClassName() const { return pName; }
boolHasName() const { return 0 != aNameResId.GetId(); }
-OUStringGetName() const
-{ return HasName() ? aNameResId.toString() :
OUString(); }
const SfxInterface* GetGenoType() const { return pGenoType; }
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index 1365b54..9a844cc 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -117,8 +117,6 @@ SfxShell::SfxShell( SfxViewShell *pViewSh )
SfxShell::~SfxShell()
{
-
-
delete pImp;
}
@@ -305,7 +303,7 @@ void SfxShell::DoActivate_Impl( SfxViewFrame *pFrame, bool
bMDI )
#endif
SAL_INFO(
sfx.control,
-SfxShell::DoActivate() this GetInterface()-GetName()
+SfxShell::DoActivate() this
GetInterface()-GetClassName()
bMDI (bMDI ? MDI : ));
if ( bMDI )
@@ -328,7 +326,7 @@ void SfxShell::DoDeactivate_Impl( SfxViewFrame *pFrame,
bool bMDI )
#endif
SAL_INFO(
sfx.control,
-SfxShell::DoDeactivate() this GetInterface()-GetName()
+SfxShell::DoDeactivate() this
GetInterface()-GetClassName()
bMDI (bMDI ? MDI : ));
// Only when it comes from a Frame
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/opengl
vcl/opengl/gdiimpl.cxx |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 7a1cb6c3953bba26e58af0f292b1e6bf4bc4a61b
Author: Michael Meeks michael.me...@collabora.com
Date: Tue Nov 25 10:12:47 2014 +
vcl: misc. TODO comment expansion.
Change-Id: Iac9e998c2737a370aff382f8c4ae68af8e59f521
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index a794d15..295ac23 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -393,7 +393,7 @@ bool OpenGLSalGraphicsImpl::CheckOffscreenTexture()
GLfloat fHeight = GetHeight();
SalTwoRect aPosAry(0, 0, fWidth, fHeight, 0,0, fWidth, fHeight);
-// TODO: lfrb: User GL_ARB_copy_image?
+// TODO: improve performance: lfrb: User GL_ARB_copy_image?
OpenGLTexture aNewTex = OpenGLTexture( GetWidth(), GetHeight() );
glFramebufferTexture2D( GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
GL_TEXTURE_2D, aNewTex.Id(), 0 );
glViewport( 0, 0, GetWidth(), GetHeight() );
@@ -1376,7 +1376,7 @@ void OpenGLSalGraphicsImpl::drawPolyPolygon( sal_uInt32
nPoly, const sal_uInt32*
if( mnLineColor != SALCOLOR_NONE )
{
-// TODO Use glMultiDrawElements or primitive restart
+// TODO performance: Use glMultiDrawElements or primitive restart
BeginSolid( mnLineColor );
for( sal_uInt32 i = 0; i nPoly; i++ )
DrawLines( pPoints[i], pPtAry[i], true );
@@ -1562,7 +1562,8 @@ void OpenGLSalGraphicsImpl::DoCopyBits( const SalTwoRect
rPosAry, OpenGLSalGrap
}
SAL_WARN( vcl.opengl, *** NOT IMPLEMENTED *** copyBits );
-// TODO Copy from one FBO to the other (glBlitFramebuffer)
+// TODO: Copy from one FBO to the other (glBlitFramebuffer)
+// ie. copying from one visible window to another visible window
}
void OpenGLSalGraphicsImpl::drawBitmap( const SalTwoRect rPosAry, const
SalBitmap rSalBitmap )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 79641] LibreOffice 4.4 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=79641 Michael Meeks michael.me...@collabora.com changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=86696 -- 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: Branch 'libreoffice-4-3' - sw/source
sw/source/core/uibase/shells/textfld.cxx | 23 +--
1 file changed, 17 insertions(+), 6 deletions(-)
New commits:
commit daa567e1c5e4015236640b1d97b32710df4e96a7
Author: Maxim Monastirsky momonas...@gmail.com
Date: Fri Nov 21 00:50:18 2014 +0200
fdo#78980 i#98931 Accept args for .uno:InsertAnnotation
(adapted from commit 917c52f3219149741199015fce1740c5b13d814e)
Change-Id: I27b1b966135767d204a11a9d9f38ad6cc943ee61
Reviewed-on: https://gerrit.libreoffice.org/13067
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/source/core/uibase/shells/textfld.cxx
b/sw/source/core/uibase/shells/textfld.cxx
index cace5c5..cd24a48 100644
--- a/sw/source/core/uibase/shells/textfld.cxx
+++ b/sw/source/core/uibase/shells/textfld.cxx
@@ -363,11 +363,22 @@ void SwTextShell::ExecField(SfxRequest rReq)
bool bNew = !(pPostIt pPostIt-GetTyp()-Which() ==
RES_POSTITFLD);
if (bNew || GetView().GetPostItMgr()-IsAnswer())
{
-SvtUserOptions aUserOpt;
+SFX_REQUEST_ARG( rReq, pAuthorItem, SvxPostItAuthorItem,
SID_ATTR_POSTIT_AUTHOR, false );
OUString sAuthor;
-if( (sAuthor = aUserOpt.GetFullName()).isEmpty())
-if( (sAuthor = aUserOpt.GetID()).isEmpty() )
-sAuthor = SW_RES( STR_REDLINE_UNKNOWN_AUTHOR );
+if ( pAuthorItem )
+sAuthor = pAuthorItem-GetValue();
+else
+{
+SvtUserOptions aUserOpt;
+if( (sAuthor = aUserOpt.GetFullName()).isEmpty())
+if( (sAuthor = aUserOpt.GetID()).isEmpty() )
+sAuthor = SW_RES( STR_REDLINE_UNKNOWN_AUTHOR );
+}
+
+SFX_REQUEST_ARG( rReq, pTextItem, SvxPostItTextItem,
SID_ATTR_POSTIT_TEXT, false );
+OUString sText;
+if ( pTextItem )
+sText = pTextItem-GetValue();
if ( rSh.HasSelection() !rSh.IsTableMode() )
{
@@ -378,14 +389,14 @@ void SwTextShell::ExecField(SfxRequest rReq)
// -- suggestion has to be removed before
GetView().GetEditWin().StopQuickHelp();
-SwInsertFld_Data aData(TYP_POSTITFLD, 0, sAuthor,
OUString(), 0);
+SwInsertFld_Data aData(TYP_POSTITFLD, 0, sAuthor, sText,
0);
aFldMgr.InsertFld( aData );
rSh.Push();
rSh.SwCrsrShell::Left(1, CRSR_SKIP_CHARS, false);
pPostIt = (SwPostItField*)aFldMgr.GetCurFld();
rSh.Pop(false); // Restore cursor position
- }
+}
if (pPostIt)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libvisio.git: src/lib
src/lib/VSDXMetaData.cpp | 44
src/lib/VSDXMetaData.h |2 ++
src/lib/tokens.txt |2 ++
3 files changed, 48 insertions(+)
New commits:
commit 04735e030c94941e956423e73214ac04243bcefa
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Nov 25 12:08:53 2014 +0100
fdo#86664 VSDX: import dcterms:created and dcterms:modified
Change-Id: I7ff5f87729419853146d941903f88f9277106b27
diff --git a/src/lib/VSDXMetaData.cpp b/src/lib/VSDXMetaData.cpp
index 3cbd61d..19c9709 100644
--- a/src/lib/VSDXMetaData.cpp
+++ b/src/lib/VSDXMetaData.cpp
@@ -37,6 +37,42 @@ void libvisio::VSDXMetaData::readTitle(xmlTextReaderPtr
reader)
m_metaData.insert(dc:title, title);
}
+void libvisio::VSDXMetaData::readCreated(xmlTextReaderPtr reader)
+{
+ int ret = 1;
+ int tokenId = XML_TOKEN_INVALID;
+ int tokenType = -1;
+ librevenge::RVNGString created;
+ do
+ {
+ret = xmlTextReaderRead(reader);
+tokenId = getElementToken(reader);
+tokenType = xmlTextReaderNodeType(reader);
+if (xmlTextReaderNodeType(reader) == XML_READER_TYPE_TEXT)
+ created.append((const char *)xmlTextReaderConstValue(reader));
+ }
+ while ((XML_DCTERMS_CREATED != tokenId || XML_READER_TYPE_END_ELEMENT !=
tokenType) 1 == ret);
+ m_metaData.insert(meta:creation-date, created);
+}
+
+void libvisio::VSDXMetaData::readModified(xmlTextReaderPtr reader)
+{
+ int ret = 1;
+ int tokenId = XML_TOKEN_INVALID;
+ int tokenType = -1;
+ librevenge::RVNGString modified;
+ do
+ {
+ret = xmlTextReaderRead(reader);
+tokenId = getElementToken(reader);
+tokenType = xmlTextReaderNodeType(reader);
+if (xmlTextReaderNodeType(reader) == XML_READER_TYPE_TEXT)
+ modified.append((const char *)xmlTextReaderConstValue(reader));
+ }
+ while ((XML_DCTERMS_MODIFIED != tokenId || XML_READER_TYPE_END_ELEMENT !=
tokenType) 1 == ret);
+ m_metaData.insert(dc:date, modified);
+}
+
void libvisio::VSDXMetaData::readCoreProperties(xmlTextReaderPtr reader)
{
int ret = 1;
@@ -57,6 +93,14 @@ void
libvisio::VSDXMetaData::readCoreProperties(xmlTextReaderPtr reader)
if (tokenType == XML_READER_TYPE_ELEMENT)
readTitle(reader);
break;
+case XML_DCTERMS_CREATED:
+ if (tokenType == XML_READER_TYPE_ELEMENT)
+readCreated(reader);
+ break;
+case XML_DCTERMS_MODIFIED:
+ if (tokenType == XML_READER_TYPE_ELEMENT)
+readModified(reader);
+ break;
default:
break;
}
diff --git a/src/lib/VSDXMetaData.h b/src/lib/VSDXMetaData.h
index 15d22c1..5ef98b8 100644
--- a/src/lib/VSDXMetaData.h
+++ b/src/lib/VSDXMetaData.h
@@ -31,6 +31,8 @@ private:
int getElementToken(xmlTextReaderPtr reader);
void readCoreProperties(xmlTextReaderPtr reader);
void readTitle(xmlTextReaderPtr reader);
+ void readCreated(xmlTextReaderPtr reader);
+ void readModified(xmlTextReaderPtr reader);
librevenge::RVNGPropertyList m_metaData;
};
diff --git a/src/lib/tokens.txt b/src/lib/tokens.txt
index 544bab4..5bf651d 100644
--- a/src/lib/tokens.txt
+++ b/src/lib/tokens.txt
@@ -228,3 +228,5 @@ XForm1D
Y
cp:coreProperties
dc:title
+dcterms:created
+dcterms:modified
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'private/ajrhunt/cunitdemo'
New branch 'private/ajrhunt/cunitdemo' available with the following commits: commit b0c18033914c9a5b8210232f56d1b94a36817f8c Author: Andrzej Hunt andr...@ahunt.org Date: Tue Nov 25 11:16:26 2014 + Add sc.units to log area. Change-Id: Ia921b3e7aef905b3132f59be35282357bf5ec3b7 commit 7de306beb1805c0e4a93fdb133b30f3f1dd4069e Author: Andrzej Hunt andr...@ahunt.org Date: Tue Nov 25 11:16:14 2014 + SC_DIMAN: PROTOTYPE: detect add/subtract operations. This is all a quick hack demo, could easily be refactored to 1/2 the size but will be discarded anyways. Change-Id: I99d533489d47b440f9688381380ca2806d8b25bb ___ 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' - cui/source
cui/source/customize/cfg.cxx | 17 ++---
1 file changed, 10 insertions(+), 7 deletions(-)
New commits:
commit e7f67732cfb9904b7667cf3e32097ea2c6ea0597
Author: Maxim Monastirsky momonas...@gmail.com
Date: Tue Nov 18 01:24:31 2014 +0200
fdo#80280 Don't add items with no bitmaps
(cherry picked from commit cf26921658c0905a4d2dda13f91e3db99c76ade6)
Conflicts:
cui/source/customize/cfg.cxx
Change-Id: I625aff5d2dcae0b1491fa77b04605d4579ec8530
Reviewed-on: https://gerrit.libreoffice.org/13068
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 18181ee..6c64a2dd 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -4907,17 +4907,20 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window
*pWindow,
if ( graphics.getLength() 0 )
{
Image img = Image( graphics[ 0 ] );
-aTbSymbol.InsertItem( nId, img, pConstIter-first );
+if ( !img.GetBitmapEx().IsEmpty() )
+{
+aTbSymbol.InsertItem( nId, img, pConstIter-first );
-uno::Reference graphic::XGraphic xGraphic = graphics[ 0 ];
+uno::Reference graphic::XGraphic xGraphic = graphics[ 0 ];
-if ( xGraphic.is() )
-xGraphic-acquire();
+if ( xGraphic.is() )
+xGraphic-acquire();
-aTbSymbol.SetItemData(
-nId, static_cast void * ( xGraphic.get() ) );
+aTbSymbol.SetItemData(
+nId, static_cast void * ( xGraphic.get() ) );
-++nId;
+++nId;
+}
}
++pConstIter;
___
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' - wizards/source
wizards/source/euro/Init.xba | 26 +++---
wizards/source/euro/euro.src |7 +--
2 files changed, 20 insertions(+), 13 deletions(-)
New commits:
commit 244f4abc04aa6773879f19b38f4aa899689978cc
Author: Aurimas Fišeras auri...@members.fsf.org
Date: Sat Aug 23 12:12:12 2014 +0300
added LTL Lithuanian Litas to Euro Converter
Reviewed-on: https://gerrit.libreoffice.org/11090
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
(cherry picked from commit 0b3e1d9b222bf045b03746f1c162bf8077a24a1b)
adapt SBCOUNTRYCOUNT
(cherry picked from commit 375228c2c811412b516fe29bf263a520f4e9be1a)
ditch unused sCurrUNKNOWN and sCurrSYSUNKNOWN strings
(cherry picked from commit 99e1b398f28ee8eb2fc2d6bf5db8362170f32e69)
increment SBCOUNTRYCOUNT again, we have 19 currencies 0..18
(cherry picked from commit dfb48f77ba011661e03b6eb942234adb4e6630d7)
Change-Id: Id4eeb42bbbaec979f60b57ddab2794b38f1e3157
Reviewed-on: https://gerrit.libreoffice.org/12952
Reviewed-by: Adolfo Jayme Barrientos fit...@ubuntu.com
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/wizards/source/euro/Init.xba b/wizards/source/euro/Init.xba
index 33d9eb8..ccd63b7 100644
--- a/wizards/source/euro/Init.xba
+++ b/wizards/source/euro/Init.xba
@@ -90,15 +90,14 @@ Public sCurrMALTESE as String
Public sCurrSLOVAK as String
Public sCurrESTONIAN as String
Public sCurrLATVIAN as String
-Public sCurrUNKNOWN as String
-Public sCurrSYSUNKNOWN as String
+Public sCurrLITHUANIAN as String
Public sPrgsRETRIEVAL as String
Public sPrgsCONVERTING as String
Public sPrgsUNPROTECT as String
Public sInclusiveSubDir as String
-Public Const SBCOUNTRYCOUNT = 17
+Public Const SBCOUNTRYCOUNT = 19
Public CurMimeType as String
Public CurCellCount as Long
Public oSheets as Object
@@ -134,8 +133,8 @@ Public CurExtension(2) as String
Public Currfactor as Double
Public CurrSymbolList(2) as String
Public CurrLanguage as String
-Public CurrValue(17,5)
-Public LangIDValue(17,2,2) as String
+Public CurrValue(18,5)
+Public LangIDValue(18,2,2) as String
Public PreName as String
Public Separator as String
Public BitmapDir as String
@@ -216,8 +215,7 @@ Dim LocWorkPath as String
sCurrSLOVAK = GetResText(1515)
sCurrESTONIAN = GetResText(1516)
sCurrLATVIAN = GetResText(1517)
- sCurrUNKNOWN = GetResText(1518)
- sCurrSYSUNKNOWN = GetResText(1519)
+ sCurrLITHUANIAN = GetResText(1518)
.cmdCancel.Label = sCANCEL
.cmdHelp.Label = sHELP
.cmdBack.Label = GetResText(1002)
@@ -392,6 +390,11 @@ Sub InitializeLanguages()
LangIDValue(17,1,1) = quot;LVquot;
LangIDValue(17,1,2) = quot;-64Bquot;
+apos; CURRENCIES_LITHUANIAN
+LangIDValue(18,0,0) = quot;ltquot;
+LangIDValue(18,0,1) = quot;LTquot;
+LangIDValue(18,0,2) = quot;-427quot;
+
End Sub
@@ -562,6 +565,15 @@ Dim i as Integer
CurrValue(17,4) = quot;Lsquot;
CurrValue(17,5) = quot;LVLquot;
+ CurrValue(18,0) = sCurrLITHUANIAN
+ apos; real conversion rate
+ CurrValue(18,1) = 3.45280
+ apos; rounded conversion rate
+ CurrValue(18,2) = 3.5
+ CurrValue(18,3) = quot;Ltquot;
+ CurrValue(18,4) = quot;Ltquot;
+ CurrValue(18,5) = quot;LTLquot;
+
i = -1
CurrSymbolList(0) = quot;quot;
CurrSymbolList(1) = quot;quot;
diff --git a/wizards/source/euro/euro.src b/wizards/source/euro/euro.src
index bf795ba..0f1b44b 100644
--- a/wizards/source/euro/euro.src
+++ b/wizards/source/euro/euro.src
@@ -412,12 +412,7 @@ Text [ en-US ] = Latvian Lats;
String CURRENCIES + 18
{
-Text [ en-US ] = The currency set for the document is not a European
currency!;
-};
-
-String CURRENCIES + 19
-{
-Text [ en-US ] = The language set for your operating system is not a language
of the European Monetary Union.;
+Text [ en-US ] = Lithuanian Litas;
};
String STEP_LASTPAGE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) New commits: commit 51a572f218cb49e2c3aabdc7e6a7dc47e56c4ded Author: Yousuf Philips philip...@hotmail.com Date: Mon Nov 24 10:32:02 2014 +0400 fdo#82969 add global shortcut for autospellcheck Change-Id: I02b933ac2080ddb46b06a525a0304833ec28acf8 Reviewed-on: https://gerrit.libreoffice.org/13088 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu index 58ee4bc..25ecc99 100644 --- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu @@ -57,6 +57,12 @@ value xml:lang=en-US.uno:EditDoc/value /prop /node + node oor:name=F7_SHIFT oor:op=replace +prop oor:name=Command + value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value + value xml:lang=en-US.uno:SpellOnline/value +/prop + /node node oor:name=K_MOD1 oor:op=replace prop oor:name=Command value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value @@ -748,7 +754,7 @@ value xml:lang=en-US.uno:ThesaurusDialog/value /prop /node -node oor:name=F7_SHIFT oor:op=replace +node oor:name=F9_SHIFT oor:op=replace prop oor:name=Command value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value value xml:lang=en-US.uno:ShowPrecedents/value ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - icon-themes/galaxy icon-themes/tango officecfg/registry sc/uiconfig
icon-themes/galaxy/cmd/lc_colorscaleformatdialog.png |binary icon-themes/galaxy/cmd/lc_conditionalformatdialog.png |binary icon-themes/galaxy/cmd/lc_databarformatdialog.png |binary icon-themes/galaxy/cmd/sc_conditionalformatmenu.png |binary icon-themes/tango/cmd/lc_colorscaleformatdialog.png |binary icon-themes/tango/cmd/lc_conditionalformatdialog.png |binary icon-themes/tango/cmd/lc_databarformatdialog.png |binary icon-themes/tango/cmd/lc_datadatapilotrun.png |binary icon-themes/tango/cmd/sc_conditionalformatmenu.png|binary officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu | 16 ++ sc/uiconfig/scalc/toolbar/formatobjectbar.xml |6 +++ 11 files changed, 21 insertions(+), 1 deletion(-) New commits: commit 55f3e0d1f99023e8987af78d92267f5b8e414cfb Author: Yousuf Philips philip...@hotmail.com Date: Fri Nov 21 18:24:54 2014 +0400 fdo#85594 enable conditional formatting button, add icons, and tooltips Change-Id: Ia6fa678fba21f48de183798bb33ee2e34598b03e Reviewed-on: https://gerrit.libreoffice.org/13022 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/icon-themes/galaxy/cmd/lc_colorscaleformatdialog.png b/icon-themes/galaxy/cmd/lc_colorscaleformatdialog.png new file mode 100644 index 000..7496144 Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_colorscaleformatdialog.png differ diff --git a/icon-themes/galaxy/cmd/lc_conditionalformatdialog.png b/icon-themes/galaxy/cmd/lc_conditionalformatdialog.png new file mode 100644 index 000..feb733d Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_conditionalformatdialog.png differ diff --git a/icon-themes/galaxy/cmd/lc_databarformatdialog.png b/icon-themes/galaxy/cmd/lc_databarformatdialog.png new file mode 100644 index 000..1148614 Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_databarformatdialog.png differ diff --git a/icon-themes/galaxy/cmd/sc_conditionalformatmenu.png b/icon-themes/galaxy/cmd/sc_conditionalformatmenu.png index 9b28083..e34885a 100644 Binary files a/icon-themes/galaxy/cmd/sc_conditionalformatmenu.png and b/icon-themes/galaxy/cmd/sc_conditionalformatmenu.png differ diff --git a/icon-themes/tango/cmd/lc_colorscaleformatdialog.png b/icon-themes/tango/cmd/lc_colorscaleformatdialog.png new file mode 100644 index 000..7496144 Binary files /dev/null and b/icon-themes/tango/cmd/lc_colorscaleformatdialog.png differ diff --git a/icon-themes/tango/cmd/lc_conditionalformatdialog.png b/icon-themes/tango/cmd/lc_conditionalformatdialog.png new file mode 100644 index 000..feb733d Binary files /dev/null and b/icon-themes/tango/cmd/lc_conditionalformatdialog.png differ diff --git a/icon-themes/tango/cmd/lc_databarformatdialog.png b/icon-themes/tango/cmd/lc_databarformatdialog.png new file mode 100644 index 000..1148614 Binary files /dev/null and b/icon-themes/tango/cmd/lc_databarformatdialog.png differ diff --git a/icon-themes/tango/cmd/lc_datadatapilotrun.png b/icon-themes/tango/cmd/lc_datadatapilotrun.png new file mode 100644 index 000..3a5aaea Binary files /dev/null and b/icon-themes/tango/cmd/lc_datadatapilotrun.png differ diff --git a/icon-themes/tango/cmd/sc_conditionalformatmenu.png b/icon-themes/tango/cmd/sc_conditionalformatmenu.png index 9b28083..e34885a 100644 Binary files a/icon-themes/tango/cmd/sc_conditionalformatmenu.png and b/icon-themes/tango/cmd/sc_conditionalformatmenu.png differ diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu index 2a1da27e..6256909 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu @@ -442,14 +442,21 @@ /node node oor:name=.uno:ConditionalFormatDialog oor:op=replace prop oor:name=Label oor:type=xs:string + value xml:lang=en-USConditional Formatting: Condition/value +/prop +prop oor:name=ContextLabel oor:type=xs:string value xml:lang=en-USCondition.../value /prop + prop oor:name=Properties oor:type=xs:int value1/value /prop /node node oor:name=.uno:ColorScaleFormatDialog oor:op=replace prop oor:name=Label oor:type=xs:string + value xml:lang=en-USConditional Formatting: Color Scale/value +/prop +prop oor:name=ContextLabel oor:type=xs:string value xml:lang=en-USColor Scale.../value /prop prop oor:name=Properties oor:type=xs:int @@ -458,6 +465,9 @@ /node node oor:name=.uno:DataBarFormatDialog oor:op=replace prop oor:name=Label oor:type=xs:string + value xml:lang=en-USConditional Formatting:
[Libreoffice-commits] core.git: icon-themes/galaxy icon-themes/tango officecfg/registry sc/uiconfig
icon-themes/galaxy/cmd/lc_colorscaleformatdialog.png |binary icon-themes/galaxy/cmd/lc_conditionalformatdialog.png |binary icon-themes/galaxy/cmd/lc_databarformatdialog.png |binary icon-themes/galaxy/cmd/sc_conditionalformatmenu.png |binary icon-themes/tango/cmd/lc_colorscaleformatdialog.png |binary icon-themes/tango/cmd/lc_conditionalformatdialog.png |binary icon-themes/tango/cmd/lc_databarformatdialog.png |binary icon-themes/tango/cmd/lc_datadatapilotrun.png |binary icon-themes/tango/cmd/sc_conditionalformatmenu.png|binary officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu | 16 ++ sc/uiconfig/scalc/toolbar/formatobjectbar.xml |6 +++ 11 files changed, 21 insertions(+), 1 deletion(-) New commits: commit db1a9ba11750fe8df475907f57a84f99f2f355de Author: Yousuf Philips philip...@hotmail.com Date: Fri Nov 21 18:24:54 2014 +0400 fdo#85594 enable conditional formatting button, add icons, and tooltips Change-Id: Ia6fa678fba21f48de183798bb33ee2e34598b03e Reviewed-on: https://gerrit.libreoffice.org/13021 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/icon-themes/galaxy/cmd/lc_colorscaleformatdialog.png b/icon-themes/galaxy/cmd/lc_colorscaleformatdialog.png new file mode 100644 index 000..7496144 Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_colorscaleformatdialog.png differ diff --git a/icon-themes/galaxy/cmd/lc_conditionalformatdialog.png b/icon-themes/galaxy/cmd/lc_conditionalformatdialog.png new file mode 100644 index 000..feb733d Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_conditionalformatdialog.png differ diff --git a/icon-themes/galaxy/cmd/lc_databarformatdialog.png b/icon-themes/galaxy/cmd/lc_databarformatdialog.png new file mode 100644 index 000..1148614 Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_databarformatdialog.png differ diff --git a/icon-themes/galaxy/cmd/sc_conditionalformatmenu.png b/icon-themes/galaxy/cmd/sc_conditionalformatmenu.png index 9b28083..e34885a 100644 Binary files a/icon-themes/galaxy/cmd/sc_conditionalformatmenu.png and b/icon-themes/galaxy/cmd/sc_conditionalformatmenu.png differ diff --git a/icon-themes/tango/cmd/lc_colorscaleformatdialog.png b/icon-themes/tango/cmd/lc_colorscaleformatdialog.png new file mode 100644 index 000..7496144 Binary files /dev/null and b/icon-themes/tango/cmd/lc_colorscaleformatdialog.png differ diff --git a/icon-themes/tango/cmd/lc_conditionalformatdialog.png b/icon-themes/tango/cmd/lc_conditionalformatdialog.png new file mode 100644 index 000..feb733d Binary files /dev/null and b/icon-themes/tango/cmd/lc_conditionalformatdialog.png differ diff --git a/icon-themes/tango/cmd/lc_databarformatdialog.png b/icon-themes/tango/cmd/lc_databarformatdialog.png new file mode 100644 index 000..1148614 Binary files /dev/null and b/icon-themes/tango/cmd/lc_databarformatdialog.png differ diff --git a/icon-themes/tango/cmd/lc_datadatapilotrun.png b/icon-themes/tango/cmd/lc_datadatapilotrun.png new file mode 100644 index 000..3a5aaea Binary files /dev/null and b/icon-themes/tango/cmd/lc_datadatapilotrun.png differ diff --git a/icon-themes/tango/cmd/sc_conditionalformatmenu.png b/icon-themes/tango/cmd/sc_conditionalformatmenu.png index 9b28083..e34885a 100644 Binary files a/icon-themes/tango/cmd/sc_conditionalformatmenu.png and b/icon-themes/tango/cmd/sc_conditionalformatmenu.png differ diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu index c3a2eaf..ab712a4 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu @@ -442,14 +442,21 @@ /node node oor:name=.uno:ConditionalFormatDialog oor:op=replace prop oor:name=Label oor:type=xs:string + value xml:lang=en-USConditional Formatting: Condition/value +/prop +prop oor:name=ContextLabel oor:type=xs:string value xml:lang=en-USCondition.../value /prop + prop oor:name=Properties oor:type=xs:int value1/value /prop /node node oor:name=.uno:ColorScaleFormatDialog oor:op=replace prop oor:name=Label oor:type=xs:string + value xml:lang=en-USConditional Formatting: Color Scale/value +/prop +prop oor:name=ContextLabel oor:type=xs:string value xml:lang=en-USColor Scale.../value /prop prop oor:name=Properties oor:type=xs:int @@ -458,6 +465,9 @@ /node node oor:name=.uno:DataBarFormatDialog oor:op=replace prop oor:name=Label oor:type=xs:string + value xml:lang=en-USConditional Formatting:
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - officecfg/registry sc/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu | 18 ++ sc/uiconfig/scalc/toolbar/formatobjectbar.xml | 12 +++--- 2 files changed, 24 insertions(+), 6 deletions(-) New commits: commit c609824138ebe50053aa42a33cdcd3b8f113193e Author: Yousuf Philips philip...@hotmail.com Date: Fri Nov 21 19:46:05 2014 +0400 fdo#86132 add tooltips to calc xcu file Change-Id: I9c643e72cb0e925c2d4e5283c6811ef73306c76b Reviewed-on: https://gerrit.libreoffice.org/13027 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu index 6256909..9df5465 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu @@ -1611,6 +1611,9 @@ /node node oor:name=.uno:NumberFormatCurrency oor:op=replace prop oor:name=Label oor:type=xs:string + value xml:lang=en-USFormat as Currency/value +/prop +prop oor:name=ContextLabel oor:type=xs:string value xml:lang=en-USCurrency/value /prop prop oor:name=Properties oor:type=xs:int @@ -1619,6 +1622,9 @@ /node node oor:name=.uno:NumberFormatPercent oor:op=replace prop oor:name=Label oor:type=xs:string + value xml:lang=en-USFormat as Percent/value +/prop +prop oor:name=ContextLabel oor:type=xs:string value xml:lang=en-USPercent/value /prop prop oor:name=Properties oor:type=xs:int @@ -1627,6 +1633,9 @@ /node node oor:name=.uno:NumberFormatStandard oor:op=replace prop oor:name=Label oor:type=xs:string + value xml:lang=en-USFormat as General/value +/prop +prop oor:name=ContextLabel oor:type=xs:string value xml:lang=en-USGeneral/value /prop prop oor:name=Properties oor:type=xs:int @@ -1635,6 +1644,9 @@ /node node oor:name=.uno:NumberFormatDate oor:op=replace prop oor:name=Label oor:type=xs:string + value xml:lang=en-USFormat as Date/value +/prop +prop oor:name=ContextLabel oor:type=xs:string value xml:lang=en-USDate/value /prop prop oor:name=Properties oor:type=xs:int @@ -1643,6 +1655,9 @@ /node node oor:name=.uno:NumberFormatDecimal oor:op=replace prop oor:name=Label oor:type=xs:string + value xml:lang=en-USFormat as Number/value +/prop +prop oor:name=ContextLabel oor:type=xs:string value xml:lang=en-USNumber/value /prop prop oor:name=Properties oor:type=xs:int @@ -1651,6 +1666,9 @@ /node node oor:name=.uno:NumberFormatScientific oor:op=replace prop oor:name=Label oor:type=xs:string + value xml:lang=en-USFormat as Scientific/value +/prop +prop oor:name=ContextLabel oor:type=xs:string value xml:lang=en-USScientific/value /prop prop oor:name=Properties oor:type=xs:int diff --git a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml index 1077e09..ab547e6 100644 --- a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml +++ b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml @@ -54,12 +54,12 @@ toolbar:toolbaritem xlink:href=.uno:AlignVCenter toolbar:style=radio auto/ toolbar:toolbaritem xlink:href=.uno:AlignBottom toolbar:style=radio auto/ toolbar:toolbarseparator/ - toolbar:toolbaritem xlink:href=.uno:NumberFormatStandard toolbar:tooltip=Format as General toolbar:visible=false/ - toolbar:toolbaritem xlink:href=.uno:NumberFormatCurrency toolbar:tooltip=Format as Currency/ - toolbar:toolbaritem xlink:href=.uno:NumberFormatPercent toolbar:tooltip=Format as Percent/ - toolbar:toolbaritem xlink:href=.uno:NumberFormatDecimal toolbar:tooltip=Format as Number/ - toolbar:toolbaritem xlink:href=.uno:NumberFormatDate toolbar:tooltip=Format as Date toolbar:visible=false/ - toolbar:toolbaritem xlink:href=.uno:NumberFormatScientific toolbar:tooltip=Format as Scientific toolbar:visible=false/ + toolbar:toolbaritem xlink:href=.uno:NumberFormatStandard toolbar:visible=false/ + toolbar:toolbaritem xlink:href=.uno:NumberFormatCurrency/ + toolbar:toolbaritem xlink:href=.uno:NumberFormatPercent/ + toolbar:toolbaritem xlink:href=.uno:NumberFormatDecimal/ + toolbar:toolbaritem xlink:href=.uno:NumberFormatDate toolbar:visible=false/ + toolbar:toolbaritem xlink:href=.uno:NumberFormatScientific toolbar:visible=false/ toolbar:toolbaritem xlink:href=.uno:NumberFormatIncDecimals/ toolbar:toolbaritem xlink:href=.uno:NumberFormatDecDecimals/ toolbar:toolbarseparator/ ___ Libreoffice-commits mailing list
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sc/uiconfig sd/uiconfig
sc/uiconfig/scalc/menubar/menubar.xml|2 +- sd/uiconfig/simpress/menubar/menubar.xml |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 2c8e0f95750e43eda1ca69df48f7b35e5003374b Author: Yousuf Philips philip...@hotmail.com Date: Fri Nov 21 21:11:56 2014 +0400 fdo#86440 move header and footer entry to insert menu Change-Id: Id3c81d50e504e3d2e29f921955a10ef00c2d3646 Reviewed-on: https://gerrit.libreoffice.org/13028 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml index 02f8779..56377a4 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -83,7 +83,6 @@ menu:menuseparator/ menu:menuitem menu:id=vnd.sun.star.findbar:FocusToFindbar/ menu:menuitem menu:id=.uno:SearchDialog/ -menu:menuitem menu:id=.uno:EditHeaderAndFooter/ menu:menuseparator/ menu:menu menu:id=.uno:ChangesMenu menu:menupopup @@ -200,6 +199,7 @@ /menu:menupopup /menu:menu menu:menuitem menu:id=.uno:HyperlinkDialog/ +menu:menuitem menu:id=.uno:EditHeaderAndFooter/ menu:menuseparator/ menu:menuitem menu:id=.uno:FunctionDialog/ menu:menuitem menu:id=.uno:FunctionBox/ diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index ee0be14..a9667c5 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -147,7 +147,6 @@ menu:menuitem menu:id=.uno:Gallery/ menu:menuitem menu:id=.uno:Navigator/ menu:menuseparator/ -menu:menuitem menu:id=.uno:HeaderAndFooter/ menu:menu menu:id=.uno:ZoomMenu menu:menupopup menu:menuitem menu:id=.uno:ZoomPage/ @@ -186,6 +185,7 @@ menu:menuitem menu:id=.uno:InsertFileField/ /menu:menupopup /menu:menu +menu:menuitem menu:id=.uno:HeaderAndFooter/ menu:menuitem menu:id=.uno:InsertAnnotation/ menu:menuitem menu:id=.uno:InsertSymbol/ menu:menu menu:id=.uno:FormattingMarkMenu ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/uiconfig sd/uiconfig
sc/uiconfig/scalc/menubar/menubar.xml|2 +- sd/uiconfig/simpress/menubar/menubar.xml |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 452db55f0a14a1f8c77cae7b54f1857498651c28 Author: Yousuf Philips philip...@hotmail.com Date: Fri Nov 21 21:11:56 2014 +0400 fdo#86440 move header and footer entry to insert menu Change-Id: Id3c81d50e504e3d2e29f921955a10ef00c2d3646 Reviewed-on: https://gerrit.libreoffice.org/13026 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml index 02f8779..56377a4 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -83,7 +83,6 @@ menu:menuseparator/ menu:menuitem menu:id=vnd.sun.star.findbar:FocusToFindbar/ menu:menuitem menu:id=.uno:SearchDialog/ -menu:menuitem menu:id=.uno:EditHeaderAndFooter/ menu:menuseparator/ menu:menu menu:id=.uno:ChangesMenu menu:menupopup @@ -200,6 +199,7 @@ /menu:menupopup /menu:menu menu:menuitem menu:id=.uno:HyperlinkDialog/ +menu:menuitem menu:id=.uno:EditHeaderAndFooter/ menu:menuseparator/ menu:menuitem menu:id=.uno:FunctionDialog/ menu:menuitem menu:id=.uno:FunctionBox/ diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index ee0be14..a9667c5 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -147,7 +147,6 @@ menu:menuitem menu:id=.uno:Gallery/ menu:menuitem menu:id=.uno:Navigator/ menu:menuseparator/ -menu:menuitem menu:id=.uno:HeaderAndFooter/ menu:menu menu:id=.uno:ZoomMenu menu:menupopup menu:menuitem menu:id=.uno:ZoomPage/ @@ -186,6 +185,7 @@ menu:menuitem menu:id=.uno:InsertFileField/ /menu:menupopup /menu:menu +menu:menuitem menu:id=.uno:HeaderAndFooter/ menu:menuitem menu:id=.uno:InsertAnnotation/ menu:menuitem menu:id=.uno:InsertSymbol/ menu:menu menu:id=.uno:FormattingMarkMenu ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry sc/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu | 18 ++ sc/uiconfig/scalc/toolbar/formatobjectbar.xml | 12 +++--- 2 files changed, 24 insertions(+), 6 deletions(-) New commits: commit 82c998977b62b5fb7a01b5e9838d7f6868d697bf Author: Yousuf Philips philip...@hotmail.com Date: Fri Nov 21 19:46:05 2014 +0400 fdo#86132 add tooltips to calc xcu file Change-Id: I9c643e72cb0e925c2d4e5283c6811ef73306c76b Reviewed-on: https://gerrit.libreoffice.org/13023 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu index ab712a4..120d1f6 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu @@ -1626,6 +1626,9 @@ /node node oor:name=.uno:NumberFormatCurrency oor:op=replace prop oor:name=Label oor:type=xs:string + value xml:lang=en-USFormat as Currency/value +/prop +prop oor:name=ContextLabel oor:type=xs:string value xml:lang=en-USCurrency/value /prop prop oor:name=Properties oor:type=xs:int @@ -1634,6 +1637,9 @@ /node node oor:name=.uno:NumberFormatPercent oor:op=replace prop oor:name=Label oor:type=xs:string + value xml:lang=en-USFormat as Percent/value +/prop +prop oor:name=ContextLabel oor:type=xs:string value xml:lang=en-USPercent/value /prop prop oor:name=Properties oor:type=xs:int @@ -1642,6 +1648,9 @@ /node node oor:name=.uno:NumberFormatStandard oor:op=replace prop oor:name=Label oor:type=xs:string + value xml:lang=en-USFormat as General/value +/prop +prop oor:name=ContextLabel oor:type=xs:string value xml:lang=en-USGeneral/value /prop prop oor:name=Properties oor:type=xs:int @@ -1650,6 +1659,9 @@ /node node oor:name=.uno:NumberFormatDate oor:op=replace prop oor:name=Label oor:type=xs:string + value xml:lang=en-USFormat as Date/value +/prop +prop oor:name=ContextLabel oor:type=xs:string value xml:lang=en-USDate/value /prop prop oor:name=Properties oor:type=xs:int @@ -1658,6 +1670,9 @@ /node node oor:name=.uno:NumberFormatDecimal oor:op=replace prop oor:name=Label oor:type=xs:string + value xml:lang=en-USFormat as Number/value +/prop +prop oor:name=ContextLabel oor:type=xs:string value xml:lang=en-USNumber/value /prop prop oor:name=Properties oor:type=xs:int @@ -1666,6 +1681,9 @@ /node node oor:name=.uno:NumberFormatScientific oor:op=replace prop oor:name=Label oor:type=xs:string + value xml:lang=en-USFormat as Scientific/value +/prop +prop oor:name=ContextLabel oor:type=xs:string value xml:lang=en-USScientific/value /prop prop oor:name=Properties oor:type=xs:int diff --git a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml index 1077e09..ab547e6 100644 --- a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml +++ b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml @@ -54,12 +54,12 @@ toolbar:toolbaritem xlink:href=.uno:AlignVCenter toolbar:style=radio auto/ toolbar:toolbaritem xlink:href=.uno:AlignBottom toolbar:style=radio auto/ toolbar:toolbarseparator/ - toolbar:toolbaritem xlink:href=.uno:NumberFormatStandard toolbar:tooltip=Format as General toolbar:visible=false/ - toolbar:toolbaritem xlink:href=.uno:NumberFormatCurrency toolbar:tooltip=Format as Currency/ - toolbar:toolbaritem xlink:href=.uno:NumberFormatPercent toolbar:tooltip=Format as Percent/ - toolbar:toolbaritem xlink:href=.uno:NumberFormatDecimal toolbar:tooltip=Format as Number/ - toolbar:toolbaritem xlink:href=.uno:NumberFormatDate toolbar:tooltip=Format as Date toolbar:visible=false/ - toolbar:toolbaritem xlink:href=.uno:NumberFormatScientific toolbar:tooltip=Format as Scientific toolbar:visible=false/ + toolbar:toolbaritem xlink:href=.uno:NumberFormatStandard toolbar:visible=false/ + toolbar:toolbaritem xlink:href=.uno:NumberFormatCurrency/ + toolbar:toolbaritem xlink:href=.uno:NumberFormatPercent/ + toolbar:toolbaritem xlink:href=.uno:NumberFormatDecimal/ + toolbar:toolbaritem xlink:href=.uno:NumberFormatDate toolbar:visible=false/ + toolbar:toolbaritem xlink:href=.uno:NumberFormatScientific toolbar:visible=false/ toolbar:toolbaritem xlink:href=.uno:NumberFormatIncDecimals/ toolbar:toolbaritem xlink:href=.uno:NumberFormatDecDecimals/ toolbar:toolbarseparator/ ___ Libreoffice-commits mailing list
[Libreoffice-commits] core.git: svtools/uiconfig
svtools/uiconfig/ui/GraphicExportOptionsDialog.ui | 35 - svtools/uiconfig/ui/addresstemplatedialog.ui | 617 +- svtools/uiconfig/ui/graphicexport.ui | 164 + svtools/uiconfig/ui/javadisableddialog.ui |4 svtools/uiconfig/ui/placeedit.ui | 272 +++-- svtools/uiconfig/ui/printersetupdialog.ui | 67 -- svtools/uiconfig/ui/querydeletedialog.ui |5 svtools/uiconfig/ui/restartdialog.ui | 12 8 files changed, 471 insertions(+), 705 deletions(-) New commits: commit ccbddf9210ad65465da5bf36a9ad36a5f59bf125 Author: Adolfo Jayme Barrientos fit...@ubuntu.com Date: Thu Nov 20 23:30:32 2014 -0600 HIG fixes for svtools Change-Id: I8b874ed49e50b7ea15774ca3b0cd9a963898fc94 Reviewed-on: https://gerrit.libreoffice.org/13049 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/svtools/uiconfig/ui/GraphicExportOptionsDialog.ui b/svtools/uiconfig/ui/GraphicExportOptionsDialog.ui index f98882b..3ffbc8a 100644 --- a/svtools/uiconfig/ui/GraphicExportOptionsDialog.ui +++ b/svtools/uiconfig/ui/GraphicExportOptionsDialog.ui @@ -1,6 +1,7 @@ ?xml version=1.0 encoding=UTF-8? +!-- Generated with glade 3.18.3 -- interface - !-- interface-requires gtk+ 3.0 -- + requires lib=gtk+ version=3.0/ object class=GtkAdjustment id=adjustment-height property name=upper2/property property name=step_increment1/property @@ -13,7 +14,8 @@ /object object class=GtkDialog id=GraphicExporter property name=can_focusFalse/property -property name=border_width5/property +property name=border_width6/property +property name=resizableFalse/property property name=type_hintdialog/property child internal-child=vbox object class=GtkBox id=dialog-vbox1 @@ -83,47 +85,41 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=row_spacing6/property -property name=column_spacing6/property +property name=column_spacing12/property child object class=GtkLabel id=label5 property name=visibleTrue/property property name=can_focusFalse/property -property name=xalign0/property +property name=xalign1/property property name=label translatable=yesWidth:/property /object packing property name=left_attach0/property property name=top_attach0/property -property name=width1/property -property name=height1/property /packing /child child object class=GtkLabel id=label6 property name=visibleTrue/property property name=can_focusFalse/property -property name=xalign0/property +property name=xalign1/property property name=label translatable=yesHeight:/property /object packing property name=left_attach0/property property name=top_attach1/property -property name=width1/property -property name=height1/property /packing /child child object class=GtkLabel id=resolutionft property name=visibleTrue/property property name=can_focusFalse/property -property name=xalign0/property +property name=xalign1/property property name=label translatable=yesResolution:/property /object packing property name=left_attach0/property property name=top_attach2/property -property name=width1/property -property name=height1/property /packing /child child @@ -137,8 +133,6 @@ packing property name=left_attach1/property property name=top_attach0/property -property name=width1/property -property name=height1/property
[Libreoffice-commits] core.git: dbaccess/uiconfig
dbaccess/uiconfig/ui/admindialog.ui |8 dbaccess/uiconfig/ui/advancedsettingsdialog.ui|6 dbaccess/uiconfig/ui/autocharsetpage.ui | 11 dbaccess/uiconfig/ui/backuppage.ui| 26 -- dbaccess/uiconfig/ui/choosedatasourcedialog.ui| 69 ++--- dbaccess/uiconfig/ui/collectionviewdialog.ui |5 dbaccess/uiconfig/ui/colwidthdialog.ui| 15 - dbaccess/uiconfig/ui/connectionpage.ui| 51 +-- dbaccess/uiconfig/ui/copytablepage.ui | 36 -- dbaccess/uiconfig/ui/dbaseindexdialog.ui | 23 - dbaccess/uiconfig/ui/dbasepage.ui | 15 - dbaccess/uiconfig/ui/dbwizconnectionpage.ui | 26 -- dbaccess/uiconfig/ui/dbwizmysqlintropage.ui | 11 dbaccess/uiconfig/ui/dbwizmysqlnativepage.ui |5 dbaccess/uiconfig/ui/deleteallrowsdialog.ui |4 dbaccess/uiconfig/ui/designsavemodifieddialog.ui |4 dbaccess/uiconfig/ui/directsqldialog.ui | 25 - dbaccess/uiconfig/ui/fielddialog.ui |6 dbaccess/uiconfig/ui/finalpagewizard.ui | 24 - dbaccess/uiconfig/ui/generalpagedialog.ui | 19 - dbaccess/uiconfig/ui/generalpagewizard.ui | 23 - dbaccess/uiconfig/ui/generalspecialjdbcdetailspage.ui | 44 +-- dbaccess/uiconfig/ui/generatedvaluespage.ui | 24 - dbaccess/uiconfig/ui/indexdesigndialog.ui | 231 -- dbaccess/uiconfig/ui/jdbcconnectionpage.ui| 36 +- dbaccess/uiconfig/ui/joindialog.ui| 31 -- dbaccess/uiconfig/ui/ldapconnectionpage.ui| 39 +-- dbaccess/uiconfig/ui/ldappage.ui | 36 -- dbaccess/uiconfig/ui/migratepage.ui | 32 -- dbaccess/uiconfig/ui/mysqlnativepage.ui | 29 -- dbaccess/uiconfig/ui/mysqlnativesettings.ui | 60 +--- dbaccess/uiconfig/ui/odbcpage.ui | 17 - dbaccess/uiconfig/ui/parametersdialog.ui | 13 - dbaccess/uiconfig/ui/password.ui | 29 -- dbaccess/uiconfig/ui/preparepage.ui | 10 dbaccess/uiconfig/ui/queryfilterdialog.ui | 33 -- dbaccess/uiconfig/ui/querypropertiesdialog.ui | 203 +-- dbaccess/uiconfig/ui/relationdialog.ui| 36 -- dbaccess/uiconfig/ui/rowheightdialog.ui | 15 - dbaccess/uiconfig/ui/savedialog.ui| 31 -- dbaccess/uiconfig/ui/saveindexdialog.ui |4 dbaccess/uiconfig/ui/savemodifieddialog.ui|4 dbaccess/uiconfig/ui/sortdialog.ui| 33 -- dbaccess/uiconfig/ui/specialjdbcconnectionpage.ui | 47 +-- dbaccess/uiconfig/ui/specialsettingspage.ui |4 dbaccess/uiconfig/ui/summarypage.ui | 12 dbaccess/uiconfig/ui/tabledesignsavemodifieddialog.ui |4 dbaccess/uiconfig/ui/tablesfilterdialog.ui|6 dbaccess/uiconfig/ui/tablesjoindialog.ui | 18 - dbaccess/uiconfig/ui/textconnectionsettings.ui|4 dbaccess/uiconfig/ui/textpage.ui | 74 + dbaccess/uiconfig/ui/typeselectpage.ui| 20 - dbaccess/uiconfig/ui/useradmindialog.ui |8 dbaccess/uiconfig/ui/useradminpage.ui | 14 - dbaccess/uiconfig/ui/userdetailspage.ui | 33 -- 55 files changed, 563 insertions(+), 1083 deletions(-) New commits: commit a4536921f663fe3dcf7361362f7990286f24c3f2 Author: Adolfo Jayme Barrientos fit...@ubuntu.com Date: Sat Nov 22 14:52:37 2014 -0600 HIG fixes for dbaccess Change-Id: Ib9ce9a28eec4343850158541375608d63fda8d19 Reviewed-on: https://gerrit.libreoffice.org/13050 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/dbaccess/uiconfig/ui/admindialog.ui b/dbaccess/uiconfig/ui/admindialog.ui index 53e1a0a..72040da 100644 --- a/dbaccess/uiconfig/ui/admindialog.ui +++ b/dbaccess/uiconfig/ui/admindialog.ui @@ -1,11 +1,12 @@ ?xml version=1.0 encoding=UTF-8? -!-- Generated with glade 3.16.0 on Wed Jan 29 09:37:35 2014 -- +!-- Generated with glade 3.18.3 -- interface - !-- interface-requires gtk+ 3.0 -- + requires lib=gtk+ version=3.0/ object class=GtkDialog id=AdminDialog property name=can_focusFalse/property property name=border_width6/property -property name=title translatable=yesDatabase properties/property +property name=title translatable=yesDatabase Properties/property +property name=resizableFalse/property property name=type_hintdialog/property child internal-child=vbox object class=GtkBox id=dialog-vbox1 @@ -58,6 +59,7 @@ property name=expandFalse/property property
[Libreoffice-commits] core.git: fpicker/uiconfig
fpicker/uiconfig/ui/explorerfiledialog.ui |1 + 1 file changed, 1 insertion(+) New commits: commit e5a7e7249a32493d175ad94ee4e650320518d711 Author: Adolfo Jayme Barrientos fit...@ubuntu.com Date: Wed Nov 19 12:48:38 2014 -0600 fdo#85347 Make file picker modal again Change-Id: I0e26b9e13e69ed49e7bbbc7f2ac0b04941ee1da7 Reviewed-on: https://gerrit.libreoffice.org/12974 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/fpicker/uiconfig/ui/explorerfiledialog.ui b/fpicker/uiconfig/ui/explorerfiledialog.ui index de95524..41118bd 100644 --- a/fpicker/uiconfig/ui/explorerfiledialog.ui +++ b/fpicker/uiconfig/ui/explorerfiledialog.ui @@ -8,6 +8,7 @@ property name=hexpandTrue/property property name=vexpandTrue/property property name=border_width6/property +property name=modalTrue/property property name=type_hintdialog/property child internal-child=vbox object class=GtkBox id=dialog-vbox1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - fpicker/uiconfig
fpicker/uiconfig/ui/explorerfiledialog.ui |1 + 1 file changed, 1 insertion(+) New commits: commit 6adc5da9246b098a3fcfdee094a742514dcec761 Author: Adolfo Jayme Barrientos fit...@ubuntu.com Date: Wed Nov 19 12:48:38 2014 -0600 fdo#85347 Make file picker modal again Change-Id: I0e26b9e13e69ed49e7bbbc7f2ac0b04941ee1da7 Reviewed-on: https://gerrit.libreoffice.org/12974 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com (cherry picked from commit e5a7e7249a32493d175ad94ee4e650320518d711) diff --git a/fpicker/uiconfig/ui/explorerfiledialog.ui b/fpicker/uiconfig/ui/explorerfiledialog.ui index de95524..41118bd 100644 --- a/fpicker/uiconfig/ui/explorerfiledialog.ui +++ b/fpicker/uiconfig/ui/explorerfiledialog.ui @@ -8,6 +8,7 @@ property name=hexpandTrue/property property name=vexpandTrue/property property name=border_width6/property +property name=modalTrue/property property name=type_hintdialog/property child internal-child=vbox object class=GtkBox id=dialog-vbox1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/numberingformatpage.ui | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) New commits: commit 936ffd5924e68e1803c8ddeb8a2435375d356260 Author: Adolfo Jayme Barrientos fit...@ubuntu.com Date: Sat Nov 22 17:36:50 2014 -0600 fdo#86579 Give uniform width to Category and Format frames Change-Id: I55648417f56c28b0ac07ebff908805764bb2eb0c Reviewed-on: https://gerrit.libreoffice.org/13059 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/cui/uiconfig/ui/numberingformatpage.ui b/cui/uiconfig/ui/numberingformatpage.ui index 7ad7600..e6e751d 100644 --- a/cui/uiconfig/ui/numberingformatpage.ui +++ b/cui/uiconfig/ui/numberingformatpage.ui @@ -99,7 +99,6 @@ property name=can_focusFalse/property property name=row_spacing6/property property name=column_spacing6/property -property name=row_homogeneousTrue/property child object class=GtkEntry id=formated property name=visibleTrue/property @@ -223,8 +222,8 @@ object class=GtkGrid id=grid5 property name=visibleTrue/property property name=can_focusFalse/property -property name=row_spacing10/property -property name=column_spacing20/property +property name=row_spacing6/property +property name=column_spacing12/property child object class=GtkSpinButton id=decimalsed property name=visibleTrue/property @@ -253,6 +252,7 @@ object class=GtkLabel id=decimalsft property name=visibleTrue/property property name=can_focusFalse/property +property name=xalign1/property property name=label translatable=yes_Decimal places:/property property name=use_underlineTrue/property property name=mnemonic_widgetdecimalsed/property @@ -266,6 +266,7 @@ object class=GtkLabel id=leadzerosft property name=visibleTrue/property property name=can_focusFalse/property +property name=xalign1/property property name=label translatable=yesLeading _zeroes:/property property name=use_underlineTrue/property property name=mnemonic_widgetleadzerosed/property @@ -332,7 +333,7 @@ property name=hexpandTrue/property property name=vexpandTrue/property property name=row_spacing12/property -property name=column_spacing6/property +property name=column_spacing12/property child object class=GtkFrame id=categoryframe property name=visibleTrue/property @@ -545,12 +546,11 @@ /child /object object class=GtkSizeGroup id=sizegroup1 -property name=modevertical/property +property name=modeboth/property property name=ignore_hiddenTrue/property widgets widget name=categoryframe/ widget name=formatframe/ - widget name=languageframe/ /widgets /object /interface ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/uiconfig sw/uiconfig
cui/uiconfig/ui/select_persona_dialog.ui | 142 +- sw/uiconfig/swriter/ui/tocdialog.ui | 167 ++- 2 files changed, 150 insertions(+), 159 deletions(-) New commits: commit b625baafd00ce578f8e68206fd8c1dd1206da2fc Author: Adolfo Jayme Barrientos fit...@ubuntu.com Date: Sun Nov 23 02:11:29 2014 -0600 Save vertical space by putting labels and checkboxes in the same row⦠... as dialog buttons. Change-Id: Ieea882b467c87093e7648590bbf14fe6dfa0b7ee Reviewed-on: https://gerrit.libreoffice.org/13061 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/cui/uiconfig/ui/select_persona_dialog.ui b/cui/uiconfig/ui/select_persona_dialog.ui index ac0fbe7..29e99a5 100644 --- a/cui/uiconfig/ui/select_persona_dialog.ui +++ b/cui/uiconfig/ui/select_persona_dialog.ui @@ -14,6 +14,79 @@ property name=can_focusFalse/property property name=orientationvertical/property property name=spacing12/property +child internal-child=action_area + object class=GtkButtonBox id=dialog-action_area1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=layout_styleend/property +child + object class=GtkButton id=ok +property name=labelgtk-ok/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=can_defaultTrue/property +property name=has_defaultTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillFalse/property +property name=position0/property + /packing +/child +child + object class=GtkButton id=cancel +property name=labelgtk-cancel/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillFalse/property +property name=position1/property + /packing +/child +child + object class=GtkButton id=help +property name=labelgtk-help/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillFalse/property +property name=position2/property +property name=secondaryTrue/property + /packing +/child +child + object class=GtkLabel id=progress_label +property name=visibleTrue/property +property name=can_focusFalse/property +property name=xalign0/property +property name=ellipsizeend/property +property name=max_width_chars45/property + /object + packing +property name=expandTrue/property +property name=fillTrue/property +property name=position3/property +property name=secondaryTrue/property + /packing +/child + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=pack_typeend/property +property name=position3/property + /packing +/child child object class=GtkFrame id=frame5 property name=visibleTrue/property @@ -368,75 +441,6 @@ property name=position1/property /packing /child -child - object class=GtkLabel id=progress_label -property name=visibleTrue/property -property name=can_focusFalse/property - /object - packing -property name=expandFalse/property -property name=fillTrue/property -property name=position2/property - /packing -/child -child internal-child=action_area - object class=GtkButtonBox id=dialog-action_area1 -property name=visibleTrue/property -property name=can_focusFalse/property -property name=layout_styleend/property -child -
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/similaritysearchdialog.ui | 219 -- 1 file changed, 92 insertions(+), 127 deletions(-) New commits: commit baa59ca5eaf061e6b799798406cc31c0a2fa7c9f Author: Adolfo Jayme Barrientos fit...@ubuntu.com Date: Sat Nov 22 16:26:06 2014 -0600 Simplify and beautify the Similarity Search dialog * Remove unnecessary containers and unhelpful frame * Center main container * Right-align labels to remove large gaps between controls * A bit of separation for the Help button This should serve as a model for similar dialogs. Change-Id: I1964e8909159506484950df9d8ef7283809cce5f Reviewed-on: https://gerrit.libreoffice.org/13057 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/cui/uiconfig/ui/similaritysearchdialog.ui b/cui/uiconfig/ui/similaritysearchdialog.ui index 46912d6..d82a62d 100644 --- a/cui/uiconfig/ui/similaritysearchdialog.ui +++ b/cui/uiconfig/ui/similaritysearchdialog.ui @@ -59,6 +59,7 @@ property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultTrue/property +property name=margin_right6/property property name=use_stockTrue/property property name=image_positiontop/property /object @@ -78,143 +79,107 @@ /packing /child child - object class=GtkFrame id=Selection + object class=GtkGrid id=grid1 property name=visibleTrue/property property name=can_focusFalse/property -property name=label_xalign0/property -property name=shadow_typenone/property +property name=haligncenter/property +property name=hexpandTrue/property +property name=vexpandTrue/property +property name=row_spacing6/property +property name=column_spacing12/property child - object class=GtkAlignment id=alignment3 + object class=GtkLabel id=label2 property name=visibleTrue/property property name=can_focusFalse/property -property name=top_padding6/property -property name=left_padding12/property -child - object class=GtkBox id=box1 -property name=visibleTrue/property -property name=can_focusFalse/property -property name=orientationvertical/property -property name=spacing6/property -child - object class=GtkGrid id=grid1 -property name=visibleTrue/property -property name=can_focusFalse/property -property name=row_spacing6/property -property name=column_spacing12/property -child - object class=GtkLabel id=label2 -property name=visibleTrue/property -property name=can_focusFalse/property -property name=xalign0/property -property name=label translatable=yes_Exchange characters:/property -property name=use_underlineTrue/property -property name=mnemonic_widgetotherfld/property - /object - packing -property name=left_attach0/property -property name=top_attach0/property - /packing -/child -child - object class=GtkLabel id=label3 -property name=visibleTrue/property -property name=can_focusFalse/property -property name=xalign0/property -property name=label translatable=yes_Add characters:/property -property name=use_underlineTrue/property -property name=mnemonic_widgetlongerfld/property - /object - packing -property name=left_attach0/property -property name=top_attach1/property - /packing -/child -child - object class=GtkLabel id=label4 -property name=visibleTrue/property -property name=can_focusFalse/property -property name=xalign0/property -property name=label translatable=yes_Remove characters:/property -property
[Libreoffice-commits] core.git: Branch 'private/ajrhunt/cunitdemo' - 2025 commits - accessibility/source android/experimental animations/source apple_remote/source autogen.sh avmedia/Library_avmediags
Rebased ref, commits from common ancestor:
commit 786c4d2f8096f0d423ff89c453f45b6d812579ac
Author: Andrzej Hunt andr...@ahunt.org
Date: Tue Nov 25 11:16:26 2014 +
Add sc.units to log area.
Change-Id: Ia921b3e7aef905b3132f59be35282357bf5ec3b7
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index ca9482f..cb4640b 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -115,6 +115,7 @@ certain functionality.
@li @c sc.core
@li @c sc.filter - Calc filter
@li @c sc.ui - Calc UI
+@li @c sc.units - Calc Unit-Verification
@section desktop
commit 8674500c0da0c45179503f185706fa92f2b44fd8
Author: Andrzej Hunt andr...@ahunt.org
Date: Tue Nov 25 11:16:14 2014 +
SC_DIMAN: PROTOTYPE: detect add/subtract operations.
This is all a quick hack demo, could easily be refactored to 1/2
the size but will be discarded anyways.
Change-Id: I99d533489d47b440f9688381380ca2806d8b25bb
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index d9fc03a..8502974 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -462,6 +462,98 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB
nTab,
}
}
}
+
+if ( pArr-GetLen() != 3 )
+{
+SAL_INFO(sc.units, not checking -- doesn't have 3 tokens);
+continue;
+}
+
+formula::FormulaToken* pTokenCheck = pArr-First();
+assert( pTokenCheck );
+
+SCROW nRow1, nRow2;
+SCCOL nCol1, nCol2;
+SCTAB nTab1, nTab2;
+
+// ScSingleRefData can return data in terms of a relative address,
+// but we need absolute addresses for retrieving the formats later.
+// Hence we need to get the formula's address first and use it
+// to determine the absolute addresses of the input cells later.
+const ScAddress aFormulaAddress( nCol, nRow, nTab );
+
+if ( pTokenCheck pTokenCheck-GetType() == formula::svSingleRef
)
+{
+ScSingleRefData* pRef = pTokenCheck-GetSingleRef();
+assert(pRef);
+
+ScAddress aInput = pRef-toAbs( aFormulaAddress );
+
+nRow1 = aInput.Row();
+nCol1 = aInput.Col();
+nTab1 = aInput.Tab();
+}
+else
+{
+continue;
+}
+
+pTokenCheck = pArr-Next();
+assert(pTokenCheck);
+
+if ( pTokenCheck-GetType() == formula::svByte
+(pTokenCheck-GetOpCode() == ocAdd ||
+ pTokenCheck-GetOpCode() == ocSub))
+{
+SAL_INFO(sc.units,Dimension checking an add/subtract
operation.);
+}
+else
+{
+SAL_INFO(sc.units, not an add/subtract operation --
ignoring);
+continue;
+}
+
+
+pTokenCheck = pArr-Next();
+assert(pTokenCheck);
+
+// TODO: refactor out
+if ( pTokenCheck pTokenCheck-GetType() == formula::svSingleRef
)
+{
+ScSingleRefData* pRef = pTokenCheck-GetSingleRef();
+assert(pRef);
+
+// ScSingleRefData can return data in terms of a relative
address,
+// but we need absolute addresses for retrieving the formats
later.
+ScAddress aInput = pRef-toAbs( aFormulaAddress );
+
+nRow2 = aInput.Row();
+nCol2 = aInput.Col();
+nTab2 = aInput.Tab();
+}
+else
+{
+continue;
+}
+
+sal_uInt32 nFormat1, nFormat2;
+pDoc-GetNumberFormat( nCol1, nRow1, nTab1, nFormat1 );
+pDoc-GetNumberFormat( nCol2, nRow2, nTab2, nFormat2 );
+
+if ( nFormat1 == nFormat2 )
+{
+SAL_INFO(sc.units, formats
match+++);
+}
+else
+{
+SAL_INFO(sc.units, formats don't
match--);
+
+SfxViewFrame* pFrame =
GetViewData().GetViewShell()-GetViewFrame();
+pFrame-AppendInfoBar( diman, Units are invalid,
std::vector PushButton* () );
+}
+
+// TODO: this only is fired when we create the formula, but not if
input data has changed.
+
} while ( bAgain );
// to be used in multiple tabs, the formula must be compiled anew
// via ScFormulaCell copy-ctor because of RangeNames,
commit 82c998977b62b5fb7a01b5e9838d7f6868d697bf
Author: Yousuf Philips philip...@hotmail.com
Date: Fri Nov 21 19:46:05 2014 +0400
fdo#86132 add tooltips to calc xcu file
Change-Id:
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 6 commits - bridges/source
bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx | 10 ++--- bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx | 13 ++ bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx |6 +-- bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx | 16 +++- bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx|4 +- bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx |8 ++-- bridges/source/cpp_uno/gcc3_ios_arm/except.cxx | 16 ++-- bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx | 10 ++--- bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx|8 +--- bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx | 12 +++--- bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx|2 + bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx | 12 +++--- bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx | 14 ++- bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx |4 +- bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx| 17 +++- bridges/source/cpp_uno/gcc3_linux_arm/except.cxx | 26 + bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx|9 ++-- bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx | 14 +++ bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx| 24 bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx |8 ++-- bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx | 10 ++--- bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx| 13 ++ bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx |2 - bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx | 15 +++ bridges/source/cpp_uno/gcc3_linux_intel/except.cxx | 20 +++--- bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx |7 +-- bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx | 14 +++ bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx| 24 bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx |8 ++-- bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx | 15 +++ bridges/source/cpp_uno/gcc3_linux_mips/except.cxx| 24 bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx |6 +-- bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx| 14 +++ bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx | 14 ++- bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx|6 +-- bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx | 10 ++--- bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx | 13 ++ bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx |2 - bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx | 12 +++--- bridges/source/cpp_uno/gcc3_linux_s390/except.cxx| 14 ++- bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx |6 +-- bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx | 10 ++--- bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx | 14 ++- bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx |4 +- bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx | 17 bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx | 24 bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx | 14 +++ bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx | 15 +++ bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx |9 ++-- bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx | 19 +++-- bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx |7 +-- bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx| 15 +++ bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx|9 ++-- bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx | 20 +++--- bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx|7 +-- bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx| 14 +++ bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx | 24 bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx| 12 +++--- bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx| 17 bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx | 24 bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx| 14 +++ bridges/source/cpp_uno/mingw_intel/callvirtualmethod.cxx |7 +-- bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx | 14 +++ bridges/source/cpp_uno/mingw_intel/except.cxx| 22 --- bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx |6 +-- bridges/source/cpp_uno/mingw_x86-64/abi.cxx | 15 +++ bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx |8 ++-- bridges/source/cpp_uno/mingw_x86-64/except.cxx | 22 --- bridges/source/cpp_uno/mingw_x86-64/uno2cpp.cxx |6 +--
[Libreoffice-commits] core.git: external/libodfgen external/libvisio
external/libodfgen/UnpackedTarball_libodfgen.mk |4 external/libodfgen/metadata.patch | 33 + external/libvisio/UnpackedTarball_libvisio.mk |1 external/libvisio/vsdx-metadata.patch.1 | 462 4 files changed, 500 insertions(+) New commits: commit 411bd6e440266a0db95907ad73a3a5be92bd1827 Author: Miklos Vajna vmik...@collabora.co.uk Date: Tue Nov 25 12:27:25 2014 +0100 fdo#86664 VSDX import: handle metadata Change-Id: I04a446e6b8a8352be9f091980bca31842bb7e643 diff --git a/external/libodfgen/UnpackedTarball_libodfgen.mk b/external/libodfgen/UnpackedTarball_libodfgen.mk index bb2153f..edf41b6 100644 --- a/external/libodfgen/UnpackedTarball_libodfgen.mk +++ b/external/libodfgen/UnpackedTarball_libodfgen.mk @@ -13,4 +13,8 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libodfgen,$(ODFGEN_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,libodfgen,0)) +$(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \ +external/libodfgen/metadata.patch \ +)) + # vim: set noet sw=4 ts=4: diff --git a/external/libodfgen/metadata.patch b/external/libodfgen/metadata.patch new file mode 100644 index 000..1b904ed --- /dev/null +++ b/external/libodfgen/metadata.patch @@ -0,0 +1,33 @@ +commit fb43d79e12ce132fc127cc0481ff5a6bdbcd1afe +Author: Miklos Vajna vmik...@collabora.co.uk +Date: Tue Nov 25 11:26:34 2014 +0100 + +Od[gp]Generator: declare meta namespace + +Other generators had it already, and without this, it's not possible to +declare creation date. + +diff --git src/OdgGenerator.cxx src/OdgGenerator.cxx +index 6a2b1a4..ca4d4f0 100644 +--- src/OdgGenerator.cxx src/OdgGenerator.cxx +@@ -283,6 +283,7 @@ bool OdgGeneratorPrivate::writeTargetDocument(OdfDocumentHandler *pHandler, OdfS + docContentPropList.addAttribute(xmlns:draw, urn:oasis:names:tc:opendocument:xmlns:drawing:1.0); + docContentPropList.addAttribute(xmlns:table, urn:oasis:names:tc:opendocument:xmlns:table:1.0); + docContentPropList.addAttribute(xmlns:xlink, http://www.w3.org/1999/xlink;); ++ docContentPropList.addAttribute(xmlns:meta, urn:oasis:names:tc:opendocument:xmlns:meta:1.0); + docContentPropList.addAttribute(xmlns:dc, http://purl.org/dc/elements/1.1/;); + docContentPropList.addAttribute(xmlns:svg, urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0); + docContentPropList.addAttribute(xmlns:fo, urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0); +diff --git a/src/OdpGenerator.cxx b/src/OdpGenerator.cxx +index 4345c40..8ba4dc0 100644 +--- src/OdpGenerator.cxx src/OdpGenerator.cxx +@@ -444,6 +444,7 @@ bool OdpGeneratorPrivate::writeTargetDocument(OdfDocumentHandler *pHandler, OdfS + docContentPropList.addAttribute(xmlns:fo, urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0); + docContentPropList.addAttribute(xmlns:config, urn:oasis:names:tc:opendocument:xmlns:config:1.0); + docContentPropList.addAttribute(xmlns:xlink, http://www.w3.org/1999/xlink;); ++ docContentPropList.addAttribute(xmlns:meta, urn:oasis:names:tc:opendocument:xmlns:meta:1.0); + // WARNING: this is not ODF! + docContentPropList.addAttribute(xmlns:ooo, http://openoffice.org/2004/office;); + docContentPropList.addAttribute(xmlns:officeooo, http://openoffice.org/2009/office;); diff --git a/external/libvisio/UnpackedTarball_libvisio.mk b/external/libvisio/UnpackedTarball_libvisio.mk index 1626dbb..4451eb5 100644 --- a/external/libvisio/UnpackedTarball_libvisio.mk +++ b/external/libvisio/UnpackedTarball_libvisio.mk @@ -13,6 +13,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libvisio,$(VISIO_TARBALL))) $(eval $(call gb_UnpackedTarball_add_patches,libvisio,\ external/libvisio/libvisio_quote.patch.1 \ + external/libvisio/vsdx-metadata.patch.1 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/libvisio/vsdx-metadata.patch.1 b/external/libvisio/vsdx-metadata.patch.1 new file mode 100644 index 000..58a0a7d --- /dev/null +++ b/external/libvisio/vsdx-metadata.patch.1 @@ -0,0 +1,462 @@ +commit 1b1fd1b07728590c94694b4e8b1b00058ca02d52 +Author: Miklos Vajna vmik...@collabora.co.uk +Date: Tue Nov 25 09:49:05 2014 +0100 + +fdo#86664 VSDX: import metadata + +Only title as a start. + +Change-Id: Id1b92992c75058f99b9c0c72d53c254110917ed7 +Reviewed-on: https://gerrit.libreoffice.org/13108 +Reviewed-by: Fridrich Strba fridr...@documentfoundation.org +Tested-by: Fridrich Strba fridr...@documentfoundation.org + +diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am +index 6080d31..955aac4 100644 +--- a/src/lib/Makefile.am b/src/lib/Makefile.am +@@ -75,6 +75,8 @@ libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_SOURCES = \ + VSDXParser.h \ + VSDXTheme.cpp \ + VSDXTheme.h \ ++ VSDXMetaData.cpp \ ++ VSDXMetaData.h \ + $(generated_files) + + +@@ -83,6
[Libreoffice-commits] core.git: android/Bootstrap instsetoo_native/CustomTarget_setup.mk scp2/source
android/Bootstrap/Makefile.shared |1 -
instsetoo_native/CustomTarget_setup.mk |1 -
scp2/source/ooo/common_brand.scp | 12
3 files changed, 14 deletions(-)
New commits:
commit 2fc4952bd0123de06bf281733597b3f9fc487d75
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Nov 25 14:10:43 2014 +0100
Remove unused URE_LIB_DIR
(which now had a bogus value on Mac OS X anyway)
Change-Id: I5bf233506d6c658560dfadddf79a9ed8605c2a20
diff --git a/android/Bootstrap/Makefile.shared
b/android/Bootstrap/Makefile.shared
index 7ec1419..a3b8ade 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -157,7 +157,6 @@ copy-stuff:
# Set up fundamentalrc
echo '[Bootstrap]' assets/program/fundamentalrc
echo 'LO_LIB_DIR=file://$$APP_DATA_DIR/lib/'
assets/program/fundamentalrc
- echo 'URE_LIB_DIR=file://$$APP_DATA_DIR/lib/'
assets/program/fundamentalrc # checkme - is this used to find configs ?
echo 'BRAND_BASE_DIR=file:///assets' assets/program/fundamentalrc
echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry
res:$${BRAND_BASE_DIR}/share/registry' assets/program/fundamentalrc
echo
'URE_BIN_DIR=file:///assets/ure/bin/dir/nothing-here/we-can/exec-anyway'
assets/program/fundamentalrc
diff --git a/instsetoo_native/CustomTarget_setup.mk
b/instsetoo_native/CustomTarget_setup.mk
index 0c61a21..f3ecebd 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -66,7 +66,6 @@ $(call
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
echo 'URE_MORE_JAVA_CLASSPATH_URLS=$(if
$(SYSTEM_HSQLDB),$(HSQLDB_JAR))' \
echo
'URE_OVERRIDE_JAVA_JFW_SHARED_DATA=$${BRAND_BASE_DIR}/$(LIBO_SHARE_FOLDER)/config/javasettings_$${_OS}_$${_ARCH}.xml'
\
echo
'URE_OVERRIDE_JAVA_JFW_USER_DATA=$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call
gb_Helper_get_rcfile,bootstrap):UserInstallation}/user/config/javasettings_$${_OS}_$${_ARCH}.xml'
\
-echo 'URE_LIB_DIR=$(if $(filter
WNT,$(OS)),$${.link:$${BRAND_BASE_DIR}/ure-link}/bin,$${BRAND_BASE_DIR}/ure-link/lib)'
\
echo
'URE_MORE_JAVA_TYPES=$${BRAND_BASE_DIR}/$(LIBO_SHARE_JAVA_FOLDER)/unoil.jar
$${BRAND_BASE_DIR}/$(LIBO_SHARE_JAVA_FOLDER)/ScriptFramework.jar
$${$${$$ORIGIN/$(call
gb_Helper_get_rcfile,louno):PKG_UserUnoFile}:UNO_JAVA_CLASSPATH}
$${$${$$ORIGIN/$(call
gb_Helper_get_rcfile,louno):PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH}
$${$${$$ORIGIN/$(call
gb_Helper_get_rcfile,louno):PKG_BundledUnoFile}:UNO_JAVA_CLASSPATH}' \
echo 'URE_MORE_SERVICES=$${$${$$ORIGIN/$(call
gb_Helper_get_rcfile,louno):PKG_UserUnoFile}:UNO_SERVICES}
$${$${$$ORIGIN/$(call
gb_Helper_get_rcfile,louno):PKG_SharedUnoFile}:UNO_SERVICES}
$${$${$$ORIGIN/$(call
gb_Helper_get_rcfile,louno):PKG_BundledUnoFile}:UNO_SERVICES}
$$ORIGIN/services*' \
echo 'URE_MORE_TYPES=$$ORIGIN/types* $${$${$$ORIGIN/$(call
gb_Helper_get_rcfile,louno):PKG_UserUnoFile}:UNO_TYPES} $${$${$$ORIGIN/$(call
gb_Helper_get_rcfile,louno):PKG_SharedUnoFile}:UNO_TYPES} $${$${$$ORIGIN/$(call
gb_Helper_get_rcfile,louno):PKG_BundledUnoFile}:UNO_TYPES}' \
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index a866929..e331f6c 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1151,18 +1151,6 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Bin_Dir
#endif
End
-ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Lib_Dir
-ModuleID = gid_Module_Root_Brand;
-ProfileID = gid_Brand_Profile_Fundamental_Ini;
-Section = Bootstrap;
-Key = URE_LIB_DIR;
-#if defined WNT
-Value = ${.link:${BRAND_BASE_DIR}/ure-link}/bin;
-#else
-Value = ${BRAND_BASE_DIR}/ure-link/lib;
-#endif
-End
-
ProfileItem gid_Brand_Profileitem_Fundamental_Configuration_Layers
ProfileID = gid_Brand_Profile_Fundamental_Ini;
ModuleID = gid_Module_Root_Brand;
___
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 65880fdcf9115a16427b0fe98c1c8a53451b28bb Author: Andras Timar andras.ti...@collabora.com Date: Tue Nov 25 14:16:14 2014 +0100 Updated core Project: translations dc9efae66f0f0e66e941a01c1c6af93b72d0213c diff --git a/translations b/translations index 27e2234..dc9efae 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 27e2234d459ba1d48cdd3560055f7b4559d0b48f +Subproject commit dc9efae66f0f0e66e941a01c1c6af93b72d0213c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Branch 'libreoffice-4-3' - source/sl source/sr source/sr-Latn
source/sl/wizards/source/euro.po | 12 ++-- source/sr-Latn/wizards/source/euro.po | 14 ++ source/sr/wizards/source/euro.po | 13 ++--- 3 files changed, 6 insertions(+), 33 deletions(-) New commits: commit dc9efae66f0f0e66e941a01c1c6af93b72d0213c Author: Andras Timar andras.ti...@collabora.com Date: Tue Nov 25 14:16:14 2014 +0100 Update sl, sr, sr-Latn euro.po for Lithuanian Litas Change-Id: I04eef05c88eee72b5cc1995db51e7088792bb2ca diff --git a/source/sl/wizards/source/euro.po b/source/sl/wizards/source/euro.po index bfc3bcf..1239eca 100644 --- a/source/sl/wizards/source/euro.po +++ b/source/sl/wizards/source/euro.po @@ -638,16 +638,8 @@ msgctxt euro.src\n CURRENCIES + 18\n string.text -msgid The currency set for the document is not a European currency! -msgstr Nastavljena valuta za dokument ni evropska valuta! - -#: euro.src -msgctxt -euro.src\n -CURRENCIES + 19\n -string.text -msgid The language set for your operating system is not a language of the European Monetary Union. -msgstr Nastavljeni jezik za operacijski sistem ne sodi med jezike Evropske denarne unije. +msgid Lithuanian Litas +msgstr litovski litas #: euro.src msgctxt diff --git a/source/sr-Latn/wizards/source/euro.po b/source/sr-Latn/wizards/source/euro.po index 5f3c819..93f31d4 100644 --- a/source/sr-Latn/wizards/source/euro.po +++ b/source/sr-Latn/wizards/source/euro.po @@ -631,22 +631,12 @@ msgid Latvian Lats msgstr #: euro.src -#, fuzzy msgctxt euro.src\n CURRENCIES + 18\n string.text -msgid The currency set for the document is not a European currency! -msgstr Valuta podeÅ¡ena za ovaj dokument nije evropska valuta! - -#: euro.src -#, fuzzy -msgctxt -euro.src\n -CURRENCIES + 19\n -string.text -msgid The language set for your operating system is not a language of the European Monetary Union. -msgstr Jezik podeÅ¡en na vaÅ¡em operativnom sistemu nije jezik Evropske monetarne zajednice. +msgid Lithuanian Litas +msgstr #: euro.src msgctxt diff --git a/source/sr/wizards/source/euro.po b/source/sr/wizards/source/euro.po index ffd1c64..013d625 100644 --- a/source/sr/wizards/source/euro.po +++ b/source/sr/wizards/source/euro.po @@ -631,22 +631,13 @@ msgid Latvian Lats msgstr #: euro.src -#, fuzzy msgctxt euro.src\n CURRENCIES + 18\n string.text -msgid The currency set for the document is not a European currency! -msgstr ÐалÑÑа подеÑена за Ð¾Ð²Ð°Ñ Ð´Ð¾ÐºÑÐ¼ÐµÐ½Ñ Ð½Ð¸Ñе евÑопÑка валÑÑа! +msgid Lithuanian Litas +msgstr -#: euro.src -#, fuzzy -msgctxt -euro.src\n -CURRENCIES + 19\n -string.text -msgid The language set for your operating system is not a language of the European Monetary Union. -msgstr Ðезик подеÑен на ваÑем опеÑаÑивном ÑиÑÑÐµÐ¼Ñ Ð½Ð¸Ñе Ñезик ÐвÑопÑке монеÑаÑне заÑедниÑе. #: euro.src msgctxt ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libmspub.git: 2 commits - src/lib
src/lib/MSPUBParser.cpp |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0ab2f4869b5d5f43a3793ae7e556bd5825609552
Author: David Tardon dtar...@redhat.com
Date: Tue Nov 25 15:27:51 2014 +0100
do not dereference past-the-end iterator
Change-Id: I93b300e79163c9fb6a6f32f937c75e6265f1c5b7
diff --git a/src/lib/MSPUBParser.cpp b/src/lib/MSPUBParser.cpp
index 2797845..ee30d91 100644
--- a/src/lib/MSPUBParser.cpp
+++ b/src/lib/MSPUBParser.cpp
@@ -967,13 +967,13 @@ bool MSPUBParser::parseQuill(librevenge::RVNGInputStream
*input)
unsigned bytesRead = 0;
std::vectorTextSpanReference::iterator currentTextSpan = spans.begin();
std::vectorTextParagraphReference::iterator currentTextPara =
paras.begin();
-for (unsigned j = 0; j textIDs.size() j textLengths.size()
currentTextPara != paras.end(); ++j)
+for (unsigned j = 0; j textIDs.size() j textLengths.size(); ++j)
{
MSPUB_DEBUG_MSG((Parsing a text block.\n));
std::vectorTextParagraph readParas;
std::vectorTextSpan readSpans;
std::vectorunsigned char text;
- for (unsigned k = 0; k textLengths[j] currentTextSpan !=
spans.end(); ++k)
+ for (unsigned k = 0; k textLengths[j] currentTextPara !=
paras.end() currentTextSpan != spans.end(); ++k)
{
text.push_back(readU8(input));
text.push_back(readU8(input));
commit b33edc1675cec963340466627973fba070d2747d
Author: David Tardon dtar...@redhat.com
Date: Tue Nov 25 15:22:30 2014 +0100
do not dereference past-the-end iterator
Change-Id: Icef6e8a324f85c51c27dd03a03ca1c37e4b01bc1
diff --git a/src/lib/MSPUBParser.cpp b/src/lib/MSPUBParser.cpp
index 091f2b5..2797845 100644
--- a/src/lib/MSPUBParser.cpp
+++ b/src/lib/MSPUBParser.cpp
@@ -967,13 +967,13 @@ bool MSPUBParser::parseQuill(librevenge::RVNGInputStream
*input)
unsigned bytesRead = 0;
std::vectorTextSpanReference::iterator currentTextSpan = spans.begin();
std::vectorTextParagraphReference::iterator currentTextPara =
paras.begin();
-for (unsigned j = 0; j textIDs.size() j textLengths.size(); ++j)
+for (unsigned j = 0; j textIDs.size() j textLengths.size()
currentTextPara != paras.end(); ++j)
{
MSPUB_DEBUG_MSG((Parsing a text block.\n));
std::vectorTextParagraph readParas;
std::vectorTextSpan readSpans;
std::vectorunsigned char text;
- for (unsigned k = 0; k textLengths[j]; ++k)
+ for (unsigned k = 0; k textLengths[j] currentTextSpan !=
spans.end(); ++k)
{
text.push_back(readU8(input));
text.push_back(readU8(input));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/opengl-canvas-rework' - 8 commits - canvas/opengl canvas/source
canvas/opengl/simpleVertexShader.glsl |5 -
canvas/opengl/texVertexShader.glsl |5 -
canvas/opengl/textManipulatingVertexShader.glsl |3
canvas/source/opengl/ogl_canvascustomsprite.cxx | 48 +++--
canvas/source/opengl/ogl_canvashelper.cxx | 85
canvas/source/opengl/ogl_canvastools.cxx| 39 +++
canvas/source/opengl/ogl_canvastools.hxx|2
canvas/source/opengl/ogl_renderHelper.cxx | 66 ++
canvas/source/opengl/ogl_renderHelper.hxx | 29 +---
canvas/source/opengl/ogl_spritedevicehelper.cxx | 67 +-
canvas/source/opengl/ogl_spritedevicehelper.hxx |3
11 files changed, 182 insertions(+), 170 deletions(-)
New commits:
commit de9b174dede3bcb0575d42f134f6f112d507abc7
Author: Michael Jaumann meta_...@yahoo.com
Date: Tue Nov 25 14:45:08 2014 +
compute gl_position in one line instead of two
Change-Id: Id250c0092d533bf23de867ef7dfc51666fa4c1fd
diff --git a/canvas/opengl/simpleVertexShader.glsl
b/canvas/opengl/simpleVertexShader.glsl
index 0aa110f..af3e9cc 100644
--- a/canvas/opengl/simpleVertexShader.glsl
+++ b/canvas/opengl/simpleVertexShader.glsl
@@ -12,9 +12,8 @@ varying vec2 textCoords;
uniform mat4 MVP;
void main(void)
-{
-vec4 v = vec4(vPosition,1,1);
-gl_Position = MVP * v;
+{
+gl_Position = MVP * vec4(vPosition,1,1);
textCoords = UV;
}
diff --git a/canvas/opengl/texVertexShader.glsl
b/canvas/opengl/texVertexShader.glsl
index aadf0de..cce2420 100644
--- a/canvas/opengl/texVertexShader.glsl
+++ b/canvas/opengl/texVertexShader.glsl
@@ -8,14 +8,13 @@
*/
#version 120
-
+
attribute vec2 vPosition;
uniform mat4 MVP;
void main(void)
{
- vec4 v = vec4(vPosition,1,1);
- gl_Position = MVP * v;
+ gl_Position = MVP * vec4(vPosition,1,1);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/opengl/textManipulatingVertexShader.glsl
b/canvas/opengl/textManipulatingVertexShader.glsl
index 172fc18..1637ff7 100644
--- a/canvas/opengl/textManipulatingVertexShader.glsl
+++ b/canvas/opengl/textManipulatingVertexShader.glsl
@@ -16,8 +16,7 @@ uniform mat4 MVP;
void main(void)
{
- vec4 v = vec4(vPosition,1,1);
- gl_Position = MVP * v;
+ gl_Position = MVP * vec4(vPosition,1,1);
textCoords = vPosition/texCord;
}
commit 0513a38ad267a57fee69fcef7a8099e23e9b3894
Author: Michael Jaumann meta_...@yahoo.com
Date: Tue Nov 25 14:11:29 2014 +
use const refs and vectors instead of arrays
Change-Id: Ie853e719528ef7f6f72935c8749a5cb8e97c3153
diff --git a/canvas/source/opengl/ogl_canvascustomsprite.cxx
b/canvas/source/opengl/ogl_canvascustomsprite.cxx
index 6073e5a..9962eb4 100644
--- a/canvas/source/opengl/ogl_canvascustomsprite.cxx
+++ b/canvas/source/opengl/ogl_canvascustomsprite.cxx
@@ -161,7 +161,8 @@ namespace oglcanvas
maTransformation.m02, maTransformation.m12, 0, 1
);
-pRenderHelper-SetModelAndMVP(translate * aGLTransform);
+//pRenderHelper-SetModelAndMVP(translate * aGLTransform);
+pRenderHelper-SetModelAndMVP( aGLTransform);
// content ended up in background buffer - compose to
// screen now. Calls below switches us back to window
// context, and binds to generated, dynamic texture
@@ -200,12 +201,12 @@ namespace oglcanvas
aSpriteSizePixel.x,
aSpriteSizePixel.y)));
-GLfloat vertices[rTriangulatedPolygon.count()*2];
+std::vectorglm::vec2 vertices;
+vertices.reserve(rTriangulatedPolygon.count());
for( sal_uInt32 i=0; irTriangulatedPolygon.count(); i++ )
{
const ::basegfx::B2DPoint rPt(
rTriangulatedPolygon.getB2DPoint(i) );
-vertices[i*2]= rPt.getX();
-vertices[i*2+1]= rPt.getY();
+vertices.push_back(glm::vec2(rPt.getX(), rPt.getY()));
}
pRenderHelper-renderVertexTex( vertices, fWidth, fHeight,
color, GL_TRIANGLES);
}
@@ -214,14 +215,19 @@ namespace oglcanvas
const double fWidth=maSize.Width/aSpriteSizePixel.x;
const double fHeight=maSize.Height/aSpriteSizePixel.y;
-GLfloat vertices[] = {0, 0,
- 0, (float) aSpriteSizePixel.y,
- (float) aSpriteSizePixel.x, 0,
- (float) aSpriteSizePixel.x, (float)
aSpriteSizePixel.y };
-GLfloat uvCoordinates[] = {0, 0,
- 0, (float) fHeight,
-
[Libreoffice-commits] core.git: 3 commits - basctl/inc basctl/source include/sfx2 include/svx sc/inc sc/source sd/inc sd/source sfx2/source starmath/source svx/source sw/source
basctl/inc/basidesh.hrc |2 basctl/source/basicide/basdoc.cxx |2 basctl/source/basicide/basidesh.cxx |2 basctl/source/basicide/basidesh.src |4 include/sfx2/objface.hxx|6 - include/sfx2/sfx.hrc|1 include/sfx2/shell.hxx | 12 +- include/svx/fmresids.hrc|2 sc/inc/sc.hrc | 21 sc/source/ui/app/scmod.cxx |2 sc/source/ui/docshell/docsh.cxx |2 sc/source/ui/drawfunc/chartsh.cxx |2 sc/source/ui/drawfunc/drawsh.cxx|2 sc/source/ui/drawfunc/drformsh.cxx |2 sc/source/ui/drawfunc/drtxtob.cxx |2 sc/source/ui/drawfunc/graphsh.cxx |2 sc/source/ui/drawfunc/mediash.cxx |2 sc/source/ui/drawfunc/oleobjsh.cxx |2 sc/source/ui/src/sc.src |7 - sc/source/ui/src/scstring.src | 75 sc/source/ui/view/auditsh.cxx |2 sc/source/ui/view/cellsh.cxx|2 sc/source/ui/view/editsh.cxx|2 sc/source/ui/view/formatsh.cxx |2 sc/source/ui/view/pgbrksh.cxx |2 sc/source/ui/view/pivotsh.cxx |2 sc/source/ui/view/prevwsh.cxx |2 sc/source/ui/view/tabvwsh.cxx |2 sd/inc/glob.hrc | 18 +-- sd/source/core/glob.src | 53 --- sd/source/ui/app/sdmod.cxx |2 sd/source/ui/dlg/PaneShells.cxx |4 sd/source/ui/docshell/docshell.cxx |2 sd/source/ui/docshell/grdocsh.cxx |2 sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx |2 sd/source/ui/table/tableobjectbar.cxx |2 sd/source/ui/view/GraphicObjectBar.cxx |2 sd/source/ui/view/MediaObjectBar.cxx|2 sd/source/ui/view/ViewShellBase.cxx |2 sd/source/ui/view/drbezob.cxx |3 sd/source/ui/view/drtxtob.cxx |3 sd/source/ui/view/drvwshrg.cxx |5 - sd/source/ui/view/outlnvsh.cxx |2 sd/source/ui/view/presvish.cxx |2 sfx2/source/appl/app.hrc|2 sfx2/source/appl/app.src|5 - sfx2/source/appl/appmisc.cxx|2 sfx2/source/appl/module.cxx |2 sfx2/source/control/objface.cxx | 14 +- sfx2/source/dialog/templdlg.cxx | 17 ++- sfx2/source/doc/objserv.cxx |2 sfx2/source/view/viewfrm.cxx|2 sfx2/source/view/viewsh.cxx |2 starmath/source/document.cxx|2 starmath/source/smmod.cxx |2 starmath/source/smres.src |4 starmath/source/view.cxx|2 svx/source/form/fmshell.cxx |2 svx/source/form/fmstring.src|4 svx/source/toolbars/extrusionbar.cxx|2 svx/source/toolbars/fontworkbar.cxx |2 sw/source/ui/app/app.src|5 - sw/source/ui/shells/shells.src | 48 -- sw/source/ui/web/web.src|8 - sw/source/uibase/app/apphdl.cxx |2 sw/source/uibase/app/docsh.cxx |2 sw/source/uibase/inc/app.hrc|3 sw/source/uibase/inc/shells.hrc | 16 --- sw/source/uibase/inc/web.hrc|2 sw/source/uibase/misc/glshell.cxx |4 sw/source/uibase/shells/annotsh.cxx |2 sw/source/uibase/shells/basesh.cxx |2 sw/source/uibase/shells/beziersh.cxx|2 sw/source/uibase/shells/drawsh.cxx |2 sw/source/uibase/shells/drformsh.cxx|2 sw/source/uibase/shells/drwbassh.cxx|2
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - include/svl sc/inc sc/qa sc/source svl/source
include/svl/broadcast.hxx | 10 +-
sc/inc/cellvalue.hxx |2
sc/inc/clipcontext.hxx|5 +
sc/inc/column.hxx | 17 +++--
sc/inc/document.hxx |2
sc/inc/formulacell.hxx|9 +-
sc/inc/grouparealistener.hxx |6 +
sc/inc/stringutil.hxx |3
sc/inc/table.hxx |5 +
sc/inc/types.hxx |7 ++
sc/qa/unit/ucalc.hxx | 25 ++-
sc/qa/unit/ucalc_sharedformula.cxx| 101 ++
sc/source/core/data/bcaslot.cxx | 24 +++
sc/source/core/data/cellvalue.cxx |4 -
sc/source/core/data/clipcontext.cxx | 14 +++-
sc/source/core/data/column.cxx| 36 --
sc/source/core/data/column3.cxx | 43
sc/source/core/data/column4.cxx |2
sc/source/core/data/document.cxx | 28
sc/source/core/data/document10.cxx| 34 ++
sc/source/core/data/formulacell.cxx | 59 +++--
sc/source/core/data/table2.cxx| 14 +++-
sc/source/core/inc/bcaslot.hxx|5 +
sc/source/core/tool/grouparealistener.cxx | 17 -
sc/source/core/tool/stringutil.cxx|3
sc/source/ui/undo/refundo.cxx | 38 ++-
svl/source/notify/broadcast.cxx |4 -
27 files changed, 435 insertions(+), 82 deletions(-)
New commits:
commit 7d52a5dff557117c0f8710eb27e61b328323ac90
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Nov 25 00:02:21 2014 -0500
Adjust ref undo to ensure group area listeners are used.
When undoing row deletion (and possibly other similar undo's). And
write test for it.
Change-Id: I04b4fd9932f4236f124dcd25967355c6055dec33
(cherry picked from commit 0dae7466fff1e742543ef7512b7dd22472c75624)
diff --git a/include/svl/broadcast.hxx b/include/svl/broadcast.hxx
index 5615255..a73abea 100644
--- a/include/svl/broadcast.hxx
+++ b/include/svl/broadcast.hxx
@@ -41,7 +41,7 @@ private:
* entries. As a side effect, the listeners get sorted by pointer values
* after this call.
*/
-void Normalize();
+void Normalize() const;
void Add( SvtListener* p );
void Remove( SvtListener* p );
@@ -74,16 +74,16 @@ public:
void PrepareForDestruction();
private:
-ListenersType maListeners;
+mutable ListenersType maListeners;
/// When the broadcaster is about to die, collect listeners that asked for
removal.
-ListenersType maDestructedListeners;
+mutable ListenersType maDestructedListeners;
/// Indicate that this broadcaster will be destructed (we indicate this on
all ScColumn's broadcasters during the ScTable destruction, eg.)
bool mbAboutToDie:1;
bool mbDisposing:1;
-bool mbNormalized:1;
-bool mbDestNormalized:1;
+mutable bool mbNormalized:1;
+mutable bool mbDestNormalized:1;
};
diff --git a/sc/inc/cellvalue.hxx b/sc/inc/cellvalue.hxx
index 9154e30..3a2d3c8 100644
--- a/sc/inc/cellvalue.hxx
+++ b/sc/inc/cellvalue.hxx
@@ -76,7 +76,7 @@ struct SC_DLLPUBLIC ScCellValue
*/
void release( ScDocument rDoc, const ScAddress rPos );
-void release( ScColumn rColumn, SCROW nRow );
+void release( ScColumn rColumn, SCROW nRow, sc::StartListeningType
eListenType = sc::SingleCellListening );
OUString getString( const ScDocument* pDoc );
diff --git a/sc/inc/clipcontext.hxx b/sc/inc/clipcontext.hxx
index 3891274..aa783e4 100644
--- a/sc/inc/clipcontext.hxx
+++ b/sc/inc/clipcontext.hxx
@@ -144,9 +144,14 @@ public:
class CopyToDocContext : public ClipContextBase
{
+bool mbStartListening;
+
public:
CopyToDocContext(ScDocument rDoc);
virtual ~CopyToDocContext();
+
+void setStartListening( bool b );
+bool isStartListening() const;
};
class MixDocContext : public ClipContextBase
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 102af12..7f883a6 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -314,8 +314,12 @@ public:
* @return pCell if it was successfully inserted, NULL otherwise. pCell
* is deleted automatically on failure to insert.
*/
-ScFormulaCell* SetFormulaCell( SCROW nRow, ScFormulaCell* pCell, bool
bSingle = false );
-ScFormulaCell* SetFormulaCell( sc::ColumnBlockPosition rBlockPos, SCROW
nRow, ScFormulaCell* pCell );
+ScFormulaCell* SetFormulaCell(
+SCROW nRow, ScFormulaCell* pCell,
+sc::StartListeningType eListenType = sc::SingleCellListening );
+ScFormulaCell* SetFormulaCell(
+sc::ColumnBlockPosition rBlockPos, SCROW nRow, ScFormulaCell* pCell,
+sc::StartListeningType eListenType = sc::SingleCellListening );
bool SetFormulaCells( SCROW nRow, std::vectorScFormulaCell* rCells );
@@
[Libreoffice-commits] core.git: include/svl sc/inc sc/qa sc/source svl/source
include/svl/broadcast.hxx | 10 +-
sc/inc/cellvalue.hxx |2
sc/inc/clipcontext.hxx|5 +
sc/inc/column.hxx | 17 +++--
sc/inc/document.hxx |2
sc/inc/formulacell.hxx|9 +-
sc/inc/grouparealistener.hxx |6 +
sc/inc/stringutil.hxx |3
sc/inc/table.hxx |5 +
sc/inc/types.hxx |7 ++
sc/qa/unit/ucalc.hxx | 25 ++-
sc/qa/unit/ucalc_sharedformula.cxx| 101 ++
sc/source/core/data/bcaslot.cxx | 24 +++
sc/source/core/data/cellvalue.cxx |4 -
sc/source/core/data/clipcontext.cxx | 14 +++-
sc/source/core/data/column.cxx| 36 --
sc/source/core/data/column3.cxx | 43
sc/source/core/data/column4.cxx |2
sc/source/core/data/document.cxx | 28
sc/source/core/data/document10.cxx| 34 ++
sc/source/core/data/formulacell.cxx | 59 +++--
sc/source/core/data/table2.cxx| 14 +++-
sc/source/core/inc/bcaslot.hxx|5 +
sc/source/core/tool/grouparealistener.cxx | 17 -
sc/source/core/tool/stringutil.cxx|3
sc/source/ui/undo/refundo.cxx | 38 ++-
svl/source/notify/broadcast.cxx |4 -
27 files changed, 435 insertions(+), 82 deletions(-)
New commits:
commit 0dae7466fff1e742543ef7512b7dd22472c75624
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Nov 25 00:02:21 2014 -0500
Adjust ref undo to ensure group area listeners are used.
When undoing row deletion (and possibly other similar undo's). And
write test for it.
Change-Id: I04b4fd9932f4236f124dcd25967355c6055dec33
diff --git a/include/svl/broadcast.hxx b/include/svl/broadcast.hxx
index 5615255..a73abea 100644
--- a/include/svl/broadcast.hxx
+++ b/include/svl/broadcast.hxx
@@ -41,7 +41,7 @@ private:
* entries. As a side effect, the listeners get sorted by pointer values
* after this call.
*/
-void Normalize();
+void Normalize() const;
void Add( SvtListener* p );
void Remove( SvtListener* p );
@@ -74,16 +74,16 @@ public:
void PrepareForDestruction();
private:
-ListenersType maListeners;
+mutable ListenersType maListeners;
/// When the broadcaster is about to die, collect listeners that asked for
removal.
-ListenersType maDestructedListeners;
+mutable ListenersType maDestructedListeners;
/// Indicate that this broadcaster will be destructed (we indicate this on
all ScColumn's broadcasters during the ScTable destruction, eg.)
bool mbAboutToDie:1;
bool mbDisposing:1;
-bool mbNormalized:1;
-bool mbDestNormalized:1;
+mutable bool mbNormalized:1;
+mutable bool mbDestNormalized:1;
};
diff --git a/sc/inc/cellvalue.hxx b/sc/inc/cellvalue.hxx
index 9154e30..3a2d3c8 100644
--- a/sc/inc/cellvalue.hxx
+++ b/sc/inc/cellvalue.hxx
@@ -76,7 +76,7 @@ struct SC_DLLPUBLIC ScCellValue
*/
void release( ScDocument rDoc, const ScAddress rPos );
-void release( ScColumn rColumn, SCROW nRow );
+void release( ScColumn rColumn, SCROW nRow, sc::StartListeningType
eListenType = sc::SingleCellListening );
OUString getString( const ScDocument* pDoc );
diff --git a/sc/inc/clipcontext.hxx b/sc/inc/clipcontext.hxx
index 3891274..aa783e4 100644
--- a/sc/inc/clipcontext.hxx
+++ b/sc/inc/clipcontext.hxx
@@ -144,9 +144,14 @@ public:
class CopyToDocContext : public ClipContextBase
{
+bool mbStartListening;
+
public:
CopyToDocContext(ScDocument rDoc);
virtual ~CopyToDocContext();
+
+void setStartListening( bool b );
+bool isStartListening() const;
};
class MixDocContext : public ClipContextBase
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 102af12..7f883a6 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -314,8 +314,12 @@ public:
* @return pCell if it was successfully inserted, NULL otherwise. pCell
* is deleted automatically on failure to insert.
*/
-ScFormulaCell* SetFormulaCell( SCROW nRow, ScFormulaCell* pCell, bool
bSingle = false );
-ScFormulaCell* SetFormulaCell( sc::ColumnBlockPosition rBlockPos, SCROW
nRow, ScFormulaCell* pCell );
+ScFormulaCell* SetFormulaCell(
+SCROW nRow, ScFormulaCell* pCell,
+sc::StartListeningType eListenType = sc::SingleCellListening );
+ScFormulaCell* SetFormulaCell(
+sc::ColumnBlockPosition rBlockPos, SCROW nRow, ScFormulaCell* pCell,
+sc::StartListeningType eListenType = sc::SingleCellListening );
bool SetFormulaCells( SCROW nRow, std::vectorScFormulaCell* rCells );
@@ -639,10 +643,15 @@ private:
sc::CellStoreType::iterator
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/inc sc/source
sc/inc/column.hxx | 12 +++-
sc/source/core/data/column4.cxx | 10 ++
sc/source/core/data/table3.cxx |3 ++-
3 files changed, 15 insertions(+), 10 deletions(-)
New commits:
commit e44d09160038c7cf661e23885a0997d54ca01752
Author: Eike Rathke er...@redhat.com
Date: Mon Nov 17 22:44:56 2014 +0100
fdo#83765 do not update references in SortReorderByColumn() if disabled
Similar to SortReorderByRow()
(cherry picked from commit 115a4b7ca36f65d93070d2e81048320d202e87a3)
Conflicts:
sc/inc/column.hxx
Change-Id: I2d2fe243c91a663b14e5bd75ee30225d1b8073da
Reviewed-on: https://gerrit.libreoffice.org/13117
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 66cd524..4bda39d 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -575,18 +575,20 @@ public:
/**
* Reset column position of formula cells within specified row range.
- * Reference positions are also adjusted to reflect the new position so
- * that the formula cells still reference the same cells or ranges after
- * the the position change. The position of a formula cell before the
- * call is interpreted as the old position of that cell.
+ * If bUpdateRefs==true then reference positions are also adjusted to
+ * reflect the new position so that the formula cells still reference the
+ * same cells or ranges after the the position change.
+ * The position of a formula cell before the call is interpreted as the old
+ * position of that cell.
*
* Caller needs to ensure that no formula groups cross the top and bottom
* row boundaries.
*
* @param nRow1 top row boundary
* @param nRow2 bottom row boundary
+ * @param bUpdateRefs whether to adjust references
*/
-void ResetFormulaCellPositions( SCROW nRow1, SCROW nRow2 );
+void ResetFormulaCellPositions( SCROW nRow1, SCROW nRow2, bool bUpdateRefs
);
void SplitFormulaGroupByRelativeRef( const ScRange rBoundRange );
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index 8b46e74..568b5b64 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -439,8 +439,9 @@ namespace {
class FormulaColPosSetter
{
SCCOL mnCol;
+bool mbUpdateRefs;
public:
-FormulaColPosSetter( SCCOL nCol ) : mnCol(nCol) {}
+FormulaColPosSetter( SCCOL nCol, bool bUpdateRefs ) : mnCol(nCol),
mbUpdateRefs(bUpdateRefs) {}
void operator() ( size_t nRow, ScFormulaCell* pCell )
{
@@ -451,7 +452,8 @@ public:
ScAddress aOldPos = pCell-aPos;
pCell-aPos.SetCol(mnCol);
pCell-aPos.SetRow(nRow);
-pCell-GetCode()-AdjustReferenceOnMovedOrigin(aOldPos,
pCell-aPos);
+if (mbUpdateRefs)
+pCell-GetCode()-AdjustReferenceOnMovedOrigin(aOldPos,
pCell-aPos);
}
else
{
@@ -463,9 +465,9 @@ public:
}
-void ScColumn::ResetFormulaCellPositions( SCROW nRow1, SCROW nRow2 )
+void ScColumn::ResetFormulaCellPositions( SCROW nRow1, SCROW nRow2, bool
bUpdateRefs )
{
-FormulaColPosSetter aFunc(nCol);
+FormulaColPosSetter aFunc(nCol, bUpdateRefs);
sc::ProcessFormula(maCells.begin(), maCells, nRow1, nRow2, aFunc);
}
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index d646678..99d6239 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -716,8 +716,9 @@ void ScTable::SortReorderByColumn(
}
// Reset formula cell positions which became out-of-sync after column
reordering.
+bool bUpdateRefs = pArray-IsUpdateRefs();
for (SCCOL nCol = nStart; nCol = nLast; ++nCol)
-aCol[nCol].ResetFormulaCellPositions(nRow1, nRow2);
+aCol[nCol].ResetFormulaCellPositions(nRow1, nRow2, bUpdateRefs);
// Set up column reorder map (for later broadcasting of reference updates).
sc::ColRowReorderMapType aColMap;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl2' - 3 commits - vcl/inc vcl/win
vcl/inc/opengl/win/gdiimpl.hxx |2 --
vcl/win/source/gdi/salgdi.cxx |1 +
2 files changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 29420563fce7a15def14b79965987d1c5c3f648c
Author: Jan Holesovsky ke...@collabora.com
Date: Tue Nov 25 16:09:42 2014 +0100
windows opengl: We should actually use Init() from OpenGLSalGraphicsImpl.
Change-Id: I524883b0f0bbce9a8b6f893771f144f49934
diff --git a/vcl/inc/opengl/win/gdiimpl.hxx b/vcl/inc/opengl/win/gdiimpl.hxx
index 66a0333..de25d23 100644
--- a/vcl/inc/opengl/win/gdiimpl.hxx
+++ b/vcl/inc/opengl/win/gdiimpl.hxx
@@ -26,8 +26,6 @@ private:
public:
WinOpenGLSalGraphicsImpl(WinSalGraphics rGraphics);
-virtual void Init() SAL_OVERRIDE;
-
protected:
virtual GLfloat GetWidth() const SAL_OVERRIDE;
virtual GLfloat GetHeight() const SAL_OVERRIDE;
diff --git a/vcl/opengl/win/gdiimpl.cxx b/vcl/opengl/win/gdiimpl.cxx
index 7307e2b..55b3c5a 100644
--- a/vcl/opengl/win/gdiimpl.cxx
+++ b/vcl/opengl/win/gdiimpl.cxx
@@ -18,15 +18,6 @@
WinOpenGLSalGraphicsImpl::WinOpenGLSalGraphicsImpl(WinSalGraphics rGraphics):
{
}
-void WinOpenGLSalGraphicsImpl::Init()
-{
-// FIXME - is this still needed after the recent changes?
-//if (mbVirDev)
-//GetOpenGLContext().requestVirtualDevice();
-//GetOpenGLContext().requestSingleBufferedRendering();
-//GetOpenGLContext().init(mhLocalDC, mhWnd);
-}
-
void WinOpenGLSalGraphicsImpl::copyBits( const SalTwoRect rPosAry,
SalGraphics* pSrcGraphics )
{
OpenGLSalGraphicsImpl *pImpl = pSrcGraphics ? dynamic_cast
OpenGLSalGraphicsImpl* (pSrcGraphics-GetImpl()) : static_cast
OpenGLSalGraphicsImpl *(mrParent.GetImpl());
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx
index 05279d1..7161dab 100644
--- a/vcl/win/source/gdi/salgdi.cxx
+++ b/vcl/win/source/gdi/salgdi.cxx
@@ -482,6 +482,7 @@ void WinSalGraphics::InitGraphics()
::SetTextAlign( getHDC(), TA_BASELINE | TA_LEFT | TA_NOUPDATECP );
::SetBkMode( getHDC(), WIN32_TRANSPARENT );
::SetROP2( getHDC(), R2_COPYPEN );
+
mpImpl-Init();
}
commit 328dbaf3f420896eceaa9a5d629d6e7dc7955946
Author: Jan Holesovsky ke...@collabora.com
Date: Sat Nov 22 22:08:23 2014 +0100
Fix build.
Change-Id: Ibf5d1ccee155cc5807a1a125fde7a7243eab7585
diff --git a/vcl/opengl/win/gdiimpl.cxx b/vcl/opengl/win/gdiimpl.cxx
index 7c2fe1f..7307e2b 100644
--- a/vcl/opengl/win/gdiimpl.cxx
+++ b/vcl/opengl/win/gdiimpl.cxx
@@ -23,8 +23,8 @@ void WinOpenGLSalGraphicsImpl::Init()
// FIXME - is this still needed after the recent changes?
//if (mbVirDev)
//GetOpenGLContext().requestVirtualDevice();
-GetOpenGLContext().requestSingleBufferedRendering();
-GetOpenGLContext().init(mhLocalDC, mhWnd);
+//GetOpenGLContext().requestSingleBufferedRendering();
+//GetOpenGLContext().init(mhLocalDC, mhWnd);
}
void WinOpenGLSalGraphicsImpl::copyBits( const SalTwoRect rPosAry,
SalGraphics* pSrcGraphics )
commit 7dd5f00d8d82e26b11a0b894156fcc5bd1f97cf6
Author: Jan Holesovsky ke...@collabora.com
Date: Sat Nov 22 21:42:08 2014 +0100
windows opengl: Implement WinOpenGLSalGraphicsImpl::Init() too.
[Blind fix to fix build; real fix to follow after testing.]
Change-Id: Ic4cf2dc74ba4649a2453bc351cdc1d1fad59a0ca
diff --git a/vcl/opengl/win/gdiimpl.cxx b/vcl/opengl/win/gdiimpl.cxx
index 55b3c5a..7c2fe1f 100644
--- a/vcl/opengl/win/gdiimpl.cxx
+++ b/vcl/opengl/win/gdiimpl.cxx
@@ -18,6 +18,15 @@
WinOpenGLSalGraphicsImpl::WinOpenGLSalGraphicsImpl(WinSalGraphics rGraphics):
{
}
+void WinOpenGLSalGraphicsImpl::Init()
+{
+// FIXME - is this still needed after the recent changes?
+//if (mbVirDev)
+//GetOpenGLContext().requestVirtualDevice();
+GetOpenGLContext().requestSingleBufferedRendering();
+GetOpenGLContext().init(mhLocalDC, mhWnd);
+}
+
void WinOpenGLSalGraphicsImpl::copyBits( const SalTwoRect rPosAry,
SalGraphics* pSrcGraphics )
{
OpenGLSalGraphicsImpl *pImpl = pSrcGraphics ? dynamic_cast
OpenGLSalGraphicsImpl* (pSrcGraphics-GetImpl()) : static_cast
OpenGLSalGraphicsImpl *(mrParent.GetImpl());
___
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' - sc/inc sc/source
sc/inc/tokenarray.hxx |6 +
sc/source/core/data/column4.cxx |2 +
sc/source/core/data/table3.cxx |4 +++
sc/source/core/tool/token.cxx | 43
4 files changed, 55 insertions(+)
New commits:
commit 094b19c2759c8ecc88b38d37047e9ac2de9b68ee
Author: Eike Rathke er...@redhat.com
Date: Mon Nov 24 23:29:32 2014 +0100
fix fdo#79441 again and keep references to other sheets during sort
... also if other references are not updated. References to other sheets
are never to be treated as relative during sort, they are always
absolute, even if they have relative row/column part references.
Broken again during the big sort mess. Even if there was a unit test,
which didn't help as it got disabled / adapted to the change..
(cherry picked from commit f0e7364603c9566bc158303c515c3274ccba62ca)
Backported.
Change-Id: Ic0e61c5e1cb0728e20725c29e450ab0eb55c3305
Reviewed-on: https://gerrit.libreoffice.org/13118
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us
diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx
index fbb613c..75451e1 100644
--- a/sc/inc/tokenarray.hxx
+++ b/sc/inc/tokenarray.hxx
@@ -208,6 +208,12 @@ public:
void AdjustReferenceOnMovedOrigin( const ScAddress rOldPos, const
ScAddress rNewPos );
/**
+ * Adjust all internal references on base position change if they point to
+ * a sheet other than the one of rOldPos.
+ */
+void AdjustReferenceOnMovedOriginIfOtherSheet( const ScAddress rOldPos,
const ScAddress rNewPos );
+
+/**
* Clear sheet deleted flag from internal reference tokens if the sheet
* index falls within specified range. Note that when a reference is on a
* sheet that's been deleted, its referenced sheet index retains the
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index 568b5b64..10bec05 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -454,6 +454,8 @@ public:
pCell-aPos.SetRow(nRow);
if (mbUpdateRefs)
pCell-GetCode()-AdjustReferenceOnMovedOrigin(aOldPos,
pCell-aPos);
+else
+
pCell-GetCode()-AdjustReferenceOnMovedOriginIfOtherSheet(aOldPos,
pCell-aPos);
}
else
{
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 99d6239..e49a4dc 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -870,6 +870,10 @@ void ScTable::SortReorderByRow(
pNew-CopyAllBroadcasters(*rCell.maCell.mpFormula);
pNew-GetCode()-AdjustReferenceOnMovedOrigin(aOldPos,
aCellPos);
}
+else
+{
+
pNew-GetCode()-AdjustReferenceOnMovedOriginIfOtherSheet(aOldPos, aCellPos);
+}
sc::CellStoreType::iterator itBlk =
rCellStore.push_back(pNew);
}
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 03ecc49..f561614 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -3548,6 +3548,49 @@ void ScTokenArray::AdjustReferenceOnMovedOrigin( const
ScAddress rOldPos, const
}
}
+void ScTokenArray::AdjustReferenceOnMovedOriginIfOtherSheet( const ScAddress
rOldPos, const ScAddress rNewPos )
+{
+FormulaToken** p = pCode;
+FormulaToken** pEnd = p + static_castsize_t(nLen);
+for (; p != pEnd; ++p)
+{
+bool bAdjust = false;
+switch ((*p)-GetType())
+{
+case svExternalSingleRef:
+bAdjust = true; // always
+// fallthru
+case svSingleRef:
+{
+ScToken* pToken = static_castScToken*(*p);
+ScSingleRefData rRef = pToken-GetSingleRef();
+ScAddress aAbs = rRef.toAbs(rOldPos);
+if (!bAdjust)
+bAdjust = (aAbs.Tab() != rOldPos.Tab());
+if (bAdjust)
+rRef.SetAddress(aAbs, rNewPos);
+}
+break;
+case svExternalDoubleRef:
+bAdjust = true; // always
+// fallthru
+case svDoubleRef:
+{
+ScToken* pToken = static_castScToken*(*p);
+ScComplexRefData rRef = pToken-GetDoubleRef();
+ScRange aAbs = rRef.toAbs(rOldPos);
+if (!bAdjust)
+bAdjust = (rOldPos.Tab() aAbs.aStart.Tab() ||
aAbs.aEnd.Tab() rOldPos.Tab());
+if (bAdjust)
+rRef.SetRange(aAbs, rNewPos);
+}
+break;
+default:
+;
+}
+}
+}
+
namespace {
void clearTabDeletedFlag( ScSingleRefData
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/cellvalues.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 34117a81f283cb27584915633a956dd3545d6b1c
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Nov 25 16:25:00 2014 +0100
Missing include
Change-Id: I506c38dd5469e4301985de77f7f75632dfdde817
diff --git a/sc/source/core/data/cellvalues.cxx
b/sc/source/core/data/cellvalues.cxx
index fb38ed5..725c5b9 100644
--- a/sc/source/core/data/cellvalues.cxx
+++ b/sc/source/core/data/cellvalues.cxx
@@ -13,6 +13,7 @@
#include cassert
#include boost/noncopyable.hpp
+#include boost/ptr_container/ptr_vector.hpp
namespace sc {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: C++11 on master (towards LO 4.5)
On Tue, 2014-11-25 at 09:13 +0100, Stephan Bergmann wrote: interesting stuff about features of C++ supported by various compilers. The range-based `for` offers clearer code, IMHO. When, I wonder, is it appropriate to use it? (*) New code? (*) When I am changing a for-statement anyway? (*) Throughout a function when I am changing a for-statement anyway? (*) Not at all until we are ready to make the change throughout the system? Similarly, what about `auto` type declarations (which often fit naturally into variable definitions in a for-statement? Thanks, Terry, ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/uiconfig sd/uiconfig sw/uiconfig
sc/uiconfig/scalc/toolbar/standardbar.xml|2 +- sd/uiconfig/simpress/toolbar/standardbar.xml |2 +- sw/uiconfig/sglobal/toolbar/standardbar.xml |2 +- sw/uiconfig/sweb/toolbar/standardbar.xml |2 +- sw/uiconfig/swform/toolbar/standardbar.xml |2 +- sw/uiconfig/swreport/toolbar/standardbar.xml |2 +- sw/uiconfig/swriter/toolbar/standardbar.xml |2 +- sw/uiconfig/swxform/toolbar/standardbar.xml |2 +- 8 files changed, 8 insertions(+), 8 deletions(-) New commits: commit 60f822e4e193c31892d5dc7a8466eba52950b015 Author: Yousuf Philips philip...@hotmail.com Date: Sun Nov 23 10:36:26 2014 +0400 fdo#84848 enable 'save as' button in toolbar Change-Id: Ie84ad526f6756e996e1955610d0a9c627d1e0c8c Reviewed-on: https://gerrit.libreoffice.org/13060 Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com Tested-by: Samuel Mehrbrodt s.mehrbr...@gmail.com diff --git a/sc/uiconfig/scalc/toolbar/standardbar.xml b/sc/uiconfig/scalc/toolbar/standardbar.xml index ed439fd..55978ab 100644 --- a/sc/uiconfig/scalc/toolbar/standardbar.xml +++ b/sc/uiconfig/scalc/toolbar/standardbar.xml @@ -23,7 +23,7 @@ toolbar:toolbaritem xlink:href=.uno:NewDoc toolbar:visible=false/ toolbar:toolbaritem xlink:href=.uno:OpenFromCalc toolbar:style=dropdown/ toolbar:toolbaritem xlink:href=.uno:Save/ - toolbar:toolbaritem xlink:href=.uno:SaveAs toolbar:visible=false/ + toolbar:toolbaritem xlink:href=.uno:SaveAs/ toolbar:toolbaritem xlink:href=.uno:SendMail toolbar:visible=false/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:EditDoc toolbar:visible=false/ diff --git a/sd/uiconfig/simpress/toolbar/standardbar.xml b/sd/uiconfig/simpress/toolbar/standardbar.xml index b3bb795..1ac855b 100644 --- a/sd/uiconfig/simpress/toolbar/standardbar.xml +++ b/sd/uiconfig/simpress/toolbar/standardbar.xml @@ -23,7 +23,7 @@ toolbar:toolbaritem xlink:href=.uno:NewDoc toolbar:visible=false/ toolbar:toolbaritem xlink:href=.uno:Open toolbar:style=dropdown/ toolbar:toolbaritem xlink:href=.uno:Save/ - toolbar:toolbaritem xlink:href=.uno:SaveAs toolbar:visible=false/ + toolbar:toolbaritem xlink:href=.uno:SaveAs/ toolbar:toolbaritem xlink:href=.uno:SendMail toolbar:visible=false/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:EditDoc toolbar:visible=false/ diff --git a/sw/uiconfig/sglobal/toolbar/standardbar.xml b/sw/uiconfig/sglobal/toolbar/standardbar.xml index 252849e..80b1c60 100644 --- a/sw/uiconfig/sglobal/toolbar/standardbar.xml +++ b/sw/uiconfig/sglobal/toolbar/standardbar.xml @@ -23,7 +23,7 @@ toolbar:toolbaritem xlink:href=.uno:NewDoc toolbar:visible=false toolbar:helpid=5500/ toolbar:toolbaritem xlink:href=.uno:Open toolbar:style=dropdown/ toolbar:toolbaritem xlink:href=.uno:Save toolbar:helpid=5505/ - toolbar:toolbaritem xlink:href=.uno:SaveAs toolbar:visible=false toolbar:helpid=5502/ + toolbar:toolbaritem xlink:href=.uno:SaveAs toolbar:helpid=5502/ toolbar:toolbaritem xlink:href=.uno:SendMail toolbar:visible=false toolbar:helpid=5331/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:EditDoc toolbar:helpid=6312 toolbar:visible=false/ diff --git a/sw/uiconfig/sweb/toolbar/standardbar.xml b/sw/uiconfig/sweb/toolbar/standardbar.xml index f6b0c50..6fefcf9 100644 --- a/sw/uiconfig/sweb/toolbar/standardbar.xml +++ b/sw/uiconfig/sweb/toolbar/standardbar.xml @@ -23,7 +23,7 @@ toolbar:toolbaritem xlink:href=.uno:NewDoc toolbar:visible=false toolbar:helpid=5500/ toolbar:toolbaritem xlink:href=.uno:Open toolbar:style=dropdown/ toolbar:toolbaritem xlink:href=.uno:Save toolbar:helpid=5505/ - toolbar:toolbaritem xlink:href=.uno:SaveAs toolbar:visible=false toolbar:helpid=5502/ + toolbar:toolbaritem xlink:href=.uno:SaveAs toolbar:helpid=5502/ toolbar:toolbaritem xlink:href=.uno:SendMail toolbar:visible=false toolbar:helpid=5331/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:EditDoc toolbar:helpid=6312 toolbar:visible=false/ diff --git a/sw/uiconfig/swform/toolbar/standardbar.xml b/sw/uiconfig/swform/toolbar/standardbar.xml index 252849e..80b1c60 100644 --- a/sw/uiconfig/swform/toolbar/standardbar.xml +++ b/sw/uiconfig/swform/toolbar/standardbar.xml @@ -23,7 +23,7 @@ toolbar:toolbaritem xlink:href=.uno:NewDoc toolbar:visible=false toolbar:helpid=5500/ toolbar:toolbaritem xlink:href=.uno:Open toolbar:style=dropdown/ toolbar:toolbaritem xlink:href=.uno:Save toolbar:helpid=5505/ - toolbar:toolbaritem xlink:href=.uno:SaveAs toolbar:visible=false toolbar:helpid=5502/ + toolbar:toolbaritem xlink:href=.uno:SaveAs toolbar:helpid=5502/ toolbar:toolbaritem xlink:href=.uno:SendMail toolbar:visible=false toolbar:helpid=5331/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:EditDoc toolbar:helpid=6312 toolbar:visible=false/ diff --git a/sw/uiconfig/swreport/toolbar/standardbar.xml b/sw/uiconfig/swreport/toolbar/standardbar.xml index 252849e..80b1c60 100644 ---
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) New commits: commit a11baa0a3478048a6a8797aa4812cb25c03df57e Author: Yousuf Philips philip...@hotmail.com Date: Mon Nov 24 10:32:02 2014 +0400 fdo#82969 add global shortcut for autospellcheck Change-Id: I02b933ac2080ddb46b06a525a0304833ec28acf8 Reviewed-on: https://gerrit.libreoffice.org/13088 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com (cherry picked from commit 51a572f218cb49e2c3aabdc7e6a7dc47e56c4ded) Reviewed-on: https://gerrit.libreoffice.org/13119 Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com Tested-by: Samuel Mehrbrodt s.mehrbr...@gmail.com diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu index 58ee4bc..25ecc99 100644 --- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu @@ -57,6 +57,12 @@ value xml:lang=en-US.uno:EditDoc/value /prop /node + node oor:name=F7_SHIFT oor:op=replace +prop oor:name=Command + value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value + value xml:lang=en-US.uno:SpellOnline/value +/prop + /node node oor:name=K_MOD1 oor:op=replace prop oor:name=Command value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value @@ -748,7 +754,7 @@ value xml:lang=en-US.uno:ThesaurusDialog/value /prop /node -node oor:name=F7_SHIFT oor:op=replace +node oor:name=F9_SHIFT oor:op=replace prop oor:name=Command value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value value xml:lang=en-US.uno:ShowPrecedents/value ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: C++11 on master (towards LO 4.5)
On 11/25/2014 04:34 PM, Terrence Enger wrote: The range-based `for` offers clearer code, IMHO. When, I wonder, is it appropriate to use it? (*) New code? (*) When I am changing a for-statement anyway? (*) Throughout a function when I am changing a for-statement anyway? (*) Not at all until we are ready to make the change throughout the system? Similarly, what about `auto` type declarations (which often fit naturally into variable definitions in a for-statement? Both range-based for and auto are available across all compilers we currently support, so feel free to use them in new code anyway. (The only exemption is include files that are part of the URE interface.) As to changing existing code, I think the answer is no different for these C++11 features than for any other sort of clean up: There is no hard and fast rules. Weigh don't needlessly touch existing code against keep the code clean and easily maintainable and draw your conclusion. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/pdfwriter_impl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 297b22bd49ea11a90063ab8503fb83090f351668
Author: Caolán McNamara caol...@redhat.com
Date: Tue Nov 25 15:56:29 2014 +
Revert Resolves: #i63015# always default to WinAnsiEncoding...
Because under Linux use text
'
and font Nimbus Sans L
and export as pdf and the output is garbled
If we do want to stick WinAnsiEncoding here then we'll presumably have have
to
test that pEncoding actually matches WinAnsiEncoding and/or generate an
additional Encoding/Differences from WinAnsiEncoding for that font.
This reverts commit eea16cb3e65a4308caddb7618d31a76ca259dbb1.
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx
b/vcl/source/gdi/pdfwriter_impl.cxx
index ad6d04d..06a7fe0 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -3504,7 +3504,7 @@ std::map sal_Int32, sal_Int32
PDFWriterImpl::emitEmbeddedFont( const Physical
/Type/Font/Subtype/Type1/BaseFont/ );
appendName( aInfo.m_aPSName, aLine );
aLine.append( \n );
-if( !pFont-IsSymbolFont() )
+if( !pFont-IsSymbolFont() pEncoding == 0 )
aLine.append( /Encoding/WinAnsiEncoding\n );
if( nToUnicodeStream )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: instsetoo_native/util
instsetoo_native/util/openoffice.lst.in |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 905db8babf00ffd8741f195d2faac5f23f829a6d
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Nov 25 17:14:19 2014 +0100
Update ReferenceOOoMajorMinor to 4.1 for installation sets, too
...and not only for instdir/, as was done in
ab67b79c7469cea7de82b6eb6ca1f690063c069c set OOo reference version to 4.1
for
incompatible MessageBox changes.
Change-Id: I58931982153e619c678adde6cf01ec461dc0d2f5
diff --git a/instsetoo_native/util/openoffice.lst.in
b/instsetoo_native/util/openoffice.lst.in
index 3ef365c..d2b3bff 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -6,7 +6,7 @@ Globals
{
UREPACKAGEVERSION
@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
URELAYERVERSION 1
-REFERENCEOOOMAJORMINOR 3.4
+REFERENCEOOOMAJORMINOR 4.1
WINDOWSBASISROOTNAME LibreOffice @LIBO_VERSION_MAJOR@
UNIXBASISROOTNAME
libreoffice@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
HIDELICENSEDIALOG 1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/libvisio
external/libvisio/vsdx-metadata.patch.1 | 38 1 file changed, 38 insertions(+) New commits: commit b3b0ecbf3717b04de3a5149db1c70a8ee93bf2ee Author: Miklos Vajna vmik...@collabora.co.uk Date: Tue Nov 25 17:14:29 2014 +0100 libvisio: don't invoke automake Change-Id: I89b3b175d75f27704dfcd1d11f953f0bfca5b60c diff --git a/external/libvisio/vsdx-metadata.patch.1 b/external/libvisio/vsdx-metadata.patch.1 index 58a0a7d..f2bdedd 100644 --- a/external/libvisio/vsdx-metadata.patch.1 +++ b/external/libvisio/vsdx-metadata.patch.1 @@ -460,3 +460,41 @@ index 0392862..d832604 100644 dc:title +dcterms:created +dcterms:modified +diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in +index 1881b7d..a51ac14 100644 +--- a/src/lib/Makefile.in b/src/lib/Makefile.in +@@ -134,7 +134,7 @@ am_libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_OBJECTS = \ + VSDParser.lo VSDShapeList.lo VSDStencils.lo VSDStyles.lo \ + VSDStylesCollector.lo VSDXMLHelper.lo VDXParser.lo \ + VSDXMLParserBase.lo VSDXMLTokenMap.lo VSDXParser.lo \ +- VSDXTheme.lo $(am__objects_1) ++ VSDXTheme.lo VSDXMetaData.lo $(am__objects_1) + libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_OBJECTS = $(am_libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_OBJECTS) + AM_V_lt = $(am__v_lt_@AM_V@) + am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +@@ -436,6 +436,8 @@ libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_SOURCES = \ + VSDXParser.h \ + VSDXTheme.cpp \ + VSDXTheme.h \ ++ VSDXMetaData.cpp \ ++ VSDXMetaData.h \ + $(generated_files) + + EXTRA_DIST = \ +@@ -548,6 +550,7 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VSDXMLHelper.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VSDXMLParserBase.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VSDXMLTokenMap.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VSDXMetaData.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VSDXParser.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VSDXTheme.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VisioDocument.Plo@am__quote@ +@@ -771,6 +774,7 @@ VSDXMLParserBase.lo : $(generated_files) + VSDXMLTokenMap.lo : $(generated_files) + VSDXParser.lo : $(generated_files) + VSDXTheme.lo : $(generated_files) ++VSDXMetaData.lo : $(generated_files) + + $(top_builddir)/src/lib/tokens.h : $(top_builddir)/src/lib/tokens.gperf + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - vcl/source
vcl/source/window/dialog.cxx | 19 +--
1 file changed, 13 insertions(+), 6 deletions(-)
New commits:
commit 384e8a216339c7019d4bf913a37e1517a46a11d9
Author: Caolán McNamara caol...@redhat.com
Date: Tue Nov 25 16:26:51 2014 +
the real bug behind so many apparent crashtest discoveries
the tests are done headless with dbgutil enabled and
this dialog contents dumped in dbgutil mode tries to
spit out the contents of the various file format
not known, file busted dialogs with some bad casts
and falls over and dies
Change-Id: I353619f0209902d4c099b42064fd48c3c547f846
(cherry picked from commit 67fe0b50ede437601e8f5ed90514d729486c6b83)
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 99ceec2..917af60 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -57,15 +57,22 @@ static OString ImplGetDialogText( Dialog* pDialog )
{
OStringBuffer aErrorStr(OUStringToOString(
pDialog-GetText(), RTL_TEXTENCODING_UTF8));
-if ( (pDialog-GetType() == WINDOW_MESSBOX) ||
- (pDialog-GetType() == WINDOW_INFOBOX) ||
- (pDialog-GetType() == WINDOW_WARNINGBOX) ||
- (pDialog-GetType() == WINDOW_ERRORBOX) ||
- (pDialog-GetType() == WINDOW_QUERYBOX) )
+
+OUString sMessage;
+if (MessBox* pMessBox = dynamic_castMessBox*(pDialog))
+{
+sMessage = pMessBox-GetMessText();
+}
+else if (MessageDialog* pMessDialog =
dynamic_castMessageDialog*(pDialog))
+{
+sMessage = pMessDialog-get_primary_text();
+}
+
+if (!sMessage.isEmpty())
{
aErrorStr.append(, );
aErrorStr.append(OUStringToOString(
-static_castMessBox*(pDialog)-GetMessText(),
RTL_TEXTENCODING_UTF8));
+sMessage, RTL_TEXTENCODING_UTF8));
}
return aErrorStr.makeStringAndClear();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/dialog.cxx | 19 +--
1 file changed, 13 insertions(+), 6 deletions(-)
New commits:
commit 67fe0b50ede437601e8f5ed90514d729486c6b83
Author: Caolán McNamara caol...@redhat.com
Date: Tue Nov 25 16:26:51 2014 +
the real bug behind so many apparent crashtest discoveries
the tests are done headless with dbgutil enabled and
this dialog contents dumped in dbgutil mode tries to
spit out the contents of the various file format
not known, file busted dialogs with some bad casts
and falls over and dies
Change-Id: I353619f0209902d4c099b42064fd48c3c547f846
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 99ceec2..917af60 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -57,15 +57,22 @@ static OString ImplGetDialogText( Dialog* pDialog )
{
OStringBuffer aErrorStr(OUStringToOString(
pDialog-GetText(), RTL_TEXTENCODING_UTF8));
-if ( (pDialog-GetType() == WINDOW_MESSBOX) ||
- (pDialog-GetType() == WINDOW_INFOBOX) ||
- (pDialog-GetType() == WINDOW_WARNINGBOX) ||
- (pDialog-GetType() == WINDOW_ERRORBOX) ||
- (pDialog-GetType() == WINDOW_QUERYBOX) )
+
+OUString sMessage;
+if (MessBox* pMessBox = dynamic_castMessBox*(pDialog))
+{
+sMessage = pMessBox-GetMessText();
+}
+else if (MessageDialog* pMessDialog =
dynamic_castMessageDialog*(pDialog))
+{
+sMessage = pMessDialog-get_primary_text();
+}
+
+if (!sMessage.isEmpty())
{
aErrorStr.append(, );
aErrorStr.append(OUStringToOString(
-static_castMessBox*(pDialog)-GetMessText(),
RTL_TEXTENCODING_UTF8));
+sMessage, RTL_TEXTENCODING_UTF8));
}
return aErrorStr.makeStringAndClear();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Crash test update
On Mon, 2014-11-24 at 12:36 +, Crashtest VM wrote: New crashtest update available at http://dev-builds.libreoffice.org/crashtest/893cf377125c03a19e2f681143910bf55904f08b/ The big recent spikes in e.g. tif and ras etc formats are not a crash in the ff importers but a dbgutil crash on reporting the contents of the dialogs that are auto-closed in headless mode. e.g. file format unknown and so on. So a big drop should happen on the next respin. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - vcl/source
vcl/source/gdi/pdfwriter_impl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a1723fa94eba483c1df64cfdab9fb216347157e5
Author: Caolán McNamara caol...@redhat.com
Date: Tue Nov 25 15:56:29 2014 +
Revert Resolves: #i63015# always default to WinAnsiEncoding...
Because under Linux use text
'
and font Nimbus Sans L
and export as pdf and the output is garbled
If we do want to stick WinAnsiEncoding here then we'll presumably have have
to
test that pEncoding actually matches WinAnsiEncoding and/or generate an
additional Encoding/Differences from WinAnsiEncoding for that font.
This reverts commit eea16cb3e65a4308caddb7618d31a76ca259dbb1.
(cherry picked from commit 297b22bd49ea11a90063ab8503fb83090f351668)
Change-Id: Ia21c676581af2894229a7a8c7a05b6016ddef8fe
Reviewed-on: https://gerrit.libreoffice.org/13120
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx
b/vcl/source/gdi/pdfwriter_impl.cxx
index ad6d04d..06a7fe0 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -3504,7 +3504,7 @@ std::map sal_Int32, sal_Int32
PDFWriterImpl::emitEmbeddedFont( const Physical
/Type/Font/Subtype/Type1/BaseFont/ );
appendName( aInfo.m_aPSName, aLine );
aLine.append( \n );
-if( !pFont-IsSymbolFont() )
+if( !pFont-IsSymbolFont() pEncoding == 0 )
aLine.append( /Encoding/WinAnsiEncoding\n );
if( nToUnicodeStream )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - cui/uiconfig
cui/uiconfig/ui/numberingformatpage.ui | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) New commits: commit af57a5f07442b580bc2fff7a621495d35ed73d9b Author: Adolfo Jayme Barrientos fit...@ubuntu.com Date: Sat Nov 22 17:36:50 2014 -0600 fdo#86579 Give uniform width to Category and Format frames Change-Id: I55648417f56c28b0ac07ebff908805764bb2eb0c Reviewed-on: https://gerrit.libreoffice.org/13059 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com (cherry picked from commit 936ffd5924e68e1803c8ddeb8a2435375d356260) Reviewed-on: https://gerrit.libreoffice.org/13112 diff --git a/cui/uiconfig/ui/numberingformatpage.ui b/cui/uiconfig/ui/numberingformatpage.ui index 7ad7600..e6e751d 100644 --- a/cui/uiconfig/ui/numberingformatpage.ui +++ b/cui/uiconfig/ui/numberingformatpage.ui @@ -99,7 +99,6 @@ property name=can_focusFalse/property property name=row_spacing6/property property name=column_spacing6/property -property name=row_homogeneousTrue/property child object class=GtkEntry id=formated property name=visibleTrue/property @@ -223,8 +222,8 @@ object class=GtkGrid id=grid5 property name=visibleTrue/property property name=can_focusFalse/property -property name=row_spacing10/property -property name=column_spacing20/property +property name=row_spacing6/property +property name=column_spacing12/property child object class=GtkSpinButton id=decimalsed property name=visibleTrue/property @@ -253,6 +252,7 @@ object class=GtkLabel id=decimalsft property name=visibleTrue/property property name=can_focusFalse/property +property name=xalign1/property property name=label translatable=yes_Decimal places:/property property name=use_underlineTrue/property property name=mnemonic_widgetdecimalsed/property @@ -266,6 +266,7 @@ object class=GtkLabel id=leadzerosft property name=visibleTrue/property property name=can_focusFalse/property +property name=xalign1/property property name=label translatable=yesLeading _zeroes:/property property name=use_underlineTrue/property property name=mnemonic_widgetleadzerosed/property @@ -332,7 +333,7 @@ property name=hexpandTrue/property property name=vexpandTrue/property property name=row_spacing12/property -property name=column_spacing6/property +property name=column_spacing12/property child object class=GtkFrame id=categoryframe property name=visibleTrue/property @@ -545,12 +546,11 @@ /child /object object class=GtkSizeGroup id=sizegroup1 -property name=modevertical/property +property name=modeboth/property property name=ignore_hiddenTrue/property widgets widget name=categoryframe/ widget name=formatframe/ - widget name=languageframe/ /widgets /object /interface ___ 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' - svx/source
svx/source/items/customshapeitem.cxx | 42 ++-
1 file changed, 41 insertions(+), 1 deletion(-)
New commits:
commit aa601f94cf39dcdc1aea619d526c894e2697da23
Author: Michael Stahl mst...@redhat.com
Date: Sat Nov 22 00:21:19 2014 +0100
svx: punish evil-doers who put duplicate properties into custom shapes
LO 4.3.2.2 is evidently able to export an ODF document that violates
XML Well-formedness constraint: Unique Att Spec.
draw:enhanced-geometry
draw:mirror-horizontal=false
draw:mirror-vertical=false
svg:viewBox=0 0 21679 2134682997
draw:text-areas=0 0 ?f3 ?f2
draw:mirror-vertical=true
draw:type=ooxml-rect
draw:enhanced-path=M 0 0 L ?f3 0 ?f3 ?f2 0 ?f2 Z N
Not sure how to reproduce this, but the attributes there are apparently a
serialization of SdrCustomShapeGeometryItem's aPropSeq,
retrieved from a CustomShapeGeometry property, so add some input
validation and assertions there.
(cherry picked from commit 7fcbb29db802acd8c0f32e8ff578ef4b2f82c46b)
Backport adapted to remove C++11 lambdas.
Change-Id: I91151365b507779a4bdc9cce2057d34f2376f005
Reviewed-on: https://gerrit.libreoffice.org/13111
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/svx/source/items/customshapeitem.cxx
b/svx/source/items/customshapeitem.cxx
index 25bea99..fe7942e 100644
--- a/svx/source/items/customshapeitem.cxx
+++ b/svx/source/items/customshapeitem.cxx
@@ -46,7 +46,14 @@ SdrCustomShapeGeometryItem::SdrCustomShapeGeometryItem(
const uno::Sequence bea
for ( i = 0; i aPropSeq.getLength(); i++ )
{
beans::PropertyValue rPropVal = aPropSeq[ i ];
-aPropHashMap[ rPropVal.Name ] = i;
+std::pairPropertyHashMap::iterator, bool const ret(
+aPropHashMap.insert(std::make_pair(rPropVal.Name, i)));
+assert(ret.second); // serious bug: duplicate xml attribute exported
+if (!ret.second)
+{
+throw uno::RuntimeException(
+CustomShapeGeometry has duplicate property + rPropVal.Name,
0);
+}
if ( rPropVal.Value.getValueType() == ::getCppuType((const
::com::sun::star::uno::Sequence beans::PropertyValue *)0) )
{
uno::Sequence beans::PropertyValue rPropSeq = *(
uno::Sequence beans::PropertyValue *)rPropVal.Value.getValue();
@@ -88,6 +95,19 @@ com::sun::star::uno::Any*
SdrCustomShapeGeometryItem::GetPropertyValueByName( co
return pRet;
}
+struct FindByName
+{
+beans::PropertyValue const m_rPropertyValue;
+FindByName(beans::PropertyValue const rPropertyValue)
+: m_rPropertyValue(rPropertyValue)
+{
+}
+bool operator()(beans::PropertyValue const rVal)
+{
+return rVal.Name == m_rPropertyValue.Name;
+}
+};
+
void SdrCustomShapeGeometryItem::SetPropertyValue( const
com::sun::star::beans::PropertyValue rPropVal )
{
com::sun::star::uno::Any* pAny = GetPropertyValueByName( rPropVal.Name );
@@ -119,6 +139,8 @@ void SdrCustomShapeGeometryItem::SetPropertyValue( const
com::sun::star::beans::
}
else
{ // it's a new property
+assert(aPropSeq.end() == std::find_if(aPropSeq.begin(), aPropSeq.end(),
+ FindByName(rPropVal)));
sal_uInt32 nIndex = aPropSeq.getLength();
aPropSeq.realloc( nIndex + 1 );
aPropSeq[ nIndex ] = rPropVal ;
@@ -142,6 +164,8 @@ void SdrCustomShapeGeometryItem::SetPropertyValue( const
OUString rSequenceName
aValue.Name = rSequenceName;
aValue.Value = ::com::sun::star::uno::makeAny( aSeq );
+assert(aPropSeq.end() == std::find_if(aPropSeq.begin(),
aPropSeq.end(),
+FindByName(aValue)));
sal_uInt32 nIndex = aPropSeq.getLength();
aPropSeq.realloc( nIndex + 1 );
aPropSeq[ nIndex ] = aValue;
@@ -284,7 +308,23 @@ bool SdrCustomShapeGeometryItem::PutValue( const uno::Any
rVal, sal_uInt8 /*nMe
if ( ! ( rVal = aPropSeq ) )
return false;
else
+{
+for (sal_Int32 i = 0; i aPropSeq.getLength(); ++i)
+{
+for (sal_Int32 j = i+1; j aPropSeq.getLength(); ++j)
+{
+if (aPropSeq[i].Name == aPropSeq[j].Name)
+{
+assert(0); // serious bug: duplicate xml attribute exported
+OUString const name(aPropSeq[i].Name);
+aPropSeq.realloc(0);
+throw uno::RuntimeException(
+CustomShapeGeometry has duplicate property + name,
0);
+}
+}
+}
return true;
+}
}
const uno::Sequence beans::PropertyValue
SdrCustomShapeGeometryItem::GetGeometry() const
{
___
Libreoffice-commits mailing list
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - icon-themes/galaxy icon-themes/tango officecfg/registry
icon-themes/galaxy/cmd/sc_hide.png|binary icon-themes/galaxy/cmd/sc_insert.png |binary icon-themes/galaxy/cmd/sc_move.png|binary icon-themes/galaxy/cmd/sc_protect.png |binary icon-themes/galaxy/cmd/sc_remove.png |binary icon-themes/tango/cmd/sc_hide.png |binary icon-themes/tango/cmd/sc_insert.png |binary icon-themes/tango/cmd/sc_move.png |binary icon-themes/tango/cmd/sc_protect.png |binary icon-themes/tango/cmd/sc_remove.png |binary officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu | 15 ++ 11 files changed, 15 insertions(+) New commits: commit 4c5eabdaf72ea996e202a6de1801b2bd681a1fba Author: Yousuf Philips philip...@hotmail.com Date: Mon Nov 24 10:09:17 2014 +0400 fdo#86476 add icons to sheet management menu and context menu entries Change-Id: I3d286487a8b81d440f480a528298c815f295fc92 Reviewed-on: https://gerrit.libreoffice.org/13087 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com (cherry picked from commit df633ac5487fd566fbf526808bb015112bd38e77) Reviewed-on: https://gerrit.libreoffice.org/13107 diff --git a/icon-themes/galaxy/cmd/sc_hide.png b/icon-themes/galaxy/cmd/sc_hide.png new file mode 100644 index 000..1fad058 Binary files /dev/null and b/icon-themes/galaxy/cmd/sc_hide.png differ diff --git a/icon-themes/galaxy/cmd/sc_insert.png b/icon-themes/galaxy/cmd/sc_insert.png new file mode 100644 index 000..fba8fb1 Binary files /dev/null and b/icon-themes/galaxy/cmd/sc_insert.png differ diff --git a/icon-themes/galaxy/cmd/sc_move.png b/icon-themes/galaxy/cmd/sc_move.png new file mode 100644 index 000..1d27feb Binary files /dev/null and b/icon-themes/galaxy/cmd/sc_move.png differ diff --git a/icon-themes/galaxy/cmd/sc_protect.png b/icon-themes/galaxy/cmd/sc_protect.png new file mode 100644 index 000..ef47f54 Binary files /dev/null and b/icon-themes/galaxy/cmd/sc_protect.png differ diff --git a/icon-themes/galaxy/cmd/sc_remove.png b/icon-themes/galaxy/cmd/sc_remove.png new file mode 100644 index 000..54da4ad Binary files /dev/null and b/icon-themes/galaxy/cmd/sc_remove.png differ diff --git a/icon-themes/tango/cmd/sc_hide.png b/icon-themes/tango/cmd/sc_hide.png new file mode 100644 index 000..1fad058 Binary files /dev/null and b/icon-themes/tango/cmd/sc_hide.png differ diff --git a/icon-themes/tango/cmd/sc_insert.png b/icon-themes/tango/cmd/sc_insert.png new file mode 100644 index 000..fba8fb1 Binary files /dev/null and b/icon-themes/tango/cmd/sc_insert.png differ diff --git a/icon-themes/tango/cmd/sc_move.png b/icon-themes/tango/cmd/sc_move.png new file mode 100644 index 000..1d27feb Binary files /dev/null and b/icon-themes/tango/cmd/sc_move.png differ diff --git a/icon-themes/tango/cmd/sc_protect.png b/icon-themes/tango/cmd/sc_protect.png new file mode 100644 index 000..ef47f54 Binary files /dev/null and b/icon-themes/tango/cmd/sc_protect.png differ diff --git a/icon-themes/tango/cmd/sc_remove.png b/icon-themes/tango/cmd/sc_remove.png new file mode 100644 index 000..54da4ad Binary files /dev/null and b/icon-themes/tango/cmd/sc_remove.png differ diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu index 9df5465..120d1f6 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu @@ -621,6 +621,9 @@ prop oor:name=Label oor:type=xs:string value xml:lang=en-US~Delete.../value /prop +prop oor:name=Properties oor:type=xs:int + value1/value +/prop /node node oor:name=.uno:FillDown oor:op=replace prop oor:name=Label oor:type=xs:string @@ -1076,6 +1079,9 @@ prop oor:name=ContextLabel oor:type=xs:string value xml:lang=en-US~Sheet.../value /prop +prop oor:name=Properties oor:type=xs:int + value1/value +/prop /node node oor:name=.uno:InsertSheetFromFile oor:op=replace prop oor:name=Label oor:type=xs:string @@ -1226,6 +1232,9 @@ prop oor:name=ContextLabel oor:type=xs:string value xml:lang=en-US~Hide/value /prop +prop oor:name=Properties oor:type=xs:int + value1/value +/prop /node node oor:name=.uno:Show oor:op=replace prop oor:name=Label oor:type=xs:string @@ -1302,6 +1311,9 @@ prop oor:name=ContextLabel oor:type=xs:string value xml:lang=en-US~Sheet.../value /prop +prop oor:name=Properties
[Libreoffice-commits] dev-tools.git: scripts/scan-build.sh
scripts/scan-build.sh | 54 ++
1 file changed, 54 insertions(+)
New commits:
commit cb70d4089408c864a8f31ace321508eacb75dae3
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Nov 25 17:51:38 2014 +0100
Import scan-build.sh
This script is similar to coverage.sh as in it has a list of code areas
and can run scan-build just on those files.
diff --git a/scripts/scan-build.sh b/scripts/scan-build.sh
new file mode 100755
index 000..3e8e1a2
--- /dev/null
+++ b/scripts/scan-build.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+# 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/.
+#
+
+# Run this script in the toplevel directory of a LibreOffice checkout.
+
+scan()
+{
+srcmodule=$1
+srcdir=$2
+srcfiles=$3
+
+set -ex
+rm -rf scan-build
+mkdir scan-build
+(cd $srcmodule touch $srcdir/$srcfiles)
+scan-build --use-cc=clang --use-c++=clang++ -o $(pwd)/scan-build make
$srcmodule
+}
+
+parallelism=$(make -s cmd cmd='echo $(PARALLELISM)'|tail -n 1)
+
+case $1 in
+sw_docxexport)
+# Writer DOCX export
+scan sw source/filter/ww8 'docx*'
+;;
+sw_rtfimport)
+# Writer RTF import
+scan writerfilter source/rtftok '*'
+;;
+sw_rtfpaste)
+# Writer RTF paste
+scan sw source/filter/rtf '*'
+;;
+sw_rtfexport)
+# Writer RTF export
+scan sw source/filter/ww8 'rtf*'
+;;
+*)
+echo Unknown code area. The currently supported ones are:
+echo
+echo sw_docxexport
+echo sw_rtfexport
+echo sw_rtfimport
+echo sw_rtfpaste
+;;
+esac
+
+# vi:set shiftwidth=4 expandtab:
___
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/layout/paintfrm.cxx | 183 -
1 file changed, 99 insertions(+), 84 deletions(-)
New commits:
commit cccf054a4353d1efdb8318e8dbed73de6d9c3d70
Author: Michaël Lefèvre lefevr...@yahoo.fr
Date: Mon Nov 24 11:07:32 2014 +0100
Use parameters instead of static access when possible
Change-Id: I36ef1f24567b9e561f2bd5e981cbd60dba1343d1
Reviewed-on: https://gerrit.libreoffice.org/13103
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 92a1153..9ace578 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -224,12 +224,10 @@ public:
}
};
-// Current zoom factor
+// Default zoom factor
const static double aMinDistScale = 0.73;
const static double aEdgeScale = 0.5;
-//static SwSubsRects *gProp.pSSubsLines = 0;
-
//To optimize the expensive RetouchColor determination
Color aGlobalRetoucheColor;
@@ -386,7 +384,7 @@ void SwCalcPixStatics( OutputDevice *pOut )
}
/**
- * To be able to save the statics so the paint is more or lees reentrant
+ * To be able to save the statics so the paint is more or less reentrant
*/
class SwSavePaintStatics : public SwPaintProperties
{
@@ -443,8 +441,8 @@ SwSavePaintStatics::~SwSavePaintStatics()
gProp.pSFlyMetafileOut= pSFlyMetafileOut;
gProp.pSRetoucheFly = pSRetoucheFly;
gProp.pSRetoucheFly2 = pSRetoucheFly2;
-gProp.pSFlyOnlyDraw = pSFlyOnlyDraw;
-gProp.pBLines = pBLines;
+gProp.pSFlyOnlyDraw = pSFlyOnlyDraw;
+gProp.pBLines = pBLines;
gProp.pSLines = pSLines;
gProp.pSSubsLines = pSSubsLines;
gProp.pSSpecSubsLines = pSSpecSubsLines;
@@ -455,9 +453,9 @@ SwSavePaintStatics::~SwSavePaintStatics()
gProp.nSHalfPixelSzH = nSHalfPixelSzH;
gProp.nSMinDistPixelW = nSMinDistPixelW;
gProp.nSMinDistPixelH = nSMinDistPixelH;
-aGlobalRetoucheColor = aSGlobalRetoucheColor;
-gProp.aSScaleX = aSScaleX;
-gProp.aSScaleY = aSScaleY;
+aGlobalRetoucheColor = aSGlobalRetoucheColor;
+gProp.aSScaleX= aSScaleX;
+gProp.aSScaleY= aSScaleY;
}
/**
@@ -471,9 +469,10 @@ SwSavePaintStatics::~SwSavePaintStatics()
**/
static sal_uInt8 lcl_TryMergeLines(
pairdouble, double const mergeA,
-pairdouble, double const mergeB)
+pairdouble, double const mergeB,
+SwPaintProperties *properties)
{
-double const fMergeGap(gProp.nSPixelSzW + gProp.nSHalfPixelSzW); // NOT
static!
+double const fMergeGap(properties-nSPixelSzW +
properties-nSHalfPixelSzW); // NOT static!
// A is above/before B
if( mergeA.second = mergeB.second
mergeA.second + fMergeGap = mergeB.first )
@@ -528,7 +527,8 @@ lcl_MergeBorderLines(
**/
static ::rtl::ReferenceBorderLinePrimitive2D
lcl_TryMergeBorderLine(BorderLinePrimitive2D const rThis,
- BorderLinePrimitive2D const rOther)
+ BorderLinePrimitive2D const rOther,
+ SwPaintProperties *properties)
{
assert(rThis.getEnd().getX() = rThis.getStart().getX());
assert(rThis.getEnd().getY() = rThis.getStart().getY());
@@ -558,7 +558,8 @@ lcl_TryMergeBorderLine(BorderLinePrimitive2D const rThis,
assert(rThis.getEnd().getX() == rOther.getEnd().getX());
nRet = lcl_TryMergeLines(
make_pair(rThis.getStart().getY(), rThis.getEnd().getY()),
-
make_pair(rOther.getStart().getY(),rOther.getEnd().getY()));
+make_pair(rOther.getStart().getY(),rOther.getEnd().getY()),
+properties);
}
}
else // horizontal line
@@ -568,7 +569,8 @@ lcl_TryMergeBorderLine(BorderLinePrimitive2D const rThis,
assert(rThis.getEnd().getY() == rOther.getEnd().getY());
nRet = lcl_TryMergeLines(
make_pair(rThis.getStart().getX(), rThis.getEnd().getX()),
-
make_pair(rOther.getStart().getX(),rOther.getEnd().getX()));
+make_pair(rOther.getStart().getX(),rOther.getEnd().getX()),
+properties);
}
}
@@ -601,7 +603,7 @@ void BorderLines::AddBorderLine(
++it)
{
::rtl::ReferenceBorderLinePrimitive2D const xMerged =
-lcl_TryMergeBorderLine(**it, *xLine);
+lcl_TryMergeBorderLine(**it, *xLine, gProp);
if (xMerged.is())
{
*it = xMerged; // replace existing line with merged
@@ -1377,35 +1379,35 @@ void SwAlignGrfRect( SwRect *pGrfRect, const
OutputDevice rOut )
pGrfRect-SSize( rOut.PixelToLogic( aPxRect.GetSize() ) );
}
-static long lcl_AlignWidth( const long nWidth )
+static long lcl_AlignWidth( const long nWidth,
[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl2' - vcl/win
vcl/win/source/gdi/salgdi.cxx|2 +- vcl/win/source/gdi/salnativewidgets-luna.cxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit d45409468b98ada43c0536fc1b0ba5e221d5b9bf Author: Jan Holesovsky ke...@collabora.com Date: Tue Nov 25 18:03:12 2014 +0100 windows opengl: Transparency of the native widgets. Change-Id: Ifa6ba5735582effc27ac68556c2367077705d1d6 diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx index 7161dab..4c36bb3 100644 --- a/vcl/win/source/gdi/salgdi.cxx +++ b/vcl/win/source/gdi/salgdi.cxx @@ -610,7 +610,7 @@ OpenGLTexture* OpenGLCompatibleDC::getTexture() return NULL; // turn what's in the mpData into a texture -return new OpenGLTexture(maRects.mnSrcWidth, maRects.mnSrcHeight, GL_RGBA, GL_UNSIGNED_BYTE, reinterpret_castsal_uInt8*(mpData)); +return new OpenGLTexture(maRects.mnSrcWidth, maRects.mnSrcHeight, GL_BGRA, GL_UNSIGNED_BYTE, reinterpret_castsal_uInt8*(mpData)); } WinSalGraphics::WinSalGraphics(WinSalGraphics::Type eType, bool bScreen, HWND hWnd): diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx index 0789d4c..539af04 100644 --- a/vcl/win/source/gdi/salnativewidgets-luna.cxx +++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx @@ -1297,7 +1297,7 @@ bool WinSalGraphics::drawNativeControl( ControlType nType, return false; pImpl-PreDraw(); -pImpl-DrawTexture(*pBlackTexture, aBlackDC.getTwoRect()); // FIXME combine the textures - DrawTextureSynthesizedAlpha() +pImpl-DrawTextureDiff(*pWhiteTexture, *pBlackTexture, aBlackDC.getTwoRect()); pImpl-PostDraw(); bOk = true; ___ 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/vcldemo.cxx | 112 +---
1 file changed, 107 insertions(+), 5 deletions(-)
New commits:
commit 54d9755ab4a0825d35e605b47376e01b72d1a57c
Author: László Németh nem...@collabora.com
Date: Tue Nov 25 18:03:08 2014 +0100
add profiling to vcldemo
usage (5 test runs): vcldemo --test 5
Change-Id: Ib8c3db1e74f4a05f16a5359fe8645ffc61e891d5
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 01ad9c9d..51474bc 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -33,9 +33,24 @@
#include vcldemo-debug.hxx
+#include rtl/math.hxx
+
#define FIXME_SELF_INTERSECTING_WORKING 0
#define FIXME_BOUNCE_BUTTON 0
+using namespace com::sun::star;
+
+namespace {
+double getTimeNow()
+{
+TimeValue aValue;
+osl_getSystemTime(aValue);
+return (double)aValue.Seconds * 1000 +
+(double)aValue.Nanosec / (1000*1000);
+}
+
+}
+
using namespace css;
enum RenderStyle {
@@ -69,10 +84,14 @@ class DemoRenderer
{ return OUString(SAL_STRINGIFY(name)); } \
virtual sal_uInt16 getAccelerator() SAL_OVERRIDE \
{ return key; }
+
+double sumTime = 0;
+int countTime = 0;
};
std::vector RegionRenderer * maRenderers;
sal_Int32 mnSelectedRenderer;
+sal_Int32 iterCount = 0;
void InitRenderers();
@@ -97,7 +116,12 @@ public:
}
OUString getRendererList();
+double getAndResetBenchmark(const char * st);
void selectRenderer(const OUString rName);
+int selectNextRenderer();
+void setIterCount(sal_Int32 iterCount);
+sal_Int32 getIterCount();
+void addTime(int i, double t);
Size maSize;
void SetSizePixel(const Size rSize) { maSize = rSize; }
@@ -883,10 +907,10 @@ public:
void drawToDevice(OutputDevice rDev, Size aSize, bool bVDev)
{
RenderContext aCtx;
+double mnStartTime;
aCtx.mbVDev = bVDev;
aCtx.mpDemoRenderer = this;
aCtx.maSize = aSize;
-
Rectangle aWholeWin(Point(0,0), rDev.GetOutputSizePixel());
drawBackground(rDev, aWholeWin);
@@ -895,7 +919,9 @@ public:
mnSelectedRenderer = 0)
{
aCtx.meStyle = RENDER_EXPANDED;
+mnStartTime = getTimeNow();
maRenderers[mnSelectedRenderer]-RenderRegion(rDev, aWholeWin,
aCtx);
+addTime(mnSelectedRenderer, getTimeNow() - mnStartTime);
}
else
{
@@ -903,7 +929,11 @@ public:
std::vectorRectangle aRegions(partition(aSize, mnSegmentsX,
mnSegmentsY));
DemoRenderer::clearRects(rDev, aRegions);
for (size_t i = 0; i maRenderers.size(); i++)
+{
+mnStartTime = getTimeNow();
maRenderers[i]-RenderRegion(rDev, aRegions[i], aCtx);
+if (!bVDev) addTime(i, getTimeNow() - mnStartTime);
+}
}
}
std::vectorvcl::Window * maInvalidates;
@@ -1055,6 +1085,41 @@ OUString DemoRenderer::getRendererList()
return aBuf.makeStringAndClear();
}
+double DemoRenderer::getAndResetBenchmark(const char * st)
+{
+double geomean = 1.0;
+fprintf(stderr, Rendering: %s, Times (ms):\n, st);
+for (size_t i = 0; i maRenderers.size(); i++)
+{
+double avgtime = maRenderers[i]-sumTime / maRenderers[i]-countTime;
+geomean *= avgtime;
+fprintf(stderr, %s: %f (IterCount: %d)\n,
+rtl::OUStringToOString(maRenderers[i]-getName(),
+RTL_TEXTENCODING_UTF8).getStr(), avgtime,
maRenderers[i]-countTime);
+maRenderers[i]-sumTime = 0;
+maRenderers[i]-countTime = 0;
+}
+geomean = pow(geomean, static_castdouble(1.0)/maRenderers.size());
+fprintf(stderr, GEOMEAN_%s: %f\n, st, geomean);
+return geomean;
+}
+
+void DemoRenderer::setIterCount(sal_Int32 i)
+{
+iterCount = i;
+}
+
+sal_Int32 DemoRenderer::getIterCount()
+{
+return iterCount;
+}
+
+void DemoRenderer::addTime(int i, double t)
+{
+maRenderers[i]-sumTime += t;
+maRenderers[i]-countTime++;
+}
+
void DemoRenderer::selectRenderer(const OUString rName)
{
for (size_t i = 0; i maRenderers.size(); i++)
@@ -1068,6 +1133,15 @@ void DemoRenderer::selectRenderer(const OUString rName)
}
}
+int DemoRenderer::selectNextRenderer()
+{
+mnSelectedRenderer++;
+if (mnSelectedRenderer == (signed) maRenderers.size())
+mnSelectedRenderer = -1;
+Invalidate();
+return mnSelectedRenderer;
+}
+
class DemoWin : public WorkWindow
{
DemoRenderer mrRenderer;
@@ -1101,7 +1175,27 @@ public:
{
mrRenderer.SetSizePixel(GetSizePixel());
fprintf(stderr, DemoWin::Paint(%ld,%ld,%ld,%ld)\n, rRect.getX(),
rRect.getY(), rRect.getWidth(), rRect.getHeight());
-mrRenderer.drawToDevice(*this, GetSizePixel(), false);
+if
[Libreoffice-commits] core.git: 7 commits - include/svx svx/source sw/source vcl/source xmloff/source
include/svx/rulritem.hxx | 10 +
svx/source/dialog/rulritem.cxx|5 +-
sw/source/core/layout/pagechg.cxx |2 -
vcl/source/outdev/map.cxx |2 +
xmloff/source/text/txtimp.cxx | 53 +---
xmloff/source/text/txtimppr.cxx | 71 --
xmloff/source/text/txtlists.cxx | 29 +--
7 files changed, 91 insertions(+), 81 deletions(-)
New commits:
commit 52ce5239b43bf6b9ce1ceddfe90227920aa57657
Author: Michael Stahl mst...@redhat.com
Date: Tue Nov 25 16:42:49 2014 +0100
vcl: assert when LogicToPixel overflows
Change-Id: I86d1c3e0c177c671b280c05b47312c79389884ed
diff --git a/sw/source/core/layout/pagechg.cxx
b/sw/source/core/layout/pagechg.cxx
index f042168..43ed48e 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -2177,7 +2177,7 @@ void SwRootFrm::CheckViewLayout( const SwViewOption*
pViewOpt, const SwRect* pVi
pSh-SetFirstVisPageInvalid();
if (bOldCallbackActionEnabled)
{
-pSh-InvalidateWindows( SwRect( 0, 0, LONG_MAX, LONG_MAX ) );
+pSh-InvalidateWindows( SwRect( 0, 0, INT_MAX, INT_MAX ) );
pSh-GetDoc()-GetDocShell()-Broadcast(SfxSimpleHint(SFX_HINT_DOCCHANGED));
}
}
diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx
index b8bc6c5..5117471 100644
--- a/vcl/source/outdev/map.cxx
+++ b/vcl/source/outdev/map.cxx
@@ -381,6 +381,8 @@ static long ImplLogicToPixel( long n, long nDPI, long
nMapNum, long nMapDenom,
}
}
else
+#else
+assert(n std::numeric_limitslong::max() / nMapNum); //detect overflows
#endif
{
sal_Int64 n64 = n;
commit d288ee633d7964cf89a32a96e6e0af8c3c3e0db9
Author: Michael Stahl mst...@redhat.com
Date: Tue Nov 25 16:36:45 2014 +0100
fdo#85858: svx: fix mouse dragging of table row separators in Writer
Add a work-around for Writer's usage of LONG_MAX to SvxColumnDescription:
on 64-bit platforms the LONG_MAX added in SwView::StateTabWin() for
SID_RULER_ROWS will overflow in vcl's LogicToPixel mapping and that
causes wrong positioning of the row highlight lines.
Probably Writer should use something other than LONG_MAX (no reason why
these types need to be bigger than 32-bit anyway) but that needs a
bigger cleanup.
(regression from 4c60f722afdc0be5c129ce5f5ed6786d09d0051e)
Change-Id: I08147462356368d48959a85a85ef7dd8dcae0943
diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx
index 11efac1..f993d69 100644
--- a/svx/source/dialog/rulritem.cxx
+++ b/svx/source/dialog/rulritem.cxx
@@ -670,8 +670,9 @@ SvxColumnDescription::SvxColumnDescription(long start, long
end, long endMin, lo
nStart (start),
nEnd (end),
bVisible (bVis),
-nEndMin (endMin),
-nEndMax (endMax)
+// fdo#85858 hack: clamp these to smaller value to prevent overflow
+nEndMin(std::minlong(endMin, std::numeric_limitsunsigned
short::max())),
+nEndMax(std::minlong(endMax, std::numeric_limitsunsigned short::max()))
{}
bool SvxColumnDescription::operator==(const SvxColumnDescription rCmp) const
commit 19576d843af13df618bad500d2e92cf9bca0a062
Author: Michael Stahl mst...@redhat.com
Date: Tue Nov 25 15:14:22 2014 +0100
svx: add debug printing of SvxColumnDescription
Change-Id: I009e3a506d9b3418215341cb7f3e232e7fcfa04b
diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx
index 9671f85..a114e2a 100644
--- a/include/svx/rulritem.hxx
+++ b/include/svx/rulritem.hxx
@@ -146,6 +146,16 @@ struct SVX_DLLPUBLIC SvxColumnDescription
long GetWidth() const;
};
+templatetypename charT, typename traits
+inline std::basic_ostreamcharT, traits operator (
+std::basic_ostreamcharT, traits stream, SvxColumnDescription const
dsc)
+{
+return stream { nStart dsc.nStart nEnd dsc.nEnd
+ bVisible dsc.bVisiblenEndMin dsc.nEndMin
+ nEndMax dsc.nEndMax };
+}
+
+
class SVX_DLLPUBLIC SvxColumnItem : public SfxPoolItem
{
typedef std::vectorSvxColumnDescription SvxColumnDescriptionVector;
commit 501ae485c7c5f7629f190755f8d1537cfe5a3d4d
Author: Michael Stahl mst...@redhat.com
Date: Tue Nov 25 14:49:20 2014 +0100
xmloff: clean up some debug printfs
Change-Id: I208bbe47d1134b6a362e50d54093e6d35e85f51b
diff --git a/xmloff/source/text/txtlists.cxx b/xmloff/source/text/txtlists.cxx
index 912c9a5..2343364 100644
--- a/xmloff/source/text/txtlists.cxx
+++ b/xmloff/source/text/txtlists.cxx
@@ -76,7 +76,6 @@ XMLTextListsHelper::~XMLTextListsHelper()
void XMLTextListsHelper::PushListContext(
XMLTextListBlockContext *i_pListBlock)
{
-//fprintf(stderr, PushListContext\n);
mListStack.push(::boost::make_tuple(i_pListBlock,
static_castXMLTextListItemContext*(0),
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 2 commits - include/svx svx/source
include/svx/rulritem.hxx | 10 ++
svx/source/dialog/rulritem.cxx |5 +++--
2 files changed, 13 insertions(+), 2 deletions(-)
New commits:
commit 74b5a0e2c4f54f97bbbc53170fa9bfc033261f58
Author: Michael Stahl mst...@redhat.com
Date: Tue Nov 25 15:14:22 2014 +0100
svx: add debug printing of SvxColumnDescription
Change-Id: I009e3a506d9b3418215341cb7f3e232e7fcfa04b
(cherry picked from commit 19576d843af13df618bad500d2e92cf9bca0a062)
diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx
index 9671f85..a114e2a 100644
--- a/include/svx/rulritem.hxx
+++ b/include/svx/rulritem.hxx
@@ -146,6 +146,16 @@ struct SVX_DLLPUBLIC SvxColumnDescription
long GetWidth() const;
};
+templatetypename charT, typename traits
+inline std::basic_ostreamcharT, traits operator (
+std::basic_ostreamcharT, traits stream, SvxColumnDescription const
dsc)
+{
+return stream { nStart dsc.nStart nEnd dsc.nEnd
+ bVisible dsc.bVisiblenEndMin dsc.nEndMin
+ nEndMax dsc.nEndMax };
+}
+
+
class SVX_DLLPUBLIC SvxColumnItem : public SfxPoolItem
{
typedef std::vectorSvxColumnDescription SvxColumnDescriptionVector;
commit a6b8f5a4541f2dc6375c0c449b9bc83235ed4193
Author: Michael Stahl mst...@redhat.com
Date: Tue Nov 25 16:36:45 2014 +0100
fdo#85858: svx: fix mouse dragging of table row separators in Writer
Add a work-around for Writer's usage of LONG_MAX to SvxColumnDescription:
on 64-bit platforms the LONG_MAX added in SwView::StateTabWin() for
SID_RULER_ROWS will overflow in vcl's LogicToPixel mapping and that
causes wrong positioning of the row highlight lines.
Probably Writer should use something other than LONG_MAX (no reason why
these types need to be bigger than 32-bit anyway) but that needs a
bigger cleanup.
(regression from 4c60f722afdc0be5c129ce5f5ed6786d09d0051e)
Change-Id: I08147462356368d48959a85a85ef7dd8dcae0943
(cherry picked from commit d288ee633d7964cf89a32a96e6e0af8c3c3e0db9)
diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx
index 11efac1..f993d69 100644
--- a/svx/source/dialog/rulritem.cxx
+++ b/svx/source/dialog/rulritem.cxx
@@ -670,8 +670,9 @@ SvxColumnDescription::SvxColumnDescription(long start, long
end, long endMin, lo
nStart (start),
nEnd (end),
bVisible (bVis),
-nEndMin (endMin),
-nEndMax (endMax)
+// fdo#85858 hack: clamp these to smaller value to prevent overflow
+nEndMin(std::minlong(endMin, std::numeric_limitsunsigned
short::max())),
+nEndMax(std::minlong(endMax, std::numeric_limitsunsigned short::max()))
{}
bool SvxColumnDescription::operator==(const SvxColumnDescription rCmp) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Crash test update
New crashtest update available at http://dev-builds.libreoffice.org/crashtest/2052ea7439790d9bb5ae5b08fda3874f74700594/ exportCrashes.csv Description: Binary data importCrash.csv Description: Binary data validationErrors.csv Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 79641] LibreOffice 4.4 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=79641 --- Comment #16 from vlb v...@xs4all.nl --- Add bug 86572: Critical regression automatic recalculation formulas and graphics -- 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 --- Comment #82 from vlb v...@xs4all.nl --- Add bug 86321: Graphic didn't automatic update when change variabele (recalculation not triggered). -- 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: sc/source
sc/source/ui/undo/undosort.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 5cec4ea827570a5bb0a368025f3733b841107d07 Author: Eike Rathke er...@redhat.com Date: Tue Nov 25 19:02:08 2014 +0100 fdo#86708 paint after Undo of Sort Regression of 10fc138307afb4b39baddb0d56eb8e986e5d29ea that exchanged the PostPaint with SetDirty, but the paint is also needed. Change-Id: Ic3e81fa106f405568effaed71ab33b575b4c5c5c diff --git a/sc/source/ui/undo/undosort.cxx b/sc/source/ui/undo/undosort.cxx index ead54d4..a4bd1af 100644 --- a/sc/source/ui/undo/undosort.cxx +++ b/sc/source/ui/undo/undosort.cxx @@ -49,6 +49,9 @@ void UndoSort::Execute( bool bUndo ) rDoc.SetDirty(maParam.maSortRange); if (!aParam.mbUpdateRefs) rDoc.BroadcastCells(aParam.maSortRange, SC_HINT_DATACHANGED); + +pDocShell-PostPaint(maParam.maSortRange, PAINT_GRID); +pDocShell-PostDataChanged(); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - configure.ac download.lst external/clcc external/Module_external.mk Makefile.fetch RepositoryExternal.mk Repository.mk sc/CppunitTest_sc_opencl_test.mk sc/C
Makefile.fetch |1
Repository.mk |1
RepositoryExternal.mk | 11
configure.ac|1
download.lst|2
external/Module_external.mk |1
external/clcc/Library_clew.mk | 35
external/clcc/Makefile |7
external/clcc/Module_clcc.mk| 17
external/clcc/UnpackedTarball_clcc.mk | 25
external/clcc/clew-non-static.patch | 52
sc/CppunitTest_sc_opencl_test.mk|7
sc/CppunitTest_sc_ucalc.mk |8
sc/Library_sc.mk| 15
sc/source/core/inc/clcc/clew.h | 1316
sc/source/core/inc/openclwrapper.hxx|2
sc/source/core/opencl/clcc/clew.cxx | 324 -
sc/source/core/opencl/opbase.hxx|2
sc/source/core/opencl/opencl_device_selection.h |2
vcl/workben/vcldemo.cxx | 11
20 files changed, 166 insertions(+), 1674 deletions(-)
New commits:
commit 4ccf97ee849c94ea4d941f332dd3f93701d8abf7
Author: Tor Lillqvist t...@collabora.com
Date: Tue Nov 25 20:05:32 2014 +0200
Fix C2864: only static const integral data members can be initialized within
Change-Id: I01f66eb78e357780f35cfd1df6722301cc5753b2
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 51474bc..706daf5 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -74,6 +74,10 @@ class DemoRenderer
};
struct RegionRenderer {
public:
+RegionRenderer() :
+sumTime(0),
+countTime(0)
+{ }
virtual ~RegionRenderer() {}
virtual OUString getName() = 0;
virtual sal_uInt16 getAccelerator() = 0;
@@ -85,13 +89,13 @@ class DemoRenderer
virtual sal_uInt16 getAccelerator() SAL_OVERRIDE \
{ return key; }
-double sumTime = 0;
-int countTime = 0;
+double sumTime;
+int countTime;
};
std::vector RegionRenderer * maRenderers;
sal_Int32 mnSelectedRenderer;
-sal_Int32 iterCount = 0;
+sal_Int32 iterCount;
void InitRenderers();
@@ -99,6 +103,7 @@ public:
DemoRenderer() : mnSegmentsX(4)
, mnSegmentsY(3)
, mnSelectedRenderer(-1)
+ , iterCount(0)
#if FIXME_BOUNCE_BUTTON
, mpButton(NULL)
, mpButtonWin(NULL)
commit a7a79ee92d5663248abdc3f6d1476e28c1abda6a
Author: Tor Lillqvist t...@collabora.com
Date: Tue Nov 25 13:29:44 2014 +0200
Move clew into a library of its own
Change-Id: Ifb7e86b078bd549506a9cc1b9ce9fc22fffc5eec
diff --git a/Makefile.fetch b/Makefile.fetch
index 7aee66a..84e5f80 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -115,6 +115,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk
$(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,CAIRO,CAIRO_TARBALL) \
$(call fetch_Optional,CAIRO,PIXMAN_TARBALL) \
$(call fetch_Optional,CDR,CDR_TARBALL) \
+ $(call fetch_Optional,CLCC,CLCC_TARBALL) \
$(call fetch_Optional,CLUCENE,CLUCENE_TARBALL) \
$(call fetch_Optional,CMIS,CMIS_TARBALL) \
$(call fetch_Optional,COINMP,COINMP_TARBALL) \
diff --git a/Repository.mk b/Repository.mk
index 0e0dffc..9078590 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -316,6 +316,7 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
chartcore \
chartcontroller \
chartopengl \
+ $(call gb_Helper_optional,CLCC,clew) \
$(if $(filter $(OS),WNT),,cmdmail) \
cppcanvas \
configmgr \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 47f6e90..fb3a1a4 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -279,6 +279,17 @@ endef
endif # SYSTEM_GLEW
+define gb_LinkTarget__use_clew
+$(call gb_LinkTarget_set_include,$(1),\
+ -I$(call gb_UnpackedTarball_get_dir,clcc)/src \
+ $$(INCLUDE) \
+)
+$(call gb_LinkTarget_use_libraries,$(1),\
+ clew \
+)
+
+endef
+
define gb_LinkTarget__use_iconv
$(call gb_LinkTarget_add_libs,$(1),-liconv)
diff --git a/configure.ac b/configure.ac
index 7f1e4b0..92a2d1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10264,6 +10264,7 @@ dnl =
ENABLE_OPENCL=
if test $_os != iOS -a $_os != Android; then
ENABLE_OPENCL=TRUE
+BUILD_TYPE=$BUILD_TYPE CLCC
AC_DEFINE(HAVE_FEATURE_OPENCL)
fi
AC_SUBST(ENABLE_OPENCL)
diff --git a/download.lst b/download.lst
index cf66c2b..fd8197af 100644
--- a/download.lst
+++ b/download.lst
@@ -20,6 +20,8 @@ export BSH_TARBALL :=
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sc/source
sc/source/ui/undo/undosort.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit fd8cf1f9c666203524a8d6af9c00ff569548f8e3 Author: Eike Rathke er...@redhat.com Date: Tue Nov 25 19:02:08 2014 +0100 fdo#86708 paint after Undo of Sort Regression of 10fc138307afb4b39baddb0d56eb8e986e5d29ea that exchanged the PostPaint with SetDirty, but the paint is also needed. Change-Id: Ic3e81fa106f405568effaed71ab33b575b4c5c5c (cherry picked from commit 5cec4ea827570a5bb0a368025f3733b841107d07) diff --git a/sc/source/ui/undo/undosort.cxx b/sc/source/ui/undo/undosort.cxx index ead54d4..a4bd1af 100644 --- a/sc/source/ui/undo/undosort.cxx +++ b/sc/source/ui/undo/undosort.cxx @@ -49,6 +49,9 @@ void UndoSort::Execute( bool bUndo ) rDoc.SetDirty(maParam.maSortRange); if (!aParam.mbUpdateRefs) rDoc.BroadcastCells(aParam.maSortRange, SC_HINT_DATACHANGED); + +pDocShell-PostPaint(maParam.maSortRange, PAINT_GRID); +pDocShell-PostDataChanged(); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/Library_sc.mk
sc/Library_sc.mk |6 ++ 1 file changed, 6 insertions(+) New commits: commit fc67c701373fe8c12126a5e63923ccb7b3c70fa2 Author: Tor Lillqvist t...@collabora.com Date: Tue Nov 25 20:26:48 2014 +0200 Need -lrt for clock_gettime() with older glibc versions Change-Id: Id134b05de3a81dd246baf8743c32fa8eb1e37935 diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index e17b4ca..a3373b0 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -676,6 +676,12 @@ $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/core/opencl/op_spreadsheet \ )) +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_libs,sc,\ +-lrt \ +)) +endif + endif $(eval $(call gb_SdiTarget_SdiTarget,sc/sdi/scslots,sc/sdi/scalc)) ___ 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/vcldemo.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2e2a2daf660e84d85aa4aab18085b41da0476521
Author: László Németh nem...@collabora.com
Date: Tue Nov 25 19:21:42 2014 +0100
vcldemo profiling: avoid unnecessary calls
Change-Id: Ic7ecfe85826d9148d14fce14e9de3f80a11eb775
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 706daf5..282e61c 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -935,7 +935,7 @@ public:
DemoRenderer::clearRects(rDev, aRegions);
for (size_t i = 0; i maRenderers.size(); i++)
{
-mnStartTime = getTimeNow();
+if (!bVDev) mnStartTime = getTimeNow();
maRenderers[i]-RenderRegion(rDev, aRegions[i], aCtx);
if (!bVDev) addTime(i, getTimeNow() - mnStartTime);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] mso-dumper.git: 2 commits - Makefile msodumper/docdirstream.py msodumper/vsdstream.py vsd-dump.py
Makefile |1
msodumper/docdirstream.py |2
msodumper/vsdstream.py| 286 ++
vsd-dump.py | 44 +++
4 files changed, 332 insertions(+), 1 deletion(-)
New commits:
commit e13cb64ab62501dbcd0dec98f042f46dd702bf56
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Nov 25 19:27:36 2014 +0100
Add initial SummaryInformation dumper
diff --git a/Makefile b/Makefile
index 1aa9120..47b42c9 100644
--- a/Makefile
+++ b/Makefile
@@ -2,3 +2,4 @@ check:
cd test/doc ./test.py
pep8 --ignore=E501 doc-dump.py
msodumper/doc{dirstream,record,sprm,stream}.py test/doc/test.py
pep8 --ignore=E501 emf-dump.py msodumper/{emf,wmf}record.py
+ pep8 --ignore=E501 vsd-dump.py msodumper/vsdstream.py
diff --git a/msodumper/vsdstream.py b/msodumper/vsdstream.py
new file mode 100644
index 000..36c279a
--- /dev/null
+++ b/msodumper/vsdstream.py
@@ -0,0 +1,286 @@
+#!/usr/bin/env python2
+#
+# 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/.
+#
+
+import ole
+import ctypes
+import struct
+from docdirstream import DOCDirStream
+import docrecord
+import globals
+import sys
+import os
+import bisect
+
+
+class VSDFile:
+Represents the whole visio file - feed will all bytes.
+def __init__(self, chars, params):
+self.chars = chars
+self.size = len(self.chars)
+self.params = params
+self.error = None
+
+self.init()
+
+def init(self):
+self.header = ole.Header(self.chars, self.params)
+self.pos = self.header.parse()
+
+def __getDirectoryObj(self):
+obj = self.header.getDirectory()
+obj.parseDirEntries()
+return obj
+
+def getDirectoryNames(self):
+return self.__getDirectoryObj().getDirectoryNames()
+
+def getDirectoryStreamByName(self, name):
+obj = self.__getDirectoryObj()
+bytes = obj.getRawStreamByName(name)
+return self.getStreamFromBytes(name, bytes)
+
+def getStreamFromBytes(self, name, bytes):
+if name == \x05SummaryInformation:
+return SummaryInformationStream(bytes, self.params, doc=self)
+else:
+return DOCDirStream(bytes, self.params, name, doc=self)
+
+def getName(self):
+return native
+
+
+class GsfVSDFile(VSDFile):
+Same as VSDFile, but uses gsf to read the OLE streams.
+def __init__(self, chars, params, gsf):
+self.gsf = gsf
+VSDFile.__init__(self, chars, params)
+
+def disableStderr(self):
+nil = os.open(os.devnull, os.O_WRONLY)
+self.savedStderr = os.dup(2)
+os.dup2(nil, 2)
+
+def enableStderr(self):
+os.dup2(self.savedStderr, 2)
+
+def init(self):
+self.streams = {}
+self.gsf.gsf_init()
+gsfInput = self.gsf.gsf_input_memory_new(self.chars, len(self.chars),
False)
+self.disableStderr()
+gsfInfile = self.gsf.gsf_infile_msole_new(gsfInput, None)
+self.enableStderr()
+if not gsfInfile:
+self.error = gsf_infile_msole_new() failed
+return
+for i in range(self.gsf.gsf_infile_num_children(gsfInfile)):
+child = self.gsf.gsf_infile_child_by_index(gsfInfile, i)
+childName =
ctypes.string_at(self.gsf.gsf_infile_name_by_index(gsfInfile, i))
+childSize = self.gsf.gsf_input_size(child)
+childData =
+while True:
+bufSize = 1024
+pos = self.gsf.gsf_input_tell(child)
+if pos == childSize:
+break
+elif pos + bufSize childSize:
+bufSize = childSize - pos
+childData += ctypes.string_at(self.gsf.gsf_input_read(child,
bufSize, None), bufSize)
+self.streams[childName] = childData
+self.gsf.gsf_shutdown()
+
+def getDirectoryNames(self):
+return self.streams.keys()
+
+def getDirectoryStreamByName(self, name):
+return self.getStreamFromBytes(name, self.streams[name])
+
+def getName(self):
+return gsf
+
+
+def createVSDFile(chars, params):
+hasGsf = True
+try:
+gsf = ctypes.cdll.LoadLibrary('libgsf-1.so')
+gsf.gsf_input_read.restype = ctypes.c_void_p
+except:
+hasGsf = False
+
+if hasGsf:
+return GsfVSDFile(chars, params, gsf)
+else:
+return VSDFile(chars, params)
+
+
+class SummaryInformationStream(DOCDirStream):
+def __init__(self, bytes, params, doc):
+DOCDirStream.__init__(self, bytes, params, \x05SummaryInformation,
doc=doc)
+
+def dump(self):
+print 'stream name=\\x05SummaryInformation size=%d' % self.size
+PropertySetStream(self).dump()
+print '/stream'
+
+
+class
[Libreoffice-commits] core.git: sc/CppunitTest_sc_ucalc.mk
sc/CppunitTest_sc_ucalc.mk |6 ++ 1 file changed, 6 insertions(+) New commits: commit e7ac7ba7de64068f0264b71bc4d9ff182e278338 Author: Tor Lillqvist t...@collabora.com Date: Tue Nov 25 20:47:13 2014 +0200 Need -lrt for clock_gettime() with older glibc versions Change-Id: I6ccd990ba71867f0ff96ad06cf5a9e7c98c93657 diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk index ead35fa..86795e8 100644 --- a/sc/CppunitTest_sc_ucalc.mk +++ b/sc/CppunitTest_sc_ucalc.mk @@ -106,6 +106,12 @@ $(eval $(call gb_CppunitTest_use_components,sc_ucalc,\ uui/util/uui \ )) +ifeq ($(OS),LINUX) +$(eval $(call gb_CppunitTest_add_libs,sc_ucalc,\ + -lrt \ +)) +endif + $(eval $(call gb_CppunitTest_use_configuration,sc_ucalc)) # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc
sw/inc/cellatr.hxx |2 +-
sw/inc/doc.hxx |4 ++--
sw/inc/docsh.hxx|2 +-
sw/inc/editsh.hxx |4 ++--
sw/inc/fldbas.hxx |2 +-
sw/inc/frmfmt.hxx |6 +++---
sw/inc/node.hxx |6 +++---
sw/inc/swddetbl.hxx |2 +-
sw/inc/swtable.hxx |2 +-
sw/inc/viewsh.hxx |4 ++--
10 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit 8b33808a1127c4552735f7a618e9639c6d109686
Author: Tor Lillqvist t...@collabora.com
Date: Tue Nov 25 20:54:35 2014 +0200
Revert loplugin: cstylecast
The change was broken. Luckily MSVC noticed: sw\inc\doc.hxx(1707) :
warning C4717: 'SwDoc::GetNumberFormatter' : recursive on all control
paths, function will cause runtime stack overflow.
This reverts commit 7ca3303aaadd20dcc1d6e08bdeba38021cbec4bb.
diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx
index 70cfbcc..b343a8b 100644
--- a/sw/inc/cellatr.hxx
+++ b/sw/inc/cellatr.hxx
@@ -71,7 +71,7 @@ public:
SwTableBox* GetTableBox();
const SwTableBox* GetTableBox() const
-{ return const_castSwTblBoxFormula*(this)-GetTableBox(); }
+{ return ((SwTblBoxFormula*)this)-GetTableBox(); }
void ChangeState( const SfxPoolItem* pItem );
void Calc( SwTblCalcPara rCalcPara, double rValue );
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index ffb23e6..a7b8829 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1691,7 +1691,7 @@ void ClrContourCache();
inline const SwTableNode* SwDoc::IsIdxInTbl( const SwNodeIndex rIdx ) const
{
-return static_castconst SwDoc*(this)-IsIdxInTbl( rIdx );
+return ((SwDoc*)this)-IsIdxInTbl( rIdx );
}
inline SvNumberFormatter* SwDoc::GetNumberFormatter( bool bCreate )
@@ -1703,7 +1703,7 @@ inline SvNumberFormatter* SwDoc::GetNumberFormatter( bool
bCreate )
inline const SvNumberFormatter* SwDoc::GetNumberFormatter( bool bCreate ) const
{
-return static_castconst SwDoc*(this)-GetNumberFormatter( bCreate );
+return ((SwDoc*)this)-GetNumberFormatter( bCreate );
}
inline void SwDoc::SetOLEPrtNotifyPending( bool bSet )
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 2473d5e..53a801c2 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -222,7 +222,7 @@ public:
/// For Core - it knows the DocShell but not the WrtShell!
SwFEShell *GetFEShell();
const SwFEShell *GetFEShell() const
-{ return const_castSwDocShell*(this)-GetFEShell(); }
+{ return ((SwDocShell*)this)-GetFEShell(); }
/// For inserting document.
Reader* StartConvertFrom(SfxMedium rMedium, SwReader** ppRdr,
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index d0b7817..b59cc50 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -869,7 +869,7 @@ public:
/// Query NumberFormater from document.
SvNumberFormatter* GetNumberFormatter();
const SvNumberFormatter* GetNumberFormatter() const
-{ return const_castSwEditShell*(this)-GetNumberFormatter(); }
+{ return ((SwEditShell*)this)-GetNumberFormatter(); }
/// Interfaces for GlobalDocument.
bool IsGlobalDoc() const;
@@ -955,7 +955,7 @@ private:
};
inline const sfx2::LinkManager SwEditShell::GetLinkManager() const
-{ return const_castSwEditShell*(this)-GetLinkManager(); }
+{ return ((SwEditShell*)this)-GetLinkManager(); }
/// Class for automated call of Start- and EndAction().
class SwActContext {
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index da578a7..57780e9 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -272,7 +272,7 @@ public:
inline void SwFieldType::UpdateFlds() const
{
-const_castSwFieldType*(this)-ModifyNotification( 0, 0 );
+((SwFieldType*)this)-ModifyNotification( 0, 0 );
}
/** Base class of all fields.
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index 0650f44..e73f6bd 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -97,7 +97,7 @@ public:
The UserCall knows its SdrObject. */
SwContact *FindContactObj();
const SwContact *FindContactObj() const
-{ return const_castSwFrmFmt*(this)-FindContactObj(); }
+{ return ((SwFrmFmt*)this)-FindContactObj(); }
/** @return the SdrObject, that is connected to the ContactObject.
Only DrawFrmFmts are connected to the real SdrObject. FlyFrmFmts
@@ -105,11 +105,11 @@ public:
Real SdrObject has position and a Z-order. */
SdrObject *FindSdrObject();
const SdrObject *FindSdrObject() const
-{ return const_castSwFrmFmt*(this)-FindSdrObject(); }
+{ return ((SwFrmFmt*)this)-FindSdrObject(); }
SdrObject *FindRealSdrObject();
const SdrObject *FindRealSdrObject() const
-{ return const_castSwFrmFmt*(this)-FindRealSdrObject(); }
+{ return ((SwFrmFmt*)this)-FindRealSdrObject(); }
bool IsLowerOf( const SwFrmFmt rFmt ) const;
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 4cf51e2..a8c7f29
[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 See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=86696 -- 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 79641] LibreOffice 4.4 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=79641 tommy27 ba...@quipo.it changed: What|Removed |Added See Also|https://bugs.freedesktop.or | |g/show_bug.cgi?id=86696 | -- 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 79641] LibreOffice 4.4 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=79641 tommy27 ba...@quipo.it changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=86696 -- 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||64490 -- 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 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|64490 | -- 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: Branch 'libreoffice-4-3' - sc/source
sc/source/ui/undo/undosort.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit c633627500e408219bbd67639a27489b50d87386 Author: Eike Rathke er...@redhat.com Date: Tue Nov 25 19:02:08 2014 +0100 fdo#86708 paint after Undo of Sort Regression of 10fc138307afb4b39baddb0d56eb8e986e5d29ea that exchanged the PostPaint with SetDirty, but the paint is also needed. Change-Id: Ic3e81fa106f405568effaed71ab33b575b4c5c5c (cherry picked from commit 5cec4ea827570a5bb0a368025f3733b841107d07) Reviewed-on: https://gerrit.libreoffice.org/13122 Reviewed-by: Kohei Yoshida libreoff...@kohei.us Tested-by: Kohei Yoshida libreoff...@kohei.us diff --git a/sc/source/ui/undo/undosort.cxx b/sc/source/ui/undo/undosort.cxx index 4a00707..f86bdc2 100644 --- a/sc/source/ui/undo/undosort.cxx +++ b/sc/source/ui/undo/undosort.cxx @@ -49,6 +49,9 @@ void UndoSort::Execute( bool bUndo ) rDoc.SetDirty(maParam.maSortRange); if (!aParam.mbUpdateRefs) rDoc.BroadcastCells(aParam.maSortRange, SC_HINT_DATACHANGED); + +pDocShell-PostPaint(maParam.maSortRange, PAINT_GRID); +pDocShell-PostDataChanged(); } } ___ 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 - sc/qa vcl/source
sc/qa/unit/ucalc.hxx |1 +
sc/qa/unit/ucalc_sort.cxx | 13 -
vcl/source/gdi/pdfwriter_impl.cxx |2 +-
3 files changed, 14 insertions(+), 2 deletions(-)
New commits:
commit 62a0a299b3c96cb743059d357c51b9c82aa38b98
Author: Eike Rathke er...@redhat.com
Date: Tue Nov 25 02:22:16 2014 +0100
check that the fdo#79441 case works in both update references modes
Change-Id: I4aa997847661021af27f27e8763a89a61f185f1f
(cherry picked from commit fb2c3fec1b98b54f929d0cec64789b79306e03b1)
Reviewed-on: https://gerrit.libreoffice.org/13115
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index a1688f7..328dc59 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -352,6 +352,7 @@ public:
void testSortRefUpdate2();
void testSortRefUpdate3();
void testSortRefUpdate4();
+void testSortRefUpdate4_Impl();
void testSortRefUpdate5();
void testSortOutOfPlaceResult();
void testSortPartialFormulaGroup();
diff --git a/sc/qa/unit/ucalc_sort.cxx b/sc/qa/unit/ucalc_sort.cxx
index ce6b9b3..177ad89 100644
--- a/sc/qa/unit/ucalc_sort.cxx
+++ b/sc/qa/unit/ucalc_sort.cxx
@@ -1028,8 +1028,19 @@ void Test::testSortRefUpdate3()
// testRefInterne.ods
void Test::testSortRefUpdate4()
{
-SortRefUpdateSetter aUpdateSet;
+// This test has to work in both update reference modes.
+{
+SortRefNoUpdateSetter aUpdateSet;
+testSortRefUpdate4_Impl();
+}
+{
+SortRefUpdateSetter aUpdateSet;
+testSortRefUpdate4_Impl();
+}
+}
+void Test::testSortRefUpdate4_Impl()
+{
sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn auto calc on.
m_pDoc-InsertTab(0, Sort);
m_pDoc-InsertTab(1, Lesson1);
commit d10ae9cc61f2982efaa8d5135b719b3ea24a7640
Author: Caolán McNamara caol...@redhat.com
Date: Tue Nov 25 15:56:29 2014 +
Revert Resolves: #i63015# always default to WinAnsiEncoding...
Because under Linux use text
'
and font Nimbus Sans L
and export as pdf and the output is garbled
If we do want to stick WinAnsiEncoding here then we'll presumably have have
to
test that pEncoding actually matches WinAnsiEncoding and/or generate an
additional Encoding/Differences from WinAnsiEncoding for that font.
This reverts commit eea16cb3e65a4308caddb7618d31a76ca259dbb1.
(cherry picked from commit 297b22bd49ea11a90063ab8503fb83090f351668)
Change-Id: I9dd8de2a68ad276cce769545186d169160880e09
Reviewed-on: https://gerrit.libreoffice.org/13121
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx
b/vcl/source/gdi/pdfwriter_impl.cxx
index 5548629..2f44dd5 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -3491,7 +3491,7 @@ std::map sal_Int32, sal_Int32
PDFWriterImpl::emitEmbeddedFont( const Physical
/Type/Font/Subtype/Type1/BaseFont/ );
appendName( aInfo.m_aPSName, aLine );
aLine.append( \n );
-if( !pFont-IsSymbolFont() )
+if( !pFont-IsSymbolFont() pEncoding == 0 )
aLine.append( /Encoding/WinAnsiEncoding\n );
if( nToUnicodeStream )
{
___
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/inc sc/source
sc/inc/column.hxx | 12 +++-
sc/source/core/data/column4.cxx | 10 ++
sc/source/core/data/table3.cxx |3 ++-
3 files changed, 15 insertions(+), 10 deletions(-)
New commits:
commit d1d41626387391d72c0e495a43b6190e6d0fec02
Author: Eike Rathke er...@redhat.com
Date: Mon Nov 17 22:44:56 2014 +0100
fdo#83765 do not update references in SortReorderByColumn() if disabled
Similar to SortReorderByRow()
(cherry picked from commit 115a4b7ca36f65d93070d2e81048320d202e87a3)
Conflicts:
sc/inc/column.hxx
Change-Id: I39f8d62b79994196b9c5933355dbbc66a5f60a5d
Reviewed-on: https://gerrit.libreoffice.org/13113
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 8f8a93c..097c377 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -584,18 +584,20 @@ public:
/**
* Reset column position of formula cells within specified row range.
- * Reference positions are also adjusted to reflect the new position so
- * that the formula cells still reference the same cells or ranges after
- * the the position change. The position of a formula cell before the
- * call is interpreted as the old position of that cell.
+ * If bUpdateRefs==true then reference positions are also adjusted to
+ * reflect the new position so that the formula cells still reference the
+ * same cells or ranges after the the position change.
+ * The position of a formula cell before the call is interpreted as the old
+ * position of that cell.
*
* Caller needs to ensure that no formula groups cross the top and bottom
* row boundaries.
*
* @param nRow1 top row boundary
* @param nRow2 bottom row boundary
+ * @param bUpdateRefs whether to adjust references
*/
-void ResetFormulaCellPositions( SCROW nRow1, SCROW nRow2 );
+void ResetFormulaCellPositions( SCROW nRow1, SCROW nRow2, bool bUpdateRefs
);
void SplitFormulaGroupByRelativeRef( const ScRange rBoundRange );
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index 93fca48..c1cf89e 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -856,8 +856,9 @@ namespace {
class FormulaColPosSetter
{
SCCOL mnCol;
+bool mbUpdateRefs;
public:
-FormulaColPosSetter( SCCOL nCol ) : mnCol(nCol) {}
+FormulaColPosSetter( SCCOL nCol, bool bUpdateRefs ) : mnCol(nCol),
mbUpdateRefs(bUpdateRefs) {}
void operator() ( size_t nRow, ScFormulaCell* pCell )
{
@@ -868,7 +869,8 @@ public:
ScAddress aOldPos = pCell-aPos;
pCell-aPos.SetCol(mnCol);
pCell-aPos.SetRow(nRow);
-pCell-GetCode()-AdjustReferenceOnMovedOrigin(aOldPos,
pCell-aPos);
+if (mbUpdateRefs)
+pCell-GetCode()-AdjustReferenceOnMovedOrigin(aOldPos,
pCell-aPos);
}
else
{
@@ -880,9 +882,9 @@ public:
}
-void ScColumn::ResetFormulaCellPositions( SCROW nRow1, SCROW nRow2 )
+void ScColumn::ResetFormulaCellPositions( SCROW nRow1, SCROW nRow2, bool
bUpdateRefs )
{
-FormulaColPosSetter aFunc(nCol);
+FormulaColPosSetter aFunc(nCol, bUpdateRefs);
sc::ProcessFormula(maCells.begin(), maCells, nRow1, nRow2, aFunc);
}
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index af9793d..3b02d62 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -718,8 +718,9 @@ void ScTable::SortReorderByColumn(
}
// Reset formula cell positions which became out-of-sync after column
reordering.
+bool bUpdateRefs = pArray-IsUpdateRefs();
for (SCCOL nCol = nStart; nCol = nLast; ++nCol)
-aCol[nCol].ResetFormulaCellPositions(nRow1, nRow2);
+aCol[nCol].ResetFormulaCellPositions(nRow1, nRow2, bUpdateRefs);
// Set up column reorder map (for later broadcasting of reference updates).
sc::ColRowReorderMapType aColMap;
___
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/inc sc/source
sc/inc/tokenarray.hxx |6 +
sc/source/core/data/column4.cxx |2 +
sc/source/core/data/table3.cxx |4 +++
sc/source/core/tool/token.cxx | 43
4 files changed, 55 insertions(+)
New commits:
commit 867c9072b146d3f15b27df6b906d4ac2e3f8bf9f
Author: Eike Rathke er...@redhat.com
Date: Mon Nov 24 23:29:32 2014 +0100
fix fdo#79441 again and keep references to other sheets during sort
... also if other references are not updated. References to other sheets
are never to be treated as relative during sort, they are always
absolute, even if they have relative row/column part references.
Broken again during the big sort mess. Even if there was a unit test,
which didn't help as it got disabled / adapted to the change..
(cherry picked from commit f0e7364603c9566bc158303c515c3274ccba62ca)
Backported.
Change-Id: Ic0e61c5e1cb0728e20725c29e450ab0eb55c3305
Reviewed-on: https://gerrit.libreoffice.org/13114
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us
diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx
index 0ce6f71..1768ba9 100644
--- a/sc/inc/tokenarray.hxx
+++ b/sc/inc/tokenarray.hxx
@@ -210,6 +210,12 @@ public:
void AdjustReferenceOnMovedOrigin( const ScAddress rOldPos, const
ScAddress rNewPos );
/**
+ * Adjust all internal references on base position change if they point to
+ * a sheet other than the one of rOldPos.
+ */
+void AdjustReferenceOnMovedOriginIfOtherSheet( const ScAddress rOldPos,
const ScAddress rNewPos );
+
+/**
* Clear sheet deleted flag from internal reference tokens if the sheet
* index falls within specified range. Note that when a reference is on a
* sheet that's been deleted, its referenced sheet index retains the
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index c1cf89e..aeaecb0 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -871,6 +871,8 @@ public:
pCell-aPos.SetRow(nRow);
if (mbUpdateRefs)
pCell-GetCode()-AdjustReferenceOnMovedOrigin(aOldPos,
pCell-aPos);
+else
+
pCell-GetCode()-AdjustReferenceOnMovedOriginIfOtherSheet(aOldPos,
pCell-aPos);
}
else
{
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 3b02d62..db6125f 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -872,6 +872,10 @@ void ScTable::SortReorderByRow(
pNew-CopyAllBroadcasters(*rCell.maCell.mpFormula);
pNew-GetCode()-AdjustReferenceOnMovedOrigin(aOldPos,
aCellPos);
}
+else
+{
+
pNew-GetCode()-AdjustReferenceOnMovedOriginIfOtherSheet(aOldPos, aCellPos);
+}
sc::CellStoreType::iterator itBlk =
rCellStore.push_back(pNew);
}
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index b0a495a..74c61a5 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -3604,6 +3604,49 @@ void ScTokenArray::AdjustReferenceOnMovedOrigin( const
ScAddress rOldPos, const
}
}
+void ScTokenArray::AdjustReferenceOnMovedOriginIfOtherSheet( const ScAddress
rOldPos, const ScAddress rNewPos )
+{
+FormulaToken** p = pCode;
+FormulaToken** pEnd = p + static_castsize_t(nLen);
+for (; p != pEnd; ++p)
+{
+bool bAdjust = false;
+switch ((*p)-GetType())
+{
+case svExternalSingleRef:
+bAdjust = true; // always
+// fallthru
+case svSingleRef:
+{
+ScToken* pToken = static_castScToken*(*p);
+ScSingleRefData rRef = pToken-GetSingleRef();
+ScAddress aAbs = rRef.toAbs(rOldPos);
+if (!bAdjust)
+bAdjust = (aAbs.Tab() != rOldPos.Tab());
+if (bAdjust)
+rRef.SetAddress(aAbs, rNewPos);
+}
+break;
+case svExternalDoubleRef:
+bAdjust = true; // always
+// fallthru
+case svDoubleRef:
+{
+ScToken* pToken = static_castScToken*(*p);
+ScComplexRefData rRef = pToken-GetDoubleRef();
+ScRange aAbs = rRef.toAbs(rOldPos);
+if (!bAdjust)
+bAdjust = (rOldPos.Tab() aAbs.aStart.Tab() ||
aAbs.aEnd.Tab() rOldPos.Tab());
+if (bAdjust)
+rRef.SetRange(aAbs, rNewPos);
+}
+break;
+default:
+;
+}
+}
+}
+
namespace {
void clearTabDeletedFlag( ScSingleRefData rRef,
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - sc/source
sc/source/ui/undo/undosort.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 560c69f5268be0116691a625fcf66f9125055fcf Author: Eike Rathke er...@redhat.com Date: Tue Nov 25 19:02:08 2014 +0100 fdo#86708 paint after Undo of Sort Regression of 10fc138307afb4b39baddb0d56eb8e986e5d29ea that exchanged the PostPaint with SetDirty, but the paint is also needed. Change-Id: Ic3e81fa106f405568effaed71ab33b575b4c5c5c (cherry picked from commit 5cec4ea827570a5bb0a368025f3733b841107d07) diff --git a/sc/source/ui/undo/undosort.cxx b/sc/source/ui/undo/undosort.cxx index 4a00707..f86bdc2 100644 --- a/sc/source/ui/undo/undosort.cxx +++ b/sc/source/ui/undo/undosort.cxx @@ -49,6 +49,9 @@ void UndoSort::Execute( bool bUndo ) rDoc.SetDirty(maParam.maSortRange); if (!aParam.mbUpdateRefs) rDoc.BroadcastCells(aParam.maSortRange, SC_HINT_DATACHANGED); + +pDocShell-PostPaint(maParam.maSortRange, PAINT_GRID); +pDocShell-PostDataChanged(); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|70809 | -- 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||70809 -- 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: Branch 'libreoffice-4-2' - sc/source
sc/source/ui/undo/undosort.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 57d68a12a7f8c8ac1e60eda33a9f96ce3bca75c2 Author: Eike Rathke er...@redhat.com Date: Tue Nov 25 19:02:08 2014 +0100 fdo#86708 paint after Undo of Sort Regression of 10fc138307afb4b39baddb0d56eb8e986e5d29ea that exchanged the PostPaint with SetDirty, but the paint is also needed. Change-Id: Ic3e81fa106f405568effaed71ab33b575b4c5c5c (cherry picked from commit 5cec4ea827570a5bb0a368025f3733b841107d07) Reviewed-on: https://gerrit.libreoffice.org/13123 Reviewed-by: Andras Timar andras.ti...@collabora.com Tested-by: Andras Timar andras.ti...@collabora.com diff --git a/sc/source/ui/undo/undosort.cxx b/sc/source/ui/undo/undosort.cxx index 4a00707..f86bdc2 100644 --- a/sc/source/ui/undo/undosort.cxx +++ b/sc/source/ui/undo/undosort.cxx @@ -49,6 +49,9 @@ void UndoSort::Execute( bool bUndo ) rDoc.SetDirty(maParam.maSortRange); if (!aParam.mbUpdateRefs) rDoc.BroadcastCells(aParam.maSortRange, SC_HINT_DATACHANGED); + +pDocShell-PostPaint(maParam.maSortRange, PAINT_GRID); +pDocShell-PostDataChanged(); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b4d237950725ea065c5fa812487fe56f8f2dc48a Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Tue Nov 25 15:42:30 2014 -0500 Assign 'l' as hard-coded accelarator for 'Reload'. Change-Id: I4c8aa46a02799dd8e8cedda0dd552b51b248a0e8 diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 8b15921..5bfc495 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -2014,7 +2014,7 @@ /node node oor:name=.uno:Reload oor:op=replace prop oor:name=Label oor:type=xs:string - value xml:lang=en-USReload/value + value xml:lang=en-USRe~load/value /prop prop oor:name=Properties oor:type=xs:int value1/value ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/linenumbering.ui |1 + 1 file changed, 1 insertion(+) New commits: commit 617427806d0a1aa7d8b3f3a6977e7bc2a292e73b Author: Michael Stahl mst...@redhat.com Date: Tue Nov 25 21:49:25 2014 +0100 fdo#86185: sw: Line Numbering dialog: fix Format combo box (regression from a2feb420fa547b89bff5e0c6f848e22f503e6602) Change-Id: I211910ba12fa1f2ce578bf467169a239ddf83e1f diff --git a/sw/uiconfig/swriter/ui/linenumbering.ui b/sw/uiconfig/swriter/ui/linenumbering.ui index 5f8aea4..886ca5e 100644 --- a/sw/uiconfig/swriter/ui/linenumbering.ui +++ b/sw/uiconfig/swriter/ui/linenumbering.ui @@ -240,6 +240,7 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=hexpandTrue/property +property name=type16/property /object packing property name=left_attach1/property ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/uiconfig
sw/uiconfig/swriter/ui/linenumbering.ui |1 + 1 file changed, 1 insertion(+) New commits: commit 3c0c857b5e10bd01fe2e53685539a9555087c802 Author: Michael Stahl mst...@redhat.com Date: Tue Nov 25 21:49:25 2014 +0100 fdo#86185: sw: Line Numbering dialog: fix Format combo box (regression from a2feb420fa547b89bff5e0c6f848e22f503e6602) Change-Id: I211910ba12fa1f2ce578bf467169a239ddf83e1f (cherry picked from commit 617427806d0a1aa7d8b3f3a6977e7bc2a292e73b) diff --git a/sw/uiconfig/swriter/ui/linenumbering.ui b/sw/uiconfig/swriter/ui/linenumbering.ui index 5f8aea4..886ca5e 100644 --- a/sw/uiconfig/swriter/ui/linenumbering.ui +++ b/sw/uiconfig/swriter/ui/linenumbering.ui @@ -240,6 +240,7 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=hexpandTrue/property +property name=type16/property /object packing property name=left_attach1/property ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|67379 | -- 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
