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

[Pranav Kant]

 loleaflet/src/control/Control.ColumnHeader.js |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 87a3b5d3ac19159afd138f84286249b71aca9fc0
Author: Pranav Kant 
Date:   Fri Mar 4 13:15:36 2016 +0530

loleaflet: Fix JS errors

Change-Id: I9740e0a223c43449ce9f40f91b8c90250d1b7560

diff --git a/loleaflet/src/control/Control.ColumnHeader.js 
b/loleaflet/src/control/Control.ColumnHeader.js
index eababcb..0091893 100644
--- a/loleaflet/src/control/Control.ColumnHeader.js
+++ b/loleaflet/src/control/Control.ColumnHeader.js
@@ -65,10 +65,12 @@ L.Control.ColumnHeader = L.Control.extend({
text.setAttribute('rel', 'spreadsheet-column-' + 
content); // for easy addressing
text.innerHTML = content;
width = Math.round(converter.call(context, twip).x) - 1 
+ 'px';
-   if (width === '-1px')
+   if (width === '-1px') {
L.DomUtil.setStyle(text, 'display', 'none');
-   else
+   }
+   else {
L.DomUtil.setStyle(text, 'width', width);
+   }
}
},
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 writerfilter/source/rtftok/rtffly.hxx   |   16 
 writerfilter/source/rtftok/rtftokenizer.cxx |   50 ++--
 writerfilter/source/rtftok/rtftokenizer.hxx |8 ++--
 3 files changed, 37 insertions(+), 37 deletions(-)

New commits:
commit 505473154bd2e717d21b1a7ff1fce322403049df
Author: Miklos Vajna 
Date:   Fri Mar 4 08:39:22 2016 +0100

writerfilter: prefix members of RTFTokenizer

Change-Id: Icba6646e183bc283e3c86a223a7f76306123200b

diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx 
b/writerfilter/source/rtftok/rtftokenizer.cxx
index 1a920c6..1af73de 100644
--- a/writerfilter/source/rtftok/rtftokenizer.cxx
+++ b/writerfilter/source/rtftok/rtftokenizer.cxx
@@ -21,10 +21,10 @@ namespace writerfilter
 namespace rtftok
 {
 
-std::vector RTFTokenizer::m_aRTFControlWords;
-bool RTFTokenizer::m_bControlWordsSorted;
-std::vector RTFTokenizer::m_aRTFMathControlWords;
-bool RTFTokenizer::m_bMathControlWordsSorted;
+std::vector RTFTokenizer::s_m_aRTFControlWords;
+bool RTFTokenizer::s_m_bControlWordsSorted;
+std::vector RTFTokenizer::s_m_aRTFMathControlWords;
+bool RTFTokenizer::s_m_bMathControlWordsSorted;
 
 RTFTokenizer::RTFTokenizer(RTFListener& rImport, SvStream* pInStream, 
uno::Reference const& xStatusIndicator)
 : m_rImport(rImport),
@@ -35,17 +35,17 @@ RTFTokenizer::RTFTokenizer(RTFListener& rImport, SvStream* 
pInStream, uno::Refer
   m_nLineStartPos(0),
   m_nGroupStart(0)
 {
-if (!RTFTokenizer::m_bControlWordsSorted)
+if (!RTFTokenizer::s_m_bControlWordsSorted)
 {
-RTFTokenizer::m_bControlWordsSorted = true;
-m_aRTFControlWords = std::vector(aRTFControlWords, 
aRTFControlWords + nRTFControlWords);
-std::sort(m_aRTFControlWords.begin(), m_aRTFControlWords.end());
+RTFTokenizer::s_m_bControlWordsSorted = true;
+s_m_aRTFControlWords = std::vector(aRTFControlWords, 
aRTFControlWords + nRTFControlWords);
+std::sort(s_m_aRTFControlWords.begin(), s_m_aRTFControlWords.end());
 }
-if (!RTFTokenizer::m_bMathControlWordsSorted)
+if (!RTFTokenizer::s_m_bMathControlWordsSorted)
 {
-RTFTokenizer::m_bMathControlWordsSorted = true;
-m_aRTFMathControlWords = 
std::vector(aRTFMathControlWords, aRTFMathControlWords + 
nRTFMathControlWords);
-std::sort(m_aRTFMathControlWords.begin(), 
m_aRTFMathControlWords.end());
+RTFTokenizer::s_m_bMathControlWordsSorted = true;
+s_m_aRTFMathControlWords = 
std::vector(aRTFMathControlWords, aRTFMathControlWords + 
nRTFMathControlWords);
+std::sort(s_m_aRTFMathControlWords.begin(), 
s_m_aRTFMathControlWords.end());
 }
 }
 
@@ -271,11 +271,11 @@ RTFError RTFTokenizer::resolveKeyword()
 
 bool RTFTokenizer::lookupMathKeyword(RTFMathSymbol& rSymbol)
 {
-std::vector::iterator low = 
std::lower_bound(m_aRTFMathControlWords.begin(), m_aRTFMathControlWords.end(), 
rSymbol);
-int i = low - m_aRTFMathControlWords.begin();
-if (low == m_aRTFMathControlWords.end() || rSymbol < *low)
+std::vector::iterator low = 
std::lower_bound(s_m_aRTFMathControlWords.begin(), 
s_m_aRTFMathControlWords.end(), rSymbol);
+int i = low - s_m_aRTFMathControlWords.begin();
+if (low == s_m_aRTFMathControlWords.end() || rSymbol < *low)
 return false;
-rSymbol = m_aRTFMathControlWords[i];
+rSymbol = s_m_aRTFMathControlWords[i];
 return true;
 }
 
@@ -293,9 +293,9 @@ RTFError RTFTokenizer::dispatchKeyword(OString& rKeyword, 
bool bParam, int nPara
  "' with param? " << (bParam ? 1 : 0) <<" param val: '" << (bParam 
? nParam : 0) << "'");
 RTFSymbol aSymbol;
 aSymbol.sKeyword = rKeyword.getStr();
-std::vector::iterator low = 
std::lower_bound(m_aRTFControlWords.begin(), m_aRTFControlWords.end(), aSymbol);
-int i = low - m_aRTFControlWords.begin();
-if (low == m_aRTFControlWords.end() || aSymbol < *low)
+std::vector::iterator low = 
std::lower_bound(s_m_aRTFControlWords.begin(), s_m_aRTFControlWords.end(), 
aSymbol);
+int i = low - s_m_aRTFControlWords.begin();
+if (low == s_m_aRTFControlWords.end() || aSymbol < *low)
 {
 SAL_INFO("writerfilter", OSL_THIS_FUNC << ": unknown keyword '\\" << 
rKeyword.getStr() << "'");
 RTFSkipDestination aSkip(m_rImport);
@@ -304,28 +304,28 @@ RTFError RTFTokenizer::dispatchKeyword(OString& rKeyword, 
bool bParam, int nPara
 }
 
 RTFError ret;
-switch (m_aRTFControlWords[i].nControlType)
+switch (s_m_aRTFControlWords[i].nControlType)
 {
 case CONTROL_FLAG:
 // flags ignore any parameter by definition
-ret = m_rImport.dispatchFlag(m_aRTFControlWords[i].nIndex);
+ret = m_rImport.dispatchFlag(s_m_aRTFControlWords[i].nIndex);
 if (ret != RTFError::OK)
 return ret;
 break;
 case CONTROL_DESTINATION:
 // same for destinations
-ret = m_rImport.dispatchDestination(m_aRTFControlWords[i].nIndex);
+ret = 

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

[Akshay Deep]

 sd/source/ui/animations/CustomAnimationList.cxx |   46 ++--
 1 file changed, 35 insertions(+), 11 deletions(-)

New commits:
commit 5351188c8ea2426e9545543646a40dc6d6df1a14
Author: Akshay Deep 
Date:   Wed Feb 17 00:09:30 2016 +0530

tdf#87812 - SIDEBAR: More animation information in list control

Modified Custom Animation ListBox entry to include multiple lines.
Added Effect names in Custom Animation List Control.

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

diff --git a/sd/source/ui/animations/CustomAnimationList.cxx 
b/sd/source/ui/animations/CustomAnimationList.cxx
index a8cc25e..2ef0644 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -215,29 +215,43 @@ public:
 private:
 VclPtr mpParent;
 OUStringmaDescription;
+OUStringeffectName;
 CustomAnimationEffectPtr mpEffect;
+const CustomAnimationPresets* mpCustomAnimationPresets;
+const long nIconWidth = 19;
+const long nItemMinHeight = 38;
 };
 
 CustomAnimationListEntryItem::CustomAnimationListEntryItem( SvTreeListEntry* 
pEntry, sal_uInt16 nFlags, const OUString& aDescription, 
CustomAnimationEffectPtr pEffect, CustomAnimationList* pParent  )
 : SvLBoxString( pEntry, nFlags, aDescription )
 , mpParent( pParent )
 , maDescription( aDescription )
+, effectName( OUString() )
 , mpEffect(pEffect)
+, 
mpCustomAnimationPresets(&CustomAnimationPresets::getCustomAnimationPresets())
 {
+effectName = 
mpCustomAnimationPresets->getUINameForPresetId(mpEffect->getPresetId());
 }
 
+
+
 CustomAnimationListEntryItem::~CustomAnimationListEntryItem()
 {
 }
 
+
 void CustomAnimationListEntryItem::InitViewData( SvTreeListBox* pView, 
SvTreeListEntry* pEntry, SvViewDataItem* pViewData )
 {
 if( !pViewData )
 pViewData = pView->GetViewDataItem( pEntry, this );
 
-Size aSize(pView->GetTextWidth( maDescription ) + 2 * 19, 
pView->GetTextHeight() );
-if( aSize.Height() < 19 )
-aSize.Height() = 19;
+long width = pView->GetTextWidth( maDescription ) + nIconWidth;
+if( width < (pView->GetTextWidth( effectName ) + 2*nIconWidth))
+width = pView->GetTextWidth( effectName ) + 2*nIconWidth;
+
+Size aSize( width, pView->GetTextHeight() );
+if( aSize.Height() < nItemMinHeight )
+aSize.Height() = nItemMinHeight;
 pViewData->maSize = aSize;
 }
 
@@ -259,8 +273,17 @@ void CustomAnimationListEntryItem::Paint(const Point& 
rPos, SvTreeListBox& rDev,
 {
 rRenderContext.DrawImage(aPos, 
mpParent->getImage(IMG_CUSTOMANIMATION_AFTER_PREVIOUS));
 }
+else if (nNodeType == EffectNodeType::WITH_PREVIOUS)
+{
+//FIXME With previous image not defined in CustomAnimation.src
+}
 
-aPos.X() += 19;
+aPos.X() += nIconWidth;
+
+
+rRenderContext.DrawText(aPos, 
rRenderContext.GetEllipsisString(maDescription, 
rDev.GetOutputSizePixel().Width() - aPos.X()));
+
+aPos.Y() += nIconWidth;
 
 sal_uInt16 nImage;
 switch (mpEffect->getPresetClass())
@@ -295,14 +318,14 @@ void CustomAnimationListEntryItem::Paint(const Point& 
rPos, SvTreeListBox& rDev,
 {
 const Image& rImage = mpParent->getImage(nImage);
 Point aImagePos(aPos);
-aImagePos.Y() += (aSize.Height() - rImage.GetSizePixel().Height()) >> 
1;
+aImagePos.Y() += (aSize.Height()/2 - rImage.GetSizePixel().Height()) 
>> 1;
 rRenderContext.DrawImage(aImagePos, rImage);
 }
 
-aPos.X() += 19;
-aPos.Y() += (aSize.Height() - rDev.GetTextHeight()) >> 1;
+aPos.X() += nIconWidth;
+aPos.Y() += (aSize.Height()/2 - rDev.GetTextHeight()) >> 1;
 
-rRenderContext.DrawText(aPos, 
rRenderContext.GetEllipsisString(maDescription, 
rDev.GetOutputSizePixel().Width() - aPos.X()));
+rRenderContext.DrawText(aPos, rRenderContext.GetEllipsisString(effectName, 
rDev.GetOutputSizePixel().Width() - aPos.X()));
 }
 
 SvLBoxItem* CustomAnimationListEntryItem::Create() const
@@ -353,6 +376,7 @@ public:
 
 private:
 OUStringmaDescription;
+const long nIconWidth = 19;
 };
 
 CustomAnimationTriggerEntryItem::CustomAnimationTriggerEntryItem( 
SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString& aDescription )
@@ -369,9 +393,9 @@ void CustomAnimationTriggerEntryItem::InitViewData( 
SvTreeListBox* pView, SvTree
 if( !pViewData )
 pViewData = pView->GetViewDataItem( pEntry, this );
 
-Size aSize(pView->GetTextWidth( maDescription ) + 2 * 19, 
pView->GetTextHeight() );
-if( aSize.Height() < 19 )
-aSize.Height() = 19;
+Size aSize(pView->GetTextWidth( maDescription ) + 2 * nIconWidth, 
pView->GetTextHeight() );
+if( aSize.Height() < nIconWidth )
+aSize.Height() = nIconWidth;
 pViewData->maSize = aSize;
 }
 
___
Libreoffi

[Libreoffice-commits] core.git: basctl/source sax/source sc/source sd/source starmath/inc starmath/source

[Aleksas Pantechovskis]

 basctl/source/basicide/basicbox.cxx |2 +-
 basctl/source/basicide/bastype2.cxx |2 +-
 basctl/source/basicide/bastypes.cxx |2 +-
 basctl/source/basicide/macrodlg.cxx |6 +++---
 basctl/source/basicide/moduldl2.cxx |6 +++---
 basctl/source/basicide/moduldlg.cxx |   16 
 sax/source/tools/converter.cxx  |4 ++--
 sc/source/core/data/global.cxx  |2 +-
 sc/source/core/tool/detfunc.cxx |6 +++---
 sc/source/filter/excel/excdoc.cxx   |4 ++--
 sc/source/filter/excel/xecontent.cxx|2 +-
 sc/source/ui/Accessibility/AccessibleCsvControl.cxx |2 +-
 sc/source/ui/app/drwtrans.cxx   |2 +-
 sc/source/ui/app/inputwin.cxx   |2 +-
 sc/source/ui/condformat/condformatdlgentry.cxx  |2 +-
 sc/source/ui/dialogs/searchresults.cxx  |2 +-
 sc/source/ui/formdlg/formula.cxx|2 +-
 sc/source/ui/vba/vbainterior.cxx|2 +-
 sc/source/ui/vba/vbaworksheets.cxx  |2 +-
 sc/source/ui/view/olinewin.cxx  |2 +-
 sc/source/ui/view/tabvwsh5.cxx  |2 +-
 sc/source/ui/view/tabvwsh9.cxx  |2 +-
 sc/source/ui/view/tabvwshe.cxx  |4 ++--
 sc/source/ui/view/viewfun2.cxx  |2 +-
 sc/source/ui/view/viewfun4.cxx  |4 ++--
 sc/source/ui/view/viewfun6.cxx  |2 +-
 sc/source/ui/view/viewutil.cxx  |2 +-
 sd/source/filter/cgm/sdcgmfilter.cxx|2 +-
 sd/source/filter/grf/sdgrffilter.cxx|2 +-
 sd/source/ui/view/drviews1.cxx  |2 +-
 sd/source/ui/view/drviews2.cxx  |6 +++---
 sd/source/ui/view/drviews4.cxx  |2 +-
 sd/source/ui/view/drviews5.cxx  |4 ++--
 sd/source/ui/view/drviews9.cxx  |2 +-
 sd/source/ui/view/drviewsa.cxx  |2 +-
 sd/source/ui/view/drviewsb.cxx  |2 +-
 sd/source/ui/view/drviewsd.cxx  |2 +-
 sd/source/ui/view/drviewse.cxx  |2 +-
 sd/source/ui/view/drviewsi.cxx  |2 +-
 starmath/inc/rect.hxx   |2 +-
 starmath/source/ElementsDockingWindow.cxx   |2 +-
 starmath/source/dialog.cxx  |2 +-
 starmath/source/edit.cxx|8 
 starmath/source/view.cxx|6 +++---
 44 files changed, 69 insertions(+), 69 deletions(-)

New commits:
commit 57d0caacee2f395be2e89b78f8ece2d47b2c8683
Author: Aleksas Pantechovskis 
Date:   Thu Mar 3 15:43:51 2016 +0200

tdf#96505 Remove long integer literal specifier when not needed

Remove L from integer literals if it does not produce warnings
and does not change semantics

Change-Id: I9573a47d3e3401993a1f0fbcf7df4be20f9e6eba
Reviewed-on: https://gerrit.libreoffice.org/22867
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/basctl/source/basicide/basicbox.cxx 
b/basctl/source/basicide/basicbox.cxx
index cc7c5cb..847a1a0 100644
--- a/basctl/source/basicide/basicbox.cxx
+++ b/basctl/source/basicide/basicbox.cxx
@@ -311,7 +311,7 @@ void LibBox::NotifyIDE()
 if (SfxDispatcher* pDispatcher = GetDispatcher())
 pDispatcher->Execute(
 SID_BASICIDE_LIBSELECTED,
-SfxCallMode::SYNCHRON, &aDocumentItem, &aLibNameItem, 0L
+SfxCallMode::SYNCHRON, &aDocumentItem, &aLibNameItem, 0
 );
 }
 ReleaseFocus();
diff --git a/basctl/source/basicide/bastype2.cxx 
b/basctl/source/basicide/bastype2.cxx
index 30fa792..288d7ed 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -932,7 +932,7 @@ bool TreeListBox::OpenCurrent()
 );
 pDispatcher->Execute(
 SID_BASICIDE_SHOWSBX,
-SfxCallMode::SYNCHRON, &aSbxItem, 0L
+SfxCallMode::SYNCHRON, &aSbxItem, 0
 );
 return true;
 }
diff --git a/basctl/source/basicide/bastypes.cxx 
b/basctl/source/basicide/bastypes.cxx
index f911713..01e0b6d 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -555,7 +555,7 @@ void TabBar::EndRenaming()
 SfxStringItem aNewName( SID_BASICIDE_ARG_MODULENAME, GetEditText() );
 if (SfxDispatcher* pDispatcher = GetDispatcher())
 pDispatcher->Execute( SID_BASICIDE_NAMECHANGEDONTAB,
-  SfxCallMode::SYNCHRON, &aID, &aNewName, 0L

[Libreoffice-commits] core.git: compilerplugins/clang include/vcl include/xmloff vcl/inc vcl/source vcl/unx xmloff/inc xmloff/source

[Noel Grandin]

 compilerplugins/clang/unuseddefaultparams.cxx |   15 
 include/vcl/button.hxx|2 -
 include/vcl/combobox.hxx  |4 +-
 include/vcl/menu.hxx  |3 -
 include/vcl/outdev.hxx|5 +-
 include/vcl/texteng.hxx   |4 +-
 include/vcl/toolbox.hxx   |2 -
 include/xmloff/shapeexport.hxx|2 -
 include/xmloff/xmlexp.hxx |3 -
 vcl/inc/listbox.hxx   |2 -
 vcl/inc/salgdi.hxx|2 -
 vcl/inc/unx/i18n_im.hxx   |2 -
 vcl/source/control/button.cxx |8 +---
 vcl/source/control/combobox.cxx   |8 ++--
 vcl/source/control/imp_listbox.cxx|   35 +---
 vcl/source/edit/texteng.cxx   |8 +---
 vcl/source/gdi/pdfwriter_impl.cxx |   16 +
 vcl/source/gdi/pdfwriter_impl.hxx |4 +-
 vcl/source/gdi/salgdilayout.cxx   |4 +-
 vcl/source/outdev/text.cxx|   17 ++---
 vcl/source/window/menu.cxx|4 +-
 vcl/source/window/toolbox.cxx |4 --
 vcl/unx/generic/app/i18n_im.cxx   |4 +-
 xmloff/inc/txtflde.hxx|3 -
 xmloff/source/core/xmlexp.cxx |   45 +-
 xmloff/source/draw/shapeexport.cxx|2 -
 xmloff/source/text/txtflde.cxx|5 +-
 27 files changed, 84 insertions(+), 129 deletions(-)

New commits:
commit f5e131b2bcd2c88a47e5988d5f319bffd767c4dc
Author: Noel Grandin 
Date:   Thu Mar 3 14:52:45 2016 +0200

loplugin:unuseddefaultparams in vcl and xmloff

and teach the plugin about code that takes the address of a function

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

diff --git a/compilerplugins/clang/unuseddefaultparams.cxx 
b/compilerplugins/clang/unuseddefaultparams.cxx
index 6906a93..a194be2 100644
--- a/compilerplugins/clang/unuseddefaultparams.cxx
+++ b/compilerplugins/clang/unuseddefaultparams.cxx
@@ -68,8 +68,11 @@ public:
 myfile.close();
 }
 
+bool shouldVisitTemplateInstantiations () const { return true; }
+
 bool VisitCallExpr(CallExpr * callExpr);
 bool VisitFunctionDecl( const FunctionDecl* functionDecl );
+bool VisitDeclRefExpr( const DeclRefExpr* declRefExpr );
 private:
 MyFuncInfo niceName(const FunctionDecl* functionDecl);
 };
@@ -208,6 +211,18 @@ bool UnusedDefaultParams::VisitFunctionDecl( const 
FunctionDecl* functionDecl )
 return true;
 }
 
+// this catches places that take the address of a method
+bool UnusedDefaultParams::VisitDeclRefExpr( const DeclRefExpr* declRefExpr )
+{
+const Decl* functionDecl = declRefExpr->getDecl();
+if (!isa(functionDecl)) {
+return true;
+}
+MyFuncInfo funcInfo = niceName(dyn_cast(functionDecl));
+callSet.insert(funcInfo);
+return true;
+}
+
 loplugin::Plugin::Registration< UnusedDefaultParams > X("unuseddefaultparams", 
false);
 
 }
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index 91ba1e3..bf19a6a 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -297,7 +297,7 @@ private:
 SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, DrawFlags nDrawFlags,
   const Point& rPos, const Size& rSize,
   const Size& rImageSize, Rectangle& rStateRect,
-  Rectangle& rMouseRect, bool bLayout = false );
+  Rectangle& rMouseRect );
 SAL_DLLPRIVATE void ImplDrawRadioButton(vcl::RenderContext& 
rRenderContext );
 SAL_DLLPRIVATE void ImplUncheckAllOther();
 SAL_DLLPRIVATE Size ImplGetRadioImageSize() const;
diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx
index 8396156..77754b7 100644
--- a/include/vcl/combobox.hxx
+++ b/include/vcl/combobox.hxx
@@ -137,8 +137,8 @@ public:
 SizeCalcBlockSize( sal_uInt16 nColumns, sal_uInt16 nLines ) 
const;
 voidGetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& 
rnLines ) const;
 
-voidSetMRUEntries( const OUString& rEntries, sal_Unicode cSep 
= ';' );
-OUStringGetMRUEntries( sal_Unicode cSep = ';' ) const;
+voidSetMRUEntries( const OUString& rEntries );
+OUStringGetMRUEntries() const;
 voidSetMaxMRUCount( sal_Int32  n );
 sal_Int32   GetMaxMRUCount() const;
 voidSetEntryData( sal_Int32  nPos, void* pNewData );
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index f8d44e0..4b1682f 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -251,8 +251,7 @@ public:
  

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

[David Tardon]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fee4fe8e589e101140d9b318ac757825bf836506
Author: David Tardon 
Date:   Thu Mar 3 14:23:31 2016 +0100

upload libpagemaker 0.0.3

Change-Id: I7d0f7e9a1bf9d2d590337cf4bb8cc4860c05444e
Reviewed-on: https://gerrit.libreoffice.org/22864
Tested-by: Jenkins 
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/download.lst b/download.lst
index 3bd1316..cee632e 100644
--- a/download.lst
+++ b/download.lst
@@ -120,8 +120,8 @@ export ORCUS_MD5SUM := e6efcbe50a5fd4d50d513c9a7a4139b0
 export ORCUS_TARBALL := liborcus-0.9.2.tar.gz
 export OWNCLOUD_ANDROID_LIB_MD5SUM := 593f0aa47bf2efc0efda2d28fae063b2
 export OWNCLOUD_ANDROID_LIB_TARBALL := 
owncloud-android-library-0.9.4-no-binary-deps.tar.gz
-export PAGEMAKER_MD5SUM := 795cc7a59ace4db2b12586971d668671
-export PAGEMAKER_TARBALL := libpagemaker-0.0.2.tar.bz2
+export PAGEMAKER_MD5SUM := 5c4985a68be0b79d3f809da5e12b143c
+export PAGEMAKER_TARBALL := libpagemaker-0.0.3.tar.bz2
 export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
 export PNG_MD5SUM := 3121bdc77c365a87e054b9f859f421fe
 export PNG_TARBALL := libpng-1.6.19.tar.gz
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/LOOLWSD.hpp loolwsd/Storage.hpp

[Ashod Nakashian]

 loolwsd/LOOLWSD.hpp |4 ++-
 loolwsd/Storage.hpp |   63 +---
 2 files changed, 63 insertions(+), 4 deletions(-)

New commits:
commit 743311af2137089e16bae3168a6e5413e3aee751
Author: Ashod Nakashian 
Date:   Thu Mar 3 21:05:30 2016 -0500

loolwsd: added wopi storage manager

Change-Id: Ia28fb3d42c43387432e0b183a1bcf6b0924da820
Reviewed-on: https://gerrit.libreoffice.org/22885
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/loolwsd/LOOLWSD.hpp b/loolwsd/LOOLWSD.hpp
index ba11e68..a41cceb 100644
--- a/loolwsd/LOOLWSD.hpp
+++ b/loolwsd/LOOLWSD.hpp
@@ -100,7 +100,9 @@ public:
 else
 {
 Log::info("Public URI [" + uriPublic.toString() +
-  "] is not a file.");
+  "] assuming cloud storage.");
+//TODO: Configure the storage to use. For now, assume it's WOPI.
+std::unique_ptr storage(new 
WopiStorage(docPath.toString()));
 }
 
 auto document = std::shared_ptr(new 
DocumentURI(uriPublic, uriJailed, childId));
diff --git a/loolwsd/Storage.hpp b/loolwsd/Storage.hpp
index 1cf2991..f38c593 100644
--- a/loolwsd/Storage.hpp
+++ b/loolwsd/Storage.hpp
@@ -13,6 +13,8 @@
 
 #include 
 
+#include 
+
 #include "Auth.hpp"
 #include "Util.hpp"
 
@@ -21,13 +23,20 @@ class StorageBase
 {
 public:
 
-/// Returns a local file path given a URI.
+StorageBase(const std::string& localStorePath) :
+_localStorePath(localStorePath)
+{
+}
+
+/// Returns a local file path given a URI or ID.
 /// If necessary copies the file locally first.
 virtual std::string getFilePathFromURI(const std::string& uri) = 0;
 
-/// Writes the contents of the file back to the URI.
+/// Writes the contents of the file back to the source.
 virtual bool restoreFileToURI(const std::string& path, const std::string& 
uri) = 0;
 
+protected:
+const std::string _localStorePath;
 };
 
 /// Trivial implementation of local storage that does not need do anything.
@@ -51,11 +60,59 @@ public:
 }
 };
 
+class WopiStorage : public StorageBase
+{
+public:
+WopiStorage(const std::string& localStorePath) :
+StorageBase(localStorePath)
+{
+}
+
+/// uri format: http://server/<...>/wopi*/files//content
+std::string getFilePathFromURI(const std::string& uri) override
+{
+Poco::URI uriObject(uri);
+Poco::Net::HTTPClientSession session(uriObject.getHost(), 
uriObject.getPort());
+Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET, uri, 
Poco::Net::HTTPMessage::HTTP_1_1);
+Poco::Net::HTTPResponse response;
+session.sendRequest(request);
+std::istream& rs = session.receiveResponse(response);
+Log::info() << "WOPI::GetFile Status: " <<  response.getStatus() << " 
" << response.getReason() << Log::end;
+
+//TODO: Get proper filename.
+const std::string local_filename = _localStorePath + "/filename";
+std::ofstream ofs(local_filename);
+std::copy(std::istreambuf_iterator(rs),
+  std::istreambuf_iterator(),
+  std::ostreambuf_iterator(ofs));
+return local_filename;
+}
+
+bool restoreFileToURI(const std::string& path, const std::string& uri) 
override
+{
+Poco::URI uriObject(uri);
+Poco::Net::HTTPClientSession session(uriObject.getHost(), 
uriObject.getPort());
+Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_POST, uri, 
Poco::Net::HTTPMessage::HTTP_1_1);
+
+std::ifstream ifs(path);
+request.read(ifs);
+
+Poco::Net::HTTPResponse response;
+session.sendRequest(request);
+Log::info() << "WOPI::PutFile Status: " <<  response.getStatus() << " 
" << response.getReason() << Log::end;
+
+return (response.getStatus() == Poco::Net::HTTPResponse::HTTP_OK);
+}
+};
+
 class WebDAVStorage : public StorageBase
 {
 public:
 
-WebDAVStorage(const std::string& url, std::unique_ptr authAgent) 
:
+WebDAVStorage(const std::string& localStorePath,
+  const std::string& url,
+  std::unique_ptr authAgent) :
+StorageBase(localStorePath),
 _url(url),
 _authAgent(std::move(authAgent))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/LOOLWSD.cpp loolwsd/LOOLWSD.hpp loolwsd/MasterProcessSession.cpp

[Ashod Nakashian]

 loolwsd/LOOLWSD.cpp  |1 -
 loolwsd/LOOLWSD.hpp  |   24 +---
 loolwsd/MasterProcessSession.cpp |5 +++--
 3 files changed, 16 insertions(+), 14 deletions(-)

New commits:
commit c980ece8bcca0bf8c6c569a9db37b085022952e5
Author: Ashod Nakashian 
Date:   Thu Mar 3 21:00:57 2016 -0500

loolwsd: preparing for wopi storage

Change-Id: Iae1bd042d84603cf81115789df40f50e8dc20d16
Reviewed-on: https://gerrit.libreoffice.org/22884
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 8ad52d7..ad5726b 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -103,7 +103,6 @@ DEALINGS IN THE SOFTWARE.
 #include "LOOLWSD.hpp"
 #include "MasterProcessSession.hpp"
 #include "QueueHandler.hpp"
-#include "Storage.hpp"
 #include "Util.hpp"
 
 using namespace LOOLProtocol;
diff --git a/loolwsd/LOOLWSD.hpp b/loolwsd/LOOLWSD.hpp
index 696ca3a..ba11e68 100644
--- a/loolwsd/LOOLWSD.hpp
+++ b/loolwsd/LOOLWSD.hpp
@@ -23,6 +23,7 @@
 #include 
 
 #include "Auth.hpp"
+#include "Storage.hpp"
 #include "Common.hpp"
 #include "Util.hpp"
 
@@ -34,8 +35,8 @@ public:
 
 static
 std::shared_ptr create(const std::string& url,
- const std::string& jailRoot,
- const std::string& childId)
+const std::string& jailRoot,
+const std::string& childId)
 {
 // TODO: Sanitize the url and limit access!
 auto uriPublic = Poco::URI(url);
@@ -52,16 +53,17 @@ public:
 
 // The URL is the publicly visible one, not visible in the chroot jail.
 // We need to map it to a jailed path and copy the file there.
+
+// chroot/jailId/user/doc
+const auto jailedDocRoot = Poco::Path(jailRoot, JailedDocumentRoot);
+
+// chroot/jailId/user/doc/childId
+const auto docPath = Poco::Path(jailedDocRoot, childId);
+Poco::File(docPath).createDirectories();
+
 auto uriJailed = uriPublic;
 if (uriPublic.isRelative() || uriPublic.getScheme() == "file")
 {
-// chroot/jailId/user/doc
-const auto jailedDocRoot = Poco::Path(jailRoot, 
JailedDocumentRoot);
-
-// chroot/jailId/user/doc/childId
-const auto docPath = Poco::Path(jailedDocRoot, childId);
-Poco::File(docPath).createDirectories();
-
 const auto filename = 
Poco::Path(uriPublic.getPath()).getFileName();
 
 // chroot/jailId/user/doc/childId/file.ext
@@ -113,8 +115,8 @@ public:
 
 private:
 DocumentURI(const Poco::URI& uriPublic,
- const Poco::URI& uriJailed,
- const std::string& jailId) :
+const Poco::URI& uriJailed,
+const std::string& jailId) :
_uriPublic(uriPublic),
_uriJailed(uriJailed),
_jailId(jailId)
diff --git a/loolwsd/MasterProcessSession.cpp b/loolwsd/MasterProcessSession.cpp
index 126a12b..55ccdaf 100644
--- a/loolwsd/MasterProcessSession.cpp
+++ b/loolwsd/MasterProcessSession.cpp
@@ -451,10 +451,11 @@ bool MasterProcessSession::loadDocument(const char* 
/*buffer*/, int /*length*/,
 
 try
 {
-Poco::URI aUri(_docURL);
+// Strip query params because we need unique URI (need a better 
solution!).
+StringTokenizer tokens(_docURL, "?", StringTokenizer::TOK_IGNORE_EMPTY 
| StringTokenizer::TOK_TRIM);
 
 // request new URL session
-const std::string aMessage = "request " + getId() + " " + _docURL + 
"\r\n";
+const std::string aMessage = "request " + getId() + " " + tokens[0] + 
"\r\n";
 Log::trace("MasterToBroker: " + aMessage.substr(0, 
aMessage.length()-2));
 Util::writeFIFO(LOOLWSD::BrokerWritePipe, aMessage);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Windows / font / text futures ...

[Thorsten Behrens]

Hi Michael,

you write:
>   Having looked at this heap; and worse - the two different heaps for
> Windows text rendering, and also the big pile of strange cross-platform
> issues with stacking diacritics, emojis etc. I'm pretty convinced that
> we cannot do a good job of consistent text shaping and/or rendering
> cross-platform while using the Windows font rendering infrastructure.
> 
Yeah, I suppose. But that alone won't fix the kind of issues you show
in your ascii art - as long as so much low-level layouting is still
happening in Writer (dx arrays, kashida filling etc).

>   While we could switch to DirectWrite on windows, which may solve some
> of our problems; this will be in itself disruptive.
> 
Incidentally - why that?

>   So - I believe that we should switch to using harfbuzz and freetype
> consistently everywhere. This would have the huge benefit of precise
> cross-platform font rendering and metric fidelity, give us a font and
> shaping stack that is fully introspectable, drop some legacy Windows API
> usage, and allow all development work and fixing on all platforms to
> share the same underlying code.
> 
I think that promise cannot be kept. Let's evaluate the merit of
switching to some truly great floss libraries based on other aspects -
you're not even getting consistent floating point math between
different CPUs, let alone different operating systems...

>   There will of course also be some corner-cases where we may simply not
> be able to replicate the tangled old layout behaviour - which is
> (anyway) inconsistent across platforms - but - I think this is a one-off
> risk that is well worth taking to get us to a fully consistent, Free
> Software rendering stack. It is interesting that Microsoft also used freetype
> for their Office / Mac rendering in the recent past =)
> 
Oh - got some reference for that? Since I guess for most complaints
about layouting problems I hear about, it's the different between MSO
and LibreOffice, rather than between LibreOffice on different
platforms. ;)

Cheers,

-- Thorsten


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

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

[Xisco Fauli]

 svgio/qa/cppunit/SvgImportTest.cxx |   12 
 test/source/primitive2dxmldump.cxx |5 -
 2 files changed, 16 insertions(+), 1 deletion(-)

New commits:
commit 31e037c348ef0e04393926891617fde1b0051a35
Author: Xisco Fauli 
Date:   Thu Mar 3 23:19:01 2016 +0100

SVGIO: Check height and width of polypolygoncolor

Change-Id: Ibc5844d4e4a89fae7bbc8d2b854384d0c433500f
Reviewed-on: https://gerrit.libreoffice.org/22883
Tested-by: Jenkins 
Reviewed-by: Xisco Faulí 

diff --git a/svgio/qa/cppunit/SvgImportTest.cxx 
b/svgio/qa/cppunit/SvgImportTest.cxx
index 365fb01..3ac20dd 100644
--- a/svgio/qa/cppunit/SvgImportTest.cxx
+++ b/svgio/qa/cppunit/SvgImportTest.cxx
@@ -116,6 +116,8 @@ void Test::checkRectPrimitive(Primitive2DSequence& 
rPrimitive)
 CPPUNIT_ASSERT (pDocument);
 
 assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor", "color", 
"#00cc00"); // rect background color
+assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor", 
"height", "100"); // rect background height
+assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor", "width", 
"100"); // rect background width
 assertXPath(pDocument, "/primitive2D/transform/polypolygonstroke/line", 
"color", "#ff"); // rect stroke color
 assertXPath(pDocument, "/primitive2D/transform/polypolygonstroke/line", 
"width", "3"); // rect stroke width
 
@@ -174,6 +176,8 @@ void Test::testTdf87309()
 CPPUNIT_ASSERT (pDocument);
 
 assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor", "color", 
"#00");
+assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor", 
"height", "100");
+assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor", "width", 
"100");
 }
 
 void Test::testFontsizeKeywords()
@@ -324,6 +328,8 @@ void Test::testTdf97543()
 CPPUNIT_ASSERT (pDocument);
 
 assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor", "color", 
"#00cc00");
+assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor", 
"height", "100");
+assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor", "width", 
"100");
 }
 
 void Test::testRGBColor()
@@ -337,6 +343,8 @@ void Test::testRGBColor()
 CPPUNIT_ASSERT (pDocument);
 
 assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor", "color", 
"#646464");
+assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor", 
"height", "100");
+assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor", "width", 
"100");
 }
 
 void Test::testRGBAColor()
@@ -364,7 +372,11 @@ void Test::testTdf97936()
 CPPUNIT_ASSERT (pDocument);
 
 assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor[1]");
+assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor[1]", 
"height", "50");
+assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor[1]", 
"width", "50");
 assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor[2]");
+assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor[2]", 
"height", "50");
+assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor[2]", 
"width", "50");
 }
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
diff --git a/test/source/primitive2dxmldump.cxx 
b/test/source/primitive2dxmldump.cxx
index d1b2fcb..fbd0b99 100644
--- a/test/source/primitive2dxmldump.cxx
+++ b/test/source/primitive2dxmldump.cxx
@@ -113,7 +113,6 @@ void Primitive2dXmlDump::decomposeAndWrite(
 {
 const TransformPrimitive2D& rTransformPrimitive2D = 
dynamic_cast(*pBasePrimitive);
 rWriter.startElement("transform");
-//pTransformPrimitive2D->getTransformation()
 decomposeAndWrite(rTransformPrimitive2D.getChildren(), 
rWriter);
 rWriter.endElement();
 }
@@ -125,6 +124,10 @@ void Primitive2dXmlDump::decomposeAndWrite(
 
 rWriter.startElement("polypolygoncolor");
 rWriter.attribute("color", 
convertColorToString(rPolyPolygonColorPrimitive2D.getBColor()));
+const basegfx::B2DPolyPolygon 
aB2DPolyPolygon(rPolyPolygonColorPrimitive2D.getB2DPolyPolygon());
+const basegfx::B2DRange 
aB2DRange(aB2DPolyPolygon.getB2DRange());
+rWriter.attribute("height", aB2DRange.getHeight());
+rWriter.attribute("width", aB2DRange.getWidth());
 rWriter.startElement("polypolygon");
 
rWriter.content(basegfx::tools::exportToSvgD(rPolyPolygonColorPrimitive2D.getB2DPolyPolygon(),
 true, true, false));
 rWriter.endElement();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/coinmp

[David Ostrovsky]

 external/coinmp/UnpackedTarball_coinmp.mk |1 +
 external/coinmp/osi_cuts_iterator.patch.0 |   12 
 2 files changed, 13 insertions(+)

New commits:
commit 7df498c828b36259397e2dd2769d99e7f30f7470
Author: David Ostrovsky 
Date:   Thu Mar 3 22:42:41 2016 +0100

Fix coinmp on MSVC 14.0

Iterator category tags carry information that can be used
to select the most efficient algorithms for the specific
requirement set that is implied by the category. OsiCuts
defines bidirectional category tag, but doesn't implement
operator--(). This is illegal: [1].

* [1] http://paste.openstack.org/show/489235

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

diff --git a/external/coinmp/UnpackedTarball_coinmp.mk 
b/external/coinmp/UnpackedTarball_coinmp.mk
index 468589b..98d54403 100644
--- a/external/coinmp/UnpackedTarball_coinmp.mk
+++ b/external/coinmp/UnpackedTarball_coinmp.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,coinmp,\
 $(eval $(call gb_UnpackedTarball_set_patchlevel,coinmp,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
+   external/coinmp/osi_cuts_iterator.patch.0 \
external/coinmp/android.build.patch.1 \
external/coinmp/no-binaries.patch.1 \
external/coinmp/werror-format-security.patch.0 \
diff --git a/external/coinmp/osi_cuts_iterator.patch.0 
b/external/coinmp/osi_cuts_iterator.patch.0
new file mode 100755
index 000..42ed5af
--- /dev/null
+++ b/external/coinmp/osi_cuts_iterator.patch.0
@@ -0,0 +1,12 @@
+diff -ru coinmp.orig/Osi/src/Osi/OsiCuts.hpp coinmp/Osi/src/Osi/OsiCuts.hpp
+--- Osi/src/Osi/OsiCuts.hpp2011-06-13 17:08:11.0 +0200
 Osi/src/Osi/OsiCuts.hpp2016-03-03 22:21:04.669838200 +0100
+@@ -74,7 +74,7 @@
+ class const_iterator {
+   friend class OsiCuts;
+   public:
+-typedef std::bidirectional_iterator_tag iterator_category;
++typedef std::forward_iterator_tag iterator_category;
+ typedef OsiCut* value_type;
+ typedef size_t difference_type;
+ typedef OsiCut ** pointer;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Tamás Bunth license statement

[Bunth Tamás]

 All of my past & future contributions to LibreOffice may be
   licensed under the MPLv2/LGPLv3+ dual license.

Tamás Bunth
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/qa

[Michael Stahl]

 vcl/qa/cppunit/blocklistparsertest.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bba00901f55bfd4fa476667baaf2b2e7e1f58762
Author: Michael Stahl 
Date:   Thu Mar 3 22:29:43 2016 +0100

vcl: fix the MSVC build

Change-Id: I3607e90eb819a2afc4bc58072cdac74fb559bacb

diff --git a/vcl/qa/cppunit/blocklistparsertest.cxx 
b/vcl/qa/cppunit/blocklistparsertest.cxx
index 66a4f70..d5357e7 100644
--- a/vcl/qa/cppunit/blocklistparsertest.cxx
+++ b/vcl/qa/cppunit/blocklistparsertest.cxx
@@ -39,7 +39,7 @@ void BlocklistParserTest::testParse()
 WinBlocklistParser aBlocklistParser(getURLFromSrc("vcl/qa/cppunit/") + 
"test_blocklist_parse.xml", aDriveInfos);
 aBlocklistParser.parse();
 
-CPPUNIT_ASSERT_EQUAL(20U, aDriveInfos.size());
+CPPUNIT_ASSERT_EQUAL(static_cast(20), aDriveInfos.size());
 
 size_t i = 0;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 vcl/qa/cppunit/blocklistparsertest.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 70fd98f16fea0afa7b7943764b0934064dbd2c43
Author: Michael Stahl 
Date:   Thu Mar 3 21:53:59 2016 +0100

vcl: type inference is beyond MSVC's limited abilities

Change-Id: I3e6c84c1f49e9523e881ce12dbb2f7e0d1df956e

diff --git a/vcl/qa/cppunit/blocklistparsertest.cxx 
b/vcl/qa/cppunit/blocklistparsertest.cxx
index b47b518..3de95f0 100644
--- a/vcl/qa/cppunit/blocklistparsertest.cxx
+++ b/vcl/qa/cppunit/blocklistparsertest.cxx
@@ -39,8 +39,8 @@ void BlocklistParserTest::testParse()
 WinBlocklistParser aBlocklistParser(getURLFromSrc("vcl/qa/cppunit/") + 
"test_blocklist_parse.xml", aDriveInfos);
 aBlocklistParser.parse();
 
-auto const n = aDriveInfos.size();
-CPPUNIT_ASSERT_EQUAL(static_cast(20), n);
+size_t const n = aDriveInfos.size();
+CPPUNIT_ASSERT_EQUAL(static_cast(20), n);
 
 size_t i = 0;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

Tag 'cp-4.4-11' created by Andras Timar  at 
2016-03-03 21:08 -0800

cp-4.4-11

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

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

[Andras Timar]

Tag 'cp-4.4-11' created by Andras Timar  at 
2016-03-03 21:08 -0800

cp-4.4-11

Changes since cp-4.4-branch-point:
Andras Timar (1):
  tdf#86301 fix hids of startcenter

---
 source/text/shared/guide/startcenter.xhp |   27 +--
 1 file changed, 13 insertions(+), 14 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier]

Tag 'cp-4.4-11' created by Andras Timar  at 
2016-03-03 21:08 -0800

cp-4.4-11

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

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

[Olivier R]

Tag 'cp-4.4-11' created by Andras Timar  at 
2016-03-03 21:08 -0800

cp-4.4-11

Changes since cp-4.4-branch-point-6:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/source/gdi/pdfwriter_impl.cxx |   21 ++---
 1 file changed, 6 insertions(+), 15 deletions(-)

New commits:
commit 5f6065f980756fdb81c7018bedbb7f54e2b8214a
Author: Caolán McNamara 
Date:   Thu Mar 3 20:44:47 2016 +

coverity#1355126 Logically dead code

maybe we should be using more precision, but we haven't
been in the past

Change-Id: Icf1e1e95099c783435e04f60d8ade755a8d2d4d5

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index 746636a..0a4d595 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -845,17 +845,14 @@ static void appendFixedInt( sal_Int32 nValue, 
OStringBuffer& rBuffer )
 rBuffer.append( '-' );
 nValue = -nValue;
 }
-sal_Int32 nFactor = 10;
-sal_Int32 nInt = nValue / nFactor;
+const sal_Int32 nFactor = 10;
+const sal_Int32 nInt = nValue / nFactor;
 rBuffer.append( nInt );
 sal_Int32 nDecimal  = nValue % nFactor;
-if( nDecimal )
+if (nDecimal)
 {
-rBuffer.append( '.' );
-// omit trailing zeros
-while( (nDecimal % 10) == 0 )
-nDecimal /= 10;
-rBuffer.append( nDecimal );
+rBuffer.append('.');
+rBuffer.append(nDecimal);
 }
 }
 
commit cd5cc12d4330d68d0a233a82eda30e983ce202a4
Author: Caolán McNamara 
Date:   Thu Mar 3 20:42:52 2016 +

nLog10Divisor is 1

Change-Id: I8820d435e2f26d04ac3eccb710383399d050e020

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index 6911134..746636a 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -845,23 +845,17 @@ static void appendFixedInt( sal_Int32 nValue, 
OStringBuffer& rBuffer )
 rBuffer.append( '-' );
 nValue = -nValue;
 }
-sal_Int32 nFactor = 1, nDiv = nLog10Divisor;
-while( nDiv-- )
-nFactor *= 10;
-
-sal_Int32 nInt  = nValue / nFactor;
+sal_Int32 nFactor = 10;
+sal_Int32 nInt = nValue / nFactor;
 rBuffer.append( nInt );
-if( nFactor > 1 )
+sal_Int32 nDecimal  = nValue % nFactor;
+if( nDecimal )
 {
-sal_Int32 nDecimal  = nValue % nFactor;
-if( nDecimal )
-{
-rBuffer.append( '.' );
-// omit trailing zeros
-while( (nDecimal % 10) == 0 )
-nDecimal /= 10;
-rBuffer.append( nDecimal );
-}
+rBuffer.append( '.' );
+// omit trailing zeros
+while( (nDecimal % 10) == 0 )
+nDecimal /= 10;
+rBuffer.append( nDecimal );
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 sc/source/core/tool/interpr8.cxx |   24 +---
 1 file changed, 9 insertions(+), 15 deletions(-)

New commits:
commit 56f81d96e321d941abb43ed6b26a987bf815f36a
Author: Tor Lillqvist 
Date:   Thu Mar 3 21:38:22 2016 +0200

We don't use 'using' for other std types either in this file

Change-Id: I561e515da65db619330b536e3c8c6de555730740

diff --git a/sc/source/core/tool/interpr8.cxx b/sc/source/core/tool/interpr8.cxx
index 7651291..48bd916 100644
--- a/sc/source/core/tool/interpr8.cxx
+++ b/sc/source/core/tool/interpr8.cxx
@@ -17,8 +17,6 @@
 #include 
 #include 
 
-
-using ::std::vector;
 using namespace formula;
 
 struct DataPoint
@@ -72,7 +70,7 @@ class ScETSForecastCalculation
 {
 private:
 SvNumberFormatter* mpFormatter;
-vector< DataPoint > maRange;// data (X, Y)
+std::vector< DataPoint > maRange;   // data (X, Y)
 double* mpBase; // calculated base value array
 double* mpTrend;// calculated trend factor array
 double* mpPerIdx;   // calculated periodical deviation 
array, not used with eds
@@ -267,7 +265,7 @@ bool ScETSForecastCalculation::PreprocessDataRange( 
ScMatrixRef rMatX, ScMatrixR
 
 case 5 : // MEDIAN
  {
- vector< double > aTmp;
+ std::vector< double > aTmp;
  aTmp.push_back( maRange[ i - 1 ].Y );
  while ( maRange[ i ].X == maRange[ i - 1 ].X  && 
i < mnCount )
  {
@@ -436,7 +434,7 @@ bool ScETSForecastCalculation::prefillPerIdx()
 return false;
 }
 SCSIZE nPeriods = mnCount / mnSmplInPrd;
-vector< double > aPeriodAverage( nPeriods, 0.0 );
+std::vector< double > aPeriodAverage( nPeriods, 0.0 );
 for ( SCSIZE i = 0; i < nPeriods ; i++ )
 {
 for ( SCSIZE j = 0; j < mnSmplInPrd; j++ )
@@ -1003,7 +1001,7 @@ bool ScETSForecastCalculation::GetETSPredictionIntervals( 
ScMatrixRef rTMat, ScM
 std::unique_ptr< double[] > xScenBase( new double[nSize]);
 std::unique_ptr< double[] > xScenTrend( new double[nSize]);
 std::unique_ptr< double[] > xScenPerIdx( new double[nSize]);
-vector< vector< double > >  aPredictions( nSize, vector< double >( 
cnScenarios ) );
+std::vector< std::vector< double > >  aPredictions( nSize, std::vector< 
double >( cnScenarios ) );
 
 // fill scenarios
 for ( SCSIZE k = 0; k < cnScenarios; k++ )
@@ -1132,7 +1130,7 @@ bool ScETSForecastCalculation::GetEDSPredictionIntervals( 
ScMatrixRef rTMat, ScM
 
 double z = ScInterpreter::gaussinv( ( 1.0 + fPILevel ) / 2.0 );
 double o = 1 - fPILevel;
-vector< double > c( nSize );
+std::vector< double > c( nSize );
 for ( SCSIZE i = 0; i < nSize; i++ )
 {
 c[ i ] = sqrt( 1 + ( fPILevel / pow( 1 + o, 3.0 ) ) *
commit db145e5073e42ae71a77c5987ae673cfe97426d1
Author: Tor Lillqvist 
Date:   Thu Mar 3 21:36:58 2016 +0200

delete works fine on nullptr

Change-Id: I373df68f8ce59d34d98a8c5608a16deb278ecec3

diff --git a/sc/source/core/tool/interpr8.cxx b/sc/source/core/tool/interpr8.cxx
index d2e160e..7651291 100644
--- a/sc/source/core/tool/interpr8.cxx
+++ b/sc/source/core/tool/interpr8.cxx
@@ -142,14 +142,10 @@ ScETSForecastCalculation::ScETSForecastCalculation( 
SCSIZE nSize, SvNumberFormat
 
 ScETSForecastCalculation::~ScETSForecastCalculation()
 {
-if ( mpBase )
-delete mpBase;
-if ( mpTrend )
-delete mpTrend;
-if ( mpPerIdx )
-delete mpPerIdx;
-if ( mpForecast )
-delete mpForecast;
+delete mpBase;
+delete mpTrend;
+delete mpPerIdx;
+delete mpForecast;
 }
 
 bool ScETSForecastCalculation::PreprocessDataRange( ScMatrixRef rMatX, 
ScMatrixRef rMatY, int& rSmplInPrd,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

New Defects reported by Coverity Scan for LibreOffice

[scan-admin]

Hi,

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

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

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


** CID 1355126:  Control flow issues  (DEADCODE)
/vcl/source/gdi/pdfwriter_impl.cxx: 862 in appendFixedInt(int, 
rtl::OStringBuffer &)()



*** CID 1355126:  Control flow issues  (DEADCODE)
/vcl/source/gdi/pdfwriter_impl.cxx: 862 in appendFixedInt(int, 
rtl::OStringBuffer &)()
856 sal_Int32 nDecimal  = nValue % nFactor;
857 if( nDecimal )
858 {
859 rBuffer.append( '.' );
860 // omit trailing zeros
861 while( (nDecimal % 10) == 0 )
>>> CID 1355126:  Control flow issues  (DEADCODE)
>>> Execution cannot reach this statement: "nDecimal /= 10;".
862 nDecimal /= 10;
863 rBuffer.append( nDecimal );
864 }
865 }
866 }
867 



To view the defects in Coverity Scan visit, 
https://scan.coverity.com/projects/libreoffice?tab=overview

To manage Coverity Scan email notifications for 
"libreoffice@lists.freedesktop.org", click 
https://scan.coverity.com/subscriptions/edit?email=libreoffice%40lists.freedesktop.org&token=d6481d718a775246b2340f282ebe5939

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

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

[Tor Lillqvist]

 sc/source/core/tool/interpr8.cxx |   11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 0f2075338c7c6dfc2a7116eb2f6103060fe73104
Author: Tor Lillqvist 
Date:   Thu Mar 3 21:34:36 2016 +0200

loplugin:nullptr

Change-Id: I139b93f3285c61e2a4ba2d7959273dbcd1f95694

diff --git a/sc/source/core/tool/interpr8.cxx b/sc/source/core/tool/interpr8.cxx
index 762ae93..d2e160e 100644
--- a/sc/source/core/tool/interpr8.cxx
+++ b/sc/source/core/tool/interpr8.cxx
@@ -134,10 +134,10 @@ ScETSForecastCalculation::ScETSForecastCalculation( 
SCSIZE nSize, SvNumberFormat
 maRange.reserve( mnCount );
 mbInitialised = false;
 mnMonthDay = 0;
-mpBase = 0;
-mpTrend= 0;
-mpPerIdx   = 0;
-mpForecast = 0;
+mpBase = nullptr;
+mpTrend= nullptr;
+mpPerIdx   = nullptr;
+mpForecast = nullptr;
 }
 
 ScETSForecastCalculation::~ScETSForecastCalculation()
@@ -1312,7 +1312,7 @@ void ScInterpreter::ScForecast_Ets( ScETSType eETSType )
 ScETSForecastCalculation aETSCalc( pMatX->GetElementCount(), pFormatter );
 if ( !aETSCalc.PreprocessDataRange( pMatX, pMatY, nSmplInPrd, 
bDataCompletion,
nAggregation,
-   ( eETSType != etsStatAdd && eETSType != 
etsStatMult ? pTMat : 0 ),
+   ( eETSType != etsStatAdd && eETSType != 
etsStatMult ? pTMat : nullptr ),
eETSType ) )
 {
 PushError( aETSCalc.GetError() );
commit 599dff308a5cb0e9ca4337839493742839abded2
Author: Tor Lillqvist 
Date:   Thu Mar 3 21:33:27 2016 +0200

loplugin:unreffun

Change-Id: I13b718ae04c30d02003fa31322de655f9386b815

diff --git a/sc/source/core/tool/interpr8.cxx b/sc/source/core/tool/interpr8.cxx
index f88d3c2..762ae93 100644
--- a/sc/source/core/tool/interpr8.cxx
+++ b/sc/source/core/tool/interpr8.cxx
@@ -25,7 +25,6 @@ struct DataPoint
 {
 double X, Y;
 
-DataPoint() : X( 0.0 ), Y( 0.0 ) {};
 DataPoint( double rX, double rY ) : X( rX ), Y( rY ) {};
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Arul Michael]

 sc/source/core/data/table3.cxx |   17 -
 1 file changed, 8 insertions(+), 9 deletions(-)

New commits:
commit a6e7673aec0321ceb328de902d5ee0689df3abf7
Author: Arul Michael 
Date:   Mon Feb 22 09:53:31 2016 +0530

tdf#97215 Sorting with update reference causes crash

The memory of SvtBroadcaster* of a cell is freed in EndlisteningCell()
during SplitFormulaGroups call. The same memory address is assigned back
to the cell again when the contents are transferred back after sorting.
This is because the CreateSortinfoArray is done before
SplitformulaGroup. For fix getting mpbroadcaster from the Document
instead of SortinfoArray since we change the broadcaster in document
after creating the SortInfoArray.

Change-Id: Ic492d5019e26ff204307db4fefccc48ec99c0a6d
Reviewed-on: https://gerrit.libreoffice.org/22607
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit fca1147953989ef26e641e2ee9bb7e6390a69dd6)
Reviewed-on: https://gerrit.libreoffice.org/22877

diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index ee76080..2671fde 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -231,11 +231,10 @@ public:
 {
 ScRefCellValue maCell;
 const sc::CellTextAttr* mpAttr;
-const SvtBroadcaster* mpBroadcaster;
 const ScPostIt* mpNote;
 const ScPatternAttr* mpPattern;
 
-Cell() : mpAttr(nullptr), mpBroadcaster(nullptr), mpNote(nullptr), 
mpPattern(nullptr) {}
+Cell() : mpAttr(nullptr), mpNote(nullptr), mpPattern(nullptr) {}
 };
 
 struct Row
@@ -438,10 +437,8 @@ void initDataRows(
 {
 ScSortInfoArray::Row& rRow = *rRows[nRow-nRow1];
 ScSortInfoArray::Cell& rCell = rRow.maCells[nCol-nCol1];
-
 rCell.maCell = rCol.GetCellValue(aBlockPos, nRow);
 rCell.mpAttr = rCol.GetCellTextAttr(aBlockPos, nRow);
-rCell.mpBroadcaster = rCol.GetBroadcaster(aBlockPos, nRow);
 rCell.mpNote = rCol.GetCellNote(aBlockPos, nRow);
 
 if (!bUniformPattern && bPattern)
@@ -709,10 +706,11 @@ void fillSortedColumnArray(
 std::vector>& rSortedCols,
 SortedRowFlags& rRowFlags,
 std::vector& rCellListeners,
-ScSortInfoArray* pArray, SCTAB nTab, SCCOL nCol1, SCCOL nCol2, ScProgress* 
pProgress )
+ScSortInfoArray* pArray, SCTAB nTab, SCCOL nCol1, SCCOL nCol2, ScProgress* 
pProgress, const ScTable* pTable )
 {
 SCROW nRow1 = pArray->GetStart();
 ScSortInfoArray::RowsType* pRows = pArray->GetDataRows();
+std::vector aOrderIndices = pArray->GetOrderIndices();
 
 size_t nColCount = nCol2 - nCol1 + 1;
 std::vector> aSortedCols; // storage for 
copied cells.
@@ -795,10 +793,11 @@ void fillSortedColumnArray(
 // At this point each broadcaster instance is managed by 2
 // containers. We will release those in the original storage
 // below before transferring them to the document.
+const SvtBroadcaster* pBroadcaster = pTable->GetBroadcaster( 
nCol1 + j, aOrderIndices[i]);
 sc::BroadcasterStoreType& rBCStore = 
aSortedCols.at(j).get()->maBroadcasters;
-if (rCell.mpBroadcaster)
+if (pBroadcaster)
 // A const pointer would be implicitly converted to a bool 
type.
-
rBCStore.push_back(const_cast(rCell.mpBroadcaster));
+
rBCStore.push_back(const_cast(pBroadcaster));
 else
 rBCStore.push_back_empty();
 }
@@ -1091,7 +1090,7 @@ void ScTable::SortReorderByRow(
 // a copy before updating the document.
 std::vector> aSortedCols; // storage for 
copied cells.
 SortedRowFlags aRowFlags;
-fillSortedColumnArray(aSortedCols, aRowFlags, aCellListeners, pArray, 
nTab, nCol1, nCol2, pProgress);
+fillSortedColumnArray(aSortedCols, aRowFlags, aCellListeners, pArray, 
nTab, nCol1, nCol2, pProgress, this);
 
 for (size_t i = 0, n = aSortedCols.size(); i < n; ++i)
 {
@@ -1277,7 +1276,7 @@ void ScTable::SortReorderByRowRefUpdate(
 std::vector> aSortedCols; // storage for 
copied cells.
 SortedRowFlags aRowFlags;
 std::vector aListenersDummy;
-fillSortedColumnArray(aSortedCols, aRowFlags, aListenersDummy, pArray, 
nTab, nCol1, nCol2, pProgress);
+fillSortedColumnArray(aSortedCols, aRowFlags, aListenersDummy, pArray, 
nTab, nCol1, nCol2, pProgress, this);
 
 for (size_t i = 0, n = aSortedCols.size(); i < n; ++i)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Arul Michael]

 sc/source/core/data/table3.cxx |   17 -
 1 file changed, 8 insertions(+), 9 deletions(-)

New commits:
commit fca1147953989ef26e641e2ee9bb7e6390a69dd6
Author: Arul Michael 
Date:   Mon Feb 22 09:53:31 2016 +0530

tdf#97215 Sorting with update reference causes crash

The memory of SvtBroadcaster* of a cell is freed in EndlisteningCell()
during SplitFormulaGroups call. The same memory address is assigned back
to the cell again when the contents are transferred back after sorting.
This is because the CreateSortinfoArray is done before
SplitformulaGroup. For fix getting mpbroadcaster from the Document
instead of SortinfoArray since we change the broadcaster in document
after creating the SortInfoArray.

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

diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index e1842c8..6cdeace 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -227,11 +227,10 @@ public:
 {
 ScRefCellValue maCell;
 const sc::CellTextAttr* mpAttr;
-const SvtBroadcaster* mpBroadcaster;
 const ScPostIt* mpNote;
 const ScPatternAttr* mpPattern;
 
-Cell() : mpAttr(nullptr), mpBroadcaster(nullptr), mpNote(nullptr), 
mpPattern(nullptr) {}
+Cell() : mpAttr(nullptr), mpNote(nullptr), mpPattern(nullptr) {}
 };
 
 struct Row
@@ -434,10 +433,8 @@ void initDataRows(
 {
 ScSortInfoArray::Row& rRow = *rRows[nRow-nRow1];
 ScSortInfoArray::Cell& rCell = rRow.maCells[nCol-nCol1];
-
 rCell.maCell = rCol.GetCellValue(aBlockPos, nRow);
 rCell.mpAttr = rCol.GetCellTextAttr(aBlockPos, nRow);
-rCell.mpBroadcaster = rCol.GetBroadcaster(aBlockPos, nRow);
 rCell.mpNote = rCol.GetCellNote(aBlockPos, nRow);
 
 if (!bUniformPattern && bPattern)
@@ -705,10 +702,11 @@ void fillSortedColumnArray(
 std::vector>& rSortedCols,
 SortedRowFlags& rRowFlags,
 std::vector& rCellListeners,
-ScSortInfoArray* pArray, SCTAB nTab, SCCOL nCol1, SCCOL nCol2, ScProgress* 
pProgress )
+ScSortInfoArray* pArray, SCTAB nTab, SCCOL nCol1, SCCOL nCol2, ScProgress* 
pProgress, const ScTable* pTable )
 {
 SCROW nRow1 = pArray->GetStart();
 ScSortInfoArray::RowsType* pRows = pArray->GetDataRows();
+std::vector aOrderIndices = pArray->GetOrderIndices();
 
 size_t nColCount = nCol2 - nCol1 + 1;
 std::vector> aSortedCols; // storage for 
copied cells.
@@ -791,10 +789,11 @@ void fillSortedColumnArray(
 // At this point each broadcaster instance is managed by 2
 // containers. We will release those in the original storage
 // below before transferring them to the document.
+const SvtBroadcaster* pBroadcaster = pTable->GetBroadcaster( 
nCol1 + j, aOrderIndices[i]);
 sc::BroadcasterStoreType& rBCStore = 
aSortedCols.at(j).get()->maBroadcasters;
-if (rCell.mpBroadcaster)
+if (pBroadcaster)
 // A const pointer would be implicitly converted to a bool 
type.
-
rBCStore.push_back(const_cast(rCell.mpBroadcaster));
+
rBCStore.push_back(const_cast(pBroadcaster));
 else
 rBCStore.push_back_empty();
 }
@@ -1087,7 +1086,7 @@ void ScTable::SortReorderByRow(
 // a copy before updating the document.
 std::vector> aSortedCols; // storage for 
copied cells.
 SortedRowFlags aRowFlags;
-fillSortedColumnArray(aSortedCols, aRowFlags, aCellListeners, pArray, 
nTab, nCol1, nCol2, pProgress);
+fillSortedColumnArray(aSortedCols, aRowFlags, aCellListeners, pArray, 
nTab, nCol1, nCol2, pProgress, this);
 
 for (size_t i = 0, n = aSortedCols.size(); i < n; ++i)
 {
@@ -1274,7 +1273,7 @@ void ScTable::SortReorderByRowRefUpdate(
 std::vector> aSortedCols; // storage for 
copied cells.
 SortedRowFlags aRowFlags;
 std::vector aListenersDummy;
-fillSortedColumnArray(aSortedCols, aRowFlags, aListenersDummy, pArray, 
nTab, nCol1, nCol2, pProgress);
+fillSortedColumnArray(aSortedCols, aRowFlags, aListenersDummy, pArray, 
nTab, nCol1, nCol2, pProgress, this);
 
 for (size_t i = 0, n = aSortedCols.size(); i < n; ++i)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Lionel Elie Mamane]

 connectivity/source/drivers/postgresql/pq_databasemetadata.cxx |   22 
+++---
 1 file changed, 17 insertions(+), 5 deletions(-)

New commits:
commit ac2505632c96b2653aea2d65178053d1ad9430ef
Author: Lionel Elie Mamane 
Date:   Thu Mar 3 19:41:54 2016 +0100

tdf#92538 use proper schema name for type names

Change-Id: I7e428e4530765925bd35c7f4fcde7f95ceb12243

diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx 
b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index 0c00c9a..92912e1 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -2191,6 +2191,16 @@ static sal_Int32 getMaxScale( sal_Int32 dataType )
 return ret;
 }
 
+namespace
+{
+OUString construct_full_typename(OUString ns, OUString tn)
+{
+if(ns == "pg_catalog")
+return tn;
+else
+return ns + "." + tn;
+}
+}
 
 static void pgTypeInfo2ResultSet(
  std::vector< std::vector > &vec,
@@ -2255,7 +2265,7 @@ static void pgTypeInfo2ResultSet(
 row[CREATE_PARAMS] <<= OUString("length, scale");
 }
 
-row[TYPE_NAME] <<= xRow->getString(1);
+row[TYPE_NAME] <<= construct_full_typename(xRow->getString(6), 
xRow->getString(1));
 row[DATA_TYPE] <<= OUString::number(dataType);
 row[PRECISION] <<= OUString::number( precision );
 sal_Int32 nullable = xRow->getBoolean(4) ?
@@ -2297,8 +2307,9 @@ static void pgTypeInfo2ResultSet(
   "pg_type.typtype AS typtype,"//2
   "pg_type.typlen AS typlen,"  //3
   "pg_type.typnotnull AS typnotnull,"  //4
-  "pg_type.typname AS typname "//5
-  "FROM pg_type "
+  "pg_type.typname AS typname, "   //5
+  "pg_namespace.nspname as typns " //6
+  "FROM pg_type LEFT JOIN pg_namespace ON 
pg_type.typnamespace=pg_namespace.oid "
   "WHERE pg_type.typtype = 'b' "
   "OR pg_type.typtype = 'p'"
 );
@@ -2312,8 +2323,9 @@ static void pgTypeInfo2ResultSet(
 "t2.typtype AS typtype,"
 "t2.typlen AS typlen,"
 "t2.typnotnull AS typnotnull,"
-"t2.typname as realtypname "
-"FROM pg_type as t1 LEFT JOIN pg_type AS t2 ON t1.typbasetype=t2.oid "
+"t2.typname as realtypname, "
+"pg_namespace.nspname as typns "
+"FROM pg_type as t1 LEFT JOIN pg_type AS t2 ON t1.typbasetype=t2.oid 
LEFT JOIN pg_namespace ON t1.typnamespace=pg_namespace.oid "
 "WHERE t1.typtype = 'd'" );
 pgTypeInfo2ResultSet( vec, rs );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/Admin.cpp loolwsd/Admin.hpp loolwsd/AdminModel.hpp loolwsd/LOOLBroker.cpp loolwsd/LOOLKit.cpp

[Pranav Kant]

 loolwsd/Admin.cpp  |   26 +---
 loolwsd/Admin.hpp  |4 
 loolwsd/AdminModel.hpp |  302 -
 loolwsd/LOOLBroker.cpp |   10 -
 loolwsd/LOOLKit.cpp|   31 +
 5 files changed, 347 insertions(+), 26 deletions(-)

New commits:
commit ada6a74dc019ba30f00e761452da4185ef91306a
Author: Pranav Kant 
Date:   Thu Mar 3 23:31:37 2016 +0530

loolwsd: Basic layout and interaction with AdminModel

Admin web sessions are added as subscribers to AdminModel. Live
notification fill up the AdminModel, and notifies to
subscribers, if present any. AdminModel can also be queried to
fetch any previous data since the start of the server including
expired documents/views with timestamps for analysis.

There is lot of stuff that can be added in future. This commit
just lays the foundation of appropriate classes.

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

diff --git a/loolwsd/Admin.cpp b/loolwsd/Admin.cpp
index e30d55e..ba1d154 100644
--- a/loolwsd/Admin.cpp
+++ b/loolwsd/Admin.cpp
@@ -61,6 +61,11 @@ public:
 Log::debug("Thread [" + thread_name + "] started.");
 
 auto ws = std::make_shared(request, response);
+
+// Subscribe the websocket of any AdminModel updates
+AdminModel& model = _admin->getModel();
+model.subscribe(ws);
+
 const Poco::Timespan waitTime(POLL_TIMEOUT_MS * 1000);
 int flags = 0;
 int n = 0;
@@ -138,7 +143,7 @@ public:
 else if (tokens.count() == 1 && tokens[0] == 
"documents")
 {
 
-std::string response = "documents " + 
_admin->getDocuments();
+std::string response = "documents " + 
model.query("documents");
 ws->sendFrame(response.data(), response.size());
 }
 }
@@ -222,21 +227,9 @@ Admin::~Admin()
 _srv.stop();
 }
 
-std::string Admin::getDocuments()
-{
-return _model.getDocuments();
-}
-
 void Admin::handleInput(std::string& message)
 {
-StringTokenizer tokens(message, " ", StringTokenizer::TOK_IGNORE_EMPTY | 
StringTokenizer::TOK_TRIM);
-if (tokens.count() > 2 && tokens[0] == "document")
-{
-std::string pid = tokens[1];
-std::string url = tokens[2];
-
-_model.addDocument(std::stoi(pid), url);
-}
+_model.update(message);
 }
 
 void Admin::run()
@@ -265,6 +258,11 @@ void Admin::run()
 Log::debug("Thread [" + thread_name + "] finished.");
 }
 
+AdminModel& Admin::getModel()
+{
+return _model;
+}
+
 //TODO: Clean up with something more elegant.
 int Admin::BrokerPipe;
 int Admin::NotifyPipe;
diff --git a/loolwsd/Admin.hpp b/loolwsd/Admin.hpp
index 0356213..1f1146e 100644
--- a/loolwsd/Admin.hpp
+++ b/loolwsd/Admin.hpp
@@ -28,10 +28,10 @@ public:
 
 static int getBrokerPid() { return Admin::BrokerPipe; }
 
-std::string getDocuments();
-
 void run() override;
 
+AdminModel& getModel();
+
 private:
 void handleInput(std::string& message);
 
diff --git a/loolwsd/AdminModel.hpp b/loolwsd/AdminModel.hpp
index dd7cea3..c9abe0a 100644
--- a/loolwsd/AdminModel.hpp
+++ b/loolwsd/AdminModel.hpp
@@ -12,8 +12,157 @@
 
 #include "config.h"
 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+
 #include "Util.hpp"
 
+class View
+{
+public:
+View(int nSessionId)
+: _nSessionId(nSessionId),
+  _start(std::time(nullptr))
+{}
+
+void expire()
+{
+_end = std::time(nullptr);
+}
+
+bool isExpired()
+{
+return _end != 0 && std::time(nullptr) > _end;
+}
+
+private:
+int _nSessionId;
+
+std::time_t _start;
+std::time_t _end = 0;
+};
+
+class Document
+{
+public:
+Document(Poco::Process::PID nPid, std::string sUrl)
+: _nPid(nPid),
+  _sUrl(sUrl),
+  _start(std::time(nullptr))
+{
+Log::info("Document " + std::to_string(_nPid) + " ctor.");
+}
+
+~Document()
+{
+Log::info("Document " + std::to_string(_nPid) + " dtor.");
+}
+
+Poco::Process::PID getPid() const
+{
+return _nPid;
+}
+
+std::string getUrl() const
+{
+return _sUrl;
+}
+
+void expire()
+{
+_end = std::time(nullptr);
+}
+
+bool isExpired() const
+{
+return _end != 0 && std::time(nullptr) > _end;
+}
+
+void addView(int nSessionId)
+{
+std::pair::iterator, bool > ret;
+ret = _views.insert(std::pair(nSessionId, 
View(nSessionId)));
+if (!ret.second)
+{
+Log::warn() << "View with SessionID [" + 
std::to_string(nSessionId) + "] already exists." << Log::end;
+}
+else
+{
+_nViews++;
+

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

[Pranav Kant]

 loolwsd/LOOLBroker.cpp |2 --
 loolwsd/LOOLKit.cpp|   11 +++
 2 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit c1ca746f669409771b65c60f37debcf88d599a18
Author: Pranav Kant 
Date:   Thu Mar 3 23:17:36 2016 +0530

loolwsd: Make notify pipe accessible from child processes

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

diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp
index d1ab001..fcf1333 100644
--- a/loolwsd/LOOLBroker.cpp
+++ b/loolwsd/LOOLBroker.cpp
@@ -31,13 +31,11 @@ typedef int (LokHookPreInit)  ( const char *install_path, 
const char *user_profi
 using Poco::ProcessHandle;
 
 const std::string FIFO_LOOLWSD = "loolwsdfifo";
-const std::string FIFO_NOTIFY = "loolnotify.fifo";
 const std::string BROKER_SUFIX = ".fifo";
 const std::string BROKER_PREFIX = "lokit";
 
 static int readerChild = -1;
 static int readerBroker = -1;
-static int writerNotify = -1;
 
 static std::string loolkitPath;
 static std::atomic forkCounter;
diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 31b659d..e9a6fbb 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -70,6 +70,9 @@ using Poco::ThreadLocal;
 const std::string CHILD_URI = "/loolws/child/";
 const std::string FIFO_PATH = "pipe";
 const std::string FIFO_BROKER = "loolbroker.fifo";
+const std::string FIFO_NOTIFY = "loolnotify.fifo";
+
+static int writerNotify = -1;
 
 namespace
 {
@@ -811,6 +814,14 @@ void lokit_main(const std::string& childRoot,
 std::exit(Application::EXIT_SOFTWARE);
 }
 
+// Open notify pipe
+const std::string pipeNotify = Path(pipePath, FIFO_NOTIFY).toString();
+if ((writerNotify = open(pipeNotify.c_str(), O_WRONLY) ) < 0)
+{
+Log::error("Error: pipe opened for writing.");
+exit(Application::EXIT_SOFTWARE);
+}
+
 const Path jailPath = Path::forDirectory(childRoot + Path::separator() 
+ jailId);
 Log::info("Jail path: " + jailPath.toString());
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/Admin.cpp loolwsd/Admin.hpp loolwsd/AdminModel.hpp loolwsd/ChildProcessSession.hpp loolwsd/LOOLBroker.cpp loolwsd/Makefile.am

[Pranav Kant]

 loolwsd/Admin.cpp   |  272 
 loolwsd/Admin.hpp   |  243 +--
 loolwsd/AdminModel.hpp  |   19 ++
 loolwsd/ChildProcessSession.hpp |2 
 loolwsd/LOOLBroker.cpp  |4 
 loolwsd/Makefile.am |2 
 6 files changed, 308 insertions(+), 234 deletions(-)

New commits:
commit 85c6467344710ef1717140c9d17fe6383b420746
Author: Pranav Kant 
Date:   Fri Feb 26 11:55:13 2016 +0530

loolwsd: Move Admin class to separate header

As a test, add command to fetch documents from AdminModel.

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

diff --git a/loolwsd/Admin.cpp b/loolwsd/Admin.cpp
new file mode 100644
index 000..e30d55e
--- /dev/null
+++ b/loolwsd/Admin.cpp
@@ -0,0 +1,272 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include "Admin.hpp"
+#include "AdminModel.hpp"
+#include "Common.hpp"
+#include "LOOLProtocol.hpp"
+#include "Util.hpp"
+
+using namespace LOOLProtocol;
+
+using Poco::Net::HTTPRequestHandler;
+using Poco::Net::HTTPRequestHandlerFactory;
+using Poco::Net::HTTPResponse;
+using Poco::Net::HTTPServerParams;
+using Poco::Net::HTTPServerRequest;
+using Poco::Net::HTTPServerResponse;
+using Poco::Net::ServerSocket;
+using Poco::Net::WebSocket;
+using Poco::Net::WebSocketException;
+using Poco::StringTokenizer;
+using Poco::Net::Socket;
+
+/// Handle admin requests.
+class AdminRequestHandler: public HTTPRequestHandler
+{
+public:
+
+AdminRequestHandler(Admin* adminManager)
+: _admin(adminManager)
+{}
+
+void handleRequest(HTTPServerRequest& request, HTTPServerResponse& 
response) override
+{
+assert(request.serverAddress().port() == ADMIN_PORT_NUMBER);
+
+const std::string thread_name = "admin_ws";
+try
+{
+if (prctl(PR_SET_NAME, reinterpret_cast(thread_name.c_str()), 0, 0, 0) != 0)
+Log::error("Cannot set thread name to " + thread_name + ".");
+
+Log::debug("Thread [" + thread_name + "] started.");
+
+auto ws = std::make_shared(request, response);
+const Poco::Timespan waitTime(POLL_TIMEOUT_MS * 1000);
+int flags = 0;
+int n = 0;
+ws->setReceiveTimeout(0);
+do
+{
+char buffer[20]; //FIXME: Dynamic?
+
+if (ws->poll(waitTime, Socket::SELECT_READ))
+{
+n = ws->receiveFrame(buffer, sizeof(buffer), flags);
+
+if ((flags & WebSocket::FRAME_OP_BITMASK) == 
WebSocket::FRAME_OP_PING)
+{
+// Echo back the ping payload as pong.
+// Technically, we should send back a PONG control 
frame.
+// However Firefox (probably) or Node.js (possibly) 
doesn't
+// like that and closes the socket when we do.
+// Echoing the payload as a normal frame works with 
Firefox.
+ws->sendFrame(buffer, n /*, 
WebSocket::FRAME_OP_PONG*/);
+}
+else if ((flags & WebSocket::FRAME_OP_BITMASK) == 
WebSocket::FRAME_OP_PONG)
+{
+// In case we do send pings in the future.
+}
+else if (n <= 0)
+{
+// Connection closed.
+Log::warn() << "Received " << n
+<< " bytes. Connection closed. Flags: "
+<< std::hex << flags << Log::end;
+break;
+}
+else
+{
+assert(n > 0);
+const std::string firstLine = getFirstLine(buffer, n);
+StringTokenizer tokens(firstLine, " ", 
StringTokenizer::TOK_IGNORE_EMPTY | StringTokenizer::TOK_TRIM);
+Log::trace() << "Recv: " << firstLine << Log::end;
+
+if (firstLine == "eof")
+{
+Log::info("Received EOF. Finishing.");
+break;
+}
+
+if (tokens.count() == 1 && tokens[0] == "stats")
+{
+  

Re: Firebird doesn't support MSVC 2015

[Wols Lists]

On 03/03/16 17:53, Jonathan Aquilina wrote:
> Instead of reinventing the wheel why not look at SQLite or there is a
> nosql db couchdb as well but not sure how easy that would be to
> integrate with LO

Is SQLite a relational db? In which case it's no interest to me ... :-)

As for other nosql dbs, the reason I would go down the Pick route is it
is the database technology I understand. And unfortunately I do not know
of a Pick database under a Free licence :-( which is a good reason for
wanting to write one :-)

If you come across a Pick DB called OpenQM I would advise you not to
touch it with a bargepole unless your sole purpose is playing/personal
use :-( Shame, as it's actually a very nice product.

If anybody else has any ideas, don't wait on me!!!

Cheers,
Wol
> 
> This email has been sent from a virus-free computer protected by Avast.
> www.avast.com
> 
> 
> 
> <#DDB4FAA8-2DD7-40BB-A1B8-4E2AA1F9FDF2>
> 
> Jonathan Aquilina
> 
> On Thu, Mar 3, 2016 at 6:50 PM, Wols Lists  > wrote:
> 
> On 02/03/16 12:12, Noel Grandin wrote:
> >
> >
> > On 2016/03/02 2:11 PM, Michael Stahl wrote:
> >>
> >> personally i'd be inclined towards alternatives that are less
> likely to
> >> trigger toolchain problems - maybe there's a SQL database implemented
> >> in, say, Java somewhere...
> >>
> >
> > Maybe even one that shares a committer with LO ?
> >
> :-)
> 
> Sounds like I ought to get my finger out :-)
> 
> I want to write a NoSQL database (a Pick derivative) and the plan is to
> do it and make it part of LibreOffice. Problem is, as a carer, I find it
> very hard to get the time available to concentrate, and I also don't
> have all the skills I need.
> 
> Anyways, I will try and have a crack at it - life seems to be getting a
> bit easier at the moment - and see where it takes us.
> 
> For those who know me, I am very much anti relational practice - imho
> it's impossible to write an efficient truly relational database - the
> theory has technical flaws that seriously impact any FNF engine.
> Basically, that (in contravention of Einstein's dictum) the engine is
> *too* *simple*, which means that any applications *must* be *overly*
> *complex*. I'll wax lyrical if you like but you'd be wise not to get me
> started :-)
> 
> My main problem is that a Pick database is actually a complete operating
> environment. Fundamental to its operation is its language, called
> DATABASIC, and while I could probably write the database engine without
> too much difficulty, writing the language compiler is a step too far at
> the moment.
> 
> Anyways, here's to having a go - if anyone's mad enough to join me,
> great!
> 
> Cheers,
> Wol
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> 
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
> 
> 

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

Re: Firebird doesn't support MSVC 2015

[Jonathan Aquilina]

Instead of reinventing the wheel why not look at SQLite or there is a nosql
db couchdb as well but not sure how easy that would be to integrate with LO

This email has been sent from a virus-free computer protected by Avast.
www.avast.com

<#DDB4FAA8-2DD7-40BB-A1B8-4E2AA1F9FDF2>

Jonathan Aquilina

On Thu, Mar 3, 2016 at 6:50 PM, Wols Lists  wrote:

> On 02/03/16 12:12, Noel Grandin wrote:
> >
> >
> > On 2016/03/02 2:11 PM, Michael Stahl wrote:
> >>
> >> personally i'd be inclined towards alternatives that are less likely to
> >> trigger toolchain problems - maybe there's a SQL database implemented
> >> in, say, Java somewhere...
> >>
> >
> > Maybe even one that shares a committer with LO ?
> >
> :-)
>
> Sounds like I ought to get my finger out :-)
>
> I want to write a NoSQL database (a Pick derivative) and the plan is to
> do it and make it part of LibreOffice. Problem is, as a carer, I find it
> very hard to get the time available to concentrate, and I also don't
> have all the skills I need.
>
> Anyways, I will try and have a crack at it - life seems to be getting a
> bit easier at the moment - and see where it takes us.
>
> For those who know me, I am very much anti relational practice - imho
> it's impossible to write an efficient truly relational database - the
> theory has technical flaws that seriously impact any FNF engine.
> Basically, that (in contravention of Einstein's dictum) the engine is
> *too* *simple*, which means that any applications *must* be *overly*
> *complex*. I'll wax lyrical if you like but you'd be wise not to get me
> started :-)
>
> My main problem is that a Pick database is actually a complete operating
> environment. Fundamental to its operation is its language, called
> DATABASIC, and while I could probably write the database engine without
> too much difficulty, writing the language compiler is a step too far at
> the moment.
>
> Anyways, here's to having a go - if anyone's mad enough to join me, great!
>
> Cheers,
> Wol
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Firebird doesn't support MSVC 2015

[Wols Lists]

On 02/03/16 12:12, Noel Grandin wrote:
> 
> 
> On 2016/03/02 2:11 PM, Michael Stahl wrote:
>>
>> personally i'd be inclined towards alternatives that are less likely to
>> trigger toolchain problems - maybe there's a SQL database implemented
>> in, say, Java somewhere...
>>
> 
> Maybe even one that shares a committer with LO ?
> 
:-)

Sounds like I ought to get my finger out :-)

I want to write a NoSQL database (a Pick derivative) and the plan is to
do it and make it part of LibreOffice. Problem is, as a carer, I find it
very hard to get the time available to concentrate, and I also don't
have all the skills I need.

Anyways, I will try and have a crack at it - life seems to be getting a
bit easier at the moment - and see where it takes us.

For those who know me, I am very much anti relational practice - imho
it's impossible to write an efficient truly relational database - the
theory has technical flaws that seriously impact any FNF engine.
Basically, that (in contravention of Einstein's dictum) the engine is
*too* *simple*, which means that any applications *must* be *overly*
*complex*. I'll wax lyrical if you like but you'd be wise not to get me
started :-)

My main problem is that a Pick database is actually a complete operating
environment. Fundamental to its operation is its language, called
DATABASIC, and while I could probably write the database engine without
too much difficulty, writing the language compiler is a step too far at
the moment.

Anyways, here's to having a go - if anyone's mad enough to join me, great!

Cheers,
Wol
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/win

[Michael Meeks]

 vcl/win/source/gdi/salgdi3.cxx |   12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 9c473d38885e74b5a48ccd54b1f3e30b01a710d2
Author: Michael Meeks 
Date:   Thu Mar 3 11:37:41 2016 +

tdf#98380 - opengl - get font anti-aliasing right.

Change-Id: I087c4939c19bc5966da45cb848d71e95ac982e33
Reviewed-on: https://gerrit.libreoffice.org/22855
Tested-by: Jenkins 
Reviewed-by: László Németh 
Reviewed-by: Jan Holesovsky 

diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 4de6530..dfeb0e0 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -40,6 +40,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "fontsubset.hxx"
 #include "outdev.h"
@@ -1393,6 +1394,15 @@ void ImplGetLogFontFromFontSelect( HDC hDC,
 rLogFont.lfPitchAndFamily = pWinFontData->GetPitchAndFamily();
 }
 
+static BYTE nDefaultQuality = NONANTIALIASED_QUALITY;
+if (nDefaultQuality == NONANTIALIASED_QUALITY)
+{
+if (OpenGLWrapper::isVCLOpenGLEnabled())
+nDefaultQuality = ANTIALIASED_QUALITY;
+else
+nDefaultQuality = DEFAULT_QUALITY;
+}
+
 rLogFont.lfWeight  = ImplWeightToWin( pFont->GetWeight() );
 rLogFont.lfHeight  = (LONG)-pFont->mnHeight;
 rLogFont.lfWidth   = (LONG)pFont->mnWidth;
@@ -1402,7 +1412,7 @@ void ImplGetLogFontFromFontSelect( HDC hDC,
 rLogFont.lfEscapement  = pFont->mnOrientation;
 rLogFont.lfOrientation = rLogFont.lfEscapement;
 rLogFont.lfClipPrecision   = CLIP_DEFAULT_PRECIS;
-rLogFont.lfQuality = DEFAULT_QUALITY;
+rLogFont.lfQuality = nDefaultQuality;
 rLogFont.lfOutPrecision= OUT_TT_PRECIS;
 if ( pFont->mnOrientation )
 rLogFont.lfClipPrecision |= CLIP_LH_ANGLES;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/sal sal/osl sal/qa sal/rtl sal/test

[Rohan Kumar]

 include/sal/log-areas.dox   |4 +++
 sal/osl/unx/profile.cxx |4 +--
 sal/osl/unx/socket.cxx  |   10 
 sal/osl/w32/socket.cxx  |   12 --
 sal/qa/osl/process/osl_process.cxx  |   24 ++---
 sal/qa/rtl/doublelock/rtl_doublelocking.cxx |   15 +++--
 sal/rtl/bootstrap.cxx   |   32 
 sal/test/testbootstrap.cxx  |   17 +-
 8 files changed, 43 insertions(+), 75 deletions(-)

New commits:
commit f59136a2ed1e3eb01cc5b62c5a7da07c34cbdfae
Author: Rohan Kumar 
Date:   Wed Mar 2 01:28:58 2016 +0530

tdf#91794 remove OSL_DEBUG_LEVEL > 1 conditionals

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

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index d2de637..d4a020a 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -30,6 +30,10 @@ certain functionality.
 @li @c sal.rtl - SAL RTL library
 @li @c sal.rtl.xub - SAL RTL warnings related to possible String->OUString 
conversion issues.
 @li @c sal.textenc - the textencoding SAL library
+@li @c sal.w32
+@li @c sal.test
+@li @c sal.process
+@li @c sal.doublelock
 
 @section basctl
 
diff --git a/sal/osl/unx/profile.cxx b/sal/osl/unx/profile.cxx
index 8cad965..9cbab6b 100644
--- a/sal/osl/unx/profile.cxx
+++ b/sal/osl/unx/profile.cxx
@@ -320,7 +320,7 @@ sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile)
 
 static bool writeProfileImpl(osl_TFile* pFile)
 {
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
 unsigned int nLen=0;
 #endif
 
@@ -329,7 +329,7 @@ static bool writeProfileImpl(osl_TFile* pFile)
 return false;
 }
 
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
 nLen=strlen(pFile->m_pWriteBuf);
 SAL_WARN_IF(nLen != (pFile->m_nWriteBufLen - pFile->m_nWriteBufFree), 
"sal.osl", "nLen != (pFile->m_nWriteBufLen - pFile->m_nWriteBufFree)");
 #endif
diff --git a/sal/osl/unx/socket.cxx b/sal/osl/unx/socket.cxx
index 190e7c3..1065c79 100644
--- a/sal/osl/unx/socket.cxx
+++ b/sal/osl/unx/socket.cxx
@@ -429,7 +429,7 @@ oslSocketResult SAL_CALL 
osl_psz_getDottedInetAddrOfSocketAddr (
 void SAL_CALL osl_psz_getLastSocketErrorDescription (
 oslSocket Socket, sal_Char* pBuffer, sal_uInt32 BufferSize);
 
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
 static sal_uInt32 g_nSocketImpl = 0;
 static sal_uInt32 g_nSocketAddr = 0;
 
@@ -451,7 +451,7 @@ oslSocket __osl_createSocketImpl(int Socket)
 pSocket->m_bIsAccepting = false;
 #endif
 
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
 g_nSocketImpl ++;
 #endif
 return pSocket;
@@ -461,7 +461,7 @@ void __osl_destroySocketImpl(oslSocket Socket)
 {
 if ( Socket != nullptr)
 free(Socket);
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
 g_nSocketImpl --;
 #endif
 }
@@ -469,7 +469,7 @@ void __osl_destroySocketImpl(oslSocket Socket)
 static oslSocketAddr __osl_createSocketAddr()
 {
 oslSocketAddr pAddr = static_cast(rtl_allocateZeroMemory( 
sizeof( struct oslSocketAddrImpl )));
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
 g_nSocketAddr ++;
 #endif
 return pAddr;
@@ -509,7 +509,7 @@ static oslSocketAddr __osl_createSocketAddrFromSystem( 
struct sockaddr *pSystemS
 
 static void __osl_destroySocketAddr( oslSocketAddr addr )
 {
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
 g_nSocketAddr --;
 #endif
 rtl_freeMemory( addr );
diff --git a/sal/osl/w32/socket.cxx b/sal/osl/w32/socket.cxx
index 927da21..e3aad35 100644
--- a/sal/osl/w32/socket.cxx
+++ b/sal/osl/w32/socket.cxx
@@ -406,16 +406,14 @@ static sal_Bool __osl_attemptSocketDialupImpl()
 /*/
 static sal_uInt32 g_nSocketImpl = 0;
 
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
 static sal_uInt32 g_nSocketAddr = 0;
 struct LeakWarning
 {
 ~LeakWarning()
 {
-if( g_nSocketImpl )
-OSL_TRACE( "sal_socket: %d socket instances leak" , g_nSocketImpl 
);
-if( g_nSocketAddr )
-OSL_TRACE( "sal_socket: %d socket address instances leak" , 
g_nSocketAddr );
+SAL_WARN_IF( g_nSocketImpl, "sal.w32", "sal_socket: " << g_nSocketImpl 
<< " socket instances leak" );
+SAL_WARN_IF( g_nSocketAddr, "sal.w32", "sal_socket: " << g_nSocketAddr 
<< " socket address instances leak" );
 }
 };
 LeakWarning socketWarning;
@@ -455,7 +453,7 @@ static oslSocketAddr __osl_createSocketAddr(  )
 {
 oslSocketAddr pAddr = (oslSocketAddr) rtl_allocateZeroMemory( sizeof( 
struct oslSocketAddrImpl ));
 pAddr->m_nRefCount = 1;
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
 g_nSocketAddr ++;
 #endif
 return pAddr;
@@ -493,7 +491,7 @@ static oslSocketAddr __osl_createSocketAddrFromSystem( 
struct sockaddr *

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

[Tor Lillqvist]

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

New commits:
commit 2103fe2515b7c71aff546dc00fe8a46721abdfa2
Author: Tor Lillqvist 
Date:   Thu Mar 3 18:35:48 2016 +0200

Revert "We use a recursive mutex, so no need to drop and re-take around 
documentLoad()"

Turns out the callbacks from documentLoad() are in general done on
another thread, not necessarily the same one that did the
documentLoad() call. Not sure why it happened to be the same thread
for me, but oh well. Need to fix the problem described in
3671abf89b376555394b22bfee25d450e7eff5f6 in some other way then.

This reverts commit 2fab7574626919d66c637f40302cb00e8d280b3f.

diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 7942436..31b659d 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -620,6 +620,9 @@ private:
 
LOK_FEATURE_DOCUMENT_PASSWORD_TO_MODIFY);
 }
 
+// documentLoad will trigger callback, which needs to take the 
lock.
+lock.unlock();
+
 // Save the provided password with us and the jailed url
 _isDocPasswordProvided = isDocPasswordProvided;
 _docPassword = docPassword;
@@ -649,6 +652,8 @@ private:
 return nullptr;
 }
 Log::info("documentLoad() returned");
+// Retake the lock.
+lock.lock();
 
 if (_multiView)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[INFRA ANNOUNCE] Gerrit maintenance... Sunday March, 6th 00h00 to 03h00 UTC

[Norbert Thiebaud]

Gerrit will be down for upgrade during the night of Saturday to Sunday.
the 3 hours windows is the maximum anticipated downtime (if things go
wrong and we need to rollback)
there will be ping in IRC #libreoffice-dev about availability

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

[Libreoffice-commits] core.git: formula/source include/formula sc/inc sc/Library_sc.mk sc/qa sc/source

[Winfried Donkers]

 formula/source/core/resource/core_resource.src |   56 +
 include/formula/compiler.hrc   |   10 
 include/formula/opcode.hxx |8 
 sc/Library_sc.mk   |1 
 sc/inc/helpids.h   |8 
 sc/qa/unit/ucalc.cxx   |8 
 sc/source/core/inc/interpre.hxx|   14 
 sc/source/core/tool/interpr3.cxx   |   18 
 sc/source/core/tool/interpr4.cxx   |   10 
 sc/source/core/tool/interpr8.cxx   | 1386 +
 sc/source/core/tool/parclass.cxx   |7 
 sc/source/filter/excel/xlformula.cxx   |   21 
 sc/source/filter/oox/formulabase.cxx   |   23 
 sc/source/ui/src/scfuncs.src   |  488 
 14 files changed, 2046 insertions(+), 12 deletions(-)

New commits:
commit f336f63da900d76c2bf6e5690f1c8a7bd15a0aa2
Author: Winfried Donkers 
Date:   Sat Jan 30 10:14:05 2016 +0100

tdf#94635 Add FORECAST.ETS functions to Calc

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

diff --git a/formula/source/core/resource/core_resource.src 
b/formula/source/core/resource/core_resource.src
index dcb0b46..1d6c15d 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -368,6 +368,14 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
 String SC_OPCODE_LINEST { Text = "LINEST" ; };
 String SC_OPCODE_LOGEST { Text = "LOGEST" ; };
 String SC_OPCODE_FORECAST { Text = "FORECAST" ; };
+String SC_OPCODE_FORECAST_ETS_ADD { Text = "FORECAST.ETS" ; };
+String SC_OPCODE_FORECAST_ETS_SEA { Text = "FORECAST.ETS.SEASONALITY" ; };
+String SC_OPCODE_FORECAST_ETS_MUL { Text = "FORECAST.ETS.MULT" ; };
+String SC_OPCODE_FORECAST_ETS_PIA { Text = "FORECAST.ETS.CONFINT" ; };
+String SC_OPCODE_FORECAST_ETS_PIM { Text = "FORECAST.ETS.PI.MULT" ; };
+String SC_OPCODE_FORECAST_ETS_STA { Text = "FORECAST.ETS.STAT" ; };
+String SC_OPCODE_FORECAST_ETS_STM { Text = "FORECAST.ETS.STAT.MULT" ; };
+String SC_OPCODE_FORECAST_LIN { Text = "FORECAST.LINEAR" ; };
 String SC_OPCODE_CHI_INV { Text = "LEGACY.CHIINV" ; };
 String SC_OPCODE_CHI_INV_MS { Text = "COM.MICROSOFT.CHISQ.INV.RT" ; };
 String SC_OPCODE_GAMMA_DIST { Text = "GAMMADIST" ; };
@@ -794,6 +802,14 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
 String SC_OPCODE_LINEST { Text = "LINEST" ; };
 String SC_OPCODE_LOGEST { Text = "LOGEST" ; };
 String SC_OPCODE_FORECAST { Text = "FORECAST" ; };
+String SC_OPCODE_FORECAST_ETS_ADD { Text = "_xlfn.FORECAST.ETS" ; };
+String SC_OPCODE_FORECAST_ETS_SEA { Text = 
"_xlfn.FORECAST.ETS.SEASONALITY" ; };
+String SC_OPCODE_FORECAST_ETS_MUL { Text = 
"_xlfn.ORG.LIBREOFFICE.FORECAST.ETS.MULT" ; };
+String SC_OPCODE_FORECAST_ETS_PIA { Text = "_xlfn.FORECAST.ETS.CONFINT" ; 
};
+String SC_OPCODE_FORECAST_ETS_PIM { Text = 
"_xlfn.ORG.LIBREOFFICE.FORECAST.ETS.PI.MULT" ; };
+String SC_OPCODE_FORECAST_ETS_STA { Text = "_xlfn.FORECAST.ETS.STAT" ; };
+String SC_OPCODE_FORECAST_ETS_STM { Text = 
"_xlfn.ORG.LIBREOFFICE.FORECAST.ETS.STAT.MULT" ; };
+String SC_OPCODE_FORECAST_LIN { Text = "_xlfn.FORECAST.LINEAR" ; };
 String SC_OPCODE_CHI_INV { Text = "CHIINV" ; };
 String SC_OPCODE_CHI_INV_MS { Text = "_xlfn.CHISQ.INV.RT" ; };
 String SC_OPCODE_GAMMA_DIST { Text = "GAMMADIST" ; };
@@ -1220,6 +1236,14 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
 String SC_OPCODE_LINEST { Text = "LINEST" ; };
 String SC_OPCODE_LOGEST { Text = "LOGEST" ; };
 String SC_OPCODE_FORECAST { Text = "FORECAST" ; };
+String SC_OPCODE_FORECAST_ETS_ADD { Text = "FORECAST.ETS.ADD" ; };
+String SC_OPCODE_FORECAST_ETS_SEA { Text = "FORECAST.ETS.SEASONALITY" ; };
+String SC_OPCODE_FORECAST_ETS_MUL { Text = "FORECAST.ETS.MULT" ; };
+String SC_OPCODE_FORECAST_ETS_PIA { Text = "FORECAST.ETS.PI.ADD" ; };
+String SC_OPCODE_FORECAST_ETS_PIM { Text = "FORECAST.ETS.PI.MULT" ; };
+String SC_OPCODE_FORECAST_ETS_STA { Text = "FORECAST.ETS.STAT.ADD" ; };
+String SC_OPCODE_FORECAST_ETS_STM { Text = "FORECAST.ETS.STAT.MULT" ; };
+String SC_OPCODE_FORECAST_LIN { Text = "FORECAST.LINEAR" ; };
 String SC_OPCODE_CHI_INV { Text = "CHIINV" ; };
 String SC_OPCODE_CHI_INV_MS { Text = "CHISQ.INV.RT" ; };
 String SC_OPCODE_GAMMA_DIST { Text = "GAMMADIST" ; };
@@ -2621,6 +2645,38 @@ Resource RID_STRLIST_FUNCTION_NAMES
 {
 Text [ en-US ] = "FORECAST" ;
 };
+String SC_OPCODE_FORECAST_ETS_ADD
+{
+Text [ en-US ] = "FORECAST.ETS.ADD" ;
+};
+String SC_OPCODE_FORECAST_ETS_SEA
+{
+Text [ en-US ] = "FORECAST.ETS.SEASONALITY" ;
+};
+String SC_OPCODE_FORECAST_ETS_MUL
+{
+Text [ e

minutes of ESC call ...

[Michael Meeks]

* Present:
+ Christian, Muthu, Sophie, Stephan, Eike, Norbert, Bjoern, Robinson, janI,
  Caolan, Michael, Andars, Kendy, Olivier, David, Miklos, Michael S, Armin,
  Thorsten, Bubli, Jan-Marek
 
* Completed Action Items:
+ submit development budget to board (Bjoern)
+ encourage Turkish hack-fest date confirmation (Bjoern)
+ April 30th -> May 1st.
+ update release plan for 5.2 and 5.3 (Christian)
[ added to the wiki and udpated 5.1 version to account for RC3 ]
+ setup a tinderbox VM for VS. 2015 (Christian)
[ being setup now, planned to hook-up later today ]
+ create the 5.1 projects for pootle (Christian)
[ are being created and synching now - should be available later
  then will trigger an update for the template project ]
+ talk around the gerrit update with Norbert (Cloph)
[ gerrit update delayed by the need for 5.1.1.3
  planned to update it in-place this weekend (Norbert)
  + was updating to Debian 8 base-line
  + requires creating a new machine etc.
  + will update in-line instead for now. ]
 
* Pending Action Items:
+ UI changes from non-committers in gerrit: post list to UX team (Kendy)
 [ assigned to kendy and push to list ]
+ double-check duplicate libmar/src, update/src (Kendy)
 
* Release Engineering update (Christian/JanI)
+ got the chance to do a 2nd build (JanI)
+ 5.0.6 RC1 - due April 12th.
+ 5.1.2 RC1 week 11, March 15th
+ planned to be done by Jan
+ Late Features (for 5.1.2)
+ New Slide Transitions: polish
[ ... debugging & work - some Intel fixing ]
+ UserAgent display & tweakage
[ still not done ... ]
+ documentation update planned.
+ Android & iOS Remote
+ updates still planned
 
* Documentation (Olivier)
+ asking for help on the list to build docs around new features
+ contacted a couple of new guys interested in helping out there
+ setting up internal tooling, keys etc.
+ branching of translations ?
+ since 5.1 - there are lots of new pages in the help
  that need translation
+ is 5.1 stable in terms of translation ?
+ new pages arrive in master.
+ already branched translations (Cloph)
+ bug in rc2 tag that made people think there was an issue.
=> why we had RC3 - there is no issue, move along.
+ pootle is currently being filled up as of now
+ tomorrow it will be done: separate master & 5.1 branches.
+ changes on master will not harm translators.
 
* GSoC 2016 (Thorsten, JanI)
+ https://wiki.documentfoundation.org/Development/GSoC/Ideas
+ 3 admin volunteers: janI, Moggi, Thorsten
+ next step - mid next month: opens for students to apply.
+ last chance to add new GSoC ideas
+ people without projects to mentor: Eike, Caolan, Michael M, Norbert, 
Andras
+ if you did not get a mentor invite ping us
+ unclear quite where to sign-up; not seen a mail (Bjoern)
  + subject: "GSoC 2016: Invitation to be a Mentor for LibreOffice" from 

AI:   + poke an admin if you didn't get the memo (All)
 resent mail to Bjoern and Michael (janI)
 
* UX Update (Kendy)
+ statistics being built from the draw survey by Heiko
+ last meeting - finalized the sidebar survey
+ if you have a view - please participate.
+ where do surveys show up ? (Michael)
+ on the planet ?
+ design blog should be subscribed & shows up (Kendy)
+ 
https://design.blog.documentfoundation.org/2016/02/26/what-do-you-expect-from-the-sidebar-in-libreoffice/
+ budget requests from design & docs team
+ lots of GSOC talk.
+ interest there, but need mentors.
 
* Crashtest update (Caolan)
+ 6 import failures, 0 export failures, 31 coverity
+ new coverity numbers expected by tomorrow
+ expected to shrink.
+ coverity - expected to halve, removed lots of Java bits.
 
* drop gstreamer 0.10/bump baseline (tdf#94508) (Bjoern)
+ are there parallel installable packages for 1.0 for CentOS6 ? (Michael)
+ don't know if we have packages (Caolan)
AI: + attempt to re-build a recent 1.0 / core spec file on CentOS6 (Cloph)
+ if that fails, abandon it; use a distro package ?
 
* development budget, late addition: "kill scp2" tender (Bjoern)
+ proposal to tender to kill scp2.
+ has lots of windows installer logic included
+ 15k under-maintained LOC
+ problems caused like GL file-list missing
+ do-able from releng, or tender it ?
+ is it split-able into easy-hacks ? (Kendy)
+ already have auto-install one (Bjoern)
https://bugs.documentfoundation.org/show_bug.cgi?id=90753
+ are there somewhat mechanical steps ? (Kendy)
+ converted 50 files - and happy !
+ some - like auto-insta

[Libreoffice-commits] online.git: loolwsd/Admin.hpp loolwsd/LOOLBroker.cpp loolwsd/Util.cpp loolwsd/Util.hpp

[Pranav Kant]

 loolwsd/Admin.hpp  |   60 +-
 loolwsd/LOOLBroker.cpp |   70 +
 loolwsd/Util.cpp   |   60 ++
 loolwsd/Util.hpp   |4 ++
 4 files changed, 68 insertions(+), 126 deletions(-)

New commits:
commit 190861395141587de2d15752be85b025809cd187
Author: Pranav Kant 
Date:   Tue Mar 1 23:47:34 2016 +0530

loolwsd: Factor out pipe reading polling logic

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

diff --git a/loolwsd/Admin.hpp b/loolwsd/Admin.hpp
index 759647b..1216505 100644
--- a/loolwsd/Admin.hpp
+++ b/loolwsd/Admin.hpp
@@ -236,22 +236,12 @@ public:
 // Start a server listening on the admin port.
 _srv.start();
 
-// Start listening for data changes
-std::string message;
-char buffer[READ_BUFFER_SIZE];
-char* start;
-char* end;
-
 struct pollfd pollPipeNotify;
-ssize_t bytes = -1;
 
 pollPipeNotify.fd = NotifyPipe;
 pollPipeNotify.events = POLLIN;
 pollPipeNotify.revents = 0;
 
-start = buffer;
-end = buffer;
-
 static const std::string thread_name = "admin_thread";
 
 if (prctl(PR_SET_NAME, reinterpret_cast(thread_name.c_str()), 0, 0, 0) != 0)
@@ -259,55 +249,9 @@ public:
 
 Log::info("Thread [" + thread_name + "] started.");
 
-while (!TerminationFlag)
-{
-if (start == end)
-{
-if (poll(&pollPipeNotify, 1, POLL_TIMEOUT_MS) < 0)
-{
-Log::error("Failed to poll pipe [" + FIFO_NOTIFY + "].");
-continue;
-}
-else if (pollPipeNotify.revents & (POLLIN | POLLPRI))
-{
-bytes = Util::readFIFO(NotifyPipe, buffer, sizeof(buffer));
-if (bytes < 0)
-{
-start = end = nullptr;
-Log::error("Error reading message from pipe [" + 
FIFO_NOTIFY + "].");
-continue;
-}
-start = buffer;
-end = buffer + bytes;
-}
-else if (pollPipeNotify.revents & (POLLERR | POLLHUP))
-{
-Log::error("Broken pipe [" + FIFO_NOTIFY + "] with wsd.");
-break;
-}
-}
-
-if (start != end)
-{
-char byteChar = *start++;
-while (start != end && byteChar != '\r' && byteChar != '\n')
-{
-message += byteChar;
-byteChar = *start++;
-}
+Util::pollPipeForReading(pollPipeNotify, FIFO_NOTIFY, NotifyPipe,
+ [this](std::string& message) { return 
handleInput(message); } );
 
-if (byteChar == '\r' && *start == '\n')
-{
-start++;
-Log::trace("NotifyData: " + message);
-if (message == "eof")
-break;
-
-handleInput(message);
-message.clear();
-}
-}
-}
 Log::debug("Thread [" + thread_name + "] finished.");
 }
 
diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp
index a9ace30..2e759cf 100644
--- a/loolwsd/LOOLBroker.cpp
+++ b/loolwsd/LOOLBroker.cpp
@@ -346,21 +346,12 @@ public:
 
 void run() override
 {
-std::string message;
-char  buffer[READ_BUFFER_SIZE];
-char* start;
-char* end;
-
 struct pollfd pollPipeBroker;
-ssize_t bytes = -1;
 
 pollPipeBroker.fd = readerBroker;
 pollPipeBroker.events = POLLIN;
 pollPipeBroker.revents = 0;
 
-start = buffer;
-end = buffer;
-
 static const std::string thread_name = "brk_pipe_reader";
 
 if (prctl(PR_SET_NAME, reinterpret_cast(thread_name.c_str()), 0, 0, 0) != 0)
@@ -368,65 +359,8 @@ public:
 
 Log::debug("Thread [" + thread_name + "] started.");
 
-while (!TerminationFlag)
-{
-if (start == end)
-{
-if (poll(&pollPipeBroker, 1, POLL_TIMEOUT_MS) < 0)
-{
-Log::error("Failed to poll pipe [" + FIFO_LOOLWSD + "].");
-continue;
-}
-else
-if (pollPipeBroker.revents & (POLLIN | POLLPRI))
-{
-bytes = Util::readFIFO(readerBroker, buffer, 
sizeof(buffer));
-if (bytes < 0)
-{
-start = end = nullptr;
-Log::error("Er

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

[Miklos Vajna]

 xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx |2 -
 xmlsecurity/source/helper/documentsignaturemanager.cxx |   18 -
 xmlsecurity/source/helper/xmlsignaturehelper.cxx   |6 ++--
 xmlsecurity/source/helper/xsecctl.cxx  |   23 +++--
 xmlsecurity/source/helper/xsecctl.hxx  |6 ++--
 xmlsecurity/source/helper/xsecsign.cxx |   10 +--
 6 files changed, 38 insertions(+), 27 deletions(-)

New commits:
commit cc75888c9e4cd09476287a8489c99fbf073feddb
Author: Miklos Vajna 
Date:   Thu Mar 3 15:46:52 2016 +0100

xmlsecurity OOXML export: don't attempt to sign other signatures

For one, MSO doesn't do that either by default.

For another, this would currently result in a io::IOException, because:

- the root storage is opened read-write, to be able to add the signature
- then _xmlsignatures/newsig is opened read-write to be able to write
  the signature
- opening _xmlsignatures/something as read-only still opens the
  _xmlsignatures storage as read-write -> boom, we tried to open the
  same sub-storage read-write two times, OStorage::openStorageElement()
  detects that

Change-Id: I2b90dc044bcfb835df4f19a339a0447e69f42975

diff --git a/xmlsecurity/source/helper/xsecctl.cxx 
b/xmlsecurity/source/helper/xsecctl.cxx
index f347863..288295b 100644
--- a/xmlsecurity/source/helper/xsecctl.cxx
+++ b/xmlsecurity/source/helper/xsecctl.cxx
@@ -993,7 +993,9 @@ static bool lcl_isOOXMLBlacklist(const OUString& 
rStreamName)
 {
 OUStringLiteral("/%5BContent_Types%5D.xml"),
 OUStringLiteral("/docProps/app.xml"),
-OUStringLiteral("/docProps/core.xml")
+OUStringLiteral("/docProps/core.xml"),
+// Don't attempt to sign other signatures for now.
+OUStringLiteral("/_xmlsignatures")
 };
 // Just check the prefix, as we don't care about the content type part of 
the stream name.
 return std::find_if(vBlacklist.begin(), vBlacklist.end(), [&](const 
OUStringLiteral& rLiteral) { return rStreamName.startsWith(rLiteral); }) != 
vBlacklist.end();
commit 963264a417ce807201f0021fc6000ce7d6cf0245
Author: Miklos Vajna 
Date:   Thu Mar 3 15:32:48 2016 +0100

xmlsecurity OOXML export: don't loose old signatures when adding a new one

With this, at least we don't completely throw away existing signatures.
The roundtrip of them isn't perfect yet, though.

Change-Id: Ibc3408364403a057169e384902afe13b1e397480

diff --git a/xmlsecurity/source/helper/documentsignaturemanager.cxx 
b/xmlsecurity/source/helper/documentsignaturemanager.cxx
index 7f0fc66..b5bc008 100644
--- a/xmlsecurity/source/helper/documentsignaturemanager.cxx
+++ b/xmlsecurity/source/helper/documentsignaturemanager.cxx
@@ -269,6 +269,10 @@ bool DocumentSignatureManager::add(const 
uno::Reference&
 int nSignatureCount = maCurrentSignatureInformations.size() + 1;
 
maSignatureHelper.ExportSignatureRelations(aStreamHelper.xSignatureStorage, 
nSignatureCount);
 
+// Export old signatures.
+for (size_t i = 0; i < maCurrentSignatureInformations.size(); ++i)
+maSignatureHelper.ExportOOXMLSignature(mxStore, 
aStreamHelper.xSignatureStorage, maCurrentSignatureInformations[i], i + 1);
+
 // Create a new signature.
 maSignatureHelper.CreateAndWriteOOXMLSignature(mxStore, 
aStreamHelper.xSignatureStorage, nSignatureCount);
 
commit 122c01989d4843db52725d375af22f866345d80a
Author: Miklos Vajna 
Date:   Thu Mar 3 14:59:03 2016 +0100

xmlsecurity: avoid calculating the certificate digest late in XSecController

Every other aspect of the certificate is calculated earlier in
DocumentSignatureManager, so calculate the digest there as well.

Change-Id: Icd97f3ecb084bbce60fcdfa496b6aaf0ac75026d

diff --git a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx 
b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
index f22570a..55dc230 100644
--- a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
+++ b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
@@ -161,7 +161,7 @@ public:
 certificate.
  */
 void SetX509Certificate(sal_Int32 nSecurityId, const OUString& 
ouX509IssuerName,
-const OUString& ouX509SerialNumber, const OUString& ouX509Cert);
+const OUString& ouX509SerialNumber, const OUString& ouX509Cert, const 
OUString& ouX509CertDigest);
 
 voidSetDateTime( sal_Int32 nSecurityId, const Date& rDate, const 
tools::Time& rTime );
 void SetDescription(sal_Int32 nSecurityId, const OUString& rDescription);
diff --git a/xmlsecurity/source/helper/documentsignaturemanager.cxx 
b/xmlsecurity/source/helper/documentsignaturemanager.cxx
index bb904b8..7f0fc66 100644
--- a/xmlsecurity/source/helper/documentsignaturemanager.cxx
+++ b/xmlsecurity/source/helper/documentsignaturemanager.cxx
@@ -32,6 +32,8 @@
 #include 
 #include 
 
+#include 
+
 using na

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

[Michael Stahl]

 sw/inc/list.hxx |1 +
 sw/source/core/doc/DocumentListsManager.cxx |7 +++
 sw/source/core/doc/list.cxx |6 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit ff202419fc61081d8dff17fbf8a543fc0f47bf48
Author: Michael Stahl 
Date:   Tue Mar 1 22:04:09 2016 +0100

sw: tdf#91131 when renaming a SwNumRule, also ...

... update the DocumentListsManager::maLists because without that all
list styles created in the UI will have GetDefaultListStyleName() ==
"Untitled1" and then deleting one of them deletes all these entries from
maList, which makes the DocumentListsManager unhappy.

Change-Id: Ic40e561fc540881ab29566a3f5ecdc8a180c97ef
(cherry picked from commit 69ff012f1a2d10b3284586474f2add4e88eabcfb)
Reviewed-on: https://gerrit.libreoffice.org/22834
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/sw/inc/list.hxx b/sw/inc/list.hxx
index 0cb1ba5..2c3daf7 100644
--- a/sw/inc/list.hxx
+++ b/sw/inc/list.hxx
@@ -39,6 +39,7 @@ class SwList
 const OUString GetListId() const;
 
 const OUString GetDefaultListStyleName() const;
+void SetDefaultListStyleName(OUString const&);
 
 void InsertListItem( SwNodeNum& rNodeNum,
  const int nLevel );
diff --git a/sw/source/core/doc/DocumentListsManager.cxx 
b/sw/source/core/doc/DocumentListsManager.cxx
index dfd9a26..5285c87 100644
--- a/sw/source/core/doc/DocumentListsManager.cxx
+++ b/sw/source/core/doc/DocumentListsManager.cxx
@@ -182,6 +182,13 @@ void DocumentListsManager::trackChangeOfListStyleName( 
const OUString& sListStyl
 maListStyleLists.erase( sListStyleName );
 maListStyleLists[sNewListStyleName] = pList;
 }
+for (auto & it : maLists) // tdf#91131 update these references too
+{
+if (it.second->GetDefaultListStyleName() == sListStyleName)
+{
+it.second->SetDefaultListStyleName(sNewListStyleName);
+}
+}
 }
 
 
diff --git a/sw/source/core/doc/list.cxx b/sw/source/core/doc/list.cxx
index a35d90e..4d0bac6 100644
--- a/sw/source/core/doc/list.cxx
+++ b/sw/source/core/doc/list.cxx
@@ -51,7 +51,6 @@ class SwListImpl
 
 bool IsListLevelMarked( const int nListLevel ) const;
 
-private:
 // unique identifier of the list
 const OUString msListId;
 // default list style for the list items, identified by the list style 
name
@@ -233,6 +232,11 @@ const OUString SwList::GetDefaultListStyleName() const
 return mpListImpl->GetDefaultListStyleName();
 }
 
+void SwList::SetDefaultListStyleName(OUString const& rNew)
+{
+mpListImpl->msDefaultListStyleName = rNew;
+}
+
 void SwList::InsertListItem( SwNodeNum& rNodeNum,
  const int nLevel )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git:

[Tor Lillqvist]

 0 files changed

New commits:
commit 3671abf89b376555394b22bfee25d450e7eff5f6
Author: Tor Lillqvist 
Date:   Thu Mar 3 17:44:00 2016 +0200

Describe what 2fab7574626919d66c637f40302cb00e8d280b3f fixes

I forgot to mention in the commit message of
2fab7574626919d66c637f40302cb00e8d280b3f what error situation the
change fixes... So here goes:

If a client session closes just after sending a load message to load a
document, and another session then fairly immediately connects and
sends a load message for the same document, the latter session gets
handled by the same kit process. Also the same Document object is
apparently used. In that kit process, the documentLoad() can still be
in progress. The handler for the new session still calls onLoad(),
too, and as the onLoad() had dropped the lock for the duration of the
documentLoad() call, the new onLoad gets the lock and calls
documentLoad(), too, while the documentLoad() call in the other thread
still is in progress. This leads to interesting problems.

Actually, now that I think of it, I very much doubt it is sane to have
the same Document object used for several sessions (one or several
already "dead" ones and one "live" one) simultaneously, but at least
the change made the unit test work more reliably.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/test

[Tor Lillqvist]

 loolwsd/test/httpwstest.cpp |   26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 69a6167f0e5d0f85eaeb0b0b7c98cc3d4080f3a6
Author: Tor Lillqvist 
Date:   Thu Mar 3 17:31:13 2016 +0200

Use better test names

diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp
index 2ab8fcc..7464b93 100644
--- a/loolwsd/test/httpwstest.cpp
+++ b/loolwsd/test/httpwstest.cpp
@@ -36,20 +36,20 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
 CPPUNIT_TEST(testPaste);
 CPPUNIT_TEST(testLargePaste);
 CPPUNIT_TEST(testRenderingOptions);
-CPPUNIT_TEST(testPasswordProtectedDocument);
-CPPUNIT_TEST(testPasswordProtectedDocument2);
-CPPUNIT_TEST(testPasswordProtectedDocument3);
-CPPUNIT_TEST(testPasswordProtectedDocument3again);
+CPPUNIT_TEST(testPasswordProtectedDocumentWithoutPassword);
+CPPUNIT_TEST(testPasswordProtectedDocumentWithWrongPassword);
+CPPUNIT_TEST(testPasswordProtectedDocumentWithCorrectPassword);
+CPPUNIT_TEST(testPasswordProtectedDocumentWithCorrectPasswordAgain);
 CPPUNIT_TEST(testImpressPartCountChanged);
 CPPUNIT_TEST_SUITE_END();
 
 void testPaste();
 void testLargePaste();
 void testRenderingOptions();
-void testPasswordProtectedDocument();
-void testPasswordProtectedDocument2();
-void testPasswordProtectedDocument3();
-void testPasswordProtectedDocument3again();
+void testPasswordProtectedDocumentWithoutPassword();
+void testPasswordProtectedDocumentWithWrongPassword();
+void testPasswordProtectedDocumentWithCorrectPassword();
+void testPasswordProtectedDocumentWithCorrectPasswordAgain();
 void testImpressPartCountChanged();
 
 static
@@ -235,7 +235,7 @@ void HTTPWSTest::testRenderingOptions()
 }
 }
 
-void HTTPWSTest::testPasswordProtectedDocument()
+void HTTPWSTest::testPasswordProtectedDocumentWithoutPassword()
 {
 try
 {
@@ -269,7 +269,7 @@ void HTTPWSTest::testPasswordProtectedDocument()
 }
 }
 
-void HTTPWSTest::testPasswordProtectedDocument2()
+void HTTPWSTest::testPasswordProtectedDocumentWithWrongPassword()
 {
 try
 {
@@ -304,7 +304,7 @@ void HTTPWSTest::testPasswordProtectedDocument2()
 }
 }
 
-void HTTPWSTest::testPasswordProtectedDocument3()
+void HTTPWSTest::testPasswordProtectedDocumentWithCorrectPassword()
 {
 try
 {
@@ -327,9 +327,9 @@ void HTTPWSTest::testPasswordProtectedDocument3()
 }
 }
 
-void HTTPWSTest::testPasswordProtectedDocument3again()
+void HTTPWSTest::testPasswordProtectedDocumentWithCorrectPasswordAgain()
 {
-testPasswordProtectedDocument3();
+testPasswordProtectedDocumentWithCorrectPassword();
 }
 
 void HTTPWSTest::testImpressPartCountChanged()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sd/source/ui/view/drviews2.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dd7a2f9a980505acd87abfad4f14526228e8a124
Author: Stephan Bergmann 
Date:   Thu Mar 3 16:23:52 2016 +0100

loplugin:nullptr

Change-Id: I3c65591d2693b6aa8bb860bf00100dc28f01db0c

diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index bf7ecd0..83ca6e9 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -1145,7 +1145,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
 case SID_CLASSIFICATION_APPLY:
 {
 const SfxItemSet* pArgs = rReq.GetArgs();
-const SfxPoolItem* pItem = 0;
+const SfxPoolItem* pItem = nullptr;
 if (pArgs && pArgs->GetItemState(nSId, false, &pItem) == 
SfxItemState::SET)
 {
 const OUString& rName = static_cast(pItem)->GetValue();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - loolwsd/LOOLKit.cpp loolwsd/test

[Tor Lillqvist]

 loolwsd/LOOLKit.cpp |5 -
 loolwsd/test/httpwstest.cpp |7 +++
 2 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 06f56e646d473cbe96934493909217b5ffe06b29
Author: Tor Lillqvist 
Date:   Thu Mar 3 17:13:57 2016 +0200

Test harder

diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp
index 86d250a..2ab8fcc 100644
--- a/loolwsd/test/httpwstest.cpp
+++ b/loolwsd/test/httpwstest.cpp
@@ -39,6 +39,7 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
 CPPUNIT_TEST(testPasswordProtectedDocument);
 CPPUNIT_TEST(testPasswordProtectedDocument2);
 CPPUNIT_TEST(testPasswordProtectedDocument3);
+CPPUNIT_TEST(testPasswordProtectedDocument3again);
 CPPUNIT_TEST(testImpressPartCountChanged);
 CPPUNIT_TEST_SUITE_END();
 
@@ -48,6 +49,7 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
 void testPasswordProtectedDocument();
 void testPasswordProtectedDocument2();
 void testPasswordProtectedDocument3();
+void testPasswordProtectedDocument3again();
 void testImpressPartCountChanged();
 
 static
@@ -325,6 +327,11 @@ void HTTPWSTest::testPasswordProtectedDocument3()
 }
 }
 
+void HTTPWSTest::testPasswordProtectedDocument3again()
+{
+testPasswordProtectedDocument3();
+}
+
 void HTTPWSTest::testImpressPartCountChanged()
 {
 try
commit 2fab7574626919d66c637f40302cb00e8d280b3f
Author: Tor Lillqvist 
Date:   Thu Mar 3 17:09:36 2016 +0200

We use a recursive mutex, so no need to drop and re-take around 
documentLoad()

The callbacks from documentLoad() are made in the same thread.

Sure, as such it is not a good thing to use recursive mutexes. If we
switch back to non-recursive mutexes, we will have to stop taking the
lock in callbacks from documentLoad(), i.e. make sure we know those
functions aren't used elsewhere, in places where a lock would be
needed. Or something.

diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 31b659d..7942436 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -620,9 +620,6 @@ private:
 
LOK_FEATURE_DOCUMENT_PASSWORD_TO_MODIFY);
 }
 
-// documentLoad will trigger callback, which needs to take the 
lock.
-lock.unlock();
-
 // Save the provided password with us and the jailed url
 _isDocPasswordProvided = isDocPasswordProvided;
 _docPassword = docPassword;
@@ -652,8 +649,6 @@ private:
 return nullptr;
 }
 Log::info("documentLoad() returned");
-// Retake the lock.
-lock.lock();
 
 if (_multiView)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Crash test update

[Crashtest VM]

New crashtest update available at 
http://dev-builds.libreoffice.org/crashtest/3f66ab95539846ace9867842f25d460d583915c3/


exportCrashes.csv
Description: Binary data


importCrash.csv
Description: Binary data


validationErrors.csv
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Aleksas Pantechovskis AlexP11223 license statement

[Alex P]

All of my past & future contributions to LibreOffice may be licensed under
the MPLv2/LGPLv3+ dual license.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Stephan Bergmann]

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

New commits:
commit b0cda1b0b6245e43ad9721cf756ab2a6fdc01b38
Author: Stephan Bergmann 
Date:   Thu Mar 3 15:56:21 2016 +0100

loplugin:stringconstant

Change-Id: I1a594a3d62790125244d221aeaa6d989adf30d97

diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx 
b/ucb/source/ucp/webdav-neon/NeonSession.cxx
index 516797e..76a4c0a 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
@@ -146,7 +146,7 @@ static bool noKeepAlive( const uno::Sequence< 
beans::NamedValue >& rFlags )
 const sal_Int32  nLen(rFlags.getLength());
 const beans::NamedValue* pValue(
 std::find_if(pAry,pAry+nLen,
-[] (beans::NamedValue const& rNV) { return rNV.Name == 
OUString("KeepAlive"); } ));
+[] (beans::NamedValue const& rNV) { return rNV.Name == 
"KeepAlive"; } ));
 if ( pValue != pAry+nLen && !pValue->Value.get() )
 return true;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sc/source/ui/view/formatsh.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 22b064a7859dbbf8e1f7988f95748bbbf0fb4c0c
Author: Stephan Bergmann 
Date:   Thu Mar 3 15:51:23 2016 +0100

loplugin:nullptr

Change-Id: Ie50bf53a24d44a7f645f381a3d07710cc3986151

diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 8d7440b..b4114b9 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -970,7 +970,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq )
 }
 else if (nSlotId == SID_CLASSIFICATION_APPLY)
 {
-const SfxPoolItem* pItem = 0;
+const SfxPoolItem* pItem = nullptr;
 if (pArgs && pArgs->GetItemState(nSlotId, false, &pItem) == 
SfxItemState::SET)
 {
 const OUString& rName = static_cast(pItem)->GetValue();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - Makefile.in Repository.mk

[Tor Lillqvist]

 Makefile.in   |   12 +---
 Repository.mk |4 +++-
 2 files changed, 12 insertions(+), 4 deletions(-)

New commits:
commit ebdb1b85b7ab75e36ca5efc2580497f779a9ee04
Author: Tor Lillqvist 
Date:   Fri Sep 19 12:47:02 2014 +0300

Unzip the InfoPlist.strings files into correct locations

Not sure how useful it is to only provide translations for the ODF
document format names, though.

Change-Id: I22a2e5b896e077ca3067a30635f7cdf67c2f5e7c
(cherry picked from commit 16f62d80c38f3920a40fc078edecad905ba2b196)
(cherry picked from commit 348ac6a9d28d5961b8804a7be09d334fbc8ef21a)

diff --git a/Makefile.in b/Makefile.in
index 686f647..a5461ca 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -306,9 +306,15 @@ ifeq ($(OS_FOR_BUILD),WNT)
 else
@$(SRCDIR)/solenv/bin/ooinstall $(TESTINSTALLDIR)
 ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
-# The InfoPlist_*.zip files in "bin" are totally pointless and should
-# not be there. I am too lazy at the moment to figure out how to
-# prevent them from ending up there.
+# Unzip bin/InfoPlist_*.zip files into corresponding Resources/*.lproj 
directories.
+   set -x; for F in $(TESTINSTALLDIR)/LibreOffice$(if 
$(ENABLE_RELEASE_BUILD),,Dev).app/Contents/bin/InfoPlist_*.zip; do \
+   bn=`basename $$F .zip`; \
+   lang=$${bn#InfoPlist_}; \
+   lproj=$(TESTINSTALLDIR)/LibreOffice$(if 
$(ENABLE_RELEASE_BUILD),,Dev).app/Contents/Resources/$$lang.lproj; \
+   mkdir $$lproj; \
+   (cd $$lproj; unzip $$F); \
+   done
+# And remove the "bin" folder which should not be there
rm -rf $(TESTINSTALLDIR)/LibreOffice$(if 
$(ENABLE_RELEASE_BUILD),,Dev).app/Contents/bin
@$(SRCDIR)/solenv/bin/macosx-codesign-app-bundle 
$(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app
 endif
commit 7af143a69ff183c7cc22e498833377b99704cf42
Author: Andras Timar 
Date:   Sun May 17 14:32:02 2015 +0200

Don't package ui-previewer in App Store case

Change-Id: I122c65d7f6dec7588ea2624e291e9dfe04dff22c
(cherry picked from commit 89dff9226690829b985371c3f2b29e57bfed06ed)

diff --git a/Repository.mk b/Repository.mk
index 36416ce..df446f6 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -147,7 +147,9 @@ $(eval $(call 
gb_Helper_register_executables_for_install,OOO,writer_brand, \
 $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
gengal \
$(if $(filter WNT,$(OS)),,uri-encode) \
-   ui-previewer \
+   $(if $(ENABLE_MACOSX_SANDBOX),, \
+   ui-previewer \
+   ) \
$(if $(filter WNT,$(OS)), \
senddoc \
) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 extensions/source/macosx/spotlight/mdimporter/Info.plist |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 291b9180baf585d1cdf2ab34d5390e54186f5ed0
Author: Andras Timar 
Date:   Sun Jun 21 14:41:22 2015 +0200

ERROR ITMS-90511: CFBundleIdentifier Collision

Change-Id: I4413853a2e8c23af770323a1e7b21cedb637cfb1
(cherry picked from commit ca7078abb540623bf4ac5728b94036a7b4782622)
Reviewed-on: https://gerrit.libreoffice.org/22858
Tested-by: Jenkins 
Reviewed-by: Andras Timar 

diff --git a/extensions/source/macosx/spotlight/mdimporter/Info.plist 
b/extensions/source/macosx/spotlight/mdimporter/Info.plist
index bc48f70..5a60493 100644
--- a/extensions/source/macosx/spotlight/mdimporter/Info.plist
+++ b/extensions/source/macosx/spotlight/mdimporter/Info.plist
@@ -59,7 +59,7 @@
 CFBundleIconFile
 
 CFBundleIdentifier
-org.openoffice.mdimporter
+org.libreoffice.mdimporter
 CFBundleInfoDictionaryVersion
 6.0
 CFBundleVersion
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: pyuno/Package_python_shell.mk

[Andras Timar]

 pyuno/Package_python_shell.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit 0f1133a2f0163318ca0cb2eb0dca2be829b5c4e5
Author: Andras Timar 
Date:   Thu Jul 2 16:26:50 2015 +0200

put python starter shell script to Resources folder of OS X app

Change-Id: Iaed947b9168fbd1e2d2c79da724426b56bd8a830
(cherry picked from commit 4f606fd7bf1ca0bd440fdccac39aa5f4a5e35a36)
Reviewed-on: https://gerrit.libreoffice.org/22857
Tested-by: Jenkins 
Reviewed-by: Andras Timar 

diff --git a/pyuno/Package_python_shell.mk b/pyuno/Package_python_shell.mk
index e8c3fa6..f75cda3 100644
--- a/pyuno/Package_python_shell.mk
+++ b/pyuno/Package_python_shell.mk
@@ -9,6 +9,10 @@
 
 $(eval $(call gb_Package_Package,python_shell,$(call 
gb_CustomTarget_get_workdir,pyuno/python_shell)))
 
+ifeq ($(OS),MACOSX)
+$(eval $(call 
gb_Package_add_file,python_shell,$(LIBO_ETC_FOLDER)/python,python.sh))
+else
 $(eval $(call 
gb_Package_add_file,python_shell,$(LIBO_BIN_FOLDER)/python,python.sh))
+endif
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - include/comphelper sal/inc sal/osl sd/inc sd/source ucb/source

[Michael Stahl]

 include/comphelper/stl_types.hxx  |   12 
 sal/inc/pch/precompiled_sal.hxx   |1 
 sal/osl/all/debugbase.cxx |4 +-
 sd/inc/pch/precompiled_sd.hxx |1 
 sd/source/ui/slideshow/SlideShowRestarter.cxx |5 ++-
 sd/source/ui/slideshow/slideshow.cxx  |5 ++-
 sd/source/ui/slideshow/slideshowimpl.cxx  |   36 +-
 ucb/source/ucp/webdav-neon/NeonSession.cxx|6 
 8 files changed, 39 insertions(+), 31 deletions(-)

New commits:
commit c96dc8822d8bb7c1b8309888b22254cac2abc5ce
Author: Michael Stahl 
Date:   Thu Mar 3 14:28:30 2016 +0100

ucb: replace boost::bind with C++11 lambdas

... and remove now unused comphelper::TNamedValueEqualFunctor.

Change-Id: Ia6cac4ae4e34d2ba134e2f2a4a5b4daea58bf0b3

diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx
index f38a9cf..e6c4a72 100644
--- a/include/comphelper/stl_types.hxx
+++ b/include/comphelper/stl_types.hxx
@@ -29,7 +29,6 @@
 #include 
 #include 
 #include 
-#include 
 
 namespace comphelper
 {
@@ -76,17 +75,6 @@ public:
 }
 };
 
-class TNamedValueEqualFunctor : public ::std::binary_function< 
css::beans::NamedValue,OUString,bool>
-{
-public:
-TNamedValueEqualFunctor()
-{}
-bool operator() (const css::beans::NamedValue& lhs, const OUString& rhs) 
const
-{
-return !!(lhs.Name == rhs);
-}
-};
-
 /// by-value less functor for std::set>
 template struct UniquePtrValueLess
 : public ::std::binary_function, std::unique_ptr, 
bool>
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx 
b/ucb/source/ucp/webdav-neon/NeonSession.cxx
index 83e5ba7..516797e 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
@@ -47,7 +47,6 @@ extern "C" {
 #include "rtl/ustrbuf.hxx"
 #include "comphelper/processfactory.hxx"
 #include "comphelper/sequence.hxx"
-#include 
 #include "ucbhelper/simplecertificatevalidationrequest.hxx"
 
 #include "DAVAuthListener.hxx"
@@ -71,7 +70,6 @@ extern "C" {
 #include 
 #include 
 
-#include 
 
 using namespace com::sun::star;
 using namespace webdav_ucp;
@@ -148,9 +146,7 @@ static bool noKeepAlive( const uno::Sequence< 
beans::NamedValue >& rFlags )
 const sal_Int32  nLen(rFlags.getLength());
 const beans::NamedValue* pValue(
 std::find_if(pAry,pAry+nLen,
- boost::bind(comphelper::TNamedValueEqualFunctor(),
- _1,
- OUString("KeepAlive";
+[] (beans::NamedValue const& rNV) { return rNV.Name == 
OUString("KeepAlive"); } ));
 if ( pValue != pAry+nLen && !pValue->Value.get() )
 return true;
 
commit b184b4249d114bafba7d2afd00093747db556d33
Author: Michael Stahl 
Date:   Thu Mar 3 14:10:32 2016 +0100

sal: replace boost::bind with C++11 lambdas

Change-Id: If8e16b7805b5b25dafe053e35cd98079abbea83c

diff --git a/sal/inc/pch/precompiled_sal.hxx b/sal/inc/pch/precompiled_sal.hxx
index ab1c7d2..13cf7bb 100644
--- a/sal/inc/pch/precompiled_sal.hxx
+++ b/sal/inc/pch/precompiled_sal.hxx
@@ -32,7 +32,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sal/osl/all/debugbase.cxx b/sal/osl/all/debugbase.cxx
index c0f0a63..c82dde9 100644
--- a/sal/osl/all/debugbase.cxx
+++ b/sal/osl/all/debugbase.cxx
@@ -23,7 +23,7 @@
 #include "osl/process.h"
 #include "osl/diagnose.hxx"
 #include "sal/log.hxx"
-#include "boost/bind.hpp"
+
 #include 
 #include 
 
@@ -95,7 +95,7 @@ bool SAL_CALL osl_detail_ObjectRegistry_storeAddresses( char 
const* pName )
 return true;
 OStringVec::const_iterator const iEnd( rVec.end() );
 return std::find_if( rVec.begin(), iEnd,
- boost::bind( &isSubStr, pName, _1 ) ) != iEnd;
+[pName] (OString const& it) { return isSubStr(pName, it); }) != iEnd;
 }
 
 bool SAL_CALL osl_detail_ObjectRegistry_checkObjectCount(
commit 521c5602e366a8d4d826fcd910428965de5d9d4e
Author: Michael Stahl 
Date:   Thu Mar 3 14:06:17 2016 +0100

sd: replace boost::bind with C++11 lambdas or std::bind

Change-Id: I1fc9ca7712fde802c885f5cfeedec1575d913f85

diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index 454dfe3..b0555fb 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -42,7 +42,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sd/source/ui/slideshow/SlideShowRestarter.cxx 
b/sd/source/ui/slideshow/SlideShowRestarter.cxx
index fdd3fad..4db7f62 100644
--- a/sd/source/ui/slideshow/SlideShowRestarter.cxx
+++ b/sd/source/ui/slideshow/SlideShowRestarter.cxx
@@ -27,7 +27,8 @@
 #include 
 #include 
 #include 
-#include 
+
+#include 
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
@@ -110,7 +111,7 @@ IMPL_LINK_NOARG_TYPED(SlideShowRestarter, EndP

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

[Caolán McNamara]

 include/vcl/floatwin.hxx   |6 +++---
 vcl/unx/gtk/gtksalmenu.cxx |   34 ++
 2 files changed, 33 insertions(+), 7 deletions(-)

New commits:
commit daa7754026ba5b025076b90f7a4427cd5820e736
Author: Caolán McNamara 
Date:   Thu Mar 3 14:04:05 2016 +

gtk3: position the native popup menus exactly where we want them

Change-Id: I2594925cba1f7c9c90178906d9c782024ad1cf4f

diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx
index e5bb9a5..d414fb8 100644
--- a/include/vcl/floatwin.hxx
+++ b/include/vcl/floatwin.hxx
@@ -126,11 +126,11 @@ public:
 SAL_DLLPRIVATE bool ImplIsFloatPopupModeWindow( const 
vcl::Window* pWindow );
 SAL_DLLPRIVATE void ImplSetMouseDown() { mbMouseDown = true; }
 SAL_DLLPRIVATE bool ImplIsMouseDown() const  { return 
mbMouseDown; }
-SAL_DLLPRIVATE static Point ImplCalcPos( vcl::Window* pWindow,
+   static Point ImplCalcPos( vcl::Window* pWindow,
  const Rectangle& rRect, 
FloatWinPopupFlags nFlags,
  sal_uInt16& rArrangeIndex );
-SAL_DLLPRIVATE static Point ImplConvertToAbsPos(vcl::Window* 
pReference, const Point& rPos);
-SAL_DLLPRIVATE static Rectangle ImplConvertToAbsPos(vcl::Window* 
pReference, const Rectangle& rRect);
+   static Point ImplConvertToAbsPos(vcl::Window* 
pReference, const Point& rPos);
+   static Rectangle ImplConvertToAbsPos(vcl::Window* 
pReference, const Rectangle& rRect);
 SAL_DLLPRIVATE void ImplEndPopupMode( FloatWinPopupEndFlags 
nFlags = FloatWinPopupEndFlags::NONE, VclPtr xFocusId = nullptr );
 SAL_DLLPRIVATE Rectangle&   ImplGetItemEdgeClipRect();
 SAL_DLLPRIVATE bool ImplIsInPrivatePopupMode() const { return 
mbInPopupMode; }
diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index ff92eac..722d242 100644
--- a/vcl/unx/gtk/gtksalmenu.cxx
+++ b/vcl/unx/gtk/gtksalmenu.cxx
@@ -361,8 +361,24 @@ void GtkSalMenu::UpdateFull()
 ImplUpdate(true, !pMenu->mbMenuBar);
 }
 
-bool GtkSalMenu::ShowNativePopupMenu(FloatingWindow* pWin, const Rectangle& 
/*rRect*/,
- FloatWinPopupFlags /*nFlags*/)
+#if GTK_CHECK_VERSION(3,0,0)
+static void MenuPositionFunc(GtkMenu* menu, gint* x, gint* y, gboolean* 
push_in, gpointer user_data)
+{
+Point *pPos = static_cast(user_data);
+*x = pPos->X();
+if (gtk_widget_get_default_direction() == GTK_TEXT_DIR_RTL)
+{
+GtkRequisition natural_size;
+gtk_widget_get_preferred_size(GTK_WIDGET(menu), nullptr, 
&natural_size);
+*x -= natural_size.width;
+}
+*y = pPos->Y();
+*push_in = false;
+}
+#endif
+
+bool GtkSalMenu::ShowNativePopupMenu(FloatingWindow* pWin, const Rectangle& 
rRect,
+ FloatWinPopupFlags nFlags)
 {
 #if GTK_CHECK_VERSION(3,0,0)
 guint nButton;
@@ -383,7 +399,14 @@ bool GtkSalMenu::ShowNativePopupMenu(FloatingWindow* pWin, 
const Rectangle& /*rR
 nTime = gtk_get_current_event_time();
 }
 
-mpFrame = 
static_cast(pWin->ImplGetWindowImpl()->mpRealParent->ImplGetFrame());
+VclPtr xParent = pWin->ImplGetWindowImpl()->mpRealParent;
+mpFrame = static_cast(xParent->ImplGetFrame());
+
+// do the same strange semantics as vcl popup windows to arrive at a frame 
geometry
+// in mirrored UI case; best done by actually executing the same code
+sal_uInt16 nArrangeIndex;
+Point aPos = FloatingWindow::ImplCalcPos(pWin, rRect, nFlags, 
nArrangeIndex);
+aPos = FloatingWindow::ImplConvertToAbsPos(xParent, aPos);
 
 GLOActionGroup* pActionGroup = 
g_lo_action_group_new(static_cast(mpFrame));
 g_lo_action_group_set_top_menu(pActionGroup, static_cast(this));
@@ -404,7 +427,8 @@ bool GtkSalMenu::ShowNativePopupMenu(FloatingWindow* pWin, 
const Rectangle& /*rR
 //until the gtk menu is destroyed
 GMainLoop* pLoop = g_main_loop_new(nullptr, true);
 g_signal_connect_swapped(G_OBJECT(pWidget), "deactivate", 
G_CALLBACK(g_main_loop_quit), pLoop);
-gtk_menu_popup(GTK_MENU(pWidget), nullptr, nullptr, nullptr, nullptr, 
nButton, nTime);
+gtk_menu_popup(GTK_MENU(pWidget), nullptr, nullptr, MenuPositionFunc,
+   &aPos, nButton, nTime);
 if (g_main_loop_is_running(pLoop))
 {
 gdk_threads_leave();
@@ -422,6 +446,8 @@ bool GtkSalMenu::ShowNativePopupMenu(FloatingWindow* pWin, 
const Rectangle& /*rR
 return true;
 #else
 (void)pWin;
+(void)rRect;
+(void)nFlags;
 return false;
 #endif
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 include/vcl/floatwin.hxx   |2 +
 vcl/source/window/floatwin.cxx |   54 +
 2 files changed, 35 insertions(+), 21 deletions(-)

New commits:
commit fbea89b6b2a4a91fecc4200d59bf03166c3f8908
Author: Caolán McNamara 
Date:   Thu Mar 3 13:52:24 2016 +

refactor these two bizarro positioning things into reusable chunks

Change-Id: I3f89aca650d31658ce17b3b1496a7babba23bdc6

diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx
index 2e9aa42..e5bb9a5 100644
--- a/include/vcl/floatwin.hxx
+++ b/include/vcl/floatwin.hxx
@@ -129,6 +129,8 @@ public:
 SAL_DLLPRIVATE static Point ImplCalcPos( vcl::Window* pWindow,
  const Rectangle& rRect, 
FloatWinPopupFlags nFlags,
  sal_uInt16& rArrangeIndex );
+SAL_DLLPRIVATE static Point ImplConvertToAbsPos(vcl::Window* 
pReference, const Point& rPos);
+SAL_DLLPRIVATE static Rectangle ImplConvertToAbsPos(vcl::Window* 
pReference, const Rectangle& rRect);
 SAL_DLLPRIVATE void ImplEndPopupMode( FloatWinPopupEndFlags 
nFlags = FloatWinPopupEndFlags::NONE, VclPtr xFocusId = nullptr );
 SAL_DLLPRIVATE Rectangle&   ImplGetItemEdgeClipRect();
 SAL_DLLPRIVATE bool ImplIsInPrivatePopupMode() const { return 
mbInPopupMode; }
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index ed997c8..00c3b34 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -449,10 +449,8 @@ Point FloatingWindow::ImplCalcPos( vcl::Window* pWindow,
 return pW->OutputToScreenPixel( aPos );
 }
 
-FloatingWindow* FloatingWindow::ImplFloatHitTest( vcl::Window* pReference, 
const Point& rPos, HitTest& rHitTest )
+Point FloatingWindow::ImplConvertToAbsPos(vcl::Window* pReference, const 
Point& rPos)
 {
-FloatingWindow* pWin = this;
-
 Point aAbsolute( rPos );
 
 const OutputDevice *pWindowOutDev = pReference->GetOutDev();
@@ -472,6 +470,37 @@ FloatingWindow* FloatingWindow::ImplFloatHitTest( 
vcl::Window* pReference, const
 aAbsolute = Point( pReference->OutputToAbsoluteScreenPixel(
 pReference->ScreenToOutputPixel(rPos) ) );
 
+return aAbsolute;
+}
+
+Rectangle FloatingWindow::ImplConvertToAbsPos(vcl::Window* pReference, const 
Rectangle& rRect)
+{
+Rectangle aFloatRect = rRect;
+
+const OutputDevice *pParentWinOutDev = pReference->GetOutDev();
+
+// compare coordinates in absolute screen coordinates
+// Keep in sync with FloatingWindow::ImplFloatHitTest, e.g. fdo#33509
+if( pReference->HasMirroredGraphics()  )
+{
+if(!pReference->IsRTLEnabled() )
+// --- RTL --- re-mirror back to get device coordinates
+pParentWinOutDev->ReMirror(aFloatRect);
+
+
aFloatRect.SetPos(pReference->ScreenToOutputPixel(aFloatRect.TopLeft()));
+aFloatRect = 
pReference->ImplOutputToUnmirroredAbsoluteScreenPixel(aFloatRect);
+}
+else
+
aFloatRect.SetPos(pReference->OutputToAbsoluteScreenPixel(pReference->ScreenToOutputPixel(rRect.TopLeft(;
+return aFloatRect;
+}
+
+FloatingWindow* FloatingWindow::ImplFloatHitTest( vcl::Window* pReference, 
const Point& rPos, HitTest& rHitTest )
+{
+FloatingWindow* pWin = this;
+
+Point aAbsolute(FloatingWindow::ImplConvertToAbsPos(pReference, rPos));
+
 do
 {
 // compute the floating window's size in absolute screen coordinates
@@ -665,24 +694,7 @@ void FloatingWindow::StartPopupMode( const Rectangle& 
rRect, FloatWinPopupFlags
 // convert maFloatRect to absolute device coordinates
 // so they can be compared across different frames
 // !!! rRect is expected to be in screen coordinates of the parent frame 
window !!!
-maFloatRect = rRect;
-
-vcl::Window *pReference =  GetParent();
-const OutputDevice *pParentWinOutDev = pReference->GetOutDev();
-
-// compare coordinates in absolute screen coordinates
-// Keep in sync with FloatingWindow::ImplFloatHitTest, e.g. fdo#33509
-if( pReference->HasMirroredGraphics()  )
-{
-if(!pReference->IsRTLEnabled() )
-// --- RTL --- re-mirror back to get device coordinates
-pParentWinOutDev->ReMirror(maFloatRect);
-
-
maFloatRect.SetPos(pReference->ScreenToOutputPixel(maFloatRect.TopLeft()));
-maFloatRect = 
pReference->ImplOutputToUnmirroredAbsoluteScreenPixel(maFloatRect);
-}
-else
-
maFloatRect.SetPos(pReference->OutputToAbsoluteScreenPixel(pReference->ScreenToOutputPixel(rRect.TopLeft(;
+maFloatRect = FloatingWindow::ImplConvertToAbsPos(GetParent(), rRect);
 
 maFloatRect.Left() -= 2;
 maFloatRect.Top()  -= 2;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Windows / font / text futures ...

[Michael Meeks]

Hi guys,

I've had the (mixed) pleasure of digging through the windows font
rendering in recent days; and I must say - I'm not thoroughly thrilled
with it =)

Let me highlight a few of the problems. First we are using GDI for text
rendering, and this is ~obsolete. Several interesting problems  are
pointed out here:

http://blogs.msdn.com/b/text/archive/2009/04/15/introducing-the-directwrite-font-system.aspx

Let me excerpt the rather charitable summary of what I've been falling
over:

"For applications that need to work with fonts at a lower level,
 GDI does have some functions that can really be thought of as
 physical font APIs. Examples are GetFontData, GetGlyphIndices,
 and even ExtTextOut when used with the ETO_GLYPH_INDEX flag.
 Yet these “physical” font functions still use an HFONT to
 specify the font. This means font mapping still occurs under
 the hood, though since no text is specified there is no font
 fallback and the same HFONT always maps to the same physical
 font internally. While this model works, the lack of a true
 physical font object in GDI can make it harder for application
 developers that use these low-level functions to be sure of
 what is going on."

Something of an under-statement there =) As far as I can see the 
SimpleWinLayout - which we use sometimes (in place of the UniScribe layout)
and which has a number of fun comments in it like:

// TODO: support surrogates in rewritten strings

Essentially re-uses the non-obvious, not-really-physical-font
logic with built-in windows font fallback. In contrast the UniScribe
layout engine does not.

The particular issue I'm looking at is that it appears really hard to
get genuine ABC widths (ie. underhang, black-width, and overhang
information) for those fall-back glyphs that are actually not in the
physical font - but that Windows (un)helpfully includes from elsewhere.
Asking for metrics via 'GetCharABCWidths' yields the 'default character's
metrics:

"The ABC widths of the default character are used for characters
 outside the range of the currently selected font."

Where by font, they mean physical font ignoring fallbacks it seems.

After lots of nice drawings - thanks to Tor for his nice font rendering
foo, of this kind; notice the '$' character appears from another font,
with inaccurate ABC width - hence the overlap.

info:vcl.gdi.opengl:4212:3344:vcl/win/gdi/winlayout.cxx:540: DX:offset : 17:1 
10:2 11:1 9:2 11:0 0:1
info:vcl.gdi.opengl:4212:3344:vcl/win/gdi/winlayout.cxx:266: this=0CC6A0E8 32 
old: {[43..48],[182..187],[286..291],[9832..9837],[9858..9863],[55356..55361]}
info:vcl.gdi.opengl:4212:3344:vcl/win/gdi/winlayout.cxx:357: ABC widths: 0:1:14 
3:3:3 1:8:1 0:16:0 1:8:2 0:22:2
info:vcl.gdi.opengl:4212:3344:vcl/win/gdi/winlayout.cxx:431: OpenSymbol: 
Escapement=0 Orientation=0 Ascent=23 InternalLeading=0 Size=(87,29) totWidth=82
info:vcl.gdi.opengl:4212:3344:vcl/win/gdi/winlayout.cxx:533: this=0CC6A0E8 now: 
{[32..37],[43..48],[182..187],[286..291],[9832..9837],[9858..9863],[55356..55361]}
info:vcl.gdi.opengl:4212:3344:vcl/win/gdi/winlayout.cxx:176: Bitmap 7705322A: 
82x33:
info:vcl.gdi.opengl:4212:3344:vcl/win/gdi/winlayout.cxx:205:  |   | 
   |||
 |   ||||
 |   ||||
 |   ||||
 |   ||   7X29  92X7   ||
 |  719  |  3X0880X3  |   3X5   9108   ||3XX19 
925
 | 80X3  |  3X0880X3  |  92X7   8029   |  818   |  92199219
53
 | 7XX29 |  3X0880X3  |  9108   5X3|  818   |  7X5  7X3   
829
 | 7XX29 |  3X0880X3  |  8029   3X5|807 |  3X7  8019 927
 | 7XX29 |  3X1991X5  |  5X3   9208|   5XXX3| 91X7  8008 53
 | 80X3  |  7X2992X7  | 92XX5  |  80X58187XX|791X7  9108829
 | 80X3  |  803  508  | 92XX5  |  5X3 818 3X|391X7  8008   927
 | 91X5  || 9108   5X3 |  3X5 818   |  3X7  8019   53
 | 92X7  || 8029   3X7 |  3X3 818   |  7X5  7X3   829
 |  3X7  || 5X3   9208 |  7XX5818   |  92199219  927
 |  308  || 3X5   8019 |   529  |3XX19   53
 |  519  ||9208   7X29 |92X5|   829   
92XX19
 |  729  ||  3XX3  |  8160XX|5 927   
92199208
 |  84   ||  3XX3  |  818 3X|2953
5X5  7X3
 |  95   ||5X3   9208  |  818 80|19   829   
92X7  8019
 |   ||3X5   8019  | 91X7 818 80|19  927
91X7  9108
 |   |   

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

[Wol]

 configure.ac |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 509bc5e5cf8129d07b5d8cf22d4bfe9c968303c6
Author: Wol 
Date:   Tue Mar 1 21:08:03 2016 +

Fix java home detection on gentoo

On gentoo (and some other distros?) /usr/bin/javac points at a script
that chooses the version of java to run. So when configure resolves
the link it doesn't end up where it expects to be. This mod detects
this situation, clears java_home, and lets it fall through to the next
test which completes successfully.

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

diff --git a/configure.ac b/configure.ac
index b6c14a0..32ecfcc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7117,7 +7117,7 @@ if test "$ENABLE_JAVA" != ""; then
 add_warning "JAVA_HOME is set to /usr - this is very likely to be 
incorrect"
 add_warning "if this is the case, please inform the correct 
JAVA_HOME with --with-jdk-home"
 fi
-dnl now that we have the path to the real javac, make a JAVA_HOME out 
of it..
+dnl now that we probably have the path to the real javac, make a 
JAVA_HOME out of it..
 if test "$JAVA_HOME" != "/usr"; then
 if test "$_os" = "Darwin" -o "$OS_FOR_BUILD" = MACOSX; then
 dnl Leopard returns a non-suitable path with readlink - points 
to "Current" only
@@ -7126,6 +7126,11 @@ if test "$ENABLE_JAVA" != ""; then
 JAVA_HOME=$(echo $JAVA_HOME | $SED -e 
s,/CurrentJDK/Commands/javac$,/CurrentJDK/Home,)
 else
 JAVA_HOME=$(echo $JAVA_HOME | $SED -e s,/bin/javac$,,)
+dnl check that we have a directory as certain distros eg 
gentoo substitute javac for a script
+dnl that checks which version to run
+if test -f "$JAVA_HOME"; then
+JAVA_HOME=""; # set JAVA_HOME to null if it's a file
+fi
 fi
 fi
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Makefile.in

[Tor Lillqvist]

 Makefile.in |4 
 1 file changed, 4 insertions(+)

New commits:
commit f345a2c52af0333b46b4b74e686883c8cb9ffab4
Author: Tor Lillqvist 
Date:   Mon Sep 15 21:50:35 2014 +0300

We don't want those bin/InfoPlist_*.zip files in the app bundle

(cherry picked from commit 7956d38fa3c0db77b9b2b41f870bd3587e3dc1af)

Conflicts:
Makefile.in

Change-Id: I29eefa599f175d98303fca8f5ccf1c8fe85b0bbc
(cherry picked from commit b21140e2de219cd97cae5b7b9b988e1fd70da029)
Reviewed-on: https://gerrit.libreoffice.org/22860
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/Makefile.in b/Makefile.in
index d9aef81..686f647 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -306,6 +306,10 @@ ifeq ($(OS_FOR_BUILD),WNT)
 else
@$(SRCDIR)/solenv/bin/ooinstall $(TESTINSTALLDIR)
 ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
+# The InfoPlist_*.zip files in "bin" are totally pointless and should
+# not be there. I am too lazy at the moment to figure out how to
+# prevent them from ending up there.
+   rm -rf $(TESTINSTALLDIR)/LibreOffice$(if 
$(ENABLE_RELEASE_BUILD),,Dev).app/Contents/bin
@$(SRCDIR)/solenv/bin/macosx-codesign-app-bundle 
$(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app
 endif
 endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

 vcl/win/gdi/salfont.cxx |   12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit a419ef186038e92f27ac5e201e231578867a66e9
Author: Michael Meeks 
Date:   Thu Mar 3 11:31:03 2016 +

tdf#98380 - opengl - get font anti-aliasing right.

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

diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index 7cfff0e..a47f3d1 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -41,6 +41,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "fontsubset.hxx"
 #include "outdev.h"
@@ -1303,6 +1304,15 @@ void ImplGetLogFontFromFontSelect( HDC hDC,
 rLogFont.lfPitchAndFamily = pWinFontData->GetPitchAndFamily();
 }
 
+static BYTE nDefaultQuality = NONANTIALIASED_QUALITY;
+if (nDefaultQuality == NONANTIALIASED_QUALITY)
+{
+if (OpenGLWrapper::isVCLOpenGLEnabled())
+nDefaultQuality = ANTIALIASED_QUALITY;
+else
+nDefaultQuality = DEFAULT_QUALITY;
+}
+
 rLogFont.lfWeight  = ImplWeightToWin( pFont->GetWeight() );
 rLogFont.lfHeight  = (LONG)-pFont->mnHeight;
 rLogFont.lfWidth   = (LONG)pFont->mnWidth;
@@ -1312,7 +1322,7 @@ void ImplGetLogFontFromFontSelect( HDC hDC,
 rLogFont.lfEscapement  = pFont->mnOrientation;
 rLogFont.lfOrientation = rLogFont.lfEscapement;
 rLogFont.lfClipPrecision   = CLIP_DEFAULT_PRECIS;
-rLogFont.lfQuality = DEFAULT_QUALITY;
+rLogFont.lfQuality = nDefaultQuality;
 rLogFont.lfOutPrecision= OUT_TT_PRECIS;
 if ( pFont->mnOrientation )
 rLogFont.lfClipPrecision |= CLIP_LH_ANGLES;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - officecfg/registry sc/sdi sc/source sc/uiconfig sc/UIConfig_scalc.mk sd/sdi sd/source sd/uiconfig sd/UIConfig_simpress.mk

[Miklos Vajna]

 officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu|   17 
+++
 officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu |   17 
+++
 sc/UIConfig_scalc.mk|1 
 sc/sdi/formatsh.sdi |1 
 sc/source/ui/view/formatsh.cxx  |   13 
+
 sc/uiconfig/scalc/toolbar/classificationbar.xml |   12 
+
 sd/UIConfig_simpress.mk |1 
 sd/sdi/_drvwsh.sdi  |4 
+
 sd/source/ui/view/drviews2.cxx  |   24 
++
 sd/uiconfig/simpress/toolbar/classificationbar.xml  |   12 
+
 10 files changed, 102 insertions(+)

New commits:
commit e4fe540aa4f77a4d76e4c6042d5790211aebc450
Author: Miklos Vajna 
Date:   Thu Mar 3 12:18:59 2016 +0100

sc: add classification toolbar

Again this is just UI to call into sfx2, where the functionality is
shared with Writer and Impress.

Change-Id: I73ce6fb54d50c23df19ed2c610766b7c515e94d6

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
index a89f8a5..4a8cbb7 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
@@ -133,6 +133,23 @@
   true
 
   
+  
+
+  0,3
+
+
+  0
+
+
+  true
+
+
+  false
+
+
+  Classification
+
+  
   
 
   0,2
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 0594195..74cb375 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -50,6 +50,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/scalc,\
sc/uiconfig/scalc/toolbar/arrowshapes \
sc/uiconfig/scalc/toolbar/basicshapes \
sc/uiconfig/scalc/toolbar/calloutshapes \
+   sc/uiconfig/scalc/toolbar/classificationbar \
sc/uiconfig/scalc/toolbar/colorbar \
sc/uiconfig/scalc/toolbar/datastreams \
sc/uiconfig/scalc/toolbar/drawbar \
diff --git a/sc/sdi/formatsh.sdi b/sc/sdi/formatsh.sdi
index 2c90f60..740e002 100644
--- a/sc/sdi/formatsh.sdi
+++ b/sc/sdi/formatsh.sdi
@@ -56,6 +56,7 @@ interface FormatForSelection
 SID_STYLE_SHOW  [ ExecMethod = ExecuteStyle; StateMethod = 
GetStyleState; ]
 SID_STYLE_PREVIEW   [ ExecMethod = ExecuteStyle; ]
 SID_STYLE_END_PREVIEW   [ ExecMethod = ExecuteStyle; ]
+SID_CLASSIFICATION_APPLY [ ExecMethod = ExecuteStyle; ]
 // } Slot's die in der DrawShell disabled werden.
 
 SID_ATTR_ALIGN_HOR_JUSTIFY[ ExecMethod = ExecuteAlignment; StateMethod 
= GetAttrState; ]
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index c7d4097..8d7440b 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -81,6 +81,7 @@
 
 #include "scabstdlg.hxx"
 #include 
+#include 
 
 #include 
 
@@ -967,6 +968,18 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq )
 if ( bListAction )
 pDocSh->GetUndoManager()->LeaveListAction();
 }
+else if (nSlotId == SID_CLASSIFICATION_APPLY)
+{
+const SfxPoolItem* pItem = 0;
+if (pArgs && pArgs->GetItemState(nSlotId, false, &pItem) == 
SfxItemState::SET)
+{
+const OUString& rName = static_cast(pItem)->GetValue();
+SfxClassificationHelper aHelper(*pDocSh);
+aHelper.SetBACName(rName);
+}
+else
+SAL_WARN("sc.ui", "missing parameter for 
SID_CLASSIFICATION_APPLY");
+}
 else
 {
 OSL_FAIL( "Unknown slot (ScViewShell::ExecuteStyle)" );
diff --git a/sc/uiconfig/scalc/toolbar/classificationbar.xml 
b/sc/uiconfig/scalc/toolbar/classificationbar.xml
new file mode 100644
index 000..3ee3407
--- /dev/null
+++ b/sc/uiconfig/scalc/toolbar/classificationbar.xml
@@ -0,0 +1,12 @@
+
+
+
+http://openoffice.org/2001/toolbar"; 
xmlns:xlink="http://www.w3.org/1999/xlink"; toolbar:id="toolbar">
+  
+
commit a56ba98ec5e287f872d957493f9e81ee27a24c00
Author: Miklos Vajna 
Date:   Thu Mar 3 11:05:07 2016 +0100

sd: add classification toolbar

This is really just a UI, all the functionality is already shared in
sfx2 with Writer.

Change-Id: Ide5697fe51d30f74490306a70164a3957a8a6429

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
index f67882d..2ad7488 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
+++ b/officecfg/registry/data/org/openof

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

[Eike Rathke]

 sc/qa/unit/ucalc_formula.cxx |   12 
 1 file changed, 12 insertions(+)

New commits:
commit 6e7e8af8ed2ee873a5c8a8b7b42fe3b99797be90
Author: Eike Rathke 
Date:   Thu Mar 3 13:31:19 2016 +0100

unit test for tdf#98297, exclude/include error values with COUNT/COUNTA

Change-Id: I2cc7d6ebdcb9411060462d7afa704f9e100c6c5e

diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index ad40ccc..63aa7d9 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -3383,6 +3383,18 @@ void Test::testFuncCOUNT()
 m_pDoc->SetString(aPos, "=COUNT(A1:A3;2;4;6)");
 CPPUNIT_ASSERT_EQUAL(6.0, m_pDoc->GetValue(aPos));
 
+// Matrix in C1.
+ScMarkData aMark;
+aMark.SelectOneTable(0);
+m_pDoc->InsertMatrixFormula(2, 0, 2, 0, aMark, 
"=COUNT(SEARCH(\"a\";{\"a\";\"b\";\"a\"}))");
+// Check that the #VALUE! error of "a" not found in "b" is not counted.
+CPPUNIT_ASSERT_EQUAL(2.0, m_pDoc->GetValue(ScAddress(2,0,0)));
+
+// Matrix in C3.
+m_pDoc->InsertMatrixFormula(2, 2, 2, 2, aMark, 
"=COUNTA(SEARCH(\"a\";{\"a\";\"b\";\"a\"}))");
+// Check that the #VALUE! error of "a" not found in "b" is counted.
+CPPUNIT_ASSERT_EQUAL(3.0, m_pDoc->GetValue(ScAddress(2,2,0)));
+
 m_pDoc->DeleteTab(0);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 comphelper/source/container/embeddedobjectcontainer.cxx |4 ++--
 comphelper/source/misc/accessiblewrapper.cxx|4 ++--
 comphelper/source/misc/componentmodule.cxx  |4 ++--
 comphelper/source/misc/docpasswordhelper.cxx|5 ++---
 comphelper/source/misc/storagehelper.cxx|9 +
 include/comphelper/accessiblewrapper.hxx|3 +--
 include/comphelper/componentmodule.hxx  |3 +--
 include/comphelper/docpasswordhelper.hxx|7 +--
 include/comphelper/embeddedobjectcontainer.hxx  |2 +-
 include/comphelper/storagehelper.hxx|3 +--
 10 files changed, 14 insertions(+), 30 deletions(-)

New commits:
commit 337f517af60d25351bc89f3814dcaf48f3aaa5b6
Author: Noel Grandin 
Date:   Thu Mar 3 13:08:30 2016 +0200

loplugin:unuseddefaultparams comphelper

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

diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx 
b/comphelper/source/container/embeddedobjectcontainer.cxx
index 6c373e2..a37b2f0 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -1206,10 +1206,10 @@ uno::Reference < io::XInputStream > 
EmbeddedObjectContainer::GetObjectStream( co
 return xInputStream;
 }
 
-uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetObjectStream( 
const uno::Reference < embed::XEmbeddedObject >& xObj, OUString* pMediaType )
+uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetObjectStream( 
const uno::Reference < embed::XEmbeddedObject >& xObj )
 {
 // try to load it from the container storage
-return GetObjectStream( GetEmbeddedObjectName( xObj ), pMediaType );
+return GetObjectStream( GetEmbeddedObjectName( xObj ), nullptr );
 }
 
 bool EmbeddedObjectContainer::InsertGraphicStream( const css::uno::Reference < 
css::io::XInputStream >& rStream, const OUString& rObjectName, const OUString& 
rMediaType )
diff --git a/comphelper/source/misc/accessiblewrapper.cxx 
b/comphelper/source/misc/accessiblewrapper.cxx
index 75cad7f..e106b9d 100644
--- a/comphelper/source/misc/accessiblewrapper.cxx
+++ b/comphelper/source/misc/accessiblewrapper.cxx
@@ -88,7 +88,7 @@ namespace comphelper
 
 
 Reference< XAccessible > 
OWrappedAccessibleChildrenManager::getAccessibleWrapperFor(
-const Reference< XAccessible >& _rxKey, bool _bCreate )
+const Reference< XAccessible >& _rxKey )
 {
 Reference< XAccessible > xValue;
 
@@ -104,7 +104,7 @@ namespace comphelper
 {
 xValue = aPos->second;
 }
-else if ( _bCreate )
+else
 {   // not found in the cache, and allowed to create
 // -> new wrapper
 xValue = new OAccessibleWrapper( m_xContext, _rxKey, 
m_aOwningAccessible );
diff --git a/comphelper/source/misc/componentmodule.cxx 
b/comphelper/source/misc/componentmodule.cxx
index 24c9a72..7e91b3c 100644
--- a/comphelper/source/misc/componentmodule.cxx
+++ b/comphelper/source/misc/componentmodule.cxx
@@ -105,9 +105,9 @@ namespace comphelper
 
 
 void OModule::registerImplementation( const OUString& 
_rImplementationName, const css::uno::Sequence< OUString >& _rServiceNames,
-::cppu::ComponentFactoryFunc _pCreateFunction, FactoryInstantiation 
_pFactoryFunction )
+::cppu::ComponentFactoryFunc _pCreateFunction )
 {
-ComponentDescription aComponent( _rImplementationName, _rServiceNames, 
_pCreateFunction, _pFactoryFunction );
+ComponentDescription aComponent( _rImplementationName, _rServiceNames, 
_pCreateFunction, ::cppu::createSingleComponentFactory );
 registerImplementation( aComponent );
 }
 
diff --git a/comphelper/source/misc/docpasswordhelper.cxx 
b/comphelper/source/misc/docpasswordhelper.cxx
index 301612c..8251768 100644
--- a/comphelper/source/misc/docpasswordhelper.cxx
+++ b/comphelper/source/misc/docpasswordhelper.cxx
@@ -235,10 +235,9 @@ sal_uInt16 DocPasswordHelper::GetXLHashAsUINT16(
 
 
 Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence(
-const OUString& aUString,
-rtl_TextEncoding nEnc )
+const OUString& aUString )
 {
-sal_uInt16 nHash = GetXLHashAsUINT16( aUString, nEnc );
+sal_uInt16 nHash = GetXLHashAsUINT16( aUString );
 Sequence< sal_Int8 > aResult( 2 );
 aResult[0] = ( nHash >> 8 );
 aResult[1] = ( nHash & 0xFF );
diff --git a/comphelper/source/misc/storagehelper.cxx 
b/comphelper/source/misc/storagehelper.cxx
index 4e7a035..35756dc 100644
--- a/comphelper/source/misc/storagehelper.cxx
+++ b/comphelper/source/misc/storagehelper.cxx
@@ -292,19 +292,12 @@ uno::Reference< embed::XStorage > 
OStorageHelper::GetStorageOfFormatFromURL(
 const

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

[Michael Stahl]

 sd/source/core/stlsheet.cxx   |6 --
 sd/source/ui/dlg/NavigatorChildWindow.cxx |3 +--
 sd/source/ui/sidebar/NavigatorWrapper.cxx |4 ++--
 sd/source/ui/view/drviewsa.cxx|3 +--
 4 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 944cdf5fa830e1d85b72c0d815e8fee29410e742
Author: Michael Stahl 
Date:   Thu Mar 3 11:36:09 2016 +0100

sd: replace boost::bind with C++11 lambdas

Change-Id: Idfac081e0b8aecde488166fe741d5b34cfcc66fe

diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 3765775..fe4f0a2 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -25,7 +25,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include 
 #include 
@@ -842,7 +841,10 @@ void SdStyleSheet::notifyModifyListener()
 if( pContainer )
 {
 EventObject aEvt( static_cast< OWeakObject * >( this ) );
-pContainer->forEach( boost::bind( 
&XModifyListener::modified, _1, boost::cref( aEvt ) ) );
+pContainer->forEach(
+[&] (Reference const& xListener) {
+return xListener->modified(aEvt);
+} );
 }
 }
 
diff --git a/sd/source/ui/dlg/NavigatorChildWindow.cxx 
b/sd/source/ui/dlg/NavigatorChildWindow.cxx
index 8a9094c..6796e23 100644
--- a/sd/source/ui/dlg/NavigatorChildWindow.cxx
+++ b/sd/source/ui/dlg/NavigatorChildWindow.cxx
@@ -25,7 +25,6 @@
 #include 
 #include 
 #include 
-#include 
 
 namespace sd {
 
@@ -58,7 +57,7 @@ NavigatorChildWindow::NavigatorChildWindow (
 pBindings);
 
 pNavWin->SetUpdateRequestFunctor(
-::boost::bind(RequestNavigatorUpdate, pBindings));
+[pBindings] () { return RequestNavigatorUpdate(pBindings); });
 
 SetWindow( pNavWin );
 }
diff --git a/sd/source/ui/sidebar/NavigatorWrapper.cxx 
b/sd/source/ui/sidebar/NavigatorWrapper.cxx
index 7c270c5..eb6fe20 100644
--- a/sd/source/ui/sidebar/NavigatorWrapper.cxx
+++ b/sd/source/ui/sidebar/NavigatorWrapper.cxx
@@ -23,7 +23,6 @@
 
 #include 
 
-#include 
 
 namespace sd { namespace sidebar {
 
@@ -38,7 +37,8 @@ NavigatorWrapper::NavigatorWrapper (
 SdResId(FLT_NAVIGATOR),
 pBindings))
 {
-
maNavigator->SetUpdateRequestFunctor(::boost::bind(&NavigatorWrapper::UpdateNavigator,
 this));
+maNavigator->SetUpdateRequestFunctor(
+[this] () { return this->UpdateNavigator(); });
 maNavigator->SetPosSizePixel(
 Point(0,0),
 GetSizePixel());
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 3bfe60f..10ce82e 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -69,7 +69,6 @@
 #include "annotationmanager.hxx"
 #include "DrawController.hxx"
 
-#include 
 #include 
 
 using namespace ::com::sun::star;
@@ -114,7 +113,7 @@ DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, 
ViewShellBase& rViewShellBas
 , mbIsLayerModeActive(false)
 , mbIsInSwitchPage(false)
 , mpSelectionChangeHandler(new svx::sidebar::SelectionChangeHandler(
-  ::boost::bind(&DrawViewShell::GetSidebarContextName, this),
+  [this] () { return this->GetSidebarContextName(); },
   
uno::Reference(&rViewShellBase.GetDrawController()),
   sfx2::sidebar::EnumContext::Context_Default))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[David Ostrovsky]

 configure.ac |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 6153a30e1eba0f7fc05dc2070ebb23f0b2a6df9d
Author: David Ostrovsky 
Date:   Thu Mar 3 08:49:11 2016 +0100

.NET detection: Don't try to add not existing path

This fixed this warning:

  cygpath: cannot create short name of \
  C:\PROGRA~2\WI3CF2~1\NETFXSDK\4.6\bin

Change-Id: I2d4e3d2c5e4c3348552355f91a340438eb0f9e8a
Reviewed-on: https://gerrit.libreoffice.org/22850
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/configure.ac b/configure.ac
index e64c713..b6c14a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12876,7 +12876,10 @@ else
 # needed for msi packaging
 pathmunge "$WINDOWS_SDK_HOME/bin/x86" "before"
 fi
-pathmunge "$DOTNET_FRAMEWORK_HOME/bin" "before"
+# .NET 4.6 and higher don't have bin directory
+if test -f "$DOTNET_FRAMEWORK_HOME/bin"; then
+pathmunge "$DOTNET_FRAMEWORK_HOME/bin" "before"
+fi
 pathmunge "$ASM_HOME" "before"
 pathmunge "$WINDOWS_SDK_HOME/bin" "before"
 pathmunge "$CSC_PATH" "before"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: avmedia/source basctl/source basegfx/source canvas/source codemaker/source extensions/source hwpfilter/source i18nlangtag/source include/avmedia include/canvas include/

[Noel Grandin]

 avmedia/source/viewer/mediawindow.cxx   |6 +
 basctl/source/inc/dlged.hxx |2 -
 basegfx/source/inc/stringconversiontools.hxx|5 +---
 canvas/source/tools/elapsedtime.cxx |2 -
 codemaker/source/codemaker/global.cxx   |   13 ++--
 extensions/source/bibliography/toolbar.cxx  |4 +--
 extensions/source/bibliography/toolbar.hxx  |2 -
 extensions/source/dbpilots/controlwizard.cxx|   10 +++--
 extensions/source/dbpilots/controlwizard.hxx|6 +
 extensions/source/propctrlr/propertyeditor.cxx  |4 +--
 extensions/source/propctrlr/propertyeditor.hxx  |2 -
 extensions/source/propctrlr/propertyhandler.hxx |7 ++
 extensions/source/update/check/download.cxx |4 +--
 hwpfilter/source/hwpreader.cxx  |4 +--
 hwpfilter/source/hwpreader.hxx  |2 -
 i18nlangtag/source/languagetag/languagetag.cxx  |   26 +---
 include/avmedia/mediawindow.hxx |2 -
 include/canvas/elapsedtime.hxx  |7 --
 include/codemaker/global.hxx|3 --
 include/i18nlangtag/languagetag.hxx |   18 ++--
 20 files changed, 45 insertions(+), 84 deletions(-)

New commits:
commit 5adde1bf69828da955f5f8ae8d36a4bd52eee055
Author: Noel Grandin 
Date:   Thu Mar 3 13:04:59 2016 +0200

loplugin:unuseddefaultparams various

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

diff --git a/avmedia/source/viewer/mediawindow.cxx 
b/avmedia/source/viewer/mediawindow.cxx
index 5fd94ee..f28db42 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -368,8 +368,7 @@ uno::Reference< media::XPlayer > MediaWindow::createPlayer( 
const OUString& rURL
 
 uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( const OUString& 
rURL,
 const OUString& 
rReferer,
-const OUString& 
sMimeType,
-double fMediaTime )
+const OUString& 
sMimeType )
 {
 uno::Reference< media::XPlayer >xPlayer( createPlayer( rURL, rReferer, 
&sMimeType ) );
 uno::Reference< graphic::XGraphic > xRet;
@@ -381,8 +380,7 @@ uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( 
const OUString& rURL
 
 if( xGrabber.is() )
 {
-if( AVMEDIA_FRAMEGRABBER_DEFAULTFRAME == fMediaTime )
-fMediaTime = AVMEDIA_FRAMEGRABBER_DEFAULTFRAME_MEDIATIME;
+double fMediaTime = AVMEDIA_FRAMEGRABBER_DEFAULTFRAME_MEDIATIME;
 
 if( fMediaTime >= xPlayer->getDuration() )
 fMediaTime = ( xPlayer->getDuration() * 0.5 );
diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx
index 997d416..958aa1d 100644
--- a/basctl/source/inc/dlged.hxx
+++ b/basctl/source/inc/dlged.hxx
@@ -175,7 +175,7 @@ public:
 boolUnmarkDialog();
 boolRemarkDialog();
 
-voidSetDialogModelChanged (bool bChanged = true) { 
bDialogModelChanged = bChanged; }
+voidSetDialogModelChanged() { bDialogModelChanged = true; }
 
 boolIsModified () const;
 voidClearModifyFlag();
diff --git a/basegfx/source/inc/stringconversiontools.hxx 
b/basegfx/source/inc/stringconversiontools.hxx
index 26fabdb..c23fb50 100644
--- a/basegfx/source/inc/stringconversiontools.hxx
+++ b/basegfx/source/inc/stringconversiontools.hxx
@@ -49,10 +49,9 @@ namespace basegfx
 
 inline bool isOnNumberChar(const OUString& rStr,
const sal_Int32 nPos,
-   boolbSignAllowed = true,
-   boolbDotAllowed = true)
+   boolbSignAllowed = true)
 {
-return isOnNumberChar(rStr[nPos], bSignAllowed, bDotAllowed);
+return isOnNumberChar(rStr[nPos], bSignAllowed);
 }
 
 bool getDoubleChar(double&  o_fRetval,
diff --git a/canvas/source/tools/elapsedtime.cxx 
b/canvas/source/tools/elapsedtime.cxx
index bde8032..d096064 100644
--- a/canvas/source/tools/elapsedtime.cxx
+++ b/canvas/source/tools/elapsedtime.cxx
@@ -142,7 +142,7 @@ void ElapsedTime::reset()
 m_bInHoldMode = false;
 }
 
-void ElapsedTime::adjustTimer( double fOffset, bool 
/*bLimitToLastQueriedTime*/ )
+void ElapsedTime::adjustTimer( double fOffset )
 {
 // to make getElapsedTime() become _larger_, have to reduce
 // m_fStartTime.
diff --git a/codemaker/source/codemaker/global.cxx 
b/codemaker/source/codemaker/global.cxx
index aa496bd..17ec892 

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

[Oliver Specht]

 sw/source/core/crsr/swcrsr.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 83dccbadc2c6caa804039199915d4a8c1f3f2d5a
Author: Oliver Specht 
Date:   Thu Mar 3 08:56:50 2016 +0100

tdf#98224: endless loop in replace all stopped

If a drawing in the document contains the search text then the selection of 
that
object removes a selection (SwShellCursor) that marks the end of the search.
This is now fixed for that special case.
Replacing text in drawing doesn't work - as before and also not all
occurrences of the searched text are found.

Change-Id: I4a10ddf2dc547572ebb55b6355439d6e320bc980
Reviewed-on: https://gerrit.libreoffice.org/22851
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 

diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index b8ecf1e..edd72bf 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -851,7 +851,7 @@ static sal_uLong lcl_FindSelection( SwFindParas& rParas, 
SwCursor* pCurrentCurso
 pPHdl->NextPos( ++pPHdl->nActPos );
 }
 
-} while( pTmpCursor != pSaveCursor );
+} while( pTmpCursor != pSaveCursor && pTmpCursor->GetNext() != pTmpCursor);
 
 if( nFound && !pFndRing ) // if no ring should be created
 pFndRing = pCurrentCursor->Create();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - include/LibreOfficeKit sd/qa sd/source

[Jan Holesovsky]

 include/LibreOfficeKit/LibreOfficeKitEnums.h |   12 --
 sd/qa/unit/tiledrendering/tiledrendering.cxx |  110 ++-
 sd/source/core/drawdoc2.cxx  |   16 ---
 3 files changed, 76 insertions(+), 62 deletions(-)

New commits:
commit 0ba1ebdd72f0612b61f28b11c7861121e7529f31
Author: Jan Holesovsky 
Date:   Thu Mar 3 09:00:21 2016 +0100

sd lok: Remove LOK_CALLBACK_PARTS_COUNT_CHANGED from the API.

LOK_CALLBACK_PARTS_COUNT_CHANGED did not cover more complex scenarios, like
more pages deleted at the same time, etc.

Instead, we need to trigger the LOK_CALLBACK_DOCUMENT_SIZE_CHANGED, and the
client has to be smart enough to update the previews in a way that does not
consume too much resources - ie. it has to have a link between the part 
names
(which are unique) and the previews, and request only the missing ones.

Change-Id: I36ff5dc86f360e3c7bd2c55fae8aaa99e054b4eb

diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h 
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 7e2cc30..343d169 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -280,18 +280,6 @@ typedef enum
  * }
  */
 LOK_CALLBACK_ERROR,
-
-/**
- * A part has been added to or removed from the document.
- *
- * {
- *  "action" : "PartInserted" | "PartDeleted"
- *  "part"   : "Part Index"
- * }
- *
- * Note: this is currently emitted by Impress.
- */
-LOK_CALLBACK_PARTS_COUNT_CHANGED
 }
 LibreOfficeKitCallbackType;
 
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx 
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 8d19021..7c63bf2 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -100,9 +101,11 @@ private:
 sal_Int32 m_nPart;
 std::vector m_aSearchResultSelection;
 std::vector m_aSearchResultPart;
-std::vector m_aPageList;
 int m_nSelectionBeforeSearchResult;
 int m_nSelectionAfterSearchResult;
+
+/// For document size changed callback.
+osl::Condition m_aDocumentSizeCondition;
 #endif
 };
 
@@ -207,6 +210,11 @@ void SdTiledRenderingTest::callbackImpl(int nType, const 
char* pPayload)
 m_bFound = false;
 }
 break;
+case LOK_CALLBACK_DOCUMENT_SIZE_CHANGED:
+{
+m_aDocumentSizeCondition.set();
+}
+break;
 case LOK_CALLBACK_SET_PART:
 {
 OUString aPayload = OUString::createFromAscii(pPayload);
@@ -227,19 +235,6 @@ void SdTiledRenderingTest::callbackImpl(int nType, const 
char* pPayload)
 }
 }
 break;
-case LOK_CALLBACK_PARTS_COUNT_CHANGED:
-{
-boost::property_tree::ptree aTree;
-std::stringstream aStream(pPayload);
-boost::property_tree::read_json(aStream, aTree);
-auto aAction = aTree.get("action", "");
-auto aPart = aTree.get("part", "");
-if (!aAction.empty() && !aPart.empty())
-{
-m_aPageList.push_back(std::atoi(aPart.data()));
-}
-}
-break;
 }
 }
 
@@ -515,6 +510,23 @@ void SdTiledRenderingTest::testSearchAllFollowedBySearch()
 CPPUNIT_ASSERT_EQUAL(OString("match"), 
pXImpressDocument->getTextSelection("text/plain;charset=utf-8", aUsedFormat));
 }
 
+namespace {
+
+std::vector getCurrentParts(SdXImpressDocument* pDocument)
+{
+int parts = pDocument->getParts();
+std::vector result;
+
+for (int i = 0; i < parts; i++)
+{
+result.push_back(pDocument->getPartName(i));
+}
+
+return result;
+}
+
+}
+
 void SdTiledRenderingTest::testInsertDeletePage()
 {
 comphelper::LibreOfficeKit::setActive();
@@ -524,59 +536,84 @@ void SdTiledRenderingTest::testInsertDeletePage()
 SdDrawDocument *pDoc = pXImpressDocument->GetDocShell()->GetDoc();
 CPPUNIT_ASSERT(pDoc);
 
+std::vector aInserted = {
+"Slide 1", "Slide 2", "Slide 3", "Slide 4", "Slide 5",
+"Slide 6", "Slide 7", "Slide 8", "Slide 9", "Slide 10", "Slide 11"
+};
+
+std::vector aDeleted = {
+"Slide 1"
+};
+
 // the document has 1 slide
 CPPUNIT_ASSERT(pDoc->GetSdPageCount(PK_STANDARD) == 1);
 
 uno::Sequence aArgs;
 
 // Insert slides
-for(unsigned it = 1; it <= 10; it++)
+m_aDocumentSizeCondition.reset();
+for (unsigned it = 1; it <= 10; it++)
 comphelper::dispatchCommand(".uno:InsertPage", aArgs);
 
+TimeValue aTimeValue = { 2 , 0 }; // 2 seconds max
+osl::Condition::Result aResult = 
m_aDocumentSizeCondition.wait(&aTimeValue);
+CPPUNIT_ASSERT_EQUAL(aResult, osl::Condition::result_ok);
+
 // Verify inserted slides
-for(auto i: m_aPageList)
+std::vector aPageList(getCurrentParts(pXImpressDocument));
+CPPUNIT_ASSERT_EQUAL(aPageList.size(), aInserted.size());
+
+for (auto it1 = aPageList.b

Steven Guo license statement

[Steven Guo]

All of my past & future contributions to LibreOffice may be licensed under
the MPLv2/LGPLv3+ dual license.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: external/libetonyek

[Tomáš Chvátal]

 external/libetonyek/libetonyek-bundled-soname.patch.0 |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 1f182f130edeb8282f0e7e325fb823200f2db34a
Author: Tomáš Chvátal 
Date:   Wed Mar 2 18:21:04 2016 +0100

Update etonyek patch to apply with sle11 patch

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

diff --git a/external/libetonyek/libetonyek-bundled-soname.patch.0 
b/external/libetonyek/libetonyek-bundled-soname.patch.0
index 753e384..122763d 100644
--- a/external/libetonyek/libetonyek-bundled-soname.patch.0
+++ b/external/libetonyek/libetonyek-bundled-soname.patch.0
@@ -1,9 +1,11 @@
 src/lib/Makefile.in.orig   2015-08-07 10:51:32.494810336 +0200
-+++ src/lib/Makefile.in2015-08-07 10:51:55.493809942 +0200
-@@ -463,5 +463,5 @@
+--- src/lib/Makefile.in.orig   2016-01-12 19:21:24.0 +0100
 src/lib/Makefile.in2016-03-02 18:19:52.214551270 +0100
+@@ -538,7 +538,7 @@
+ 
+ libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_LIBADD = 
libetonyek_internal.la $(REVENGE_LIBS) $(LANGTAG_LIBS) $(XML_LIBS) $(ZLIB_LIBS) 
@LIBETONYEK_WIN32_RESOURCE@
  libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_DEPENDENCIES = 
libetonyek_internal.la @LIBETONYEK_WIN32_RESOURCE@
 -libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_LDFLAGS = 
$(version_info) -export-dynamic -no-undefined
 +libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_LDFLAGS = 
$(version_info) -export-dynamic -no-undefined -release lo
  libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_SOURCES = \
EtonyekDocument.cpp
-
+ 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - external/libetonyek

[Tomáš Chvátal]

 external/libetonyek/libetonyek-bundled-soname.patch.0 |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 94190e176d7a0384455b79c9cf15b08c032d98c6
Author: Tomáš Chvátal 
Date:   Wed Mar 2 18:21:04 2016 +0100

Update etonyek patch to apply with sle11 patch

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

diff --git a/external/libetonyek/libetonyek-bundled-soname.patch.0 
b/external/libetonyek/libetonyek-bundled-soname.patch.0
index 753e384..122763d 100644
--- a/external/libetonyek/libetonyek-bundled-soname.patch.0
+++ b/external/libetonyek/libetonyek-bundled-soname.patch.0
@@ -1,9 +1,11 @@
 src/lib/Makefile.in.orig   2015-08-07 10:51:32.494810336 +0200
-+++ src/lib/Makefile.in2015-08-07 10:51:55.493809942 +0200
-@@ -463,5 +463,5 @@
+--- src/lib/Makefile.in.orig   2016-01-12 19:21:24.0 +0100
 src/lib/Makefile.in2016-03-02 18:19:52.214551270 +0100
+@@ -538,7 +538,7 @@
+ 
+ libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_LIBADD = 
libetonyek_internal.la $(REVENGE_LIBS) $(LANGTAG_LIBS) $(XML_LIBS) $(ZLIB_LIBS) 
@LIBETONYEK_WIN32_RESOURCE@
  libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_DEPENDENCIES = 
libetonyek_internal.la @LIBETONYEK_WIN32_RESOURCE@
 -libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_LDFLAGS = 
$(version_info) -export-dynamic -no-undefined
 +libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_LDFLAGS = 
$(version_info) -export-dynamic -no-undefined -release lo
  libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_SOURCES = \
EtonyekDocument.cpp
-
+ 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: hello everyone

[jan iversen]

Welcome 

have a look at our step-by-step guide, that will help you.
https://wiki.documentfoundation.org/Development/GetInvolved

rgds
jan i.


Sent from my iPad, please excuse any misspellings 

> On 03 Mar 2016, at 08:37, 史周波  wrote:
> 
> hi all,
> 
>   I am glad to join the libreoffice community。
> 
> 
> 
> best regard.
> 
> shi zhoubo
> 
> 
> 
>  
> 
>  
> 
> ​
> 
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-7' - 2 commits - loolwsd/bundled loolwsd/LOKitClient.cpp loolwsd/LOOLSession.cpp

[Jan Holesovsky]

 loolwsd/LOKitClient.cpp  |1 -
 loolwsd/LOOLSession.cpp  |2 --
 loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h |1 +
 loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h  |2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit c3e3cf58ebb7daa67d4c1dc9a25a88f41ab31323
Author: Jan Holesovsky 
Date:   Thu Mar 3 11:20:20 2016 +0100

loolwsd: LOK_CALLBACK_PARTS_COUNT_CHANGED was removed from the API.

diff --git a/loolwsd/LOKitClient.cpp b/loolwsd/LOKitClient.cpp
index b02c062..9542942 100644
--- a/loolwsd/LOKitClient.cpp
+++ b/loolwsd/LOKitClient.cpp
@@ -67,7 +67,6 @@ extern "C"
 CASE(DOCUMENT_PASSWORD);
 CASE(DOCUMENT_PASSWORD_TO_MODIFY);
 CASE(ERROR);
-CASE(PARTS_COUNT_CHANGED);
 #undef CASE
 }
 std::cout << " payload: " << pPayload << std::endl;
diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index 506fd64..a77df51 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -1085,8 +1085,6 @@ extern "C"
 " kind=" + object->get("kind").toString() + " code=" + 
object->get("code").toString());
 }
 break;
-case LOK_CALLBACK_PARTS_COUNT_CHANGED:
-break;
 }
 }
 }
commit 48d2fe6d8b2409fbeaaf895f15772f0a597447d4
Author: Jan Holesovsky 
Date:   Thu Mar 3 11:18:25 2016 +0100

loolwsd: Update the bundled LOK headers.

diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h 
b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 5ce8610..901bf6b 100644
--- a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -197,6 +197,7 @@ typedef enum
  *
  * {
  * "searchString": "...",
+ * "highlightAll": true|false, // this is a result of 'search all'
  * "searchResultSelection": [
  * {
  * "part": "...",
diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h 
b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
index 23e5772..a1b2ddc 100644
--- a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -19,7 +19,7 @@ extern "C"
 
 #if defined(__linux__) || defined (__FreeBSD_kernel__) || defined(_AIX) ||\
 defined(_WIN32) || defined(__APPLE__) || defined (__NetBSD__) ||\
-defined (__sun)
+defined (__sun) || defined(__OpenBSD__)
 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - loolwsd/bundled loolwsd/ChildProcessSession.cpp loolwsd/LOKitClient.cpp loolwsd/protocol.txt loolwsd/test

[Jan Holesovsky]

 loolwsd/ChildProcessSession.cpp  |5 
 loolwsd/LOKitClient.cpp  |1 
 loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h |   12 ---
 loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h  |2 -
 loolwsd/protocol.txt |   12 ---
 loolwsd/test/httpwstest.cpp  |2 +
 6 files changed, 3 insertions(+), 31 deletions(-)

New commits:
commit 2590cd186e638af2ff0a164b3ea30fdb98037951
Author: Jan Holesovsky 
Date:   Thu Mar 3 11:13:34 2016 +0100

loolwsd: LOK_CALLBACK_PARTS_COUNT_CHANGED was removed from the API.

diff --git a/loolwsd/ChildProcessSession.cpp b/loolwsd/ChildProcessSession.cpp
index 926b4dc..9df3d5a 100644
--- a/loolwsd/ChildProcessSession.cpp
+++ b/loolwsd/ChildProcessSession.cpp
@@ -110,8 +110,6 @@ public:
 return std::string("LOK_CALLBACK_DOCUMENT_SIZE_CHANGED");
 case LOK_CALLBACK_SET_PART:
 return std::string("LOK_CALLBACK_SET_PART");
-case LOK_CALLBACK_PARTS_COUNT_CHANGED:
-return std::string("LOK_CALLBACK_PARTS_COUNT_CHANGED");
 case LOK_CALLBACK_DOCUMENT_PASSWORD:
 return std::string("LOK_CALLBACK_DOCUMENT_PASSWORD");
 case LOK_CALLBACK_DOCUMENT_PASSWORD_TO_MODIFY:
@@ -243,9 +241,6 @@ public:
 " kind=" + object->get("kind").toString() + " code=" + 
object->get("code").toString());
 }
 break;
-case LOK_CALLBACK_PARTS_COUNT_CHANGED:
-_session.sendTextFrame("partscountchanged: " + rPayload);
-break;
 }
 }
 
diff --git a/loolwsd/LOKitClient.cpp b/loolwsd/LOKitClient.cpp
index cd52a1c..50cf3ec 100644
--- a/loolwsd/LOKitClient.cpp
+++ b/loolwsd/LOKitClient.cpp
@@ -67,7 +67,6 @@ extern "C"
 CASE(DOCUMENT_PASSWORD);
 CASE(DOCUMENT_PASSWORD_TO_MODIFY);
 CASE(ERROR);
-CASE(PARTS_COUNT_CHANGED);
 #undef CASE
 }
 std::cout << " payload: " << pPayload << std::endl;
diff --git a/loolwsd/protocol.txt b/loolwsd/protocol.txt
index ab5142c..334be17 100644
--- a/loolwsd/protocol.txt
+++ b/loolwsd/protocol.txt
@@ -230,18 +230,6 @@ unocommandresult: 
 Callback that an UNO command has finished.
 See LOK_CALLBACK_UNO_COMMAND_RESULT for details.
 
-partscountchanged: action= part=
-
-Callback action performed:
-
-PartInserted. The document parts has changed by the action
-Insert.
-
-PartDeleted. The document parts has changed by the action
-Delete.
-
- The index of the part 
-
 child -> parent
 ===
 
diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp
index 7ed1bb1..86d250a 100644
--- a/loolwsd/test/httpwstest.cpp
+++ b/loolwsd/test/httpwstest.cpp
@@ -355,6 +355,7 @@ void HTTPWSTest::testImpressPartCountChanged()
 CPPUNIT_ASSERT_EQUAL(totalParts, 1);
 }
 
+/* FIXME partscountchanged: was removed, update accordingly
 // insert 10 slides
 for (unsigned it = 1; it <= 10; it++)
 {
@@ -410,6 +411,7 @@ void HTTPWSTest::testImpressPartCountChanged()
 CPPUNIT_ASSERT(values["action"] == "PartDeleted");
 }
 }
+*/
 
 socket.shutdown();
 }
commit b442680d90775bdaf50852a55e5b49effed23ff1
Author: Jan Holesovsky 
Date:   Thu Mar 3 11:08:25 2016 +0100

loolwsd: Update the bundled LOK headers.

diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h 
b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
index e855b6a..901bf6b 100644
--- a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -280,18 +280,6 @@ typedef enum
  * }
  */
 LOK_CALLBACK_ERROR,
-
-/**
- * A part has been added to or removed from the document.
- *
- * {
- *  "action" : "PartInserted" | "PartDeleted"
- *  "part"   : "Part Index"
- * }
- *
- * Note: this is currently emitted by Impress.
- */
-LOK_CALLBACK_PARTS_COUNT_CHANGED
 }
 LibreOfficeKitCallbackType;
 
diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h 
b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
index 23e5772..a1b2ddc 100644
--- a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -19,7 +19,7 @@ extern "C"
 
 #if defined(__linux__) || defined (__FreeBSD_kernel__) || defined(_AIX) ||\
 defined(_WIN32) || defined(__APPLE__) || defined (__NetBSD__) ||\
-defined (__sun)
+defined (__sun) || defined(__OpenBSD__)
 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

hello everyone

[史周波]

hi all,

 I am glad to join the libreoffice community。

best
regard.

shi zhoubo

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

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

[Jan Holesovsky]

 include/LibreOfficeKit/LibreOfficeKitEnums.h |   12 ---
 sd/qa/unit/tiledrendering/tiledrendering.cxx |  102 ++-
 sd/source/core/drawdoc2.cxx  |   16 
 3 files changed, 72 insertions(+), 58 deletions(-)

New commits:
commit 8fb170cbe929fcbf85b24284bf31ec6b06150fbe
Author: Jan Holesovsky 
Date:   Thu Mar 3 09:00:21 2016 +0100

sd lok: Remove LOK_CALLBACK_PARTS_COUNT_CHANGED from the API.

LOK_CALLBACK_PARTS_COUNT_CHANGED did not cover more complex scenarios, like
more pages deleted at the same time, etc.

Instead, we need to trigger the LOK_CALLBACK_DOCUMENT_SIZE_CHANGED, and the
client has to be smart enough to update the previews in a way that does not
consume too much resources - ie. it has to have a link between the part 
names
(which are unique) and the previews, and request only the missing ones.

Change-Id: I36ff5dc86f360e3c7bd2c55fae8aaa99e054b4eb

diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h 
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index e855b6a..901bf6b 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -280,18 +280,6 @@ typedef enum
  * }
  */
 LOK_CALLBACK_ERROR,
-
-/**
- * A part has been added to or removed from the document.
- *
- * {
- *  "action" : "PartInserted" | "PartDeleted"
- *  "part"   : "Part Index"
- * }
- *
- * Note: this is currently emitted by Impress.
- */
-LOK_CALLBACK_PARTS_COUNT_CHANGED
 }
 LibreOfficeKitCallbackType;
 
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx 
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 402734c..8ee50a3 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -20,6 +20,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -93,9 +94,11 @@ private:
 sal_Int32 m_nPart;
 std::vector m_aSearchResultSelection;
 std::vector m_aSearchResultPart;
-std::vector m_aPageList;
 int m_nSelectionBeforeSearchResult;
 int m_nSelectionAfterSearchResult;
+
+/// For document size changed callback.
+osl::Condition m_aDocumentSizeCondition;
 #endif
 };
 
@@ -200,6 +203,11 @@ void SdTiledRenderingTest::callbackImpl(int nType, const 
char* pPayload)
 m_bFound = false;
 }
 break;
+case LOK_CALLBACK_DOCUMENT_SIZE_CHANGED:
+{
+m_aDocumentSizeCondition.set();
+}
+break;
 case LOK_CALLBACK_SET_PART:
 {
 OUString aPayload = OUString::createFromAscii(pPayload);
@@ -220,19 +228,6 @@ void SdTiledRenderingTest::callbackImpl(int nType, const 
char* pPayload)
 }
 }
 break;
-case LOK_CALLBACK_PARTS_COUNT_CHANGED:
-{
-boost::property_tree::ptree aTree;
-std::stringstream aStream(pPayload);
-boost::property_tree::read_json(aStream, aTree);
-auto aAction = aTree.get("action", "");
-auto aPart = aTree.get("part", "");
-if (!aAction.empty() && !aPart.empty())
-{
-m_aPageList.push_back(std::atoi(aPart.data()));
-}
-}
-break;
 }
 }
 
@@ -516,6 +511,23 @@ void SdTiledRenderingTest::testSearchAllFollowedBySearch()
 CPPUNIT_ASSERT_EQUAL(OString("match"), 
pXImpressDocument->getTextSelection("text/plain;charset=utf-8", aUsedFormat));
 }
 
+namespace {
+
+std::vector getCurrentParts(SdXImpressDocument* pDocument)
+{
+int parts = pDocument->getParts();
+std::vector result;
+
+for (int i = 0; i < parts; i++)
+{
+result.push_back(pDocument->getPartName(i));
+}
+
+return result;
+}
+
+}
+
 void SdTiledRenderingTest::testInsertDeletePage()
 {
 comphelper::LibreOfficeKit::setActive();
@@ -525,59 +537,84 @@ void SdTiledRenderingTest::testInsertDeletePage()
 SdDrawDocument* pDoc = pXImpressDocument->GetDocShell()->GetDoc();
 CPPUNIT_ASSERT(pDoc);
 
+std::vector aInserted = {
+"Slide 1", "Slide 2", "Slide 3", "Slide 4", "Slide 5",
+"Slide 6", "Slide 7", "Slide 8", "Slide 9", "Slide 10", "Slide 11"
+};
+
+std::vector aDeleted = {
+"Slide 1"
+};
+
 // the document has 1 slide
 CPPUNIT_ASSERT(pDoc->GetSdPageCount(PK_STANDARD) == 1);
 
 uno::Sequence aArgs;
 
 // Insert slides
+m_aDocumentSizeCondition.reset();
 for (unsigned it = 1; it <= 10; it++)
 comphelper::dispatchCommand(".uno:InsertPage", aArgs);
 
+TimeValue aTimeValue = { 2 , 0 }; // 2 seconds max
+osl::Condition::Result aResult = m_aDocumentSizeCondition.wait(aTimeValue);
+CPPUNIT_ASSERT_EQUAL(aResult, osl::Condition::result_ok);
+
 // Verify inserted slides
-for (auto i: m_aPageList)
+std::vector aPageList(getCurrentParts(pXImpressDocument));
+CPPUNIT_ASSERT_EQUAL(aPageList.size(), aInserted.size());
+
+for (auto it1 = aPageList.begin(), it2 = aInserted.begin(); it1 != 
aP

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

[Miklos Vajna]

 sfx2/source/view/classificationhelper.cxx |   68 ++
 1 file changed, 50 insertions(+), 18 deletions(-)

New commits:
commit ae5c80502b4f7d9bfb6a09cd28ab72594552037d
Author: Miklos Vajna 
Date:   Thu Mar 3 10:06:07 2016 +0100

sfx2 classification: replace default start date with current time ...

... unless the policy changes the default already.

This was the date of the classification is stored in the document, and
can be inserted as a field as well, but if the policy has an explicit
classification start date, we don't overwrite that.

Change-Id: I17974d73a415a2c8032df48aa7b7f4eebb7178ab

diff --git a/sfx2/source/view/classificationhelper.cxx 
b/sfx2/source/view/classificationhelper.cxx
index f086ade..349c337 100644
--- a/sfx2/source/view/classificationhelper.cxx
+++ b/sfx2/source/view/classificationhelper.cxx
@@ -29,7 +29,8 @@
 #include 
 #include 
 #include 
-#include 
+#include 
+#include 
 #include 
 
 using namespace com::sun::star;
@@ -37,6 +38,24 @@ using namespace com::sun::star;
 namespace
 {
 
+const OUString& PROP_BACNAME()
+{
+static OUString 
sProp("urn:bails:IntellectualProperty:BusinessAuthorizationCategory:Name");
+return sProp;
+}
+
+const OUString& PROP_STARTVALIDITY()
+{
+static OUString 
sProp("urn:bails:IntellectualProperty:Authorization:StartValidity");
+return sProp;
+}
+
+const OUString& PROP_NONE()
+{
+static OUString sProp("None");
+return sProp;
+}
+
 /// Represents one category of a classification policy.
 class SfxClassificationCategory
 {
@@ -151,15 +170,15 @@ throw (xml::sax::SAXException, uno::RuntimeException, 
std::exception)
 
rCategory.m_aLabels["urn:bails:IntellectualProperty:BusinessAuthorizationCategory:Identifier"]
 = aIdentifier;
 
 // Also initialize defaults.
-
rCategory.m_aLabels["urn:bails:IntellectualProperty:PolicyAuthority:Identifier"]
 = "None";
-
rCategory.m_aLabels["urn:bails:IntellectualProperty:PolicyAuthority:Country"] = 
"None";
-
rCategory.m_aLabels["urn:bails:IntellectualProperty:Policy:Identifier"] = 
"None";
-
rCategory.m_aLabels["urn:bails:IntellectualProperty:BusinessAuthorization:Name"]
 = "None";
-
rCategory.m_aLabels["urn:bails:IntellectualProperty:BusinessAuthorization:Locator"]
 = "None";
-
rCategory.m_aLabels["urn:bails:IntellectualProperty:BusinessAuthorizationCategory:Identifier:OID"]
 = "None";
-
rCategory.m_aLabels["urn:bails:IntellectualProperty:BusinessAuthorizationCategory:Locator"]
 = "None";
-
rCategory.m_aLabels["urn:bails:IntellectualProperty:BusinessAuthorization:Locator"]
 = "None";
-
rCategory.m_aLabels["urn:bails:IntellectualProperty:MarkingPrecedence"] = 
"None";
+
rCategory.m_aLabels["urn:bails:IntellectualProperty:PolicyAuthority:Identifier"]
 = PROP_NONE();
+
rCategory.m_aLabels["urn:bails:IntellectualProperty:PolicyAuthority:Country"] = 
PROP_NONE();
+
rCategory.m_aLabels["urn:bails:IntellectualProperty:Policy:Identifier"] = 
PROP_NONE();
+
rCategory.m_aLabels["urn:bails:IntellectualProperty:BusinessAuthorization:Name"]
 = PROP_NONE();
+
rCategory.m_aLabels["urn:bails:IntellectualProperty:BusinessAuthorization:Locator"]
 = PROP_NONE();
+
rCategory.m_aLabels["urn:bails:IntellectualProperty:BusinessAuthorizationCategory:Identifier:OID"]
 = PROP_NONE();
+
rCategory.m_aLabels["urn:bails:IntellectualProperty:BusinessAuthorizationCategory:Locator"]
 = PROP_NONE();
+
rCategory.m_aLabels["urn:bails:IntellectualProperty:BusinessAuthorization:Locator"]
 = PROP_NONE();
+
rCategory.m_aLabels["urn:bails:IntellectualProperty:MarkingPrecedence"] = 
PROP_NONE();
 
rCategory.m_aLabels["urn:bails:IntellectualProperty:Marking:general-summary"].clear();
 
rCategory.m_aLabels["urn:bails:IntellectualProperty:Marking:general-warning-statement"].clear();
 
rCategory.m_aLabels["urn:bails:IntellectualProperty:Marking:general-warning-statement:ext:2"].clear();
@@ -176,8 +195,8 @@ throw (xml::sax::SAXException, uno::RuntimeException, 
std::exception)
 
rCategory.m_aLabels["urn:bails:IntellectualProperty:Marking:email-last-line-of-text"].clear();
 
rCategory.m_aLabels["urn:bails:IntellectualProperty:Marking:email-subject-prefix"].clear();
 
rCategory.m_aLabels["urn:bails:IntellectualProperty:Marking:email-subject-suffix"].clear();
-
rCategory.m_aLabels["urn:bails:IntellectualProperty:Authorization:StartValidity"]
 = "None";
-
rCategory.m_aLabels["urn:bails:IntellectualProperty:Authorization:StopValidity"]
 = "None";
+rCategory.m_aLabels[PROP_STARTVALIDITY()] = PROP_NONE();
+
rCategory.m_aLabels["urn:bails:IntellectualProperty:Authorization:StopValidity"]
 = PROP_NONE();
 m_pCategory = &rCategory;

Re: minutes of ESC call ...

[Stephan Bergmann]

On 02/18/2016 05:38 PM, Michael Meeks wrote:

* MSVC 14.0 / Drop MSVC 12.0 on master (DavidO)
  + Improvement of C++14/C++17 standard
  + bit rotted on master: dozen compilation errors
  + Add Tinderbox to verify that it still works
  + After release of 5.1 consider to discontinue support for MSVC 12.0 on 
master
  * Looks like it's impossible to manage the switch period
  * both compilers could be installed (?) on the same machine, to still 
use old compiler on 5.1
  + Duplicated Python 3.3/3.5 trees, because upstream dropped support for 
MSVC 12.0
  + plan was to use Windows Server 2016 + update baseline (Cloph)
  + can setup the tech. preview 4 of Win. Server 2016 & have a t-box.
  + but not convinced on deprecation yet.
  + does 5.0 build with VS 2015 ? (Norbert)

+ No. Requires Python 3.5

  Only build on master

  + if so, with the 2x new Windows box showing up
 + install VS 2015 there.
  + then take two others off-line & upgrade them too.
  + even on master - with just VS 2015 - still have issues (Miklos)
  + would be good for now to have a tinderbox to stop it breaking.
  + not fond of multiple versions of compiler (Norbert)
  + can hide problems.
  + concerned we test with only the new compiler (Miklos)
  + new Win boxes physically arrived
  + being moved around at Manitu right now with Alex.
  => put Win Server 2016 Preview 4 + VS 2015
  - and bring them on-line and see how it goes.
  + if problems building with 5.0 and 5.1 - re-think.
  + is it confirmed 5.0 builds with VS 2015 ? (Norbert)
  + No. Requires Python 3.5
Only build on master
  + only 1x release left of 5.0.x - anyway (Cloph)
  + to mid April/May.
  => defer update until then.
  + can we somehow restore Thorsten's t-box vs. 2015 ? (Michael)
  + Thorsten's TB was shut down because of devenv.exe invocation
(mst__ has an idea how to fix it?)
   + no idea (mst).
  + migrating slaves of jenkins infra - is a bigger deal - needs a single
toolchain that builds all relevant versions (Norbert).
AI:  => will setup a tinderbox VM for VS. 2015 (Cloph)
  + would be good to back-port fixes to 5.1 too to be prepared for May.


What I noticed with my clang-cl build on Windows is that some of the 
external modules (at least external/libxmlsec/ExternalProject_xmlsec.mk) 
do not get built with whatever is configured as CC/CXX for LO, but 
determine that themselves, potentially picking an unexpected MSVC 
version if multiple ones are installed?


(It is rather harmless for my clang-cl case, where the main reason to 
build with clang-cl is more warnings, which we ignore in external 
modules anyway. So it doesn't really matter there that some external 
modules are built with MSVC instead of clang-cl.  But it might become a 
problem for MSVC 2013 vs. 2015 builds, when such an external DLL records 
a requirement on the "wrong" compiler runtime DLL.)

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

[Libreoffice-commits] core.git: 3 commits - connectivity/source filter/source formula/source include/connectivity include/filter include/formula reportdesign/source sc/source

[Noel Grandin]

 connectivity/source/commontools/dbexception.cxx|   18 +---
 connectivity/source/commontools/dbtools.cxx|4 
 connectivity/source/commontools/predicateinput.cxx |   14 ---
 connectivity/source/commontools/sqlerror.cxx   |   12 +-
 filter/source/flash/swfwriter.cxx  |   11 --
 filter/source/flash/swfwriter.hxx  |4 
 filter/source/graphicfilter/eps/eps.cxx|   36 
 filter/source/msfilter/dffpropset.cxx  |4 
 filter/source/msfilter/escherex.cxx|   15 +--
 filter/source/msfilter/eschesdo.cxx|2 
 filter/source/msfilter/eschesdo.hxx|7 -
 filter/source/msfilter/msdffimp.cxx|   21 +
 filter/source/svg/svgwriter.cxx|   87 +++--
 filter/source/svg/svgwriter.hxx|   18 +---
 formula/source/core/api/FormulaCompiler.cxx|5 -
 include/connectivity/dbexception.hxx   |   17 
 include/connectivity/dbtools.hxx   |3 
 include/connectivity/predicateinput.hxx|   15 ---
 include/connectivity/sqlerror.hxx  |   24 -
 include/filter/msfilter/dffpropset.hxx |2 
 include/filter/msfilter/escherex.hxx   |2 
 include/filter/msfilter/msdffimp.hxx   |3 
 include/formula/FormulaCompiler.hxx|3 
 include/formula/IControlReferenceHandler.hxx   |2 
 reportdesign/source/ui/dlg/Formula.cxx |2 
 reportdesign/source/ui/inc/Formula.hxx |2 
 sc/source/ui/formdlg/formula.cxx   |4 
 sc/source/ui/inc/anyrefdg.hxx  |2 
 sc/source/ui/inc/formula.hxx   |2 
 sc/source/ui/miscdlgs/anyrefdg.cxx |4 
 30 files changed, 128 insertions(+), 217 deletions(-)

New commits:
commit 2437ccd3e90db011fb7e04f31eb4033d50919d77
Author: Noel Grandin 
Date:   Thu Mar 3 11:15:36 2016 +0200

loplugin:unuseddefaultparams in formula

Change-Id: I7f0baa2709db24e8299f0e1c19c0703aee1cbf4f

diff --git a/formula/source/core/api/FormulaCompiler.cxx 
b/formula/source/core/api/FormulaCompiler.cxx
index 6b0eb35..4813cfc 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -1866,11 +1866,10 @@ void FormulaCompiler::CreateStringFromTokenArray( 
OUStringBuffer& rBuffer )
 }
 }
 
-const FormulaToken* FormulaCompiler::CreateStringFromToken( OUString& 
rFormula, const FormulaToken* pTokenP,
-bool bAllowArrAdvance )
+const FormulaToken* FormulaCompiler::CreateStringFromToken( OUString& 
rFormula, const FormulaToken* pTokenP )
 {
 OUStringBuffer aBuffer;
-const FormulaToken* p = CreateStringFromToken( aBuffer, pTokenP, 
bAllowArrAdvance );
+const FormulaToken* p = CreateStringFromToken( aBuffer, pTokenP );
 rFormula += aBuffer.makeStringAndClear();
 return p;
 }
diff --git a/include/formula/FormulaCompiler.hxx 
b/include/formula/FormulaCompiler.hxx
index 00e76fa..24956d6 100644
--- a/include/formula/FormulaCompiler.hxx
+++ b/include/formula/FormulaCompiler.hxx
@@ -237,8 +237,7 @@ public:
 
 void CreateStringFromTokenArray( OUString& rFormula );
 void CreateStringFromTokenArray( OUStringBuffer& rBuffer );
-const FormulaToken* CreateStringFromToken( OUString& rFormula, const 
FormulaToken* pToken,
-bool bAllowArrAdvance = false );
+const FormulaToken* CreateStringFromToken( OUString& rFormula, const 
FormulaToken* pToken );
 const FormulaToken* CreateStringFromToken( OUStringBuffer& rBuffer, const 
FormulaToken* pToken,
 bool bAllowArrAdvance = false );
 
diff --git a/include/formula/IControlReferenceHandler.hxx 
b/include/formula/IControlReferenceHandler.hxx
index 9dbde6c..595eb13 100644
--- a/include/formula/IControlReferenceHandler.hxx
+++ b/include/formula/IControlReferenceHandler.hxx
@@ -31,7 +31,7 @@ namespace formula
 public:
 virtual void ShowReference(const OUString& _sRef) = 0;
 virtual void HideReference( bool bDoneRefMode = true ) = 0;
-virtual void ReleaseFocus( RefEdit* pEdit, RefButton* pButton = 
nullptr ) = 0;
+virtual void ReleaseFocus( RefEdit* pEdit ) = 0;
 virtual void ToggleCollapsed( RefEdit* pEdit, RefButton* pButton = 
nullptr ) = 0;
 
 protected:
diff --git a/reportdesign/source/ui/dlg/Formula.cxx 
b/reportdesign/source/ui/dlg/Formula.cxx
index 03f4a7a..4fbd9a3 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -189,7 +189,7 @@ void FormulaDialog::HideReference( bool /*bDoneRefMode*/)
 {
 }
 
-void FormulaDialog::ReleaseFocus( RefEdit* /*pEdit*/, RefButton* /*pButton*/)
+void FormulaDialog::ReleaseFocus( RefEdit* /*pEdit*/)
 {
 }
 
diff --git a/reportdesign/source/ui/inc/Formula.hxx 
b/reportdesign/s

Minutes of the Design Hangout: 2016-02-26

[Jan Holesovsky]

* Present: Italo, Stuart, Heiko, Jay, Kendy, Jan-Marek, Tomaz, Akshay

* UI changes integrated the last week:

+ Add a "filter" to Insert > Field > Other > Cross reference tab (Akshay)
+ ".uno:LineToolbox" command into writer (Gulsah)
+ UI for classification (Miklos)
+ Update of .ui files in Option (Adolfo)
+ More menus converted to xml (Maxim)
+ Slide preview fixing (Rishabh)
+ Fix paper cuts in animations sidebar (Bubli)
+ Tweaks in tango and galaxy icons (Jay)
+ Native Gtk3 popup menus (Caolán)
+ Vertical alignment buttons for shapes in the sidebar (Maxim)
+ Move accessibility relations to .ui files (melikeyurtoglu)

* GSoC - Special Character dialog (Jay/Heiko)

+ should we design implement our own or use OS specific charmap dialog
  https://bugs.documentfoundation.org/show_bug.cgi?id=37229
  https://www.kde.org/applications/utilities/kcharselect/
  https://wiki.gnome.org/action/show/Apps/Gucharmap
+ char map app is not necessarily bundeled on Linux (Heiko)
+ Adolfo worked on the task; in our dialog some features are missing 
(Stuart)
+ Proposal for high-end dialog made last year at 
http://user-prompt.com/de/libreoffice-design-session-special-character/

+ from the development point of view, would rather have own dialog, than 
having to maintain code
  for ~5 platforms (Windows, OS X, LXQT, KDE (Qt4/5), Gnome2/3, etc.) 
(Kendy)
+ agreed, good to add more features to our dialog though (Stuart)
+ it is not a single dialog / API, but external program(s) on those 
platforms (Jan-Marek)

+ conclusion: let's stick to our dialog, and promote improvements in it for 
the GSoC

* GSoC

+ https://wiki.documentfoundation.org/Development/GSoC/Ideas
+ needs to be filed in until the next Tue
+ Heiko will add the ideas there (/done)
/done Area Fill, Table Styles, AutText, Bibliography
+ Samuel added Notebookbar (Jay: good, Heiko: better define 
requirements first)
+ we should file in the tasks that are completed from the design point of 
view
+ Table styles, Customization dialog, Sidebar, ...
+ design session stuff : table of contents dialog, symbol dialog, fill 
dialog, print dialog
  
https://drive.google.com/folderview?id=0B6qJrVIa0SAlcFV0Q2lWMmdUcW8&usp=sharing
+ done
+ redesign template manager
  
https://docs.google.com/document/d/1JRPNdeHQpgqiqJv8LW-RHOjtHN8EMX0qK98QBnr10Yg/edit?usp=sharing
  
https://docs.google.com/document/d/1Ri2jznhcQmCtk3cVygEhwN7pi8FkbIVV_OvRQce_n6Y/edit?usp=sharing

+ Jay: add a Styles usability improvements section + list the various 
things to implement to GSoC-next ideas
+ Ahmed, Jay: Brainstorm about some nice / more styles for Calc
  https://redmine.documentfoundation.org/boards/1/topics/493
  [longer term - maybe better to add to the GSoC Styles task?]
+ Jay: Impress also needs more default object styles (only 2 are 
available)

+ concern about the Notebookbar task (Heiko)
+ it is supposed to provide the ground work (Kendy)
+ yet it talks details that were not decided yet (?) (Heiko)
+ propose to move it to a different section, if it is for the ground 
work (Heiko)
+ good idea, will move it to porting / platform (Kendy)

+ potential student akki  joined the the hangout, Stuart explains the 
concept (Stuart)

* Cell borders interopability (Jay)

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

+ would be good add new line styles, so that we can map between Calc and 
Excel 1:1 (Jay)
+ currently the 13 Excel types map to 7 LibreOffice styles (Jay)
  
https://bug-attachments.documentfoundation.org/attachment.cgi?id=121956
+ suggested to add new odf/libreoffice styles, so that we can map 
perfectly (Jay)
+ the interoperability problem comes from us... (Jan-Marek)
+ the solution isn't the most optimal interoperability fix (Jay)
+ loses the information - maps to something that is not true (Jay)
+ at least this improves roundtrip (Jan-Marek)
+ suggest to create a follow-up bugreport (Kendy)
+ Jan-Marek will discuss with Jay (Jan-Marek)

* Draw-related survey (Heiko)

+ published and continued (will close on Friday, 19 February)
  
https://design.blog.documentfoundation.org/2016/02/07/what-do-you-expect-from-draw/
  http://user-weave.com/survey/b0edf831f89d4d23bb3d6b6ba3e574a9?12
+ Results  
  https://drive.google.com/open?id=0ByWdNpQKVjM8bF91TGJCUXlFUk0

+ many participants, over 1200 valid answers

+ intermediate results at 
https://docs.google.com/document/d/1OEnqvhBkBMoULW_1Zeb37UpM3GbZaUynj2reM3Bdq-U/edit
+ textual analysis work in progress at 
https://docs.google.com/spreadsheets/d/1GjpudJOJQUlWh7AHGpB5iAEk086SQ6nkAzkKOXPJL84/edit#gid=0

* Place to share documents - where? (

Re: Firebird doesn't support MSVC 2015

[Stephan Bergmann]

On 03/02/2016 07:25 PM, Alexander Thurgood wrote:

Toolchain problems on OSX with firebird too...currently not building
with firebird enabled in my own master builds, as the build fails each
time when I do.


* "When building LibreOffice on OS X 10.11 you currently need to use at 
least --disable-firebird-sdbc." 
()


* See 
 
"Compilation on OS X 10.11" for why you might need to explicitly 
configure --disable-firebird-sdbc, and why it might be set implicitly 
instead, depending on your master revision.


* See the commit message of 
 
"Allow external/firebird to be built with a custom SHELL under Mac OS X 
10.11" for how to build external/firebird on 10.11 after all ("build 
your own bash and pass it to make with SHELL=...").


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

[Libreoffice-commits] core.git: svgio/inc svgio/Library_svgio.mk svgio/source

[Xisco Fauli]

 svgio/Library_svgio.mk|1 
 svgio/inc/svgio/svgreader/svganode.hxx|   58 +
 svgio/inc/svgio/svgreader/svgtoken.hxx|1 
 svgio/source/svgreader/svganode.cxx   |  109 ++
 svgio/source/svgreader/svgdocumenthandler.cxx |9 ++
 svgio/source/svgreader/svgtoken.cxx   |2 
 6 files changed, 180 insertions(+)

New commits:
commit 57de81580dc3a9c53c43871150109181da1bb646
Author: Xisco Fauli 
Date:   Wed Mar 2 00:45:14 2016 +0100

tdf#98113: SVGIO: Add SvgANode class to handle transport ...

... attribute in anchor elements.

I used Svggnode class a a reference for this.

Change-Id: Id2a58bd913f9984dc91163ca0f333c016aa981f1
Reviewed-on: https://gerrit.libreoffice.org/22822
Tested-by: Jenkins 
Reviewed-by: Xisco Faulí 

diff --git a/svgio/Library_svgio.mk b/svgio/Library_svgio.mk
index bea40eb..3ba1891 100644
--- a/svgio/Library_svgio.mk
+++ b/svgio/Library_svgio.mk
@@ -51,6 +51,7 @@ $(eval $(call gb_Library_add_exception_objects,svgio,\
 svgio/source/svgreader/svgdocumenthandler \
 svgio/source/svgreader/svgellipsenode \
 svgio/source/svgreader/svggnode \
+svgio/source/svgreader/svganode \
 svgio/source/svgreader/svggradientnode \
 svgio/source/svgreader/svggradientstopnode \
 svgio/source/svgreader/svgimagenode \
diff --git a/svgio/inc/svgio/svgreader/svganode.hxx 
b/svgio/inc/svgio/svgreader/svganode.hxx
new file mode 100644
index 000..d58224a
--- /dev/null
+++ b/svgio/inc/svgio/svgreader/svganode.hxx
@@ -0,0 +1,58 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGANODE_HXX
+#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGANODE_HXX
+
+#include 
+#include 
+
+namespace svgio
+{
+namespace svgreader
+{
+class SvgANode : public SvgNode
+{
+private:
+/// use styles
+SvgStyleAttributes  maSvgStyleAttributes;
+
+/// variable scan values, dependent of given XAttributeList
+basegfx::B2DHomMatrix*  mpaTransform;
+
+public:
+SvgANode(
+SvgDocument& rDocument,
+SvgNode* pParent);
+virtual ~SvgANode();
+
+virtual const SvgStyleAttributes* getSvgStyleAttributes() const 
override;
+virtual void parseAttribute(const OUString& rTokenName, SVGToken 
aSVGToken, const OUString& aContent) override;
+virtual void 
decomposeSvgNode(drawinglayer::primitive2d::Primitive2DContainer& rTarget, bool 
bReferenced) const override;
+
+/// transform content
+const basegfx::B2DHomMatrix* getTransform() const { return 
mpaTransform; }
+void setTransform(const basegfx::B2DHomMatrix* pMatrix = nullptr) 
{ if(mpaTransform) delete mpaTransform; mpaTransform = nullptr; if(pMatrix) 
mpaTransform = new basegfx::B2DHomMatrix(*pMatrix); }
+};
+} // end of namespace svgreader
+} // end of namespace svgio
+
+#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGANODE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/inc/svgio/svgreader/svgtoken.hxx 
b/svgio/inc/svgio/svgreader/svgtoken.hxx
index adc6783..112102f 100644
--- a/svgio/inc/svgio/svgreader/svgtoken.hxx
+++ b/svgio/inc/svgio/svgreader/svgtoken.hxx
@@ -127,6 +127,7 @@ namespace svgio
 SVGTokenSvg,
 SVGTokenSymbol,
 SVGTokenUse,
+SVGTokenA,
 
 // shape elements
 SVGTokenCircle,
diff --git a/svgio/source/svgreader/svganode.cxx 
b/svgio/source/svgreader/svganode.cxx
new file mode 100644
index 000..70c53d5
--- /dev/null
+++ b/svgio/source/svgreader/svganode.cxx
@@ -0,0 +1,109 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozill

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

[Takeshi Abe]

 starmath/inc/node.hxx|   10 ---
 starmath/source/node.cxx |   99 ---
 starmath/source/view.cxx |9 ---
 starmath/workben/smath-dump-watch.sh |   33 ---
 4 files changed, 151 deletions(-)

New commits:
commit ad82b7bac267f1680ba869f5f0d46202d09cbeea
Author: Takeshi Abe 
Date:   Mon Feb 22 13:44:31 2016 +0900

starmath: Drop ENABLE_DEBUG_DUMPASDOT feature

The feature for debugging seems unused so long that defining
ENABLE_DEBUG_DUMPASDOT breaks the build but no one complains.
So let's ditch it.

Change-Id: I0b472cd1acbcfd0c2550c3bd36661c91bc2e2986
Reviewed-on: https://gerrit.libreoffice.org/22608
Tested-by: Jenkins 
Reviewed-by: Takeshi Abe 

diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index bd30531..b4e5b1d 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -186,16 +186,6 @@ public:
 bool IsSelected() const {return mbIsSelected;}
 void SetSelected(bool Selected = true) {mbIsSelected = Selected;}
 
-#ifdef DEBUG_ENABLE_DUMPASDOT
-/** The tree as dot graph for graphviz, usable for debugging
- * Convert the output to a image using $ dot graph.gv -Tpng > graph.png
- */
-inline void DumpAsDot(std::ostream &out, OUString* label = NULL) const{
-int id = 0;
-DumpAsDot(out, label, -1, id, -1);
-}
-#endif /* DEBUG_ENABLE_DUMPASDOT */
-
 /** Get the parent node of this node */
 SmStructureNode* GetParent(){ return mpParentNode; }
 const SmStructureNode* GetParent() const { return mpParentNode; }
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 77a825a..6a9c07d 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -413,105 +413,6 @@ const SmNode * 
SmNode::FindNodeWithAccessibleIndex(sal_Int32 nAccIdx) const
 return pResult;
 }
 
-#ifdef DEBUG_ENABLE_DUMPASDOT
-void SmNode::DumpAsDot(std::ostream &out, OUString* label, int number, int& 
id, int parent) const
-{
-//If this is the root start the file
-if(number == -1){
-out<<"digraph {"< n"< n"GetText(), 
RTL_TEXTENCODING_UTF8).getStr();
-break;
-case NBLANK:   out<<"SmBlankNode"; break;
-case NERROR:   out<<"SmErrorNode"; break;
-case NLINE:out<<"SmLineNode"; break;
-case NEXPRESSION:  out<<"SmExpressionNode"; break;
-case NPOLYLINE:out<<"SmPolyLineNode"; break;
-case NROOT:out<<"SmRootNode"; break;
-case NROOTSYMBOL:  out<<"SmRootSymbolNode"; break;
-case NRECTANGLE:   out<<"SmRectangleNode"; break;
-case NVERTICAL_BRACE:  out<<"SmVerticalBraceNode"; break;
-case NMATHIDENT:   out<<"SmMathIdentifierNode"; break;
-case NINTDYNSYMBOL:out<<"SmDynIntegralSymbolNode"; break;
-case NINTDYN:out<<"SmDynIntegralNode"; break;
-default:
-out<<"Unknown Node";
-}
-out<<"\"";
-if(IsSelected())
-out<<", style=dashed";
-out<<"];"GetFormulaTree();
-std::fstream file("/tmp/smath-dump.gv", std::fstream::out);
-OUString label(pViewShell->GetDoc()->GetText());
-pTree->DumpAsDot(file, &label);
-file.close();
-}
-#endif /* DEBUG_ENABLE_DUMPASDOT */
 }break;
 case KEY_DELETE:
 {
diff --git a/starmath/workben/smath-dump-watch.sh 
b/starmath/workben/smath-dump-watch.sh
deleted file mode 100755
index af377d7..000
--- a/starmath/workben/smath-dump-watch.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-#Watches for formula dumps by starmath and renders them
-# If starmath is compiled with the macro DEBUG_ENABLE_DUMPASDOT defined.
-# shift+enter, in the visual formula editor will make starmath dump a
-# graphviz graph of the formula tree structure. This is very useful when
-# debugging. The formula is dumped to /tmp/smath-dump.gv-
-# This script monitors this file and renders the graph when written,
-# after which the formula is displayed using feh.
-#
-# Usage: Let this script run in the background, e.g. start it in a terminal
-# (and don't close the terminal). Then compile starma

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

[Miklos Vajna]

 editeng/source/rtf/svxrtf.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 0ba96ffcd8ee2296b5a30451a9310b5b097df514
Author: Miklos Vajna 
Date:   Thu Mar 3 09:44:24 2016 +0100

editeng: fix -Werror=unused-but-set-variable

Change-Id: I14364bc833c97dbb5dfe323c65282f69ba7e393f

diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index be4305b..f3e564e 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -659,7 +659,6 @@ void SvxRTFParser::ReadInfo()
 DBG_ASSERT(m_xDocProps.is(),
 "SvxRTFParser::ReadInfo: no DocumentProperties");
 OUString sStr, sComment;
-long nVersNo = 0;
 
 while( _nOpenBrakets && IsParserWorking() )
 {
@@ -734,7 +733,6 @@ void SvxRTFParser::ReadInfo()
 break;
 
 case RTF_VERN:
-nVersNo = nTokenValue;
 break;
 
 case RTF_EDMINS:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 l10ntools/inc/gConv.hxx|2 +-
 l10ntools/inc/gConvDB.hxx  |4 ++--
 l10ntools/inc/gConvPo.hxx  |   10 +-
 l10ntools/inc/gConvProp.hxx|4 ++--
 l10ntools/inc/gConvSrc.hxx |6 +++---
 l10ntools/inc/gConvTree.hxx|4 ++--
 l10ntools/inc/gConvUlf.hxx |4 ++--
 l10ntools/inc/gConvXcs.hxx |4 ++--
 l10ntools/inc/gConvXcu.hxx |4 ++--
 l10ntools/inc/gConvXhp.hxx |4 ++--
 l10ntools/inc/gConvXrm.hxx |4 ++--
 l10ntools/source/gConv.cxx |   10 +-
 l10ntools/source/gConvDB.cxx   |2 +-
 l10ntools/source/gConvProp.cxx |4 ++--
 l10ntools/source/gConvSrc.cxx  |8 
 l10ntools/source/gConvTree.cxx |4 ++--
 l10ntools/source/gConvUlf.cxx  |2 +-
 l10ntools/source/gConvXcs.cxx  |4 ++--
 l10ntools/source/gConvXcu.cxx  |2 +-
 l10ntools/source/gConvXhp.cxx  |8 
 l10ntools/source/gConvXrm.cxx  |2 +-
 l10ntools/source/gL10nMem.cxx  |   10 +-
 22 files changed, 53 insertions(+), 53 deletions(-)

New commits:
commit a39fb49535bbcdecd0a605250f82335aee690937
Author: Stephan Bergmann 
Date:   Thu Mar 3 09:43:06 2016 +0100

various loplugin warnings

Change-Id: I9078ba18d8897a89a472fe75385542dac0c6bf78

diff --git a/l10ntools/inc/gConv.hxx b/l10ntools/inc/gConv.hxx
index 5b79e4a..7287a49 100644
--- a/l10ntools/inc/gConv.hxx
+++ b/l10ntools/inc/gConv.hxx
@@ -76,7 +76,7 @@ class convert_gen_impl
 // utility functions for converters
 void lexRead(char *sBuf, int *nResult, int nMax_size);
 void writeSourceFile(const std::string& line);
-std::string& copySource (char *yyText, bool bDoClear = true);
+std::string& copySource (char const *yyText, bool bDoClear = true);
 
   protected:
 std::string  msSourceBuffer, msCopyText;
diff --git a/l10ntools/inc/gConvDB.hxx b/l10ntools/inc/gConvDB.hxx
index 54dba4e..0cbb746 100644
--- a/l10ntools/inc/gConvDB.hxx
+++ b/l10ntools/inc/gConvDB.hxx
@@ -36,14 +36,14 @@ class convert_db : public convert_gen_impl
 {
   public:
 convert_db(l10nMem& crMemory);
-~convert_db();
+virtual ~convert_db();
 
   private:
 static const int NUMFIELD = 16;
 std::string  msFields[NUMFIELD];
 int  miSize;
 
-void execute();
+void execute() override;
 bool collectLine();
 };
 #endif
diff --git a/l10ntools/inc/gConvPo.hxx b/l10ntools/inc/gConvPo.hxx
index 7d2d8f2..b467064 100644
--- a/l10ntools/inc/gConvPo.hxx
+++ b/l10ntools/inc/gConvPo.hxx
@@ -40,7 +40,7 @@ class convert_po : public convert_gen_impl
 
 
 convert_po(l10nMem& crMemory);
-~convert_po();
+virtual ~convert_po();
 
 void startLook ();
 void setValue  (char *syyText, int iLineCnt);
@@ -57,15 +57,15 @@ class convert_po : public convert_gen_impl
 bool mbFuzzy;
 std::filebuf outBuffer;
 
-void execute();
+void execute() override;
 
 void startSave(const std::string& sLanguage,
-   const std::string& sFile);
+   const std::string& sFile) override;
 void save(const std::string& sFileName,
   const std::string& sKey,
   const std::string& sENUStext,
   const std::string& sText,
-  bool   bFuzzy);
-void endSave();
+  bool   bFuzzy) override;
+void endSave() override;
 };
 #endif
diff --git a/l10ntools/inc/gConvProp.hxx b/l10ntools/inc/gConvProp.hxx
index ce2ee38..8b1c281 100644
--- a/l10ntools/inc/gConvProp.hxx
+++ b/l10ntools/inc/gConvProp.hxx
@@ -36,10 +36,10 @@ class convert_prop : public convert_gen_impl
 {
   public:
 convert_prop(l10nMem& crMemory);
-~convert_prop();
+virtual ~convert_prop();
 
 
   private:
-void execute();
+void execute() override;
 };
 #endif
diff --git a/l10ntools/inc/gConvSrc.hxx b/l10ntools/inc/gConvSrc.hxx
index e8de370..e9a2139 100644
--- a/l10ntools/inc/gConvSrc.hxx
+++ b/l10ntools/inc/gConvSrc.hxx
@@ -37,7 +37,7 @@ class convert_src : public convert_gen_impl
 bool mbExpectValue;
 
 convert_src(l10nMem& crMemory);
-~convert_src();
+virtual ~convert_src();
 
 void setValue  (char *syyText, char *sbuildValue);
 void setLang   (char *syyText, bool bEnUs);
@@ -47,7 +47,7 @@ class convert_src : public convert_gen_impl
 void setCmd(char *syyText);
 void setMacro  (char *syyText);
 void setList   (char *syyText);
-void setListItem   (char *syyText, bool bIsStart);
+void setListItem   (char const *syyText, bool bIsStart);
 void setNL (char *syyText, bool bMacro);
 void startBlock(char *syyText);
 void stopBlock (char *syyText);
@@ -67,7 +67,7 @@ class convert_src : public convert_gen_impl
 bool mbInListItem;
 int  miListCount;
 int  miMacroLevel;
-void execute();
+void execute() override;
 void trim(std::strin

[Libreoffice-commits] core.git: l10ntools/Module_l10ntools.mk

[Jan Iversen]

 l10ntools/Module_l10ntools.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit fba6f6fb514ee84bd42f765d11a5627590d04cfd
Author: Jan Iversen 
Date:   Thu Mar 3 09:34:47 2016 +0100

Removed call of genLang makefile

genLang produces errors on the clang tinderbox, due to the way
it uses a singleton.

Removed genLang from Module in order to satisfy tinderbox, while
fixing the problem.

Change-Id: I03a6175de8340f1c0ad5953b32659106e10d75f5

diff --git a/l10ntools/Module_l10ntools.mk b/l10ntools/Module_l10ntools.mk
index 0c2e18e..d391ed7 100644
--- a/l10ntools/Module_l10ntools.mk
+++ b/l10ntools/Module_l10ntools.mk
@@ -10,7 +10,6 @@
 $(eval $(call gb_Module_Module,l10ntools))
 
 $(eval $(call gb_Module_add_targets_for_build,l10ntools,\
-Executable_genlang \
 Executable_helpex \
 Executable_idxdict \
 Executable_ulfex \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 writerfilter/source/rtftok/rtfdocumentimpl.cxx |  134 -
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |   16 +-
 2 files changed, 75 insertions(+), 75 deletions(-)

New commits:
commit cad7f8ddd91ab6fa6711f442c14ae02f5164ef29
Author: Miklos Vajna 
Date:   Thu Mar 3 09:34:03 2016 +0100

writerfilter: prefix members of RTFFrame

Change-Id: I2cfc356a4bc570484b9fd1566e338aa4081c6f24

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 46852da..187eb5a 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1129,10 +1129,10 @@ RTFError RTFDocumentImpl::resolveChars(char ch)
 
 bool RTFFrame::inFrame()
 {
-return nW > 0
-   || nH > 0
-   || nX > 0
-   || nY > 0;
+return m_nW > 0
+   || m_nH > 0
+   || m_nX > 0
+   || m_nY > 0;
 }
 
 void RTFDocumentImpl::singleChar(sal_uInt8 nValue, bool bRunProps)
@@ -4547,7 +4547,7 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword 
nKeyword, int nParam)
 }
 break;
 case RTF_FLYANCHOR:
-m_aStates.top().aFrame.nAnchorType = nParam;
+m_aStates.top().aFrame.m_nAnchorType = nParam;
 break;
 case RTF_WMETAFILE:
 m_aStates.top().aPicture.eWMetafile = nParam;
@@ -6390,18 +6390,18 @@ RTFDrawingObject::RTFDrawingObject()
 
 RTFFrame::RTFFrame(RTFParserState* pParserState)
 : m_pParserState(pParserState),
-  nX(0),
-  nY(0),
-  nW(0),
-  nH(0),
-  nHoriPadding(0),
-  nVertPadding(0),
-  nHoriAlign(0),
-  nHoriAnchor(0),
-  nVertAlign(0),
-  nVertAnchor(0),
-  nHRule(NS_ooxml::LN_Value_doc_ST_HeightRule_auto),
-  nAnchorType(0)
+  m_nX(0),
+  m_nY(0),
+  m_nW(0),
+  m_nH(0),
+  m_nHoriPadding(0),
+  m_nVertPadding(0),
+  m_nHoriAlign(0),
+  m_nHoriAnchor(0),
+  m_nVertAlign(0),
+  m_nVertAnchor(0),
+  m_nHRule(NS_ooxml::LN_Value_doc_ST_HeightRule_auto),
+  m_nAnchorType(0)
 {
 }
 
@@ -6415,37 +6415,37 @@ void RTFFrame::setSprm(Id nId, Id nValue)
 switch (nId)
 {
 case NS_ooxml::LN_CT_FramePr_w:
-nW = nValue;
+m_nW = nValue;
 break;
 case NS_ooxml::LN_CT_FramePr_h:
-nH = nValue;
+m_nH = nValue;
 break;
 case NS_ooxml::LN_CT_FramePr_x:
-nX = nValue;
+m_nX = nValue;
 break;
 case NS_ooxml::LN_CT_FramePr_y:
-nY = nValue;
+m_nY = nValue;
 break;
 case NS_ooxml::LN_CT_FramePr_hSpace:
-nHoriPadding = nValue;
+m_nHoriPadding = nValue;
 break;
 case NS_ooxml::LN_CT_FramePr_vSpace:
-nVertPadding = nValue;
+m_nVertPadding = nValue;
 break;
 case NS_ooxml::LN_CT_FramePr_xAlign:
-nHoriAlign = nValue;
+m_nHoriAlign = nValue;
 break;
 case NS_ooxml::LN_CT_FramePr_hAnchor:
-nHoriAnchor = nValue;
+m_nHoriAnchor = nValue;
 break;
 case NS_ooxml::LN_CT_FramePr_yAlign:
-nVertAlign = nValue;
+m_nVertAlign = nValue;
 break;
 case NS_ooxml::LN_CT_FramePr_vAnchor:
-nVertAnchor = nValue;
+m_nVertAnchor = nValue;
 break;
 case NS_ooxml::LN_CT_FramePr_wrap:
-oWrap = nValue;
+m_oWrap = nValue;
 break;
 default:
 break;
@@ -6482,66 +6482,66 @@ RTFSprms RTFFrame::getSprms()
 switch (nId)
 {
 case NS_ooxml::LN_CT_FramePr_x:
-if (nX != 0)
-pValue = std::make_shared(nX);
+if (m_nX != 0)
+pValue = std::make_shared(m_nX);
 break;
 case NS_ooxml::LN_CT_FramePr_y:
-if (nY != 0)
-pValue = std::make_shared(nY);
+if (m_nY != 0)
+pValue = std::make_shared(m_nY);
 break;
 case NS_ooxml::LN_CT_FramePr_h:
-if (nH != 0)
+if (m_nH != 0)
 {
-if (nHRule == NS_ooxml::LN_Value_doc_ST_HeightRule_exact)
-pValue = std::make_shared(-nH); // The negative 
value just sets nHRule
+if (m_nHRule == NS_ooxml::LN_Value_doc_ST_HeightRule_exact)
+pValue = std::make_shared(-m_nH); // The 
negative value just sets nHRule
 else
-pValue = std::make_shared(nH);
+pValue = std::make_shared(m_nH);
 }
 break;
 case NS_ooxml::LN_CT_FramePr_w:
-if (nW != 0)
-pValue = std::make_shared(nW);
+if (m_nW != 0)
+pValue = std::make_shared(m_nW);
 break;
 case NS_ooxml::LN_CT_FramePr_hSpace:
-if (nHoriPadding != 0)
-pValue = std::make_shared(nHoriPadding);
+if (m_nHoriPadding != 0)
+pValue