[Bug 82577] get rid of prex.h / postx.h wrapper headers

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=82577

--- Comment #1 from Noel Grandin  ---
Is there a compiler flag that we can turn on that will automatically report
type name collisions?

-- 
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: store/source

[Thomas Arnhold]

 store/source/stortree.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit a7d21497094f0320916d4f6f99af1439ad2c3eaf
Author: Thomas Arnhold 
Date:   Thu Aug 14 09:07:27 2014 +0200

warning C4189: : local variable is initialized but not referenced

Change-Id: I650fab8227fd8b6aeb4fd4d420cb820aefd80271

diff --git a/store/source/stortree.cxx b/store/source/stortree.cxx
index 8e91cf0..5e96a6e 100644
--- a/store/source/stortree.cxx
+++ b/store/source/stortree.cxx
@@ -297,8 +297,7 @@ storeError OStoreBTreeNodeObject::remove (
 void OStoreBTreeRootObject::testInvariant (char const * message)
 {
 OSL_PRECOND(m_xPage.get() != 0, "OStoreBTreeRootObject::testInvariant(): 
Null pointer");
-bool result = ((m_xPage->location() - m_xPage->size()) == 0);
-SAL_WARN_IF( !result, "store", message);
+SAL_WARN_IF( (m_xPage->location() - m_xPage->size()) != 0, "store", 
message);
 }
 
 /*
___
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' - dbaccess/source

[Lionel Elie Mamane]

 dbaccess/source/core/api/CRowSetColumn.cxx |   10 --
 dbaccess/source/core/api/CRowSetColumn.hxx |2 -
 dbaccess/source/core/api/CRowSetDataColumn.cxx |   38 +++--
 dbaccess/source/core/api/CRowSetDataColumn.hxx |7 ++--
 dbaccess/source/core/api/RowSet.cxx|7 ++--
 5 files changed, 34 insertions(+), 30 deletions(-)

New commits:
commit 3dc29ff5846160060587d41f22868486ffd4e96e
Author: Lionel Elie Mamane 
Date:   Wed Aug 6 15:17:13 2014 +0200

fdo#82151 when constructing column object, replace m_aCurrentRow by a 
function

The passed m_aCurrentRow becomes out-of-date as soon as the current row 
changes.
This also hides an implementation detail of ORowSet to ORowSet(Data)Column.

Functional squelch of the following master commits:
  Change-Id: Ib9188743e5dd6dec240e9f5fd3fd9655c6761abc
  commit id: 03a2b4a80c5854bcb8520f2a43e485b98e3eba8f

  Change-Id: I527cc35ae120cf083f7c69a9a23526839a2bbddb
  commit id: 90b09303ef4f9163428107be7b8db23022ce10b7

  Change-Id: If813a1544ec9a5dac6f87197982d10576c91cd8c
  commit id: 5be4407d0716f78acdcdf24de135af91f17e51be

+ keep older behaviour of confusing no value and null value.

Change-Id: Ib9188743e5dd6dec240e9f5fd3fd9655c6761abc
Reviewed-on: https://gerrit.libreoffice.org/10796
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/dbaccess/source/core/api/CRowSetColumn.cxx 
b/dbaccess/source/core/api/CRowSetColumn.cxx
index 945b15f..adc3d38 100644
--- a/dbaccess/source/core/api/CRowSetColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetColumn.cxx
@@ -36,9 +36,13 @@ using namespace ::com::sun::star::beans;
 namespace dbaccess
 {
 
-ORowSetColumn::ORowSetColumn(   const Reference < XResultSetMetaData >& 
_xMetaData, const Reference < XRow >& _xRow, sal_Int32 _nPos,
-const Reference< XDatabaseMetaData >& _rxDBMeta, const 
OUString& _rDescription, const OUString& i_sLabel,ORowSetCacheIterator& 
_rColumnValue )
-:ORowSetDataColumn( _xMetaData, _xRow, NULL, _nPos, _rxDBMeta, 
_rDescription, i_sLabel,_rColumnValue )
+ORowSetColumn::ORowSetColumn( const Reference < XResultSetMetaData >& 
_xMetaData,
+  const Reference < XRow >& _xRow, sal_Int32 _nPos,
+  const Reference< XDatabaseMetaData >& _rxDBMeta,
+  const OUString& _rDescription,
+  const OUString& i_sLabel,
+  const boost::function< const 
::connectivity::ORowSetValue& ( sal_Int32 ) > &_getValue )
+:ORowSetDataColumn( _xMetaData, _xRow, NULL, _nPos, _rxDBMeta, 
_rDescription, i_sLabel, _getValue )
 {
 }
 
diff --git a/dbaccess/source/core/api/CRowSetColumn.hxx 
b/dbaccess/source/core/api/CRowSetColumn.hxx
index bba7c7d..0c4ec82 100644
--- a/dbaccess/source/core/api/CRowSetColumn.hxx
+++ b/dbaccess/source/core/api/CRowSetColumn.hxx
@@ -38,7 +38,7 @@ namespace dbaccess
 const ::com::sun::star::uno::Reference< 
::com::sun::star::sdbc::XDatabaseMetaData >& _rxDBMeta,
 const OUString& _rDescription,
 const OUString& i_sLabel,
-ORowSetCacheIterator& _rColumnValue);
+const boost::function< const 
::connectivity::ORowSetValue& ( sal_Int32 ) > &_getValue);
 
 virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const 
SAL_OVERRIDE;
 virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() 
SAL_OVERRIDE;
diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx 
b/dbaccess/source/core/api/CRowSetDataColumn.cxx
index f0de794..3f2901d 100644
--- a/dbaccess/source/core/api/CRowSetDataColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 using namespace dbaccess;
@@ -39,16 +40,16 @@ using namespace cppu;
 using namespace osl;
 
 
-ORowSetDataColumn::ORowSetDataColumn(   const Reference < XResultSetMetaData 
>& _xMetaData,
+ORowSetDataColumn::ORowSetDataColumn( const Reference < XResultSetMetaData >& 
_xMetaData,
   const Reference < XRow >& _xRow,
   const Reference < XRowUpdate >& 
_xRowUpdate,
   sal_Int32 _nPos,
   const Reference< XDatabaseMetaData >& 
_rxDBMeta,
   const OUString& _rDescription,
   const OUString& i_sLabel,
-  const ORowSetCacheIterator& 
_rColumnValue)
+  const boost::function< const 
ORowSetValue& (sal_Int32)> &_getValue)
 :ODataColumn(_xMetaData,_xRow,_xRowUpdate,_nPos,_rxDBMeta)
-,m_aColumnValue(_rColumnValue)
+,m_pGetValue(_getValue)
 ,m_sLabel(i_sLabel)
 ,m_aDescriptio

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/qa xmloff/source

[Michael Stahl]

 sw/qa/extras/odfimport/data/fdo82165.odt  |binary
 sw/qa/extras/odfimport/odfimport.cxx  |   10 ++
 xmloff/source/text/XMLTextHeaderFooterContext.cxx |   13 +++--
 3 files changed, 21 insertions(+), 2 deletions(-)

New commits:
commit fe7d0f8b60c7a99d150b32eb5530a4a530267fab
Author: Michael Stahl 
Date:   Tue Aug 12 17:47:20 2014 +0200

fdo#82165: ODF import: clear all shapes when removing header content

Shapes anchored to the first or last paragraph survive setString("")
so need to be deleted with some ruse.

(regression from b8499fc3dcf474050f026b8d5cd1d9037bbe42b7)

Change-Id: I00a8132583c45d1953c207932cc7f02f3065ae77
(cherry picked from commit 555c988f3b896e16afc7bdd1bd98e48229599637)
Reviewed-on: https://gerrit.libreoffice.org/10894
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/sw/qa/extras/odfimport/data/fdo82165.odt 
b/sw/qa/extras/odfimport/data/fdo82165.odt
new file mode 100644
index 000..65a4084
Binary files /dev/null and b/sw/qa/extras/odfimport/data/fdo82165.odt differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index 299fea7..8cd4b09 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -345,6 +345,16 @@ DECLARE_ODFIMPORT_TEST(testFdo68839, "fdo68839.odt")
 getProperty(xFrame2, "ChainNextName"));
 }
 
+DECLARE_ODFIMPORT_TEST(testFdo82165, "fdo82165.odt")
+{
+// there was a duplicate shape in the left header
+lcl_CheckShape(getShape(1), "Picture 9");
+try {
+uno::Reference xShape = getShape(2);
+CPPUNIT_FAIL("IndexOutOfBoundsException expected");
+} catch (lang::IndexOutOfBoundsException const&) { }
+}
+
 DECLARE_ODFIMPORT_TEST(testFdo37606, "fdo37606.odt")
 {
 SwXTextDocument* pTxtDoc = dynamic_cast(mxComponent.get());
diff --git a/xmloff/source/text/XMLTextHeaderFooterContext.cxx 
b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
index ca59d82..fd727e9 100644
--- a/xmloff/source/text/XMLTextHeaderFooterContext.cxx
+++ b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
@@ -18,6 +18,7 @@
  */
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -158,8 +159,16 @@ SvXMLImportContext 
*XMLTextHeaderFooterContext::CreateChildContext(
 
 if( bRemoveContent )
 {
-OUString aText;
-xText->setString( aText );
+xText->setString(OUString());
+// fdo#82165 shapes anchored at the beginning or end survive
+// setString("") - kill them the hard way: SwDoc::DelFullPara()
+uno::Reference const xAppend(
+xText, uno::UNO_QUERY_THROW);
+uno::Reference const xPara(
+xAppend->finishParagraph(
+uno::Sequence()),
+uno::UNO_QUERY_THROW);
+xPara->dispose();
 }
 
 UniReference < XMLTextImportHelper > xTxtImport =
___
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' - sw/qa xmloff/source

[Michael Stahl]

 sw/qa/extras/odfimport/data/fdo82165.odt  |binary
 sw/qa/extras/odfimport/odfimport.cxx  |   10 ++
 xmloff/source/text/XMLTextHeaderFooterContext.cxx |   13 +++--
 3 files changed, 21 insertions(+), 2 deletions(-)

New commits:
commit 9c4c37e3745a3998f29d8aa15d2023cb3d07424b
Author: Michael Stahl 
Date:   Tue Aug 12 17:47:20 2014 +0200

fdo#82165: ODF import: clear all shapes when removing header content

Shapes anchored to the first or last paragraph survive setString("")
so need to be deleted with some ruse.

(regression from b8499fc3dcf474050f026b8d5cd1d9037bbe42b7)

Change-Id: I00a8132583c45d1953c207932cc7f02f3065ae77
(cherry picked from commit 555c988f3b896e16afc7bdd1bd98e48229599637)
Reviewed-on: https://gerrit.libreoffice.org/10895
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/sw/qa/extras/odfimport/data/fdo82165.odt 
b/sw/qa/extras/odfimport/data/fdo82165.odt
new file mode 100644
index 000..65a4084
Binary files /dev/null and b/sw/qa/extras/odfimport/data/fdo82165.odt differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index 879513b..e7fa8fb 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -344,6 +344,16 @@ DECLARE_ODFIMPORT_TEST(testFdo68839, "fdo68839.odt")
 getProperty(xFrame2, "ChainNextName"));
 }
 
+DECLARE_ODFIMPORT_TEST(testFdo82165, "fdo82165.odt")
+{
+// there was a duplicate shape in the left header
+lcl_CheckShape(getShape(1), "Picture 9");
+try {
+uno::Reference xShape = getShape(2);
+CPPUNIT_FAIL("IndexOutOfBoundsException expected");
+} catch (lang::IndexOutOfBoundsException const&) { }
+}
+
 DECLARE_ODFIMPORT_TEST(testFdo37606, "fdo37606.odt")
 {
 SwXTextDocument* pTxtDoc = dynamic_cast(mxComponent.get());
diff --git a/xmloff/source/text/XMLTextHeaderFooterContext.cxx 
b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
index 2a711b0..27cbc9c 100644
--- a/xmloff/source/text/XMLTextHeaderFooterContext.cxx
+++ b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
@@ -18,6 +18,7 @@
  */
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -158,8 +159,16 @@ SvXMLImportContext 
*XMLTextHeaderFooterContext::CreateChildContext(
 
 if( bRemoveContent )
 {
-OUString aText;
-xText->setString( aText );
+xText->setString(OUString());
+// fdo#82165 shapes anchored at the beginning or end survive
+// setString("") - kill them the hard way: SwDoc::DelFullPara()
+uno::Reference const xAppend(
+xText, uno::UNO_QUERY_THROW);
+uno::Reference const xPara(
+xAppend->finishParagraph(
+uno::Sequence()),
+uno::UNO_QUERY_THROW);
+xPara->dispose();
 }
 
 UniReference < XMLTextImportHelper > xTxtImport =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: On the use of C++ exception handling

[Ruslan Kabatsayev]

Hello,

I've tried filling the survey forms, and on "Use of exception handling
in C++" page the numbers are reset to 1-2-3-4-5 regardless of what I
choose. Thus it's impossible to correctly answer the questions.
I'm using Chromium Version 34.0.1847.116 Ubuntu 12.04 (260972).

Regards,
Ruslan

On Wed, Aug 13, 2014 at 9:50 PM, Rodrigo B Almeida
 wrote:
> Dear all, I've been investigating the use of C++ exception handling
> constructs in open-source C++ projects (including LibreOffice). Currently, I
> am conducting a survey on this subject and I would really appreciate if you
> could contribute to this research by answering a few questions.
>
> The survey is available on-line:
>
> https://pt.surveymonkey.com/s/exceptionHandling
>
> All the best,
>
> Rodrigo.
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 82577] get rid of prex.h / postx.h wrapper headers

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=82577

--- Comment #2 from Björn Michaelsen  ---
(In reply to comment #1)
> Is there a compiler flag that we can turn on that will automatically report
> type name collisions?

Even easier: New type names should be in a namespace. That should make
practically rule out collisions of types (up until we collide a full namespace
somewhere).

-- 
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: writerfilter/documentation

[Miklos Vajna]

 writerfilter/documentation/ooxml/model.rng |  473 +
 writerfilter/documentation/ooxml/model.xml |   42 --
 2 files changed, 473 insertions(+), 42 deletions(-)

New commits:
commit 59a68fe4ad8ca32fb016e4f1955ef6c18bcd3044
Author: Miklos Vajna 
Date:   Thu Aug 14 10:40:05 2014 +0200

Add rng schema for model.xml

Change-Id: I1b75c5c42a131c7994868ea3261120c6a5b7650e

diff --git a/writerfilter/documentation/ooxml/model.rng 
b/writerfilter/documentation/ooxml/model.rng
new file mode 100644
index 000..d21045b
--- /dev/null
+++ b/writerfilter/documentation/ooxml/model.rng
@@ -0,0 +1,473 @@
+
+
+
+http://relaxng.org/ns/structure/1.0";>
+  
+
+  
+
+  
+  
+http://relaxng.org/ns/structure/1.0";>
+  
+
+  
+  
+
+  
+  
+  
+  
+
+  
+
+  
+
+  
+  
+http://relaxng.org/ns/structure/1.0";>
+  
+
+  
+  
+
+  
+  
+  
+
+  
+
+  
+
+  
+  
+http://relaxng.org/ns/structure/1.0";>
+  
+
+  
+
+  
+  
+http://relaxng.org/ns/structure/1.0";>
+  
+
+  
+
+  
+  
+http://relaxng.org/ns/structure/1.0";>
+  
+
+  
+
+  
+  
+http://relaxng.org/ns/structure/1.0";>
+  
+
+  
+  
+  
+  
+  
+
+  
+
+  
+
+  
+
+  
+  
+http://relaxng.org/ns/structure/1.0";>
+  
+  
+
+  
+  
+  
+  
+  
+  
+
+  
+
+  
+
+  
+  
+http://relaxng.org/ns/structure/1.0";>
+  
+
+  
+
+  
+  
+http://relaxng.org/ns/structure/1.0";>
+  
+  
+
+  
+  
+
+  
+  
+
+  
+  
+
+  
+
+  
+
+  
+  
+http://relaxng.org/ns/structure/1.0";>
+  
+
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+  
+
+  
+
+  
+
+  
+  
+
+  
+  
+  
+  
+
+  
+
+  
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+  
+
+  
+  
+
+  
+  
+
+  
+  
+  
+
+  
+
+  
+
+  
+  
+
+  
+
+  
+
+  
+  
+
+  
+  
+  
+  
+  
+
+  
+  
+
+  
+  
+  
+  
+
+  
+
+  
+
+  
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+  
+
+  
+  
+
+  
+
+  
+
+  
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+  
+  
+
+  
+  
+
+  
+  
+
+  
+
+  
+
+  
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+
diff --git a/writerfilter/documentation/ooxml/model.xml 
b/writerfilter/documentation/ooxml/model.xml
deleted file mode 100644
index 75ee217..000
--- a/writerfilter/documentation/ooxml/model.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-These are various notes about ooxml/model.xml and related stuff. They have been
-mostly found out by trial and error, because existing documentation is poor
-or nonexistent, so I don't actually understand writerfilter that much (and
-think nothing nice about it) and don't think it (both writerfilter and my
-understanding/liking of it) could be noticeably improved. In an ideal world
-it should be nuked from orbit and started again from scratch with a saner 
design.
-
--
-CT_xxx (Complex Type) - it seems to be used for XML elements
-ST_xxx (Simple Type) - it seems to be used for XML attributes
-
-- SPRM (the Sprm structure specified a modification to a property of a
-character, paragraph, table, or section in the binary .doc format) - in
-the context of OOXML it seems to pretty much mean "XML element"
-
--
-
-Format of the  tag (shortened CT_Font example):
-
-
-  
-  
-
-
-CT_Font is the type that is defined how it will be handled.
-resource="XXX" means it will be handled by OOXMLFastContextHandlerXXX class
-no idea what tag="font" means or if it matters
- defines the  subelement will be handled in sprm() function
-as NS_ooxml::LN_CT_Font_charset case
- defines the  attribute of the element will be handled
-in attribute() function as NS_ooxml::LN_CT_Font_name case
-in both cases sprm()/attribute() may mean actually any of the various strange
-naming ideas like lcl_sprm()
-
--
-If an element (and its subelements) are not processed but the element itself
-does not require any special handling, make sure something like the below is 
present.
-Otherwise null context will be created and the element and all its subelements
-will be ignored.
-
-
-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 8 commits - bean/com bean/qa bean/test bridges/test chart2/qa connectivity/qa dbaccess/qa embeddedobj/test extensions/qa filter/qa forms/qa framework/qa javaunohelper/c

[Noel Grandin]

 bean/com/sun/star/beans/ContainerFactory.java  
  |2 
 bean/com/sun/star/beans/LocalOfficeConnection.java 
  |1 
 bean/com/sun/star/beans/LocalOfficeWindow.java 
  |1 
 bean/com/sun/star/beans/OfficeConnection.java  
  |2 
 bean/com/sun/star/comp/beans/ContainerFactory.java 
  |2 
 bean/com/sun/star/comp/beans/LocalOfficeWindow.java
  |1 
 bean/qa/complex/bean/OOoBeanTest.java  
  |1 
 bean/test/applet/oooapplet/OOoViewer.java  
  |1 
 bridges/test/lib/TestBed.java  
  |5 
 chart2/qa/TestCaseOldAPI.java  
  |8 
 connectivity/qa/complex/connectivity/dbase/DBaseSqlTests.java  
  |3 
 connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java  
  |   63 
 connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java 
  |9 
 connectivity/qa/connectivity/tools/FlatFileDatabase.java   
  |1 
 connectivity/qa/connectivity/tools/sdb/Connection.java 
  |1 
 dbaccess/qa/complex/dbaccess/DataSource.java   
  |1 
 embeddedobj/test/Container1/EmbedContApp.java  
  |5 
 extensions/qa/integration/extensions/MethodHandler.java
  |1 
 filter/qa/complex/filter/detection/typeDetection/Helper.java   
  |5 
 forms/qa/integration/forms/CellBinding.java
  |2 
 forms/qa/integration/forms/DocumentHelper.java 
  |1 
 forms/qa/integration/forms/DocumentViewHelper.java 
  |3 
 forms/qa/integration/forms/FormControlTest.java
  |1 
 forms/qa/integration/forms/FormLayer.java  
  |1 
 framework/qa/complex/XUserInputInterception/EventTest.java 
  |   22 -
 framework/qa/complex/api_internal/CheckAPI.java
  |1 
 framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java   
  |2 
 framework/qa/complex/desktop/DesktopTerminate.java 
  |1 
 framework/qa/complex/dispatches/checkdispatchapi.java  
  |1 
 framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java 
  |1 
 framework/qa/complex/framework/recovery/RecoveryTools.java 
  |1 
 framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java   
  |   24 -
 framework/qa/complex/path_settings/PathSettingsTest.java   
  |1 
 javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java
  |4 
 javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java  
  |1 
 javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java   
  |4 
 jurt/com/sun/star/lib/connections/pipe/pipeAcceptor.java   
  |3 
 jurt/com/sun/star/lib/uno/environments/java/java_environment.java  
  |7 
 jurt/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java  
  |2 
 
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalFile.java
   |5 
 
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/RandomGenerator.java
  |1 
 
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignSpace.java
   |1 
 odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java   
  |8 
 odk/examples/DevelopersGuide/Database/CodeSamples.java 
  |1 
 odk/examples/DevelopersGuide/Database/RowSet.java  
  |  

New Balance Skor Dam

[LauraL]

Numera är mycket mer framträdande Nike skor som faktiskt släpps genom att
helt enkelt Nike Organization. Trots detta är Nike Atmosphere skor i
allmänhet fortsätter att även lämplig för jorden, anledningen?  New Balance
Skor Dam året bara gått skor
består vanligtvis av olika färgsättningar. Detta är förvisso utvecklats för
dessa skilda tillfällen. Till exempel, för de olympiska spelen,
online-spelare genom olika internationella platser kommer att delta i att
god videospel, och de skulle säkert bestämma Nike skor. Efter att de olika
färgsättningar värda hänvisar skor kan bidra till att sätta egna nyckelord
dessa typer av online-spelare på ett annat sätt, kommunicera därför till
sina platser. Flera grader av den för den inbegriper de distinkta
färgsättningar som skapats specifikt för de kommande platser som Ny,
Detroit, Puerto Rico tillsammans med kanske Gulf Indies. 

Ett stort antal framstående online spelare utöver förutse att skapa
lufttrycks versioner skor distinkt avsedda för själva allmän hälsa förväntan
dessa typer av skor kan säkert upprepa sin egen smak. För närvarande har
Nike bolaget varit tänkt att vara det permanent myt.  New Balance 420 Dam
De har upplevt många år av
kamp genom nittonhundra att kunna 21: a hundra år. På extremt komma igång,
slutade Nike företaget upp att vara en ganska liten en, tillsammans med dess
helt enkelt produkter och lösningar hamnade Nike Atmosphere skor och
stövlar. Trots detta, numera, besitter sina produkter och lösningar breddas
för att kunna alla platser som Nike arbetsskor med inriktning på arbets
idrott, Nike fotbollsskor avsett särskilt för fotboll online-spel,
tillsammans med Nike spelet golf friidrott skor utvecklats specifikt med När
det gäller spelet golf sport aktivitet. Nike Company kan göra personer som
ett fantastiskt liv helt enkelt till exempel vad dess slogan att "Just
Perform It". 


Men sanningen är, Nike skor dessutom inrättat myt som vad det Nike Company
besitter produceras. Beträffande Nike skor och stövlar; de flesta som en
utmärkt kändis. Till exempel Nike Atmosphere, om att design, som chip i en
hel del i den utmärkta kändis i samband med  Toms Skor Sverige
Organization. tillsammans med tills
slutligen idag, är många individer i allmänhet ändå lockas av helt enkelt
dessa typer av skor och stövlar. Vanligtvis personer är benägna att använda
dessa typer av skor i massor av omständigheter, såsom, golfutrustning,
internetdejting, och även klasser. Särskilt sant; dessa typer av skor
förutom hjälp gör dessa människor utestående. Bortsett från dess
otvivelaktigt rätt att du kan använda dessa typer av skor som är avsedda för
sportaktivitet som är säkert just deras första syfte. 




--
View this message in context: 
http://nabble.documentfoundation.org/New-Balance-Skor-Dam-tp4118955.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: solenv/gbuild

[Thomas Arnhold]

 solenv/gbuild/platform/com_MSC_defs.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit 90ca44ae9f897b6abc80b3c5acfdea798d4f69ea
Author: Thomas Arnhold 
Date:   Wed Aug 13 17:27:47 2014 +0200

MSVC: disable C4189 again in optimizing builds

MSVC2012 emits bogus "unused variable" warnings for variables only
used in a condition of SAL_WARN_IF in optimizing
compilations. Nevertheless it's quite useful to have these warnings
when not optimizing, then it does not emit them bogusly.

Change-Id: I58a071db65bed15f753def793da8c0f9677abd4b

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 380b2c5..0911a07 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -70,6 +70,8 @@ gb_AFLAGS := $(AFLAGS)
 
 # C4127: conditional expression is constant
 
+# C4189: 'identifier' : local variable is initialized but not referenced
+
 # C4201: nonstandard extension used : nameless struct/union
 
 # C4242: 'identifier' : conversion from 'type1' to 'type2', possible
@@ -137,6 +139,7 @@ gb_CFLAGS := \
-nologo \
-W4 \
-wd4127 \
+   $(if $(filter 0,$(gb_DEBUGLEVEL)),-wd4189) \
-wd4242 \
-wd4244 \
-wd4251 \
@@ -159,6 +162,7 @@ gb_CXXFLAGS := \
-nologo \
-W4 \
-wd4127 \
+   $(if $(filter 0,$(gb_DEBUGLEVEL)),-wd4189) \
-wd4201 \
-wd4244 \
-wd4250 \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - include/sal solenv/gbuild

[Tor Lillqvist]

 include/sal/types.h|3 ++-
 solenv/gbuild/platform/com_MSC_defs.mk |4 
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 7731f62c25e5a32043b783af2e6f7aa9afe2e26a
Author: Tor Lillqvist 
Date:   Thu Aug 14 13:58:31 2014 +0300

If we disable C4189 we should also disable C4100

They are both bogusly emitted from SAL_WARN_IF in an optimizing
compilation.

Change-Id: Ia56687422a29c61a7a8ad0d48541300c7643120e

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 0911a07..0fbc69e 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -68,6 +68,8 @@ gb_AFLAGS := $(AFLAGS)
 # cleaning away from the code, to avoid warnings when building with
 # gcc or Clang and -Wall -Werror.
 
+# C4100: 'identifier' : unreferenced format parameter
+
 # C4127: conditional expression is constant
 
 # C4189: 'identifier' : local variable is initialized but not referenced
@@ -138,6 +140,7 @@ gb_CFLAGS := \
$(if $(MSVC_USE_DEBUG_RUNTIME),-MDd,-MD) \
-nologo \
-W4 \
+   $(if $(filter 0,$(gb_DEBUGLEVEL)),-wd4100) \
-wd4127 \
$(if $(filter 0,$(gb_DEBUGLEVEL)),-wd4189) \
-wd4242 \
@@ -161,6 +164,7 @@ gb_CXXFLAGS := \
$(if $(MSVC_USE_DEBUG_RUNTIME),-MDd,-MD) \
-nologo \
-W4 \
+   $(if $(filter 0,$(gb_DEBUGLEVEL)),-wd4100) \
-wd4127 \
$(if $(filter 0,$(gb_DEBUGLEVEL)),-wd4189) \
-wd4201 \
commit b1744526cc35531f5cb561137082ea8f725be43a
Author: Tor Lillqvist 
Date:   Thu Aug 14 13:34:15 2014 +0300

WaE: C4722: destructor never returns, potential memory leak

Change-Id: I9691048ca7dc6e18cc904b29e8f6f59b11e002cf

diff --git a/include/sal/types.h b/include/sal/types.h
index 86c31c2..af98c87 100644
--- a/include/sal/types.h
+++ b/include/sal/types.h
@@ -527,7 +527,8 @@ template< typename T1, typename T2 > inline T1 
static_int_cast(T2 n) {
 #ifdef _MSC_VER
 #define SAL_WNOUNREACHABLE_CODE_PUSH \
 __pragma(warning(push)) \
-__pragma(warning(disable:4702))
+__pragma(warning(disable:4702)) \
+__pragma(warning(disable:4722))
 #define SAL_WNOUNREACHABLE_CODE_POP \
 __pragma(warning(pop))
 #else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/gbuild

[Tor Lillqvist]

 solenv/gbuild/platform/com_MSC_defs.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 49229866458e5f2cbac0d87752a6bef701416e07
Author: Tor Lillqvist 
Date:   Thu Aug 14 14:02:37 2014 +0300

Typo

Change-Id: I8d4ce3f0ebd894d2550c5c7788121308f77b0b2a

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 0fbc69e..1702218 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -68,7 +68,7 @@ gb_AFLAGS := $(AFLAGS)
 # cleaning away from the code, to avoid warnings when building with
 # gcc or Clang and -Wall -Werror.
 
-# C4100: 'identifier' : unreferenced format parameter
+# C4100: 'identifier' : unreferenced formal parameter
 
 # C4127: conditional expression is constant
 
___
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

[Tor Lillqvist]

 configure.ac |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a4f4edb344805d1687333d1d7f46b4fde3f8d2c6
Author: Tor Lillqvist 
Date:   Thu Aug 14 14:28:07 2014 +0300

Rename misleadingly named variable

Change-Id: I48c7e2d29c16b61b71ef72a0a45792c968c0fa0f

diff --git a/configure.ac b/configure.ac
index 831ab32..e20f112 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3114,7 +3114,7 @@ if test $_os = iOS; then
 
 xcode_developer=`xcode-select -print-path`
 
-pref_sdk_ver=7.1
+current_sdk_ver=7.1
 for sdkver in 8.0 7.1 7.0 6.1 6.0; do
 
t=$xcode_developer/Platforms/$platform.platform/Developer/SDKs/$platform$sdkver.sdk
 if test -d $t; then
@@ -3125,7 +3125,7 @@ if test $_os = iOS; then
 done
 
 if test -z "$sysroot"; then
-AC_MSG_ERROR([Could not find iOS SDK, expected something like 
$xcode_developer/Platforms/$platform.platform/Developer/SDKs/${platform}${pref_sdk_ver}])
+AC_MSG_ERROR([Could not find iOS SDK, expected something like 
$xcode_developer/Platforms/$platform.platform/Developer/SDKs/${platform}${current_sdk_ver}])
 fi
 
 AC_MSG_RESULT($sysroot)
commit fd56de496e2dbb4834ec4a5926f07e1c7d8a5d3f
Author: Tor Lillqvist 
Date:   Wed Aug 13 21:42:43 2014 +0300

Look also for iOS SDK 8.0

Change-Id: I0587e395f6b4833953618b1a0ac1e201a1f79b61

diff --git a/configure.ac b/configure.ac
index ff89d60..831ab32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3114,8 +3114,8 @@ if test $_os = iOS; then
 
 xcode_developer=`xcode-select -print-path`
 
-pref_sdk_ver=7.0
-for sdkver in 7.1 7.0 6.1 6.0; do
+pref_sdk_ver=7.1
+for sdkver in 8.0 7.1 7.0 6.1 6.0; do
 
t=$xcode_developer/Platforms/$platform.platform/Developer/SDKs/$platform$sdkver.sdk
 if test -d $t; then
 ios_sdk=$sdkver
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - sw/qa sw/source

[Michael Stahl]

 sw/qa/python/var_fields.py   |   20 ++--
 sw/source/core/doc/DocumentFieldsManager.cxx |1 +
 sw/source/core/doc/docnew.cxx|1 +
 3 files changed, 12 insertions(+), 10 deletions(-)

New commits:
commit 19efa546ab88ea4b3943bb05405752dee7e57623
Author: Michael Stahl 
Date:   Thu Aug 14 14:15:03 2014 +0200

sw: assert that UnlockExpFlds() isn't called when it's not locked

Change-Id: Ibe2394978b776dd4a91a253856040fc45f81c7e9

diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx 
b/sw/source/core/doc/DocumentFieldsManager.cxx
index b9b3607..870685e 100644
--- a/sw/source/core/doc/DocumentFieldsManager.cxx
+++ b/sw/source/core/doc/DocumentFieldsManager.cxx
@@ -1207,6 +1207,7 @@ void DocumentFieldsManager::LockExpFlds()
 
 void DocumentFieldsManager::UnlockExpFlds()
 {
+assert(mnLockExpFld != 0);
 if( mnLockExpFld )
 --mnLockExpFld;
 }
commit 85fde3735afb306b4c3aba72a9c99d19c71546fa
Author: Michael Stahl 
Date:   Thu Aug 14 13:37:41 2014 +0200

sw: initialize SwDoc::mbInReading

This was causing intermittent failure at least in sw_python test.
(regression from 5494954b269267f6ee3bdd5ac73e7513fa69978f)

Change-Id: I8452536cfbb7bc5bd07e6405bc255e31a5007185

diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 1e129bf..0b2c0d1 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -260,6 +260,7 @@ SwDoc::SwDoc()
 mReferenceCount(0),
 mbGlossDoc(false),
 mbDtor(false),
+mbInReading(false),
 mbInXMLImport(false),
 mbUpdateTOX(false),
 mbInLoadAsynchron(false),
commit 29f0b74a74c80edf89868b3eb586c266472454a2
Author: Michael Stahl 
Date:   Thu Aug 14 12:51:55 2014 +0200

sw: use less confusing variable names in python test

Change-Id: Ie07fe4761a634c3ae55e82e1ed70c9424dc33213

diff --git a/sw/qa/python/var_fields.py b/sw/qa/python/var_fields.py
index 3222f17..b6b3ff1 100644
--- a/sw/qa/python/var_fields.py
+++ b/sw/qa/python/var_fields.py
@@ -74,35 +74,35 @@ class TestVarFields(unittest.TestCase):
 xBodyText.insertControlCharacter(xCursor, PARAGRAPH_BREAK, False )
 xBodyText.insertString(xCursor, "new paragraph", False)
 # 13. Access fields to refresh the document
-xEnumerationAccess = xDoc.getTextFields()
+xTextFields = xDoc.getTextFields()
 # 14. refresh document to update the fields
-xEnumerationAccess.refresh()
+xTextFields.refresh()
 # 15. retrieve the field
-xFieldEnum = xEnumerationAccess.createEnumeration()
+xFieldEnum = xTextFields.createEnumeration()
 # Note: we have only one field here, that why nextElement() is just 
fine here
-xPropSet = xFieldEnum.nextElement()
+xField = xFieldEnum.nextElement()
 # check
-readContent = xPropSet.getPropertyValue("Content")
+readContent = xField.getPropertyValue("Content")
 self.assertEqual("0", readContent)
-readContent = xPropSet.getPropertyValue("Value")
+readContent = xField.getPropertyValue("Value")
 self.assertEqual(0.0, readContent)
 # 16. change the value of the field from 0 to 1 and check
 self.__class__._uno.checkProperties(
-xPropSet,
+xField,
 {"Value": 1.0,
  "Content": "1"
  },
 self
 )
 # 17. refresh document to update the fields again
-xEnumerationAccess.refresh()
+xTextFields.refresh()
 # 18. store document
 url = os.path.join(os.environ["TestUserDir"], "VarFields.odt")
 xDoc.storeToURL(url, tuple(list(range(0
 # 19. retrieve the section
-xPropSet = xDoc.getTextSections().getByIndex(0)
+xSection = xDoc.getTextSections().getByIndex(0)
 # 20. retrieve the condition property of that section
-readContent = xPropSet.getPropertyValue("Condition")
+readContent = xSection.getPropertyValue("Condition")
 # 21. check
 # expected:
 #self.assertEqual("foo EQ 1", readContent)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source include/editeng svx/source

[matteocam]

 editeng/source/editeng/editeng.cxx  |5 +
 editeng/source/editeng/impedit.hxx  |3 +++
 editeng/source/editeng/impedit3.cxx |   16 
 editeng/source/outliner/outlin2.cxx |5 +
 include/editeng/editeng.hxx |1 +
 include/editeng/outliner.hxx|1 +
 svx/source/svdraw/svdedxv.cxx   |2 ++
 7 files changed, 33 insertions(+)

New commits:
commit 40fcecfce85b12b60518ef8258378a6f085023cb
Author: matteocam 
Date:   Thu Aug 14 14:59:30 2014 +0200

Hard coded call to onEditOutlinerStatusEvent for chaining

Change-Id: I663263170a29a290cc37b89f540f9a8daa9c9f73

diff --git a/editeng/source/editeng/editeng.cxx 
b/editeng/source/editeng/editeng.cxx
index 2709740..9e6f25d 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -1522,6 +1522,11 @@ void EditEngine::SetStatusEventHdl( const Link& rLink )
 pImpEditEngine->SetStatusEventHdl( rLink );
 }
 
+void EditEngine::SetStatusEventHdl1( const Link& rLink )
+{
+pImpEditEngine->SetStatusEventHdlChaining( rLink );
+}
+
 Link EditEngine::GetStatusEventHdl() const
 {
 return pImpEditEngine->GetStatusEventHdl();
diff --git a/editeng/source/editeng/impedit.hxx 
b/editeng/source/editeng/impedit.hxx
index d53e5fd..ac95eaa 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -475,6 +475,7 @@ private:
 // this should not happen immediately (critical section):
 Timer   aStatusTimer;
 LinkaStatusHdlLink;
+LinkaStatusHdlLinkChaining;
 LinkaNotifyHdl;
 LinkaImportHdl;
 LinkaBeginMovingParagraphsHdl;
@@ -839,6 +840,7 @@ public:
 
 voidSetStatusEventHdl( const Link& rLink )  { aStatusHdlLink = 
rLink; }
 LinkGetStatusEventHdl() const   { return 
aStatusHdlLink; }
+voidSetStatusEventHdlChaining( const Link& rLink )  { 
aStatusHdlLinkChaining = rLink; }
 
 voidSetNotifyHdl( const Link& rLink )   { aNotifyHdl = 
rLink; }
 LinkGetNotifyHdl() const{ return aNotifyHdl; }
@@ -876,6 +878,7 @@ public:
 
 InternalEditStatus& GetStatus() { return aStatus; }
 voidCallStatusHdl();
+voidCallStatusHdlChaining();
 voidDelayedCallStatusHdl()  { aStatusTimer.Start(); }
 
 voidCallNotify( EENotify& rNotify );
diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index 7ea5a51..8f95bce 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -504,9 +504,25 @@ void ImpEditEngine::FormatDoc()
 
 CallStatusHdl();// If Modified...
 
+//FIXME(matteocam)
+CallStatusHdlChaining(); // XXX: hard coded for chaining
+
 LeaveBlockNotifications();
 }
 
+void ImpEditEngine::CallStatusHdlChaining()
+{
+if ( aStatusHdlLinkChaining.IsSet() && aStatus.GetStatusWord() )
+{
+// The Status has to be reset before the Call,
+// since other Flags might be set in the handler...
+EditStatus aTmpStatus( aStatus );
+aStatus.Clear(); // No need for this with chaining. It does not affect 
it either way.
+//aStatusHdlLinkChaining.Call( &aTmpStatus );
+aStatusTimer.Stop();// If called by hand ...
+}
+}
+
 bool ImpEditEngine::ImpCheckRefMapMode()
 {
 bool bChange = false;
diff --git a/editeng/source/outliner/outlin2.cxx 
b/editeng/source/outliner/outlin2.cxx
index 43ca90b..ca69fcd 100644
--- a/editeng/source/outliner/outlin2.cxx
+++ b/editeng/source/outliner/outlin2.cxx
@@ -139,6 +139,11 @@ Link Outliner::GetStatusEventHdl() const
 return pEditEngine->GetStatusEventHdl();
 }
 
+void Outliner::SetStatusEventHdl1( const Link& rLink )
+{
+pEditEngine->SetStatusEventHdl1( rLink );
+}
+
 void Outliner::SetDefTab( sal_uInt16 nTab )
 {
 pEditEngine->SetDefTab( nTab );
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index 33dd8f0..7bd1656 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -357,6 +357,7 @@ public:
 sal_uLong   Write( SvStream& rOutput, EETextFormat );
 
 voidSetStatusEventHdl( const Link& rLink );
+voidSetStatusEventHdl1( const Link& rLink ); // for chaining
 LinkGetStatusEventHdl() const;
 
 voidSetNotifyHdl( const Link& rLink );
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index dedc476..8889adf 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -802,6 +802,7 @@ public:
 
 voidSetStatusEventHdl( const Link& rLink );
 LinkGetStatusEventHdl() const;
+voidSetStatusEventHdl1( const Link& rLink );
 
 voidDraw( OutputDevice* pOutDev, const Rectangle& rOutRect );

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source svx/source

[matteocam]

 editeng/source/editeng/impedit3.cxx |2 +-
 svx/source/svdraw/svdotext.cxx  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8aebd168df66261279b178444853b8ffcb845372
Author: matteocam 
Date:   Thu Aug 14 15:12:39 2014 +0200

TextObj's chaining changed only if  called for it in 
onEditOutlinerStatusEvent

Change-Id: I8736b039f3a4be519e68e3e60f87e7c32a8b2153

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index 8f95bce..6393b29 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -512,7 +512,7 @@ void ImpEditEngine::FormatDoc()
 
 void ImpEditEngine::CallStatusHdlChaining()
 {
-if ( aStatusHdlLinkChaining.IsSet() && aStatus.GetStatusWord() )
+if ( aStatusHdlLinkChaining.IsSet() /* && aStatus.GetStatusWord() */)
 {
 // The Status has to be reset before the Call,
 // since other Flags might be set in the handler...
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index fe9dcd6..0e32745 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1953,7 +1953,7 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus* 
pEditStatus )
 ImpAutoFitText(*pEdtOutl);
 mbInDownScale = false;
 }
-else if ( GetNextLinkInChain() != NULL)
+else if ( GetNextLinkInChain() != NULL && 
pEditStatus->IsPageOverflow() && !nStat ) // do it only if it is a call 
explicitly for chaining (status word already cleared)
 {
 // set the need for chaining
 SetToBeChained( pEditStatus->IsPageOverflow() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source svx/source

[matteocam]

 editeng/source/editeng/impedit3.cxx |2 +-
 svx/source/svdraw/svdotext.cxx  |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 651a5edee2991a4ed6fa7227fb7ddb8f7168d66b
Author: matteocam 
Date:   Thu Aug 14 15:20:36 2014 +0200

Removed status words'checks for overflow

Change-Id: I10a5032be60a83dd6ca7b4429a967f9a9b80edcb

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index 6393b29..b0bf25e 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -518,7 +518,7 @@ void ImpEditEngine::CallStatusHdlChaining()
 // since other Flags might be set in the handler...
 EditStatus aTmpStatus( aStatus );
 aStatus.Clear(); // No need for this with chaining. It does not affect 
it either way.
-//aStatusHdlLinkChaining.Call( &aTmpStatus );
+aStatusHdlLinkChaining.Call( &aTmpStatus );
 aStatusTimer.Stop();// If called by hand ...
 }
 }
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 0e32745..be2d8fd 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1936,7 +1936,7 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus* 
pEditStatus )
 const bool bGrowX=(nStat & EE_STAT_TEXTWIDTHCHANGED) !=0;
 const bool bGrowY=(nStat & EE_STAT_TEXTHEIGHTCHANGED) !=0;
 const bool bOverflow = (nStat & 0x0100) != 0;
-if(bTextFrame && (bGrowX || bGrowY || bOverflow))
+if(bTextFrame && (bGrowX || bGrowY))
 {
 if ((bGrowX && IsAutoGrowWidth()) || (bGrowY && IsAutoGrowHeight()))
 {
@@ -1953,7 +1953,7 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus* 
pEditStatus )
 ImpAutoFitText(*pEdtOutl);
 mbInDownScale = false;
 }
-else if ( GetNextLinkInChain() != NULL && 
pEditStatus->IsPageOverflow() && !nStat ) // do it only if it is a call 
explicitly for chaining (status word already cleared)
+else if ( GetNextLinkInChain() != NULL && !nStat ) // do it only if it 
is a call explicitly for chaining (status word already cleared)
 {
 // set the need for chaining
 SetToBeChained( pEditStatus->IsPageOverflow() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source svx/source

[matteocam]

 editeng/source/editeng/impedit3.cxx |2 +-
 svx/source/svdraw/svdotext.cxx  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 89f2fa2febecbb1a1ed2667b18eb3bc1b148c895
Author: matteocam 
Date:   Thu Aug 14 15:45:19 2014 +0200

No clearing of status after handling chainging

Change-Id: I421fcf3d015026c3e06a99c4a726bbc2f2111296

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index b0bf25e..b0db341 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -517,7 +517,7 @@ void ImpEditEngine::CallStatusHdlChaining()
 // The Status has to be reset before the Call,
 // since other Flags might be set in the handler...
 EditStatus aTmpStatus( aStatus );
-aStatus.Clear(); // No need for this with chaining. It does not affect 
it either way.
+//aStatus.Clear(); // No need for this with chaining. It does not 
affect it either way.
 aStatusHdlLinkChaining.Call( &aTmpStatus );
 aStatusTimer.Stop();// If called by hand ...
 }
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index be2d8fd..dd16447 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1936,7 +1936,7 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus* 
pEditStatus )
 const bool bGrowX=(nStat & EE_STAT_TEXTWIDTHCHANGED) !=0;
 const bool bGrowY=(nStat & EE_STAT_TEXTHEIGHTCHANGED) !=0;
 const bool bOverflow = (nStat & 0x0100) != 0;
-if(bTextFrame && (bGrowX || bGrowY))
+if(bTextFrame && (bGrowX || bGrowY || !nStat))
 {
 if ((bGrowX && IsAutoGrowWidth()) || (bGrowY && IsAutoGrowHeight()))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara]

 vcl/source/outdev/text.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 4c1e2c446865b355f50720b8b96ec704822006dc
Author: Caolán McNamara 
Date:   Thu Aug 14 14:43:17 2014 +0100

Resolves: fdo#82550 MacOSX GetTextBreak always return -1

so multiline text ends up splitting over a huge number of
lines leading to massively tall dialogs when they contain
text which is supposed to line break

regression from 6ca2d0d6645a697d323593a401ea8b1da02445bf

Change-Id: I51cecd9164112af3208bffced63aed7e261ea9e2

diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 75ac162..f60062b 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -1428,12 +1428,12 @@ sal_Int32 OutputDevice::GetTextBreak( const OUString& 
rStr, long nTextWidth,
 long nWidthFactor = pSalLayout->GetUnitsPerPixel();
 long nSubPixelFactor = (nWidthFactor < 64 ) ? 64 : 1;
 nTextWidth *= nWidthFactor * nSubPixelFactor;
-DeviceCoordinate nTextPixelWidth = LogicWidthToDeviceCoordinate( 
nTextWidth );
-DeviceCoordinate nExtraPixelWidth = 0;
+long nTextPixelWidth = ImplLogicWidthToDevicePixel( nTextWidth );
+long nExtraPixelWidth = 0;
 if( nCharExtra != 0 )
 {
 nCharExtra *= nWidthFactor * nSubPixelFactor;
-nExtraPixelWidth = LogicWidthToDeviceCoordinate( nCharExtra );
+nExtraPixelWidth = ImplLogicWidthToDevicePixel( nCharExtra );
 }
 nRetVal = pSalLayout->GetTextBreak( nTextPixelWidth, nExtraPixelWidth, 
nSubPixelFactor );
 
@@ -1462,12 +1462,12 @@ sal_Int32 OutputDevice::GetTextBreak( const OUString& 
rStr, long nTextWidth,
 long nSubPixelFactor = (nWidthFactor < 64 ) ? 64 : 1;
 
 nTextWidth *= nWidthFactor * nSubPixelFactor;
-DeviceCoordinate nTextPixelWidth = LogicWidthToDeviceCoordinate( 
nTextWidth );
-DeviceCoordinate nExtraPixelWidth = 0;
+long nTextPixelWidth = ImplLogicWidthToDevicePixel( nTextWidth );
+long nExtraPixelWidth = 0;
 if( nCharExtra != 0 )
 {
 nCharExtra *= nWidthFactor * nSubPixelFactor;
-nExtraPixelWidth = LogicWidthToDeviceCoordinate( nCharExtra );
+nExtraPixelWidth = ImplLogicWidthToDevicePixel( nCharExtra );
 }
 
 // calculate un-hyphenated break position
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - sw/qa sw/source writerfilter/source

[Miklos Vajna]

 sw/qa/extras/ooxmlimport/data/hidemark.docx  |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |   13 
 sw/source/filter/ww8/rtfsdrexport.cxx|4 -
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |   48 +++
 writerfilter/source/dmapper/PropertyIds.cxx  |1 
 writerfilter/source/dmapper/PropertyIds.hxx  |1 
 writerfilter/source/dmapper/TablePropertiesHandler.cxx   |8 ++
 7 files changed, 72 insertions(+), 3 deletions(-)

New commits:
commit d1278ef4849661b9ae0eb7aaf4d74fbf91ccaf11
Author: Miklos Vajna 
Date:   Thu Aug 14 13:54:18 2014 +0200

bnc#865381 DOCX import: handle  table cell property

Change-Id: Id0dd34110376168e34df4956869608895b86abfe

diff --git a/sw/qa/extras/ooxmlimport/data/hidemark.docx 
b/sw/qa/extras/ooxmlimport/data/hidemark.docx
new file mode 100644
index 000..4a273d6
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/hidemark.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 371b303..7c8f13b 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2320,6 +2320,19 @@ 
DECLARE_OOXMLIMPORT_TEST(testFloatingTableSectionColumns, "floating-table-sectio
 CPPUNIT_ASSERT( tableWidth.toInt32() > 1 );
 }
 
+DECLARE_OOXMLIMPORT_TEST(testHidemark, "hidemark.docx")
+{
+// Problem was that  cell property was ignored.
+uno::Reference xTablesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xTables(xTablesSupplier->getTextTables( ), uno::UNO_QUERY);
+uno::Reference xTextTable(xTables->getByIndex(0), 
uno::UNO_QUERY);
+uno::Reference xTableRows(xTextTable->getRows(), 
uno::UNO_QUERY);
+// Height should be minimal
+CPPUNIT_ASSERT_EQUAL(convertTwipToMm100(MINLAY), 
getProperty(xTableRows->getByIndex(1), "Height"));
+// Size type was MIN, should be FIX to avoid considering the end of 
paragraph marker.
+CPPUNIT_ASSERT_EQUAL(text::SizeType::FIX, 
getProperty(xTableRows->getByIndex(1), "SizeType"));
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx 
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 8a121fa..0daa890 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -29,9 +29,11 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
+#include 
 
 #ifdef DEBUG_DOMAINMAPPER
 #include 
@@ -804,12 +806,50 @@ CellPropertyValuesSeq_t 
DomainMapperTableHandler::endTableGetCellProperties(Tabl
 return aCellProperties;
 }
 
+/// Do all cells in this row have a CellHideMark property?
+bool lcl_hideMarks(PropertyMapVector1& rCellProperties)
+{
+for (size_t nCell = 0; nCell < rCellProperties.size(); ++nCell)
+if (!rCellProperties[nCell]->isSet(PROP_CELL_HIDE_MARK))
+return false;
+return true;
+}
+
+/// Are all cells in this row empty?
+bool lcl_emptyRow(TableSequence_t& rTableSeq, sal_Int32 nRow)
+{
+if (nRow >= rTableSeq.getLength())
+{
+SAL_WARN("writerfilter", "m_aCellProperties not in sync with 
m_pTableSeq?");
+return false;
+}
+
+RowSequence_t rRowSeq = rTableSeq[nRow];
+uno::Reference 
xTextRangeCompare(rRowSeq[0][0]->getText(), uno::UNO_QUERY);
+try
+{
+for (sal_Int32 nCell = 0; nCell < rRowSeq.getLength(); ++nCell)
+// See SwXText::Impl::ConvertCell(), we need to compare the start 
of
+// the start and the end of the end. However for our text ranges, 
only
+// the starts are set, so compareRegionStarts() does what we need.
+if (xTextRangeCompare->compareRegionStarts(rRowSeq[nCell][0], 
rRowSeq[nCell][1]) != 0)
+return false;
+}
+catch (lang::IllegalArgumentException& e)
+{
+SAL_WARN("writerfilter", "compareRegionStarts() failed: " << 
e.Message);
+return false;
+}
+return true;
+}
+
 RowPropertyValuesSeq_t DomainMapperTableHandler::endTableGetRowProperties()
 {
 #ifdef DEBUG_DOMAINMAPPER
 dmapper_logger->startElement("getRowProperties");
 #endif
 
+static const int MINLAY = 23; // sw/inc/swtypes.hxx, minimal possible size 
of frames.
 RowPropertyValuesSeq_t aRowProperties( m_aRowProperties.size() );
 PropertyMapVector1::const_iterator aRowIter = m_aRowProperties.begin();
 PropertyMapVector1::const_iterator aRowIterEnd = m_aRowProperties.end();
@@ -826,6 +866,14 @@ RowPropertyValuesSeq_t 
DomainMapperTableHandler::endTableGetRowProperties()
 // tblHeader is only our property, remove before the property map 
hits UNO
 (*aRowIter)->Erase(PROP_TBL_HEADER);
 
+if (lcl_hideMarks(m_aCellProperties[nRow]) && 
lcl_emptyRow(*m_pTableSeq, nRow))
+{
+// We have CellHideMark on all 

[Libreoffice-commits] core.git: helpcontent2

[Caolán McNamara]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b8f3c0536d84e15b05a088f11cd5db99e5c4f2a7
Author: Caolán McNamara 
Date:   Thu Aug 14 15:11:26 2014 +0100

Updated core
Project: help  65caf6f111cd29d807ab5b75bbe094804c0fa6eb

diff --git a/helpcontent2 b/helpcontent2
index 1fbcc73..65caf6f 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 1fbcc737e36231426bedfdca0b172bbb90279d64
+Subproject commit 65caf6f111cd29d807ab5b75bbe094804c0fa6eb
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: helpers/help_hid.lst

[Caolán McNamara]

 helpers/help_hid.lst |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 65caf6f111cd29d807ab5b75bbe094804c0fa6eb
Author: Caolán McNamara 
Date:   Thu Aug 14 15:11:26 2014 +0100

drop help ids that go nowhere

Change-Id: Iad9a0aae264c28c301bd0e05c0ee15f3c8b453f3

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index f2b9826..e6b9e51 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1279,7 +1279,6 @@ HID_DLG_FLDEDT_ADDRESS,53061,
 HID_DLG_FLDEDT_NEXT,53059,
 HID_DLG_FLDEDT_PREV,53060,
 HID_DLG_NAME,33818,
-HID_DLG_NEWERVERSIONWARNING,35848,
 HID_DLG_PASSWD_SECTION,53440,
 HID_DLG_WORDCOUNT,54987,
 HID_DOCINFO_EDT,33070,
@@ -5693,7 +5692,6 @@ uui_ListBox_DLG_FILTER_SELECT_LB_FILTERS,1311477279,
 uui_PushButton_DLG_COOKIES_BTN_COOKIES_CANCEL,1311363614,
 uui_PushButton_DLG_COOKIES_BTN_COOKIES_OK,1311363615,
 uui_PushButton_DLG_UUI_LOGIN_BTN_LOGIN_PATH,1311347224,
-uui_PushButton_RID_DLG_NEWER_VERSION_WARNING_PB_UPDATE,1312182797,
 uui_RadioButton_DLG_COOKIES_RB_INFUTURE_IGNORE,1311359509,
 uui_RadioButton_DLG_COOKIES_RB_INFUTURE_INTERACTIVE,1311359510,
 uui_RadioButton_DLG_COOKIES_RB_INFUTURE_SEND,1311359508,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - offapi/com offapi/UnoApi_offapi.mk sfx2/inc sfx2/source uui/AllLangResTarget_uui.mk uui/inc uui/Library_uui.mk uui/source

[Caolán McNamara]

 offapi/UnoApi_offapi.mk|1 
 offapi/com/sun/star/task/FutureDocumentVersionProductUpdateRequest.idl |   56 
---
 sfx2/inc/pch/precompiled_sfx.hxx   |1 
 sfx2/source/doc/objstor.cxx|1 
 uui/AllLangResTarget_uui.mk|1 
 uui/Library_uui.mk |1 
 uui/inc/pch/precompiled_uui.hxx|1 
 uui/source/iahndl.cxx  |   83 

 uui/source/iahndl.hxx  |   10 
 uui/source/ids.hrc |3 
 uui/source/newerverwarn.cxx|  175 
--
 uui/source/newerverwarn.hrc|   50 
--
 uui/source/newerverwarn.hxx|   54 
---
 uui/source/newerverwarn.src|   76 

 14 files changed, 1 insertion(+), 512 deletions(-)

New commits:
commit ca7c9f647f965574ca90e238305a082855106cb0
Author: Caolán McNamara 
Date:   Thu Aug 14 15:08:31 2014 +0100

remove unpublished unused FutureDocumentVersionProductUpdateRequest

Change-Id: Icdfc9c02df251680b6f01fac184be9484edf8870

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 364581d..b317d8c 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -3638,7 +3638,6 @@ $(eval $(call 
gb_UnoApi_add_idlfiles,offapi,com/sun/star/task,\
DocumentPasswordRequest2 \
ErrorCodeIOException \
ErrorCodeRequest \
-   FutureDocumentVersionProductUpdateRequest \
InteractionClassification \
MasterPasswordRequest \
NoMasterException \
diff --git 
a/offapi/com/sun/star/task/FutureDocumentVersionProductUpdateRequest.idl 
b/offapi/com/sun/star/task/FutureDocumentVersionProductUpdateRequest.idl
deleted file mode 100644
index 6ca61a3..000
--- a/offapi/com/sun/star/task/FutureDocumentVersionProductUpdateRequest.idl
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * 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 .
- */
-
-#include 
-
-#ifndef __com_sun_star_task_FutureDocumentVersionProductUpdateRequest_idl__
-#define __com_sun_star_task_FutureDocumentVersionProductUpdateRequest_idl__
-
-
-module com { module sun { module star { module task {
-
-
-/** describes a request to the user to update OpenOffice.org to a newer 
version, since
-an ODF document was encountered which conforms to an ODF version unknown 
to the
-current OpenOffice.org version.
-
-An interaction request of this type usually comes with an 
XInteractionApprove,
-and XInteractionDisapprove, and XInteractionAskLater continuation.
- */
-exception FutureDocumentVersionProductUpdateRequest : 
ClassifiedInteractionRequest
-{
-/// specifies the URL of the document which conforms to a future ODF 
version
-string DocumentURL;
-
-/** the ODF version which the document conforms to
-
-If the request was not issued because of a too-new ODF version of 
the document, but because
-the application detected by other means that the document was too-new, 
then DocumentODFVersion
-is allowed to be empty
-*/
-string DocumentODFVersion;
-};
-
-
-}; }; }; };
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit efb658bc0d287a7c85cd90a339f72eddd4547fed
Author: Caolán McNamara 
Date:   Thu Aug 14 15:04:16 2014 +0100

FutureDocumentVersionProductUpdateRequest is never created

only extracted, so seeing as nothing inherits from it and
nothing creates another one, everything dependent on it
existing is dead code, which enables removing the
RID_DLG_NEWER_VERSION_WARNING dialog

Change-Id: I9515abdfeebbe60f6cd88a160524327d039403f6

diff --git a/uui/AllLangResTarget_uui.mk b/uui/AllLangResTarget_uui.mk
index 36a9a0b..89cfad0 100644
--- a/uui/AllLangResTarget_

[Libreoffice-commits] core.git: helpcontent2

[Caolán McNamara]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dbaed27d3cc8c0c1a61543de9445b9a8de87e03b
Author: Caolán McNamara 
Date:   Thu Aug 14 15:41:44 2014 +0100

Updated core
Project: help  7cef65b120c00b4bdfb37859429ecbe5ed4f660b

diff --git a/helpcontent2 b/helpcontent2
index 65caf6f..7cef65b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 65caf6f111cd29d807ab5b75bbe094804c0fa6eb
+Subproject commit 7cef65b120c00b4bdfb37859429ecbe5ed4f660b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: helpers/help_hid.lst

[Caolán McNamara]

 helpers/help_hid.lst |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 7cef65b120c00b4bdfb37859429ecbe5ed4f660b
Author: Caolán McNamara 
Date:   Thu Aug 14 15:41:44 2014 +0100

drop help ids that go nowhere

Change-Id: Id9ceb69e676846b4c424fbcc57daa54e0c29db88

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index e6b9e51..3040d75 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -4998,11 +4998,9 @@ 
desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_NEVER,586088967,
 desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_NOW,586088965,
 extensions_CheckBox_RID_TP_LICENSE_CB_ACCEPT,55366,
 
extensions_Edit_RID_PAGE_LCW_CONTENTSELECTION_FIELD_ET_DISPLAYEDFIELD,859768836,
-extensions_ListBox_RID_DLG_SELECTION_LB_ENTRIES,1090178561,
 
extensions_ListBox_RID_PAGE_LCW_CONTENTSELECTION_FIELD_LB_SELECTFIELD,859770374,
 extensions_ListBox_RID_PAGE_OPTION_DBFIELD_LB_STOREINFIELD,859721220,
 extensions_ModalDialog_RID_DLG_OEMWIZARD,1090519040,
-extensions_ModalDialog_RID_DLG_SELECTION,1090174976,
 extensions_MultiLineEdit_RID_TP_LICENSE_ML_LICENSE,553667083,
 extensions_PushButton_RID_DLG_OEMWIZARD_PB_NEXT,1090523650,
 extensions_PushButton_RID_DLG_OEMWIZARD_PB_PREV,1090523649,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extensions/AllLangResTarget_pcr.mk extensions/source extensions/uiconfig extensions/UIConfig_spropctrlr.mk

[Caolán McNamara]

 extensions/AllLangResTarget_pcr.mk|4 
 extensions/UIConfig_spropctrlr.mk |1 
 extensions/source/propctrlr/formresid.hrc |5 
 extensions/source/propctrlr/listselectiondlg.cxx  |   47 ++
 extensions/source/propctrlr/listselectiondlg.hxx  |   15 --
 extensions/source/propctrlr/listselectiondlg.src  |   72 --
 extensions/uiconfig/spropctrlr/ui/listselectdialog.ui |  121 ++
 7 files changed, 142 insertions(+), 123 deletions(-)

New commits:
commit 93a4899047efb2c3eab1a8b7c9abe65a59ccb0f3
Author: Caolán McNamara 
Date:   Thu Aug 14 15:38:08 2014 +0100

convert RID_DLG_SELECTION to .ui format

Change-Id: Ib23d8ec34c757bb8268651d4a1d00c6528dac9c1

diff --git a/extensions/AllLangResTarget_pcr.mk 
b/extensions/AllLangResTarget_pcr.mk
index 0480dfc..a305fd9 100644
--- a/extensions/AllLangResTarget_pcr.mk
+++ b/extensions/AllLangResTarget_pcr.mk
@@ -32,8 +32,4 @@ $(eval $(call gb_SrsTarget_add_files,pcr/res,\
extensions/source/propctrlr/formlinkdialog.src \
 ))
 
-$(eval $(call gb_SrsTarget_add_nonlocalizable_files,pcr/res,\
-extensions/source/propctrlr/listselectiondlg.src \
-))
-
 # vim:set noet sw=4 ts=4:
diff --git a/extensions/UIConfig_spropctrlr.mk 
b/extensions/UIConfig_spropctrlr.mk
index 9793906..eda1044 100644
--- a/extensions/UIConfig_spropctrlr.mk
+++ b/extensions/UIConfig_spropctrlr.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/spropctrlr,\
extensions/uiconfig/spropctrlr/ui/fieldlinkrow \
extensions/uiconfig/spropctrlr/ui/formlinksdialog \
extensions/uiconfig/spropctrlr/ui/labelselectiondialog \
+   extensions/uiconfig/spropctrlr/ui/listselectdialog \
extensions/uiconfig/spropctrlr/ui/taborder \
 ))
 
diff --git a/extensions/source/propctrlr/formresid.hrc 
b/extensions/source/propctrlr/formresid.hrc
index 3396a83..48625eb 100644
--- a/extensions/source/propctrlr/formresid.hrc
+++ b/extensions/source/propctrlr/formresid.hrc
@@ -274,11 +274,6 @@
 
 #define RID_STR_CONFIRM_DELETE_DATA_TYPE( RID_FORMBROWSER_START + 500 )
 
-// - dialogs
-
-#define RID_DLG_TABORDER( RID_PROPCONTROLLER_START +  1 )
-#define RID_DLG_SELECTION   ( RID_PROPCONTROLLER_START +  3 )
-
 // - ImageLists
 
 #define RID_IL_FORMEXPLORER ( RID_PROPCONTROLLER_START +  0 )
diff --git a/extensions/source/propctrlr/listselectiondlg.cxx 
b/extensions/source/propctrlr/listselectiondlg.cxx
index 4c9d430..7808c27 100644
--- a/extensions/source/propctrlr/listselectiondlg.cxx
+++ b/extensions/source/propctrlr/listselectiondlg.cxx
@@ -18,47 +18,36 @@
  */
 
 #include "listselectiondlg.hxx"
-#include "listselectiondlg.hrc"
 
 #include "modulepcr.hxx"
 #include "formresid.hrc"
 #include "formstrings.hxx"
 #include 
 
-
 namespace pcr
 {
-
-
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 
-
-//= ListSelectionDialog
-
-
-ListSelectionDialog::ListSelectionDialog( Window* _pParent, const 
Reference< XPropertySet >& _rxListBox,
-const OUString& _rPropertyName, const OUString& _rPropertyUIName )
-:ModalDialog( _pParent, PcrRes( RID_DLG_SELECTION ) )
-,m_aLabel   ( this, PcrRes( FT_ENTRIES ) )
-,m_aEntries ( this, PcrRes( LB_ENTRIES ) )
-,m_aOK  ( this, PcrRes( PB_OK  ) )
-,m_aCancel  ( this, PcrRes( PB_CANCEL  ) )
-,m_aHelp( this, PcrRes( PB_HELP) )
+ListSelectionDialog::ListSelectionDialog(Window* _pParent, const 
Reference< XPropertySet >& _rxListBox,
+const OUString& _rPropertyName, const OUString& _rPropertyUIName)
+: ModalDialog( _pParent, "ListSelectDialog", 
"modules/spropctrlr/ui/listselectdialog.ui" )
 ,m_xListBox ( _rxListBox )
 ,m_sPropertyName( _rPropertyName )
 {
-FreeResource();
-
 OSL_PRECOND( m_xListBox.is(), 
"ListSelectionDialog::ListSelectionDialog: invalid list box!" );
 
-SetText( _rPropertyUIName );
-m_aLabel.SetText( _rPropertyUIName );
+get(m_pEntries, "treeview");
+Size aSize(LogicToPixel(Size(85, 97), MAP_APPFONT));
+m_pEntries->set_width_request(aSize.Width());
+m_pEntries->set_height_request(aSize.Height());
+
+SetText(_rPropertyUIName);
+get("frame")->set_label(_rPropertyUIName);
 
 initialize( );
 }
 
-
 short ListSelectionDialog::Execute()
 {
 short nResult = ModalDialog::Execute();
@@ -75,14 +64,14 @@ namespace pcr
 if ( !m_xListBox.is() )
 return;
 
-m_aEntries.SetStyle( GetStyle() | WB_SIMPLEMODE );
+m_pEntries->SetStyle( GetStyle() | WB_SIMPLEMODE );
 
 try
 {
 // initialize the multi-selection flag
 bool bMultiSelection = false;
 OSL_VERIFY( m_xListBox->getPropertyValue( PROPERTY_MULTISELECTION 
) >>= bMultiSelectio

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - vcl/aqua

[Julien Nabet]

 vcl/aqua/source/window/salframe.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d4928dde73ca036e6337eb089faca3c8c2c93445
Author: Julien Nabet 
Date:   Tue Aug 12 21:43:45 2014 +0200

fdo#39477: Mac Keyboard shortcut Option key ko in Customize dialog

(+ fdo#49280)
I couldn't cherry-pick directly since the arbo is different between 4.2 and 
4.3+
Indeed vcl/aqua is now vcl/osx

Change-Id: I45a834c5ec1e4c4c5c4fd6960b48963df5656a7e
Reviewed-on: https://gerrit.libreoffice.org/10898
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/aqua/source/window/salframe.cxx 
b/vcl/aqua/source/window/salframe.cxx
index 523fbda..6eb9ba25 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -1110,7 +1110,7 @@ OUString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode )
 // we do not really handle Alt (see below)
 // we map it to MOD3, whichis actually Command
 if( (nKeyCode & (KEY_MOD2|KEY_MOD3)) != 0 )
-aResult.append( sal_Unicode( 0x2303 ) );
+aResult.append( sal_Unicode( 0x2325 ) );
 
 aResult.append( it->second );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: 7 commits - chart2/source extensions/source hwpfilter/source l10ntools/source sal/osl unoidl/source

[Miklos Vajna]

Hi,

On Tue, Aug 12, 2014 at 12:03:45PM +0100, Caolán McNamara  
wrote:
> FWIW I played around with clang-format to see what combination of rules
> gave the smallest diff against the code of sw/source/filter/ww8 and
> below is what I got as far as before abandoning that line of thought.

Just to mention one more option, document liberation projects use astyle
to keep style consistent. writerfilter/source/rtftok/astyle.options
contains the config I use to keep new files I create consistent.

(Nevertheless, if we could agree on a global style -- then I'm happy to
abandon that, as long as then a commit hook enforces keeping that
consistency.)

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: sfx2/source

[Caolán McNamara]

 sfx2/source/appl/appuno.cxx   |1 +
 sfx2/source/doc/objstor.cxx   |1 -
 sfx2/source/inc/fltoptint.hxx |1 -
 3 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 0c830d899dc4095cfa29d05789bc30b2f468b418
Author: Caolán McNamara 
Date:   Thu Aug 14 16:09:33 2014 +0100

reduce num of FilterOptionsRequest includes

Change-Id: I403bb7b96e8bcaa6138cdd9be823657bc47fa7ca

diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index a16ab3e..c77707b 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -60,6 +60,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 3360dbf..7de5349 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -34,7 +34,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sfx2/source/inc/fltoptint.hxx b/sfx2/source/inc/fltoptint.hxx
index d9684b1..1572cc7 100644
--- a/sfx2/source/inc/fltoptint.hxx
+++ b/sfx2/source/inc/fltoptint.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SFX2_SOURCE_INC_FLTOPTINT_HXX
 #define INCLUDED_SFX2_SOURCE_INC_FLTOPTINT_HXX
 
-#include 
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 6 commits - chart2/source editeng/source include/editeng svx/source

[Kohei Yoshida]

 chart2/source/view/charttypes/PieChart.cxx |  229 -
 chart2/source/view/charttypes/PieChart.hxx |   22 +-
 editeng/source/outliner/outlobj.cxx|  152 +--
 include/editeng/outlobj.hxx|5 
 svx/source/unodraw/unopage.cxx |  150 +-
 svx/source/unodraw/unoprov.cxx |   97 ++--
 svx/source/unodraw/unoshap2.cxx|   62 ---
 7 files changed, 379 insertions(+), 338 deletions(-)

New commits:
commit aa3babb42fa88840706f5b487ca0e88552cd8f83
Author: Kohei Yoshida 
Date:   Thu Aug 14 10:57:09 2014 -0400

Use boost::intrusive_ptr in lieu of manual ref-counting.

Change-Id: I0a29a1e490f5aa52a9057be71164573e403affe9

diff --git a/editeng/source/outliner/outlobj.cxx 
b/editeng/source/outliner/outlobj.cxx
index d4aee9d..9a5ead1 100644
--- a/editeng/source/outliner/outlobj.cxx
+++ b/editeng/source/outliner/outlobj.cxx
@@ -32,24 +32,25 @@
 #include 
 #include 
 
+#include 
+
 /**
  * This is the guts of OutlinerParaObject, refcounted and shared among
  * multiple instances of OutlinerParaObject.
  */
-class OutlinerParaObjData
+struct OutlinerParaObjData
 {
-public:
 // data members
 EditTextObject* mpEditTextObject;
 ParagraphDataVector maParagraphDataVector;
 boolmbIsEditDoc;
 
 // refcounter
-sal_uInt32  mnRefCount;
+mutable size_t mnRefCount;
 
 // constuctor
-OutlinerParaObjData(EditTextObject* pEditTextObject, const 
ParagraphDataVector& rParagraphDataVector, bool bIsEditDoc)
-:   mpEditTextObject(pEditTextObject),
+OutlinerParaObjData( EditTextObject* pEditTextObject, const 
ParagraphDataVector& rParagraphDataVector, bool bIsEditDoc ) :
+mpEditTextObject(pEditTextObject),
 maParagraphDataVector(rParagraphDataVector),
 mbIsEditDoc(bIsEditDoc),
 mnRefCount(0)
@@ -58,6 +59,11 @@ public:
 maParagraphDataVector.resize(pEditTextObject->GetParagraphCount());
 }
 
+OutlinerParaObjData( const OutlinerParaObjData& r ) :
+mpEditTextObject(r.mpEditTextObject->Clone()),
+maParagraphDataVector(r.maParagraphDataVector),
+mbIsEditDoc(r.mbIsEditDoc) {}
+
 // destructor
 ~OutlinerParaObjData()
 {
@@ -78,41 +84,37 @@ public:
 }
 };
 
+inline void intrusive_ptr_add_ref(const OutlinerParaObjData* p)
+{
+++p->mnRefCount;
+}
+
+inline void intrusive_ptr_release(const OutlinerParaObjData* p)
+{
+--p->mnRefCount;
+if (!p->mnRefCount)
+delete p;
+}
+
 struct OutlinerParaObject::Impl
 {
-OutlinerParaObjData* mpData;
+typedef boost::intrusive_ptr DataRef;
+DataRef mxData;
 
 Impl( const EditTextObject& rTextObj, const ParagraphDataVector& 
rParaData, bool bIsEditDoc ) :
-mpData(new OutlinerParaObjData(rTextObj.Clone(), rParaData, 
bIsEditDoc)) {}
+mxData(new OutlinerParaObjData(rTextObj.Clone(), rParaData, 
bIsEditDoc)) {}
 
 Impl( const EditTextObject& rTextObj ) :
-mpData(new OutlinerParaObjData(rTextObj.Clone(), 
ParagraphDataVector(), true)) {}
+mxData(new OutlinerParaObjData(rTextObj.Clone(), 
ParagraphDataVector(), true)) {}
 
-Impl( const Impl& r ) : mpData(r.mpData)
-{
-mpData->mnRefCount++;
-}
+Impl( const Impl& r ) : mxData(r.mxData) {}
 
-~Impl()
-{
-if (mpData->mnRefCount)
-mpData->mnRefCount--;
-else
-delete mpData;
-}
+~Impl() {}
 };
 
 void OutlinerParaObject::ImplMakeUnique()
 {
-if (mpImpl->mpData->mnRefCount)
-{
-OutlinerParaObjData* pNew = new OutlinerParaObjData(
-mpImpl->mpData->mpEditTextObject->Clone(),
-mpImpl->mpData->maParagraphDataVector,
-mpImpl->mpData->mbIsEditDoc);
-mpImpl->mpData->mnRefCount--;
-mpImpl->mpData = pNew;
-}
+mpImpl->mxData.reset(new OutlinerParaObjData(*mpImpl->mxData));
 }
 
 OutlinerParaObject::OutlinerParaObject(
@@ -124,86 +126,72 @@ OutlinerParaObject::OutlinerParaObject( const 
EditTextObject& rTextObj ) :
 {
 }
 
-OutlinerParaObject::OutlinerParaObject(const OutlinerParaObject& rCandidate) :
-mpImpl(new Impl(*rCandidate.mpImpl)) {}
+OutlinerParaObject::OutlinerParaObject( const OutlinerParaObject& r ) :
+mpImpl(new Impl(*r.mpImpl)) {}
 
 OutlinerParaObject::~OutlinerParaObject()
 {
 delete mpImpl;
 }
 
-OutlinerParaObject& OutlinerParaObject::operator=(const OutlinerParaObject& 
rCandidate)
+OutlinerParaObject& OutlinerParaObject::operator=( const OutlinerParaObject& r 
)
 {
-if(rCandidate.mpImpl->mpData != mpImpl->mpData)
-{
-if (mpImpl->mpData->mnRefCount)
-{
-mpImpl->mpData->mnRefCount--;
-}
-else
-{
-delete mpImpl->mpData;
-}
-
-mpImpl->mpData = rCandidate.mpImpl->mpData;
-mpImpl->mpData->mnRefCount++;
-}
-

[Libreoffice-commits] core.git: extensions/source extensions/uiconfig extensions/UIConfig_sabpilot.mk

[Palenik Mihály]

 extensions/UIConfig_sabpilot.mk  |1 
 extensions/source/dbpilots/commonpagesdbp.cxx|   21 +--
 extensions/source/dbpilots/commonpagesdbp.hxx|   12 --
 extensions/source/dbpilots/commonpagesdbp.src|   52 
 extensions/source/dbpilots/dbpresid.hrc  |   28 
 extensions/uiconfig/sabpilot/ui/optiondbfieldpage.ui |  111 +++
 6 files changed, 130 insertions(+), 95 deletions(-)

New commits:
commit 3953eb3d83f4bb2f388eb1853f1f4976b150bab1
Author: Palenik Mihály 
Date:   Thu Aug 14 15:39:05 2014 +0200

Convert RID_PAGE_OPTION_DBFIELD tabpage to .ui

Change-Id: I5ab4c42cf5467254423396ce4f56390fc2fb5276
Reviewed-on: https://gerrit.libreoffice.org/10920
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/extensions/UIConfig_sabpilot.mk b/extensions/UIConfig_sabpilot.mk
index 0456655..8dfe146 100644
--- a/extensions/UIConfig_sabpilot.mk
+++ b/extensions/UIConfig_sabpilot.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/sabpilot,\
extensions/uiconfig/sabpilot/ui/gridfieldsselectionpage \
extensions/uiconfig/sabpilot/ui/groupradioselectionpage \
extensions/uiconfig/sabpilot/ui/invokeadminpage \
+   extensions/uiconfig/sabpilot/ui/optiondbfieldpage \
extensions/uiconfig/sabpilot/ui/optionsfinalpage \
extensions/uiconfig/sabpilot/ui/optionvaluespage \
extensions/uiconfig/sabpilot/ui/selecttablepage \
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx 
b/extensions/source/dbpilots/commonpagesdbp.cxx
index 414b5e3..25090d8 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -456,17 +456,16 @@ namespace dbp
 
 
 ODBFieldPage::ODBFieldPage( OControlWizard* _pParent )
-:OMaybeListSelectionPage(_pParent, ModuleRes(RID_PAGE_OPTION_DBFIELD))
-,m_aFrame   (this, ModuleRes(FL_DATABASEFIELD_EXPL))
-,m_aDescription (this, ModuleRes(FT_DATABASEFIELD_EXPL))
-,m_aQuestion(this, ModuleRes(FT_DATABASEFIELD_QUEST))
-,m_aStoreYes(this, ModuleRes(RB_STOREINFIELD_YES))
-,m_aStoreNo (this, ModuleRes(LB_STOREINFIELD))
-,m_aStoreWhere  (this, ModuleRes(RB_STOREINFIELD_NO))
+:OMaybeListSelectionPage(_pParent, "OptionDBField", 
"modules/sabpilot/ui/optiondbfieldpage.ui")
 {
-FreeResource();
-announceControls(m_aStoreYes, m_aStoreNo, m_aStoreWhere);
-m_aStoreWhere.SetDropDownLineCount(10);
+get(m_pDescription, "explLabel");
+get(m_pStoreYes, "yesRadiobutton");
+get(m_pStoreNo, "noRadiobutton");
+get(m_pStoreWhere, "storeInFieldCombobox");
+SetText(ModuleRes(RID_STR_OPTION_DB_FIELD_TITLE));
+
+announceControls(*m_pStoreYes, *m_pStoreNo, *m_pStoreWhere);
+m_pStoreWhere->SetDropDownLineCount(10);
 }
 
 
@@ -475,7 +474,7 @@ namespace dbp
 OMaybeListSelectionPage::initializePage();
 
 // fill the fields page
-fillListBox(m_aStoreWhere, getContext().aFieldNames);
+fillListBox(*m_pStoreWhere, getContext().aFieldNames);
 
 implInitialize(getDBFieldSetting());
 }
diff --git a/extensions/source/dbpilots/commonpagesdbp.hxx 
b/extensions/source/dbpilots/commonpagesdbp.hxx
index 09ccc77..d8da418 100644
--- a/extensions/source/dbpilots/commonpagesdbp.hxx
+++ b/extensions/source/dbpilots/commonpagesdbp.hxx
@@ -106,18 +106,16 @@ namespace dbp
 class ODBFieldPage : public OMaybeListSelectionPage
 {
 protected:
-FixedLine   m_aFrame;
-FixedText   m_aDescription;
-FixedText   m_aQuestion;
-RadioButton m_aStoreYes;
-RadioButton m_aStoreNo;
-ListBox m_aStoreWhere;
+FixedText*  m_pDescription;
+RadioButton*m_pStoreYes;
+RadioButton*m_pStoreNo;
+ListBox*m_pStoreWhere;
 
 public:
 ODBFieldPage( OControlWizard* _pParent );
 
 protected:
-void setDescriptionText(const OUString& _rDesc) { 
m_aDescription.SetText(_rDesc); }
+void setDescriptionText(const OUString& _rDesc) { 
m_pDescription->SetText(_rDesc); }
 
 // OWizardPage overridables
 virtual void initializePage() SAL_OVERRIDE;
diff --git a/extensions/source/dbpilots/commonpagesdbp.src 
b/extensions/source/dbpilots/commonpagesdbp.src
index d40c759..896bc0e 100644
--- a/extensions/source/dbpilots/commonpagesdbp.src
+++ b/extensions/source/dbpilots/commonpagesdbp.src
@@ -32,59 +32,9 @@ Image IMG_QUERY
 MaskColor = Color { Red = 0x; Green = 0x0; Blue = 0x; };
 };
 
-TabPage RID_PAGE_OPTION_DBFIELD
+String RID_STR_OPTION_DB_FIELD_TITLE
 {
-HelpID = "extensions:TabPage:RID_PAGE_OPTION_DBFIELD";
-SVLook = TRUE ;
-Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
 Text [ en-US ] = "Database Field";
-
-

[Libreoffice-commits] core.git: helpcontent2

[Caolán McNamara]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9aac367bcc8f189bd49b6c7c6f54a4ecd0b17b53
Author: Caolán McNamara 
Date:   Thu Aug 14 16:28:47 2014 +0100

Updated core
Project: help  658fb3a6464d2f73bfe853278596d57457fcee77

diff --git a/helpcontent2 b/helpcontent2
index 7cef65b..658fb3a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 7cef65b120c00b4bdfb37859429ecbe5ed4f660b
+Subproject commit 658fb3a6464d2f73bfe853278596d57457fcee77
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: helpers/help_hid.lst source/text

[Caolán McNamara]

 helpers/help_hid.lst   |4 
 source/text/shared/02/01170904.xhp |9 +++--
 source/text/shared/autopi/01120400.xhp |6 +++---
 3 files changed, 6 insertions(+), 13 deletions(-)

New commits:
commit 658fb3a6464d2f73bfe853278596d57457fcee77
Author: Caolán McNamara 
Date:   Thu Aug 14 16:28:47 2014 +0100

update help ids for combobo dbfield options page

Change-Id: Ibf2e4e8084967c114a1eea5ec9ffc8fb1fe5ae1a

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 3040d75..f5ba7de 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -4999,16 +4999,12 @@ 
desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_NOW,586088965,
 extensions_CheckBox_RID_TP_LICENSE_CB_ACCEPT,55366,
 
extensions_Edit_RID_PAGE_LCW_CONTENTSELECTION_FIELD_ET_DISPLAYEDFIELD,859768836,
 
extensions_ListBox_RID_PAGE_LCW_CONTENTSELECTION_FIELD_LB_SELECTFIELD,859770374,
-extensions_ListBox_RID_PAGE_OPTION_DBFIELD_LB_STOREINFIELD,859721220,
 extensions_ModalDialog_RID_DLG_OEMWIZARD,1090519040,
 extensions_MultiLineEdit_RID_TP_LICENSE_ML_LICENSE,553667083,
 extensions_PushButton_RID_DLG_OEMWIZARD_PB_NEXT,1090523650,
 extensions_PushButton_RID_DLG_OEMWIZARD_PB_PREV,1090523649,
 extensions_PushButton_RID_TP_LICENSE_PB_PAGEDOWN,553669138,
-extensions_RadioButton_RID_PAGE_OPTION_DBFIELD_RB_STOREINFIELD_NO,859718148,
-extensions_RadioButton_RID_PAGE_OPTION_DBFIELD_RB_STOREINFIELD_YES,859718147,
 extensions_TabPage_RID_PAGE_LCW_CONTENTSELECTION_FIELD,859766784,
-extensions_TabPage_RID_PAGE_OPTION_DBFIELD,859717632,
 extensions_TabPage_RID_TP_LICENSE,553664512,
 extensions_TabPage_RID_TP_WELCOME,553697280,
 filter_CheckBox_DLG_OPTIONS_BOOL_EXPORT_ALL,1090520065,
diff --git a/source/text/shared/02/01170904.xhp 
b/source/text/shared/02/01170904.xhp
index b611dfb..1eba3a4 100644
--- a/source/text/shared/02/01170904.xhp
+++ b/source/text/shared/02/01170904.xhp
@@ -41,15 +41,12 @@
 
 Do you want to save the value in a database 
field?
 Two options are available for this question:
-
 Yes, I want to save it in the following database 
field
-Specifies 
whether the user's entered or selected combination field value should be saved 
in a database field. Several database table fields are offered which 
can be accessed in the current form.
+Specifies whether 
the user's entered or selected combination field value should be saved in a 
database field. Several database table fields are offered which can be 
accessed in the current form.
 In Control - Properties the selected field appears as an entry 
in the Data tab page under Data field.
-
 List field
-Specifies the data 
field where the combination field value should be saved.
-
+Specifies the 
data field where the combination field value should be 
saved.
 No, I only want to save the value in the form
-Specifies that 
the value of this combination field will not be written in the database and 
will only be saved in the form.
+Specifies that the 
value of this combination field will not be written in the database and will 
only be saved in the form.
 
 
diff --git a/source/text/shared/autopi/01120400.xhp 
b/source/text/shared/autopi/01120400.xhp
index a6b14a0..21d112b 100644
--- a/source/text/shared/autopi/01120400.xhp
+++ b/source/text/shared/autopi/01120400.xhp
@@ -42,10 +42,10 @@
 This page is only displayed if the document is already linked to a 
database.
 Do you want to save the value in a database 
field?UFI: removed three help ids
 Yes, I want to save it in the following database 
field:
-Specifies 
that you want to save the reference values in a database. The values 
are written in the data field selected in the list box. The list box displays 
all the field names from the database table that the form is linked 
to.
+Specifies that you 
want to save the reference values in a database. The values are written 
in the data field selected in the list box. The list box displays all the field 
names from the database table that the form is linked to.
 List box
-Select the data field in which the reference values have to 
be saved.
+Select the data field in which the reference values have to 
be saved.
 No, I only want to save the value in the form.
-Specifies that 
you want to save the reference values in the form only, and not in the 
database.
+Specifies that you 
want to save the reference values in the form only, and not in the 
database.
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - 2 commits - editeng/source include/editeng svx/source

[matteocam]

 editeng/source/editeng/impedit.hxx  |2 +
 editeng/source/editeng/impedit3.cxx |   43 
 include/editeng/editstat.hxx|   12 +-
 svx/source/svdraw/svdotext.cxx  |6 ++---
 4 files changed, 36 insertions(+), 27 deletions(-)

New commits:
commit b515d44b620f9f667a0fb172583a62d0300e5a21
Author: matteocam 
Date:   Thu Aug 14 17:59:54 2014 +0200

Fixed overflow and chaining in edit status

Change-Id: I5c9c2f37056674090551dff1ccf90d306cc456f5

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index 19d2452..e299061 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -619,7 +619,6 @@ void ImpEditEngine::CheckPageOverflow()
 // which paragraph is the first to cause higher size of the box?
 UpdateOverflowingParaNum( nBoxHeight /*aPrevPaperSize.Height()*/ ); // 
XXX: currently only for horizontal text
 aStatus.SetPageOverflow(true);
-aStatus.GetStatusWord() |= 0x0100;
 } else
 {
 // No overflow if withing box boundaries
diff --git a/include/editeng/editstat.hxx b/include/editeng/editstat.hxx
index 0aadd3d..36a816d 100644
--- a/include/editeng/editstat.hxx
+++ b/include/editeng/editstat.hxx
@@ -71,6 +71,7 @@
 #define EE_STAT_TEXTWIDTHCHANGED0x0020
 #define EE_STAT_TEXTHEIGHTCHANGED   0x0040
 #define EE_STAT_WRONGWORDCHANGED0x0080
+#define EE_STAT_CHAININGSET 0x0100
 // #define EE_STAT_MODIFIED 0x0100
 
 /*
@@ -91,14 +92,15 @@ protected:
 sal_uLong   nStatusBits;
 sal_uLong   nControlBits;
 sal_Int32   nPrevPara;  // for EE_STAT_CRSRLEFTPARA
-
 boolbIsPageOverflow;
 
 public:
-EditStatus(){ nStatusBits = 0; nControlBits = 0;
-  nPrevPara = -1; bIsPageOverflow = 
false; }
+EditStatus(){ nStatusBits = 0;
+  nControlBits = 0;
+  nPrevPara = -1;
+  bIsPageOverflow = false; }
 
-voidClear() { nStatusBits = 0; /*bIsPageOverflow = 
false;*/ }
+voidClear() { nStatusBits = 0; bIsPageOverflow = 
false; }
 voidSetControlBits( sal_uLong nMask, bool bOn )
 { SetFlags( nControlBits, nMask, bOn ); }
 
@@ -112,7 +114,7 @@ public:
 sal_Int32&  GetPrevParagraph()  { return nPrevPara; }
 
 boolIsPageOverflow() const  { return bIsPageOverflow; }
-voidSetPageOverflow(bool isOverflow) { bIsPageOverflow = 
isOverflow; }
+voidSetPageOverflow(bool isOverflow) { GetStatusWord() |= 
EE_STAT_CHAININGSET; bIsPageOverflow = isOverflow; }
 };
 
 #define SPELLCMD_IGNOREWORD 0x0001
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index ed6a201..a93d7bc 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1935,8 +1935,8 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus* 
pEditStatus )
 const sal_uInt32 nStat = pEditStatus->GetStatusWord();
 const bool bGrowX=(nStat & EE_STAT_TEXTWIDTHCHANGED) !=0;
 const bool bGrowY=(nStat & EE_STAT_TEXTHEIGHTCHANGED) !=0;
-const bool bOverflow = (nStat & 0x0100) != 0;
-if(bTextFrame && (bGrowX || bGrowY || bOverflow))
+const bool bChainingSet = (nStat & EE_STAT_CHAININGSET) != 0;
+if(bTextFrame && (bGrowX || bGrowY || bChainingSet))
 {
 if ((bGrowX && IsAutoGrowWidth()) || (bGrowY && IsAutoGrowHeight()))
 {
@@ -1953,7 +1953,7 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus* 
pEditStatus )
 ImpAutoFitText(*pEdtOutl);
 mbInDownScale = false;
 }
-else if ( GetNextLinkInChain() != NULL && bOverflow ) // do it only if 
it is a call explicitly for chaining (status word already cleared)
+else if ( GetNextLinkInChain() != NULL )
 {
 // set the need for chaining
 SetToBeChained( pEditStatus->IsPageOverflow() );
commit 9f7ebc397fbc6602ac3787f77a61cd05d1716bf0
Author: matteocam 
Date:   Thu Aug 14 17:08:34 2014 +0200

Overflow detection coupled with handler. Using status word for overflow

Change-Id: I01abba89b4e14016d3c21103410963ead2cd097b

diff --git a/editeng/source/editeng/impedit.hxx 
b/editeng/source/editeng/impedit.hxx
index ac95eaa..e8ede1b 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -552,6 +552,8 @@ private:
 voidRecalcFormatterFontMetrics( FormatterFontMetric& 
rCurMetrics, SvxFont& rFont );
 voidCheckAutoPageSize();
 
+voidCheckPageOverflow();
+
 voidImpBreakLine( ParaPortion* pParaPortion, EditLine* 
pLine, TextPortion* pPortion, sal_Int32 nPo

[Libreoffice-commits] core.git: editeng/source

[Kohei Yoshida]

 editeng/source/editeng/editobj.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 536e9ed46f021e99537d370879a6877fd93472ea
Author: Kohei Yoshida 
Date:   Thu Aug 14 12:22:42 2014 -0400

Build fix when DEBUG_EDIT_ENGINE is on.

Change-Id: Ie3271400862bfca7ecbefbab2d3fcdc60a893818

diff --git a/editeng/source/editeng/editobj.cxx 
b/editeng/source/editeng/editobj.cxx
index be0e9fb..cbba466 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -188,7 +188,7 @@ bool ContentInfo::isWrongListEqual(const ContentInfo& 
rCompare) const
 void ContentInfo::Dump() const
 {
 cout << "--" << endl;
-cout << "text: '" << OUString(maText.getData()) << "'" << endl;
+cout << "text: '" << OUString(const_cast(maText.getData())) 
<< "'" << endl;
 cout << "style: '" << aStyle << "'" << endl;
 
 XEditAttributesType::const_iterator it = aAttribs.begin(), itEnd = 
aAttribs.end();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

minutes of the ESC Call 2014-08-14

[Bjoern Michaelsen]

* Present
+ Robinson, Miklos, Christian, Bjorn, Michael S, Muthu
 
* Completed Action Items
+ setup some VM's that can be created on-demand (Cloph)
+ done for the hackfest, non-public
+ working on creating a public machine
+ initial version based on Amazon marketplace Ubuntu 14.04 base,
  using a community version for upcoming events, which is more
  freely distributable
* Pending Action Items:
+ ask UX advise wrt. wrench icons (revert or not ?) (Astron)
+ blog about the sad realities of web plugins (Bjoern)
+ open-source newer Synezip tests / speak at the conference (Umesh)
+ Ask for 1-2 more dev-list moderators & re-visit next-week (Michael)
+ contact Michael / the list when students show up (Jan Marek)
+ help Cloph with the quickstarter disabling (Andras)
  https://gerrit.libreoffice.org/#/c/10817/
  https://gerrit.libreoffice.org/#/c/10669/

* GSOC Update (Cedric)
+ poke students
 
* Release Engineering update (Christian)
+ RC2 tagging tommorrow
+ 4.3.1 RC2 status
+ Android Remote

* support of non-SSE2 capable CPUs
+ by accident (switch to MSVC 2012) the 4.3 Windows release requires SSE2
+ https://bugs.freedesktop.org/show_bug.cgi?id=82430
+ https://gerrit.libreoffice.org/#/c/10838/  might help
+ since these CPUs were made until 2005 most likely users run WinXP
  should we support them at least as long as WinXP?
=> reenable non-SSE2 support, but need testers

* Crashtest update (Markus)
+ no Markus (maybe we should broaden the skill base to read these?)
 
* Certification Committee (Stephan/Bjoern/Kendy)
+ waiting until ~September (nearly there)

* commit access confusion:
+ OTRS finally dead and gone in the docs, I hope (Bjoern)
+ Norbert set up a branch for Doug, which should nicely solve this for 
porting patches
AI:  + porting patches shouldnt be needed anymore on master, see after 
remaining changes in gerrit (Bjoern)
+ Samuel: on hold -- too many common mentors/reviewers are on vacation still

* USA Hackfest update (Michael?)
+ Boston Hackfest
+ hosted by Xamarin, had some engineers come over
+ some good bugfixing, some good mentoring ...
 
* Hackfests (Bjoern)
+ Seattle 'Libre-Fest' (Robinson)
https://wiki.documentfoundation.org/Events/2014/Seattle_LibreFest
+ October 26, 2014
+ Bug-triaging/Intro-to-community event
+ Following SeaGL conference
+ Munich hack-fest (Jan-Marek):
http://www.it-muenchen-blog.de/2014/07/bug-squashing-party-2014/
+ will have a BSP come-together; if someone says they're coming
  just show up etc.
   + November 21st-23rd, 2014
   https://wiki.debian.org/BSP/2014/11/de/Munich
   + we should drop by with 2 or 3 developers, if possible
+ Toulouse Hackfest ...
+ Confirmed for Nov. 15-16th
+ more details: 
https://wiki.documentfoundation.org/Hackfest/Toulouse2014
+ Be great to have -really- easy easy hacks for devs (Bjoern)
 
* QA (Robinson)
+ UNCONFIRMED count creeping up. Recruiting again
+ More inquiries re: Windows quickstarter 
https://bugs.freedesktop.org/show_bug.cgi?id=80927
+ Multiple q's and bugs filed re: video playback support in Impress
https://bugs.freedesktop.org/show_bug.cgi?id=79546 - OSX (plays in QT, not 
in LO)
+ Do we document our policy for video/audio playback? (using system 
framework)
+ Status of VLC support?
+ Different support on different distros (Bjoern)
  
* UX Update (Astron / Mirek)
+ no UX attendance
 
* Bern Conference
+ book your hotels!
 
* QA stats:
  + https://bugs.freedesktop.org/page.cgi?id=weekly-bug-summary.html
+221-251(-30 overall)
many thanks to the top bug squashers:
QA Administrators   110
Maxim Monastirsky   29
Julien Nabet 9
Foss 8
Jay Philips  6
Joel Madero  5
Michael Stahl5
tommy27  5
Jean-Baptiste Faure  4
Urmas4
 
* Open 4.4 MAB
  + 4/8 4/8 3/7 3/7 2/5 1/2 1/1
  + https://bugs.freedesktop.org/showdependencytree.cgi?id=79641&hide_resolved=1
 
* Open 4.3 MAB
  + 14/52 14/50 11/47 14/47 14/45 19/43 10/32 6/27 5/24 5/22 3/20
 26%   28%   23%   29%   33%   44%   31%   22%  20%  22%  15%
  + https://bugs.freedesktop.org/showdependencytree.cgi?id=75025&hide_resolved=1
 
* Open 4.2 MAB
  + 83/244 83/243 84/236 85/235 82/229 81/222 76/215 74/212 74/210 71/207
 34%34% 35%36%35%36%35%34%35%34%
  + https://bugs.freedesktop.org/showdependencytree.cgi?id=65675&hide_resolved=1
 
* Bibisected bugs open: whiteboard 'bibsected'
  + 136/361 127/349 119/331 102/308 92/296 84/283 84/280 81/274 79/265 75/259
+ http://bit.ly/VQfF3Q
 
* all bugs tagged with 'regression'
+ 435(-4) bugs open of 2952(

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/source

[Caolán McNamara]

 sw/source/core/unocore/unotext.cxx |   18 +-
 1 file changed, 13 insertions(+), 5 deletions(-)

New commits:
commit 8f8fd00b8f67028c7f158e38d30e94819984a811
Author: Caolán McNamara 
Date:   Tue Aug 12 12:06:49 2014 +0100

Resolves: fdo#81046 don't crash on compilers that enforce exception specs

bit of a hammer here, the offending property is "IsSplitAllowed" if someone
wants to attempt a more subtle fix

(cherry picked from commit b59931d8a62f761022929f58f27d7ba22536b570)

Change-Id: I37ed623a9947473fcb5c9e2b987d7a3dd9147ffa
Signed-off-by: Miklos Vajna 

diff --git a/sw/source/core/unocore/unotext.cxx 
b/sw/source/core/unocore/unotext.cxx
index f8867d9..e066325 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -2136,12 +2136,20 @@ lcl_ApplyCellProperties(
 xCellCurs->gotoEnd( sal_True );
 const uno::Reference< beans::XPropertyState >
 xCellTextPropState(xCellCurs, uno::UNO_QUERY);
-const beans::PropertyState state = 
xCellTextPropState->getPropertyState(rName);
-if (state == beans::PropertyState_DEFAULT_VALUE)
+try
 {
-const uno::Reference< beans::XPropertySet >
-xCellTextProps(xCellCurs, uno::UNO_QUERY);
-xCellTextProps->setPropertyValue(rName, rValue);
+const beans::PropertyState state = 
xCellTextPropState->getPropertyState(rName);
+if (state == beans::PropertyState_DEFAULT_VALUE)
+{
+const uno::Reference< beans::XPropertySet >
+xCellTextProps(xCellCurs, uno::UNO_QUERY);
+xCellTextProps->setPropertyValue(rName, rValue);
+}
+}
+catch (const uno::Exception& e)
+{
+SAL_WARN( "sw.uno", "Exception when getting PropertyState: 
"
++ rName + ". Message: " + e.Message );
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

[Takeshi Abe]

 sc/source/filter/excel/xiescher.cxx |   12 ++--
 sc/source/filter/inc/xiescher.hxx   |   11 +--
 2 files changed, 15 insertions(+), 8 deletions(-)

New commits:
commit 6a686b41eeefa815b2635724e0abe6522fe1661b
Author: Takeshi Abe 
Date:   Fri Aug 15 00:43:26 2014 +0900

fdo#75757: remove inheritance to std::vector

Change-Id: I07daec0ced64d0ca6ad2dd06fd19a1c7366e5c31
Reviewed-on: https://gerrit.libreoffice.org/10921
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/sc/source/filter/excel/xiescher.cxx 
b/sc/source/filter/excel/xiescher.cxx
index a8569d5..3f5a1f1 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -965,17 +965,17 @@ void XclImpDrawObjBase::ImplReadObj8( XclImpStream& rStrm 
)
 
 void XclImpDrawObjVector::InsertGrouped( XclImpDrawObjRef xDrawObj )
 {
-if( !empty() )
-if( XclImpGroupObj* pGroupObj = dynamic_cast< XclImpGroupObj* >( 
back().get() ) )
+if( !mObjs.empty() )
+if( XclImpGroupObj* pGroupObj = dynamic_cast< XclImpGroupObj* >( 
mObjs.back().get() ) )
 if( pGroupObj->TryInsert( xDrawObj ) )
 return;
-push_back( xDrawObj );
+mObjs.push_back( xDrawObj );
 }
 
 sal_Size XclImpDrawObjVector::GetProgressSize() const
 {
 sal_Size nProgressSize = 0;
-for( const_iterator aIt = begin(), aEnd = end(); aIt != aEnd; ++aIt )
+for( ::std::vector< XclImpDrawObjRef >::const_iterator aIt = 
mObjs.begin(), aEnd = mObjs.end(); aIt != aEnd; ++aIt )
 nProgressSize += (*aIt)->GetProgressSize();
 return nProgressSize;
 }
@@ -1036,7 +1036,7 @@ SdrObject* XclImpGroupObj::DoCreateSdrObj( 
XclImpDffConverter& rDffConv, const R
 TSdrObjectPtr< SdrObjGroup > xSdrObj( new SdrObjGroup );
 // child objects in BIFF2-BIFF5 have absolute size, not needed to pass own 
anchor rectangle
 SdrObjList& rObjList = *xSdrObj->GetSubList();  // SdrObjGroup always 
returns existing sublist
-for( XclImpDrawObjVector::const_iterator aIt = maChildren.begin(), aEnd = 
maChildren.end(); aIt != aEnd; ++aIt )
+for( ::std::vector< XclImpDrawObjRef >::const_iterator aIt = 
maChildren.begin(), aEnd = maChildren.end(); aIt != aEnd; ++aIt )
 rDffConv.ProcessObject( rObjList, **aIt );
 rDffConv.Progress();
 return xSdrObj.release();
@@ -3299,7 +3299,7 @@ void XclImpDffConverter::ProcessObject( SdrObjList& 
rObjList, const XclImpDrawOb
 void XclImpDffConverter::ProcessDrawing( const XclImpDrawObjVector& rDrawObjs )
 {
 SdrPage& rSdrPage = GetConvData().mrSdrPage;
-for( XclImpDrawObjVector::const_iterator aIt = rDrawObjs.begin(), aEnd = 
rDrawObjs.end(); aIt != aEnd; ++aIt )
+for( ::std::vector< XclImpDrawObjRef >::const_iterator aIt = 
rDrawObjs.begin(), aEnd = rDrawObjs.end(); aIt != aEnd; ++aIt )
 ProcessObject( rSdrPage, **aIt );
 }
 
diff --git a/sc/source/filter/inc/xiescher.hxx 
b/sc/source/filter/inc/xiescher.hxx
index 76847ce..d4da2dc 100644
--- a/sc/source/filter/inc/xiescher.hxx
+++ b/sc/source/filter/inc/xiescher.hxx
@@ -202,10 +202,17 @@ private:
 boolmbCustomDff;/// true = Recreate SdrObject in DFF 
import.
 };
 
-class XclImpDrawObjVector : public ::std::vector< XclImpDrawObjRef >
+class XclImpDrawObjVector
 {
+private:
+::std::vector< XclImpDrawObjRef > mObjs;
+
 public:
-inline explicit XclImpDrawObjVector() {}
+inline explicit XclImpDrawObjVector() : mObjs() {}
+
+::std::vector< XclImpDrawObjRef >::const_iterator begin() const { return 
mObjs.begin(); }
+::std::vector< XclImpDrawObjRef >::const_iterator end() const { return 
mObjs.end(); }
+void push_back(const XclImpDrawObjRef& rObj) { mObjs.push_back(rObj); }
 
 /** Tries to insert the passed object into the last group or appends it. */
 voidInsertGrouped( XclImpDrawObjRef xDrawObj );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 75757] remove inheritance to std::map and std::vector

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=75757

--- Comment #23 from Commit Notification 
 ---
Takeshi Abe committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=6a686b41eeefa815b2635724e0abe6522fe1661b

fdo#75757: remove inheritance to std::vector



The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
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: 4 commits - bin/update_pch.sh configure.ac external/liblangtag external/openssl sc/source solenv/gbuild solenv/gcc-wrappers sw/source xmlsecurity/inc

[Michael Stahl]

 bin/update_pch.sh   |2 ++
 configure.ac|3 +++
 external/liblangtag/ExternalProject_langtag.mk  |4 +++-
 external/openssl/ExternalProject_openssl.mk |2 +-
 sc/source/filter/inc/xiescher.hxx   |3 ++-
 solenv/gbuild/platform/com_MSC_class.mk |6 --
 solenv/gcc-wrappers/g++.cxx |4 +++-
 solenv/gcc-wrappers/gcc.cxx |4 +++-
 sw/source/core/doc/docnew.cxx   |1 +
 xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx |1 -
 10 files changed, 22 insertions(+), 8 deletions(-)

New commits:
commit 3078f0e3ffeb431308df7741b3f75951459003b0
Author: Michael Stahl 
Date:   Thu Aug 14 17:59:16 2014 +0200

sw: initialize SwDoc::mbCopyIsMove

(regression from 5494954b269267f6ee3bdd5ac73e7513fa69978f)

Change-Id: I8bc2e0e079cbf86449ef0ce9c046eedb624127f2

diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 0b2c0d1..c5ec7fe 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -260,6 +260,7 @@ SwDoc::SwDoc()
 mReferenceCount(0),
 mbGlossDoc(false),
 mbDtor(false),
+mbCopyIsMove(false),
 mbInReading(false),
 mbInXMLImport(false),
 mbUpdateTOX(false),
commit 26eca5a184269281823f92aa64b962202712da78
Author: Michael Stahl 
Date:   Thu Aug 14 17:54:15 2014 +0200

sc: stupid auto_ptr deprecation

Change-Id: I7ef7de18c2f03d6dc825c12f14f3607fb64008cf

diff --git a/sc/source/filter/inc/xiescher.hxx 
b/sc/source/filter/inc/xiescher.hxx
index d4da2dc..0a936ef 100644
--- a/sc/source/filter/inc/xiescher.hxx
+++ b/sc/source/filter/inc/xiescher.hxx
@@ -28,6 +28,7 @@
 #include "xiroot.hxx"
 #include "xistring.hxx"
 #include 
+#include 
 #include 
 #include 
 
@@ -1229,7 +1230,7 @@ public:
 voidFillToItemSet( SfxItemSet& rItemSet ) const;
 
 private:
-typedef ::std::auto_ptr< SvMemoryStream > SvMemoryStreamPtr;
+typedef ::boost::scoped_ptr SvMemoryStreamPtr;
 
 SvMemoryStream  maDummyStrm;/// Dummy DGG stream for DFF manager.
 XclImpSimpleDffConverter maDffConv; /// DFF converter used to resolve 
palette colors.
commit 8848f4e8c203e35f14a4f20919b826e2d667b757
Author: Michael Stahl 
Date:   Thu Aug 14 16:19:25 2014 +0200

xmlsecurity: remove NSS cert.h from PCH

nssrenam.h is another horror...

Change-Id: I166ac2ab1414e89d5cd4beae543670fdfa389adb

diff --git a/bin/update_pch.sh b/bin/update_pch.sh
index 09ffd08..0d0b8f6 100755
--- a/bin/update_pch.sh
+++ b/bin/update_pch.sh
@@ -133,6 +133,7 @@ function filter_ignore()
 # - sores.hxx provides BMP_PLUGIN, which is redefined
 # - some sources play ugly #define tricks with editeng/eeitemid.hxx
 # - objbase.h and oledb.h break ado
+# - NSS cert.h may need to be mangled by nssrenam.h
 # - xmlreader.h breaks cppuhelper
 # - jerror.h and jpeglib.h are not self-contained
 # - service1.hxx/service2.hxx are inside comments in frameworks/
@@ -147,6 +148,7 @@ function filter_ignore()
 grep -v -F -e '#include ' | \
 grep -v -F -e '#include ' | \
 grep -v -F -e '#include ' | \
+grep -v -F -e '#include ' | \
 grep -v -F -e '#include ' | \
 grep -v -F -e '#include "jerror.h"' | \
 grep -v -F -e '#include "jpeglib.h"'
diff --git a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx 
b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx
index 7925c4c..6afc266 100644
--- a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx
+++ b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx
@@ -17,7 +17,6 @@
 #include "libxml/parserInternals.h"
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
commit 8bd6bf93b7711a7ac7c5cbd7c3bb980481570ebd
Author: Michael Stahl 
Date:   Fri Aug 8 14:58:08 2014 +0200

fdo#82430: configure: MSVC build: avoid using SSE2 instructions

MSVC 2012 for x86 defaults to -arch:SSE2; binaries do not run on any AMD
32-bit CPU, neither on Intel Pentium III.

http://msdn.microsoft.com/en-us/library/vstudio/7t5yh4fd%28v=vs.110%29.aspx

Change-Id: Ie8253137db2699f2a7fa69c4ac4e7ded90931e3e

diff --git a/configure.ac b/configure.ac
index e20f112..89d80e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3773,6 +3773,9 @@ if test "$_os" = "WINNT"; then
 COMPATH=`echo $VC_PRODUCT_DIR`
 fi
 fi
+if test "$BITNESS_OVERRIDE" = ""; then
+CC="$CC -arch:SSE" # MSVC 2012 default for x86 is -arch:SSE2
+fi
 export INCLUDE=`cygpath -d "$COMPATH/Include"`
 
 PathFormat "$COMPATH"
diff --git a/external/liblangtag/ExternalProject_langtag.mk 
b/external/liblangtag/ExternalProject_langtag.mk
index c3d4115..8835bdf 100644
--- a/external/liblangtag/ExternalProject_langtag.mk
+++ b/external/liblangtag/ExternalProject_langtag.mk
@@ -31,7 +31,9 @@ $(call gb_ExternalProject_get_state_target,langtag,build):
  

[Libreoffice-commits] core.git: 47 commits - cui/AllLangResTarget_cui.mk cui/Library_cui.mk cui/source cui/uiconfig officecfg/registry sfx2/source vcl/source

[Jan Holesovsky]

 cui/AllLangResTarget_cui.mk|1 
 cui/Library_cui.mk |1 
 cui/source/inc/cuires.hrc  |8 
 cui/source/options/personalization.cxx |  602 +++--
 cui/source/options/personalization.hxx |   96 +-
 cui/source/options/personalization.src |   52 +
 cui/source/options/personasdochandler.cxx  |   80 +
 cui/source/options/personasdochandler.hxx  |   60 +
 cui/uiconfig/ui/personalization_tab.ui |  107 ++
 cui/uiconfig/ui/select_persona_dialog.ui   |  298 +-
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |   44 
 sfx2/source/dialog/backingwindow.cxx   |4 
 vcl/source/app/settings.cxx|   22 
 13 files changed, 1256 insertions(+), 119 deletions(-)

New commits:
commit a6fc653bbf38de453a540ca2ab69958dafa1d322
Author: Jan Holesovsky 
Date:   Thu Aug 14 15:07:58 2014 +0200

personas: Added a TODO FIXME wrt. ssl negotiation.

Change-Id: I5f5889b6e63e8e6763abc39690adb78d48929783

diff --git a/cui/source/options/personalization.cxx 
b/cui/source/options/personalization.cxx
index 71da75f..5aafe83 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -123,6 +123,37 @@ IMPL_LINK( SelectPersonaDialog, SearchPersonas, 
PushButton*, pButton )
 if( searchTerm.isEmpty( ) )
 return 0;
 
+// TODO FIXME!
+// Before the release, the allizom.org url shoud be changed to:
+// OUString rSearchURL = 
"https://services.addons.mozilla.org/en-US/firefox/api/1.5/search/"; + 
searchTerm + "/9/9";
+// The problem why it cannot be done just now is that the SSL negotiation
+// with services.addons.mozilla.org fails very early - during an early
+// propfind, SSL returns X509_V_ERR_CERT_UNTRUSTED to neon, causing the
+// NE_SSL_UNTRUSTED being set in verify_callback in neon/src/ne_openssl.c
+//
+// This is not cleared anywhere during the init, and so later, even though
+// we have found the certificate, this triggers
+// NeonSession_CertificationNotify callback, that
+// causes that NE_SSL_UNTRUSTED is igored in cases when the condition
+//   if ( pSession->isDomainMatch(
+//  GetHostnamePart( xEECert.get()->getSubjectName() ) ) )
+// is true; but that is only when getSubjectName() actually returns a
+// wildcard, or the exact name.
+//
+// In the case of services.addons.mozilla.com, the certificate is for
+// versioncheck.addons.mozilla.com, but it also has
+//   X509v3 Subject Alternative Name:
+//   DNS:services.addons.mozilla.org, 
DNS:versioncheck-bg.addons.mozilla.org, DNS:pyrepo.addons.mozilla.org, 
DNS:versioncheck.addons.mozilla.org
+// So it is all valid; but the early X509_V_ERR_CERT_UNTRUSTED failure
+// described above just makes this being ignored.
+//
+// My suspicion is that this never actually worked, and the
+//   if ( pSession->isDomainMatch(
+//  GetHostnamePart( xEECert.get()->getSubjectName() ) ) )
+// works around the root cause that is there for years, and which makes it
+// work in most cases.  I guess that we initialize something wrongly or
+// too late; but I have already spent few hours debugging, and
+// give up for the moment - need to return to this at some stage.
 OUString rSearchURL = 
"https://addons.allizom.org/en-US/firefox/api/1.5/search/"; + searchTerm + 
"/9/9";
 m_rSearchThread = new SearchAndParseThread( this, rSearchURL );
 m_rSearchThread->launch();
commit f4003ccbe4be3c5ef6ca08b98d43416b30ba8d0d
Author: Jan Holesovsky 
Date:   Thu Aug 14 11:49:55 2014 +0200

personas: Better default searches, improved error messaging.

Change-Id: I0a1303f5864516efbf69e7a0227f17e43aea4af7

diff --git a/cui/source/options/personalization.cxx 
b/cui/source/options/personalization.cxx
index 31e37e1..71da75f 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -45,23 +45,23 @@ SelectPersonaDialog::SelectPersonaDialog( Window *pParent )
 m_pSearchButton->SetClickHdl( LINK( this, SelectPersonaDialog, 
SearchPersonas ) );
 
 get( m_vSearchSuggestions[0], "suggestion1" );
-m_vSearchSuggestions[0]->SetText( "libreoffice" );
+m_vSearchSuggestions[0]->SetText( "LibreOffice" );
 m_vSearchSuggestions[0]->SetClickHdl( LINK( this, SelectPersonaDialog, 
SearchPersonas ) );
 
 get( m_vSearchSuggestions[1], "suggestion2" );
-m_vSearchSuggestions[1]->SetText( "science" );
+m_vSearchSuggestions[1]->SetText( "Abstract" );
 m_vSearchSuggestions[1]->SetClickHdl( LINK( this, SelectPersonaDialog, 
SearchPersonas ) );
 
 get( m_vSearchSuggestions[2], "suggestion3" );
-m_vSearchSuggestions[2]->SetText( "firefox" );
+

[Libreoffice-commits] core.git: svx/source

[Kohei Yoshida]

 svx/source/svdraw/svddrgmt.cxx |  116 -
 1 file changed, 58 insertions(+), 58 deletions(-)

New commits:
commit b732ba336af1d4c9a3d2780ecca7ce3231187f96
Author: Kohei Yoshida 
Date:   Thu Aug 14 12:42:17 2014 -0400

Massive scope level reduction by early bail-out.

Change-Id: Ie620208f02bf74844f9b7cb904f9c5abbb10ca07

diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 0952a23..b28c8a9 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -1300,75 +1300,75 @@ void SdrDragObjOwn::MoveSdrDrag(const Point& rNoSnapPnt)
 {
 const SdrObject* pObj = GetDragObj();
 
-if(pObj)
+if (!pObj)
+// No object to drag.  Bail out.
+return;
+
+Point aPnt(rNoSnapPnt);
+SdrPageView* pPV = GetDragPV();
+
+if (!pPV)
+// No page view available.  Bail out.
+return;
+
+if(!DragStat().IsNoSnap())
 {
-Point aPnt(rNoSnapPnt);
-SdrPageView* pPV = GetDragPV();
+SnapPos(aPnt);
+}
 
-if(pPV)
+if(getSdrDragView().IsOrtho())
+{
+if (DragStat().IsOrtho8Possible())
 {
-if(!DragStat().IsNoSnap())
-{
-SnapPos(aPnt);
-}
+
OrthoDistance8(DragStat().GetStart(),aPnt,getSdrDragView().IsBigOrtho());
+}
+else if (DragStat().IsOrtho4Possible())
+{
+
OrthoDistance4(DragStat().GetStart(),aPnt,getSdrDragView().IsBigOrtho());
+}
+}
 
-if(getSdrDragView().IsOrtho())
-{
-if (DragStat().IsOrtho8Possible())
-{
-
OrthoDistance8(DragStat().GetStart(),aPnt,getSdrDragView().IsBigOrtho());
-}
-else if (DragStat().IsOrtho4Possible())
-{
-
OrthoDistance4(DragStat().GetStart(),aPnt,getSdrDragView().IsBigOrtho());
-}
-}
+if (!DragStat().CheckMinMoved(rNoSnapPnt))
+// Not moved by the minimum threshold.  Nothing to do.
+return;
 
-if(DragStat().CheckMinMoved(rNoSnapPnt))
-{
-if(aPnt != DragStat().GetNow())
-{
-Hide();
-DragStat().NextMove(aPnt);
+Hide();
+DragStat().NextMove(aPnt);
 
-// since SdrDragObjOwn currently supports no 
transformation of
-// existing SdrDragEntries but only their recreation, a 
recreation
-// after every move is needed in this mode. Delete existing
-// SdrDragEntries here  to force their recreation in the 
following Show().
-clearSdrDragEntries();
+// since SdrDragObjOwn currently supports no transformation of
+// existing SdrDragEntries but only their recreation, a recreation
+// after every move is needed in this mode. Delete existing
+// SdrDragEntries here  to force their recreation in the following Show().
+clearSdrDragEntries();
 
-// delete current clone (after the last reference to it is 
deleted above)
-if(mpClone)
-{
-SdrObject::Free(mpClone);
-mpClone = 0;
-}
+// delete current clone (after the last reference to it is deleted above)
+if(mpClone)
+{
+SdrObject::Free(mpClone);
+mpClone = 0;
+}
 
-// create a new clone and modify to current drag state
-if(!mpClone)
-{
-mpClone = pObj->getFullDragClone();
-mpClone->applySpecialDrag(DragStat());
-
-// #120999# AutoGrowWidth may change for SdrTextObj 
due to the automatism used
-// with bDisableAutoWidthOnDragging, so not only 
geometry changes but
-// also this (pretty indirect) property change is 
possible. If it gets
-// changed, it needs to be copied to the original 
since nothing will
-// happen when it only changes in the drag clone
-const bool 
bOldAutoGrowWidth(((SdrOnOffItem&)pObj->GetMergedItem(SDRATTR_TEXT_AUTOGROWWIDTH)).GetValue());
-const bool 
bNewAutoGrowWidth(((SdrOnOffItem&)mpClone->GetMergedItem(SDRATTR_TEXT_AUTOGROWWIDTH)).GetValue());
-
-if(bOldAutoGrowWidth != bNewAutoGrowWidth)
-{
-
GetDragObj()->SetMergedItem(makeSdrTextAutoGrowWidthItem(bNewAutoGrowWidth));
-}
-}
+// create a new clone and modify to current drag state
+if(!mpClone)
+{
+mpClone = pObj->getFullDragClone();
+mpClone->applySpecialDrag(DragStat());
 
-Show();

[Bug 79116] make paste special easier to use

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=79116

Thomas Viehmann  changed:

   What|Removed |Added

 Status|NEW |ASSIGNED
   Assignee|libreoffice-b...@lists.free |tv.bugs.freedesktop.org@bea
   |desktop.org |mnet.de

--- Comment #3 from Thomas Viehmann  ---
Created attachment 104635
  --> https://bugs.freedesktop.org/attachment.cgi?id=104635&action=edit
Screenshot

Hi,

I would like to see if I can offer something for the resolution of this bug.

Kind regards

Thomas

-- 
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: svx/source

[Jan Holesovsky]

 svx/source/svdraw/svddrgmt.cxx |   27 ---
 1 file changed, 12 insertions(+), 15 deletions(-)

New commits:
commit 8e8383612e2cf860acfc0fd3f5620da55d4ef35a
Author: Jan Holesovsky 
Date:   Thu Aug 14 22:24:37 2014 +0200

Go even further in the scope reduction, we are 100% sure mpClone is NULL.

Change-Id: Id5facbc817ecc0b89689dcba30672a6538e70945

diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index b28c8a9..c3d7f97 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -1349,23 +1349,20 @@ void SdrDragObjOwn::MoveSdrDrag(const Point& rNoSnapPnt)
 }
 
 // create a new clone and modify to current drag state
-if(!mpClone)
-{
-mpClone = pObj->getFullDragClone();
-mpClone->applySpecialDrag(DragStat());
+mpClone = pObj->getFullDragClone();
+mpClone->applySpecialDrag(DragStat());
 
-// #120999# AutoGrowWidth may change for SdrTextObj due to the 
automatism used
-// with bDisableAutoWidthOnDragging, so not only geometry changes but
-// also this (pretty indirect) property change is possible. If it gets
-// changed, it needs to be copied to the original since nothing will
-// happen when it only changes in the drag clone
-const bool 
bOldAutoGrowWidth(((SdrOnOffItem&)pObj->GetMergedItem(SDRATTR_TEXT_AUTOGROWWIDTH)).GetValue());
-const bool 
bNewAutoGrowWidth(((SdrOnOffItem&)mpClone->GetMergedItem(SDRATTR_TEXT_AUTOGROWWIDTH)).GetValue());
+// #120999# AutoGrowWidth may change for SdrTextObj due to the automatism 
used
+// with bDisableAutoWidthOnDragging, so not only geometry changes but
+// also this (pretty indirect) property change is possible. If it gets
+// changed, it needs to be copied to the original since nothing will
+// happen when it only changes in the drag clone
+const bool 
bOldAutoGrowWidth(((SdrOnOffItem&)pObj->GetMergedItem(SDRATTR_TEXT_AUTOGROWWIDTH)).GetValue());
+const bool 
bNewAutoGrowWidth(((SdrOnOffItem&)mpClone->GetMergedItem(SDRATTR_TEXT_AUTOGROWWIDTH)).GetValue());
 
-if(bOldAutoGrowWidth != bNewAutoGrowWidth)
-{
-
GetDragObj()->SetMergedItem(makeSdrTextAutoGrowWidthItem(bNewAutoGrowWidth));
-}
+if (bOldAutoGrowWidth != bNewAutoGrowWidth)
+{
+
GetDragObj()->SetMergedItem(makeSdrTextAutoGrowWidthItem(bNewAutoGrowWidth));
 }
 
 Show();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 14 commits - sfx2/source sfx2/uiconfig

[Efe Gürkan YALAMAN]

 sfx2/source/dialog/backingwindow.cxx |  147 +-
 sfx2/source/dialog/backingwindow.hxx |   21 
 sfx2/uiconfig/ui/startcenter.ui  |  149 ++-
 3 files changed, 275 insertions(+), 42 deletions(-)

New commits:
commit 3e46f2c5a03134b0e819fad98e31b4a7e9925c33
Author: Efe Gürkan YALAMAN 
Date:   Fri Aug 8 18:03:12 2014 +0300

Fixed the Templates button

It works as a button. When clicked the triangle works as dropdown.

Change-Id: Ib4e3b6a1832efef3382e7bd01b06d2ff8d4e7543

diff --git a/sfx2/source/dialog/backingwindow.cxx 
b/sfx2/source/dialog/backingwindow.cxx
index 22147f5..28179f9 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -122,9 +122,6 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
 get(mpHelpButton, "help");
 get(mpExtensionsButton, "extensions");
 
-//get(mpViewBar, "action_view");
-//get(mpTemplateBar, "action_templates");
-
 //Containers are invisible to cursor traversal
 //So on pressing "right" when in Help the
 //extension button is considered as a candidate
@@ -266,7 +263,7 @@ void BackingWindow::initControls()
 mpAllRecentThumbnails->Reload();
 mpAllRecentThumbnails->ShowTooltips( true );
 
-//initialize Template views
+//initialize Template view
 mpLocalView->SetStyle( mpLocalView->GetStyle() | WB_VSCROLL);
 
mpLocalView->setItemDimensions(TEMPLATE_ITEM_MAX_WIDTH,TEMPLATE_ITEM_THUMBNAIL_MAX_HEIGHT,
 
TEMPLATE_ITEM_MAX_HEIGHT-TEMPLATE_ITEM_THUMBNAIL_MAX_HEIGHT,
@@ -278,25 +275,12 @@ void BackingWindow::initControls()
 
 mpCurrentView = mpLocalView;
 
-//mpViewBar->SetButtonType(BUTTON_SYMBOLTEXT);
-//mpViewBar->SetItemBits(mpViewBar->GetItemId("repository"), 
TIB_DROPDOWNONLY);
-//mpViewBar->SetClickHdl(LINK(this,BackingWindow,TBXViewHdl));
-//mpViewBar->SetDropdownClickHdl(LINK(this,BackingWindow,TBXDropdownHdl));
-//mpViewBar->Hide();
-//mpViewBar->HideItem("import");
-
-//mpTemplateBar->SetButtonType(BUTTON_SYMBOLTEXT);
-//mpTemplateBar->SetItemBits(mpTemplateBar->GetItemId(TEMPLATEBAR_MOVE), 
TIB_DROPDOWNONLY);
-//mpTemplateBar->SetClickHdl( LINK( this, BackingWindow,TBXTemplateHdl ) );
-//mpTemplateBar->SetDoubleClickHdl( LINK(this, BackingWindow, 
OpenTemplateHdl) );
-//mpTemplateBar->SetDropdownClickHdl(LINK(this, 
BackingWindow,TBXDropdownHdl));
+mpTemplateButton->SetMenuMode( MENUBUTTON_MENUMODE_TIMED );
 
 //set handlers
 mpLocalView->setOpenRegionHdl(LINK(this, BackingWindow, OpenRegionHdl));
 mpLocalView->setOpenTemplateHdl(LINK(this,BackingWindow,OpenTemplateHdl));
 
-/*FIXME: Add other things for Local View*/
-
 setupButton( mpOpenButton );
 setupButton( mpTemplateButton );
 setupButton( mpWriterAllButton );
@@ -348,7 +332,6 @@ void BackingWindow::setupButton( PushButton* pButton )
 
 // color that fits the theme
 pButton->SetControlForeground(aButtonsText);
-
 pButton->SetClickHdl( LINK( this, BackingWindow, ClickHdl ) );
 }
 
@@ -361,15 +344,13 @@ void BackingWindow::setupButton( MenuButton* pButton )
 // color that fits the theme
 pButton->SetControlForeground(aButtonsText);
 
-//Menubutton implementation
 PopupMenu* pMenu = pButton->GetPopupMenu();
 pMenu->SetMenuFlags(pMenu->GetMenuFlags() | 
MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES);
 
-//pButton->SetClickHdl(LINK(this, BackingWindow, ClickHdl));
+pButton->SetClickHdl(LINK(this, BackingWindow, ClickHdl));
 pButton->SetSelectHdl(LINK(this, BackingWindow, MenuSelectHdl));
 }
 
-
 void BackingWindow::Paint( const Rectangle& )
 {
 Resize();
@@ -572,18 +553,9 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton )
 }
 else if( pButton == mpTemplateButton )
 {
-/*Reference< XDispatchProvider > xFrame( mxFrame, UNO_QUERY );
-
-Sequence< com::sun::star::beans::PropertyValue > aArgs(1);
-PropertyValue* pArg = aArgs.getArray();
-pArg[0].Name = "Referer";
-pArg[0].Value <<= OUString("private:user");
-
-dispatchURL( TEMPLATE_URL, OUString(), xFrame, aArgs );
-*/
 mpAllRecentThumbnails->Hide();
+mpCurrentView->filterItems(ViewFilter_Application(FILTER_APP_NONE));
 mpLocalView->Show();
-//mpViewBar->Hide();
 }
 return 0;
 }
@@ -592,11 +564,7 @@ IMPL_LINK( BackingWindow, MenuSelectHdl, MenuButton*, 
pButton )
 {
 OString sId = pButton->GetCurItemIdent();
 
-if( sId == "filter_none" )
-{
-mpCurrentView->filterItems(ViewFilter_Application(FILTER_APP_NONE));
-}
-else if( sId == "filter_writer" )
+if( sId == "filter_writer" )
 {
 mpCurrentView->filterItems(ViewFilter_Application(FILTER_APP_WRITER));
 }
@@ -625,7 +593,6 @@ IMPL_LINK( BackingWindow, MenuSelectHdl, MenuButton*, 
pButton )
 
 }
 
-
 mpAllRecentThumbnails->Hide();
 mpLocalView->Show

[Libreoffice-commits] core.git: 3 commits - vcl/inc vcl/quartz vcl/source vcl/win

[Norbert Thiebaud]

 vcl/inc/graphite_layout.hxx   |2 +-
 vcl/inc/graphite_serverfont.hxx   |2 +-
 vcl/inc/sallayout.hxx |6 +++---
 vcl/quartz/ctlayout.cxx   |   14 ++
 vcl/source/gdi/sallayout.cxx  |6 +++---
 vcl/source/glyphs/graphite_layout.cxx |4 ++--
 vcl/source/outdev/map.cxx |9 +
 vcl/source/outdev/text.cxx|   12 ++--
 vcl/win/source/gdi/winlayout.cxx  |   13 ++---
 9 files changed, 37 insertions(+), 31 deletions(-)

New commits:
commit 47f3485579929724afc0c4c5ebdfd2143cf952be
Author: Norbert Thiebaud 
Date:   Thu Aug 14 22:43:26 2014 +0200

Revert "Resolves: fdo#82550 MacOSX GetTextBreak always return -1"

This reverts commit 4c1e2c446865b355f50720b8b96ec704822006dc.
it was just hiding the underlying bug.

diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index f60062b..75ac162 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -1428,12 +1428,12 @@ sal_Int32 OutputDevice::GetTextBreak( const OUString& 
rStr, long nTextWidth,
 long nWidthFactor = pSalLayout->GetUnitsPerPixel();
 long nSubPixelFactor = (nWidthFactor < 64 ) ? 64 : 1;
 nTextWidth *= nWidthFactor * nSubPixelFactor;
-long nTextPixelWidth = ImplLogicWidthToDevicePixel( nTextWidth );
-long nExtraPixelWidth = 0;
+DeviceCoordinate nTextPixelWidth = LogicWidthToDeviceCoordinate( 
nTextWidth );
+DeviceCoordinate nExtraPixelWidth = 0;
 if( nCharExtra != 0 )
 {
 nCharExtra *= nWidthFactor * nSubPixelFactor;
-nExtraPixelWidth = ImplLogicWidthToDevicePixel( nCharExtra );
+nExtraPixelWidth = LogicWidthToDeviceCoordinate( nCharExtra );
 }
 nRetVal = pSalLayout->GetTextBreak( nTextPixelWidth, nExtraPixelWidth, 
nSubPixelFactor );
 
@@ -1462,12 +1462,12 @@ sal_Int32 OutputDevice::GetTextBreak( const OUString& 
rStr, long nTextWidth,
 long nSubPixelFactor = (nWidthFactor < 64 ) ? 64 : 1;
 
 nTextWidth *= nWidthFactor * nSubPixelFactor;
-long nTextPixelWidth = ImplLogicWidthToDevicePixel( nTextWidth );
-long nExtraPixelWidth = 0;
+DeviceCoordinate nTextPixelWidth = LogicWidthToDeviceCoordinate( 
nTextWidth );
+DeviceCoordinate nExtraPixelWidth = 0;
 if( nCharExtra != 0 )
 {
 nCharExtra *= nWidthFactor * nSubPixelFactor;
-nExtraPixelWidth = ImplLogicWidthToDevicePixel( nCharExtra );
+nExtraPixelWidth = LogicWidthToDeviceCoordinate( nCharExtra );
 }
 
 // calculate un-hyphenated break position
commit d8584f62e28369594c5d1b733e5804837a98dd85
Author: Norbert Thiebaud 
Date:   Thu Aug 14 22:41:26 2014 +0200

fdo#82550 LogicWidthToDeviceCoordinate missed handling of mbMap == false

Change-Id: I98902ed266ae7b2737fa9720d69a4b87cc958d51

diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx
index 819f7db..deaddcb 100644
--- a/vcl/source/outdev/map.cxx
+++ b/vcl/source/outdev/map.cxx
@@ -2144,11 +2144,12 @@ long Window::ImplLogicUnitToPixelY( long nY, MapUnit 
eUnit )
 
 DeviceCoordinate OutputDevice::LogicWidthToDeviceCoordinate( long nWidth ) 
const
 {
+if ( !mbMap )
+return (DeviceCoordinate)nWidth;
+
 #if VCL_FLOAT_DEVICE_PIXEL
 return (double)nWidth * maMapRes.mfScaleX * mnDPIX;
 #else
-if ( !mbMap )
-return nWidth;
 
 return ImplLogicToPixel( nWidth, mnDPIX,
  maMapRes.mnMapScNumX, maMapRes.mnMapScDenomX,
@@ -2158,11 +2159,11 @@ DeviceCoordinate 
OutputDevice::LogicWidthToDeviceCoordinate( long nWidth ) const
 
 DeviceCoordinate OutputDevice::LogicHeightToDeviceCoordinate( long nHeight ) 
const
 {
+if ( !mbMap )
+return (DeviceCoordinate)nHeight;
 #if VCL_FLOAT_DEVICE_PIXEL
 return (double)nHeight * maMapRes.mfScaleY * mnDPIY;
 #else
-if ( !mbMap )
-return nHeight;
 
 return ImplLogicToPixel( nHeight, mnDPIY,
  maMapRes.mnMapScNumY, maMapRes.mnMapScDenomY,
commit 32a92502fdbabe7615330e668357568cc4812e54
Author: Norbert Thiebaud 
Date:   Thu Aug 14 18:08:38 2014 +0200

GetTextBreak takes a DeviceCoordinate as width

Change-Id: Ie03732a0966eedf6c0226beed83356ae4886a016

diff --git a/vcl/inc/graphite_layout.hxx b/vcl/inc/graphite_layout.hxx
index 77bab7e..24b668d 100644
--- a/vcl/inc/graphite_layout.hxx
+++ b/vcl/inc/graphite_layout.hxx
@@ -123,7 +123,7 @@ public:
 virtual void  AdjustLayout( ImplLayoutArgs& ) SAL_OVERRIDE;  // adjusting 
positions
 
 // methods using string indexing
-virtual sal_Int32 GetTextBreak(long nMaxWidth, long nCharExtra=0, int 
nFactor=1) const SAL_OVERRIDE;
+virtual sal_Int32 GetTextBreak(DeviceCoordinate nMaxWidth, long 
nCharExtra=0, int nFactor=1) const SAL_OVERRIDE;
 virtual DeviceCoordinate FillDXArray( DeviceCoordinate* pDXArray ) const 
SAL_OVE

[Libreoffice-commits] core.git: download.lst external/cppunit

[Thomas Arnhold]

 download.lst|3 ++-
 external/cppunit/ExternalProject_cppunit.mk |1 +
 external/cppunit/coverity.patch |2 +-
 external/cppunit/unix.patch |   13 -
 4 files changed, 4 insertions(+), 15 deletions(-)

New commits:
commit 4b8a131d3897a3fda8d4e8fe635f19cc41bed36a
Author: Thomas Arnhold 
Date:   Sun Aug 10 14:04:53 2014 +0200

upgrade to cppunit 1.13.2

* remove obsolete patch part
* enable x64 target for vc project file on win64

Change-Id: Ie794c08c9f739ad8c9c68c423f72e79ed4f6b0ff
Reviewed-on: https://gerrit.libreoffice.org/10856
Reviewed-by: Thomas Arnhold 
Tested-by: Thomas Arnhold 

diff --git a/download.lst b/download.lst
index ac0682c..b58596d 100644
--- a/download.lst
+++ b/download.lst
@@ -24,7 +24,8 @@ export CMIS_TARBALL := 
22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz
 export COINMP_MD5SUM := 1cce53bf4b40ae29790d2c5c9f8b1129
 export COINMP_TARBALL := CoinMP-1.7.6.tgz
 export COLLADA2GLTF_TARBALL := 
4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
-export CPPUNIT_TARBALL := 
ac4781e01619be13461bb2d562b94a7b-cppunit-1.13.1.tar.gz
+export CPPUNIT_MD5SUM := d1c6bdd5a76c66d2c38331e2d287bc01
+export CPPUNIT_TARBALL := cppunit-1.13.2.tar.gz
 export CT2N_TARBALL := 
451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
 export CURL_MD5SUM := e6d1f9d1b59da5062109ffe14e0569a4
 export CURL_TARBALL := curl-7.36.0.tar.bz2
diff --git a/external/cppunit/ExternalProject_cppunit.mk 
b/external/cppunit/ExternalProject_cppunit.mk
index b5b7f8a..351c5a6 100644
--- a/external/cppunit/ExternalProject_cppunit.mk
+++ b/external/cppunit/ExternalProject_cppunit.mk
@@ -17,6 +17,7 @@ ifeq ($(OS)$(COM),WNTMSC)
 $(call gb_ExternalProject_get_state_target,cppunit,build) :
$(call gb_ExternalProject_run,build,\
PROFILEFLAGS="$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
+   /p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if 
$(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \
/p:VisualStudioVersion=11.0) \
$(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 
/p:VisualStudioVersion=12.0 /ToolsVersion:12.0)" \
diff --git a/external/cppunit/coverity.patch b/external/cppunit/coverity.patch
index 5e5e64d..6fb3261 100644
--- a/external/cppunit/coverity.patch
+++ b/external/cppunit/coverity.patch
@@ -1,6 +1,6 @@
 --- misc/cppunit-1.13.1/src/cppunit/Asserter.cpp
 +++ misc/build/cppunit-1.13.1/src/cppunit/Asserter.cpp
-@@ -13,7 +13,7 @@
+@@ -13,7 +13,7 @@ Asserter::fail( std::string message,
fail( Message( "assertion failed", message ), sourceLine );
  }
  
diff --git a/external/cppunit/unix.patch b/external/cppunit/unix.patch
index 74de602..e75e72c 100644
--- a/external/cppunit/unix.patch
+++ b/external/cppunit/unix.patch
@@ -8,16 +8,3 @@
  }
  
  
-@@ -34,7 +33,11 @@
- std::string 
- DynamicLibraryManager::getLastErrorDetail() const
- {
--  return "";
-+  const char *last_dlerror = ::dlerror();
-+  if (last_dlerror != NULL)
-+return last_dlerror;
-+  else
-+return "";
- }
- 
- 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source svx/source

[matteocam]

 editeng/source/editeng/impedit3.cxx |9 +
 svx/source/svdraw/svdotext.cxx  |6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit eb8d180f4fabbf57e0babba0f3b0dca402c65172
Author: matteocam 
Date:   Thu Aug 14 23:30:05 2014 +0200

Generalizing chaining to more than 2 objects

Change-Id: If3dec97d383abbb42c3fa4310025ed3b353108e0

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index e299061..db962b5 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -612,12 +612,13 @@ void ImpEditEngine::CheckPageOverflow()
 /* fprintf( stderr, IsPageOverflow(aPaperSize, aPrevPaperSize)
 ? "YES Overflow!\n"  : "NO Overflow!\n" ); */
 // setting overflow status
-sal_uInt32 nBoxHeight = 1783; // XXX: hard coded for testing
-//if ( IsPageOverflow( aPaperSize, aPrevPaperSize ) ) {
-if (CalcTextHeight(NULL) > nBoxHeight) // XXX: CalcTextHeight here??
+
+sal_uInt32 nBoxHeight = GetMaxAutoPaperSize().Height();
+
+if (CalcTextHeight(NULL) > nBoxHeight)
 {
 // which paragraph is the first to cause higher size of the box?
-UpdateOverflowingParaNum( nBoxHeight /*aPrevPaperSize.Height()*/ ); // 
XXX: currently only for horizontal text
+UpdateOverflowingParaNum( nBoxHeight); // XXX: currently only for 
horizontal text
 aStatus.SetPageOverflow(true);
 } else
 {
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index a93d7bc..d15d67c 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -2017,9 +2017,9 @@ SdrTextObj* SdrTextObj::GetNextLinkInChain() const
 SdrTextObj *pNextTextObj = NULL;
 
 if ( pPage && pPage->GetObjCount() > 1) {
-pNextTextObj =  dynamic_cast< SdrTextObj * >( pPage->GetObj(1) );
-if ( pNextTextObj == NULL)
-return NULL;
+int nextIndex = (GetOrdNum()+1) % pPage->GetObjCount();
+pNextTextObj =  dynamic_cast< SdrTextObj * >( pPage->GetObj( nextIndex 
) );
+
 return pNextTextObj;
 } else {
 fprintf(stderr, "Make New Object please\n");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/inc sc/source

[Eike Rathke]

 sc/inc/types.hxx|4 +-
 sc/source/core/data/bcaslot.cxx |   33 ++-
 sc/source/core/data/table3.cxx  |   67 ++--
 sc/source/core/tool/token.cxx   |2 +
 4 files changed, 95 insertions(+), 11 deletions(-)

New commits:
commit 69adec3ec051ff94f600ab899506ca9d645a8b56
Author: Eike Rathke 
Date:   Thu Aug 14 23:36:47 2014 +0200

correct references after sort, fdo#79441

5c6ee09126631342939ae8766fe36083d8c011e3 introduced a different
algorithm for reference handling during sort. Unfortunately that clashed
with the SC_CLONECELL_ADJUST3DREL introduced a little earlier resulting
in relative 3D references effectively being "adjusted" twice.

Furthermore, in-sort-range range references to one row (or column) were
not adapted to the move at all if the formula within the range listened
only to ranges and not a single cell. Added collecting and adjusting
area listeners for this.

Last but not least, external (relative) references need to be treated
the same as internal 3D references, making them point to the same
location after the sort.

Change-Id: I492768b525f95f1c43d1c6e7a63a36cce093fa5a

diff --git a/sc/inc/types.hxx b/sc/inc/types.hxx
index 8dc8f18..d40b2a5 100644
--- a/sc/inc/types.hxx
+++ b/sc/inc/types.hxx
@@ -103,7 +103,9 @@ typedef boost::unordered_map 
ColRowReorderMapType;
 enum AreaOverlapType
 {
 AreaInside,
-AreaPartialOverlap
+AreaPartialOverlap,
+OneRowInsideArea,
+OneColumnInsideArea
 };
 
 }
diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx
index ea70ffb..2192706 100644
--- a/sc/source/core/data/bcaslot.cxx
+++ b/sc/source/core/data/bcaslot.cxx
@@ -444,14 +444,31 @@ void ScBroadcastAreaSlot::GetAllListeners(
 ScBroadcastArea* pArea = (*aIter).mpArea;
 const ScRange& rAreaRange = pArea->GetRange();
 
-if (eType == sc::AreaInside && !rRange.In(rAreaRange))
-// The range needs to be fully inside specified range.
-continue;
-
-if (eType == sc::AreaPartialOverlap &&
-(!rRange.Intersects(rAreaRange) || rRange.In(rAreaRange)))
-// The range needs to be only partially overlapping.
-continue;
+switch (eType)
+{
+case sc::AreaInside:
+if (!rRange.In(rAreaRange))
+// The range needs to be fully inside specified range.
+continue;
+break;
+case sc::AreaPartialOverlap:
+if (!rRange.Intersects(rAreaRange) || rRange.In(rAreaRange))
+// The range needs to be only partially overlapping.
+continue;
+break;
+case sc::OneRowInsideArea:
+if (rAreaRange.aStart.Row() != rAreaRange.aEnd.Row() || 
!rRange.In(rAreaRange))
+// The range needs to be one single row and fully inside
+// specified range.
+continue;
+break;
+case sc::OneColumnInsideArea:
+if (rAreaRange.aStart.Col() != rAreaRange.aEnd.Col() || 
!rRange.In(rAreaRange))
+// The range needs to be one single column and fully inside
+// specified range.
+continue;
+break;
+}
 
 SvtBroadcaster::ListenersType& rLst = 
pArea->GetBroadcaster().GetAllListeners();
 SvtBroadcaster::ListenersType::iterator itLst = rLst.begin(), itLstEnd 
= rLst.end();
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 25e088f..0409f14 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -60,6 +60,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -717,6 +718,21 @@ void ScTable::SortReorderByColumn(
 
 // Collect all listeners within sorted range ahead of time.
 std::vector aListeners;
+
+// Get all area listeners that listen on one column within the range and
+// end their listening.
+ScRange aMoveRange( nStart, nRow1, nTab, nLast, nRow2, nTab);
+std::vector aAreaListeners = 
pDocument->GetBASM()->GetAllListeners(
+aMoveRange, sc::OneColumnInsideArea);
+{
+std::vector::iterator it = aAreaListeners.begin(), 
itEnd = aAreaListeners.end();
+for (; it != itEnd; ++it)
+{
+pDocument->EndListeningArea(it->maArea, it->mpListener);
+aListeners.push_back( it->mpListener);
+}
+}
+
 for (SCCOL nCol = nStart; nCol <= nLast; ++nCol)
 aCol[nCol].CollectListeners(aListeners, nRow1, nRow2);
 
@@ -728,6 +744,22 @@ void ScTable::SortReorderByColumn(
 ColReorderNotifier aFunc(aColMap, nTab, nRow1, nRow2);
 std::for_each(aListeners.begin(), aListeners.end(), aFunc);
 
+// Re-start area listeners on the reordered columns.
+{
+  

Re: minutes of the ESC Call 2014-08-14

[Bjoern Michaelsen]

On Thu, Aug 14, 2014 at 06:33:37PM +0200, Bjoern Michaelsen wrote:
> * commit access confusion:
whops, missed this link relevant to the topic and branch reviews here:
 https://wiki.documentfoundation.org/Development/Branches

Best,

Bjoern
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=65675

Bug 65675 depends on bug 79441, which changed state.

Bug 79441 Summary: Internal references to other sheets not sorted (procedure 
comment 31)
https://bugs.freedesktop.org/show_bug.cgi?id=79441

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution|--- |FIXED

-- 
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: 3 commits - chart2/source vcl/source

[Markus Mohrhard]

 chart2/source/view/main/GL3DRenderer.cxx |2 ++
 vcl/source/opengl/OpenGLContext.cxx  |6 +-
 vcl/source/opengl/OpenGLHelper.cxx   |4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 8378bb3122417885db741dc8b6d770863afb72bd
Author: Markus Mohrhard 
Date:   Fri Aug 15 00:01:54 2014 +0200

fix OSX check for GL_EXT_texture_array

For some reason the extension is supported in GL but not in GLSL.

Change-Id: I1cad8baea23e80714269454af23fca87ea9e2949

diff --git a/chart2/source/view/main/GL3DRenderer.cxx 
b/chart2/source/view/main/GL3DRenderer.cxx
index d31e5d1..7e82334 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -256,8 +256,10 @@ void OpenGL3DRenderer::ShaderResources::LoadShaders()
 m_3DBatchVertexID = glGetAttribLocation(m_3DBatchProID, 
"vertexPositionModelspace");
 m_3DBatchNormalID = glGetAttribLocation(m_3DBatchProID, 
"vertexNormalModelspace");
 m_3DBatchColorID = glGetAttribLocation(m_3DBatchProID, "barColor");
+#if !defined MACOSX
 //check whether the texture array is support
 mbTexBatchSupport = GLEW_EXT_texture_array == 1;
+#endif
 if (mbTexBatchSupport)
 {
 m_BatchTextProID = 
OpenGLHelper::LoadShaders("textVertexShaderBatch", "textFragmentShaderBatch");
commit 0b48025baf41ab58f7fd174d2cda856e0aa5d5ea
Author: Markus Mohrhard 
Date:   Fri Aug 15 00:00:38 2014 +0200

seems like the better approach for getting it working

Change-Id: I18d5ecc9a14a6eb8ad8c6ea5ec9835dbe8f5db40

diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index 12b3f7c..707b0d8 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -475,12 +475,8 @@ bool OpenGLContext::ImplInit()
 #elif defined( MACOSX )
 
 CGLPixelFormatAttribute pixelFormatAttributes[] = {
-#ifdef kCGLPFAOpenGLProfile // Available in OS X 10.7 and later
+#if MACOSX_SDK_VERSION > 1060
 kCGLPFAOpenGLProfile, (CGLPixelFormatAttribute) 
kCGLOGLPVersion_3_2_Core,
-#else
-// Will we then get run-time error on OS X < 10.7? Why can't
-// we just require building against the 10.9 SDK or later, and
-// running on 10.7 at least.
 #endif
 kCGLPFAColorSize, (CGLPixelFormatAttribute) 24,
 kCGLPFAAlphaSize, (CGLPixelFormatAttribute) 8,
commit ae1c06be2920043f74b5713c1efd573e54e0460a
Author: Markus Mohrhard 
Date:   Thu Aug 14 23:33:37 2014 +0200

improve debug message for shader compilatione errors

Change-Id: I14106870bd46c081a574d28f416278b848544fcc

diff --git a/vcl/source/opengl/OpenGLHelper.cxx 
b/vcl/source/opengl/OpenGLHelper.cxx
index d58b537..ab10a25 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -83,7 +83,7 @@ GLint OpenGLHelper::LoadShaders(const OUString& 
rVertexShaderName,const OUString
 std::vector VertexShaderErrorMessage(InfoLogLength+1);
 glGetShaderInfoLog(VertexShaderID, InfoLogLength, NULL, 
&VertexShaderErrorMessage[0]);
 VertexShaderErrorMessage.push_back('\0');
-SAL_WARN("vcl.opengl", "vertex shader compile failed : " << 
&VertexShaderErrorMessage[0]);
+SAL_WARN("vcl.opengl", "vertex shader compile for " << 
rVertexShaderName << " failed : " << &VertexShaderErrorMessage[0]);
 }
 else
 SAL_WARN("vcl.opengl", "vertex shader compile failed without error 
log");
@@ -107,7 +107,7 @@ GLint OpenGLHelper::LoadShaders(const OUString& 
rVertexShaderName,const OUString
 std::vector FragmentShaderErrorMessage(InfoLogLength+1);
 glGetShaderInfoLog(FragmentShaderID, InfoLogLength, NULL, 
&FragmentShaderErrorMessage[0]);
 FragmentShaderErrorMessage.push_back('\0');
-SAL_WARN("vcl.opengl", "fragment shader compile failed : " << 
&FragmentShaderErrorMessage[0]);
+SAL_WARN("vcl.opengl", "fragment shader compile for " << 
rFragmentShaderName << " failed : " << &FragmentShaderErrorMessage[0]);
 }
 else
 SAL_WARN("vcl.opengl", "fragment shader compile failed without 
error log");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH 03/17] XHTML export: remove trailing space

[andrew-libreoffice . org]

From: Andrew Sayers 

---
 .../source/xslt/odf2xhtml/export/common/body.xsl   | 68 +++---
 .../export/common/styles/style_mapping_css.xsl |  6 +-
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git filter/source/xslt/odf2xhtml/export/common/body.xsl 
filter/source/xslt/odf2xhtml/export/common/body.xsl
index 3196fac..4353c7c 100644
--- filter/source/xslt/odf2xhtml/export/common/body.xsl
+++ filter/source/xslt/odf2xhtml/export/common/body.xsl
@@ -151,7 +151,7 @@



-   
+



@@ -170,13 +170,13 @@

 
 
-
+


 


-  
+   





diff --git 
filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl 
filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
index e56be28..d42 100644
--- filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
+++ filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
@@ -87,7 +87,7 @@

 

-
+   
 


@@ -123,7 +123,7 @@

 
 
-text-align:left ! important; 
+text-align:left ! important;
 
 
 text-align:right ! important; 
@@ -292,7 +292,7 @@
 writing-mode:
 
 ; 
-   
+ 
 


-- 
1.8.5.1

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH 12/17] XHTML export: strip whitespace in binary data

[andrew-libreoffice . org]

From: Andrew Sayers 

Fixes output in xsltproc
---
 filter/source/xslt/odf2xhtml/export/common/body.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git filter/source/xslt/odf2xhtml/export/common/body.xsl 
filter/source/xslt/odf2xhtml/export/common/body.xsl
index cfb464f..5aed262 100644
--- filter/source/xslt/odf2xhtml/export/common/body.xsl
+++ filter/source/xslt/odf2xhtml/export/common/body.xsl
@@ -360,7 +360,7 @@



-   
data:image/*;base64,
+   
data:image/*;base64,



-- 
1.8.5.1

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH 13/17] XHTML export: silence an unhelpful warning

[andrew-libreoffice . org]

From: Andrew Sayers 

---
 filter/source/xslt/odf2xhtml/export/common/body.xsl | 2 +-
 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git filter/source/xslt/odf2xhtml/export/common/body.xsl 
filter/source/xslt/odf2xhtml/export/common/body.xsl
index 5aed262..dfb49c0 100644
--- filter/source/xslt/odf2xhtml/export/common/body.xsl
+++ filter/source/xslt/odf2xhtml/export/common/body.xsl
@@ -431,7 +431,7 @@



-   Using default element rule for ODF element 
''.
+   Using default element 
rule for ODF element ''.
 


diff --git filter/source/xslt/odf2xhtml/export/xhtml/body.xsl 
filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index 5df5cd4..51fb7b6 100644
--- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -1537,12 +1537,12 @@



-   
+   
Accessibility Warning:
 No alternate text ('svg:title' element) set for
 image '
'!
-   
+   



-- 
1.8.5.1

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Thomas Viehmann license statement

[Thomas Viehmann]

Hello,

thank you for LibreOffice. All of my past & future contributions to 
LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license unless 
explicitly stated otherwise with the contribution.


Best regards

Thomas
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 79116] make paste special easier to use

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=79116

--- Comment #4 from Thomas Viehmann  ---
Hello,

a proposed patch is at https://gerrit.libreoffice.org/#/c/10928/

It currently has
- Paste values only,
- paste values and formats,
- paste transpose.
These are the ones I use most, but other desirable short cut combinations can
be added as well.
The would-be icons are based on the paste symbol in the galaxy theme.

I appreciate any comment you may have.

Thank you,

Thomas

-- 
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

[PATCH 06/17] XHTML export: Specify the font-family for bullet points

[andrew-libreoffice . org]

From: Andrew Sayers 

---
 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl | 10 ++
 1 file changed, 10 insertions(+)

diff --git filter/source/xslt/odf2xhtml/export/xhtml/body.xsl 
filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index 6f3e980..fc018c4 100644
--- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -2023,6 +2023,16 @@

;min-width:



cm;
+   

+   

+   

+   

+   

+   
font-family:
+   

+   
;
+   

+   







-- 
1.8.5.1

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

CppUnit

[Walter Borges]

Hello

Is this test library still maintained?

If so, is there a way to run tests in parallel to take advantage of multi
core processors?

Thanks
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH 14/17] XHTML export: avoid useless attempts to convert measures

[andrew-libreoffice . org]

From: Andrew Sayers 

---
 .../odf2xhtml/export/common/styles/style_mapping_css.xsl | 11 ---
 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl   | 16 ++--
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git 
filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl 
filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
index 822ba0b..79b8954 100644
--- filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
+++ filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
@@ -344,9 +344,14 @@

 

-   
-   
-   
+   
+   0
+   
+   
+   
+   
+   
+   



diff --git filter/source/xslt/odf2xhtml/export/xhtml/body.xsl 
filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index 51fb7b6..1126f8e 100644
--- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -596,9 +596,11 @@
 
position:absolute;left:

-   
-   
-   
+   
+   
+   
+   
+   



@@ -2000,9 +2002,11 @@






-   

-   

-   

+   

+   

+   

+   

+   







-- 
1.8.5.1

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 2 commits - desktop/source sal/Library_sal.mk sal/osl

[Tor Lillqvist]

 desktop/source/app/check_ext_deps.cxx  |3 ++
 desktop/source/deployment/misc/dp_misc.cxx |4 ++
 sal/Library_sal.mk |1 
 sal/osl/unx/uunxapi.cxx|   39 ++---
 4 files changed, 42 insertions(+), 5 deletions(-)

New commits:
commit 8e279c79f88608a4ab4dfc74c0a66a7947ea1482
Author: Tor Lillqvist 
Date:   Fri Aug 15 01:39:49 2014 +0300

Don't do the security scope bookmark dance if not in a sandboxed process

No point in doing it in build-time tools like cppumaker which don't
run as sandboxed processes. Just slows them down a lot, while cfprefsd
consumes lots of CPU doing user preference lookups in vain for every
file accessed through the uunxapi functions.

Change-Id: I83e55a8e8d0c4f2c60c60ecad2c831e42c9e5bfd

diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 16c4876..77d4176 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -81,6 +81,7 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,sal,\
Carbon \
CoreFoundation \
Foundation \
+   $(if $(ENABLE_MACOSX_SANDBOX),Security) \
 ))
 endif
 
diff --git a/sal/osl/unx/uunxapi.cxx b/sal/osl/unx/uunxapi.cxx
index 6fb75a1..8690c4d 100644
--- a/sal/osl/unx/uunxapi.cxx
+++ b/sal/osl/unx/uunxapi.cxx
@@ -37,11 +37,36 @@ inline rtl::OString OUStringToOString(const rtl_uString* s)
 
 #if defined(MACOSX) && MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 && 
HAVE_FEATURE_MACOSX_SANDBOX
 
+#include 
+#include 
+#include 
+
 static NSUserDefaults *userDefaults = NULL;
+static bool isSandboxed = false;
 
-static void get_user_defaults()
+static void do_once()
 {
-userDefaults = [NSUserDefaults standardUserDefaults];
+SecCodeRef code;
+OSStatus rc = SecCodeCopySelf(kSecCSDefaultFlags, &code);
+
+SecStaticCodeRef staticCode;
+if (rc == errSecSuccess)
+rc = SecCodeCopyStaticCode(code, kSecCSDefaultFlags, &staticCode);
+
+CFDictionaryRef signingInformation;
+if (rc == errSecSuccess)
+rc = SecCodeCopySigningInformation(staticCode, 
kSecCSRequirementInformation, &signingInformation);
+
+CFDictionaryRef entitlements = NULL;
+if (rc == errSecSuccess)
+entitlements = (CFDictionaryRef) 
CFDictionaryGetValue(signingInformation, kSecCodeInfoEntitlementsDict);
+
+if (entitlements != NULL)
+if (CFDictionaryGetValue(entitlements, 
CFSTR("com.apple.security.app-sandbox")) != NULL)
+isSandboxed = true;
+
+if (isSandboxed)
+userDefaults = [NSUserDefaults standardUserDefaults];
 }
 
 typedef struct {
@@ -53,12 +78,15 @@ static accessFilePathState *
 prepare_to_access_file_path( const char *cpFilePath )
 {
 static pthread_once_t once = PTHREAD_ONCE_INIT;
-pthread_once(&once, &get_user_defaults);
+pthread_once(&once, &do_once);
 NSURL *fileURL = nil;
 NSData *data = nil;
 BOOL stale;
 accessFilePathState *state;
 
+if (!isSandboxed)
+return NULL;
+
 // If malloc() fails we are screwed anyway
 state = (accessFilePathState*) malloc(sizeof(accessFilePathState));
 
@@ -86,6 +114,9 @@ prepare_to_access_file_path( const char *cpFilePath )
 static void
 done_accessing_file_path( const char * /*cpFilePath*/, accessFilePathState 
*state )
 {
+if (!isSandboxed)
+return;
+
 int saved_errno = errno;
 
 if (state->scopeURL != nil)
@@ -259,7 +290,7 @@ int open_c(const char *cpPath, int oflag, int mode)
 int result = open(cpPath, oflag, mode);
 
 #if defined(MACOSX) && MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 && 
HAVE_FEATURE_MACOSX_SANDBOX
-if (result != -1 && (oflag & O_CREAT) && (oflag & O_EXCL))
+if (isSandboxed && result != -1 && (oflag & O_CREAT) && (oflag & O_EXCL))
 {
 // A new file was created. Check if it is outside the sandbox.
 // (In that case it must be one the user selected as export or
commit 59ddf7216d52dd5492ffe1362174518dc2f5e0ce
Author: Tor Lillqvist 
Date:   Tue Feb 25 16:26:30 2014 +0200

Don't do the annoying restart thing when sandboxed on OS X, ignore risks...

So far we have just displayed a hugely annoying dialog "sorry, but we
suck, you need to start LibreOffice again". But that sucks. So just
try to do without restart then, and let's see what happens. At least
in trivial testing, no crash.

Change-Id: I475fe49a0fdb8086bb33a165a08b32ac46548857

diff --git a/desktop/source/app/check_ext_deps.cxx 
b/desktop/source/app/check_ext_deps.cxx
index e32bb13..ad2d72b 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -18,6 +18,7 @@
  */
 
 #include 
+#include 
 
 #include 
 #include 
@@ -420,8 +421,10 @@ void Desktop::SynchronizeExtensionRepositories()
 if (m_bCleanedExtensionCache) {
 
deployment::ExtensionManager::get(context)->reinstallDeployedExtensions(
 true, "user", Reference(), silent);
+#if !HAVE_FEATURE_MACOSX_SANDBOX
 task::OfficeR

[PATCH 16/17] XHTML export: less-ugly createTabIndent implementation

[andrew-libreoffice . org]

From: Andrew Sayers 

"createTabIndent" used to position spans absolutely, so a paragraph with
nothing but indented s would be set to zero height.  A document that uses
tabs on adjacent paragraphs will therefore see all the text on top of each
other.

Padding gets much closer to the document's intent.
---
 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git filter/source/xslt/odf2xhtml/export/xhtml/body.xsl 
filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index 60b5808..bbf90d5 100644
--- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -594,7 +594,7 @@


 
-   position:absolute;left:
+   padding-left:



-- 
1.8.5.1

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH 10/17] XHTML export: Don't print redundant styles

[andrew-libreoffice . org]

From: Andrew Sayers 

---
 filter/source/xslt/odf2xhtml/export/xhtml/header.xsl | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git filter/source/xslt/odf2xhtml/export/xhtml/header.xsl 
filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
index 6af404c..98ee59b 100644
--- filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
+++ filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
@@ -128,9 +128,11 @@



-   
+   
+   
 ODF styles with no properties 
representable as CSS 
-{ }
+{ }
+   

 

-- 
1.8.5.1

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH 07/17] XHTML export: Use zero-width spaces instead of non-breaking spaces

[andrew-libreoffice . org]

From: Andrew Sayers 

The XHTML writer sometimes needs to force an element to have height.
Using non-breaking spaces in underlined paragraphs shows an ugly
underline, so we use zero-width spaces instead.
---
 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl | 22 +++---
 .../source/xslt/odf2xhtml/export/xhtml/table.xsl   |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git filter/source/xslt/odf2xhtml/export/xhtml/body.xsl 
filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index fc018c4..d4d5ee7 100644
--- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -391,9 +391,9 @@
 -->


-   
-    
+   
+   ​



+   

 


@@ -743,7 +743,7 @@



-    
+   ​



@@ -889,7 +889,7 @@



-    
+   ​


 
@@ -995,7 +995,7 @@

cm;

-    
+   ​



@@ -2056,13 +2056,13 @@






+   
so we use a zero-width space instead -->










-   
 
+   
​






@@ -2551,7 +2551,7 @@



-    
+   ​

 

@@ -2620,7 +2620,7 @@
 


-    
+   ​

 

diff --git filter/source/xslt/odf2xhtml/export/xhtml/table.xsl 
filter/source/xslt/odf2xhtml/export/xhtml/table.xsl
index 2f72ee7..b7180ba 100644
--- filter/source/xslt/odf2xhtml/export/xhtml/table.xsl
+++ filter/source/xslt/odf2xhtml/export/xhtml/table.xsl
@@ -159,7 +159,7 @@

 

+   therefore a zero-width space has been inserted 
-->



@@ -170,7 +170,7 @@



-    
+   ​


 
-- 
1.8.5.1

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH 08/17] XHTML export: Change the non-existent "h" tag to a "div" tag

[andrew-libreoffice . org]

From: Andrew Sayers 

---
 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git filter/source/xslt/odf2xhtml/export/xhtml/body.xsl 
filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index d4d5ee7..fdc4e19 100644
--- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -2589,7 +2589,7 @@


 
-   
+   



-- 
1.8.5.1

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH 01/17] XSLT: Better error messages in measure_conversion.xsl

[andrew-libreoffice . org]

From: Andrew Sayers 

---
Hi LibreOffice,

Earlier this year I needed to do some work with HTML document export.  This
patchset represents the sundry improvements I made along the way.  The code has
been stable for a while now, so I've rebased it and sent it in.  I don't expect
to make any more changes at this point, Murphy notwithstanding.

Note: some of these patches deal with trailing spaces and mixed Windows/Unix
newlines.  To make the patches cleanly apply, I needed to do:

git am -p0 --keep-cr patches/*

 filter/source/xslt/common/measure_conversion.xsl | 48 
 1 file changed, 40 insertions(+), 8 deletions(-)

diff --git filter/source/xslt/common/measure_conversion.xsl 
filter/source/xslt/common/measure_conversion.xsl
index 2828f4b..f808fa3 100644
--- filter/source/xslt/common/measure_conversion.xsl
+++ filter/source/xslt/common/measure_conversion.xsl
@@ -125,8 +125,12 @@



+   
+   measure_conversion.xsl: Empty 
string passed for unit when when converting to to 'mm' - passing unmodified 
value back
+   
+   

-   measure_conversion.xsl: Find no 
conversion for  to 'mm'!
+   unrecognised value '' passed to 'convert2mm' - please update 
measure_conversion.xsl to handle this unit



@@ -160,8 +164,12 @@



+   
+   measure_conversion.xsl: Empty 
string passed for unit when when converting to to 'cm' - passing unmodified 
value back
+   
+   

-   measure_conversion.xsl: Find no 
conversion for  to 'cm'!
+   unrecognised value '' passed to 'convert2cm' - please update 
measure_conversion.xsl to handle this unit



@@ -195,8 +203,12 @@



+   
+   measure_conversion.xsl: Empty 
string passed for unit when when converting to to 'in' - passing unmodified 
value back
+   
+   

-   measure_conversion.xsl: Find no 
conversion for  to 'in'!
+   unrecognised value '' passed to 'convert2in' - please update 
measure_conversion.xsl to handle this unit



@@ -230,8 +242,12 @@



+   
+   measure_conversion.xsl: Empty 
string passed for unit when when converting to to 'dpt' - passing unmodified 
value back
+   
+   

-   measure_conversion.xsl: Find no 
conversion for  to 'dpt'!
+   unrecognised value '' passed to 'convert2dpt' - please update 
measure_conversion.xsl to handle this unit



@@ -265,8 +281,12 @@



+   
+   measure_conversion.xsl: Empty 
string passed for unit when when converting to to 'pica' - passing unmodified 
value back
+   
+   

-   measure_conversion.xsl: Find no 
conversion for  to 'pica'!
+   unrecognised value '' passed to 'convert2pica' - please update 
measure_conversion.xsl to handle this unit



@@ -300,8 +320,12 @@



+   
+   measure_conversion.xsl: Empty 
string passed for unit when when converting to to 'pt' - passing unmodified 
value back
+   
+   

-   measure_conversion.xsl: Find no 
conversion for  to 'pt'!
+   unrecognised value '' passed to 'convert2pt' - please update 
measure_conversion.xsl to handle this unit



@@ -335,8 +359,12 @@

[PATCH 05/17] XHTML export: convert DOS newlines to Unix newlines

[andrew-libreoffice . org]

From: Andrew Sayers 

---
 .../source/xslt/odf2xhtml/export/common/body.xsl   | 798 ++---
 .../export/common/styles/style_mapping_css.xsl | 666 -
 2 files changed, 732 insertions(+), 732 deletions(-)

diff --git filter/source/xslt/odf2xhtml/export/common/body.xsl 
filter/source/xslt/odf2xhtml/export/common/body.xsl
index b2cc5d0..facc174 100644
--- filter/source/xslt/odf2xhtml/export/common/body.xsl
+++ filter/source/xslt/odf2xhtml/export/common/body.xsl
@@ -1,4 +1,4 @@
-
+
 
-
+
 http://www.w3.org/1999/XSL/Transform";
 xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
@@ -47,402 +47,402 @@
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
 xmlns:java="http://xml.apache.org/xslt/java";
 xmlns:urlencoder="http://www.jclark.com/xt/java/java.net.URLEncoder";
-exclude-result-prefixes="chart config dc dom dr3d draw fo form math meta 
number office ooo oooc ooow script style svg table text xforms xlink xsd xsi 
java urlencoder">
-
-
-   
-
-
-   
-   
-   
-
-   
-   
-   
-   
-   
-
-
-   
-   
-   
-
-   
-    
-   
-   
-   
-   
-   
-   
-
-
-   
-   
-   
-   
-
-   
-   
-   
-   
-   
-   
-
-   
-   
-   
-
-   
-   
-   
-   
-
-
-
-   
-   
-   
-
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-
-
-   
-   
-
-   
-
-   
-   
-   
-   margin-left:cm
-   
-   
-   
-
-
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-
-
-   
-   
-   
-
-   
-   
-   
-   
-   
-   #
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-
-   
-   
-   
-
-   
-   
-   
-
-
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-
-
-
-   
-   
-
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-
-   
-   
-   
-   
-
-   
-   
-
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-
-   
-   
-   
-   
-
-
-   
-   
-
-   
-   
-   
-   
-
-   
-   
-
-   
-   
-   
-   
-   
-   
-
-   
-   
-   
-   
-   
-   
-
-   
-   
-   

[PATCH 04/17] XHML Export: break incredibly long line

[andrew-libreoffice . org]

From: Andrew Sayers 

`git send-email` requires the `--no-validate` option to send patches with lines
that break RFC 2281's 998 character line-length limit.  Breaking the line up
removes a hurdle for future developers.
---
As this patch is being sent by e-mail, obviously there's a chance some program
along the chain will corrupt it.

This patch was created simply by running 's/" /"\r/g' on the appropriate
line of the file.  If the patch has been corrupted, you should be able to
recreate it the same way.

 .../source/xslt/odf2xhtml/export/common/body.xsl   | 30 +-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git filter/source/xslt/odf2xhtml/export/common/body.xsl 
filter/source/xslt/odf2xhtml/export/common/body.xsl
index 4353c7c..b2cc5d0 100644
--- filter/source/xslt/odf2xhtml/export/common/body.xsl
+++ filter/source/xslt/odf2xhtml/export/common/body.xsl
@@ -19,7 +19,35 @@
 
-http://www.w3.org/1999/XSL/Transform"; 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:s
 tyle="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:java="http://xml.apache.org/xslt/java"; 
xmlns:urlencoder="http://www.jclark.com/xt/java/java.net.URLEncoder"; 
exclude-result-prefixes="chart config dc dom dr3d draw fo form math meta number 
office ooo oooc ooow script style svg table text xforms xlink xsd xsi java 
urlencoder">
+http://www.w3.org/1999/XSL/Transform";
+xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
+xmlns:dc="http://purl.org/dc/elements/1.1/";
+xmlns:dom="http://www.w3.org/2001/xml-events";
+xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
+xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
+xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
+xmlns:math="http://www.w3.org/1998/Math/MathML";
+xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
+xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
+xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+xmlns:ooo="http://openoffice.org/2004/office";
+xmlns:oooc="http://openoffice.org/2004/calc";
+xmlns:ooow="http://openoffice.org/2004/writer";
+xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
+xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
+xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
+xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+xmlns:xforms="http://www.w3.org/2002/xforms";
+xmlns:xlink="http://www.w3.org/1999/xlink";
+xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+xmlns:java="http://xml.apache.org/xslt/java";
+xmlns:urlencoder="http://www.jclark.com/xt/java/java.net.URLEncoder";
+exclude-result-prefixes="chart config dc dom dr3d draw fo form math meta 
number office ooo oooc ooow script style svg table text xforms xlink xsd xsi 
java urlencoder">
 
 

-- 
1.8.5.1

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH 02/17] XHTML export: improve comments

[andrew-libreoffice . org]

From: Andrew Sayers 

---
 .../export/common/styles/style_collector.xsl   |  2 +-
 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl | 45 +++---
 .../source/xslt/odf2xhtml/export/xhtml/table.xsl   |  4 +-
 3 files changed, 25 insertions(+), 26 deletions(-)

diff --git 
filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl 
filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
index 9b02d94..69d34a4 100644
--- filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
+++ filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
@@ -661,7 +661,7 @@
 
 
 
-
+
 
 
 
diff --git filter/source/xslt/odf2xhtml/export/xhtml/body.xsl 
filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index 3ecde5e..6f3e980 100644
--- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -433,8 +433,8 @@



+   OOo writes out empty paragraphs 
laid out behind an image (= draw:image within draw:frame),
+   those must be neglected in HTML 
-->



@@ -479,7 +479,7 @@
 
 

+   



@@ -630,15 +630,15 @@


 
-   




-   


@@ -729,8 +729,8 @@


 
-   
+   



@@ -790,9 +790,9 @@



-   
+   
Next 'div' added 
for floating.


@@ -803,7 +803,7 @@



-   
+   





@@ -1325,7 +1325,7 @@
and preceding siblings of 'text:h' with the same 'text:outline-level' 
(until a text:outline-level with lower value is found).
If the 'text:start-value is not set the default value of '1' has to be 
taken.
If a heading number is found (e.g. text:outline-level='3') all heading 
numbers
-   for the higher levels have to be written out -->
+   for the higher levels must be written out -->



@@ -2004,10 +2004,9 @@






-   
+   






@@ -2046,8 +2045,8 @@






-   

+   







@@ -2186,7 +2185,7 @@
 
 

+   but must be reused on following items with no text:start-value -->

   

[PATCH 15/17] XHTML export: hide unhelpful comments

[andrew-libreoffice . org]

From: Andrew Sayers 

---
 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl | 26 +++---
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git filter/source/xslt/odf2xhtml/export/xhtml/body.xsl 
filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index 1126f8e..60b5808 100644
--- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -250,7 +250,7 @@


 
-   Next 'div' was a 'draw:text-box'.
+   Next 'div' was a 
'draw:text-box'.



@@ -374,10 +374,10 @@



-   Next 'div' was a 
'text:p'.
+   Next 'div' was a 
'text:p'.


-   Next 'div' was a 
'draw:page'.
+   Next 'div' was a 
'draw:page'.



@@ -801,7 +801,7 @@

-   Next 'div' added 
for floating.
+   Next 'div' added for 
floating.



position:relative; left:
@@ -991,7 +991,7 @@



-   Next 'div' is emulating the top hight of a 
draw:frame.
+   Next 'div' is 
emulating the top hight of a draw:frame.



@@ -2775,7 +2775,7 @@

 

-   Next 'div' was a 
'text:section'.
+   Next 'div' 
was a 'text:section'.



@@ -2800,11 +2800,11 @@



-   
+   



-   
+   



-- 
1.8.5.1

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH 11/17] XHTML export: Mildly sanitise bullet points

[andrew-libreoffice . org]

From: Andrew Sayers 

---
 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl   | 14 +++---
 filter/source/xslt/odf2xhtml/export/xhtml/header.xsl |  2 ++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git filter/source/xslt/odf2xhtml/export/xhtml/body.xsl 
filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index 46c0a7c..5df5cd4 100644
--- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -2014,13 +2014,15 @@

 The  represents the list item/header label (e.g. 1.A.III).

 We use CSS to make the  a block element, to set its width, and to float 
in the correct place -->


-   

-   

+   

+   
bullet
+   

+   
 


-   

-   

+   

+   



-   
display:block;float:
+   
float:






@@ -2046,9 +2048,7 @@






-   



-   







diff --git filter/source/xslt/odf2xhtml/export/xhtml/header.xsl 
filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
index 98ee59b..f76c451 100644
--- filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
+++ filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
@@ -108,6 +108,8 @@

 span.annotation_style_by_filter { font-size:95%; font-family:Arial; 
background-color:#fff000;  margin:0; border:0; padding:0;  }

+li span.bullet {display:block}
+
 * { margin:0;}


-- 
1.8.5.1

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH 09/17] XHTML export: Add markup and styles for page-breaks

[andrew-libreoffice . org]

From: Andrew Sayers 

---
 filter/source/xslt/odf2xhtml/export/common/body.xsl | 2 +-
 .../xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl   | 6 ++
 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl  | 6 ++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git filter/source/xslt/odf2xhtml/export/common/body.xsl 
filter/source/xslt/odf2xhtml/export/common/body.xsl
index facc174..cfb464f 100644
--- filter/source/xslt/odf2xhtml/export/common/body.xsl
+++ filter/source/xslt/odf2xhtml/export/common/body.xsl
@@ -417,7 +417,7 @@

 

-   
+   
 


diff --git 
filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl 
filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
index b99a781..822ba0b 100644
--- filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
+++ filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
@@ -73,6 +73,12 @@


 
+   
+   break-before:
+   
+   ; 
+   
+


clear:both; 
diff --git filter/source/xslt/odf2xhtml/export/xhtml/body.xsl 
filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index fdc4e19..46c0a7c 100644
--- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -205,6 +205,12 @@


 
+   
+   
+   break-before:page
+   
+   
+



-- 
1.8.5.1

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: cui/source

[Tor Lillqvist]

 cui/source/options/personalization.cxx |2 +-
 cui/source/options/personalization.hxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5180edb7f264c6037091fd522317638d0e9505ea
Author: Tor Lillqvist 
Date:   Fri Aug 15 02:26:53 2014 +0300

WaE: passing class rtl::OUString by value, rather pass by reference

Change-Id: Ib2154a93192aa8342660b309f5307c1cb443063c

diff --git a/cui/source/options/personalization.cxx 
b/cui/source/options/personalization.cxx
index 5aafe83..16def71 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -356,7 +356,7 @@ void SvxPersonalizationTabPage::Reset( const SfxItemSet * )
 m_pDefaultPersona->Check();
 }
 
-void SvxPersonalizationTabPage::SetPersonaSettings( const OUString 
aPersonaSettings )
+void SvxPersonalizationTabPage::SetPersonaSettings( const OUString& 
aPersonaSettings )
 {
 m_aPersonaSettings = aPersonaSettings;
 m_pOwnPersona->Check();
diff --git a/cui/source/options/personalization.hxx 
b/cui/source/options/personalization.hxx
index 2ef49e9..4df2a68 100644
--- a/cui/source/options/personalization.hxx
+++ b/cui/source/options/personalization.hxx
@@ -51,7 +51,7 @@ public:
 /// Reset to default settings ([Revert] button).
 virtual void Reset( const SfxItemSet *rSet ) SAL_OVERRIDE;
 
-void SetPersonaSettings( const OUString );
+void SetPersonaSettings( const OUString& );
 
 void LoadDefaultImages();
 void LoadExtensionThemes();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: libreofficekit/qa

[Michael Meeks]

 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ec7ab6356b02d85011485048d0f4d11239d386af
Author: Michael Meeks 
Date:   Thu Aug 14 19:06:02 2014 -0400

LOK: remove code from assert that must be compiled when not in debug mode.

Change-Id: Ibc02247ad4f1099fa31acdcef38dd5b1e95523f2

diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx 
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index 112e03e..2e70c09 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -280,7 +280,8 @@ int main( int argc, char* argv[] )
 gtk_widget_show_all( pWindow );
 
 pFileName = argv[2];
-assert( lok_docview_open_document( LOK_DOCVIEW(pDocView), argv[2] ) );
+int bOpened = lok_docview_open_document( LOK_DOCVIEW(pDocView), argv[2] );
+assert( bOpened ); (void)bOpened;
 assert( LOK_DOCVIEW(pDocView)->pDocument );
 
 // GtkComboBox requires gtk 2.24 or later
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/galaxy sc/source sc/uiconfig

[Thomas Viehmann]

 icon-themes/galaxy/sc/res/paste_transpose.png  |binary
 icon-themes/galaxy/sc/res/paste_values_formats.png |binary
 icon-themes/galaxy/sc/res/paste_values_only.png|binary
 sc/source/ui/inc/inscodlg.hxx  |   19 +++-
 sc/source/ui/miscdlgs/inscodlg.cxx |   76 +
 sc/uiconfig/scalc/ui/pastespecial.ui   |   89 ++---
 6 files changed, 169 insertions(+), 15 deletions(-)

New commits:
commit 6af3bc396eedde71e40c3e8d714a728c8fa881aa
Author: Thomas Viehmann 
Date:   Fri Aug 15 00:07:58 2014 +0200

fdo#79116 make paste special easier to use

This patch adds three short cut buttons to the calc paste special
dialog: paste values only (numbers, strings, dates), paste values and
formats, and paste transposed.

Change-Id: Ie70fbaa28976b2311b1d9cf53b094a5083fb42d4
Reviewed-on: https://gerrit.libreoffice.org/10928
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/icon-themes/galaxy/sc/res/paste_transpose.png 
b/icon-themes/galaxy/sc/res/paste_transpose.png
new file mode 100644
index 000..9f1d315
Binary files /dev/null and b/icon-themes/galaxy/sc/res/paste_transpose.png 
differ
diff --git a/icon-themes/galaxy/sc/res/paste_values_formats.png 
b/icon-themes/galaxy/sc/res/paste_values_formats.png
new file mode 100644
index 000..82f0b1f
Binary files /dev/null and b/icon-themes/galaxy/sc/res/paste_values_formats.png 
differ
diff --git a/icon-themes/galaxy/sc/res/paste_values_only.png 
b/icon-themes/galaxy/sc/res/paste_values_only.png
new file mode 100644
index 000..4ae118b
Binary files /dev/null and b/icon-themes/galaxy/sc/res/paste_values_only.png 
differ
diff --git a/sc/source/ui/inc/inscodlg.hxx b/sc/source/ui/inc/inscodlg.hxx
index 3fd4008..1130daa 100644
--- a/sc/source/ui/inc/inscodlg.hxx
+++ b/sc/source/ui/inc/inscodlg.hxx
@@ -37,9 +37,9 @@ public:
 
 sal_uInt16  GetInsContentsCmdBits() const;
 sal_uInt16  GetFormulaCmdBits() const;
-boolIsSkipEmptyCells() const {return 
mpBtnSkipEmptyCells->IsChecked();}
-boolIsTranspose() const {return mpBtnTranspose->IsChecked();}
-boolIsLink() const {return mpBtnLink->IsChecked();}
+boolIsSkipEmptyCells() const;
+boolIsTranspose() const;
+boolIsLink() const;
 InsCellCmd  GetMoveMode();
 
 voidSetOtherDoc( bool bSet );
@@ -71,11 +71,23 @@ private:
 RadioButton* mpRbMoveDown;
 RadioButton* mpRbMoveRight;
 
+PushButton*  mpBtnShortCutPasteValuesOnly;
+PushButton*  mpBtnShortCutPasteValuesFormats;
+PushButton*  mpBtnShortCutPasteTranspose;
+
 bool  bOtherDoc;
 bool  bFillMode;
 bool  bChangeTrack;
 bool  bMoveDownDisabled;
 bool  bMoveRightDisabled;
+bool  bUsedShortCut;
+
+sal_uInt16nShortCutInsContentsCmdBits;
+sal_uInt16nShortCutFormulaCmdBits;
+bool  bShortCutSkipEmptyCells;
+bool  bShortCutTranspose;
+bool  bShortCutIsLink;
+InsCellCmdnShortCutMoveMode;
 
 static bool bPreviousAllCheck;
 static sal_uInt16   nPreviousChecks;
@@ -89,6 +101,7 @@ private:
 // Handler
 DECL_LINK( InsAllHdl, void* );
 DECL_LINK( LinkBtnHdl, void* );
+DECL_LINK( ShortCutHdl, PushButton* );
 };
 
 #endif // INCLUDED_SC_SOURCE_UI_INC_INSCODLG_HXX
diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx 
b/sc/source/ui/miscdlgs/inscodlg.cxx
index 18426b0..f35252e 100644
--- a/sc/source/ui/miscdlgs/inscodlg.cxx
+++ b/sc/source/ui/miscdlgs/inscodlg.cxx
@@ -38,7 +38,8 @@ ScInsertContentsDlg::ScInsertContentsDlg( Window*   
pParent,
 bFillMode   ( false ),
 bChangeTrack( false ),
 bMoveDownDisabled( false ),
-bMoveRightDisabled( false )
+bMoveRightDisabled( false ),
+bUsedShortCut   ( false )
 {
 get( mpBtnInsAll, "paste_all" );
 get( mpBtnInsStrings, "text" );
@@ -59,6 +60,9 @@ ScInsertContentsDlg::ScInsertContentsDlg( Window*   
pParent,
 get( mpRbMoveNone, "no_shift" );
 get( mpRbMoveDown, "move_down" );
 get( mpRbMoveRight, "move_right" );
+get( mpBtnShortCutPasteValuesOnly, "paste_values_only");
+get( mpBtnShortCutPasteValuesFormats, "paste_values_formats");
+get( mpBtnShortCutPasteTranspose, "paste_transpose");
 
 if ( pStrTitle )
 SetText( *pStrTitle );
@@ -111,6 +115,9 @@ ScInsertContentsDlg::ScInsertContentsDlg( Window*   
pParent,
 mpBtnInsAll->SetClickHdl( LINK( this, ScInsertContentsDlg, InsAllHdl ) );
 mpBtnLink->SetClickHdl( LINK( this, ScInsertContentsDlg, LinkBtnHdl ) );
 
+mpBtnShortCutPasteValuesOnly->SetClickHdl( LINK( this, 
ScInsertContentsDlg, ShortCutHdl ) );;
+mpBtnShortCutPasteValuesFormats->SetClickHdl( LINK( this, 
ScInsertContentsDlg, ShortCutHdl ) );;
+mpBtnSho

[Bug 79116] make paste special easier to use

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=79116

Commit Notification  changed:

   What|Removed |Added

 Whiteboard|EasyHack DifficultyBeginner |EasyHack DifficultyBeginner
   |SkillCpp TopicCleanup   |SkillCpp TopicCleanup
   ||target:4.4.0

--- Comment #5 from Commit Notification 
 ---
Thomas Viehmann committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=6af3bc396eedde71e40c3e8d714a728c8fa881aa

fdo#79116 make paste special easier to use



The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
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 79116] make paste special easier to use

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=79116

Michael Meeks  changed:

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED
 CC||markus.mohrhard@googlemail.
   ||com

--- Comment #6 from Michael Meeks  ---
Awesome work Thomas =) thanks for that - pushed to master (perhaps the calc
guys will have a comment here or there :-), and looking forward to your next
commit. Anything else you can see to cleanup around that dialog ?

Failing that could I interest you in bug#82641 - I (for one) would find that
rather useful too ;-)

-- 
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

[Markus Mohrhard]

 sc/source/core/tool/chartlis.cxx |   38 ++
 1 file changed, 6 insertions(+), 32 deletions(-)

New commits:
commit 1e9baadcb71cb393864be4e8580a50183cb7152e
Author: Markus Mohrhard 
Date:   Fri Aug 15 03:48:25 2014 +0200

another memory leak based on release().release()

Thanks Michael Meeks for noticing.

Change-Id: I8c27215d3cf4624a19f4fd905758e588b342c6c9

diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx
index be56325..57778a6 100644
--- a/sc/source/core/tool/chartlis.cxx
+++ b/sc/source/core/tool/chartlis.cxx
@@ -499,24 +499,6 @@ void ScChartListenerCollection::ChangeListening( const 
OUString& rName,
 pCL->SetDirty( true );
 }
 
-namespace {
-
-class InsertChartListener : public std::unary_function
-{
-ScChartListenerCollection::ListenersType& mrListeners;
-public:
-InsertChartListener(ScChartListenerCollection::ListenersType& rListeners) :
-mrListeners(rListeners) {}
-
-void operator() (ScChartListener* p)
-{
-OUString aName = p->GetName();
-mrListeners.insert(aName, p);
-}
-};
-
-}
-
 void ScChartListenerCollection::FreeUnused()
 {
 ListenersType aUsed, aUnused;
@@ -550,29 +532,21 @@ void ScChartListenerCollection::FreeUnused()
 void ScChartListenerCollection::FreeUno( const uno::Reference< 
chart::XChartDataChangeEventListener >& rListener,
  const uno::Reference< 
chart::XChartData >& rSource )
 {
-std::vector aUsed, aUnused;
+ListenersType aUsed, aUnused;
 
 // First, filter each listener into 'used' and 'unused' categories.
 {
-ListenersType::iterator it = maListeners.begin(), itEnd = 
maListeners.end();
-for (; it != itEnd; ++it)
+while(!maListeners.empty())
 {
-ScChartListener* p = it->second;
+ScChartListener* p = maListeners.begin()->second;
 if (p->IsUno() && p->GetUnoListener() == rListener && 
p->GetUnoSource() == rSource)
-aUnused.push_back(p);
+aUnused.transfer(maListeners.begin(), maListeners);
 else
-aUsed.push_back(p);
+aUsed.transfer(maListeners.begin(), maListeners);
 }
 }
 
-// Release all pointers currently managed by the ptr_map container.
-maListeners.release().release();
-
-// Re-insert the listeners we need to keep.
-std::for_each(aUsed.begin(), aUsed.end(), 
InsertChartListener(maListeners));
-
-// Now, delete the ones no longer needed.
-std::for_each(aUnused.begin(), aUnused.end(), 
boost::checked_deleter());
+std::swap(aUsed, maListeners);
 }
 
 void ScChartListenerCollection::StartTimer()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Repository.mk

[Tor Lillqvist]

 Repository.mk |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit c68dd99b967146a1707a5e14524e1374acda723e
Author: Tor Lillqvist 
Date:   Fri Aug 15 01:39:14 2014 +0300

Register postgresql-sdbc libs only if we build them, surely?

Change-Id: I8cee0b3ee52925029834605c86fc01303e34b0c4

diff --git a/Repository.mk b/Repository.mk
index e043860..9bdff08 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -434,8 +434,9 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 ))
 
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,postgresqlsdbc, 
\
-   postgresql-sdbc \
-   postgresql-sdbc-impl \
+   $(if $(BUILD_POSTGRESQL_SDBC), \
+   postgresql-sdbc \
+   postgresql-sdbc-impl) \
 ))
 
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,pdfimport, \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - scp2/inc scp2/source solenv/bin

[Tor Lillqvist]

 scp2/inc/macros.inc   |2 --
 scp2/source/ooo/common_brand.scp  |8 
 scp2/source/ooo/ure.scp   |   22 --
 scp2/source/python/file_python.scp|3 +++
 solenv/bin/macosx-codesign-app-bundle |9 ++---
 5 files changed, 29 insertions(+), 15 deletions(-)

New commits:
commit 26cfc797fa0b1809cd0c01d5546ba97856bc8143
Author: Tor Lillqvist 
Date:   Fri Aug 15 08:39:49 2014 +0300

When ENABLE_MACOSX_MACLIKE_APP_STRUCTURE put only binaries in the MacOS dir

The new code signing is more strict and enforces bundle structure
harder, it seems.

When ENABLE_MACOSX_MACLIKE_APP_STRUCTURE bypass the unoinfo and python
shell scripts. If they actually are needed, will have to put them
somewhere under Resources.

Change-Id: I14a34936b78195746d2b88d25603952ce5309380

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 365fb7b..935238e 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -560,12 +560,14 @@ File gid_Brand_File_Desktophelper_Txt
 End
 #endif
 
+#if !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
 File gid_Brand_File_Bin_Unoinfo
 BIN_FILE_BODY;
 Dir = gid_Brand_Dir_Program;
 Name = EXENAME(unoinfo);
 Styles = (PACKED);
 End
+#endif
 
 #ifdef WNT
 File gid_Brand_File_Bin_Unopkgcom
diff --git a/scp2/source/python/file_python.scp 
b/scp2/source/python/file_python.scp
index b2595ce..32b0d36 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -42,6 +42,8 @@ File gid_File_Pyuno_Rdb
 End
 
 #ifndef SYSTEM_PYTHON
+
+#if !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
 File gid_File_Py_Bin_Python
 BIN_FILE_BODY;
 #ifdef WNT
@@ -54,6 +56,7 @@ File gid_File_Py_Bin_Python
 Styles = (FILELIST, PACKED);
 #endif
 End
+#endif
 
 #ifndef MACOSX
 Directory gid_Dir_Py_PythonCore
commit 41f2ebfbaa9fb06f56530b4a330fc029df87ecfd
Author: Tor Lillqvist 
Date:   Fri Aug 15 01:52:17 2014 +0300

The --resource-rules option in being deprecated

The documentation is a bit unclear yet, but I think it is safe to
assume that Apple strongly wants sandboxed apps to have what we call
ENABLE_MACOSX_MACLIKE_APP_STRUCTURE and to be signed without any
special resource rules.

Change-Id: I1409ccb6a3f9086d01af6ff318fe28536c1cebef

diff --git a/solenv/bin/macosx-codesign-app-bundle 
b/solenv/bin/macosx-codesign-app-bundle
index 2f22618..cdaa8e8 100755
--- a/solenv/bin/macosx-codesign-app-bundle
+++ b/solenv/bin/macosx-codesign-app-bundle
@@ -89,11 +89,14 @@ done
 # (bootstraprc and similar that the user might adjust and image files)
 # See also https://developer.apple.com/library/mac/technotes/tn2206/
 
-if test "$ENABLE_MACOSX_SANDBOX" = "TRUE"; then
+id=`echo ${MACOSX_APP_NAME} | tr ' ' '-'`
+
+if test -n "$ENABLE_MACOSX_SANDBOX"; then
 entitlements="--entitlements $BUILDDIR/lo.xcent"
+else
+resource_rules="--resource-rules 
$SRCDIR/setup_native/source/mac/CodesignRules.plist"
 fi
 
-id=`echo ${MACOSX_APP_NAME} | tr ' ' '-'`
-codesign --force --verbose --identifier="${MACOSX_BUNDLE_IDENTIFIER}.$id" 
--resource-rules "$SRCDIR/setup_native/source/mac/CodesignRules.plist" --sign 
"$MACOSX_CODESIGNING_IDENTITY" $entitlements $APP_BUNDLE
+codesign --force --verbose --identifier="${MACOSX_BUNDLE_IDENTIFIER}.$id" 
$resource_rules --sign "$MACOSX_CODESIGNING_IDENTITY" $entitlements $APP_BUNDLE
 
 exit 0
commit 88be7b54c5be57c7ecabe200731262e24c0ca0a4
Author: Tor Lillqvist 
Date:   Fri Aug 15 01:51:05 2014 +0300

Fixes for the ENABLE_MACOSX_MACLIKE_APP_STRUCTURE case

Change-Id: Ic3d27298264df9aa4e3e976fbca477106dbe180a

diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 2952eff..dd9b4b3 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -83,7 +83,6 @@
 #define GID_DIR_URE_JAVA gid_Dir_Classes
 #define GID_DIR_URE_LIB gid_Dir_Frameworks
 #define GID_DIR_URE_SHARE gid_Brand_Dir_Share_Ure
-#define GID_DIR_URE_SHARE_MISC gid_Brand_Dir_Share_Ure
 #else
 #define GID_BRAND_DIR_ETC gid_Brand_Dir_Program
 #define GID_DIR_PY gid_Brand_Dir_Program
@@ -92,7 +91,6 @@
 #define GID_DIR_URE_JAVA gid_Dir_Ure_Java
 #define GID_DIR_URE_LIB gid_Dir_Ure_Lib
 #define GID_DIR_URE_SHARE gid_Dir_Ure_Share
-#define GID_DIR_URE_SHARE_MISC gid_Dir_Ure_Misc
 #endif
 
 #define RESFILENAME(name,lang)STRING(CONCAT3(name,lang,.res))
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 562cad7..365fb7b 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -45,6 +45,7 @@ Module gid_Module_Root_Brand
 gid_Brand_Dir_Share_Uno_Packages,
 gid_Brand_Dir_Share_Uno_Packages_Cache,
 gid_Brand_Dir_Share_Ure,
+gid_Brand_Dir_Share_Ure_Share,
 gid_Brand_Dir_Share_Glade,
 gid_Brand_Dir_Share_Labels,
 

[Libreoffice-commits] core.git: scp2/source

[Tor Lillqvist]

 scp2/source/ooo/ure.scp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5794fcad10df4d6ac8388627662ea830dde7e629
Author: Tor Lillqvist 
Date:   Fri Aug 15 09:01:00 2014 +0300

Typo

Change-Id: I9ba1a5679eb636103ccf7b34f120ed0d03903e76

diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 173e669..26d7dba 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -91,7 +91,7 @@ Directory gid_Dir_Ure_Share_Misc
 #if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
 ParentID = gid_Brand_Dir_Share_Ure_Share;
 #else
-ParentID = gir_Dir_Ure_Share;
+ParentID = gid_Dir_Ure_Share;
 #endif
 DosName = "misc";
 End
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

LibreOffice Gerrit News for core on 2014-08-15

[gerrit]

Moin!

* Open changes on master for project core changed in the last 25 hours:

 First time contributors doing great things! 
+ vcl/source/opengl/OpenGLContext.cxx: fix build for OSX < 10.6
  in https://gerrit.libreoffice.org/10592 from Douglas Mencken
  about module vcl
+ fdo#81426 : Data from header and footer is getting lost.
  in https://gerrit.libreoffice.org/10531 from Rajashri Udhoji
  about module sw
+ fdo#79541 :Corrupt: Shape  enclosed within a floating table
  in https://gerrit.libreoffice.org/9914 from Rajashri Udhoji
  about module sw, writerfilter
 End of freshness 

+ upgrade to apache-commons-1.2
  in https://gerrit.libreoffice.org/10927 from Thomas Arnhold
  about module build, external, reportbuilder, swext
+ upgrade to openssl-1.0.1i
  in https://gerrit.libreoffice.org/10926 from Thomas Arnhold
  about module build
+ XStyleLoader2 : correct idl description
  in https://gerrit.libreoffice.org/10923 from Laurent Godard
  about module offapi
+ vcl: use enum for complex text layout constants
  in https://gerrit.libreoffice.org/10676 from Noel Grandin
  about module canvas, cppcanvas, drawinglayer, editeng, include, sc, starmath, 
svx, sw, vcl


* Merged changes on master for project core changed in the last 25 hours:

+ fdo#79116 make paste special easier to use
  in https://gerrit.libreoffice.org/10928 from Thomas Viehmann
+ upgrade to cppunit 1.13.2
  in https://gerrit.libreoffice.org/10856 from Thomas Arnhold
+ Created std::vector to store learnmore URLs.
  in https://gerrit.libreoffice.org/9346 from Rachit Gupta
+ select_persona_dialog.ui changed to include search.
  in https://gerrit.libreoffice.org/9228 from Rachit Gupta
+ Created basic architecture for PersonasDocHandler.
  in https://gerrit.libreoffice.org/9203 from Rachit Gupta
+ fdo#82430: configure: MSVC build: avoid using SSE2 instructions
  in https://gerrit.libreoffice.org/10838 from Michael Stahl
+ fdo#75757: remove inheritance to std::vector
  in https://gerrit.libreoffice.org/10921 from Takeshi Abe
+ Convert RID_PAGE_OPTION_DBFIELD tabpage to .ui
  in https://gerrit.libreoffice.org/10920 from Mihály Palenik
+ MSVC: disable C4189 again in optimizing builds
  in https://gerrit.libreoffice.org/10914 from Thomas Arnhold
+ fdo#82123 : DOCX: Corruption: File was getting corrupt fafter RT
  in https://gerrit.libreoffice.org/10827 from Pallavi Jadhav


* Abandoned changes on master for project core changed in the last 25 hours:

+ javaunohelper: parseUnoUrl with a regex
  in https://gerrit.libreoffice.org/10917 from Robert Antoni Buj i Gelonch
+ move OpenGLContext to SAL
  in https://gerrit.libreoffice.org/9429 from David Tardon


* Open changes needing tweaks, but being untouched for more than a week:

+ fdo#79422 Fix hang problem After ReplaceAll by closing Search Dialog
  in https://gerrit.libreoffice.org/10643 from Seyeong Kim
+ Rel fdo#48068: fix errors when 2 decimals in svg path position
  in https://gerrit.libreoffice.org/10544 from Joren De Cuyper
+ fdo#80996:Fix for DataLabel not preserved for ColumnChart after RT
  in https://gerrit.libreoffice.org/10169 from Dushyant Bhalgami
+ fdo#79018: LO hangs while opening file.
  in https://gerrit.libreoffice.org/9564 from Yogesh Bharate
+ Use assert instead of OSL_ASSERT in sal/
  in https://gerrit.libreoffice.org/10113 from Arnaud Versini
+ fdo#77716 : Paragraph spacing is not preserved after RT.
  in https://gerrit.libreoffice.org/9197 from Tushar Bende
+ fdo#77121 Header / Footer positions not preserved after RT
  in https://gerrit.libreoffice.org/9235 from Priyanka Gaikwad


Best,

Your friendly LibreOffice Gerrit Digest Mailer

Note: The bot generating this message can be found and improved here:
   
https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 79116] make paste special easier to use

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=79116

--- Comment #7 from Adolfo Jayme  ---
This looks like something that needs to be highlighted in the release notes :-)
https://wiki.documentfoundation.org/ReleaseNotes/4.4

-- 
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: desktop/source

[deenafrancis]

 desktop/source/app/app.cxx |1 
 desktop/source/app/cmdlineargs.cxx |8 
 desktop/source/app/cmdlineargs.hxx |2 +
 desktop/source/app/cmdlinehelp.cxx |5 ++
 desktop/source/app/dispatchwatcher.cxx |   57 +
 desktop/source/app/dispatchwatcher.hxx |3 +
 desktop/source/app/officeipcthread.cxx |7 ++--
 desktop/source/app/officeipcthread.hxx |3 +
 8 files changed, 74 insertions(+), 12 deletions(-)

New commits:
commit 3d318e6cf4a183e14a043840b9990958c7527536
Author: deenafrancis 
Date:   Wed Jul 30 01:16:34 2014 +0530

fdo#70625 Add --cat parameter to make git diffs pretty

Change-Id: I309ca3e718a11ca97991686c229c79ab20e8c3d9
Reviewed-on: https://gerrit.libreoffice.org/10623
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 46fbebe..8eed982 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -2399,6 +2399,7 @@ void Desktop::OpenClients()
 aRequest.aConversionParams = rArgs.GetConversionParams();
 aRequest.aConversionOut = rArgs.GetConversionOut();
 aRequest.aInFilter = rArgs.GetInFilter();
+aRequest.bTextCat = rArgs.IsTextCat();
 
 if ( !aRequest.aOpenList.empty() ||
  !aRequest.aViewList.empty() ||
diff --git a/desktop/source/app/cmdlineargs.cxx 
b/desktop/source/app/cmdlineargs.cxx
index 5f98e07..2cecabc 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -190,6 +190,13 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& 
supplier )
 m_headless = true;
 m_invisible = true;
 }
+else if ( oArg == "cat" )
+{
+m_textcat = true;
+m_conversionparams = "txt:Text";
+bOpenEvent = false;
+bConversionEvent = true;
+}
 else if ( oArg == "quickstart" )
 {
 #if defined(ENABLE_QUICKSTART_APPLET)
@@ -608,6 +615,7 @@ void CommandLineArgs::InitParamValues()
 m_splashpipe = false;
 m_bEmpty = true;
 m_bDocumentArgs  = false;
+m_textcat = false;
 }
 
 
diff --git a/desktop/source/app/cmdlineargs.hxx 
b/desktop/source/app/cmdlineargs.hxx
index 609befb..74c8c0e 100644
--- a/desktop/source/app/cmdlineargs.hxx
+++ b/desktop/source/app/cmdlineargs.hxx
@@ -85,6 +85,7 @@ class CommandLineArgs: private boost::noncopyable
 boolIsVersion() const { return m_version;}
 boolHasModuleParam() const;
 boolWantsToLoadDocument() const { return 
m_bDocumentArgs;}
+boolIsTextCat() const { return m_textcat;}
 
 OUStringGetUnknown() const { return m_unknown;}
 
@@ -145,6 +146,7 @@ class CommandLineArgs: private boost::noncopyable
 bool m_helpbase;
 bool m_version;
 bool m_splashpipe;
+bool m_textcat;
 
 OUString m_unknown;
 
diff --git a/desktop/source/app/cmdlinehelp.cxx 
b/desktop/source/app/cmdlinehelp.cxx
index f042b46..dbec4e9 100644
--- a/desktop/source/app/cmdlinehelp.cxx
+++ b/desktop/source/app/cmdlinehelp.cxx
@@ -124,7 +124,10 @@ namespace desktop
 "  Batch print files to file.\n"\
 "  If --outdir is not specified then current working dir is used 
as output_dir.\n"\
 "  Eg. --print-to-file *.doc\n"\
-"  --print-to-file --printer-name nasty_lowres_printer 
--outdir /home/user *.doc\n"\
+"  --print-to-file --printer-name nasty_lowres_printer 
--outdir /home/user *.doc\n" \
+"--cat files\n"\
+"  Dump text content of the files to console\n"\
+"  Eg. --cat *.odt\n"\
 "--pidfile file\n"\
 "  Store soffice.bin pid to file.\n"\
 "-env:[=]\n"\
diff --git a/desktop/source/app/dispatchwatcher.cxx 
b/desktop/source/app/dispatchwatcher.cxx
index c792655..01d082e 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -55,7 +55,10 @@
 
 #include 
 #include 
+#include 
+#include 
 #include 
+#include 
 
 using namespace ::osl;
 using namespace ::com::sun::star::uno;
@@ -496,11 +499,12 @@ bool DispatchWatcher::executeDispatchRequests( const 
DispatchList& aDispatchRequ
 else if ( aDispatchRequest.aRequestType == REQUEST_PRINT ||
   aDispatchRequest.aRequestType == REQUEST_PRINTTO ||
   aDispatchRequest.aRequestType == REQUEST_BATCHPRINT ||
-  aDispatchRequest.aRequestType == REQUEST_CONVERSION )
+  aDispatchRequest.aRequestType == REQUEST_CONVERSION ||
+  aDispatchRequest.aRequestType == REQUEST_CAT )
 {
 if ( xDoc.is() )
 {
-if ( aDispatchRequest.aRequestType == REQUEST_CONVERSION ) 
{
+   

[Bug 70625] Add --cat parameter to make git diffs pretty

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=70625

Commit Notification  changed:

   What|Removed |Added

 Whiteboard|EasyHack DifficultyBeginner |EasyHack DifficultyBeginner
   |SkillCpp TopicCleanup   |SkillCpp TopicCleanup
   ||target:4.4.0

--- Comment #10 from Commit Notification 
 ---
deenafrancis committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=3d318e6cf4a183e14a043840b9990958c7527536

fdo#70625 Add --cat parameter to make git diffs pretty



The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
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: scp2/source

[Tor Lillqvist]

 scp2/source/ooo/ure.scp |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit 8605fcbf8e2a89afda675775b2302d9f58333e74
Author: Tor Lillqvist 
Date:   Fri Aug 15 09:41:06 2014 +0300

Blind fix attempt for WNT

Change-Id: Iee1c5a5a1c9db5114b2b31cfac66d1a2d673a585

diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 26d7dba..a30a1fc 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -87,6 +87,7 @@ End
 
 #endif // !ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
 
+#if !defined WNT
 Directory gid_Dir_Ure_Share_Misc
 #if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
 ParentID = gid_Brand_Dir_Share_Ure_Share;
@@ -95,6 +96,7 @@ Directory gid_Dir_Ure_Share_Misc
 #endif
 DosName = "misc";
 End
+#endif
 
 // Public Dynamic Libraries:
 
@@ -412,14 +414,22 @@ End
 
 File gid_File_Misc_TypesRdb
 TXT_FILE_BODY;
+#ifdef WNT
+Dir = gid_Dir_Ure_Misc;
+#else
 Dir = gid_Dir_Ure_Share_Misc;
+#endif
 Name = "types.rdb";
 Styles = (PACKED);
 End
 
 File gid_File_Misc_ServicesRdb
 TXT_FILE_BODY;
+#ifdef WNT
+Dir = gid_Dir_Ure_Misc;
+#else
 Dir = gid_Dir_Ure_Share_Misc;
+#endif
 Name = "services.rdb";
 Styles = (PACKED);
 End
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 70625] Add --cat parameter to make git diffs pretty

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=70625

--- Comment #11 from Michael Meeks  ---
Nice patch Deena - thanks for that.

A few more things might be a good idea:

* perhaps auto-enable --headless on Linux - there are other settings to force
windows not to show on Mac etc. I think ;-)

* work out what we want for spreadsheets / presentations - export as CSV ? or
... something there would be good I guess.

Then I guess we need to persuade someone to knock up some sample git config
bits such that we can get nice human readable diffs easily - perhaps dropping
that in the wiki ? [ and the 4.4 features wiki page I guess - perhaps the
SparkleShare people would appreciate that too ? ].

Anyhow - a really great start; - oh ! and also can you send an E-mail like
this:

https://wiki.documentfoundation.org/Development/Developers#Developers_and_Contributors_list

so we get the auditing right =)

Thanks !

-- 
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: offapi/com

[Laurent Godard]

 offapi/com/sun/star/style/XStyleLoader2.idl |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1f795ad128ce52dfd2edfb567454f2d5785b6016
Author: Laurent Godard 
Date:   Thu Aug 14 18:26:51 2014 +0200

XStyleLoader2 : correct idl description

only implemented for calc at the moment

Change-Id: I7ac631567a69c9ad30da79caad3c50359de14437
Reviewed-on: https://gerrit.libreoffice.org/10923
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/offapi/com/sun/star/style/XStyleLoader2.idl 
b/offapi/com/sun/star/style/XStyleLoader2.idl
index 819ea9b..dbdde44 100644
--- a/offapi/com/sun/star/style/XStyleLoader2.idl
+++ b/offapi/com/sun/star/style/XStyleLoader2.idl
@@ -17,7 +17,7 @@
 
 module com {  module sun {  module star {  module style {
 
-/** extends XStyleLoader interface to import styles from an already opened 
calc or writer component.
+/** extends XStyleLoader interface to import styles from an already opened 
component.
 
 @see com::sun::star::style::XStyleLoader
 
@@ -28,7 +28,7 @@ interface XStyleLoader2: com::sun::star::style::XStyleLoader
 /** loads styles from a given document
 
  @param aSourceComponent
- a valid XComponent reference to source doc (calc or writer)
+ a valid XComponent reference to source document
  @param aOptions
  Specifies which of the Style families the method should load.
  The sequence has the following, optional 
items:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits