date:20151105

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

2015-11-05 Thread Miklos Vajna

 sw/inc/htmltbl.hxx|  154 
 sw/source/core/doc/htmltbl.cxx|  484 +--
 sw/source/core/text/inftxt.cxx|  196 +--
 sw/source/core/text/inftxt.hxx|  250 +++---
 sw/source/ui/config/optpage.cxx   |  602 +-
 sw/source/uibase/inc/optpage.hxx  |   92 ++---
 sw/source/uibase/inc/unomailmerge.hxx |   84 ++--
 sw/source/uibase/uno/unomailmerge.cxx |  450 -
 8 files changed, 1156 insertions(+), 1156 deletions(-)

New commits:
commit ad8af6c83cd32af0e377a7e220ea5cd0fbea341e
Author: Miklos Vajna 
Date:   Fri Nov 6 08:35:03 2015 +0100

sw: prefix members of SwXMailMerge

Change-Id: If8ad3b57bd2b5af83cbf44737db24e44af92d6b7

diff --git a/sw/source/uibase/inc/unomailmerge.hxx 
b/sw/source/uibase/inc/unomailmerge.hxx
index 2620d25..6aa7e67 100644
--- a/sw/source/uibase/inc/unomailmerge.hxx
+++ b/sw/source/uibase/inc/unomailmerge.hxx
@@ -75,53 +75,53 @@ class SwXMailMerge :
 {
 friend class MailMergeExecuteFinalizer;
 
-cppu::OInterfaceContainerHelper aEvtListeners;
-cppu::OInterfaceContainerHelper aMergeListeners;
-OPropertyListenerContainerHelperaPropListeners;
+cppu::OInterfaceContainerHelper m_aEvtListeners;
+cppu::OInterfaceContainerHelper m_aMergeListeners;
+OPropertyListenerContainerHelperm_aPropListeners;
 
-const SfxItemPropertySet*   pPropSet;
+const SfxItemPropertySet*   m_pPropSet;
 
-SfxObjectShellRef xDocSh;   // the document
+SfxObjectShellRef m_xDocSh;   // the document
 
-OUStringaTmpFileName;
+OUStringm_aTmpFileName;
 
 // properties of mail merge service
-com::sun::star::uno::Sequence< com::sun::star::uno::Any >   
aSelection;
-com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSet >  
xResultSet;
-com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > 
xConnection;
-com::sun::star::uno::Reference< com::sun::star::frame::XModel > xModel;
-OUString   aDataSourceName;
-OUString   aDataCommand;
-OUString   aFilter;
-OUString   aDocumentURL;
-OUString   aOutputURL;
-OUString   aFileNamePrefix;
-sal_Int32   nDataCommandType;
-sal_Int16   nOutputType;
-boolbEscapeProcessing;
-boolbSinglePrintJobs;
-boolbFileNameFromColumn;
-
-OUString sInServerPassword;
-OUString sOutServerPassword;
-OUString sSubject;
-OUString sAddressFromColumn;
-OUString sMailBody;
-OUString sAttachmentName;
-OUString sAttachmentFilter;
-com::sun::star::uno::Sequence< OUString >aCopiesTo;
-com::sun::star::uno::Sequence< OUString >aBlindCopiesTo;
-boolbSendAsHTML;
-boolbSendAsAttachment;
-
-com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > 
aPrintSettings;
-
-boolbSaveAsSingleFile;
-OUString sSaveFilter;
-OUString sSaveFilterOptions;
-com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > 
aSaveFilterData;
-
-boolbDisposing;
+com::sun::star::uno::Sequence< com::sun::star::uno::Any >   
m_aSelection;
+com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSet >  
m_xResultSet;
+com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > 
m_xConnection;
+com::sun::star::uno::Reference< com::sun::star::frame::XModel > 
m_xModel;
+OUString   m_aDataSourceName;
+OUString   m_aDataCommand;
+OUString   m_aFilter;
+OUString   m_aDocumentURL;
+OUString   m_aOutputURL;
+OUString   m_aFileNamePrefix;
+sal_Int32   m_nDataCommandType;
+sal_Int16   m_nOutputType;
+boolm_bEscapeProcessing;
+boolm_bSinglePrintJobs;
+boolm_bFileNameFromColumn;
+
+OUString m_sInServerPassword;
+OUString m_sOutServerPassword;
+OUString m_sSubject;
+OUString m_sAddressFromColumn;
+OUString m_sMailBody;
+OUString m_sAttachmentName;
+OUString m_sAttachmentFilter;
+com::sun::star::uno::Sequence< OUString >m_aCopiesTo;
+com::sun::star::uno::Se

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - 5 commits - desktop/source include/LibreOfficeKit include/vcl sc/inc sc/source

2015-11-05 Thread Andrzej Hunt

 desktop/source/lib/init.cxx  |   54 +++
 include/LibreOfficeKit/LibreOfficeKitEnums.h |9 +
 include/vcl/ITiledRenderable.hxx |   12 ++
 sc/inc/docuno.hxx|6 +
 sc/source/ui/inc/gridwin.hxx |   18 +++
 sc/source/ui/unoobj/docuno.cxx   |   17 +++
 sc/source/ui/view/gridwin.cxx|  128 ---
 sc/source/ui/view/gridwin4.cxx   |6 -
 8 files changed, 213 insertions(+), 37 deletions(-)

New commits:
commit bfe4af27e930108942f0e1af2bffd436588286dd
Author: Andrzej Hunt 
Date:   Thu Nov 5 10:31:06 2015 +0100

sc lok: update parameter syntax for .uno:CellCursor

This follows the syntax for .uno:ViewRowColumnHeaders
(which was implemented somewhat concurrentl with CellCursor)

Change-Id: I8ef03a969abc1716a0e95d95fb7043d75910c828
(cherry picked from commit e7e0d46dba7b1016968a10bca23a4bf668ec)

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 49189eb..dfb37b9 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1282,7 +1282,7 @@ static char* doc_getCommandValues(LibreOfficeKitDocument* 
pThis, const char* pCo
 strcpy(pMemory, aString.getStr());
 return pMemory;
 }
-else if (aCommand.startsWith(aCellCursor)
+else if (aCommand.startsWith(aCellCursor))
 {
 ITiledRenderable* pDoc = getTiledRenderable(pThis);
 if (!pDoc)
@@ -1291,29 +1291,40 @@ static char* 
doc_getCommandValues(LibreOfficeKitDocument* pThis, const char* pCo
 return 0;
 }
 
-OString aString;
-OString aParams = 
aCommand.copy(OString(".uno:CellCursor:").getLength());
-
-sal_Int32 nIndex = 0;
-OString aOutputWidth = aParams.getToken(0,  ',',  nIndex);
-OString aOutputHeight = aParams.getToken(0,  ',',  nIndex);
-OString aTileWidth = aParams.getToken(0,  ',',  nIndex);
-OString aTileHeight = aParams.getToken(0,  ',',  nIndex);
-
-int nOutputWidth, nOutputHeight;
-long nTileWidth, nTileHeight;
-if (!(comphelper::string::getTokenCount(aParams, ',') == 4
-  && !aOutputWidth.isEmpty()
-  && (nOutputWidth = aOutputWidth.toInt32()) != 0
-  && !aOutputHeight.isEmpty()
-  && (nOutputHeight = aOutputHeight.toInt32()) != 0
-  && !aTileWidth.isEmpty()
-  && (nTileWidth = aTileWidth.toInt64()) != 0
-  && !aTileHeight.isEmpty()
-  && (nTileHeight = aTileHeight.toInt64()) != 0))
+// Command has parameters.
+int nOutputWidth = 0;
+int nOutputHeight = 0;
+long nTileWidth = 0;
+long nTileHeight = 0;
+if (aCommand.getLength() > aCellCursor.getLength())
 {
-gImpl->maLastExceptionMsg = "Can't parse arguments for 
.uno:CellCursor, no cursor returned";
-return NULL;
+OString aArguments = aCommand.copy(aCellCursor.getLength() + 1);
+sal_Int32 nParamIndex = 0;
+do
+{
+OString aParamToken = aArguments.getToken(0, '&', nParamIndex);
+sal_Int32 nIndex = 0;
+OString aKey;
+OString aValue;
+do
+{
+OString aToken = aParamToken.getToken(0, '=', nIndex);
+if (!aKey.getLength())
+aKey = aToken;
+else
+aValue = aToken;
+}
+while (nIndex >= 0);
+if (aKey == "outputWidth")
+nOutputWidth = aValue.toInt32();
+else if (aKey == "outputHeight")
+nOutputHeight = aValue.toInt32();
+else if (aKey == "tileWidth")
+nTileWidth = aValue.toInt64();
+else if (aKey == "tileHeight")
+nTileHeight = aValue.toInt64();
+}
+while (nParamIndex >= 0);
 }
 
 OString aString = pDoc->getCellCursor(nOutputWidth, nOutputHeight, 
nTileWidth, nTileHeight);
commit 7020080f693ed8e6843c5099f742887395099477
Author: Andrzej Hunt 
Date:   Wed Nov 4 17:24:15 2015 +0100

sc lok: tdf#94605 introduce uno:CellCursor

This allows the client to rerequest the current cursor position,
which is necessary e.g. on zoom-level changes.

Conflicts:
desktop/source/lib/init.cxx
sc/inc/docuno.hxx

(cherry picked from commit 2bcaffd12263e8f3c2a2fbf8ccc4b9bba2642146)

Conflicts:
sc/inc/docuno.hxx

Change-Id: I10d81e220a56a36e2ec0c59005cd1d4f134857d5

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 8a391b3..49189eb 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -39,6 +39,7 @@
 #include 
 #include 
 #include 
+#i

[Libreoffice-commits] core.git: sw/inc

2015-11-05 Thread Noel Grandin

 sw/inc/IDocumentFieldsAccess.hxx|4 
 sw/inc/IDocumentLinksAdministration.hxx |4 
 sw/inc/IDocumentRedlineAccess.hxx   |4 
 sw/inc/IDocumentSettingAccess.hxx   |4 
 sw/inc/IMark.hxx|2 
 sw/inc/PostItMgr.hxx|   20 -
 sw/inc/SidebarWin.hxx   |2 
 sw/inc/SwAppletImpl.hxx |4 
 sw/inc/SwSmartTagMgr.hxx|8 
 sw/inc/SwUndoField.hxx  |6 
 sw/inc/SwXMLSectionList.hxx |   11 
 sw/inc/TextCursorHelper.hxx |6 
 sw/inc/accmap.hxx   |   43 +--
 sw/inc/authfld.hxx  |8 
 sw/inc/breakit.hxx  |   18 -
 sw/inc/checkit.hxx  |2 
 sw/inc/chpfld.hxx   |4 
 sw/inc/crsrsh.hxx   |   24 -
 sw/inc/crstate.hxx  |2 
 sw/inc/dbfld.hxx|   28 +-
 sw/inc/dbmgr.hxx|   64 ++--
 sw/inc/ddefld.hxx   |4 
 sw/inc/dlelstnr.hxx |   21 -
 sw/inc/doc.hxx  |   32 +-
 sw/inc/docsh.hxx|   16 -
 sw/inc/docstyle.hxx |4 
 sw/inc/docufld.hxx  |   66 ++--
 sw/inc/dpage.hxx|2 
 sw/inc/drawdoc.hxx  |5 
 sw/inc/editsh.hxx   |   17 -
 sw/inc/expfld.hxx   |   20 -
 sw/inc/fchrfmt.hxx  |4 
 sw/inc/fesh.hxx |   16 -
 sw/inc/finalthreadmanager.hxx   |   42 +--
 sw/inc/fldbas.hxx   |   17 -
 sw/inc/flddat.hxx   |4 
 sw/inc/flddropdown.hxx  |8 
 sw/inc/fmtanchr.hxx |4 
 sw/inc/fmtautofmt.hxx   |4 
 sw/inc/fmtclds.hxx  |4 
 sw/inc/fmtcnct.hxx  |2 
 sw/inc/fmtfld.hxx   |9 
 sw/inc/fmtfsize.hxx |4 
 sw/inc/fmtftntx.hxx |4 
 sw/inc/fmtinfmt.hxx |6 
 sw/inc/fmtline.hxx  |4 
 sw/inc/fmtmeta.hxx  |   16 -
 sw/inc/fmtornt.hxx  |   16 -
 sw/inc/fmtpdsc.hxx  |4 
 sw/inc/fmtruby.hxx  |6 
 sw/inc/fmtsrnd.hxx  |4 
 sw/inc/fmtsrndenum.hxx  |   12 
 sw/inc/fmturl.hxx   |4 
 sw/inc/fmtwrapinfluenceonobjpos.hxx |7 
 sw/inc/format.hxx   |4 
 sw/inc/frmfmt.hxx   |   13 
 sw/inc/grfatr.hxx   |   20 -
 sw/inc/hhcwrp.hxx   |6 
 sw/inc/iodetect.hxx |2 
 sw/inc/modcfg.hxx   |   20 -
 sw/inc/ndgrf.hxx|8 
 sw/inc/ndole.hxx|4 
 sw/inc/ndtxt.hxx|   14 -
 sw/inc/numrule.hxx  |4 
 sw/inc/pam.hxx  |4 
 sw/inc/paratr.hxx   |8 
 sw/inc/printdata.hxx|2 
 sw/inc/prtopt.hxx   |4 
 sw/inc/reffld.hxx   |8 
 sw/inc/section.hxx  |   20 -
 sw/inc/shellio.hxx  |   16 -
 sw/inc/splargs.hxx  |   10 
 sw/inc/swabstdlg.hxx|   40 +-
 sw/inc/swacorr.hxx  |6 
 sw/inc/swbaslnk.hxx |2 
 sw/inc/swcalwrp.hxx |3 
 sw/inc/swcrsr.hxx   |   10 
 sw/inc/swdbdata.hxx |2 
 sw/inc/swfltopt.hxx |2 
 sw/inc/swmodule.hxx |   21 -
 sw/inc/swserv.hxx   |2 
 sw/inc/swtypes.hxx  |   20 -
 sw/inc/swunohelper.hxx  |2 
 sw/inc/tgrditem.hxx |4 
 sw/inc/tox.hxx  |9 
 sw/inc/toxwrap.hxx  |   18 -
 sw/inc/unobaseclass.hxx |   12 
 sw/inc/unochart.hxx |  217 +++
 sw/inc/unocoll.hxx  |  172 ++--
 sw/inc/unocrsrhelper.hxx|  106 +++
 sw/inc/unodraw.hxx  |  168 ++--
 sw/inc/unofieldcoll.hxx |   72 ++---
 sw/inc/unoframe.hxx |  207 +++---
 sw/inc/unoidxcoll.hxx   |   38 +-
 sw/inc/unoparagraph.hxx |  271 ---
 sw/inc/unoredline.hxx   |   50 +--
 sw/inc/unoredlines.hxx  |   34 +-
 sw/inc/unosett.hxx  |  183 ++---
 sw/inc/unosrch.hxx  |   52 +--
 s

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

2015-11-05 Thread Noel Grandin

 sw/qa/core/layout-test.cxx|2 -
 sw/qa/core/macros-test.cxx|   10 
 sw/qa/extras/inc/bordertest.hxx   |4 +--
 sw/qa/extras/mailmerge/mailmerge.cxx  |2 -
 sw/qa/extras/odfimport/odfimport.cxx  |4 +--
 sw/qa/extras/ooxmlexport/ooxmlexport3.cxx |6 ++--
 sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx |2 -
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  |2 -
 sw/qa/extras/uiwriter/uiwriter.cxx|   32 +-
 9 files changed, 32 insertions(+), 32 deletions(-)

New commits:
commit dc5a6426fac6d6488ff764549dca898fb9d71b6f
Author: Noel Grandin 
Date:   Thu Nov 5 15:56:28 2015 +0200

com::sun::star->css in sw/qa/

Change-Id: I4a0282291c7737a981dbff078824904f07e4
Reviewed-on: https://gerrit.libreoffice.org/19804
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/sw/qa/core/layout-test.cxx b/sw/qa/core/layout-test.cxx
index 6261e3f..db04d51 100644
--- a/sw/qa/core/layout-test.cxx
+++ b/sw/qa/core/layout-test.cxx
@@ -86,7 +86,7 @@ void SwLayoutTest::setUp()
 m_xWriterComponent =
 
getMultiServiceFactory()->createInstance("com.sun.star.comp.Writer.TextDocument");
 CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xWriterComponent.is());
-mxDesktop = com::sun::star::frame::Desktop::create( 
comphelper::getComponentContext(getMultiServiceFactory()) );
+mxDesktop = css::frame::Desktop::create( 
comphelper::getComponentContext(getMultiServiceFactory()) );
 }
 
 void SwLayoutTest::tearDown()
diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index 89b9f0f..e6d21d9 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -126,7 +126,7 @@ void SwMacrosTest::testStarBasic()
 OUString aFileExtension(aFileFormats[0].pName, 
strlen(aFileFormats[0].pName), RTL_TEXTENCODING_UTF8 );
 OUString aFileName;
 createFileURL(aFileNameBase, aFileExtension, aFileName);
-uno::Reference< com::sun::star::lang::XComponent > xComponent = 
loadFromDesktop(aFileName, "com.sun.star.text.TextDocument");
+uno::Reference< css::lang::XComponent > xComponent = 
loadFromDesktop(aFileName, "com.sun.star.text.TextDocument");
 
 CPPUNIT_ASSERT_MESSAGE("Failed to load StarBasic.ods", xComponent.is());
 
@@ -161,7 +161,7 @@ void SwMacrosTest::testVba()
 {
 OUString aFileName;
 createFileURL(testInfo[i].sFileBaseName, aFileExtension, aFileName);
-uno::Reference< com::sun::star::lang::XComponent > xComponent = 
loadFromDesktop(aFileName, "com.sun.star.text.TextDocument");
+uno::Reference< css::lang::XComponent > xComponent = 
loadFromDesktop(aFileName, "com.sun.star.text.TextDocument");
 OUStringBuffer sMsg( "Failed to load " );
 sMsg.append ( aFileName );
 CPPUNIT_ASSERT_MESSAGE( OUStringToOString( sMsg.makeStringAndClear(), 
RTL_TEXTENCODING_UTF8 ).getStr(), xComponent.is() );
@@ -258,7 +258,7 @@ void SwMacrosTest::testControlShapeGrouping()
 {
 OUString aFileName;
 createFileURL("testControlShapeGrouping.", "odt", aFileName);
-Reference< com::sun::star::lang::XComponent > xComponent(
+Reference< css::lang::XComponent > xComponent(
 loadFromDesktop(aFileName, "com.sun.star.text.TextDocument"));
 CPPUNIT_ASSERT(xComponent.is());
 
@@ -395,7 +395,7 @@ void SwMacrosTest::testFdo68983()
 {
 OUString aFileName;
 createFileURL("fdo68983.", "odt", aFileName);
-Reference< com::sun::star::lang::XComponent > xComponent =
+Reference< css::lang::XComponent > xComponent =
 loadFromDesktop(aFileName, "com.sun.star.text.TextDocument");
 
 CPPUNIT_ASSERT_MESSAGE("Failed to load fdo68983.odt", xComponent.is());
@@ -504,7 +504,7 @@ void SwMacrosTest::setUp()
 m_xWriterComponent =
 
getMultiServiceFactory()->createInstance("com.sun.star.comp.Writer.TextDocument");
 CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xWriterComponent.is());
-mxDesktop = com::sun::star::frame::Desktop::create( 
comphelper::getComponentContext(getMultiServiceFactory()) );
+mxDesktop = css::frame::Desktop::create( 
comphelper::getComponentContext(getMultiServiceFactory()) );
 }
 
 void SwMacrosTest::tearDown()
diff --git a/sw/qa/extras/inc/bordertest.hxx b/sw/qa/extras/inc/bordertest.hxx
index fdee574..111bae2 100644
--- a/sw/qa/extras/inc/bordertest.hxx
+++ b/sw/qa/extras/inc/bordertest.hxx
@@ -14,8 +14,8 @@
 #ifndef INCLUDED_SW_QA_EXTRAS_INC_BORDERTEST_HXX
 #define INCLUDED_SW_QA_EXTRAS_INC_BORDERTEST_HXX
 
-typedef std::map BorderLineMap;
-typedef std::pair 
StringBorderPair;
+typedef std::map BorderLineMap;
+typedef std::pair StringBorderPair;
 
 using namespace com::sun::star;
 
diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx 
b/sw/qa/extras/mailmerge/mailmerge.cxx
index 985b2f8..6f95565 100644
--- a/sw/qa/extras/mailmerge/mailmerge.cxx
+++ b/sw/qa/extras/mailmerge/mailmerge.cxx
@@ -200,7 +200,7 @@ protected:

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

2015-11-05 Thread Takeshi Abe

 vcl/unx/generic/app/i18n_keysym.cxx |   38 ++--
 1 file changed, 19 insertions(+), 19 deletions(-)

New commits:
commit cb27eef229ce7f3d415184e74d1cb24ec2f8510c
Author: Takeshi Abe 
Date:   Fri Nov 6 12:01:42 2015 +0900

vcl: The keymap table is constant

Change-Id: Ia563e1c58a61eaa9f2316be280711fafe6702c9d

diff --git a/vcl/unx/generic/app/i18n_keysym.cxx 
b/vcl/unx/generic/app/i18n_keysym.cxx
index f464c49..123f0ec 100644
--- a/vcl/unx/generic/app/i18n_keysym.cxx
+++ b/vcl/unx/generic/app/i18n_keysym.cxx
@@ -29,11 +29,11 @@
 typedef const sal_Unicode unicode_t;
 typedef struct {
 const int first; const int last;
-unicode_t *map;
+const unicode_t *map;
 } keymap_t;
 
 // Latin-1  Byte 3 = 0x00
-unicode_t keymap00_map[] = {
+const unicode_t keymap00_map[] = {
 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027,
 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f,
 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037,
@@ -65,7 +65,7 @@ unicode_t keymap00_map[] = {
 const keymap_t keymap00 = { 32, 255, keymap00_map };
 
 // Latin-2  Byte 3 = 0x01
-unicode_t keymap01_map[] = {
+const unicode_t keymap01_map[] = {
 0x0104, 0x02d8, 0x0141, 0x, 0x013d, 0x015a, 0x, 0x,
 0x0160, 0x015e, 0x0164, 0x0179, 0x, 0x017d, 0x017b, 0x,
 0x0105, 0x02db, 0x0142, 0x, 0x013e, 0x015b, 0x02c7, 0x,
@@ -81,7 +81,7 @@ unicode_t keymap01_map[] = {
 const keymap_t keymap01 = { 161, 255, keymap01_map };
 
 // Latin-3  Byte 3 = 0x02
-unicode_t keymap02_map[] = {
+const unicode_t keymap02_map[] = {
 0x0126, 0x, 0x, 0x, 0x, 0x0124, 0x, 0x,
 0x0130, 0x, 0x011e, 0x0134, 0x, 0x, 0x, 0x,
 0x0127, 0x, 0x, 0x, 0x, 0x0125, 0x, 0x,
@@ -97,7 +97,7 @@ unicode_t keymap02_map[] = {
 const keymap_t keymap02 = { 161, 254, keymap02_map };
 
 // Latin-4  Byte 3 = 0x03
-unicode_t keymap03_map[] = {
+const unicode_t keymap03_map[] = {
 0x0138, 0x0156, 0x, 0x0128, 0x013b, 0x, 0x, 0x,
 0x0112, 0x0122, 0x0166, 0x, 0x, 0x, 0x, 0x,
 0x, 0x0157, 0x, 0x0129, 0x013c, 0x, 0x, 0x,
@@ -113,7 +113,7 @@ unicode_t keymap03_map[] = {
 const keymap_t keymap03 = { 162, 254, keymap03_map };
 
 // Kana Byte 3 = 0x04
-unicode_t keymap04_map[] = {
+const unicode_t keymap04_map[] = {
 0x203e, 0x, 0x, 0x, 0x, 0x, 0x, 0x,
 0x, 0x, 0x, 0x, 0x, 0x, 0x, 0x,
 0x, 0x, 0x, 0x, 0x, 0x, 0x, 0x,
@@ -130,7 +130,7 @@ unicode_t keymap04_map[] = {
 const keymap_t keymap04 = { 126, 223, keymap04_map };
 
 // Arabic   Byte 3 = 0x05
-unicode_t keymap05_map[] = {
+const unicode_t keymap05_map[] = {
 0x060c, 0x, 0x, 0x, 0x, 0x, 0x, 0x,
 0x, 0x, 0x, 0x, 0x, 0x, 0x, 0x061b,
 0x, 0x, 0x, 0x061f, 0x, 0x0621, 0x0622, 0x0623,
@@ -143,7 +143,7 @@ unicode_t keymap05_map[] = {
 const keymap_t keymap05 = { 172, 242, keymap05_map };
 
 // Cyrillic Byte 3 = 0x06
-unicode_t keymap06_map[] = {
+const unicode_t keymap06_map[] = {
 0x0452, 0x0453, 0x0451, 0x0454, 0x0455, 0x0456, 0x0457, 0x0458,
 0x0459, 0x045a, 0x045b, 0x045c, 0x, 0x045e, 0x045f, 0x2116,
 0x0402, 0x0403, 0x0401, 0x0404, 0x0405, 0x0406, 0x0407, 0x0408,
@@ -159,7 +159,7 @@ unicode_t keymap06_map[] = {
 const keymap_t keymap06 = { 161, 255, keymap06_map };
 
 // GreekByte 3 = 0x07
-unicode_t keymap07_map[] = {
+const unicode_t keymap07_map[] = {
 0x0386, 0x0388, 0x0389, 0x038a, 0x03aa, 0x, 0x038c, 0x038e,
 0x03ab, 0x, 0x038f, 0x, 0x, 0x0385, 0x2015, 0x,
 0x03ac, 0x03ad, 0x03ae, 0x03af, 0x03ca, 0x0390, 0x03cc, 0x03cd,
@@ -175,7 +175,7 @@ unicode_t keymap07_map[] = {
 const keymap_t keymap07 = { 161, 249, keymap07_map };
 
 // TechnicalByte 3 = 0x08
-unicode_t keymap08_map[] = {
+const unicode_t keymap08_map[] = {
 0x23b7, 0x250c, 0x2500, 0x2320, 0x2321, 0x2502, 0x23a1, 0x23a3,
 0x23a4, 0x23a6, 0x239b, 0x239d, 0x239e, 0x23a0, 0x23a8, 0x23ac,
 0x, 0x, 0x, 0x, 0x, 0x, 0x, 0x,
@@ -191,7 +191,7 @@ unicode_t keymap08_map[] = {
 const keymap_t keymap08 = { 161, 254, keymap08_map };
 
 // Special  Byte 3 = 0x09
-unicode_t keymap09_map[] = {
+const unicode_t keymap09_map[] = {
 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x, 0x,
 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba,
 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c,
@@ -199,7 +199,7 @@ unicode_t keymap09_map[] = {
 const keymap_t keymap09 = { 224, 248, keymap09_map };
 
 // Publishing   Byte 3 = 0x0a = 10
-unicode_t keymap10_map[] = {
+const unicode_t keymap10_map[] = {
 0x2003, 0x2002, 0x2004, 0x2005, 0x2007, 0x2008, 0x2009, 0x200a,

[Libreoffice-commits] core.git: Branch 'feature/fixes11' - include/tools sc/source tools/Library_tl.mk tools/source

2015-11-05 Thread László Németh

 include/tools/cpuid.hxx|   28 --
 sc/source/core/inc/arraysumfunctor.hxx |  141 -
 sc/source/core/tool/interpr6.cxx   |   18 ++--
 tools/Library_tl.mk|1 
 tools/source/misc/cpuid.cxx|   63 --
 5 files changed, 11 insertions(+), 240 deletions(-)

New commits:
commit 3395c3ed22519c62b091a5065e03862bda587f20
Author: LÃ¡szlÃ³ NÃ©meth 
Date:   Fri Nov 6 01:14:31 2015 +0100

Revert "invalid array index when pCurrent pointer is incremented"

This reverts commit b35c38c6e44b0df0fc2c5a3983ecd7547b964691.

Revert "Fast array sum: aligned load, process 8 doubles per loop"

This reverts commit f814b00bc908c5498156194f45bf8f9c0b8268ac.

Revert "arraysumfunctor: fast sum a double array, use for SUM() in Calc"

This reverts commit e59e6c572f3e7531800b396f7e4ad5f52f98d987.

diff --git a/include/tools/cpuid.hxx b/include/tools/cpuid.hxx
deleted file mode 100644
index 316e656..000
--- a/include/tools/cpuid.hxx
+++ /dev/null
@@ -1,28 +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/.
- *
- */
-
-#ifndef INCLUDED_TOOLS_CPUID_HXX
-#define INCLUDED_TOOLS_CPUID_HXX
-
-#include 
-#include 
-
-namespace tools
-{
-namespace cpuid
-{
-TOOLS_DLLPUBLIC bool hasSSE();
-TOOLS_DLLPUBLIC bool hasSSE2();
-}
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/inc/arraysumfunctor.hxx 
b/sc/source/core/inc/arraysumfunctor.hxx
deleted file mode 100644
index 776c514..000
--- a/sc/source/core/inc/arraysumfunctor.hxx
+++ /dev/null
@@ -1,141 +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/.
- *
- */
-
-#ifndef INCLUDED_SC_SOURCE_CORE_INC_ARRAYSUMFUNCTOR_HXX
-#define INCLUDED_SC_SOURCE_CORE_INC_ARRAYSUMFUNCTOR_HXX
-
-#include 
-#include 
-
-namespace sc
-{
-
-template
-inline bool isAligned(const T* pointer)
-{
-return 0 == (uintptr_t(pointer) % N);
-}
-
-struct ArraySumFunctor
-{
-private:
-const double* mpArray;
-size_t mnSize;
-
-public:
-ArraySumFunctor(const double* pArray, size_t nSize)
-: mpArray(pArray)
-, mnSize(nSize)
-{
-}
-
-double operator() ()
-{
-static bool hasSSE2 = tools::cpuid::hasSSE2();
-
-double fSum = 0.0;
-size_t i = 0;
-const double* pCurrent = mpArray;
-
-if (hasSSE2)
-{
-while (!isAligned(pCurrent))
-{
-fSum += *pCurrent++;
-i++;
-}
-fSum += executeSSE2(i, pCurrent);
-}
-else
-fSum += executeUnrolled(i, pCurrent);
-
-// sum rest of the array
-
-for (; i < mnSize; ++i)
-fSum += mpArray[i];
-
-return fSum;
-}
-
-private:
-inline double executeSSE2(size_t& i, const double* pCurrent) const
-{
-double fSum = 0.0;
-size_t nRealSize = mnSize - i;
-size_t nUnrolledSize = nRealSize - (nRealSize % 8);
-
-if (nUnrolledSize > 0)
-{
-__m128d sum1 = _mm_setzero_pd();
-__m128d sum2 = _mm_setzero_pd();
-__m128d sum3 = _mm_setzero_pd();
-__m128d sum4 = _mm_setzero_pd();
-
-for (; i < nUnrolledSize; i += 8)
-{
-__m128d load1 = _mm_load_pd(pCurrent);
-sum1 = _mm_add_pd(sum1, load1);
-pCurrent += 2;
-
-__m128d load2 = _mm_load_pd(pCurrent);
-sum2 = _mm_add_pd(sum2, load2);
-pCurrent += 2;
-
-__m128d load3 = _mm_load_pd(pCurrent);
-sum3 = _mm_add_pd(sum3, load3);
-pCurrent += 2;
-
-__m128d load4 = _mm_load_pd(pCurrent);
-sum4 = _mm_add_pd(sum4, load4);
-pCurrent += 2;
-}
-sum1 = _mm_add_pd(_mm_add_pd(sum1, sum2), _mm_add_pd(sum3, sum4));
-
-double temp;
-
-_mm_storel_pd(&temp, sum1);
-fSum += temp;
-
-_mm_storeh_pd(&temp, sum1);
-fSum += temp;
-}
-return fSum;
-}
-
-inline double executeUnrolled(size_t& i, const double* pCurrent) const
-{
-size_t nRealSize = mnSize - i;
-size_t nUnrolledSize = nRealSize - (nRealSize % 4);
-
-if (nUnrolledSize > 0)
-{
-

[Libreoffice-commits] core.git: officecfg/registry sw/uiconfig

2015-11-05 Thread Yousuf Philips

 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu|   
24 --
 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |
5 
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |   
64 ++-
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu  |   
74 
 sw/uiconfig/swriter/menubar/menubar.xml  |   
84 +++---
 5 files changed, 165 insertions(+), 86 deletions(-)

New commits:
commit 0644737e00ec2c9127944fbc76b19c8e55d98a3d
Author: Yousuf Philips 
Date:   Thu Nov 5 21:38:28 2015 +0400

tdf#91781 Add Form related commands to insert and tools menus

Change-Id: I56a51bf1b9edd8a032167c3b648b69236a3d8e74
Reviewed-on: https://gerrit.libreoffice.org/19765
Reviewed-by: Yousuf Philips 
Tested-by: Yousuf Philips 

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 0bcb143..c18bd3c 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -2022,30 +2022,6 @@
   Paste Only Value
 
   
-  
-
-  Co~mpress Image...
-
-
-1
-
-  
-  
-
-  Save Image...
-
-
-1
-
-  
-  
-
-  ~Replace Image...
-
-
-1
-
-  
 
   
 
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index d80b94d..a569a11 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -1586,11 +1586,6 @@
   La~yer
 
   
-  
-
-  Gr~id
-
-  
   
 
   ~Convert
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 155b1ef..161b46c 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -1943,10 +1943,56 @@
 
   Crop Image
 
+
+  Crop
+
 
   1
 
   
+  
+
+  Replace Image
+
+
+  ~Replace...
+
+
+  1
+
+  
+  
+
+  Compress Image
+
+
+  Co~mpress...
+
+
+1
+
+  
+  
+
+  Save Image
+
+
+  Save...
+
+
+1
+
+  
+  
+
+  Gr~id
+
+  
+  
+
+  ~Forms
+
+  
   
 
   Manage Templates
@@ -2105,7 +2151,7 @@
   
   
 
-  Print Document Directly
+  Print Directly
 
 
   1
@@ -2605,7 +2651,7 @@
   
   
 
-  Apply Paragraph Style
+  Apply Style
 
 
   1
@@ -3221,7 +3267,7 @@
   
   
 
-  Frame and OLE Ob~ject
+  Frame and Ob~ject
 
 
   1
@@ -3245,7 +3291,10 @@
   
   
 
-  Auto~Format...
+  AutoFormat Table Styles
+
+
+  Auto~Format Styles...
 
 
   1
@@ -3311,7 +3360,7 @@
   
   
 
-  ~Ruler
+  ~Rulers
 
 
   1
@@ -4449,6 +4498,9 @@
   
   
 
+  Export as PDF
+
+
   Export Directly as PDF
 
 
@@ -5678,7 +5730,7 @@
   
   
 
-  R~eferences
+  R~eference
 
   
   
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index ddb9cef..1ad103d 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -68,6 +68,16 @@
   Page Number
 
   
+  
+
+  Fo~rm Control
+
+  
+  
+
+  He~ader and Footer
+
+  
   
 
   He~ader
@@ -112,7 +122,7 @@
   
   
 
-  ~Indexes and Tables of Contents...
+  Table of Contents or ~Index...
 
 
   1
@@ -342,7 +352,7 @@
   
   
 
-  F~ootnote and Endnote...
+  F~ootnote or Endnote...
 
   
   
@@ -400,10 +410,10 @@

[Libreoffice-commits] core.git: officecfg/registry sd/xml slideshow/opengl slideshow/Package_opengl.mk slideshow/source

2015-11-05 Thread Tor Lillqvist

 officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu   |   13 +
 sd/xml/transitions-ogl.xml |3 
 slideshow/Package_opengl.mk|1 
 slideshow/opengl/rippleFragmentShader.glsl |   33 

 slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx   |   70 
++
 slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx   |1 
 slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx |4 
 7 files changed, 125 insertions(+)

New commits:
commit 75465aadff0272fd49d302ed8f77da7e709bd90d
Author: Tor Lillqvist 
Date:   Thu Nov 5 23:31:35 2015 +0200

Add a 'Ripple' transition

Change-Id: I18efe35c299bc3a4a2a5e449021323fc1f53f378

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu
index a7a1bfd..ad52853 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu
@@ -1597,6 +1597,14 @@
   Vortex
 
   
+  
+
+  exciting
+
+
+  Ripple
+
+  
 
 
   
@@ -2335,6 +2343,11 @@
   vortex
 
   
+  
+
+  ripple
+
+  
 
   
   
diff --git a/sd/xml/transitions-ogl.xml b/sd/xml/transitions-ogl.xml
index 26de569..d541133 100644
--- a/sd/xml/transitions-ogl.xml
+++ b/sd/xml/transitions-ogl.xml
@@ -62,6 +62,9 @@
  
   
  
+ 
+  
+ 
  
   
  
diff --git a/slideshow/Package_opengl.mk b/slideshow/Package_opengl.mk
index 440c03d..a312622 100644
--- a/slideshow/Package_opengl.mk
+++ b/slideshow/Package_opengl.mk
@@ -15,6 +15,7 @@ $(eval $(call 
gb_Package_add_files,slideshow_opengl_shader,$(LIBO_ETC_FOLDER)/op
staticFragmentShader.glsl \
vortexFragmentShader.glsl \
vortexVertexShader.glsl \
+   rippleFragmentShader.glsl \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/slideshow/opengl/rippleFragmentShader.glsl 
b/slideshow/opengl/rippleFragmentShader.glsl
new file mode 100644
index 000..83677e4
--- /dev/null
+++ b/slideshow/opengl/rippleFragmentShader.glsl
@@ -0,0 +1,33 @@
+/* -*- 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/.
+ */
+
+#define M_PI 3.1415926535897932384626433832795
+
+uniform sampler2D leavingSlideTexture;
+uniform sampler2D enteringSlideTexture;
+uniform float time;
+uniform vec2 center;
+varying vec2 v_texturePosition;
+
+void main()
+{
+float d = length(v_texturePosition - center);
+float w = 0;
+w = max(w, length(center - vec2(0, 0)));
+w = max(w, length(center - vec2(1, 0)));
+w = max(w, length(center - vec2(1, 1)));
+w = max(w, length(center - vec2(0, 1)));
+float v = 0.2;
+float smoothtime = smoothstep(0, 1, time);
+float a = smoothstep(smoothtime*w-v, smoothtime*w+v, d);
+a += (0.5 - abs(a-0.5))*sin(d*M_PI*30);
+gl_FragColor = mix(texture2D(enteringSlideTexture, v_texturePosition), 
texture2D(leavingSlideTexture, v_texturePosition), a);
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git 
a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx 
b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
index 963397c..a3183c6 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
@@ -27,6 +27,7 @@
  /
 
 #include 
+#include 
 #include 
 
 #include 
@@ -1845,6 +1846,75 @@ std::shared_ptr makeVortex()
 return makeVortexTransition(aLeavingSlide, aEnteringSlide, aSettings, NX, 
NY);
 }
 
+namespace
+{
+
+class RippleTransition : public ShaderTransition
+{
+public:
+RippleTransition(const TransitionScene& rScene, const TransitionSettings& 
rSettings, const glm::vec2& rCenter)
+: ShaderTransition(rScene, rSettings),
+  maCenter(rCenter)
+{
+}
+
+private:
+virtual GLuint makeShader() override;
+
+glm::vec2 maCenter;
+};
+
+GLuint RippleTransition::makeShader()
+{
+GLuint nProgram = OpenGLHelper::LoadShaders( "basicVertexShader", 
"rippleFragmentShader" );
+
+if (nProgram)
+{
+glUseProgram(nProgram);
+
+GLint nCenterLocation = glGetUniformLocation(nProgram, "center");
+CHECK_GL_ERROR();
+
+glUniform2fv(nCenterLocation, 1, glm::value_ptr(maCenter));
+CHECK_GL_ERROR();
+}
+
+return nProgram;
+}
+
+std::shared_ptr
+makeRippl

[Libreoffice-commits] core.git: configure.ac

2015-11-05 Thread Stephan Bergmann

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

New commits:
commit fca4e6f2c1e0a63dbed367d8c34855e24521
Author: Stephan Bergmann 
Date:   Thu Nov 5 17:47:34 2015 +0100

Some shell quoting fixes

Change-Id: I38de1e66e93086c125c94b76ac5a724439a6fb17
Reviewed-on: https://gerrit.libreoffice.org/19810
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/configure.ac b/configure.ac
index dc8bbf4..cf52e9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3691,11 +3691,10 @@ if test "$_os" = "WINNT"; then
 # Remove /cl.exe from CC case insensitive
 AC_MSG_RESULT([found Visual C++ $vcyear $vcexpress ($CC)])
 if test "$BITNESS_OVERRIDE" = ""; then
-COMPATH=`echo $CC | $SED -e 
's@\/[[Bb]][[Ii]][[Nn]]\/[[cC]][[lL]]\.[[eE]][[xX]][[eE]].*@@' -e 's@^.* @@'`
+COMPATH=`echo "$CC" | $SED -e 
's@\/[[Bb]][[Ii]][[Nn]]\/[[cC]][[lL]]\.[[eE]][[xX]][[eE]].*@@' -e 's@^.* @@'`
 else
 if test -n "$VC_PRODUCT_DIR"; then
-# Huh, why not just an assignment?
-COMPATH=`echo $VC_PRODUCT_DIR`
+COMPATH=$VC_PRODUCT_DIR
 fi
 fi
 if test "$BITNESS_OVERRIDE" = ""; then
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - sw/inc sw/source

2015-11-05 Thread Ashod Nakashian

 sw/inc/viewopt.hxx  |3 +++
 sw/source/core/layout/hffrm.cxx |6 --
 sw/source/uibase/config/viewopt.cxx |4 
 3 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit cdebfc0f5a230668d9630492118c06ceda339543
Author: Ashod Nakashian 
Date:   Mon Jul 13 23:32:28 2015 -0400

tdf#39080 Added HideWhitespaceMode ViewOption flag

Change-Id: I94ac57881dc3a3628413b9198ea750fdc282accb
Reviewed-on: https://gerrit.libreoffice.org/17278
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 
(cherry picked from commit 3e3c5369e87066a4bfdead5fc9dbfe128f84df52)

diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index dee2189..87558cc 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -150,6 +150,7 @@ protected:
 boolmbBrowseMode : 1;
 boolmbBookView : 1;  // View mode for page preview.
 boolmbViewLayoutBookMode : 1; // Book view mode for edit view.
+boolmbHideWhitespaceMode : 1; // Hide header, footer, and 
pagebreak.
 boolbShowPlaceHolderFields : 1; // Only used in printing!
 mutable boolbIdle;
 
@@ -393,6 +394,8 @@ public:
 void   SetViewLayoutBookMode( bool bNew ) { mbViewLayoutBookMode = bNew; }
 sal_uInt16 GetViewLayoutColumns() const { return mnViewLayoutColumns; }
 void   SetViewLayoutColumns( sal_uInt16 nNew ) { mnViewLayoutColumns = 
nNew; }
+bool   IsHideWhitespaceMode() const { return mbHideWhitespaceMode; }
+void   SetHideWhitespaceMode( bool bMode ) { mbHideWhitespaceMode = bMode; 
}
 
 #ifdef DBG_UTIL
 // Correspond to statements in ui/config/cfgvw.src.
diff --git a/sw/source/core/layout/hffrm.cxx b/sw/source/core/layout/hffrm.cxx
index 03f6ed4..a5789fe 100644
--- a/sw/source/core/layout/hffrm.cxx
+++ b/sw/source/core/layout/hffrm.cxx
@@ -679,7 +679,8 @@ void SwPageFrm::PrepareHeader()
 const SwFormatHeader &rH = 
static_cast(GetRegisteredIn())->GetHeader();
 
 const SwViewShell *pSh = getRootFrm()->GetCurrShell();
-const bool bOn = !(pSh && pSh->GetViewOptions()->getBrowseMode());
+const bool bOn = !(pSh && (pSh->GetViewOptions()->getBrowseMode() ||
+   pSh->GetViewOptions()->IsHideWhitespaceMode()));
 
 if ( bOn && rH.IsActive() )
 {   //Implant header, but remove first, if already present
@@ -721,7 +722,8 @@ void SwPageFrm::PrepareFooter()
 pLay = static_cast(pLay->GetNext());
 
 const SwViewShell *pSh = getRootFrm()->GetCurrShell();
-const bool bOn = !(pSh && pSh->GetViewOptions()->getBrowseMode());
+const bool bOn = !(pSh && (pSh->GetViewOptions()->getBrowseMode() ||
+   pSh->GetViewOptions()->IsHideWhitespaceMode()));
 
 if ( bOn && rF.IsActive() )
 {   //Implant footer, but remove first, if already present
diff --git a/sw/source/uibase/config/viewopt.cxx 
b/sw/source/uibase/config/viewopt.cxx
index 77c716a..3670bdd 100644
--- a/sw/source/uibase/config/viewopt.cxx
+++ b/sw/source/uibase/config/viewopt.cxx
@@ -82,6 +82,7 @@ bool SwViewOption::IsEqualFlags( const SwViewOption &rOpt ) 
const
 && mbFormView == rOpt.IsFormView()
 && mbBrowseMode == rOpt.getBrowseMode()
 && mbViewLayoutBookMode == rOpt.mbViewLayoutBookMode
+&& mbHideWhitespaceMode == rOpt.mbHideWhitespaceMode
 && bShowPlaceHolderFields == rOpt.bShowPlaceHolderFields
 && bIdle == rOpt.bIdle
 #ifdef DBG_UTIL
@@ -165,6 +166,7 @@ SwViewOption::SwViewOption() :
 mbBrowseMode(false),
 mbBookView(false),
 mbViewLayoutBookMode(false),
+mbHideWhitespaceMode(false),
 bShowPlaceHolderFields( true ),
 nZoom( 100 ),
 eZoom( SvxZoomType::PERCENT ),
@@ -237,6 +239,7 @@ SwViewOption::SwViewOption(const SwViewOption& rVOpt)
 mbBookView  = rVOpt.mbBookView;
 mbBrowseMode= rVOpt.mbBrowseMode;
 mbViewLayoutBookMode = rVOpt.mbViewLayoutBookMode;
+mbHideWhitespaceMode = rVOpt.mbHideWhitespaceMode;
 bShowPlaceHolderFields = rVOpt.bShowPlaceHolderFields;
 bIdle   = rVOpt.bIdle;
 
@@ -277,6 +280,7 @@ SwViewOption& SwViewOption::operator=( const SwViewOption 
&rVOpt )
 mbBookView  = rVOpt.mbBookView;
 mbBrowseMode= rVOpt.mbBrowseMode;
 mbViewLayoutBookMode = rVOpt.mbViewLayoutBookMode;
+mbHideWhitespaceMode = rVOpt.mbHideWhitespaceMode;
 bShowPlaceHolderFields = rVOpt.bShowPlaceHolderFields;
 bIdle   = rVOpt.bIdle;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-11-05 Thread Eike Rathke

 sc/source/core/tool/interpr5.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit db6a928a420868b2a80ba11c8d46151d16c13624
Author: Eike Rathke 
Date:   Thu Nov 5 22:45:01 2015 +0100

return #N/A for defined but unsupported arguments, tdf#95010 related

... which is what also Excel does for memavail, memused and totmem.

Change-Id: I48330d0a78094f7c40c02bc992a12353b511f29f

diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index f44bb88..e7107e8 100644
--- a/sc/source/core/tool/interpr5.cxx
+++ b/sc/source/core/tool/interpr5.cxx
@@ -3251,6 +3251,8 @@ void ScInterpreter::ScInfo()
 PushDouble( 1 );
 else if( aStr == "RECALC" )
 PushString( ScGlobal::GetRscString( pDok->GetAutoCalc() ? 
STR_RECALC_AUTO : STR_RECALC_MANUAL ) );
+else if (aStr == "DIRECTORY" || aStr == "MEMAVAIL" || aStr == 
"MEMUSED" || aStr == "ORIGIN" || aStr == "TOTMEM")
+PushNA();
 else
 PushIllegalArgument();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

New Defects reported by Coverity Scan for LibreOffice

2015-11-05 Thread scan-admin


Hi,

Please find the latest report on new defect(s) introduced to LibreOffice found 
with Coverity Scan.

44 new defect(s) introduced to LibreOffice found with Coverity Scan.
46 defect(s), reported by Coverity Scan earlier, were marked fixed in the 
recent build analyzed by Coverity Scan.

New defect(s) Reported-by: Coverity Scan
Showing 20 of 44 defect(s)


** CID 1338273:  FindBugs: Internationalization  (FB.DM_DEFAULT_ENCODING)
/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java: 762 in 
mod._forms.ODatabaseForm$ParameterListenerImpl.()()



*** CID 1338273:  FindBugs: Internationalization  (FB.DM_DEFAULT_ENCODING)
/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java: 762 in 
mod._forms.ODatabaseForm$ParameterListenerImpl.()()
756  * Implementation of interface 
_XDatabaseParameterBroadcaster.CheckParameterListener
757  * for the XDatabaseParameterBroadcaster test
758  * @see ifc.form._XDatabaseParameterBroadcaster
759  */
760 private static class ParameterListenerImpl implements 
_XDatabaseParameterBroadcaster.CheckParameterListener {
761 private boolean listenerWasCalled = false;
>>> CID 1338273:  FindBugs: Internationalization  (FB.DM_DEFAULT_ENCODING)
>>> Found reliance on default encoding: new 
>>> java.io.PrintWriter(OutputStream).
762 private PrintWriter log = new PrintWriter(System.out);
763 
764 /**
765  * Return true, if the listener was called, false otherwise.
766  * @return True, if any other method of the listener was called.
767  */

** CID 1338272:  Error handling issues  (UNCAUGHT_EXCEPT)
/registry/tools/regview.cxx: 32 in main()



*** CID 1338272:  Error handling issues  (UNCAUGHT_EXCEPT)
/registry/tools/regview.cxx: 32 in main()
26 #include 
27 #include 
28 
29 using namespace registry::tools;
30 
31 #if (defined UNX)
>>> CID 1338272:  Error handling issues  (UNCAUGHT_EXCEPT)
>>> In function "main(int, char **)" an exception of type 
>>> "std::length_error" is thrown and never caught.
32 int main( int argc, char * argv[] )
33 #else
34 int __cdecl main( int argc, char * argv[] )
35 #endif
36 {
37 RegHandle   hReg;

** CID 1338271:(UNCAUGHT_EXCEPT)
/helpcompiler/source/HelpIndexer_main.cxx: 19 in main()
/helpcompiler/source/HelpIndexer_main.cxx: 19 in main()



*** CID 1338271:(UNCAUGHT_EXCEPT)
/helpcompiler/source/HelpIndexer_main.cxx: 19 in main()
13 #include 
14 #include 
15 #include 
16 
17 #include "LuceneHelper.hxx"
18 
>>> CID 1338271:(UNCAUGHT_EXCEPT)
>>> In function "main(int, char **)" an exception of type 
>>> "std::length_error" is thrown and never caught.
19 int main(int argc, char **argv) {
20 const std::string pLang("-lang");
21 const std::string pModule("-mod");
22 const std::string pDir("-dir");
23 
24 std::string lang;
/helpcompiler/source/HelpIndexer_main.cxx: 19 in main()
13 #include 
14 #include 
15 #include 
16 
17 #include "LuceneHelper.hxx"
18 
>>> CID 1338271:(UNCAUGHT_EXCEPT)
>>> In function "main(int, char **)" an exception of type 
>>> "std::length_error" is thrown and never caught.
19 int main(int argc, char **argv) {
20 const std::string pLang("-lang");
21 const std::string pModule("-mod");
22 const std::string pDir("-dir");
23 
24 std::string lang;

** CID 1338270:(UNCAUGHT_EXCEPT)
/registry/tools/regcompare.cxx: 1952 in main()
/registry/tools/regcompare.cxx: 1952 in main()



*** CID 1338270:(UNCAUGHT_EXCEPT)
/registry/tools/regcompare.cxx: 1952 in main()
1946 }
1947 
1948 return nError;
1949 }
1950 
1951 #if (defined UNX) || defined __MINGW32__
>>> CID 1338270:(UNCAUGHT_EXCEPT)
>>> In function "main(int, char **)" an exception of type 
>>> "std::length_error" is thrown and never caught.
1952 int main( int argc, char * argv[] )
1953 #else
1954 int _cdecl main( int argc, char * argv[] )
1955 #endif
1956 {
1957 std::vector< std::string > args;
/registry/tools/regcompare.cxx: 1952 in main()
1946 }
1947 
1948 return nError;
1949 }
1950 
1951 #if (defined UNX) || defined __MINGW32__
>>> CID 1338270:(UNCAUGHT_EXCEPT)
>>> In function "main(int, char **)" an exception of type 
>>> "std::length_error" is thrown and never caught.
1952 int main( int argc, char * argv[] )
1953 #else
1954

[Bug 36946] Slide transitions in Impress should be sorted in meaningful categories (Usability improvement)

2015-11-05 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=36946

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

http://cgit.freedesktop.org/libreoffice/core/commit/?id=95e13b89ecb70eb0a03a0c68f0f1e41d02acef22

tdf#36946: Organise transitions hierarchically

It will be available in 5.1.0.

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 36946] Slide transitions in Impress should be sorted in meaningful categories (Usability improvement)

2015-11-05 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=36946

Commit Notification  changed:

   What|Removed |Added

 Whiteboard|| target:5.1.0

-- 
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: icon-themes/galaxy officecfg/registry sd/inc sd/source sd/uiconfig

2015-11-05 Thread Tor Lillqvist

 icon-themes/galaxy/sd/cmd/transition-none.png  |binary
 icon-themes/galaxy/sd/cmd/transition-random-bars.png   |binary
 icon-themes/galaxy/sd/cmd/transition-uncover.png   |binary
 icon-themes/galaxy/sd/cmd/transition-wheel.png |binary
 icon-themes/galaxy/sd/cmd/transition-wipe.png  |binary
 officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu   |  945 
--
 officecfg/registry/schema/org/openoffice/Office/UI/Effects.xcs |   47 
 sd/inc/TransitionPreset.hxx|   11 
 sd/source/core/TransitionPreset.cxx|   87 
 sd/source/ui/animations/SlideTransitionPane.cxx|  216 +-
 sd/source/ui/animations/SlideTransitionPane.hxx|   14 
 sd/source/ui/dlg/dlgass.cxx|   28 
 sd/source/ui/dlg/dlgctrls.cxx  |   93 
 sd/source/ui/inc/dlgctrls.hxx  |5 
 sd/uiconfig/simpress/ui/assistentdialog.ui |   33 
 sd/uiconfig/simpress/ui/slidetransitionspanel.ui   |   32 
 16 files changed, 1229 insertions(+), 282 deletions(-)

New commits:
commit 95e13b89ecb70eb0a03a0c68f0f1e41d02acef22
Author: Tor Lillqvist 
Date:   Tue Nov 3 14:18:23 2015 +0200

tdf#36946: Organise transitions hierarchically

Introduce the concept of transition groups and sets. (Suggestions for
other terminology welcome.) A collection of transitions that differ
only in the direction the transition is applied, or similar minor
fashion, are called a set, and they show up only once in the long list
of transitions in the UI. Each set also has an icon.

Sets are then collected into groups based on some overall common
feature, like "subtle" or "3D". Groups do not yet show up in the UI,
but are only present in the configuration registry.

I made only a few silly icons as I am not an artist. Not intended to
be a final design in any way for them.

Change-Id: I148cb7f8dc2e3ecd70cae188908dd02053308239
Reviewed-on: https://gerrit.libreoffice.org/19797
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/icon-themes/galaxy/sd/cmd/transition-none.png 
b/icon-themes/galaxy/sd/cmd/transition-none.png
new file mode 100644
index 000..71b14a1
Binary files /dev/null and b/icon-themes/galaxy/sd/cmd/transition-none.png 
differ
diff --git a/icon-themes/galaxy/sd/cmd/transition-random-bars.png 
b/icon-themes/galaxy/sd/cmd/transition-random-bars.png
new file mode 100644
index 000..e27b13c
Binary files /dev/null and 
b/icon-themes/galaxy/sd/cmd/transition-random-bars.png differ
diff --git a/icon-themes/galaxy/sd/cmd/transition-uncover.png 
b/icon-themes/galaxy/sd/cmd/transition-uncover.png
new file mode 100644
index 000..f799ef8
Binary files /dev/null and b/icon-themes/galaxy/sd/cmd/transition-uncover.png 
differ
diff --git a/icon-themes/galaxy/sd/cmd/transition-wheel.png 
b/icon-themes/galaxy/sd/cmd/transition-wheel.png
new file mode 100644
index 000..b674a00
Binary files /dev/null and b/icon-themes/galaxy/sd/cmd/transition-wheel.png 
differ
diff --git a/icon-themes/galaxy/sd/cmd/transition-wipe.png 
b/icon-themes/galaxy/sd/cmd/transition-wipe.png
new file mode 100644
index 000..6f5cbfb
Binary files /dev/null and b/icon-themes/galaxy/sd/cmd/transition-wipe.png 
differ
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu
index 84376c4..a7a1bfd 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu
@@ -1314,370 +1314,1025 @@
 
   
 
-
-  
+
+
+  
 
-  Venetian Blinds Horizontal
+  Subtle
 
   
-  
+  
 
-  Venetian Blinds Vertical
+  Exciting
 
   
-  
+
+
+  
+
+  subtle
+
 
-  Box In
+  Venetian Blinds
 
   
-  
+  
+
+  exciting
+
 
-  Box Out
+  3D Venetian Blinds
 
   
-  
+  
+
+  subtle
+
 
-  Checkerboard Across
+  Box
 
   
-  
+  
+
+  subtle
+
 
-  Checkerboard Down
+  Checkerboard
 
   
-  
+  
+
+  subtle
+
 
-  Comb Horizontal
+  Comb
 
   
-  
+  
+
+  subtle
+
 
-  Comb Vertical
+  Cover
 
   
-  
+  
+
+  subtle
+
 
-  Cover Down
+  Uncover
 
   
-  
+  
+
+  subtle
+

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

2015-11-05 Thread Caolán McNamara

 sd/source/ui/view/Outliner.cxx   |2 +-
 vcl/qa/afl-eventtesting/eventtesting.impress.crash-5 |binary
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0c39c456f47c14e2b7f86d1bc6857dc0e2ca6cb3
Author: CaolÃ¡n McNamara 
Date:   Thu Nov 5 21:15:14 2015 +

afl-eventesting: deref of null mpTextObj

Change-Id: Icdb7d1cc250640f428984b96b0a51ac950013cb2

diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index c7f315a..8ae2950 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -1384,7 +1384,7 @@ void Outliner::SetPage (EditMode eEditMode, sal_uInt16 
nPageIndex)
 void Outliner::EnterEditMode (bool bGrabFocus)
 {
 OutlinerView* pOutlinerView = mpImpl->GetOutlinerView();
-if (pOutlinerView != NULL)
+if (pOutlinerView && mpTextObj)
 {
 pOutlinerView->SetOutputArea( Rectangle( Point(), Size(1, 1)));
 SetPaperSize( mpTextObj->GetLogicRect().GetSize() );
diff --git a/vcl/qa/afl-eventtesting/eventtesting.impress.crash-5 
b/vcl/qa/afl-eventtesting/eventtesting.impress.crash-5
new file mode 100644
index 000..0221754
Binary files /dev/null and 
b/vcl/qa/afl-eventtesting/eventtesting.impress.crash-5 differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - 6 commits - configure.ac sd/source sw/qa vcl/generic wizards/com writerfilter/source xmloff/source

2015-11-05 Thread Andras Timar

 configure.ac  |2 -
 sd/source/ui/dlg/animobjs.cxx |   10 +++---
 sw/qa/extras/ooxmlimport/data/hello.docx  |binary
 sw/qa/extras/ooxmlimport/data/tdf94374.docx   |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  |   30 ++
 vcl/generic/app/gensys.cxx|   18 +-
 wizards/com/sun/star/wizards/db/SQLQueryComposer.java |   26 +--
 wizards/com/sun/star/wizards/ui/FilterComponent.java  |4 +-
 writerfilter/source/filter/WriterFilter.cxx   |3 +
 xmloff/source/style/xmlnumfe.cxx  |3 +
 xmloff/source/style/xmlnumfi.cxx  |2 -
 11 files changed, 70 insertions(+), 28 deletions(-)

New commits:
commit 6064a8b601a4d3ee6e4bbe598d7ee50712d300e4
Author: Andras Timar 
Date:   Thu Nov 5 22:04:43 2015 +0100

Bump to version 5.0-8

Change-Id: I74bc0ee02279152bec9ecc54b0d948a6978fa6c8

diff --git a/configure.ac b/configure.ac
index 83412c0..335068e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[5.0.10.7],[],[],[https://CollaboraOffice.com/])
+AC_INIT([Collabora Office],[5.0.10.8],[],[],[https://CollaboraOffice.com/])
 
 AC_PREREQ([2.59])
 
commit 5f919351aed1b0e80fd10a33ee3ac08b3697efff
Author: Armin Le Grand 
Date:   Tue Nov 3 12:25:13 2015 +0100

tdf#95298: corrected some out-of-bound accesses to array

the index variable m_FrameList used to reference the current frame uses
the state EMTY_FRAMELIST to mark as invalid, which is the max integer
number. Thus all usages have to be secured to not use m_FrameList
if set to EMPTY_FRAMELIST. This was missing in some places.
the max integer
number. Thus all usages have to be secured to not use m_FrameList
if set to EMPTY_FRAMELIST. This was missing in some places.

Reviewed-on: https://gerrit.libreoffice.org/19753
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 

Cherry-picked from f0cef70cd4164342b218fbee34bf57eedc22c998

Change-Id: Ie1cf4ae2cb79d821f634ec78b621a2647abc61a8
Reviewed-on: https://gerrit.libreoffice.org/19787
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 
(cherry picked from commit 6b3b080f8cedc1b496022b18e477af0c7361fba3)

diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index 0b033f9..5c66014 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -430,7 +430,8 @@ IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, void *, 
pBtn )
 SdPage* pPage = pMyDoc->GetSdPage(0, PK_STANDARD);
 SdrObject*  pObject;
 
-if (pBtn == m_pBtnRemoveBitmap)
+// tdf#95298 check m_nCurrentFrame for EMPTY_FRAMELIST to avoid 
out-of-bound array access
+if (pBtn == m_pBtnRemoveBitmap && EMPTY_FRAMELIST  != m_nCurrentFrame)
 {
 delete m_FrameList[m_nCurrentFrame].first;
 delete m_FrameList[m_nCurrentFrame].second;
@@ -449,8 +450,8 @@ IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, void *, 
pBtn )
 
 if (m_nCurrentFrame >= m_FrameList.size())
 {
-assert(m_FrameList.empty());
-m_nCurrentFrame = EMPTY_FRAMELIST;
+// tdf#95298 last frame was deleted, try to use the one before it 
or go on empty state
+m_nCurrentFrame = m_FrameList.empty() ? EMPTY_FRAMELIST : 
m_FrameList.size() - 1;
 }
 }
 else // delete everything
@@ -539,7 +540,8 @@ IMPL_LINK_NOARG(AnimationWindow, ModifyTimeHdl)
 
 void AnimationWindow::UpdateControl(bool const bDisableCtrls)
 {
-if (!m_FrameList.empty())
+// tdf#95298 check m_nCurrentFrame for EMPTY_FRAMELIST to avoid 
out-of-bound array access
+if (!m_FrameList.empty() && EMPTY_FRAMELIST != m_nCurrentFrame)
 {
 BitmapEx aBmp(*m_FrameList[m_nCurrentFrame].first);
 
commit 3458c7844b3ed8fcb3dcc92dc31ce66d2fc498e3
Author: Lionel Elie Mamane 
Date:   Wed Oct 28 17:41:44 2015 +0100

base new query wizard: fix confusion between display name and field name

Change-Id: I75354ffea2daede55b34e4cf3321d57196be3d9b
Reviewed-on: https://gerrit.libreoffice.org/19652
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 
(cherry picked from commit c7a520868ecf6d5de48dc3964a7bccab3fa480c3)

diff --git a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java 
b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
index 0a30846..c9c9400 100644
--- a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
+++ b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
@@ -77,7 +77,7 @@ public class SQLQueryComposer
 int iAggregate = 
CurDBMetaData.getAg

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

2015-11-05 Thread Eike Rathke

 sc/source/core/tool/userlist.cxx |   11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

New commits:
commit 7aba9dcf13ac464acfcfe3cba7b2e5918790ce0e
Author: Eike Rathke 
Date:   Thu Nov 5 21:50:55 2015 +0100

a vector is unnecessary here, tdf#79983 follow-up

Only the first case-insensitive match needs to be remembered.

Change-Id: Ifac666760878f769bc04d567db9284eedaa40a65

diff --git a/sc/source/core/tool/userlist.cxx b/sc/source/core/tool/userlist.cxx
index d29e388..3bc65ee 100644
--- a/sc/source/core/tool/userlist.cxx
+++ b/sc/source/core/tool/userlist.cxx
@@ -274,7 +274,7 @@ ScUserList::ScUserList(const ScUserList& r) :
 
 const ScUserListData* ScUserList::GetData(const OUString& rSubStr) const
 {
-std::vector matchData;
+const ScUserListData* pFirstCaseInsensitive = nullptr;
 DataType::const_iterator itr = maData.begin(), itrEnd = maData.end();
 sal_uInt16 nIndex;
 bool bMatchCase = false;
@@ -285,15 +285,12 @@ const ScUserListData* ScUserList::GetData(const OUString& 
rSubStr) const
 {
 if (bMatchCase)
 return &(*itr);
-matchData.push_back(itr);
+if (!pFirstCaseInsensitive)
+pFirstCaseInsensitive = &(*itr);
 }
 }
-if (matchData.empty())
-{
-return NULL;
-}
 
-return &(**matchData.begin());
+return pFirstCaseInsensitive;
 }
 
 const ScUserListData& ScUserList::operator[](size_t nIndex) const
___
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

2015-11-05 Thread Sahas

 sc/inc/userlist.hxx  |2 +-
 sc/source/core/data/table4.cxx   |5 +++--
 sc/source/core/tool/userlist.cxx |   35 ++-
 3 files changed, 30 insertions(+), 12 deletions(-)

New commits:
commit ef6ddb36751f917cd4ddab4a7fc609d5cf212b1b
Author: Sahas 
Date:   Sun Oct 18 21:46:25 2015 +0530

tdf#79983 - Fix to make calc sort lists case sensitive

Change-Id: I9d4aec8ccb395f8bf59f08d0f5ed461e99c9ea64
Reviewed-on: https://gerrit.libreoffice.org/19433
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/inc/userlist.hxx b/sc/inc/userlist.hxx
index f174b36..8983026 100644
--- a/sc/inc/userlist.hxx
+++ b/sc/inc/userlist.hxx
@@ -51,7 +51,7 @@ public:
 const OUString& GetString() const { return aStr; }
 void SetString(const OUString& rStr);
 size_t GetSubCount() const;
-bool GetSubIndex(const OUString& rSubStr, sal_uInt16& rIndex) const;
+bool GetSubIndex(const OUString& rSubStr, sal_uInt16& rIndex, bool& 
bMatchCase) const;
 OUString GetSubStr(sal_uInt16 nIndex) const;
 sal_Int32 Compare(const OUString& rSubStr1, const OUString& rSubStr2) 
const;
 sal_Int32 ICompare(const OUString& rSubStr1, const OUString& rSubStr2) 
const;
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index b8f3a95..1be25d4 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -362,13 +362,14 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, 
SCCOL nCol2, SCROW nRow2,
 rListData = 
const_cast(ScGlobal::GetUserList()->GetData(aStr));
 if (rListData)
 {
-(void)rListData->GetSubIndex(aStr, rListIndex);
+bool bMatchCase = false;
+(void)rListData->GetSubIndex(aStr, rListIndex, bMatchCase);
 nCol = sal::static_int_cast( nCol + nAddX );
 nRow = sal::static_int_cast( nRow + nAddY );
 for (sal_uInt16 i=1; iGetSubIndex(aStr, rListIndex))
+if (!rListData->GetSubIndex(aStr, rListIndex, bMatchCase))
 rListData = NULL;
 nCol = sal::static_int_cast( nCol + nAddX );
 nRow = sal::static_int_cast( nRow + nAddY );
diff --git a/sc/source/core/tool/userlist.cxx b/sc/source/core/tool/userlist.cxx
index 3f3cac7..d29e388 100644
--- a/sc/source/core/tool/userlist.cxx
+++ b/sc/source/core/tool/userlist.cxx
@@ -111,7 +111,7 @@ size_t ScUserListData::GetSubCount() const
 return maSubStrings.size();
 }
 
-bool ScUserListData::GetSubIndex(const OUString& rSubStr, sal_uInt16& rIndex) 
const
+bool ScUserListData::GetSubIndex(const OUString& rSubStr, sal_uInt16& rIndex, 
bool& bMatchCase) const
 {
 // First, case sensitive search.
 SubStringsType::const_iterator itr = ::std::find_if(
@@ -119,6 +119,7 @@ bool ScUserListData::GetSubIndex(const OUString& rSubStr, 
sal_uInt16& rIndex) co
 if (itr != maSubStrings.end())
 {
 rIndex = ::std::distance(maSubStrings.begin(), itr);
+bMatchCase = true;
 return true;
 }
 
@@ -130,8 +131,10 @@ bool ScUserListData::GetSubIndex(const OUString& rSubStr, 
sal_uInt16& rIndex) co
 if (itr != maSubStrings.end())
 {
 rIndex = ::std::distance(maSubStrings.begin(), itr);
+bMatchCase = false;
 return true;
 }
+bMatchCase = false;
 return false;
 }
 
@@ -146,8 +149,9 @@ OUString ScUserListData::GetSubStr(sal_uInt16 nIndex) const
 sal_Int32 ScUserListData::Compare(const OUString& rSubStr1, const OUString& 
rSubStr2) const
 {
 sal_uInt16 nIndex1, nIndex2;
-bool bFound1 = GetSubIndex(rSubStr1, nIndex1);
-bool bFound2 = GetSubIndex(rSubStr2, nIndex2);
+bool bMatchCase;
+bool bFound1 = GetSubIndex(rSubStr1, nIndex1, bMatchCase);
+bool bFound2 = GetSubIndex(rSubStr2, nIndex2, bMatchCase);
 if (bFound1)
 {
 if (bFound2)
@@ -171,8 +175,9 @@ sal_Int32 ScUserListData::Compare(const OUString& rSubStr1, 
const OUString& rSub
 sal_Int32 ScUserListData::ICompare(const OUString& rSubStr1, const OUString& 
rSubStr2) const
 {
 sal_uInt16 nIndex1, nIndex2;
-bool bFound1 = GetSubIndex(rSubStr1, nIndex1);
-bool bFound2 = GetSubIndex(rSubStr2, nIndex2);
+bool bMatchCase;
+bool bFound1 = GetSubIndex(rSubStr1, nIndex1, bMatchCase);
+bool bFound2 = GetSubIndex(rSubStr2, nIndex2, bMatchCase);
 if (bFound1)
 {
 if (bFound2)
@@ -269,14 +274,26 @@ ScUserList::ScUserList(const ScUserList& r) :
 
 const ScUserListData* ScUserList::GetData(const OUString& rSubStr) const
 {
+std::vector matchData;
 DataType::const_iterator itr = maData.begin(), itrEnd = maData.end();
+sal_uInt16 nIndex;
+bool bMatchCase = false;
+
 for (; itr != itrEnd; ++itr)
 {
-sal_uInt16 nIndex;
-if (itr->GetSubIndex(rSubStr, nIndex))
-return &(*itr);
+if (itr->GetSubIndex(rSubStr, nIndex, bMatchCase))
+{
+if (bMatchCase)
+

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

2015-11-05 Thread Stephan Bergmann

 sdext/source/minimizer/pppoptimizertoken.cxx |  119 ---
 sdext/source/minimizer/pppoptimizertoken.hxx |  119 ---
 2 files changed, 238 deletions(-)

New commits:
commit 8299b8b81cc547ab698106499916a8dcb8fe57aa
Author: Stephan Bergmann 
Date:   Thu Nov 5 21:29:58 2015 +0100

Remove unused PPPOptimizerTokenEnum enumerators

Change-Id: Ia94becb796f71aa602c65375539f8cdafb270bca

diff --git a/sdext/source/minimizer/pppoptimizertoken.cxx 
b/sdext/source/minimizer/pppoptimizertoken.cxx
index cc616e9..91c2871 100644
--- a/sdext/source/minimizer/pppoptimizertoken.cxx
+++ b/sdext/source/minimizer/pppoptimizertoken.cxx
@@ -41,154 +41,40 @@ struct TokenTable
 static const TokenTable pTokenTableArray[] =
 {
 { "rdmNavi",TK_rdmNavi },
-{ "lnNavSep1",  TK_lnNavSep1 },
-{ "lnNavSep2",  TK_lnNavSep2 },
 { "btnNavBack", TK_btnNavBack },
 { "btnNavNext", TK_btnNavNext },
 { "btnNavFinish",   TK_btnNavFinish },
 { "btnNavCancel",   TK_btnNavCancel },
 
-{ "FixedText0Pg0",  TK_FixedText0Pg0 },
-{ "FixedText1Pg0",  TK_FixedText1Pg0 },
-{ "Separator1Pg0",  TK_Separator1Pg0 },
-{ "FixedText2Pg0",  TK_FixedText2Pg0 },
-{ "ListBox0Pg0",TK_ListBox0Pg0 },
 { "Button0Pg0", TK_Button0Pg0 },
 { "RadioButton0Pg1",TK_RadioButton0Pg1 },
 { "RadioButton1Pg1",TK_RadioButton1Pg1 },
-{ "FixedText0Pg1",  TK_FixedText0Pg1 },
 { "CheckBox1Pg1",   TK_CheckBox1Pg1 },
-{ "FixedText1Pg1",  TK_FixedText1Pg1 },
-{ "FixedText2Pg1",  TK_FixedText2Pg1 },
-{ "FormattedField0Pg1", TK_FormattedField0Pg1 },
-{ "ComboBox0Pg1",   TK_ComboBox0Pg1 },
 { "CheckBox2Pg1",   TK_CheckBox2Pg1 },
-{ "FixedText0Pg2",  TK_FixedText0Pg2 },
-{ "FixedText1Pg2",  TK_FixedText1Pg2 },
 { "CheckBox0Pg2",   TK_CheckBox0Pg2 },
 { "RadioButton0Pg2",TK_RadioButton0Pg2 },
 { "RadioButton1Pg2",TK_RadioButton1Pg2 },
-{ "FixedText0Pg3",  TK_FixedText0Pg3 },
 { "CheckBox0Pg3",   TK_CheckBox0Pg3 },
-{ "FixedText1Pg3",  TK_FixedText1Pg3 },
 { "CheckBox1Pg3",   TK_CheckBox1Pg3 },
-{ "FixedText2Pg3",  TK_FixedText2Pg3 },
 { "CheckBox2Pg3",   TK_CheckBox2Pg3 },
 { "CheckBox3Pg3",   TK_CheckBox3Pg3 },
-{ "ListBox0Pg3",TK_ListBox0Pg3 },
-{ "Separator0Pg4",  TK_Separator0Pg4 },
 { "RadioButton0Pg4",TK_RadioButton0Pg4 },
 { "RadioButton1Pg4",TK_RadioButton1Pg4 },
-{ "Separator1Pg4",  TK_Separator1Pg4 },
-{ "FixedText0Pg4",  TK_FixedText0Pg4 },
-{ "FixedText1Pg4",  TK_FixedText1Pg4 },
-{ "FixedText2Pg4",  TK_FixedText2Pg4 },
-{ "FixedText3Pg4",  TK_FixedText3Pg4 },
-{ "FixedText4Pg4",  TK_FixedText4Pg4 },
-{ "FixedText5Pg4",  TK_FixedText5Pg4 },
-{ "FixedText6Pg4",  TK_FixedText6Pg4 },
-{ "FixedText7Pg4",  TK_FixedText7Pg4 },
-{ "FixedText8Pg4",  TK_FixedText8Pg4 },
 { "CheckBox1Pg4",   TK_CheckBox1Pg4 },
-{ "ComboBox0Pg4",   TK_ComboBox0Pg4 },
 
-{ "_blank", TK__blank },
-{ "_self",  TK__self },
-{ "Activated",  TK_Activated },
-{ "Align",  TK_Align },
-{ "Alpha",  TK_Alpha },
-{ "Animated",   TK_Animated },
-{ "Background", TK_Background },
-{ "BitmapPath", TK_BitmapPath },
-{ "Border", TK_Border },
-{ "Closeable",  TK_Closeable },
-{ "ColorMode",  TK_ColorMode },
-{ "Complete",   TK_Complete },
-{ "Compression",TK_Compression },
-{ "CurrentItemID",  TK_CurrentItemID },
-{ "DefaultButton",  TK_DefaultButton },
 { "DocumentService",TK_DocumentService },
-{ "Dropdown",   TK_Dropdown },
-{ "EffectiveValue", TK_EffectiveValue },
-{ "EffectiveMin",   TK_EffectiveMin },
-{ "EffectiveMax",   TK_EffectiveMax },
-{ "Enabled",TK_Enabled },
-{ "Extensions", TK_Extensions },
 { "FileSizeDestination",TK_FileSizeDestination },
 { "FileSizeSource", TK_FileSizeSource },
-{ "FillBitmap", TK_FillBitmap },
-{ "FillBitmapLogicalSize",TK_FillBitmapLogicalSize },
-{ "FillBitmapMode", TK_FillBitmapMode },
-{ "FillBitmapSizeX",TK_FillBitmapSizeX },
-{ "FillBitmapSizeY",TK_FillBitmapSizeY },
-{ "FillBitmapURL",  TK_FillBitmapURL },
-{ "FillStyle",  TK_FillStyle },
-{ "FilterData", TK_FilterData },
 { "FilterName", TK_FilterName },
 { "Flags",  TK_Flags },
-{ "FontDescriptor", TK_FontDescriptor },
-{ "Graphic",TK_Graphic },
-{ "GraphicCrop",TK_GraphicCrop },
-{ "GraphicCropLogic",   TK_GraphicCropLogic },
-{ "GraphicURL",

[Libreoffice-commits] core.git: download.lst

2015-11-05 Thread Michael Stahl

 download.lst |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0c1922a268cefb7a1c90f2519053123303ca6ebf
Author: Michael Stahl 
Date:   Thu Nov 5 15:43:32 2015 +0100

nss: upgrade to release 3.19.4

Change-Id: I303254d17450e5252b5d9e925082c39d0077654e
Reviewed-on: https://gerrit.libreoffice.org/19808
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/download.lst b/download.lst
index 25542de..81a2354 100755
--- a/download.lst
+++ b/download.lst
@@ -102,7 +102,7 @@ export MWAW_TARBALL := 
libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.bz2
 export MYSQLCPPCONN_TARBALL := 
7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
 export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
-export NSS_TARBALL := 
2100bc5a7ea9685928ff68cda2e60569-nss-3.19.2-with-nspr-4.10.8.tar.gz
+export NSS_TARBALL := 
478e0e90ebc4a90159549e77021021fd-nss-3.19.4-with-nspr-4.10.10.tar.gz
 export ODFGEN_MD5SUM := 6f1f1b174d8f60b7f40e8f195f663b61
 export ODFGEN_VERSION_MICRO := 5
 export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 8 commits - chart2/source cppcanvas/source drawinglayer/source filter/source include/drawinglayer include/oox include/svx include/tools svx/inc svx/source tools/inc too

2015-11-05 Thread Matteo Casalin

 chart2/source/inc/CommonConverters.hxx|1 
 cppcanvas/source/mtfrenderer/textaction.hxx   |1 
 drawinglayer/source/primitive2d/textlayoutdevice.cxx  |1 
 filter/source/flash/swfwriter.hxx |7 +
 include/drawinglayer/primitive2d/textlayoutdevice.hxx |2 
 include/oox/export/drawingml.hxx  |5 -
 include/svx/sdggaitm.hxx  |2 
 include/tools/poly.hxx|   31 ++-
 svx/inc/svdibrow.hxx  |   10 +-
 svx/source/svdraw/svdibrow.cxx|   77 --
 tools/inc/poly.h  |4 
 tools/source/generic/poly.cxx |   51 +--
 tools/source/generic/poly2.cxx|   31 +++
 vcl/inc/openglgdiimpl.hxx |7 +
 vcl/inc/regband.hxx   |2 
 vcl/source/gdi/impvect.hxx|3 
 vcl/source/gdi/region.cxx |1 
 17 files changed, 114 insertions(+), 122 deletions(-)

New commits:
commit 13d927267535c0dca3139a50ebf8d5bcfc0df484
Author: Matteo Casalin 
Date:   Thu Nov 5 18:58:49 2015 +0100

(Poly)Polygons: sal_uIntPtr to sal_uInt32/sdt::size_t/enum

Change-Id: I167d656f419ddbeb72960b8510fb8084605d4d5c

diff --git a/include/tools/poly.hxx b/include/tools/poly.hxx
index 33cfb5d..0471a68 100644
--- a/include/tools/poly.hxx
+++ b/include/tools/poly.hxx
@@ -89,7 +89,7 @@ public:
  const sal_uInt8* pFlagAry = NULL );
 Polygon( const Rectangle& rRect );
 Polygon( const Rectangle& rRect,
- sal_uIntPtr nHorzRound, sal_uIntPtr 
nVertRound );
+ sal_uInt32 nHorzRound, sal_uInt32 nVertRound 
);
 Polygon( const Point& rCenter,
  long nRadX, long nRadY,
  sal_uInt16 nPoints = 0 );
@@ -190,7 +190,13 @@ class TOOLS_DLLPUBLIC SAL_WARN_UNUSED PolyPolygon
 private:
 ImplPolyPolygon*mpImplPolyPolygon;
 
-TOOLS_DLLPRIVATE void  ImplDoOperation( const tools::PolyPolygon& 
rPolyPoly, tools::PolyPolygon& rResult, sal_uIntPtr nOperation ) const;
+enum class PolyClipOp {
+INTERSECT,
+UNION,
+DIFF,
+XOR
+};
+TOOLS_DLLPRIVATE void  ImplDoOperation( const tools::PolyPolygon& 
rPolyPoly, tools::PolyPolygon& rResult, PolyClipOp nOperation ) const;
 
 public:
 PolyPolygon( sal_uInt16 nInitSize = 16, sal_uInt16 
nResize = 16 );
diff --git a/tools/inc/poly.h b/tools/inc/poly.h
index 7805873..f15f01f 100644
--- a/tools/inc/poly.h
+++ b/tools/inc/poly.h
@@ -29,7 +29,7 @@ public:
 Point*  mpPointAry;
 sal_uInt8*   mpFlagAry;
 sal_uInt16  mnPoints;
-sal_uIntPtr   mnRefCount;
+sal_uInt32  mnRefCount;
 };
 
 class SAL_WARN_UNUSED ImplPolygon  : public ImplPolygonData
@@ -55,7 +55,7 @@ class SAL_WARN_UNUSED ImplPolyPolygon
 {
 public:
 tools::Polygon** mpPolyAry;
-sal_uIntPtr mnRefCount;
+sal_uInt32  mnRefCount;
 sal_uInt16  mnCount;
 sal_uInt16  mnSize;
 sal_uInt16  mnResize;
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index 539178c..0788894 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -62,8 +62,9 @@ ImplPolygon::ImplPolygon( sal_uInt16 nInitSize, bool bFlags  )
 {
 if ( nInitSize )
 {
-mpPointAry = reinterpret_cast(new 
char[(sal_uIntPtr)nInitSize*sizeof(Point)]);
-memset( mpPointAry, 0, (sal_uIntPtr)nInitSize*sizeof(Point) );
+const std::size_t 
nSz(static_cast(nInitSize)*sizeof(Point));
+mpPointAry = reinterpret_cast(new char[nSz]);
+memset( mpPointAry, 0, nSz );
 }
 else
 mpPointAry = NULL;
@@ -84,8 +85,9 @@ ImplPolygon::ImplPolygon( const ImplPolygon& rImpPoly )
 {
 if ( rImpPoly.mnPoints )
 {
-mpPointAry = reinterpret_cast(new 
char[(sal_uIntPtr)rImpPoly.mnPoints*sizeof(Point)]);
-memcpy( mpPointAry, rImpPoly.mpPointAry, 
(sal_uIntPtr)rImpPoly.mnPoints*sizeof(Point) );
+const std::size_t 
nSz(static_cast(rImpPoly.mnPoints)*sizeof(Point));
+mpPointAry = reinterpret_cast(new char[nSz]);
+memcpy( mpPointAry, rImpPoly.mpPointAry, nSz );
 
 if( rImpPoly.mpFlagAry )
 {
@@ -109,8 +111,9 @@ ImplPolygon::ImplPolygon( sal_uInt16 nInitSize, const 
Point* pInitAry, const sal
 {
 if ( nInitSize )
 {
-mpPointAry = reinterpret_cast(new 
char[(sal_uIntPtr)nInitSize*sizeof(Point)]);
-memcpy( mpPointAry, pInitAry, (sal_uIntPtr)nInitSize*sizeof( Point ) );
+const std::size_t 
nSz(static_cast(nInitSize)*sizeof(Poi

[Bug 93195] Default action in Select Firefox Theme should be Search

2015-11-05 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=93195

Yousuf (Jay) Philips  changed:

   What|Removed |Added

 Status|NEW |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: i18nutil/source

2015-11-05 Thread Justin Luth

 i18nutil/source/utility/unicode.cxx |   16 ++--
 1 file changed, 10 insertions(+), 6 deletions(-)

New commits:
commit c93db073425e61907a290f3f5826c0f79f310275
Author: Justin Luth 
Date:   Thu Nov 5 17:22:42 2015 +0300

related tdf#73691 - prevent AltX creating control characters

Do nothing for numbers 0x00 - 0x1f.

Change-Id: Idda596e735c464b97dc3624253ebbea86933ff2c
Reviewed-on: https://gerrit.libreoffice.org/19654
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/i18nutil/source/utility/unicode.cxx 
b/i18nutil/source/utility/unicode.cxx
index 8b56239..a7d3d46 100644
--- a/i18nutil/source/utility/unicode.cxx
+++ b/i18nutil/source/utility/unicode.cxx
@@ -1084,6 +1084,13 @@ bool ToggleUnicodeCodepoint::AllowMoreInput(sal_Unicode 
uChar)
 return false;
 }
 
+// 0 - 1f are control characters.  Do not process those.
+if( uChar < 0x20 )
+{
+mbAllowMoreChars = false;
+return false;
+}
+
 switch( uChar )
 {
 case 'u':
@@ -1117,9 +1124,6 @@ bool ToggleUnicodeCodepoint::AllowMoreInput(sal_Unicode 
uChar)
 maInput.insertUtf32(0, uChar);
 }
 break;
-case 0:
-mbAllowMoreChars = false;
-break;
 default:
 // + already found. Since not U, cancel further input
 if( mbRequiresU )
@@ -1185,15 +1189,15 @@ OUString ToggleUnicodeCodepoint::StringToReplace()
 while( nUPlus != -1 )
 {
 nUnicode = sIn.copy(0, nUPlus).toString().toUInt32(16);
-//strip out all null or invalid Unicode values
-if( !nUnicode || nUnicode > 0x10 )
+//prevent creating control characters or invalid Unicode values
+if( nUnicode < 0x20 || nUnicode > 0x10 )
 maInput = sIn.copy(nUPlus);
 sIn = sIn.copy(nUPlus+2);
 nUPlus =  sIn.indexOf("U+");
 }
 
 nUnicode = sIn.toString().toUInt32(16);
-if( !nUnicode || nUnicode > 0x10 )
+if( nUnicode < 0x20 || nUnicode > 0x10 )
maInput.truncate().append( sIn[sIn.getLength()-1] );
 return maInput.toString();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-11-05 Thread Katarina Behrens

 sc/source/filter/excel/xestring.cxx |3 +--
 sc/source/filter/excel/xetable.cxx  |   17 +++--
 2 files changed, 12 insertions(+), 8 deletions(-)

New commits:
commit dd971d008780186c88cc33df3610ed8cc9f0a2f4
Author: Katarina Behrens 
Date:   Thu Nov 5 17:57:07 2015 +0100

tdf#92296: Fix off-by-one formatting of text runs on OOXML export

This essentially reverts commit 8865ed2efecd03722d10e522265f31c99b13b2bb
and implements a different fix for tdf#90812:
If the formatting of entire cell is uniform, remove formatting of the
leading text run and create corresponding cell style. In all other cases,
write out formattings for each individual run.

Change-Id: I7724b7a474f773f2cdc39e9150d843642fb05bbe
Reviewed-on: https://gerrit.libreoffice.org/19811
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/source/filter/excel/xestring.cxx 
b/sc/source/filter/excel/xestring.cxx
index 4bb7406..1a420b2 100644
--- a/sc/source/filter/excel/xestring.cxx
+++ b/sc/source/filter/excel/xestring.cxx
@@ -428,10 +428,9 @@ void XclExpString::WriteXml( XclExpXmlStream& rStrm ) const
 const XclExpFont* pFont = NULL;
 for ( ; aIt != aEnd; ++aIt )
 {
-// pFont getting first then pass it to run otherwise pFont is NULL.
-pFont = rFonts.GetFont( aIt->mnFontIdx );
 nStart = lcl_WriteRun( rStrm, GetUnicodeBuffer(),
 nStart, aIt->mnChar-nStart, pFont );
+pFont = rFonts.GetFont( aIt->mnFontIdx );
 }
 lcl_WriteRun( rStrm, GetUnicodeBuffer(),
 nStart, GetUnicodeBuffer().size() - nStart, pFont );
diff --git a/sc/source/filter/excel/xetable.cxx 
b/sc/source/filter/excel/xetable.cxx
index 2aa170e..e8e4d00 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -723,13 +723,18 @@ void XclExpLabelCell::Init( const XclExpRoot& rRoot,
 mxText = xText;
 mnSstIndex = 0;
 
-// create the cell format
-sal_uInt16 nXclFont = mxText->RemoveLeadingFont();
-if( GetXFId() == EXC_XFID_NOTFOUND )
+const XclFormatRunVec& rFormats = mxText->GetFormats();
+// Create the cell format and remove formatting of the leading run
+// if the entire string is equally formatted
+if( rFormats.size() == 1 )
 {
-OSL_ENSURE( nXclFont != EXC_FONT_NOTFOUND, "XclExpLabelCell::Init - 
leading font not found" );
-bool bForceLineBreak = mxText->IsWrapped();
-SetXFId( rRoot.GetXFBuffer().InsertWithFont( pPattern, 
ApiScriptType::WEAK, nXclFont, bForceLineBreak ) );
+sal_uInt16 nXclFont = mxText->RemoveLeadingFont();
+if( GetXFId() == EXC_XFID_NOTFOUND )
+{
+OSL_ENSURE( nXclFont != EXC_FONT_NOTFOUND, "XclExpLabelCell::Init 
- leading font not found" );
+bool bForceLineBreak = mxText->IsWrapped();
+SetXFId( rRoot.GetXFBuffer().InsertWithFont( pPattern, 
ApiScriptType::WEAK, nXclFont, bForceLineBreak ) );
+}
 }
 
 // get auto-wrap attribute from cell format
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-11-05 Thread Michael Meeks

 vcl/quartz/salgdiutils.cxx |9 +
 1 file changed, 9 insertions(+)

New commits:
commit 2dd20b4745a5876ca40106163799e89bf539b2cf
Author: Michael Meeks 
Date:   Thu Nov 5 14:22:09 2015 +

Comment the quartz off-screen buffering code.

Change-Id: Ie9a52745a83ca6e4281faa4f1dc8b8ea7411badf
Reviewed-on: https://gerrit.libreoffice.org/19805
Tested-by: Jenkins 
Reviewed-by: Michael Meeks 

diff --git a/vcl/quartz/salgdiutils.cxx b/vcl/quartz/salgdiutils.cxx
index 58d1d45..f142620 100644
--- a/vcl/quartz/salgdiutils.cxx
+++ b/vcl/quartz/salgdiutils.cxx
@@ -89,6 +89,10 @@ void AquaSalGraphics::UnsetState()
 }
 }
 
+/**
+ * (re-)create the off-screen mxLayer we render everything to if
+ * necessary: eg. not initialized yet, or it has an incorrect size.
+ */
 bool AquaSalGraphics::CheckContext()
 {
 if( mbWindow && mpFrame && mpFrame->getNSWindow() )
@@ -174,6 +178,11 @@ CGContextRef AquaSalGraphics::GetContext()
 return mrContext;
 }
 
+/**
+ * Blit the contents of our internal mxLayer state to the
+ * associated window, if any; cf. drawRect event handling
+ * on the frame.
+ */
 void AquaSalGraphics::UpdateWindow( NSRect& )
 {
 if( !mpFrame )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - jurt/source

2015-11-05 Thread Damjan Jovanovic

 jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c |   18 +--
 jurt/source/pipe/wrapper/wrapper.c  |   51 
+++---
 2 files changed, 46 insertions(+), 23 deletions(-)

New commits:
commit d0991ab96b863dfae89a6ce4e9ac90016681b61d
Author: Damjan Jovanovic 
Date:   Thu Nov 5 17:23:14 2015 +

#i126360# Possible exception/segfault in jurt jpipe.dll under Windows with 
pipe connection

- Remove the LoadLibrary from DLLMain (from windows not recommended)
see 
http://msdn.microsoft.com/en-us/library/windows/desktop/ms682583(v=vs.85).aspx
in section Remarks
- Improve the comment why we need two dll's (jpipe.dll and jpipx.dll)
- Integrate CriticalSection, init in DllMain see link

http://msdn.microsoft.com/en-us/library/windows/desktop/dn633971(v=vs.85).aspx#general_best_practices

Patch by: Juergen Funk 
Review by: Damjan Jovanovic

diff --git 
a/jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c 
b/jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c
index fae40f9..5244c3e 100644
--- a/jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c
+++ b/jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c
@@ -25,15 +25,15 @@
 #include "osl/security.h"
 #include 
 
-/* On Windows, jpipe.dll must not have dependencies on any other URE DLLs, as
-   Java System.LoadLibrary could otherwise not load it.  Therefore, on Windows,
-   this code goes into a jpipx.dll that the jpipe.dll wrapper loads with
-   LoadLibraryEx(LOAD_WITH_ALTERED_SEARCH_PATH).  The function names in this
-   wrapped code are truncated from the long JNICALL names, as JNICALL causes
-   some "@N" with different numeric values for N (and probably different across
-   32 and 64 bit) to be added to the symbol names, which the calls to
-   GetProcAddress in wrapper/wrapper.c would otheriwse have to take into
-   account.
+/* On Windows, jpipe.dll must not have static dependencies on any other URE 
DLLs
+   (sal3.dll, uwinapi.dll), as Java System.LoadLibrary could otherwise not load
+   it.  Therefore, on Windows, this code goes into a jpipx.dll that the 
jpipe.dll
+   wrapper loads with LoadLibraryEx(LOAD_WITH_ALTERED_SEARCH_PATH).
+   The function names in this wrapped code are truncated from the long JNICALL
+   names, as JNICALL causes some "@N" with different numeric values for
+   N (and probably different across 32 and 64 bit) to be added to the symbol
+   names, which the calls to GetProcAddress in wrapper/wrapper.c would 
otherwise
+   have to take into account.
 */
 
 /*/
diff --git a/jurt/source/pipe/wrapper/wrapper.c 
b/jurt/source/pipe/wrapper/wrapper.c
index 59d51d1..314cc18 100644
--- a/jurt/source/pipe/wrapper/wrapper.c
+++ b/jurt/source/pipe/wrapper/wrapper.c
@@ -30,27 +30,50 @@
 #include "jni.h"
 #include "sal/types.h"
 
-static HMODULE module;
 
-static FARPROC getFunction(char const * name) {
+static HMODULE   module   = NULL;
+static HINSTANCE hInstDLL = NULL;
+static CRITICAL_SECTION CriticalSection;
+
+void InitWrapper(void) {
+#define MAXPATH 512
+wchar_t path[MAXPATH];
+DWORD size;
+
+size = GetModuleFileNameW(hInstDLL, path, MAXPATH);
+if (size == 0) {
+abort();
+}
+path[size - 5] = L'x'; /* ...\jpipe.dll -> ...\jpipx.dll */
+module = LoadLibraryExW(path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
+if (module == NULL) {
+abort();
+}
+}
+
+static FARPROC getFunction(char const * name)
+{
+{
+EnterCriticalSection(&CriticalSection);
+
+if(module == NULL)
+InitWrapper();
+
+LeaveCriticalSection(&CriticalSection);
+}
+
 return GetProcAddress(module, name);
 }
 
 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
 (void) lpvReserved;
-if (fdwReason == DLL_PROCESS_ATTACH) {
-wchar_t path[32767];
-DWORD size;
-size = GetModuleFileNameW(hinstDLL, path, 32767);
-if (size == 0) {
-return FALSE;
-}
-path[size - 5] = L'x'; /* ...\jpipe.dll -> ...\jpipx.dll */
-module = LoadLibraryExW(path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
-if (module == NULL) {
-return FALSE;
-}
+
+if (fdwReason == DLL_PROCESS_ATTACH)
+{
+InitializeCriticalSection(&CriticalSection);
+hInstDLL = hinstDLL;
 }
+
 return TRUE;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/src

2015-11-05 Thread László Németh

 loleaflet/src/map/handler/Map.Keyboard.js |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 26fa6adff748935670390da9f7671faa38010259
Author: LÃ¡szlÃ³ NÃ©meth 
Date:   Thu Nov 5 19:02:13 2015 +0100

loleaflet: revert the removed Ctrl-5 for Calc strikethrough text

diff --git a/loleaflet/src/map/handler/Map.Keyboard.js 
b/loleaflet/src/map/handler/Map.Keyboard.js
index 9ac81de..3d1f846 100644
--- a/loleaflet/src/map/handler/Map.Keyboard.js
+++ b/loleaflet/src/map/handler/Map.Keyboard.js
@@ -341,6 +341,12 @@ L.Map.Keyboard = L.Handler.extend({
}
 
switch (e.originalEvent.keyCode) {
+   case 53: // 5
+   if (this._map.getDocType() === 'spreadsheet') {
+   L.Socket.sendMessage('uno 
.uno:Strikeout');
+   return true;
+   }
+   return false;
case 67: // c
// we prepare for a copy event
this._map._docLayer._textArea.value = 'dummy 
text';
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-11-05 Thread Oliver Specht

 sw/source/core/doc/DocumentFieldsManager.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d7144b71eeb132b00bd555495d9547c3b859ceaa
Author: Oliver Specht 
Date:   Thu Nov 5 15:14:13 2015 +0100

tdf#76995: updated cached value on Evaluate() of db name field

Conversion of fields to text while creating mail merge documents
returns a cached value. This needs to be set before also for db name fields.

Change-Id: I5796adc82e11005ea045fb220b81201db5ff0b28
Reviewed-on: https://gerrit.libreoffice.org/19806
Tested-by: Jenkins 
Reviewed-by: Oliver Specht 

diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx 
b/sw/source/core/doc/DocumentFieldsManager.cxx
index 6953c53..90ae677 100644
--- a/sw/source/core/doc/DocumentFieldsManager.cxx
+++ b/sw/source/core/doc/DocumentFieldsManager.cxx
@@ -988,6 +988,7 @@ void DocumentFieldsManager::UpdateExpFields( SwTextField* 
pUpdateField, bool bUp
 {
 const_cast(static_cast(pField))->Evaluate(&m_rDoc);
 aCalc.VarChange( sDBNumNm, static_cast(pField)->GetSetNumber());
+pField->ExpandField(m_rDoc.IsClipBoard());
 }
 #endif
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

minutes of ESC call ...

2015-11-05 Thread Michael Meeks

* Present:
+ Norbert, Stephan, Jan-Marek, Oliver, Sophie, Lionel, Robinson,
  Jacobo, Jan I, David, Bubli, Olivier, Thorstenb, Bjoern, Miklos,
  Michael S, Muthu, Eike, Kendy, Armin, Caolan, Andras
 
* Completed Action Items:
+ kind offer to setup an MSVC2015 tinderbox vs. master (Thorsten)
[ live and working, some problems with cppunit tests
  triggering a dialog with automatic debugging.
  Needs registry tweak to turn of debugging. ]
+ reach-out to Beta Co-working guy to book pre-FOSDEM hackfest (Bjoern)
[ mailed & response - just fine, promote them in the wiki pages.
  Asked for the 2x days before FOSDEM. ]
 
* Pending Action Items:
+ add a 4.4.7 to the release-plan (Cloph)
+ please cleanup / merge mentoring page (JanI)
[ https://wiki.documentfoundation.org/Mentors
  https://wiki.documentfoundation.org/FindTheExpert ]
+ UserAgent - drop bundled-languages (Michael)
+ UserAgent - produce a patch for review (Michael)
+ talk to Alex wrt. design blog tomorrow (Cloph)
+ Largo as a hack-fest venue ? chat to Dave (Robinson)
+ come up with a proposal for "abandoned" / "insufficient data"
  resolution in the bug-flow graph (Robinson)
[ some ideas, will send mail after the call ]
 
* Release Engineering update (Robinson)
+ 4.4.6 / 5.0.3 retrospective
+ out now.
+ 4.4.7
+ RC1 / freeze week 46, 1 week out.
+ 5.1.0 branch / feature-freeze: ~2 weeks out: Week 47
+ had bug-hunting session with Alpha1 @ weekend.
+ 5.0.4 status
+ RC1 / freeze week 48, 3x weeks out.
+ Android & iOS Remote
+ 4x CVEs release today (Bjoern)
+ people should be aware:
http://www.libreoffice.org/about-us/security/advisories/
+ Caolan updated the page, but needs crediting for the fixes.
 
* Introduction (Armin)
+ formerly Armin Weiss,
+ working on the code-base for ~15 yrs, from StarDivision, with Marco.
+ formerly at IBM, now at CIB.
+ working on LibreOffice immediately, starting now.
+ currently getting used to new stuff; gerrit, new builds etc.
+ warming up the fingers.
+ commit access for him? (Bubli)
=> adding him (Norbert) Done.
+ pushing to gerrit gives a free-build on all platforms in 30-40mins 
(Norbert)
+ it's awesome (Armin)
+ if have a patch, want to test, but don't want it to go through:
+ put a -1 self review on it; it helps.
+ also can use a +2 to avoid others reviewing things (Bjoern)
+ or makes people think you forgot to press the button (Kendy)
 
* Widow / Orphan controls on by default (Justin)
"I would like to request that someone give official endorsement
  to turning on widow/orphan controls by default for new
  documents.  I expect this probably fits ESC better than UI
  group.
  https://bugs.documentfoundation.org/show_bug.cgi?id=89714";
+ replied on the list, pretty old feature & stable (Miklos)
+ just a UX decision if it should be on/off.
+ not entirely UX (Bubli)
+ changes ODF export around styles (are they default styles)
+ from the bug report (JMux)
+ default value currently not saved in the doc.
+ all old documents without this would get it on load.
+ he intends that only new docs get it (Lionel)
+ Can we store this 'on/off' setting for Microsoft docs ? (Michael S)
+ by default on since MS Word 2003 - so improves interop (Lionel)
+ all for it in general; no opinion on implementation.
+ not necessary for UX to discuss it (Kendy)
=> as long as it doesn't break old docs - happy for it to go in
   with the new more interoperable default.
 
* Documentation (Kendy/Olivier)
+ someone working on online modification of help-files
 + Jay to encourage him to push that publicly.
 + in a while will need a VM from infra to test this.
+ more changes in help-authoring:
 + better image handling; new version needs releasing soon.
+ in the last week:
 + added nice new help pages from Lera Goncharuk (tagezi)
 + interested in cleaning trash from the help files too.
 + which may help translators too - avoiding redundant work.
 + Jay is updating the help for the menus & the authoring ext'n.
 + Regina & Eike did some work at the hackfest tool.
 
* UX Update (Kendy)
+ new icons 32pix vers of tango & Sifr as well.
+ code to enable 32pix icons coming soon.
+ need a switch in tools->options to enable them.
+ this Friday:
+ design session building ideas around NotebookBar.
+ ideally when Samuel is back
+ won't be (Bubli, Thorsten)
+ won't be only 1x session.
+ increased interest in new user statistics
+ hacker

[Libreoffice-commits] core.git: officecfg/registry sc/uiconfig

2015-11-05 Thread Yousuf Philips

 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu|3 
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |   14 ++-
 sc/uiconfig/scalc/menubar/menubar.xml|   37 
+-
 3 files changed, 35 insertions(+), 19 deletions(-)

New commits:
commit 582839394a8224f74ae07dd08f8916352ce48259
Author: Yousuf Philips 
Date:   Wed Nov 4 05:55:01 2015 +0400

tdf#91820 Round of small tweaks to Calc's menu bar

Change-Id: I723dd1bc7179ec90cd828aaf263d8a2bc091ac22
Reviewed-on: https://gerrit.libreoffice.org/19766
Tested-by: Jenkins 
Reviewed-by: Yousuf Philips 

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index eb28b3b..0bcb143 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1800,6 +1800,9 @@
   
   
 
+  Toggle Grid Lines for Current Sheet
+
+
   Grid Lines for Sheet
 
 
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 27b21a4..155b1ef 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -3227,6 +3227,14 @@
   1
 
   
+  
+
+  ~Form
+
+
+  1
+
+  
   
 
   ~Image...
@@ -4766,15 +4774,15 @@
   
   
 
-  Con~trol...
+  Con~trol Properties...
 
 
   9
 
   
   
-
-  For~m...
+
+  For~m Properties...
 
 
   9
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml 
b/sc/uiconfig/scalc/menubar/menubar.xml
index cff033e..fe9260f 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -94,8 +94,8 @@
 
 
 
-
 
+
 
 
 
@@ -123,6 +123,7 @@
 
 
 
+
 
 
 
@@ -149,17 +150,6 @@
 
 
 
-
-
-
-  
-
-
-
-
-
-  
-
 
 
 
@@ -169,10 +159,10 @@
 
 
 
-
 
 
 
+
 
 
 
@@ -181,6 +171,17 @@
 
 
 
+
+  
+
+
+
+
+
+  
+
+
+
 
 
 
@@ -367,6 +368,12 @@
 
 
 
+
+
+
+
+
+
 
 
 
@@ -399,9 +406,6 @@
 
 
 
-
-
-
 
 
 
@@ -452,6 +456,7 @@
 
 
 
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 93195] Default action in Select Firefox Theme should be Search

2015-11-05 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=93195

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

http://cgit.freedesktop.org/libreoffice/core/commit/?id=05b87c9a75fc36179b10c2995f77768edcd9ad96

tdf#93195 Set default focus to search button

It will be available in 5.1.0.

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 93195] Default action in Select Firefox Theme should be Search

2015-11-05 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=93195

Commit Notification  changed:

   What|Removed |Added

 Whiteboard|EasyHack DifficultyBeginner |EasyHack DifficultyBeginner
   |SkillCpp topicUI|SkillCpp topicUI
   ||target:5.1.0

-- 
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: cui/uiconfig

2015-11-05 Thread Yousuf Philips

 cui/uiconfig/ui/select_persona_dialog.ui |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 05b87c9a75fc36179b10c2995f77768edcd9ad96
Author: Yousuf Philips 
Date:   Thu Nov 5 01:10:52 2015 +0400

tdf#93195 Set default focus to search button

Change-Id: Id60a901b0d66e5e093f107c25db28b12a5f499d5
Reviewed-on: https://gerrit.libreoffice.org/19791
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 

diff --git a/cui/uiconfig/ui/select_persona_dialog.ui 
b/cui/uiconfig/ui/select_persona_dialog.ui
index ee5100a..c34e518 100644
--- a/cui/uiconfig/ui/select_persona_dialog.ui
+++ b/cui/uiconfig/ui/select_persona_dialog.ui
@@ -23,8 +23,6 @@
 gtk-ok
 True
 True
-True
-True
 True
 True
   
@@ -130,6 +128,8 @@
 _Search
 True
 True
+True
+True
 True
 True
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-11-05 Thread Katarina Behrens

 sc/source/filter/excel/xestring.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 825f8422bb2cce52bd3095a63de14b34b32ae37c
Author: Katarina Behrens 
Date:   Thu Nov 5 11:44:17 2015 +0100

tdf#88137, tdf#89254: Preserve whitespace also in formatted strings

Change-Id: I5c160e5e032e35be659eba00d25b79cebfcfcfc9
Reviewed-on: https://gerrit.libreoffice.org/19798
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/source/filter/excel/xestring.cxx 
b/sc/source/filter/excel/xestring.cxx
index 6076f5a..4bb7406 100644
--- a/sc/source/filter/excel/xestring.cxx
+++ b/sc/source/filter/excel/xestring.cxx
@@ -401,7 +401,7 @@ static sal_uInt16 lcl_WriteRun( XclExpXmlStream& rStrm, 
const ScfUInt16Vec& rBuf
 rWorksheet->endElement( XML_rPr );
 }
 rWorksheet->startElement( XML_t,
-FSEND );
+FSNS(XML_xml, XML_space), "preserve", FSEND );
 rWorksheet->writeEscaped( XclXmlUtils::ToOUString( rBuffer, nStart, 
nLength ) );
 rWorksheet->endElement( XML_t );
 rWorksheet->endElement( XML_r );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/Module_sd.mk

2015-11-05 Thread Miklos Vajna

 sd/Module_sd.mk |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 327933f22a35b0c28d43968118b302c4f043a3e2
Author: Miklos Vajna 
Date:   Thu Nov 5 17:04:57 2015 +0100

sd: CppunitTest_sd_svg_export_tests is Linux-only so far

Change-Id: If0f93ab9414f9013aab580bafc67f77891dfd8cc

diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index c62ea20..09b36b2 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -34,10 +34,14 @@ $(eval $(call gb_Module_add_check_targets,sd,\
 CppunitTest_sd_filters_test \
 CppunitTest_sd_html_export_tests \
 CppunitTest_sd_tiledrendering \
-CppunitTest_sd_svg_export_tests \
 ))
 endif
 
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Module_add_check_targets,sd,\
+CppunitTest_sd_svg_export_tests \
+))
+endif
 
 $(eval $(call gb_Module_add_subsequentcheck_targets,sd,\
 JunitTest_sd_unoapi \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-11-05 Thread Jan-Marek Glogowski

 package/source/zipapi/ZipFile.cxx |   22 --
 1 file changed, 8 insertions(+), 14 deletions(-)

New commits:
commit 912c03445349330f3b82b9f6c66f4c8dc5783bdc
Author: Jan-Marek Glogowski 
Date:   Wed Nov 4 10:33:09 2015 +0100

Don't check version field from local ZIP header

Our current Maven based Java toolchain produces JARs, which
have a different "version needed to extract" in the ZIP local
and central directory header.

I had a look at 7zip and unzip and they already ignore the version
but compare other data LO already ignores - sig. The "standard"
document from PKWARE doesn't help.

So just compare the file path and calculate the data offset and
otherwise ignore all (duplicated) information from the local index
and rely on a correct central directory entry. Various programs
produce(d) "broken" ZIP files; even LO at some point (see git log).

Change-Id: I8d63abb0d49a1087c7654f401b62355c147c3118
Reviewed-on: https://gerrit.libreoffice.org/19779
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 
Reviewed-by: Jan-Marek Glogowski 

diff --git a/package/source/zipapi/ZipFile.cxx 
b/package/source/zipapi/ZipFile.cxx
index 9fa0cbb..41d77fb 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -639,10 +639,15 @@ bool ZipFile::readLOC( ZipEntry &rEntry )
 
 aGrabber.seek(nPos);
 sal_Int32 nTestSig = aGrabber.ReadInt32();
-
 if (nTestSig != LOCSIG)
 throw ZipIOException("Invalid LOC header (bad signature)" );
-sal_Int16 nVersion = aGrabber.ReadInt16();
+
+// Ignore all (duplicated) information from the local file header.
+// various programs produced "broken" zip files; even LO at some point.
+// Just verify the path and calculate the data offset and otherwise
+// rely on the central directory info.
+
+aGrabber.ReadInt16(); //version
 aGrabber.ReadInt16(); //flag
 aGrabber.ReadInt16(); //how
 aGrabber.ReadInt32(); //time
@@ -682,18 +687,7 @@ bool ZipFile::readLOC( ZipEntry &rEntry )
 rEntry.sPath = sLOCPath;
 }
 
-// check basic local file header / entry consistency, just
-// plain ignore bits 1 & 2 of the flag field - they are either
-// purely informative, or even fully undefined (depending on
-// nMethod)
-// Do *not* compare nMethod / nHow, older versions with
-// encrypted streams write mismatching DEFLATE/STORE pairs
-// there.
-// Do *not* compare timestamps, since MSO 2010 can produce documents
-// with timestamp difference in the central directory entry and local
-// file header.
-bBroken = rEntry.nVersion != nVersion
-|| rEntry.nPathLen != nPathLen
+bBroken = rEntry.nPathLen != nPathLen
 || !rEntry.sPath.equals( sLOCPath );
 }
 catch(...)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/src

2015-11-05 Thread László Németh

 loleaflet/src/map/handler/Map.Keyboard.js |  310 ++
 1 file changed, 66 insertions(+), 244 deletions(-)

New commits:
commit fd610ff6a66db269f47413546bfb7aa712b0e2cf
Author: LÃ¡szlÃ³ NÃ©meth 
Date:   Thu Nov 5 16:48:41 2015 +0100

loleaflet: handle Ctrl/Alt keys in the core

diff --git a/loleaflet/src/map/handler/Map.Keyboard.js 
b/loleaflet/src/map/handler/Map.Keyboard.js
index 3532795..9ac81de 100644
--- a/loleaflet/src/map/handler/Map.Keyboard.js
+++ b/loleaflet/src/map/handler/Map.Keyboard.js
@@ -38,6 +38,42 @@ L.Map.Keyboard = L.Handler.extend({
40  : 1024, // down arrow   : DOWN
45  : 1285, // insert   : INSERT
46  : 1286, // delete   : DELETE
+   48  : 256,  // 0: NUM0
+   49  : 257,  // 1: NUM1
+   50  : 258,  // 2: NUM2
+   51  : 259,  // 3: NUM3
+   52  : 260,  // 4: NUM4
+   53  : 261,  // 5: NUM5
+   54  : 262,  // 6: NUM6
+   55  : 263,  // 7: NUM7
+   56  : 264,  // 8: NUM8
+   57  : 265,  // 9: NUM9
+   65  : 512,  // A: A
+   66  : 513,  // B: B
+   67  : 514,  // C: C
+   68  : 515,  // D: D
+   69  : 516,  // E: E
+   70  : 517,  // F: F
+   71  : 518,  // G: G
+   72  : 519,  // H: H
+   73  : 520,  // I: I
+   74  : 521,  // J: J
+   75  : 522,  // K: K
+   76  : 523,  // L: L
+   77  : 524,  // M: M
+   78  : 525,  // N: N
+   79  : 526,  // O: O
+   80  : 527,  // P: P
+   81  : 528,  // Q: Q
+   82  : 529,  // R: R
+   83  : 530,  // S: S
+   84  : 531,  // T: T
+   85  : 532,  // U: U
+   86  : 533,  // V: V
+   87  : 534,  // W: W
+   88  : 535,  // X: X
+   89  : 536,  // Y: Y
+   90  : 537,  // Z: Z
91  : null, // left window key  : UNKOWN
92  : null, // right window key : UNKOWN
93  : null, // select key   : UNKOWN
@@ -69,11 +105,11 @@ L.Map.Keyboard = L.Handler.extend({
122 : 778,  // f11  : F11
144 : 1313, // num lock : NUMLOCK
145 : 1314, // scroll lock  : SCROLLLOCK
-   173 : 5,// dash : DASH (on Firefox)
+   173 : 1288, // dash : DASH (on Firefox)
186 : 1317, // semi-colon   : SEMICOLON
187 : 1295, // equal sign   : EQUAL
188 : 1292, // comma: COMMA
-   189 : 5,// dash : DASH
+   189 : 1288, // dash : DASH
190 : null, // period   : UNKOWN
191 : null, // forward slash: UNKOWN
192 : null, // grave accent : UNKOWN
@@ -191,9 +227,10 @@ L.Map.Keyboard = L.Handler.extend({
var ctrl = e.originalEvent.ctrlKey ? this.keyModifier.ctrl : 0;
var alt = e.originalEvent.altKey ? this.keyModifier.alt : 0;
this.modifier = shift | ctrl | alt;
+
if (ctrl) {
-   this._handleCtrlCommand(e);
-   return;
+   if (this._handleCtrlCommand(e))
+   return;
}
 
// page up or page down, handled by this.dopagejump
@@ -215,15 +252,12 @@ L.Map.Keyboard = L.Handler.extend({
var keyCode = e.originalEvent.keyCode;
var unoKeyCode = this._toUNOKeyCode(keyCode);
 
-   if (shift) {
-   unoKeyCode |= this.keyModifier.shift;
-
-   switch (e.originalEvent.keyCode) {
-   case 32: // space
-   if (this._map.getDocType() === 
'spreadsheet') {
-   L.Socket.sendMessage('uno 
.uno:SelectRow');
-   return;
-   }
+   if (this.modifier) {
+   unoKeyCode |= this.modifier;
+   if (e.type

www.lists.freedesktop.org

2015-11-05 Thread Anne | AU IT SOLUTIONS


Hello, I hope you are well.

My name is Anne Roberts and I work for a Search Marketing company in  
Sydney, Australia.


I was doing some research on your industry and I landed on your website.  
Thing is i had a look at some of the other businesses who are currently  
ranked on Page 1 and I truly believe you have a better website and a better  
brand.


Long story short, I have created an 18-Page WebsiteAudit which addresses  
all of the technical and web errors on your website that is stopping you  
from ranking on PAGE 1...


I am happy to send you this report forFREE.

All I want is the opportunity to call you and discuss THE WEBSITE AUDIT in  
greater detail.


What do you think?

Kind Regards,


Anne | MANAGER

AU IT SOLUTIONS
Headquarters: 41 Bridge Rd Glebe, NSW 2037, Australia
Other Offices: Hong Kong & China | USA | New Zealand | UAE | Singapore


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

[Libreoffice-commits] core.git: sd/CppunitTest_sd_svg_export_tests.mk sd/Module_sd.mk sd/qa

2015-11-05 Thread Marco Cecchetti

 sd/CppunitTest_sd_svg_export_tests.mk   |   76 
 sd/Module_sd.mk |1 
 sd/qa/unit/SVGExportTests.cxx   |   72 ++
 sd/qa/unit/data/odp/svg-export-text-decorations.odp |binary
 4 files changed, 149 insertions(+)

New commits:
commit 87e0c9f6d7d753fbe4ade55d7c15ee07b1118c56
Author: Marco Cecchetti 
Date:   Thu Nov 5 12:49:20 2015 +0100

sd: add support for svg export unit tests

Change-Id: Iafeaecad612b724c4eeb85e0c01c942afb6445d8

diff --git a/sd/CppunitTest_sd_svg_export_tests.mk 
b/sd/CppunitTest_sd_svg_export_tests.mk
new file mode 100644
index 000..36f64ea
--- /dev/null
+++ b/sd/CppunitTest_sd_svg_export_tests.mk
@@ -0,0 +1,76 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,sd_svg_export_tests))
+
+$(eval $(call gb_CppunitTest_use_externals,sd_svg_export_tests,\
+   boost_headers \
+libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sd_svg_export_tests, \
+sd/qa/unit/SVGExportTests \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sd_svg_export_tests, \
+basegfx \
+comphelper \
+cppu \
+cppuhelper \
+drawinglayer \
+editeng \
+for \
+forui \
+i18nlangtag \
+msfilter \
+oox \
+sal \
+salhelper \
+sax \
+sd \
+sfx \
+sot \
+svl \
+svt \
+svx \
+svxcore \
+test \
+tl \
+tk \
+ucbhelper \
+unotest \
+utl \
+vcl \
+xo \
+$(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sd_svg_export_tests,\
+-I$(SRCDIR)/sd/source/ui/inc \
+-I$(SRCDIR)/sd/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sd_svg_export_tests,\
+offapi \
+udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sd_svg_export_tests))
+$(eval $(call gb_CppunitTest_use_vcl,sd_svg_export_tests))
+
+$(eval $(call gb_CppunitTest_use_rdb,sd_svg_export_tests,services))
+
+$(eval $(call gb_CppunitTest_use_configuration,sd_svg_export_tests))
+
+$(call gb_CppunitTest_get_target,sd_svg_export_tests) : $(call 
gb_AllLangResTarget_get_target,sd)
+
+# vim: set noet sw=4 ts=4:
diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index 4bd26ac..c62ea20 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Module_add_check_targets,sd,\
 CppunitTest_sd_filters_test \
 CppunitTest_sd_html_export_tests \
 CppunitTest_sd_tiledrendering \
+CppunitTest_sd_svg_export_tests \
 ))
 endif
 
diff --git a/sd/qa/unit/SVGExportTests.cxx b/sd/qa/unit/SVGExportTests.cxx
new file mode 100644
index 000..8dbbbc9
--- /dev/null
+++ b/sd/qa/unit/SVGExportTests.cxx
@@ -0,0 +1,72 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "sdmodeltestbase.hxx"
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+using namespace css;
+
+class SdSVGFilterTest : public SdModelTestBase, public XmlTestTools
+{
+uno::Reference mxComponent;
+utl::TempFile maTempFile;
+
+public:
+SdSVGFilterTest()
+{
+maTempFile.EnableKillingFile();
+}
+
+virtual void setUp() override
+{
+SdModelTestBase::setUp();
+
+
mxDesktop.set(css::frame::Desktop::create(comphelper::getComponentContext(getMultiServiceFactory(;
+}
+
+virtual void tearDown() override
+{
+if (mxComponent.is())
+mxComponent->dispose();
+
+SdModelTestBase::tearDown();
+}
+
+void testSVGExportTextDecorations()
+{
+mxComponent = 
loadFromDesktop(getURLFromSrc("/sd/qa/unit/data/odp/svg-export-text-decorations.odp"));
+CPPUNIT_ASSERT(mxComponent.is());
+
+uno::Reference xStorable(mxComponent, 
uno::UNO_QUERY);
+utl::MediaDescriptor aMediaDescriptor;
+OUString aFilterName("impress_svg_Export");
+aMediaDescriptor["FilterName"] <<= aFilterName;
+xStorable->storeToURL(maTempFile.GetURL(), 
aMediaDescriptor.getAsConstPropertyValueList());
+xmlDocPtr pXmlDoc = parseXml(maTempFile);
+CPPUNIT_ASSERT(pXmlDoc);
+
+// TODO use assertXPath() here.
+}
+
+CPPUNIT_TEST_SUITE(SdSVGFilterTest);
+CPPUNIT_TEST(testSVGExportTex

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

2015-11-05 Thread Miklos Vajna

 sw/inc/PostItMgr.hxx |1 +
 sw/inc/SidebarWin.hxx|1 +
 sw/source/core/view/viewsh.cxx   |3 +++
 sw/source/uibase/docvw/PostItMgr.cxx |   15 +++
 sw/source/uibase/docvw/SidebarTxtControl.cxx |   19 ---
 sw/source/uibase/docvw/SidebarTxtControl.hxx |1 +
 sw/source/uibase/docvw/SidebarWin.cxx|   21 -
 7 files changed, 57 insertions(+), 4 deletions(-)

New commits:
commit d54aaea33bf2dab86c0ead4bd142c593d017f930
Author: Miklos Vajna 
Date:   Thu Nov 5 15:58:55 2015 +0100

sw tiled rendering: initial annotation support

Change-Id: I4fcb05f8a58965341cf44a1b7e2367b5cbff981d

diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 752cd2a..73d2deb 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -285,6 +285,7 @@ class SwPostItMgr: public SfxListener
  std::vector< vcl::Window* >* pChildren );
 
 void DrawNotesForPage(OutputDevice *pOutDev, sal_uInt32 nPage);
+void PaintTile(OutputDevice& rRenderContext, const Rectangle& rRect);
 };
 
 #endif
diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx
index e01c269..556de93 100644
--- a/sw/inc/SidebarWin.hxx
+++ b/sw/inc/SidebarWin.hxx
@@ -177,6 +177,7 @@ class SwSidebarWin : public vcl::Window
 virtual ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessible > CreateAccessible() override;
 
 virtual voidDraw(OutputDevice* pDev, const Point&, const Size&, 
DrawFlags) override;
+void PaintTile(vcl::RenderContext& rRenderContext, const Rectangle& 
rRect);
 
 protected:
 virtual voidDataChanged( const DataChangedEvent& aEvent) override;
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 02935a8..d424ebf 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1900,6 +1900,9 @@ void SwViewShell::PaintTile(VirtualDevice &rDevice, int 
contextWidth, int contex
 // draw - works in logic coordinates
 Paint(rDevice, aOutRect);
 
+if (SwPostItMgr* pPostItMgr = GetPostItMgr())
+pPostItMgr->PaintTile(rDevice, aOutRect);
+
 // SwViewShell's output device tear down
 mpOut = pSaveOut;
 mbInLibreOfficeKitCallback = false;
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx 
b/sw/source/uibase/docvw/PostItMgr.cxx
index 44c6602..74a65c6 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -847,6 +847,21 @@ void SwPostItMgr::DrawNotesForPage(OutputDevice *pOutDev, 
sal_uInt32 nPage)
 }
 }
 
+void SwPostItMgr::PaintTile(OutputDevice& rRenderContext, const Rectangle& 
/*rRect*/)
+{
+for (SwSidebarItem* pItem : mvPostItFields)
+{
+SwSidebarWin* pPostIt = pItem->pPostIt;
+if (!pPostIt)
+continue;
+
+Point aPoint(mpEditWin->PixelToLogic(pPostIt->GetPosPixel()));
+Size aSize(pPostIt->PixelToLogic(pPostIt->GetSizePixel()));
+Rectangle aRectangle(aPoint, aSize);
+pPostIt->PaintTile(rRenderContext, aRectangle);
+}
+}
+
 void SwPostItMgr::Scroll(const long lScroll,const unsigned long aPage)
 {
 OSL_ENSURE((lScroll % GetScrollSize() )==0,"SwPostItMgr::Scroll: scrolling 
by wrong value");
diff --git a/sw/source/uibase/docvw/SidebarTxtControl.cxx 
b/sw/source/uibase/docvw/SidebarTxtControl.cxx
index d864b40..e8d1d28 100644
--- a/sw/source/uibase/docvw/SidebarTxtControl.cxx
+++ b/sw/source/uibase/docvw/SidebarTxtControl.cxx
@@ -53,6 +53,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace sw { namespace sidebarwindows {
 
@@ -151,25 +152,37 @@ void SidebarTextControl::Draw(OutputDevice* pDev, const 
Point& rPt, const Size&
 }
 }
 
+void SidebarTextControl::PaintTile(vcl::RenderContext& rRenderContext, const 
Rectangle& rRect)
+{
+Paint(rRenderContext, rRect);
+}
+
 void SidebarTextControl::Paint(vcl::RenderContext& rRenderContext, const 
Rectangle& rRect)
 {
+Point aPoint(0, 0);
+if (comphelper::LibreOfficeKit::isActive())
+aPoint = rRect.TopLeft();
+
 if (!rRenderContext.GetSettings().GetStyleSettings().GetHighContrastMode())
 {
 if (mrSidebarWin.IsMouseOverSidebarWin() || HasFocus())
 {
-rRenderContext.DrawGradient(Rectangle(Point(0,0), 
rRenderContext.PixelToLogic(GetSizePixel())),
+rRenderContext.DrawGradient(Rectangle(aPoint, 
rRenderContext.PixelToLogic(GetSizePixel())),
 Gradient(GradientStyle_LINEAR, 
mrSidebarWin.ColorDark(), mrSidebarWin.ColorDark()));
 }
 else
 {
-rRenderContext.DrawGradient(Rectangle(Point(0,0), 
rRenderContext.PixelToLogic(GetSizePixel())),
+rRenderContext.DrawGradient(Rectangle(aPoint, 
rRenderContext.PixelToLogic(GetSizePixel())),
Gradient(GradientStyle_LINEAR, 
mrSidebarWin.Co

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - sw/source

2015-11-05 Thread Oliver Specht

 sw/source/uibase/uno/unomod.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 9c771cb1cfb7f9c821ad0dfe94c4fc0218eb9898
Author: Oliver Specht 
Date:   Thu Sep 3 08:30:52 2015 +0200

tdf#93719: handle 'HideWhitespace' in SwXViewSettings

Added missing part from tdf#39080 to SwXViewSettings
to handle 'HideWhitespace' property

Change-Id: I8d8098810ba36b6ade6e4476464a72348ef4db8d
Reviewed-on: https://gerrit.libreoffice.org/18291
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 
(cherry picked from commit a1fd97308d7fc7a35a5def1e15a05099dba90f91)

diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx
index 483c2a4..726166c 100644
--- a/sw/source/uibase/uno/unomod.cxx
+++ b/sw/source/uibase/uno/unomod.cxx
@@ -58,6 +58,7 @@ enum SwViewSettingsPropertyHandles
 HANDLE_VIEWSET_HIDDEN_CHARACTERS,
 HANDLE_VIEWSET_HIDDEN_PARAGRAPHS,
 HANDLE_VIEWSET_HIDDEN_TEXT,
+HANDLE_VIEWSET_HIDE_WHITESPACE,
 HANDLE_VIEWSET_HRULER,
 HANDLE_VIEWSET_HSCROLL,
 HANDLE_VIEWSET_INDEX_MARK_BACKGROUND,
@@ -137,6 +138,7 @@ static ChainablePropertySetInfo * 
lcl_createViewSettingsInfo()
 { OUString( "ShowHiddenCharacters"), HANDLE_VIEWSET_HIDDEN_CHARACTERS  
  , cppu::UnoType::get(), PROPERTY_NONE,  0},
 { OUString( "ShowHiddenParagraphs"), HANDLE_VIEWSET_HIDDEN_PARAGRAPHS  
  , cppu::UnoType::get(), PROPERTY_NONE,  0},
 { OUString( "ShowHiddenText"),   HANDLE_VIEWSET_HIDDEN_TEXT
  , cppu::UnoType::get(), PROPERTY_NONE,  0},
+{ OUString( "HideWhitespace"),   HANDLE_VIEWSET_HIDE_WHITESPACE,   
cppu::UnoType::get(), PROPERTY_NONE, 0 },
 { OUString( "ShowHoriRuler"),HANDLE_VIEWSET_HRULER 
  , cppu::UnoType::get(), PROPERTY_NONE,  0},
 { OUString( "ShowHoriScrollBar"),HANDLE_VIEWSET_HSCROLL
  , cppu::UnoType::get(), PROPERTY_NONE,  0},
 { OUString( 
"ShowIndexMarkBackground"),HANDLE_VIEWSET_INDEX_MARK_BACKGROUND, 
cppu::UnoType::get(),PROPERTY_NONE, 0},
@@ -617,6 +619,7 @@ void SwXViewSettings::_setSingleValue( const 
comphelper::PropertyInfo & rInfo, c
 case  HANDLE_VIEWSET_TABSTOPS  :   
mpViewOption->SetTab(bVal);  break;
 case  HANDLE_VIEWSET_BREAKS:   
mpViewOption->SetLineBreak(bVal); break;
 case  HANDLE_VIEWSET_HIDDEN_TEXT   :   
mpViewOption->SetShowHiddenField(bVal);  break;
+case  HANDLE_VIEWSET_HIDE_WHITESPACE:  
mpViewOption->SetHideWhitespaceMode(bVal); break;
 case  HANDLE_VIEWSET_HIDDEN_CHARACTERS :   
mpViewOption->SetShowHiddenChar(bVal); break;
 case  HANDLE_VIEWSET_HIDDEN_PARAGRAPHS :   
mpViewOption->SetShowHiddenPara(bVal);   break;
 case  HANDLE_VIEWSET_TABLE_BOUNDARIES  :   
SwViewOption::SetAppearanceFlag(VIEWOPT_TABLE_BOUNDARIES, bVal, true);break;
@@ -847,6 +850,7 @@ void SwXViewSettings::_getSingleValue( const 
comphelper::PropertyInfo & rInfo, u
 case  HANDLE_VIEWSET_TABSTOPS  :   bBoolVal = 
mpConstViewOption->IsTab(true);   break;
 case  HANDLE_VIEWSET_BREAKS:   bBoolVal = 
mpConstViewOption->IsLineBreak(true); break;
 case  HANDLE_VIEWSET_HIDDEN_TEXT   :   bBoolVal = 
mpConstViewOption->IsShowHiddenField();   break;
+case  HANDLE_VIEWSET_HIDE_WHITESPACE:  bBoolVal = 
mpConstViewOption->IsHideWhitespaceMode(); break;
 case  HANDLE_VIEWSET_HIDDEN_CHARACTERS :   bBoolVal = 
mpConstViewOption->IsShowHiddenChar(true); break;
 case  HANDLE_VIEWSET_HIDDEN_PARAGRAPHS :   bBoolVal = 
mpConstViewOption->IsShowHiddenPara();break;
 case  HANDLE_VIEWSET_TABLE_BOUNDARIES  :   bBoolVal = 
SwViewOption::IsTableBoundaries(); break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Two svg import filters

2015-11-05 Thread Xisco Faulí

Hi,

it would be nice if this topic can be dicussed today at the ESC meeting.

Regards

2015-11-05 12:22 GMT+01:00 Armin Le Grand :

> Hi,
>
> Am 05.11.2015 um 10:30 schrieb Xisco Faulí:
>
> Hi all,
>
> Recently I've been working on some fixes for filter/source/svg/* and my
> intention would be to spend some more time to fix other issues in this
> filter as there's plenty of room for improvements. However, I'd like to
> know if a decision is going to be make wrt this topic before I do other
> fixes as I wouldn't like to work on something that, eventually, is going to
> be drop.
> From my point of view, I find svgio to support more svg elements and
> atributtes than svg filter but, as mentioned before, they do different
> things, svgio imports the file as svg and the filter as a draw document so
> it can be edited afterwards, so either we drop one or the other we are
> going to lose some already implemented features. On the other hand, it's
> also a pain to have 2 filters that do more or less the same.
>
>
> SVG added as GraphicObject using svgio can also be edited - that's why
> there is a 'break' command in the context menu for this objects. Not sure
> if this command is available in all Apps from the UI perspective (the core
> can always break SVGs), but you may try in draw/impress. Breaking creates
> all SdrObjects needed to represent the SVG.
>
> With regards to the missing support in svg filter, I don't think it
> wouldn't be to difficult to improve it, as other filters already implement
> similar features, so they can be taken as a guidance.
>
> Regards
>
> *
> https://gerrit.libreoffice.org/#/q/owner:%22Xisco+Faul%25C3%25AD+Tarazona+%253Canistenis%2540gmail.com%253E%22
>
>
> ___
> LibreOffice mailing 
> listLibreOffice@lists.freedesktop.orghttp://lists.freedesktop.org/mailman/listinfo/libreoffice
>
>
> --
> ALG (PGP Key: EE1C 4B3F E751 D8BC C485 DEC1 3C59 F953 D81C F4A2)
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Smart Watches Series

2015-11-05 Thread Dean

Dear Manager,Good day to you ！I am Dean from Chinese company.Our factory professionally manufactures Smart Watches Series,includingAndroid watches,bluetooth watches,GPS watches,phone watches and MP4 watchesHere, I would like to introduce our new-style and  high quality Smart Watches  to youAs to our general service as follows:1.OEM and ODM service available,customized service for you2.Small wholesales available3.Terms of payment:Bank transfer,Western Union and Paypal etc. For more detailed information, including price list, pictures,descriptions and other services etc.Please do not hesitate to contact me, hope our smart watches are helpful to you Thanks&Best regardsDean OuyangSpecialized in wearable devicesShenzhen Bothbay Technology Co.,LtdAdd: No.13, Wanfeng Industrial Area, Wanfeng, Shajing Town,Bao'an District, Shenzhen,China.Tel: 0086-755-29545220     Fax: 0086-755-81773687Mobile: 0086-13420949526Skype: deanfutureEmail: d...@bothbay.comWebsite: www.bothbay.com ___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: LibreOffice Bug

2015-11-05 Thread Stephan Bergmann


On 11/05/2015 02:29 PM, İrem Şendur wrote:

I 'm working on this bug
https://bugs.documentfoundation.org/show_bug.cgi?id=46279.
I looked files under the extensions directory but I couldn't find where
checking installation of extensions. I should add a dialog about
installation extensions and user should restart LibreOffice.
I asked this question on IRC and <@jmadero> suggested me that I might
mail the LibreOffice mail list.
Can anyone help me with finding the file or about what should I do ?


The code of the "Tools - Extension Manager..." dialog is in 
desktop/source/deployment/gui/dp_gui_theextmgr.cxx (all the 
extension-related functionality is in desktop/source/deployment/), 
TheExtensionManager::installPackage is the starting point for installing 
an extension from within that dialog.


However, what we probably want is something more elaborate than simply 
urging the user to restart LO upon every extension installation (as well 
as extension update, deinstallation, enabling, disabling?).


The referenced bug quotes some issues (missing menu update for already 
open documents) that can probably be addressed without needing a 
restart.  There might be other issues that cannot be resolved without a 
restart, but then we should only urge the user to restart LO if the 
given extension really triggers that issue.




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

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

2015-11-05 Thread Caolán McNamara

 cui/source/tabpages/transfrm.cxx |   16 ++--
 1 file changed, 10 insertions(+), 6 deletions(-)

New commits:
commit eafd3ee3f01bceef0eb3327be3139a8eee2a2b2e
Author: CaolÃ¡n McNamara 
Date:   Thu Nov 5 13:42:13 2015 +

tdf#95210 SetHandleControllerPosition is busted wrt HandleFlags::REFX

so instead of saving the initial pos and trying to restore the pos, instead 
use
a bigger hammer and save the entire geometry and restore that instead.

Change-Id: Id06ea8f205f30771987089c5dc949bb52adc7a27

diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index f6b1f26..0db63db 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -633,10 +633,15 @@ void SvxSlantTabPage::Reset(const SfxItemSet* rAttrs)
 SdrObjKind eKind = (SdrObjKind) pObj->GetObjIdentifier();
 if (eKind == OBJ_CUSTOMSHAPE)
 {
+//save geometry
+SdrCustomShapeGeometryItem aInitialGeometry =
+static_cast(pObj->GetMergedItem(SDRATTR_CUSTOMSHAPE_GEOMETRY));
+
 EnhancedCustomShape2d aShape(pObj);
-Point aInitialPosition;
+
 for (int i = 0; i < 2; ++i)
 {
+Point aInitialPosition;
 if (!aShape.GetHandlePosition(i, aInitialPosition))
 break;
 m_aControlGroups[i]->Enable();
@@ -655,14 +660,10 @@ void SvxSlantTabPage::Reset(const SfxItemSet* rAttrs)
 aShape.GetHandlePosition(i, aMinPosition);
 
 Rectangle aLogicRect = aShape.GetLogicRect();
+aInitialPosition.Move(-aLogicRect.Left(), -aLogicRect.Top());
 aMaxPosition.Move(-aLogicRect.Left(), -aLogicRect.Top());
 aMinPosition.Move(-aLogicRect.Left(), -aLogicRect.Top());
 
-aPosition.X = aInitialPosition.X();
-aPosition.Y = aInitialPosition.Y();
-aInitialPosition.Move(-aLogicRect.Left(), -aLogicRect.Top());
-aShape.SetHandleControllerPosition(i, aPosition);
-
 SetMetricValue(*m_aControlX[i], aInitialPosition.X(), 
ePoolUnit);
 SetMetricValue(*m_aControlY[i], aInitialPosition.Y(), 
ePoolUnit);
 
@@ -681,6 +682,9 @@ void SvxSlantTabPage::Reset(const SfxItemSet* rAttrs)
 m_aControlY[i]->SetMax(aMaxPosition.Y(), FUNIT_MM);
 }
 }
+
+//restore geometry
+pObj->SetMergedItem(aInitialGeometry);
 }
 }
 for (int i = 0; i < 2; ++i)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

LibreOffice Bug

2015-11-05 Thread İrem Şendur

Hi,
I 'm working on this bug
https://bugs.documentfoundation.org/show_bug.cgi?id=46279.
I looked files under the extensions directory but I couldn't find where
checking installation of extensions. I should add a dialog about
installation extensions and user should restart LibreOffice.
I asked this question on IRC and <@jmadero> suggested me that I might mail
the LibreOffice mail list.
Can anyone help me with finding the file or about what should I do ?
Regards.
 Irem Sendur
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2015-11-05 Thread Michael Stahl

 mysqlc/source/mysqlc_driver.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 8e2852428dd67cea2f09955f175518cd3563498f
Author: Michael Stahl 
Date:   Wed Nov 4 16:29:48 2015 +0100

mysqlc: -Werror=unused-function

Change-Id: I8b1f4b7c78a10ce604a63aff47d2df2d1d10dc26
Reviewed-on: https://gerrit.libreoffice.org/19800
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/mysqlc/source/mysqlc_driver.cxx b/mysqlc/source/mysqlc_driver.cxx
index ed43d27..399d622 100644
--- a/mysqlc/source/mysqlc_driver.cxx
+++ b/mysqlc/source/mysqlc_driver.cxx
@@ -110,7 +110,9 @@ Sequence< rtl::OUString > SAL_CALL 
MysqlCDriver::getSupportedServiceNames()
 return getSupportedServiceNames_Static();
 }
 
+#ifndef SYSTEM_MYSQL_CPPCONN
 extern "C" { static void SAL_CALL thisModule() {} }
+#endif
 
 void MysqlCDriver::impl_initCppConn_lck_throw()
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 5 commits - loleaflet/src loolwsd/bundled loolwsd/LOKitClient.cpp loolwsd/LOOLSession.cpp

2015-11-05 Thread Andrzej Hunt

 loleaflet/src/layer/tile/TileLayer.js|   72 ++-
 loolwsd/LOKitClient.cpp  |1 
 loolwsd/LOOLSession.cpp  |5 
 loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h |9 +
 4 files changed, 84 insertions(+), 3 deletions(-)

New commits:
commit 96965bec95370e595eb213ed76e8c10ea5c47556
Author: Andrzej Hunt 
Date:   Thu Nov 5 09:57:29 2015 +0100

loleaflet: update .uno:CellCursor parameter format

This mirrors the parameter format for .uno:ViewRowColumnHeaders

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 60fadd9..3cdf098 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -943,11 +943,11 @@ L.TileLayer = L.GridLayer.extend({
// hence we need to request an updated cell cursor position for this 
level.
_onCellCursorShift: function (bForce) {
if (this._cellCursorMarker || bForce) {
-   L.Socket.sendMessage('commandvalues 
command=.uno:CellCursor:'
-+ '' + this._tileSize + ','
-+ '' + this._tileSize + ','
-+ '' + this._tileWidthTwips + ','
-+ '' + this._tileHeightTwips );
+   L.Socket.sendMessage('commandvalues 
command=.uno:CellCursor'
++ '?outputHeight=' + this._tileSize
++ '&outputWidth=' + this._tileSize
++ '&tileHeight=' + 
this._tileWidthTwips
++ '&tileWidth=' + 
this._tileHeightTwips );
}
},
 
commit d9d0d47514fef09d0606abcf7dc48b6b977c8987
Author: Andrzej Hunt 
Date:   Wed Nov 4 15:44:29 2015 +0100

loleaflet: tdf#94605 Show cell cursor

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 6dc4d1f..60fadd9 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -66,6 +66,10 @@ L.TileLayer = L.GridLayer.extend({
this._graphicSelectionTwips = new L.bounds(new L.point(0, 0), 
new L.point(0, 0));
// Rectangle graphic selection
this._graphicSelection = new L.LatLngBounds(new L.LatLng(0, 0), 
new L.LatLng(0, 0));
+   // Original rectangle of cell cursor in twips
+   this._cellCursorTwips = new L.bounds(new L.point(0, 0), new 
L.point(0, 0));
+   // Rectangle for cell cursor
+   this._cellCursor = new L.LatLngBounds(new L.LatLng(0, 0), new 
L.LatLng(0, 0));
// Position and size of the selection start (as if there would 
be a cursor caret there).
 
this._lastValidPart = -1;
@@ -110,10 +114,21 @@ L.TileLayer = L.GridLayer.extend({
map.on('paste', this._onPaste, this);
map.on('zoomend', this._onUpdateCursor, this);
map.on('zoomend', this._onUpdatePartPageRectangles, this);
+   map.on('zoomend', this._onCellCursorShift, this);
map.on('dragstart', this._onDragStart, this);
map.on('requestloksession', this._onRequestLOKSession, this);
map.on('error', this._mapOnError, this);
map.on('resize', this._fitDocumentHorizontally, this);
+   // Retrieve the initial cell cursor position (as LOK only sends 
us an
+   // updated cell cursor when the selected cell is changed and 
not the initial
+   // cell).
+   map.on('statusindicator',
+  function (e) {
+if (e.statusType === 'alltilesloaded') {
+  this._onCellCursorShift(true);
+}
+  },
+  this);
for (var key in this._selectionHandles) {
this._selectionHandles[key].on('drag dragend', 
this._onSelectionHandleDrag, this);
}
@@ -204,6 +219,9 @@ L.TileLayer = L.GridLayer.extend({
else if (textMsg.startsWith('graphicselection:')) {
this._onGraphicSelectionMsg(textMsg);
}
+   else if (textMsg.startsWith('cellcursor:')) {
+   this._onCellCursorMsg(textMsg);
+   }
else if (textMsg.startsWith('hyperlinkclicked:')) {
this._onHyperlinkClickedMsg(textMsg);
}
@@ -264,7 +282,9 @@ L.TileLayer = L.GridLayer.extend({
 
_onCommandValuesMsg: function (textMsg) {
var obj = JSON.parse(textMsg.substring(textMsg.indexOf('{')));
-   if (this._map.unoToolbarCommands.indexOf(obj.c

[Libreoffice-commits] core.git: 5 commits - desktop/source include/LibreOfficeKit include/vcl libreofficekit/source sc/inc sc/source

2015-11-05 Thread Andrzej Hunt

 desktop/source/lib/init.cxx  |   54 +++
 include/LibreOfficeKit/LibreOfficeKitEnums.h |9 +
 include/vcl/ITiledRenderable.hxx |   12 ++
 libreofficekit/source/gtk/lokdocview.cxx |   30 ++
 sc/inc/docuno.hxx|6 +
 sc/source/ui/inc/gridwin.hxx |   19 
 sc/source/ui/unoobj/docuno.cxx   |   17 +++
 sc/source/ui/view/gridwin.cxx|  128 ---
 sc/source/ui/view/gridwin4.cxx   |6 -
 9 files changed, 244 insertions(+), 37 deletions(-)

New commits:
commit e7e0d46dba7b1016968a10bca23a4bf668ec
Author: Andrzej Hunt 
Date:   Thu Nov 5 10:31:06 2015 +0100

sc lok: update parameter syntax for .uno:CellCursor

This follows the syntax for .uno:ViewRowColumnHeaders
(which was implemented somewhat concurrentl with CellCursor)

Change-Id: I8ef03a969abc1716a0e95d95fb7043d75910c828

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index f45445c..aaa5492 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1274,7 +1274,7 @@ static char* doc_getCommandValues(LibreOfficeKitDocument* 
pThis, const char* pCo
 strcpy(pMemory, aString.getStr());
 return pMemory;
 }
-else if (aCommand.startsWith(aCellCursor)
+else if (aCommand.startsWith(aCellCursor))
 {
 ITiledRenderable* pDoc = getTiledRenderable(pThis);
 if (!pDoc)
@@ -1283,29 +1283,40 @@ static char* 
doc_getCommandValues(LibreOfficeKitDocument* pThis, const char* pCo
 return 0;
 }
 
-OString aString;
-OString aParams = 
aCommand.copy(OString(".uno:CellCursor:").getLength());
-
-sal_Int32 nIndex = 0;
-OString aOutputWidth = aParams.getToken(0,  ',',  nIndex);
-OString aOutputHeight = aParams.getToken(0,  ',',  nIndex);
-OString aTileWidth = aParams.getToken(0,  ',',  nIndex);
-OString aTileHeight = aParams.getToken(0,  ',',  nIndex);
-
-int nOutputWidth, nOutputHeight;
-long nTileWidth, nTileHeight;
-if (!(comphelper::string::getTokenCount(aParams, ',') == 4
-  && !aOutputWidth.isEmpty()
-  && (nOutputWidth = aOutputWidth.toInt32()) != 0
-  && !aOutputHeight.isEmpty()
-  && (nOutputHeight = aOutputHeight.toInt32()) != 0
-  && !aTileWidth.isEmpty()
-  && (nTileWidth = aTileWidth.toInt64()) != 0
-  && !aTileHeight.isEmpty()
-  && (nTileHeight = aTileHeight.toInt64()) != 0))
+// Command has parameters.
+int nOutputWidth = 0;
+int nOutputHeight = 0;
+long nTileWidth = 0;
+long nTileHeight = 0;
+if (aCommand.getLength() > aCellCursor.getLength())
 {
-gImpl->maLastExceptionMsg = "Can't parse arguments for 
.uno:CellCursor, no cursor returned";
-return NULL;
+OString aArguments = aCommand.copy(aCellCursor.getLength() + 1);
+sal_Int32 nParamIndex = 0;
+do
+{
+OString aParamToken = aArguments.getToken(0, '&', nParamIndex);
+sal_Int32 nIndex = 0;
+OString aKey;
+OString aValue;
+do
+{
+OString aToken = aParamToken.getToken(0, '=', nIndex);
+if (!aKey.getLength())
+aKey = aToken;
+else
+aValue = aToken;
+}
+while (nIndex >= 0);
+if (aKey == "outputWidth")
+nOutputWidth = aValue.toInt32();
+else if (aKey == "outputHeight")
+nOutputHeight = aValue.toInt32();
+else if (aKey == "tileWidth")
+nTileWidth = aValue.toInt64();
+else if (aKey == "tileHeight")
+nTileHeight = aValue.toInt64();
+}
+while (nParamIndex >= 0);
 }
 
 OString aString = pDoc->getCellCursor(nOutputWidth, nOutputHeight, 
nTileWidth, nTileHeight);
commit 2bcaffd12263e8f3c2a2fbf8ccc4b9bba2642146
Author: Andrzej Hunt 
Date:   Wed Nov 4 17:24:15 2015 +0100

sc lok: tdf#94605 introduce uno:CellCursor

This allows the client to rerequest the current cursor position,
which is necessary e.g. on zoom-level changes.

Conflicts:
desktop/source/lib/init.cxx
sc/inc/docuno.hxx

Change-Id: I10d81e220a56a36e2ec0c59005cd1d4f134857d5

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index bcc215b..f45445c 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -32,6 +32,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -1209,6 +1210,7 @@ static char* doc_getCommandValues(LibreOfficeKitDocument* 
pThis, const char* pCo

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sd/source

2015-11-05 Thread Armin Le Grand

 sd/source/ui/dlg/animobjs.cxx |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 6b3b080f8cedc1b496022b18e477af0c7361fba3
Author: Armin Le Grand 
Date:   Tue Nov 3 12:25:13 2015 +0100

tdf#95298: corrected some out-of-bound accesses to array

the index variable m_FrameList used to reference the current frame uses
the state EMTY_FRAMELIST to mark as invalid, which is the max integer
number. Thus all usages have to be secured to not use m_FrameList
if set to EMPTY_FRAMELIST. This was missing in some places.
the max integer
number. Thus all usages have to be secured to not use m_FrameList
if set to EMPTY_FRAMELIST. This was missing in some places.

Reviewed-on: https://gerrit.libreoffice.org/19753
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 

Cherry-picked from f0cef70cd4164342b218fbee34bf57eedc22c998

Change-Id: Ie1cf4ae2cb79d821f634ec78b621a2647abc61a8
Reviewed-on: https://gerrit.libreoffice.org/19787
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index 0b033f9..5c66014 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -430,7 +430,8 @@ IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, void *, 
pBtn )
 SdPage* pPage = pMyDoc->GetSdPage(0, PK_STANDARD);
 SdrObject*  pObject;
 
-if (pBtn == m_pBtnRemoveBitmap)
+// tdf#95298 check m_nCurrentFrame for EMPTY_FRAMELIST to avoid 
out-of-bound array access
+if (pBtn == m_pBtnRemoveBitmap && EMPTY_FRAMELIST  != m_nCurrentFrame)
 {
 delete m_FrameList[m_nCurrentFrame].first;
 delete m_FrameList[m_nCurrentFrame].second;
@@ -449,8 +450,8 @@ IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, void *, 
pBtn )
 
 if (m_nCurrentFrame >= m_FrameList.size())
 {
-assert(m_FrameList.empty());
-m_nCurrentFrame = EMPTY_FRAMELIST;
+// tdf#95298 last frame was deleted, try to use the one before it 
or go on empty state
+m_nCurrentFrame = m_FrameList.empty() ? EMPTY_FRAMELIST : 
m_FrameList.size() - 1;
 }
 }
 else // delete everything
@@ -539,7 +540,8 @@ IMPL_LINK_NOARG(AnimationWindow, ModifyTimeHdl)
 
 void AnimationWindow::UpdateControl(bool const bDisableCtrls)
 {
-if (!m_FrameList.empty())
+// tdf#95298 check m_nCurrentFrame for EMPTY_FRAMELIST to avoid 
out-of-bound array access
+if (!m_FrameList.empty() && EMPTY_FRAMELIST != m_nCurrentFrame)
 {
 BitmapEx aBmp(*m_FrameList[m_nCurrentFrame].first);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - bean/qa comphelper/qa connectivity/qa dbaccess/qa extensions/qa forms/qa framework/qa qadevOOo/tests wizards/com

2015-11-05 Thread Noel Grandin

 bean/qa/complex/bean/OOoBeanTest.java |3 -
 comphelper/qa/complex/comphelper/Map.java |4 -
 connectivity/qa/complex/connectivity/FlatFileAccess.java  |8 +-
 dbaccess/qa/complex/dbaccess/CopyTableWizard.java |2 
 extensions/qa/integration/extensions/ServicesHandler.java |2 
 forms/qa/complex/forms/CheckOGroupBoxModel.java   |2 
 framework/qa/complex/XUserInputInterception/EventTest.java|2 
 framework/qa/complex/framework/autosave/AutoSave.java |2 
 framework/qa/complex/imageManager/CheckImageManager.java  |2 
 framework/qa/complex/path_substitution/PathSubstitutionTest.java  |2 
 qadevOOo/tests/java/ifc/beans/_XHierarchicalPropertySet.java  |3 -
 qadevOOo/tests/java/ifc/beans/_XMultiHierarchicalPropertySet.java |3 -
 qadevOOo/tests/java/ifc/i18n/_XCalendar.java  |   21 
++-
 qadevOOo/tests/java/ifc/io/_XDataOutputStream.java|   30 
--
 qadevOOo/tests/java/ifc/sheet/_XCellRangeMovement.java|4 -
 qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java|4 -
 wizards/com/sun/star/wizards/report/ReportWizard.java |3 -
 17 files changed, 38 insertions(+), 59 deletions(-)

New commits:
commit eda52500c72c56149c10f2ef73474b4ac1ae0552
Author: Noel Grandin 
Date:   Thu Nov 5 13:36:36 2015 +0200

java:avoid empty if statements

Change-Id: I9c66dd5331f422d8d6271157fece2b346d8b3756

diff --git a/bean/qa/complex/bean/OOoBeanTest.java 
b/bean/qa/complex/bean/OOoBeanTest.java
index 22c5fb4..eebf372 100644
--- a/bean/qa/complex/bean/OOoBeanTest.java
+++ b/bean/qa/complex/bean/OOoBeanTest.java
@@ -541,9 +541,6 @@ public class OOoBeanTest
 break;
 }
 }
-else
-{
-}
 
 } finally {
 bean.stopOOoConnection();
diff --git a/qadevOOo/tests/java/ifc/beans/_XHierarchicalPropertySet.java 
b/qadevOOo/tests/java/ifc/beans/_XHierarchicalPropertySet.java
index dd19cf8..16ce506 100644
--- a/qadevOOo/tests/java/ifc/beans/_XHierarchicalPropertySet.java
+++ b/qadevOOo/tests/java/ifc/beans/_XHierarchicalPropertySet.java
@@ -33,8 +33,7 @@ public class _XHierarchicalPropertySet extends 
MultiMethodTest {
 XHierarchicalPropertySetInfo hpsi = 
oObj.getHierarchicalPropertySetInfo();
 boolean res = true;
 
-if (hpsi != null) {
-} else {
+if (hpsi == null) {
 log.println(
 "The component doesn't provide 
HierarchicalPropertySetInfo");
 tRes.tested("getHierarchicalPropertySetInfo()",
diff --git a/qadevOOo/tests/java/ifc/beans/_XMultiHierarchicalPropertySet.java 
b/qadevOOo/tests/java/ifc/beans/_XMultiHierarchicalPropertySet.java
index 9bcc343..10b1c8c 100644
--- a/qadevOOo/tests/java/ifc/beans/_XMultiHierarchicalPropertySet.java
+++ b/qadevOOo/tests/java/ifc/beans/_XMultiHierarchicalPropertySet.java
@@ -33,8 +33,7 @@ public class _XMultiHierarchicalPropertySet extends 
MultiMethodTest {
 XHierarchicalPropertySetInfo hpsi = 
oObj.getHierarchicalPropertySetInfo();
 boolean res = true;
 
-if (hpsi != null) {
-} else {
+if (hpsi == null) {
 log.println(
 "The component doesn't provide 
HierarchicalPropertySetInfo");
 tRes.tested("getHierarchicalPropertySetInfo()",
diff --git a/qadevOOo/tests/java/ifc/i18n/_XCalendar.java 
b/qadevOOo/tests/java/ifc/i18n/_XCalendar.java
index 46a0b15..102bf7f 100644
--- a/qadevOOo/tests/java/ifc/i18n/_XCalendar.java
+++ b/qadevOOo/tests/java/ifc/i18n/_XCalendar.java
@@ -111,8 +111,7 @@ public class _XCalendar extends MultiMethodTest {
   ", Country: "+ installed_locales[i].Country +
   ", Variant: "+ installed_locales[i].Country;
 oObj.loadDefaultCalendar(installed_locales[i]);
-if (oObj.getLoadedCalendar().Default) {
-} else {
+if (!oObj.getLoadedCalendar().Default) {
 log.println(lang + " ... FAILED");
 }
 res &= oObj.getLoadedCalendar().Default;
@@ -135,8 +134,7 @@ public class _XCalendar extends MultiMethodTest {
   ", Variant: "+ installed_locales[i].Country;
 calendars[i] = oObj.getAllCalendars(installed_locales[i]);
 count[i] = calendars[i].length-1;
-if (calendars[i].length > 0) {
-} else {
+if (calendars[i].length <= 0) {
 log.println(lang + " ... FAILED");
 }
 res &= (calendars[i].length > 0);
@@ -163,8 +161,7 @@ public class _XCalendar extends MultiMethodTest {
   ", Country: "+ installed_locales[i].Country +
   ", Variant: "+ insta

[Libreoffice-commits] core.git: 2 commits - vcl/osx vcl/source vcl/unx vcl/workben winaccessibility/source writerfilter/qa writerfilter/source xmlhelp/source xmloff/source xmlsecurity/source xmlsecuri

2015-11-05 Thread Noel Grandin

 vcl/osx/DragSource.cxx  |4 -
 vcl/osx/DropTarget.cxx  |4 -
 vcl/osx/a11ycomponentwrapper.mm |2 
 vcl/osx/a11ywrapper.mm  |   24 
 vcl/osx/service_entry.cxx   |2 
 vcl/source/filter/FilterConfigItem.cxx  |2 
 vcl/source/gdi/print.cxx|2 
 vcl/source/opengl/OpenGLHelper.cxx  |2 
 vcl/unx/gtk/gdi/salprn-gtk.cxx  |   14 ++--
 vcl/unx/gtk/window/gtksalframe.cxx  |2 
 vcl/workben/mtfdemo.cxx |3 -
 vcl/workben/vcldemo.cxx |3 -
 winaccessibility/source/service/AccObject.cxx   |4 -
 writerfilter/qa/cppunittests/rtftok/testrtftok.cxx  |2 
 writerfilter/source/dmapper/DomainMapper_Impl.cxx   |   26 +++--
 writerfilter/source/dmapper/FormControlHelper.cxx   |6 +-
 writerfilter/source/dmapper/GraphicImport.cxx   |2 
 writerfilter/source/dmapper/PropertyMap.cxx |   24 +++-
 writerfilter/source/dmapper/StyleSheetTable.cxx |8 +-
 xmlhelp/source/cxxhelp/provider/databases.cxx   |8 +-
 xmlhelp/source/cxxhelp/provider/provider.hxx|5 -
 xmlhelp/source/cxxhelp/provider/resultset.cxx   |4 -
 xmlhelp/source/cxxhelp/provider/resultsetbase.cxx   |3 -
 xmlhelp/source/treeview/tvfactory.cxx   |6 --
 xmlhelp/source/treeview/tvread.cxx  |2 
 xmloff/source/chart/SchXMLAxisContext.cxx   |4 -
 xmloff/source/chart/SchXMLChartContext.cxx  |2 
 xmloff/source/chart/SchXMLExport.cxx|4 -
 xmloff/source/chart/SchXMLSeries2Context.cxx|2 
 xmloff/source/chart/SchXMLSeriesHelper.cxx  |6 --
 xmloff/source/chart/SchXMLTools.cxx |3 -
 xmloff/source/core/XMLEmbeddedObjectImportContext.cxx   |2 
 xmloff/source/core/xmlexp.cxx   |   14 ++--
 xmloff/source/core/xmlimp.cxx   |   34 +---
 xmloff/source/core/xmluconv.cxx |2 
 xmloff/source/draw/animationimport.cxx  |4 -
 xmloff/source/draw/animimp.cxx  |2 
 xmloff/source/draw/layerimp.cxx |2 
 xmloff/source/draw/ximp3dscene.cxx  |2 
 xmloff/source/draw/ximpgrp.cxx  |2 
 xmloff/source/draw/ximppage.cxx |5 -
 xmloff/source/draw/ximpshap.cxx |   16 ++---
 xmloff/source/draw/ximpshow.cxx |6 +-
 xmloff/source/forms/elementimport.cxx   |4 -
 xmloff/source/forms/elementimport_impl.hxx  |2 
 xmloff/source/forms/layerexport.cxx |2 
 xmloff/source/meta/MetaExportComponent.cxx  |2 
 xmloff/source/meta/MetaImportComponent.cxx  |2 
 xmloff/source/meta/xmlversion.cxx   |2 
 xmloff/source/style/prstylei.cxx|2 
 xmloff/source/style/styleexp.cxx|4 -
 xmloff/source/style/xmlnumi.cxx |2 
 xmloff/source/text/XMLTextFrameContext.cxx  |2 
 xmloff/source/text/XMLTextMasterPageContext.cxx |2 
 xmloff/source/text/txtflde.cxx  |2 
 xmloff/source/text/txtimp.cxx   |7 +-
 xmloff/source/transform/OOo2Oasis.cxx   |2 
 xmlsecurity/source/component/documentdigitalsignatures.cxx  |4 -
 xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx  |2 
 xmlsecurity/source/framework/saxeventkeeperimpl.cxx |6 --
 xmlsecurity/source/helper/xsecctl.cxx   |6 +-
 xmlsecurity/source/helper/xsecsign.cxx  |2 
 xmlsecurity/source/helper/xsecverify.cxx|2 
 xmlsecurity/source/xmlsec/mscrypt/xsec_mscrypt.cxx  |2 
 xmlsecurity/source/xmlsec/nss/nssinitializer.cxx|3 -
 xmlsecurity/source/xmlsec/nss/xsec_nss.cxx  |4 -
 xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx |2 
 xmlsecurity/workben/signaturetest.cxx   |2 
 68 files changed, 162 insertions(+), 186 deletions(-)

New commits:
commit 9e8ff13eb2405f7e3dcb4f90cb38e9e4b1da2bd5
Author: Noel Grandin 
Date:   Thu Nov 5 13:26:24 2015 +0200

use uno::Reference::set method instead

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - wizards/com

2015-11-05 Thread Lionel Elie Mamane

 wizards/com/sun/star/wizards/db/SQLQueryComposer.java |   26 +++---
 wizards/com/sun/star/wizards/ui/FilterComponent.java  |4 +-
 2 files changed, 24 insertions(+), 6 deletions(-)

New commits:
commit c7a520868ecf6d5de48dc3964a7bccab3fa480c3
Author: Lionel Elie Mamane 
Date:   Wed Oct 28 17:41:44 2015 +0100

base new query wizard: fix confusion between display name and field name

Change-Id: I75354ffea2daede55b34e4cf3321d57196be3d9b
Reviewed-on: https://gerrit.libreoffice.org/19652
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java 
b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
index 0a30846..c9c9400 100644
--- a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
+++ b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
@@ -77,7 +77,7 @@ public class SQLQueryComposer
 int iAggregate = 
CurDBMetaData.getAggregateIndex(CurDBMetaData.FieldColumns[i].getDisplayFieldName());
 if (iAggregate > -1)
 {
-sSelectClause += 
CurDBMetaData.AggregateFieldNames[iAggregate][1] + "(" + 
getComposedAliasFieldName(CurDBMetaData.AggregateFieldNames[iAggregate][0]) + 
")";
+sSelectClause += 
CurDBMetaData.AggregateFieldNames[iAggregate][1] + "(" + 
getComposedAliasDisplayName(CurDBMetaData.AggregateFieldNames[iAggregate][0]) + 
")";
 if (_baddAliasFieldNames)
 {
 sSelectClause += 
getAliasFieldNameClause(CurDBMetaData.AggregateFieldNames[iAggregate][0]);
@@ -85,7 +85,7 @@ public class SQLQueryComposer
 }
 else
 {
-sSelectClause += 
getComposedAliasFieldName(CurDBMetaData.FieldColumns[i].getDisplayFieldName());
+sSelectClause += 
getComposedAliasDisplayName(CurDBMetaData.FieldColumns[i].getDisplayFieldName());
 if (_baddAliasFieldNames)
 {
 sSelectClause += 
getAliasFieldNameClause(CurDBMetaData.FieldColumns[i].getDisplayFieldName());
@@ -182,7 +182,7 @@ public class SQLQueryComposer
 {
 sOrder += ", ";
 }
-sOrder += CurDBMetaData.AggregateFieldNames[iAggregate][1] + 
"(" + 
getComposedAliasFieldName(CurDBMetaData.AggregateFieldNames[iAggregate][0]) + 
")";
+sOrder += CurDBMetaData.AggregateFieldNames[iAggregate][1] + 
"(" + 
getComposedAliasDisplayName(CurDBMetaData.AggregateFieldNames[iAggregate][0]) + 
")";
 sOrder += " " + CurDBMetaData.getSortFieldNames()[i][1];
 m_queryComposer.setOrder(sOrder);
 }
@@ -311,7 +311,7 @@ public class SQLQueryComposer
 }
 }
 
-private String getComposedAliasFieldName(String _fieldname)
+private String getComposedAliasDisplayName(String _fieldname)
 {
 FieldColumn CurFieldColumn = 
CurDBMetaData.getFieldColumnByDisplayName(_fieldname);
 final String curCommandName = CurFieldColumn.getCommandName();
@@ -329,6 +329,24 @@ public class SQLQueryComposer
 return quoteName(curAliasName) + "." + quoteName(curFieldName);
 }
 
+private String getComposedAliasFieldName(String _fieldname)
+{
+FieldColumn CurFieldColumn = 
CurDBMetaData.getFieldColumnByFieldName(_fieldname);
+final String curCommandName = CurFieldColumn.getCommandName();
+final String curFieldName = CurFieldColumn.getFieldName();
+CommandName curComposedCommandName = 
getComposedCommandByDisplayName(curCommandName);
+if (curComposedCommandName == null)
+{
+//return _fieldname;
+if ( curCommandName.length() > 0 )
+return quoteName(curCommandName) + "." + 
quoteName(curFieldName);
+else
+return quoteName(curFieldName);
+}
+String curAliasName = curComposedCommandName.getAliasName();
+return quoteName(curAliasName) + "." + quoteName(curFieldName);
+}
+
 private CommandName getComposedCommandByAliasName(String _AliasName)
 {
 if (composedCommandNames != null)
diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java 
b/wizards/com/sun/star/wizards/ui/FilterComponent.java
index 186dcc4..19f7efd 100644
--- a/wizards/com/sun/star/wizards/ui/FilterComponent.java
+++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java
@@ -119,7 +119,7 @@ public class FilterComponent
 String sControlNameSuffix = sIncSuffix + "_" + 
getIndexNumber(sControlName);
 XListBox xCurFieldListBox = 
UnoRuntime.queryInterface(XListBox.class, 
CurUnoDialog.xDlgContainer.getControl(sControlName));
 String CurDisplayFieldName = 
xCurFieldListBox.getSelectedItem();
-FieldColumn CurFieldColumn = new 
FieldColumn(oQueryMet

Re: Two svg import filters

2015-11-05 Thread Armin Le Grand


Hi,

Am 05.11.2015 um 10:30 schrieb Xisco Faulí:

Hi all,

Recently I've been working on some fixes for filter/source/svg/* and 
my intention would be to spend some more time to fix other issues in 
this filter as there's plenty of room for improvements. However, I'd 
like to know if a decision is going to be make wrt this topic before I 
do other fixes as I wouldn't like to work on something that, 
eventually, is going to be drop.
From my point of view, I find svgio to support more svg elements and 
atributtes than svg filter but, as mentioned before, they do different 
things, svgio imports the file as svg and the filter as a draw 
document so it can be edited afterwards, so either we drop one or the 
other we are going to lose some already implemented features. On the 
other hand, it's also a pain to have 2 filters that do more or less 
the same.


SVG added as GraphicObject using svgio can also be edited - that's why 
there is a 'break' command in the context menu for this objects. Not 
sure if this command is available in all Apps from the UI perspective 
(the core can always break SVGs), but you may try in draw/impress. 
Breaking creates all SdrObjects needed to represent the SVG.


With regards to the missing support in svg filter, I don't think it 
wouldn't be to difficult to improve it, as other filters already 
implement similar features, so they can be taken as a guidance.


Regards

* 
https://gerrit.libreoffice.org/#/q/owner:%22Xisco+Faul%25C3%25AD+Tarazona+%253Canistenis%2540gmail.com%253E%22



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


--
ALG (PGP Key: EE1C 4B3F E751 D8BC C485 DEC1 3C59 F953 D81C F4A2)

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

[Libreoffice-commits] core.git: Branch 'feature/fixes11' - sc/source

2015-11-05 Thread Tomaž Vajngerl

 sc/source/core/inc/arraysumfunctor.hxx |   13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit b35c38c6e44b0df0fc2c5a3983ecd7547b964691
Author: TomaÅ¾ Vajngerl 
Date:   Thu Nov 5 12:14:06 2015 +0100

invalid array index when pCurrent pointer is incremented

If pCurrent is incremented (when the input double array is not
alligned) we can't use i as the array index anymore as it refers
correctly to elements in input double array only. Changing back
to pointer arithmetic.

Change-Id: Id498a4182d28cae067195853e96f7169063853e2

diff --git a/sc/source/core/inc/arraysumfunctor.hxx 
b/sc/source/core/inc/arraysumfunctor.hxx
index fc1b915..776c514 100644
--- a/sc/source/core/inc/arraysumfunctor.hxx
+++ b/sc/source/core/inc/arraysumfunctor.hxx
@@ -39,7 +39,6 @@ public:
 double operator() ()
 {
 static bool hasSSE2 = tools::cpuid::hasSSE2();
-printf("SSE used %d\n", hasSSE2);
 
 double fSum = 0.0;
 size_t i = 0;
@@ -81,17 +80,21 @@ private:
 
 for (; i < nUnrolledSize; i += 8)
 {
-__m128d load1 = _mm_load_pd(&pCurrent[i]);
+__m128d load1 = _mm_load_pd(pCurrent);
 sum1 = _mm_add_pd(sum1, load1);
+pCurrent += 2;
 
-__m128d load2 = _mm_load_pd(&pCurrent[i + 2]);
+__m128d load2 = _mm_load_pd(pCurrent);
 sum2 = _mm_add_pd(sum2, load2);
+pCurrent += 2;
 
-__m128d load3 = _mm_load_pd(&pCurrent[i + 4]);
+__m128d load3 = _mm_load_pd(pCurrent);
 sum3 = _mm_add_pd(sum3, load3);
+pCurrent += 2;
 
-__m128d load4 = _mm_load_pd(&pCurrent[i + 6]);
+__m128d load4 = _mm_load_pd(pCurrent);
 sum4 = _mm_add_pd(sum4, load4);
+pCurrent += 2;
 }
 sum1 = _mm_add_pd(_mm_add_pd(sum1, sum2), _mm_add_pd(sum3, sum4));
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/LOOLSession.cpp

2015-11-05 Thread Jan Holesovsky

 loolwsd/LOOLSession.cpp |5 +
 1 file changed, 5 insertions(+)

New commits:
commit c6743b4d644bce8df95ac1e1f4bb9e0fd28f89db
Author: Jan Holesovsky 
Date:   Thu Nov 5 12:15:54 2015 +0100

loolwsd: Remove the potential leftover document before attempting to link.

Otherwise we create a copy, and at the moment, the copy is not copied back 
out
of the chroot jail; we should bind that to the .uno:Save callback...

diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index 36b6a92..32b4b9f 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -627,6 +627,11 @@ void MasterProcessSession::dispatchChild()
 
 }
 
+// cleanup potential leftovers from the last time
+File aToCleanup(aDstFile);
+if (aToCleanup.exists())
+aToCleanup.remove();
+
 #ifdef __linux
 Application::instance().logger().information(Util::logPrefix() + 
"Linking " + aSrcFile.toString() + " to " + aDstFile.toString());
 if (link(aSrcFile.toString().c_str(), aDstFile.toString().c_str()) == 
-1)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 36946] Slide transitions in Impress should be sorted in meaningful categories (Usability improvement)

2015-11-05 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=36946

Katarina Behrens (CIB)  changed:

   What|Removed |Added

 Whiteboard|needsDevEval topicUI|

--- Comment #18 from Katarina Behrens (CIB)  ---
No easy hack at all

-- 
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 - qadevOOo/runner qadevOOo/tests

2015-11-05 Thread Caolán McNamara

 qadevOOo/runner/helper/APIDescGetter.java   |2 
 qadevOOo/tests/java/ifc/awt/_XCurrencyField.java|   39 +---
 qadevOOo/tests/java/ifc/awt/_XNumericField.java |   32 +++--
 qadevOOo/tests/java/ifc/chart/_XChartDataArray.java |4 +
 qadevOOo/tests/java/ifc/style/_CharacterProperties.java |1 
 5 files changed, 45 insertions(+), 33 deletions(-)

New commits:
commit 75da22e3ce80f8dcdeef0488b22c4dc522c2ec29
Author: CaolÃ¡n McNamara 
Date:   Thu Nov 5 09:45:18 2015 +

coverity#1326925 silence Suspicious use of non-short-circuit boolean 
operator

Change-Id: I4d71640baa3c169fba069ca1328273fb78964541

diff --git a/qadevOOo/tests/java/ifc/chart/_XChartDataArray.java 
b/qadevOOo/tests/java/ifc/chart/_XChartDataArray.java
index 14ead16..cd84569 100644
--- a/qadevOOo/tests/java/ifc/chart/_XChartDataArray.java
+++ b/qadevOOo/tests/java/ifc/chart/_XChartDataArray.java
@@ -218,7 +218,9 @@ public class _XChartDataArray extends MultiMethodTest {
 bResult = false;
 for (int i = 0; i < data.length; i++) {
 for (int j = 0; j < data[i].length; j++) {
-bResult &= data[i][j] == _data[i][j];
+if (data[i][j] != _data[i][j]) {
+bResult = false;
+}
 }
 }
 
commit c5cb780bda98ed6979268b0e436d977c4db01216
Author: CaolÃ¡n McNamara 
Date:   Thu Nov 5 09:40:27 2015 +

coverity#1326578 Useless call

Change-Id: Ib6f7463d97e9c835b2c9d64fa498efd546360645

diff --git a/qadevOOo/tests/java/ifc/style/_CharacterProperties.java 
b/qadevOOo/tests/java/ifc/style/_CharacterProperties.java
index c1c651c..db07327 100644
--- a/qadevOOo/tests/java/ifc/style/_CharacterProperties.java
+++ b/qadevOOo/tests/java/ifc/style/_CharacterProperties.java
@@ -256,7 +256,6 @@ public class _CharacterProperties extends MultiPropertyTest 
{
 changeProp((XPropertySet) oPara,
 (XPropertySet) oPort,"RubyAdjust", aShort);
 }
-Short.valueOf((short) 1);
 }
 
 /**
commit f1fbda5bf7cecd7f1b5605137b0a60c22f600e37
Author: CaolÃ¡n McNamara 
Date:   Thu Nov 5 09:39:02 2015 +

coverity#1326577 Useless call

Change-Id: I3f9742cafdcdce3302c925a2227da1f7839c80c3

diff --git a/qadevOOo/runner/helper/APIDescGetter.java 
b/qadevOOo/runner/helper/APIDescGetter.java
index 55a2698..19fdaac 100644
--- a/qadevOOo/runner/helper/APIDescGetter.java
+++ b/qadevOOo/runner/helper/APIDescGetter.java
@@ -298,7 +298,7 @@ public class APIDescGetter extends DescGetter
 }
 if (aToken.hasMoreTokens())
 {
-StringHelper.removeQuoteIfExists(aToken.nextToken());
+aToken.nextToken();
 }
 if (aToken.hasMoreTokens())
 {
commit addec679db06203eb4cea71d8f98d38fec9f772c
Author: CaolÃ¡n McNamara 
Date:   Thu Nov 5 09:22:51 2015 +

coverity#1326879 FE: Test for floating point equality

and

coverity#1326880 FE: Test for floating point equality
coverity#1326881 FE: Test for floating point equality
coverity#1326882 FE: Test for floating point equality
coverity#1326883 FE: Test for floating point equality
coverity#1326884 FE: Test for floating point equality
coverity#1326885 FE: Test for floating point equality
coverity#1326886 FE: Test for floating point equality
coverity#1326887 FE: Test for floating point equality
coverity#1326888 FE: Test for floating point equality

Change-Id: I04a00035d541ea7a253a37d2a87c4dc407228346

diff --git a/qadevOOo/tests/java/ifc/awt/_XCurrencyField.java 
b/qadevOOo/tests/java/ifc/awt/_XCurrencyField.java
index 3b03b86..beb7488 100644
--- a/qadevOOo/tests/java/ifc/awt/_XCurrencyField.java
+++ b/qadevOOo/tests/java/ifc/awt/_XCurrencyField.java
@@ -21,6 +21,7 @@ package ifc.awt;
 import lib.MultiMethodTest;
 
 import com.sun.star.awt.XCurrencyField;
+import util.utils;
 
 /**
 * Testing com.sun.star.awt.XCurrencyField
@@ -69,9 +70,12 @@ public class _XCurrencyField extends MultiMethodTest {
 public void _setValue() {
 requiredMethod("getValue()");
 
-oObj.setValue(val + 1.1);
+double value = val + 1.1;
+oObj.setValue(value);
+double ret = oObj.getValue();
+boolean result = utils.approxEqual(ret, value);
 
-tRes.tested("setValue()", oObj.getValue() == val + 1.1);
+tRes.tested("setValue()", result);
 }
 
 /**
@@ -95,9 +99,12 @@ public class _XCurrencyField extends MultiMethodTest {
 public void _setMin() {
 requiredMethod("getMin()");
 
-oObj.setMin(min + 1.1);
+double value = min + 1.1;
+oObj.setMin(value);
+double ret = oObj.getMin();
+boolean result = utils.approxEqual(ret, value);
 
-tRes.tested("setMin()", oObj.getMin() == min + 1.1);
+tRes.tested("setMin()", result);

Re: TheServiceDocumenter: extension to core ...

2015-11-05 Thread Miklos Vajna

Hi,

On Thu, Nov 05, 2015 at 11:07:30AM +0100, Bjoern Michaelsen 
 wrote:
> Yeah. :/ But updating docs.libreoffice.org manually from multiple source and
> builds is inefficient and timewasting.

Agreed. If it's possible to automate that, that would be great. Don't
get me wrong, I see the value of your plugin, but the overhead would be
enough that it bothers even me to do it manually from time to time. :-)

Miklos

signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: ucbhelper/source unodevtools/source unotest/source unotools/source unoxml/source uui/source

2015-11-05 Thread Noel Grandin

 ucbhelper/source/client/content.cxx  |3 --
 ucbhelper/source/client/proxydecider.cxx |3 --
 ucbhelper/source/provider/registerucb.cxx|2 -
 unodevtools/source/skeletonmaker/cppcompskeleton.cxx |6 +---
 unotest/source/cpp/bootstrapfixturebase.cxx  |2 -
 unotest/source/cpp/macros_test.cxx   |2 -
 unotools/source/config/configitem.cxx|   28 +--
 unotools/source/config/confignode.cxx|8 ++---
 unotools/source/config/historyoptions.cxx|   22 +++---
 unotools/source/config/lingucfg.cxx  |2 -
 unotools/source/config/moduleoptions.cxx |4 +-
 unotools/source/config/useroptions.cxx   |4 +-
 unotools/source/config/viewoptions.cxx   |5 +--
 unotools/source/ucbhelper/ucblockbytes.cxx   |   18 +---
 unoxml/source/dom/attributesmap.cxx  |   13 +++-
 unoxml/source/dom/saxbuilder.cxx |4 --
 unoxml/source/service/services.cxx   |6 ++--
 uui/source/passwordcontainer.cxx |4 --
 uui/source/unknownauthdlg.cxx|6 +---
 19 files changed, 63 insertions(+), 79 deletions(-)

New commits:
commit 94268513eeded3952972d7efe0a9bc689605421b
Author: Noel Grandin 
Date:   Thu Nov 5 12:42:10 2015 +0200

use uno::Reference::set method instead of assignment

Change-Id: Id57ccff7ea6cf5c7053b51268b1190f5459bb357

diff --git a/ucbhelper/source/client/content.cxx 
b/ucbhelper/source/client/content.cxx
index a384a5e..54363ef 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.cxx
@@ -1298,8 +1298,7 @@ Reference< XCommandProcessor > 
Content_Impl::getCommandProcessor()
 osl::MutexGuard aGuard( m_aMutex );
 
 if ( !m_xCommandProcessor.is() )
-m_xCommandProcessor
-= Reference< XCommandProcessor >( getContent(), UNO_QUERY );
+m_xCommandProcessor.set( getContent(), UNO_QUERY );
 }
 
 return m_xCommandProcessor;
diff --git a/ucbhelper/source/client/proxydecider.cxx 
b/ucbhelper/source/client/proxydecider.cxx
index 49fa8ed..b51e889 100644
--- a/ucbhelper/source/client/proxydecider.cxx
+++ b/ucbhelper/source/client/proxydecider.cxx
@@ -369,8 +369,7 @@ InternetProxyDecider_Impl::InternetProxyDecider_Impl(
 
 // Register as listener for config changes.
 
-m_xNotifier = uno::Reference< util::XChangesNotifier >(
-xInterface, uno::UNO_QUERY );
+m_xNotifier.set( xInterface, uno::UNO_QUERY );
 
 OSL_ENSURE( m_xNotifier.is(),
 "InternetProxyDecider - No notifier!" );
diff --git a/ucbhelper/source/provider/registerucb.cxx 
b/ucbhelper/source/provider/registerucb.cxx
index 5016155..d13a729 100644
--- a/ucbhelper/source/provider/registerucb.cxx
+++ b/ucbhelper/source/provider/registerucb.cxx
@@ -80,7 +80,7 @@ registerAtUcb(
 if (!xProvider.is())
 try
 {
-xProvider = uno::Reference< ucb::XContentProvider >(
+xProvider.set(
 
rxContext->getServiceManager()->createInstanceWithContext(rName, rxContext),
 uno::UNO_QUERY);
 }
diff --git a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx 
b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
index f9137b0..488440e 100644
--- a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
+++ b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
@@ -538,8 +538,7 @@ void generateAddinConstructorAndHelper(std::ostream& o,
 "css::uno::Reference< css::uno::XInterface > xIface =\n"
 "xProvider->createInstanceWithArguments(sReadOnlyView, 
"
 "aArguments);\n\n"
-" m_xHAccess = css::uno::Reference<\n"
-"css::container::XHierarchicalNameAccess >(xIface, 
css::uno::UNO_QUERY);"
+" m_xHAccess.set(xIface, css::uno::UNO_QUERY);"
 "\n\n";
 
 o << "// extend arguments to create a view for all locales to 
get "
@@ -551,8 +550,7 @@ void generateAddinConstructorAndHelper(std::ostream& o,
 "// create view for all locales\n"
 "xIface = 
xProvider->createInstanceWithArguments(sReadOnlyView, "
 "aArguments);\n\n"
-"m_xCompAccess = css::uno::Reference<\n"
-"css::container::XHierarchicalNameAccess >(xIface, 
css::uno::UNO_QUERY);\n";
+"m_xCompAccess.set(xIface, css::uno::UNO_QUERY);\n";
 
 o << "}\ncatch ( css::uno::Exception & ) {\n}\n}\n\n";
 
diff --git a/unotest/source/cpp/bootstrapfixturebase.cxx 
b/unotest/source/cpp/bootstrapfixturebase.cxx
index e04c00f..af340d6 100644
---

Re: 250 USD offer on FreedomSponsor to fix tdf#33082

2015-11-05 Thread Tommy


Michael Meeks wrote:

Hi Tommy,

On Thu, 2015-11-05 at 06:07 +0100, Tommy wrote:

I want to inform the developer community that an user offered 250
dollars to fix:
Bug 33082 - Multiple operations are not tracked as change in change control
https://bugs.documentfoundation.org/show_bug.cgi?id=33082


Hmm. So - just as a hyper-optimistic estimation - implementing change
tracking for tables, including the file-format support (there is none in
ODF as such) and so on is the order of a six man month type job: unit
tests, filter work, core data structure pieces etc.


I'm not a programmer so I had no idea how much effort was needed.
thanks for the info.


It is good to have people supporting and offering money for the work -
but 6 man months is 8*5*4*6 hours -> 960 hours. No idea what you think a
programmer should earn but $0.26/hr rate is below most estimations ;-)


not a good salary indeed
even those who built the pyramids were paid better :-)

anyway as that user said, anyone is free to add a few bucks to the 
funding campaign




Having said that - it is clear that this is an important missing
feature. In general it would be good to split it into many bugs - some
of the features are smaller and less problematic.

HTH !

Michael.



bye, Tommy

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

[Libreoffice-commits] core.git: filter/source include/xmloff xmloff/source

2015-11-05 Thread Xisco Fauli

 filter/source/svg/svgreader.cxx |   31 +++
 include/xmloff/xmltoken.hxx |6 +++---
 xmloff/source/core/xmltoken.cxx |6 +++---
 3 files changed, 21 insertions(+), 22 deletions(-)

New commits:
commit c89ba1dedc511ec17df1e35f8e0696bc20121491
Author: Xisco Fauli 
Date:   Mon Nov 2 00:46:29 2015 +0100

tdf#95510: SVG: Import stop-color and stop-opacity

Change-Id: Ie073ff3e92c9344a78badfeefa0afed2c2b76fb8
Reviewed-on: https://gerrit.libreoffice.org/19731
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 

diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index b4d84e6..ce94e0f 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -816,6 +816,21 @@ struct AnnotatingVisitor
 case XML_ID:
 maStopIdMap.insert(std::make_pair(sValue,nStopNumber));
 break;
+case XML_STOP_COLOR:
+if( maGradientVector.empty() ||
+maGradientVector.back().maStops.empty() )
+break;
+parseColor( sValue.toUtf8().getStr(), maGradientStopVector[
+  
maGradientVector.back().maStops.back()].maStopColor );
+break;
+case XML_STOP_OPACITY:
+if( maGradientVector.empty() ||
+maGradientVector.back().maStops.empty() )
+break;
+parseOpacity( sValue.toUtf8().getStr(),
+  maGradientStopVector[
+  
maGradientVector.back().maStops.back()].maStopColor );
+break;
 case XML_OFFSET:
 io_rGradientStop.mnStopPosition = sValue.toDouble();
 break;
@@ -1022,22 +1037,6 @@ struct AnnotatingVisitor
 case XML_TEXT_ANCHOR:
 parseTextAlign(maCurrState,aValueUtf8.getStr());
 break;
-case XML_STOP_COLOR:
-if( maGradientVector.empty() ||
-maGradientVector.back().maStops.empty() )
-break;
-parseColor( aValueUtf8.getStr(),
-maGradientStopVector[
-
maGradientVector.back().maStops.back()].maStopColor );
-break;
-case XML_STOP_OPACITY:
-if( maGradientVector.empty() ||
-maGradientVector.back().maStops.empty() )
-break;
-parseOpacity( aValueUtf8.getStr(),
-  maGradientStopVector[
-  
maGradientVector.back().maStops.back()].maStopColor );
-break;
 case XML_TOKEN_INVALID:
 SAL_INFO("svg", "unhandled token");
 break;
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 29af403..89596b0 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -1117,6 +1117,7 @@ namespace xmloff { namespace token {
 XML_LINE_SPACING,
 XML_LINE_STYLE,
 XML_LINEAR,
+XML_LINEARGRADIENT,
 XML_LINENUMBERING_CONFIGURATION,
 XML_LINENUMBERING_SEPARATOR,
 XML_LINES,
@@ -1740,8 +1741,8 @@ namespace xmloff { namespace token {
 XML_STOCK_UPDOWN_BARS,
 XML_STOCK_WITH_VOLUME,
 XML_STOP,
-XML_STOPCOLOR,
-XML_STOPOPACITY,
+XML_STOP_COLOR,
+XML_STOP_OPACITY,
 XML_STRETCH,
 XML_STRETCH_FROM_BOTTOM,
 XML_STRETCH_FROM_LEFT,
@@ -1776,7 +1777,6 @@ namespace xmloff { namespace token {
 XML_SUB_VIEW_SIZE,
 XML_SUFFIX,
 XML_SUM,
-XML_SVGLINEARGRADIENT,
 XML_SWISS,
 XML_SYMBOL,
 XML_SYMBOL_HEIGHT,
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 0d4ed2d..97809c6 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -1122,6 +1122,7 @@ namespace xmloff { namespace token {
 TOKEN( "line-spacing",XML_LINE_SPACING ),
 TOKEN( "line-style",  XML_LINE_STYLE ),
 TOKEN( "linear",  XML_LINEAR ),
+TOKEN( "linearGradient",  XML_LINEARGRADIENT ),
 TOKEN( "linenumbering-configuration", 
XML_LINENUMBERING_CONFIGURATION ),
 TOKEN( "linenumbering-separator", XML_LINENUMBERING_SEPARATOR 
),
 TOKEN( "lines",   XML_LINES ),
@@ -1745,8 +1746,8 @@ namespace xmloff { namespace token {
 TOKEN( "stock-updown-bars",   XML_STOCK_UPDOWN_BARS ),
 TOKEN( "stock-with-volume",   XML_STOCK_WITH_VOLUME ),
 TOKEN( "stop",XML_STOP ),
-TOKEN( "stop-color",  XML_STOPCOLOR ),
-TOKEN( "stop-opa

Re: TheServiceDocumenter: extension to core ...

2015-11-05 Thread Bjoern Michaelsen

Hi,

On Thu, Nov 05, 2015 at 09:37:26AM +0100, Miklos Vajna wrote:
> 1) If this would be a subdir of docs.l.o, then if you propose a name for
> it, I can make sure I leave it alone when I update the rest of the site.

Yeah. :/ But updating docs.libreoffice.org manually from multiple source and
builds is inefficient and timewasting.

> 2) If TDF can provide a build machine that is able to do 'make && make
> docs' with clang ~one in a month and has no problem with eating that
> upload bandwith, then that could be an option.)

I would love that, esp. if we get that machine to do this triggered by a
cronjob/Jenkins job/whatever, see:

 https://redmine.documentfoundation.org/issues/1422

for a TDF-infra-provided machine that we might use for that. IIRC Norbert had
some concerns about that though (though I see nothing in the ticket right now).

Best,

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

[Libreoffice-commits] core.git: compilerplugins/clang editeng/source include/svx sc/inc sc/source sd/source svx/Library_svxcore.mk svx/source sw/inc sw/source

2015-11-05 Thread Noel Grandin

 compilerplugins/clang/mergeclasses.results |1 
 editeng/source/xml/xmltxtexp.cxx   |2 
 include/svx/fmdmod.hxx |   40 +++
 include/svx/unomodel.hxx   |6 -
 sc/inc/docuno.hxx  |4 -
 sc/source/ui/unoobj/docuno.cxx |   10 +-
 sd/source/ui/inc/unomodel.hxx  |6 -
 sd/source/ui/unoidl/unomodel.cxx   |8 +-
 svx/Library_svxcore.mk |1 
 svx/source/form/fmdmod.cxx |  100 +
 svx/source/unodraw/unomod.cxx  |   61 +
 sw/inc/unotxdoc.hxx|4 -
 sw/source/uibase/uno/unotxdoc.cxx  |8 +-
 13 files changed, 172 insertions(+), 79 deletions(-)

New commits:
commit 609b22787392be4c2eac6fe098a70341a4c204e4
Author: Noel Grandin 
Date:   Thu Nov 5 11:33:34 2015 +0200

fix tdf#95488, crash in report wizard

This reverts commit bb76b8f10697f3d5ca1f9a2f19902b043bd61cd7
"loplugin:mergeclasses"

Change-Id: Ib65459ab45cd4cefa859ed75f9ddc4f070879b1d

diff --git a/compilerplugins/clang/mergeclasses.results 
b/compilerplugins/clang/mergeclasses.results
index 5d77cd6..95bd5da 100644
--- a/compilerplugins/clang/mergeclasses.results
+++ b/compilerplugins/clang/mergeclasses.results
@@ -68,6 +68,7 @@ merge StarSymbolToMSMultiFont with StarSymbolToMSMultiFontImpl
 merge StgReader with WW8Reader
 merge SvListView with SvTreeListBox
 merge SvxShapeMaster with SdXShape
+merge SvxUnoDrawMSFactory with SvxFmMSFactory
 merge SwXParaFrameEnumeration with SwXParaFrameEnumerationImpl
 merge SwXParagraphEnumeration with SwXParagraphEnumerationImpl
 merge SwXTextRanges with SwXTextRangesImpl
diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx
index 2dad6f4..6b69e04 100644
--- a/editeng/source/xml/xmltxtexp.cxx
+++ b/editeng/source/xml/xmltxtexp.cxx
@@ -193,7 +193,7 @@ SvxSimpleUnoModel::~SvxSimpleUnoModel()
 {
 }
 
-// XMultiServiceFactory ( SvxUnoDrawMSFactory )
+// XMultiServiceFactory ( SvxFmMSFactory )
 uno::Reference< uno::XInterface > SAL_CALL SvxSimpleUnoModel::createInstance( 
const OUString& aServiceSpecifier )
 throw(uno::Exception, uno::RuntimeException, std::exception)
 {
diff --git a/include/svx/fmdmod.hxx b/include/svx/fmdmod.hxx
new file mode 100644
index 000..8a5a167
--- /dev/null
+++ b/include/svx/fmdmod.hxx
@@ -0,0 +1,40 @@
+/* -*- 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 .
+ */
+#ifndef INCLUDED_SVX_FMDMOD_HXX
+#define INCLUDED_SVX_FMDMOD_HXX
+
+#include 
+#include 
+
+class SVX_DLLPUBLIC SvxFmMSFactory : public SvxUnoDrawMSFactory
+{
+
+public:
+SvxFmMSFactory() {};
+
+virtual ~SvxFmMSFactory() {}
+
+virtual ::com::sun::star::uno::Reference< 
::com::sun::star::uno::XInterface > SAL_CALL createInstance(const OUString& 
ServiceSpecifier) throw( ::com::sun::star::uno::Exception, 
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+virtual ::com::sun::star::uno::Reference< 
::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments(const 
OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< 
::com::sun::star::uno::Any >& Arguments) throw( 
::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, 
std::exception ) SAL_OVERRIDE;
+virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL 
getAvailableServiceNames() throw( ::com::sun::star::uno::RuntimeException, 
std::exception ) SAL_OVERRIDE;
+};
+
+#endif // INCLUDED_SVX_FMDMOD_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/unomodel.hxx b/include/svx/unomodel.hxx
index 7cce6bc..17d857b 100644
--- a/include/svx/unomodel.hxx
+++ b/include/svx/unomodel.hxx
@@ -26,13 +26,13 @@
 #include 
 #include 
 #include 
+#include 
 #include 
-#include 
 
 class SdrModel;
 
 class SVX_DLLPUBLIC SvxUnoDrawingModel : public SfxBaseModel, // implements 
SfxListener, OWEAKOBJECT & other
-   public SvxUnoDrawMSFactory,
+   public SvxFmMSFactory,
pu

Re: TheServiceDocumenter: extension to core ...

2015-11-05 Thread Bjoern Michaelsen

Hi,

On Thu, Nov 05, 2015 at 09:51:30AM +0100, Stephan Bergmann wrote:
> In 
> 
> "Do not implicitly run this for now; it breaks the build" I made that
> specific plugin opt-in, you need to explicitly "make
> COMPILER_PLUGIN_TOOL=getimplementationname" to enable it (see
> compilerplugins/README).

Thanks, I didnt think about a otherwise harmless warning from a plugin to break
the build combined with Werror to break tinderboxes -- in my mind that was
somehow still mapped to "just creates some colorful output", sorry.

Best,

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

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

2015-11-05 Thread Xisco Fauli

 filter/source/svg/parserfragments.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2fe02d55d72a808dd79ba9529bc5078a45175c16
Author: Xisco Fauli 
Date:   Sat Oct 24 15:28:37 2015 +0200

tdf#94098: SVG: improved parsing of rotate's parameters

2nd and 3rd one can be separated by commas or spaces

Change-Id: Ie266956ddad0f23a8bf13f1292105bbe6ec60895
Reviewed-on: https://gerrit.libreoffice.org/19573
Reviewed-by: Katarina Behrens 
Tested-by: Katarina Behrens 

diff --git a/filter/source/svg/parserfragments.cxx 
b/filter/source/svg/parserfragments.cxx
index 953c033..1d9cc85 100644
--- a/filter/source/svg/parserfragments.cxx
+++ b/filter/source/svg/parserfragments.cxx
@@ -446,7 +446,7 @@ bool parseTransform( const char* sTransform, 
basegfx::B2DHomMatrix& rTransform )
   >> '('
   >> real_p[assign_a(fRotationAngle)]
   >> !((',' | eps_p) >> real_p[assign_a(aCurrTransform.m02)]
-   >> real_p[assign_a(aCurrTransform.m12)])
+   >> (',' | eps_p) >>  
real_p[assign_a(aCurrTransform.m12)])
   >> ')')[boost::bind(&calcRotation,
   boost::ref(aTransforms),
   boost::ref(aCurrTransform),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-11-05 Thread Michael Meeks

 cui/source/options/optgdlg.cxx |   14 ++
 cui/source/options/optgdlg.hxx |4 
 cui/uiconfig/ui/optviewpage.ui |   32 ++--
 vcl/source/outdev/bitmap.cxx   |2 +-
 4 files changed, 49 insertions(+), 3 deletions(-)

New commits:
commit b3f78806942d4e562b5f0f3ff866eca2f953ef4f
Author: Michael Meeks 
Date:   Wed Nov 4 21:17:17 2015 +

OpenGL options: clarify setting descriptions, and provide a live status.

Hopefully this will un-confuse users about whether GL is enabled; the
settings only take effect on re-start, so show a current status line too.

Change-Id: I82832fd8d35bc76ab2cf1f394f11a881fde80774
Reviewed-on: https://gerrit.libreoffice.org/19790
Tested-by: Jenkins 
Reviewed-by: Michael Meeks 

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index e4811b9..ca895cc 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -635,6 +635,8 @@ OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const 
SfxItemSet& rSet)
 get(m_pUseAntiAliase, "useaa");
 get(m_pUseOpenGL, "useopengl");
 get(m_pForceOpenGL, "forceopengl");
+get(m_pOpenGLStatusEnabled, "openglenabled");
+get(m_pOpenGLStatusDisabled, "opengldisabled");
 get(m_pMousePosLB, "mousepos");
 get(m_pMouseMiddleLB, "mousemiddle");
 
@@ -676,6 +678,8 @@ OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const 
SfxItemSet& rSet)
 m_pUseOpenGL->Enable(false);
 if (officecfg::Office::Common::VCL::ForceOpenGL::isReadOnly())
 m_pForceOpenGL->Enable(false);
+
+UpdateOGLStatus();
 }
 
 OfaViewTabPage::~OfaViewTabPage()
@@ -703,6 +707,8 @@ void OfaViewTabPage::dispose()
 m_pUseAntiAliase.clear();
 m_pUseOpenGL.clear();
 m_pForceOpenGL.clear();
+m_pOpenGLStatusEnabled.clear();
+m_pOpenGLStatusDisabled.clear();
 m_pMousePosLB.clear();
 m_pMouseMiddleLB.clear();
 SfxTabPage::dispose();
@@ -972,6 +978,14 @@ void OfaViewTabPage::Reset( const SfxItemSet* )
 #endif
 }
 
+void OfaViewTabPage::UpdateOGLStatus()
+{
+// Easier than a custom translation string.
+bool bEnabled = OpenGLWrapper::isVCLOpenGLEnabled();
+m_pOpenGLStatusEnabled->Show(bEnabled);
+m_pOpenGLStatusDisabled->Show(!bEnabled);
+}
+
 struct LanguageConfig_Impl
 {
 SvtLanguageOptions aLanguageOptions;
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 658b89c..5f12c5d 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -97,6 +97,9 @@ private:
 VclPtr   m_pUseOpenGL;
 VclPtr   m_pForceOpenGL;
 
+VclPtr  m_pOpenGLStatusEnabled;
+VclPtr  m_pOpenGLStatusDisabled;
+
 VclPtrm_pMousePosLB;
 VclPtrm_pMouseMiddleLB;
 
@@ -113,6 +116,7 @@ private:
 #if defined( UNX )
 DECL_LINK_TYPED( OnAntialiasingToggled, CheckBox&, void );
 #endif
+void UpdateOGLStatus();
 
 public:
 OfaViewTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui
index 273a0e8..39508c4 100644
--- a/cui/uiconfig/ui/optviewpage.ui
+++ b/cui/uiconfig/ui/optviewpage.ui
@@ -88,7 +88,7 @@
 
 
   
-Use OpenGL 
for all rendering
+Use OpenGL 
for all rendering (on restart)
 True
 True
 False
@@ -104,7 +104,7 @@
 
 
   
-Force OpenGL 
even if blacklisted
+Force OpenGL 
even if blacklisted (on restart)
 True
 True
 False
@@ -119,6 +119,34 @@
 1
   
 
+
+  
+Galse
+False
+0
+Current GL 
status: Enabled
+  
+  
+0
+4
+1
+1
+  
+
+
+  
+False
+False
+0
+Current GL 
status: Disabled
+  
+  
+0
+5
+1
+1
+  
+
   
 
   
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index 9834347..a2e30aa 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -666,7 +666,7 @@ void OutputDevice::DrawDeviceAlphaBi

Re: 250 USD offer on FreedomSponsor to fix tdf#33082

2015-11-05 Thread Michael Meeks

Hi Tommy,

On Thu, 2015-11-05 at 06:07 +0100, Tommy wrote:
> I want to inform the developer community that an user offered 250 
> dollars to fix:
> Bug 33082 - Multiple operations are not tracked as change in change control
> https://bugs.documentfoundation.org/show_bug.cgi?id=33082

Hmm. So - just as a hyper-optimistic estimation - implementing change
tracking for tables, including the file-format support (there is none in
ODF as such) and so on is the order of a six man month type job: unit
tests, filter work, core data structure pieces etc.

It is good to have people supporting and offering money for the work -
but 6 man months is 8*5*4*6 hours -> 960 hours. No idea what you think a
programmer should earn but $0.26/hr rate is below most estimations ;-)

Having said that - it is clear that this is an important missing
feature. In general it would be good to split it into many bugs - some
of the features are smaller and less problematic.

HTH !

Michael.

-- 
 michael.me...@collabora.com  <><, Pseudo Engineer, itinerant idiot

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

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

2015-11-05 Thread Miklos Vajna

 sw/source/filter/html/htmlbas.cxx|   88 -
 sw/source/filter/html/htmlcss1.cxx   |  156 +--
 sw/source/filter/html/htmlctxt.cxx   |  102 +-
 sw/source/filter/html/htmldrawreader.cxx |   70 -
 sw/source/filter/html/htmlfld.cxx|   82 -
 sw/source/filter/html/htmlform.cxx   |  232 ++---
 sw/source/filter/html/htmlftn.cxx|   78 -
 sw/source/filter/html/htmlgrin.cxx   |  208 ++--
 sw/source/filter/html/htmlnumreader.cxx  |   66 -
 sw/source/filter/html/htmlplug.cxx   |  102 +-
 sw/source/filter/html/htmlsect.cxx   |  112 +-
 sw/source/filter/html/htmltab.cxx|  536 +--
 sw/source/filter/html/swhtml.cxx | 1386 +++
 sw/source/filter/html/swhtml.hxx |  186 ++--
 14 files changed, 1702 insertions(+), 1702 deletions(-)

New commits:
commit 87f0fa6b57bab798c5c6c2acfa619a8ea9f1b2aa
Author: Miklos Vajna 
Date:   Thu Nov 5 10:13:37 2015 +0100

sw: prefix members of SwHTMLParser

Change-Id: I3d4b39a79c49f847c6814215593d86e8d992b38a

diff --git a/sw/source/filter/html/htmlbas.cxx 
b/sw/source/filter/html/htmlbas.cxx
index 251fa71..303d8e1 100644
--- a/sw/source/filter/html/htmlbas.cxx
+++ b/sw/source/filter/html/htmlbas.cxx
@@ -60,13 +60,13 @@ static HTMLOutEvent aBodyEventTable[] =
 
 void SwHTMLParser::NewScript()
 {
-ParseScriptOptions( aScriptType, sBaseURL, eScriptLang, aScriptURL,
-aBasicLib, aBasicModule );
+ParseScriptOptions( m_aScriptType, m_sBaseURL, m_eScriptLang, m_aScriptURL,
+m_aBasicLib, m_aBasicModule );
 
-if( !aScriptURL.isEmpty() )
+if( !m_aScriptURL.isEmpty() )
 {
 // Den Inhalt des Script-Tags ignorieren
-bIgnoreRawData = true;
+m_bIgnoreRawData = true;
 }
 }
 
@@ -75,7 +75,7 @@ void SwHTMLParser::EndScript()
 bool bInsIntoBasic = false,
  bInsSrcIntoField = false;
 
-switch( eScriptLang )
+switch( m_eScriptLang )
 {
 case HTML_SL_STARBASIC:
 bInsIntoBasic = true;
@@ -85,34 +85,34 @@ void SwHTMLParser::EndScript()
 break;
 }
 
-bIgnoreRawData = false;
-aScriptSource = convertLineEnd(aScriptSource, GetSystemLineEnd());
+m_bIgnoreRawData = false;
+m_aScriptSource = convertLineEnd(m_aScriptSource, GetSystemLineEnd());
 
 // Ausser StarBasic und unbenutzem JavaScript jedes Script oder den
 // Modulnamen in einem Feld merken merken
-if( bInsSrcIntoField && !bIgnoreHTMLComments )
+if( bInsSrcIntoField && !m_bIgnoreHTMLComments )
 {
 SwScriptFieldType *pType =
-
static_cast(pDoc->getIDocumentFieldsAccess().GetSysFieldType(
 RES_SCRIPTFLD ));
+
static_cast(m_pDoc->getIDocumentFieldsAccess().GetSysFieldType(
 RES_SCRIPTFLD ));
 
-SwScriptField aField( pType, aScriptType,
-!aScriptURL.isEmpty() ? aScriptURL : aScriptSource,
-!aScriptURL.isEmpty() );
+SwScriptField aField( pType, m_aScriptType,
+!m_aScriptURL.isEmpty() ? m_aScriptURL : 
m_aScriptSource,
+!m_aScriptURL.isEmpty() );
 InsertAttr( SwFormatField( aField ) );
 }
 
-SwDocShell *pDocSh = pDoc->GetDocShell();
-if( !aScriptSource.isEmpty() && pDocSh &&
+SwDocShell *pDocSh = m_pDoc->GetDocShell();
+if( !m_aScriptSource.isEmpty() && pDocSh &&
 bInsIntoBasic && IsNewDoc() )
 {
 // Fuer JavaScript und StarBasic noch ein Basic-Modul anlegen
 // Das Basic entfernt natuerlich weiterhin keine SGML-Kommentare
-RemoveSGMLComment( aScriptSource, true );
+RemoveSGMLComment( m_aScriptSource, true );
 
 // get library name
 OUString aLibName;
-if( !aBasicLib.isEmpty() )
-aLibName = aBasicLib;
+if( !m_aBasicLib.isEmpty() )
+aLibName = m_aBasicLib;
 else
 aLibName = "Standard";
 
@@ -136,24 +136,24 @@ void SwHTMLParser::EndScript()
 
 if ( xModLib.is() )
 {
-if( aBasicModule.isEmpty() )
+if( m_aBasicModule.isEmpty() )
 {
 // create module name
 bool bFound = true;
 while( bFound )
 {
-aBasicModule = "Modul";
-aBasicModule += OUString::number( 
(sal_Int32)(++nSBModuleCnt) );
-bFound = xModLib->hasByName( aBasicModule );
+m_aBasicModule = "Modul";
+m_aBasicModule += OUString::number( 
(sal_Int32)(++m_nSBModuleCnt) );
+bFound = xModLib->hasByName( m_aBasicModule );
 }
 }
 
 // create module
-OUString aModName( aBasicModule );
+OUString aModName( m_aBasicModule );
 if ( !xModLib->hasByName( aMo

Two svg import filters

2015-11-05 Thread Xisco Faulí

Hi all,

Recently I've been working on some fixes for filter/source/svg/* and my
intention would be to spend some more time to fix other issues in this
filter as there's plenty of room for improvements. However, I'd like to
know if a decision is going to be make wrt this topic before I do other
fixes as I wouldn't like to work on something that, eventually, is going to
be drop.
>From my point of view, I find svgio to support more svg elements and
atributtes than svg filter but, as mentioned before, they do different
things, svgio imports the file as svg and the filter as a draw document so
it can be edited afterwards, so either we drop one or the other we are
going to lose some already implemented features. On the other hand, it's
also a pain to have 2 filters that do more or less the same.
With regards to the missing support in svg filter, I don't think it
wouldn't be to difficult to improve it, as other filters already implement
similar features, so they can be taken as a guidance.

Regards

*
https://gerrit.libreoffice.org/#/q/owner:%22Xisco+Faul%25C3%25AD+Tarazona+%253Canistenis%2540gmail.com%253E%22
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: agenda item for ESC: Bug 89714 - Orphan and widow control should be on by default

2015-11-05 Thread Miklos Vajna

Hi Justin,

On Thu, Nov 05, 2015 at 08:41:11AM +0300, Justin Luth  
wrote:
> I would like to request that someone give official endorsement to
> turning on widow/orphan controls by default for new documents.  I expect
> this probably fits ESC better than UI group.
> 
> https://bugs.documentfoundation.org/show_bug.cgi?id=89714

It's a pretty old feature, so it's not like it's disabled by default as
it has known problems. I think it's the expertise of UX to decide if it
should be on or off by default.

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: vcl/qa

2015-11-05 Thread Noel Grandin

 vcl/qa/complex/persistent_window_states/DocumentHandle.java |   36 ++--
 1 file changed, 32 insertions(+), 4 deletions(-)

New commits:
commit 0e93ef3ec1fe19a088e70810904140f4bbd60244
Author: Noel Grandin 
Date:   Thu Nov 5 11:22:45 2015 +0200

fix compiling of this java class

(even though it's not being built right now)

Change-Id: I237cce48ea50b1184b166a8a8132ae425597bffe

diff --git a/vcl/qa/complex/persistent_window_states/DocumentHandle.java 
b/vcl/qa/complex/persistent_window_states/DocumentHandle.java
index ec09cac..e3760ba 100644
--- a/vcl/qa/complex/persistent_window_states/DocumentHandle.java
+++ b/vcl/qa/complex/persistent_window_states/DocumentHandle.java
@@ -22,12 +22,14 @@ import helper.WindowListener;
 
 import com.sun.star.awt.PosSize;
 import com.sun.star.awt.Rectangle;
+import com.sun.star.awt.WindowEvent;
 import com.sun.star.awt.XWindow;
 import com.sun.star.beans.PropertyState;
 import com.sun.star.beans.PropertyValue;
 import com.sun.star.frame.FrameSearchFlag;
 import com.sun.star.frame.XComponentLoader;
 import com.sun.star.frame.XFrame;
+import com.sun.star.lang.EventObject;
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 
@@ -42,7 +44,7 @@ public class DocumentHandle {
 // the current window
 private XWindow xWin = null;
 // a own window listener
-private final WindowListener wl;
+private final MyWindowListener wl;
 
 /**
  * Constructor
@@ -50,7 +52,7 @@ public class DocumentHandle {
  */
 public DocumentHandle(XComponentLoader xCompLoader) {
 this.xCompLoader = xCompLoader;
-wl = new WindowListener();
+wl = new MyWindowListener();
 }
 
 /**
@@ -61,7 +63,7 @@ public class DocumentHandle {
  */
 public Rectangle loadDocument(XMultiServiceFactory xMSF, String docName, 
boolean hidden)
 throws Exception{
-wl.resetTrigger();
+wl.resizedTrigger = false;
 try {
 PropertyValue [] szArgs = null;
 if (hidden) {
@@ -140,10 +142,36 @@ public class DocumentHandle {
  * @return True if resize worked.
  */
 private boolean resizeDocument(XMultiServiceFactory xMSF, Rectangle 
newPosSize){
-wl.resetTrigger();
+wl.resizedTrigger = false;
 xWin.setPosSize(newPosSize.X, newPosSize.Y, newPosSize.Width,
 newPosSize.Height, PosSize.POSSIZE);
 util.utils.waitForEventIdle(xMSF);
 return wl.resizedTrigger;
 }
+
+private static class MyWindowListener implements 
com.sun.star.awt.XWindowListener {
+// resize called
+public boolean resizedTrigger = false;
+
+@Override
+public void disposing(EventObject eventObject) {
+}
+
+@Override
+public void windowHidden(EventObject eventObject) {
+}
+
+@Override
+public void windowMoved(WindowEvent eventObject) {
+}
+
+@Override
+public void windowResized(WindowEvent eventObject) {
+resizedTrigger = true;
+}
+
+@Override
+public void windowShown(EventObject eventObject) {
+}
+}
 }
___
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 test/source toolkit/source ucb/source

2015-11-05 Thread Noel Grandin

 sw/qa/extras/odfexport/odfexport.cxx  |2 
 sw/qa/extras/ooxmlexport/ooxmlexport3.cxx |2 
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  |4 -
 sw/source/core/unocore/unochart.cxx   |6 +-
 sw/source/core/unocore/unocrsrhelper.cxx  |5 -
 sw/source/core/unocore/unodraw.cxx|6 +-
 sw/source/core/unocore/unofield.cxx   |3 -
 sw/source/filter/html/htmlform.cxx|9 +--
 sw/source/filter/ww8/docxattributeoutput.cxx  |2 
 sw/source/filter/ww8/docxsdrexport.cxx|2 
 sw/source/filter/ww8/wrtw8nds.cxx |2 
 sw/source/filter/ww8/wrtww8.cxx   |3 -
 sw/source/filter/ww8/ww8par3.cxx  |4 -
 sw/source/filter/xml/xmlfmt.cxx   |2 
 sw/source/filter/xml/xmltbli.cxx  |2 
 sw/source/ui/dbui/addresslistdialog.cxx   |2 
 sw/source/ui/dbui/dbinsdlg.cxx|2 
 sw/source/ui/envelp/mailmrge.cxx  |4 -
 sw/source/ui/index/cntex.cxx  |3 -
 sw/source/ui/vba/vbafind.cxx  |2 
 sw/source/uibase/app/apphdl.cxx   |3 -
 sw/source/uibase/dbui/dbmgr.cxx   |   20 +++
 sw/source/uibase/dbui/dbtree.cxx  |   12 ++--
 sw/source/uibase/dbui/mailmergehelper.cxx |7 --
 sw/source/uibase/dochdl/swdtflvr.cxx  |2 
 sw/source/uibase/docvw/PageBreakWin.cxx   |   12 +---
 sw/source/uibase/fldui/fldmgr.cxx |2 
 sw/source/uibase/fldui/xfldui.cxx |8 +-
 sw/source/uibase/misc/numberingtypelistbox.cxx|2 
 sw/source/uibase/uno/unoatxt.cxx  |4 -
 sw/source/uibase/uno/unodispatch.cxx  |2 
 sw/source/uibase/uno/unomailmerge.cxx |5 -
 sw/source/uibase/uno/unomodule.cxx|2 
 sw/source/uibase/uno/unotxdoc.cxx |2 
 sw/source/uibase/uno/unotxvw.cxx  |6 +-
 sw/source/uibase/utlui/unotools.cxx   |2 
 test/source/sheet/xspreadsheets2.cxx  |6 +-
 toolkit/source/awt/vclxtoolkit.cxx|3 -
 toolkit/source/awt/vclxwindow.cxx |2 
 toolkit/source/controls/controlmodelcontainerbase.cxx |8 +-
 toolkit/source/controls/formattedcontrol.cxx  |2 
 toolkit/source/controls/geometrycontrolmodel.cxx  |2 
 toolkit/source/controls/stdtabcontroller.cxx  |4 -
 ucb/source/cacher/cachedcontentresultset.cxx  |6 +-
 ucb/source/cacher/contentresultsetwrapper.cxx |5 -
 ucb/source/cacher/dynamicresultsetwrapper.cxx |6 +-
 ucb/source/core/FileAccess.cxx|2 
 ucb/source/core/provprox.cxx  |4 -
 ucb/source/core/ucb.cxx   |3 -
 ucb/source/core/ucbcmds.cxx   |3 -
 ucb/source/sorter/sortdynres.cxx  |2 
 ucb/source/sorter/sortresult.cxx  |4 -
 ucb/source/ucp/cmis/cmis_content.cxx  |6 +-
 ucb/source/ucp/cmis/cmis_datasupplier.cxx |2 
 ucb/source/ucp/file/bc.cxx|5 -
 ucb/source/ucp/file/filrset.cxx   |4 -
 ucb/source/ucp/file/prov.cxx  |2 
 ucb/source/ucp/ftp/ftpdynresultset.cxx|4 -
 ucb/source/ucp/ftp/ftpresultsetI.cxx  |2 
 ucb/source/ucp/gio/gio_content.cxx|4 -
 ucb/source/ucp/gio/gio_datasupplier.cxx   |2 
 ucb/source/ucp/hierarchy/hierarchycontent.cxx |3 -
 ucb/source/ucp/hierarchy/hierarchydata.cxx|   49 +-
 ucb/source/ucp/hierarchy/hierarchydatasource.cxx  |4 -
 ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx|2 
 ucb/source/ucp/hierarchy/hierarchyprovider.cxx|6 --
 ucb/source/ucp/package/pkgcontent.cxx |3 -
 ucb/source/ucp/package/pkgdatasupplier.cxx|2 
 ucb/source/ucp/package/pkgprovider.cxx|2 
 ucb/source/ucp/tdoc/tdoc_content.cxx  |3 -
 ucb/source/ucp/tdoc/tdoc_datasupplier.cxx |2 
 ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx   |6 --
 ucb/source/ucp/tdoc/tdoc_storage.cxx  |4 -
 ucb/source/ucp/webdav-neon/webdavcontent.cxx  |   10 +--
 ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx |2 
 ucb/source/ucp/webdav/webdavcontent.cxx   |   10 +--
 ucb/source/ucp/webdav/webdavdatasupplier.cxx  |2 
 77 files changed, 152 insertions(+), 209 deletions(-)

Re: TheServiceDocumenter: extension to core ...

2015-11-05 Thread Stephan Bergmann


On 11/05/2015 01:26 AM, Bjoern Michaelsen wrote:

I finally managed to finished TheServiceDocumenter thing presented with:

  http://people.canonical.com/~bjoern/presentations/extension2core.odp
  https://www.youtube.com/watch?v=WBNG6bVZPzw

If you build master with --enable-compiler-plugins on clang 3.7.0 or later[1]
it should create a set of html stubs in $(WORKDIR)/ServiceImplementions. These
have the names of UNO implementations and just do an immediate meta refresh to
the matching C++ core documentation on http://docs.libreoffice.org.


In 
 
"Do not implicitly run this for now; it breaks the build" I made that 
specific plugin opt-in, you need to explicitly "make 
COMPILER_PLUGIN_TOOL=getimplementationname" to enable it (see 
compilerplugins/README).


I did that for two reasons:  For one, the plugin apparently does not 
work properly yet, see 
 
for an example of a broken tinderbox build.  For another, I understand 
that the generated data needs to be processed further (uploaded 
somewhere), so it is probably faster and more convenient to only do this 
when explicitly requested, and not routinely on every build (for people 
routinely building with Clang plugins enabled).

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

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

2015-11-05 Thread Takeshi Abe

 vcl/unx/gtk3/app/gtk3gtkinst.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0e31c12f4c1cb53e1d68d1129b3b42508605846f
Author: Takeshi Abe 
Date:   Thu Nov 5 16:45:10 2015 +0900

vcl: This is constant

Change-Id: Ib01701c4e89f665cb65cdfa8612b02a70633181e

diff --git a/vcl/unx/gtk3/app/gtk3gtkinst.cxx b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
index 86b562a..38e28cc 100644
--- a/vcl/unx/gtk3/app/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
@@ -41,7 +41,7 @@ namespace
 const char* pType;  // Mime encoding on our side
 };
 
-static TypeEntry aConversionTab[] =
+static const TypeEntry aConversionTab[] =
 {
 { "ISO10646-1", "text/plain;charset=utf-16" },
 { "UTF8_STRING", "text/plain;charset=utf-8" },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: TheServiceDocumenter: extension to core ...

2015-11-05 Thread Miklos Vajna

Hi,

On Thu, Nov 05, 2015 at 01:26:59AM +0100, Bjoern Michaelsen 
 wrote:
> @Miklos: IIRC you populate/update docs.libreoffice.org, do you think you can
> update this along with the other generated docs during your next run?

I currently use gcc to do a 'make && make docs', where the result of
docs/ is uploaded to docs.l.o from time to time.

Checking tinderbox results:

http://tinderbox.libreoffice.org/cgi-bin/gunzip.cgi?tree=MASTER&brief-log=1446709801.8844

It seems your plugin got disabled as it currently breaks the build.
Probably best to sort that out first. :-)

(As a side note: the size of the output is around 11GB. I can't easily
upload that much from home, so I do the 'make && make docs' on a server
that has the bandwidth to do that. I have no clang there -- nor really
willing to fool around with self-built toolchain -- though.  Options I
can imagine:

1) If this would be a subdir of docs.l.o, then if you propose a name for
it, I can make sure I leave it alone when I update the rest of the site.

2) If TDF can provide a build machine that is able to do 'make && make
docs' with clang ~one in a month and has no problem with eating that
upload bandwith, then that could be an option.)

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: compilerplugins/clang

2015-11-05 Thread Stephan Bergmann

 compilerplugins/clang/vclwidgets.cxx |   24 
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit b16a3372317a6478968792d068bff5e5f65d60ae
Author: Stephan Bergmann 
Date:   Thu Nov 5 09:30:42 2015 +0100

Improve warning messages

Change-Id: I75eb9f17a3dcc688314355fa957e3f34086b161a

diff --git a/compilerplugins/clang/vclwidgets.cxx 
b/compilerplugins/clang/vclwidgets.cxx
index 15833e0..95dfabe 100644
--- a/compilerplugins/clang/vclwidgets.cxx
+++ b/compilerplugins/clang/vclwidgets.cxx
@@ -189,7 +189,7 @@ bool VCLWidgets::VisitCXXDestructorDecl(const 
CXXDestructorDecl* pCXXDestructorD
 if (bFoundVclPtrField && pCompoundStatement && pCompoundStatement->size() 
== 0) {
 report(
 DiagnosticsEngine::Warning,
-"OutputDevice subclass with VclPtr field must call disposeOnce() 
from its destructor.",
+"OutputDevice subclass with VclPtr field must call disposeOnce() 
from its destructor",
 pCXXDestructorDecl->getLocStart())
   << pCXXDestructorDecl->getSourceRange();
 return true;
@@ -225,7 +225,7 @@ bool VCLWidgets::VisitCXXDestructorDecl(const 
CXXDestructorDecl* pCXXDestructorD
 {
 report(
 DiagnosticsEngine::Warning,
-"OutputDevice subclass should have nothing in its destructor 
but a call to disposeOnce().",
+"OutputDevice subclass should have nothing in its destructor 
but a call to disposeOnce()",
 pCXXDestructorDecl->getLocStart())
   << pCXXDestructorDecl->getSourceRange();
 }
@@ -264,9 +264,9 @@ bool VCLWidgets::VisitVarDecl(const VarDecl * pVarDecl) {
 {
 report(
 DiagnosticsEngine::Warning,
-"OutputDevice subclass should be wrapped in VclPtr. " + 
pVarDecl->getType().getAsString(),
+"OutputDevice subclass %0 should be wrapped in VclPtr",
 pVarDecl->getLocation())
-  << pVarDecl->getSourceRange();
+<< pVarDecl->getType() << pVarDecl->getSourceRange();
 return true;
 }
 
@@ -282,7 +282,7 @@ bool VCLWidgets::VisitVarDecl(const VarDecl * pVarDecl) {
 if (isDerivedFromWindow(recordDecl)) {
 report(
 DiagnosticsEngine::Warning,
-"OutputDevice subclass allocated on stack, should be allocated via 
VclPtr or via *.",
+"OutputDevice subclass allocated on stack, should be allocated via 
VclPtr or via *",
 pVarDecl->getLocation())
   << pVarDecl->getSourceRange();
 }
@@ -302,9 +302,9 @@ bool VCLWidgets::VisitFieldDecl(const FieldDecl * 
fieldDecl) {
 if (!(pParentRecordDecl != nullptr && 
pParentRecordDecl->getQualifiedNameAsString() == "ErrorContextImpl")) {
 report(
 DiagnosticsEngine::Warning,
-"OutputDevice subclass declared as a pointer field, should be 
wrapped in VclPtr." + fieldDecl->getType().getAsString(),
+"OutputDevice subclass %0 declared as a pointer member, should 
be wrapped in VclPtr",
 fieldDecl->getLocation())
-  << fieldDecl->getSourceRange();
+<< fieldDecl->getType() << fieldDecl->getSourceRange();
 return true;
}
 }
@@ -321,7 +321,7 @@ bool VCLWidgets::VisitFieldDecl(const FieldDecl * 
fieldDecl) {
 if (isDerivedFromWindow(recordDecl)) {
 report(
 DiagnosticsEngine::Warning,
-"OutputDevice subclass allocated as a class member, should be 
allocated via VclPtr.",
+"OutputDevice subclass allocated as a class member, should be 
allocated via VclPtr",
 fieldDecl->getLocation())
   << fieldDecl->getSourceRange();
 }
@@ -342,14 +342,14 @@ bool VCLWidgets::VisitFieldDecl(const FieldDecl * 
fieldDecl) {
 if (!bFoundDispose) {
 report(
 DiagnosticsEngine::Warning,
-"OutputDevice subclass with a VclPtr field MUST have a 
dispose() method.",
+"OutputDevice subclass with a VclPtr field MUST override 
dispose() (and call its superclass dispose() as the last thing it does)",
 fieldDecl->getLocation())
   << fieldDecl->getSourceRange();
 }
 if (!pParentRecordDecl->hasUserDeclaredDestructor()) {
 report(
 DiagnosticsEngine::Warning,
-"OutputDevice subclass with a VclPtr field MUST have an 
explicit destructor.",
+"OutputDevice subclass with a VclPtr field MUST have a 
user-provided destructor (that calls disposeOnce())",
 fieldDecl->getLocation())
   << fieldDecl->getSourceRange();
 }
@@ -402,7 +402,7 @@ bool VCLWidgets::VisitFunctionDecl( const FunctionDecl* 
functionDecl )
 if (!isDisposeCallingSuperclassDispose(pMethodDecl)) {
 report(
 DiagnosticsEngine::Warn

[Libreoffice-commits] core.git: officecfg/registry sdext/source

2015-11-05 Thread Stephan Bergmann

 officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu   |   
21 ---
 officecfg/registry/schema/org/openoffice/Office/PresentationMinimizer.xcs |   
28 --
 sdext/source/minimizer/pppoptimizertoken.cxx  |
7 --
 sdext/source/minimizer/pppoptimizertoken.hxx  |
7 --
 4 files changed, 63 deletions(-)

New commits:
commit ffde331fbefec360d0f6ca5268cdc9acd1a6440b
Author: Stephan Bergmann 
Date:   Thu Nov 5 09:17:58 2015 +0100

Remove unused strings

Change-Id: I376a1a9c8198e71eb8fd893ca4382fd25bd55817

diff --git 
a/officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu 
b/officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu
index 15327e6..d5fb575 100644
--- a/officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu
@@ -118,9 +118,6 @@ The current presentation contains no OLE objects.
 
 Choose which slides to delete
 
-
-Master Pages
-
 
 Delete unused ~master pages
 
@@ -139,12 +136,6 @@ The current presentation contains no OLE objects.
 
 Choose where to apply the following 
changes
 
-
-Progress
-
-
-Objects optimized
-
 
 ~Apply changes to current 
presentation
 
@@ -172,21 +163,9 @@ The current presentation contains no OLE objects.
 
 Estimated new file size:
 
-
-%1 MB
-
 
 My Settings 
 
-
-default session
-
-
-The optimization will modify the current 
document. Do you want to continue?
-
-
-~Yes
-
 
 OK
 
diff --git 
a/officecfg/registry/schema/org/openoffice/Office/PresentationMinimizer.xcs 
b/officecfg/registry/schema/org/openoffice/Office/PresentationMinimizer.xcs
index 49b7415..c283f27 100644
--- a/officecfg/registry/schema/org/openoffice/Office/PresentationMinimizer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/PresentationMinimizer.xcs
@@ -255,10 +255,6 @@ The current presentation contains no OLE objects.
String STR_CHOOSE_SLIDES.
Choose which slides to delete

-   
-   String STR_MASTER_PAGES.
-   Master Pages
-   

String STR_DELETE_MASTER_PAGES.
Delete unused ~master pages
@@ -283,14 +279,6 @@ The current presentation contains no OLE objects.
String STR_SUMMARY_TITLE.
Choose where to apply the following 
changes

-   
-   String STR_PROGRESS.
-   Progress
-   
-   
-   String STR_OBJECTS_OPTIMIZED.
-   Objects optimized
-   

String STR_APPLY_TO_CURRENT.
~Apply changes to current 
presentation
@@ -329,26 +317,10 @@ The current presentation contains no OLE objects.
String STR_ESTIMATED_FILESIZE.
Estimated new file size:

-   
-   String STR_MB.
-   %1 MB
-   

String MY_SETTINGS.
My Settings

-   
-   String STR_DEFAULT_SESSION.
-   default session
-   
-   
-   String STR_MODIFY_WARNING.
-   The optimization will modify the current 
document. Do you want to continue?
-   
-   
-   String STR_YES.
-   ~Yes
-   
 
String STR_OK.
 OK
diff --git a/sdext/source/minimizer/pppoptimizertoken.cxx 
b/sdext/source/minimizer/pppoptimizertoken.cxx
index ecce848..cc616e9 100644
--- a/sdext/source/minimizer/pppoptimizertoken.cxx
+++ b/sdext/source/minimizer/pppoptimizertoken.cxx
@@ -244,15 +244,12 @@ static const TokenTable pTokenTableArray[] =
 { "STR_NO_OLE_OBJECTS_DESC",STR_NO_OLE_OBJECTS_DESC },
 { "STR_SLIDES", STR_SLIDES },
 { "STR_CHOOSE_SLIDES",  STR_CHOOSE_SLIDES },
-{ "STR_MASTER_PAGES",   STR_MASTER_PAGES },
 { "STR_DELETE_MASTER_PAGES",STR_DELETE_MASTER_PAGES },
 { "STR

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

2015-11-05 Thread Miklos Vajna

 vcl/source/filter/sgvspln.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 46f34ebb0bcb296d242fa8b1195f4ecfffebbc80
Author: Miklos Vajna 
Date:   Thu Nov 5 09:12:34 2015 +0100

vcl: fix typo in the Android stub of sgvspln

The intention is to call the real function, not the stub itself.

Change-Id: I4bfd3020871c68951b19a3c63ea9a2dc4d736be7

diff --git a/vcl/source/filter/sgvspln.cxx b/vcl/source/filter/sgvspln.cxx
index 1d95a05..762e310 100644
--- a/vcl/source/filter/sgvspln.cxx
+++ b/vcl/source/filter/sgvspln.cxx
@@ -29,7 +29,7 @@ namespace std
 template
 T copysign(T x, T y)
 {
-return copysign(x, y);
+return ::copysign(x, y);
 }
 }
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Two svg import filters

2015-11-05 Thread SOS


From a users point of view:
Inserting a SVG-image in Writer, Calc or Impress must been done 
"unchanged" because users will in 99% off all cases not edit a Image.
Opening in Draw is a different game where in most cases the user has the 
intention tot edit a image and  save back SVG or  as  a  other format.


A same sort of  filter who import a PDF as Graphic  in Writer, Calc and 
Impress would be very nice to. Currently we need a third party app to 
convert PDF to SVG  before we can insert a PDF-file into writer, Calc or 
Impress


Greetz
Fernand


On 4/11/2015 13:30, Armin Le Grand wrote:

Hi,

Am 04.11.2015 um 13:11 schrieb Caolán McNamara:

We have svgio which is being used for insert->image->from file and
filter/source/svg which is being used for open file.

Which one is "the future", and what prevents us from using it in both
places ?


svgio: Imports SVG as Graphic, keeps SVG unchanged, embedded in ODF, 
can be exported again, can be broken to graphic objects to use/change 
geometrically


filter/source/svg: New for me, seems to directly convert on XML-Base 
from SVG to ODF by breaking at import time


future: Not sure, there are probably args for each. If you want to 
preserve the SVG unchanged, svgio and a resulting ODF with one graphic 
object and embedded original SVG might be preferred. Needs to be 
discussed.




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


--
ALG (PGP Key: EE1C 4B3F E751 D8BC C485 DEC1 3C59 F953 D81C F4A2)

___
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

[Libreoffice-commits] core.git: 4 commits - sfx2/source shell/source slideshow/source slideshow/test sot/source starmath/source stoc/source stoc/test svl/source svtools/source svx/source

2015-11-05 Thread Noel Grandin

 sfx2/source/appl/appopen.cxx  |2 
 sfx2/source/appl/appuno.cxx   |   34 
+--
 sfx2/source/appl/childwin.cxx |6 
 sfx2/source/appl/helpinterceptor.cxx  |4 
 sfx2/source/appl/imagemgr.cxx |4 
 sfx2/source/appl/imestatuswindow.cxx  |3 
 sfx2/source/appl/opengrf.cxx  |2 
 sfx2/source/appl/shutdownicon.cxx |2 
 sfx2/source/appl/workwin.cxx  |   14 -
 sfx2/source/bastyp/fltfnc.cxx |   10 -
 sfx2/source/config/evntconf.cxx   |7 
 sfx2/source/control/bindings.cxx  |5 
 sfx2/source/control/querystatus.cxx   |5 
 sfx2/source/control/recentdocsviewitem.cxx|2 
 sfx2/source/control/statcach.cxx  |4 
 sfx2/source/control/unoctitm.cxx  |4 
 sfx2/source/dialog/backingcomp.cxx|4 
 sfx2/source/dialog/backingwindow.cxx  |2 
 sfx2/source/dialog/dockwin.cxx|2 
 sfx2/source/dialog/filedlghelper.cxx  |4 
 sfx2/source/dialog/mailmodel.cxx  |5 
 sfx2/source/dialog/recfloat.cxx   |5 
 sfx2/source/doc/docfile.cxx   |6 
 sfx2/source/doc/doctempl.cxx  |5 
 sfx2/source/doc/doctemplates.cxx  |2 
 sfx2/source/doc/guisaveas.cxx |   23 +-
 sfx2/source/doc/objmisc.cxx   |6 
 sfx2/source/doc/objserv.cxx   |2 
 sfx2/source/doc/objstor.cxx   |   33 
++-
 sfx2/source/doc/objxtor.cxx   |4 
 sfx2/source/doc/sfxbasemodel.cxx  |   18 -
 sfx2/source/doc/templatedlg.cxx   |5 
 sfx2/source/notify/eventsupplier.cxx  |5 
 sfx2/source/sidebar/SidebarController.cxx |2 
 sfx2/source/toolbox/tbxitem.cxx   |3 
 sfx2/source/view/ipclient.cxx |2 
 sfx2/source/view/sfxbasecontroller.cxx|6 
 sfx2/source/view/viewfrm.cxx  |4 
 sfx2/source/view/viewprn.cxx  |2 
 sfx2/source/view/viewsh.cxx   |   14 -
 shell/source/win32/simplemail/smplmailsuppl.cxx   |2 
 slideshow/source/engine/slideshowimpl.cxx |2 
 slideshow/test/demoshow.cxx   |3 
 sot/source/unoolestorage/xolesimplestorage.cxx|4 
 starmath/source/mathmlexport.cxx  |   16 -
 starmath/source/mathmlimport.cxx  |   13 -
 stoc/source/implementationregistration/implreg.cxx|2 
 stoc/source/inspect/introspection.cxx |   38 
++--
 stoc/source/invocation/invocation.cxx |   69 
+++
 stoc/source/javaloader/javaloader.cxx |3 
 stoc/source/javavm/javavm.cxx |   12 -
 stoc/source/uriproc/UriReferenceFactory.cxx   |3 
 stoc/test/javavm/jvm_interaction/interactionhandler.cxx   |4 
 stoc/test/registry_tdprovider/testregistrytdprovider.cxx  |   93 
--
 stoc/test/testcorefl.cxx  |5 
 stoc/test/testintrosp.cxx |3 
 stoc/test/testsmgr_cpnt.cxx   |2 
 svl/source/fsstor/fsstorage.cxx   |   11 -
 svl/source/fsstor/ostreamcontainer.cxx|   18 -
 svl/source/misc/sharecontrolfile.cxx  |   10 -
 svl/source/misc/strmadpt.cxx  |3 
 svl/source/passwordcontainer/passwordcontainer.cxx|2 
 svtools/source/config/accessibilityoptions.cxx

82 matches

Mail list logo