[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sc/source winaccessibility/source

[Steve Yin]

 sc/source/ui/Accessibility/AccessibleCell.cxx|2 +-
 sc/source/ui/Accessibility/AccessibleDocument.cxx|   17 ++---
 sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx |   10 +-
 sc/source/ui/inc/AccessibleCell.hxx  |3 ++-
 sc/source/ui/inc/AccessibleSpreadsheet.hxx   |   11 +++
 sc/source/ui/inc/tabvwsh.hxx |6 ++
 sc/source/ui/view/cellsh4.cxx|6 ++
 sc/source/ui/view/tabview3.cxx   |4 
 sc/source/ui/view/tabvwsh4.cxx   |1 +
 winaccessibility/source/UAccCOM/MAccessible.cpp  |1 +
 10 files changed, 43 insertions(+), 18 deletions(-)

New commits:
commit 5478c54be2de808663565e53250c8a4055b390c9
Author: Steve Yin 
Date:   Mon Jan 6 07:40:48 2014 +

Bug 123629 - [ia2] Calc: Invalid focus event fired after editing cell

Some Coverity issues fixes

diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx 
b/sc/source/ui/Accessibility/AccessibleCell.cxx
index 084b420..c7d0c29 100644
--- a/sc/source/ui/Accessibility/AccessibleCell.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCell.cxx
@@ -510,7 +510,7 @@ void ScAccessibleCell::AddRelation(const ScRange& rRange,
 }
 
 uno::Any SAL_CALL ScAccessibleCell::getExtendedAttributes()
-throw (::com::sun::star::lang::IndexOutOfBoundsException, 
::com::sun::star::uno::RuntimeException)
+throw (::com::sun::star::lang::IndexOutOfBoundsException, 
::com::sun::star::uno::RuntimeException, 
com::sun::star::ucb::CommandFailedException)
 {
 uno::Any strRet;
 if (mpViewShell)
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx 
b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 8a8c93a..d127a47 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -257,12 +257,12 @@ public:
 
 virtual ::accessibility::AccessibleControlShape* 
GetAccControlShapeFromModel
 (::com::sun::star::beans::XPropertySet* pSet)
-throw (::com::sun::star::uno::RuntimeException);
+throw (::com::sun::star::uno::RuntimeException, 
com::sun::star::ucb::CommandFailedException);
 virtual  ::com::sun::star::uno::Reference<
 ::com::sun::star::accessibility::XAccessible>
 GetAccessibleCaption (const ::com::sun::star::uno::Reference<
 ::com::sun::star::drawing::XShape>& xShape)
-throw (::com::sun::star::uno::RuntimeException);
+throw (::com::sun::star::uno::RuntimeException, 
com::sun::star::ucb::CommandFailedException);
 ///=  Internal  

 void SetDrawBroadcaster();
 
@@ -483,7 +483,7 @@ sal_Bool ScChildrenShapes::ReplaceChild 
(::accessibility::AccessibleShape* pCurr
 return bResult;
 }
 
-::accessibility::AccessibleControlShape * 
ScChildrenShapes::GetAccControlShapeFromModel(::com::sun::star::beans::XPropertySet*
 pSet) throw (::com::sun::star::uno::RuntimeException)
+::accessibility::AccessibleControlShape * 
ScChildrenShapes::GetAccControlShapeFromModel(::com::sun::star::beans::XPropertySet*
 pSet) throw (::com::sun::star::uno::RuntimeException, 
com::sun::star::ucb::CommandFailedException)
 {
 sal_Int32 count = GetCount();
 for (sal_Int32 index=0;index
 ScChildrenShapes::GetAccessibleCaption (const ::com::sun::star::uno::Reference 
< ::com::sun::star::drawing::XShape>& xShape)
-throw (::com::sun::star::uno::RuntimeException)
+throw (::com::sun::star::uno::RuntimeException, 
com::sun::star::ucb::CommandFailedException)
 {
 sal_Int32 count = GetCount();
 for (sal_Int32 index=0;index(mpViewShell->GetWindowByPos(meSplitPos));
-if (pWin)
+if (mpViewShell)
 {
-bWinFocus = pWin->HasFocus();
+ScGridWindow* pWin = 
static_cast(mpViewShell->GetWindowByPos(meSplitPos));
+if (pWin)
+{
+bWinFocus = pWin->HasFocus();
+}
 }
 const SdrMarkList* pMarkList = NULL;
 SdrObject* pMarkedObj = NULL;
diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx 
b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
index 26c6798..b5d1a80 100644
--- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
+++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
@@ -480,7 +480,7 @@ void ScAccessibleSpreadsheet::Notify( SfxBroadcaster& rBC, 
const SfxHint& rHint
 pAccDoc->CommitChange(aEvent);
 }
 }
-sal_Bool bNewPosCell = (aNewCell != maActiveCell);
+sal_Bool bNewPosCell = (aNewCell != maActiveCell) || 
mpViewShell->GetForceFocusOnCurCell(); // i123629
 sal_Bool bNewPosCellFocus=sal_False;
 if ( bNewPosCell && IsFocused() && aNewCell.Tab() == 
maActiveCell.Tab() )
 {//single Focus
@@ -1490,7 +1490,7 @@ Rectang

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sd/source

[Caolán McNamara]

 sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 6a7a73d278c300ac7519d1ec50e5a4495f174f89
Author: Caolán McNamara 
Date:   Thu Dec 12 12:37:43 2013 +

pages with equal Priority and Class getting dropped

Change-Id: Ib053dc4b6e5fb5f01f48c71a4b295a53c0ec6715
(cherry picked from commit 9790588da4b2de455ffc7a2cc69f26539823c3da)
(cherry picked from commit be366ad7690b190c5ef4dc42311a4df6b7dcce4b)
Reviewed-on: https://gerrit.libreoffice.org/7054
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx 
b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
index d02bae1..835787b 100644
--- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
@@ -40,9 +40,14 @@ public:
 bool operator() (const Request& rRequest1, const Request& rRequest2)
 {
 if (rRequest1.meClass == rRequest2.meClass)
-return (rRequest1.mnPriorityInClass > 
rRequest2.mnPriorityInClass);
-else
-return (rRequest1.meClass < rRequest2.meClass);
+{
+if (rRequest1.mnPriorityInClass == rRequest2.mnPriorityInClass)
+{
+return rRequest1.maKey < rRequest2.maKey;
+}
+return rRequest1.mnPriorityInClass > 
rRequest2.mnPriorityInClass;
+}
+return rRequest1.meClass < rRequest2.meClass;
 }
 };
 /** Request data is compared arbitrarily by their addresses in memory.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 oox/source/export/shapes.cxx  |8 +++-
 oox/source/shape/WpgContext.cxx   |4 
 sw/qa/extras/ooxmlexport/data/groupshape-picture.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx  |8 
 4 files changed, 19 insertions(+), 1 deletion(-)

New commits:
commit 430246ef14e79643ff93a981d56086acd259d055
Author: Miklos Vajna 
Date:   Mon Jan 6 09:51:46 2014 +0100

oox: handle pic:pic in WPG groupshape import

Change-Id: I7de11251bc4e1b58f9cb308e8b698d4c8c1a58d3

diff --git a/oox/source/shape/WpgContext.cxx b/oox/source/shape/WpgContext.cxx
index 8e6c8ea..6e31612 100644
--- a/oox/source/shape/WpgContext.cxx
+++ b/oox/source/shape/WpgContext.cxx
@@ -10,6 +10,7 @@
 #include "WpgContext.hxx"
 #include 
 #include 
+#include 
 
 using namespace com::sun::star;
 
@@ -54,6 +55,9 @@ oox::core::ContextHandlerRef 
WpgContext::onCreateContext(sal_Int32 nElementToken
 return new oox::drawingml::ShapeContext(*this, mpShape, pShape);
 }
 break;
+case XML_pic:
+return new oox::drawingml::GraphicShapeContext(*this, mpShape, 
oox::drawingml::ShapePtr(new 
oox::drawingml::Shape("com.sun.star.drawing.GraphicObjectShape")));
+break;
 case XML_grpSp:
 {
 oox::drawingml::ShapePtr pShape(new 
oox::drawingml::Shape("com.sun.star.drawing.GroupShape"));
diff --git a/sw/qa/extras/ooxmlexport/data/groupshape-picture.docx 
b/sw/qa/extras/ooxmlexport/data/groupshape-picture.docx
new file mode 100644
index 000..4ecce56
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/groupshape-picture.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index aab75ab..126516f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2217,6 +2217,14 @@ DECLARE_OOXMLEXPORT_TEST(testGroupshapeTextbox, 
"groupshape-textbox.docx")
 CPPUNIT_ASSERT_EQUAL(11.f, getProperty(xShape, "CharHeight"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testGroupshapePicture, "groupshape-picture.docx")
+{
+// Picture in the groupshape got lost, groupshape had only one child.
+uno::Reference xGroup(getShape(1), uno::UNO_QUERY);
+uno::Reference 
xShapeDescriptor(xGroup->getByIndex(1), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.drawing.GraphicObjectShape"), 
xShapeDescriptor->getShapeType());
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTrackChangesDeletedParagraphMark, 
"testTrackChangesDeletedParagraphMark.docx")
 {
 xmlDocPtr pXmlDoc = parseExport("word/document.xml");
commit c6d1ccd8024c9a90bf8f5732ce1e2b957e8048e7
Author: Miklos Vajna 
Date:   Mon Jan 6 09:39:49 2014 +0100

oox: fix XML namespace of drawing::GraphicObjectShape in DML export

Change-Id: Ia7fb126f30ff1c4cd2f5fb8a5c71a87dd5e1d5c9

diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 67cf3dc..76dd743 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -272,8 +272,14 @@ ShapeExport& 
ShapeExport::WriteGroupShape(uno::Reference xShape
 {
 uno::Reference xChild(xGroupShape->getByIndex(i), 
uno::UNO_QUERY_THROW);
 sal_Int32 nSavedNamespace = mnXmlNamespace;
-mnXmlNamespace = XML_wps;
+
+uno::Reference xServiceInfo(xChild, 
uno::UNO_QUERY_THROW);
+if 
(xServiceInfo->supportsService("com.sun.star.drawing.GraphicObjectShape"))
+mnXmlNamespace = XML_pic;
+else
+mnXmlNamespace = XML_wps;
 WriteShape(xChild);
+
 mnXmlNamespace = nSavedNamespace;
 }
 m_xParent = xParent;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 79/5b3bb9e59c9bf049d27538c860cd66633dddcf

[Caolán McNamara]

 79/5b3bb9e59c9bf049d27538c860cd66633dddcf |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7be90e40cf7cd77436f86eea9449f114080b7ae4
Author: Caolán McNamara 
Date:   Mon Jan 6 09:26:41 2014 +

Notes added by 'git notes add'

diff --git a/79/5b3bb9e59c9bf049d27538c860cd66633dddcf 
b/79/5b3bb9e59c9bf049d27538c860cd66633dddcf
new file mode 100644
index 000..f233a60
--- /dev/null
+++ b/79/5b3bb9e59c9bf049d27538c860cd66633dddcf
@@ -0,0 +1 @@
+merged as: 6242f8262f4d7ac15e9fe20da0e8d3475e9f5cf2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Steve Yin]

 winaccessibility/source/UAccCOM/MAccessible.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6242f8262f4d7ac15e9fe20da0e8d3475e9f5cf2
Author: Steve Yin 
Date:   Mon Jan 6 07:08:05 2014 +

Initialize m_containedObjects

(cherry picked from commit 795b3bb9e59c9bf049d27538c860cd66633dddcf)

Change-Id: I45e495ad8b3513613102b7ce803303980fbe

diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx 
b/winaccessibility/source/UAccCOM/MAccessible.cxx
index 308e839..4cba97c 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.cxx
+++ b/winaccessibility/source/UAccCOM/MAccessible.cxx
@@ -241,6 +241,7 @@ m_bRequiresSave(FALSE)
 m_sLocation.m_dWidth=0;
 m_sLocation.m_dHeight=0;
 CEnumVariant::Create(&m_pEnumVar);
+m_containedObjects.clear();
 }
 
 CMAccessible::~CMAccessible()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - l10ntools/inc l10ntools/source starmath/source

[Andras Timar]

 l10ntools/inc/export.hxx |6 --
 l10ntools/source/export.cxx  |   93 ++-
 starmath/source/commands.src |   38 -
 3 files changed, 50 insertions(+), 87 deletions(-)

New commits:
commit 9a319e930cf649346985e9e87e95945d447beae4
Author: Andras Timar 
Date:   Mon Jan 6 10:57:16 2014 +0100

Typo fixes in Math tooltips

Change-Id: I7623fd53dd60fdfd9afb99135b79adfb434aa72a

diff --git a/starmath/source/commands.src b/starmath/source/commands.src
index 950c582..a51eae2 100644
--- a/starmath/source/commands.src
+++ b/starmath/source/commands.src
@@ -48,7 +48,7 @@ String RID_NEGX_HELP
 String RID_XPLUSY   { Text = " +  " ; };
 String RID_XPLUSY_HELP
 {
-Text [ en-US ] = "Addition + " ;
+Text [ en-US ] = "Addition +" ;
 };
 String RID_XMINUSY  { Text = " -  " ; };
 String RID_XMINUSY_HELP
@@ -281,7 +281,7 @@ String RID_FACTX_HELP
 String RID_SQRTX{ Text = "sqrt{} " ; };
 String RID_SQRTX_HELP
 {
-Text [ en-US ] = "Square Root " ;
+Text [ en-US ] = "Square Root" ;
 };
 String RID_NROOTXY  { Text = "nroot{}{} " ; };
 String RID_NROOTXY_HELP
@@ -336,7 +336,7 @@ String RID_ARCSINX_HELP
 String RID_ARCCOSX  { Text = "arccos() " ; };
 String RID_ARCCOSX_HELP
 {
-Text [ en-US ] = "Arccosise" ;
+Text [ en-US ] = "Arccosine" ;
 };
 String RID_ARCTANX  { Text = "arctan() " ; };
 String RID_ARCTANX_HELP
@@ -401,7 +401,7 @@ String RID_SUM_FROMX_HELP
 String RID_SUM_TOX  { Text = "sum to{}  " ; };
 String RID_SUM_TOX_HELP
 {
-Text [ en-US ] = "Sum SuperScript Top" ;
+Text [ en-US ] = "Sum Superscript Top" ;
 };
 String RID_SUM_FROMTOX  { Text = "sum from{} to{}  " ; };
 String RID_SUM_FROMTOX_HELP
@@ -436,7 +436,7 @@ String RID_COPRODX_HELP
 String RID_COPROD_FROMX { Text = "coprod from{}  " ; };
 String RID_COPROD_FROMX_HELP
 {
-Text [ en-US ] = "Coproduct " ;
+Text [ en-US ] = "Coproduct Subscript Bottom" ;
 };
 String RID_COPROD_TOX   { Text = "coprod to{}  " ; };
 String RID_COPROD_TOX_HELP
@@ -456,24 +456,24 @@ String RID_LIMX_HELP
 String RID_LIM_FROMX{ Text = "lim from{}  " ; };
 String RID_LIM_FROMX_HELP
 {
-Text [ en-US ] = "Lime Subscript Bottom" ;
+Text [ en-US ] = "Limes Subscript Bottom" ;
 };
 String RID_LIM_TOX  { Text = "lim to{}  " ; };
 String RID_LIM_TOX_HELP
 {
-Text [ en-US ] = "Lime Superscript Top" ;
+Text [ en-US ] = "Limes Superscript Top" ;
 };
 String RID_LIM_FROMTOX  { Text = "lim from{} to{}  " ; };
 String RID_LIM_FROMTOX_HELP
 {
-Text [ en-US ] = "Lime Sup/Sub script" ;
+Text [ en-US ] = "Limes Sup/Sub script" ;
 };
 String RID_LIMINFX  { Text = "liminf  " ; };
 String RID_LIMSUPX  { Text = "limsup  " ; };
 String RID_EXISTS   { Text = "exists " ; };
 String RID_EXISTS_HELP
 {
-Text [ en-US ] = "There exists" ;
+Text [ en-US ] = "There Exists" ;
 };
 String RID_NOTEXISTS{ Text = "notexists " ; };
 String RID_NOTEXISTS_HELP
@@ -493,7 +493,7 @@ String RID_INTX_HELP
 String RID_INT_FROMX{ Text = "int from{}  " ; };
 String RID_INT_FROMX_HELP
 {
-Text [ en-US ] = "Integral Subscript Top" ;
+Text [ en-US ] = "Integral Subscript Bottom" ;
 };
 String RID_INT_TOX  { Text = "int to{}  " ; };
 String RID_INT_TOX_HELP
@@ -603,7 +603,7 @@ String RID_LLLINT_TOX_HELP
 String RID_LLLINT_FROMTOX   { Text = "lllint from{} to{}  " ; };
 String RID_LLLINT_FROMTOX_HELP
 {
-Text [ en-US ] = "Trile Curve Integral Sup/Sub script" ;
+Text [ en-US ] = "Triple Curve Integral Sup/Sub script" ;
 };
 String RID_FROMX{ Text = "from{}  " ; };
 String RID_TOX  { Text = "to{}  " ; };
@@ -646,7 +646,7 @@ String RID_DDOTX_HELP
 String RID_DDDOTX   { Text = "dddot  " ; };
 String RID_DDDOTX_HELP
 {
-Text [ en-US ] = "Triple Dot " ;
+Text [ en-US ] = "Triple Dot" ;
 };
 String RID_GRAVEX   { Text = "grave  " ; };
 String RID_GRAVEX_HELP
@@ -752,12 +752,12 @@ String RID_LRGROUPX_HELP
 String RID_LRPARENTX{ Text = "() " ; };
 String RID_LRPARENTX_HELP
 {
-Text [ en-US ] = "Round Brackets (Scalable)" ;
+Text [ en-US ] = "Round Brackets" ;
 };
 String RID_LRBRACKETX   { Text = "[] " ; };
 String RID_LRBRACKETX_HELP
 {
-Text [ en-US ] = "Square Brackets (Scalable)" ;
+Text [ en-US ] = "Square Brackets" ;
 };
 String RID_LRDBRACKETX  { Text = "ldbracket  rdbracket " ; };
 String RID_LRDBRACKETX_HELP
@@ -827,12 +827,12 @@ String RID_SLRANGLEX_HELP
 String RID_SLRCEILX { Text = "left lceil  right rceil " ; };
 String RID_SLRCEILX_HELP
 {
-Text [ en-US ] = "Minor ceil" ;
+Text [ en-US ] = "Ceiling (Scalable)" ;
 };
 String RID_SLRFLOORX{ Text = "left lfloor  right rfloor " ; };
 String RID_SLRFLOORX_HELP
 {
-Text [ en-US ] = "Minor floor" ;
+Text [ en-US ] = "Floor (Scalable)" ;
 };
 String RID_SLRLINEX { Text = "left lline  ri

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

[Andras Timar]

 starmath/source/commands.src |   38 +++---
 1 file changed, 19 insertions(+), 19 deletions(-)

New commits:
commit 7e78ca35dd80d2330cfc4e6ede7a1139b136a673
Author: Andras Timar 
Date:   Mon Jan 6 10:57:16 2014 +0100

Typo fixes in Math tooltips

Change-Id: I7623fd53dd60fdfd9afb99135b79adfb434aa72a

diff --git a/starmath/source/commands.src b/starmath/source/commands.src
index 950c582..a51eae2 100644
--- a/starmath/source/commands.src
+++ b/starmath/source/commands.src
@@ -48,7 +48,7 @@ String RID_NEGX_HELP
 String RID_XPLUSY   { Text = " +  " ; };
 String RID_XPLUSY_HELP
 {
-Text [ en-US ] = "Addition + " ;
+Text [ en-US ] = "Addition +" ;
 };
 String RID_XMINUSY  { Text = " -  " ; };
 String RID_XMINUSY_HELP
@@ -281,7 +281,7 @@ String RID_FACTX_HELP
 String RID_SQRTX{ Text = "sqrt{} " ; };
 String RID_SQRTX_HELP
 {
-Text [ en-US ] = "Square Root " ;
+Text [ en-US ] = "Square Root" ;
 };
 String RID_NROOTXY  { Text = "nroot{}{} " ; };
 String RID_NROOTXY_HELP
@@ -336,7 +336,7 @@ String RID_ARCSINX_HELP
 String RID_ARCCOSX  { Text = "arccos() " ; };
 String RID_ARCCOSX_HELP
 {
-Text [ en-US ] = "Arccosise" ;
+Text [ en-US ] = "Arccosine" ;
 };
 String RID_ARCTANX  { Text = "arctan() " ; };
 String RID_ARCTANX_HELP
@@ -401,7 +401,7 @@ String RID_SUM_FROMX_HELP
 String RID_SUM_TOX  { Text = "sum to{}  " ; };
 String RID_SUM_TOX_HELP
 {
-Text [ en-US ] = "Sum SuperScript Top" ;
+Text [ en-US ] = "Sum Superscript Top" ;
 };
 String RID_SUM_FROMTOX  { Text = "sum from{} to{}  " ; };
 String RID_SUM_FROMTOX_HELP
@@ -436,7 +436,7 @@ String RID_COPRODX_HELP
 String RID_COPROD_FROMX { Text = "coprod from{}  " ; };
 String RID_COPROD_FROMX_HELP
 {
-Text [ en-US ] = "Coproduct " ;
+Text [ en-US ] = "Coproduct Subscript Bottom" ;
 };
 String RID_COPROD_TOX   { Text = "coprod to{}  " ; };
 String RID_COPROD_TOX_HELP
@@ -456,24 +456,24 @@ String RID_LIMX_HELP
 String RID_LIM_FROMX{ Text = "lim from{}  " ; };
 String RID_LIM_FROMX_HELP
 {
-Text [ en-US ] = "Lime Subscript Bottom" ;
+Text [ en-US ] = "Limes Subscript Bottom" ;
 };
 String RID_LIM_TOX  { Text = "lim to{}  " ; };
 String RID_LIM_TOX_HELP
 {
-Text [ en-US ] = "Lime Superscript Top" ;
+Text [ en-US ] = "Limes Superscript Top" ;
 };
 String RID_LIM_FROMTOX  { Text = "lim from{} to{}  " ; };
 String RID_LIM_FROMTOX_HELP
 {
-Text [ en-US ] = "Lime Sup/Sub script" ;
+Text [ en-US ] = "Limes Sup/Sub script" ;
 };
 String RID_LIMINFX  { Text = "liminf  " ; };
 String RID_LIMSUPX  { Text = "limsup  " ; };
 String RID_EXISTS   { Text = "exists " ; };
 String RID_EXISTS_HELP
 {
-Text [ en-US ] = "There exists" ;
+Text [ en-US ] = "There Exists" ;
 };
 String RID_NOTEXISTS{ Text = "notexists " ; };
 String RID_NOTEXISTS_HELP
@@ -493,7 +493,7 @@ String RID_INTX_HELP
 String RID_INT_FROMX{ Text = "int from{}  " ; };
 String RID_INT_FROMX_HELP
 {
-Text [ en-US ] = "Integral Subscript Top" ;
+Text [ en-US ] = "Integral Subscript Bottom" ;
 };
 String RID_INT_TOX  { Text = "int to{}  " ; };
 String RID_INT_TOX_HELP
@@ -603,7 +603,7 @@ String RID_LLLINT_TOX_HELP
 String RID_LLLINT_FROMTOX   { Text = "lllint from{} to{}  " ; };
 String RID_LLLINT_FROMTOX_HELP
 {
-Text [ en-US ] = "Trile Curve Integral Sup/Sub script" ;
+Text [ en-US ] = "Triple Curve Integral Sup/Sub script" ;
 };
 String RID_FROMX{ Text = "from{}  " ; };
 String RID_TOX  { Text = "to{}  " ; };
@@ -646,7 +646,7 @@ String RID_DDOTX_HELP
 String RID_DDDOTX   { Text = "dddot  " ; };
 String RID_DDDOTX_HELP
 {
-Text [ en-US ] = "Triple Dot " ;
+Text [ en-US ] = "Triple Dot" ;
 };
 String RID_GRAVEX   { Text = "grave  " ; };
 String RID_GRAVEX_HELP
@@ -752,12 +752,12 @@ String RID_LRGROUPX_HELP
 String RID_LRPARENTX{ Text = "() " ; };
 String RID_LRPARENTX_HELP
 {
-Text [ en-US ] = "Round Brackets (Scalable)" ;
+Text [ en-US ] = "Round Brackets" ;
 };
 String RID_LRBRACKETX   { Text = "[] " ; };
 String RID_LRBRACKETX_HELP
 {
-Text [ en-US ] = "Square Brackets (Scalable)" ;
+Text [ en-US ] = "Square Brackets" ;
 };
 String RID_LRDBRACKETX  { Text = "ldbracket  rdbracket " ; };
 String RID_LRDBRACKETX_HELP
@@ -827,12 +827,12 @@ String RID_SLRANGLEX_HELP
 String RID_SLRCEILX { Text = "left lceil  right rceil " ; };
 String RID_SLRCEILX_HELP
 {
-Text [ en-US ] = "Minor ceil" ;
+Text [ en-US ] = "Ceiling (Scalable)" ;
 };
 String RID_SLRFLOORX{ Text = "left lfloor  right rfloor " ; };
 String RID_SLRFLOORX_HELP
 {
-Text [ en-US ] = "Minor floor" ;
+Text [ en-US ] = "Floor (Scalable)" ;
 };
 String RID_SLRLINEX { Text = "left lline  right rline " ; };
 String RID_SLRLINEX_HELP
@@ -902,7 +902,7 @@ String RID_BLANK_HELP
 String RID_NEWL

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

[Steve Yin]

 sc/source/ui/Accessibility/AccessibleCell.cxx|2 +-
 sc/source/ui/Accessibility/AccessibleDocument.cxx|8 
 sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx |8 
 sc/source/ui/inc/AccessibleCell.hxx  |3 +--
 sc/source/ui/inc/AccessibleSpreadsheet.hxx   |   11 ---
 5 files changed, 14 insertions(+), 18 deletions(-)

New commits:
commit 15e6a8263ae6181ac4912b94af8cb63adc34a86d
Author: Steve Yin 
Date:   Mon Jan 6 09:42:20 2014 +

Rolled back some coverity issue fixes for mac build

diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx 
b/sc/source/ui/Accessibility/AccessibleCell.cxx
index c7d0c29..084b420 100644
--- a/sc/source/ui/Accessibility/AccessibleCell.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCell.cxx
@@ -510,7 +510,7 @@ void ScAccessibleCell::AddRelation(const ScRange& rRange,
 }
 
 uno::Any SAL_CALL ScAccessibleCell::getExtendedAttributes()
-throw (::com::sun::star::lang::IndexOutOfBoundsException, 
::com::sun::star::uno::RuntimeException, 
com::sun::star::ucb::CommandFailedException)
+throw (::com::sun::star::lang::IndexOutOfBoundsException, 
::com::sun::star::uno::RuntimeException)
 {
 uno::Any strRet;
 if (mpViewShell)
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx 
b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index d127a47..b8ef809 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -257,12 +257,12 @@ public:
 
 virtual ::accessibility::AccessibleControlShape* 
GetAccControlShapeFromModel
 (::com::sun::star::beans::XPropertySet* pSet)
-throw (::com::sun::star::uno::RuntimeException, 
com::sun::star::ucb::CommandFailedException);
+throw (::com::sun::star::uno::RuntimeException);
 virtual  ::com::sun::star::uno::Reference<
 ::com::sun::star::accessibility::XAccessible>
 GetAccessibleCaption (const ::com::sun::star::uno::Reference<
 ::com::sun::star::drawing::XShape>& xShape)
-throw (::com::sun::star::uno::RuntimeException, 
com::sun::star::ucb::CommandFailedException);
+throw (::com::sun::star::uno::RuntimeException);
 ///=  Internal  

 void SetDrawBroadcaster();
 
@@ -483,7 +483,7 @@ sal_Bool ScChildrenShapes::ReplaceChild 
(::accessibility::AccessibleShape* pCurr
 return bResult;
 }
 
-::accessibility::AccessibleControlShape * 
ScChildrenShapes::GetAccControlShapeFromModel(::com::sun::star::beans::XPropertySet*
 pSet) throw (::com::sun::star::uno::RuntimeException, 
com::sun::star::ucb::CommandFailedException)
+::accessibility::AccessibleControlShape * 
ScChildrenShapes::GetAccControlShapeFromModel(::com::sun::star::beans::XPropertySet*
 pSet) throw (::com::sun::star::uno::RuntimeException)
 {
 sal_Int32 count = GetCount();
 for (sal_Int32 index=0;index
 ScChildrenShapes::GetAccessibleCaption (const ::com::sun::star::uno::Reference 
< ::com::sun::star::drawing::XShape>& xShape)
-throw (::com::sun::star::uno::RuntimeException, 
com::sun::star::ucb::CommandFailedException)
+throw (::com::sun::star::uno::RuntimeException)
 {
 sal_Int32 count = GetCount();
 for (sal_Int32 index=0;index
 #endif
-#include 
 
 class ScTabViewShell;
 class ScAccessibleDocument;
@@ -143,7 +142,7 @@ public:
 throw (::com::sun::star::uno::RuntimeException);
 
 virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes()
-throw (::com::sun::star::lang::IndexOutOfBoundsException, 
::com::sun::star::uno::RuntimeException, 
com::sun::star::ucb::CommandFailedException) ;
+throw (::com::sun::star::lang::IndexOutOfBoundsException, 
::com::sun::star::uno::RuntimeException) ;
 
 // Override this method to handle cell's ParaIndent attribute specially.
 virtual ::com::sun::star::uno::Sequence< 
::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( 
sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& 
aRequestedAttributes )
diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx 
b/sc/source/ui/inc/AccessibleSpreadsheet.hxx
index 7d44025..926ed95 100644
--- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx
+++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx
@@ -28,9 +28,6 @@
 #include "AccessibleTableBase.hxx"
 #include "viewdata.hxx"
 
-#include 
-#include 
-
 #include 
 
 #include "rangelst.hxx"
@@ -246,13 +243,13 @@ public:
 throw (com::sun::star::uno::RuntimeException);
 //=  XAccessibleTableSelection  

 virtual sal_Bool SAL_CALL selectRow( sal_Int32 row )
-throw (::com::sun::star::lang::IndexOutOfBoundsException, 
::com::sun::star::uno::RuntimeException, 
::com::sun::star::ucb::CommandFailedException, 
com::sun::star::ucb::ContentCreationException) ;
+throw (::com::

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

[Caolán McNamara]

 helpers/help_hid.lst  |9 -
 source/text/sbasic/shared/01/0613.xhp |   12 ++--
 source/text/shared/00/0001.xhp|2 +-
 source/text/shared/01/0613.xhp|   24 
 4 files changed, 19 insertions(+), 28 deletions(-)

New commits:
commit 30a52763d36fe64b9d6c170032404b69f823b5c9
Author: Caolán McNamara 
Date:   Mon Jan 6 10:08:18 2014 +

update help ids for lib page .ui conversion

Change-Id: I22fff4675a0b097b39bd23f87c19c61e615ef430

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index b284519..26ccd1b 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -813,7 +813,6 @@ HID_BASICIDE_BRKPROPS,63558,
 HID_BASICIDE_DIALOGWINDOW,63562,
 HID_BASICIDE_EDITORWINDOW,63563,
 HID_BASICIDE_LIBS,63545,
-HID_BASICIDE_LIBS_TREE,63548,
 HID_BASICIDE_MANAGE_LANGUAGE,63571,
 HID_BASICIDE_MODULES_TREE,63547,
 HID_BASICIDE_MODULWINDOW,63561,
@@ -5442,7 +5441,6 @@ basctl_Edit_RID_MACROCHOOSER_RID_ED_MACRONAME,1317865477,
 basctl_Edit_RID_MACROOPTIONS_RID_ED_HELPNAME,1317947404,
 basctl_FloatingWindow_RID_BASICIDE_OBJCAT,1855062016,
 basctl_ListBox_RID_DLG_MANAGE_LANGUAGE_LB_LANGUAGE,1343589890,
-basctl_ListBox_RID_TP_LIBS_RID_LB_BASICS,780799500,
 basctl_ModalDialog_RID_MACROCHOOSER,1317863424,
 basctl_ModalDialog_RID_MACROOPTIONS,1317945344,
 basctl_MultiLineEdit_RID_MACROCHOOSER_RID_ML_DESCRIPTION,1317866000,
@@ -5462,18 +5460,11 @@ basctl_PushButton_RID_TP_DLGS_RID_PB_DELETE,780816904,
 basctl_PushButton_RID_TP_DLGS_RID_PB_EDIT,780816900,
 basctl_PushButton_RID_TP_DLGS_RID_PB_NEWDLG,780816903,
 basctl_PushButton_RID_TP_DLGS_RID_PB_NEWMOD,780816902,
-basctl_PushButton_RID_TP_LIBS_RID_PB_APPEND,780800522,
-basctl_PushButton_RID_TP_LIBS_RID_PB_DELETE,780800520,
-basctl_PushButton_RID_TP_LIBS_RID_PB_EDIT,780800516,
-basctl_PushButton_RID_TP_LIBS_RID_PB_EXPORT,780800526,
-basctl_PushButton_RID_TP_LIBS_RID_PB_NEWLIB,780800521,
-basctl_PushButton_RID_TP_LIBS_RID_PB_PASSWORD,780800523,
 basctl_PushButton_RID_TP_MODULS_RID_PB_DELETE,780784136,
 basctl_PushButton_RID_TP_MODULS_RID_PB_EDIT,780784132,
 basctl_PushButton_RID_TP_MODULS_RID_PB_NEWDLG,780784135,
 basctl_PushButton_RID_TP_MODULS_RID_PB_NEWMOD,780784134,
 basctl_TabPage_RID_TP_DLGS,780812288,
-basctl_TabPage_RID_TP_LIBS,780795904,
 basctl_TabPage_RID_TP_MODULS,780779520,
 basic_CheckBox_RID_TP_CRASH_CB_ALLOWCONTACT,602555449,
 basic_CheckBox_RID_TP_CRASH_CB_USEPROXY,602555444,
diff --git a/source/text/sbasic/shared/01/0613.xhp 
b/source/text/sbasic/shared/01/0613.xhp
index 08ead10..e5d354d 100644
--- a/source/text/sbasic/shared/01/0613.xhp
+++ b/source/text/sbasic/shared/01/0613.xhp
@@ -65,18 +65,18 @@
 Libraries tab page
 Lets you 
manage the macro libraries.
 Location
-Select the 
location containing the macro libraries that you want to 
organize.
+Select the 
location containing the macro libraries that you want to 
organize.
 Library
-Lists the macro libraries in 
the chosen location.
+Lists the macro 
libraries in the chosen location.
 Edit
-Opens the 
$[officename] Basic editor so that you can modify the selected 
library.
+Opens the 
$[officename] Basic editor so that you can modify the selected 
library.
 Password
-Assigns 
or edits the password for the selected library. "Standard" libraries 
cannot have a password.
+Assigns or edits 
the password for the selected library. "Standard" libraries 
cannot have a password.
 New
-Creates a 
new library.
+Creates a new 
library.
 Name
 Enter a 
name for the new module, dialog, or library.
 Append
-Locate 
that $[officename] Basic library that you want to add to the current list, and 
then click Open.
+Locate that 
$[officename] Basic library that you want to add to the current list, and then 
click Open.
 
 
diff --git a/source/text/shared/00/0001.xhp 
b/source/text/shared/00/0001.xhp
index 9296255..5d608c3 100644
--- a/source/text/shared/00/0001.xhp
+++ b/source/text/shared/00/0001.xhp
@@ -98,7 +98,7 @@
 
 
 
-
+
 
 Delete
diff --git a/source/text/shared/01/0613.xhp 
b/source/text/shared/01/0613.xhp
index 0af13a5..822ea9f 100644
--- a/source/text/shared/01/0613.xhp
+++ b/source/text/shared/01/0613.xhp
@@ -88,28 +88,28 @@
 
 Libraries tab pagethe three tab pages 
have no Help button, so no need to have three help pages
 Lets you 
manage the macro libraries for the current application and any open 
documents.
-
+
 Location
-Select the 
application or the document containing the macro libraries that you want to 
organize.
-
+Select the 
application or the document containing the macro libraries that you want to 
organize.
+
 Library
-Lists the existing macro 
libraries for the current application and any open 
documents.
-
+Lists the existing 
macro libraries for the current application and any open 
documents.
+
 Edit
-Opens the 
$[officename] Basic editor so that you can modify the selected 
library.
+Opens the 
$[officename] Basic editor so that you ca

[Libreoffice-commits] core.git: 2 commits - basctl/inc basctl/source basctl/uiconfig basctl/UIConfig_basicide.mk helpcontent2

[Caolán McNamara]

 basctl/UIConfig_basicide.mk|1 
 basctl/inc/basidesh.hrc|1 
 basctl/inc/helpid.hrc  |1 
 basctl/source/basicide/moduldl2.cxx|  189 ++-
 basctl/source/basicide/moduldlg.hxx|   18 +-
 basctl/source/basicide/moduldlg.src|   86 
 basctl/uiconfig/basicide/ui/libpage.ui |  223 +
 helpcontent2   |2 
 8 files changed, 329 insertions(+), 192 deletions(-)

New commits:
commit 6fd47306eb393d3c99c552ffc851f4edf245f8c8
Author: Caolán McNamara 
Date:   Mon Jan 6 09:49:34 2014 +

convert lib page to .ui

Change-Id: Idd9e3c1ab1c63baa11f503c20d46f3d13e6f78a3

diff --git a/basctl/UIConfig_basicide.mk b/basctl/UIConfig_basicide.mk
index ad9b522..acdaf02 100644
--- a/basctl/UIConfig_basicide.mk
+++ b/basctl/UIConfig_basicide.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/BasicIDE,\
basctl/uiconfig/basicide/ui/exportdialog \
basctl/uiconfig/basicide/ui/gotolinedialog \
basctl/uiconfig/basicide/ui/importlibdialog \
+   basctl/uiconfig/basicide/ui/libpage \
basctl/uiconfig/basicide/ui/managebreakpoints \
basctl/uiconfig/basicide/ui/newlibdialog \
basctl/uiconfig/basicide/ui/organizedialog \
diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc
index 6fdd05e..14a7ce8 100644
--- a/basctl/inc/basidesh.hrc
+++ b/basctl/inc/basidesh.hrc
@@ -31,7 +31,6 @@
 #define RID_POPUP_BRKPROPS  ( RID_BASICIDE_START + 11 )
 #define RID_POPUP_TABBAR( RID_BASICIDE_START + 12 )
 #define RID_TP_MODULS   ( RID_BASICIDE_START + 37 )
-#define RID_TP_LIBS ( RID_BASICIDE_START + 38 )
 #define RID_TP_DLGS ( RID_BASICIDE_START + 39 )
 #define RID_POPUP_DLGED ( RID_BASICIDE_START + 62 )
 #define RID_PRINTDLG_STRLIST( RID_BASICIDE_START + 78 )
diff --git a/basctl/inc/helpid.hrc b/basctl/inc/helpid.hrc
index 3a48ef3..a23f1a8 100644
--- a/basctl/inc/helpid.hrc
+++ b/basctl/inc/helpid.hrc
@@ -25,7 +25,6 @@
 #define HID_BASICIDE_LIBS 
"BASCTL_HID_BASICIDE_LIBS"
 
 #define HID_BASICIDE_MODULES_TREE 
"BASCTL_HID_BASICIDE_MODULES_TREE"
-#define HID_BASICIDE_LIBS_TREE
"BASCTL_HID_BASICIDE_LIBS_TREE"
 #define HID_BASICIDE_OBJECTCAT
"BASCTL_HID_BASICIDE_OBJECTCAT"
 
 #define HID_BASICIDE_OBJCAT_SHOW  
"BASCTL_HID_BASICIDE_OBJCAT_SHOW"
diff --git a/basctl/source/basicide/moduldl2.cxx 
b/basctl/source/basicide/moduldl2.cxx
index 4edc506..30b3b46 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -482,7 +482,8 @@ IMPL_LINK_NOARG(ExportDialog, OkButtonHandler)
 }
 
 ExportDialog::ExportDialog(Window * pParent)
-: ModalDialog(pParent, "ExportDialog", 
"modules/BasicIDE/ui/exportdialog.ui")
+: ModalDialog(pParent, "ExportDialog",
+"modules/BasicIDE/ui/exportdialog.ui")
 , mbExportAsPackage(false)
 {
 get(m_pExportAsPackageButton, "extension");
@@ -496,43 +497,45 @@ ExportDialog::ExportDialog(Window * pParent)
 //  LibPage
 //
 
-LibPage::LibPage( Window * pParent )
-:TabPage( pParent, IDEResId( RID_TP_LIBS ) )
-,aBasicsText( this, IDEResId( RID_STR_BASICS ) )
-,aBasicsBox( this, IDEResId( RID_LB_BASICS ) )
-,aLibText( this, IDEResId( RID_STR_LIB ) )
-,aLibBox( this, IDEResId( RID_TRLBOX ) )
-,aEditButton( this, IDEResId( RID_PB_EDIT ) )
-,aPasswordButton( this, IDEResId( RID_PB_PASSWORD ) )
-,aNewLibButton( this, IDEResId( RID_PB_NEWLIB ) )
-,aInsertLibButton( this, IDEResId( RID_PB_APPEND ) )
-,aExportButton( this, IDEResId( RID_PB_EXPORT ) )
-,aDelButton( this, IDEResId( RID_PB_DELETE ) )
-,m_aCurDocument( ScriptDocument::getApplicationScriptDocument() )
-,m_eCurLocation( LIBRARY_LOCATION_UNKNOWN )
+LibPage::LibPage(Window * pParent)
+: TabPage(pParent, "LibPage",
+"modules/BasicIDE/ui/libpage.ui")
+, m_aCurDocument(ScriptDocument::getApplicationScriptDocument())
+, m_eCurLocation(LIBRARY_LOCATION_UNKNOWN)
 {
-FreeResource();
+get(m_pBasicsBox, "location");
+get(m_pLibBox, "library");
+Size aSize(m_pLibBox->LogicToPixel(Size(130, 87), MAP_APPFONT));
+m_pLibBox->set_height_request(aSize.Height());
+m_pLibBox->set_width_request(aSize.Width());
+get(m_pEditButton, "edit");
+get(m_pPasswordButton, "password");
+get(m_pNewLibButton, "new");
+get(m_pInsertLibButton, "import");
+get(m_pExportButton, "export");
+get(m_pDelButton, "delete");
+
 pTabDlg = 0;
 
-aEditButton.SetClickHdl( LINK( this, LibPage, ButtonHdl ) );
-aNewLibButton.SetClickHdl( LINK( this, LibPage, ButtonHdl ) );
-aPasswordButton.SetClick

[Bug 60698] kill pointless one-file library ...

[bugzilla-daemon]

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

--- Comment #24 from Stephan Bergmann  ---
(In reply to comment #23)
> And about xmlreader library?
> 
> It just have 3 files... where we can put this?

xmlreader is used by both the URE and LO layers, but is not part of the URE
stable interface, so there is no obvious other library to merge it into.

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

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

[sushil_shinde]

 oox/source/drawingml/shape.cxx |6 ++
 oox/source/export/drawingml.cxx|2 
 sw/qa/extras/ooxmlexport/data/textbox_picturefill.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx   |7 ++
 sw/source/filter/ww8/docxattributeoutput.cxx   |   41 -
 5 files changed, 45 insertions(+), 11 deletions(-)

New commits:
commit 854d7a1cc77b82ef6b5d72a7889743c1ebe6fe6e
Author: sushil_shinde 
Date:   Thu Jan 2 16:31:26 2014 +0530

fdo#73217  : Textbox with picture fill are rendered and saved properly.

   - Bitmap url was not stored propertly for textframes.
   - Exported background image fill for text box properly.
   - Added unit test.

Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/7259

Change-Id: I1fbab24b2a83b22be04fd6950c80ddf274436738

diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index b42e27e..b191762 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -633,6 +633,12 @@ Reference< XShape > Shape::createAndInsert(
 aShapeProps.setProperty(PROP_BackColorTransparency, 
aShapeProps[PROP_FillTransparence]);
 aShapeProps.erase(PROP_FillTransparence);
 }
+// TextFrames have BackGrahicURL, not FillBitmapURL
+if (aShapeProps.hasProperty(PROP_FillBitmapURL))
+{
+aShapeProps.setProperty(PROP_BackGraphicURL, 
aShapeProps[PROP_FillBitmapURL]);
+aShapeProps.erase(PROP_FillBitmapURL);
+}
 // And no LineColor property; individual borders can have 
colors
 if (aShapeProps.hasProperty(PROP_LineColor))
 {
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 030beb5..b533d747 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -608,7 +608,7 @@ void DrawingML::WriteBlipFill( Reference< XPropertySet > 
rXPropSet, OUString sUR
 
 WriteBlip( rXPropSet, aURL );
 
-if( sURLPropName == "FillBitmapURL" )
+if( sURLPropName == "FillBitmapURL" || sURLPropName == 
"BackGraphicURL")
 WriteBlipMode( rXPropSet );
 else if( GetProperty( rXPropSet, "FillBitmapStretch" ) ) {
 bool bStretch = false;
diff --git a/sw/qa/extras/ooxmlexport/data/textbox_picturefill.docx 
b/sw/qa/extras/ooxmlexport/data/textbox_picturefill.docx
new file mode 100644
index 000..f4fab1b
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/textbox_picturefill.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 126516f..dc8726c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2253,6 +2253,13 @@ DECLARE_OOXMLEXPORT_TEST(testFdo69649, "fdo69649.docx")
 CPPUNIT_ASSERT(contents.match("15"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTextBoxPictureFill, "textbox_picturefill.docx")
+{
+uno::Reference xFrame(getShape(1), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_BITMAP, 
getProperty(xFrame, "FillStyle"));
+
CPPUNIT_ASSERT(!(getProperty(xFrame,"BackGraphicURL")).isEmpty());
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index d1d617e..0aa7e36 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -5716,16 +5716,29 @@ void DocxAttributeOutput::FormatBackground( const 
SvxBrushItem& rBrush )
 }
 else if (m_bDMLTextFrameSyntax)
 {
-m_pSerializer->startElementNS(XML_a, XML_solidFill, FSEND);
-m_pSerializer->startElementNS(XML_a, XML_srgbClr,
-  XML_val, sColor,
-  FSEND);
-if (oAlpha)
-m_pSerializer->singleElementNS(XML_a, XML_alpha,
-   XML_val, OString::number(*oAlpha),
-   FSEND);
-m_pSerializer->endElementNS(XML_a, XML_srgbClr);
-m_pSerializer->endElementNS(XML_a, XML_solidFill);
+bool bImageBackground = false;
+const SfxPoolItem* pItem = GetExport().HasItem(RES_FILL_STYLE);
+if (pItem)
+{
+const XFillStyleItem* pFillStyle = static_cast(pItem);
+if(pFillStyle->GetValue() == XFILL_BITMAP)
+{
+bImageBackground = true;
+}
+}
+if (!bImageBackground)
+{
+m_pSerializer->startElementNS(XML_a, XML_solidFill, FSEND);
+m_pSerializer->startElementNS(XML_a, XML_srgbClr,
+  XML_val, sColor,
+   

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

[Chris Sherlock]

 vcl/source/filter/wmf/enhwmf.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit ddaceeaf227f5e0f2dbc6016ac20632421758adc
Author: Chris Sherlock 
Date:   Mon Jan 6 20:58:56 2014 +1100

Move default: to end of switch

This helps prevent silly people like myself from asking about it on
IRC. Basically it is a coding convention, I've moved the default to
the end of the switch block.

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

diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index 3ad4481..4af22a9 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -748,9 +748,9 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
 bTransparent = sal_True;
 aLineInfo.SetStyle( LINE_NONE );
 break;
-default :
 case PS_INSIDEFRAME :
 case PS_SOLID :
+default :
 aLineInfo.SetStyle( LINE_SOLID );
 }
 if ( nDashCount | nDotCount )
@@ -802,9 +802,9 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
 aLineInfo.SetStyle( LINE_NONE );
 break;
 
-default :
 case PS_INSIDEFRAME :
 case PS_SOLID :
+default :
 aLineInfo.SetStyle( LINE_SOLID );
 }
 if ( nDashCount | nDotCount )
@@ -1378,7 +1378,6 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
 }
 break;
 
-default :   SAL_INFO("vcl.emf", 
"Unknown Meta Action"); break;
 case EMR_MASKBLT :  SAL_INFO("vcl.emf", "not 
implemented '" << "MaskBlt" << "'");   break;
 case EMR_PLGBLT :   SAL_INFO("vcl.emf", "not 
implemented '" << "PlgBlt" << "'");break;
 case EMR_SETDIBITSTODEVICE :SAL_INFO("vcl.emf", "not 
implemented '" << "SetDIBitsToDevice" << "'"); break;
@@ -1433,6 +1432,8 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
 case EMR_GDICOMMENT :
 case EMR_HEADER :   // has already been read at 
ReadHeader()
 break;
+
+default :   SAL_INFO("vcl.emf", 
"Unknown Meta Action"); break;
 }
 }
 pWMF->Seek( nNextPos );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomofumi Yagi]

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

New commits:
commit 91bbb55f2877aada6f4bee966185287eeb3aaadd
Author: Tomofumi Yagi 
Date:   Sat Jan 4 17:01:55 2014 +0900

$MSM_PATH($msmdir) needs a path separator at the end of the line.

A error occurs in Visual Studio Express and Windows 7/8/8.1 environment,
 if a path separator at the end of the line is missing.
The registry entry for Merge Module directory has a path separator as 
suffix.

Change-Id: Ic1c51716631980e89f5bfa11a1d76b45c35e920e
Reviewed-on: https://gerrit.libreoffice.org/7272
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/configure.ac b/configure.ac
index 9a764f5..2047a6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5199,8 +5199,8 @@ find_msms()
 fi
 done
 if test -z "$msmdir"; then
-AC_MSG_NOTICE([no registry entry for Merge Module directory - trying 
"$COMMONPROGRAMFILES\Merge Modules"])
-msmdir="$COMMONPROGRAMFILES\Merge Modules"
+AC_MSG_NOTICE([no registry entry for Merge Module directory - trying 
"${COMMONPROGRAMFILES}/Merge Modules/"])
+msmdir="${COMMONPROGRAMFILES}/Merge Modules/"
 fi
 msmdir=`cygpath -m "$msmdir"`
 if test -z "$msmdir"; then
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 15/e6a8263ae6181ac4912b94af8cb63adc34a86d 54/78c54be2de808663565e53250c8a4055b390c9

[Caolán McNamara]

 15/e6a8263ae6181ac4912b94af8cb63adc34a86d |1 +
 54/78c54be2de808663565e53250c8a4055b390c9 |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 4bda1914b82d95b108cee082168d2dcf84ad5f7c
Author: Caolán McNamara 
Date:   Mon Jan 6 10:47:02 2014 +

Notes added by 'git notes add'

diff --git a/15/e6a8263ae6181ac4912b94af8cb63adc34a86d 
b/15/e6a8263ae6181ac4912b94af8cb63adc34a86d
new file mode 100644
index 000..e2e5c55
--- /dev/null
+++ b/15/e6a8263ae6181ac4912b94af8cb63adc34a86d
@@ -0,0 +1 @@
+merged as: 296cd762c9730ead75767cf7bbc5f5845f18168b
commit 49f3172eebbccc907085d0ea5efc29cb046f8455
Author: Caolán McNamara 
Date:   Mon Jan 6 10:46:50 2014 +

Notes added by 'git notes add'

diff --git a/54/78c54be2de808663565e53250c8a4055b390c9 
b/54/78c54be2de808663565e53250c8a4055b390c9
new file mode 100644
index 000..e2e5c55
--- /dev/null
+++ b/54/78c54be2de808663565e53250c8a4055b390c9
@@ -0,0 +1 @@
+merged as: 296cd762c9730ead75767cf7bbc5f5845f18168b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Steve Yin]

 sc/source/ui/Accessibility/AccessibleDocument.cxx|9 ++---
 sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx |2 +-
 sc/source/ui/inc/tabvwsh.hxx |8 ++--
 sc/source/ui/view/cellsh4.cxx|6 ++
 sc/source/ui/view/tabview3.cxx   |4 
 sc/source/ui/view/tabvwsh4.cxx   |1 +
 6 files changed, 24 insertions(+), 6 deletions(-)

New commits:
commit 296cd762c9730ead75767cf7bbc5f5845f18168b
Author: Steve Yin 
Date:   Mon Jan 6 07:40:48 2014 +

Resolves: #i123629# [ia2] Invalid focus event fired after editing cell

Some Coverity issues fixes
(cherry picked from commit 5478c54be2de808663565e53250c8a4055b390c9)

Conflicts:
sc/source/ui/inc/AccessibleCell.hxx
sc/source/ui/inc/tabvwsh.hxx
sc/source/ui/view/cellsh4.cxx
sc/source/ui/view/tabvwsh4.cxx

Rolled back some coverity issue fixes for mac build

(cherry picked from commit 15e6a8263ae6181ac4912b94af8cb63adc34a86d)

Conflicts:
sc/source/ui/inc/AccessibleCell.hxx

a727d3c7f819c8d0082a9fb017351d5307877fa6

Change-Id: I03b63c655bd55e5fb92d95490eaa4bb081b8ee7d

diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx 
b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 8e0f3a4..47a5177 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -1029,10 +1029,13 @@ sal_Bool 
ScChildrenShapes::FindSelectedShapesChanges(const uno::Reference(mpViewShell->GetWindowByPos(meSplitPos));
-if (pWin)
+if (mpViewShell)
 {
-bWinFocus = pWin->HasFocus();
+ScGridWindow* pWin = 
static_cast(mpViewShell->GetWindowByPos(meSplitPos));
+if (pWin)
+{
+bWinFocus = pWin->HasFocus();
+}
 }
 const SdrMarkList* pMarkList = NULL;
 SdrObject* pMarkedObj = NULL;
diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx 
b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
index 5fa5740..9179488 100644
--- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
+++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
@@ -455,7 +455,7 @@ void ScAccessibleSpreadsheet::Notify( SfxBroadcaster& rBC, 
const SfxHint& rHint
 pAccDoc->CommitChange(aEvent);
 }
 }
-sal_Bool bNewPosCell = (aNewCell != maActiveCell);
+sal_Bool bNewPosCell = (aNewCell != maActiveCell) || 
mpViewShell->GetForceFocusOnCurCell(); // #i123629#
 sal_Bool bNewPosCellFocus=sal_False;
 if ( bNewPosCell && IsFocused() && aNewCell.Tab() == 
maActiveCell.Tab() )
 {//single Focus
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index a6d4f0e..083befe 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -165,7 +165,9 @@ private:
 
 SbxObject*  pScSbxObject;
 
-sal_BoolbChartAreaValid;// if chart is 
drawn
+sal_BoolbChartAreaValid; // if chart is drawn
+sal_BoolbForceFocusOnCurCell; // #i123629#
+
 OUStringaEditChartName;
 ScRangeListRef  aChartSource;
 Rectangle   aChartPos;
@@ -182,7 +184,6 @@ private:
 boolmbInSwitch;
 OUString   maName;
 OUString   maScope;
-
 private:
 voidConstruct( sal_uInt8 nForceDesignMode = SC_FORCEMODE_NONE );
 
@@ -418,6 +419,9 @@ public:
 
 // ugly hack to call Define Names from Manage Names
 voidSwitchBetweenRefDialogs(SfxModelessDialog* pDialog);
+// #i123629#
+sal_BoolGetForceFocusOnCurCell() const { return bForceFocusOnCurCell; }
+void SetForceFocusOnCurCell(sal_Bool bFlag) { bForceFocusOnCurCell=bFlag; }
 };
 
 //==
diff --git a/sc/source/ui/view/cellsh4.cxx b/sc/source/ui/view/cellsh4.cxx
index 945909c..ffeaad0 100644
--- a/sc/source/ui/view/cellsh4.cxx
+++ b/sc/source/ui/view/cellsh4.cxx
@@ -119,6 +119,12 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq )
 // once extra, so that the cursor will not be painted too often with 
ExecuteInputDirect:
 pTabViewShell->HideAllCursors();
 
+// #i123629#
+if( pTabViewShell->GetCurObjectSelectionType() == OST_Editing )
+pTabViewShell->SetForceFocusOnCurCell(sal_True);
+else
+pTabViewShell->SetForceFocusOnCurCell(sal_False);
+
 //OS: once for all should do, however!
 pTabViewShell->ExecuteInputDirect();
 switch ( nSlotId )
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index cedb9ba..57dfa8c 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -992,6 +992,10 @@ void ScTabView::MoveCursorAbs( SCsCOL nCurX, SCsROW nCurY, 
ScFollow

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

[Zolnai Tamás]

 sfx2/uiconfig/ui/startcenter.ui |   12 
 1 file changed, 12 insertions(+)

New commits:
commit 28b8f43d071fb62fe4205648daa33f80c1b4b4a8
Author: Zolnai Tamás 
Date:   Mon Jan 6 12:24:33 2014 +0100

Startcenter: add icons for 'Open Files' and 'Templates'

Change-Id: Ic9e584f63e374e977ce18115173d18083d2e44a3

diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui
index 7f60948..831e1bf 100644
--- a/sfx2/uiconfig/ui/startcenter.ui
+++ b/sfx2/uiconfig/ui/startcenter.ui
@@ -38,6 +38,7 @@
 6
 6
 6
+open_all_image
 none
 True
 0
@@ -56,6 +57,7 @@
 True
 6
 6
+templates_all_image
 none
 True
 0
@@ -365,6 +367,16 @@
   
 
   
+  
+True
+False
+framework/res/folder_32.png
+  
+  
+True
+False
+framework/res/templates_32.png
+  
   
 True
 False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sfx2/uiconfig

[Zolnai Tamás]

 sfx2/uiconfig/ui/startcenter.ui |   12 
 1 file changed, 12 insertions(+)

New commits:
commit 9c2794e07883c4c5ce1a3c2c6ef167e0b1b1e88a
Author: Zolnai Tamás 
Date:   Mon Jan 6 12:24:33 2014 +0100

Startcenter: add icons for 'Open Files' and 'Templates'

Change-Id: Ic9e584f63e374e977ce18115173d18083d2e44a3
(cherry picked from commit 28b8f43d071fb62fe4205648daa33f80c1b4b4a8)

diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui
index 7f60948..831e1bf 100644
--- a/sfx2/uiconfig/ui/startcenter.ui
+++ b/sfx2/uiconfig/ui/startcenter.ui
@@ -38,6 +38,7 @@
 6
 6
 6
+open_all_image
 none
 True
 0
@@ -56,6 +57,7 @@
 True
 6
 6
+templates_all_image
 none
 True
 0
@@ -365,6 +367,16 @@
   
 
   
+  
+True
+False
+framework/res/folder_32.png
+  
+  
+True
+False
+framework/res/templates_32.png
+  
   
 True
 False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/source

[Markus Mohrhard]

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

New commits:
commit a487e676ef96d1e6e2efa8680385720667790a60
Author: Markus Mohrhard 
Date:   Sat Dec 28 08:13:12 2013 +0100

only write new element and attributes in ODF 1.2 extended

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

diff --git a/sc/source/filter/xml/xmlexprt.cxx 
b/sc/source/filter/xml/xmlexprt.cxx
index 0fbc692..4f97260 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -2709,7 +2709,7 @@ void ScXMLExport::WriteTable(sal_Int32 nTable, const 
ReferenceisProtected())
+if (pProtect && pProtect->isProtected() && getDefaultVersion() > 
SvtSaveOptions::ODFVER_012)
 {
 if (pProtect->isOptionEnabled(ScTableProtection::SELECT_LOCKED_CELLS))
 AddAttribute(XML_NAMESPACE_TABLE, XML_SELECT_PROTECTED_CELLS, 
XML_TRUE);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 sw/uiconfig/swriter/ui/flddbpage.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b7f339e37e68bc344572b239a4b4ca44483eff8f
Author: Andras Timar 
Date:   Mon Jan 6 12:55:19 2014 +0100

fix copy&paste error on UI

Change-Id: Id45ef565883069705bd7dddf5f5ec1c05f4f9b63

diff --git a/sw/uiconfig/swriter/ui/flddbpage.ui 
b/sw/uiconfig/swriter/ui/flddbpage.ui
index 9870c19..026ae9c 100644
--- a/sw/uiconfig/swriter/ui/flddbpage.ui
+++ b/sw/uiconfig/swriter/ui/flddbpage.ui
@@ -386,7 +386,7 @@
 True
 False
 0
-Database 
s_election
+Format
 True
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/source

[Markus Mohrhard]

 sc/source/filter/xml/xmlimprt.cxx |3 +++
 sc/source/filter/xml/xmlimprt.hxx |5 -
 sc/source/filter/xml/xmltabi.cxx  |3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 3d7011c3c2b47aca273d7e8a26bdaeaf982d8702
Author: Markus Mohrhard 
Date:   Sat Dec 28 12:44:02 2013 +0100

read elements/attribs written to extension namespace

Related to validation errors with fdo#31296

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

diff --git a/sc/source/filter/xml/xmlimprt.cxx 
b/sc/source/filter/xml/xmlimprt.cxx
index 28c3ace..3378541 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -828,6 +828,7 @@ const SvXMLTokenMap& ScXMLImport::GetTableElemTokenMap()
 { XML_NAMESPACE_TABLE,  XML_TABLE_COLUMNS,
XML_TOK_TABLE_COLS},
 { XML_NAMESPACE_TABLE,  XML_TABLE_COLUMN, 
XML_TOK_TABLE_COL },
 { XML_NAMESPACE_TABLE,  XML_TABLE_PROTECTION, 
XML_TOK_TABLE_PROTECTION},
+{ XML_NAMESPACE_OFFICE_EXT, XML_TABLE_PROTECTION, 
XML_TOK_TABLE_PROTECTION_EXT  },
 { XML_NAMESPACE_TABLE,  XML_TABLE_ROW_GROUP,  
XML_TOK_TABLE_ROW_GROUP   },
 { XML_NAMESPACE_TABLE,  XML_TABLE_HEADER_ROWS,
XML_TOK_TABLE_HEADER_ROWS },
 { XML_NAMESPACE_TABLE,  XML_TABLE_ROWS,   
XML_TOK_TABLE_ROWS},
@@ -856,6 +857,8 @@ const SvXMLTokenMap& 
ScXMLImport::GetTableProtectionAttrTokenMap()
 {
 { XML_NAMESPACE_TABLE, XML_SELECT_PROTECTED_CELLS,  
XML_TOK_TABLE_SELECT_PROTECTED_CELLS},
 { XML_NAMESPACE_TABLE, XML_SELECT_UNPROTECTED_CELLS,
XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS  },
+{ XML_NAMESPACE_OFFICE_EXT, XML_SELECT_PROTECTED_CELLS, 
XML_TOK_TABLE_SELECT_PROTECTED_CELLS_EXT},
+{ XML_NAMESPACE_OFFICE_EXT, XML_SELECT_UNPROTECTED_CELLS, 
XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS_EXT  },
 XML_TOKEN_MAP_END
 };
 pTableProtectionElemTokenMap = new 
SvXMLTokenMap(aTableProtectionTokenMap);
diff --git a/sc/source/filter/xml/xmlimprt.hxx 
b/sc/source/filter/xml/xmlimprt.hxx
index 0957a9f..3fb584a 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -240,6 +240,7 @@ enum ScXMLTableTokens
 XML_TOK_TABLE_ROW_GROUP,
 XML_TOK_TABLE_HEADER_ROWS,
 XML_TOK_TABLE_PROTECTION,
+XML_TOK_TABLE_PROTECTION_EXT,
 XML_TOK_TABLE_ROWS,
 XML_TOK_TABLE_ROW,
 XML_TOK_TABLE_SOURCE,
@@ -254,7 +255,9 @@ enum ScXMLTableTokens
 enum ScXMLTokenProtectionTokens
 {
 XML_TOK_TABLE_SELECT_PROTECTED_CELLS,
-XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS
+XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS,
+XML_TOK_TABLE_SELECT_PROTECTED_CELLS_EXT,
+XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS_EXT
 };
 
 enum ScXMLTableRowsTokens
diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx
index a1bc801..f15a602 100644
--- a/sc/source/filter/xml/xmltabi.cxx
+++ b/sc/source/filter/xml/xmltabi.cxx
@@ -286,6 +286,7 @@ SvXMLImportContext *ScXMLTableContext::CreateChildContext( 
sal_uInt16 nPrefix,
   rLName, xAttrList );
 break;
 case XML_TOK_TABLE_PROTECTION:
+case XML_TOK_TABLE_PROTECTION_EXT:
 pContext = new ScXMLTableProtectionContext( GetScImport(), nPrefix, 
rLName, xAttrList );
 break;
 case XML_TOK_TABLE_ROW_GROUP:
@@ -454,9 +455,11 @@ ScXMLTableProtectionContext::ScXMLTableProtectionContext(
 switch (rAttrTokenMap.Get(nLocalPrefix, aLocalName))
 {
 case XML_TOK_TABLE_SELECT_PROTECTED_CELLS:
+case XML_TOK_TABLE_SELECT_PROTECTED_CELLS_EXT:
 bSelectProtectedCells = IsXMLToken(aValue, XML_TRUE);
 break;
 case XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS:
+case XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS_EXT:
 bSelectUnprotectedCells = IsXMLToken(aValue, XML_TRUE);
 break;
 default:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 sw/uiconfig/swriter/ui/flddbpage.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3a860d3e03e523777942a5c824d8cb6013d4098f
Author: Andras Timar 
Date:   Mon Jan 6 12:55:19 2014 +0100

fix copy&paste error on UI

Change-Id: Id45ef565883069705bd7dddf5f5ec1c05f4f9b63

diff --git a/sw/uiconfig/swriter/ui/flddbpage.ui 
b/sw/uiconfig/swriter/ui/flddbpage.ui
index 9870c19..026ae9c 100644
--- a/sw/uiconfig/swriter/ui/flddbpage.ui
+++ b/sw/uiconfig/swriter/ui/flddbpage.ui
@@ -386,7 +386,7 @@
 True
 False
 0
-Database 
s_election
+Format
 True
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst  |   11 ---
 source/text/sbasic/shared/01/0613.xhp |   10 +-
 source/text/shared/00/0001.xhp|4 ++--
 source/text/shared/01/0613.xhp|   23 ---
 4 files changed, 19 insertions(+), 29 deletions(-)

New commits:
commit e6b3e8a539ae36e71087ae8c26812be103492c8c
Author: Caolán McNamara 
Date:   Mon Jan 6 11:43:25 2014 +

update help ids for macro and dialog tabpage .ui conversion

Change-Id: If959d52daf88c6d205cddb691b2426e33c741b88

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 26ccd1b..58799af 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -814,7 +814,6 @@ HID_BASICIDE_DIALOGWINDOW,63562,
 HID_BASICIDE_EDITORWINDOW,63563,
 HID_BASICIDE_LIBS,63545,
 HID_BASICIDE_MANAGE_LANGUAGE,63571,
-HID_BASICIDE_MODULES_TREE,63547,
 HID_BASICIDE_MODULWINDOW,63561,
 HID_BASICIDE_OBJCAT_SHOW,63553,
 HID_BASICIDE_OBJECTCAT,63550,
@@ -5456,16 +5455,6 @@ 
basctl_PushButton_RID_MACROCHOOSER_RID_PB_NEWLIB,1317868051,
 basctl_PushButton_RID_MACROCHOOSER_RID_PB_NEWMOD,1317868052,
 basctl_PushButton_RID_MACROCHOOSER_RID_PB_ORG,1317868043,
 basctl_PushButton_RID_MACROCHOOSER_RID_PB_RUN,1317868040,
-basctl_PushButton_RID_TP_DLGS_RID_PB_DELETE,780816904,
-basctl_PushButton_RID_TP_DLGS_RID_PB_EDIT,780816900,
-basctl_PushButton_RID_TP_DLGS_RID_PB_NEWDLG,780816903,
-basctl_PushButton_RID_TP_DLGS_RID_PB_NEWMOD,780816902,
-basctl_PushButton_RID_TP_MODULS_RID_PB_DELETE,780784136,
-basctl_PushButton_RID_TP_MODULS_RID_PB_EDIT,780784132,
-basctl_PushButton_RID_TP_MODULS_RID_PB_NEWDLG,780784135,
-basctl_PushButton_RID_TP_MODULS_RID_PB_NEWMOD,780784134,
-basctl_TabPage_RID_TP_DLGS,780812288,
-basctl_TabPage_RID_TP_MODULS,780779520,
 basic_CheckBox_RID_TP_CRASH_CB_ALLOWCONTACT,602555449,
 basic_CheckBox_RID_TP_CRASH_CB_USEPROXY,602555444,
 basic_CheckBox_RID_TP_PROFILE_CB_AUTORELOAD,602539063,
diff --git a/source/text/sbasic/shared/01/0613.xhp 
b/source/text/sbasic/shared/01/0613.xhp
index e5d354d..113ca19 100644
--- a/source/text/sbasic/shared/01/0613.xhp
+++ b/source/text/sbasic/shared/01/0613.xhp
@@ -54,16 +54,16 @@
 Organizer
 Opens 
the Macro Organizer dialog, where you can add, edit, or delete 
existing macro modules, dialogs, and libraries.
 Module/Dialog
-Lists the existing macros 
and dialogs.
+Lists the 
existing macros and dialogs.
 You can drag-and-drop a module or a dialog between 
libraries.
 To copy a dialog or a module, hold down the CommandCtrl
 key while you drag-and-drop.
 Edit
-Opens the 
selected macro or dialog for editing.
+Opens the selected 
macro or dialog for editing.
 New
-Creates 
a new module.
-Creates 
a new dialog.
+Creates a new 
module.
+Creates a new 
dialog.
 Libraries tab page
-Lets you 
manage the macro libraries.
+Lets you 
manage the macro libraries.
 Location
 Select the 
location containing the macro libraries that you want to 
organize.
 Library
diff --git a/source/text/shared/00/0001.xhp 
b/source/text/shared/00/0001.xhp
index 5d608c3..15a4f38 100644
--- a/source/text/shared/00/0001.xhp
+++ b/source/text/shared/00/0001.xhp
@@ -96,8 +96,8 @@
 
 
 
-
-
+
+
 
 
 Assign
 Opens the 
Customize 
dialog, where you can assign the selected macro to a menu command, a toolbar, 
or an event.
 
-
+
 Edit
 Starts the 
$[officename] Basic editor and opens the selected macro or dialog for 
editing.
 
@@ -71,23 +71,24 @@
 Opens 
the Macro Organizer dialog, where you can add, edit, or delete 
existing macro modules, dialogs, and libraries.
 Module/Dialog tab page
 Lets you 
manage modules or dialog boxes.
-
+
+
 Module/Dialog
-Lists the existing macros 
and dialogs.
-
+Lists the 
existing macros and dialogs.
+
+
 Edit
-Opens the 
selected macro or dialog for editing.
+Opens the selected 
macro or dialog for editing.
 
-
+
 NewUFI: i40875
-Opens 
the editor and creates a new module.
-
-
+Opens the 
editor and creates a new module.
+
 New
-Opens 
the editor and creates a new dialog.
+Opens the 
editor and creates a new dialog.
 
 Libraries tab pagethe three tab pages 
have no Help button, so no need to have three help pages
-Lets you 
manage the macro libraries for the current application and any open 
documents.
+Lets you 
manage the macro libraries for the current application and any open 
documents.
 
 Location
 Select the 
application or the document containing the macro libraries that you want to 
organize.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - basctl/inc basctl/source basctl/uiconfig basctl/UIConfig_basicide.mk extras/source

[Caolán McNamara]

 basctl/UIConfig_basicide.mk|2 
 basctl/inc/basidesh.hrc|2 
 basctl/inc/helpid.hrc  |1 
 basctl/source/basicide/moduldl2.cxx|   12 -
 basctl/source/basicide/moduldlg.cxx|  166 +++-
 basctl/source/basicide/moduldlg.hrc|   58 ---
 basctl/source/basicide/moduldlg.hxx|   17 --
 basctl/source/basicide/moduldlg.src|  110 -
 basctl/uiconfig/basicide/ui/dialogpage.ui  |  206 +
 basctl/uiconfig/basicide/ui/modulepage.ui  |  206 +
 extras/source/glade/libreoffice-catalog.xml.in |3 
 11 files changed, 517 insertions(+), 266 deletions(-)

New commits:
commit ea89ba42e2d09b074043b70f2d38b9f5b4684261
Author: Caolán McNamara 
Date:   Mon Jan 6 11:22:44 2014 +

convert module and dialog tabpages to .ui

Change-Id: I2954a734b44be22d4d7ffae17480dde1c0ac64e7

diff --git a/basctl/UIConfig_basicide.mk b/basctl/UIConfig_basicide.mk
index acdaf02..ca9e9b5 100644
--- a/basctl/UIConfig_basicide.mk
+++ b/basctl/UIConfig_basicide.mk
@@ -31,11 +31,13 @@ $(eval $(call 
gb_UIConfig_add_toolbarfiles,modules/BasicIDE,\
 $(eval $(call gb_UIConfig_add_uifiles,modules/BasicIDE,\
basctl/uiconfig/basicide/ui/basicmacrodialog \
basctl/uiconfig/basicide/ui/defaultlanguage \
+   basctl/uiconfig/basicide/ui/dialogpage \
basctl/uiconfig/basicide/ui/exportdialog \
basctl/uiconfig/basicide/ui/gotolinedialog \
basctl/uiconfig/basicide/ui/importlibdialog \
basctl/uiconfig/basicide/ui/libpage \
basctl/uiconfig/basicide/ui/managebreakpoints \
+   basctl/uiconfig/basicide/ui/modulepage \
basctl/uiconfig/basicide/ui/newlibdialog \
basctl/uiconfig/basicide/ui/organizedialog \
 ))
diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc
index 14a7ce8..4fee05a 100644
--- a/basctl/inc/basidesh.hrc
+++ b/basctl/inc/basidesh.hrc
@@ -30,8 +30,6 @@
 #define RID_POPUP_BRKDLG( RID_BASICIDE_START + 10 )
 #define RID_POPUP_BRKPROPS  ( RID_BASICIDE_START + 11 )
 #define RID_POPUP_TABBAR( RID_BASICIDE_START + 12 )
-#define RID_TP_MODULS   ( RID_BASICIDE_START + 37 )
-#define RID_TP_DLGS ( RID_BASICIDE_START + 39 )
 #define RID_POPUP_DLGED ( RID_BASICIDE_START + 62 )
 #define RID_PRINTDLG_STRLIST( RID_BASICIDE_START + 78 )
 
diff --git a/basctl/inc/helpid.hrc b/basctl/inc/helpid.hrc
index a23f1a8..433a167 100644
--- a/basctl/inc/helpid.hrc
+++ b/basctl/inc/helpid.hrc
@@ -24,7 +24,6 @@
 #define HID_BASICIDE_MACROS   
"BASCTL_HID_BASICIDE_MACROS"
 #define HID_BASICIDE_LIBS 
"BASCTL_HID_BASICIDE_LIBS"
 
-#define HID_BASICIDE_MODULES_TREE 
"BASCTL_HID_BASICIDE_MODULES_TREE"
 #define HID_BASICIDE_OBJECTCAT
"BASCTL_HID_BASICIDE_OBJECTCAT"
 
 #define HID_BASICIDE_OBJCAT_SHOW  
"BASCTL_HID_BASICIDE_OBJCAT_SHOW"
diff --git a/basctl/source/basicide/moduldl2.cxx 
b/basctl/source/basicide/moduldl2.cxx
index 451cd43..a27cf45 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -20,7 +20,6 @@
 #include 
 #include 
 
-#include 
 #include 
 #include 
 #include 
diff --git a/basctl/source/basicide/moduldlg.cxx 
b/basctl/source/basicide/moduldlg.cxx
index 48bf93e..0d27f1b 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -19,7 +19,6 @@
 
 #include "baside2.hrc"
 #include "basidesh.hrc"
-#include "moduldlg.hrc"
 
 #include "moduldlg.hxx"
 #include "localizationmgr.hxx"
@@ -53,9 +52,24 @@ using namespace ::com::sun::star::resource;
 // ==
 //
 
-ExtTreeListBox::ExtTreeListBox (Window* pParent, ResId const& rRes) :
-TreeListBox( pParent, rRes )
-{ }
+ExtTreeListBox::ExtTreeListBox(Window* pParent, ResId const& rRes)
+: TreeListBox(pParent, rRes)
+{
+}
+
+ExtTreeListBox::ExtTreeListBox(Window* pParent, WinBits nStyle)
+: TreeListBox(pParent, nStyle)
+{
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeExtTreeListBox(Window 
*pParent, VclBuilder::stringmap &rMap)
+{
+WinBits nWinBits = WB_TABSTOP;
+OString sBorder = VclBuilder::extractCustomProperty(rMap);
+if (!sBorder.isEmpty())
+   nWinBits |= WB_BORDER;
+return new ExtTreeListBox(pParent, nWinBits);
+}
 
 ExtTreeListBox::~ExtTreeListBox ()
 { }
@@ -514,14 +528,14 @@ IMPL_LINK( OrganizeDialog, ActivatePageHdl, TabControl *, 
pTabCtrl )
 TabPage* pNewTabPage = 0;
 if (sPageName == "modules")
 {
-ObjectPage* pObjectPage = new ObjectPage(pTabCtrl, 
IDEResId(RID_TP_MODULS), BROWSEMODE_MODULES);
+ObjectPage* pObjectPage = new ObjectPage(pTabCtrl, "ModulePage", 
BROWSEMODE_MODULES);

[Libreoffice-commits] core.git: helpcontent2

[Caolán McNamara]

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

New commits:
commit cc88b3a3064149f9894b303d2609efe1e368de7f
Author: Caolán McNamara 
Date:   Mon Jan 6 11:43:25 2014 +

Updated core
Project: help  e6b3e8a539ae36e71087ae8c26812be103492c8c

diff --git a/helpcontent2 b/helpcontent2
index 30a5276..e6b3e8a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 30a52763d36fe64b9d6c170032404b69f823b5c9
+Subproject commit e6b3e8a539ae36e71087ae8c26812be103492c8c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Herbert Dürr]

 dbaccess/source/filter/xml/makefile.mk |1 +
 dbaccess/source/filter/xml/xmlservices.cxx |   11 +++
 2 files changed, 4 insertions(+), 8 deletions(-)

New commits:
commit 631b6b53afe97f22405f5239e7d13422622f980b
Author: Herbert Dürr 
Date:   Mon Jan 6 11:40:46 2014 +

#i123964# fix symbol visibility mismatch in dbaccess filter/xml

diff --git a/dbaccess/source/filter/xml/makefile.mk 
b/dbaccess/source/filter/xml/makefile.mk
index 2563211..a28cfd5 100644
--- a/dbaccess/source/filter/xml/makefile.mk
+++ b/dbaccess/source/filter/xml/makefile.mk
@@ -31,6 +31,7 @@ ENABLE_EXCEPTIONS=TRUE
 # --- Settings --
 
 .INCLUDE : settings.mk
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
 
 # --- Files -
 
diff --git a/dbaccess/source/filter/xml/xmlservices.cxx 
b/dbaccess/source/filter/xml/xmlservices.cxx
index 9edd503..8165fb4 100644
--- a/dbaccess/source/filter/xml/xmlservices.cxx
+++ b/dbaccess/source/filter/xml/xmlservices.cxx
@@ -24,15 +24,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_dbaccess.hxx"
 
-#ifndef _CPPUHELPER_FACTORY_HXX_
 #include 
-#endif
-#ifndef _OSL_DIAGNOSE_H_
 #include 
-#endif
-#ifndef _FLT_REGHELPER_HXX_
 #include "flt_reghelper.hxx"
-#endif
+#include "dbaccessdllapi.h"
 
 
//
 
@@ -70,7 +65,7 @@ extern "C" void SAL_CALL createRegistryInfo_dbaxml()
 
 
//---
 
-extern "C" void SAL_CALL component_getImplementationEnvironment(
+extern "C" void DBACCESS_DLLPUBLIC component_getImplementationEnvironment(
 const sal_Char  **ppEnvTypeName,
 uno_Environment **
 )
@@ -80,7 +75,7 @@ extern "C" void SAL_CALL 
component_getImplementationEnvironment(
 }
 
 
//---
-extern "C" void* SAL_CALL component_getFactory(
+extern "C" void* DBACCESS_DLLPUBLIC component_getFactory(
 const sal_Char* pImplementationName,
 void* pServiceManager,
 void* /*pRegistryKey*/)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: .gitignore

[Michael Stahl]

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

New commits:
commit 0edcb5438621b967132916052e89acb9da0f9798
Author: Michael Stahl 
Date:   Mon Jan 6 13:17:10 2014 +0100

.gitignore: add test-install/

Change-Id: I41c617e27f34f730a3905fca67d841bdf237b5fe

diff --git a/.gitignore b/.gitignore
index 64ebb3c..8adc533 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,13 +19,14 @@
 # should not catch anything but possibly /external/tarballs
 #
 
-# where stuff are built
+# where stuff is built
 /instdir
 /instdir_for_build
 /workdir
 /workdir_for_build
+/test-install
 
-# where the external downloads maybe located
+# default location for external downloads
 /external/tarballs
 
 # autoconf generated stuff
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Winfried Donkers]

 sc/source/ui/src/scfuncs.src |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1142320ccd6e9d7dcfcda339cd2b32674b7a3d32
Author: Winfried Donkers 
Date:   Sun Dec 29 16:29:49 2013 +0100

fdo#73117 fix switched true/false explanation for HYPGEOM.DIST

in function wizard.

Change-Id: I768620967728c619e051e35e8ff472ae12f1404d
Reviewed-on: https://gerrit.libreoffice.org/7274
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
Reviewed-by: Eike Rathke 
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index d9e406c..ac37c4d 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -7210,11 +7210,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
 };
 String 10 // Name of Parameter 5
 {
-Text [ en-US ] = "C" ;
+Text [ en-US ] = "Cumulative" ;
 };
 String 11 // Description of Parameter 5
 {
-Text [ en-US ] = "Cumulated. TRUE calculates the probability mass 
function, FALSE the cumulative distribution function." ;
+Text [ en-US ] = "Cumulated. TRUE calculates the cumulative 
distribution function, FALSE the probability mass function." ;
 };
 };
  // -=*# Resource for function TVERT #*=-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 fpicker/source/aqua/FPentry.mm |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 8723bf714b6156396f30ac71c0268e5a51c76337
Author: Tor Lillqvist 
Date:   Mon Jan 6 14:26:04 2014 +0200

Bin mysterious FIXME comment and 'if (0) return 0;' line

Change-Id: I41a29ec89b848ea0bfeb9975cd675357a2fcc69f

diff --git a/fpicker/source/aqua/FPentry.mm b/fpicker/source/aqua/FPentry.mm
index 58f3479..756be80 100644
--- a/fpicker/source/aqua/FPentry.mm
+++ b/fpicker/source/aqua/FPentry.mm
@@ -57,9 +57,6 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL 
fps_aqua_component_getFactory(
 
 if( pSrvManager )
 {
-// FIXME: PJ: when we do not need native file and folder picker...
-if (0) return 0;
-
 Reference< XSingleServiceFactory > xFactory;
 
 if (0 == rtl_str_compare(pImplName, FILE_PICKER_IMPL_NAME))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/chart-opengl2' - 3 commits - chart2/source

[Peilin]

 chart2/source/view/main/OpenGLRender.cxx |  203 ---
 chart2/source/view/main/OpenGLRender.hxx |   11 +
 2 files changed, 170 insertions(+), 44 deletions(-)

New commits:
commit 143f47dced2b01e4c379b14a03243b5fa514bad6
Author: Peilin 
Date:   Mon Jan 6 16:32:09 2014 +0800

fix the crash and add SetBackGroundColor of rectrangle

Change-Id: I521de3e68af928a1c9879a20e72ea5290259bd2c

diff --git a/chart2/source/view/main/OpenGLRender.cxx 
b/chart2/source/view/main/OpenGLRender.cxx
index 866d3d2..73aedac 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -409,7 +409,7 @@ int OpenGLRender::InitOpenGL(GLWindow aWindow)
 glEnable(GL_BLEND);
 glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
-glClearColor (1.0f, 1.0f, 1.0f, 1.0f);
+glClearColor (m_ClearColor.r, m_ClearColor.g, m_ClearColor.b, 
m_ClearColor.a);
 glClear(GL_COLOR_BUFFER_BIT);
 glClearDepth(1.0f);
 glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -917,6 +917,12 @@ OpenGLRender::OpenGLRender(uno::Reference< drawing::XShape 
> xTarget):
 m_TextTexCoordID(1)
 {
 memset(&m_Line2DPointList, 0, sizeof(Line2DPointList));
+memset(&m_Bubble2DPointList, 0, sizeof(m_Bubble2DPointList));
+memset(&m_Bubble2DCircle, 0, sizeof(m_Bubble2DCircle));
+memset(&m_TextInfo, 0, sizeof(TextInfo));
+memset(&m_Area2DPointList, 0, sizeof(m_Area2DPointList));
+memset(&m_RectangleList, 0, sizeof(RectanglePointList));
+
 m_iFboIdx = 0;
 m_FboID[0] = 0;
 m_FboID[1] = 0;
@@ -924,6 +930,14 @@ OpenGLRender::OpenGLRender(uno::Reference< drawing::XShape 
> xTarget):
 m_TextureObj[1] = 0;
 m_RboID[0] = 0;
 m_RboID[1] = 0;
+m_iArbMultisampleSupported = 0;
+m_iArbMultisampleFormat = 0;
+m_ClearColor = glm::vec4(1.0f, 1.0f, 1.0f, 1.0f);
+
+for (size_t i = 0; i < sizeof(m_BackgroundColor) / sizeof(float); i++)
+{
+m_BackgroundColor[i] = 1.0;
+}
 
 mxRenderTarget->setPosition(awt::Point(0,0));
 }
@@ -1358,31 +1372,45 @@ int OpenGLRender::RenderRectangleShape()
 RectanglePointList &pointList = m_RectangleShapePointList.front();
 PosVecf3 trans = {pointList.x, pointList.y, pointList.z};
 PosVecf3 angle = {0.0f, 0.0f, 0.0f};
-PosVecf3 scale = {pointList.xScale, pointList.yScale, 1.0f};
+PosVecf3 scale = {pointList.xScale / 2, pointList.yScale / 2, 1.0f};
 MoveModelf(trans, angle, scale);
 m_MVP = m_Projection * m_View * m_Model;
+
 //render to fbo
 //fill vertex buffer
 glBindBuffer(GL_ARRAY_BUFFER, m_VertexBuffer);
 glBufferData(GL_ARRAY_BUFFER, sizeof(square2DVertices), 
square2DVertices, GL_STATIC_DRAW);
 
-glUseProgram(m_CommonProID);
+glBindBuffer(GL_ARRAY_BUFFER, m_ColorBuffer);
+glBufferData(GL_ARRAY_BUFFER, sizeof(m_BackgroundColor), 
m_BackgroundColor, GL_STATIC_DRAW);
+glUseProgram(m_BackgroundProID);
 
-glUniform4fv(m_2DColorID, 1, &m_2DColor[0]);
-glUniformMatrix4fv(m_MatrixID, 1, GL_FALSE, &m_MVP[0][0]);
+glUniformMatrix4fv(m_BackgroundMatrixID, 1, GL_FALSE, &m_MVP[0][0]);
 // 1rst attribute buffer : vertices
-glEnableVertexAttribArray(m_2DVertexID);
+glEnableVertexAttribArray(m_BackgroundVertexID);
 glBindBuffer(GL_ARRAY_BUFFER, m_VertexBuffer);
 glVertexAttribPointer(
-m_2DVertexID,  // attribute. No particular reason 
for 0, but must match the layout in the shader.
+m_BackgroundVertexID,  // attribute. No particular 
reason for 0, but must match the layout in the shader.
 2,  // size
 GL_FLOAT,   // type
 GL_FALSE,   // normalized?
 0,  // stride
 (void*)0// array buffer offset
 );
+// 2nd attribute buffer : color
+glEnableVertexAttribArray(m_BackgroundColorID);
+glBindBuffer(GL_ARRAY_BUFFER, m_ColorBuffer);
+glVertexAttribPointer(
+m_BackgroundColorID,  // attribute. No particular 
reason for 0, but must match the layout in the shader.
+4,  // size
+GL_FLOAT,   // type
+GL_FALSE,   // normalized?
+0,  // stride
+(void*)0// array buffer offset
+);
 glDrawArrays(GL_QUADS, 0, 4);
-glDisableVertexAttribArray(m_2DVertexID);
+glDisableVertexAttribArray(m_BackgroundVertexID);
+glDisableVertexAttribArray(m_BackgroundColorID);
 glUseProgram(0);
 glBindBuffer(GL_ARRAY_BUFFER, 0);
 m_RectangleShapePointList.pop_front();
@@ -1390,6 +1418,7 @@ int OpenGLRender::RenderRectangleShape()
 return 0;
 }
 
+
 int OpenGLRender::CreateTextTexture(::rtl::OUString textValue, s

Re: odb ODF standard conformance [was: minutes of ESC call ...]

[Stephan Bergmann]

On 12/20/2013 03:51 PM, Lionel Elie Mamane wrote:

On Fri, Dec 20, 2013 at 03:09:04PM +0100, Miklos Vajna wrote:

Random is probably the worst method you can think about.


Why? What properties do you want from these IDs? Only that they are
unique within the XML document, right?


...and uniqueness is not exactly a selling point for random numbers. 
(Yes, I do know Version 4 UUIDs -- and I consider them blasphemy :)


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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - c0/a84ad10964fb7a65b6239cbe1cef8698b5d17b

[Caolán McNamara]

 c0/a84ad10964fb7a65b6239cbe1cef8698b5d17b |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 96317201b15fa32ce45a22a9825342985f8bcebd
Author: Caolán McNamara 
Date:   Mon Jan 6 14:32:48 2014 +

Notes added by 'git notes add'

diff --git a/c0/a84ad10964fb7a65b6239cbe1cef8698b5d17b 
b/c0/a84ad10964fb7a65b6239cbe1cef8698b5d17b
new file mode 100644
index 000..8399e72
--- /dev/null
+++ b/c0/a84ad10964fb7a65b6239cbe1cef8698b5d17b
@@ -0,0 +1 @@
+merged as: a16aacd6474f02307341646ec08f9e1608a8615d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 63/1b6b53afe97f22405f5239e7d13422622f980b

[Caolán McNamara]

 63/1b6b53afe97f22405f5239e7d13422622f980b |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f6ebd5e1a554a536426a61e1f2559561f078d973
Author: Caolán McNamara 
Date:   Mon Jan 6 14:33:36 2014 +

Notes added by 'git notes add'

diff --git a/63/1b6b53afe97f22405f5239e7d13422622f980b 
b/63/1b6b53afe97f22405f5239e7d13422622f980b
new file mode 100644
index 000..8ebbe55
--- /dev/null
+++ b/63/1b6b53afe97f22405f5239e7d13422622f980b
@@ -0,0 +1 @@
+ignore: obsolete
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [libreoffice-projects] [ANN] LIbreOffice 4.2.0 RC1 available

[Stephan Bergmann]

On 12/20/2013 09:36 PM, Norbert Thiebaud wrote:

both should work for 10.9... I would just like a confirmation that the
64 bits build works (which I think it does... as the problem seems to
be tied to the signing of the Python Framework.. which is not
delivered in the 64 bits build (unnecessary since the target 10.8+
already have a suitable system python)


FYI:  Using PyUNO from within a standalone python executable requires 
special precautions (cf. pyuno/zipcore/) which are typically not met in 
the --enable-python=system case.  (In other words: the assumption that, 
given a suitable system Python, --enable-python=system is a drop-in 
replacement for --enable-python=internal is wrong.)


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

Re: What parameters to supply to autogen.sh

[Stephan Bergmann]

On 12/23/2013 03:21 PM, mcmurchy1917-libreoff...@yahoo.co.uk wrote:

For the build, Linux - rpm (x86), version 4.1.4, English (US), that appears on
the Download page what parameters would have been supplied to autogen.sh to
build it?


see 

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

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

[Caolán McNamara]

 cui/UIConfig_cui.mk|1 
 cui/source/customize/cfg.cxx   |   61 -
 cui/source/customize/cfg.src   |   39 
 cui/source/inc/cfg.hxx |7 -
 cui/uiconfig/ui/customizedialog.ui |  162 +
 5 files changed, 188 insertions(+), 82 deletions(-)

New commits:
commit 0194b9f5eb6ce5384a706c750f1412bd2470206e
Author: Caolán McNamara 
Date:   Mon Jan 6 15:06:16 2014 +

convert customize tab dialog to .ui

Change-Id: I95463021b388e936e8982454b91e58036e3920b5

diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 07a669d..3f1ba6d 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/gradientpage \
cui/uiconfig/ui/colorconfigwin \
cui/uiconfig/ui/connpooloptions \
+   cui/uiconfig/ui/customizedialog \
cui/uiconfig/ui/dbregisterpage \
cui/uiconfig/ui/effectspage \
cui/uiconfig/ui/formatcellsdialog \
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index fc817d6..590d9de 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -782,23 +782,23 @@ sal_Bool impl_showKeyConfigTabPage( const 
css::uno::Reference< css::frame::XFram
  * key bindings.
  *
  */
-SvxConfigDialog::SvxConfigDialog(
-Window * pParent, const SfxItemSet* pSet_ )
-:
-SfxTabDialog( pParent,
-CUI_RES( RID_SVXDLG_CUSTOMIZE ), pSet_ )
+SvxConfigDialog::SvxConfigDialog(Window * pParent, const SfxItemSet* pInSet)
+: SfxTabDialog(pParent, "CustomizeDialog",
+"cui/ui/customizedialog.ui", pInSet)
+, m_nMenusPageId(0)
+, m_nKeyboardPageId(0)
+, m_nToolbarsPageId(0)
+, m_nEventsPageId(0)
 {
-FreeResource();
-
 InitImageType();
 
-AddTabPage( RID_SVXPAGE_MENUS, CreateSvxMenuConfigPage, NULL );
-AddTabPage( RID_SVXPAGE_KEYBOARD, CreateKeyboardConfigPage, NULL );
-AddTabPage( RID_SVXPAGE_TOOLBARS, CreateSvxToolbarConfigPage, NULL );
-AddTabPage( RID_SVXPAGE_EVENTS, CreateSvxEventConfigPage, NULL );
+m_nMenusPageId = AddTabPage("menus", CreateSvxMenuConfigPage, NULL);
+m_nKeyboardPageId = AddTabPage("keyboard", CreateKeyboardConfigPage, NULL);
+m_nToolbarsPageId = AddTabPage("toolbars", CreateSvxToolbarConfigPage, 
NULL);
+m_nEventsPageId = AddTabPage("events", CreateSvxEventConfigPage, NULL);
 
 const SfxPoolItem* pItem =
-pSet_->GetItem( pSet_->GetPool()->GetWhich( SID_CONFIG ) );
+pInSet->GetItem( pInSet->GetPool()->GetWhich( SID_CONFIG ) );
 
 if ( pItem )
 {
@@ -806,7 +806,7 @@ SvxConfigDialog::SvxConfigDialog(
 
 if (text.startsWith( ITEM_TOOLBAR_URL ) )
 {
-SetCurPageId( RID_SVXPAGE_TOOLBARS );
+SetCurPageId(m_nToolbarsPageId);
 }
 }
 }
@@ -816,38 +816,19 @@ void SvxConfigDialog::SetFrame(const 
::com::sun::star::uno::Reference< ::com::su
 m_xFrame = xFrame;
 
 if (!impl_showKeyConfigTabPage( xFrame ))
-RemoveTabPage( RID_SVXPAGE_KEYBOARD );
-}
-
-SvxConfigDialog::~SvxConfigDialog()
-{
-}
-
-short SvxConfigDialog::Ok()
-{
-return SfxTabDialog::Ok();
+RemoveTabPage(m_nKeyboardPageId);
 }
 
 void SvxConfigDialog::PageCreated( sal_uInt16 nId, SfxTabPage& rPage )
 {
-(void)rPage;
-
-switch ( nId )
+if (nId == m_nMenusPageId || nId == m_nKeyboardPageId ||
+nId == m_nToolbarsPageId)
 {
-case RID_SVXPAGE_MENUS:
-case RID_SVXPAGE_TOOLBARS:
-case RID_SVXPAGE_KEYBOARD:
-{
-rPage.SetFrame(m_xFrame);
-}
-break;
-case RID_SVXPAGE_EVENTS:
-{
-dynamic_cast< SvxEventConfigPage& >( rPage ).LateInit( 
m_xFrame );
-};
-break;
-default:
-break;
+rPage.SetFrame(m_xFrame);
+}
+else if (nId == m_nEventsPageId)
+{
+dynamic_cast< SvxEventConfigPage& >( rPage ).LateInit( m_xFrame );
 }
 }
 
diff --git a/cui/source/customize/cfg.src b/cui/source/customize/cfg.src
index 6ba7277..35d2aeb 100644
--- a/cui/source/customize/cfg.src
+++ b/cui/source/customize/cfg.src
@@ -20,45 +20,6 @@
 #include "cfg.hrc"
 #include "helpid.hrc"
 
-TabDialog RID_SVXDLG_CUSTOMIZE
-{
-OutputSize = TRUE ;
-Text [ en-US ] = "Customize" ;
-Moveable = TRUE ;
-SvLook = TRUE ;
-TabControl 1
-{
-OutputSize = TRUE ;
-PageList =
-{
-PageItem
-{
-Identifier = RID_SVXPAGE_MENUS ;
-Text [ en-US ] = "Menus" ;
-PageResID = 300 ;
-};
-PageItem
-{
-Identifier = RID_SVXPAGE_KEYBOARD ;
-Text [ en-US ] = "Keyboard" ;
-PageResID = 301 ;
-};
-

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

[Zolnai Tamás]

 sw/qa/extras/ww8export/data/fdo59530.doc |binary
 sw/source/filter/ww8/wrtw8sty.cxx|7 ---
 2 files changed, 7 deletions(-)

New commits:
commit eafe417d1a9531c98d2bd44d8eb04bc1af068b40
Author: Zolnai Tamás 
Date:   Mon Jan 6 15:59:50 2014 +0100

cp#201310151026: fix file coruption caused by comments' doc export

Plcfbkl contains only character positions. The Plcfbkf is that one
which contains additional informations.

Change-Id: I9bd8eec5c8e64d9d757764dae51bcb866456cdc9
(cherry picked from commit 3ed870e237a0b7b95f48bfb8192fe7d5c2957a03)

diff --git a/sw/qa/extras/ww8export/data/fdo59530.doc 
b/sw/qa/extras/ww8export/data/fdo59530.doc
index 921fbca..90bd4ce 100644
Binary files a/sw/qa/extras/ww8export/data/fdo59530.doc and 
b/sw/qa/extras/ww8export/data/fdo59530.doc differ
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx 
b/sw/source/filter/ww8/wrtw8sty.cxx
index 9d8fbe8..52a050a 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -2365,13 +2365,6 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, 
sal_uInt8 nTTyp,
 }
 SwWW8Writer::WriteLong( *rWrt.pTableStrm, 
aRangeEndPos[i-1] + 1);
 
-// Commented text ranges additional informations 
(Plcfbkl.aFBKF)
-for ( i = 0; i < aRangeEndPos.size(); ++i )
-{
-SwWW8Writer::WriteShort( *rWrt.pTableStrm, i ); // 
FBKF.ibkl
-SwWW8Writer::WriteShort( *rWrt.pTableStrm, 0 ); // 
FBKF.bkc
-}
-
 nFcStart = rWrt.pTableStrm->Tell();
 rFib.lcbPlcfAtnbkl = nFcStart - rFib.fcPlcfAtnbkl;
 
___
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

[Zolnai Tamás]

 sw/qa/extras/ww8export/data/fdo59530.doc |binary
 sw/source/filter/ww8/wrtw8sty.cxx|7 ---
 2 files changed, 7 deletions(-)

New commits:
commit 2927ae7ac8b8f3cdeedb9467356f10b047eb4d75
Author: Zolnai Tamás 
Date:   Mon Jan 6 15:59:50 2014 +0100

cp#201310151026: fix file coruption caused by comments' doc export

Plcfbkl contains only character positions. The Plcfbkf is that one
which contains additional informations.

Change-Id: I9bd8eec5c8e64d9d757764dae51bcb866456cdc9

diff --git a/sw/qa/extras/ww8export/data/fdo59530.doc 
b/sw/qa/extras/ww8export/data/fdo59530.doc
index 921fbca..90bd4ce 100644
Binary files a/sw/qa/extras/ww8export/data/fdo59530.doc and 
b/sw/qa/extras/ww8export/data/fdo59530.doc differ
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx 
b/sw/source/filter/ww8/wrtw8sty.cxx
index 43b64fb..1ed627c 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -2365,13 +2365,6 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, 
sal_uInt8 nTTyp,
 }
 SwWW8Writer::WriteLong( *rWrt.pTableStrm, 
aRangeEndPos[i-1] + 1);
 
-// Commented text ranges additional informations 
(Plcfbkl.aFBKF)
-for ( i = 0; i < aRangeEndPos.size(); ++i )
-{
-SwWW8Writer::WriteShort( *rWrt.pTableStrm, i ); // 
FBKF.ibkl
-SwWW8Writer::WriteShort( *rWrt.pTableStrm, 0 ); // 
FBKF.bkc
-}
-
 nFcStart = rWrt.pTableStrm->Tell();
 rFib.lcbPlcfAtnbkl = nFcStart - rFib.fcPlcfAtnbkl;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Zolnai Tamás]

 sw/qa/extras/ww8export/data/fdo59530.doc |binary
 sw/source/filter/ww8/wrtw8sty.cxx|7 ---
 2 files changed, 7 deletions(-)

New commits:
commit 5ea7f28bb9f787a1650e0d126e28ffb543c2a363
Author: Zolnai Tamás 
Date:   Mon Jan 6 15:59:50 2014 +0100

cp#201310151026: fix file coruption caused by comments' doc export

Plcfbkl contains only character positions. The Plcfbkf is that one
which contains additional informations.

Change-Id: I9bd8eec5c8e64d9d757764dae51bcb866456cdc9
(cherry picked from commit 3ed870e237a0b7b95f48bfb8192fe7d5c2957a03)

diff --git a/sw/qa/extras/ww8export/data/fdo59530.doc 
b/sw/qa/extras/ww8export/data/fdo59530.doc
index 921fbca..90bd4ce 100644
Binary files a/sw/qa/extras/ww8export/data/fdo59530.doc and 
b/sw/qa/extras/ww8export/data/fdo59530.doc differ
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx 
b/sw/source/filter/ww8/wrtw8sty.cxx
index 0b5422c..7b27efd 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -2238,13 +2238,6 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, 
sal_uInt8 nTTyp,
 }
 SwWW8Writer::WriteLong( *rWrt.pTableStrm, 
aRangeEndPos[i-1] + 1);
 
-// Commented text ranges additional informations 
(Plcfbkl.aFBKF)
-for ( i = 0; i < aRangeEndPos.size(); ++i )
-{
-SwWW8Writer::WriteShort( *rWrt.pTableStrm, i ); // 
FBKF.ibkl
-SwWW8Writer::WriteShort( *rWrt.pTableStrm, 0 ); // 
FBKF.bkc
-}
-
 nFcStart = rWrt.pTableStrm->Tell();
 rFib.lcbPlcfAtnbkl = nFcStart - rFib.fcPlcfAtnbkl;
 
___
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-4.1' - sw/qa sw/source

[Zolnai Tamás]

 sw/qa/extras/ww8export/data/fdo59530.doc |binary
 sw/source/filter/ww8/wrtw8sty.cxx|7 ---
 2 files changed, 7 deletions(-)

New commits:
commit d68bc8d8f0775e5bafc6d168ade5a801a83565e5
Author: Zolnai Tamás 
Date:   Mon Jan 6 15:59:50 2014 +0100

cp#201310151026: fix file coruption caused by comments' doc export

Plcfbkl contains only character positions. The Plcfbkf is that one
which contains additional informations.

Change-Id: I9bd8eec5c8e64d9d757764dae51bcb866456cdc9
(cherry picked from commit 3ed870e237a0b7b95f48bfb8192fe7d5c2957a03)

diff --git a/sw/qa/extras/ww8export/data/fdo59530.doc 
b/sw/qa/extras/ww8export/data/fdo59530.doc
index 921fbca..90bd4ce 100644
Binary files a/sw/qa/extras/ww8export/data/fdo59530.doc and 
b/sw/qa/extras/ww8export/data/fdo59530.doc differ
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx 
b/sw/source/filter/ww8/wrtw8sty.cxx
index 0b5422c..7b27efd 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -2238,13 +2238,6 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, 
sal_uInt8 nTTyp,
 }
 SwWW8Writer::WriteLong( *rWrt.pTableStrm, 
aRangeEndPos[i-1] + 1);
 
-// Commented text ranges additional informations 
(Plcfbkl.aFBKF)
-for ( i = 0; i < aRangeEndPos.size(); ++i )
-{
-SwWW8Writer::WriteShort( *rWrt.pTableStrm, i ); // 
FBKF.ibkl
-SwWW8Writer::WriteShort( *rWrt.pTableStrm, 0 ); // 
FBKF.bkc
-}
-
 nFcStart = rWrt.pTableStrm->Tell();
 rFib.lcbPlcfAtnbkl = nFcStart - rFib.fcPlcfAtnbkl;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Efficient UNO component linkage & GC ...

[Stephan Bergmann]

On 12/23/2013 06:44 PM, Matúš Kukan wrote:

On Thu, 2013-12-19 at 10:51 +0100, Stephan Bergmann wrote:

* assume all LO-internal C++ implementations are ComponentContext-based
(i.e., use cppu::createSingleComponentFactory or
cppu::createOneInstanceComponentFactory rather than legacy
ServiceManager-based cppu::createSingleFactory or
cppu::createOneInstanceFactory); reaching this state is effectively an
easy hack


Yep, but maybe we don't need special easy hack for this.
So far, I was able to just remove the variables as unused.
I think it's easy to do as part of creating constructor function for
implementation.


Not sure what you mean here with "remove the variables as unused."


* implementations of non-single-instance services can be rewritten using
the new .component XML http://cgit.freedesktop.org/libreoffice/core/commit/?id=ae3a0c8da50b36db395984637f5ad74d3b4887bc>
"Add .component 

Hm, what does it mean, it no longer uses css.lang.XInitialization
protocol?
What to do about implementations inheriting from XInitialization?
I tried to convert such class in
https://gerrit.libreoffice.org/#/c/7186/


Yes, using the XInitialization protocol inside the constructor function 
is a possibility here.



* idea is to set aside for every UNO service/singleton S two macros
LO_URE_CTOR_ENV_ and LO_URE_CTOR_FUN_, and a macro
LO_URE_CURRENT_ENV, and modify cppumaker to generate constructor code as


#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_ \
 && defined LO_URE_CTOR_FUN && LO_URE_CURRENT_ENV == 
LO_URE_CTOR_ENV_

extern "C" cppu::ConstructorFunction_type LO_URE_CTOR_FUN;


Is not LO_URE_CTOR_ENV_ redundant ?
We can just check for defined LO_URE_CTOR_FUN ?


Not in general.


** when compiling .cxx files for which it is known that the constructor
function for some S will be visible (which could e.g. be ~always the
case when compiling for a single big executable on Android/iOS), define
the LO_URE_CTOR_ENV_ and LO_URE_CTOR_FUN_ macros, either via -D
or via some strategically included header


Yes, so this needs some thought.
If I see correctly, there are already some typos in
15abebbde560e17413f17b16b8b2e9c1f31f01a5
like LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_xml_dot_sax_dot_FastParser
vs.
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_comp_dot_extensions_dot_xml_dot_sax_dot_FastParser


Ach, sure, that quick-n-dirty include/osl/detail/component-defines.h is 
just nonsense; it erroneously uses implementation names instead of 
service names for those LO_URE_CTOR_{ENV,FUN}_ macros.



Unfortunately I can't see how to avoid these macros, so I'll try to
generate include/osl/detail/component-defines.h early in build process.
Do you have another idea ?


Introducing include/osl/detail/component-defines.h was just a quick and 
dirty hack to get this bootstrapped.  Ultimately, we likely will not 
want to have those



#if defined ANDROID || defined IOS //TODO
#include 
#endif


lines in the generated .hpp files anyway, but I do not have any more 
concrete ideas yet than that hand-waving "either via -D or via some 
strategically included header" (same for the "the encoding of 
environments (which are normally strings) in LO_URE_CURRENT_ENV and 
LO_URE_CTOR_ENV_ macros must be such that they can be used in the 
preprocessor == expression above" issue).


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

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

[Caolán McNamara]

 sc/inc/scabstdlg.hxx   |6 --
 sc/source/ui/attrdlg/scdlgfact.cxx |   21 -
 sc/source/ui/attrdlg/scdlgfact.hxx |6 --
 sc/source/ui/optdlg/tpusrlst.cxx   |8 
 4 files changed, 4 insertions(+), 37 deletions(-)

New commits:
commit 8c0bb201382d839124fb9a9c8906e2c2018a6939
Author: Caolán McNamara 
Date:   Mon Jan 6 15:24:23 2014 +

avoid out of bounds string access

Change-Id: I0a0affea08528fc9bd729ab01cdb5fa6e9f8e18f

diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index 2b986ce..89c9d19 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -333,14 +333,14 @@ void ScTpUserLists::MakeListStr( OUString& rListStr )
 while ( c < nLen )
 {
 rListStr += OUString(aStr[c]);
-c++;
+++c;
 
-if ( aStr[c] == cDelimiter )
+if ((c < nLen) && (aStr[c] == cDelimiter))
 {
 rListStr += OUString(aStr[c]);
 
-while ( (c < nLen) && (aStr[c] == cDelimiter) )
-c++;
+while ((c < nLen) && (aStr[c] == cDelimiter))
+++c;
 }
 }
 
commit 894a3598371c812604832bb1b698ede58cae4427
Author: Caolán McNamara 
Date:   Mon Jan 6 15:20:37 2014 +

CreateScColOrRowDlg is unused

Change-Id: I1194d111eff8eeafb656d743af12d71523a65ac8

diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index dc1b17f..52d52bc 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -342,12 +342,6 @@ public:
 sal_Bool bCol 
= false,
 sal_Bool bRow 
= false) = 0;
 
-virtual VclAbstractDialog * CreateScColOrRowDlg( Window*
pParent,
-const OUString&   
rStrTitle,
-const OUString&   
rStrLabel,
-int nId,
-sal_Bool
bColDefault = sal_True ) = 0;
-
 virtual AbstractScSortWarningDlg * CreateScSortWarningDlg(Window* pParent, 
const OUString& rExtendText, const OUString& rCurrentText ) = 0;
 
 virtual AbstractScCondFormatManagerDlg* CreateScCondFormatMgrDlg(Window* 
pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList,
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 9e3f47e..cf1208e 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -657,27 +657,6 @@ AbstractScColRowLabelDlg *  
ScAbstractDialogFactory_Impl::CreateScColRowLabelDlg
 return 0;
 }
 
-VclAbstractDialog *  ScAbstractDialogFactory_Impl::CreateScColOrRowDlg(Window* 
 pParent,
-const OUString&   
rStrTitle,
-const OUString&   
rStrLabel,
-int nId,
-sal_Bool
bColDefault)
-{
-Dialog * pDlg=NULL;
-switch ( nId )
-{
-case RID_SCDLG_COLORROW :
-pDlg = new ScColOrRowDlg( pParent, rStrTitle,rStrLabel,bColDefault 
);
-break;
-default:
-break;
-}
-
-if ( pDlg )
-return new ScVclAbstractDialog_Impl( pDlg );
-return 0;
-}
-
 AbstractScSortWarningDlg* 
ScAbstractDialogFactory_Impl::CreateScSortWarningDlg( Window* pParent, const 
OUString& rExtendText, const OUString& rCurrentText )
 {
 ScSortWarningDlg* pDlg = new ScSortWarningDlg(pParent, rExtendText, 
rCurrentText );
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx 
b/sc/source/ui/attrdlg/scdlgfact.hxx
index 91c450b..6043574 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -411,12 +411,6 @@ public:
 sal_Bool bCol 
= false,
 sal_Bool bRow 
= false);
 
-virtual VclAbstractDialog * CreateScColOrRowDlg( Window*
pParent,
-const OUString&   
rStrTitle,
-const OUString&   
rStrLabel,
-int nId,
-sal_Bool
bColDefault = sal_True );
-
 virtual AbstractScSortWarningDlg * CreateScSortWarningDlg(Window* pParent, 
const OUString& rExtendText, const OUString& rCurrentText );
 
 virtual AbstractScCondFormatManagerDlg* CreateScCondFormatMgrDlg(Window* 
pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList,
___
Libreoffice-commits mailing lis

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

[Caolán McNamara]

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

New commits:
commit 5f8d2ac5f3d6bd69fae981f6872bfcfac9c2d611
Author: Caolán McNamara 
Date:   Mon Jan 6 15:32:21 2014 +

pGlyphIDs->pGlyphIds

Change-Id: I6325ef720294e5f3faf239fd1f18a53248d9403d

diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 07def60..c38f271 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -2533,7 +2533,7 @@ int ScopedTrueTypeFont::open(void * pBuffer, sal_uInt32 
nLen,
 }
 
 sal_Bool WinSalGraphics::CreateFontSubset( const OUString& rToFile,
-const PhysicalFontFace* pFont, sal_GlyphId* pGlyphIDs, sal_uInt8* 
pEncoding,
+const PhysicalFontFace* pFont, sal_GlyphId* pGlyphIds, sal_uInt8* 
pEncoding,
 sal_Int32* pGlyphWidths, int nGlyphCount, FontSubsetInfo& rInfo )
 {
 // TODO: use more of the central font-subsetting code, move stuff there if 
needed
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Fridrich Štrba]

 writerperfect/source/common/WPXSvStream.cxx |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 4b4a870b176cf5ff9ee84fc5b16f4df1d8eeef94
Author: Fridrich Å trba 
Date:   Mon Jan 6 16:43:17 2014 +0100

Avoid some memcpy when not necessary

Change-Id: I9b838fc8392bc61be4ed911fb1423a1e97af2356

diff --git a/writerperfect/source/common/WPXSvStream.cxx 
b/writerperfect/source/common/WPXSvStream.cxx
index 3b33a17..86e835b 100644
--- a/writerperfect/source/common/WPXSvStream.cxx
+++ b/writerperfect/source/common/WPXSvStream.cxx
@@ -310,9 +310,7 @@ const unsigned char *WPXSvInputStream::read(unsigned long 
numBytes, unsigned lon
 mpImpl->mnReadBufferLength = mpImpl->mnLength - curpos;
 }
 else
-mpImpl->mnReadBufferLength = numBytes;
-
-mpImpl->seek((long) curpos);
+return mpImpl->read(numBytes, numBytesRead);
 
 mpImpl->mpReadBuffer = new unsigned char[mpImpl->mnReadBufferLength];
 unsigned long tmpNumBytes(0);
@@ -360,7 +358,7 @@ int WPXSvInputStream::seek(long offset, WPX_SEEK_TYPE 
seekType)
 if (tmpOffset < mpImpl->tell() && (unsigned long)tmpOffset >= (unsigned 
long)mpImpl->tell() - mpImpl->mnReadBufferLength)
 {
 mpImpl->mnReadBufferPos = (unsigned long)(tmpOffset + (long) 
mpImpl->mnReadBufferLength - (long) mpImpl->tell());
-return 0;
+return retVal;
 }
 
 mpImpl->invalidateReadBuffer();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Efficient UNO component linkage & GC ...

[Stephan Bergmann]

On 12/23/2013 08:28 PM, Michael Meeks wrote:

On Mon, 2013-12-23 at 18:44 +0100, Matúš Kukan wrote:

* implementations of non-single-instance services can be rewritten using
the new .component XML http://cgit.freedesktop.org/libreoffice/core/commit/?id=ae3a0c8da50b36db395984637f5ad74d3b4887bc>


I'm concerned that we already have way too many, far too verbose XML
files, with over-lengthy attributes (some with un-necessary and
over-complicated namespacing to boot ;-). Parsing that lot takes a very
considerable chunk of startup time, and storing redundant foo in memory
seems a bit un-necessary :-)

What does this:

   
  
   

win us over:

   
  
   

? :-) Certainly the latter can be stored as an extra boolean.


There is a mismatch between the grammar for UNO implementation names and 
C function identifiers usable for these constructor functions, and the 
constructor argument in its current form caters for that.


Note 1:  Of course, "given that we control the [relevant] impl names, we 
[could] simply mandate that they are legal C function names to begin with."


Note 2:  "In addition to having [the components data] stored as XML 
files that are parsed at start-up in cppuhelper::ServiceManager::init, 
one could optionally have them pre-compiled into some data structure 
that is accessible from cppuhelper/source/servicemanager.cxx."


Note 3:  A key insight is that "we can easily extend the components XML 
schema, even removing features again in a later LO version."  First make 
it work, then make it fast (if necessary).


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

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

[Miklos Vajna]

 oox/source/shape/WpsContext.cxx  |   14 +-
 sw/qa/extras/ooxmlexport/data/autofit.docx   |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |6 ++
 sw/source/filter/ww8/docxattributeoutput.cxx |6 +-
 4 files changed, 24 insertions(+), 2 deletions(-)

New commits:
commit 52263eb4ee841ff101fa54e7fb95d76d2070f91b
Author: Miklos Vajna 
Date:   Mon Jan 6 15:15:15 2014 +0100

DOCX export: implement drawingML export of TextFrame AutoSize

Change-Id: I180158bfa0bd36ed1360d10788e7921c2fa945a7

diff --git a/sw/qa/extras/ooxmlexport/data/autofit.docx 
b/sw/qa/extras/ooxmlexport/data/autofit.docx
new file mode 100755
index 000..8932edf
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/autofit.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index dc8726c..fc7079a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2225,6 +2225,12 @@ DECLARE_OOXMLEXPORT_TEST(testGroupshapePicture, 
"groupshape-picture.docx")
 CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.drawing.GraphicObjectShape"), 
xShapeDescriptor->getShapeType());
 }
 
+DECLARE_OOXMLEXPORT_TEST(testAutofit, "autofit.docx")
+{
+CPPUNIT_ASSERT_EQUAL(true, bool(getProperty(getShape(1), 
"FrameIsAutomaticHeight")));
+CPPUNIT_ASSERT_EQUAL(false, bool(getProperty(getShape(2), 
"FrameIsAutomaticHeight")));
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTrackChangesDeletedParagraphMark, 
"testTrackChangesDeletedParagraphMark.docx")
 {
 xmlDocPtr pXmlDoc = parseExport("word/document.xml");
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 0aa7e36..38a05c8 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -488,7 +488,11 @@ void DocxAttributeOutput::WriteDMLTextFrame(sw::Frame* 
pParentFrame)
 m_pSerializer->endElementNS( XML_wps, XML_txbx );
 XFastAttributeListRef xBodyPrAttrList(m_pBodyPrAttrList);
 m_pBodyPrAttrList = NULL;
-m_pSerializer->singleElementNS( XML_wps, XML_bodyPr, xBodyPrAttrList );
+m_pSerializer->startElementNS( XML_wps, XML_bodyPr, xBodyPrAttrList );
+// AutoSize of the Text Frame.
+const SwFmtFrmSize& rSize = rFrmFmt.GetFrmSize();
+m_pSerializer->singleElementNS(XML_a, (rSize.GetHeightSizeType() == 
ATT_VAR_SIZE ? XML_spAutoFit : XML_noAutofit), FSEND);
+m_pSerializer->endElementNS( XML_wps, XML_bodyPr );
 
 m_pSerializer->endElementNS(XML_wps, XML_wsp);
 m_pSerializer->endElementNS(XML_a, XML_graphicData);
commit e7e6a5f9850a36d72339799b3981369790113d12
Author: Miklos Vajna 
Date:   Mon Jan 6 13:02:57 2014 +0100

oox: handle a:noAutofit/spAutoFit in WpsContext

Change-Id: I568e8d95f263b30579a2eec49abe8ae45f7f2e96

diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx
index 44fc1e6..e2bbb0e 100644
--- a/oox/source/shape/WpsContext.cxx
+++ b/oox/source/shape/WpsContext.cxx
@@ -86,13 +86,25 @@ oox::core::ContextHandlerRef 
WpsContext::onCreateContext(sal_Int32 nElementToken
 for (size_t i = 0; i < SAL_N_ELEMENTS(aProps); ++i)
 if (oInsets[i])
 xPropertySet->setPropertyValue(aProps[i], 
uno::makeAny(*oInsets[i]));
+return this;
 }
 break;
+case XML_noAutofit:
+case XML_spAutoFit:
+{
+// We can't use oox::drawingml::TextBodyPropertiesContext here, as this
+// is a child context of bodyPr, so the shape is already sent: we need
+// to alter the XShape directly.
+uno::Reference xPropertySet(mxShape, 
uno::UNO_QUERY);
+if (xPropertySet.is())
+xPropertySet->setPropertyValue("FrameIsAutomaticHeight", 
uno::makeAny(getBaseToken(nElementToken) == XML_spAutoFit));
+}
+break;
 case XML_txbx:
 mpShape->setServiceName("com.sun.star.text.TextFrame");
 break;
 default:
-SAL_WARN("oox", "WpsContext::createFastChildContext: unhandled 
element:" << getBaseToken(nElementToken));
+SAL_WARN("oox", "WpsContext::createFastChildContext: unhandled 
element: " << getBaseToken(nElementToken));
 break;
 }
 return 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 39674] find / fix all German spellings in internal APIs

[bugzilla-daemon]

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

--- Comment #11 from Philipp Riemer  ---
(In reply to comment #10)
> One more: sw/source/core/text/wrong.cxx:
> 
> nOben, nUnten, nMitte in SwWrongList::GetWrongPos()

Done with commit:

http://cgit.freedesktop.org/libreoffice/core/commit/?id=62ab589282ad4fb96e1b8d1f9cc13090276f49ca

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

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

[Caolán McNamara]

 sc/source/ui/optdlg/tpusrlst.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit c41e98e9ec3026c62424420e4910bd9a0470fbb7
Author: Caolán McNamara 
Date:   Mon Jan 6 15:24:23 2014 +

avoid out of bounds string access

Change-Id: I0a0affea08528fc9bd729ab01cdb5fa6e9f8e18f
(cherry picked from commit 8c0bb201382d839124fb9a9c8906e2c2018a6939)

diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index 2b986ce..89c9d19 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -333,14 +333,14 @@ void ScTpUserLists::MakeListStr( OUString& rListStr )
 while ( c < nLen )
 {
 rListStr += OUString(aStr[c]);
-c++;
+++c;
 
-if ( aStr[c] == cDelimiter )
+if ((c < nLen) && (aStr[c] == cDelimiter))
 {
 rListStr += OUString(aStr[c]);
 
-while ( (c < nLen) && (aStr[c] == cDelimiter) )
-c++;
+while ((c < nLen) && (aStr[c] == cDelimiter))
+++c;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 include/osl/detail/component-defines.h |   46 +-
 sw/source/core/text/wrong.cxx  |  143 +++--
 2 files changed, 89 insertions(+), 100 deletions(-)

New commits:
commit be58acfe2b8bc453b1b8b10bd6349599730d0d78
Author: Stephan Bergmann 
Date:   Mon Jan 6 16:59:02 2014 +0100

Thinko: The macros must be based on service instead of implementation names

Change-Id: I80fe00310f934fa335ade5fcdef41c44cc6ab69c

diff --git a/include/osl/detail/component-defines.h 
b/include/osl/detail/component-defines.h
index 63893ea..da6856f 100644
--- a/include/osl/detail/component-defines.h
+++ b/include/osl/detail/component-defines.h
@@ -14,30 +14,28 @@
 
 #define LO_URE_CURRENT_ENV 1 /*TODO*/
 
-#define 
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_comp_dot_extensions_dot_xml_dot_sax_dot_FastParser
 1 /*TODO*/
-#define 
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_comp_dot_extensions_dot_xml_dot_sax_dot_FastParser
 com_sun_star_comp_extensions_xml_sax_FastParser
-#define 
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_comp_dot_extensions_dot_xml_dot_sax_dot_ParserExpat
 1 /*TODO*/
-#define 
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_comp_dot_extensions_dot_xml_dot_sax_dot_ParserExpat
 com_sun_star_comp_extensions_xml_sax_ParserExpat
-#define 
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_DLLComponentLoader 1 
/*TODO*/
-#define 
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_DLLComponentLoader 
com_sun_star_comp_stoc_DLLComponentLoader
-#define 
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_ImplementationRegistration
 1 /*TODO*/
-#define 
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_ImplementationRegistration
 com_sun_star_comp_stoc_ImplementationRegistration
-#define 
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_NestedRegistry 1 
/*TODO*/
-#define 
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_NestedRegistry 
com_sun_star_comp_stoc_NestedRegistry
-#define 
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_ORegistryServiceManager
 1 /*TODO*/
-#define 
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_ORegistryServiceManager
 com_sun_star_comp_stoc_ORegistryServiceManager
-#define 
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_OServiceManager 1 
/*TODO*/
-#define 
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_OServiceManager 
com_sun_star_comp_stoc_OServiceManager
-#define 
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_OServiceManagerWrapper
 1 /*TODO*/
-#define 
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_OServiceManagerWrapper
 com_sun_star_comp_stoc_OServiceManagerWrapper
-#define 
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_SimpleRegistry 1 
/*TODO*/
-#define 
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_SimpleRegistry 
com_sun_star_comp_stoc_SimpleRegistry
-#define 
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_extensions_dot_xml_dot_sax_dot_Writer 
1 /*TODO*/
-#define 
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_extensions_dot_xml_dot_sax_dot_Writer 
com_sun_star_extensions_xml_sax_Writer
-#define 
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_security_dot_comp_dot_stoc_dot_AccessController
 1 /*TODO*/
-#define 
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_security_dot_comp_dot_stoc_dot_AccessController
 com_sun_star_security_comp_stoc_AccessController
-#define 
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_security_dot_comp_dot_stoc_dot_FilePolicy
 1 /*TODO*/
-#define 
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_security_dot_comp_dot_stoc_dot_FilePolicy
 com_sun_star_security_comp_stoc_FilePolicy
+#define 
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_lang_dot_RegistryServiceManager 1 
/*TODO*/
+#define 
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_lang_dot_RegistryServiceManager 
com_sun_star_comp_stoc_ORegistryServiceManager
+#define LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_lang_dot_ServiceManager 1 
/*TODO*/
+#define LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_lang_dot_ServiceManager 
com_sun_star_comp_stoc_OServiceManager
+#define LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_loader_dot_SharedLibrary 1 
/*TODO*/
+#define LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_loader_dot_SharedLibrary 
com_sun_star_comp_stoc_DLLComponentLoader
+#define 
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_registry_dot_ImplementationRegistration
 1 /*TODO*/
+#define 
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_registry_dot_ImplementationRegistration
 com_sun_star_comp_stoc_ImplementationRegistration
+#define LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_registry_dot_NestedRegistry 1 
/*TODO*/
+#define LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_registry_dot_NestedRegistry 
com_sun_star_comp_stoc_NestedRegistry
+#define LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_registry_dot_SimpleRegistry 1 
/*TODO*/
+#define LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_registry_dot_SimpleRegistry 
com_sun_star_comp_stoc_SimpleRegistry
+#define LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_security_dot_AccessC

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

[Caolán McNamara]

 sc/UIConfig_scalc.mk   |1 
 sc/inc/sc.hrc  |1 
 sc/source/ui/inc/crdlg.hxx |   25 +
 sc/source/ui/miscdlgs/crdlg.cxx|   56 +++-
 sc/source/ui/src/miscdlgs.src  |   60 -
 sc/uiconfig/scalc/ui/colorrowdialog.ui |  152 +
 6 files changed, 176 insertions(+), 119 deletions(-)

New commits:
commit 0183d4cf7e3311625d3544395229b5ccd0f7bc4d
Author: Caolán McNamara 
Date:   Mon Jan 6 16:04:55 2014 +

convert col or row dialog to .ui

Change-Id: I47b0b0abd3cbb992b93cd1db10558fed579e4f1c

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 8299602..b0308be 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/analysisofvariancedialog \
sc/uiconfig/scalc/ui/cellprotectionpage \
sc/uiconfig/scalc/ui/chardialog \
+   sc/uiconfig/scalc/ui/colorrowdialog \
sc/uiconfig/scalc/ui/colwidthdialog \
sc/uiconfig/scalc/ui/consolidatedialog \
sc/uiconfig/scalc/ui/correlationdialog \
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index bfd9668..6b8cc619 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1045,7 +1045,6 @@
 #define RID_SCDLG_HFEDIT_HEADER (SC_DIALOGS_START + 68)
 #define RID_SCDLG_HFEDIT_FOOTER (SC_DIALOGS_START + 69)
 #define RID_SCPAGE_PRINT(SC_DIALOGS_START + 70)
-#define RID_SCDLG_COLORROW  (SC_DIALOGS_START + 71)
 
 #define RID_SCDLG_CONTACTS  (SC_DIALOGS_START + 78)
 
diff --git a/sc/source/ui/inc/crdlg.hxx b/sc/source/ui/inc/crdlg.hxx
index fd2eaba..5e7f00f 100644
--- a/sc/source/ui/inc/crdlg.hxx
+++ b/sc/source/ui/inc/crdlg.hxx
@@ -23,34 +23,23 @@
 
 #include 
 #include 
-#include 
+#include 
 #include "scui_def.hxx"
 
-//
-
 class ScColOrRowDlg : public ModalDialog
 {
 public:
-ScColOrRowDlg( Window*  pParent,
-   const OUString&rStrTitle,
-   const OUString&rStrLabel,
-   sal_Bool bColDefault = sal_True );
-~ScColOrRowDlg();
-
+ScColOrRowDlg(Window* pParent, const OUString& rStrTitle,
+const OUString& rStrLabel, bool bColDefault = true);
 private:
-FixedLine   aFlFrame;
-RadioButton aBtnRows;
-RadioButton aBtnCols;
-OKButtonaBtnOk;
-CancelButtonaBtnCancel;
-HelpButton  aBtnHelp;
+VclFrame*   m_pFrame;
+RadioButton*m_pBtnRows;
+RadioButton*m_pBtnCols;
+OKButton*   m_pBtnOk;
 
 DECL_LINK(OkHdl, void *);
 };
 
-
 #endif
 
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/miscdlgs/crdlg.cxx b/sc/source/ui/miscdlgs/crdlg.cxx
index 7a41edb..c009bd4 100644
--- a/sc/source/ui/miscdlgs/crdlg.cxx
+++ b/sc/source/ui/miscdlgs/crdlg.cxx
@@ -17,62 +17,38 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #undef SC_DLLIMPLEMENTATION
 
-
-
-//--
-
 #include "crdlg.hxx"
 #include "scresid.hxx"
 #include "miscdlgs.hrc"
 
-
-//==
-
-ScColOrRowDlg::ScColOrRowDlg( Window*   pParent,
-  const OUString& rStrTitle,
-  const OUString& rStrLabel,
-  sal_Bool  bColDefault )
-
-:   ModalDialog ( pParent, ScResId( RID_SCDLG_COLORROW ) ),
-//
-aFlFrame( this, ScResId( FL_FRAME ) ),
-aBtnRows( this, ScResId( BTN_GROUP_ROWS ) ),
-aBtnCols( this, ScResId( BTN_GROUP_COLS ) ),
-aBtnOk  ( this, ScResId( BTN_OK ) ),
-aBtnCancel  ( this, ScResId( BTN_CANCEL ) ),
-aBtnHelp( this, ScResId( BTN_HELP ) )
+ScColOrRowDlg::ScColOrRowDlg(Window* pParent, const OUString& rStrTitle,
+const OUString& rStrLabel, bool bColDefault)
+: ModalDialog(pParent, "ColOrRowDialog",
+"modules/scalc/ui/colorrowdialog.ui")
 {
-SetText( rStrTitle );
-aFlFrame.SetText( rStrLabel );
-
-if ( bColDefault )
-aBtnCols.Check();
-else
-aBtnRows.Check();
-
-aBtnOk.SetClickHdl( LINK( this, ScColOrRowDlg, OkHdl ) );
+get(m_pBtnOk, "ok");
+get(m_pBtnCols, "columns");
+get(m_pBtnRows, "rows");
+get(m_pFrame, "frame");
 
-FreeResource();
-}
+SetText(rStrTitle);
+m_pFrame->set_label(rStrLabel);
 
-//
+if (bColDefault)
+m_pBtnCols->Check();
+else
+m_pBtnRows->Check();
 
-ScColOrRowDlg::~ScColOrRowDlg()
-{
+m_pBtnOk->SetClickHdl( LINK( this, ScColOrRowDlg, OkHdl ) );
 }
 
-//---

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

[Caolán McNamara]

 helpers/help_hid.lst |3 ---
 source/text/shared/optionen/01060401.xhp |   12 ++--
 2 files changed, 6 insertions(+), 9 deletions(-)

New commits:
commit 792806c6d7a924bf04ef90aa582ed5966a72b70b
Author: Caolán McNamara 
Date:   Mon Jan 6 16:07:59 2014 +

update help ids for row or columns .ui conversion

Change-Id: I6e270acd88560207aa43d971ca5ea6fc7e98c816

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 58799af..4100183 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -6019,7 +6019,6 @@ sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT3,956435974,
 sc_ListBox_TP_VALIDATION_VALUES_LB_ALLOW,548277762,
 sc_ListBox_TP_VALIDATION_VALUES_LB_VALUE,548277765,
 sc_ModalDialog_RID_SCDLG_CHARTCOLROW,1494515712,
-sc_ModalDialog_RID_SCDLG_COLORROW,1494368256,
 sc_ModalDialog_RID_SCDLG_GROUP,1493549056,
 sc_ModalDialog_RID_SCDLG_NEWSCENARIO,1493843968,
 sc_ModalDialog_RID_SCDLG_RETYPEPASS,1495662592,
@@ -6052,8 +6051,6 @@ 
sc_PushButton_RID_SCDLG_RETYPEPASS_BTN_RETYPE_SHEET1,1495667315,
 sc_PushButton_RID_SCDLG_RETYPEPASS_BTN_RETYPE_SHEET2,1495667318,
 sc_PushButton_RID_SCDLG_RETYPEPASS_BTN_RETYPE_SHEET3,1495667321,
 sc_PushButton_RID_SCDLG_RETYPEPASS_BTN_RETYPE_SHEET4,1495667324,
-sc_RadioButton_RID_SCDLG_COLORROW_BTN_GROUP_COLS,1494368769,
-sc_RadioButton_RID_SCDLG_COLORROW_BTN_GROUP_ROWS,1494368771,
 sc_RadioButton_RID_SCDLG_DPDATEGROUP_RB_AUTOEND,1495433731,
 sc_RadioButton_RID_SCDLG_DPDATEGROUP_RB_AUTOSTART,1495433729,
 sc_RadioButton_RID_SCDLG_DPDATEGROUP_RB_MANEND,1495433732,
diff --git a/source/text/shared/optionen/01060401.xhp 
b/source/text/shared/optionen/01060401.xhp
index 7e224d2..d81f83b 100644
--- a/source/text/shared/optionen/01060401.xhp
+++ b/source/text/shared/optionen/01060401.xhp
@@ -35,19 +35,19 @@
 
 sort lists; copying to in 
Calc
 
-
+
 Copy List
-Allows you to copy 
marked cells to a sort list.
+Allows 
you to copy marked cells to a sort list.
 
   
 
 List from
 Choose between the options Rows and 
Columns. Cells without text will be ignored when 
copying.
-
+
 Rows
-Select 
the Rows option to summarize the contents of the selected rows in 
a list.
-
+Select the 
Rows option to summarize the contents of the selected rows in a 
list.
+
 Columns
-Select 
the Columns option to summarize the contents of the selected 
columns in a list.
+Select 
the Columns option to summarize the contents of the selected 
columns in a list.
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Caolán McNamara]

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

New commits:
commit 11cde981f5f9f4d037f0f0f73a14e928eab23075
Author: Caolán McNamara 
Date:   Mon Jan 6 16:07:59 2014 +

Updated core
Project: help  792806c6d7a924bf04ef90aa582ed5966a72b70b

diff --git a/helpcontent2 b/helpcontent2
index e6b3e8a..792806c 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e6b3e8a539ae36e71087ae8c26812be103492c8c
+Subproject commit 792806c6d7a924bf04ef90aa582ed5966a72b70b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Fridrich Štrba]

 writerperfect/source/common/WPXSvStream.cxx |  154 ++--
 1 file changed, 122 insertions(+), 32 deletions(-)

New commits:
commit ec5fc829f08b09baa50a8dc0707c68669d28677f
Author: Fridrich Å trba 
Date:   Fri Dec 20 14:49:06 2013 +0100

Buffered WPXSvInputStream

Change-Id: I8bb2632cb018093d02e21090e77bb48364f99268
Reviewed-on: https://gerrit.libreoffice.org/7146
Reviewed-by: David Tardon 
Tested-by: David Tardon 
(cherry picked from commit c56c2e28ff4252aa858826416a8a57cb8c2bf100)

Simplify this condition a bit

Change-Id: Iceef995be9ff55306550e56a0be87dddab7a78c3
(cherry picked from commit c85456b01bd8dd12792b76fb393f893496461c5c)

Avoid some memcpy when not necessary

Change-Id: I9b838fc8392bc61be4ed911fb1423a1e97af2356
(cherry picked from commit 4b4a870b176cf5ff9ee84fc5b16f4df1d8eeef94)
Reviewed-on: https://gerrit.libreoffice.org/7279
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/writerperfect/source/common/WPXSvStream.cxx 
b/writerperfect/source/common/WPXSvStream.cxx
index dd35311..86e835b 100644
--- a/writerperfect/source/common/WPXSvStream.cxx
+++ b/writerperfect/source/common/WPXSvStream.cxx
@@ -37,7 +37,7 @@ typedef struct
 SotStorageStreamRef ref;
 } SotStorageStreamRefWrapper;
 
-class WPXSvInputStreamImpl : public WPXInputStream
+class WPXSvInputStreamImpl
 {
 public :
 WPXSvInputStreamImpl( ::com::sun::star::uno::Reference<
@@ -48,27 +48,35 @@ public :
 WPXInputStream * getDocumentOLEStream(const char *name);
 
 const unsigned char *read(unsigned long numBytes, unsigned long 
&numBytesRead);
-int seek(long offset, WPX_SEEK_TYPE seekType);
+int seek(long offset);
 long tell();
 bool atEOS();
+void invalidateReadBuffer();
 private:
 ::std::vector< SotStorageRefWrapper > mxChildrenStorages;
 ::std::vector< SotStorageStreamRefWrapper > mxChildrenStreams;
 ::com::sun::star::uno::Reference<
-::com::sun::star::io::XInputStream > mxStream;
+::com::sun::star::io::XInputStream > mxStream;
 ::com::sun::star::uno::Reference<
-::com::sun::star::io::XSeekable > mxSeekable;
+::com::sun::star::io::XSeekable > mxSeekable;
 ::com::sun::star::uno::Sequence< sal_Int8 > maData;
+public:
 sal_Int64 mnLength;
+unsigned char *mpReadBuffer;
+unsigned long mnReadBufferLength;
+unsigned long mnReadBufferPos;
 };
 
 WPXSvInputStreamImpl::WPXSvInputStreamImpl( Reference< XInputStream > xStream 
) :
-WPXInputStream(),
 mxChildrenStorages(),
 mxChildrenStreams(),
 mxStream(xStream),
 mxSeekable(xStream, UNO_QUERY),
-maData(0)
+maData(0),
+mnLength(0),
+mpReadBuffer(0),
+mnReadBufferLength(0),
+mnReadBufferPos(0)
 {
 if (!xStream.is() || !mxStream.is())
 mnLength = 0;
@@ -93,6 +101,8 @@ WPXSvInputStreamImpl::WPXSvInputStreamImpl( Reference< 
XInputStream > xStream )
 
 WPXSvInputStreamImpl::~WPXSvInputStreamImpl()
 {
+if (mpReadBuffer)
+delete [] mpReadBuffer;
 }
 
 const unsigned char *WPXSvInputStreamImpl::read(unsigned long numBytes, 
unsigned long &numBytesRead)
@@ -122,7 +132,7 @@ long WPXSvInputStreamImpl::tell()
 }
 }
 
-int WPXSvInputStreamImpl::seek(long offset, WPX_SEEK_TYPE seekType)
+int WPXSvInputStreamImpl::seek(long offset)
 {
 if ((mnLength == 0) || !mxStream.is() || !mxSeekable.is())
 return -1;
@@ -131,28 +141,10 @@ int WPXSvInputStreamImpl::seek(long offset, WPX_SEEK_TYPE 
seekType)
 if ((tmpPosition < 0) || (tmpPosition > 
(std::numeric_limits::max)()))
 return -1;
 
-sal_Int64 tmpOffset = offset;
-if (seekType == WPX_SEEK_CUR)
-tmpOffset += tmpPosition;
-if (seekType == WPX_SEEK_END)
-tmpOffset += mnLength;
-
-int retVal = 0;
-if (tmpOffset < 0)
-{
-tmpOffset = 0;
-retVal = -1;
-}
-if (tmpOffset > mnLength)
-{
-tmpOffset = mnLength;
-retVal = -1;
-}
-
 try
 {
-mxSeekable->seek(tmpOffset);
-return retVal;
+mxSeekable->seek(offset);
+return 0;
 }
 catch (...)
 {
@@ -255,6 +247,18 @@ WPXInputStream 
*WPXSvInputStreamImpl::getDocumentOLEStream(const char *name)
 }
 
 
+void WPXSvInputStreamImpl::invalidateReadBuffer()
+{
+if (mpReadBuffer)
+{
+seek((long) tell() + (long)mnReadBufferPos - (long)mnReadBufferLength);
+delete [] mpReadBuffer;
+mpReadBuffer = 0;
+mnReadBufferPos = 0;
+mnReadBufferLength = 0;
+}
+}
+
 WPXSvInputStream::WPXSvInputStream( Reference< XInputStream > xStream ) :
 mpImpl(new WPXSvInputStreamImpl(xStream))
 {
@@ -262,36 +266,122 @@ WPXSvInputStream::WPXSvInputStream( Reference< 
XInputStream > xStream ) :
 
 WPXSvInputStream::~WPXSvInputStream()
 {
-   delete mpImpl;
+   if (mpImpl)
+   delete mpImpl;
 }
 
+#define BUFFER_MAX 65536
+
 const unsigned char *WPXSvInputStream

Re: help in debug LibreOffice

[Lionel Elie Mamane]

On Wed, Jan 01, 2014 at 03:43:45PM -0200, Olivier Hallot wrote:
> Em 01-01-2014 09:13, Miklos Vajna escreveu:
>> On Wed, Jan 01, 2014 at 08:33:53AM -0200, Olivier Hallot 
>>  wrote:
>>> (gdb) b DataSourceTabPage::DataSourceTabPage

>> That class is in the chart namespace. You can try if "b
>> chart::DataSourceTabPage::DataSourceTabPage" works.

> Thanks Miklos, the namespace was the one to blame..

To avoid that kind of problems where I set a breakpoint on the wrong
name, I usually *first* run LibreOffice, loading all appropriate
modules (usually, opening the document is enough; else reproduce the
bug once) and *then* I set the breakpoint (just hit CTRL-C in the gdb
window, issue the "break" command and then "continue").

Then there is not need to make the breakpoint pending. If gdb asks to
do that, then I know the name is wrong :)

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 7f/c467773e73586e5fb457eab043cb1823207900

[Caolán McNamara]

 7f/c467773e73586e5fb457eab043cb1823207900 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ba50b9454630a1145bb0024f3f3656954dd520b4
Author: Caolán McNamara 
Date:   Mon Jan 6 16:25:44 2014 +

Notes added by 'git notes add'

diff --git a/7f/c467773e73586e5fb457eab043cb1823207900 
b/7f/c467773e73586e5fb457eab043cb1823207900
new file mode 100644
index 000..8a2345e
--- /dev/null
+++ b/7f/c467773e73586e5fb457eab043cb1823207900
@@ -0,0 +1 @@
+ignore: fixed
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - c3/1988351c10e9f3fd783730d95da34efd52c153

[Caolán McNamara]

 c3/1988351c10e9f3fd783730d95da34efd52c153 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 938c732a27ecdac8b4d3eebab86ab69b72101019
Author: Caolán McNamara 
Date:   Mon Jan 6 16:32:39 2014 +

Notes added by 'git notes add'

diff --git a/c3/1988351c10e9f3fd783730d95da34efd52c153 
b/c3/1988351c10e9f3fd783730d95da34efd52c153
new file mode 100644
index 000..eb07e21
--- /dev/null
+++ b/c3/1988351c10e9f3fd783730d95da34efd52c153
@@ -0,0 +1 @@
+merged as: 9e77ddcd19d328c54ed0fb3ebb83f585b85f0249
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Bugreport 32506

[Lionel Elie Mamane]

On Thu, Dec 26, 2013 at 08:50:07PM +0100, Jochen Schiffers wrote:
> on GE-user-ML is been discussed the bugreport 32506
> (https://bugs.freedesktop.org/show_bug.cgi?id=32506). See you any
> possibility to solve the problem?

If designed properly, this could be a nice feature. I take
patches. In other words: unlikely I will do it soon, but I'll help
anybody that wants to do it.

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

[Libreoffice-commits] cppunit.git: Branch 'feature/cmake' - CMakeLists.txt examples/CMakeLists.txt examples/qt

[Bernhard Sessler]

 CMakeLists.txt |5 +
 examples/CMakeLists.txt|3 +++
 examples/qt/CMakeLists.txt |   21 +
 3 files changed, 29 insertions(+)

New commits:
commit 9d8fffbf39ece34d1d4fb315beac1f8967a12bbe
Author: Bernhard Sessler 
Date:   Sun Dec 22 15:22:28 2013 +0100

examples: Add Qt test runner example to CMake build system

The new CMake build option 'CPPUNIT_BUILD_EXAMPLES' (OFF by default)
decides whether to build the example programs or not.

Change-Id: I6694f224bcf9c0c5131c9a1810c6565ad91626b7
Signed-off-by: Bernhard Sessler 
Reviewed-on: https://gerrit.libreoffice.org/7185
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0427289..3e6c407 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,6 +18,7 @@ include(Versioning)
 option(BUILD_SHARED_LIBS   "Build cppunit as shared or static library" 
   ON)
 option(CPPUNIT_BUILD_APIDOC"Adds a build target for generating the API 
documentation" OFF)
 option(CPPUNIT_BUILD_QT_TESTRUNNER "Build the Qt test runner library"  
   OFF)
+option(CPPUNIT_BUILD_EXAMPLES  "Build the examples shipped with cppunit"   
   OFF)
 
 if(BUILD_SHARED_LIBS AND WIN32)
 add_definitions(-DCPPUNIT_BUILD_DLL)
@@ -35,6 +36,10 @@ include_directories("${CMAKE_CURRENT_BINARY_DIR}/include")
 add_subdirectory(include)
 add_subdirectory(src)
 
+if(CPPUNIT_BUILD_EXAMPLES)
+add_subdirectory(examples)
+endif()
+
 if(CPPUNIT_BUILD_APIDOC)
 add_subdirectory(doc)
 endif()
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
new file mode 100644
index 000..0c26262
--- /dev/null
+++ b/examples/CMakeLists.txt
@@ -0,0 +1,3 @@
+if(CPPUNIT_BUILD_QT_TESTRUNNER)
+add_subdirectory(qt)
+endif()
diff --git a/examples/qt/CMakeLists.txt b/examples/qt/CMakeLists.txt
new file mode 100644
index 000..ea9d142
--- /dev/null
+++ b/examples/qt/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Include the current binary dir, so files produced by moc can be found
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+# Common source files
+set(qt_example_SOURCES
+ExampleTestCases.cpp
+Main.cpp
+)
+
+# Create the test runner executable
+add_executable(qt_example ${qt_example_SOURCES})
+target_link_libraries(qt_example cppunit-qttestrunner)
+
+if(Qt5_POSITION_INDEPENDENT_CODE)
+set_target_properties(qt_example PROPERTIES POSITION_INDEPENDENT_CODE ON)
+endif()
+
+# Create install target
+install(TARGETS qt_example
+RUNTIME DESTINATION bin
+COMPONENT examples)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basic/source dtrans/source extensions/source sc/source sd/source svx/source toolkit/source vcl/quartz

[Herbert Dürr]

 basic/source/comp/parser.cxx |2 -
 basic/source/comp/token.cxx  |4 +-
 basic/source/inc/token.hxx   |2 -
 dtrans/source/win32/clipb/WinClipboard.cxx   |2 -
 extensions/source/logging/filehandler.cxx|2 -
 extensions/source/propctrlr/composeduiupdate.cxx |2 -
 extensions/source/propctrlr/eformspropertyhandler.cxx|2 -
 extensions/source/propctrlr/propcontroller.cxx   |2 -
 extensions/source/propctrlr/propertycomposer.cxx |2 -
 extensions/source/propctrlr/submissionhandler.cxx|2 -
 extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx |2 -
 sc/source/core/data/documen3.cxx |2 -
 sc/source/core/data/dpsave.cxx   |4 +-
 sc/source/core/data/table5.cxx   |2 -
 sc/source/ui/Accessibility/AccessibleText.cxx|2 -
 sc/source/ui/unoobj/chart2uno.cxx|6 +--
 sd/source/ui/accessibility/AccessibleSlideSorterView.cxx |2 -
 sd/source/ui/tools/PreviewRenderer.cxx   |4 +-
 svx/source/dialog/svxruler.cxx   |   18 +--
 svx/source/form/formcontroller.cxx   |2 -
 toolkit/source/helper/formpdfexport.cxx  |2 -
 vcl/quartz/salbmp.cxx|2 -
 22 files changed, 35 insertions(+), 35 deletions(-)

New commits:
commit 9e77ddcd19d328c54ed0fb3ebb83f585b85f0249
Author: Herbert Dürr 
Date:   Mon Jan 6 14:10:06 2014 +

Resolves: #i123817# prepare codebase for updating to boost 1.55

(cherry picked from commit c31988351c10e9f3fd783730d95da34efd52c153)

Conflicts:
basic/source/comp/parser.cxx
basic/source/comp/token.cxx
dbaccess/source/ui/dlg/generalpage.cxx
sc/source/ui/unoobj/chart2uno.cxx
vcl/quartz/salbmp.cxx

Change-Id: Ic9580f2d4a44959cb3e38906eb4153b2c2a54899

diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx
index da4420b..a132e89 100644
--- a/basic/source/comp/parser.cxx
+++ b/basic/source/comp/parser.cxx
@@ -758,7 +758,7 @@ void SbiParser::Option()
 {
 switch( Next() )
 {
-case EXPLICIT:
+case BASIC_EXPLICIT:
 bExplicit = true; break;
 case BASE:
 if( Next() == NUMBER )
diff --git a/basic/source/comp/token.cxx b/basic/source/comp/token.cxx
index bc0519d..d283f2e 100644
--- a/basic/source/comp/token.cxx
+++ b/basic/source/comp/token.cxx
@@ -96,7 +96,7 @@ static const TokenTable aTokTable_Basic [] = {
 { ERASE,"Erase" },
 { _ERROR_,  "Error" },
 { EXIT, "Exit" },
-{ EXPLICIT, "Explicit" },
+{ BASIC_EXPLICIT, "Explicit" },
 { FOR,  "For" },
 { FUNCTION, "Function" },
 { GET,  "Get" },
@@ -192,7 +192,7 @@ TokenLabelInfo::TokenLabelInfo( void )
 }
 // Token accepted as label by VBA
 SbiToken eLabelToken[] = { ACCESS, ALIAS, APPEND, BASE, BINARY, 
CLASSMODULE,
-   COMPARE, COMPATIBLE, DEFERR, _ERROR_, EXPLICIT, 
LIB, LINE, LPRINT, NAME,
+   COMPARE, COMPATIBLE, DEFERR, _ERROR_, 
BASIC_EXPLICIT, LIB, LINE, LPRINT, NAME,
TOBJECT, OUTPUT, PROPERTY, RANDOM, READ, STEP, 
STOP, TEXT, VBASUPPORT, NIL };
 SbiToken* pTok = eLabelToken;
 SbiToken eTok;
diff --git a/basic/source/inc/token.hxx b/basic/source/inc/token.hxx
index cb40559..0b6482a 100644
--- a/basic/source/inc/token.hxx
+++ b/basic/source/inc/token.hxx
@@ -89,7 +89,7 @@ enum SbiToken {
 NUMBER=FIRSTEXTRA, FIXSTRING, SYMBOL, _CDECL_, BYVAL, BYREF,
 OUTPUT, RANDOM, APPEND, BINARY, ACCESS,
 LOCK, READ, PRESERVE, BASE, ANY, LIB, _OPTIONAL_,
-EXPLICIT, COMPATIBLE, CLASSMODULE, PARAMARRAY, WITHEVENTS,
+BASIC_EXPLICIT, COMPATIBLE, CLASSMODULE, PARAMARRAY, WITHEVENTS,
 
 // from here there are JavaScript-tokens (same enum so that same type)
 FIRSTJAVA,
diff --git a/dtrans/source/win32/clipb/WinClipboard.cxx 
b/dtrans/source/win32/clipb/WinClipboard.cxx
index cd08ec6..59bc8be 100644
--- a/dtrans/source/win32/clipb/WinClipboard.cxx
+++ b/dtrans/source/win32/clipb/WinClipboard.cxx
@@ -265,7 +265,7 @@ void SAL_CALL CWinClipboard::disposing()
 m_pImpl->dispose( );
 
 // force destruction of the impl class
-m_pImpl.reset( NULL );
+m_pImpl.reset();
 }
 
 // -
diff --git a/extensions/source/logging/filehandler.cxx 
b/extensions/source/logging/filehandler.cxx
index e600315..d2dc622 100644
--- a/extensions/source/logging/filehandler.cxx
+++ b/extensions/source/logging/filehandler.cxx
@@ -247,7 +247,7 @@ namespace logging
 impl_writeString_nothrow( sTail );
 

[Libreoffice-commits] cppunit.git: Branch 'feature/cmake' - 2 commits - CMakeLists.txt cmake/SelectQtVersion.cmake examples/qt include/CMakeLists.txt src/CMakeLists.txt src/qttestrunner

[Bernhard Sessler]

 CMakeLists.txt   |   12 +-
 cmake/SelectQtVersion.cmake  |   43 +
 examples/qt/ExampleTestCases.cpp |   48 +--
 examples/qt/ExampleTestCases.h   |   32 --
 examples/qt/Main.cpp |   18 --
 examples/qt/qt_example.pro   |   67 +++
 include/CMakeLists.txt   |   12 ++
 src/CMakeLists.txt   |4 ++
 src/qttestrunner/CMakeLists.txt  |   43 +
 9 files changed, 175 insertions(+), 104 deletions(-)

New commits:
commit f9374cf4589f8128be6962238bbcaff4e16720cb
Author: Bernhard Sessler 
Date:   Sun Dec 22 15:16:50 2013 +0100

src/qttestrunner: Add CMake build system

This will allow building the qt test runner by using the CMake build
system. The new CMake option 'CPPUNIT_BUILD_QT_TESTRUNNER' (OFF by
default) can be used to build the test runner (switch these options
ON and OFF by running the CMake built-in 'edit_cache' build target,
e.g. using Linux / GNU make this would be 'make edit_cache', NMake
based build systems would run 'nmake edit_cache').

Change-Id: Ifead1e2cd9162c74b8a212daf93f4bbad9f6c1f3
Signed-off-by: Bernhard Sessler 
Reviewed-on: https://gerrit.libreoffice.org/7184
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 97baafe..0427289 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,6 +4,9 @@ cmake_minimum_required(VERSION 2.8.7)
 
 # Add project specific CMake module path
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
 
 # Perform platform and compiler feature checks
 include(PlatformChecks)
@@ -12,13 +15,18 @@ include(PlatformChecks)
 include(Versioning)
 
 # Build options
-option(BUILD_SHARED_LIBS"Build cppunit as shared or static library"
ON)
-option(CPPUNIT_BUILD_APIDOC "Adds a build target for generating the API 
documentation" OFF)
+option(BUILD_SHARED_LIBS   "Build cppunit as shared or static library" 
   ON)
+option(CPPUNIT_BUILD_APIDOC"Adds a build target for generating the API 
documentation" OFF)
+option(CPPUNIT_BUILD_QT_TESTRUNNER "Build the Qt test runner library"  
   OFF)
 
 if(BUILD_SHARED_LIBS AND WIN32)
 add_definitions(-DCPPUNIT_BUILD_DLL)
 endif()
 
+if(CPPUNIT_BUILD_QT_TESTRUNNER)
+include(SelectQtVersion)
+endif()
+
 # Include paths
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include")
 include_directories("${CMAKE_CURRENT_BINARY_DIR}/include")
diff --git a/cmake/SelectQtVersion.cmake b/cmake/SelectQtVersion.cmake
new file mode 100644
index 000..4cfb4d5
--- /dev/null
+++ b/cmake/SelectQtVersion.cmake
@@ -0,0 +1,43 @@
+##
+# Projectname - Redmine:Administration
+# Author  - Bernhard Sessler 
+# Description - Depending on the variable WITH_QT5 search either for Qt5 or 
Qt4 libs
+#
+# (c) 2013, Corscience GmbH & Co. KG
+##
+
+if(NOT WITH_QT)
+set(WITH_QT 5)
+endif()
+
+# Find Qt5
+if(WITH_QT EQUAL 5)
+set(QT5_REQUIRED_MODULES Widgets)
+
+find_package(Qt5 REQUIRED COMPONENTS ${QT5_REQUIRED_MODULES})
+
+foreach(_submodule ${QT5_REQUIRED_MODULES})
+   include_directories(${Qt5${_submodule}_INCLUDE_DIRS})
+   list(APPEND QT_LIBRARIES ${Qt5${_submodule}_LIBRARIES})
+endforeach()
+
+set(QT_LIBRARIES_FOUND ${Qt5Widgets_FOUND})
+
+# Find Qt4
+elseif(WITH_QT EQUAL 4)
+set(QT4_REQUIRED_MODULES QtCore QtGui)
+
+find_package(Qt4 REQUIRED COMPONENTS ${QT4_REQUIRED_MODULES})
+include(${QT_USE_FILE})
+
+foreach(_submodule ${QT4_REQUIRED_MODULES})
+   string(TOUPPER _submodule _var)
+   list(APPEND QT_LIBRARIES ${QT_${_var}_LIBRARY})
+endforeach()
+
+set(QT_LIBRARIES_FOUND ${QT_QTGUI_FOUND})
+
+# Unsupported version
+else()
+message(SEND_ERROR "Unsupported Qt version specified. Set WITH_QT to 
either 4 or 5")
+endif()
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 142eeda..4e30800 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -2,4 +2,14 @@
 configure_file(config-auto.h.in 
"${CMAKE_CURRENT_BINARY_DIR}/cppunit/config-auto.h")
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/cppunit/config-auto.h" DESTINATION 
include/cppunit)
 
-install(DIRECTORY cppunit DESTINATION include FILES_MATCHING PATTERN "*.h")
+install(DIRECTORY cppunit
+DESTINATION include
+FILES_MATCHING  PATTERN "*.h"
+PATTERN "ui/qt" EXCLUDE
+PATTERN "ui/mfc" EXCLUDE)
+
+if(CPPUNIT_BUILD_QT_TESTRUNNER)
+install(DIRECTORY cppunit/ui/qt
+DESTINATION include/cppunit/ui
+FILES_MATCHING PATTERN "*.h")
+endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
in

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

[Kohei Yoshida]

 sc/qa/unit/ucalc.cxx |   40 
 sc/qa/unit/ucalc.hxx |7 +++
 2 files changed, 47 insertions(+)

New commits:
commit 4796d5dde115cc56eeddb67f38ce7b9f490e886d
Author: Kohei Yoshida 
Date:   Mon Jan 6 11:33:00 2014 -0500

Add unit test for getting data entries. This used to crash at MAXROW.

Change-Id: Ia904f69ddebcbd61e4ad3b97a0ace3db2d3a33e7

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 283f763..cd0a9f3 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -636,6 +636,46 @@ void Test::testInput()
 m_pDoc->DeleteTab(0);
 }
 
+void Test::testDataEntries()
+{
+m_pDoc->InsertTab(0, "Test");
+
+m_pDoc->SetString(ScAddress(0,5,0), "Andy");
+m_pDoc->SetString(ScAddress(0,6,0), "Bruce");
+m_pDoc->SetString(ScAddress(0,7,0), "Charlie");
+m_pDoc->SetString(ScAddress(0,10,0), "Andy");
+
+std::vector aEntries;
+m_pDoc->GetDataEntries(0, 0, 0, true, aEntries); // Try at the very top.
+
+// Entries are supposed to be sorted in ascending order, and are all 
unique.
+CPPUNIT_ASSERT_EQUAL(static_cast(3), aEntries.size());
+std::vector::const_iterator it = aEntries.begin();
+CPPUNIT_ASSERT_EQUAL(OUString("Andy"), it->GetString());
+++it;
+CPPUNIT_ASSERT_EQUAL(OUString("Bruce"), it->GetString());
+++it;
+CPPUNIT_ASSERT_EQUAL(OUString("Charlie"), it->GetString());
+++it;
+CPPUNIT_ASSERT_MESSAGE("The entries should have ended here.", it == 
aEntries.end());
+
+aEntries.clear();
+m_pDoc->GetDataEntries(0, MAXROW, 0, true, aEntries); // Try at the very 
bottom.
+CPPUNIT_ASSERT_EQUAL(static_cast(3), aEntries.size());
+
+// Make sure we get the same set of suggestions.
+it = aEntries.begin();
+CPPUNIT_ASSERT_EQUAL(OUString("Andy"), it->GetString());
+++it;
+CPPUNIT_ASSERT_EQUAL(OUString("Bruce"), it->GetString());
+++it;
+CPPUNIT_ASSERT_EQUAL(OUString("Charlie"), it->GetString());
+++it;
+CPPUNIT_ASSERT_MESSAGE("The entries should have ended here.", it == 
aEntries.end());
+
+m_pDoc->DeleteTab(0);
+}
+
 void Test::testCopyAttributes()
 {
 CPPUNIT_ASSERT_MESSAGE ("mashed up attributes", !(IDF_ATTRIB & 
IDF_CONTENTS));
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index 9ccc85a..6bbc86a 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -84,6 +84,12 @@ public:
 void testRangeList();
 void testInput();
 
+/**
+ * The 'data entries' data is a list of strings used for suggestions as
+ * the user types in new cell value.
+ */
+void testDataEntries();
+
 void testFormulaCreateStringFromTokens();
 void testFormulaParseReference();
 void testFetchVectorRefArray();
@@ -299,6 +305,7 @@ public:
 CPPUNIT_TEST(testSharedStringPool);
 CPPUNIT_TEST(testRangeList);
 CPPUNIT_TEST(testInput);
+CPPUNIT_TEST(testDataEntries);
 CPPUNIT_TEST(testFormulaCreateStringFromTokens);
 CPPUNIT_TEST(testFormulaParseReference);
 CPPUNIT_TEST(testFetchVectorRefArray);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac download.lst external/python3

[Michael Stahl]

 configure.ac|2 
 download.lst|2 
 external/python3/ExternalPackage_python3.mk |   14 +-
 external/python3/UnpackedTarball_python3.mk |   11 -
 external/python3/i100492-freebsd.patch.1|2 
 external/python3/python-3.3.0-15833.patch.1 |   28 
 external/python3/python-3.3.0-aix.patch.1   |  156 
 external/python3/python-3.3.0-elf-rpath.patch.1 |   13 --
 external/python3/python-3.3.0-ffi-clang.patch.1 |   40 --
 external/python3/python-3.3.3-aix.patch.1   |  145 ++
 external/python3/python-3.3.3-elf-rpath.patch.1 |   13 ++
 11 files changed, 170 insertions(+), 256 deletions(-)

New commits:
commit 45c537a1185dfca7e51229dde9e9220e5174bd57
Author: Michael Stahl 
Date:   Mon Jan 6 16:05:56 2014 +0100

fdo#73087: python3: upgrade to version 3.3.3

- drop obsolete/upstreamed patches:
  python-3.3.0-ffi-clang.patch.1
  python-3.3.0-15833.patch.1
  one hunk of python-3.3.0-aix.patch.1 in fficonfig.py.in

Change-Id: I12f0f78a172067986b63455847015ea2430a084c
Reviewed-on: https://gerrit.libreoffice.org/7278
Tested-by: LibreOffice gerrit bot 
Reviewed-by: Michael Stahl 

diff --git a/configure.ac b/configure.ac
index 2047a6b..67efcce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8175,7 +8175,7 @@ internal)
 SYSTEM_PYTHON=NO
 PYTHON_VERSION_MAJOR=3
 PYTHON_VERSION_MINOR=3
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.0
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.3
 BUILD_TYPE="$BUILD_TYPE PYTHON"
 # Embedded Python dies without Home set
 if test "$HOME" = ""; then
diff --git a/download.lst b/download.lst
index 6ab97a7..5cd4914 100644
--- a/download.lst
+++ b/download.lst
@@ -92,7 +92,7 @@ export PIXMAN_TARBALL := 
c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
 export PNG_TARBALL := 9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz
 export POPPLER_TARBALL := 
1cd27460f7e3379d1eb109cfd7bcdb39-poppler-0.22.5.tar.gz
 export POSTGRESQL_TARBALL := 
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
-export PYTHON_TARBALL := b3b2524f72409d919a4137826a870a8f-Python-3.3.0.tar.bz2
+export PYTHON_TARBALL := f3ebe34d4d8695bf889279b54673e10c-Python-3.3.3.tar.bz2
 export RAPTOR_TARBALL := 4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz
 export RASQAL_TARBALL := b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz
 export REDLAND_TARBALL := 
32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz
diff --git a/external/python3/ExternalPackage_python3.mk 
b/external/python3/ExternalPackage_python3.mk
index ac8e856..1b83bd2 100644
--- a/external/python3/ExternalPackage_python3.mk
+++ b/external/python3/ExternalPackage_python3.mk
@@ -114,6 +114,13 @@ endif
 # headers are not delivered, but used from unpacked dir Include/
 # (+ toplevel for pyconfig.h)
 
+# that one is generated...
+ifneq ($(OS)-$(COM),WNT-MSC)
+$(eval $(call 
gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\
+   LO_lib/_sysconfigdata.py \
+))
+endif
+
 # packages not shipped:
 # dbm, sqlite3 - need some database stuff
 # curses - need curses to build the C module
@@ -148,13 +155,6 @@ $(eval $(call 
gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
Lib/plat-aix4/IN.py \
 ))
 
-# that one is generated...
-ifneq ($(OS)-$(COM),WNT-MSC)
-$(eval $(call 
gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\
-   Lib/_sysconfigdata.py \
-))
-endif
-
 $(eval $(call 
gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\
LICENSE \
Lib/__future__.py \
diff --git a/external/python3/UnpackedTarball_python3.mk 
b/external/python3/UnpackedTarball_python3.mk
index 62cc55e..200a9e13 100644
--- a/external/python3/UnpackedTarball_python3.mk
+++ b/external/python3/UnpackedTarball_python3.mk
@@ -22,28 +22,21 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,python3,\
 $(eval $(call gb_UnpackedTarball_add_patches,python3,\
external/python3/i100492-freebsd.patch.1 \
external/python3/python-3.3.0-i42553.patch.2 \
-   external/python3/python-3.3.0-aix.patch.1 \
+   external/python3/python-3.3.3-aix.patch.1 \
external/python3/python-3.3.0-darwin.patch.1 \
external/python3/python-3.3.0-msvc2012.patch.1 \
external/python3/python-3.3.0-msvc-disable.patch.1 \
external/python3/python-3.3.0-msvc-x64.patch.1 \
external/python3/python-3.3.0-ssl.patch.1 \
external/python3/python-3.3.0-implicit-int.patch.1 \
-   external/python3/python-3.3.0-ffi-clang.patch.1 \
external/python3/python-3.3.0-gcc-4.8.patch.1 \
external/python3/python-3.3.0-pythreadstate.patch.1 \
external/python3/python-3.3.0-clang.patch.1 \
 ))
 
-ifneq ($(OS),WNT)
-$(ev

Re: [libreoffice-projects] [ANN] LIbreOffice 4.2.0 RC1 available

[Norbert Thiebaud]

On Mon, Jan 6, 2014 at 8:42 AM, Stephan Bergmann  wrote:
> On 12/20/2013 09:36 PM, Norbert Thiebaud wrote:
>>
>> both should work for 10.9... I would just like a confirmation that the
>> 64 bits build works (which I think it does... as the problem seems to
>> be tied to the signing of the Python Framework.. which is not
>> delivered in the 64 bits build (unnecessary since the target 10.8+
>> already have a suitable system python)
>
>
> FYI:  Using PyUNO from within a standalone python executable requires
> special precautions (cf. pyuno/zipcore/) which are typically not met in the
> --enable-python=system case.  (In other words: the assumption that, given a
> suitable system Python, --enable-python=system is a drop-in replacement for
> --enable-python=internal is wrong.)
>
ok then.. I should use --enable-python=internal then on mac, always ?
/me recal that cloph had quite a log of fun back then with python
combinaison and making the packaging 'works'

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

Re: ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx seems unused

[Eike Rathke]

Hi julien2412,

On Saturday, 2014-01-04 03:50:19 -0800, julien2412 wrote:

> Cppcheck reported this:
> ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx
> 123   syntaxError error   Invalid number of character (() when these 
> macros are
> defined: ''.
> 
> Indeed we have:
>  123 aBodyText = "" + aBodyText + "" );
> See
> http://opengrok.libreoffice.org/xref/core/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx#123
> 
> Should this part be removed or do I lack a config option to build this
> specific part?

Remove the closing parenthesis please, that would never build. It's
a leftover of 89633c6da1cde46983926dcc2e0f8e08de0e9378

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Support the FSFE, care about Free Software! https://fsfe.org/support/?erack


pgpTPBhJ8vPi0.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Lionel Elie Mamane]

 connectivity/source/drivers/jdbc/CallableStatement.cxx |4 
 connectivity/source/drivers/jdbc/PreparedStatement.cxx |5 +
 2 files changed, 9 insertions(+)

New commits:
commit 01329972d89ddfd30d197b7947c571fdb83b0cf8
Author: Lionel Elie Mamane 
Date:   Mon Jan 6 16:40:59 2014 +0100

fdo#37167 create statement before execute/wasNull/getBoolean

This populates "object" member variable.

The "createStatement" calls were removed in:

 commit b9392a36645d8632b97ad79240f483b3a1683b61
 Author: Ivo Hinkelmann 
 Date:   Thu Apr 23 10:42:05 2009 +

CWS-TOOLING: integrate CWS dbaperf1

This was most probably in error since the call is not removed from the
other modified member functions in this commit and/or failed to
aaccount for the scenario of no parameter (and thus no setXXX call
before execute).

Change-Id: Ic0e7b7b64ea496791f32c1416aa7d4416f909616

diff --git a/connectivity/source/drivers/jdbc/CallableStatement.cxx 
b/connectivity/source/drivers/jdbc/CallableStatement.cxx
index 7ab349f..50cce64 100644
--- a/connectivity/source/drivers/jdbc/CallableStatement.cxx
+++ b/connectivity/source/drivers/jdbc/CallableStatement.cxx
@@ -69,12 +69,16 @@ Any SAL_CALL java_sql_CallableStatement::queryInterface( 
const Type & rType ) th
 // -
 sal_Bool SAL_CALL java_sql_CallableStatement::wasNull(  ) 
throw(starsdbc::SQLException, RuntimeException)
 {
+SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
+createStatement(t.pEnv);
 static jmethodID mID(NULL);
 return callBooleanMethod( "wasNull", mID );
 }
 
 sal_Bool SAL_CALL java_sql_CallableStatement::getBoolean( sal_Int32 
columnIndex ) throw(starsdbc::SQLException, RuntimeException)
 {
+SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
+createStatement(t.pEnv);
 static jmethodID mID(NULL);
 return callBooleanMethodWithIntArg( "getBoolean", mID,columnIndex );
 }
diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx 
b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
index 59a4b29..774d130 100644
--- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx
+++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
@@ -96,6 +96,8 @@ sal_Bool SAL_CALL java_sql_PreparedStatement::execute(  ) 
throw(::com::sun::star
 ::osl::MutexGuard aGuard( m_aMutex );
 checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
 
+SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
+createStatement(t.pEnv);
 static jmethodID mID(NULL);
 return callBooleanMethod( "execute", mID );
 }
@@ -106,6 +108,9 @@ sal_Int32 SAL_CALL 
java_sql_PreparedStatement::executeUpdate(  ) throw(::com::su
 ::osl::MutexGuard aGuard( m_aMutex );
 checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
 m_aLogger.log( LogLevel::FINE, STR_LOG_EXECUTING_PREPARED_UPDATE );
+
+SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
+createStatement(t.pEnv);
 static jmethodID mID(NULL);
 return callIntMethod("executeUpdate",mID);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

 package/source/xstor/owriteablestream.cxx |2 +-
 package/source/xstor/xstorage.cxx |6 ++
 package/source/xstor/xstorage.hxx |8 
 3 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit 1ae9fdb294fe063a55e34188b249c5e0d908ddcf
Author: Michael Meeks 
Date:   Sun Jan 5 01:26:50 2014 +

package: avoid un-necessary modification event work.

Change-Id: Ia4b4e3edccf661b8c5f474c5c7474b5f9e497fcc
Reviewed-on: https://gerrit.libreoffice.org/7282
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/package/source/xstor/owriteablestream.cxx 
b/package/source/xstor/owriteablestream.cxx
index 9d987a5..c3a2591 100644
--- a/package/source/xstor/owriteablestream.cxx
+++ b/package/source/xstor/owriteablestream.cxx
@@ -1861,7 +1861,7 @@ void OWriteStream::ModifyParentUnlockMutex_Impl( 
::osl::ResettableMutexGuard& aG
 {
 if ( m_pImpl->m_pParent )
 {
-if ( m_pImpl->m_pParent->m_pAntiImpl )
+if ( m_pImpl->m_pParent->HasModifiedListener() )
 {
 uno::Reference< util::XModifiable > xParentModif( 
(util::XModifiable*)(m_pImpl->m_pParent->m_pAntiImpl) );
 aGuard.clear();
diff --git a/package/source/xstor/xstorage.cxx 
b/package/source/xstor/xstorage.cxx
index 9a78782..9e2ffb7 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -191,6 +191,7 @@ OStorage_Impl::OStorage_Impl(   uno::Reference< 
io::XInputStream > xInputStream,
 , m_bCommited( sal_False )
 , m_bIsRoot( sal_True )
 , m_bListCreated( sal_False )
+, m_nModifiedListenerCount( 0 )
 , m_xContext( xContext )
 , m_xProperties( xProperties )
 , m_bHasCommonEncryptionData( sal_False )
@@ -230,6 +231,7 @@ OStorage_Impl::OStorage_Impl(   uno::Reference< io::XStream 
> xStream,
 , m_bCommited( sal_False )
 , m_bIsRoot( sal_True )
 , m_bListCreated( sal_False )
+, m_nModifiedListenerCount( 0 )
 , m_xContext( xContext )
 , m_xProperties( xProperties )
 , m_bHasCommonEncryptionData( sal_False )
@@ -272,6 +274,7 @@ OStorage_Impl::OStorage_Impl(   OStorage_Impl* pParent,
 , m_bCommited( sal_False )
 , m_bIsRoot( sal_False )
 , m_bListCreated( sal_False )
+, m_nModifiedListenerCount( 0 )
 , m_xPackageFolder( xPackageFolder )
 , m_xPackage( xPackage )
 , m_xContext( xContext )
@@ -1959,6 +1962,7 @@ void SAL_CALL OStorage::InternalDispose( sal_Bool 
bNotifyImpl )
 // since the listeners could dispose the object while being notified
lang::EventObject aSource( static_cast< ::cppu::OWeakObject* >(this) );
 m_pData->m_aListenersContainer.disposeAndClear( aSource );
+m_pImpl->m_nModifiedListenerCount = 0;
 
 if ( m_pData->m_bReadOnlyWrap )
 {
@@ -4203,6 +4207,7 @@ void SAL_CALL OStorage::addModifyListener(
 throw lang::DisposedException( OSL_LOG_PREFIX, uno::Reference< 
uno::XInterface >() );
 }
 
+osl_atomic_increment( &m_pImpl->m_nModifiedListenerCount );
 m_pData->m_aListenersContainer.addInterface(
 ::getCppuType( ( const uno::Reference< 
util::XModifyListener >* )0 ), aListener );
 }
@@ -4219,6 +4224,7 @@ void SAL_CALL OStorage::removeModifyListener(
 throw lang::DisposedException( OSL_LOG_PREFIX, uno::Reference< 
uno::XInterface >() );
 }
 
+osl_atomic_decrement( &m_pImpl->m_nModifiedListenerCount );
 m_pData->m_aListenersContainer.removeInterface(
 ::getCppuType( ( const uno::Reference< 
util::XModifyListener >* )0 ), aListener );
 }
diff --git a/package/source/xstor/xstorage.hxx 
b/package/source/xstor/xstorage.hxx
index 039dd22..ccc0efe 100644
--- a/package/source/xstor/xstorage.hxx
+++ b/package/source/xstor/xstorage.hxx
@@ -124,11 +124,19 @@ struct OStorage_Impl
 sal_Int32   m_nStorageMode; // open mode ( 
read/write/trunc/nocreate )
 sal_Boolm_bIsModified;  // only modified elements will 
be sent to the original content
 sal_Boolm_bBroadcastModified;  // will be set if 
notification is required
+
 sal_Boolm_bCommited;// sending the streams is 
coordinated by the root storage of the package
 
 sal_Boolm_bIsRoot;  // marks this storage as root 
storages that manages all commits and reverts
 sal_Boolm_bListCreated;
 
+/// Count of registered modification listeners
+oslInterlockedCount m_nModifiedListenerCount;
+boolHasModifiedListener()
+{
+return m_nModifiedListenerCount > 0 && m_pAntiImpl != NULL;
+}
+
 SotElementList_Impl m_aChildrenList;
 SotElementList_Impl m_aDeletedList;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - basic/source boost/makefile.mk boost/prj dbaccess/source dtrans/source extensions/source external_deps.lst sc/source sd/source svx/sour

[Herbert Dürr]

 basic/source/comp/parser.cxx |2 
 basic/source/comp/token.cxx  |6 +-
 basic/source/inc/token.hxx   |2 
 boost/makefile.mk|   24 +--
 boost/prj/d.lst  |   22 ++
 dbaccess/source/filter/xml/xmlservices.cxx   |5 +-
 dbaccess/source/ui/dlg/generalpage.cxx   |4 -
 dtrans/source/win32/clipb/WinClipboard.cxx   |2 
 extensions/source/logging/filehandler.cxx|2 
 extensions/source/propctrlr/composeduiupdate.cxx |2 
 extensions/source/propctrlr/eformspropertyhandler.cxx|2 
 extensions/source/propctrlr/propcontroller.cxx   |2 
 extensions/source/propctrlr/propertycomposer.cxx |2 
 extensions/source/propctrlr/submissionhandler.cxx|2 
 extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx |2 
 external_deps.lst|8 +--
 sc/source/core/data/documen3.cxx |2 
 sc/source/core/data/dpsave.cxx   |4 -
 sc/source/core/data/table5.cxx   |2 
 sc/source/ui/Accessibility/AccessibleText.cxx|2 
 sc/source/ui/unoobj/chart2uno.cxx|   10 ++--
 sd/source/ui/accessibility/AccessibleSlideSorterView.cxx |2 
 sd/source/ui/tools/PreviewRenderer.cxx   |4 -
 svx/source/form/formcontroller.cxx   |2 
 toolkit/source/helper/formpdfexport.cxx  |2 
 vcl/aqua/source/gdi/salbmp.cxx   |2 
 26 files changed, 71 insertions(+), 50 deletions(-)

New commits:
commit 7fc467773e73586e5fb457eab043cb1823207900
Author: Herbert Dürr 
Date:   Mon Jan 6 15:58:21 2014 +

#i123964# reshuffle DLLEXPORT in dbaccess module

to fix the build with MSVC2008

diff --git a/dbaccess/source/filter/xml/xmlservices.cxx 
b/dbaccess/source/filter/xml/xmlservices.cxx
index 8165fb4..80d7626 100644
--- a/dbaccess/source/filter/xml/xmlservices.cxx
+++ b/dbaccess/source/filter/xml/xmlservices.cxx
@@ -65,7 +65,7 @@ extern "C" void SAL_CALL createRegistryInfo_dbaxml()
 
 
//---
 
-extern "C" void DBACCESS_DLLPUBLIC component_getImplementationEnvironment(
+extern "C" DBACCESS_DLLPUBLIC void component_getImplementationEnvironment(
 const sal_Char  **ppEnvTypeName,
 uno_Environment **
 )
@@ -75,7 +75,8 @@ extern "C" void DBACCESS_DLLPUBLIC 
component_getImplementationEnvironment(
 }
 
 
//---
-extern "C" void* DBACCESS_DLLPUBLIC component_getFactory(
+
+extern "C" DBACCESS_DLLPUBLIC void* component_getFactory(
 const sal_Char* pImplementationName,
 void* pServiceManager,
 void* /*pRegistryKey*/)
commit 04d077d34bd6ed991a279ea5921a8afbcd3993f2
Author: Herbert Dürr 
Date:   Mon Jan 6 14:11:28 2014 +

#i123817# update boost library to version 1.55

diff --git a/boost/makefile.mk b/boost/makefile.mk
index f77f15a..309d0a8 100644
--- a/boost/makefile.mk
+++ b/boost/makefile.mk
@@ -34,24 +34,18 @@ TARGET=ooo_boost
 
 .INCLUDE : settings.mk
 
-# force patched boost for sunpro CC
-# to workaround opt bug when compiling with -xO3
-.IF "$(SYSTEM_BOOST)" == "YES" && ("$(OS)"!="SOLARIS" || "$(COM)"=="GCC")
+.IF "$(SYSTEM_BOOST)" == "YES"
+
 all:
 @echo "An already available installation of boost should exist on your 
system."
 @echo "Therefore the version provided here does not need to be built in 
addition."
-.ELSE  # "$(SYSTEM_BOOST)" == "YES" && ("$(OS)"!="SOLARIS" || 
"$(COM)"=="GCC")
+
+.ELSE # "$(SYSTEM_BOOST)" == "YES"
 
 # --- Files 
 
-TARFILE_NAME=boost_1_48_0
-TARFILE_MD5=d1e9a7a7f532bb031a3c175d86688d95
-PATCH_FILES=\
-$(TARFILE_NAME).patch \
-boost_freebsd.patch
-.IF "$(GUI)"=="OS2"
-PATCH_FILES+=boost-os2.patch
-.ENDIF
+TARFILE_NAME=boost_1_55_0
+TARFILE_MD5=d6eef4b4cacb2183f2bf265a5a03a354
 
 CONFIGURE_DIR=
 CONFIGURE_ACTION=
@@ -93,6 +87,7 @@ $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : 
$(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
 @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/concept 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/concept_check 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/config 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/container 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -R $(PACKAGE_DIR)

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

[Kohei Yoshida]

 sc/inc/document.hxx  |   11 --
 sc/source/core/data/documen2.cxx |3 
 sc/source/ui/Accessibility/AccessibleDocument.cxx|   46 +--
 sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx |   38 +
 sc/source/ui/docshell/docsh.cxx  |1 
 sc/source/ui/inc/docsh.hxx   |5 -
 6 files changed, 47 insertions(+), 57 deletions(-)

New commits:
commit b4ea08def28a510212f4de355b384e8542c014d4
Author: Kohei Yoshida 
Date:   Mon Jan 6 12:45:43 2014 -0500

Try not to use ScDocument as a "anything can go in" storage place.

There are things that shouldn't be stored in ScDocument believe it or
not.

Change-Id: I6a06327549851fae0fdc0defbc716285d8456aa2

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 95443b5..0b7fe1d 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -443,18 +443,7 @@ private:
 
 boolmbUseEmbedFonts;
 
-OUString msDocAccTitle;
-
-public:
-void setDocAccTitle( const OUString& rTitle ) { msDocAccTitle = rTitle; }
-const OUString getDocAccTitle() const { return msDocAccTitle; }
-
-private:
-bool mbReadOnly;
-
 public:
-void setDocReadOnly(bool b){ mbReadOnly = b; }
-bool getDocReadOnly() const { return mbReadOnly; }
 sal_Bool IsCellInChangeTrack(const ScAddress &cell,Color *pColCellBoder);
 void GetCellChangeTrackNote(const ScAddress &cell, OUString &strTrackText, 
sal_Bool &pbLeftEdge);
 bool  IsUsingEmbededFonts() { return mbUseEmbedFonts; }
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 58310967..8803d25 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -220,8 +220,7 @@ ScDocument::ScDocument( ScDocumentMode eMode, 
SfxObjectShell* pDocShell ) :
 mbStreamValidLocked( false ),
 mbUserInteractionEnabled(true),
 mnNamedRangesLockCount(0),
-mbUseEmbedFonts(false),
-mbReadOnly(false)
+mbUseEmbedFonts(false)
 {
 SetStorageGrammar( formula::FormulaGrammar::GRAM_STORAGE_DEFAULT);
 
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx 
b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 47a5177..993da13 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -69,6 +69,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1859,30 +1860,33 @@ OUString SAL_CALL
 ScAccessibleDocument::getAccessibleName(void)
 throw (::com::sun::star::uno::RuntimeException)
 {
-OUString sName = ScResId(STR_ACC_DOC_SPREADSHEET);
+OUString aName = ScResId(STR_ACC_DOC_SPREADSHEET);
 ScDocument* pScDoc = GetDocument();
-if ( pScDoc )
+if (!pScDoc)
+return aName;
+
+SfxObjectShell* pObjSh = pScDoc->GetDocumentShell();
+if (!pObjSh)
+return aName;
+
+OUString aFileName;
+SfxMedium* pMed = pObjSh->GetMedium();
+if (pMed)
+aFileName = pMed->GetName();
+
+if (aFileName.isEmpty())
+aFileName = pObjSh->GetTitle(SFX_TITLE_APINAME);
+
+
+if (!aFileName.isEmpty())
 {
-OUString sFileName = pScDoc->getDocAccTitle();
-if ( !sFileName.getLength() )
-{
-SfxObjectShell* pObjSh = pScDoc->GetDocumentShell();
-if ( pObjSh )
-{
-sFileName = pObjSh->GetTitle( SFX_TITLE_APINAME );
-}
-}
-OUString sReadOnly;
-if (pScDoc->getDocReadOnly())
-{
-sReadOnly = ScResId(STR_ACC_DOC_SPREADSHEET_READONLY);
-}
-if ( sFileName.getLength() )
-{
-sName = sFileName + sReadOnly + " - " + sName;
-}
+OUString aReadOnly;
+if (pObjSh->IsReadOnly())
+aReadOnly = ScResId(STR_ACC_DOC_SPREADSHEET_READONLY);
+
+aName = aFileName + aReadOnly + " - " + aName;
 }
-return sName;
+return aName;
 }
 
 ///=  XAccessibleSelection  ===
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx 
b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index 94c28ec..d9abbb9 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -51,6 +51,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -1699,28 +1700,31 @@ ScShapeChildren* 
ScAccessibleDocumentPagePreview::GetShapeChildren()
 OUString ScAccessibleDocumentPagePreview::getAccessibleName(void)
 throw (::com::sun::star::uno::RuntimeException)
 {
-OUString sName = ScResId(STR_ACC_DOC_SPREADSHEET);
+OUString aName = ScResId(STR_ACC_DOC_SPREADSHEET);
 ScDocument* pScDoc = mpViewShell->GetDocument();
-if ( pScDoc )
+if (!pScDo

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

[Fridrich Štrba]

 writerperfect/source/common/WPXSvStream.cxx |9 ++---
 1 file changed, 2 insertions(+), 7 deletions(-)

New commits:
commit 6404567b0ad3dab20f39eb93114a30f0b2016f31
Author: Fridrich Å trba 
Date:   Mon Jan 6 19:06:03 2014 +0100

Avoid memcpy completely

Change-Id: I3d27935918930af71f02354696134def6bd052b6

diff --git a/writerperfect/source/common/WPXSvStream.cxx 
b/writerperfect/source/common/WPXSvStream.cxx
index 86e835b..beaf702 100644
--- a/writerperfect/source/common/WPXSvStream.cxx
+++ b/writerperfect/source/common/WPXSvStream.cxx
@@ -101,8 +101,6 @@ WPXSvInputStreamImpl::WPXSvInputStreamImpl( Reference< 
XInputStream > xStream )
 
 WPXSvInputStreamImpl::~WPXSvInputStreamImpl()
 {
-if (mpReadBuffer)
-delete [] mpReadBuffer;
 }
 
 const unsigned char *WPXSvInputStreamImpl::read(unsigned long numBytes, 
unsigned long &numBytesRead)
@@ -252,7 +250,6 @@ void WPXSvInputStreamImpl::invalidateReadBuffer()
 if (mpReadBuffer)
 {
 seek((long) tell() + (long)mnReadBufferPos - (long)mnReadBufferLength);
-delete [] mpReadBuffer;
 mpReadBuffer = 0;
 mnReadBufferPos = 0;
 mnReadBufferLength = 0;
@@ -310,11 +307,10 @@ const unsigned char *WPXSvInputStream::read(unsigned long 
numBytes, unsigned lon
 mpImpl->mnReadBufferLength = mpImpl->mnLength - curpos;
 }
 else
-return mpImpl->read(numBytes, numBytesRead);
+mpImpl->mnReadBufferLength = numBytes;
 
-mpImpl->mpReadBuffer = new unsigned char[mpImpl->mnReadBufferLength];
 unsigned long tmpNumBytes(0);
-const unsigned char *pTmp = mpImpl->read(mpImpl->mnReadBufferLength, 
tmpNumBytes);
+mpImpl->mpReadBuffer = const_cast(mpImpl->read(mpImpl->mnReadBufferLength, tmpNumBytes));
 if (tmpNumBytes != mpImpl->mnReadBufferLength)
 mpImpl->mnReadBufferLength = tmpNumBytes;
 
@@ -325,7 +321,6 @@ const unsigned char *WPXSvInputStream::read(unsigned long 
numBytes, unsigned lon
 numBytesRead = numBytes;
 
 mpImpl->mnReadBufferPos += numBytesRead;
-memcpy(mpImpl->mpReadBuffer, pTmp, mpImpl->mnReadBufferLength);
 return const_cast(mpImpl->mpReadBuffer);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Herbert Dürr]

 sc/source/filter/dif/makefile.mk  |3 ++-
 sc/source/filter/excel/makefile.mk|3 ++-
 sc/source/filter/ftools/makefile.mk   |3 ++-
 sc/source/filter/html/makefile.mk |3 ++-
 sc/source/filter/lotus/makefile.mk|3 ++-
 sc/source/filter/qpro/makefile.mk |4 ++--
 sc/source/filter/rtf/makefile.mk  |3 ++-
 sc/source/filter/starcalc/makefile.mk |3 ++-
 sc/source/filter/xcl97/makefile.mk|3 ++-
 sc/source/filter/xml/makefile.mk  |3 ++-
 10 files changed, 20 insertions(+), 11 deletions(-)

New commits:
commit e8418b5adfbca524b7dcb72929fb35a120481fbf
Author: Herbert Dürr 
Date:   Mon Jan 6 17:48:53 2014 +

#i123964# fix SC build on windows with consistent symbol visibility

diff --git a/sc/source/filter/dif/makefile.mk b/sc/source/filter/dif/makefile.mk
index dc3b865..4add9b7 100644
--- a/sc/source/filter/dif/makefile.mk
+++ b/sc/source/filter/dif/makefile.mk
@@ -34,10 +34,11 @@ PROJECTPCHSOURCE=..\pch\filt_pch
 
 # --- Settings -
 
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
 .INCLUDE :  scpre.mk
 .INCLUDE :  settings.mk
 .INCLUDE :  sc.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 # --- Files 
 
diff --git a/sc/source/filter/excel/makefile.mk 
b/sc/source/filter/excel/makefile.mk
index 280f865..0be1eea 100644
--- a/sc/source/filter/excel/makefile.mk
+++ b/sc/source/filter/excel/makefile.mk
@@ -34,10 +34,11 @@ PROJECTPCHSOURCE=..\pch\filt_pch
 
 # --- Settings -
 
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
 .INCLUDE :  scpre.mk
 .INCLUDE :  settings.mk
 .INCLUDE :  sc.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 # --- Files 
 
diff --git a/sc/source/filter/ftools/makefile.mk 
b/sc/source/filter/ftools/makefile.mk
index 0ba8800..1bbe118 100644
--- a/sc/source/filter/ftools/makefile.mk
+++ b/sc/source/filter/ftools/makefile.mk
@@ -34,10 +34,11 @@ PROJECTPCHSOURCE=..\pch\filt_pch
 
 # --- Settings -
 
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
 .INCLUDE :  scpre.mk
 .INCLUDE :  settings.mk
 .INCLUDE :  sc.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 # --- Files 
 
diff --git a/sc/source/filter/html/makefile.mk 
b/sc/source/filter/html/makefile.mk
index 657663d..93cd638 100644
--- a/sc/source/filter/html/makefile.mk
+++ b/sc/source/filter/html/makefile.mk
@@ -34,10 +34,11 @@ PROJECTPCHSOURCE=..\pch\filt_pch
 
 # --- Settings -
 
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
 .INCLUDE :  scpre.mk
 .INCLUDE :  settings.mk
 .INCLUDE :  sc.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 # --- Files 
 
diff --git a/sc/source/filter/lotus/makefile.mk 
b/sc/source/filter/lotus/makefile.mk
index 4e66837..e72378b 100644
--- a/sc/source/filter/lotus/makefile.mk
+++ b/sc/source/filter/lotus/makefile.mk
@@ -34,10 +34,11 @@ AUTOSEG=true
 
 # --- Settings -
 
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
 .INCLUDE :  scpre.mk
 .INCLUDE :  settings.mk
 .INCLUDE :  sc.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 # --- Files 
 
diff --git a/sc/source/filter/qpro/makefile.mk 
b/sc/source/filter/qpro/makefile.mk
index ea52d0e..ebe2b77 100644
--- a/sc/source/filter/qpro/makefile.mk
+++ b/sc/source/filter/qpro/makefile.mk
@@ -32,13 +32,13 @@ PROJECTPCHSOURCE=..\pch\filt_pch
 
 AUTOSEG=true
 
-
 # --- Settings -
 
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
 .INCLUDE :  scpre.mk
 .INCLUDE :  settings.mk
 .INCLUDE :  sc.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 # --- Files 
 
diff --git a/sc/source/filter/rtf/makefile.mk b/sc/source/filter/rtf/makefile.mk
index b6528bb..b2bd5a9 100644
--- a/sc/source/filter/rtf/makefile.mk
+++ b/sc/source/filter/rtf/makefile.mk
@@ -34,10 +34,11 @@ PROJECTPCHSOURCE=..\pch\filt_pch
 
 # --- Settings -
 
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
 .INCLUDE :  scpre.mk
 .INCLUDE :  settings.mk
 .INCLUDE :  sc.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 # --- Files 
 
diff --git a/sc/source/filter/starcalc/makefile.mk 
b/sc/source/filter/starcalc/makefile.mk
index de29c19..873e13c 100644
--- a/sc/source/filter/starcalc/makefile.mk
+++ b/sc/source/filter/starcalc/makefile.mk
@@ -34,10 +34,11 @@ AUTOSEG=true
 
 # --- Settings -
 
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
 .INCLUDE :  scpre.mk
 .INCLUDE :  settings.mk
 .INCLUDE :  sc.mk
-.INCLUDE :  $(PRJ

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

[Andras Timar]

 vcl/source/filter/wmf/enhwmf.cxx |   28 +++-
 1 file changed, 27 insertions(+), 1 deletion(-)

New commits:
commit 5b8ad54cc596a58da1f79937cc6709ce0799ac7f
Author: Andras Timar 
Date:   Mon Jan 6 19:23:01 2014 +0100

EMF/WMF: parse line cap and line join

Change-Id: I081ae9c24e48912631dcfe4aba8a06ff2680aaf5

diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index 4af22a9..255d2d0 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -732,7 +732,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
 sal_Bool bTransparent = sal_False;
 sal_uInt16 nDashCount = 0;
 sal_uInt16 nDotCount = 0;
-switch( nStyle )
+switch( nStyle & 0xFF )
 {
 case PS_DASHDOTDOT :
 nDotCount++;
@@ -753,6 +753,32 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
 default :
 aLineInfo.SetStyle( LINE_SOLID );
 }
+switch( nStyle & 0xF00 )
+{
+case PS_ENDCAP_ROUND :
+aLineInfo.SetLineCap( 
com::sun::star::drawing::LineCap_ROUND );
+break;
+case PS_ENDCAP_SQUARE :
+aLineInfo.SetLineCap( 
com::sun::star::drawing::LineCap_SQUARE );
+break;
+case PS_ENDCAP_FLAT :
+default :
+aLineInfo.SetLineCap( 
com::sun::star::drawing::LineCap_BUTT );
+}
+switch( nStyle & 0xF000 )
+{
+case PS_JOIN_ROUND :
+aLineInfo.SetLineJoin ( 
basegfx::B2DLINEJOIN_ROUND );
+break;
+case PS_JOIN_MITER :
+aLineInfo.SetLineJoin ( 
basegfx::B2DLINEJOIN_MITER );
+break;
+case PS_JOIN_BEVEL :
+aLineInfo.SetLineJoin ( 
basegfx::B2DLINEJOIN_BEVEL );
+break;
+default :
+aLineInfo.SetLineJoin ( 
basegfx::B2DLINEJOIN_NONE );
+}
 if ( nDashCount | nDotCount )
 {
 aLineInfo.SetStyle( LINE_DASH );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 vcl/source/filter/wmf/enhwmf.cxx |   28 +++-
 1 file changed, 27 insertions(+), 1 deletion(-)

New commits:
commit 356a5921f0a0a2295d55cbee2bf1570f357bd686
Author: Andras Timar 
Date:   Mon Jan 6 19:23:01 2014 +0100

EMF/WMF: parse line cap and line join

Change-Id: I081ae9c24e48912631dcfe4aba8a06ff2680aaf5

diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index 3ad4481..5cd9c0b 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -732,7 +732,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
 sal_Bool bTransparent = sal_False;
 sal_uInt16 nDashCount = 0;
 sal_uInt16 nDotCount = 0;
-switch( nStyle )
+switch( nStyle & 0xFF )
 {
 case PS_DASHDOTDOT :
 nDotCount++;
@@ -753,6 +753,32 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
 case PS_SOLID :
 aLineInfo.SetStyle( LINE_SOLID );
 }
+switch( nStyle & 0xF00 )
+{
+case PS_ENDCAP_ROUND :
+aLineInfo.SetLineCap( 
com::sun::star::drawing::LineCap_ROUND );
+break;
+case PS_ENDCAP_SQUARE :
+aLineInfo.SetLineCap( 
com::sun::star::drawing::LineCap_SQUARE );
+break;
+case PS_ENDCAP_FLAT :
+default :
+aLineInfo.SetLineCap( 
com::sun::star::drawing::LineCap_BUTT );
+}
+switch( nStyle & 0xF000 )
+{
+case PS_JOIN_ROUND :
+aLineInfo.SetLineJoin ( 
basegfx::B2DLINEJOIN_ROUND );
+break;
+case PS_JOIN_MITER :
+aLineInfo.SetLineJoin ( 
basegfx::B2DLINEJOIN_MITER );
+break;
+case PS_JOIN_BEVEL :
+aLineInfo.SetLineJoin ( 
basegfx::B2DLINEJOIN_BEVEL );
+break;
+default :
+aLineInfo.SetLineJoin ( 
basegfx::B2DLINEJOIN_NONE );
+}
 if ( nDashCount | nDotCount )
 {
 aLineInfo.SetStyle( LINE_DASH );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet]

 ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9ca4e6e1940a22cf82cc492da6a3ce0b3d8e0e80
Author: Julien Nabet 
Date:   Mon Jan 6 20:21:37 2014 +0100

Fix extra right parenthesis

Change-Id: I0386aedb2fc8c70122fc1e5d7c370ca5fd47ad9e

diff --git a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx 
b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx
index 637337a..9cff1d7 100644
--- a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx
@@ -120,7 +120,7 @@ serf_bucket_t * 
SerfPropFindReqProcImpl::createSerfRequestBucket( serf_request_t
 aBodyText += "\"/>";
 }
 
-aBodyText = "" + aBodyText + "" );
+aBodyText = "" + aBodyText + "";
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[SOLVED] e: ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx seems unused

[Julien Nabet]

On 06/01/2014 17:53, Eike Rathke wrote:

Hi julien2412,

On Saturday, 2014-01-04 03:50:19 -0800, julien2412 wrote:


Cppcheck reported this:
ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx
123 syntaxError error   Invalid number of character (() when these 
macros are
defined: ''.

Indeed we have:
  123 aBodyText = "" + aBodyText + "" );
See
http://opengrok.libreoffice.org/xref/core/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx#123

Should this part be removed or do I lack a config option to build this
specific part?

Remove the closing parenthesis please, that would never build. It's
a leftover of 89633c6da1cde46983926dcc2e0f8e08de0e9378


Thank you Eike for your feedback.
I pushed the change (see 9ca4e6e1940a22cf82cc492da6a3ce0b3d8e0e80)

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

Re: Efficient UNO component linkage & GC ...

[Michael Meeks]

On Mon, 2014-01-06 at 16:45 +0100, Stephan Bergmann wrote:
> > ? :-) Certainly the latter can be stored as an extra boolean.
> 
> There is a mismatch between the grammar for UNO implementation names and 
> C function identifiers usable for these constructor functions, and the 
> constructor argument in its current form caters for that.

Is there a practical example of this anywhere ? and/or can we not
default to doing the efficient thing and have the casual bloat version
as a fallback ? ;-)

> Note 1:  Of course, "given that we control the [relevant] impl names, we 
> [could] simply mandate that they are legal C function names to begin with."

Are the impl. names not exposed to the scripter / programmer ?

> Note 2:  "In addition to having [the components data] stored as XML 
> files that are parsed at start-up in cppuhelper::ServiceManager::init, 
> one could optionally have them pre-compiled into some data structure 
> that is accessible from cppuhelper/source/servicemanager.cxx."

Sure; so - if we have that data around in a structure, it'd be great
not to duplicate it in the XML and also in the C++ :-) it'd be nice to
have the strings in one DSO only - if we even need them at all :-) [ are
they just a mapping detail ? ].

> Note 3:  A key insight is that "we can easily extend the components XML 
> schema, even removing features again in a later LO version."  First make 
> it work, then make it fast (if necessary).

Sure - my concern is that before we push this across the code-base,
it'd be nice to rid ourselves of the factory functions and come up with
something that is efficient, minimal, as simple as possible, and -then-
push it over a thousand+ call-sites / XML entries etc. Rather than for
each small change having to manually re-touch all that lot.

ATB,

Michael.

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

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

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

[Miklos Vajna]

 sw/source/filter/ww8/docxattributeoutput.cxx |  272 +--
 sw/source/filter/ww8/docxattributeoutput.hxx |   13 -
 sw/source/filter/ww8/docxsdrexport.cxx   |  240 +++
 sw/source/filter/ww8/docxsdrexport.hxx   |   33 +++
 4 files changed, 328 insertions(+), 230 deletions(-)

New commits:
commit c0d5d26ad74cc7b6470d1e0c8951bee548c7ba17
Author: Miklos Vajna 
Date:   Mon Jan 6 20:53:52 2014 +0100

DocxAttributeOutput: factor out writeVMLTextFrame() into DocxSdrExport

Given that DocxSdrExport doesn't know DocxAttributeOutput this requires
also moving a number of data members into that class, which is probably
also a good thing.

Change-Id: I7e9c7def505e11e5e27a2bf86544d2b66d9b3f86

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 38a05c8..020c84d 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -266,158 +266,6 @@ void DocxAttributeOutput::StartParagraph( 
ww8::WW8TableNodeInfo::Pointer_t pText
 m_bParagraphOpened = true;
 }
 
-void lcl_TextFrameShadow(FSHelperPtr pSerializer, const SwFrmFmt& rFrmFmt)
-{
-SvxShadowItem aShadowItem = rFrmFmt.GetShadow();
-if (aShadowItem.GetLocation() == SVX_SHADOW_NONE)
-return;
-
-OString aShadowWidth( OString::number( double( aShadowItem.GetWidth() ) / 
20) + "pt");
-OString aOffset;
-switch (aShadowItem.GetLocation())
-{
-case SVX_SHADOW_TOPLEFT: aOffset = "-" + aShadowWidth + ",-" + 
aShadowWidth; break;
-case SVX_SHADOW_TOPRIGHT: aOffset = aShadowWidth + ",-" + 
aShadowWidth; break;
-case SVX_SHADOW_BOTTOMLEFT: aOffset = "-" + aShadowWidth + "," + 
aShadowWidth; break;
-case SVX_SHADOW_BOTTOMRIGHT: aOffset = aShadowWidth + "," + 
aShadowWidth; break;
-case SVX_SHADOW_NONE:
-case SVX_SHADOW_END:
-break;
-}
-if (aOffset.isEmpty())
-return;
-
-OString aShadowColor = 
msfilter::util::ConvertColor(aShadowItem.GetColor());
-pSerializer->singleElementNS(XML_v, XML_shadow,
-XML_on, "t",
-XML_color, "#" + aShadowColor,
-XML_offset, aOffset,
-FSEND);
-}
-
-class ExportDataSaveRestore
-{
-private:
-DocxExport& m_rExport;
-public:
-ExportDataSaveRestore(DocxExport& rExport, sal_uLong nStt, sal_uLong nEnd, 
sw::Frame *pParentFrame)
-: m_rExport(rExport)
-{
-m_rExport.SaveData(nStt, nEnd);
-m_rExport.mpParentFrame = pParentFrame;
-}
-~ExportDataSaveRestore()
-{
-m_rExport.RestoreData();
-}
-};
-
-// Undo the text direction mangling done by the frame btLr handler in 
writerfilter::dmapper::DomainMapper::lcl_startCharacterGroup()
-bool lcl_checkFrameBtlr(SwNode* pStartNode, sax_fastparser::FastAttributeList* 
pTextboxAttrList = 0, sax_fastparser::FastAttributeList* pBodyPrAttrList = 0)
-{
-// The intended usage is to pass either a valid VML or DML attribute list.
-assert(pTextboxAttrList || pBodyPrAttrList);
-
-if (!pStartNode->IsTxtNode())
-return false;
-
-SwTxtNode* pTxtNode = static_cast(pStartNode);
-
-const SfxPoolItem* pItem = 0; // explicitly init to avoid warnings
-bool bItemSet = false;
-if (pTxtNode->HasSwAttrSet())
-{
-const SwAttrSet& rAttrSet = pTxtNode->GetSwAttrSet();
-bItemSet = rAttrSet.GetItemState(RES_CHRATR_ROTATE, true, &pItem) == 
SFX_ITEM_SET;
-}
-
-if (!bItemSet)
-{
-if (!pTxtNode->HasHints())
-return false;
-
-SwTxtAttr* pTxtAttr = pTxtNode->GetTxtAttrAt(0, RES_TXTATR_AUTOFMT);
-
-if (!pTxtAttr || pTxtAttr->Which() != RES_TXTATR_AUTOFMT)
-return false;
-
-boost::shared_ptr pItemSet = 
pTxtAttr->GetAutoFmt().GetStyleHandle();
-bItemSet = pItemSet->GetItemState(RES_CHRATR_ROTATE, true, &pItem) == 
SFX_ITEM_SET;
-}
-
-if (bItemSet)
-{
-const SvxCharRotateItem& rCharRotate = static_cast(*pItem);
-if (rCharRotate.GetValue() == 900)
-{
-if (pTextboxAttrList)
-pTextboxAttrList->add(XML_style, 
"mso-layout-flow-alt:bottom-to-top");
-else
-pBodyPrAttrList->add(XML_vert, "vert270");
-return true;
-}
-}
-return false;
-}
-
-void DocxAttributeOutput::WriteVMLTextFrame(sw::Frame* pParentFrame)
-{
-const SwFrmFmt& rFrmFmt = pParentFrame->GetFrmFmt( );
-const SwNodeIndex* pNodeIndex = rFrmFmt.GetCntnt().GetCntntIdx();
-
-sal_uLong nStt = pNodeIndex ? pNodeIndex->GetIndex()+1  : 
0;
-sal_uLong nEnd = pNodeIndex ? pNodeIndex->GetNode().EndOfSectionIndex() : 
0;
-
-//Save data here and restore when out of scope
-ExportDataSaveRestore aDataGuard(m_rExport, nStt, nEnd, pParentFrame);
-
-// When a frame has some low height, but automatically expanded due
-// to lots

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - e8/418b5adfbca524b7dcb72929fb35a120481fbf

[Caolán McNamara]

 e8/418b5adfbca524b7dcb72929fb35a120481fbf |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b7df90f69d3dbc90cedd427fac20e02cf4e0d264
Author: Caolán McNamara 
Date:   Mon Jan 6 20:14:34 2014 +

Notes added by 'git notes add'

diff --git a/e8/418b5adfbca524b7dcb72929fb35a120481fbf 
b/e8/418b5adfbca524b7dcb72929fb35a120481fbf
new file mode 100644
index 000..8ebbe55
--- /dev/null
+++ b/e8/418b5adfbca524b7dcb72929fb35a120481fbf
@@ -0,0 +1 @@
+ignore: obsolete
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: odb ODF standard conformance [was: minutes of ESC call ...]

[Michael Stahl]

On 20/12/13 14:40, Lionel Elie Mamane wrote:
> On Thu, Dec 19, 2013 at 08:24:29PM +, Michael Meeks wrote:
> 
>> * Crashtest update (Markus)
>> + cf. http://dev-builds.libreoffice.org/crashtest/
>>   new crash testing result is available (cf. the date & git hash)
>>   All files tested, and the results are complete for the 1st time.
>>   and that all odb files are not valid according to the validator
>> + need to look at the standard (Lionel)
>> + presumably some silly error ...
> 
> Here are the main classes of "low hanging fruit" conformance errors I
> see:
> 
> 1) xlink:href without xlink:type
> 
>Easy to fix if (as I assume) I can always put "simple" in these
>places. I have a patch sitting in my tree to do that.

sounds good.

> 2) manifest:manifest without version attribute: I have no clue what
>version I should put there. Any hint?

to expand on Thorsten's answer, "1.2", but only if that's the ODF
version; the attribute did not exist in ODF 1.1/1.0.

> 3) ODF mimetype 'application/vnd.oasis.opendocument.base' is invalid
> 
>Well,
>
> http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part1.html#__RefHeading__1420388_253892949
>lists this as the "recommended" mimetype but that the
>RFC4288-registration is "in progress". Shouldn't we rather move
>forward on the registration... which has been stalled... why?

it's more complicated than that: there is a MIME type registration, but
unfortunately the MIME type registered with IANA is different from the
one given in the ODF specification... not sure what to do about that.

https://bugs.freedesktop.org/show_bug.cgi?id=45854
https://lists.oasis-open.org/archives/office-comment/201202/msg1.html
https://tools.oasis-open.org/issues/browse/OFFICE-3745

> I need help on these:
> 
> 1) fdo36288-2.odb/forms/Obj42/content.xml[2,17145]:  Error: attribute
>"xlink:href" has a bad value: ".uno:FormController/saveRecord" does
>not satisfy the "anyURI" type
> 
>What is the "right" way to put a .uno URI?

anyURI is actually an IRI reference in ODF (not that it makes a
difference here).  RFC3987 says:

   scheme = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )

... so the problem is that it starts with "." where only ALPHA is
allowed.  was that perhaps legal in a previous URI RFC or how did we end
up with this?

> 2) ooo103006-1.odb/reports/Obj131/content.xml[2,6115]:  Error: element
>"form:hidden" is missing "id" attribute
> 
>This one probably just needs an ID generated. Shall we just call
>something like BASE64ENCODE(RANDOM(give me 9 bytes))? Or is there a
>more structured system in LibreOffice?

it's a mandatory xml:id attribute with an optional form:id (with same
value as xml:id) for backward compatibility with ODF 1.1.  the only
correct way to implement that is via com.sun.star.rdf.XMetadatable,
which will take care of both uniqueness and persistence.  could possibly
be tricky though, since no form thingy supports this currently; adding
whatever hack is used for other form:* may be easier.

> I doubt that these actually come from base-specific code, but who
> knows:
> 
> 1) forms/Obj11/styles.xml:  Error: unexpected attribute 
> "style:layout-grid-snap-to-characters"

see c1e1ef80e8428514499b061e00801a6a6298d0b0

> 2) fdo36288-2.odb/content.xml[2,2887]:  Error: tag name
>"db:font-charset" is not allowed. Possible tag names are:
>,

dbaccess/source/filter/xml/xmlExport.cxx:SvXMLElementExport
aElem(*this,XML_NAMESPACE_DB, XML_FONT_CHARSET, sal_True, sal_True);

guessing maybe it should be db:character-set?


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

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

[Kohei Yoshida]

 sc/inc/column.hxx|7 -
 sc/inc/table.hxx |4 -
 sc/qa/unit/ucalc.cxx |  139 +
 sc/qa/unit/ucalc.hxx |7 +
 sc/source/core/data/column2.cxx  |  146 ++-
 sc/source/core/data/documen4.cxx |   17 +---
 sc/source/core/data/table3.cxx   |   31 ++--
 7 files changed, 218 insertions(+), 133 deletions(-)

New commits:
commit 4a7a6b46c0dc779581f271b9e6c13c365eca7ab8
Author: Kohei Yoshida 
Date:   Mon Jan 6 16:12:28 2014 -0500

fdo#73001: Simplify the selection function logic & calculate correct 
results.

Fixing a bug and cleaning up the code all at the same time.  And don't 
forget
to write test for it as well.

Change-Id: Ia0322c4bebd4c5debcbfa4bb0902afbe581208b2

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 6ec3336..8b09db3 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -237,13 +237,8 @@ public:
 
 ScAttrIterator* CreateAttrIterator( SCROW nStartRow, SCROW nEndRow ) const;
 
-// UpdateSelectionFunction: multi-select
 void UpdateSelectionFunction(
-const ScMarkData& rMark, ScFunctionData& rData, ScFlatBoolRowSegments& 
rHiddenRows,
-bool bDoExclude, SCROW nExStartRow, SCROW nExEndRow );
-
-void UpdateAreaFunction(
-ScFunctionData& rData, ScFlatBoolRowSegments& rHiddenRows, SCROW 
nStartRow, SCROW nEndRow);
+const ScMarkData& rMark, ScFunctionData& rData, ScFlatBoolRowSegments& 
rHiddenRows );
 
 void CopyToColumn(
 sc::CopyToDocContext& rCxt, SCROW nRow1, SCROW nRow2, sal_uInt16 
nFlags, bool bMarked,
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 09d541b..68a1791 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -542,9 +542,7 @@ public:
 double nStepValue, double nMaxValue, ScProgress* 
pProgress);
 OUStringGetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW 
nEndY );
 
-voidUpdateSelectionFunction( ScFunctionData& rData,
-SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW 
nEndRow,
-const ScMarkData& rMark );
+void UpdateSelectionFunction( ScFunctionData& rData, const ScMarkData& 
rMark );
 
 voidAutoFormat( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, 
SCROW nEndRow,
 sal_uInt16 nFormatNo );
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index cd0a9f3..5196c98 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -676,6 +676,145 @@ void Test::testDataEntries()
 m_pDoc->DeleteTab(0);
 }
 
+void Test::testSelectionFunction()
+{
+m_pDoc->InsertTab(0, "Test");
+
+// Insert values into B2:B4.
+m_pDoc->SetString(ScAddress(1,1,0), "=1"); // formula
+m_pDoc->SetValue(ScAddress(1,2,0), 2.0);
+m_pDoc->SetValue(ScAddress(1,3,0), 3.0);
+
+// Insert strings into B5:B8.
+m_pDoc->SetString(ScAddress(1,4,0), "A");
+m_pDoc->SetString(ScAddress(1,5,0), "B");
+m_pDoc->SetString(ScAddress(1,6,0), "=\"C\""); // formula
+m_pDoc->SetString(ScAddress(1,7,0), "D");
+
+// Insert values into D2:D4.
+m_pDoc->SetValue(ScAddress(3,1,0), 4.0);
+m_pDoc->SetValue(ScAddress(3,2,0), 5.0);
+m_pDoc->SetValue(ScAddress(3,3,0), 6.0);
+
+// Insert edit text into D5.
+ScFieldEditEngine& rEE = m_pDoc->GetEditEngine();
+rEE.SetText("Rich Text");
+m_pDoc->SetEditText(ScAddress(3,4,0), rEE.CreateTextObject());
+
+// Insert Another string into D6.
+m_pDoc->SetString(ScAddress(3,5,0), "E");
+
+// Select B2:B8 & D2:D8 disjoint region.
+ScRangeList aRanges;
+aRanges.Append(ScRange(1,1,0,1,7,0)); // B2:B8
+aRanges.Append(ScRange(3,1,0,3,7,0)); // D2:D8
+ScMarkData aMark;
+aMark.MarkFromRangeList(aRanges, true);
+
+struct Check
+{
+ScSubTotalFunc meFunc;
+double mfExpected;
+};
+
+{
+Check aChecks[] =
+{
+{ SUBTOTAL_FUNC_AVE,  3.5 },
+{ SUBTOTAL_FUNC_CNT2,12.0 },
+{ SUBTOTAL_FUNC_CNT,  6.0 },
+{ SUBTOTAL_FUNC_MAX,  6.0 },
+{ SUBTOTAL_FUNC_MIN,  1.0 },
+{ SUBTOTAL_FUNC_SUM, 21.0 },
+{ SUBTOTAL_FUNC_SELECTION_COUNT, 14.0 }
+};
+
+for (size_t i = 0; i < SAL_N_ELEMENTS(aChecks); ++i)
+{
+double fRes = 0.0;
+bool bRes = m_pDoc->GetSelectionFunction(aChecks[i].meFunc, 
ScAddress(), aMark, fRes);
+CPPUNIT_ASSERT_MESSAGE("Failed to fetch selection function 
result.", bRes);
+CPPUNIT_ASSERT_EQUAL(aChecks[i].mfExpected, fRes);
+}
+}
+
+// Hide rows 4 and 6 and check the results again.
+
+m_pDoc->SetRowHidden(3, 3, 0, true);
+m_pDoc->SetRowHidden(5, 5, 0, true);
+CPPUNIT_ASSERT_MESSAGE("This row should be hidden.",

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

[Kohei Yoshida]

 sc/inc/column.hxx|7 -
 sc/inc/table.hxx |4 
 sc/qa/unit/ucalc.cxx |  179 +++
 sc/qa/unit/ucalc.hxx |   14 +++
 sc/source/core/data/column2.cxx  |  146 ---
 sc/source/core/data/documen4.cxx |   17 +--
 sc/source/core/data/table3.cxx   |   31 +-
 7 files changed, 265 insertions(+), 133 deletions(-)

New commits:
commit c009bdb061d074bbddd58a16bdf65022e2099ba5
Author: Kohei Yoshida 
Date:   Mon Jan 6 16:12:28 2014 -0500

fdo#73001: Simplify the selection function logic & calculate correct 
results.

Fixing a bug and cleaning up the code all at the same time.  And don't 
forget
to write test for it as well.

Change-Id: Ia0322c4bebd4c5debcbfa4bb0902afbe581208b2
(cherry picked from commit 4a7a6b46c0dc779581f271b9e6c13c365eca7ab8)

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 55b3847..16caa5e 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -237,13 +237,8 @@ public:
 
 ScAttrIterator* CreateAttrIterator( SCROW nStartRow, SCROW nEndRow ) const;
 
-// UpdateSelectionFunction: multi-select
 void UpdateSelectionFunction(
-const ScMarkData& rMark, ScFunctionData& rData, ScFlatBoolRowSegments& 
rHiddenRows,
-bool bDoExclude, SCROW nExStartRow, SCROW nExEndRow );
-
-void UpdateAreaFunction(
-ScFunctionData& rData, ScFlatBoolRowSegments& rHiddenRows, SCROW 
nStartRow, SCROW nEndRow);
+const ScMarkData& rMark, ScFunctionData& rData, ScFlatBoolRowSegments& 
rHiddenRows );
 
 void CopyToColumn(
 sc::CopyToDocContext& rCxt, SCROW nRow1, SCROW nRow2, sal_uInt16 
nFlags, bool bMarked,
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 86b61f5..c2b8549 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -539,9 +539,7 @@ public:
 double nStepValue, double nMaxValue, ScProgress* 
pProgress);
 OUStringGetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW 
nEndY );
 
-voidUpdateSelectionFunction( ScFunctionData& rData,
-SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW 
nEndRow,
-const ScMarkData& rMark );
+void UpdateSelectionFunction( ScFunctionData& rData, const ScMarkData& 
rMark );
 
 voidAutoFormat( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, 
SCROW nEndRow,
 sal_uInt16 nFormatNo );
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index c341796..d6320ec 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -675,6 +675,145 @@ void Test::testDataEntries()
 m_pDoc->DeleteTab(0);
 }
 
+void Test::testSelectionFunction()
+{
+m_pDoc->InsertTab(0, "Test");
+
+// Insert values into B2:B4.
+m_pDoc->SetString(ScAddress(1,1,0), "=1"); // formula
+m_pDoc->SetValue(ScAddress(1,2,0), 2.0);
+m_pDoc->SetValue(ScAddress(1,3,0), 3.0);
+
+// Insert strings into B5:B8.
+m_pDoc->SetString(ScAddress(1,4,0), "A");
+m_pDoc->SetString(ScAddress(1,5,0), "B");
+m_pDoc->SetString(ScAddress(1,6,0), "=\"C\""); // formula
+m_pDoc->SetString(ScAddress(1,7,0), "D");
+
+// Insert values into D2:D4.
+m_pDoc->SetValue(ScAddress(3,1,0), 4.0);
+m_pDoc->SetValue(ScAddress(3,2,0), 5.0);
+m_pDoc->SetValue(ScAddress(3,3,0), 6.0);
+
+// Insert edit text into D5.
+ScFieldEditEngine& rEE = m_pDoc->GetEditEngine();
+rEE.SetText("Rich Text");
+m_pDoc->SetEditText(ScAddress(3,4,0), rEE.CreateTextObject());
+
+// Insert Another string into D6.
+m_pDoc->SetString(ScAddress(3,5,0), "E");
+
+// Select B2:B8 & D2:D8 disjoint region.
+ScRangeList aRanges;
+aRanges.Append(ScRange(1,1,0,1,7,0)); // B2:B8
+aRanges.Append(ScRange(3,1,0,3,7,0)); // D2:D8
+ScMarkData aMark;
+aMark.MarkFromRangeList(aRanges, true);
+
+struct Check
+{
+ScSubTotalFunc meFunc;
+double mfExpected;
+};
+
+{
+Check aChecks[] =
+{
+{ SUBTOTAL_FUNC_AVE,  3.5 },
+{ SUBTOTAL_FUNC_CNT2,12.0 },
+{ SUBTOTAL_FUNC_CNT,  6.0 },
+{ SUBTOTAL_FUNC_MAX,  6.0 },
+{ SUBTOTAL_FUNC_MIN,  1.0 },
+{ SUBTOTAL_FUNC_SUM, 21.0 },
+{ SUBTOTAL_FUNC_SELECTION_COUNT, 14.0 }
+};
+
+for (size_t i = 0; i < SAL_N_ELEMENTS(aChecks); ++i)
+{
+double fRes = 0.0;
+bool bRes = m_pDoc->GetSelectionFunction(aChecks[i].meFunc, 
ScAddress(), aMark, fRes);
+CPPUNIT_ASSERT_MESSAGE("Failed to fetch selection function 
result.", bRes);
+CPPUNIT_ASSERT_EQUAL(aChecks[i].mfExpected, fRes);
+}
+}
+
+// Hide rows 4 and 6 and check the results again.
+
+m_pDoc->SetRowHidden(3, 3, 0, true);
+m_pDoc->SetRowHidden(5, 5, 0,

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

Bug 65675 depends on bug 73001, which changed state.

Bug 73001 Summary: UI: Statusbar quick functions broken if several ranges 
selected
https://bugs.freedesktop.org/show_bug.cgi?id=73001

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

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

[Libreoffice-commits] dev-tools.git: scripts/esc-bug-stats.pl

[Michael Meeks]

 scripts/esc-bug-stats.pl |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 5503fa4933808df6fa9d1bd5967a213850817abf
Author: Michael Meeks 
Date:   Mon Jan 6 21:59:08 2014 -0800

More blacklisting / cleanup output for 3.6

diff --git a/scripts/esc-bug-stats.pl b/scripts/esc-bug-stats.pl
index 14c95d8..f2e48d9 100755
--- a/scripts/esc-bug-stats.pl
+++ b/scripts/esc-bug-stats.pl
@@ -27,6 +27,14 @@ my %sadly_non_libreoffice = (
 'Richard Hughes' => 1,
 'Ben Widawsky' => 1,
 'Chengwei Yang' => 1,
+'Dan Nicholson' => 1,
+'Zbigniew Jedrzejewski-Szmek' => 1,
+'Tanu Kaskinen' => 1,
+'Vinson Lee' => 1,
+'Sylvain BERTRAND' => 1,
+'lu hua' => 1,
+'Kenneth Graunke' => 1,
+'Seif Lotfy' => 1,
 );
 
 # use me for testing XML pretty printing etc.
@@ -366,9 +374,9 @@ print << "EOF"
   $date_value
  
  
- 
  
- 
+ 
+ 
  
  
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

LibreOffice Gerrit News for core on 2014-01-07

[gerrit]

Moin!

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

 First time contributors doing great things ! 
+ svt: Use constructor feature for ODocumentCloser.
  in https://gerrit.libreoffice.org/7186 from Matúš Kukan
  about module svtools
+ fdo#69616: Fix for VML part missing for group.
  in https://gerrit.libreoffice.org/7276 from Rohit Deshmukh
  about module filter, include, oox, sc, svx, sw
+ fdo#72563 : Pageref field tag not preserved
  in https://gerrit.libreoffice.org/7074 from Rajashri Udhoji
  about module sw
+ fdo#71788: Unit test case for corruption of file after roundtrip.
  in https://gerrit.libreoffice.org/6853 from Pallavi Jadhav
  about module sw
 End of freshness 



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

+ fdo#73087: python3: upgrade to version 3.3.3
  in https://gerrit.libreoffice.org/7278 from Michael Stahl
+ $MSM_PATH($msmdir) needs a path separator at the end of the line.
  in https://gerrit.libreoffice.org/7272 from Tomofumi Yagi
+ Move default: to end of switch
  in https://gerrit.libreoffice.org/7277 from Chris Sherlock
+ fdo#73217  : Textbox with picture fill are rendered and saved properly.
  in https://gerrit.libreoffice.org/7259 from Sushil Shinde


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

+ new cell-border handling in calc
  in https://gerrit.libreoffice.org/6093 from Viktor Varga


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

+ Export CoreText-related SPI stuff
  in https://gerrit.libreoffice.org/7143 from Douglas Mencken
+ remove BluetoothOperator wrapper
  in https://gerrit.libreoffice.org/7092 from Christian Lohmaier
+ fix previous commit
  in https://gerrit.libreoffice.org/7101 from Markus Mohrhard
+ CID#736173: Out-of-bound read
  in https://gerrit.libreoffice.org/6973 from Julien Nabet
+ move from ActionBarSherlock to corresponding android support lib
  in https://gerrit.libreoffice.org/7082 from Christian Lohmaier
+ fdo#60698: Merge animcore into sd and slideshow
  in https://gerrit.libreoffice.org/7108 from Marcos Souza
+ fix Bluetooth lifecycle problems and respect UI guidelines
  in https://gerrit.libreoffice.org/7083 from Christian Lohmaier
+ Double toolbar icon size for HiDPI screens.
  in https://gerrit.libreoffice.org/6994 from Andrzej Hunt
+ sw/export docx: add unit test for document with header and section(s)
  in https://gerrit.libreoffice.org/6249 from Pierre-Eric Pelloux-Prayer
+ add a header to provide posix compatible wrapper for platform lacking
  in https://gerrit.libreoffice.org/6837 from Norbert Thiebaud
+ Code clean-up/consolidation task.
  in https://gerrit.libreoffice.org/5926 from Vishv Brahmbhatt
+ fix for exporting of text watermark to DOCX
  in https://gerrit.libreoffice.org/5568 from Adam CloudOn
+ WIP: fdo#33980 Preserve selection across all slide sorters.
  in https://gerrit.libreoffice.org/6633 from Andrzej Hunt
+ fdo#71043 -  Use STACK lint tool to clean code
  in https://gerrit.libreoffice.org/6529 from José Guilherme Vanz
+ Increase number of remembered recent documents from 10 to 25
  in https://gerrit.libreoffice.org/6101 from Krisztian Pinter
+ startcenter: Make SC open faster by timeouting thumbnails
  in https://gerrit.libreoffice.org/6102 from Krisztian Pinter
+ Simplify oslThreadIdentifier on Linux 32.
  in https://gerrit.libreoffice.org/5553 from Arnaud Versini
+ Dynamically align toolbars in LibreOffice
  in https://gerrit.libreoffice.org/5655 from Prashant Pandey
+ fdo#36791 : fix for import of greeting card
  in https://gerrit.libreoffice.org/4240 from Adam CloudOn
+ more debug logs, extra debug layer, file is not used in p3k
  in https://gerrit.libreoffice.org/5267 from James Michael Dupont
+ Positional Tab additions
  in https://gerrit.libreoffice.org/5387 from Adam CloudOn
+ fdo#64817 : fix for rectangle with image fill
  in https://gerrit.libreoffice.org/4718 from Adam CloudOn


Best,

Your friendly LibreOffice Gerrit Digest Mailer

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

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

[Steve Yin]

 sc/source/ui/Accessibility/AccessibleDocument.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 68792ef189457094eb0fa1790c5895d7031571da
Author: Steve Yin 
Date:   Tue Jan 7 06:02:14 2014 +

Bug 123622 - [ia2] Calc: No focus event fired on cell when new spreadsheet 
is created

diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx 
b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index b8ef809..e55bc96 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -2266,6 +2266,7 @@ uno::Reference < XAccessible >
 mpAccessibleSpreadsheet->acquire();
 mpAccessibleSpreadsheet->Init();
 mbCompleteSheetSelected = IsTableSelected();
+mpAccessibleSpreadsheet->FireFirstCellFocus(); // i123622
 }
 return mpAccessibleSpreadsheet;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - translations

[Andras Timar]

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

New commits:
commit d56dc259875a697aa69fb6a808fe8a86189db062
Author: Andras Timar 
Date:   Tue Jan 7 07:53:12 2014 +0100

Updated core
Project: translations  4417e4d92cb27c5712dafdb9b22fd54d7554d600

diff --git a/translations b/translations
index f0b3bc6..4417e4d 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit f0b3bc66f11e1bc3718c032d93b6b9f1a3966b6b
+Subproject commit 4417e4d92cb27c5712dafdb9b22fd54d7554d600
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Luc Castermans]

 svtools/source/control/ctrlbox.cxx |2 
 svtools/source/control/tabbar.cxx  |  216 +
 2 files changed, 102 insertions(+), 116 deletions(-)

New commits:
commit 347af397cafa97cfa7d5027f83fff784ca04a397
Author: Luc Castermans 
Date:   Sun Jan 5 22:22:55 2014 +0100

translated german comments

Reviewed on:
https://gerrit.libreoffice.org/7275

Change-Id: I86fef5ab012c7c464271afec3a0a5fa4d3c72f31

diff --git a/svtools/source/control/ctrlbox.cxx 
b/svtools/source/control/ctrlbox.cxx
index cc9d5d8..2078cd5 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -1616,7 +1616,7 @@ void FontStyleBox::Fill( const OUString& rName, const 
FontList* pList )
 if ( bInsert )
 InsertEntry( aStyleText );
 
-// Bestimmte Styles als Nachbildung
+// certain style as copy
 if ( bNormal )
 {
 if ( !bItalic )
diff --git a/svtools/source/control/tabbar.cxx 
b/svtools/source/control/tabbar.cxx
index 1f826da..07bdb4d 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -243,7 +243,7 @@ void ImplTabSizer::Paint( const Rectangle& )
 
 // ===
 
-// Heisst nicht Impl, da evtl. mal von aussen benutz- und ueberladbar
+// Is not named Impl. as it may be called or overloaded
 
 // --
 // - TabBarEdit -
@@ -513,7 +513,7 @@ void TabBar::ImplInitSettings( sal_Bool bFont, sal_Bool 
bBackground )
 aToolFont.SetWeight( WEIGHT_BOLD );
 SetZoomedPointFont( aToolFont );
 
-// Font in der groesse Anpassen, wenn Fenster zu klein?
+// Adapt font size if window too small?
 while ( GetTextHeight() > (GetOutputSizePixel().Height()-1) )
 {
 Font aFont = GetFont();
@@ -559,8 +559,8 @@ void TabBar::ImplGetColors( Color& rFaceColor, Color& 
rFaceTextColor,
 else
 rSelectTextColor = rStyleSettings.GetWindowTextColor();
 
-// Bei 3D-Tabs wird Selektions- und Face-Farbe umgedreht, da die
-// selektierten Tabs in 3D erscheinen sollen
+// For 3D-tabs the selection- and face-colours are swapped,
+// as the selected tabs should appear in 3D
 if ( mnWinStyle & WB_3DTAB )
 {
 Color aTempColor = rFaceColor;
@@ -576,12 +576,11 @@ void TabBar::ImplGetColors( Color& rFaceColor, Color& 
rFaceTextColor,
 
 sal_Bool TabBar::ImplCalcWidth()
 {
-// Groessen muessen nur ermittelt werden, wenn sich Text aendert oder
-// wenn der Font geaendert wurde
+// Sizes should only be retrieved if the text or the font was changed
 if ( !mbSizeFormat )
 return sal_False;
 
-// Breiten der Tabs mit dem fetten Font ermitteln
+// retrieve width of tabs with bold font
 Font aFont = GetFont();
 if ( aFont.GetWeight() != WEIGHT_BOLD )
 {
@@ -641,14 +640,13 @@ void TabBar::ImplFormat()
 for ( size_t i = 0, nL = mpItemList->size(); i < nL; ++i )
 {
 ImplTabBarItem* pItem = (*mpItemList)[ i ];
-// Bei allen nicht sichtbaren Tabs, wird ein leeres Rechteck
-// gesetzt
+// At all non-visible tabs an empty rectangle is set
 if ( (n+1 < mnFirstPos) || (x > mnLastOffX) )
 pItem->maRect.SetEmpty();
 else
 {
-// Etwas von der Tab vor der ersten sichtbaren Page
-// muss auch zu sehen sein
+// Slightly befor the tab before the first visible page
+// should also be visible
 if ( n+1 == mnFirstPos )
 pItem->maRect.Left() = x-pItem->mnWidth;
 else
@@ -672,7 +670,7 @@ void TabBar::ImplFormat()
 
 mbFormat = sal_False;
 
-// Button enablen/disablen
+//  enable/disable button
 ImplEnableControls();
 }
 
@@ -773,7 +771,7 @@ void TabBar::ImplEnableControls()
 if ( mbSizeFormat || mbFormat )
 return;
 
-// Buttons enablen/disblen
+// enable/disable buttons
 sal_Bool bEnableBtn = mbScrollAlwaysEnabled || mnFirstPos > 0;
 if ( mpFirstBtn )
 mpFirstBtn->Enable( bEnableBtn );
@@ -797,7 +795,7 @@ void TabBar::SetScrollAlwaysEnabled(bool 
bScrollAlwaysEnabled)
 
 void TabBar::ImplShowPage( sal_uInt16 nPos )
 {
-// Breite berechnen
+// calculate width
 long nWidth = GetOutputSizePixel().Width();
 if ( nWidth >= TABBAR_OFFSET_X )
 nWidth -= TABBAR_OFFSET_X;
@@ -864,8 +862,8 @@ void TabBar::MouseMove( const MouseEvent& rMEvt )
 
 void TabBar::MouseButtonDown( const MouseEvent& rMEvt )
 {
-// Bei Klick in unser Fenster EditModus nur beenden und Klick nicht
-// ausfuehren
+// Only terminate EditModus and do not execute Klick
+// if clicked inside our window,
 if ( IsInEditMode() )
 {
 EndEditMode();
@@ -930,9 +928,9 @@ void TabBar::MouseButtonDown( const MouseEvent& rMEvt )
 sal_uInt16 nCurPos = GetPagePos( mnCurPage