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

[Julien Nabet]

 lotuswordpro/source/filter/lwptablelayout.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 6e1efd486dfd5a4bcff1405158c9e40e0c2b6524
Author: Julien Nabet 
Date:   Sun Dec 13 09:17:02 2015 +0100

cppcheck: fix memleak in lotuswordpro

Change-Id: I15b8aa6b95264d56018fbd5c22bcb0d04e43cf91

diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx 
b/lotuswordpro/source/filter/lwptablelayout.cxx
index 902795c..735dd3e 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -580,7 +580,10 @@ void LwpTableLayout::RegisterColumns()
 {
 auto nColId = pColumnLayout->GetColumnID();
 if (nColId >= nCols)
+{
+delete [] pWidthCalculated;
 throw std::range_error("corrupt LwpTableLayout");
+}
 m_pColumns[nColId] = pColumnLayout;
 if (!pColumnLayout->IsJustifiable())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 lotuswordpro/source/filter/xfilter/xftable.cxx |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 2487ba80581d8b0f50be40a26255789e1a050e95
Author: Caolán McNamara 
Date:   Sun Dec 13 11:53:43 2015 +

guard against missing header rows

Change-Id: Iaa28ef00572eb9c4ba3a6d8ae0c668b7b0132f56

diff --git a/lotuswordpro/source/filter/xfilter/xftable.cxx 
b/lotuswordpro/source/filter/xfilter/xftable.cxx
index 9a96db8..d139a85 100644
--- a/lotuswordpro/source/filter/xfilter/xftable.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftable.cxx
@@ -104,9 +104,11 @@ void XFTable::AddRow(XFRow *pRow)
 m_aRows[row] = pRow;
 }
 
-voidXFTable::AddHeaderRow(XFRow *pRow)
+void XFTable::AddHeaderRow(XFRow *pRow)
 {
-if( !pRow )
+if( !pRow)
+return;
+if (!m_aHeaderRows.is())
 return;
 m_aHeaderRows->Add(pRow);
 }
@@ -207,7 +209,7 @@ voidXFTable::ToXml(IXFStream *pStrm)
 }
 }
 
-if( m_aHeaderRows->GetCount()>0 )
+if (m_aHeaderRows.is() && m_aHeaderRows->GetCount()>0)
 {
 pStrm->StartElement( "table:table-header-rows" );
 m_aHeaderRows->ToXml(pStrm);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 4 commits - officecfg/registry reportdesign/uiconfig sd/uiconfig

[Maxim Monastirsky]

 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |   
65 +++--
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |   
12 
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu  |
5 
 reportdesign/uiconfig/dbreport/menubar/menubar.xml   |   
12 
 sd/uiconfig/simpress/menubar/menubar.xml |  
125 +++---
 5 files changed, 150 insertions(+), 69 deletions(-)

New commits:
commit fd5708bfe8b034a825c0643ea9af73b2f976cd40
Author: Maxim Monastirsky 
Date:   Sun Dec 13 11:43:44 2015 +0200

Move .uno:InsertFormMenu to GenericCommands

Change-Id: I9af0b49c95dd55ccde463b6f0567c9160d180670

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index b106784..fed2bfc 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -20,6 +20,11 @@
 http://openoffice.org/2001/registry; 
xmlns:xs="http://www.w3.org/2001/XMLSchema; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:install="http://openoffice.org/2004/installation; 
oor:name="GenericCommands" oor:package="org.openoffice.Office.UI">
   
 
+  
+
+  Fo~rm Control
+
+  
   
 
   Preview in Web Browser
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index b6a0311..d946b2c 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -68,11 +68,6 @@
   Page Number
 
   
-  
-
-  Fo~rm Control
-
-  
   
 
   He~ader and Footer
commit 4151ce973503126f335a92444bb18bd7f3fe1942
Author: Maxim Monastirsky 
Date:   Sun Dec 13 11:35:01 2015 +0200

These should use menu:menuitem

Change-Id: Id93ee037e99ca7612937e206a116fac4b0650124

diff --git a/reportdesign/uiconfig/dbreport/menubar/menubar.xml 
b/reportdesign/uiconfig/dbreport/menubar/menubar.xml
index abd7f19..02487c7 100644
--- a/reportdesign/uiconfig/dbreport/menubar/menubar.xml
+++ b/reportdesign/uiconfig/dbreport/menubar/menubar.xml
@@ -201,12 +201,12 @@
 
 
 
-
-
-
-
-
-
+
+
+
+
+
+
 
 
 
commit c6772819f7606546493d2cff9265d8536896fb81
Author: Maxim Monastirsky 
Date:   Sun Dec 13 11:29:00 2015 +0200

Use ToolbarAsMenuController

Change-Id: I5e43898bba93c0d946b247c72a6243c17e4ac26e

diff --git a/sd/uiconfig/simpress/menubar/menubar.xml 
b/sd/uiconfig/simpress/menubar/menubar.xml
index caf8f07..565a53e 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -199,61 +199,8 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+   

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

[Julien Nabet]

 setup_native/source/win32/wintools/msidb/msidb.c |   76 ---
 1 file changed, 67 insertions(+), 9 deletions(-)

New commits:
commit d699266393d29227d249204faf5036fc0bd6d6ac
Author: Julien Nabet 
Date:   Sun Dec 13 09:27:00 2015 +0100

cppcheck: fix memleak in win32/wintools/msidb/msidb.c

Change-Id: I60ce0dbb26a75b49a50a982214d7adfb7ab833a0
Reviewed-on: https://gerrit.libreoffice.org/20679
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 

diff --git a/setup_native/source/win32/wintools/msidb/msidb.c 
b/setup_native/source/win32/wintools/msidb/msidb.c
index b4242e1..733fe58 100644
--- a/setup_native/source/win32/wintools/msidb/msidb.c
+++ b/setup_native/source/win32/wintools/msidb/msidb.c
@@ -119,24 +119,51 @@ static BOOL msidbExportStorage(LPCWSTR dbfile, LPCWSTR 
wdir, LPWSTR storageName)
 sprintf(queryBuffer, "SELECT * FROM _Storages WHERE Name = '%s'", 
storageNameA);
 
 r = MsiOpenDatabaseW(dbfile, (LPWSTR) MSIDBOPEN_READONLY, );
-if (r != ERROR_SUCCESS) return FALSE;
+if (r != ERROR_SUCCESS)
+{
+free(storageNameA);
+free(wdirA);
+return FALSE;
+}
 
 MsiDatabaseOpenView(dbhandle, queryBuffer, );
 MsiViewExecute(view, 0);
 r = MsiViewFetch(view, );
-if (r != ERROR_SUCCESS) return FALSE;
+if (r != ERROR_SUCCESS)
+{
+free(storageNameA);
+free(wdirA);
+return FALSE;
+}
 
 if (MsiRecordReadStream(rec, 2, 0, ) != ERROR_SUCCESS)
 {
+free(storageNameA);
+free(wdirA);
 return FALSE;
 }
 
-if ((dataBuffer = malloc(dataLen)) == NULL) return FALSE;
-if (MsiRecordReadStream(rec, 2, dataBuffer, ) != ERROR_SUCCESS) 
return FALSE;
+if ((dataBuffer = malloc(dataLen)) == NULL)
+{
+free(storageNameA);
+free(wdirA);
+return FALSE;
+}
+if (MsiRecordReadStream(rec, 2, dataBuffer, ) != ERROR_SUCCESS)
+{
+free(storageNameA);
+free(wdirA);
+return FALSE;
+}
 
 len = strlen(wdirA) + strlen(storageNameA) + 2;
 storagePath = malloc(len * sizeof(WCHAR));
-if (storagePath == NULL) return FALSE;
+if (storagePath == NULL)
+{
+free(storageNameA);
+free(wdirA);
+return FALSE;
+}
 
 strcpy(storagePath, wdirA);
 strcat(storagePath, "/");
@@ -232,24 +259,52 @@ static BOOL msidbExportStream(LPCWSTR dbfile, LPCWSTR 
wdir, LPCWSTR streamName)
 DWORD dataLen = 0;
 
 r = MsiOpenDatabaseW(dbfile, (LPCWSTR) MSIDBOPEN_READONLY, );
-if (r != ERROR_SUCCESS) return FALSE;
+if (r != ERROR_SUCCESS)
+{
+free(wdirA);
+free(streamNameA);
+return FALSE;
+}
 
 sprintf(queryBuffer, "SELECT * FROM _Streams WHERE Name = '%s'", 
streamNameA);
 MsiDatabaseOpenView(dbhandle, queryBuffer, );
 MsiViewExecute(streamListView, 0);
 r = MsiViewFetch(streamListView, );
-if (r != ERROR_SUCCESS) return FALSE;
+if (r != ERROR_SUCCESS)
+{
+free(wdirA);
+free(streamNameA);
+return FALSE;
+}
 
 if (MsiRecordReadStream(rec, 2, 0, ) != ERROR_SUCCESS)
+{
+free(wdirA);
+free(streamNameA);
 return FALSE;
+}
 dataBuffer = malloc(dataLen);
-if (!dataBuffer) return FALSE;
+if (!dataBuffer)
+{
+free(wdirA);
+free(streamNameA);
+return FALSE;
+}
 if (MsiRecordReadStream(rec, 2, dataBuffer, ) != ERROR_SUCCESS)
+{
+free(wdirA);
+free(streamNameA);
 return FALSE;
+}
 
 len = strlen(streamNameA) + 5;
 streamFileA = malloc(len);
-if (streamFileA == NULL) return FALSE;
+if (streamFileA == NULL)
+{
+free(wdirA);
+free(streamNameA);
+return FALSE;
+}
 
 strcpy(streamFileA, streamNameA);
 strcat(streamFileA, ext);
@@ -333,7 +388,10 @@ static BOOL msidbImportTables(LPCWSTR dbfile, LPCWSTR 
wdir, LPWSTR tables[], BOO
 }
 }
 else
+{
+free(dirNameA);
 return FALSE;
+}
 closedir(dir);
 free(dirNameA);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 lotuswordpro/source/filter/lwpcelllayout.cxx  |6 +++---
 lotuswordpro/source/filter/lwpframelayout.cxx |2 +-
 lotuswordpro/source/filter/lwplayout.cxx  |6 --
 lotuswordpro/source/filter/lwplayout.hxx  |   12 +++-
 4 files changed, 19 insertions(+), 7 deletions(-)

New commits:
commit 4e6df6de1a95b6b4194cf930cabaae7fde3b6960
Author: Caolán McNamara 
Date:   Sun Dec 13 10:40:10 2015 +

recursion protection

Change-Id: I66fda143ba1f0fa6f2638a8bd4936c75a6c40980

diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx 
b/lotuswordpro/source/filter/lwpcelllayout.cxx
index 76faa62..0a8356d 100644
--- a/lotuswordpro/source/filter/lwpcelllayout.cxx
+++ b/lotuswordpro/source/filter/lwpcelllayout.cxx
@@ -645,7 +645,7 @@ void LwpCellLayout::ApplyProtect(XFCell * pCell, 
LwpObjectID aTableID)
 {
 bool bProtected = false;
 // judge current cell
-if (IsProtected())
+if (GetIsProtected())
 {
 bProtected = true;
 }
@@ -653,7 +653,7 @@ void LwpCellLayout::ApplyProtect(XFCell * pCell, 
LwpObjectID aTableID)
 {
 // judge base on
 LwpCellLayout * pBase = dynamic_cast(GetBasedOnStyle().get());
-if (pBase && pBase->IsProtected())
+if (pBase && pBase->GetIsProtected())
 {
 bProtected = true;
 }
@@ -663,7 +663,7 @@ void LwpCellLayout::ApplyProtect(XFCell * pCell, 
LwpObjectID aTableID)
 LwpTable * pTable = dynamic_cast(aTableID.obj().get());
 LwpTableLayout * pTableLayout = pTable ? 
dynamic_cast(pTable->GetTableLayout()) : nullptr;
 LwpSuperTableLayout * pSuper = pTableLayout ? 
pTableLayout->GetSuperTableLayout() : nullptr;
-if (pSuper && pSuper->IsProtected())
+if (pSuper && pSuper->GetIsProtected())
 {
 bProtected = true;
 }
diff --git a/lotuswordpro/source/filter/lwpframelayout.cxx 
b/lotuswordpro/source/filter/lwpframelayout.cxx
index 165d9e5..b31791a 100644
--- a/lotuswordpro/source/filter/lwpframelayout.cxx
+++ b/lotuswordpro/source/filter/lwpframelayout.cxx
@@ -397,7 +397,7 @@ void LwpFrame::ApplyBackColor(XFFrameStyle* pFrameStyle)
 */
 void LwpFrame::ApplyProtect(XFFrameStyle* pFrameStyle)
 {
-if(m_pLayout->IsProtected())
+if(m_pLayout->GetIsProtected())
 {
 pFrameStyle->SetProtect(true,true,true);
 }
diff --git a/lotuswordpro/source/filter/lwplayout.cxx 
b/lotuswordpro/source/filter/lwplayout.cxx
index 86a1863..3e58fa9 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -74,6 +74,8 @@
 LwpVirtualLayout::LwpVirtualLayout(LwpObjectHeader , LwpSvStream* pStrm)
 : LwpDLNFPVList(objHdr, pStrm)
 , m_bGettingHonorProtection(false)
+, m_bGettingHasProtection(false)
+, m_bGettingIsProtected(false)
 , m_nAttributes(0)
 , m_nAttributes2(0)
 , m_nAttributes3(0)
@@ -1267,7 +1269,7 @@ bool LwpMiddleLayout::IsProtected()
 }
 else if (LwpMiddleLayout* pLay = dynamic_cast 
(GetBasedOnStyle().get()))
 {
-bProtected = pLay->IsProtected();
+bProtected = pLay->GetIsProtected();
 }
 else
 bProtected = LwpVirtualLayout::IsProtected();
@@ -1276,7 +1278,7 @@ bool LwpMiddleLayout::IsProtected()
 if(pParent && !pParent->IsHeader())
 {
 /* If a parent's protected then none of its children can be accessed. 
*/
-if(pParent->IsProtected())
+if(pParent->GetIsProtected())
 return true;
 
 if(pParent->GetHonorProtection())
diff --git a/lotuswordpro/source/filter/lwplayout.hxx 
b/lotuswordpro/source/filter/lwplayout.hxx
index e9c039a..1419043 100644
--- a/lotuswordpro/source/filter/lwplayout.hxx
+++ b/lotuswordpro/source/filter/lwplayout.hxx
@@ -120,7 +120,15 @@ public:
 m_bGettingHonorProtection = false;
 return bRet;
 }
-virtual bool IsProtected();
+bool GetIsProtected()
+{
+if (m_bGettingIsProtected)
+throw std::runtime_error("recursion in layout");
+m_bGettingIsProtected = true;
+bool bRet = IsProtected();
+m_bGettingIsProtected = false;
+return bRet;
+}
 bool GetHasProtection()
 {
 if (m_bGettingHasProtection)
@@ -181,9 +189,11 @@ protected:
 void Read() override;
 bool HasProtection();
 virtual bool HonorProtection();
+virtual bool IsProtected();
 protected:
 bool m_bGettingHonorProtection;
 bool m_bGettingHasProtection;
+bool m_bGettingIsProtected;
 sal_uInt32 m_nAttributes;
 sal_uInt32 m_nAttributes2;
 sal_uInt32 m_nAttributes3;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwpcelllayout.cxx  |6 +++---
 lotuswordpro/source/filter/lwpframelayout.cxx |2 +-
 lotuswordpro/source/filter/lwplayout.cxx  |6 --
 lotuswordpro/source/filter/lwplayout.hxx  |   12 +++-
 4 files changed, 19 insertions(+), 7 deletions(-)

New commits:
commit c617765c305e43f699487016b02afaf5f65e4d64
Author: Caolán McNamara 
Date:   Sun Dec 13 10:40:10 2015 +

recursion protection

Change-Id: I66fda143ba1f0fa6f2638a8bd4936c75a6c40980
(cherry picked from commit 4e6df6de1a95b6b4194cf930cabaae7fde3b6960)

diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx 
b/lotuswordpro/source/filter/lwpcelllayout.cxx
index 76faa62..0a8356d 100644
--- a/lotuswordpro/source/filter/lwpcelllayout.cxx
+++ b/lotuswordpro/source/filter/lwpcelllayout.cxx
@@ -645,7 +645,7 @@ void LwpCellLayout::ApplyProtect(XFCell * pCell, 
LwpObjectID aTableID)
 {
 bool bProtected = false;
 // judge current cell
-if (IsProtected())
+if (GetIsProtected())
 {
 bProtected = true;
 }
@@ -653,7 +653,7 @@ void LwpCellLayout::ApplyProtect(XFCell * pCell, 
LwpObjectID aTableID)
 {
 // judge base on
 LwpCellLayout * pBase = dynamic_cast(GetBasedOnStyle().get());
-if (pBase && pBase->IsProtected())
+if (pBase && pBase->GetIsProtected())
 {
 bProtected = true;
 }
@@ -663,7 +663,7 @@ void LwpCellLayout::ApplyProtect(XFCell * pCell, 
LwpObjectID aTableID)
 LwpTable * pTable = dynamic_cast(aTableID.obj().get());
 LwpTableLayout * pTableLayout = pTable ? 
dynamic_cast(pTable->GetTableLayout()) : nullptr;
 LwpSuperTableLayout * pSuper = pTableLayout ? 
pTableLayout->GetSuperTableLayout() : nullptr;
-if (pSuper && pSuper->IsProtected())
+if (pSuper && pSuper->GetIsProtected())
 {
 bProtected = true;
 }
diff --git a/lotuswordpro/source/filter/lwpframelayout.cxx 
b/lotuswordpro/source/filter/lwpframelayout.cxx
index 165d9e5..b31791a 100644
--- a/lotuswordpro/source/filter/lwpframelayout.cxx
+++ b/lotuswordpro/source/filter/lwpframelayout.cxx
@@ -397,7 +397,7 @@ void LwpFrame::ApplyBackColor(XFFrameStyle* pFrameStyle)
 */
 void LwpFrame::ApplyProtect(XFFrameStyle* pFrameStyle)
 {
-if(m_pLayout->IsProtected())
+if(m_pLayout->GetIsProtected())
 {
 pFrameStyle->SetProtect(true,true,true);
 }
diff --git a/lotuswordpro/source/filter/lwplayout.cxx 
b/lotuswordpro/source/filter/lwplayout.cxx
index 86a1863..3e58fa9 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -74,6 +74,8 @@
 LwpVirtualLayout::LwpVirtualLayout(LwpObjectHeader , LwpSvStream* pStrm)
 : LwpDLNFPVList(objHdr, pStrm)
 , m_bGettingHonorProtection(false)
+, m_bGettingHasProtection(false)
+, m_bGettingIsProtected(false)
 , m_nAttributes(0)
 , m_nAttributes2(0)
 , m_nAttributes3(0)
@@ -1267,7 +1269,7 @@ bool LwpMiddleLayout::IsProtected()
 }
 else if (LwpMiddleLayout* pLay = dynamic_cast 
(GetBasedOnStyle().get()))
 {
-bProtected = pLay->IsProtected();
+bProtected = pLay->GetIsProtected();
 }
 else
 bProtected = LwpVirtualLayout::IsProtected();
@@ -1276,7 +1278,7 @@ bool LwpMiddleLayout::IsProtected()
 if(pParent && !pParent->IsHeader())
 {
 /* If a parent's protected then none of its children can be accessed. 
*/
-if(pParent->IsProtected())
+if(pParent->GetIsProtected())
 return true;
 
 if(pParent->GetHonorProtection())
diff --git a/lotuswordpro/source/filter/lwplayout.hxx 
b/lotuswordpro/source/filter/lwplayout.hxx
index e9c039a..1419043 100644
--- a/lotuswordpro/source/filter/lwplayout.hxx
+++ b/lotuswordpro/source/filter/lwplayout.hxx
@@ -120,7 +120,15 @@ public:
 m_bGettingHonorProtection = false;
 return bRet;
 }
-virtual bool IsProtected();
+bool GetIsProtected()
+{
+if (m_bGettingIsProtected)
+throw std::runtime_error("recursion in layout");
+m_bGettingIsProtected = true;
+bool bRet = IsProtected();
+m_bGettingIsProtected = false;
+return bRet;
+}
 bool GetHasProtection()
 {
 if (m_bGettingHasProtection)
@@ -181,9 +189,11 @@ protected:
 void Read() override;
 bool HasProtection();
 virtual bool HonorProtection();
+virtual bool IsProtected();
 protected:
 bool m_bGettingHonorProtection;
 bool m_bGettingHasProtection;
+bool m_bGettingIsProtected;
 sal_uInt32 m_nAttributes;
 sal_uInt32 m_nAttributes2;
 sal_uInt32 m_nAttributes3;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Branch 'libreoffice-5-1' - source/sl

[Andras Timar]

 source/sl/chart2/uiconfig/ui.po|8 -
 source/sl/cui/uiconfig/ui.po   |   13 +
 source/sl/helpcontent2/source/text/scalc/01.po |   72 
+++---
 source/sl/helpcontent2/source/text/shared/07.po|4 
 source/sl/helpcontent2/source/text/shared/explorer/database.po |4 
 source/sl/helpcontent2/source/text/shared/guide.po |4 
 source/sl/helpcontent2/source/text/swriter/00.po   |   56 +++
 source/sl/helpcontent2/source/text/swriter/01.po   |   32 ++--
 source/sl/helpcontent2/source/text/swriter/guide.po|   26 +--
 source/sl/librelogo/source/pythonpath.po   |6 
 source/sl/officecfg/registry/data/org/openoffice/Office/UI.po  |8 -
 source/sl/sc/source/ui/formdlg.po  |4 
 source/sl/sc/uiconfig/scalc/ui.po  |4 
 source/sl/sd/source/ui/app.po  |4 
 source/sl/svx/uiconfig/ui.po   |4 
 source/sl/sw/uiconfig/swriter/ui.po|4 
 16 files changed, 123 insertions(+), 130 deletions(-)

New commits:
commit 850e8b1a63bd60796421642789a46bb1117572f7
Author: Andras Timar 
Date:   Sun Dec 13 12:15:22 2015 +0100

Updated Slovenian translation

Change-Id: I54bf8a57580916cf2a8a0c95dae4b683345eb5b5

diff --git a/source/sl/chart2/uiconfig/ui.po b/source/sl/chart2/uiconfig/ui.po
index 01abcba..aa740c0 100644
--- a/source/sl/chart2/uiconfig/ui.po
+++ b/source/sl/chart2/uiconfig/ui.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 5.1\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice_status=UNCONFIRMED=UI\n;
-"POT-Creation-Date: 2015-11-17 15:56+0100\n"
-"PO-Revision-Date: 2015-11-26 21:45+0200\n"
+"POT-Creation-Date: 2015-12-06 12:54+0100\n"
+"PO-Revision-Date: 2015-11-29 01:28+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
@@ -3534,7 +3534,7 @@ msgctxt ""
 "label\n"
 "string.text"
 msgid "Automat_ic"
-msgstr "Samodej_no"
+msgstr "Samode_jno"
 
 #: tp_Scale.ui
 msgctxt ""
diff --git a/source/sl/cui/uiconfig/ui.po b/source/sl/cui/uiconfig/ui.po
index 8f2f91a..0c038a1 100644
--- a/source/sl/cui/uiconfig/ui.po
+++ b/source/sl/cui/uiconfig/ui.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 5.1\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice_status=UNCONFIRMED=UI\n;
-"POT-Creation-Date: 2015-11-24 18:34+0100\n"
-"PO-Revision-Date: 2015-11-26 21:11+0200\n"
+"POT-Creation-Date: 2015-12-06 12:54+0100\n"
+"PO-Revision-Date: 2015-12-06 17:07+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
 "Language: sl\n"
@@ -11410,6 +11410,15 @@ msgstr "Možnosti spletne posodobitve"
 #: optopenclpage.ui
 msgctxt ""
 "optopenclpage.ui\n"
+"useswinterpreter\n"
+"label\n"
+"string.text"
+msgid "Allow use of Software Interpreter (even when OpenCL is not available)"
+msgstr "Dovoli uporabo programskega tolmača (tudi ko OpenCL ni na voljo)"
+
+#: optopenclpage.ui
+msgctxt ""
+"optopenclpage.ui\n"
 "useopencl\n"
 "label\n"
 "string.text"
diff --git a/source/sl/helpcontent2/source/text/scalc/01.po 
b/source/sl/helpcontent2/source/text/scalc/01.po
index a886617..4b311fd 100644
--- a/source/sl/helpcontent2/source/text/scalc/01.po
+++ b/source/sl/helpcontent2/source/text/scalc/01.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 5.1\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice_status=UNCONFIRMED=UI\n;
-"POT-Creation-Date: 2015-11-24 18:34+0100\n"
-"PO-Revision-Date: 2015-11-27 16:44+0200\n"
+"POT-Creation-Date: 2015-12-06 12:54+0100\n"
+"PO-Revision-Date: 2015-12-11 22:57+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
 "Language: sl\n"
@@ -61724,14 +61724,6 @@ msgstr "Vključi ali izključi način 
Uredi točke
 #: ful_func.xhp
 msgctxt ""
 "ful_func.xhp\n"
-"tit\n"
-"help.text"
-msgid "Frequently Used Lexemes"
-msgstr "Pogosto uporabljeni pojmi"
-
-#: ful_func.xhp
-msgctxt ""
-"ful_func.xhp\n"
 "hd_id126511265112651\n"
 "help.text"
 msgid "Syntax"
@@ -61750,16 +61742,16 @@ msgctxt ""
 "ful_func.xhp\n"
 "par_id2595283314097\n"
 "help.text"
-msgid "Complex_number is a 
complex number that is entered in the form \"a+bi\" or \"a+bj\", or is the 
result of a string operation with other functions, cell references, or 

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - translations

[Andras Timar]

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

New commits:
commit 9763835df0c79c4dfad0d12fce34ca465b48e498
Author: Andras Timar 
Date:   Sun Dec 13 12:15:22 2015 +0100

Updated core
Project: translations  850e8b1a63bd60796421642789a46bb1117572f7

Updated Slovenian translation

Change-Id: I54bf8a57580916cf2a8a0c95dae4b683345eb5b5

diff --git a/translations b/translations
index 6ba2a1e..850e8b1 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 6ba2a1e629bd8f10c07796ecae0cfcf4bd066686
+Subproject commit 850e8b1a63bd60796421642789a46bb1117572f7
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 lotuswordpro/source/filter/lwpcelllayout.cxx  |5 +
 lotuswordpro/source/filter/lwpfootnote.cxx|2 +-
 lotuswordpro/source/filter/lwptable.hxx   |2 +-
 lotuswordpro/source/filter/lwptablelayout.cxx |1 +
 4 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 5d8449cd14aa3d08929bb25626ab54aa7515f47d
Author: Caolán McNamara 
Date:   Sun Dec 13 10:24:33 2015 +

need more dynamic casts here

Change-Id: Idf84ababeeb109a411c03a18d3a9aa6e136c7ef4

diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx 
b/lotuswordpro/source/filter/lwpcelllayout.cxx
index da49507..76faa62 100644
--- a/lotuswordpro/source/filter/lwpcelllayout.cxx
+++ b/lotuswordpro/source/filter/lwpcelllayout.cxx
@@ -422,10 +422,7 @@ LwpObjectID * LwpCellLayout::GetPreviousCellStory()
 LwpCellBorderType LwpCellLayout::GetCellBorderType(sal_uInt16 nRow, sal_uInt16 
nCol, LwpTableLayout * pTableLayout)
 {
 if (!pTableLayout)
-{
-assert(false);
 return enumWholeBorder;
-}
 
 // get left cell and judge if neighbour border is different
 XFBorders * pBorders = GetXFBorders();
@@ -664,7 +661,7 @@ void LwpCellLayout::ApplyProtect(XFCell * pCell, 
LwpObjectID aTableID)
 {
 // judge whole table
 LwpTable * pTable = dynamic_cast(aTableID.obj().get());
-LwpTableLayout * pTableLayout = pTable ? 
static_cast(pTable->GetTableLayout()) : nullptr;
+LwpTableLayout * pTableLayout = pTable ? 
dynamic_cast(pTable->GetTableLayout()) : nullptr;
 LwpSuperTableLayout * pSuper = pTableLayout ? 
pTableLayout->GetSuperTableLayout() : nullptr;
 if (pSuper && pSuper->IsProtected())
 {
diff --git a/lotuswordpro/source/filter/lwpfootnote.cxx 
b/lotuswordpro/source/filter/lwpfootnote.cxx
index 49b6083..0da512e 100644
--- a/lotuswordpro/source/filter/lwpfootnote.cxx
+++ b/lotuswordpro/source/filter/lwpfootnote.cxx
@@ -199,7 +199,7 @@ LwpCellLayout* LwpFootnote::GetCellLayout()
 LwpEnSuperTableLayout* pEnSuperLayout = FindFootnoteTableLayout();
 if(pEnSuperLayout)
 {
-LwpTableLayout* pTableLayout = 
static_cast(pEnSuperLayout->GetMainTableLayout());
+LwpTableLayout* pTableLayout = 
dynamic_cast(pEnSuperLayout->GetMainTableLayout());
 if(pTableLayout)
 {
 LwpRowLayout* pRowLayout = pTableLayout->GetRowLayout(m_nRow);
diff --git a/lotuswordpro/source/filter/lwptable.hxx 
b/lotuswordpro/source/filter/lwptable.hxx
index c9fa7da..f4fa013 100644
--- a/lotuswordpro/source/filter/lwptable.hxx
+++ b/lotuswordpro/source/filter/lwptable.hxx
@@ -119,7 +119,7 @@ public:
 LwpObjectID& GetDefaultCellStyle() {return m_DefaultCellStyle;}
 sal_uInt16 GetRow() {return m_nRow;}
 sal_uInt16 GetColumn() {return m_nColumn;}
-LwpTableLayout * GetTableLayout(){return static_cast(GetLayout(nullptr));}
+LwpTableLayout * GetTableLayout(){return dynamic_cast(GetLayout(nullptr));}
 bool IsNumberDown();
 virtual bool IsTable() override { return true;}
 LwpSuperTableLayout* GetSuperTableLayout();
diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx 
b/lotuswordpro/source/filter/lwptablelayout.cxx
index 735dd3e..e5b16c7 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -448,6 +448,7 @@ LwpCellLayout * LwpTableLayout::GetCellByRowCol(sal_uInt16 
nRow, sal_uInt16 nCol
 
 return m_WordProCellsMap[static_cast(nRow)*m_nCols + nCol];
 }
+
 /**
  * @short   traverse all table cells
  * @param
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwppagelayout.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 32368647339bf16c43899b29627030eb64893357
Author: Caolán McNamara 
Date:   Sun Dec 13 11:04:43 2015 +

protect against missing Foundry

Change-Id: Ie5c0317f842258fe42f894dbace0ea0e328f288a
(cherry picked from commit ddc7d96a399822c2f29dcaca8222dfb96c383576)

diff --git a/lotuswordpro/source/filter/lwppagelayout.cxx 
b/lotuswordpro/source/filter/lwppagelayout.cxx
index 3547661..e7fd45d 100644
--- a/lotuswordpro/source/filter/lwppagelayout.cxx
+++ b/lotuswordpro/source/filter/lwppagelayout.cxx
@@ -576,6 +576,8 @@ sal_Int32 LwpPageLayout::GetPageNumber(sal_uInt16 
nLayoutNumber)
 {
 sal_Int16 nPageNumber = -1;
 LwpFoundry* pFoundry = this->GetFoundry();
+if (!pFoundry)
+return nPageNumber;
 LwpDocument* pDoc = pFoundry->GetDocument();
 LwpDLVListHeadTailHolder* pHeadTail = 
dynamic_cast(pDoc->GetPageHintsID().obj().get());
 if(!pHeadTail) return nPageNumber;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 lotuswordpro/source/filter/lwppagelayout.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit ddc7d96a399822c2f29dcaca8222dfb96c383576
Author: Caolán McNamara 
Date:   Sun Dec 13 11:04:43 2015 +

protect against missing Foundry

Change-Id: Ie5c0317f842258fe42f894dbace0ea0e328f288a

diff --git a/lotuswordpro/source/filter/lwppagelayout.cxx 
b/lotuswordpro/source/filter/lwppagelayout.cxx
index 3547661..e7fd45d 100644
--- a/lotuswordpro/source/filter/lwppagelayout.cxx
+++ b/lotuswordpro/source/filter/lwppagelayout.cxx
@@ -576,6 +576,8 @@ sal_Int32 LwpPageLayout::GetPageNumber(sal_uInt16 
nLayoutNumber)
 {
 sal_Int16 nPageNumber = -1;
 LwpFoundry* pFoundry = this->GetFoundry();
+if (!pFoundry)
+return nPageNumber;
 LwpDocument* pDoc = pFoundry->GetDocument();
 LwpDLVListHeadTailHolder* pHeadTail = 
dynamic_cast(pDoc->GetPageHintsID().obj().get());
 if(!pHeadTail) return nPageNumber;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jean-Pierre Ledure]

 wizards/source/access2base/Database.xba |   29 +++--
 wizards/source/access2base/DoCmd.xba|2 +-
 2 files changed, 20 insertions(+), 11 deletions(-)

New commits:
commit 9d3adaaac8839b71f3960ebebbf5fa193f906219
Author: Jean-Pierre Ledure 
Date:   Sun Dec 13 11:29:49 2015 +0100

Access2Base - OutputTo action - support encoding in csv files

Change-Id: Icc4a631d67c3d4acf67de1cb38018c37602a16eb

diff --git a/wizards/source/access2base/Database.xba 
b/wizards/source/access2base/Database.xba
index 81a233e..05e7335 100644
--- a/wizards/source/access2base/Database.xba
+++ b/wizards/source/access2base/Database.xba
@@ -621,7 +621,7 @@ Const cstThisSub = Database.OutputTo
If IsMissing(pvTemplateFile) Then pvTemplateFile = 
If Not Utils._CheckArgument(pvTemplateFile, 6, vbString) Then Goto 
Exit_Function
If IsMissing(pvEncoding) Then pvEncoding = 0
-   If Not Utils._CheckArgument(pvEncoding, 7, _AddNumeric(), Array(0, 
acUTF8Encoding)) Then Goto Exit_Function
+   If Not Utils._CheckArgument(pvEncoding, 7, _AddNumeric()) Then Goto 
Exit_Function
If IsMissing(pvQuality) Then pvQuality = acExportQualityPrint
If Not Utils._CheckArgument(pvQuality, 7, _AddNumeric(), 
Array(acExportQualityPrint, acExportQualityScreen)) Then Goto Exit_Function
 
@@ -674,7 +674,7 @@ Dim sOutputFormat As String, iTemplate As Integer, 
iOutputFile As Integer, bOutp
Case UCase(acFormatXLS), XLSX
bOutput = _OutputToCalc(oTable, sOutputFile, 
acFormatXLSX)
Case UCase(acFormatTXT), TXT, CSV
-   bOutput = _OutputToCalc(oTable, sOutputFile, 
acFormatTXT)
+   bOutput = _OutputToCalc(oTable, sOutputFile, 
acFormatTXT, pvEncoding)
End Select
oTable.Dispose()

@@ -1010,7 +1010,7 @@ Error_Function:
 End Function DFunction   V1.1.0
 
 REM 
---
-Private Function _FilterOptionsDefault() As String
+Private Function _FilterOptionsDefault(ByVal plEncoding As Long) As String
  Return the default FilterOptions string for table/query export to csv
 
 Dim sFieldSeparator as string
@@ -1020,7 +1020,7 @@ Const cstTextDelimitor = 
If _DecimalPoint() = , Then sFieldSeparator = ; 
Else sFieldSeparator = cstComma
_FilteroptionsDefault = Trim(Str(Asc(sFieldSeparator))) _
 cstComma 
 Trim(Str(Asc(cstTextDelimitor))) _
-cstComma 
 Trim(Str(acUTF8Encoding)) _
+cstComma 
 Trim(Str(plEncoding)) _
 cstComma 
 1
 
 End Function _FilterOptionsDefault   V1.4.0
@@ -1296,7 +1296,11 @@ Dim i As Integer, l As Long
 End Function _OutputStringToHTML V1.4.0
 
 REM 
---
-Private Function _OutputToCalc(poData As Object, ByVal psOutputFile As String, 
psFilter As String) As Boolean
+Private Function _OutputToCalc(poData As Object _
+   , ByVal 
psOutputFile As String _
+   , ByVal 
psFilter As String _
+   , Optional 
ByVal plEncoding As Long _
+   ) As Boolean
  
https://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Database_Import
  
https://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Filter_Options
 
@@ -1306,6 +1310,7 @@ Dim oRange As Object, i As Integer, iCol As Integer, 
oColumns As Object
 
If _ErrorHandler() Then On Local Error Goto Error_Function
_OutputToCalc = False
+   If IsMissing(plEncoding) Then plEncoding = acUTF8Encoding
  Create a new OO-Calc-Document
Set oCalcDoc = StarDesktop.LoadComponentFromURL( _
private:factory/scalc _
@@ -1344,14 +1349,18 @@ Dim oRange As Object, i As Integer, iCol As Integer, 
oColumns As Object
For i = 0 To iCol - 1
oColumns.getByIndex(i).OptimalWidth = True
Next i
+   oCalcDoc.storeAsUrl(psOutputFile, Array( _
+   
_MakePropertyValue(FilterName, psFilter) _
+   , 
_MakePropertyValue(Overwrite, True) _
+   ))
Case Else
+   oCalcDoc.storeAsUrl(psOutputFile, Array( _
+   

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/xfilter/xftable.cxx |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 27f138b27b14827485e587cf924a227b8aabe91f
Author: Caolán McNamara 
Date:   Sun Dec 13 11:53:43 2015 +

guard against missing header rows

Change-Id: Iaa28ef00572eb9c4ba3a6d8ae0c668b7b0132f56
(cherry picked from commit 2487ba80581d8b0f50be40a26255789e1a050e95)

diff --git a/lotuswordpro/source/filter/xfilter/xftable.cxx 
b/lotuswordpro/source/filter/xfilter/xftable.cxx
index 9a96db8..d139a85 100644
--- a/lotuswordpro/source/filter/xfilter/xftable.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftable.cxx
@@ -104,9 +104,11 @@ void XFTable::AddRow(XFRow *pRow)
 m_aRows[row] = pRow;
 }
 
-voidXFTable::AddHeaderRow(XFRow *pRow)
+void XFTable::AddHeaderRow(XFRow *pRow)
 {
-if( !pRow )
+if( !pRow)
+return;
+if (!m_aHeaderRows.is())
 return;
 m_aHeaderRows->Add(pRow);
 }
@@ -207,7 +209,7 @@ voidXFTable::ToXml(IXFStream *pStrm)
 }
 }
 
-if( m_aHeaderRows->GetCount()>0 )
+if (m_aHeaderRows.is() && m_aHeaderRows->GetCount()>0)
 {
 pStrm->StartElement( "table:table-header-rows" );
 m_aHeaderRows->ToXml(pStrm);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

LO 5.1 build broken

[Jean-Baptiste Faure]

Hi,

LO 5.1 is currently broken. I get the following error message:

> [build LOC] libreoffice
> [build LOC] top level modules: libreoffice
> /home/jbf/LibO/lo51/workdir/CxxObject/sc/source/ui/view/reffact.o: In 
> function `ScValidationDlg::Close()':
> reffact.cxx:(.text._ZN15ScValidationDlg5CloseEv[_ZN15ScValidationDlg5CloseEv]+0x36):
>  undefined reference to `ScTPValidationValue::RemoveRefDlg()'
> /home/jbf/LibO/lo51/workdir/CxxObject/sc/source/ui/view/reffact.o: In 
> function `ScValidationDlg::dispose()':
> reffact.cxx:(.text._ZN15ScValidationDlg7disposeEv[_ZN15ScValidationDlg7disposeEv]+0x10):
>  undefined reference to `ScValidationDlg::RemoveRefDlg(bool)'
> collect2: error: ld returned 1 exit status
> /home/jbf/LibO/lo51/sc/Library_sc.mk:10: recipe for target 
> '/home/jbf/LibO/lo51/instdir/program/libsclo.so' failed
> make[1]: *** [/home/jbf/LibO/lo51/instdir/program/libsclo.so] Error 1
> Makefile:244: recipe for target 'build' failed
> make: *** [build] Error 2

My last successful build was incremental and for this buildID:
Version: 5.1.0.0.beta2+
Build ID: 8f63516df72b49e9347d90750f6d3ef3d4a1813f
Threads 4; Ver: 4.2; Render: default;
Ubuntu_15.10_x86-64
Locale : fr-FR (fr_FR.UTF-8)

Last night I did a complete rebuild (make distclean -> ./autogen.sh ->
make). I just changed optimization option from -O2 to -O3 for gcc
(version 5.2). What I do not undeerstand is why, when I reset my local
repository to commit 8f63516df72b49e9347d90750f6d3ef3d4a1813f, now I get
the same build error. Is it possible that the cause could be the change
I made for the optimization level?

Best regards.
JBF

-- 
Seuls des formats ouverts peuvent assurer la pérennité de vos documents.
Disclaimer: my Internet Provider being located in France, each of our
exchanges over Internet will be scanned by French spying services.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - 2 commits - lotuswordpro/source

[Julien Nabet]

 lotuswordpro/source/filter/lwpdoc.hxx |4 +--
 lotuswordpro/source/filter/lwplayout.cxx  |   31 +++---
 lotuswordpro/source/filter/lwplayout.hxx  |   24 ++--
 lotuswordpro/source/filter/lwptablelayout.cxx |3 ++
 4 files changed, 41 insertions(+), 21 deletions(-)

New commits:
commit e3bbae56ad6b901053e86b8333c5e28baebac98a
Author: Julien Nabet 
Date:   Sun Dec 13 09:17:02 2015 +0100

cppcheck: fix memleak in lotuswordpro

Change-Id: I15b8aa6b95264d56018fbd5c22bcb0d04e43cf91
(cherry picked from commit 6e1efd486dfd5a4bcff1405158c9e40e0c2b6524)

diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx 
b/lotuswordpro/source/filter/lwptablelayout.cxx
index 902795c..735dd3e 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -580,7 +580,10 @@ void LwpTableLayout::RegisterColumns()
 {
 auto nColId = pColumnLayout->GetColumnID();
 if (nColId >= nCols)
+{
+delete [] pWidthCalculated;
 throw std::range_error("corrupt LwpTableLayout");
+}
 m_pColumns[nColId] = pColumnLayout;
 if (!pColumnLayout->IsJustifiable())
 {
commit c5ceb92be59f805a1824f8679250564775050552
Author: Caolán McNamara 
Date:   Sun Dec 13 09:34:01 2015 +

infinite recurse protection

Change-Id: I7139e67e7b5bcd7e1867dff1cfbd53fa0f5748b7
(cherry picked from commit fb8cba16caa87bf21fdd2747b22d90d913557dac)

diff --git a/lotuswordpro/source/filter/lwpdoc.hxx 
b/lotuswordpro/source/filter/lwpdoc.hxx
index ad9d5fd..17ab35d 100644
--- a/lotuswordpro/source/filter/lwpdoc.hxx
+++ b/lotuswordpro/source/filter/lwpdoc.hxx
@@ -132,7 +132,7 @@ public:
 void RegisterStyle() override;
 
 inline bool IsChildDoc();
-inline bool HonorProtection();
+inline bool GetHonorProtection();
 inline LwpObjectID& GetDocData();
 inline LwpObjectID& GetSocket();
 
@@ -176,7 +176,7 @@ inline bool LwpDocument::IsChildDoc()
 {
 return (m_nPersistentFlags & DOC_CHILDDOC) != 0;
 }
-inline bool LwpDocument::HonorProtection()
+inline bool LwpDocument::GetHonorProtection()
 {
 return (m_nPersistentFlags & DOC_PROTECTED) != 0;
 }
diff --git a/lotuswordpro/source/filter/lwplayout.cxx 
b/lotuswordpro/source/filter/lwplayout.cxx
index 1bef408..86a1863 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -73,6 +73,7 @@
 
 LwpVirtualLayout::LwpVirtualLayout(LwpObjectHeader , LwpSvStream* pStrm)
 : LwpDLNFPVList(objHdr, pStrm)
+, m_bGettingHonorProtection(false)
 , m_nAttributes(0)
 , m_nAttributes2(0)
 , m_nAttributes3(0)
@@ -139,20 +140,16 @@ bool LwpVirtualLayout::HonorProtection()
 return false;
 
 LwpVirtualLayout* pParent = dynamic_cast 
(GetParent().obj().get());
-if (pParent && !pParent->IsHeader() && pParent != this)
+if (pParent && !pParent->IsHeader())
 {
-return pParent->HonorProtection();
+return pParent->GetHonorProtection();
 }
 
 if(m_pFoundry)//is null now
 {
 LwpDocument* pDoc = m_pFoundry->GetDocument();
-/*if(pDoc)
-{
-return pDoc->HonorProtection();
-}*/
 if(pDoc && pDoc->GetRootDocument())
-return pDoc->GetRootDocument()->HonorProtection();
+return pDoc->GetRootDocument()->GetHonorProtection();
 }
 
 return true;
@@ -169,7 +166,7 @@ bool LwpVirtualLayout::IsProtected()
 LwpVirtualLayout* pParent = dynamic_cast 
(GetParent().obj().get());
 if(pParent && !pParent->IsHeader())
 {
-if(pParent->HonorProtection()&&(pParent->HasProtection()||bProtected))
+
if(pParent->GetHonorProtection()&&(pParent->GetHasProtection()||bProtected))
 {
 return true;
 }
@@ -179,7 +176,7 @@ bool LwpVirtualLayout::IsProtected()
 LwpDocument* pDoc = m_pFoundry->GetDocument();
 if(pDoc)
 {
-if (pDoc->HonorProtection() && bProtected)
+if (pDoc->GetHonorProtection() && bProtected)
 {
 return true;
 }
@@ -199,9 +196,9 @@ bool LwpVirtualLayout::HasProtection()
 return true;
 
 LwpVirtualLayout* pParent = dynamic_cast 
(GetParent().obj().get());
-if (pParent && !pParent->IsHeader() && pParent != this)
+if (pParent && !pParent->IsHeader())
 {
-return pParent->HasProtection();
+return pParent->GetHasProtection();
 }
 
 return false;
@@ -1235,9 +1232,9 @@ bool LwpMiddleLayout::HonorProtection()
 return false;
 
 LwpVirtualLayout* pParent = dynamic_cast 
(GetParent().obj().get());
-if(pParent && !pParent->IsHeader())
+if (pParent && !pParent->IsHeader())
 {
-return 

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

[Caolán McNamara]

 lotuswordpro/source/filter/lwpdoc.hxx|4 ++--
 lotuswordpro/source/filter/lwplayout.cxx |   31 ++-
 lotuswordpro/source/filter/lwplayout.hxx |   24 ++--
 3 files changed, 38 insertions(+), 21 deletions(-)

New commits:
commit fb8cba16caa87bf21fdd2747b22d90d913557dac
Author: Caolán McNamara 
Date:   Sun Dec 13 09:34:01 2015 +

infinite recurse protection

Change-Id: I7139e67e7b5bcd7e1867dff1cfbd53fa0f5748b7

diff --git a/lotuswordpro/source/filter/lwpdoc.hxx 
b/lotuswordpro/source/filter/lwpdoc.hxx
index ad9d5fd..17ab35d 100644
--- a/lotuswordpro/source/filter/lwpdoc.hxx
+++ b/lotuswordpro/source/filter/lwpdoc.hxx
@@ -132,7 +132,7 @@ public:
 void RegisterStyle() override;
 
 inline bool IsChildDoc();
-inline bool HonorProtection();
+inline bool GetHonorProtection();
 inline LwpObjectID& GetDocData();
 inline LwpObjectID& GetSocket();
 
@@ -176,7 +176,7 @@ inline bool LwpDocument::IsChildDoc()
 {
 return (m_nPersistentFlags & DOC_CHILDDOC) != 0;
 }
-inline bool LwpDocument::HonorProtection()
+inline bool LwpDocument::GetHonorProtection()
 {
 return (m_nPersistentFlags & DOC_PROTECTED) != 0;
 }
diff --git a/lotuswordpro/source/filter/lwplayout.cxx 
b/lotuswordpro/source/filter/lwplayout.cxx
index 1bef408..86a1863 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -73,6 +73,7 @@
 
 LwpVirtualLayout::LwpVirtualLayout(LwpObjectHeader , LwpSvStream* pStrm)
 : LwpDLNFPVList(objHdr, pStrm)
+, m_bGettingHonorProtection(false)
 , m_nAttributes(0)
 , m_nAttributes2(0)
 , m_nAttributes3(0)
@@ -139,20 +140,16 @@ bool LwpVirtualLayout::HonorProtection()
 return false;
 
 LwpVirtualLayout* pParent = dynamic_cast 
(GetParent().obj().get());
-if (pParent && !pParent->IsHeader() && pParent != this)
+if (pParent && !pParent->IsHeader())
 {
-return pParent->HonorProtection();
+return pParent->GetHonorProtection();
 }
 
 if(m_pFoundry)//is null now
 {
 LwpDocument* pDoc = m_pFoundry->GetDocument();
-/*if(pDoc)
-{
-return pDoc->HonorProtection();
-}*/
 if(pDoc && pDoc->GetRootDocument())
-return pDoc->GetRootDocument()->HonorProtection();
+return pDoc->GetRootDocument()->GetHonorProtection();
 }
 
 return true;
@@ -169,7 +166,7 @@ bool LwpVirtualLayout::IsProtected()
 LwpVirtualLayout* pParent = dynamic_cast 
(GetParent().obj().get());
 if(pParent && !pParent->IsHeader())
 {
-if(pParent->HonorProtection()&&(pParent->HasProtection()||bProtected))
+
if(pParent->GetHonorProtection()&&(pParent->GetHasProtection()||bProtected))
 {
 return true;
 }
@@ -179,7 +176,7 @@ bool LwpVirtualLayout::IsProtected()
 LwpDocument* pDoc = m_pFoundry->GetDocument();
 if(pDoc)
 {
-if (pDoc->HonorProtection() && bProtected)
+if (pDoc->GetHonorProtection() && bProtected)
 {
 return true;
 }
@@ -199,9 +196,9 @@ bool LwpVirtualLayout::HasProtection()
 return true;
 
 LwpVirtualLayout* pParent = dynamic_cast 
(GetParent().obj().get());
-if (pParent && !pParent->IsHeader() && pParent != this)
+if (pParent && !pParent->IsHeader())
 {
-return pParent->HasProtection();
+return pParent->GetHasProtection();
 }
 
 return false;
@@ -1235,9 +1232,9 @@ bool LwpMiddleLayout::HonorProtection()
 return false;
 
 LwpVirtualLayout* pParent = dynamic_cast 
(GetParent().obj().get());
-if(pParent && !pParent->IsHeader())
+if (pParent && !pParent->IsHeader())
 {
-return pParent->HonorProtection();
+return pParent->GetHonorProtection();
 }
 
 if(m_pFoundry)//is null now
@@ -1245,13 +1242,13 @@ bool LwpMiddleLayout::HonorProtection()
 LwpDocument* pDoc = m_pFoundry->GetDocument();
 if(pDoc)
 {
-return pDoc->HonorProtection();
+return pDoc->GetHonorProtection();
 }
 }
 }
 else if (LwpMiddleLayout* pLay = dynamic_cast 
(GetBasedOnStyle().get()))
 {
-return pLay->HonorProtection();
+return pLay->GetHonorProtection();
 }
 
 return LwpVirtualLayout::HonorProtection();
@@ -1282,7 +1279,7 @@ bool LwpMiddleLayout::IsProtected()
 if(pParent->IsProtected())
 return true;
 
-if(pParent->HonorProtection())
+if(pParent->GetHonorProtection())
 return bProtected;
 
 /* If our parent isn't honoring protection then we aren't protected. */
@@ -1294,7 +1291,7 @@ bool LwpMiddleLayout::IsProtected()
 LwpDocument* pDoc = 

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

[Maxim Monastirsky]

 cui/source/customize/cfg.cxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 9e820dc8e6e8ebc65e3afad813755422bef33c63
Author: Maxim Monastirsky 
Date:   Sun Dec 13 11:07:45 2015 +0200

Get rid of this env. variable

Change-Id: I70222eaef9ab77f74bd7e200a3c4e849dcc4542f

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 4d50289..2b1cd622 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -815,10 +815,7 @@ SvxConfigDialog::SvxConfigDialog(vcl::Window * pParent, 
const SfxItemSet* pInSet
 InitImageType();
 
 m_nMenusPageId = AddTabPage("menus", CreateSvxMenuConfigPage, nullptr);
-if ( getenv("LO_USE_NEWCONTEXTMENU") )
-m_nContextMenusPageId = AddTabPage("contextmenus", 
CreateSvxContextMenuConfigPage, nullptr);
-else
-RemoveTabPage("contextmenus");
+m_nContextMenusPageId = AddTabPage("contextmenus", 
CreateSvxContextMenuConfigPage, nullptr);
 m_nKeyboardPageId = AddTabPage("keyboard", CreateKeyboardConfigPage, 
nullptr);
 m_nToolbarsPageId = AddTabPage("toolbars", CreateSvxToolbarConfigPage, 
nullptr);
 m_nEventsPageId = AddTabPage("events", CreateSvxEventConfigPage, nullptr);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwpcelllayout.cxx  |5 +
 lotuswordpro/source/filter/lwpfootnote.cxx|2 +-
 lotuswordpro/source/filter/lwptable.hxx   |2 +-
 lotuswordpro/source/filter/lwptablelayout.cxx |1 +
 4 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit a505944f54421ed112f594ea14d29b6ea7a47f85
Author: Caolán McNamara 
Date:   Sun Dec 13 10:24:33 2015 +

need more dynamic casts here

Change-Id: Idf84ababeeb109a411c03a18d3a9aa6e136c7ef4
(cherry picked from commit 5d8449cd14aa3d08929bb25626ab54aa7515f47d)

diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx 
b/lotuswordpro/source/filter/lwpcelllayout.cxx
index da49507..76faa62 100644
--- a/lotuswordpro/source/filter/lwpcelllayout.cxx
+++ b/lotuswordpro/source/filter/lwpcelllayout.cxx
@@ -422,10 +422,7 @@ LwpObjectID * LwpCellLayout::GetPreviousCellStory()
 LwpCellBorderType LwpCellLayout::GetCellBorderType(sal_uInt16 nRow, sal_uInt16 
nCol, LwpTableLayout * pTableLayout)
 {
 if (!pTableLayout)
-{
-assert(false);
 return enumWholeBorder;
-}
 
 // get left cell and judge if neighbour border is different
 XFBorders * pBorders = GetXFBorders();
@@ -664,7 +661,7 @@ void LwpCellLayout::ApplyProtect(XFCell * pCell, 
LwpObjectID aTableID)
 {
 // judge whole table
 LwpTable * pTable = dynamic_cast(aTableID.obj().get());
-LwpTableLayout * pTableLayout = pTable ? 
static_cast(pTable->GetTableLayout()) : nullptr;
+LwpTableLayout * pTableLayout = pTable ? 
dynamic_cast(pTable->GetTableLayout()) : nullptr;
 LwpSuperTableLayout * pSuper = pTableLayout ? 
pTableLayout->GetSuperTableLayout() : nullptr;
 if (pSuper && pSuper->IsProtected())
 {
diff --git a/lotuswordpro/source/filter/lwpfootnote.cxx 
b/lotuswordpro/source/filter/lwpfootnote.cxx
index 49b6083..0da512e 100644
--- a/lotuswordpro/source/filter/lwpfootnote.cxx
+++ b/lotuswordpro/source/filter/lwpfootnote.cxx
@@ -199,7 +199,7 @@ LwpCellLayout* LwpFootnote::GetCellLayout()
 LwpEnSuperTableLayout* pEnSuperLayout = FindFootnoteTableLayout();
 if(pEnSuperLayout)
 {
-LwpTableLayout* pTableLayout = 
static_cast(pEnSuperLayout->GetMainTableLayout());
+LwpTableLayout* pTableLayout = 
dynamic_cast(pEnSuperLayout->GetMainTableLayout());
 if(pTableLayout)
 {
 LwpRowLayout* pRowLayout = pTableLayout->GetRowLayout(m_nRow);
diff --git a/lotuswordpro/source/filter/lwptable.hxx 
b/lotuswordpro/source/filter/lwptable.hxx
index c9fa7da..f4fa013 100644
--- a/lotuswordpro/source/filter/lwptable.hxx
+++ b/lotuswordpro/source/filter/lwptable.hxx
@@ -119,7 +119,7 @@ public:
 LwpObjectID& GetDefaultCellStyle() {return m_DefaultCellStyle;}
 sal_uInt16 GetRow() {return m_nRow;}
 sal_uInt16 GetColumn() {return m_nColumn;}
-LwpTableLayout * GetTableLayout(){return static_cast(GetLayout(nullptr));}
+LwpTableLayout * GetTableLayout(){return dynamic_cast(GetLayout(nullptr));}
 bool IsNumberDown();
 virtual bool IsTable() override { return true;}
 LwpSuperTableLayout* GetSuperTableLayout();
diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx 
b/lotuswordpro/source/filter/lwptablelayout.cxx
index 735dd3e..e5b16c7 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -448,6 +448,7 @@ LwpCellLayout * LwpTableLayout::GetCellByRowCol(sal_uInt16 
nRow, sal_uInt16 nCol
 
 return m_WordProCellsMap[static_cast(nRow)*m_nCols + nCol];
 }
+
 /**
  * @short   traverse all table cells
  * @param
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libvisio.git: src/lib

[Fridrich Štrba]

 src/lib/VSD6Parser.cpp  |4 +++-
 src/lib/VSDContentCollector.cpp |4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 037e82fcaaacb3b6b68e54f424398e7260d64a62
Author: Fridrich Å trba 
Date:   Mon Dec 14 03:22:58 2015 +0100

Improved handling of stencil text

Change-Id: I8fdae37eec051998b9e4b88b0a6116167da71eae

diff --git a/src/lib/VSD6Parser.cpp b/src/lib/VSD6Parser.cpp
index a9e91fa..d38454e 100644
--- a/src/lib/VSD6Parser.cpp
+++ b/src/lib/VSD6Parser.cpp
@@ -78,8 +78,10 @@ void 
libvisio::VSD6Parser::readText(librevenge::RVNGInputStream *input)
 }
 textStream.append(tmpBuffer, numBytesRead);
 m_shape.m_text = textStream;
-m_shape.m_textFormat = libvisio::VSD_TEXT_ANSI;
   }
+  else
+m_shape.m_text.clear();
+  m_shape.m_textFormat = libvisio::VSD_TEXT_ANSI;
 }
 
 void libvisio::VSD6Parser::readLayerMem(librevenge::RVNGInputStream *input)
diff --git a/src/lib/VSDContentCollector.cpp b/src/lib/VSDContentCollector.cpp
index 0037bd2..79d351f 100644
--- a/src/lib/VSDContentCollector.cpp
+++ b/src/lib/VSDContentCollector.cpp
@@ -1977,8 +1977,8 @@ void libvisio::VSDContentCollector::collectShape(unsigned 
id, unsigned level, un
   _handleForeignData(m_stencilShape->m_foreign->data);
 }
 
-m_textStream = m_stencilShape->m_text;
-m_textFormat = m_stencilShape->m_textFormat;
+// m_textStream = m_stencilShape->m_text;
+// m_textFormat = m_stencilShape->m_textFormat;
 
 for (std::map< unsigned, VSDName>::const_iterator iterData = 
m_stencilShape->m_names.begin(); iterData != m_stencilShape->m_names.end(); 
++iterData)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet]

 vcl/win/gdi/gdiimpl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bdafd030e5aabc127fb18229968af1ae061359a8
Author: Julien Nabet 
Date:   Sun Dec 13 11:43:02 2015 +0100

Blind fix for TB Win64Dbg

Regression from 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=1321ae8ceba1801cd75322d6cf51ab53bac86b2a

Change-Id: Iba9e9560e34d9107787d117a7cfff82349b7f933
Reviewed-on: https://gerrit.libreoffice.org/20680
Reviewed-by: Tomaž Vajngerl 
Tested-by: Tomaž Vajngerl 

diff --git a/vcl/win/gdi/gdiimpl.cxx b/vcl/win/gdi/gdiimpl.cxx
index 8af9909..2d86dbe 100644
--- a/vcl/win/gdi/gdiimpl.cxx
+++ b/vcl/win/gdi/gdiimpl.cxx
@@ -2310,7 +2310,7 @@ bool WinSalGraphicsImpl::drawTransformedBitmap(
 const SalBitmap* pAlphaBitmap)
 {
 assert(dynamic_cast());
-assert(dynamic_cast());
+assert(dynamic_cast(pAlphaBitmap));
 
 const WinSalBitmap& rSalBitmap = static_cast< const WinSalBitmap& 
>(rSourceBitmap);
 const WinSalBitmap* pSalAlpha = static_cast< const WinSalBitmap* 
>(pAlphaBitmap);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Is there a project as Freemind or Planview in LibreOffice?

[Olivier Lenoir]

  
  
Is there a project as Freemind or Planview in LibreOffice?

Thanks
-- 
  Olivier Lenoir
  13 av de la Porte Chaumont 
  75019 Paris
  +33688965603
  09 53 97 60 82
  
  Free software user for 24 years ago
  Linux user since 1998, You won't find me on FaceB??!
  www.ubuntu.com, www.odoo.com,
  www.musescore.org, www.libreoffice.org.. 
  

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

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwplayout.cxx  |   10 
 lotuswordpro/source/filter/lwppagelayout.cxx  |   30 +-
 lotuswordpro/source/filter/lwptablelayout.cxx |5 
 3 files changed, 21 insertions(+), 24 deletions(-)

New commits:
commit 6fee415ec54c1386cbabb10bec0d7f6e28e17987
Author: Caolán McNamara 
Date:   Sun Dec 13 12:29:29 2015 +

deploy references to keep layout alive long enough

Change-Id: I670f00b0beb77e5014c3dd4a4798e69ece882b87
(cherry picked from commit 1deae8a2d92747ad69b024513ddae93cc8927d29)

diff --git a/lotuswordpro/source/filter/lwplayout.cxx 
b/lotuswordpro/source/filter/lwplayout.cxx
index 3e58fa9..e4a9112 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -330,12 +330,12 @@ LwpVirtualLayout* LwpVirtualLayout::GetParentLayout()
 void LwpVirtualLayout::RegisterChildStyle()
 {
 //Register all children styles
-LwpVirtualLayout* pLayout = 
dynamic_cast(GetChildHead().obj().get());
-while(pLayout)
+rtl::Reference 
xLayout(dynamic_cast(GetChildHead().obj().get()));
+while (xLayout.is())
 {
-pLayout->SetFoundry(m_pFoundry);
-pLayout->RegisterStyle();
-pLayout = 
dynamic_cast(pLayout->GetNext().obj().get());
+xLayout->SetFoundry(m_pFoundry);
+xLayout->RegisterStyle();
+
xLayout.set(dynamic_cast(xLayout->GetNext().obj().get()));
 }
 }
 
diff --git a/lotuswordpro/source/filter/lwppagelayout.cxx 
b/lotuswordpro/source/filter/lwppagelayout.cxx
index e7fd45d..cd29157 100644
--- a/lotuswordpro/source/filter/lwppagelayout.cxx
+++ b/lotuswordpro/source/filter/lwppagelayout.cxx
@@ -503,24 +503,24 @@ void LwpPageLayout::ResetXFColumns()
 
 LwpHeaderLayout* LwpPageLayout::GetHeaderLayout()
 {
-LwpVirtualLayout* pLay = 
dynamic_cast(GetChildHead().obj().get());
-while(pLay)
+rtl::Reference 
xLay(dynamic_cast(GetChildHead().obj().get()));
+while (xLay.is())
 {
-if( pLay->GetLayoutType() == LWP_HEADER_LAYOUT )
-return ( static_cast (pLay) );
-pLay = dynamic_cast (pLay->GetNext().obj().get());
+if (xLay->GetLayoutType() == LWP_HEADER_LAYOUT)
+return dynamic_cast(xLay.get());
+xLay.set(dynamic_cast(xLay->GetNext().obj().get()));
 }
 return nullptr;
 }
 
 LwpFooterLayout* LwpPageLayout::GetFooterLayout()
 {
-LwpVirtualLayout* pLay = 
dynamic_cast(GetChildHead().obj().get());
-while(pLay)
+rtl::Reference 
xLay(dynamic_cast(GetChildHead().obj().get()));
+while (xLay.is())
 {
-if( pLay->GetLayoutType() == LWP_FOOTER_LAYOUT )
-return ( static_cast (pLay) );
-pLay = dynamic_cast (pLay->GetNext().obj().get());
+if (xLay->GetLayoutType() == LWP_FOOTER_LAYOUT)
+return dynamic_cast(xLay.get());
+xLay.set(dynamic_cast(xLay->GetNext().obj().get()));
 }
 return nullptr;
 }
@@ -533,19 +533,19 @@ LwpPageLayout* LwpPageLayout::GetOddChildLayout()
 {
 if(IsComplex())
 {
-LwpVirtualLayout* pLay = 
dynamic_cast(GetChildHead().obj().get());
-while(pLay)
+rtl::Reference 
xLay(dynamic_cast(GetChildHead().obj().get()));
+while (xLay.is())
 {
-if( pLay->GetLayoutType() == LWP_PAGE_LAYOUT )
+if (xLay->GetLayoutType() == LWP_PAGE_LAYOUT)
 {
-LwpPageLayout* pPageLayout = static_cast 
(pLay);
+LwpPageLayout* pPageLayout = 
static_cast(xLay.get());
 LwpUseWhen* pUseWhen = pPageLayout->GetUseWhen();
 if(pUseWhen && pUseWhen->IsUseOnAllOddPages())
 {
 return pPageLayout;
 }
 }
-pLay = dynamic_cast 
(pLay->GetNext().obj().get());
+
xLay.set(dynamic_cast(xLay->GetNext().obj().get()));
 }
 }
 return nullptr;
diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx 
b/lotuswordpro/source/filter/lwptablelayout.cxx
index e5b16c7..9783531 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -691,11 +691,8 @@ void LwpTableLayout::RegisterStyle()
 {
 // get super table layout
 LwpSuperTableLayout * pSuper = GetSuperTableLayout();
-if(!pSuper)
-{
-assert(false);
+if (!pSuper)
 return;
-}
 
 // get table
 LwpTable * pTable = GetTable();
___
Libreoffice-commits mailing list

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

[Caolán McNamara]

 lotuswordpro/source/filter/lwplayout.cxx  |   10 
 lotuswordpro/source/filter/lwppagelayout.cxx  |   30 +-
 lotuswordpro/source/filter/lwptablelayout.cxx |5 
 3 files changed, 21 insertions(+), 24 deletions(-)

New commits:
commit 1deae8a2d92747ad69b024513ddae93cc8927d29
Author: Caolán McNamara 
Date:   Sun Dec 13 12:29:29 2015 +

deploy references to keep layout alive long enough

Change-Id: I670f00b0beb77e5014c3dd4a4798e69ece882b87

diff --git a/lotuswordpro/source/filter/lwplayout.cxx 
b/lotuswordpro/source/filter/lwplayout.cxx
index 3e58fa9..e4a9112 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -330,12 +330,12 @@ LwpVirtualLayout* LwpVirtualLayout::GetParentLayout()
 void LwpVirtualLayout::RegisterChildStyle()
 {
 //Register all children styles
-LwpVirtualLayout* pLayout = 
dynamic_cast(GetChildHead().obj().get());
-while(pLayout)
+rtl::Reference 
xLayout(dynamic_cast(GetChildHead().obj().get()));
+while (xLayout.is())
 {
-pLayout->SetFoundry(m_pFoundry);
-pLayout->RegisterStyle();
-pLayout = 
dynamic_cast(pLayout->GetNext().obj().get());
+xLayout->SetFoundry(m_pFoundry);
+xLayout->RegisterStyle();
+
xLayout.set(dynamic_cast(xLayout->GetNext().obj().get()));
 }
 }
 
diff --git a/lotuswordpro/source/filter/lwppagelayout.cxx 
b/lotuswordpro/source/filter/lwppagelayout.cxx
index e7fd45d..cd29157 100644
--- a/lotuswordpro/source/filter/lwppagelayout.cxx
+++ b/lotuswordpro/source/filter/lwppagelayout.cxx
@@ -503,24 +503,24 @@ void LwpPageLayout::ResetXFColumns()
 
 LwpHeaderLayout* LwpPageLayout::GetHeaderLayout()
 {
-LwpVirtualLayout* pLay = 
dynamic_cast(GetChildHead().obj().get());
-while(pLay)
+rtl::Reference 
xLay(dynamic_cast(GetChildHead().obj().get()));
+while (xLay.is())
 {
-if( pLay->GetLayoutType() == LWP_HEADER_LAYOUT )
-return ( static_cast (pLay) );
-pLay = dynamic_cast (pLay->GetNext().obj().get());
+if (xLay->GetLayoutType() == LWP_HEADER_LAYOUT)
+return dynamic_cast(xLay.get());
+xLay.set(dynamic_cast(xLay->GetNext().obj().get()));
 }
 return nullptr;
 }
 
 LwpFooterLayout* LwpPageLayout::GetFooterLayout()
 {
-LwpVirtualLayout* pLay = 
dynamic_cast(GetChildHead().obj().get());
-while(pLay)
+rtl::Reference 
xLay(dynamic_cast(GetChildHead().obj().get()));
+while (xLay.is())
 {
-if( pLay->GetLayoutType() == LWP_FOOTER_LAYOUT )
-return ( static_cast (pLay) );
-pLay = dynamic_cast (pLay->GetNext().obj().get());
+if (xLay->GetLayoutType() == LWP_FOOTER_LAYOUT)
+return dynamic_cast(xLay.get());
+xLay.set(dynamic_cast(xLay->GetNext().obj().get()));
 }
 return nullptr;
 }
@@ -533,19 +533,19 @@ LwpPageLayout* LwpPageLayout::GetOddChildLayout()
 {
 if(IsComplex())
 {
-LwpVirtualLayout* pLay = 
dynamic_cast(GetChildHead().obj().get());
-while(pLay)
+rtl::Reference 
xLay(dynamic_cast(GetChildHead().obj().get()));
+while (xLay.is())
 {
-if( pLay->GetLayoutType() == LWP_PAGE_LAYOUT )
+if (xLay->GetLayoutType() == LWP_PAGE_LAYOUT)
 {
-LwpPageLayout* pPageLayout = static_cast 
(pLay);
+LwpPageLayout* pPageLayout = 
static_cast(xLay.get());
 LwpUseWhen* pUseWhen = pPageLayout->GetUseWhen();
 if(pUseWhen && pUseWhen->IsUseOnAllOddPages())
 {
 return pPageLayout;
 }
 }
-pLay = dynamic_cast 
(pLay->GetNext().obj().get());
+
xLay.set(dynamic_cast(xLay->GetNext().obj().get()));
 }
 }
 return nullptr;
diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx 
b/lotuswordpro/source/filter/lwptablelayout.cxx
index e5b16c7..9783531 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -691,11 +691,8 @@ void LwpTableLayout::RegisterStyle()
 {
 // get super table layout
 LwpSuperTableLayout * pSuper = GetSuperTableLayout();
-if(!pSuper)
-{
-assert(false);
+if (!pSuper)
 return;
-}
 
 // get table
 LwpTable * pTable = GetTable();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org

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

[Jean-Pierre Ledure]

 wizards/source/access2base/Database.xba |   15 ---
 1 file changed, 4 insertions(+), 11 deletions(-)

New commits:
commit ad23fb096d8f65346bf5f0f5095f718532a32941
Author: Jean-Pierre Ledure 
Date:   Sun Dec 13 16:06:00 2015 +0100

Access2Base - OutputTo action more concise

Simplified use of TableDefs and QueryDefs collections

Change-Id: I87c5dcbbb1105c61324a0a89929f13ff86eab4a4

diff --git a/wizards/source/access2base/Database.xba 
b/wizards/source/access2base/Database.xba
index 05e7335..b54915f 100644
--- a/wizards/source/access2base/Database.xba
+++ b/wizards/source/access2base/Database.xba
@@ -625,19 +625,12 @@ Const cstThisSub = Database.OutputTo
If IsMissing(pvQuality) Then pvQuality = acExportQualityPrint
If Not Utils._CheckArgument(pvQuality, 7, _AddNumeric(), 
Array(acExportQualityPrint, acExportQualityScreen)) Then Goto Exit_Function
 
-Dim sOutputFile As String, bFound As Boolean, i As Integer, iCount As Integer, 
oTable As Object
+Dim sOutputFile As String, oTable As Object
 Dim sOutputFormat As String, iTemplate As Integer, iOutputFile As Integer, 
bOutput As Boolean, sSuffix As String
+
Find applicable table or query
-   bFound = False
-   If pvObjectType = acOutputTable Then iCount = TableDefs.Count Else 
iCount = Querydefs.Count
-   For i = 0 To iCount
-   If pvObjectType = acOutputTable Then Set oTable = TableDefs(i) 
Else Set oTable = Querydefs(i)
-   If UCase(oTable._Name) = UCase(pvObjectName) Then
-   bFound = True
-   Exit For
-   End If
-   Next i
-   If Not bFound Then Goto Error_NotFound
+   If pvObjectType = acOutputTable Then Set oTable = 
TableDefs(pvObjectName, True) Else Set oTable = Querydefs(pvObjectName, True)
+   If IsNull(oTable) Then Goto Error_NotFound

Determine format and parameters
If pvOutputFormat =  Then
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 lotuswordpro/source/filter/lwpcelllayout.cxx  |6 +-
 lotuswordpro/source/filter/lwpcontent.cxx |   20 --
 lotuswordpro/source/filter/lwpcontent.hxx |2 
 lotuswordpro/source/filter/lwpfootnote.cxx|4 -
 lotuswordpro/source/filter/lwpgrfobj.cxx  |4 -
 lotuswordpro/source/filter/lwplayout.cxx  |   54 --
 lotuswordpro/source/filter/lwplayout.hxx  |2 
 lotuswordpro/source/filter/lwpoleobject.cxx   |6 +-
 lotuswordpro/source/filter/lwppara1.cxx   |6 +-
 lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx |   16 ++---
 lotuswordpro/source/filter/lwpstory.cxx   |   54 +-
 lotuswordpro/source/filter/lwpstory.hxx   |2 
 lotuswordpro/source/filter/lwptable.hxx   |5 +
 13 files changed, 94 insertions(+), 87 deletions(-)

New commits:
commit a1426bc54b11eb48fdefaf7e8dfd7996e5c7e4d5
Author: Caolán McNamara 
Date:   Sun Dec 13 15:33:37 2015 +

use more references to fix life cycles

Change-Id: I0c903533542608c1d7a3c97e2be7f2b7624b265b

diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx 
b/lotuswordpro/source/filter/lwpcelllayout.cxx
index 0a8356d..8efc821b 100644
--- a/lotuswordpro/source/filter/lwpcelllayout.cxx
+++ b/lotuswordpro/source/filter/lwpcelllayout.cxx
@@ -327,7 +327,7 @@ XFCell* LwpCellLayout::ConvertCell(LwpObjectID aTableID, 
sal_uInt16 nRow, sal_uI
 // we should adjust its style by current position
 if (pTable->GetDefaultCellStyle() == GetObjectID())
 {
-aStyleName = GetCellStyleName(nRow, nCol, pTable->GetTableLayout());
+aStyleName = GetCellStyleName(nRow, nCol, 
pTable->GetTableLayout().get());
 }
 
 // content of cell
@@ -661,8 +661,8 @@ void LwpCellLayout::ApplyProtect(XFCell * pCell, 
LwpObjectID aTableID)
 {
 // judge whole table
 LwpTable * pTable = dynamic_cast(aTableID.obj().get());
-LwpTableLayout * pTableLayout = pTable ? 
dynamic_cast(pTable->GetTableLayout()) : nullptr;
-LwpSuperTableLayout * pSuper = pTableLayout ? 
pTableLayout->GetSuperTableLayout() : nullptr;
+rtl::Reference xTableLayout(pTable ? 
pTable->GetTableLayout() : nullptr);
+LwpSuperTableLayout * pSuper = xTableLayout.is() ? 
xTableLayout->GetSuperTableLayout() : nullptr;
 if (pSuper && pSuper->GetIsProtected())
 {
 bProtected = true;
diff --git a/lotuswordpro/source/filter/lwpcontent.cxx 
b/lotuswordpro/source/filter/lwpcontent.cxx
index addc3f2..61a03b9 100644
--- a/lotuswordpro/source/filter/lwpcontent.cxx
+++ b/lotuswordpro/source/filter/lwpcontent.cxx
@@ -121,17 +121,20 @@ void LwpContent::Read()
 pStrm->SkipExtra();
 }
 
-LwpVirtualLayout* LwpContent::GetLayout(LwpVirtualLayout* pStartLayout)
+rtl::Reference LwpContent::GetLayout(LwpVirtualLayout* 
pStartLayout)
 {
 return m_LayoutsWithMe.GetLayout(pStartLayout);
 }
 
 bool LwpContent::HasNonEmbeddedLayouts()
 {
-LwpVirtualLayout* pLayout = nullptr;
-while( (pLayout = GetLayout(pLayout)) )
+rtl::Reference xLayout;
+while (1)
 {
-if(!pLayout->NoContentReference())
+xLayout = GetLayout(xLayout.get());
+if (!xLayout.is())
+break;
+if (!xLayout->NoContentReference())
 return true;
 }
 return false;
@@ -139,10 +142,13 @@ bool LwpContent::HasNonEmbeddedLayouts()
 
 bool LwpContent::IsStyleContent()
 {
-LwpVirtualLayout* pLayout = nullptr;
-while( (pLayout = GetLayout(pLayout)) )
+rtl::Reference xLayout;
+while (1)
 {
-if(pLayout->IsStyleLayout())
+xLayout = GetLayout(xLayout.get());
+if (!xLayout.is())
+break;
+if (xLayout->IsStyleLayout())
 return true;
 }
 return false;
diff --git a/lotuswordpro/source/filter/lwpcontent.hxx 
b/lotuswordpro/source/filter/lwpcontent.hxx
index 2848e36..dfdd474 100644
--- a/lotuswordpro/source/filter/lwpcontent.hxx
+++ b/lotuswordpro/source/filter/lwpcontent.hxx
@@ -106,7 +106,7 @@ protected:
 void Read() override;
 public:
 inline LwpAssociatedLayouts& GetLayoutsWithMe();
-LwpVirtualLayout* GetLayout(LwpVirtualLayout* pStartLayout);
+rtl::Reference GetLayout(LwpVirtualLayout* pStartLayout);
 inline bool IsActive();
 virtual bool IsTable();
 inline OUString GetClassName();
diff --git a/lotuswordpro/source/filter/lwpfootnote.cxx 
b/lotuswordpro/source/filter/lwpfootnote.cxx
index 0da512e..408cb48 100644
--- a/lotuswordpro/source/filter/lwpfootnote.cxx
+++ b/lotuswordpro/source/filter/lwpfootnote.cxx
@@ -363,7 +363,7 @@ LwpEnSuperTableLayout* 
LwpFootnote::FindFootnoteTableLayout()
 
 while ((pContent = pFoundry->EnumContents(pContent)) != nullptr)
 if (pContent->IsTable() && 
(strClassName.equals(pContent->GetClassName())) &&
-   

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwpcelllayout.cxx  |6 +-
 lotuswordpro/source/filter/lwpcontent.cxx |   20 --
 lotuswordpro/source/filter/lwpcontent.hxx |2 
 lotuswordpro/source/filter/lwpfootnote.cxx|4 -
 lotuswordpro/source/filter/lwpgrfobj.cxx  |4 -
 lotuswordpro/source/filter/lwplayout.cxx  |   54 --
 lotuswordpro/source/filter/lwplayout.hxx  |2 
 lotuswordpro/source/filter/lwpoleobject.cxx   |6 +-
 lotuswordpro/source/filter/lwppara1.cxx   |6 +-
 lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx |   16 ++---
 lotuswordpro/source/filter/lwpstory.cxx   |   54 +-
 lotuswordpro/source/filter/lwpstory.hxx   |2 
 lotuswordpro/source/filter/lwptable.hxx   |5 +
 13 files changed, 94 insertions(+), 87 deletions(-)

New commits:
commit 560b9a410aa97349b9b6404dfdd0a1e6fe0c84b9
Author: Caolán McNamara 
Date:   Sun Dec 13 15:33:37 2015 +

use more references to fix life cycles

Change-Id: I0c903533542608c1d7a3c97e2be7f2b7624b265b
(cherry picked from commit a1426bc54b11eb48fdefaf7e8dfd7996e5c7e4d5)

diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx 
b/lotuswordpro/source/filter/lwpcelllayout.cxx
index 0a8356d..8efc821b 100644
--- a/lotuswordpro/source/filter/lwpcelllayout.cxx
+++ b/lotuswordpro/source/filter/lwpcelllayout.cxx
@@ -327,7 +327,7 @@ XFCell* LwpCellLayout::ConvertCell(LwpObjectID aTableID, 
sal_uInt16 nRow, sal_uI
 // we should adjust its style by current position
 if (pTable->GetDefaultCellStyle() == GetObjectID())
 {
-aStyleName = GetCellStyleName(nRow, nCol, pTable->GetTableLayout());
+aStyleName = GetCellStyleName(nRow, nCol, 
pTable->GetTableLayout().get());
 }
 
 // content of cell
@@ -661,8 +661,8 @@ void LwpCellLayout::ApplyProtect(XFCell * pCell, 
LwpObjectID aTableID)
 {
 // judge whole table
 LwpTable * pTable = dynamic_cast(aTableID.obj().get());
-LwpTableLayout * pTableLayout = pTable ? 
dynamic_cast(pTable->GetTableLayout()) : nullptr;
-LwpSuperTableLayout * pSuper = pTableLayout ? 
pTableLayout->GetSuperTableLayout() : nullptr;
+rtl::Reference xTableLayout(pTable ? 
pTable->GetTableLayout() : nullptr);
+LwpSuperTableLayout * pSuper = xTableLayout.is() ? 
xTableLayout->GetSuperTableLayout() : nullptr;
 if (pSuper && pSuper->GetIsProtected())
 {
 bProtected = true;
diff --git a/lotuswordpro/source/filter/lwpcontent.cxx 
b/lotuswordpro/source/filter/lwpcontent.cxx
index addc3f2..61a03b9 100644
--- a/lotuswordpro/source/filter/lwpcontent.cxx
+++ b/lotuswordpro/source/filter/lwpcontent.cxx
@@ -121,17 +121,20 @@ void LwpContent::Read()
 pStrm->SkipExtra();
 }
 
-LwpVirtualLayout* LwpContent::GetLayout(LwpVirtualLayout* pStartLayout)
+rtl::Reference LwpContent::GetLayout(LwpVirtualLayout* 
pStartLayout)
 {
 return m_LayoutsWithMe.GetLayout(pStartLayout);
 }
 
 bool LwpContent::HasNonEmbeddedLayouts()
 {
-LwpVirtualLayout* pLayout = nullptr;
-while( (pLayout = GetLayout(pLayout)) )
+rtl::Reference xLayout;
+while (1)
 {
-if(!pLayout->NoContentReference())
+xLayout = GetLayout(xLayout.get());
+if (!xLayout.is())
+break;
+if (!xLayout->NoContentReference())
 return true;
 }
 return false;
@@ -139,10 +142,13 @@ bool LwpContent::HasNonEmbeddedLayouts()
 
 bool LwpContent::IsStyleContent()
 {
-LwpVirtualLayout* pLayout = nullptr;
-while( (pLayout = GetLayout(pLayout)) )
+rtl::Reference xLayout;
+while (1)
 {
-if(pLayout->IsStyleLayout())
+xLayout = GetLayout(xLayout.get());
+if (!xLayout.is())
+break;
+if (xLayout->IsStyleLayout())
 return true;
 }
 return false;
diff --git a/lotuswordpro/source/filter/lwpcontent.hxx 
b/lotuswordpro/source/filter/lwpcontent.hxx
index 2848e36..dfdd474 100644
--- a/lotuswordpro/source/filter/lwpcontent.hxx
+++ b/lotuswordpro/source/filter/lwpcontent.hxx
@@ -106,7 +106,7 @@ protected:
 void Read() override;
 public:
 inline LwpAssociatedLayouts& GetLayoutsWithMe();
-LwpVirtualLayout* GetLayout(LwpVirtualLayout* pStartLayout);
+rtl::Reference GetLayout(LwpVirtualLayout* pStartLayout);
 inline bool IsActive();
 virtual bool IsTable();
 inline OUString GetClassName();
diff --git a/lotuswordpro/source/filter/lwpfootnote.cxx 
b/lotuswordpro/source/filter/lwpfootnote.cxx
index 0da512e..408cb48 100644
--- a/lotuswordpro/source/filter/lwpfootnote.cxx
+++ b/lotuswordpro/source/filter/lwpfootnote.cxx
@@ -363,7 +363,7 @@ LwpEnSuperTableLayout* 
LwpFootnote::FindFootnoteTableLayout()
 
 while ((pContent = pFoundry->EnumContents(pContent)) != nullptr)
 if 

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwpframelayout.cxx |   15 ---
 lotuswordpro/source/filter/lwplayout.cxx  |   17 +
 lotuswordpro/source/filter/lwplayout.hxx  |2 +-
 3 files changed, 18 insertions(+), 16 deletions(-)

New commits:
commit 3870b3d42bed9039ac05af0370ddbe4f29179aa0
Author: Caolán McNamara 
Date:   Sun Dec 13 16:59:16 2015 +

hold WaterMarkLayout by reference

Change-Id: I7dc7739ee7b958319ddd4e0cf262254728ef0569
(cherry picked from commit 80509545cc43893776dd24f441e9b95567ce06db)

diff --git a/lotuswordpro/source/filter/lwpframelayout.cxx 
b/lotuswordpro/source/filter/lwpframelayout.cxx
index b31791a..7312e81 100644
--- a/lotuswordpro/source/filter/lwpframelayout.cxx
+++ b/lotuswordpro/source/filter/lwpframelayout.cxx
@@ -272,7 +272,7 @@ void LwpFrame::ApplyWrapType(XFFrameStyle *pFrameStyle)
 case LwpPlacableLayout::LAY_NO_WRAP_AROUND:
 {
 eWrap = enumXFWrapRunThrough;
-if(!m_pLayout->GetBackColor() && !m_pLayout->GetWaterMarkLayout())
+if(!m_pLayout->GetBackColor() && 
!m_pLayout->GetWaterMarkLayout().is())
 {
 //pFrameStyle->SetBackGround(sal_True);
 XFColor aXFColor(0xff); //white color
@@ -534,12 +534,13 @@ void LwpFrame::ApplyWatermark(XFFrameStyle *pFrameStyle)
 {
 pFrameStyle->SetBackImage(pBGImage);
 //set watermark transparent
- LwpMiddleLayout* pLay = 
static_cast(m_pLayout->GetWaterMarkLayout());
- LwpBackgroundStuff* pBackgroundStuff = pLay->GetBackgroundStuff();
- if(pBackgroundStuff && !pBackgroundStuff->IsTransparent())
- {
- pFrameStyle->SetTransparency(100);
- }
+rtl::Reference 
xWaterMarkLayout(m_pLayout->GetWaterMarkLayout());
+LwpMiddleLayout* pLay = 
dynamic_cast(xWaterMarkLayout.get());
+LwpBackgroundStuff* pBackgroundStuff = pLay ? 
pLay->GetBackgroundStuff() : nullptr;
+if(pBackgroundStuff && !pBackgroundStuff->IsTransparent())
+{
+pFrameStyle->SetTransparency(100);
+}
  }
 }
 
diff --git a/lotuswordpro/source/filter/lwplayout.cxx 
b/lotuswordpro/source/filter/lwplayout.cxx
index b8dd7fa..7eeeb51 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -1357,18 +1357,18 @@ bool LwpMiddleLayout::IsProtected()
 * @descr:   Get watermark layout
 *
 */
-LwpVirtualLayout* LwpMiddleLayout::GetWaterMarkLayout()
+rtl::Reference LwpMiddleLayout::GetWaterMarkLayout()
 {
-LwpVirtualLayout* pLay = 
dynamic_cast(GetChildHead().obj().get());
-while(pLay)
+rtl::Reference 
xLay(dynamic_cast(GetChildHead().obj().get()));
+while (xLay.is())
 {
-if( pLay->IsForWaterMark())
+if (xLay->IsForWaterMark())
 {
-return pLay;
+return xLay;
 }
-pLay = dynamic_cast (pLay->GetNext().obj().get());
+xLay.set(dynamic_cast(xLay->GetNext().obj().get()));
 }
-return nullptr;
+return rtl::Reference();
 }
 
 /**
@@ -1377,7 +1377,8 @@ LwpVirtualLayout* LwpMiddleLayout::GetWaterMarkLayout()
 */
 XFBGImage* LwpMiddleLayout::GetXFBGImage()
 {
-LwpMiddleLayout* pLay = 
static_cast(GetWaterMarkLayout());
+rtl::Reference xWaterMarkLayout(GetWaterMarkLayout());
+LwpMiddleLayout* pLay = 
dynamic_cast(xWaterMarkLayout.get());
 if(pLay)
 {
 //test BGImage
diff --git a/lotuswordpro/source/filter/lwplayout.hxx 
b/lotuswordpro/source/filter/lwplayout.hxx
index 9221029..5d115a6 100644
--- a/lotuswordpro/source/filter/lwplayout.hxx
+++ b/lotuswordpro/source/filter/lwplayout.hxx
@@ -322,7 +322,7 @@ public:
 virtual sal_uInt8 GetContentOrientation() override;
 virtual bool HonorProtection() override;
 virtual bool IsProtected() override;
-LwpVirtualLayout* GetWaterMarkLayout();
+rtl::Reference GetWaterMarkLayout();
 XFBGImage* GetXFBGImage();
 bool GetUsePrinterSettings();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 lotuswordpro/source/filter/lwpdoc.cxx |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 62a6cadbab6c7bdfbd605c1c75c250904ed10442
Author: Caolán McNamara 
Date:   Sun Dec 13 12:42:54 2015 +

use more references to fix life cycles

Change-Id: Ib70b5ebc498e6517ef40d0515e69e2e77288c1b5

diff --git a/lotuswordpro/source/filter/lwpdoc.cxx 
b/lotuswordpro/source/filter/lwpdoc.cxx
index 12975e3..d0be396 100644
--- a/lotuswordpro/source/filter/lwpdoc.cxx
+++ b/lotuswordpro/source/filter/lwpdoc.cxx
@@ -284,18 +284,18 @@ void LwpDocument::RegisterLayoutStyles()
 void LwpDocument::RegisterStylesInPara()
 {
 //Register all automatic styles in para
-LwpHeadContent* pContent = m_pFoundry
+rtl::Reference xContent(m_pFoundry
 ? dynamic_cast 
(m_pFoundry->GetContentManager().GetContentList().obj().get())
-: nullptr;
-if (pContent)
+: nullptr);
+if (xContent.is())
 {
-LwpStory* pStory = 
dynamic_cast(pContent->GetChildHead().obj(VO_STORY).get());
-while(pStory)
+rtl::Reference 
xStory(dynamic_cast(xContent->GetChildHead().obj(VO_STORY).get()));
+while (xStory.is())
 {
 //Register the child para
-pStory->SetFoundry(m_pFoundry);
-pStory->DoRegisterStyle();
-pStory = 
dynamic_cast(pStory->GetNext().obj(VO_STORY).get());
+xStory->SetFoundry(m_pFoundry);
+xStory->DoRegisterStyle();
+
xStory.set(dynamic_cast(xStory->GetNext().obj(VO_STORY).get()));
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwpdoc.cxx |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit c3568650bf339e283b6212e87d60a7faead2ec80
Author: Caolán McNamara 
Date:   Sun Dec 13 12:42:54 2015 +

use more references to fix life cycles

Change-Id: Ib70b5ebc498e6517ef40d0515e69e2e77288c1b5
(cherry picked from commit 62a6cadbab6c7bdfbd605c1c75c250904ed10442)

diff --git a/lotuswordpro/source/filter/lwpdoc.cxx 
b/lotuswordpro/source/filter/lwpdoc.cxx
index 12975e3..d0be396 100644
--- a/lotuswordpro/source/filter/lwpdoc.cxx
+++ b/lotuswordpro/source/filter/lwpdoc.cxx
@@ -284,18 +284,18 @@ void LwpDocument::RegisterLayoutStyles()
 void LwpDocument::RegisterStylesInPara()
 {
 //Register all automatic styles in para
-LwpHeadContent* pContent = m_pFoundry
+rtl::Reference xContent(m_pFoundry
 ? dynamic_cast 
(m_pFoundry->GetContentManager().GetContentList().obj().get())
-: nullptr;
-if (pContent)
+: nullptr);
+if (xContent.is())
 {
-LwpStory* pStory = 
dynamic_cast(pContent->GetChildHead().obj(VO_STORY).get());
-while(pStory)
+rtl::Reference 
xStory(dynamic_cast(xContent->GetChildHead().obj(VO_STORY).get()));
+while (xStory.is())
 {
 //Register the child para
-pStory->SetFoundry(m_pFoundry);
-pStory->DoRegisterStyle();
-pStory = 
dynamic_cast(pStory->GetNext().obj(VO_STORY).get());
+xStory->SetFoundry(m_pFoundry);
+xStory->DoRegisterStyle();
+
xStory.set(dynamic_cast(xStory->GetNext().obj(VO_STORY).get()));
 }
 }
 }
___
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' - 2 commits - desktop/source include/LibreOfficeKit sfx2/source

[Mihai Varga]

 desktop/source/lib/init.cxx   |   79 +-
 include/LibreOfficeKit/LibreOfficeKit.h   |6 ++
 include/LibreOfficeKit/LibreOfficeKit.hxx |   12 
 sfx2/source/control/unoctitm.cxx  |   14 +++--
 4 files changed, 95 insertions(+), 16 deletions(-)

New commits:
commit d7676d40872ff3db5c6443983a3edad30e1a20d1
Author: Mihai Varga 
Date:   Mon Nov 30 14:45:27 2015 +0200

LOK: get state change feedback for more uno commands

I've also ordered them alphabetically so we can read them easier.

Change-Id: Ia332f1662a91de4a4068f0056a3d969fe978a744

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index b4f0e4b..48881e1 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -669,23 +669,27 @@ static void doc_iniUnoCommands ()
 {
 OUString sUnoCommands[] =
 {
+OUString(".uno:BackColor"),
 OUString(".uno:Bold"),
-OUString(".uno:Italic"),
-OUString(".uno:Underline"),
-OUString(".uno:Strikeout"),
+OUString(".uno:CenterPara"),
+OUString(".uno:CharFontName"),
+OUString(".uno:DecrementIndent"),
 OUString(".uno:DefaultBullet"),
 OUString(".uno:DefaultNumbering"),
+OUString(".uno:FontColor"),
+OUString(".uno:FontHeight"),
+OUString(".uno:IncrementIndent"),
+OUString(".uno:Italic"),
+OUString(".uno:JustifyPara"),
+OUString(".uno:OutlineFont"),
 OUString(".uno:LeftPara"),
-OUString(".uno:CenterPara"),
 OUString(".uno:RightPara"),
-OUString(".uno:JustifyPara"),
-OUString(".uno:IncrementIndent"),
-OUString(".uno:DecrementIndent"),
-OUString(".uno:CharFontName"),
-OUString(".uno:FontHeight"),
+OUString(".uno:Shadowed"),
+OUString(".uno:SubScript"),
+OUString(".uno:SuperScript"),
+OUString(".uno:Strikeout"),
 OUString(".uno:StyleApply"),
-OUString(".uno:FontColor"),
-OUString(".uno:BackColor")
+OUString(".uno:Underline")
 };
 
 util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 42d128a..f0e9bc1 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1067,15 +1067,19 @@ void 
SfxDispatchController_Impl::InterceptLOKStateChangeEvent(const SfxObjectShe
 aBuffer.append("=");
 
 if (aEvent.FeatureURL.Path == "Bold" ||
-aEvent.FeatureURL.Path == "Italic" ||
-aEvent.FeatureURL.Path == "Underline" ||
-aEvent.FeatureURL.Path == "Strikeout" ||
+aEvent.FeatureURL.Path == "CenterPara" ||
 aEvent.FeatureURL.Path == "DefaultBullet" ||
 aEvent.FeatureURL.Path == "DefaultNumbering" ||
+aEvent.FeatureURL.Path == "Italic" ||
+aEvent.FeatureURL.Path == "JustifyPara" ||
 aEvent.FeatureURL.Path == "LeftPara" ||
-aEvent.FeatureURL.Path == "CenterPara" ||
+aEvent.FeatureURL.Path == "OutlineFont" ||
 aEvent.FeatureURL.Path == "RightPara" ||
-aEvent.FeatureURL.Path == "JustifyPara")
+aEvent.FeatureURL.Path == "Shadowed" ||
+aEvent.FeatureURL.Path == "SubScript" ||
+aEvent.FeatureURL.Path == "SuperScript" ||
+aEvent.FeatureURL.Path == "Strikeout" ||
+aEvent.FeatureURL.Path == "Underline")
 {
 bool bTemp = false;
 aEvent.State >>= bTemp;
commit abb4ef4e23f684fff3911b51c35a0718dc277bde
Author: Mihai Varga 
Date:   Fri Nov 27 16:19:09 2015 +0200

LOK: renderFont method

Renders the given font in a virtual output device. For now it iterates
over a list of fonts until it finds the one that matches the requested
font.

Change-Id: Ie4ecc3a1441519840d8f4f4a890e92670759b4fc

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index d3fc402..b4f0e4b 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -373,6 +373,10 @@ static void doc_destroyView(LibreOfficeKitDocument* pThis, 
int nId);
 static void doc_setView(LibreOfficeKitDocument* pThis, int nId);
 static int doc_getView(LibreOfficeKitDocument* pThis);
 static int doc_getViews(LibreOfficeKitDocument* pThis);
+static unsigned char* doc_renderFont(LibreOfficeKitDocument* pThis,
+  const char *pFontName,
+  int* pFontWidth,
+  int* pFontHeight);
 
 LibLODocument_Impl::LibLODocument_Impl(const uno::Reference 
 )
 : mxComponent(xComponent)
@@ -394,6 +398,7 @@ LibLODocument_Impl::LibLODocument_Impl(const uno::Reference 
setPart = doc_setPart;
 m_pDocumentClass->getPartName = doc_getPartName;
 m_pDocumentClass->setPartMode = doc_setPartMode;
+m_pDocumentClass->renderFont = doc_renderFont;
 m_pDocumentClass->paintTile = doc_paintTile;
 

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwplayout.cxx |   14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 1bf5da9682e17688051af5b8ddaef9b33476b970
Author: Caolán McNamara 
Date:   Sun Dec 13 16:27:12 2015 +

guard against invalid Layout Scale

Change-Id: I84541445e44f14244030b9970e0a48e72edacea7
(cherry picked from commit c66ed9591217a612c7adc22757ea2b760a716ee3)

diff --git a/lotuswordpro/source/filter/lwplayout.cxx 
b/lotuswordpro/source/filter/lwplayout.cxx
index 27603d5..00e8e50 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -896,7 +896,7 @@ LwpTabOverride* LwpMiddleLayout::GetTabOverride()
 */
 sal_uInt16 LwpMiddleLayout::GetScaleMode()
 {
-if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is())
+if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is() && 
GetLayoutScale())
 return GetLayoutScale()->GetScaleMode();
 rtl::Reference xBase(GetBasedOnStyle());
 if (xBase.is())
@@ -907,7 +907,7 @@ sal_uInt16 LwpMiddleLayout::GetScaleMode()
 
 sal_uInt16 LwpMiddleLayout::GetScaleTile()
 {
-if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is())
+if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is() && 
GetLayoutScale())
 return (GetLayoutScale()->GetPlacement() & LwpLayoutScale::TILED)
 ? 1 : 0;
 rtl::Reference xBase(GetBasedOnStyle());
@@ -919,9 +919,11 @@ sal_uInt16 LwpMiddleLayout::GetScaleTile()
 
 sal_uInt16 LwpMiddleLayout::GetScaleCenter()
 {
-if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is())
+if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is() && 
GetLayoutScale())
+{
 return (GetLayoutScale()->GetPlacement() & LwpLayoutScale::CENTERED)
 ? 1 : 0;
+}
 rtl::Reference xBase(GetBasedOnStyle());
 if (xBase.is())
 return dynamic_cast(*xBase.get()).GetScaleCenter();
@@ -931,7 +933,7 @@ sal_uInt16 LwpMiddleLayout::GetScaleCenter()
 
 sal_uInt32 LwpMiddleLayout::GetScalePercentage()
 {
-if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is())
+if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is() && 
GetLayoutScale())
 return GetLayoutScale()->GetScalePercentage()/10;//m_nScalePercentage 
1000 = 100%
 rtl::Reference xBase(GetBasedOnStyle());
 if (xBase.is())
@@ -942,7 +944,7 @@ sal_uInt32 LwpMiddleLayout::GetScalePercentage()
 
 double LwpMiddleLayout::GetScaleWidth()
 {
-if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is())
+if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is() && 
GetLayoutScale())
 return LwpTools::ConvertFromUnits(GetLayoutScale()->GetScaleWidth());
 rtl::Reference xBase(GetBasedOnStyle());
 if (xBase.is())
@@ -953,7 +955,7 @@ double LwpMiddleLayout::GetScaleWidth()
 
 double LwpMiddleLayout::GetScaleHeight()
 {
-if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is())
+if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is() && 
GetLayoutScale())
 return LwpTools::ConvertFromUnits(GetLayoutScale()->GetScaleHeight());
 rtl::Reference xBase(GetBasedOnStyle());
 if (xBase.is())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 lotuswordpro/source/filter/lwplayout.cxx |   14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

New commits:
commit c66ed9591217a612c7adc22757ea2b760a716ee3
Author: Caolán McNamara 
Date:   Sun Dec 13 16:27:12 2015 +

guard against invalid Layout Scale

Change-Id: I84541445e44f14244030b9970e0a48e72edacea7

diff --git a/lotuswordpro/source/filter/lwplayout.cxx 
b/lotuswordpro/source/filter/lwplayout.cxx
index 27603d5..00e8e50 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -896,7 +896,7 @@ LwpTabOverride* LwpMiddleLayout::GetTabOverride()
 */
 sal_uInt16 LwpMiddleLayout::GetScaleMode()
 {
-if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is())
+if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is() && 
GetLayoutScale())
 return GetLayoutScale()->GetScaleMode();
 rtl::Reference xBase(GetBasedOnStyle());
 if (xBase.is())
@@ -907,7 +907,7 @@ sal_uInt16 LwpMiddleLayout::GetScaleMode()
 
 sal_uInt16 LwpMiddleLayout::GetScaleTile()
 {
-if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is())
+if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is() && 
GetLayoutScale())
 return (GetLayoutScale()->GetPlacement() & LwpLayoutScale::TILED)
 ? 1 : 0;
 rtl::Reference xBase(GetBasedOnStyle());
@@ -919,9 +919,11 @@ sal_uInt16 LwpMiddleLayout::GetScaleTile()
 
 sal_uInt16 LwpMiddleLayout::GetScaleCenter()
 {
-if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is())
+if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is() && 
GetLayoutScale())
+{
 return (GetLayoutScale()->GetPlacement() & LwpLayoutScale::CENTERED)
 ? 1 : 0;
+}
 rtl::Reference xBase(GetBasedOnStyle());
 if (xBase.is())
 return dynamic_cast(*xBase.get()).GetScaleCenter();
@@ -931,7 +933,7 @@ sal_uInt16 LwpMiddleLayout::GetScaleCenter()
 
 sal_uInt32 LwpMiddleLayout::GetScalePercentage()
 {
-if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is())
+if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is() && 
GetLayoutScale())
 return GetLayoutScale()->GetScalePercentage()/10;//m_nScalePercentage 
1000 = 100%
 rtl::Reference xBase(GetBasedOnStyle());
 if (xBase.is())
@@ -942,7 +944,7 @@ sal_uInt32 LwpMiddleLayout::GetScalePercentage()
 
 double LwpMiddleLayout::GetScaleWidth()
 {
-if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is())
+if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is() && 
GetLayoutScale())
 return LwpTools::ConvertFromUnits(GetLayoutScale()->GetScaleWidth());
 rtl::Reference xBase(GetBasedOnStyle());
 if (xBase.is())
@@ -953,7 +955,7 @@ double LwpMiddleLayout::GetScaleWidth()
 
 double LwpMiddleLayout::GetScaleHeight()
 {
-if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is())
+if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is() && 
GetLayoutScale())
 return LwpTools::ConvertFromUnits(GetLayoutScale()->GetScaleHeight());
 rtl::Reference xBase(GetBasedOnStyle());
 if (xBase.is())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 lotuswordpro/source/filter/lwppara.cxx |   15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 01f920f2cece7a05ea075130c19229029efe7c0f
Author: Caolán McNamara 
Date:   Sun Dec 13 17:05:30 2015 +

most casts and checks

Change-Id: I8be1b8298f096791628d1f51d36ceeabdc804f9a

diff --git a/lotuswordpro/source/filter/lwppara.cxx 
b/lotuswordpro/source/filter/lwppara.cxx
index 29c8fe0..99a2132 100644
--- a/lotuswordpro/source/filter/lwppara.cxx
+++ b/lotuswordpro/source/filter/lwppara.cxx
@@ -348,13 +348,14 @@ void LwpPara::RegisterStyle()
   //2 reg para style
 if (!m_pFoundry)
 return;
-XFParaStyle* pBaseStyle = 
static_cast(m_pFoundry->GetStyleManager()->GetStyle(m_ParaStyle));
+XFParaStyle* pBaseStyle = 
dynamic_cast(m_pFoundry->GetStyleManager()->GetStyle(m_ParaStyle));
 if (pBaseStyle == nullptr) return;
 m_StyleName = pBaseStyle->GetStyleName();//such intf to be added
 m_ParentStyleName = m_StyleName;
 XFStyleManager* pXFStyleManager = 
LwpGlobalMgr::GetInstance()->GetXFStyleManager();
 
-if (GetParaStyle()->GetIndent())
+LwpParaStyle* pParaStyle = GetParaStyle();
+if (pParaStyle && pParaStyle->GetIndent())
 {
 std::unique_ptr 
pIndentOverride(GetParaStyle()->GetIndent()->clone());
 delete m_pIndentOverride;
@@ -736,13 +737,13 @@ void LwpPara::RegisterStyle()
 //register tab style
 if(m_Fribs.HasFrib(FRIB_TAG_TAB))
 {
-XFParaStyle* pParaStyle = new XFParaStyle;
-*pParaStyle = *GetXFParaStyle();
+XFParaStyle* pNewParaStyle = new XFParaStyle;
+*pNewParaStyle = *GetXFParaStyle();
 //pOverStyle->SetStyleName("");
-this->RegisterTabStyle(pParaStyle);
+this->RegisterTabStyle(pNewParaStyle);
 if (!m_ParentStyleName.isEmpty())
-pParaStyle->SetParentStyleName(m_ParentStyleName);
-m_StyleName = 
pXFStyleManager->AddStyle(pParaStyle).m_pStyle->GetStyleName();
+pNewParaStyle->SetParentStyleName(m_ParentStyleName);
+m_StyleName = 
pXFStyleManager->AddStyle(pNewParaStyle).m_pStyle->GetStyleName();
 }
 
 //register master page;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwppara.cxx |   15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 15f3670533128c774a1c9885454b17f53cd5c256
Author: Caolán McNamara 
Date:   Sun Dec 13 17:05:30 2015 +

most casts and checks

Change-Id: I8be1b8298f096791628d1f51d36ceeabdc804f9a
(cherry picked from commit 01f920f2cece7a05ea075130c19229029efe7c0f)

diff --git a/lotuswordpro/source/filter/lwppara.cxx 
b/lotuswordpro/source/filter/lwppara.cxx
index 29c8fe0..99a2132 100644
--- a/lotuswordpro/source/filter/lwppara.cxx
+++ b/lotuswordpro/source/filter/lwppara.cxx
@@ -348,13 +348,14 @@ void LwpPara::RegisterStyle()
   //2 reg para style
 if (!m_pFoundry)
 return;
-XFParaStyle* pBaseStyle = 
static_cast(m_pFoundry->GetStyleManager()->GetStyle(m_ParaStyle));
+XFParaStyle* pBaseStyle = 
dynamic_cast(m_pFoundry->GetStyleManager()->GetStyle(m_ParaStyle));
 if (pBaseStyle == nullptr) return;
 m_StyleName = pBaseStyle->GetStyleName();//such intf to be added
 m_ParentStyleName = m_StyleName;
 XFStyleManager* pXFStyleManager = 
LwpGlobalMgr::GetInstance()->GetXFStyleManager();
 
-if (GetParaStyle()->GetIndent())
+LwpParaStyle* pParaStyle = GetParaStyle();
+if (pParaStyle && pParaStyle->GetIndent())
 {
 std::unique_ptr 
pIndentOverride(GetParaStyle()->GetIndent()->clone());
 delete m_pIndentOverride;
@@ -736,13 +737,13 @@ void LwpPara::RegisterStyle()
 //register tab style
 if(m_Fribs.HasFrib(FRIB_TAG_TAB))
 {
-XFParaStyle* pParaStyle = new XFParaStyle;
-*pParaStyle = *GetXFParaStyle();
+XFParaStyle* pNewParaStyle = new XFParaStyle;
+*pNewParaStyle = *GetXFParaStyle();
 //pOverStyle->SetStyleName("");
-this->RegisterTabStyle(pParaStyle);
+this->RegisterTabStyle(pNewParaStyle);
 if (!m_ParentStyleName.isEmpty())
-pParaStyle->SetParentStyleName(m_ParentStyleName);
-m_StyleName = 
pXFStyleManager->AddStyle(pParaStyle).m_pStyle->GetStyleName();
+pNewParaStyle->SetParentStyleName(m_ParentStyleName);
+m_StyleName = 
pXFStyleManager->AddStyle(pNewParaStyle).m_pStyle->GetStyleName();
 }
 
 //register master page;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwpdoc.cxx|6 +++---
 lotuswordpro/source/filter/lwpdoc.hxx|2 +-
 lotuswordpro/source/filter/lwplayout.cxx |   14 +++---
 lotuswordpro/source/filter/lwplayout.hxx |2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 33b5bcc9e77b27cedfdeee61e11956bec6960cce
Author: Caolán McNamara 
Date:   Sun Dec 13 15:56:01 2015 +

deploy references to keep layout alive long enough

Change-Id: Icac22d3c179eca42e01a724f7592ee4b34dd45e3
(cherry picked from commit fdf122378d5dfa7160fa29eace026424b125e3e4)

diff --git a/lotuswordpro/source/filter/lwpdoc.cxx 
b/lotuswordpro/source/filter/lwpdoc.cxx
index d0be396..d120d9c 100644
--- a/lotuswordpro/source/filter/lwpdoc.cxx
+++ b/lotuswordpro/source/filter/lwpdoc.cxx
@@ -646,7 +646,7 @@ LwpDocument* LwpDocument::GetPreviousDivision()
 LwpDocument *pLastDoc = pRoot ? pRoot->GetLastDivisionWithContents() : 
nullptr;
 while (pLastDoc)
 {
-if(pLastDoc->GetEnSuperTableLayout())
+if (pLastDoc->GetEnSuperTableLayout().is())
 return pLastDoc;
 pLastDoc = pLastDoc->GetPreviousDivisionWithContents();
 }
@@ -656,14 +656,14 @@ LwpDocument* LwpDocument::GetPreviousDivision()
  /**
  * @descrGet endnote supertable layout, every division has only one 
endnote supertable layout.
  */
- LwpVirtualLayout* LwpDocument::GetEnSuperTableLayout()
+rtl::Reference LwpDocument::GetEnSuperTableLayout()
 {
 LwpHeadLayout* pHeadLayout = 
dynamic_cast(GetFoundry()->GetLayout().obj().get());
 if(pHeadLayout)
 {
 return pHeadLayout->FindEnSuperTableLayout();
 }
-return nullptr;
+return rtl::Reference();
 }
 
 /**
diff --git a/lotuswordpro/source/filter/lwpdoc.hxx 
b/lotuswordpro/source/filter/lwpdoc.hxx
index 17ab35d..8b1bdef 100644
--- a/lotuswordpro/source/filter/lwpdoc.hxx
+++ b/lotuswordpro/source/filter/lwpdoc.hxx
@@ -159,7 +159,7 @@ public:
 
 LwpDocument* GetLastDivision();
 LwpDocument* GetFirstDivision();
-LwpVirtualLayout* GetEnSuperTableLayout();
+rtl::Reference GetEnSuperTableLayout();
 bool GetNumberOfPages(LwpDocument* pEndDivision, sal_uInt16& nCount);
 
 sal_uInt16 GetNumberOfPagesBefore();
diff --git a/lotuswordpro/source/filter/lwplayout.cxx 
b/lotuswordpro/source/filter/lwplayout.cxx
index 7a7e9c04b..27603d5 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -499,18 +499,18 @@ void LwpHeadLayout::RegisterStyle()
  * @descr   find endnote supertable layout from the child layout list. Suppose 
that there is only one endnote supertablelayout in one division
  * @return pointer to endnote supertable layout
  */
-LwpVirtualLayout* LwpHeadLayout::FindEnSuperTableLayout()
+rtl::Reference LwpHeadLayout::FindEnSuperTableLayout()
 {
-LwpVirtualLayout* pLayout = 
dynamic_cast(GetChildHead().obj().get());
-while(pLayout)
+rtl::Reference 
xLayout(dynamic_cast(GetChildHead().obj().get()));
+while (xLayout.get())
 {
-if(pLayout->GetLayoutType() == LWP_ENDNOTE_SUPERTABLE_LAYOUT)
+if (xLayout->GetLayoutType() == LWP_ENDNOTE_SUPERTABLE_LAYOUT)
 {
-return pLayout;
+return xLayout;
 }
-pLayout = 
dynamic_cast(pLayout->GetNext().obj().get());
+
xLayout.set(dynamic_cast(xLayout->GetNext().obj().get()));
 }
-return nullptr;
+return rtl::Reference();
 }
 
 LwpLayoutStyle::LwpLayoutStyle()
diff --git a/lotuswordpro/source/filter/lwplayout.hxx 
b/lotuswordpro/source/filter/lwplayout.hxx
index 053f6be..9221029 100644
--- a/lotuswordpro/source/filter/lwplayout.hxx
+++ b/lotuswordpro/source/filter/lwplayout.hxx
@@ -266,7 +266,7 @@ public:
 LwpHeadLayout(LwpObjectHeader , LwpSvStream* pStrm);
 virtual ~LwpHeadLayout(){}
 void RegisterStyle() override;
-LwpVirtualLayout* FindEnSuperTableLayout();
+rtl::Reference FindEnSuperTableLayout();
 protected:
 void Read() override;
 virtual LWP_LAYOUT_TYPE GetLayoutType () override { return 
LWP_HEAD_LAYOUT;}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 lotuswordpro/source/filter/lwpdoc.cxx|6 +++---
 lotuswordpro/source/filter/lwpdoc.hxx|2 +-
 lotuswordpro/source/filter/lwplayout.cxx |   14 +++---
 lotuswordpro/source/filter/lwplayout.hxx |2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit fdf122378d5dfa7160fa29eace026424b125e3e4
Author: Caolán McNamara 
Date:   Sun Dec 13 15:56:01 2015 +

deploy references to keep layout alive long enough

Change-Id: Icac22d3c179eca42e01a724f7592ee4b34dd45e3

diff --git a/lotuswordpro/source/filter/lwpdoc.cxx 
b/lotuswordpro/source/filter/lwpdoc.cxx
index d0be396..d120d9c 100644
--- a/lotuswordpro/source/filter/lwpdoc.cxx
+++ b/lotuswordpro/source/filter/lwpdoc.cxx
@@ -646,7 +646,7 @@ LwpDocument* LwpDocument::GetPreviousDivision()
 LwpDocument *pLastDoc = pRoot ? pRoot->GetLastDivisionWithContents() : 
nullptr;
 while (pLastDoc)
 {
-if(pLastDoc->GetEnSuperTableLayout())
+if (pLastDoc->GetEnSuperTableLayout().is())
 return pLastDoc;
 pLastDoc = pLastDoc->GetPreviousDivisionWithContents();
 }
@@ -656,14 +656,14 @@ LwpDocument* LwpDocument::GetPreviousDivision()
  /**
  * @descrGet endnote supertable layout, every division has only one 
endnote supertable layout.
  */
- LwpVirtualLayout* LwpDocument::GetEnSuperTableLayout()
+rtl::Reference LwpDocument::GetEnSuperTableLayout()
 {
 LwpHeadLayout* pHeadLayout = 
dynamic_cast(GetFoundry()->GetLayout().obj().get());
 if(pHeadLayout)
 {
 return pHeadLayout->FindEnSuperTableLayout();
 }
-return nullptr;
+return rtl::Reference();
 }
 
 /**
diff --git a/lotuswordpro/source/filter/lwpdoc.hxx 
b/lotuswordpro/source/filter/lwpdoc.hxx
index 17ab35d..8b1bdef 100644
--- a/lotuswordpro/source/filter/lwpdoc.hxx
+++ b/lotuswordpro/source/filter/lwpdoc.hxx
@@ -159,7 +159,7 @@ public:
 
 LwpDocument* GetLastDivision();
 LwpDocument* GetFirstDivision();
-LwpVirtualLayout* GetEnSuperTableLayout();
+rtl::Reference GetEnSuperTableLayout();
 bool GetNumberOfPages(LwpDocument* pEndDivision, sal_uInt16& nCount);
 
 sal_uInt16 GetNumberOfPagesBefore();
diff --git a/lotuswordpro/source/filter/lwplayout.cxx 
b/lotuswordpro/source/filter/lwplayout.cxx
index 7a7e9c04b..27603d5 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -499,18 +499,18 @@ void LwpHeadLayout::RegisterStyle()
  * @descr   find endnote supertable layout from the child layout list. Suppose 
that there is only one endnote supertablelayout in one division
  * @return pointer to endnote supertable layout
  */
-LwpVirtualLayout* LwpHeadLayout::FindEnSuperTableLayout()
+rtl::Reference LwpHeadLayout::FindEnSuperTableLayout()
 {
-LwpVirtualLayout* pLayout = 
dynamic_cast(GetChildHead().obj().get());
-while(pLayout)
+rtl::Reference 
xLayout(dynamic_cast(GetChildHead().obj().get()));
+while (xLayout.get())
 {
-if(pLayout->GetLayoutType() == LWP_ENDNOTE_SUPERTABLE_LAYOUT)
+if (xLayout->GetLayoutType() == LWP_ENDNOTE_SUPERTABLE_LAYOUT)
 {
-return pLayout;
+return xLayout;
 }
-pLayout = 
dynamic_cast(pLayout->GetNext().obj().get());
+
xLayout.set(dynamic_cast(xLayout->GetNext().obj().get()));
 }
-return nullptr;
+return rtl::Reference();
 }
 
 LwpLayoutStyle::LwpLayoutStyle()
diff --git a/lotuswordpro/source/filter/lwplayout.hxx 
b/lotuswordpro/source/filter/lwplayout.hxx
index 053f6be..9221029 100644
--- a/lotuswordpro/source/filter/lwplayout.hxx
+++ b/lotuswordpro/source/filter/lwplayout.hxx
@@ -266,7 +266,7 @@ public:
 LwpHeadLayout(LwpObjectHeader , LwpSvStream* pStrm);
 virtual ~LwpHeadLayout(){}
 void RegisterStyle() override;
-LwpVirtualLayout* FindEnSuperTableLayout();
+rtl::Reference FindEnSuperTableLayout();
 protected:
 void Read() override;
 virtual LWP_LAYOUT_TYPE GetLayoutType () override { return 
LWP_HEAD_LAYOUT;}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 lotuswordpro/source/filter/lwpstory.cxx |   41 +---
 1 file changed, 12 insertions(+), 29 deletions(-)

New commits:
commit 0876868a14c7d139ed2a79ece989c84239a2c853
Author: Caolán McNamara 
Date:   Sun Dec 13 16:03:07 2015 +

use more references to fix life cycles

Change-Id: I54931f0dccabb2d9a58cc92ef5ebf3469f93f03c

diff --git a/lotuswordpro/source/filter/lwpstory.cxx 
b/lotuswordpro/source/filter/lwpstory.cxx
index 908cf3e..53d76a9 100644
--- a/lotuswordpro/source/filter/lwpstory.cxx
+++ b/lotuswordpro/source/filter/lwpstory.cxx
@@ -100,15 +100,15 @@ void LwpStory::XFConvert(XFContentContainer* pCont)
 XFConvertFrameInFrame(pCont);
 //process para list
 XFContentContainer* pParaCont = pCont;
-LwpPara* pPara = dynamic_cast ( GetFirstPara().obj().get() );
-while(pPara)
+rtl::Reference 
xPara(dynamic_cast(GetFirstPara().obj().get()));
+while (xPara.is())
 {
-pPara->SetFoundry(m_pFoundry);
-pPara->XFConvert(pParaCont);
+xPara->SetFoundry(m_pFoundry);
+xPara->XFConvert(pParaCont);
 
 //Get the xfcontainer for the next para
-pParaCont = pPara->GetXFContainer();
-pPara = dynamic_cast ( pPara->GetNext().obj().get() );
+pParaCont = xPara->GetXFContainer();
+xPara.set(dynamic_cast(xPara->GetNext().obj().get()));
 }
 
 //process frame which anchor is to cell after converter all the para
@@ -116,15 +116,15 @@ void LwpStory::XFConvert(XFContentContainer* pCont)
 XFConvertFrameInHeaderFooter(pCont);
 
 //Release Lwp Objects
-LwpPara* pCur = dynamic_cast (GetFirstPara().obj().get());
-LwpPara* pNext;
-while(pCur)
+rtl::Reference 
xCur(dynamic_cast(GetFirstPara().obj().get()));
+rtl::Reference xNext;
+while (xCur.is())
 {
-pNext = dynamic_cast ( pCur->GetNext().obj().get() );
+xNext.set(dynamic_cast(xCur->GetNext().obj().get()));
 LwpGlobalMgr* pGlobal = LwpGlobalMgr::GetInstance();
 LwpObjectFactory* pObjMgr = pGlobal->GetLwpObjFactory();
-pObjMgr->ReleaseObject(pCur->GetObjectID());
-pCur = pNext;
+pObjMgr->ReleaseObject(xCur->GetObjectID());
+xCur = xNext;
 }
 }
 
@@ -146,23 +146,6 @@ void LwpStory::Parse(IXFStream* pOutputStream)
 m_pXFContainer->ToXml(pOutputStream);
 delete m_pXFContainer;
 m_pXFContainer = nullptr;
-
-//It seems that, currently, we do not need to process the child story
-/*LwpObject* pChildStory = GetFirstStory()->obj();
-if(pChildStory)
-{
-pChildStory->SetFoundry(m_pFoundry);
-pChildStory->Parse(pOutputStream);
-}*/
-
-//Don't process the next story
-/*  LwpObject* pNextStory = GetNextStory()->obj();
-if(pNextStory)
-{
-pNextStory->SetFoundry(m_pFoundry);
-pNextStory->Parse(pOutputStream);
-}*/
-
 }
 
 #include "lwppagelayout.hxx"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwpstory.cxx |   41 +---
 1 file changed, 12 insertions(+), 29 deletions(-)

New commits:
commit 517f2d46aab495b630b6d0ba805cacf01c78f364
Author: Caolán McNamara 
Date:   Sun Dec 13 16:03:07 2015 +

use more references to fix life cycles

Change-Id: I54931f0dccabb2d9a58cc92ef5ebf3469f93f03c
(cherry picked from commit 0876868a14c7d139ed2a79ece989c84239a2c853)

diff --git a/lotuswordpro/source/filter/lwpstory.cxx 
b/lotuswordpro/source/filter/lwpstory.cxx
index 908cf3e..53d76a9 100644
--- a/lotuswordpro/source/filter/lwpstory.cxx
+++ b/lotuswordpro/source/filter/lwpstory.cxx
@@ -100,15 +100,15 @@ void LwpStory::XFConvert(XFContentContainer* pCont)
 XFConvertFrameInFrame(pCont);
 //process para list
 XFContentContainer* pParaCont = pCont;
-LwpPara* pPara = dynamic_cast ( GetFirstPara().obj().get() );
-while(pPara)
+rtl::Reference 
xPara(dynamic_cast(GetFirstPara().obj().get()));
+while (xPara.is())
 {
-pPara->SetFoundry(m_pFoundry);
-pPara->XFConvert(pParaCont);
+xPara->SetFoundry(m_pFoundry);
+xPara->XFConvert(pParaCont);
 
 //Get the xfcontainer for the next para
-pParaCont = pPara->GetXFContainer();
-pPara = dynamic_cast ( pPara->GetNext().obj().get() );
+pParaCont = xPara->GetXFContainer();
+xPara.set(dynamic_cast(xPara->GetNext().obj().get()));
 }
 
 //process frame which anchor is to cell after converter all the para
@@ -116,15 +116,15 @@ void LwpStory::XFConvert(XFContentContainer* pCont)
 XFConvertFrameInHeaderFooter(pCont);
 
 //Release Lwp Objects
-LwpPara* pCur = dynamic_cast (GetFirstPara().obj().get());
-LwpPara* pNext;
-while(pCur)
+rtl::Reference 
xCur(dynamic_cast(GetFirstPara().obj().get()));
+rtl::Reference xNext;
+while (xCur.is())
 {
-pNext = dynamic_cast ( pCur->GetNext().obj().get() );
+xNext.set(dynamic_cast(xCur->GetNext().obj().get()));
 LwpGlobalMgr* pGlobal = LwpGlobalMgr::GetInstance();
 LwpObjectFactory* pObjMgr = pGlobal->GetLwpObjFactory();
-pObjMgr->ReleaseObject(pCur->GetObjectID());
-pCur = pNext;
+pObjMgr->ReleaseObject(xCur->GetObjectID());
+xCur = xNext;
 }
 }
 
@@ -146,23 +146,6 @@ void LwpStory::Parse(IXFStream* pOutputStream)
 m_pXFContainer->ToXml(pOutputStream);
 delete m_pXFContainer;
 m_pXFContainer = nullptr;
-
-//It seems that, currently, we do not need to process the child story
-/*LwpObject* pChildStory = GetFirstStory()->obj();
-if(pChildStory)
-{
-pChildStory->SetFoundry(m_pFoundry);
-pChildStory->Parse(pOutputStream);
-}*/
-
-//Don't process the next story
-/*  LwpObject* pNextStory = GetNextStory()->obj();
-if(pNextStory)
-{
-pNextStory->SetFoundry(m_pFoundry);
-pNextStory->Parse(pOutputStream);
-}*/
-
 }
 
 #include "lwppagelayout.hxx"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - icon-themes/elementary icon-themes/hicontrast icon-themes/human icon-themes/sifr

[Laurent Balland-Poirier]

 icon-themes/elementary/cmd/lc_openremote.png  |binary
 icon-themes/elementary/cmd/sc_openremote.png  |binary
 icon-themes/elementary/framework/res/remote-documents.png |binary
 icon-themes/hicontrast/cmd/lc_openremote.png  |binary
 icon-themes/hicontrast/cmd/sc_openremote.png  |binary
 icon-themes/hicontrast/framework/res/remote-documents.png |binary
 icon-themes/human/cmd/lc_openremote.png   |binary
 icon-themes/human/cmd/sc_openremote.png   |binary
 icon-themes/human/framework/res/remote-documents.png  |binary
 icon-themes/sifr/cmd/lc_openremote.png|binary
 icon-themes/sifr/cmd/sc_openremote.png|binary
 11 files changed

New commits:
commit 996f99ea821bd4cf33364691b371219673c94783
Author: Laurent Balland-Poirier 
Date:   Sat Dec 12 17:16:34 2015 +0100

Update themes for openremote icon (tdf#93038)

add elementary, hicontrast, human and sifr openremote icons

Change-Id: Iefe2db951a8127be387e79453cae0131bf0648c3
Reviewed-on: https://gerrit.libreoffice.org/20681
Tested-by: Jenkins 
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit 92e4dae00d8eb4a82b43eabec149bd6912cb74b0)
Reviewed-on: https://gerrit.libreoffice.org/20683
Tested-by: Adolfo Jayme Barrientos 

diff --git a/icon-themes/elementary/cmd/lc_openremote.png 
b/icon-themes/elementary/cmd/lc_openremote.png
new file mode 100644
index 000..5b41e0a
Binary files /dev/null and b/icon-themes/elementary/cmd/lc_openremote.png differ
diff --git a/icon-themes/elementary/cmd/sc_openremote.png 
b/icon-themes/elementary/cmd/sc_openremote.png
new file mode 100644
index 000..5e9ec33
Binary files /dev/null and b/icon-themes/elementary/cmd/sc_openremote.png differ
diff --git a/icon-themes/elementary/framework/res/remote-documents.png 
b/icon-themes/elementary/framework/res/remote-documents.png
new file mode 100644
index 000..6eda35a
Binary files /dev/null and 
b/icon-themes/elementary/framework/res/remote-documents.png differ
diff --git a/icon-themes/hicontrast/cmd/lc_openremote.png 
b/icon-themes/hicontrast/cmd/lc_openremote.png
new file mode 100644
index 000..cd26bec
Binary files /dev/null and b/icon-themes/hicontrast/cmd/lc_openremote.png differ
diff --git a/icon-themes/hicontrast/cmd/sc_openremote.png 
b/icon-themes/hicontrast/cmd/sc_openremote.png
new file mode 100644
index 000..8efa138
Binary files /dev/null and b/icon-themes/hicontrast/cmd/sc_openremote.png differ
diff --git a/icon-themes/hicontrast/framework/res/remote-documents.png 
b/icon-themes/hicontrast/framework/res/remote-documents.png
new file mode 100644
index 000..1e67347
Binary files /dev/null and 
b/icon-themes/hicontrast/framework/res/remote-documents.png differ
diff --git a/icon-themes/human/cmd/lc_openremote.png 
b/icon-themes/human/cmd/lc_openremote.png
new file mode 100644
index 000..87b2d32
Binary files /dev/null and b/icon-themes/human/cmd/lc_openremote.png differ
diff --git a/icon-themes/human/cmd/sc_openremote.png 
b/icon-themes/human/cmd/sc_openremote.png
new file mode 100644
index 000..711c758
Binary files /dev/null and b/icon-themes/human/cmd/sc_openremote.png differ
diff --git a/icon-themes/human/framework/res/remote-documents.png 
b/icon-themes/human/framework/res/remote-documents.png
new file mode 100644
index 000..fedd47b
Binary files /dev/null and 
b/icon-themes/human/framework/res/remote-documents.png differ
diff --git a/icon-themes/sifr/cmd/lc_openremote.png 
b/icon-themes/sifr/cmd/lc_openremote.png
new file mode 100644
index 000..34a38a9
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_openremote.png differ
diff --git a/icon-themes/sifr/cmd/sc_openremote.png 
b/icon-themes/sifr/cmd/sc_openremote.png
new file mode 100644
index 000..13af864
Binary files /dev/null and b/icon-themes/sifr/cmd/sc_openremote.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 lotuswordpro/source/filter/lwpstory.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit a258c3a6503b4fd76ad2b0f705fdd7f472f58c4b
Author: Caolán McNamara 
Date:   Sun Dec 13 16:30:42 2015 +

use more references to fix life cycles

Change-Id: I50fd30114b45d1225adb7bfd5d77cb89a229aac8

diff --git a/lotuswordpro/source/filter/lwpstory.cxx 
b/lotuswordpro/source/filter/lwpstory.cxx
index 53d76a9..ed52730 100644
--- a/lotuswordpro/source/filter/lwpstory.cxx
+++ b/lotuswordpro/source/filter/lwpstory.cxx
@@ -130,12 +130,12 @@ void LwpStory::XFConvert(XFContentContainer* pCont)
 
 void LwpStory::RegisterStyle()
 {
-LwpPara* pPara = dynamic_cast( GetFirstPara().obj().get() );
-while(pPara)
+rtl::Reference 
xPara(dynamic_cast(GetFirstPara().obj().get()));
+while (xPara.is())
 {
-pPara->SetFoundry(m_pFoundry);
-pPara->DoRegisterStyle();
-pPara = dynamic_cast(pPara->GetNext().obj().get());
+xPara->SetFoundry(m_pFoundry);
+xPara->DoRegisterStyle();
+xPara.set(dynamic_cast(xPara->GetNext().obj().get()));
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwpstory.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 894ac79aa3557dacee0286d79bbfb00b8f4d0be2
Author: Caolán McNamara 
Date:   Sun Dec 13 16:30:42 2015 +

use more references to fix life cycles

Change-Id: I50fd30114b45d1225adb7bfd5d77cb89a229aac8
(cherry picked from commit a258c3a6503b4fd76ad2b0f705fdd7f472f58c4b)

diff --git a/lotuswordpro/source/filter/lwpstory.cxx 
b/lotuswordpro/source/filter/lwpstory.cxx
index 53d76a9..ed52730 100644
--- a/lotuswordpro/source/filter/lwpstory.cxx
+++ b/lotuswordpro/source/filter/lwpstory.cxx
@@ -130,12 +130,12 @@ void LwpStory::XFConvert(XFContentContainer* pCont)
 
 void LwpStory::RegisterStyle()
 {
-LwpPara* pPara = dynamic_cast( GetFirstPara().obj().get() );
-while(pPara)
+rtl::Reference 
xPara(dynamic_cast(GetFirstPara().obj().get()));
+while (xPara.is())
 {
-pPara->SetFoundry(m_pFoundry);
-pPara->DoRegisterStyle();
-pPara = dynamic_cast(pPara->GetNext().obj().get());
+xPara->SetFoundry(m_pFoundry);
+xPara->DoRegisterStyle();
+xPara.set(dynamic_cast(xPara->GetNext().obj().get()));
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Arnaud Versini]

 basic/source/basmgr/basicmanagerrepository.cxx |4 ++--
 basic/source/classes/sb.cxx|4 +---
 basic/source/classes/sbxmod.cxx|   10 --
 basic/source/comp/exprgen.cxx  |5 +
 basic/source/comp/exprnode.cxx |5 ++---
 basic/source/sbx/sbxarray.cxx  |   19 ---
 6 files changed, 18 insertions(+), 29 deletions(-)

New commits:
commit 4df183e2c9c548ecdd6f3421d9ef043194aa0981
Author: Arnaud Versini 
Date:   Sun Dec 6 14:29:18 2015 +0100

BASIC: use c++ foreach loops when possible.

Change-Id: Ia1c734e26da88010eef40a4375c423b0765f43ae
Reviewed-on: https://gerrit.libreoffice.org/20423
Tested-by: Jenkins 
Reviewed-by: Arnaud Versini 

diff --git a/basic/source/basmgr/basicmanagerrepository.cxx 
b/basic/source/basmgr/basicmanagerrepository.cxx
index 1b3ca26..de559e9 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -427,10 +427,10 @@ namespace basic
 {
 // handle errors
 std::vector& aErrors = 
_out_rpBasicManager->GetErrors();
-for(std::vector::const_iterator i = 
aErrors.begin(); i != aErrors.end(); ++i)
+for(const auto& rError : aErrors)
 {
 // show message to user
-if ( ERRCODE_BUTTON_CANCEL == ErrorHandler::HandleError( 
i->GetErrorId() ) )
+if ( ERRCODE_BUTTON_CANCEL == ErrorHandler::HandleError( 
rError.GetErrorId() ) )
 {
 // user wants to break loading of BASIC-manager
 delete _out_rpBasicManager;
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index bfdfcef..a59da1e 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1199,10 +1199,8 @@ void SbModule::implProcessModuleRunInit( 
ModuleInitDependencyMap& rMap, ClassMod
 StringVector& rReqTypes = pModule->pClassData->maRequiredTypes;
 if( rReqTypes.size() > 0 )
 {
-for( StringVector::iterator it = rReqTypes.begin() ; it != 
rReqTypes.end() ; ++it )
+for( const auto& rStr : rReqTypes )
 {
-OUString& rStr = *it;
-
 // Is required type a class module?
 ModuleInitDependencyMap::iterator itFind = rMap.find( rStr );
 if( itFind != rMap.end() )
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 0730273..73428af 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -1293,10 +1293,9 @@ void SbModule::RunInit()
 void SbModule::AddVarName( const OUString& aName )
 {
 // see if the name is added already
-std::vector< OUString >::iterator it_end = mModuleVariableNames.end();
-for ( std::vector< OUString >::iterator it = mModuleVariableNames.begin(); 
it != it_end; ++it )
+for ( const auto& rModuleVariableName: mModuleVariableNames )
 {
-if ( aName == *it )
+if ( aName == rModuleVariableName )
 return;
 }
 mModuleVariableNames.push_back( aName );
@@ -1304,13 +1303,12 @@ void SbModule::AddVarName( const OUString& aName )
 
 void SbModule::RemoveVars()
 {
-std::vector< OUString >::iterator it_end = mModuleVariableNames.end();
-for ( std::vector< OUString >::iterator it = mModuleVariableNames.begin(); 
it != it_end; ++it )
+for ( const auto& rModuleVariableName: mModuleVariableNames )
 {
 // We don't want a Find being called in a derived class ( e.g.
 // SbUserform because it could trigger say an initialise event
 // which would cause basic to be re-run in the middle of the init ( and 
remember RemoveVars is called from compile and we don't want code to run as 
part of the compile )
-SbxVariableRef p = SbModule::Find( *it, SbxCLASS_PROPERTY );
+SbxVariableRef p = SbModule::Find( rModuleVariableName, SbxCLASS_PROPERTY 
);
 if( p.Is() )
 Remove (p);
 }
diff --git a/basic/source/comp/exprgen.cxx b/basic/source/comp/exprgen.cxx
index c1c74a0..ce6ff93 100644
--- a/basic/source/comp/exprgen.cxx
+++ b/basic/source/comp/exprgen.cxx
@@ -191,11 +191,8 @@ void SbiExprNode::GenElement( SbiCodeGen& rGen, SbiOpcode 
eOp )
 
 if( aVar.pvMorePar )
 {
-SbiExprListVector* pvMorePar = aVar.pvMorePar;
-SbiExprListVector::iterator it;
-for( it = pvMorePar->begin() ; it != pvMorePar->end() ; ++it )
+for( auto& pExprList: *aVar.pvMorePar )
 {
-SbiExprList* pExprList = *it;
 pExprList->Gen();
 rGen.Gen( _ARRAYACCESS );
 }
diff --git a/basic/source/comp/exprnode.cxx b/basic/source/comp/exprnode.cxx
index 3bd9693..52c2211 100644
--- a/basic/source/comp/exprnode.cxx

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

[Caolán McNamara]

 lotuswordpro/source/filter/lwptoc.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit c6a2df4061de028eb9d7fb752051ecb9f1621fef
Author: Caolán McNamara 
Date:   Sun Dec 13 16:22:35 2015 +

guard against no container layout

Change-Id: If615c68bfaf145d81dab96b05e7b903c1a6b03cf

diff --git a/lotuswordpro/source/filter/lwptoc.cxx 
b/lotuswordpro/source/filter/lwptoc.cxx
index 4857e94..c92171e 100644
--- a/lotuswordpro/source/filter/lwptoc.cxx
+++ b/lotuswordpro/source/filter/lwptoc.cxx
@@ -243,6 +243,9 @@ void  LwpTocSuperLayout::XFConvert(XFContentContainer* 
pCont)
 // add TOC content
 LwpSuperTableLayout::XFConvert(pToc);
 
+if (!GetContainerLayout())
+return;
+
 // if current TOC is located in a cell, we must add a frame between upper 
level container and TOC
 if ( !GetContainerLayout()->IsCell() )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwptoc.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 64fdc60c947c96b81a8edbdfcc6405a8f3a139ef
Author: Caolán McNamara 
Date:   Sun Dec 13 16:22:35 2015 +

guard against no container layout

Change-Id: If615c68bfaf145d81dab96b05e7b903c1a6b03cf
(cherry picked from commit c6a2df4061de028eb9d7fb752051ecb9f1621fef)

diff --git a/lotuswordpro/source/filter/lwptoc.cxx 
b/lotuswordpro/source/filter/lwptoc.cxx
index 4857e94..c92171e 100644
--- a/lotuswordpro/source/filter/lwptoc.cxx
+++ b/lotuswordpro/source/filter/lwptoc.cxx
@@ -243,6 +243,9 @@ void  LwpTocSuperLayout::XFConvert(XFContentContainer* 
pCont)
 // add TOC content
 LwpSuperTableLayout::XFConvert(pToc);
 
+if (!GetContainerLayout())
+return;
+
 // if current TOC is located in a cell, we must add a frame between upper 
level container and TOC
 if ( !GetContainerLayout()->IsCell() )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 lotuswordpro/source/filter/lwpparaproperty.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a23f7b3c14ad0e88264aca197a979aefcc9c0670
Author: Caolán McNamara 
Date:   Sun Dec 13 16:34:46 2015 +

use more references to fix life cycles

Change-Id: I83928638a390f434c431487b1cb13633f24de9ec

diff --git a/lotuswordpro/source/filter/lwpparaproperty.cxx 
b/lotuswordpro/source/filter/lwpparaproperty.cxx
index 66730e2..2ddd714 100644
--- a/lotuswordpro/source/filter/lwpparaproperty.cxx
+++ b/lotuswordpro/source/filter/lwpparaproperty.cxx
@@ -143,8 +143,8 @@ LwpParaAlignProperty::LwpParaAlignProperty(LwpObjectStream* 
pFile)
 LwpObjectID align;
 align.ReadIndexed(pFile);
 
-LwpAlignmentPiece *pAlignmentPiece = 
dynamic_cast(align.obj(VO_ALIGNMENTPIECE).get());
-m_pAlignment = pAlignmentPiece ? 
dynamic_cast(pAlignmentPiece->GetOverride()) : nullptr;
+rtl::Reference 
xAlignmentPiece(dynamic_cast(align.obj(VO_ALIGNMENTPIECE).get()));
+m_pAlignment = xAlignmentPiece.is() ? 
dynamic_cast(xAlignmentPiece->GetOverride()) : nullptr;
 
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 lotuswordpro/source/filter/lwpframelayout.cxx |   15 ---
 lotuswordpro/source/filter/lwplayout.cxx  |   17 +
 lotuswordpro/source/filter/lwplayout.hxx  |2 +-
 3 files changed, 18 insertions(+), 16 deletions(-)

New commits:
commit 80509545cc43893776dd24f441e9b95567ce06db
Author: Caolán McNamara 
Date:   Sun Dec 13 16:59:16 2015 +

hold WaterMarkLayout by reference

Change-Id: I7dc7739ee7b958319ddd4e0cf262254728ef0569

diff --git a/lotuswordpro/source/filter/lwpframelayout.cxx 
b/lotuswordpro/source/filter/lwpframelayout.cxx
index b31791a..7312e81 100644
--- a/lotuswordpro/source/filter/lwpframelayout.cxx
+++ b/lotuswordpro/source/filter/lwpframelayout.cxx
@@ -272,7 +272,7 @@ void LwpFrame::ApplyWrapType(XFFrameStyle *pFrameStyle)
 case LwpPlacableLayout::LAY_NO_WRAP_AROUND:
 {
 eWrap = enumXFWrapRunThrough;
-if(!m_pLayout->GetBackColor() && !m_pLayout->GetWaterMarkLayout())
+if(!m_pLayout->GetBackColor() && 
!m_pLayout->GetWaterMarkLayout().is())
 {
 //pFrameStyle->SetBackGround(sal_True);
 XFColor aXFColor(0xff); //white color
@@ -534,12 +534,13 @@ void LwpFrame::ApplyWatermark(XFFrameStyle *pFrameStyle)
 {
 pFrameStyle->SetBackImage(pBGImage);
 //set watermark transparent
- LwpMiddleLayout* pLay = 
static_cast(m_pLayout->GetWaterMarkLayout());
- LwpBackgroundStuff* pBackgroundStuff = pLay->GetBackgroundStuff();
- if(pBackgroundStuff && !pBackgroundStuff->IsTransparent())
- {
- pFrameStyle->SetTransparency(100);
- }
+rtl::Reference 
xWaterMarkLayout(m_pLayout->GetWaterMarkLayout());
+LwpMiddleLayout* pLay = 
dynamic_cast(xWaterMarkLayout.get());
+LwpBackgroundStuff* pBackgroundStuff = pLay ? 
pLay->GetBackgroundStuff() : nullptr;
+if(pBackgroundStuff && !pBackgroundStuff->IsTransparent())
+{
+pFrameStyle->SetTransparency(100);
+}
  }
 }
 
diff --git a/lotuswordpro/source/filter/lwplayout.cxx 
b/lotuswordpro/source/filter/lwplayout.cxx
index b8dd7fa..7eeeb51 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -1357,18 +1357,18 @@ bool LwpMiddleLayout::IsProtected()
 * @descr:   Get watermark layout
 *
 */
-LwpVirtualLayout* LwpMiddleLayout::GetWaterMarkLayout()
+rtl::Reference LwpMiddleLayout::GetWaterMarkLayout()
 {
-LwpVirtualLayout* pLay = 
dynamic_cast(GetChildHead().obj().get());
-while(pLay)
+rtl::Reference 
xLay(dynamic_cast(GetChildHead().obj().get()));
+while (xLay.is())
 {
-if( pLay->IsForWaterMark())
+if (xLay->IsForWaterMark())
 {
-return pLay;
+return xLay;
 }
-pLay = dynamic_cast (pLay->GetNext().obj().get());
+xLay.set(dynamic_cast(xLay->GetNext().obj().get()));
 }
-return nullptr;
+return rtl::Reference();
 }
 
 /**
@@ -1377,7 +1377,8 @@ LwpVirtualLayout* LwpMiddleLayout::GetWaterMarkLayout()
 */
 XFBGImage* LwpMiddleLayout::GetXFBGImage()
 {
-LwpMiddleLayout* pLay = 
static_cast(GetWaterMarkLayout());
+rtl::Reference xWaterMarkLayout(GetWaterMarkLayout());
+LwpMiddleLayout* pLay = 
dynamic_cast(xWaterMarkLayout.get());
 if(pLay)
 {
 //test BGImage
diff --git a/lotuswordpro/source/filter/lwplayout.hxx 
b/lotuswordpro/source/filter/lwplayout.hxx
index 9221029..5d115a6 100644
--- a/lotuswordpro/source/filter/lwplayout.hxx
+++ b/lotuswordpro/source/filter/lwplayout.hxx
@@ -322,7 +322,7 @@ public:
 virtual sal_uInt8 GetContentOrientation() override;
 virtual bool HonorProtection() override;
 virtual bool IsProtected() override;
-LwpVirtualLayout* GetWaterMarkLayout();
+rtl::Reference GetWaterMarkLayout();
 XFBGImage* GetXFBGImage();
 bool GetUsePrinterSettings();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 lotuswordpro/source/filter/lwpproplist.cxx |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit a065eda2383e8d2d8de3cf0a280f6699c05da425
Author: Caolán McNamara 
Date:   Sun Dec 13 16:17:30 2015 +

protect both EnumNamedProperty branches the same way

Change-Id: I93669a6460806c1d4c35669a639667b0c6f3f4ab

diff --git a/lotuswordpro/source/filter/lwpproplist.cxx 
b/lotuswordpro/source/filter/lwpproplist.cxx
index a0a59f1..119179e 100644
--- a/lotuswordpro/source/filter/lwpproplist.cxx
+++ b/lotuswordpro/source/filter/lwpproplist.cxx
@@ -127,11 +127,10 @@ OUString LwpPropList::EnumNamedProperty(OUString& 
name,OUString& value)
 value = pElement->GetValue().str();
 name  = pElement->GetName().str();
 pElement = pElement->GetNext();
-return  pElement->GetName().str();
+if(pElement)
+return  pElement->GetName().str();
 }
-else
-return OUString("");
-
+return OUString("");
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwpproplist.cxx |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 07cef793f3cbe8bdada82c76e13e3ec1a7c3332d
Author: Caolán McNamara 
Date:   Sun Dec 13 16:17:30 2015 +

protect both EnumNamedProperty branches the same way

Change-Id: I93669a6460806c1d4c35669a639667b0c6f3f4ab
(cherry picked from commit a065eda2383e8d2d8de3cf0a280f6699c05da425)

diff --git a/lotuswordpro/source/filter/lwpproplist.cxx 
b/lotuswordpro/source/filter/lwpproplist.cxx
index a0a59f1..119179e 100644
--- a/lotuswordpro/source/filter/lwpproplist.cxx
+++ b/lotuswordpro/source/filter/lwpproplist.cxx
@@ -127,11 +127,10 @@ OUString LwpPropList::EnumNamedProperty(OUString& 
name,OUString& value)
 value = pElement->GetValue().str();
 name  = pElement->GetName().str();
 pElement = pElement->GetNext();
-return  pElement->GetName().str();
+if(pElement)
+return  pElement->GetName().str();
 }
-else
-return OUString("");
-
+return OUString("");
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/elementary icon-themes/hicontrast icon-themes/human icon-themes/sifr

[Laurent Balland-Poirier]

 icon-themes/elementary/cmd/lc_openremote.png  |binary
 icon-themes/elementary/cmd/sc_openremote.png  |binary
 icon-themes/elementary/framework/res/remote-documents.png |binary
 icon-themes/hicontrast/cmd/lc_openremote.png  |binary
 icon-themes/hicontrast/cmd/sc_openremote.png  |binary
 icon-themes/hicontrast/framework/res/remote-documents.png |binary
 icon-themes/human/cmd/lc_openremote.png   |binary
 icon-themes/human/cmd/sc_openremote.png   |binary
 icon-themes/human/framework/res/remote-documents.png  |binary
 icon-themes/sifr/cmd/lc_openremote.png|binary
 icon-themes/sifr/cmd/sc_openremote.png|binary
 11 files changed

New commits:
commit 92e4dae00d8eb4a82b43eabec149bd6912cb74b0
Author: Laurent Balland-Poirier 
Date:   Sat Dec 12 17:16:34 2015 +0100

Update themes for openremote icon (tdf#93038)

add elementary, hicontrast, human and sifr openremote icons

Change-Id: Iefe2db951a8127be387e79453cae0131bf0648c3
Reviewed-on: https://gerrit.libreoffice.org/20681
Tested-by: Jenkins 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/icon-themes/elementary/cmd/lc_openremote.png 
b/icon-themes/elementary/cmd/lc_openremote.png
new file mode 100644
index 000..5b41e0a
Binary files /dev/null and b/icon-themes/elementary/cmd/lc_openremote.png differ
diff --git a/icon-themes/elementary/cmd/sc_openremote.png 
b/icon-themes/elementary/cmd/sc_openremote.png
new file mode 100644
index 000..5e9ec33
Binary files /dev/null and b/icon-themes/elementary/cmd/sc_openremote.png differ
diff --git a/icon-themes/elementary/framework/res/remote-documents.png 
b/icon-themes/elementary/framework/res/remote-documents.png
new file mode 100644
index 000..6eda35a
Binary files /dev/null and 
b/icon-themes/elementary/framework/res/remote-documents.png differ
diff --git a/icon-themes/hicontrast/cmd/lc_openremote.png 
b/icon-themes/hicontrast/cmd/lc_openremote.png
new file mode 100644
index 000..cd26bec
Binary files /dev/null and b/icon-themes/hicontrast/cmd/lc_openremote.png differ
diff --git a/icon-themes/hicontrast/cmd/sc_openremote.png 
b/icon-themes/hicontrast/cmd/sc_openremote.png
new file mode 100644
index 000..8efa138
Binary files /dev/null and b/icon-themes/hicontrast/cmd/sc_openremote.png differ
diff --git a/icon-themes/hicontrast/framework/res/remote-documents.png 
b/icon-themes/hicontrast/framework/res/remote-documents.png
new file mode 100644
index 000..1e67347
Binary files /dev/null and 
b/icon-themes/hicontrast/framework/res/remote-documents.png differ
diff --git a/icon-themes/human/cmd/lc_openremote.png 
b/icon-themes/human/cmd/lc_openremote.png
new file mode 100644
index 000..87b2d32
Binary files /dev/null and b/icon-themes/human/cmd/lc_openremote.png differ
diff --git a/icon-themes/human/cmd/sc_openremote.png 
b/icon-themes/human/cmd/sc_openremote.png
new file mode 100644
index 000..711c758
Binary files /dev/null and b/icon-themes/human/cmd/sc_openremote.png differ
diff --git a/icon-themes/human/framework/res/remote-documents.png 
b/icon-themes/human/framework/res/remote-documents.png
new file mode 100644
index 000..fedd47b
Binary files /dev/null and 
b/icon-themes/human/framework/res/remote-documents.png differ
diff --git a/icon-themes/sifr/cmd/lc_openremote.png 
b/icon-themes/sifr/cmd/lc_openremote.png
new file mode 100644
index 000..34a38a9
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_openremote.png differ
diff --git a/icon-themes/sifr/cmd/sc_openremote.png 
b/icon-themes/sifr/cmd/sc_openremote.png
new file mode 100644
index 000..13af864
Binary files /dev/null and b/icon-themes/sifr/cmd/sc_openremote.png 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' - 5 commits - extras/source readlicense_oo/license sc/source sw/source vcl/source

[Dennis Francis]

 extras/source/autocorr/lang/es/DocumentList.xml |8 
 extras/source/autocorr/lang/is/DocumentList.xml |   31 
 readlicense_oo/license/CREDITS.fodt | 2451 
 sc/source/ui/view/cellsh2.cxx   |   31 
 sw/source/core/access/accpara.cxx   |2 
 sw/source/core/attr/calbck.cxx  |8 
 sw/source/core/unocore/unodraw.cxx  |3 
 sw/source/core/unocore/unoflatpara.cxx  |3 
 sw/source/core/unocore/unoframe.cxx |3 
 sw/source/core/unocore/unoport.cxx  |5 
 sw/source/core/unocore/unosett.cxx  |1 
 sw/source/core/unocore/unostyle.cxx |2 
 sw/source/core/unocore/unotbl.cxx   |   16 
 vcl/source/gdi/pdfwriter_impl.cxx   |2 
 14 files changed, 1327 insertions(+), 1239 deletions(-)

New commits:
commit 99bfb536dcfec6ef90c9bc3da7115b124e088a5f
Author: Dennis Francis 
Date:   Sat Nov 28 22:47:02 2015 +0530

tdf#73006 : Put results in correct cells after Text to Columns

Change-Id: I7a1653424edd93b2de0597ce8a94aa5f4fa85622
Reviewed-on: https://gerrit.libreoffice.org/20258
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit d4c22dbb1c9d71bb83c218d339df83e8727e469c)
Reviewed-on: https://gerrit.libreoffice.org/20675
(cherry picked from commit 5816c47a65d95629d34d6d40fd040e7bc44ea589)

diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index aeca622..88ca0ad 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -70,7 +70,7 @@
 
 using namespace com::sun::star;
 
-static bool lcl_GetTextToColumnsRange( const ScViewData* pData, ScRange& 
rRange )
+static bool lcl_GetTextToColumnsRange( const ScViewData* pData, ScRange& 
rRange, bool bDoEmptyCheckOnly )
 {
 OSL_ENSURE( pData, "lcl_GetTextToColumnsRange: pData is null!" );
 
@@ -100,11 +100,28 @@ static bool lcl_GetTextToColumnsRange( const ScViewData* 
pData, ScRange& rRange
 const ScDocument* pDoc = pData->GetDocument();
 OSL_ENSURE( pDoc, "lcl_GetTextToColumnsRange: pDoc is null!" );
 
-if ( bRet && pDoc->IsBlockEmpty( rRange.aStart.Tab(), rRange.aStart.Col(),
- rRange.aStart.Row(), rRange.aEnd.Col(),
- rRange.aEnd.Row() ) )
+if ( bDoEmptyCheckOnly )
 {
-bRet = false;
+if ( bRet && pDoc->IsBlockEmpty( rRange.aStart.Tab(), 
rRange.aStart.Col(),
+ rRange.aStart.Row(), 
rRange.aEnd.Col(),
+ rRange.aEnd.Row() ) )
+{
+bRet = false;
+}
+}
+else if ( bRet )
+{
+rRange.PutInOrder();
+SCCOL nStartCol = rRange.aStart.Col(), nEndCol = rRange.aEnd.Col();
+SCROW nStartRow = rRange.aStart.Row(), nEndRow = rRange.aEnd.Row();
+bool bShrunk = false;
+pDoc->ShrinkToUsedDataArea( bShrunk, rRange.aStart.Tab(), nStartCol, 
nStartRow,
+   nEndCol, nEndRow, false, false, true );
+if ( bShrunk )
+{
+rRange.aStart.SetRow( nStartRow );
+rRange.aEnd.SetRow( nEndRow );
+}
 }
 
 return bRet;
@@ -942,7 +959,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
 OSL_ENSURE( pData, "ScCellShell::ExecuteDB: 
SID_TEXT_TO_COLUMNS - pData is null!" );
 ScRange aRange;
 
-if ( lcl_GetTextToColumnsRange( pData, aRange ) )
+if ( lcl_GetTextToColumnsRange( pData, aRange, false ) )
 {
 ScDocument* pDoc = pData->GetDocument();
 OSL_ENSURE( pDoc, "ScCellShell::ExecuteDB: 
SID_TEXT_TO_COLUMNS - pDoc is null!" );
@@ -1180,7 +1197,7 @@ void ScCellShell::GetDBState( SfxItemSet& rSet )
 case SID_TEXT_TO_COLUMNS:
 {
 ScRange aRange;
-if ( !lcl_GetTextToColumnsRange( pData, aRange ) )
+if ( !lcl_GetTextToColumnsRange( pData, aRange, true ) )
 {
 rSet.DisableItem( nWhich );
 }
commit 3ce8662ea666b8d97286daee0fec514aa981856f
Author: Tomaž Vajngerl 
Date:   Fri Dec 4 18:19:08 2015 +0100

tdf#94739 use GetScanlineSize instead of calculating it

We calculate the scanline size wrongly when writing a PDF so the
image is not exported correctly. BitmapAccess already has a method
to determine the scanline size so use that instead.

Change-Id: Icccba8f26c5e0fd4bd4c37bba7c5a7fe8d0094bd
(cherry picked from commit 82e0c38e1205a3c8a70234a95ca33ab1400fbe57)
Signed-off-by: Michael Meeks 
Reviewed-on: 

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

[Andras Timar]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ceef0230600b1f7e4697a11e55dbefaeaa8714db
Author: Andras Timar 
Date:   Sun Dec 13 17:34:19 2015 +0100

Bump version to 5.0-14

Change-Id: I1dde706c7a1ea6bdbb40f3d48d88c6c4dedb5c11

diff --git a/configure.ac b/configure.ac
index db9ab05..3ebc512 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.13],[],[],[https://CollaboraOffice.com/])
+AC_INIT([Collabora Office],[5.0.10.14],[],[],[https://CollaboraOffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 lotuswordpro/source/filter/lwplayout.cxx |  206 ++-
 1 file changed, 151 insertions(+), 55 deletions(-)

New commits:
commit 64cfe976c36cb930e0a96557ba7d9eb99442fc59
Author: Caolán McNamara 
Date:   Sun Dec 13 16:51:27 2015 +

use more references to fix life cycles

Change-Id: Ib14639d532da5bffdfe7e0a7bb362b20a7f25dfb

diff --git a/lotuswordpro/source/filter/lwplayout.cxx 
b/lotuswordpro/source/filter/lwplayout.cxx
index 00e8e50..b8dd7fa 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -642,9 +642,13 @@ LwpLayoutGeometry* LwpMiddleLayout::GetGeometry()
 {
 return ( dynamic_cast (m_LayGeometry.obj().get()) 
);
 }
-else if (LwpMiddleLayout* pLay = 
dynamic_cast(GetBasedOnStyle().get()))
+else
 {
-return pLay->GetGeometry();
+rtl::Reference xBase(GetBasedOnStyle());
+if (LwpMiddleLayout* pLay = 
dynamic_cast(xBase.get()))
+{
+return pLay->GetGeometry();
+}
 }
 return nullptr;
 }
@@ -689,12 +693,12 @@ bool LwpMiddleLayout::MarginsSameAsParent()
 {
 return LwpVirtualLayout::MarginsSameAsParent();
 }
-if (LwpVirtualLayout* pLay = dynamic_cast 
(GetBasedOnStyle().get()))
+rtl::Reference xBase(GetBasedOnStyle());
+if (LwpVirtualLayout* pLay = dynamic_cast(xBase.get()))
 {
 pLay->MarginsSameAsParent();
 }
 return LwpVirtualLayout::MarginsSameAsParent();
-
 }
 
 /**
@@ -726,8 +730,9 @@ double LwpMiddleLayout::GetMarginsValue(const sal_uInt8 
)
 return fValue;
 }
 }
-LwpVirtualLayout* pStyle = 
dynamic_cast(GetBasedOnStyle().get());
-if(pStyle)
+rtl::Reference xBase(GetBasedOnStyle());
+LwpVirtualLayout* pStyle = dynamic_cast(xBase.get());
+if (pStyle)
 {
 fValue = pStyle->GetMarginsValue(nWhichSide);
 return fValue;
@@ -770,9 +775,13 @@ LwpBorderStuff* LwpMiddleLayout::GetBorderStuff()
 LwpLayoutBorder* pLayoutBorder = 
dynamic_cast(m_LayBorderStuff.obj().get());
 return pLayoutBorder ? >GetBorderStuff() : nullptr;
 }
-else if (LwpMiddleLayout* pLay = 
dynamic_cast(GetBasedOnStyle().get()))
+else
 {
-return pLay->GetBorderStuff();
+rtl::Reference xBase(GetBasedOnStyle());
+if (LwpMiddleLayout* pLay = 
dynamic_cast(xBase.get()))
+{
+return pLay->GetBorderStuff();
+}
 }
 return nullptr;
 }
@@ -787,9 +796,13 @@ LwpBackgroundStuff* LwpMiddleLayout::GetBackgroundStuff()
 LwpLayoutBackground* pLayoutBackground = 
dynamic_cast(m_LayBackgroundStuff.obj().get());
 return pLayoutBackground ? >GetBackgoudStuff() : 
nullptr;
 }
-else if (LwpMiddleLayout* pLay = 
dynamic_cast(GetBasedOnStyle().get()))
+else
 {
-return pLay->GetBackgroundStuff();
+rtl::Reference xBase(GetBasedOnStyle());
+if (LwpMiddleLayout* pLay = 
dynamic_cast(xBase.get()))
+{
+return pLay->GetBackgroundStuff();
+}
 }
 return nullptr;
 }
@@ -884,9 +897,13 @@ LwpTabOverride* LwpMiddleLayout::GetTabOverride()
 }
 return nullptr;
 }
-else if (LwpMiddleLayout* pLay = dynamic_cast ( 
GetBasedOnStyle().get() ))
+else
 {
-return pLay->GetTabOverride();
+rtl::Reference xBase(GetBasedOnStyle());
+if (LwpMiddleLayout* pLay = 
dynamic_cast(xBase.get()))
+{
+return pLay->GetTabOverride();
+}
 }
 return nullptr;
 }
@@ -1127,9 +1144,13 @@ bool LwpMiddleLayout::IsAutoGrow()
 ((LAY_AUTOGROW << SHIFT_UP) | (LAY_AUTOGROW << SHIFT_DOWN) |
 (LAY_AUTOGROW << SHIFT_RIGHT) | (LAY_AUTOGROW << SHIFT_LEFT))) != 
0;
 }
-else if (LwpMiddleLayout* pLay = 
dynamic_cast(GetBasedOnStyle().get()))
+else
 {
-return pLay->IsAutoGrow();
+rtl::Reference xBase(GetBasedOnStyle());
+if (LwpMiddleLayout* pLay = 
dynamic_cast(xBase.get()))
+{
+return pLay->IsAutoGrow();
+}
 }
 return LwpVirtualLayout::IsAutoGrow();
 }
@@ -1144,9 +1165,13 @@ bool LwpMiddleLayout::IsAutoGrowDown()
 {
 return (m_nDirection & (LAY_AUTOGROW << SHIFT_DOWN)) != 0;
 }
-else if (LwpMiddleLayout* pLay = 
dynamic_cast(GetBasedOnStyle().get()))
+else
 {
-return pLay->IsAutoGrowDown();
+rtl::Reference xBase(GetBasedOnStyle());
+if (LwpMiddleLayout* pLay = 
dynamic_cast(xBase.get()))
+{
+return pLay->IsAutoGrowDown();
+}
   

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - 2 commits - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwplayout.cxx   |  206 ++---
 lotuswordpro/source/filter/lwpparaproperty.cxx |4 
 2 files changed, 153 insertions(+), 57 deletions(-)

New commits:
commit 4d5bba46b33b84072f17f7cd925d38407ae56a1a
Author: Caolán McNamara 
Date:   Sun Dec 13 16:51:27 2015 +

use more references to fix life cycles

Change-Id: Ib14639d532da5bffdfe7e0a7bb362b20a7f25dfb
(cherry picked from commit 64cfe976c36cb930e0a96557ba7d9eb99442fc59)

diff --git a/lotuswordpro/source/filter/lwplayout.cxx 
b/lotuswordpro/source/filter/lwplayout.cxx
index 00e8e50..b8dd7fa 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -642,9 +642,13 @@ LwpLayoutGeometry* LwpMiddleLayout::GetGeometry()
 {
 return ( dynamic_cast (m_LayGeometry.obj().get()) 
);
 }
-else if (LwpMiddleLayout* pLay = 
dynamic_cast(GetBasedOnStyle().get()))
+else
 {
-return pLay->GetGeometry();
+rtl::Reference xBase(GetBasedOnStyle());
+if (LwpMiddleLayout* pLay = 
dynamic_cast(xBase.get()))
+{
+return pLay->GetGeometry();
+}
 }
 return nullptr;
 }
@@ -689,12 +693,12 @@ bool LwpMiddleLayout::MarginsSameAsParent()
 {
 return LwpVirtualLayout::MarginsSameAsParent();
 }
-if (LwpVirtualLayout* pLay = dynamic_cast 
(GetBasedOnStyle().get()))
+rtl::Reference xBase(GetBasedOnStyle());
+if (LwpVirtualLayout* pLay = dynamic_cast(xBase.get()))
 {
 pLay->MarginsSameAsParent();
 }
 return LwpVirtualLayout::MarginsSameAsParent();
-
 }
 
 /**
@@ -726,8 +730,9 @@ double LwpMiddleLayout::GetMarginsValue(const sal_uInt8 
)
 return fValue;
 }
 }
-LwpVirtualLayout* pStyle = 
dynamic_cast(GetBasedOnStyle().get());
-if(pStyle)
+rtl::Reference xBase(GetBasedOnStyle());
+LwpVirtualLayout* pStyle = dynamic_cast(xBase.get());
+if (pStyle)
 {
 fValue = pStyle->GetMarginsValue(nWhichSide);
 return fValue;
@@ -770,9 +775,13 @@ LwpBorderStuff* LwpMiddleLayout::GetBorderStuff()
 LwpLayoutBorder* pLayoutBorder = 
dynamic_cast(m_LayBorderStuff.obj().get());
 return pLayoutBorder ? >GetBorderStuff() : nullptr;
 }
-else if (LwpMiddleLayout* pLay = 
dynamic_cast(GetBasedOnStyle().get()))
+else
 {
-return pLay->GetBorderStuff();
+rtl::Reference xBase(GetBasedOnStyle());
+if (LwpMiddleLayout* pLay = 
dynamic_cast(xBase.get()))
+{
+return pLay->GetBorderStuff();
+}
 }
 return nullptr;
 }
@@ -787,9 +796,13 @@ LwpBackgroundStuff* LwpMiddleLayout::GetBackgroundStuff()
 LwpLayoutBackground* pLayoutBackground = 
dynamic_cast(m_LayBackgroundStuff.obj().get());
 return pLayoutBackground ? >GetBackgoudStuff() : 
nullptr;
 }
-else if (LwpMiddleLayout* pLay = 
dynamic_cast(GetBasedOnStyle().get()))
+else
 {
-return pLay->GetBackgroundStuff();
+rtl::Reference xBase(GetBasedOnStyle());
+if (LwpMiddleLayout* pLay = 
dynamic_cast(xBase.get()))
+{
+return pLay->GetBackgroundStuff();
+}
 }
 return nullptr;
 }
@@ -884,9 +897,13 @@ LwpTabOverride* LwpMiddleLayout::GetTabOverride()
 }
 return nullptr;
 }
-else if (LwpMiddleLayout* pLay = dynamic_cast ( 
GetBasedOnStyle().get() ))
+else
 {
-return pLay->GetTabOverride();
+rtl::Reference xBase(GetBasedOnStyle());
+if (LwpMiddleLayout* pLay = 
dynamic_cast(xBase.get()))
+{
+return pLay->GetTabOverride();
+}
 }
 return nullptr;
 }
@@ -1127,9 +1144,13 @@ bool LwpMiddleLayout::IsAutoGrow()
 ((LAY_AUTOGROW << SHIFT_UP) | (LAY_AUTOGROW << SHIFT_DOWN) |
 (LAY_AUTOGROW << SHIFT_RIGHT) | (LAY_AUTOGROW << SHIFT_LEFT))) != 
0;
 }
-else if (LwpMiddleLayout* pLay = 
dynamic_cast(GetBasedOnStyle().get()))
+else
 {
-return pLay->IsAutoGrow();
+rtl::Reference xBase(GetBasedOnStyle());
+if (LwpMiddleLayout* pLay = 
dynamic_cast(xBase.get()))
+{
+return pLay->IsAutoGrow();
+}
 }
 return LwpVirtualLayout::IsAutoGrow();
 }
@@ -1144,9 +1165,13 @@ bool LwpMiddleLayout::IsAutoGrowDown()
 {
 return (m_nDirection & (LAY_AUTOGROW << SHIFT_DOWN)) != 0;
 }
-else if (LwpMiddleLayout* pLay = 
dynamic_cast(GetBasedOnStyle().get()))
+else
 {
-return pLay->IsAutoGrowDown();
+rtl::Reference xBase(GetBasedOnStyle());
+if 

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwptablelayout.cxx |   17 ++---
 1 file changed, 10 insertions(+), 7 deletions(-)

New commits:
commit 9e04fac9ed56cbe709485430f60ee93d40127204
Author: Caolán McNamara 
Date:   Sun Dec 13 17:40:36 2015 +

font might be null

Change-Id: Id0d9bb1d1abe6f6c9440bf979407d13db49696c4
(cherry picked from commit 00bccc565d1bcd4bd620bb9b33b9f1d07fb5f13e)

diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx 
b/lotuswordpro/source/filter/lwptablelayout.cxx
index 9783531..85ff885 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -1222,14 +1222,17 @@ void LwpTableLayout::PostProcessParagraph(XFCell 
*pCell, sal_uInt16 nRowID, sal_
 
 if (bColorMod)
 {
-rtl::Reference pFont = pOverStyle->GetFont();
-XFColor aColor = pFont->GetColor();
-if ( aColor == aNullColor )
+rtl::Reference xFont = pOverStyle->GetFont();
+if (xFont.is())
 {
-rtl::Reference pNewFont = new XFFont;
-aColor = pNumStyle->GetColor();
-pNewFont->SetColor(aColor);
-pOverStyle->SetFont(pNewFont);
+XFColor aColor = xFont->GetColor();
+if ( aColor == aNullColor )
+{
+rtl::Reference pNewFont = new XFFont;
+aColor = pNumStyle->GetColor();
+pNewFont->SetColor(aColor);
+pOverStyle->SetFont(pNewFont);
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 lotuswordpro/source/filter/lwptablelayout.cxx |   17 ++---
 1 file changed, 10 insertions(+), 7 deletions(-)

New commits:
commit 00bccc565d1bcd4bd620bb9b33b9f1d07fb5f13e
Author: Caolán McNamara 
Date:   Sun Dec 13 17:40:36 2015 +

font might be null

Change-Id: Id0d9bb1d1abe6f6c9440bf979407d13db49696c4

diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx 
b/lotuswordpro/source/filter/lwptablelayout.cxx
index 9783531..85ff885 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -1222,14 +1222,17 @@ void LwpTableLayout::PostProcessParagraph(XFCell 
*pCell, sal_uInt16 nRowID, sal_
 
 if (bColorMod)
 {
-rtl::Reference pFont = pOverStyle->GetFont();
-XFColor aColor = pFont->GetColor();
-if ( aColor == aNullColor )
+rtl::Reference xFont = pOverStyle->GetFont();
+if (xFont.is())
 {
-rtl::Reference pNewFont = new XFFont;
-aColor = pNumStyle->GetColor();
-pNewFont->SetColor(aColor);
-pOverStyle->SetFont(pNewFont);
+XFColor aColor = xFont->GetColor();
+if ( aColor == aNullColor )
+{
+rtl::Reference pNewFont = new XFFont;
+aColor = pNumStyle->GetColor();
+pNewFont->SetColor(aColor);
+pOverStyle->SetFont(pNewFont);
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Request for upload HSQLDB 2.3.3.zip on http://dev-www.libreoffice.org/src

[Julien Nabet]

On 12/12/2015 09:40, Markus Mohrhard wrote:

Hey Julien,

...


There is no need to repackage the tarball to get that in the build 
system. Unpackedtarball.mk already supports adapting the directory 
layout. As an example of a package that does this already: $(eval 
$(call 
gb_UnpackedTarball_set_tarball,cppunit,$(CPPUNIT_TARBALL),,cppunit))...

Hi Markus,

Thank you for the tip.
So I suppose the request should be changed as if someone could upload 
the file from official hsqldb website... :-)


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

fix paint table border in DOUBLE_THIN style

[flw.aquar...@gmail.com]

Hi, I find a bug in the master branch and fixed it. But i am in trouble when i 
push the patch to the gerrit. It the waring fllow:

The authenticity of host '[gerrit.libreoffice.org]:29418 
([89.238.68.148]:29418)' can't be established.

So, i show the screenshot to show the bug and patch fllow:

screenshot:
http://7xjcd4.com1.z0.glb.clouddn.com/bog_lo_bug_cell_double_thin_1.png

patch:
From f7d4b14cccb20ea39a90fb68986fb5578c6fd9a2 Mon Sep 17 00:00:00 2001
From: aqcoder 
Date: Sun, 13 Dec 2015 19:11:28 +0800
Subject: [PATCH] fix paint table border in DOUBLE_THIN style

it always paint partial table border which have line style of DOUBLE_THIN.
Becouse the partial of the border line is out of the invalid window rect.
so, we extend it.

Change-Id: I9d95ca71a96cfa869c68d9d2200f29c7cd447eca
---
 sw/source/core/layout/paintfrm.cxx | 18 ++
 1 file changed, 18 insertions(+)

diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index 83a8638..9746df7 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -2742,6 +2742,24 @@ void SwTabFramePainter::PaintLines(OutputDevice& rDev, 
const SwRect& rRect) cons
 aPaintEnd.Y()   += static_cast(offsetEnd   + 0.5);
 }
 
+if( rEntryStyle.Type() == table::BorderLineStyle::DOUBLE_THIN )
+{
+long aPixel = rDev.PixelToLogic( Point(1, 1) ).getX();
+SwRect aPaintEx( aPaintStart, aPaintEnd );
+if( bHori )
+{
+aPaintEx.Pos().Y() -= aPixel;
+aPaintEx.SSize().Height() += aPixel * 2;
+}
+else
+{
+aPaintEx.Pos().X() -= aPixel;
+aPaintEx.SSize().Width() += aPixel * 2;
+}
+
+gProp.pSGlobalShell->InvalidateWindows( aPaintEx );
+}
+
 if (bHori)
 {
 mrTabFrame.ProcessPrimitives( 
svx::frame::CreateBorderPrimitives(
-- 
2.5.0
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

C++ Exception Handling

[Rodrigo Bonifacio]

Dear all, (apologies if you receive multiple copies)

We are investigating the use of C++ exception handling constructs in well
known open-source C++ systems, and have published some results in the last
International Conference on Source Code Analysis and Manipulation [1]

We are expanding this research to a broader community, so I kindly invite
you to answer our new version of the survey at:

https://www.surveymonkey.com/r/SXCB7WJ

Sincerely,

Rodrigo Bonifácio (on behalf of the authors of this research effort).

[1] "The use of C++ exception handling constructs: A comprehensive study"
http://dx.doi.org/10.1109/SCAM.2015.7335398
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Request for upload HSQLDB 2.3.3.zip on http://dev-www.libreoffice.org/src

[Julien Nabet]

On 12/12/2015 11:00, Markus Mohrhard wrote:

...
Give a link to the file and it will be uploaded.

Here it is:
http://downloads.sourceforge.net/project/hsqldb/hsqldb/hsqldb_2_3/hsqldb-2.3.3.zip?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fhsqldb%2Ffiles%2F=1449914555_mirror=heanet

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

[SOLVED] Re: Request for upload HSQLDB 2.3.3.zip on http://dev-www.libreoffice.org/src

[Julien Nabet]

On 12/12/2015 11:08, Markus Mohrhard wrote:



On Sat, Dec 12, 2015 at 11:03 AM, Julien Nabet > wrote:


On 12/12/2015 11:00, Markus Mohrhard wrote:

...
Give a link to the file and it will be uploaded.

Here it is:

http://downloads.sourceforge.net/project/hsqldb/hsqldb/hsqldb_2_3/hsqldb-2.3.3.zip?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fhsqldb%2Ffiles%2F=1449914555_mirror=heanet

Julien



Uploaded as 62c0b97e94fe47d5e50ff605d2edf37a-hsqldb-2.3.3.zip


Thank you Markus! :-)

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

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - connectivity/source

[Lionel Elie Mamane]

 connectivity/source/drivers/odbc/OPreparedStatement.cxx |   12 +---
 connectivity/source/inc/odbc/OPreparedStatement.hxx |1 +
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit e95e07ef3b125688d4dce47f382533a1db50479f
Author: Lionel Elie Mamane 
Date:   Sun Dec 13 19:21:30 2015 +0100

tdf#96461 ODBC SQLBindParameter: correct DecimalDigits for time(date) values

Change-Id: I33c63d2c002d9abcbadb16bcd460996ef3212f4a
Reviewed-on: https://gerrit.libreoffice.org/20686
Reviewed-by: Lionel Elie Mamane 
Tested-by: Lionel Elie Mamane 

diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx 
b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
index 2e8f6be..95a9f21 100644
--- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx
+++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
@@ -290,6 +290,12 @@ void OPreparedStatement::setParameterPre(sal_Int32 
parameterIndex)
 
 template  void OPreparedStatement::setScalarParameter(const 
sal_Int32 parameterIndex, const sal_Int32 i_nType, const SQLULEN i_nColSize, 
const T i_Value)
 {
+setScalarParameter(parameterIndex, i_nType, i_nColSize, invalid_scale, 
i_Value);
+}
+
+
+template  void OPreparedStatement::setScalarParameter(const 
sal_Int32 parameterIndex, const sal_Int32 i_nType, const SQLULEN i_nColSize, 
sal_Int32 i_nScale, const T i_Value)
+{
 ::osl::MutexGuard aGuard( m_aMutex );
 setParameterPre(parameterIndex);
 
@@ -298,7 +304,7 @@ template  void 
OPreparedStatement::setScalarParameter(const sal_Int3
 TnoRef *bindBuf = static_cast< TnoRef* >( allocBindBuf(parameterIndex, 
sizeof(i_Value)) );
 *bindBuf = i_Value;
 
-setParameter(parameterIndex, i_nType, i_nColSize, invalid_scale, bindBuf, 
sizeof(i_Value), sizeof(i_Value));
+setParameter(parameterIndex, i_nType, i_nColSize, i_nScale, bindBuf, 
sizeof(i_Value), sizeof(i_Value));
 }
 
 
@@ -442,7 +448,7 @@ void SAL_CALL OPreparedStatement::setTime( sal_Int32 
parameterIndex, const css::
 else
 nColSize = 18;
 TIME_STRUCT x(OTools::TimeToOdbcTime(aVal));
-setScalarParameter(parameterIndex, DataType::TIME, nColSize, 
x);
+setScalarParameter(parameterIndex, DataType::TIME, nColSize, 
(nColSize == 8)? 0 : nColSize-9, x);
 }
 
 
@@ -476,7 +482,7 @@ void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 
parameterIndex, const
 nColSize = 29;
 
 TIMESTAMP_STRUCT x(OTools::DateTimeToTimestamp(aVal));
-setScalarParameter(parameterIndex, DataType::TIMESTAMP, 
nColSize, x);
+setScalarParameter(parameterIndex, DataType::TIMESTAMP, 
nColSize, (nColSize <= 19)? 0 : nColSize-20, x);
 }
 
 
diff --git a/connectivity/source/inc/odbc/OPreparedStatement.hxx 
b/connectivity/source/inc/odbc/OPreparedStatement.hxx
index f3ccaf7..edd9b32 100644
--- a/connectivity/source/inc/odbc/OPreparedStatement.hxx
+++ b/connectivity/source/inc/odbc/OPreparedStatement.hxx
@@ -81,6 +81,7 @@ namespace connectivity
 void initBoundParam () throw(::com::sun::star::sdbc::SQLException);
 void setParameterPre(sal_Int32 parameterIndex);
 template  void setScalarParameter(sal_Int32 
parameterIndex, sal_Int32 _nType, SQLULEN _nColumnSize, const T i_Value);
+template  void setScalarParameter(sal_Int32 
parameterIndex, sal_Int32 _nType, SQLULEN _nColumnSize, sal_Int32 _nScale, 
const T i_Value);
 void setParameter(sal_Int32 parameterIndex, sal_Int32 _nType, 
SQLULEN _nColumnSize, sal_Int32 _nScale, const void* _pData, SQLULEN _nDataLen, 
SQLLEN _nDataAllocLen);
 // Wrappers for special cases
 void setParameter(sal_Int32 parameterIndex, sal_Int32 _nType, 
sal_Int16 _nScale, const OUString &_sData);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 lotuswordpro/source/filter/lwpstory.cxx |   48 +++-
 1 file changed, 23 insertions(+), 25 deletions(-)

New commits:
commit 012bdecfcd7094403516c98bd5231fe1ef6f7e9d
Author: Caolán McNamara 
Date:   Sun Dec 13 17:50:22 2015 +

more lifecycle protection

Change-Id: I158632de6898685e34d362cc274e959bb5c2e2d7

diff --git a/lotuswordpro/source/filter/lwpstory.cxx 
b/lotuswordpro/source/filter/lwpstory.cxx
index ed52730..da8ea33 100644
--- a/lotuswordpro/source/filter/lwpstory.cxx
+++ b/lotuswordpro/source/filter/lwpstory.cxx
@@ -301,21 +301,19 @@ void LwpStory::XFConvertFrameInCell(XFContentContainer* 
pCont)
 rtl::Reference xLayout(GetLayout(nullptr));
 while (xLayout.is())
 {
-LwpVirtualLayout* pFrameLayout = 
dynamic_cast(xLayout->GetChildHead().obj().get());
-while(pFrameLayout)
+rtl::Reference 
xFrameLayout(dynamic_cast(xLayout->GetChildHead().obj().get()));
+while (xFrameLayout.is())
 {
-
-//if(pFrameLayout->IsAnchorCell())
-if(pFrameLayout->IsAnchorCell() && pFrameLayout->HasContent())
+if (xFrameLayout->IsAnchorCell() && xFrameLayout->HasContent())
 {
 //get the first xfpara
 rtl::Reference first(
 pCont->FindFirstContent(enumXFContentPara));
 XFContentContainer* pXFFirtPara = 
static_cast(first.get());
 if(pXFFirtPara)
-pFrameLayout->XFConvert(pXFFirtPara);
+xFrameLayout->XFConvert(pXFFirtPara);
 }
-pFrameLayout = 
dynamic_cast(pFrameLayout->GetNext().obj().get());
+
xFrameLayout.set(dynamic_cast(xFrameLayout->GetNext().obj().get()));
 }
 xLayout = GetLayout(xLayout.get());
 }
@@ -329,17 +327,17 @@ void LwpStory::XFConvertFrameInPage(XFContentContainer* 
pCont)
 rtl::Reference xLayout(GetLayout(nullptr));
 while (xLayout.is())
 {
-LwpVirtualLayout* pFrameLayout = 
dynamic_cast(xLayout->GetChildHead().obj().get());
-while(pFrameLayout)
+rtl::Reference 
xFrameLayout(dynamic_cast(xLayout->GetChildHead().obj().get()));
+while (xFrameLayout.is())
 {
-if((pFrameLayout->IsAnchorPage()
-&&(pFrameLayout->IsFrame()
-  ||pFrameLayout->IsSuperTable()
-  ||pFrameLayout->IsGroupHead(
+if((xFrameLayout->IsAnchorPage()
+&&(xFrameLayout->IsFrame()
+  || xFrameLayout->IsSuperTable()
+  || xFrameLayout->IsGroupHead(
 {
-pFrameLayout->XFConvert(pCont);
+xFrameLayout->XFConvert(pCont);
 }
-pFrameLayout = 
dynamic_cast(pFrameLayout->GetNext().obj().get());
+
xFrameLayout.set(dynamic_cast(xFrameLayout->GetNext().obj().get()));
 }
 xLayout = GetLayout(xLayout.get());
 }
@@ -352,14 +350,14 @@ void LwpStory::XFConvertFrameInFrame(XFContentContainer* 
pCont)
 rtl::Reference xLayout(GetLayout(nullptr));
 while (xLayout.get())
 {
-LwpVirtualLayout* pFrameLayout = 
dynamic_cast(xLayout->GetChildHead().obj().get());
-while(pFrameLayout)
+rtl::Reference 
xFrameLayout(dynamic_cast(xLayout->GetChildHead().obj().get()));
+while (xFrameLayout.is())
 {
-if(pFrameLayout->IsAnchorFrame())
+if (xFrameLayout->IsAnchorFrame())
 {
-pFrameLayout->XFConvert(pCont);
+xFrameLayout->XFConvert(pCont);
 }
-pFrameLayout = 
dynamic_cast(pFrameLayout->GetNext().obj().get());
+
xFrameLayout.set(dynamic_cast(xFrameLayout->GetNext().obj().get()));
 }
 xLayout = GetLayout(xLayout.get());
 }
@@ -372,19 +370,19 @@ void 
LwpStory::XFConvertFrameInHeaderFooter(XFContentContainer* pCont)
 rtl::Reference xLayout(GetLayout(nullptr));
 while (xLayout.is())
 {
-LwpVirtualLayout* pFrameLayout = 
dynamic_cast(xLayout->GetChildHead().obj().get());
-while(pFrameLayout)
+rtl::Reference 
xFrameLayout(dynamic_cast(xLayout->GetChildHead().obj().get()));
+while (xFrameLayout.is())
 {
-if(pFrameLayout->IsAnchorPage() && (xLayout->IsHeader() || 
xLayout->IsFooter()))
+if (xFrameLayout->IsAnchorPage() && (xLayout->IsHeader() || 
xLayout->IsFooter()))
 {
 //The frame must be included by 
 rtl::Reference first(
 pCont->FindFirstContent(enumXFContentPara));

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwpstory.cxx |   48 +++-
 1 file changed, 23 insertions(+), 25 deletions(-)

New commits:
commit 455e35dfc89119dc93aecaee1447b2b27ce27baf
Author: Caolán McNamara 
Date:   Sun Dec 13 17:50:22 2015 +

more lifecycle protection

Change-Id: I158632de6898685e34d362cc274e959bb5c2e2d7
(cherry picked from commit 012bdecfcd7094403516c98bd5231fe1ef6f7e9d)

diff --git a/lotuswordpro/source/filter/lwpstory.cxx 
b/lotuswordpro/source/filter/lwpstory.cxx
index ed52730..da8ea33 100644
--- a/lotuswordpro/source/filter/lwpstory.cxx
+++ b/lotuswordpro/source/filter/lwpstory.cxx
@@ -301,21 +301,19 @@ void LwpStory::XFConvertFrameInCell(XFContentContainer* 
pCont)
 rtl::Reference xLayout(GetLayout(nullptr));
 while (xLayout.is())
 {
-LwpVirtualLayout* pFrameLayout = 
dynamic_cast(xLayout->GetChildHead().obj().get());
-while(pFrameLayout)
+rtl::Reference 
xFrameLayout(dynamic_cast(xLayout->GetChildHead().obj().get()));
+while (xFrameLayout.is())
 {
-
-//if(pFrameLayout->IsAnchorCell())
-if(pFrameLayout->IsAnchorCell() && pFrameLayout->HasContent())
+if (xFrameLayout->IsAnchorCell() && xFrameLayout->HasContent())
 {
 //get the first xfpara
 rtl::Reference first(
 pCont->FindFirstContent(enumXFContentPara));
 XFContentContainer* pXFFirtPara = 
static_cast(first.get());
 if(pXFFirtPara)
-pFrameLayout->XFConvert(pXFFirtPara);
+xFrameLayout->XFConvert(pXFFirtPara);
 }
-pFrameLayout = 
dynamic_cast(pFrameLayout->GetNext().obj().get());
+
xFrameLayout.set(dynamic_cast(xFrameLayout->GetNext().obj().get()));
 }
 xLayout = GetLayout(xLayout.get());
 }
@@ -329,17 +327,17 @@ void LwpStory::XFConvertFrameInPage(XFContentContainer* 
pCont)
 rtl::Reference xLayout(GetLayout(nullptr));
 while (xLayout.is())
 {
-LwpVirtualLayout* pFrameLayout = 
dynamic_cast(xLayout->GetChildHead().obj().get());
-while(pFrameLayout)
+rtl::Reference 
xFrameLayout(dynamic_cast(xLayout->GetChildHead().obj().get()));
+while (xFrameLayout.is())
 {
-if((pFrameLayout->IsAnchorPage()
-&&(pFrameLayout->IsFrame()
-  ||pFrameLayout->IsSuperTable()
-  ||pFrameLayout->IsGroupHead(
+if((xFrameLayout->IsAnchorPage()
+&&(xFrameLayout->IsFrame()
+  || xFrameLayout->IsSuperTable()
+  || xFrameLayout->IsGroupHead(
 {
-pFrameLayout->XFConvert(pCont);
+xFrameLayout->XFConvert(pCont);
 }
-pFrameLayout = 
dynamic_cast(pFrameLayout->GetNext().obj().get());
+
xFrameLayout.set(dynamic_cast(xFrameLayout->GetNext().obj().get()));
 }
 xLayout = GetLayout(xLayout.get());
 }
@@ -352,14 +350,14 @@ void LwpStory::XFConvertFrameInFrame(XFContentContainer* 
pCont)
 rtl::Reference xLayout(GetLayout(nullptr));
 while (xLayout.get())
 {
-LwpVirtualLayout* pFrameLayout = 
dynamic_cast(xLayout->GetChildHead().obj().get());
-while(pFrameLayout)
+rtl::Reference 
xFrameLayout(dynamic_cast(xLayout->GetChildHead().obj().get()));
+while (xFrameLayout.is())
 {
-if(pFrameLayout->IsAnchorFrame())
+if (xFrameLayout->IsAnchorFrame())
 {
-pFrameLayout->XFConvert(pCont);
+xFrameLayout->XFConvert(pCont);
 }
-pFrameLayout = 
dynamic_cast(pFrameLayout->GetNext().obj().get());
+
xFrameLayout.set(dynamic_cast(xFrameLayout->GetNext().obj().get()));
 }
 xLayout = GetLayout(xLayout.get());
 }
@@ -372,19 +370,19 @@ void 
LwpStory::XFConvertFrameInHeaderFooter(XFContentContainer* pCont)
 rtl::Reference xLayout(GetLayout(nullptr));
 while (xLayout.is())
 {
-LwpVirtualLayout* pFrameLayout = 
dynamic_cast(xLayout->GetChildHead().obj().get());
-while(pFrameLayout)
+rtl::Reference 
xFrameLayout(dynamic_cast(xLayout->GetChildHead().obj().get()));
+while (xFrameLayout.is())
 {
-if(pFrameLayout->IsAnchorPage() && (xLayout->IsHeader() || 
xLayout->IsFooter()))
+if (xFrameLayout->IsAnchorPage() && (xLayout->IsHeader() || 
xLayout->IsFooter()))
 {
 //The frame must be included by 
 rtl::Reference 

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

[Lionel Elie Mamane]

 connectivity/source/drivers/odbc/OPreparedStatement.cxx |   12 +---
 connectivity/source/inc/odbc/OPreparedStatement.hxx |1 +
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 0df0ab1bc8530b5bc307e946f35e8f6be883c2d1
Author: Lionel Elie Mamane 
Date:   Sun Dec 13 19:21:30 2015 +0100

tdf#96461 ODBC SQLBindParameter: correct DecimalDigits for time(date) values

Change-Id: I33c63d2c002d9abcbadb16bcd460996ef3212f4a
Reviewed-on: https://gerrit.libreoffice.org/20684
Reviewed-by: Lionel Elie Mamane 
Tested-by: Lionel Elie Mamane 

diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx 
b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
index 2e8f6be..95a9f21 100644
--- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx
+++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
@@ -290,6 +290,12 @@ void OPreparedStatement::setParameterPre(sal_Int32 
parameterIndex)
 
 template  void OPreparedStatement::setScalarParameter(const 
sal_Int32 parameterIndex, const sal_Int32 i_nType, const SQLULEN i_nColSize, 
const T i_Value)
 {
+setScalarParameter(parameterIndex, i_nType, i_nColSize, invalid_scale, 
i_Value);
+}
+
+
+template  void OPreparedStatement::setScalarParameter(const 
sal_Int32 parameterIndex, const sal_Int32 i_nType, const SQLULEN i_nColSize, 
sal_Int32 i_nScale, const T i_Value)
+{
 ::osl::MutexGuard aGuard( m_aMutex );
 setParameterPre(parameterIndex);
 
@@ -298,7 +304,7 @@ template  void 
OPreparedStatement::setScalarParameter(const sal_Int3
 TnoRef *bindBuf = static_cast< TnoRef* >( allocBindBuf(parameterIndex, 
sizeof(i_Value)) );
 *bindBuf = i_Value;
 
-setParameter(parameterIndex, i_nType, i_nColSize, invalid_scale, bindBuf, 
sizeof(i_Value), sizeof(i_Value));
+setParameter(parameterIndex, i_nType, i_nColSize, i_nScale, bindBuf, 
sizeof(i_Value), sizeof(i_Value));
 }
 
 
@@ -442,7 +448,7 @@ void SAL_CALL OPreparedStatement::setTime( sal_Int32 
parameterIndex, const css::
 else
 nColSize = 18;
 TIME_STRUCT x(OTools::TimeToOdbcTime(aVal));
-setScalarParameter(parameterIndex, DataType::TIME, nColSize, 
x);
+setScalarParameter(parameterIndex, DataType::TIME, nColSize, 
(nColSize == 8)? 0 : nColSize-9, x);
 }
 
 
@@ -476,7 +482,7 @@ void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 
parameterIndex, const
 nColSize = 29;
 
 TIMESTAMP_STRUCT x(OTools::DateTimeToTimestamp(aVal));
-setScalarParameter(parameterIndex, DataType::TIMESTAMP, 
nColSize, x);
+setScalarParameter(parameterIndex, DataType::TIMESTAMP, 
nColSize, (nColSize <= 19)? 0 : nColSize-20, x);
 }
 
 
diff --git a/connectivity/source/inc/odbc/OPreparedStatement.hxx 
b/connectivity/source/inc/odbc/OPreparedStatement.hxx
index f3ccaf7..edd9b32 100644
--- a/connectivity/source/inc/odbc/OPreparedStatement.hxx
+++ b/connectivity/source/inc/odbc/OPreparedStatement.hxx
@@ -81,6 +81,7 @@ namespace connectivity
 void initBoundParam () throw(::com::sun::star::sdbc::SQLException);
 void setParameterPre(sal_Int32 parameterIndex);
 template  void setScalarParameter(sal_Int32 
parameterIndex, sal_Int32 _nType, SQLULEN _nColumnSize, const T i_Value);
+template  void setScalarParameter(sal_Int32 
parameterIndex, sal_Int32 _nType, SQLULEN _nColumnSize, sal_Int32 _nScale, 
const T i_Value);
 void setParameter(sal_Int32 parameterIndex, sal_Int32 _nType, 
SQLULEN _nColumnSize, sal_Int32 _nScale, const void* _pData, SQLULEN _nDataLen, 
SQLLEN _nDataAllocLen);
 // Wrappers for special cases
 void setParameter(sal_Int32 parameterIndex, sal_Int32 _nType, 
sal_Int16 _nScale, const OUString &_sData);
___
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' - desktop/source

[Andras Timar]

 desktop/source/lib/init.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 6b4cffc4593f8137f1820069296e882df357fb51
Author: Andras Timar 
Date:   Sun Dec 13 19:50:54 2015 +0100

build fix

Change-Id: I4be6445ff49d04e9e2f4146b4f5536770249fb84

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 48881e1..efd5d10 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1573,7 +1573,7 @@ unsigned char* doc_renderFont(LibreOfficeKitDocument* 
/*pThis*/,
 if (!aSearchedFontName.equals(aFontName.toUtf8().getStr()))
 continue;
 
-VirtualDevice aDevice(nullptr, Size(1, 1), DeviceFormat::DEFAULT);
+VirtualDevice aDevice(nullptr, Size(1, 1), 0);
 ::Rectangle aRect;
 vcl::Font aFont(rInfo);
 aFont.SetSize(Size(0, 25));
@@ -1587,11 +1587,12 @@ unsigned char* doc_renderFont(LibreOfficeKitDocument* 
/*pThis*/,
 unsigned char* pBuffer = static_cast(malloc(4 * 
nFontWidth * nFontHeight));
 memset(pBuffer, 0, nFontWidth * nFontHeight * 4);
 boost::shared_array aBuffer(pBuffer, NoDelete< 
sal_uInt8 >());
+boost::shared_array aAlphaBuffer;
 
 aDevice.SetBackground(Wallpaper(COL_TRANSPARENT));
 aDevice.SetOutputSizePixelScaleOffsetAndBuffer(
 Size(nFontWidth, nFontHeight), Fraction(1.0), Point(),
-aBuffer, nullptr);
+aBuffer, aAlphaBuffer);
 aDevice.DrawText(Point(0,0), aFontName);
 
 return pBuffer;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 lotuswordpro/source/filter/lwpframelayout.cxx |   69 +
 lotuswordpro/source/filter/lwpfribframe.cxx   |6 +-
 lotuswordpro/source/filter/lwpfribtable.cxx   |   10 +--
 lotuswordpro/source/filter/lwplayout.cxx  |   71 --
 lotuswordpro/source/filter/lwplayout.hxx  |6 +-
 lotuswordpro/source/filter/lwpstory.cxx   |4 -
 lotuswordpro/source/filter/lwptablelayout.cxx |4 -
 lotuswordpro/source/filter/lwptoc.cxx |5 +
 8 files changed, 89 insertions(+), 86 deletions(-)

New commits:
commit 9550737e5db7415a679aec8a64d6f724962b8750
Author: Caolán McNamara 
Date:   Sun Dec 13 19:34:43 2015 +

need more References for life cycle fixes here

32nd and final distinct crash fix of this sequence

Change-Id: Ib9f41091737e66995f332c06083d51408eb1497b

diff --git a/lotuswordpro/source/filter/lwpframelayout.cxx 
b/lotuswordpro/source/filter/lwpframelayout.cxx
index 7312e81..e0baf18 100644
--- a/lotuswordpro/source/filter/lwpframelayout.cxx
+++ b/lotuswordpro/source/filter/lwpframelayout.cxx
@@ -187,35 +187,35 @@ void  LwpFrame::RegisterStyle(XFFrameStyle* pFrameStyle)
  void LwpFrame::XFConvert(XFContentContainer* pCont)
  {
 // parse the frame which anchor to page
-LwpVirtualLayout* pParent = m_pLayout->GetParentLayout();
-if (!pParent)
+rtl::Reference xParent = m_pLayout->GetParentLayout();
+if (!xParent.is())
 throw std::runtime_error("missing Parent Layout");
-if (pParent->IsPage() && pParent->GetParentLayout() && 
pParent->GetParentLayout()->IsPage())
+if (xParent->IsPage() && xParent->GetParentLayout().is() && 
xParent->GetParentLayout()->IsPage())
 {
 //for mirror page, problems exist if the parent layout is header or 
footer layout,
-pParent = pParent->GetParentLayout();
+xParent = xParent->GetParentLayout();
 }
-if(m_pLayout->IsAnchorPage()&& pParent->IsPage())
+if(m_pLayout->IsAnchorPage()&& xParent->IsPage())
 {
 //get parent layout
 if(m_pLayout->IsUseOnPage())
 {
-sal_Int32 nPageNo = 
pParent->GetPageNumber(m_pLayout->GetUsePage());
+sal_Int32 nPageNo = 
xParent->GetPageNumber(m_pLayout->GetUsePage());
 if(nPageNo>0)
 m_pLayout->XFConvertFrame(pCont, nPageNo);
 }
 else if(m_pLayout->IsUseOnAllPages())
 {
-sal_Int32 nFirst = pParent->GetPageNumber(FIRST_LAYOUTPAGENO);
-sal_Int32 nLast = pParent->GetPageNumber(LAST_LAYOUTPAGENO);
+sal_Int32 nFirst = xParent->GetPageNumber(FIRST_LAYOUTPAGENO);
+sal_Int32 nLast = xParent->GetPageNumber(LAST_LAYOUTPAGENO);
 if(nLast > 0)
 m_pLayout->XFConvertFrame(pCont, nFirst, nLast, true);
 
 }
 else 
if(m_pLayout->IsUseOnAllOddPages()||m_pLayout->IsUseOnAllEvenPages())
 {
-sal_Int32 nFirst = pParent->GetPageNumber(FIRST_LAYOUTPAGENO);
-sal_Int32 nLast = pParent->GetPageNumber(LAST_LAYOUTPAGENO);
+sal_Int32 nFirst = xParent->GetPageNumber(FIRST_LAYOUTPAGENO);
+sal_Int32 nLast = xParent->GetPageNumber(LAST_LAYOUTPAGENO);
 if(nLast > 0)
 {
 sal_uInt16 first = static_cast(nFirst);
@@ -254,7 +254,8 @@ void LwpFrame::ApplyWrapType(XFFrameStyle *pFrameStyle)
 //between the frame object and page margins
 
 eWrap = enumXFWrapBest;
-LwpMiddleLayout* pParent = 
static_cast(m_pLayout->GetContainerLayout());
+rtl::Reference 
xContainer(m_pLayout->GetContainerLayout());
+LwpMiddleLayout* pParent = 
dynamic_cast(xContainer.get());
 if(pParent)
 {
 if(IsLeftWider())
@@ -434,8 +435,8 @@ void LwpFrame::ApplyPosType(XFFrameStyle* pFrameStyle)
 //set vertical position
 if(m_pLayout->IsAnchorPage())//in page
 {
-LwpVirtualLayout* pContainer = m_pLayout->GetContainerLayout();
-if(pContainer && (pContainer->IsHeader() || 
pContainer->IsFooter()))
+rtl::Reference 
xContainer(m_pLayout->GetContainerLayout());
+if (xContainer.is() && (xContainer->IsHeader() || 
xContainer->IsFooter()))
 {
 //Only anchor to para, the frame can display in header and 
footer of each page
 eYPos = enumXFFrameYPosFromTop; //from top
@@ -465,15 +466,15 @@ void LwpFrame::ApplyPosType(XFFrameStyle* pFrameStyle)
 eXPos = enumXFFrameXPosFromLeft;
 eXRel = enumXFFrameXRelPage;
 //set vertical position
-LwpVirtualLayout* pContainer = m_pLayout->GetContainerLayout();
-if(pContainer && pContainer->IsPage())//in page
+rtl::Reference 
xContainer(m_pLayout->GetContainerLayout());
+

[Libreoffice-commits] libcdr.git: src/lib

[Fridrich Štrba]

 src/lib/Makefile.am |   11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 882a4b3f83a4b5097da53670c720a26f4e2750eb
Author: Fridrich Å trba 
Date:   Sun Dec 13 20:37:16 2015 +0100

Some boost 1.59 fixes

Change-Id: I0054c977a6d8ff5a9b93c147578e890476365999

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 3f00cc5..e14fa8c 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -13,9 +13,16 @@ 
libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_include_HEADERS = \
$(top_srcdir)/inc/libcdr/CDRDocument.h \
$(top_srcdir)/inc/libcdr/CMXDocument.h
 
-AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(LCMS2_CFLAGS) 
$(ZLIB_CFLAGS) $(ICU_CFLAGS) $(DEBUG_CXXFLAGS) -DLIBCDR_BUILD=1
+AM_CXXFLAGS = -I$(top_srcdir)/inc \
+   $(REVENGE_CFLAGS) \
+   $(LCMS2_CFLAGS) \
+   $(ZLIB_CFLAGS) \
+   $(ICU_CFLAGS) \
+   $(DEBUG_CXXFLAGS) \
+   -DLIBCDR_BUILD=1 \
+   -DBOOST_ERROR_CODE_HEADER_ONLY \
+   -DBOOST_SYSTEM_NO_DEPRECATED
 
-libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_CPPFLAGS = 
-DBOOST_ERROR_CODE_HEADER_ONLY
 libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_LIBADD  = libcdr-internal.la 
$(REVENGE_LIBS) $(LCMS2_LIBS) $(ZLIB_LIBS) $(ICU_LIBS) @LIBCDR_WIN32_RESOURCE@
 libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_DEPENDENCIES = 
libcdr-internal.la @LIBCDR_WIN32_RESOURCE@
 libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_LDFLAGS = $(version_info) 
-export-dynamic -no-undefined
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwpframelayout.cxx |   69 +
 lotuswordpro/source/filter/lwpfribframe.cxx   |6 +-
 lotuswordpro/source/filter/lwpfribtable.cxx   |   10 +--
 lotuswordpro/source/filter/lwplayout.cxx  |   71 --
 lotuswordpro/source/filter/lwplayout.hxx  |6 +-
 lotuswordpro/source/filter/lwpstory.cxx   |4 -
 lotuswordpro/source/filter/lwptablelayout.cxx |4 -
 lotuswordpro/source/filter/lwptoc.cxx |5 +
 8 files changed, 89 insertions(+), 86 deletions(-)

New commits:
commit 3dd642dae33ca724c42e358520e2cfb6e601cdb3
Author: Caolán McNamara 
Date:   Sun Dec 13 19:34:43 2015 +

need more References for life cycle fixes here

32nd and final distinct crash fix of this sequence

Change-Id: Ib9f41091737e66995f332c06083d51408eb1497b
(cherry picked from commit 9550737e5db7415a679aec8a64d6f724962b8750)

diff --git a/lotuswordpro/source/filter/lwpframelayout.cxx 
b/lotuswordpro/source/filter/lwpframelayout.cxx
index 7312e81..e0baf18 100644
--- a/lotuswordpro/source/filter/lwpframelayout.cxx
+++ b/lotuswordpro/source/filter/lwpframelayout.cxx
@@ -187,35 +187,35 @@ void  LwpFrame::RegisterStyle(XFFrameStyle* pFrameStyle)
  void LwpFrame::XFConvert(XFContentContainer* pCont)
  {
 // parse the frame which anchor to page
-LwpVirtualLayout* pParent = m_pLayout->GetParentLayout();
-if (!pParent)
+rtl::Reference xParent = m_pLayout->GetParentLayout();
+if (!xParent.is())
 throw std::runtime_error("missing Parent Layout");
-if (pParent->IsPage() && pParent->GetParentLayout() && 
pParent->GetParentLayout()->IsPage())
+if (xParent->IsPage() && xParent->GetParentLayout().is() && 
xParent->GetParentLayout()->IsPage())
 {
 //for mirror page, problems exist if the parent layout is header or 
footer layout,
-pParent = pParent->GetParentLayout();
+xParent = xParent->GetParentLayout();
 }
-if(m_pLayout->IsAnchorPage()&& pParent->IsPage())
+if(m_pLayout->IsAnchorPage()&& xParent->IsPage())
 {
 //get parent layout
 if(m_pLayout->IsUseOnPage())
 {
-sal_Int32 nPageNo = 
pParent->GetPageNumber(m_pLayout->GetUsePage());
+sal_Int32 nPageNo = 
xParent->GetPageNumber(m_pLayout->GetUsePage());
 if(nPageNo>0)
 m_pLayout->XFConvertFrame(pCont, nPageNo);
 }
 else if(m_pLayout->IsUseOnAllPages())
 {
-sal_Int32 nFirst = pParent->GetPageNumber(FIRST_LAYOUTPAGENO);
-sal_Int32 nLast = pParent->GetPageNumber(LAST_LAYOUTPAGENO);
+sal_Int32 nFirst = xParent->GetPageNumber(FIRST_LAYOUTPAGENO);
+sal_Int32 nLast = xParent->GetPageNumber(LAST_LAYOUTPAGENO);
 if(nLast > 0)
 m_pLayout->XFConvertFrame(pCont, nFirst, nLast, true);
 
 }
 else 
if(m_pLayout->IsUseOnAllOddPages()||m_pLayout->IsUseOnAllEvenPages())
 {
-sal_Int32 nFirst = pParent->GetPageNumber(FIRST_LAYOUTPAGENO);
-sal_Int32 nLast = pParent->GetPageNumber(LAST_LAYOUTPAGENO);
+sal_Int32 nFirst = xParent->GetPageNumber(FIRST_LAYOUTPAGENO);
+sal_Int32 nLast = xParent->GetPageNumber(LAST_LAYOUTPAGENO);
 if(nLast > 0)
 {
 sal_uInt16 first = static_cast(nFirst);
@@ -254,7 +254,8 @@ void LwpFrame::ApplyWrapType(XFFrameStyle *pFrameStyle)
 //between the frame object and page margins
 
 eWrap = enumXFWrapBest;
-LwpMiddleLayout* pParent = 
static_cast(m_pLayout->GetContainerLayout());
+rtl::Reference 
xContainer(m_pLayout->GetContainerLayout());
+LwpMiddleLayout* pParent = 
dynamic_cast(xContainer.get());
 if(pParent)
 {
 if(IsLeftWider())
@@ -434,8 +435,8 @@ void LwpFrame::ApplyPosType(XFFrameStyle* pFrameStyle)
 //set vertical position
 if(m_pLayout->IsAnchorPage())//in page
 {
-LwpVirtualLayout* pContainer = m_pLayout->GetContainerLayout();
-if(pContainer && (pContainer->IsHeader() || 
pContainer->IsFooter()))
+rtl::Reference 
xContainer(m_pLayout->GetContainerLayout());
+if (xContainer.is() && (xContainer->IsHeader() || 
xContainer->IsFooter()))
 {
 //Only anchor to para, the frame can display in header and 
footer of each page
 eYPos = enumXFFrameYPosFromTop; //from top
@@ -465,15 +466,15 @@ void LwpFrame::ApplyPosType(XFFrameStyle* pFrameStyle)
 eXPos = enumXFFrameXPosFromLeft;
 eXRel = enumXFFrameXRelPage;
 //set vertical position
-LwpVirtualLayout* pContainer = m_pLayout->GetContainerLayout();
-if(pContainer && pContainer->IsPage())//in page
+

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwpdoc.cxx |5 +++--
 lotuswordpro/source/filter/lwpdoc.hxx |   12 +++-
 2 files changed, 14 insertions(+), 3 deletions(-)

New commits:
commit ab665bc75a66694765ea955aac40697120e5c6dc
Author: Caolán McNamara 
Date:   Sun Dec 13 17:59:02 2015 +

guard against infinite recursion

Change-Id: I1b566c835b6cdc733d0aa4393d3b3ce2ff7b764f
(cherry picked from commit 76220aafe0bffe20f10b07c725cd096adb56b108)

diff --git a/lotuswordpro/source/filter/lwpdoc.cxx 
b/lotuswordpro/source/filter/lwpdoc.cxx
index d120d9c..9cc5f68 100644
--- a/lotuswordpro/source/filter/lwpdoc.cxx
+++ b/lotuswordpro/source/filter/lwpdoc.cxx
@@ -71,6 +71,7 @@
 LwpDocument::LwpDocument(LwpObjectHeader& objHdr, LwpSvStream* pStrm)
 : LwpDLNFPVList(objHdr, pStrm)
 , m_pOwnedFoundry(nullptr)
+, m_bGettingFirstDivisionWithContentsThatIsNotOLE(false)
 , m_nFlags(0)
 , m_nPersistentFlags(0)
 , m_pLnOpts(nullptr)
@@ -619,7 +620,7 @@ LwpDocument* LwpDocument::GetPreviousDivision()
   /**
  * @descrGet first division with contents that is not ole, copy from 
lwp-source code
  */
- LwpDocument* LwpDocument::GetFirstDivisionWithContentsThatIsNotOLE()
+ LwpDocument* LwpDocument::ImplGetFirstDivisionWithContentsThatIsNotOLE()
 {
 LwpDivInfo* pDivInfo = 
dynamic_cast(GetDivInfoID().obj().get());
 if(pDivInfo && pDivInfo->HasContents()
@@ -628,7 +629,7 @@ LwpDocument* LwpDocument::GetPreviousDivision()
 
 LwpDocument* pDivision = GetFirstDivision();
 
-while (pDivision && pDivision != this)
+while (pDivision)
 {
 LwpDocument* pContentDivision = 
pDivision->GetFirstDivisionWithContentsThatIsNotOLE();
 if(pContentDivision)
diff --git a/lotuswordpro/source/filter/lwpdoc.hxx 
b/lotuswordpro/source/filter/lwpdoc.hxx
index 8b1bdef..5fa33f4 100644
--- a/lotuswordpro/source/filter/lwpdoc.hxx
+++ b/lotuswordpro/source/filter/lwpdoc.hxx
@@ -84,6 +84,7 @@ public:
 
 private:
 LwpFoundry* m_pOwnedFoundry;
+bool m_bGettingFirstDivisionWithContentsThatIsNotOLE;
 
 //Data members in file format
 LwpObjectID m_DocSockID;
@@ -154,7 +155,15 @@ public:
 LwpDocument* GetLastDivisionWithContents();
 LwpDocument* GetLastInGroupWithContents();
 LwpDocument* GetRootDocument();
-LwpDocument* GetFirstDivisionWithContentsThatIsNotOLE();
+LwpDocument* GetFirstDivisionWithContentsThatIsNotOLE()
+{
+if (m_bGettingFirstDivisionWithContentsThatIsNotOLE)
+throw std::runtime_error("recursion in page divisions");
+m_bGettingFirstDivisionWithContentsThatIsNotOLE = true;
+LwpDocument* pRet = ImplGetFirstDivisionWithContentsThatIsNotOLE();
+m_bGettingFirstDivisionWithContentsThatIsNotOLE = false;
+return pRet;
+}
 LwpDocument* GetLastDivisionThatHasEndnote();
 
 LwpDocument* GetLastDivision();
@@ -167,6 +176,7 @@ public:
 
 private:
 void MaxNumberOfPages(sal_uInt16& nNumPages);
+LwpDocument* ImplGetFirstDivisionWithContentsThatIsNotOLE();
 void XFConvertFrameInPage(XFContentContainer* pCont);
 static void ChangeStyleName();
 bool IsSkippedDivision();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Maxim Monastirsky]

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |6 +
 sw/uiconfig/sglobal/popupmenu/table.xml |   32 
--
 sw/uiconfig/sweb/popupmenu/table.xml|   32 
--
 sw/uiconfig/swform/popupmenu/table.xml  |   32 
--
 sw/uiconfig/swreport/popupmenu/table.xml|   32 
--
 sw/uiconfig/swriter/popupmenu/table.xml |   32 
--
 sw/uiconfig/swxform/popupmenu/table.xml |   32 
--
 7 files changed, 18 insertions(+), 180 deletions(-)

New commits:
commit db5ca168680404801d2e93291ee2a14580766bcc
Author: Maxim Monastirsky 
Date:   Sun Dec 13 23:47:28 2015 +0200

sw: table context menu improvements

Taking into consideration the changes from
https://gerrit.libreoffice.org/20446

Change-Id: If2419574611b890170e9d5eb69703e5c8c21c3c2

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index d946b2c..fff1246 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -290,6 +290,9 @@
 
   H~yperlink
 
+
+  Edit Hyperlink...
+
   
   
 
@@ -940,6 +943,9 @@
 
   ~Properties...
 
+
+  ~Table Properties...
+
 
   1
 
diff --git a/sw/uiconfig/sglobal/popupmenu/table.xml 
b/sw/uiconfig/sglobal/popupmenu/table.xml
index c92c50e..02b6c42 100644
--- a/sw/uiconfig/sglobal/popupmenu/table.xml
+++ b/sw/uiconfig/sglobal/popupmenu/table.xml
@@ -23,6 +23,7 @@
   
   
   
+  
   
 
   
@@ -41,27 +42,13 @@
   
 
   
-  
-
-  
-  
-  
-  
-
-  
   
-  
-
-  
-  
-  
-
-  
   
 
   
   
   
+  
   
   
   
@@ -70,24 +57,9 @@
   
   
   
-  
-  
   
   
   
-  
-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-
-  
   
   
   
diff --git a/sw/uiconfig/sweb/popupmenu/table.xml 
b/sw/uiconfig/sweb/popupmenu/table.xml
index c92c50e..02b6c42 100644
--- a/sw/uiconfig/sweb/popupmenu/table.xml
+++ b/sw/uiconfig/sweb/popupmenu/table.xml
@@ -23,6 +23,7 @@
   
   
   
+  
   
 
   
@@ -41,27 +42,13 @@
   
 
   
-  
-
-  
-  
-  
-  
-
-  
   
-  
-
-  
-  
-  
-
-  
   
 
   
   
   
+  
   
   
   
@@ -70,24 +57,9 @@
   
   
   
-  
-  
   
   
   
-  
-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-
-  
   
   
   
diff --git a/sw/uiconfig/swform/popupmenu/table.xml 
b/sw/uiconfig/swform/popupmenu/table.xml
index c92c50e..02b6c42 100644
--- a/sw/uiconfig/swform/popupmenu/table.xml
+++ b/sw/uiconfig/swform/popupmenu/table.xml
@@ -23,6 +23,7 @@
   
   
   
+  
   
 
   
@@ -41,27 +42,13 @@
   
 
   
-  
-
-  
-  
-  
-  
-
-  
   
-  
-
-  
-  
-  
-
-  
   
 
   
   
   
+  
   
   
   
@@ -70,24 +57,9 @@
   
   
   
-  
-  
   
   
   
-  
-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-
-  
   
   
   
diff --git a/sw/uiconfig/swreport/popupmenu/table.xml 
b/sw/uiconfig/swreport/popupmenu/table.xml
index c92c50e..02b6c42 100644
--- a/sw/uiconfig/swreport/popupmenu/table.xml
+++ b/sw/uiconfig/swreport/popupmenu/table.xml
@@ -23,6 +23,7 @@
   
   
   
+  
   
 
   
@@ -41,27 +42,13 @@
   
 
   
-  
-
-  
-  
-  
-  
-
-  
   
-  
-
-  
-  
-  
-
-  
   
 
   
   
   
+  
   
   
   
@@ -70,24 +57,9 @@
   
   
   
-  
-  
   
   
   
-  
-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-
-  
   
   
   
diff --git a/sw/uiconfig/swriter/popupmenu/table.xml 
b/sw/uiconfig/swriter/popupmenu/table.xml
index c92c50e..02b6c42 100644
--- a/sw/uiconfig/swriter/popupmenu/table.xml
+++ b/sw/uiconfig/swriter/popupmenu/table.xml
@@ -23,6 +23,7 @@
   
   
   
+  
   
 
   
@@ -41,27 +42,13 @@
   
 
   
-  
-
-  
-  
-  
-  
-
-  
   
-  
-
-  
-  
-  
-
-  
   
 
   
   
   
+  
   
   
   
@@ -70,24 +57,9 @@
   
   
   
-  
-  
   
   
   
-  
-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-
-  
   
   
   
diff --git a/sw/uiconfig/swxform/popupmenu/table.xml 
b/sw/uiconfig/swxform/popupmenu/table.xml
index c92c50e..02b6c42 100644
--- a/sw/uiconfig/swxform/popupmenu/table.xml
+++ b/sw/uiconfig/swxform/popupmenu/table.xml
@@ -23,6 +23,7 @@
   
 

[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-5.0-14'

[Andras Timar]

Tag 'cp-5.0-14' created by Andras Timar  at 
2015-12-13 19:18 -0800

cp-5.0-14

Changes since libreoffice-5-0-branch-point-2:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

libreoffice bug

[Ayşe Melike Yurtoğlu]

Hi,
I want to work on this bug:
https://bugs.documentfoundation.org/show_bug.cgi?id=3

As far as I understand the "Enable experimental (stable) features" checkbox
feature is not yet finished.I looked for methods to do in the
Background.But i could not find exactly what i need to do. I think  I did
not understand overrides "undo/redo". If anyone can help me, I am very
glad about
it.
thank you.
Regards.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Caolán McNamara]

 lotuswordpro/source/filter/lwpdoc.cxx |5 +++--
 lotuswordpro/source/filter/lwpdoc.hxx |   12 +++-
 2 files changed, 14 insertions(+), 3 deletions(-)

New commits:
commit 76220aafe0bffe20f10b07c725cd096adb56b108
Author: Caolán McNamara 
Date:   Sun Dec 13 17:59:02 2015 +

guard against infinite recursion

Change-Id: I1b566c835b6cdc733d0aa4393d3b3ce2ff7b764f

diff --git a/lotuswordpro/source/filter/lwpdoc.cxx 
b/lotuswordpro/source/filter/lwpdoc.cxx
index d120d9c..9cc5f68 100644
--- a/lotuswordpro/source/filter/lwpdoc.cxx
+++ b/lotuswordpro/source/filter/lwpdoc.cxx
@@ -71,6 +71,7 @@
 LwpDocument::LwpDocument(LwpObjectHeader& objHdr, LwpSvStream* pStrm)
 : LwpDLNFPVList(objHdr, pStrm)
 , m_pOwnedFoundry(nullptr)
+, m_bGettingFirstDivisionWithContentsThatIsNotOLE(false)
 , m_nFlags(0)
 , m_nPersistentFlags(0)
 , m_pLnOpts(nullptr)
@@ -619,7 +620,7 @@ LwpDocument* LwpDocument::GetPreviousDivision()
   /**
  * @descrGet first division with contents that is not ole, copy from 
lwp-source code
  */
- LwpDocument* LwpDocument::GetFirstDivisionWithContentsThatIsNotOLE()
+ LwpDocument* LwpDocument::ImplGetFirstDivisionWithContentsThatIsNotOLE()
 {
 LwpDivInfo* pDivInfo = 
dynamic_cast(GetDivInfoID().obj().get());
 if(pDivInfo && pDivInfo->HasContents()
@@ -628,7 +629,7 @@ LwpDocument* LwpDocument::GetPreviousDivision()
 
 LwpDocument* pDivision = GetFirstDivision();
 
-while (pDivision && pDivision != this)
+while (pDivision)
 {
 LwpDocument* pContentDivision = 
pDivision->GetFirstDivisionWithContentsThatIsNotOLE();
 if(pContentDivision)
diff --git a/lotuswordpro/source/filter/lwpdoc.hxx 
b/lotuswordpro/source/filter/lwpdoc.hxx
index 8b1bdef..5fa33f4 100644
--- a/lotuswordpro/source/filter/lwpdoc.hxx
+++ b/lotuswordpro/source/filter/lwpdoc.hxx
@@ -84,6 +84,7 @@ public:
 
 private:
 LwpFoundry* m_pOwnedFoundry;
+bool m_bGettingFirstDivisionWithContentsThatIsNotOLE;
 
 //Data members in file format
 LwpObjectID m_DocSockID;
@@ -154,7 +155,15 @@ public:
 LwpDocument* GetLastDivisionWithContents();
 LwpDocument* GetLastInGroupWithContents();
 LwpDocument* GetRootDocument();
-LwpDocument* GetFirstDivisionWithContentsThatIsNotOLE();
+LwpDocument* GetFirstDivisionWithContentsThatIsNotOLE()
+{
+if (m_bGettingFirstDivisionWithContentsThatIsNotOLE)
+throw std::runtime_error("recursion in page divisions");
+m_bGettingFirstDivisionWithContentsThatIsNotOLE = true;
+LwpDocument* pRet = ImplGetFirstDivisionWithContentsThatIsNotOLE();
+m_bGettingFirstDivisionWithContentsThatIsNotOLE = false;
+return pRet;
+}
 LwpDocument* GetLastDivisionThatHasEndnote();
 
 LwpDocument* GetLastDivision();
@@ -167,6 +176,7 @@ public:
 
 private:
 void MaxNumberOfPages(sal_uInt16& nNumPages);
+LwpDocument* ImplGetFirstDivisionWithContentsThatIsNotOLE();
 void XFConvertFrameInPage(XFContentContainer* pCont);
 static void ChangeStyleName();
 bool IsSkippedDivision();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Lionel Elie Mamane]

 connectivity/source/drivers/odbc/OPreparedStatement.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 76d3e87113da51ea515d1d0a84a17cdb0f70d5c4
Author: Lionel Elie Mamane 
Date:   Sun Dec 13 19:24:44 2015 +0100

ODBC SQLBindParameter nitpick: correct DecimalDigits for exact numeric 
values

The driver is supposed to ignore it as per the spec, but let's be
conservative and pass the value defined by the spec.

Leave it as invalid for approximate (floating-point) datatypes.

Change-Id: I542fdde5e711a335c708ad9e6f2abe2fd8632ef6
Reviewed-on: https://gerrit.libreoffice.org/20685
Reviewed-by: Lionel Elie Mamane 
Tested-by: Lionel Elie Mamane 

diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx 
b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
index 95a9f21..8d91ceb 100644
--- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx
+++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
@@ -415,7 +415,7 @@ void OPreparedStatement::setParameter(const sal_Int32 
parameterIndex, const sal_
 
 void SAL_CALL OPreparedStatement::setByte( const sal_Int32 parameterIndex, 
const sal_Int8 x ) throw(SQLException, RuntimeException, std::exception)
 {
-setScalarParameter(parameterIndex, DataType::TINYINT, 3, x);
+setScalarParameter(parameterIndex, DataType::TINYINT, 3, 0, x);
 }
 
 void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const 
Date& aData ) throw(SQLException, RuntimeException, std::exception)
@@ -501,7 +501,7 @@ void SAL_CALL OPreparedStatement::setFloat( sal_Int32 
parameterIndex, float x )
 
 void SAL_CALL OPreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 
x ) throw(SQLException, RuntimeException, std::exception)
 {
-setScalarParameter(parameterIndex, DataType::INTEGER, 10, x);
+setScalarParameter(parameterIndex, DataType::INTEGER, 10, 0, x);
 }
 
 
@@ -509,7 +509,7 @@ void SAL_CALL OPreparedStatement::setLong( sal_Int32 
parameterIndex, sal_Int64 x
 {
 try
 {
-setScalarParameter(parameterIndex, DataType::BIGINT, 19, x);
+setScalarParameter(parameterIndex, DataType::BIGINT, 19, 0, x);
 }
 catch(SQLException&)
 {
@@ -635,7 +635,7 @@ void SAL_CALL OPreparedStatement::setObject( sal_Int32 
parameterIndex, const Any
 
 void SAL_CALL OPreparedStatement::setShort( sal_Int32 parameterIndex, 
sal_Int16 x ) throw(SQLException, RuntimeException, std::exception)
 {
-setScalarParameter(parameterIndex, DataType::SMALLINT, 5, x);
+setScalarParameter(parameterIndex, DataType::SMALLINT, 5, 0, x);
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwpcelllayout.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 86d2f25e3bd3a7d94087ac1b277ede0a58e26720
Author: Caolán McNamara 
Date:   Sun Dec 13 17:44:50 2015 +

more use of references to avoid crashing

Change-Id: I03748695efbe17d59aba09f88d5c6fcd174113c9
(cherry picked from commit 69d166a0277d21d63b97ffc965d82bb301d55502)

diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx 
b/lotuswordpro/source/filter/lwpcelllayout.cxx
index 8efc821b..9db1307 100644
--- a/lotuswordpro/source/filter/lwpcelllayout.cxx
+++ b/lotuswordpro/source/filter/lwpcelllayout.cxx
@@ -568,8 +568,8 @@ void LwpCellLayout::RegisterDefaultCell()
  */
 void LwpCellLayout::RegisterStyle()
 {
-LwpVirtualLayout * pParent = dynamic_cast(GetParent().obj().get());
-if (!pParent || pParent->GetLayoutType() != LWP_ROW_LAYOUT)
+rtl::Reference xParent(dynamic_cast(GetParent().obj().get()));
+if (!xParent.is() || xParent->GetLayoutType() != LWP_ROW_LAYOUT)
 {
 // default cell layout, we must register 4 styles for it
 RegisterDefaultCell();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 lotuswordpro/source/filter/lwpcelllayout.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 69d166a0277d21d63b97ffc965d82bb301d55502
Author: Caolán McNamara 
Date:   Sun Dec 13 17:44:50 2015 +

more use of references to avoid crashing

Change-Id: I03748695efbe17d59aba09f88d5c6fcd174113c9

diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx 
b/lotuswordpro/source/filter/lwpcelllayout.cxx
index 8efc821b..9db1307 100644
--- a/lotuswordpro/source/filter/lwpcelllayout.cxx
+++ b/lotuswordpro/source/filter/lwpcelllayout.cxx
@@ -568,8 +568,8 @@ void LwpCellLayout::RegisterDefaultCell()
  */
 void LwpCellLayout::RegisterStyle()
 {
-LwpVirtualLayout * pParent = dynamic_cast(GetParent().obj().get());
-if (!pParent || pParent->GetLayoutType() != LWP_ROW_LAYOUT)
+rtl::Reference xParent(dynamic_cast(GetParent().obj().get()));
+if (!xParent.is() || xParent->GetLayoutType() != LWP_ROW_LAYOUT)
 {
 // default cell layout, we must register 4 styles for it
 RegisterDefaultCell();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-5.0-14'

[Andras Timar]

Tag 'cp-5.0-14' created by Andras Timar  at 
2015-12-13 19:18 -0800

cp-5.0-14

Changes since cp-5.0-13-10:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-5.0-14'

[Olivier R]

Tag 'cp-5.0-14' created by Andras Timar  at 
2015-12-13 19:18 -0800

cp-5.0-14

Changes since libreoffice-5-0-branch-point-2:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-5.0-14'

[Andras Timar]

Tag 'cp-5.0-14' created by Andras Timar  at 
2015-12-13 19:18 -0800

cp-5.0-14

Changes since libreoffice-5-0-branch-point-2:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - 2 commits - officecfg/registry sd/uiconfig

[Maxim Monastirsky]

 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |   
65 ++-
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |   
12 
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu  |
5 
 sd/uiconfig/simpress/menubar/menubar.xml |  
178 --
 4 files changed, 197 insertions(+), 63 deletions(-)

New commits:
commit 166b7ef486ed7bdb41b728ea3a5196bab3201b1b
Author: Maxim Monastirsky 
Date:   Sun Dec 13 11:43:44 2015 +0200

Move .uno:InsertFormMenu to GenericCommands

Change-Id: I9af0b49c95dd55ccde463b6f0567c9160d180670
(cherry picked from commit fd5708bfe8b034a825c0643ea9af73b2f976cd40)

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 5b9f025..cdd91b8 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -20,6 +20,11 @@
 http://openoffice.org/2001/registry; 
xmlns:xs="http://www.w3.org/2001/XMLSchema; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:install="http://openoffice.org/2004/installation; 
oor:name="GenericCommands" oor:package="org.openoffice.Office.UI">
   
 
+  
+
+  Fo~rm Control
+
+  
   
 
   Preview in Web Browser
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 8aa8fee..c14b54f 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -68,11 +68,6 @@
   Page Number
 
   
-  
-
-  Fo~rm Control
-
-  
   
 
   He~ader and Footer
commit b824edb749d9bd532d5c2329da15599a55ea98c6
Author: Yousuf Philips 
Date:   Fri Dec 11 13:01:58 2015 +0400

tdf#91857 Additional improvements to Impress' menu bar

Change-Id: Ibad6e02b4198219ae32f61af20abd312a99811e8
(cherry picked from commit d1461011d3fb5df172e4e07cb549c4cac4f37b67)

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index 33c9eb9..bdb9d8a 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -24,6 +24,16 @@
   S~lide
 
   
+  
+
+  Navigate
+
+  
+  
+
+  Move
+
+  
   
 
   Rename Page/Slide
@@ -361,7 +371,7 @@
   
   
 
-  Custom Animation...
+  Custom Animation
 
 
   1
@@ -374,7 +384,7 @@
   
   
 
-  Slide Transition...
+  Slide Transition
 
   
   
@@ -765,7 +775,7 @@
   
   
 
-  ~Ruler
+  ~Rulers
 
   
   
@@ -775,7 +785,7 @@
   
   
 
-  Slide ~Layout...
+  Slide ~Layout
 
 
   1
@@ -904,7 +914,10 @@
   
   
 
-  Toggle Tab bar visibility
+  Toggle Tab Bar Visibility
+
+
+  Modes Tab Bar
 
 
   1
@@ -1391,7 +1404,7 @@
   
   
 
-  ~Save Images...
+  ~Save...
 
 
 1
@@ -1404,7 +1417,7 @@
   
   
 
-  ~Replace Image...
+  ~Replace...
 
 
 1
@@ -1412,7 +1425,7 @@
   
   
 
-  Co~mpress Image...
+  Co~mpress...
 
 
 1
@@ -1430,12 +1443,12 @@
   
   
 
-  Display Background of Master
+  Display Master Background
 
   
   
 
-  Display Objects from Master
+  Display Master Objects
 
   
   
@@ -1931,10 +1944,10 @@
   
   
 
-  First Page
+  Go to First Page/Slide
 
 
-  Go to the first page
+  To First Page/Slide
 
 
   1
@@ -1942,10 +1955,10 @@
   
   
 
-  Previous Page
+  Go to Previous Page/Slide
 
 
-  Go to the previous page
+  To Previous Page/Slide
 
 
   1
@@ -1953,10 +1966,10 @@
   
   
 
-  Next Page
+  Go to Next Page/Slide
 
 
-  Go to the next page
+  To Next Page/Slide
 
 
   1
@@ -1964,10 +1977,10 @@
   
   
 
-  Last Page
+  Go to 

Liwen, Fan license statement

[flw.aquar...@gmail.com]

Hi,

All of my past & future contributions to LibreOffice are licensed
under the MPL/LGPLv3+ dual license.

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

[Libreoffice-commits] libvisio.git: src/lib

[Fridrich Štrba]

 src/lib/VSDContentCollector.cpp |   21 
 src/lib/VSDContentCollector.h   |1 
 src/lib/VSDLayerList.cpp|   42 +---
 src/lib/VSDLayerList.h  |4 +++
 src/lib/VSDParser.cpp   |3 ++
 src/lib/VSDXMLParserBase.cpp|6 +
 src/lib/tokens.txt  |2 +
 7 files changed, 76 insertions(+), 3 deletions(-)

New commits:
commit e7806e9b217fcd195b5f8297091fa83b40b8a95d
Author: Fridrich Å trba 
Date:   Mon Dec 14 00:21:17 2015 +0100

Consider layer visibility and printability

Change-Id: Ie47bd7d066673ddc322826d7f33f99eadfbe1e16

diff --git a/src/lib/VSDContentCollector.cpp b/src/lib/VSDContentCollector.cpp
index aee5456..e66984a 100644
--- a/src/lib/VSDContentCollector.cpp
+++ b/src/lib/VSDContentCollector.cpp
@@ -272,6 +272,7 @@ void libvisio::VSDContentCollector::_flushCurrentPath()
   m_shapeOutputDrawing->addStyle(fillPathProps);
   librevenge::RVNGPropertyList propList;
   propList.insert("svg:d", path);
+  _appendVisibleAndPrintable(propList);
   m_shapeOutputDrawing->addPath(propList);
 }
   }
@@ -355,6 +356,7 @@ void libvisio::VSDContentCollector::_flushCurrentPath()
   m_shapeOutputDrawing->addStyle(linePathProps);
   librevenge::RVNGPropertyList propList;
   propList.insert("svg:d", path);
+  _appendVisibleAndPrintable(propList);
   m_shapeOutputDrawing->addPath(propList);
 }
   }
@@ -439,6 +441,8 @@ void libvisio::VSDContentCollector::_flushText()
   m_paraFormats[iPara].charCount = numCharsInText;
   }
 
+  _appendVisibleAndPrintable(textBlockProps);
+
   m_shapeOutputText->addStartTextObject(textBlockProps);
 
   unsigned int charIndex = 0;
@@ -670,6 +674,8 @@ void 
libvisio::VSDContentCollector::_flushCurrentForeignData()
   if (angle != 0.0)
 m_currentForeignProps.insert("librevenge:rotate", angle * 180 / M_PI, 
librevenge::RVNG_GENERIC);
 
+  _appendVisibleAndPrintable(m_currentForeignProps);
+
   if (m_currentForeignData.size() && 
m_currentForeignProps["librevenge:mime-type"] && m_foreignWidth != 0.0 && 
m_foreignHeight != 0.0)
   {
 m_shapeOutputDrawing->addStyle(styleProps);
@@ -3019,4 +3025,19 @@ void 
libvisio::VSDContentCollector::collectLayer(unsigned id, unsigned level, co
   m_currentLayerList.addLayer(id, layer);
 }
 
+void 
libvisio::VSDContentCollector::_appendVisibleAndPrintable(librevenge::RVNGPropertyList
 )
+{
+  bool visible = m_currentLayerList.getVisible(m_currentLayerMem);
+  bool printable = m_currentLayerList.getPrintable(m_currentLayerMem);
+
+  if (visible && printable)
+return;
+  else if (!visible && !printable)
+propList.insert("draw:display", "none");
+  else if (!visible && printable)
+propList.insert("draw:display", "printer");
+  else if (visible && !printable)
+propList.insert("draw:display", "screen");
+}
+
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/VSDContentCollector.h b/src/lib/VSDContentCollector.h
index 02304b2..4b920f8 100644
--- a/src/lib/VSDContentCollector.h
+++ b/src/lib/VSDContentCollector.h
@@ -215,6 +215,7 @@ private:
   void _outputCubicBezierSegment(const std::vector > 
);
   void _outputQuadraticBezierSegment(const std::vector > );
   void _outputLinearBezierSegment(const std::vector 
> );
+  void _appendVisibleAndPrintable(librevenge::RVNGPropertyList );
 
   bool m_isPageStarted;
   double m_pageWidth;
diff --git a/src/lib/VSDLayerList.cpp b/src/lib/VSDLayerList.cpp
index 6ebbbd6..d858e4e 100644
--- a/src/lib/VSDLayerList.cpp
+++ b/src/lib/VSDLayerList.cpp
@@ -9,9 +9,10 @@
 
 #include "VSDLayerList.h"
 
-libvisio::VSDLayer::VSDLayer() : m_colour() {}
+libvisio::VSDLayer::VSDLayer() : m_colour(), m_visible(1), m_printable(1) {}
 
-libvisio::VSDLayer::VSDLayer(const VSDLayer ) : m_colour(layer.m_colour) 
{}
+libvisio::VSDLayer::VSDLayer(const VSDLayer ) :
+  m_colour(layer.m_colour), m_visible(layer.m_visible), 
m_printable(layer.m_printable) {}
 
 libvisio::VSDLayer::~VSDLayer() {}
 
@@ -20,6 +21,8 @@ libvisio::VSDLayer ::VSDLayer::operator=(const 
libvisio::VSDLayer 
   if (this != )
   {
 m_colour = layer.m_colour;
+m_visible = layer.m_visible;
+m_printable = layer.m_printable;
   }
   return *this;
 }
@@ -71,7 +74,7 @@ const libvisio::Colour 
*libvisio::VSDLayerList::getColour(const std::vector::const_iterator iterMap = 
m_elements.find(*iter);
 // It is enough that one layer does not override colour and the original 
colour is used
-if (!iterMap->second.m_colour)
+if (iterMap == m_elements.end() || !iterMap->second.m_colour)
   return 0;
 // This means we are reading the first layer and it overrides colour
 else if (iterColour == m_elements.end())
@@ -85,4 +88,37 @@ const libvisio::Colour 
*libvisio::VSDLayerList::getColour(const std::vectorsecond.m_colour.get_ptr();
 }
 
+bool 

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sal/osl

[Damjan Jovanovic]

 sal/osl/unx/backtrace.c |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 7d41b0a9559a388fe558cf7e8d81e4909a785af3
Author: Damjan Jovanovic 
Date:   Sun Dec 13 23:55:35 2015 +

Use %tx to print ptrdiff_t.

Patch by: me

diff --git a/sal/osl/unx/backtrace.c b/sal/osl/unx/backtrace.c
index b8a2726..fadd07b 100644
--- a/sal/osl/unx/backtrace.c
+++ b/sal/osl/unx/backtrace.c
@@ -116,12 +116,12 @@ void backtrace_symbols_fd( void **buffer, int size, int 
fd )
 if ( dli.dli_fname && dli.dli_fbase )
 {
 offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_fbase;
-fprintf( fp, "%s+0x%x", dli.dli_fname, offset );
+fprintf( fp, "%s+0x%" SAL_PRI_PTRDIFFT "x", dli.dli_fname, 
offset );
 }
 if ( dli.dli_sname && dli.dli_saddr )
 {
 offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_saddr;
-fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset );
+fprintf( fp, "(%s+0x%" SAL_PRI_PTRDIFFT "x)", 
dli.dli_sname, offset );
 }
 }
 fprintf( fp, "[%p]\n", *pFramePtr );
@@ -270,12 +270,12 @@ void backtrace_symbols_fd( void **buffer, int size, int 
fd )
 if ( dli.dli_fname && dli.dli_fbase )
 {
 offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_fbase;
-fprintf( fp, "%s+0x%x", dli.dli_fname, offset );
+fprintf( fp, "%s+0x%" SAL_PRI_PTRDIFFT "x", dli.dli_fname, 
offset );
 }
 if ( dli.dli_sname && dli.dli_saddr )
 {
 offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_saddr;
-fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset );
+fprintf( fp, "(%s+0x%" SAL_PRI_PTRDIFFT "x)", 
dli.dli_sname, offset );
 }
 }
 fprintf( fp, "[%p]\n", *pFramePtr );
@@ -336,12 +336,12 @@ void backtrace_symbols_fd( void **buffer, int size, int 
fd )
 if ( dli.dli_fname && dli.dli_fbase )
 {
 offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_fbase;
-fprintf( fp, "%s+0x%x", dli.dli_fname, offset );
+fprintf( fp, "%s+0x%" SAL_PRI_PTRDIFFT "x", dli.dli_fname, 
offset );
 }
 if ( dli.dli_sname && dli.dli_saddr )
 {
 offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_saddr;
-fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset );
+fprintf( fp, "(%s+0x%" SAL_PRI_PTRDIFFT "x)", 
dli.dli_sname, offset );
 }
 }
 fprintf( fp, "[%p]\n", *pFramePtr );
commit 25f185144085ebe06405a5d8f19a11544ed7f794
Author: Damjan Jovanovic 
Date:   Sun Dec 13 23:35:09 2015 +

Use %p to print pointers in sal backtraces instead of 0x%x + conversion to 
integer.

Patch by: me

diff --git a/sal/osl/unx/backtrace.c b/sal/osl/unx/backtrace.c
index 4ba05cc..b8a2726 100644
--- a/sal/osl/unx/backtrace.c
+++ b/sal/osl/unx/backtrace.c
@@ -124,7 +124,7 @@ void backtrace_symbols_fd( void **buffer, int size, int fd )
 fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset );
 }
 }
-fprintf( fp, "[0x%x]\n", *pFramePtr );
+fprintf( fp, "[%p]\n", *pFramePtr );
 }
 
 fflush( fp );
@@ -192,7 +192,7 @@ void backtrace_symbols_fd( void **buffer, int size, int fd )
 fprintf( fp, "(%s+0x%" SAL_PRI_PTRDIFFT "x)", 
dli.dli_sname, offset );
 }
 }
-fprintf( fp, "[0x%p]\n", *pFramePtr );
+fprintf( fp, "[%p]\n", *pFramePtr );
 }
 fflush( fp );
 fclose( fp );
@@ -278,7 +278,7 @@ void backtrace_symbols_fd( void **buffer, int size, int fd )
 fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset );
 }
 }
-fprintf( fp, "[0x%x]\n", *pFramePtr );
+fprintf( fp, "[%p]\n", *pFramePtr );
 }
 
 fflush( fp );
@@ -344,7 +344,7 @@ void backtrace_symbols_fd( void **buffer, int size, int fd )
 fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset );
 }
 }
-fprintf( fp, "[0x%x]\n", (unsigned int)*pFramePtr );
+fprintf( fp, "[%p]\n", *pFramePtr );
 }
 
 fflush( fp );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - officecfg/registry sw/source sw/uiconfig sw/UIConfig_sglobal.mk sw/UIConfig_sweb.mk sw/UIConfig_swform.mk sw/UIConfig_swreport.mk sw/UIConfig_swriter.mk sw/

[Maxim Monastirsky]

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 
   3 +
 officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu   | 
   5 ++
 officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu | 
   5 ++
 officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu | 
   5 ++
 officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu| 
   5 ++
 officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu   | 
   5 ++
 officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu   | 
  10 +
 sw/UIConfig_sglobal.mk   | 
   1 
 sw/UIConfig_sweb.mk  | 
   1 
 sw/UIConfig_swform.mk| 
   1 
 sw/UIConfig_swreport.mk  | 
   1 
 sw/UIConfig_swriter.mk   | 
   1 
 sw/UIConfig_swxform.mk   | 
   1 
 sw/source/uibase/uiview/pview.cxx| 
   3 -
 sw/uiconfig/sglobal/popupmenu/preview.xml| 
  18 ++
 sw/uiconfig/sweb/popupmenu/preview.xml   | 
  18 ++
 sw/uiconfig/swform/popupmenu/preview.xml | 
  18 ++
 sw/uiconfig/swreport/popupmenu/preview.xml   | 
  18 ++
 sw/uiconfig/swriter/popupmenu/preview.xml| 
  18 ++
 sw/uiconfig/swxform/popupmenu/preview.xml| 
  18 ++
 20 files changed, 153 insertions(+), 2 deletions(-)

New commits:
commit 121b7b880c4d17c1ce320ad6b1c560577c9953ed
Author: Maxim Monastirsky 
Date:   Mon Dec 14 00:58:18 2015 +0200

tdf#93837 Convert MN_PPREVIEW_POPUPMENU to xml

Change-Id: If490e8523dbedabdf4124b1bd1a5ba08678dc06e

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index fed2bfc..269f788 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -5127,6 +5127,9 @@
 
   Print Pr~eview
 
+
+  Close Preview
+
 
   9
 
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
index e64c937..c5d927f 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
@@ -20,6 +20,11 @@
 http://openoffice.org/2004/installation; 
xmlns:oor="http://openoffice.org/2001/registry; 
xmlns:xs="http://www.w3.org/2001/XMLSchema; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
oor:name="WriterFormWindowState" oor:package="org.openoffice.Office.UI">
   
 
+  
+
+  Print Preview
+
+  
   
 
   Table
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
index 16821c2..3077b71 100644
--- 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
+++ 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
@@ -20,6 +20,11 @@
 http://openoffice.org/2004/installation; 
xmlns:oor="http://openoffice.org/2001/registry; 
xmlns:xs="http://www.w3.org/2001/XMLSchema; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
oor:name="WriterGlobalWindowState" oor:package="org.openoffice.Office.UI">
   
 
+  
+
+  Print Preview
+
+  
   
 
   Table
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
index 6934c5b..60c42e5 100644
--- 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
+++ 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
@@ -20,6 +20,11 @@
 http://openoffice.org/2004/installation; 
xmlns:oor="http://openoffice.org/2001/registry; 
xmlns:xs="http://www.w3.org/2001/XMLSchema; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
oor:name="WriterReportWindowState" oor:package="org.openoffice.Office.UI">
   
 
+  
+
+  Print Preview
+
+  
   
 
   Table
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu 

[ANN] LibreOffice 5.0.4 RC2 available

[Christian Lohmaier]

Dear Community,

The Document Foundation is pleased to announce the second release
candidate of LibreOffice 5.0.4. The upcoming 5.0.4 will be the fourth
bugfix release of our fresh 5.0 line. Please be aware that LibreOffice
5.0.4 RC2 has not been flagged as ready for production use yet,
however feel free to give it a try instead of 5.0.3.

A work-in-progress list of new features in LibreOffice 5.0 can be
found at https://wiki.documentfoundation.org/ReleaseNotes/5.0

The release is available for Windows, Linux and Mac OS X from our QA
builds download page at

  http://www.libreoffice.org/download/pre-releases/

Windows builds are also provided in 64bit version.

Should you find bugs, please report them to our Bugzilla:

  https://bugs.documentfoundation.org

A good way to assess the release candidate quality is to run some
specific manual tests on it, our TCM wiki page has more details:

 
http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test

For other ways to get involved with this exciting project - you can
e.g. contribute code:

  http://www.libreoffice.org/community/developers/

translate LibreOffice to your language:

  http://wiki.documentfoundation.org/LibreOffice_Localization_Guide

or help with funding our operations:

  http://donate.libreoffice.org/

A list of known issues and fixed bugs compared to 5.0.4 rc1 is
available from our wiki:

  http://wiki.documentfoundation.org/Releases/5.0.4/RC2

Special thanks to all QA, developers, bugreporters who did make this possible.

You'll find the number of bugs along with the names in the wiki (
https://wiki.documentfoundation.org/Releases/5.0.4/RC2#Thanks_to_all_who_took_part_in_handling_the_issues
)

Also thanks to all the translators (a slightly outdated list of those
using pootle are listed
here: https://translations.documentfoundation.org/about/contributors/
) who make this possible.

And of course also big thanks to contributors who do great work in other
areas that cannot be put into numbers!

Thanks a lot for your help,

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

[Libreoffice-commits] libvisio.git: src/lib

[Fridrich Štrba]

 src/lib/VSDContentCollector.cpp |4 
 1 file changed, 4 insertions(+)

New commits:
commit 0ef93c0af5304b7876813a6fcff7cdaabc380cee
Author: Fridrich Å trba 
Date:   Mon Dec 14 01:00:30 2015 +0100

Consider transparency in the solid fill we use instead of hatching

Change-Id: I429d20b2bad02781d22282f4eee7c19e31f3

diff --git a/src/lib/VSDContentCollector.cpp b/src/lib/VSDContentCollector.cpp
index e66984a..0037bd2 100644
--- a/src/lib/VSDContentCollector.cpp
+++ b/src/lib/VSDContentCollector.cpp
@@ -2609,6 +2609,10 @@ void 
libvisio::VSDContentCollector::_fillAndShadowProperties(const VSDFillStyle
   {
 styleProps.insert("draw:fill", "solid");
 styleProps.insert("draw:fill-color", getColourString(style.bgColour));
+if (style.bgTransparency > 0)
+  styleProps.insert("draw:opacity", 1 - style.bgTransparency, 
librevenge::RVNG_PERCENT);
+else
+  styleProps.remove("draw:opacity");
   }
 
   if (style.shadowPattern)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - include/vcl vcl/inc vcl/opengl vcl/source

[Michael Meeks]

 include/vcl/opengl/OpenGLContext.hxx |5 +
 vcl/inc/openglgdiimpl.hxx|5 +
 vcl/opengl/gdiimpl.cxx   |7 ---
 vcl/opengl/win/gdiimpl.cxx   |1 +
 vcl/opengl/x11/gdiimpl.cxx   |1 +
 vcl/source/opengl/OpenGLContext.cxx  |1 +
 6 files changed, 9 insertions(+), 11 deletions(-)

New commits:
commit 6b443b08cbe50c228fee0d555df7dc40f0c8bbc5
Author: Michael Meeks 
Date:   Fri Dec 11 18:18:50 2015 +

vcl: use a custom tag for VCL OpenGLContext's to avoid re-use.

Other code is out of legacy mode now, so can't legacy as a proxy.

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

diff --git a/include/vcl/opengl/OpenGLContext.hxx 
b/include/vcl/opengl/OpenGLContext.hxx
index fb09bd5..a6d753f 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -204,6 +204,10 @@ public:
 return mbRequestLegacyContext;
 }
 
+/// VCL promiscuously re-uses its own contexts:
+void setVCLOnly() { mbVCLOnly = true; }
+bool isVCLOnly() { return mbVCLOnly; }
+
 bool supportMultiSampling() const;
 
 static SystemWindowData generateWinData(vcl::Window* pParent, bool 
bRequestLegacyContext);
@@ -229,6 +233,7 @@ private:
 int  mnRefCount;
 bool mbRequestLegacyContext;
 bool mbUseDoubleBufferedRendering;
+bool mbVCLOnly;
 
 int mnFramebufferCount;
 OpenGLFramebuffer* mpCurrentFramebuffer;
diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index a1c2a25..3e5ec94 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -72,9 +72,6 @@ protected:
 OpenGLFramebuffer* mpFramebuffer;
 OpenGLProgram* mpProgram;
 
-/// Is it someone else's context we shouldn't be fiddling with ?
-static bool IsForeignContext(const rtl::Reference 
);
-
 /// This idle handler is used to swap buffers after rendering.
 OpenGLFlushIdle *mpFlush;
 
@@ -174,7 +171,7 @@ protected:
 bool UseContext( const rtl::Reference  )
 {
 return pContext->isInitialized() &&  // not released by the OS etc.
-   IsForeignContext( pContext ); // a genuine VCL context.
+   pContext->isVCLOnly();
 }
 
 public:
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 380417d..f106872 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -2092,11 +2092,4 @@ void OpenGLSalGraphicsImpl::doFlush()
 VCL_GL_INFO( "flushAndSwap - end." );
 }
 
-bool OpenGLSalGraphicsImpl::IsForeignContext(const 
rtl::Reference )
-{
-// so far a blunt heuristic: vcl uses shiny new contexts.
-return xContext->requestedLegacy();
-}
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/opengl/win/gdiimpl.cxx b/vcl/opengl/win/gdiimpl.cxx
index 666cdbf..9ca266a6 100644
--- a/vcl/opengl/win/gdiimpl.cxx
+++ b/vcl/opengl/win/gdiimpl.cxx
@@ -29,6 +29,7 @@ void WinOpenGLSalGraphicsImpl::copyBits( const SalTwoRect& 
rPosAry, SalGraphics*
 rtl::Reference WinOpenGLSalGraphicsImpl::CreateWinContext()
 {
 rtl::Reference pContext = OpenGLContext::Create();
+pContext->setVCLOnly();
 pContext->init( mrParent.mhLocalDC, mrParent.mhWnd );
 return pContext;
 }
diff --git a/vcl/opengl/x11/gdiimpl.cxx b/vcl/opengl/x11/gdiimpl.cxx
index 595ca45c..effc81b 100644
--- a/vcl/opengl/x11/gdiimpl.cxx
+++ b/vcl/opengl/x11/gdiimpl.cxx
@@ -53,6 +53,7 @@ rtl::Reference 
X11OpenGLSalGraphicsImpl::CreateWinContext()
 
 Window aWin = pProvider->GetX11Window();
 rtl::Reference pContext = OpenGLContext::Create();
+pContext->setVCLOnly();
 pContext->init( mrParent.GetXDisplay(), aWin,
 mrParent.m_nXScreen.getXScreen() );
 return pContext;
diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index ed1347d..771b548 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -62,6 +62,7 @@ OpenGLContext::OpenGLContext():
 mnRefCount(0),
 mbRequestLegacyContext(false),
 mbUseDoubleBufferedRendering(true),
+mbVCLOnly(false),
 mnFramebufferCount(0),
 mpCurrentFramebuffer(nullptr),
 mpFirstFramebuffer(nullptr),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Justin Luth]

 sw/qa/extras/ww8export/data/tdf91083.odt |binary
 sw/qa/extras/ww8export/ww8export.cxx |6 ++
 sw/source/filter/ww8/wrtw8nds.cxx|2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 4ec0cc0781312d908a46dca382fae8e416753756
Author: Justin Luth 
Date:   Fri Nov 27 06:50:18 2015 +0300

tdf#91083 - .doc: emulate table kept-with-next not splitting

An .odt table can “keep with next paragraph”.  This means that the 
entire
table may shift to the next page and all the rows will keep together as
the table attempts to stay on the same page as the following paragraph.
There is no “keep with next” property for .doc tables, but each row CAN
be kept with the following one.  When exporting an .odt file to .doc,
setting each row like this will keep the text flow similar to the
original .odt's layout.

This commit only hinders the table from splitting - it does not actually
affect keeping with the following paragraph.

This functionality already exists in the code, but was broken
by a variable that “changed meaning” almost as soon as the
functionality was introduced.

A followup commit will deal with "full page" situations when the kept
sections are too large to fit on a single page and so the table should
split instead of start a new page. The only situation that can't be
handled nicely is a single table kept-with-next that spans more than
one page. Such tables ought not be marked as keep-with-next anyway.

Change-Id: I401772b3fa2e329b7b0890e67639cbca8c845206
Reviewed-on: https://gerrit.libreoffice.org/20217
Reviewed-by: Justin Luth 
Tested-by: Justin Luth 

diff --git a/sw/qa/extras/ww8export/data/tdf91083.odt 
b/sw/qa/extras/ww8export/data/tdf91083.odt
new file mode 100644
index 000..e4f55e5
Binary files /dev/null and b/sw/qa/extras/ww8export/data/tdf91083.odt differ
diff --git a/sw/qa/extras/ww8export/ww8export.cxx 
b/sw/qa/extras/ww8export/ww8export.cxx
index 53a1513..1bb1236 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -591,6 +591,12 @@ DECLARE_WW8EXPORT_TEST(testCommentExport, 
"comment-export.odt")
 }
 }
 
+DECLARE_WW8EXPORT_TEST(testTableKeep, "tdf91083.odt")
+{
+//emulate table "keep with next" -do not split table
+CPPUNIT_ASSERT_EQUAL( OUString("Row 1"), 
parseDump("/root/page[5]/body/tab[1]/row[2]/cell[1]/txt[1]") );
+}
+
 DECLARE_WW8EXPORT_TEST(testMoveRange, "fdo66304-1.odt")
 {
 //the save must survive without asserting
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx 
b/sw/source/filter/ww8/wrtw8nds.cxx
index 05c44e3..e0958e3 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2683,7 +2683,7 @@ void MSWordExportBase::OutputTextNode( const SwTextNode& 
rNode )
 }
 
 // #i76520# Emulate non-splitting tables
-if ( m_bOutTable )
+if ( IsInTable() )
 {
 const SwTableNode* pTableNode = rNode.FindTableNode();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

 vcl/win/gdi/gdiimpl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 63feac2a3264ead8f52148644b14078a4be5a2b9
Author: Michael Meeks 
Date:   Mon Dec 14 02:38:43 2015 +

Fix drawTransformedBitmap for NULL pAlphaBitmap.

Change-Id: Iff1a0eb8e4b112b874813023551a797320ac0ad5

diff --git a/vcl/win/gdi/gdiimpl.cxx b/vcl/win/gdi/gdiimpl.cxx
index 2d86dbe..dc16217 100644
--- a/vcl/win/gdi/gdiimpl.cxx
+++ b/vcl/win/gdi/gdiimpl.cxx
@@ -2310,7 +2310,7 @@ bool WinSalGraphicsImpl::drawTransformedBitmap(
 const SalBitmap* pAlphaBitmap)
 {
 assert(dynamic_cast());
-assert(dynamic_cast(pAlphaBitmap));
+assert(!pAlphaBitmap || dynamic_cast(pAlphaBitmap));
 
 const WinSalBitmap& rSalBitmap = static_cast< const WinSalBitmap& 
>(rSourceBitmap);
 const WinSalBitmap* pSalAlpha = static_cast< const WinSalBitmap* 
>(pAlphaBitmap);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 lotuswordpro/source/filter/lwpcontent.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 658c66882f76885d5b0df88e254740e499dcaf4c
Author: Stephan Bergmann 
Date:   Mon Dec 14 08:48:25 2015 +0100

loplugin:literaltoboolconversion

Change-Id: I9048966bd41e79bb7a2e9bd24c1dc611acefef1f

diff --git a/lotuswordpro/source/filter/lwpcontent.cxx 
b/lotuswordpro/source/filter/lwpcontent.cxx
index 61a03b9..dc10225 100644
--- a/lotuswordpro/source/filter/lwpcontent.cxx
+++ b/lotuswordpro/source/filter/lwpcontent.cxx
@@ -129,7 +129,7 @@ rtl::Reference 
LwpContent::GetLayout(LwpVirtualLayout* pStartL
 bool LwpContent::HasNonEmbeddedLayouts()
 {
 rtl::Reference xLayout;
-while (1)
+while (true)
 {
 xLayout = GetLayout(xLayout.get());
 if (!xLayout.is())
@@ -143,7 +143,7 @@ bool LwpContent::HasNonEmbeddedLayouts()
 bool LwpContent::IsStyleContent()
 {
 rtl::Reference xLayout;
-while (1)
+while (true)
 {
 xLayout = GetLayout(xLayout.get());
 if (!xLayout.is())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Branch 'libreoffice-5-1' - source/sl

[Andras Timar]

 source/sl/cui/uiconfig/ui.po  |4 
 source/sl/filter/source/config/fragments/filters.po   |  335 +-
 source/sl/helpcontent2/source/text/scalc/01.po|4 
 source/sl/librelogo/source/pythonpath.po  |4 
 source/sl/officecfg/registry/data/org/openoffice/Office/UI.po |  254 +--
 source/sl/sc/source/ui/src.po |   10 
 source/sl/sw/source/ui/frmdlg.po  |   36 -
 7 files changed, 231 insertions(+), 416 deletions(-)

New commits:
commit e5fbdb56562d1f88b532f50bae67f2a5ce782a85
Author: Andras Timar 
Date:   Mon Dec 14 08:54:56 2015 +0100

Updated Slovenian translation

Change-Id: I2a49208a17dd5e5e7813f94da13c910691efb03a

diff --git a/source/sl/cui/uiconfig/ui.po b/source/sl/cui/uiconfig/ui.po
index 0c038a1..a17b814 100644
--- a/source/sl/cui/uiconfig/ui.po
+++ b/source/sl/cui/uiconfig/ui.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 5.1\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice_status=UNCONFIRMED=UI\n;
-"POT-Creation-Date: 2015-12-06 12:54+0100\n"
+"POT-Creation-Date: 2015-12-13 21:47+0100\n"
 "PO-Revision-Date: 2015-12-06 17:07+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
diff --git a/source/sl/filter/source/config/fragments/filters.po 
b/source/sl/filter/source/config/fragments/filters.po
index a8a5891..ae4bbde 100644
--- a/source/sl/filter/source/config/fragments/filters.po
+++ b/source/sl/filter/source/config/fragments/filters.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 5.1\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice_status=UNCONFIRMED=UI\n;
-"POT-Creation-Date: 2015-11-24 18:33+0100\n"
-"PO-Revision-Date: 2015-11-21 20:04+0200\n"
+"POT-Creation-Date: 2015-12-13 21:46+0100\n"
+"PO-Revision-Date: 2015-12-14 00:52+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
@@ -62,33 +62,6 @@ msgctxt ""
 msgid "BMP - Windows Bitmap"
 msgstr "BMP – Windows Bitmap"
 
-#: Beagle_Works.xcu
-msgctxt ""
-"Beagle_Works.xcu\n"
-"Beagle_Works\n"
-"UIName\n"
-"value.text"
-msgid "BeagleWorks/WordPerfect Works v1 Text Document"
-msgstr "Dokument z besedilom BeagleWorks/WordPerfect Works razl. 1"
-
-#: Beagle_Works_Calc.xcu
-msgctxt ""
-"Beagle_Works_Calc.xcu\n"
-"Beagle_Works_Calc\n"
-"UIName\n"
-"value.text"
-msgid "BeagleWorks/WordPerfect Works v1 Spreadsheet"
-msgstr "Preglednica BeagleWorks/WordPerfect Works razl. 1"
-
-#: Beagle_Works_Draw.xcu
-msgctxt ""
-"Beagle_Works_Draw.xcu\n"
-"Beagle_Works_Draw\n"
-"UIName\n"
-"value.text"
-msgid "BeagleWorks/WordPerfect Works v1 Drawing"
-msgstr "Risba BeagleWorks/WordPerfect Works razl. 1"
-
 #: BroadBand_eBook.xcu
 msgctxt ""
 "BroadBand_eBook.xcu\n"
@@ -107,15 +80,6 @@ msgctxt ""
 msgid "CGM - Computer Graphics Metafile"
 msgstr "CGM – Computer Graphics Metafile"
 
-#: ClarisDraw.xcu
-msgctxt ""
-"ClarisDraw.xcu\n"
-"ClarisDraw\n"
-"UIName\n"
-"value.text"
-msgid "ClarisDraw"
-msgstr "ClarisDraw"
-
 #: ClarisWorks.xcu
 msgctxt ""
 "ClarisWorks.xcu\n"
@@ -197,15 +161,6 @@ msgctxt ""
 msgid "DXF - AutoCAD Interchange Format"
 msgstr "DXF – AutoCAD Interchange Format"
 
-#: DocMaker.xcu
-msgctxt ""
-"DocMaker.xcu\n"
-"DocMaker\n"
-"UIName\n"
-"value.text"
-msgid "DOCMaker (v4) Document"
-msgstr "Dokument DOCMaker (v4)"
-
 #: EMF___MS_Windows_Metafile.xcu
 msgctxt ""
 "EMF___MS_Windows_Metafile.xcu\n"
@@ -242,15 +197,6 @@ msgctxt ""
 msgid "Adobe/Macromedia Freehand"
 msgstr "Adobe/Macromedia Freehand"
 
-#: FullWrite_Professional.xcu
-msgctxt ""
-"FullWrite_Professional.xcu\n"
-"FullWrite_Professional\n"
-"UIName\n"
-"value.text"
-msgid "FullWrite Professional Document"
-msgstr "Dokument FullWrite Professional"
-
 #: GIF___Graphics_Interchange.xcu
 msgctxt ""
 "GIF___Graphics_Interchange.xcu\n"
@@ -260,33 +206,6 @@ msgctxt ""
 msgid "GIF - Graphics Interchange Format"
 msgstr "GIF – Graphics Interchange Format"
 
-#: Great_Works.xcu
-msgctxt ""
-"Great_Works.xcu\n"
-"Great_Works\n"
-"UIName\n"
-"value.text"
-msgid "GreatWorks Text Document"
-msgstr "Dokument z besedilom GreatWorks"
-
-#: Great_Works_Calc.xcu
-msgctxt ""

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - translations

[Andras Timar]

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

New commits:
commit 7b6769e6437aa588215100c2b1de0b9fda11d475
Author: Andras Timar 
Date:   Mon Dec 14 08:54:56 2015 +0100

Updated core
Project: translations  e5fbdb56562d1f88b532f50bae67f2a5ce782a85

Updated Slovenian translation

Change-Id: I2a49208a17dd5e5e7813f94da13c910691efb03a

diff --git a/translations b/translations
index 850e8b1..e5fbdb5 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 850e8b1a63bd60796421642789a46bb1117572f7
+Subproject commit e5fbdb56562d1f88b532f50bae67f2a5ce782a85
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Joel]

 cui/uiconfig/ui/optadvancedpage.ui |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 6fb1da55085ec37ca6ffde5d9bbc73585b26dee5
Author: Joel 
Date:   Sun Dec 13 11:04:42 2015 -0800

tdf#81519 Clarifying advanced options (unstable vs. limited)

minor update to clarify unstable features against macro (limited) features

Change-Id: I30c782144e5dff3c300cfcf431c745597f0c3db2
Reviewed-on: https://gerrit.libreoffice.org/20688
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 

diff --git a/cui/uiconfig/ui/optadvancedpage.ui 
b/cui/uiconfig/ui/optadvancedpage.ui
index 35e081b..7f15f19 100644
--- a/cui/uiconfig/ui/optadvancedpage.ui
+++ b/cui/uiconfig/ui/optadvancedpage.ui
@@ -312,7 +312,7 @@
 6
 
   
-Enable 
experimental features
+Enable 
experimental features (may be unstable)
 True
 True
 False
@@ -327,7 +327,7 @@
 
 
   
-Enable macro 
recording (limited)
+Enable macro 
recording (may be limited)
 True
 True
 False
@@ -361,7 +361,7 @@
   
 True
 False
-Optional (Unstable) 
Options
+Optional 
Features:
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-bugs] [Bug 96219] FILEOPEN: MSO DOCX image incorrectly placed when using Top Margin Position

[bugzilla-daemon]

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

--- Comment #6 from raal  ---
Created attachment 121255
  --> https://bugs.documentfoundation.org/attachment.cgi?id=121255=edit
printscreens

-- 
You are receiving this mail because:
You are the assignee for the bug.
___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 91857] Reorganization of the menu bar for Impress

[bugzilla-daemon]

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

Commit Notification  changed:

   What|Removed |Added

 Whiteboard| target:5.1.0   | target:5.1.0 target:5.2.0

-- 
You are receiving this mail because:
You are the assignee for the bug.
___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-ux-advise] [Bug 91857] Reorganization of the menu bar for Impress

[bugzilla-daemon]

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

Commit Notification  changed:

   What|Removed |Added

 Whiteboard| target:5.1.0   | target:5.1.0 target:5.2.0

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
Libreoffice-ux-advise mailing list
Libreoffice-ux-advise@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-ux-advise

[Libreoffice-ux-advise] [Bug 91857] Reorganization of the menu bar for Impress

[bugzilla-daemon]

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

--- Comment #12 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=d1461011d3fb5df172e4e07cb549c4cac4f37b67

tdf#91857 Additional improvements to Impress' menu bar

It will be available in 5.2.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-ux-advise mailing list
Libreoffice-ux-advise@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-ux-advise

[Libreoffice-bugs] [Bug 96119] Cannot select list item with mouse in any combobox

[bugzilla-daemon]

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

Luke  changed:

   What|Removed |Added

   Keywords||bibisectRequest

-- 
You are receiving this mail because:
You are the assignee for the bug.
___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 94851] Images are not printed (paper and PDF) with OpenGL activated

[bugzilla-daemon]

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

--- Comment #51 from marshals  ---
(In reply to Michael Meeks from comment #48)
> For 5.0.x we disabled GL by default.

are you sure?

i've just installed LO-5.0.3.2 x64 on a fresh Win10Home x64 build, and under
Options > LibreOffice > View, the "Use OpenGL for all rendering" is ticked (as
is Options > LibreOffice > Open CL "Allow use of OpenCL").

or did you mean some other setting?  or am i misunderstanding something?

-- 
You are receiving this mail because:
You are the assignee for the bug.
___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 96219] FILEOPEN: MSO DOCX image incorrectly placed when using Top Margin Position

[bugzilla-daemon]

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

raal  changed:

   What|Removed |Added

   Keywords||bibisected, bisected
 CC||l.lu...@collabora.com
 Whiteboard|bibisectRequest |

--- Comment #5 from raal  ---
This seems to have begun at the below commit.
Adding Cc: to Luboš Luňák ; Could you possibly take a look at this one?
Thanks

cf196516a0f26272ee89c78c70881fbc054fa6fb is the first bad commit
commit cf196516a0f26272ee89c78c70881fbc054fa6fb
Author: Matthew Francis 
Date:   Sun Mar 15 02:57:35 2015 +0800

source-hash-3891ba42a886fa85eb43da24d1badf44e765d54c

commit 3891ba42a886fa85eb43da24d1badf44e765d54c
Author: Luboš Luňák 
AuthorDate: Sun Sep 21 17:52:58 2014 +0200
Commit: Luboš Luňák 
CommitDate: Sun Sep 21 17:54:41 2014 +0200

handle docx's w:anchor layoutInCell attribute (bnc#891663)

Change-Id: I8268567b84aa0f6e42624bfd0f79c8c49c153edd

-- 
You are receiving this mail because:
You are the assignee for the bug.
___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs