Re: Merging feature/commonsallayout branch

[Milos Sramek]

On 2016-10-18 18:36, Khaled Hosny wrote:
> On Tue, Oct 18, 2016 at 09:06:42AM +0200, Milos Sramek wrote:
>> Dear Khaled,
>>
>> do you think that extensive comparison of rendering of numerous
>> documents with and without the new layout engine makes sense?
>> If yes, I can run my tests in such a way to see if there are any
>> differences.
> This would be extremely helpful, and more so if it can run on Windows or
> Mac.
I can run the tests on Linux and Windows. I do not have Mac, but I think
that there should not be a problem with that.
On windows or mac one just converts/prints files by means of a script -
they are then compared on a system with running Python - in my case a
Linux machine.

I run Windows in a virtual machine, which has access to the directory,
where all data and scripts reside. So I even do not have to copy files.

I've checked the web and see that it is possible to install MAC on
virtual box:
https://techsviewer.com/how-to-install-mac-os-x-el-capitan-on-pc-on-virtualbox/
I'll try it

best
milos


>
>> My test documents use latin script except for a few ones in Chinese. So,
>> if you happen to have sume documents in Arabic I can add them to my test
>> set.
> I’ve a random collection of documents somewhere, I’ll clean it up and
> send it to you.
>
> Regards,
> Khaled
>
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice


-- 
email & jabber: sramek.mi...@gmail.com

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

[Libreoffice-commits] core.git: Branch 'feature/screenshotannotation' - cui/source

[Katarina Behrens]

 cui/source/dialogs/screenshotannotationdlg.cxx |   43 -
 1 file changed, 42 insertions(+), 1 deletion(-)

New commits:
commit 1a781466c679874d01c7a6badc7f941dfde354d9
Author: Katarina Behrens 
Date:   Tue Oct 18 19:29:00 2016 +0200

screenshot annotation: Display markup for embedding the image

Change-Id: I06fd744fabd66ee02123790718a899d9e0dcb6b7

diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx 
b/cui/source/dialogs/screenshotannotationdlg.cxx
index e2a9b4c..d44806b 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -27,6 +27,8 @@
 #include 
 #include 
 #include 
+
+#include 
 #include 
 #include 
 #include 
@@ -40,6 +42,44 @@
 
 using namespace com::sun::star;
 
+namespace
+{
+OUString lcl_genRandom( const OUString &rId )
+{
+//FIXME: plus timestamp
+unsigned int nRand = comphelper::rng::uniform_uint_distribution(0, 
0x);
+return OUString( rId + OUString::number( nRand ) );
+}
+
+
+OUString lcl_AltDescr()
+{
+OUString aRet = OUString("") +
+OUString(" ") + //FIXME real dialog title or something
+OUString("");
+return aRet;
+}
+
+OUString lcl_Image( const OUString& rScreenshotId )
+{
+OUString aRet = OUString("") + //FIXME width + height
+lcl_AltDescr() +
+OUString("");
+return aRet;
+}
+
+OUString lcl_ParagraphWithImage( const OUString& rScreenshotId )
+{
+OUString aRet = OUString("") +
+lcl_Image( rScreenshotId ) +
+OUString("");
+return aRet;
+}
+}
+
 class ControlDataEntry
 {
 public:
@@ -205,7 +245,8 @@ ScreenshotAnnotationDlg_Impl::ScreenshotAnnotationDlg_Impl(
 // copying content to clipboard is allowed
 if (mpText)
 {
-mpText->SetText("The quick brown fox jumps over the lazy dog :)");
+OUString aHelpId = OStringToOUString( mrParentDialog.GetHelpId(), 
RTL_TEXTENCODING_UTF8 );
+mpText->SetText( lcl_ParagraphWithImage( aHelpId) );
 mpText->SetReadOnly(true);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 formula/source/ui/dlg/ControlHelper.hxx   |8 
 formula/source/ui/dlg/funcutl.cxx |   36 ++
 formula/source/ui/dlg/parawin.cxx |   30 ++-
 formula/source/ui/dlg/parawin.hxx |4 --
 fpicker/source/office/iodlgimp.cxx|8 
 fpicker/source/office/iodlgimp.hxx|3 -
 framework/inc/helper/ocomponentaccess.hxx |   24 
 framework/inc/helper/oframes.hxx  |2 -
 framework/inc/services/desktop.hxx|   11 -
 framework/inc/uielement/toolbarsmenucontroller.hxx|1 
 framework/source/helper/ocomponentaccess.cxx  |   18 -
 framework/source/helper/oframes.cxx   |   17 +---
 framework/source/services/desktop.cxx |   16 +---
 framework/source/uielement/toolbarsmenucontroller.cxx |2 -
 14 files changed, 18 insertions(+), 162 deletions(-)

New commits:
commit 423936ffacb72f85b37961e4cd585fe2719799b7
Author: Noel Grandin 
Date:   Tue Oct 18 14:42:58 2016 +0200

loplugin:expandablemethodds in formula..framework

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

diff --git a/formula/source/ui/dlg/ControlHelper.hxx 
b/formula/source/ui/dlg/ControlHelper.hxx
index 4fc48cc..00da7a7 100644
--- a/formula/source/ui/dlg/ControlHelper.hxx
+++ b/formula/source/ui/dlg/ControlHelper.hxx
@@ -39,7 +39,6 @@ private:
 protected:
 
 virtual boolPreNotify( NotifyEvent& rNEvt ) override;
-voidSelectionChanged();
 virtual voidResize() override;
 virtual voidGetFocus() override;
 
@@ -101,13 +100,6 @@ private:
 DECL_LINK( EdFocusHdl, Control&, void );
 DECL_LINK( EdModifyHdl, Edit&, void );
 
-protected:
-
-voidFxClick();
-voidFxFocus();
-voidEdFocus();
-voidEdModify();
-
 public:
 
 ArgInput();
diff --git a/formula/source/ui/dlg/funcutl.cxx 
b/formula/source/ui/dlg/funcutl.cxx
index f1f014c..9e9777a 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -260,48 +260,28 @@ void ArgInput::UpdateAccessibleNames()
 pRefBtn->SetAccessibleName(aName);
 }
 
-void ArgInput::FxClick()
-{
-aFxClickLink.Call(*this);
-}
-
-void ArgInput::FxFocus()
-{
-aFxFocusLink.Call(*this);
-}
-
-void ArgInput::EdFocus()
-{
-aEdFocusLink.Call(*this);
-}
-
-void ArgInput::EdModify()
-{
-aEdModifyLink.Call(*this);
-}
-
 IMPL_LINK( ArgInput, FxBtnClickHdl, Button*, pBtn, void )
 {
 if(pBtn == pBtnFx)
-FxClick();
+aFxClickLink.Call(*this);
 }
 
 IMPL_LINK( ArgInput, FxBtnFocusHdl, Control&, rControl, void )
 {
 if(&rControl == pBtnFx)
-FxFocus();
+aFxFocusLink.Call(*this);
 }
 
 IMPL_LINK( ArgInput, EdFocusHdl, Control&, rControl, void )
 {
 if(&rControl == pEdArg)
-EdFocus();
+aEdFocusLink.Call(*this);
 }
 
 IMPL_LINK( ArgInput, EdModifyHdl, Edit&, rEdit, void )
 {
 if(&rEdit == pEdArg)
-EdModify();
+aEdModifyLink.Call(*this);
 }
 
 // class EditBox
@@ -341,12 +321,6 @@ void EditBox::dispose()
 Control::dispose();
 }
 
-// When the selection is changed this function will be called
-void EditBox::SelectionChanged()
-{
-aSelChangedLink.Call(*this);
-}
-
 // When the size is changed, MultiLineEdit must be adapted..
 void EditBox::Resize()
 {
@@ -411,7 +385,7 @@ IMPL_LINK_NOARG(EditBox, ChangedHdl, void*, void)
 
 if(aNewSel.Min()!=aOldSel.Min() || aNewSel.Max()!=aOldSel.Max())
 {
-SelectionChanged();
+aSelChangedLink.Call(*this);
 aOldSel=aNewSel;
 }
 }
diff --git a/formula/source/ui/dlg/parawin.cxx 
b/formula/source/ui/dlg/parawin.cxx
index 51a87c1..a6d5f41 100644
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/formula/source/ui/dlg/parawin.cxx
@@ -223,7 +223,7 @@ void ParaWin::UpdateArgInput( sal_uInt16 nOffset, 
sal_uInt16 i )
 SetArgName( i, pFuncDesc->getParameterName(nRealArg) );
 }
 if (nArgClear();
-}
-
-
 void SvtExpFileDlg_Impl::SetCurFilter( SvtFileDialogFilter_Impl* pFilter, 
const OUString& rDisplayName )
 {
 DBG_ASSERT( pFilter, "SvtExpFileDlg_Impl::SetCurFilter: invalid filter!" );
@@ -300,7 +294,7 @@ void SvtExpFileDlg_Impl::InsertFilterListEntry( const 
SvtFileDialogFilter_Impl*
 void SvtExpFileDlg_Impl::InitFilterList( )
 {
 // clear the current list
-ClearFilterList( );
+_pLbFilter->Clear();
 
 // reinit it
 sal_uInt16 nPos = m_aFilter.size();
diff --git a/fpicker/source/office/iodlgimp.hxx 
b/fpicker/source/office/iodlgimp.hxx
index 7781a2e..fe49631 100644
--- a/fpicker/source/office/iodlgimp.hxx
+++ b/fpicker/source/office/iodlgimp.hxx
@@ -192,9 +192,8 @@ public:
 inline  voidSetFilterListSelectHdl(

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

[Miklos Vajna]

 starmath/source/unofilter.cxx |   22 +-
 1 file changed, 9 insertions(+), 13 deletions(-)

New commits:
commit 10cfa2abeec568d72fc1f6c110316e3be5336132
Author: Miklos Vajna 
Date:   Wed Oct 19 08:33:05 2016 +0200

starmath: clean up redundant virtual keywords in unofilter

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

diff --git a/starmath/source/unofilter.cxx b/starmath/source/unofilter.cxx
index 8caf72e..95fc3e8 100644
--- a/starmath/source/unofilter.cxx
+++ b/starmath/source/unofilter.cxx
@@ -30,28 +30,24 @@ class MathTypeFilter : public cppu::WeakImplHelper
 
 public:
 MathTypeFilter();
-virtual ~MathTypeFilter() override;
+~MathTypeFilter() override;
 
 // XFilter
-virtual sal_Bool SAL_CALL filter(const 
uno::Sequence& rDescriptor) throw (uno::RuntimeException, 
std::exception) override;
-virtual void SAL_CALL cancel() throw (uno::RuntimeException, 
std::exception) override;
+sal_Bool SAL_CALL filter(const uno::Sequence& 
rDescriptor) throw (uno::RuntimeException, std::exception) override;
+void SAL_CALL cancel() throw (uno::RuntimeException, std::exception) 
override;
 
 // XImporter
-virtual void SAL_CALL setTargetDocument(const 
uno::Reference& xDoc) throw (lang::IllegalArgumentException, 
uno::RuntimeException, std::exception) override;
+void SAL_CALL setTargetDocument(const uno::Reference& 
xDoc) throw (lang::IllegalArgumentException, uno::RuntimeException, 
std::exception) override;
 
 // XServiceInfo
-virtual OUString SAL_CALL getImplementationName() throw 
(uno::RuntimeException, std::exception) override;
-virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) 
throw (uno::RuntimeException, std::exception) override;
-virtual uno::Sequence SAL_CALL getSupportedServiceNames() throw 
(uno::RuntimeException, std::exception) override;
+OUString SAL_CALL getImplementationName() throw (uno::RuntimeException, 
std::exception) override;
+sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw 
(uno::RuntimeException, std::exception) override;
+uno::Sequence SAL_CALL getSupportedServiceNames() throw 
(uno::RuntimeException, std::exception) override;
 };
 
-MathTypeFilter::MathTypeFilter()
-{
-}
+MathTypeFilter::MathTypeFilter() = default;
 
-MathTypeFilter::~MathTypeFilter()
-{
-}
+MathTypeFilter::~MathTypeFilter() = default;
 
 sal_Bool MathTypeFilter::filter(const uno::Sequence& 
rDescriptor) throw(uno::RuntimeException, std::exception)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 sd/source/ui/view/sdview.cxx |   35 ++-
 1 file changed, 18 insertions(+), 17 deletions(-)

New commits:
commit f1693c5387833a6fc6ad87dedb3ebb5d3d8de852
Author: Noel Grandin 
Date:   Tue Oct 18 16:25:23 2016 +0200

use early returns in View::OnEndPasteOrDrop

Change-Id: I37afbd64c4f4887aa6a0262ffc362ec8714cbf91

diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index a4ed147..014a67d 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -1207,24 +1207,25 @@ void View::OnEndPasteOrDrop( PasteOrDropInfos* pInfo )
 /* Style Sheet handling */
 SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( GetTextEditObject() );
 SdrOutliner* pOutliner = GetTextEditOutliner();
-if( pOutliner && pTextObj && pTextObj->GetPage() )
+if( !pOutliner || !pTextObj || !pTextObj->GetPage() )
+return;
+
+SdPage* pPage = static_cast< SdPage* >( pTextObj->GetPage() );
+const PresObjKind eKind = pPage->GetPresObjKind(pTextObj);
+
+// outline kinds are taken care of in 
Outliner::ImplSetLevelDependendStyleSheet
+if( eKind == PRESOBJ_OUTLINE )
+return;
+
+SfxStyleSheet* pStyleSheet = nullptr;
+if( eKind != PRESOBJ_NONE )
+pStyleSheet = pPage->GetStyleSheetForPresObj(eKind);
+else
+ pStyleSheet = pTextObj->GetStyleSheet();
+// just put the object style on each new paragraph
+for ( sal_Int32 nPara = pInfo->nStartPara; nPara <= pInfo->nEndPara; 
nPara++ )
 {
-SdPage* pPage = static_cast< SdPage* >( pTextObj->GetPage() );
-const PresObjKind eKind = pPage->GetPresObjKind(pTextObj);
-// outline kinds are taken care of in 
Outliner::ImplSetLevelDependendStyleSheet
-if( eKind != PRESOBJ_OUTLINE )
-{
-SfxStyleSheet* pStyleSheet = nullptr;
-if( eKind != PRESOBJ_NONE )
-pStyleSheet = pPage->GetStyleSheetForPresObj(eKind);
-else
-pStyleSheet = pTextObj->GetStyleSheet();
-// just put the object style on each new paragraph
-for ( sal_Int32 nPara = pInfo->nStartPara; nPara <= 
pInfo->nEndPara; nPara++ )
-{
-pOutliner->SetStyleSheet( nPara, pStyleSheet );
-}
-}
+pOutliner->SetStyleSheet( nPara, pStyleSheet );
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: translations

[Andras Timar]

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

New commits:
commit 9e54e0708df58b054996d6f6c66852a50d25e742
Author: Andras Timar 
Date:   Wed Oct 19 10:05:24 2016 +0200

Updated core
Project: translations  35a31ff71279807598c4ee4cd84d831e2c3270dd

Updated Slovenian translation

Change-Id: I5b14dba08f409bbedaca6100be56b1374a5328cf

diff --git a/translations b/translations
index 4a45b12..35a31ff 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 4a45b12af9d0be41780e5a29b73e8e595f3f430f
+Subproject commit 35a31ff71279807598c4ee4cd84d831e2c3270dd
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ce/a03b42ca0e2cd4d93c01879dec388295b8f771

[Caolán McNamara]

 ce/a03b42ca0e2cd4d93c01879dec388295b8f771 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b6c615af6bb07ef786e6fccdf169d74687bfd9f6
Author: Caolán McNamara 
Date:   Wed Oct 19 09:05:49 2016 +0100

Notes added by 'git notes add'

diff --git a/ce/a03b42ca0e2cd4d93c01879dec388295b8f771 
b/ce/a03b42ca0e2cd4d93c01879dec388295b8f771
new file mode 100644
index 000..c9b8239
--- /dev/null
+++ b/ce/a03b42ca0e2cd4d93c01879dec388295b8f771
@@ -0,0 +1 @@
+prefer: 15704e6319c1194944df6c25a9d1ce413f309610
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: source/sl

[Andras Timar]

 source/sl/avmedia/source/framework.po  |   24 
 source/sl/basctl/source/basicide.po|   21 
 source/sl/chart2/source/controller/dialogs.po  |   18 
 source/sl/chart2/uiconfig/ui.po|  153 
 source/sl/cui/source/customize.po  |   47 
 source/sl/cui/source/dialogs.po|   15 
 source/sl/cui/source/options.po|   75 
 source/sl/cui/source/tabpages.po   |  591 -
 source/sl/cui/uiconfig/ui.po   | 2106 ++--
 source/sl/editeng/source/accessibility.po  |   10 
 source/sl/extensions/source/update/check.po|4 
 source/sl/extras/source/autocorr/emoji.po  |   52 
 source/sl/filter/source/config/fragments/filters.po|   47 
 source/sl/filter/source/config/fragments/internalgraphicfilters.po |   24 
 source/sl/filter/uiconfig/ui.po|   17 
 source/sl/forms/source/resource.po |   14 
 source/sl/formula/source/core/resource.po  |   26 
 source/sl/formula/uiconfig/ui.po   |   15 
 source/sl/fpicker/uiconfig/ui.po   |   47 
 source/sl/framework/source/classes.po  |4 
 source/sl/helpcontent2/source/auxiliary.po |   10 
 source/sl/helpcontent2/source/text/sbasic/shared.po|  910 --
 source/sl/helpcontent2/source/text/scalc.po|   10 
 source/sl/helpcontent2/source/text/scalc/00.po |  145 
 source/sl/helpcontent2/source/text/scalc/01.po | 1959 +---
 source/sl/helpcontent2/source/text/scalc/04.po |   12 
 source/sl/helpcontent2/source/text/scalc/05.po |5 
 source/sl/helpcontent2/source/text/scalc/guide.po  |   47 
 source/sl/helpcontent2/source/text/schart/01.po|  424 
 source/sl/helpcontent2/source/text/sdraw.po|8 
 source/sl/helpcontent2/source/text/sdraw/04.po |6 
 source/sl/helpcontent2/source/text/sdraw/guide.po  |4 
 source/sl/helpcontent2/source/text/shared.po   |   12 
 source/sl/helpcontent2/source/text/shared/00.po|  559 -
 source/sl/helpcontent2/source/text/shared/01.po| 2927 
+++---
 source/sl/helpcontent2/source/text/shared/02.po|   94 
 source/sl/helpcontent2/source/text/shared/05.po|9 
 source/sl/helpcontent2/source/text/shared/autopi.po|  910 --
 source/sl/helpcontent2/source/text/shared/explorer/database.po |   75 
 source/sl/helpcontent2/source/text/shared/guide.po | 1050 ++
 source/sl/helpcontent2/source/text/shared/menu.po  |   50 
 source/sl/helpcontent2/source/text/shared/optionen.po  |  752 -
 source/sl/helpcontent2/source/text/simpress/00.po  |   65 
 source/sl/helpcontent2/source/text/simpress/01.po  |   95 
 source/sl/helpcontent2/source/text/simpress/02.po  |   29 
 source/sl/helpcontent2/source/text/simpress/guide.po   |   44 
 source/sl/helpcontent2/source/text/smath/00.po |   29 
 source/sl/helpcontent2/source/text/smath/01.po | 1004 +-
 source/sl/helpcontent2/source/text/swriter.po  |  362 
 source/sl/helpcontent2/source/text/swriter/00.po   |  327 
 source/sl/helpcontent2/source/text/swriter/01.po   |  608 -
 source/sl/helpcontent2/source/text/swriter/02.po   |   58 
 source/sl/helpcontent2/source/text/swriter/04.po   |   14 
 source/sl/helpcontent2/source/text/swriter/guide.po|  299 
 source/sl/helpcontent2/source/text/swriter/menu.po |   22 
 source/sl/instsetoo_native/inc_openoffice/windows/msi_languages.po |   63 
 source/sl/officecfg/registry/data/org/openoffice/Office.po |   19 
 source/sl/officecfg/registry/data/org/openoffice/Office/UI.po  | 2299 -
 source/sl/reportdesign/source/ui/dlg.po|   54 
 source/sl/reportdesign/source/ui/report.po |   10 
 source/sl/reportdesign/uiconfig/dbreport/ui.po |   62 
 source/sl/sc/source/ui/StatisticsDialogs.po|6 
 source/sl/sc/source/ui/navipi.po   |  128 
 source/sl/sc/source/ui/src.po  |  238 
 source/sl/sc/uiconfig/scalc/ui.po  | 1151 +-
 source/sl/scp2/source/ex

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

[Noel Grandin]

 basctl/source/basicide/breakpoint.cxx|   11 ++-
 basctl/source/basicide/breakpoint.hxx|1 -
 basctl/source/basicide/scriptdocument.cxx|8 +---
 basctl/source/inc/scriptdocument.hxx |6 --
 basic/inc/sbstdobj.hxx   |1 -
 basic/source/comp/exprgen.cxx|6 +++---
 basic/source/comp/exprnode.cxx   |4 ++--
 basic/source/inc/expr.hxx|9 -
 basic/source/runtime/stdobj1.cxx |2 +-
 chart2/source/controller/main/FeatureCommandDispatchBase.cxx |7 +--
 chart2/source/controller/main/FeatureCommandDispatchBase.hxx |3 ---
 chart2/source/inc/LifeTime.hxx   |5 ++---
 chart2/source/tools/LifeTime.cxx |2 +-
 chart2/source/view/inc/AbstractShapeFactory.hxx  |5 +
 chart2/source/view/main/AbstractShapeFactory.cxx |4 ++--
 15 files changed, 16 insertions(+), 58 deletions(-)

New commits:
commit f019ee7cf9e278cd8a27b1c36172ad4c8124080c
Author: Noel Grandin 
Date:   Tue Oct 18 11:55:32 2016 +0200

loplugin:expandablemethodds in basctl..chart2

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

diff --git a/basctl/source/basicide/breakpoint.cxx 
b/basctl/source/basicide/breakpoint.cxx
index b3e6a70..3396a19 100644
--- a/basctl/source/basicide/breakpoint.cxx
+++ b/basctl/source/basicide/breakpoint.cxx
@@ -49,10 +49,8 @@ void BreakPointList::reset()
 
 void BreakPointList::transfer(BreakPointList & rList)
 {
-reset();
-for (size_t i = 0; i < rList.size(); ++i)
-maBreakPoints.push_back( rList.at( i ) );
-rList.clear();
+maBreakPoints.swap(rList.maBreakPoints);
+rList.reset();
 }
 
 void BreakPointList::InsertSorted(BreakPoint* pNewBrk)
@@ -159,11 +157,6 @@ const BreakPoint* BreakPointList::at(size_t i) const
 return i < maBreakPoints.size() ? maBreakPoints[ i ] : nullptr;
 }
 
-void BreakPointList::clear()
-{
-maBreakPoints.clear();
-}
-
 } // namespace basctl
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/breakpoint.hxx 
b/basctl/source/basicide/breakpoint.hxx
index 8431c30..2ade823 100644
--- a/basctl/source/basicide/breakpoint.hxx
+++ b/basctl/source/basicide/breakpoint.hxx
@@ -72,7 +72,6 @@ public:
 size_t size() const;
 BreakPoint* at(size_t i);
 const BreakPoint* at(size_t i) const;
-void clear();
 BreakPoint* remove(BreakPoint* ptr);
 };
 
diff --git a/basctl/source/basicide/scriptdocument.cxx 
b/basctl/source/basicide/scriptdocument.cxx
index 17d928d..a99fefa 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -1100,7 +1100,7 @@ namespace basctl
 {
 const ScriptDocument aCheck = ScriptDocument( doc->xModel );
 if  (   _rUrlOrCaption == aCheck.getTitle()
-||  _rUrlOrCaption == aCheck.getURL()
+||  _rUrlOrCaption == aCheck.m_pImpl->getURL()
 )
 {
 aDocument = aCheck;
@@ -1513,12 +1513,6 @@ namespace basctl
 }
 
 
-OUString ScriptDocument::getURL() const
-{
-return m_pImpl->getURL();
-}
-
-
 bool ScriptDocument::isActive() const
 {
 bool bIsActive( false );
diff --git a/basctl/source/inc/scriptdocument.hxx 
b/basctl/source/inc/scriptdocument.hxx
index 1a02436..6546799 100644
--- a/basctl/source/inc/scriptdocument.hxx
+++ b/basctl/source/inc/scriptdocument.hxx
@@ -471,12 +471,6 @@ namespace basctl
 */
 OUStringgetTitle() const;
 
-/** returns the URL of the document
-
-to be used for valid documents only
-*/
-OUStringgetURL() const;
-
 /** determines whether the document is currently the one-and-only 
application-wide active document
 */
 boolisActive() const;
diff --git a/basic/inc/sbstdobj.hxx b/basic/inc/sbstdobj.hxx
index b0840a8..7cc2258 100644
--- a/basic/inc/sbstdobj.hxx
+++ b/basic/inc/sbstdobj.hxx
@@ -90,7 +90,6 @@ public:
 bool IsUnderline() const { return bUnderline; }
 void SetSize( sal_uInt16 nS ) { nSize = nS; }
 sal_uInt16 GetSize() const { return nSize; }
-void SetFontName( const OUString& rName ) { aName = rName; }
 const OUString& GetFontName() const { return aName; }
 };
 
diff --git a/basic/source/comp/exprgen.cxx b/basic/source/comp/exprgen.cxx
index 7581d6e..1b06388 100644
--- a/basic/source/comp/exprgen.cxx
+++ b/basic/source/comp/exprgen.cxx
@@ -108,7 +108,7 @@ void SbiExprNode::Gen( SbiCodeGen& rGen, RecursiveMode 
eRecMode )
 }
 }
   

[Libreoffice-commits] core.git: hwpfilter/source i18npool/source idlc/inc idlc/source idl/inc idl/source l10ntools/inc l10ntools/source linguistic/source

[Noel Grandin]

 hwpfilter/source/hbox.h   |5 -
 hwpfilter/source/hwpread.cxx  |2 +-
 hwpfilter/source/mzstring.cxx |7 +--
 hwpfilter/source/mzstring.h   |4 
 i18npool/source/localedata/LocaleNode.cxx |8 ++--
 i18npool/source/localedata/LocaleNode.hxx |3 ---
 idl/inc/slot.hxx  |4 
 idl/source/objects/slot.cxx   |6 --
 idlc/inc/astattribute.hxx |2 --
 idlc/inc/astexpression.hxx|2 --
 idlc/source/astdump.cxx   |2 +-
 idlc/source/astexpression.cxx |2 +-
 l10ntools/inc/cfgmerge.hxx|2 --
 l10ntools/source/cfgmerge.cxx |7 +--
 linguistic/source/convdicxml.cxx  |3 +--
 15 files changed, 8 insertions(+), 51 deletions(-)

New commits:
commit 84c05731b7505a3d3a947a1dcb528f36df41
Author: Noel Grandin 
Date:   Tue Oct 18 14:55:26 2016 +0200

loplugin:expandablemethodds in hwpfilter..linguistic

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

diff --git a/hwpfilter/source/hbox.h b/hwpfilter/source/hbox.h
index 0645219..3832c76 100644
--- a/hwpfilter/source/hbox.h
+++ b/hwpfilter/source/hbox.h
@@ -376,11 +376,6 @@ struct TxtBox: public FBox
 TxtBox();
 virtual ~TxtBox() override;
 
-/**
- * @returns Count of cell.
- */
-int NCell()   { return nCell; }
-
 virtual bool Read(HWPFile &hwpf) override;
 };
 
diff --git a/hwpfilter/source/hwpread.cxx b/hwpfilter/source/hwpread.cxx
index a939b3c..377c13e 100644
--- a/hwpfilter/source/hwpread.cxx
+++ b/hwpfilter/source/hwpread.cxx
@@ -281,7 +281,7 @@ bool TxtBox::Read(HWPFile & hwpf)
 
 UpdateBBox(this);
 
-ncell = NCell();
+ncell = nCell;
 if (!(ncell > 0)){
 return hwpf.SetState(HWP_InvalidFileFormat);
  }
diff --git a/hwpfilter/source/mzstring.cxx b/hwpfilter/source/mzstring.cxx
index b99b9d0..e5db996 100644
--- a/hwpfilter/source/mzstring.cxx
+++ b/hwpfilter/source/mzstring.cxx
@@ -89,7 +89,7 @@ void MzString::append(const char *s, int slen)
 return;
 
 int new_len = Length + slen;
-if (resize(new_len))
+if (allocate(new_len))
 {
 memcpy(Data + Length, s, slen);
 Length = new_len;
@@ -259,9 +259,4 @@ bool MzString::allocate(int len)
 }
 
 
-bool MzString::resize(int len)
-{
-return allocate(len);
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/hwpfilter/source/mzstring.h b/hwpfilter/source/mzstring.h
index 4afb0e5..89bd240 100644
--- a/hwpfilter/source/mzstring.h
+++ b/hwpfilter/source/mzstring.h
@@ -88,10 +88,6 @@ class MzString
 const char*   c_str() const;
 operator  char*() { return const_cast(c_str()); }
 
-// If it is not possible to use the constructor with an initial
-// allocation size, use the following member to set the size.
-bool  resize(int len);
-
 // Assignment
 MzString  &operator = (const MzString &s);
 MzString  &operator = (const char *s);
diff --git a/i18npool/source/localedata/LocaleNode.cxx 
b/i18npool/source/localedata/LocaleNode.cxx
index 1aad3d4..26f0e69 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -84,18 +84,14 @@ void LocaleNode::addChild ( LocaleNode * node) {
 children = arrN;
 }
 children[nChildren++] = node;
-node->setParent (this);
-}
-
-void LocaleNode::setParent ( LocaleNode * node) {
-parent = node;
+node->parent = this;
 }
 
 const LocaleNode* LocaleNode::getRoot() const
 {
 const LocaleNode* pRoot = nullptr;
 const LocaleNode* pParent = this;
-while ( (pParent = pParent->getParent()) != nullptr )
+while ( (pParent = pParent->parent) != nullptr )
 pRoot = pParent;
 return pRoot;
 }
diff --git a/i18npool/source/localedata/LocaleNode.hxx 
b/i18npool/source/localedata/LocaleNode.hxx
index 226d257..00e24be 100644
--- a/i18npool/source/localedata/LocaleNode.hxx
+++ b/i18npool/source/localedata/LocaleNode.hxx
@@ -88,8 +88,6 @@ class LocaleNode
 sal_Int32 nChildren;
 sal_Int32 childArrSize;
 
-void setParent ( LocaleNode*  node);
-
 protected:
 mutable int nError;
 
@@ -106,7 +104,6 @@ public:
 void printR () const;
 virtual ~LocaleNode();
 void addChild (  LocaleNode * node);
-const LocaleNode* getParent() const { return parent; };
 const LocaleNode* getRoot() const;
 int getError() const;
 virtual void generateCode (const OFileWriter &of) const;
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index e3e8c19..87118d6 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -68,9 +68,6 @@ public:
 boolIsVariable() const;
 boolIsMethod() const;
 
-voidSetToggle( bool bSet ) { aToggle = bSet; }
-voidSetA

[Libreoffice-commits] core.git: vcl/inc vcl/opengl

[Tomaž Vajngerl]

 vcl/inc/opengl/framebuffer.hxx |5 ++-
 vcl/opengl/framebuffer.cxx |8 ++---
 vcl/opengl/gdiimpl.cxx |   56 +++--
 3 files changed, 23 insertions(+), 46 deletions(-)

New commits:
commit 94b6b4678b4736b6f4974ec8ee73df5c11ff06d1
Author: Tomaž Vajngerl 
Date:   Thu Jul 28 21:45:56 2016 +0900

opengl: blit offscreen framebuffer instead of drawing

Change-Id: I3ab0da9cf83e0e85b8442b34ecd6eb91dd3d1bd3
Reviewed-on: https://gerrit.libreoffice.org/27875
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/inc/opengl/framebuffer.hxx b/vcl/inc/opengl/framebuffer.hxx
index 9f94a8f..4bad28a 100644
--- a/vcl/inc/opengl/framebuffer.hxx
+++ b/vcl/inc/opengl/framebuffer.hxx
@@ -30,8 +30,9 @@ public:
 int GetWidth() const { return mnWidth; };
 int GetHeight() const { return mnHeight; };
 
-voidBind();
-static void Unbind();
+voidBind(GLenum eTarget = GL_FRAMEBUFFER);
+
+static void Unbind(GLenum eTarget = GL_FRAMEBUFFER);
 
 boolIsFree() const;
 boolIsAttached( GLuint nTexture ) const;
diff --git a/vcl/opengl/framebuffer.cxx b/vcl/opengl/framebuffer.cxx
index aa20a93..cb91ea4 100644
--- a/vcl/opengl/framebuffer.cxx
+++ b/vcl/opengl/framebuffer.cxx
@@ -32,16 +32,16 @@ OpenGLFramebuffer::~OpenGLFramebuffer()
 CHECK_GL_ERROR();
 }
 
-void OpenGLFramebuffer::Bind()
+void OpenGLFramebuffer::Bind(GLenum eTarget)
 {
 VCL_GL_INFO( "Binding framebuffer " << (int)mnId );
-glBindFramebuffer( GL_FRAMEBUFFER, mnId );
+glBindFramebuffer(eTarget, mnId);
 CHECK_GL_ERROR();
 }
 
-void OpenGLFramebuffer::Unbind()
+void OpenGLFramebuffer::Unbind(GLenum eTarget)
 {
-glBindFramebuffer( GL_FRAMEBUFFER, 0 );
+glBindFramebuffer(eTarget, 0);
 CHECK_GL_ERROR();
 VCL_GL_INFO( "Binding default framebuffer" );
 }
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 5fd46b6..b1898df 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -2096,11 +2096,11 @@ void OpenGLSalGraphicsImpl::doFlush()
 
 VCL_GL_INFO( "doFlush - acquire default framebuffer" );
 
-mpWindowContext->state()->sync();
-
 mpWindowContext->AcquireDefaultFramebuffer();
+
 CHECK_GL_ERROR();
 
+mpWindowContext->state()->sync();
 mpWindowContext->state()->viewport(Rectangle(Point(0, 0), Size(GetWidth(), 
GetHeight(;
 mpWindowContext->state()->scissor().disable();
 mpWindowContext->state()->stencil().disable();
@@ -2108,54 +2108,30 @@ void OpenGLSalGraphicsImpl::doFlush()
 #if OSL_DEBUG_LEVEL > 0 // random background glClear
 glClearColor((float)rand()/RAND_MAX, (float)rand()/RAND_MAX,
  (float)rand()/RAND_MAX, 1.0);
-#else
-glClearColor(1.0, 1.0, 1.0, 1.0);
-#endif
 glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT 
);
 CHECK_GL_ERROR();
+#endif
 
 VCL_GL_INFO( "Texture height " << maOffscreenTex.GetHeight() << " vs. 
window height " << GetHeight() );
 
-OpenGLProgram *pProgram =
-mpWindowContext->UseProgram("combinedTextureVertexShader", 
"combinedTextureFragmentShader", "// flush shader\n" ); // flush helps profiling
-if( !pProgram )
-VCL_GL_INFO( "Can't compile simple copying shader !" );
-else
+OpenGLFramebuffer* pFrameBuffer = 
mpWindowContext->AcquireFramebuffer(maOffscreenTex);
+CHECK_GL_ERROR();
+if (pFrameBuffer)
 {
-pProgram->SetShaderType(TextureShaderType::Normal);
-pProgram->SetIdentityTransform("transform");
-pProgram->SetTexture("texture", maOffscreenTex);
-
-SalTwoRect aPosAry( 0, 0, maOffscreenTex.GetWidth(), 
maOffscreenTex.GetHeight(),
-0, 0, maOffscreenTex.GetWidth(), 
maOffscreenTex.GetHeight() );
-
-GLfloat aTexCoord[8];
-maOffscreenTex.GetCoord( aTexCoord, aPosAry );
-pProgram->SetTextureCoord(aTexCoord);
-pProgram->SetMaskCoord(aTexCoord);
-pProgram->SetAlphaCoord(aTexCoord);
-
-GLfloat fWidth( maOffscreenTex.GetWidth() );
-GLfloat fHeight( maOffscreenTex.GetHeight() );
-std::vector aVertices {
-0, fHeight,
-0, 0,
-fWidth, 0,
-fWidth, fHeight
-};
+OpenGLFramebuffer::Unbind(GL_DRAW_FRAMEBUFFER);
+pFrameBuffer->Bind(GL_READ_FRAMEBUFFER);
 
-pProgram->ApplyMatrix(GetWidth(), GetHeight(), 0.0);
-pProgram->DrawArrays(GL_TRIANGLE_FAN, aVertices);
-
-pProgram->Clean();
-
-maOffscreenTex.Unbind();
+glBlitFramebuffer(0, 0, GetWidth(), GetHeight(),
+  0, 0, GetWidth(), GetHeight(), GL_COLOR_BUFFER_BIT, 
GL_NEAREST);
+CHECK_GL_ERROR();
 
-static bool bNoSwap = getenv("SAL_GL_NO_SWAP");
-if (!bNoSwap)
-mpWindowContext->swapBuffers();
+pFrameBuffer->Bind();
 }
 
+static bool bNoSwap = getenv("SAL_GL_NO_SWAP");
+if (!bN

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

[Noel Grandin]

 sc/inc/AccessibleFilterMenu.hxx |1 -
 sc/inc/AccessibleFilterMenuItem.hxx |1 -
 sc/inc/chart2uno.hxx|1 -
 sc/inc/compiler.hxx |3 ---
 sc/inc/dapiuno.hxx  |1 -
 sc/inc/formulaopt.hxx   |2 --
 sc/source/core/tool/compiler.cxx|2 +-
 sc/source/core/tool/formulaopt.cxx  |7 +--
 sc/source/core/tool/odffmap.cxx |5 -
 sc/source/core/tool/token.cxx   |2 +-
 sc/source/filter/inc/biff.hxx   |1 -
 sc/source/filter/qpro/biff.cxx  |2 +-
 sc/source/filter/xml/xmlimprt.cxx   |   14 ++
 sc/source/filter/xml/xmlimprt.hxx   |3 ---
 sc/source/ui/Accessibility/AccessibleFilterMenu.cxx |7 +--
 sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx |7 +--
 sc/source/ui/app/inputwin.cxx   |7 +++
 sc/source/ui/inc/anyrefdg.hxx   |1 -
 sc/source/ui/inc/drawview.hxx   |2 --
 sc/source/ui/inc/inputwin.hxx   |2 --
 sc/source/ui/inc/tpview.hxx |3 ---
 sc/source/ui/inc/viewfunc.hxx   |1 -
 sc/source/ui/miscdlgs/anyrefdg.cxx  |2 +-
 sc/source/ui/optdlg/tpview.cxx  |2 +-
 sc/source/ui/unoobj/chart2uno.cxx   |7 +--
 sc/source/ui/unoobj/dapiuno.cxx |7 +--
 sc/source/ui/vba/vbaformat.cxx  |2 +-
 sc/source/ui/vba/vbaformat.hxx  |1 -
 sc/source/ui/vba/vbarange.cxx   |4 ++--
 sc/source/ui/vba/vbarange.hxx   |2 --
 sc/source/ui/view/drawview.cxx  |2 +-
 sc/source/ui/view/output2.cxx   |3 +--
 sc/source/ui/view/viewfunc.cxx  |2 +-
 33 files changed, 25 insertions(+), 84 deletions(-)

New commits:
commit 6581152f036e94f27fc2b37b4c836a1733a1a471
Author: Noel Grandin 
Date:   Wed Oct 19 08:45:15 2016 +0200

loplugin:expandablemethodds in sc

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

diff --git a/sc/inc/AccessibleFilterMenu.hxx b/sc/inc/AccessibleFilterMenu.hxx
index fba3061..7d4c737 100644
--- a/sc/inc/AccessibleFilterMenu.hxx
+++ b/sc/inc/AccessibleFilterMenu.hxx
@@ -155,7 +155,6 @@ protected:
 
 private:
 bool isSelected() const;
-bool isFocused() const;
 
 void updateStates();
 
diff --git a/sc/inc/AccessibleFilterMenuItem.hxx 
b/sc/inc/AccessibleFilterMenuItem.hxx
index b9f4eba..c150278 100644
--- a/sc/inc/AccessibleFilterMenuItem.hxx
+++ b/sc/inc/AccessibleFilterMenuItem.hxx
@@ -96,7 +96,6 @@ protected:
 
 private:
 bool isSelected() const;
-bool isFocused() const;
 void updateStateSet();
 
 private:
diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx
index 1beda6c..9201638 100644
--- a/sc/inc/chart2uno.hxx
+++ b/sc/inc/chart2uno.hxx
@@ -375,7 +375,6 @@ private:
 
 virtual void notify(sal_uInt16 nFileId, 
ScExternalRefManager::LinkUpdateType eType) override;
 void addFileId(sal_uInt16 nFileId);
-void removeFileId(sal_uInt16 nFileId);
 const std::unordered_set& getAllFileIds() { return 
maFileIds;}
 
 private:
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 20423ef..468d0c3 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -171,8 +171,6 @@ public:
 formula::FormulaToken* CreateToken() const;   // create typified token
 
 static sal_Int32 GetStrLen( const sal_Unicode* pStr ); // as long as a 
"string" is an array
-static size_t GetStrLenBytes( sal_Int32 nLen )
-{ return nLen * sizeof(sal_Unicode); }
 };
 
 class SC_DLLPUBLIC ScCompiler : public formula::FormulaCompiler
@@ -262,7 +260,6 @@ private:
 const char* pOriginal;  // programmatical name
 const char* pUpper; // upper case programmatical name
 } g_aAddInMap[];
-static const AddInMap* GetAddInMap();
 static size_t GetAddInMapCount();
 
 ScDocument* pDoc;
diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx
index 2dcee62..915d9d9 100644
--- a/sc/inc/dapiuno.hxx
+++ b/sc/inc/dapiuno.hxx
@@ -555,7 +555,6 @@ public:
 void setFunction(css::sheet::GeneralFunction Function);
 css::uno::Sequence< css::sheet::GeneralFunction > getSubtotals() const;
 void setSubtotals(const css::uno::Sequence< css::sheet::GeneralFunction >& 
rFunctions);
-static OUString getCu

[Libreoffice-commits] core.git: reportdesign/inc reportdesign/source rsc/inc rsc/source sal/osl

[Noel Grandin]

 reportdesign/inc/ReportDefinition.hxx  |6 --
 reportdesign/source/core/api/ReportDefinition.cxx  |   10 --
 reportdesign/source/ui/inc/DefaultInspection.hxx   |1 -
 reportdesign/source/ui/inc/ReportControllerObserver.hxx|1 -
 reportdesign/source/ui/inspection/DefaultInspection.cxx|7 +--
 reportdesign/source/ui/report/ReportControllerObserver.cxx |8 +---
 rsc/inc/rscdb.hxx  |1 -
 rsc/inc/rscdef.hxx |1 -
 rsc/source/parser/rscibas.cxx  |5 -
 rsc/source/parser/rscinit.cxx  |2 +-
 rsc/source/tools/rscdef.cxx|2 +-
 sal/osl/all/utility.cxx|5 -
 12 files changed, 8 insertions(+), 41 deletions(-)

New commits:
commit 1690b84015b7fa882076d6fb7d79e1959e467544
Author: Noel Grandin 
Date:   Tue Oct 18 15:27:34 2016 +0200

loplugin:expandablemethodds in reportdesign..sal

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

diff --git a/reportdesign/inc/ReportDefinition.hxx 
b/reportdesign/inc/ReportDefinition.hxx
index daad870..5235ae0 100644
--- a/reportdesign/inc/ReportDefinition.hxx
+++ b/reportdesign/inc/ReportDefinition.hxx
@@ -184,12 +184,6 @@ namespace reportdesign
 
 css::uno::Reference< css::uno::XComponentContext > getContext();
 
-/** return the SdrModel of the real model
-*
-* \return
-*/
-std::shared_ptr getSdrModel() const;
-
 static std::shared_ptr getSdrModel(const 
css::uno::Reference< css::report::XReportDefinition >& _xReportDefinition);
 private:
 DECLARE_XINTERFACE( )
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx 
b/reportdesign/source/core/api/ReportDefinition.cxx
index 6227c71..3e5fc11 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -2034,17 +2034,15 @@ uno::Reference< uno::XComponentContext > 
OReportDefinition::getContext()
 return m_aProps->m_xContext;
 }
 
-std::shared_ptr OReportDefinition::getSdrModel() const
-{
-return m_pImpl->m_pReportModel;
-}
-
 std::shared_ptr OReportDefinition::getSdrModel(const 
uno::Reference< report::XReportDefinition >& _xReportDefinition)
 {
 std::shared_ptr pReportModel;
 uno::Reference< lang::XUnoTunnel > xUT( _xReportDefinition, uno::UNO_QUERY 
);
 if( xUT.is() )
-pReportModel = 
reinterpret_cast(sal::static_int_cast(xUT->getSomething(
 OReportDefinition::getUnoTunnelImplementationId(->getSdrModel();
+pReportModel = reinterpret_cast(
+   sal::static_int_cast(
+   xUT->getSomething( 
OReportDefinition::getUnoTunnelImplementationId()))
+)->m_pImpl->m_pReportModel;
 return pReportModel;
 }
 
diff --git a/reportdesign/source/ui/inc/DefaultInspection.hxx 
b/reportdesign/source/ui/inc/DefaultInspection.hxx
index eca2c12..d4e1741 100644
--- a/reportdesign/source/ui/inc/DefaultInspection.hxx
+++ b/reportdesign/source/ui/inc/DefaultInspection.hxx
@@ -87,7 +87,6 @@ namespace rptui
 
 protected:
 // Service constructors
-voidcreateDefault();
 voidcreateWithHelpSection( sal_Int32 _nMinHelpTextLines, sal_Int32 
_nMaxHelpTextLines );
 };
 
diff --git a/reportdesign/source/ui/inc/ReportControllerObserver.hxx 
b/reportdesign/source/ui/inc/ReportControllerObserver.hxx
index 0e1f5b3..0d3a0db 100644
--- a/reportdesign/source/ui/inc/ReportControllerObserver.hxx
+++ b/reportdesign/source/ui/inc/ReportControllerObserver.hxx
@@ -94,7 +94,6 @@ namespace rptui
 
 void Lock();
 void UnLock();
-bool IsLocked() const;
 
 void Clear();
 private:
diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx 
b/reportdesign/source/ui/inspection/DefaultInspection.cxx
index fe0e6c1..aa93293 100644
--- a/reportdesign/source/ui/inspection/DefaultInspection.cxx
+++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx
@@ -167,7 +167,7 @@ namespace rptui
 
 if ( !_arguments.hasElements() )
 {   // constructor: "createDefault()"
-createDefault();
+m_bConstructed = true;
 return;
 }
 
@@ -184,11 +184,6 @@ namespace rptui
 }
 
 
-void DefaultComponentInspectorModel::createDefault()
-{
-m_bConstructed = true;
-}
-
 void DefaultComponentInspectorModel::createWithHelpSection( sal_Int32 
_nMinHelpTextLines, sal_Int32 _nMaxHelpTextLines )
 {
 if ( ( _nMinHelpTextLines <= 0 ) || ( _nMaxHelpTextLines <= 0 ) || ( 
_nMinHelpTextLines > _nMaxHelpTextLines ) )
diff --git a/reportdesign/source/ui/report/ReportCon

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

[Ashod Nakashian]

 vcl/inc/svids.hrc|1 +
 vcl/source/app/svapp.cxx |7 +++
 vcl/source/src/app.src   |5 +
 3 files changed, 13 insertions(+)

New commits:
commit 6b5b773488a4ab77b5c18d82e663e68692f14b33
Author: Ashod Nakashian 
Date:   Thu Oct 13 15:52:32 2016 -0400

tdf#103185 - Add VCL backend being used to About dialog

The VCL backend is now shown on the About dialog.

Change-Id: Ib4e6b33e9c2b3ec2fca229fed8f4533227a67ac6
Reviewed-on: https://gerrit.libreoffice.org/29798
Reviewed-by: Yousuf Philips 
Tested-by: Yousuf Philips 
Tested-by: Jenkins 
Reviewed-by: Michael Meeks 

diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index efb3490..891fe57 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -179,6 +179,7 @@
 #define SV_APP_UIRENDER 10802
 #define SV_APP_GL   10803
 #define SV_APP_DEFAULT  10804
+#define SV_APP_VCLBACKEND   10805
 
 #define SV_ICON_SIZE48_START2
 #define SV_ICON_SIZE32_START21000
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 33e6fe8..61e0072 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1211,6 +1211,13 @@ OUString Application::GetHWOSConfInfo()
 aDetails.append( VclResId(SV_APP_DEFAULT).toString() );
 aDetails.append( "; " );
 
+#ifdef LINUX
+// Only linux has different backends, so don't show blank for others.
+aDetails.append( VclResId(SV_APP_VCLBACKEND).toString() );
+aDetails.append( GetToolkitName() );
+aDetails.append( "; " );
+#endif
+
 return aDetails.makeStringAndClear();
 }
 
diff --git a/vcl/source/src/app.src b/vcl/source/src/app.src
index 91d9df1..b36686d 100644
--- a/vcl/source/src/app.src
+++ b/vcl/source/src/app.src
@@ -34,4 +34,9 @@ String SV_APP_DEFAULT
 Text [ en-US ] = "default";
 };
 
+String SV_APP_VCLBACKEND
+{
+Text [ en-US ] = "VCL: ";
+};
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/Library_vclplug_gen.mk

[Khaled Hosny]

 vcl/Library_vclplug_gen.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 66b3aa76b161c4d08e87fbdb19c2b72cc15153cd
Author: Khaled Hosny 
Date:   Wed Oct 19 10:50:18 2016 +0200

Add missing icu_headers dependency

Apparently this was working before by accident since most people have
ICU headers in the system include path on Linux.

Should fix the failing tinderbox.

Change-Id: I796453e66c53b3c64e546c661007a54fa5d866ec

diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index c250ca8..f281605 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -54,6 +54,7 @@ $(eval $(call gb_Library_use_externals,vclplug_gen,\
glew \
glm_headers \
harfbuzz \
+   icu_headers \
icuuc \
valgrind \
Xrender \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 compilerplugins/clang/plugin.cxx  |3 +--
 compilerplugins/clang/unreffun.cxx|8 
 sc/qa/extras/scannotationshapeobj.cxx |4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

New commits:
commit d6ff3d49df1fbe2731e4ba2076f4faa63ded9b11
Author: Stephan Bergmann 
Date:   Wed Oct 19 10:56:35 2016 +0200

Plugin::isInUnoIncludeFile should not cover WORKDIR

...that got in, for no apparent reason, when various, slightly different
implementations of isInUnoIncludeFile got consolidated into one.

Change-Id: I64a9eb62703d57a0b7b57720ec9f251ffa780691

diff --git a/compilerplugins/clang/plugin.cxx b/compilerplugins/clang/plugin.cxx
index dc48101..143897b 100644
--- a/compilerplugins/clang/plugin.cxx
+++ b/compilerplugins/clang/plugin.cxx
@@ -166,8 +166,7 @@ bool Plugin::isInUnoIncludeFile(SourceLocation 
spellingLocation) const {
|| name.startswith(SRCDIR "/include/salhelper/")
|| name.startswith(SRCDIR "/include/systools/")
|| name.startswith(SRCDIR "/include/typelib/")
-   || name.startswith(SRCDIR "/include/uno/")
-   || name.startswith(WORKDIR "/"));
+   || name.startswith(SRCDIR "/include/uno/"));
 }
 
 bool Plugin::isInUnoIncludeFile(const FunctionDecl* functionDecl) const {
diff --git a/compilerplugins/clang/unreffun.cxx 
b/compilerplugins/clang/unreffun.cxx
index 0284d36..1dac4d7 100644
--- a/compilerplugins/clang/unreffun.cxx
+++ b/compilerplugins/clang/unreffun.cxx
@@ -133,6 +133,14 @@ bool UnrefFun::VisitFunctionDecl(FunctionDecl const * 
decl) {
 {
 return true;
 }
+auto loc = decl->getLocation();
+if (compiler.getSourceManager().isMacroBodyExpansion(loc)
+&& (Lexer::getImmediateMacroName(
+loc, compiler.getSourceManager(), compiler.getLangOpts())
+== "MDDS_MTV_DEFINE_ELEMENT_CALLBACKS"))
+{
+return true;
+}
 report(
 DiagnosticsEngine::Warning,
 (canon->isDefined()
diff --git a/sc/qa/extras/scannotationshapeobj.cxx 
b/sc/qa/extras/scannotationshapeobj.cxx
index 7eefd0c..6b18077 100644
--- a/sc/qa/extras/scannotationshapeobj.cxx
+++ b/sc/qa/extras/scannotationshapeobj.cxx
@@ -116,8 +116,8 @@ uno::Reference 
ScAnnotationShapeObj::getTextContent()
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ScAnnotationShapeObj);
 
-CPPUNIT_PLUGIN_IMPLEMENT();
-
 }
 
+CPPUNIT_PLUGIN_IMPLEMENT();
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 desktop/qa/desktop_lib/test_desktop_lib.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 0c34cd41c65973f8ff0e78c76cd6ad52ef89bc4a
Author: Miklos Vajna 
Date:   Wed Oct 19 09:45:07 2016 +0200

CppunitTest_desktop_lib: fix stack-use-after-return

The LOK callback objects registered are on-stack objects, so we must be
sure that references no longer used after we return.

Process idle events, so that desktop::CallbackHandler::flush() won't try
to use the reference after return.

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

diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index bcf019e..d71df17 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -1639,6 +1639,7 @@ void DesktopLOKTest::testPaintPartTile()
 // the first view, so there were no invalidations.
 CPPUNIT_ASSERT(aView1.m_bTilesInvalidated);
 
+Scheduler::ProcessEventsToIdle();
 mxComponent->dispose();
 mxComponent.clear();
 comphelper::LibreOfficeKit::setActive(false);
@@ -1678,6 +1679,7 @@ void DesktopLOKTest::testWriterCommentInsertCursor()
 // inserted the comment.
 CPPUNIT_ASSERT(aView1.m_aOwnCursor.IsEmpty());
 
+Scheduler::ProcessEventsToIdle();
 mxComponent->dispose();
 mxComponent.clear();
 comphelper::LibreOfficeKit::setActive(false);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

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

New commits:
commit 99ee085d436a7287895c62d5d4451385868b9c2c
Author: Caolán McNamara 
Date:   Wed Oct 19 10:29:48 2016 +0100

two elements at the same packing position

if you use glade to edit the .ui files then this sort of
cockup which reeks of manual xml editing doesn't arise

Change-Id: Ic339953cad15078bc847a4c31c0c7592b071b454

diff --git a/filter/uiconfig/ui/pdfgeneralpage.ui 
b/filter/uiconfig/ui/pdfgeneralpage.ui
index 0cfa5c9..836fd25 100644
--- a/filter/uiconfig/ui/pdfgeneralpage.ui
+++ b/filter/uiconfig/ui/pdfgeneralpage.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -607,7 +607,7 @@
 7
   
 
- 
+
   
 Exp_ort 
automatically inserted blank pages
 True
@@ -649,7 +649,7 @@
   
   
 0
-9
+10
   
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 loleaflet/po/templates/loleaflet-help.pot |2 
 loleaflet/po/templates/loleaflet-ui.pot   |   97 +-
 2 files changed, 56 insertions(+), 43 deletions(-)

New commits:
commit 1f2be910098b2920bba6915d6b8ba4a640fa4d03
Author: Andras Timar 
Date:   Wed Oct 19 11:53:18 2016 +0200

loleaflet: updated port files

diff --git a/loleaflet/po/templates/loleaflet-help.pot 
b/loleaflet/po/templates/loleaflet-help.pot
index b05eab5..4a13fda 100644
--- a/loleaflet/po/templates/loleaflet-help.pot
+++ b/loleaflet/po/templates/loleaflet-help.pot
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-11 12:11+0200\n"
+"POT-Creation-Date: 2016-10-19 11:51+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
diff --git a/loleaflet/po/templates/loleaflet-ui.pot 
b/loleaflet/po/templates/loleaflet-ui.pot
index 307e66f..e12b9c9 100644
--- a/loleaflet/po/templates/loleaflet-ui.pot
+++ b/loleaflet/po/templates/loleaflet-ui.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-11 12:11+0200\n"
+"POT-Creation-Date: 2016-10-19 11:51+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -197,8 +197,8 @@ msgstr ""
 
 #: dist/errormessages.js:1
 msgid ""
-"Wrong WOPISrc, usage: WOPISrc=valid encoded URI, or file_path, usage: "
-"file_path=/path/to/doc/"
+"No disk space left on server, please contact the server administrator to "
+"continue."
 msgstr ""
 
 #: dist/errormessages.js:2
@@ -209,18 +209,30 @@ msgstr ""
 
 #: dist/errormessages.js:3
 msgid ""
-"No disk space left on server, please contact the server administrator to "
-"continue."
-msgstr ""
-
-#: dist/errormessages.js:4
-msgid ""
 "This development build is limited to %0 documents, and %1 connections - to "
 "avoid the impression that it is suitable for deployment in large "
 "enterprises. To find out more about deploying and scaling %2 checkout: %3."
 msgstr ""
 
+#: dist/errormessages.js:4
+msgid ""
+"Service is unavailable. Please try again later and report to your "
+"administrator if the issue persists."
+msgstr ""
+
+#: dist/errormessages.js:5
+msgid ""
+"Unauthorized WOPI host. Please try again later and report to your "
+"administrator if the issue persists."
+msgstr ""
+
+#: dist/errormessages.js:6
+msgid ""
+"Wrong WOPISrc, usage: WOPISrc=valid encoded URI, or file_path, usage: "
+"file_path=/path/to/doc/"
+msgstr ""
+
 #: dist/toolbar/toolbar.js:150
 msgid "Are you sure you want to delete this page?"
 msgstr ""
@@ -415,7 +427,7 @@ msgstr ""
 msgid "Cancel the search"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:462 dist/toolbar/toolbar.js:1328
+#: dist/toolbar/toolbar.js:462 dist/toolbar/toolbar.js:1326
 msgid "No users"
 msgstr ""
 
@@ -428,17 +440,17 @@ msgid "Next page"
 msgstr ""
 
 #: dist/toolbar/toolbar.js:467 src/control/Control.Menubar.js:41
-#: src/control/Control.Menubar.js:86 src/control/Control.Menubar.js:135
+#: src/control/Control.Menubar.js:86 src/control/Control.Menubar.js:136
 msgid "Reset zoom"
 msgstr ""
 
 #: dist/toolbar/toolbar.js:468 src/control/Control.Menubar.js:40
-#: src/control/Control.Menubar.js:85 src/control/Control.Menubar.js:134
+#: src/control/Control.Menubar.js:85 src/control/Control.Menubar.js:135
 msgid "Zoom out"
 msgstr ""
 
 #: dist/toolbar/toolbar.js:470 src/control/Control.Menubar.js:39
-#: src/control/Control.Menubar.js:84 src/control/Control.Menubar.js:133
+#: src/control/Control.Menubar.js:84 src/control/Control.Menubar.js:134
 msgid "Zoom in"
 msgstr ""
 
@@ -450,7 +462,7 @@ msgstr ""
 msgid "%user has left"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:625 dist/toolbar/toolbar.js:1117
+#: dist/toolbar/toolbar.js:625 dist/toolbar/toolbar.js:1115
 msgid "Size"
 msgstr ""
 
@@ -554,39 +566,39 @@ msgstr ""
 msgid "Number of Slides"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:941
+#: dist/toolbar/toolbar.js:939
 msgid "Document saved"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:1100
+#: dist/toolbar/toolbar.js:1098
 msgid "Style"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:1112
+#: dist/toolbar/toolbar.js:1110
 msgid "Font"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:1136
+#: dist/toolbar/toolbar.js:1134
 msgid "Previous slide"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:1137
+#: dist/toolbar/toolbar.js:1135
 msgid "Next slide"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:1305
+#: dist/toolbar/toolbar.js:1303
 msgid "Layout"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:1319
+#: dist/toolbar/toolbar.js:1317
 msgid "%n users"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:1326
+#: dist/toolbar/toolbar.js:1324
 msgid "1 user"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:1351 src/control/Control.DocumentRepair.js:87
+#: dist/toolbar/toolbar.js:1349 src/control/Control.DocumentRepair.js:87
 msgid "You"
 msgstr ""
 
@@ -630,7 +642,7 @@ msgstr ""
 msgi

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

[Tomaž Vajngerl]

 include/opencl/openclwrapper.hxx |1 
 opencl/source/openclwrapper.cxx  |   81 +++
 2 files changed, 49 insertions(+), 33 deletions(-)

New commits:
commit 4969015d138cbd9b20bf3a9bee0af9d6222f1a68
Author: Tomaž Vajngerl 
Date:   Thu Oct 13 12:55:57 2016 +0200

tdf#103204 opencl: initialize command queue on demand

Change-Id: Ie3da1d6ec91e951b1ffc15abf376c7af57789e47
Reviewed-on: https://gerrit.libreoffice.org/29802
Reviewed-by: Tomaž Vajngerl 
Tested-by: Tomaž Vajngerl 
(cherry picked from commit 4eea4af8924e3b1bb00c22cf1f9d21fc4dec6e83)
Reviewed-on: https://gerrit.libreoffice.org/29994
Tested-by: Jenkins 
Reviewed-by: Jan Holesovsky 

diff --git a/include/opencl/openclwrapper.hxx b/include/opencl/openclwrapper.hxx
index dae1192..233412f 100644
--- a/include/opencl/openclwrapper.hxx
+++ b/include/opencl/openclwrapper.hxx
@@ -42,6 +42,7 @@ struct OPENCL_DLLPUBLIC GPUEnv
 cl_context mpContext;
 cl_device_id mpDevID;
 cl_command_queue mpCmdQueue[OPENCL_CMDQUEUE_SIZE];
+bool mbCommandQueueInitialized;
 cl_program mpArryPrograms[MAX_CLFILE_NUM]; //one program object maps one 
kernel source file
 int mnIsUserCreated; // 1: created , 0:no create and needed to create by 
opencl wrapper
 int mnCmdQueuePos;
diff --git a/opencl/source/openclwrapper.cxx b/opencl/source/openclwrapper.cxx
index d8d16c3..5d40a54 100644
--- a/opencl/source/openclwrapper.cxx
+++ b/opencl/source/openclwrapper.cxx
@@ -103,8 +103,54 @@ OString getCacheFolder()
 
 }
 
+bool initializeCommandQueue(GPUEnv& aGpuEnv)
+{
+OpenCLZone zone;
+
+cl_int nState;
+cl_command_queue command_queue[OPENCL_CMDQUEUE_SIZE];
+
+for (int i = 0; i < OPENCL_CMDQUEUE_SIZE; ++i)
+{
+command_queue[i] = clCreateCommandQueue(aGpuEnv.mpContext, 
aGpuEnv.mpDevID, 0, &nState);
+if (nState != CL_SUCCESS)
+SAL_WARN("opencl", "clCreateCommandQueue failed: " << 
errorString(nState));
+
+if (command_queue[i] == nullptr || nState != CL_SUCCESS)
+{
+// Release all command queues created so far.
+for (int j = 0; j <= i; ++j)
+{
+if (command_queue[j])
+{
+clReleaseCommandQueue(command_queue[j]);
+command_queue[j] = nullptr;
+}
+}
+
+clReleaseContext(aGpuEnv.mpContext);
+SAL_WARN("opencl", "failed to set/switch opencl device");
+return false;
+}
+
+SAL_INFO("opencl", "Created command queue " << command_queue[i] << " 
for context " << aGpuEnv.mpContext);
+}
+
+for (int i = 0; i < OPENCL_CMDQUEUE_SIZE; ++i)
+{
+aGpuEnv.mpCmdQueue[i] = command_queue[i];
+}
+aGpuEnv.mbCommandQueueInitialized = true;
+return true;
+}
+
 void setKernelEnv( KernelEnv *envInfo )
 {
+if (!gpuEnv.mbCommandQueueInitialized)
+{
+initializeCommandQueue(gpuEnv);
+}
+
 envInfo->mpkContext = gpuEnv.mpContext;
 envInfo->mpkProgram = gpuEnv.mpArryPrograms[0];
 
@@ -265,8 +311,7 @@ bool initOpenCLAttr( OpenCLEnv * env )
 
 gpuEnv.mnIsUserCreated = 1;
 
-for (int i = 0; i < OPENCL_CMDQUEUE_SIZE; ++i)
-gpuEnv.mpCmdQueue[i] = env->mpOclCmdQueue[i];
+gpuEnv.mbCommandQueueInitialized = false;
 
 gpuEnv.mnCmdQueuePos = 0; // default to 0.
 
@@ -765,7 +810,6 @@ bool switchOpenCLDevice(const OUString* pDevice, bool 
bAutoSelect, bool bForceEv
 
 cl_context context;
 cl_platform_id platformId;
-cl_command_queue command_queue[OPENCL_CMDQUEUE_SIZE];
 
 {
 OpenCLZone zone;
@@ -790,33 +834,6 @@ bool switchOpenCLDevice(const OUString* pDevice, bool 
bAutoSelect, bool bForceEv
 }
 SAL_INFO("opencl", "Created context " << context << " for platform " 
<< platformId << ", device " << pDeviceId);
 
-for (int i = 0; i < OPENCL_CMDQUEUE_SIZE; ++i)
-{
-command_queue[i] = clCreateCommandQueue(
-context, pDeviceId, 0, &nState);
-if (nState != CL_SUCCESS)
-SAL_WARN("opencl", "clCreateCommandQueue failed: " << 
errorString(nState));
-
-if (command_queue[i] == nullptr || nState != CL_SUCCESS)
-{
-// Release all command queues created so far.
-for (int j = 0; j <= i; ++j)
-{
-if (command_queue[j])
-{
-clReleaseCommandQueue(command_queue[j]);
-command_queue[j] = nullptr;
-}
-}
-
-clReleaseContext(context);
-SAL_WARN("opencl", "failed to set/switch opencl device");
-return false;
-}
-
-SAL_INFO("opencl", "Created command queue " << command_queue[i] << 
" for context " << context);
-}
-
 OString sDeviceID = getDeviceInfoSt

Gian Domenico license statement

[Gian Domenico Ceccarini]

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

Re: dark themes

[Jan Holesovsky]

Hi Caolán,

Caolán McNamara píše v Út 18. 10. 2016 v 16:28 +0100:

> Looking at https://bugs.documentfoundation.org/show_bug.cgi?id=102778 w
> hich is "insufficient contrast with dark themes" for the page layout
> icons in the writer status bar I see that we have...
> 
> a) a breeze dark theme
> b) a VCL_ICONS_FOR_DARK_THEME variable which re-colorizes icons to fit
> a dark theme better (?)
> 
> any thoughts on when detecting that gtk3 has a dark theme enabled if we
> should auto-default to the breeze dark theme or go down the
> VCL_ICONS_FOR_DARK_THEME route ? Or something else.

IIRC the plan was to use re-coloring for all themes, but I think Tomaz
(who implemented it) was not happy enough with the results yet - or
something like that, so it's not enabled by default.

The breeze_dark was introduced to have "something" until the
re-colorization approach is finished; but now when we have it anyway, we
could also consider an option to prefer *_dark variant for dark themes
if it exists, otherwise do the re-coloring...

Tomaz - thoughts? :-)

All the best,
Kendy

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

Re: dark themes

[Tomaž Vajngerl]

Hi,

On 18/10/16 17:28, Caolán McNamara wrote:

Looking at https://bugs.documentfoundation.org/show_bug.cgi?id=102778 w
hich is "insufficient contrast with dark themes" for the page layout
icons in the writer status bar I see that we have...

a) a breeze dark theme
b) a VCL_ICONS_FOR_DARK_THEME variable which re-colorizes icons to fit
a dark theme better (?)

any thoughts on when detecting that gtk3 has a dark theme enabled if we
should auto-default to the breeze dark theme or go down the
VCL_ICONS_FOR_DARK_THEME route ? Or something else.

C.
For now I would switch to breeze dark theme as it is the only dark theme 
we have. VCL_ICONS_FOR_DARK_THEME functionality is not complete because 
it modifies other images too, not just toolbar icons. I'm working on a 
functionality that will combine HiDPI and dark theme manipulation as 
well as on demand creation of icons from SVG and caching, but this is 
still far from ready.


Regards, Tomaž
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Giuseppe Castagno]

 writerperfect/source/impress/KeynoteImportFilter.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 17b94a616d63759294a9530dca5139972172aadf
Author: Giuseppe Castagno 
Date:   Wed Oct 19 09:25:14 2016 +0200

tdf#103274 (9): Add default XCommandEnvironment reference

Change-Id: If1b7bc913e392f511caf0684baa5bc3ce2c6933d
Reviewed-on: https://gerrit.libreoffice.org/30035
Tested-by: Jenkins 
Reviewed-by: Giuseppe Castagno 

diff --git a/writerperfect/source/impress/KeynoteImportFilter.cxx 
b/writerperfect/source/impress/KeynoteImportFilter.cxx
index 1547d1d..cf274c8 100644
--- a/writerperfect/source/impress/KeynoteImportFilter.cxx
+++ b/writerperfect/source/impress/KeynoteImportFilter.cxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -132,7 +133,9 @@ throw(css::uno::RuntimeException, std::exception)
  */
 if (xContent.is())
 {
-ucbhelper::Content aContent(xContent, Reference< 
ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext());
+ucbhelper::Content aContent(xContent,
+
utl::UCBContentHelper::getDefaultCommandEnvironment(),
+comphelper::getProcessComponentContext());
 try
 {
 if (aContent.isFolder())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Armin Le Grand]

 comphelper/source/misc/backupfilehelper.cxx |  434 +---
 desktop/source/app/app.cxx  |9 
 include/comphelper/backupfilehelper.hxx |   34 +-
 svx/source/dialog/SafeModeDialog.cxx|8 
 4 files changed, 377 insertions(+), 108 deletions(-)

New commits:
commit 0f5d4da2b41fb30aea5465465052f4438ba3ba8c
Author: Armin Le Grand 
Date:   Tue Oct 18 12:50:42 2016 +0200

profilesafe: Deeper integration with SafeMode

Added deeper integration by saving at SaveMode content of user dir
completely to a user/SafeMode dir, including the whole stack
of pack files. Repair happens in that safe directory, so that
the user dir is resetted to default when re-started in SafeMode.
All changes (including complete deletion) are played back to
the user config at first restart with disabled SafeMode

Change-Id: I5114c7d5d04582be62090707bc9b97afa55fc1f1
Reviewed-on: https://gerrit.libreoffice.org/30003
Tested-by: Jenkins 
Reviewed-by: Armin Le Grand 

diff --git a/comphelper/source/misc/backupfilehelper.cxx 
b/comphelper/source/misc/backupfilehelper.cxx
index dd0c1ef..60ad11a9 100644
--- a/comphelper/source/misc/backupfilehelper.cxx
+++ b/comphelper/source/misc/backupfilehelper.cxx
@@ -41,15 +41,16 @@ namespace
 if (-1 == nIndex)
 {
 aRetval = rSrc;
+rRight.clear();
 }
 else if (nIndex > 0)
 {
 aRetval = rSrc.copy(0, nIndex);
-}
 
-if (rSrc.getLength() > nIndex + 1)
-{
-rRight = rSrc.copy(nIndex + 1);
+if (rSrc.getLength() > nIndex + 1)
+{
+rRight = rSrc.copy(nIndex + 1);
+}
 }
 
 return aRetval;
@@ -286,6 +287,7 @@ namespace
 {
 std::set< OUString > aDirs;
 std::set< std::pair< OUString, OUString > > aFiles;
+bool bError(false);
 
 scanDirsAndFiles(
 rDirURL,
@@ -296,7 +298,7 @@ namespace
 {
 const OUString aNewDirURL(rDirURL + "/" + dir);
 
-deleteDirRecursively(aNewDirURL);
+bError |= deleteDirRecursively(aNewDirURL);
 }
 
 for (const auto& file : aFiles)
@@ -309,10 +311,85 @@ namespace
 aNewFileURL += file.second;
 }
 
-osl::File::remove(aNewFileURL);
+bError |= (osl::FileBase::E_None != 
osl::File::remove(aNewFileURL));
+}
+
+bError |= (osl::FileBase::E_None != osl::Directory::remove(rDirURL));
+
+return bError;
+}
+
+// both exist, move content
+bool moveDirContent(
+const OUString& rSourceDirURL,
+const OUString& rTargetDirURL,
+const std::set< OUString >& rExcludeList)
+{
+std::set< OUString > aDirs;
+std::set< std::pair< OUString, OUString > > aFiles;
+bool bError(false);
+
+scanDirsAndFiles(
+rSourceDirURL,
+aDirs,
+aFiles);
+
+for (const auto& dir : aDirs)
+{
+const bool bExcluded(
+!rExcludeList.empty() &&
+rExcludeList.find(dir) != rExcludeList.end());
+
+if (!bExcluded)
+{
+const OUString aNewSourceDirURL(rSourceDirURL + "/" + dir);
+
+if (dirExists(aNewSourceDirURL))
+{
+const OUString aNewTargetDirURL(rTargetDirURL + "/" + dir);
+
+if (dirExists(aNewTargetDirURL))
+{
+deleteDirRecursively(aNewTargetDirURL);
+}
+
+bError |= (osl::FileBase::E_None != osl::File::move(
+aNewSourceDirURL,
+aNewTargetDirURL));
+}
+}
+}
+
+for (const auto& file : aFiles)
+{
+OUString aSourceFileURL(rSourceDirURL + "/" + file.first);
+
+if (!file.second.isEmpty())
+{
+aSourceFileURL += ".";
+aSourceFileURL += file.second;
+}
+
+if (fileExists(aSourceFileURL))
+{
+OUString aTargetFileURL(rTargetDirURL + "/" + file.first);
+
+if (!file.second.isEmpty())
+{
+aTargetFileURL += ".";
+aTargetFileURL += file.second;
+}
+
+if (fileExists(aTargetFileURL))
+{
+osl::File::remove(aTargetFileURL);
+}
+
+bError |= (osl::FileBase::E_None != 
osl::File::move(aSourceFileURL, aTargetFileURL));
+}
 }
 
-return osl::FileBase::E_None == osl::Directory::remove(rDirURL);
+return bError;
 }
 }
 
@@ -369,6 +446,14 @@ namespace
 }
 }
 
+bool isSameExtension(const ExtensionInfoEntry& rComp) const

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

[Michael Meeks]

 vcl/source/app/scheduler.cxx |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit c00d8271ba443c4f0acf657c226eea4824597f95
Author: Michael Meeks 
Date:   Tue Oct 18 21:38:34 2016 +0100

vcl: assert solar mutex is held for various timer / scheduler ops.

Bringing paranoia to some source-code near you.

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

diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx
index 4dcbc4d..4caa4d2 100644
--- a/vcl/source/app/scheduler.cxx
+++ b/vcl/source/app/scheduler.cxx
@@ -31,6 +31,8 @@ void InitSystemTimer(ImplSVData* pSVData);
 
 void ImplSchedulerData::Invoke()
 {
+DBG_TESTSOLARMUTEX();
+
 if (mbDelete || mbInScheduler )
 return;
 
@@ -127,6 +129,9 @@ void Scheduler::ImplStartTimer(sal_uInt64 nMS, bool bForce)
 // ImplSalStopTimer() on WNT the timer queue is restarted and never 
ends
 return;
 }
+
+DBG_TESTSOLARMUTEX();
+
 InitSystemTimer(pSVData);
 
 if ( !nMS )
@@ -169,6 +174,8 @@ bool Scheduler::ProcessTaskScheduling( bool bTimerOnly )
 {
 ImplSchedulerData* pSchedulerData;
 
+DBG_TESTSOLARMUTEX();
+
 if ((pSchedulerData = ImplSchedulerData::GetMostImportantTask(bTimerOnly)))
 {
 SAL_INFO("vcl.schedule", "Invoke task " << 
pSchedulerData->GetDebugName());
@@ -203,6 +210,8 @@ sal_uInt64 Scheduler::CalculateMinimumTimeout( bool 
&bHasActiveIdles )
 sal_uInt64 nTime = tools::Time::GetSystemTicks();
 sal_uInt64 nMinPeriod = MaximumTimeoutMs;
 
+DBG_TESTSOLARMUTEX();
+
 SAL_INFO("vcl.schedule", "Calculating minimum timeout:");
 pSchedulerData = pSVData->mpFirstSchedulerData;
 while ( pSchedulerData )
@@ -275,6 +284,8 @@ void Scheduler::Start()
 return;
 }
 
+DBG_TESTSOLARMUTEX();
+
 // Mark timer active
 mbActive = true;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Maxim Monastirsky]

 chart2/source/controller/main/ChartController_Window.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 42e89217fb3b8bda7cc084c8e14ba56efa8eae3f
Author: Maxim Monastirsky 
Date:   Wed Oct 19 13:59:56 2016 +0300

No need to check here if menu name is empty

We now do this on the ResourceMenuController side.

Change-Id: Ic249b6a687fe059393ccf55bbc4534242c08e30e

diff --git a/chart2/source/controller/main/ChartController_Window.cxx 
b/chart2/source/controller/main/ChartController_Window.cxx
index b1daf04..4e7a791 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -1217,11 +1217,10 @@ void ChartController::execute_Command( const 
CommandEvent& rCEvt )
 }
 }
 
-css::uno::Sequence< css::uno::Any > aArgs( aMenuName.isEmpty() ? 2 : 3 
);
+css::uno::Sequence< css::uno::Any > aArgs( 3 );
 aArgs[0] <<= comphelper::makePropertyValue( "IsContextMenu", true );
 aArgs[1] <<= comphelper::makePropertyValue( "Frame", m_xFrame );
-if ( !aMenuName.isEmpty() )
-aArgs[2] <<= comphelper::makePropertyValue( "Value", aMenuName );
+aArgs[2] <<= comphelper::makePropertyValue( "Value", aMenuName );
 
 css::uno::Reference< css::frame::XPopupMenuController > 
xPopupController(
 m_xCC->getServiceManager()->createInstanceWithArgumentsAndContext(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/source/app/IconThemeSelector.cxx  |4 
 vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx |   15 +--
 2 files changed, 17 insertions(+), 2 deletions(-)

New commits:
commit 75544eb042ab3fc79dd6104749a32af7e180c116
Author: Caolán McNamara 
Date:   Wed Oct 19 12:57:09 2016 +0100

Resolves: tdf#102778 by default use breeze_dark when dark themes are 
requested

Under gtk3 if gtk-application-prefer-dark-theme is enabled or the requested
icon-theme name ends in [-|_]dark

Change-Id: Ia70ea3adc51ac0ec2b26d08fc960c1c7285c338b

diff --git a/vcl/source/app/IconThemeSelector.cxx 
b/vcl/source/app/IconThemeSelector.cxx
index ce91d5b..91a082c 100644
--- a/vcl/source/app/IconThemeSelector.cxx
+++ b/vcl/source/app/IconThemeSelector.cxx
@@ -82,6 +82,10 @@ IconThemeSelector::SelectIconThemeForDesktopEnvironment(
 if (icon_theme_is_in_installed_themes(mPreferredIconTheme, 
installedThemes)) {
 return mPreferredIconTheme;
 }
+//if a dark variant is preferred, and we didn't have an exact match, 
then try our one and only dark theme
+if (mPreferredIconTheme.endsWith("_dark") && 
icon_theme_is_in_installed_themes("breeze_dark", installedThemes)) {
+return "breeze_dark";
+}
 }
 
 OUString themeForDesktop = 
GetIconThemeForDesktopEnvironment(desktopEnvironment);
diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
index 3d5ee0f..8d6c2d0 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -2719,8 +2719,19 @@ void GtkSalGraphics::updateSettings( AllSettings& 
rSettings )
 
 // preferred icon style
 gchar* pIconThemeName = nullptr;
-g_object_get( pSettings, "gtk-icon-theme-name", &pIconThemeName, nullptr );
-aStyleSet.SetPreferredIconTheme( OUString::createFromAscii( pIconThemeName 
) );
+gboolean bDarkIconTheme = false;
+g_object_get(pSettings, "gtk-icon-theme-name", &pIconThemeName,
+"gtk-application-prefer-dark-theme", 
&bDarkIconTheme,
+nullptr );
+OUString sIconThemeName(OUString::createFromAscii(pIconThemeName));
+if (sIconThemeName.endsWithIgnoreAsciiCase("-dark", &sIconThemeName) ||
+sIconThemeName.endsWithIgnoreAsciiCase("_dark", &sIconThemeName))
+{
+bDarkIconTheme = true;
+}
+if (bDarkIconTheme)
+sIconThemeName += "_dark";
+aStyleSet.SetPreferredIconTheme(sIconThemeName);
 g_free( pIconThemeName );
 
 aStyleSet.SetToolbarIconSize( ToolbarIconSize::Large );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/source/app/IconThemeInfo.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit cd1c20ea546d1154daab0eea264c003fc446898c
Author: Caolán McNamara 
Date:   Wed Oct 19 13:03:24 2016 +0100

make the 'Breeze_dark' name look less stupid in the icon theme dropdown list

Change-Id: I3e0be0f5f83e0191988c63c709c090ba4c936d61

diff --git a/vcl/source/app/IconThemeInfo.cxx b/vcl/source/app/IconThemeInfo.cxx
index a354b0d..3c886be 100644
--- a/vcl/source/app/IconThemeInfo.cxx
+++ b/vcl/source/app/IconThemeInfo.cxx
@@ -23,6 +23,8 @@ namespace {
 static const OUStringLiteral HIGH_CONTRAST_DISPLAY_NAME("High Contrast");
 static const OUStringLiteral TANGO_TESTING_ID("tango_testing");
 static const OUStringLiteral TANGO_TESTING_DISPLAY_NAME("Tango Testing");
+static const OUStringLiteral BREEZE_DARK_ID("breeze_dark");
+static const OUStringLiteral BREEZE_DARK_DISPLAY_NAME("Breeze Dark");
 
 OUString
 filename_from_url(const OUString& url)
@@ -127,6 +129,9 @@ IconThemeInfo::ThemeIdToDisplayName(const OUString& themeId)
 else if (themeId.equalsIgnoreAsciiCase(TANGO_TESTING_ID)) {
 return TANGO_TESTING_DISPLAY_NAME;
 }
+else if (themeId.equalsIgnoreAsciiCase(BREEZE_DARK_ID)) {
+return BREEZE_DARK_DISPLAY_NAME;
+}
 
 // make the first letter uppercase
 OUString r;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

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

New commits:
commit d1c8e184642e6e5f2a54d6fd965551457bdc7e8b
Author: Stephan Bergmann 
Date:   Wed Oct 19 14:09:21 2016 +0200

Help old GCC versions

Change-Id: I17e05a0ca985241030c71e7d08b81c1290ef1bc9

diff --git a/vcl/source/app/IconThemeSelector.cxx 
b/vcl/source/app/IconThemeSelector.cxx
index 91a082c..556d31a 100644
--- a/vcl/source/app/IconThemeSelector.cxx
+++ b/vcl/source/app/IconThemeSelector.cxx
@@ -84,7 +84,7 @@ IconThemeSelector::SelectIconThemeForDesktopEnvironment(
 }
 //if a dark variant is preferred, and we didn't have an exact match, 
then try our one and only dark theme
 if (mPreferredIconTheme.endsWith("_dark") && 
icon_theme_is_in_installed_themes("breeze_dark", installedThemes)) {
-return "breeze_dark";
+return OUString("breeze_dark");
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Maxim Monastirsky]

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

New commits:
commit 4a74c8af0b4573b4b72ccf04b26c71e41799e7a0
Author: Maxim Monastirsky 
Date:   Wed Oct 19 15:03:48 2016 +0300

tdf#103264 Missing case for SID_SAVE_BACKGROUND

Regression of:

commit 93b4bf647a5899f54ef51f8b4bfed0faa66b466e
Date:   Fri Jul 31 02:28:28 2015 +0530

tdf#89466: Slide Background tab

Change-Id: I1c6d1d35c47e6e4400d65474c84b2c3ebeb0330f

diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index fb7a046..2d08d73 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -1187,6 +1187,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
 break;
 
 case SID_SELECT_BACKGROUND:
+case SID_SAVE_BACKGROUND:
 case SID_ATTR_PAGE_SIZE:
 case SID_ATTR_PAGE:
 case SID_PAGESETUP:  // BASIC ??
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sc/source/ui/view/tabview4.cxx |   24 ++--
 1 file changed, 14 insertions(+), 10 deletions(-)

New commits:
commit ef044f82452af7b4c844d5ed1ca05869aafe21c5
Author: Caolán McNamara 
Date:   Wed Oct 19 14:13:54 2016 +0100

Resolves: tdf#100841 use Popover instead of Tooltip for the fill series hint

Change-Id: Id84265d7c76869059144e28c1d9a735efa46fe29

diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx
index e016af8..fbb40fa 100644
--- a/sc/source/ui/view/tabview4.cxx
+++ b/sc/source/ui/view/tabview4.cxx
@@ -267,16 +267,20 @@ void ScTabView::UpdateRef( SCCOL nCurX, SCROW nCurY, 
SCTAB nCurZ )
 else if ( nEndX != aMarkRange.aEnd.Col() || nEndY != 
aMarkRange.aEnd.Row() )
 aHelpStr = pDoc->GetAutoFillPreview( aMarkRange, nEndX, nEndY 
);
 
-//  je nach Richtung die obere oder untere Ecke:
-SCCOL nAddX = ( nEndX >= aMarkRange.aEnd.Col() ) ? 1 : 0;
-SCROW nAddY = ( nEndY >= aMarkRange.aEnd.Row() ) ? 1 : 0;
-Point aPos = aViewData.GetScrPos( nEndX+nAddX, nEndY+nAddY, 
aViewData.GetActivePart() );
-aPos.X() += 8;
-aPos.Y() += 4;
-aPos = pWin->OutputToScreenPixel( aPos );
-Rectangle aRect( aPos, aPos );
-QuickHelpFlags nAlign = QuickHelpFlags::Left|QuickHelpFlags::Top;
-Help::ShowQuickHelp(pWin, aRect, aHelpStr, nAlign);
+if (aHelpStr.getLength())
+{
+//  je nach Richtung die obere oder untere Ecke:
+SCCOL nAddX = ( nEndX >= aMarkRange.aEnd.Col() ) ? 1 : 0;
+SCROW nAddY = ( nEndY >= aMarkRange.aEnd.Row() ) ? 1 : 0;
+Point aPos = aViewData.GetScrPos( nEndX+nAddX, nEndY+nAddY, 
aViewData.GetActivePart() );
+aPos.X() += 8;
+aPos.Y() += 4;
+aPos = pWin->OutputToScreenPixel( aPos );
+Rectangle aRect( aPos, aPos );
+QuickHelpFlags nAlign = 
QuickHelpFlags::Left|QuickHelpFlags::Top;
+HideTip();
+nTipVisible = Help::ShowPopover(pWin, aRect, aHelpStr, nAlign);
+}
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Takeshi Abe]

 sw/source/core/access/accmap.cxx |   22 ++
 1 file changed, 18 insertions(+), 4 deletions(-)

New commits:
commit d24694fb1b273aeeba8717638d23d190953fb82f
Author: Takeshi Abe 
Date:   Wed Oct 19 16:56:38 2016 +0900

sw: Avoid inheritance from std::list

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

diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index f1b63ca..0aed777 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -498,8 +498,9 @@ public:
 }
 };
 
-class SwAccessibleEventList_Impl: public std::list < SwAccessibleEvent_Impl >
+class SwAccessibleEventList_Impl
 {
+std::list maEvents;
 bool mbFiring;
 
 public:
@@ -517,6 +518,19 @@ public:
 }
 
 void MoveMissingXAccToEnd();
+
+size_t size() const { return maEvents.size(); }
+std::list::iterator begin() { return 
maEvents.begin(); }
+std::list::iterator end() { return maEvents.end(); 
}
+std::list::iterator insert( 
std::list::iterator aIter,
+const 
SwAccessibleEvent_Impl& rEvent )
+{
+return maEvents.insert( aIter, rEvent );
+}
+std::list::iterator erase( 
std::list::iterator aPos )
+{
+return maEvents.erase( aPos );
+}
 };
 
 // see comment in SwAccessibleMap::InvalidatePosOrSize()
@@ -529,7 +543,7 @@ void SwAccessibleEventList_Impl::MoveMissingXAccToEnd()
 return;
 }
 SwAccessibleEventList_Impl lstEvent;
-for (iterator li = begin(); li != end(); )
+for (auto li = begin(); li != end(); )
 {
 if (li->IsNoXaccParentFrame())
 {
@@ -540,7 +554,7 @@ void SwAccessibleEventList_Impl::MoveMissingXAccToEnd()
 ++li;
 }
 OSL_ENSURE(size() + lstEvent.size() == nSize ,"");
-insert(end(),lstEvent.begin(),lstEvent.end());
+maEvents.insert(end(),lstEvent.begin(),lstEvent.end());
 OSL_ENSURE(size() == nSize ,"");
 }
 
@@ -567,7 +581,7 @@ class SwAccessibleEventMap_Impl
 {
 public:
 typedef SwAccessibleChild   
key_type;
-typedef SwAccessibleEventList_Impl::iterator
mapped_type;
+typedef std::list::iterator 
mapped_type;
 typedef std::pair   
value_type;
 typedef SwAccessibleChildFunc   
key_compare;
 typedef std::map::iterator
iterator;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Yousuf Philips]

 sw/uiconfig/swriter/ui/notebookbar_groups.ui |  367 +++
 1 file changed, 212 insertions(+), 155 deletions(-)

New commits:
commit 10b24e7fa8a9368e3d20e8511172bc01f04f5a1a
Author: Yousuf Philips 
Date:   Wed Oct 19 02:46:42 2016 +0400

tdf#103170 Heikobar: hide list buttons and add third column to insert

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

diff --git a/sw/uiconfig/swriter/ui/notebookbar_groups.ui 
b/sw/uiconfig/swriter/ui/notebookbar_groups.ui
index c2b2a60..dd3b906 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groups.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groups.ui
@@ -1,8 +1,8 @@
 
-
+
 
   
-  
+  
   
   
 True
@@ -19,11 +19,6 @@
 False
 cmd/sc_centerpara.png
   
-  
-True
-False
-cmd/sc_insertobjectchart.png
-  
   
 True
 False
@@ -942,6 +937,7 @@
 True
 False
 center
+vertical
 
   
 True
@@ -1263,18 +1259,18 @@
 False
 vertical
 
-  
+  
 26
 True
 False
 False
 
-  
+  
 False
 True
 False
 True
-.uno:BackColor
+.uno:BackgroundColor
 True
   
   
@@ -1291,18 +1287,18 @@
   
 
 
-  
+  
 26
 True
 False
 False
 
-  
+  
 False
 True
 False
 True
-.uno:BackgroundColor
+.uno:BackColor
 True
   
   
@@ -1315,11 +1311,11 @@
 False
 True
 end
-0
+1
   
 
 
-  
+  
 26
 True
 False
@@ -1343,7 +1339,7 @@
 False
 True
 end
-1
+2
   
 
   
@@ -1355,7 +1351,6 @@
 
 
   
-True
 False
 vertical
 3
@@ -1426,7 +1421,7 @@
 15
 True
 False
-Format
+Text
 
   
   
@@ -1463,160 +1458,141 @@
 False
 vertical
 
-  
+  
+True
 False
 3
 3
 vertical
 5
 
-  
+  
+78
 True
 False
-6
 
-  
-Style
-70
-78
+  
 True
-True
-True
-tablestylei
-none
-top
-  
-  
-False
-True
-0
-  
-
-
-  
 False
 vertical
 
-  
-Rows
+  
+26
+True
+False
+both-horiz
+
+  
+True
+False
+True
+   

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

[Yousuf Philips]

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

New commits:
commit 2f3f06461e7c830105935a1590ff9f181169dff5
Author: Yousuf Philips 
Date:   Sun Oct 16 21:59:57 2016 +0400

tdf#102284 Allow footnote separator thickness of 0pt

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

diff --git a/sw/uiconfig/swriter/ui/footnoteareapage.ui 
b/sw/uiconfig/swriter/ui/footnoteareapage.ui
index 1a921ee..adcfbdb 100644
--- a/sw/uiconfig/swriter/ui/footnoteareapage.ui
+++ b/sw/uiconfig/swriter/ui/footnoteareapage.ui
@@ -16,7 +16,7 @@
 10
   
   
-0.25
+0.00
 9
 0.25
 1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extras/Package_tplpresnt.mk extras/source

[Yousuf Philips]

 dev/null|binary
 extras/Package_tplpresnt.mk |3 ---
 2 files changed, 3 deletions(-)

New commits:
commit 0ae76ce8bac0b1679598f27e5883af1e33f403c6
Author: Yousuf Philips 
Date:   Tue Oct 18 19:17:18 2016 +0400

tdf#103317 remove single master simple gradient templates

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

diff --git a/extras/Package_tplpresnt.mk b/extras/Package_tplpresnt.mk
index 6c7c36b..442b410 100644
--- a/extras/Package_tplpresnt.mk
+++ b/extras/Package_tplpresnt.mk
@@ -10,9 +10,6 @@
 $(eval $(call 
gb_Package_Package,extras_tplpresnt,$(SRCDIR)/extras/source/templates/presnt))
 
 $(eval $(call 
gb_Package_add_files,extras_tplpresnt,$(LIBO_SHARE_FOLDER)/template/common/presnt,\
-   AbstractGreen.otp \
-   AbstractRed.otp \
-   AbstractYellow.otp \
BrightBlue.otp \
DNA.otp \
Inspiration.otp \
diff --git a/extras/source/templates/presnt/AbstractGreen.otp 
b/extras/source/templates/presnt/AbstractGreen.otp
deleted file mode 100644
index 0ac2540..000
Binary files a/extras/source/templates/presnt/AbstractGreen.otp and /dev/null 
differ
diff --git a/extras/source/templates/presnt/AbstractRed.otp 
b/extras/source/templates/presnt/AbstractRed.otp
deleted file mode 100644
index a43f80b..000
Binary files a/extras/source/templates/presnt/AbstractRed.otp and /dev/null 
differ
diff --git a/extras/source/templates/presnt/AbstractYellow.otp 
b/extras/source/templates/presnt/AbstractYellow.otp
deleted file mode 100644
index 59829b4..000
Binary files a/extras/source/templates/presnt/AbstractYellow.otp and /dev/null 
differ
___
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.1' - desktop/source

[Michael Meeks]

 desktop/source/lib/init.cxx |   74 
 1 file changed, 68 insertions(+), 6 deletions(-)

New commits:
commit eb69d8cb5eb6192de89ca8310a53ae7a434a73d1
Author: Michael Meeks 
Date:   Wed Oct 19 14:34:22 2016 +0100

LOK: hold the solar mutex consistently for document method calls.

Change-Id: I200dff44b457a1632d99619981e237de73a2a8df

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index da12579..e6a9303 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -912,6 +912,8 @@ void CallbackFlushHandler::removeViewStates(int viewId)
 
 static void doc_destroy(LibreOfficeKitDocument *pThis)
 {
+SolarMutexGuard aGuard;
+
 LibLODocument_Impl *pDocument = static_cast(pThis);
 delete pDocument;
 }
@@ -989,10 +991,10 @@ static LibreOfficeKitDocument* 
lo_documentLoad(LibreOfficeKit* pThis, const char
 
 static LibreOfficeKitDocument* lo_documentLoadWithOptions(LibreOfficeKit* 
pThis, const char* pURL, const char* pOptions)
 {
-LibLibreOffice_Impl* pLib = static_cast(pThis);
-
 SolarMutexGuard aGuard;
 
+LibLibreOffice_Impl* pLib = static_cast(pThis);
+
 OUString aURL(getAbsoluteURL(pURL));
 if (aURL.isEmpty())
 {
@@ -1080,6 +1082,8 @@ static void lo_registerCallback (LibreOfficeKit* pThis,
  LibreOfficeKitCallback pCallback,
  void* pData)
 {
+SolarMutexGuard aGuard;
+
 LibLibreOffice_Impl* pLib = static_cast(pThis);
 
 pLib->mpCallback = pCallback;
@@ -1088,6 +1092,8 @@ static void lo_registerCallback (LibreOfficeKit* pThis,
 
 static int doc_saveAs(LibreOfficeKitDocument* pThis, const char* sUrl, const 
char* pFormat, const char* pFilterOptions)
 {
+SolarMutexGuard aGuard;
+
 LibLODocument_Impl* pDocument = static_cast(pThis);
 
 OUString sFormat = getUString(pFormat);
@@ -1213,6 +1219,8 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis, 
const char* sUrl, const cha
 
 static void doc_iniUnoCommands ()
 {
+SolarMutexGuard aGuard;
+
 OUString sUnoCommands[] =
 {
 OUString(".uno:BackColor"),
@@ -1330,6 +1338,8 @@ static void doc_iniUnoCommands ()
 
 static int doc_getDocumentType (LibreOfficeKitDocument* pThis)
 {
+SolarMutexGuard aGuard;
+
 LibLODocument_Impl* pDocument = static_cast(pThis);
 
 try
@@ -1366,6 +1376,8 @@ static int doc_getDocumentType (LibreOfficeKitDocument* 
pThis)
 
 static int doc_getParts (LibreOfficeKitDocument* pThis)
 {
+SolarMutexGuard aGuard;
+
 ITiledRenderable* pDoc = getTiledRenderable(pThis);
 if (!pDoc)
 {
@@ -1378,6 +1390,8 @@ static int doc_getParts (LibreOfficeKitDocument* pThis)
 
 static int doc_getPart (LibreOfficeKitDocument* pThis)
 {
+SolarMutexGuard aGuard;
+
 ITiledRenderable* pDoc = getTiledRenderable(pThis);
 if (!pDoc)
 {
@@ -1390,6 +1404,8 @@ static int doc_getPart (LibreOfficeKitDocument* pThis)
 
 static void doc_setPart(LibreOfficeKitDocument* pThis, int nPart)
 {
+SolarMutexGuard aGuard;
+
 ITiledRenderable* pDoc = getTiledRenderable(pThis);
 if (!pDoc)
 {
@@ -1397,12 +1413,13 @@ static void doc_setPart(LibreOfficeKitDocument* pThis, 
int nPart)
 return;
 }
 
-SolarMutexGuard aGuard;
 pDoc->setPart( nPart );
 }
 
 static char* doc_getPartPageRectangles(LibreOfficeKitDocument* pThis)
 {
+SolarMutexGuard aGuard;
+
 ITiledRenderable* pDoc = getTiledRenderable(pThis);
 if (!pDoc)
 {
@@ -1420,6 +1437,8 @@ static char* 
doc_getPartPageRectangles(LibreOfficeKitDocument* pThis)
 
 static char* doc_getPartName(LibreOfficeKitDocument* pThis, int nPart)
 {
+SolarMutexGuard aGuard;
+
 ITiledRenderable* pDoc = getTiledRenderable(pThis);
 if (!pDoc)
 {
@@ -1437,6 +1456,8 @@ static char* doc_getPartName(LibreOfficeKitDocument* 
pThis, int nPart)
 
 static char* doc_getPartHash(LibreOfficeKitDocument* pThis, int nPart)
 {
+SolarMutexGuard aGuard;
+
 ITiledRenderable* pDoc = getTiledRenderable(pThis);
 if (!pDoc)
 {
@@ -1455,6 +1476,8 @@ static char* doc_getPartHash(LibreOfficeKitDocument* 
pThis, int nPart)
 static void doc_setPartMode(LibreOfficeKitDocument* pThis,
 int nPartMode)
 {
+SolarMutexGuard aGuard;
+
 ITiledRenderable* pDoc = getTiledRenderable(pThis);
 if (!pDoc)
 {
@@ -1462,7 +1485,6 @@ static void doc_setPartMode(LibreOfficeKitDocument* pThis,
 return;
 }
 
-SolarMutexGuard aGuard;
 
 int nCurrentPart = pDoc->getPart();
 
@@ -1493,6 +1515,8 @@ void doc_paintTile(LibreOfficeKitDocument* pThis,
const int nTilePosX, const int nTilePosY,
const int nTileWidth, const int nTileHeight)
 {
+SolarMutexGuard aGuard;
+
 SAL_INFO( "lok.tiledrendering", "paintTile: painting [" << nTileWidth << 
"x" << nTileHeight <<
   "]@(" << nTilePosX << ", " << nTilePosY << ") to [" <<
   nCa

[Libreoffice-commits] core.git: Branch 'feature/new-vcl-scheduler' - 181 commits - accessibility/source avmedia/source basctl/source basegfx/source basic/inc basic/source chart2/source comphelper/sour

[Jan-Marek Glogowski]

Rebased ref, commits from common ancestor:
commit 45c3dd568b17648b6decf45fe41dcc44803473d6
Author: Jan-Marek Glogowski 
Date:   Fri Oct 14 16:05:58 2016 +0200

Correctly handle nested task processing calls

If ProcessTaskScheduling is called to process tasks while inside
Invoke(), the assumptions about the list pointers in the parent
call will be void.

There would be two possible solutions:
  1. Nested calls are forbidden to change the list, except for
 adding tasks.
  2. The parent call must be informed of the changes and update
 the pointers.

Since we want to be able to remove processed tasks in nested calls,
we go with option 2, which has a slight overhead but won't exhaust
memory, because it can't release processed tasks.

Change-Id: I7a3910a9a4677988dff1d5a7648a67d66fb41056

diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 27c4cfc..02ffdc1 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -318,6 +318,7 @@ struct ImplSVData
 ImplSchedulerData*  mpFirstSchedulerData = nullptr; // list of all 
running tasks
 ImplSchedulerData*  mpFreeSchedulerData = nullptr;  // list of all 
deleted tasks for reuse
 boolmbNeedsReschedule = false;  // was the list of 
tasks changed?
+boolmbTaskRemoved = false;  // was a task 
removed
 sal_uInt64  mnTimerPeriod = 0;  // current timer 
period / sleep time
 sal_uInt64  mnLastUpdate = 0;   // last scheduler 
time
 SalTimer*   mpSalTimer = nullptr;   // interface to 
sal event loop/timers
diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx
index 8e26711..c6418d9 100644
--- a/vcl/source/app/scheduler.cxx
+++ b/vcl/source/app/scheduler.cxx
@@ -177,6 +177,7 @@ bool Scheduler::ProcessTaskScheduling( IdleRunPolicy 
eIdleRunPolicy )
 ImplSchedulerData *pPrevMostUrgent = nullptr;
 ImplSchedulerData *pMostUrgent = nullptr;
 sal_uInt64 nMinPeriod = InfiniteTimeoutMs;
+bool   bIsNestedCall = false;
 
 DBG_TESTSOLARMUTEX();
 
@@ -193,7 +194,10 @@ bool Scheduler::ProcessTaskScheduling( IdleRunPolicy 
eIdleRunPolicy )
 #endif
 // Skip invoked task
 if ( pSchedulerData->mbInScheduler )
+{
+bIsNestedCall = true;
 goto next_entry;
+}
 
 // Can this task be removed from scheduling?
 if ( !pSchedulerData->mpScheduler )
@@ -206,6 +210,7 @@ bool Scheduler::ProcessTaskScheduling( IdleRunPolicy 
eIdleRunPolicy )
 pSchedulerData->mpNext = pSVData->mpFreeSchedulerData;
 pSVData->mpFreeSchedulerData = pSchedulerData;
 pSchedulerData = pNextSchedulerData;
+pSVData->mbTaskRemoved = true;
 continue;
 }
 
@@ -232,6 +237,10 @@ next_entry:
 
 assert( !pSchedulerData );
 
+// We just have to handle removed tasks for nested calls
+if ( !bIsNestedCall )
+pSVData->mbTaskRemoved = false;
+
 if ( pMostUrgent )
 {
 assert( pPrevMostUrgent != pMostUrgent );
@@ -244,6 +253,14 @@ next_entry:
 SAL_INFO_IF( !pMostUrgent->mpScheduler, "vcl.schedule", 
tools::Time::GetSystemTicks()
  << " " << pMostUrgent <<  "  tag-rm " );
 
+// If there were some tasks removed, our list pointers may be invalid,
+// except pMostUrgent, which is protected by mbInScheduler
+if ( pSVData->mbTaskRemoved )
+{
+nMinPeriod = ImmediateTimeoutMs;
+pPrevSchedulerData = pMostUrgent;
+}
+
 // do some simple round-robin scheduling
 // nothing to do, if we're already the last element
 if ( pMostUrgent->mpScheduler )
@@ -253,6 +270,19 @@ next_entry:
 
 if ( pMostUrgent->mpNext )
 {
+// see ^
+if ( pSVData->mbTaskRemoved )
+{
+pPrevMostUrgent = pSVData->mpFirstSchedulerData;
+if ( pPrevMostUrgent != pMostUrgent )
+{
+while ( pPrevMostUrgent && pPrevMostUrgent->mpNext != 
pMostUrgent )
+pPrevMostUrgent = pPrevMostUrgent->mpNext;
+assert( pPrevMostUrgent );
+}
+else
+pPrevMostUrgent = nullptr;
+}
 if ( pPrevMostUrgent )
 pPrevMostUrgent->mpNext = pMostUrgent->mpNext;
 else
commit fa550e2a173cbdc938597f80a79f1e9e9a7e0652
Author: Jan-Marek Glogowski 
Date:   Tue Sep 13 11:03:08 2016 +0200

Round-robin invoked auto tasks

Add some simple round-robin to the task processing, so equal
priority (auto) tasks won't always be scheduled, if there are
multiple tasks with the same priority.

Change-Id: 

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

[Caolán McNamara]

 comphelper/source/misc/backupfilehelper.cxx |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 724f2b20d83c340d9cb1221766a741f432ed9204
Author: Caolán McNamara 
Date:   Wed Oct 19 15:07:14 2016 +0100

coverity#1373663 Untrusted loop bound

Change-Id: Iabad14f8fc35656015b98693dd327a41aeaf63c7

diff --git a/comphelper/source/misc/backupfilehelper.cxx 
b/comphelper/source/misc/backupfilehelper.cxx
index 60ad11a9..5c55ca4 100644
--- a/comphelper/source/misc/backupfilehelper.cxx
+++ b/comphelper/source/misc/backupfilehelper.cxx
@@ -105,14 +105,7 @@ namespace
 // read rTarget
 if (osl::File::E_None == rFile->read(static_cast(aArray), 4, 
nBaseRead) && 4 == nBaseRead)
 {
-//This is untainted data which comes from a controlled source
-//so, using a byte-swapping pattern which coverity doesn't
-//detect as such
-
//http://security.coverity.com/blog/2014/Apr/on-detecting-heartbleed-with-static-analysis.html
-rTarget = aArray[0]; rTarget <<= 8;
-rTarget |= aArray[1]; rTarget <<= 8;
-rTarget |= aArray[2]; rTarget <<= 8;
-rTarget |= aArray[3];
+rTarget = (sal_uInt32(aArray[0]) << 24) + (sal_uInt32(aArray[1]) 
<< 16) + (sal_uInt32(aArray[2]) << 8) + sal_uInt32(aArray[3]);
 return true;
 }
 
@@ -674,6 +667,13 @@ namespace
 return false;
 }
 
+// coverity#1373663 Untrusted loop bound, check file size
+// isn't utterly broken
+sal_uInt64 nFileSize(0);
+rFile->getSize(nFileSize);
+if (nFileSize < nExtEntries)
+return false;
+
 for (sal_uInt32 a(0); a < nExtEntries; a++)
 {
 ExtensionInfoEntry aNewEntry;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/filter/ww8/wrtww8.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f7397024fef154f7bedcb844678e1cabba1e5cd8
Author: Caolán McNamara 
Date:   Wed Oct 19 15:26:50 2016 +0100

coverity#1371215 Missing move assignment operator

Change-Id: Icfea2ad2ba98d7537cf1963ad3832ade192c5fd4

diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 7afa944..e54c4b2 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2763,7 +2763,7 @@ void MSWordExportBase::WriteText()
 }
 
 if (pNextNode != nullptr)
-m_pCurPam->GetPoint()->nNode = SwNodeIndex(*pNextNode);
+m_pCurPam->GetPoint()->nNode.Assign(*pNextNode);
 else
 ++m_pCurPam->GetPoint()->nNode;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 xmlsecurity/source/pdfio/pdfdocument.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e9834a3eaf35a2c7b61cf45c2d64e9f3bbe89982
Author: Miklos Vajna 
Date:   Wed Oct 19 12:36:37 2016 +0200

xmlsecurity: fix the PDF incremental update's cross-references table

The VCL pdf export writes a space after the in-use entry, and turns out
Adobe Acrobat starts to "repair" the file if there is no such space.
Which means the signature is validated against the repaired document,
resulting in a "The signature byte range is invalid" error message,
hiding the root cause.

Not that ISO-32000 7.5.4 "Cross-References Table" would mention the need
for such whitespace at the end of the lines.

Change-Id: I165b57809550f184f374c00f28426a3cd813c63f

diff --git a/xmlsecurity/source/pdfio/pdfdocument.cxx 
b/xmlsecurity/source/pdfio/pdfdocument.cxx
index 6e807a4..ad488cf 100644
--- a/xmlsecurity/source/pdfio/pdfdocument.cxx
+++ b/xmlsecurity/source/pdfio/pdfdocument.cxx
@@ -462,9 +462,9 @@ bool PDFDocument::Sign(const 
uno::Reference& xCertificat
 while (aBuffer.getLength() < 10)
 aBuffer.insert(0, "0");
 if (nObject == 0)
-aBuffer.append(" 65535 f\n");
+aBuffer.append(" 65535 f \n");
 else
-aBuffer.append(" 0 n\n");
+aBuffer.append(" 0 n \n");
 m_aEditBuffer.WriteOString(aBuffer.toString());
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/core/crsr/swcrsr.cxx  |5 -
 sw/source/core/doc/DocumentContentOperationsManager.cxx |2 +-
 sw/source/core/docnode/ndtbl.cxx|2 +-
 sw/source/core/docnode/node.cxx |2 +-
 sw/source/core/text/frmcrsr.cxx |7 +++
 sw/source/core/undo/untbl.cxx   |2 +-
 sw/source/filter/ww8/ww8par.cxx |2 +-
 7 files changed, 12 insertions(+), 10 deletions(-)

New commits:
commit af84c70c95e99935d2efdb98bc105d2a7852ebda
Author: Caolán McNamara 
Date:   Wed Oct 19 15:37:34 2016 +0100

coverity#1371301 Missing move assignment operator

Change-Id: Ibd6d4b52c24989af6872b4eb3c6c585c1e24a4db

diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 56dc9a0..69de007 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -1965,7 +1965,10 @@ bool SwCursor::GoPrevNextCell( bool bNext, sal_uInt16 
nCnt )
 (!bNext && !aCellIdx.GetNode().IsEndNode()) )
 return false;
 
-rPtIdx = bNext ? aCellIdx : 
SwNodeIndex(*aCellIdx.GetNode().StartOfSectionNode());
+if (bNext)
+rPtIdx = aCellIdx;
+else
+rPtIdx.Assign(*aCellIdx.GetNode().StartOfSectionNode());
 
 pTableBoxStartNode = rPtIdx.GetNode().FindTableBoxStartNode();
 pTableBox = pTableBoxStartNode->GetTableBox();
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index e051892..b0d05c3 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -1420,7 +1420,7 @@ SwTableNode* SwNodes::TextToTable( const 
SwNodes::TableRanges_t & rTableNodes,
 aCellNodeIdx.GetNode().m_pStartOfSection = pSttNd;
 //skip start/end node pairs
 if( aCellNodeIdx.GetNode().IsStartNode() )
-aCellNodeIdx = SwNodeIndex( 
*aCellNodeIdx.GetNode().EndOfSectionNode() );
+
aCellNodeIdx.Assign(*aCellNodeIdx.GetNode().EndOfSectionNode());
 }
 
 // assign Section to the Box
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 8ab388c..50c6e18 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -833,7 +833,7 @@ sal_uInt8 SwNode::HasPrevNextLayNode() const
 if( IsValidNextPrevNd( aIdx.GetNode() ))
 nRet |= ND_HAS_PREV_LAYNODE;
 // #i77805# - skip section start and end nodes
-aIdx = SwNodeIndex( *this, +1 );
+aIdx.Assign(*this, +1);
 while ( aIdx.GetNode().IsSectionNode() ||
 ( aIdx.GetNode().IsEndNode() &&
   aIdx.GetNode().StartOfSectionNode()->IsSectionNode() ) )
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 35320c4..f6add22 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4569,7 +4569,7 @@ void wwSectionManager::InsertSegments()
 mrReader.m_rDoc.GetNodes().MakeTextNode(aAnchor,
 
mrReader.m_rDoc.getIDocumentStylePoolAccess().GetTextCollFromPool( 
RES_POOLCOLL_TEXT ));
 
-aSectPaM.GetPoint()->nNode = SwNodeIndex(*pTextNd);
+aSectPaM.GetPoint()->nNode.Assign(*pTextNd);
 aSectPaM.GetPoint()->nContent.Assign(
 aSectPaM.GetContentNode(), 0);
 }
commit e8baf2d2f1d3eaa6fadbda0ff3ef798a497bbdec
Author: Caolán McNamara 
Date:   Wed Oct 19 15:32:53 2016 +0100

coverity#1371270 Missing move assignment operator

Change-Id: I9a5656fa3a4d4283a1daec957da9d909390d9eb2

diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx 
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index f12fd3b..7cd5c76 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -4516,7 +4516,7 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& 
rPam, SwPosition& rPos,
 {
 assert(*pCopyPam->GetPoint() == rPos);
 // the Node rPos points to may be deleted so unregister ...
-rPos.nContent = SwIndex(nullptr);
+rPos.nContent.Assign(nullptr, 0);
 lcl_DeleteRedlines(rPam, *pCopyPam);
 rPos = *pCopyPam->GetPoint(); // ... and restore.
 }
diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index d2c4a89..130c710 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -689,7 +689,7 @@ bool SwTextFrame::LeftMargin(SwPaM *pPam) const
 nIndx = 0;
 }
 }
-pPam->GetPoint()->nContent = SwIndex( pFrame->GetTextNode(), nIndx );
+pPam->GetPoint()->nContent.Assign(pFrame->GetTextNode(), nIndx);
 SwTextCursor::SetRightMargin( false );
 return true;
 }
@@

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

[Tor Lillqvist]

 desktop/source/lib/init.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 2447b5ef00d0e3e3cc9dabe7ab29ce0ec118d9f2
Author: Tor Lillqvist 
Date:   Wed Oct 19 17:58:08 2016 +0300

Avoid deadlock in CppunitTest_libreofficekit_tiledrendering

Change-Id: Ief6f39400381764a5f41812a045ff2477aaecaeb

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index e6a9303..ab7b557 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2913,7 +2913,7 @@ int lok_preinit(const char* install_path, const char* 
user_profile_path)
 
 static void lo_destroy(LibreOfficeKit* pThis)
 {
-SolarMutexGuard aGuard;
+SolarMutexClearableGuard aGuard;
 
 bool bSuccess = false;
 LibLibreOffice_Impl* pLib = static_cast(pThis);
@@ -2935,6 +2935,8 @@ static void lo_destroy(LibreOfficeKit* pThis)
 Application::Quit();
 }
 
+aGuard.clear();
+
 osl_joinWithThread(pLib->maThread);
 osl_destroyThread(pLib->maThread);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 3 commits - loleaflet/dist loleaflet/src loolwsd/ClientSession.cpp loolwsd/ClientSession.hpp loolwsd/DocumentBroker.cpp loolwsd/LOOLWSD.cpp loolwsd/protocol.txt loolw

[Pranav Kant]

 loleaflet/dist/toolbar/toolbar.js |3 ++-
 loleaflet/src/control/Parts.js|3 +++
 loleaflet/src/core/Socket.js  |   13 +
 loolwsd/ClientSession.cpp |7 +++
 loolwsd/ClientSession.hpp |1 +
 loolwsd/DocumentBroker.cpp|   12 +++-
 loolwsd/LOOLWSD.cpp   |3 +++
 loolwsd/Storage.cpp   |   10 +++---
 loolwsd/Storage.hpp   |9 ++---
 loolwsd/protocol.txt  |5 +
 10 files changed, 58 insertions(+), 8 deletions(-)

New commits:
commit 9f69359b33c40a2c196f43bee4c91cfc0d5b0a31
Author: Pranav Kant 
Date:   Wed Oct 19 21:08:33 2016 +0530

loleaflet: Disable these toolbar buttons too, in readonly mode

Change-Id: I8bc661dd3cfd689c7c7ded367deacdba853153e4

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index 4f2b649..dc2b8b5 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -488,7 +488,8 @@ var formatButtons = {
'annotation': true, 'inserttable': true,
'fontcolor': true, 'backcolor': true, 'bullet': true, 'numbering': true,
'alignleft': true, 'alignhorizontal': true, 'alignright': true, 
'alignblock': true,
-   'incrementindent': true, 'decrementindent': true, 'insertgraphic': true
+   'incrementindent': true, 'decrementindent': true, 'insertgraphic': true,
+   'insertfootnote': true, 'repair': true
 };
 
 var userJoinedPopupMessage = '' + _('%user has joined') + '';
commit 1be2a78564afd84172aba44edc4bab42cd30c34d
Author: Pranav Kant 
Date:   Wed Oct 19 20:22:53 2016 +0530

Handle WOPI's UserCanWrite to determine readonliness

permission= parameter in URL is still supported, but overridden
by UserCanWrite parameter.

Also, introduce a new protocol message, perm: which dictates
loleaflet about the permission rather than the other way around
(only in case of WOPI)

It is to be noted that by default loolwsd assumes very
restrictive permissions, so not providing UserCanWrite in WOPI
implementation by a WOPI host would lead to opening of only
readonly session.

Change-Id: I2013c1661fd491c79bb367a41e1a7036fa03f984

diff --git a/loleaflet/src/control/Parts.js b/loleaflet/src/control/Parts.js
index cdde4d1..1139594 100644
--- a/loleaflet/src/control/Parts.js
+++ b/loleaflet/src/control/Parts.js
@@ -295,6 +295,9 @@ L.Map.include({
},
 
getDocType: function () {
+   if (!this._docLayer)
+   return null;
+
return this._docLayer._docType;
}
 });
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index c0c9cdb..9258858 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -144,6 +144,19 @@ L.Socket = L.Class.extend({
 lokitVersionObj.ProductVersion 
+ lokitVersionObj.ProductExtension.replace('.10.','-') +
 ' (git hash: ' + 
lokitVersionObj.BuildId.substring(0, 7) + ')');
}
+   else if (textMsg.startsWith('perm:')) {
+   var perm = textMsg.substring('perm:'.length);
+
+   // This message is often received very early before 
doclayer is initialized
+   // Change options.permission so that when docLayer is 
initialized, it
+   // picks up the new value of permission rather than 
something else
+   this._map.options.permission = 'readonly';
+   // Lets also try to set the permission ourself since 
this can well be received
+   // after doclayer is initialized. There's no harm to 
call this in any case.
+   this._map.setPermission(perm);
+
+   return;
+   }
else if (textMsg.startsWith('error:') && command.errorCmd === 
'internal') {
this._map._fatal = true;
if (command.errorKind === 'diskfull') {
diff --git a/loolwsd/ClientSession.cpp b/loolwsd/ClientSession.cpp
index 2aad600..ee5510b 100644
--- a/loolwsd/ClientSession.cpp
+++ b/loolwsd/ClientSession.cpp
@@ -368,4 +368,11 @@ bool ClientSession::forwardToChild(const std::string& 
message,
 return docBroker->forwardToChild(getId(), message);
 }
 
+void ClientSession::setReadOnly()
+{
+_isReadOnly = true;
+// Also inform the client
+sendTextFrame("perm: readonly");
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/loolwsd/ClientSession.hpp b/loolwsd/ClientSession.hpp
index 201e7c1..6ba901b 100644
--- a/loolwsd/ClientSession.hpp
+++ b/loolwsd/ClientSession.hpp
@@ -30,6 +30,7 @@ public:
 
 virtual ~ClientSession();
 
+void setReadOnly();
 bool isReadOnly() const { return _isReadOnly; }
 
 void setPeer(const std::shared_ptr& peer) { _

[Libreoffice-commits] core.git: basctl/uiconfig chart2/uiconfig dbaccess/uiconfig extensions/uiconfig framework/uiconfig include/sfx2 officecfg/registry reportdesign/uiconfig sc/uiconfig sd/uiconfig s

[Olivier Hallot]

 basctl/uiconfig/basicide/menubar/menubar.xml |1 
 chart2/uiconfig/menubar/menubar.xml  |1 
 dbaccess/uiconfig/dbapp/menubar/menubar.xml  |1 
 dbaccess/uiconfig/dbquery/menubar/menubar.xml|1 
 dbaccess/uiconfig/dbrelation/menubar/menubar.xml |1 
 dbaccess/uiconfig/dbtable/menubar/menubar.xml|1 
 dbaccess/uiconfig/dbtdata/menubar/menubar.xml|1 
 extensions/uiconfig/sbibliography/menubar/menubar.xml|1 
 framework/uiconfig/startmodule/menubar/menubar.xml   |1 
 include/sfx2/sfxsids.hrc |1 
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |5 +
 reportdesign/uiconfig/dbreport/menubar/menubar.xml   |1 
 sc/uiconfig/scalc/menubar/menubar.xml|1 
 sd/uiconfig/sdraw/menubar/menubar.xml|1 
 sd/uiconfig/simpress/menubar/menubar.xml |1 
 sfx2/sdi/appslots.sdi|4 +
 sfx2/sdi/sfx.sdi |   14 

 sfx2/source/appl/appserv.cxx |   32 
+++---
 starmath/uiconfig/smath/menubar/menubar.xml  |1 
 sw/uiconfig/sglobal/menubar/menubar.xml  |1 
 sw/uiconfig/sweb/menubar/menubar.xml |1 
 sw/uiconfig/swform/menubar/menubar.xml   |1 
 sw/uiconfig/swreport/menubar/menubar.xml |1 
 sw/uiconfig/swriter/menubar/menubar.xml  |1 
 sw/uiconfig/swxform/menubar/menubar.xml  |1 
 25 files changed, 56 insertions(+), 20 deletions(-)

New commits:
commit e91a1abe4c53ea3a1ac59e3c1d5dddf98141a4ee
Author: Olivier Hallot 
Date:   Sat Sep 10 13:38:52 2016 -0300

tdf#96015 (part) link to Doc'tation in Help menu

Add the entry "Documentation" to the modules Help menu.

on click, the system browser opens
http://hub.libreoffice.org/documentation/?&LOlang=

 is obtained from .getLocale()

Patch2: create a member with try/catch for external URLs

Patch3
Use sfx2::openUriExternally
Revert to User Guides.. in UI.

Change-Id: I8332253c31bd3be330cdd794f9e056b632b38037
Patch4: remove 1st '&' in URLs
Reviewed-on: https://gerrit.libreoffice.org/28817
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 

diff --git a/basctl/uiconfig/basicide/menubar/menubar.xml 
b/basctl/uiconfig/basicide/menubar/menubar.xml
index 62c7ded..2a177f6 100644
--- a/basctl/uiconfig/basicide/menubar/menubar.xml
+++ b/basctl/uiconfig/basicide/menubar/menubar.xml
@@ -96,6 +96,7 @@
 
 
 
+
 
 
 
diff --git a/chart2/uiconfig/menubar/menubar.xml 
b/chart2/uiconfig/menubar/menubar.xml
index ddf7af1..032e758 100644
--- a/chart2/uiconfig/menubar/menubar.xml
+++ b/chart2/uiconfig/menubar/menubar.xml
@@ -167,6 +167,7 @@
 
 
 
+
 
 
 
diff --git a/dbaccess/uiconfig/dbapp/menubar/menubar.xml 
b/dbaccess/uiconfig/dbapp/menubar/menubar.xml
index 97cad1c..ecffe81 100644
--- a/dbaccess/uiconfig/dbapp/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbapp/menubar/menubar.xml
@@ -152,6 +152,7 @@
 
 
 
+
 
 
 
diff --git a/dbaccess/uiconfig/dbquery/menubar/menubar.xml 
b/dbaccess/uiconfig/dbquery/menubar/menubar.xml
index 14d1acf..bd46041 100644
--- a/dbaccess/uiconfig/dbquery/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbquery/menubar/menubar.xml
@@ -93,6 +93,7 @@
 
 
 
+
 
 
 
diff --git a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml 
b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
index 3df7607..7f88113 100644
--- a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
@@ -76,6 +76,7 @@
 
 
 
+
 
 
 
diff --git a/dbaccess/uiconfig/dbtable/menubar/menubar.xml 
b/dbaccess/uiconfig/dbtable/menubar/menubar.xml
index fa4aefc..ca66a41 100644
--- a/dbaccess/uiconfig/dbtable/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbtable/menubar/menubar.xml
@@ -77,6 +77,7 @@
 
 
 
+
 
 
 
diff --git a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml 
b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml
index 9624cc5..17678fe 100644
--- a/dba

LibreOffice Online integration with Kolab

[Aleksander Machniak]

Hello! I'm working on integrating CODE with Kolab (using WOPI API).

We already use WebODF (+Manticore) as a document editor and we have
collaborative editing implemented. Here we have an iframe with the
editor and our own toolbar with some functionality. Actions of this
toolbar communicates with the editor using javascript postMessage.

Now, I already have CODE working, but I miss some functionality, that
I'd like to have on pair with webodf-based editor.

Here's the list. Please tell me which of this is already possible, which
you would see useful and which does not make sense from your
perspective. Note, I generally would like to use and extend API
described in
https://wopi.readthedocs.io/en/latest/scenarios/postmessage.html#postmessage

1. "ready" event - triggered when editor finished loading. I use it to
hide my own "loading..." element when user can start working on the
document.
2. "getTitle", "setTitle", "titleChanged" - for document title
manipulation. Where "titleChanged" is an event triggered when other user
in the session changed the title. It's about a title not filename.
3. "getExportFormats" - list of supported formats for "Save as" menu.
4. "actionSave" - execute/click "Save" action.
5. "actionExport" - execute/click "Save as" action for selected format.
6. "sessionClosed" - event triggered when an editing session owner
terminates the session. In this case we inform all session members and
close their browser windows, as the "meeting" is over and they can't
continue editing. I'm not sure how that would be possible with CODE,
probably "closeSession" action would be needed too. Still, I don't see a
concept of "session/document owner" in CODE.
7. "getMembers" - return all users in the session (including current user).
8. "memberAdded" - event executed when a new user joins the editing
session. We use this to add user image/name to the list of session
members in our toolbar.
9. "memberRemoved" - as above but when a member closes his editor window.
10. "actionPrint" - execute/click "Print" action.

>From my perspective, the most important are 6-9. Should I create some
tickets?

Regards
-- 
Aleksander Machniak
Software Developer, Kolab Systems AG
---
PGP:19359DC1  -  http://kolabsys.com  -  http://alec.pl
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Miklos Vajna]

 desktop/qa/desktop_lib/test_desktop_lib.cxx |   62 
 sfx2/source/control/bindings.cxx|4 -
 2 files changed, 1 insertion(+), 65 deletions(-)

New commits:
commit b86b78e0ad9bb1e6ed2e22a0fca18cad8d19ded1
Author: Miklos Vajna 
Date:   Wed Oct 19 15:17:14 2016 +0200

Revert "CppunitTest_desktop_lib: add ModifiedStatus callback testcase"

This reverts commit cdf08b3aa74bb32ea18b583a9c0c41b91d7819ac. It breaks
'make -sr CppunitTest_desktop_lib
CPPUNIT_TEST_NAME="DesktopLOKTest::testPaintPartTile
DesktopLOKTest::testWriterCommentInsertCursor" VALGRIND=memcheck' (it is
terminated by SIGSEGV), and also it's the reason why sometimes the
lo_ubsan buildbot fails, see e.g.
.

This has to be re-introduced once I find a way to process all binding
updates at once without side-effects.

Conflicts:
desktop/qa/desktop_lib/test_desktop_lib.cxx
sfx2/source/control/bindings.cxx

Change-Id: Id6c49b9b31095ef1a1a8c1cd92cbae5deb316500

diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index d71df17..1c92165 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -91,7 +91,6 @@ public:
 void testCellCursor();
 void testCommandResult();
 void testWriterComments();
-void testModifiedStatus();
 void testSheetOperations();
 void testSheetSelections();
 void testContextMenuCalc();
@@ -124,7 +123,6 @@ public:
 CPPUNIT_TEST(testCellCursor);
 CPPUNIT_TEST(testCommandResult);
 CPPUNIT_TEST(testWriterComments);
-CPPUNIT_TEST(testModifiedStatus);
 CPPUNIT_TEST(testSheetOperations);
 CPPUNIT_TEST(testSheetSelections);
 CPPUNIT_TEST(testContextMenuCalc);
@@ -755,66 +753,6 @@ void DesktopLOKTest::testWriterComments()
 comphelper::LibreOfficeKit::setActive(false);
 }
 
-void DesktopLOKTest::testModifiedStatus()
-{
-LibLibreOffice_Impl aOffice;
-comphelper::LibreOfficeKit::setActive();
-LibLODocument_Impl* pDocument = loadDoc("blank_text.odt");
-pDocument->pClass->initializeForRendering(pDocument, nullptr);
-pDocument->pClass->registerCallback(pDocument, &DesktopLOKTest::callback, 
this);
-
-// Type "t" and check that the document was set as modified
-m_bModified = false;
-m_aStateChangedCondition.reset();
-pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 't', 0);
-Scheduler::ProcessEventsToIdle();
-TimeValue aTimeValue = { 2 , 0 }; // 2 seconds max
-m_aStateChangedCondition.wait(aTimeValue);
-Scheduler::ProcessEventsToIdle();
-
-// This was false, there was no callback about the modified status change.
-CPPUNIT_ASSERT(m_bModified);
-
-// Perform SaveAs with "TakeOwnership" option set, and check that the
-// modification state was reset
-m_aStateChangedCondition.reset();
-utl::TempFile aTempFile;
-aTempFile.EnableKillingFile();
-CPPUNIT_ASSERT(pDocument->pClass->saveAs(pDocument, 
aTempFile.GetURL().toUtf8().getStr(), "odt", "TakeOwnership"));
-Scheduler::ProcessEventsToIdle();
-m_aStateChangedCondition.wait(aTimeValue);
-Scheduler::ProcessEventsToIdle();
-
-// There was no callback about the modified status change.
-CPPUNIT_ASSERT(!m_bModified);
-
-// Modify the document again
-m_aStateChangedCondition.reset();
-pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 't', 0);
-Scheduler::ProcessEventsToIdle();
-m_aStateChangedCondition.wait(aTimeValue);
-Scheduler::ProcessEventsToIdle();
-
-// There was no callback about the modified status change.
-CPPUNIT_ASSERT(m_bModified);
-
-/*
-// TODO: move this to a test where LOK is fully bootstrapped, so that we 
can
-// get back the notification about ".uno:Save" too
-// Now perform a normal "Save", and check the modified state was reset
-// again
-m_aStateChangedCondition.reset();
-pDocument->pClass->postUnoCommand(pDocument, ".uno:Save", nullptr, false);
-m_aStateChangedCondition.wait(aTimeValue);
-Scheduler::ProcessEventsToIdle();
-
-// There was no callback about the modified status change.
-CPPUNIT_ASSERT(!m_bModified);
-*/
-
-comphelper::LibreOfficeKit::setActive(false);
-}
-
 void DesktopLOKTest::testTrackChanges()
 {
 // Load a document and create two views.
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 04d625a..4562cc1 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -1470,9 +1470,7 @@ bool SfxBindings::NextJob_Impl(Timer * pTimer)
 }
 
 // if possible Update all server / happens in its own time slice
-// but process all events at once when unit testing, for reliability 
reasons
-static bool bTest = getenv("LO_TESTNAME");
-if ( pImpl->bMsgDir

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loleaflet/src

[Pranav Kant]

 loleaflet/src/layer/tile/TileLayer.js |   24 
 1 file changed, 24 deletions(-)

New commits:
commit a36440dda36bf62afb1a8daa215a32fb6dd4af92
Author: Pranav Kant 
Date:   Wed Oct 19 22:52:23 2016 +0530

bccu#2055: Dont follow the cursor/cell anymore

Change-Id: If21466595efdf04bb54f6d02b0f54321bd5004aa

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index c53d73b..107c97c 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -885,19 +885,6 @@ L.TileLayer = L.GridLayer.extend({
var pixBounds = 
L.bounds(this._map.latLngToLayerPoint(this._visibleCursor.getSouthWest()),
 
this._map.latLngToLayerPoint(this._visibleCursor.getNorthEast()));
var cursorPos = this._visibleCursor.getNorthWest();
-
-   if (!e && !this._map.getBounds().contains(this._visibleCursor) 
&& this._isCursorVisible) {
-   var center = this._map.project(cursorPos);
-   center = 
center.subtract(this._map.getSize().divideBy(2));
-   center.x = Math.round(center.x < 0 ? 0 : center.x);
-   center.y = Math.round(center.y < 0 ? 0 : center.y);
-
-   if (!(this._selectionHandles.start && 
this._selectionHandles.start.isDragged) &&
-   !(this._selectionHandles.end && 
this._selectionHandles.end.isDragged)) {
-   this._map.fire('scrollto', {x: center.x, y: 
center.y});
-   }
-   }
-
if (this._map._permission === 'edit' && this._isCursorVisible 
&& this._isCursorOverlayVisible
&& 
!this._isEmptyRectangle(this._visibleCursor)) {
if (this._cursorMarker) {
@@ -1029,17 +1016,6 @@ L.TileLayer = L.GridLayer.extend({
} else if (verticalDirection === -1 && 
this._cellCursor.getSouth() < mapBounds.getSouth()) {
scrollY = this._cellCursor.getSouth() - 
mapBounds.getSouth() - spacingY;
}
-
-   if (scrollX !== 0 || scrollY !== 0) {
-   var newCenter = mapBounds.getCenter();
-   newCenter.lng += scrollX;
-   newCenter.lat += scrollY;
-   var center = 
this._map.project(newCenter);
-   center = 
center.subtract(this._map.getSize().divideBy(2));
-   center.x = Math.round(center.x < 0 ? 0 
: center.x);
-   center.y = Math.round(center.y < 0 ? 0 
: center.y);
-   this._map.fire('scrollto', {x: 
center.x, y: center.y});
-   }
}
 
if (this._cellCursorMarker) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Giuseppe Castagno]

 sfx2/source/dialog/filedlghelper.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 75239b77139434db9be5e0e7e133e3661c5404b0
Author: Giuseppe Castagno 
Date:   Wed Oct 19 12:29:30 2016 +0200

tdf#103274 (10): Add default XCommandEnvironment reference

Change-Id: Ic91553a513656b412bccd73a483ca7d7f131b657
Reviewed-on: https://gerrit.libreoffice.org/30047
Tested-by: Jenkins 
Reviewed-by: Giuseppe Castagno 

diff --git a/sfx2/source/dialog/filedlghelper.cxx 
b/sfx2/source/dialog/filedlghelper.cxx
index b4a79d7..c976b8d 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -2031,7 +2031,9 @@ namespace
 sPathCheck += ".";
 try
 {
-::ucbhelper::Content aContent( sPathCheck, uno::Reference< 
ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() );
+::ucbhelper::Content aContent( sPathCheck,
+   
utl::UCBContentHelper::getDefaultCommandEnvironment(),
+   
comphelper::getProcessComponentContext() );
 bValid = aContent.isFolder();
 }
 catch( const Exception& ) {}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 vcl/source/gdi/CommonSalLayout.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 17cbea4159c369cc9324a67ab2f1aac9cf416476
Author: Stephan Bergmann 
Date:   Wed Oct 19 20:41:14 2016 +0200

loplugin:nullptr, loplugin:redundantcast

Change-Id: Ie7b713a63cec9b714135a2ba840656870596eaef

diff --git a/vcl/source/gdi/CommonSalLayout.cxx 
b/vcl/source/gdi/CommonSalLayout.cxx
index f6088b8..50d7007 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -83,7 +83,7 @@ static hb_blob_t* getFontTable(hb_face_t* /*face*/, hb_tag_t 
nTableTag, void* pU
   );
 #elif defined(MACOSX) || defined(IOS)
 pBlob = hb_blob_create(reinterpret_cast(pBuffer), 
nLength, HB_MEMORY_MODE_READONLY,
-   const_cast(pBuffer), [](void* 
data){ delete[] reinterpret_cast(data); });
+   pBuffer, [](void* data){ delete[] 
static_cast(data); });
 #else
 pBlob = hb_blob_create(reinterpret_cast(pBuffer), 
nLength, HB_MEMORY_MODE_READONLY, nullptr, nullptr);
 #endif
@@ -217,7 +217,7 @@ CommonSalLayout::CommonSalLayout(const CoreTextStyle& 
rCoreTextStyle)
 {
 hb_face_t* pHbFace;
 CTFontRef pCTFont = 
static_cast(CFDictionaryGetValue(rCoreTextStyle.GetStyleDict(), 
kCTFontAttributeName));
-CGFontRef pCGFont = CTFontCopyGraphicsFont(pCTFont, NULL);
+CGFontRef pCGFont = CTFontCopyGraphicsFont(pCTFont, nullptr);
 if (pCGFont)
 pHbFace = hb_coretext_face_create(pCGFont);
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: connectivity/source dbaccess/source filter/source forms/source sdext/source sd/source svtools/source svx/source unotools/source vbahelper/source

[Jochen Nitschke]

 connectivity/source/commontools/dbtools.cxx|8 ++--
 dbaccess/source/core/api/SingleSelectQueryComposer.cxx |3 +--
 dbaccess/source/ui/uno/unosqlmessage.cxx   |5 ++---
 filter/source/pdf/impdialog.cxx|2 +-
 filter/source/pdf/pdfexport.cxx|2 +-
 forms/source/richtext/richtextmodel.cxx|2 +-
 sd/source/ui/animations/CustomAnimationDialog.cxx  |2 +-
 sdext/source/minimizer/optimizationstats.cxx   |2 +-
 svtools/source/graphic/renderer.cxx|2 +-
 svtools/source/uno/unoiface.cxx|2 --
 svx/source/accessibility/AccessibleControlShape.cxx|2 +-
 unotools/source/config/historyoptions.cxx  |8 
 vbahelper/source/vbahelper/vbahelper.cxx   |6 ++
 13 files changed, 18 insertions(+), 28 deletions(-)

New commits:
commit 7567a4c230625bbf922c52c861363f1cc4d6a1c7
Author: Jochen Nitschke 
Date:   Tue Oct 18 12:56:25 2016 +0200

'>>=' with rhs Any is a copy assignment

replace '>>=' operator with '=' where return value is not checked
and simplify. (note: switches lhs with rhs)

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

diff --git a/connectivity/source/commontools/dbtools.cxx 
b/connectivity/source/commontools/dbtools.cxx
index 7352946..0f4b0ad 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -1438,9 +1438,7 @@ bool implUpdateObject(const Reference< XRowUpdate >& 
_rxUpdatedObject,
 {
 case TypeClass_ANY:
 {
-Any aInnerValue;
-_rValue >>= aInnerValue;
-bSuccessfullyReRouted = implUpdateObject(_rxUpdatedObject, 
_nColumnIndex, aInnerValue);
+bSuccessfullyReRouted = implUpdateObject(_rxUpdatedObject, 
_nColumnIndex, _rValue);
 }
 break;
 
@@ -1546,9 +1544,7 @@ bool implSetObject( const Reference< XParameters >& 
_rxParameters,
 
 case TypeClass_ANY:
 {
-Any aInnerValue;
-_rValue >>= aInnerValue;
-bSuccessfullyReRouted = implSetObject(_rxParameters, 
_nColumnIndex, aInnerValue);
+bSuccessfullyReRouted = implSetObject(_rxParameters, 
_nColumnIndex, _rValue);
 }
 break;
 
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx 
b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 4bd1fe4..468b1c9 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -1552,8 +1552,7 @@ void OSingleSelectQueryComposer::setConditionByColumn( 
const Reference< XPropert
 OUString aName;
 column->getPropertyValue(PROPERTY_NAME) >>= aName;
 
-Any aValue;
-column->getPropertyValue(PROPERTY_VALUE) >>= aValue;
+const Any aValue = column->getPropertyValue(PROPERTY_VALUE);
 
 OUStringBuffer aSQL;
 const OUString aQuote= m_xMetaData->getIdentifierQuoteString();
diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx 
b/dbaccess/source/ui/uno/unosqlmessage.cxx
index a2d01a7..6638c82 100644
--- a/dbaccess/source/ui/uno/unosqlmessage.cxx
+++ b/dbaccess/source/ui/uno/unosqlmessage.cxx
@@ -88,13 +88,12 @@ void OSQLMessageDialog::initialize(Sequence const & 
args) throw (css::uno::
 {
 OUString title;
 Reference< css::awt::XWindow > parentWindow;
-css::uno::Any sqlException;
 
-if ((args.getLength() == 3) && (args[0] >>= title) && (args[1] >>= 
parentWindow) && (args[2] >>= sqlException)) {
+if ((args.getLength() == 3) && (args[0] >>= title) && (args[1] >>= 
parentWindow)) {
 Sequence s(3);
 s[0] <<= PropertyValue( "Title", -1, makeAny(title), 
PropertyState_DIRECT_VALUE);
 s[1] <<= PropertyValue( "ParentWindow", -1, makeAny(parentWindow), 
PropertyState_DIRECT_VALUE);
-s[2] <<= PropertyValue( "SQLException", -1, sqlException, 
PropertyState_DIRECT_VALUE);
+s[2] <<= PropertyValue( "SQLException", -1, args[2], 
PropertyState_DIRECT_VALUE);
 OGenericUnoDialog::initialize(s);
 } else {
 OGenericUnoDialog::initialize(args);
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 671a9f6..65657b1 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -133,7 +133,7 @@ ImpPDFTabDialog::ImpPDFTabDialog(vcl::Window* pParent, 
Sequence< PropertyValue >
 {
 Reference< view::XSelectionSupplier > xView( xController, 
UNO_QUERY );
 if( xView.is() )
-xView->getSelection() >>= maSelection;
+maSelection = xView->getSelection();
 }
 }
 catch(const RuntimeException &)
diff --git a/filter/source/pdf/pdfexport.cxx b/filte

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

[Jochen Nitschke]

 chart2/source/tools/MediaDescriptorHelper.cxx |  293 --
 1 file changed, 226 insertions(+), 67 deletions(-)

New commits:
commit 978d4c11979eca54d84463b58394b421de2d4da6
Author: Jochen Nitschke 
Date:   Wed Oct 19 10:33:51 2016 +0200

expand WRITE_PROPERTY macro

in case the property is an Any this commit changes behaviour.
(ComponentData, FilterData and ViewData)
ISSET_%Property% is only true if the property value hasValue(),
before it was always true.

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

diff --git a/chart2/source/tools/MediaDescriptorHelper.cxx 
b/chart2/source/tools/MediaDescriptorHelper.cxx
index 50a9b5c..b964efa 100644
--- a/chart2/source/tools/MediaDescriptorHelper.cxx
+++ b/chart2/source/tools/MediaDescriptorHelper.cxx
@@ -24,31 +24,6 @@ using namespace ::com::sun::star;
 namespace apphelper
 {
 
-const short FLAG_DEPRECATED =1;
-const short FLAG_MODEL  =2;
-
-#define WRITE_PROPERTY( MediaName, nFlags ) \
-if(rProp.Name == #MediaName) \
-{   \
-if( rProp.Value >>= MediaName ) \
-ISSET_##MediaName = true;   \
-if((nFlags & FLAG_DEPRECATED) != 0) \
-{   \
-m_aDeprecatedProperties[nDeprecatedCount]=rProp;\
-nDeprecatedCount++; \
-}   \
-else\
-{   \
-m_aRegularProperties[nRegularCount]=rProp;  \
-nRegularCount++;\
-if((nFlags & FLAG_MODEL) != 0)  \
-{   \
-m_aModelProperties[nModelCount]=rProp;  \
-nModelCount++;  \
-}   \
-}   \
-}
-
 MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence<
 beans::PropertyValue > & rMediaDescriptor )
 : m_aRegularProperties(rMediaDescriptor.getLength())
@@ -57,57 +32,241 @@ MediaDescriptorHelper::MediaDescriptorHelper( const 
uno::Sequence<
 , m_aModelProperties(rMediaDescriptor.getLength())
 {
 impl_init();
-
 sal_Int32 nRegularCount = 0;
 sal_Int32 nDeprecatedCount = 0;
 sal_Int32 nAdditionalCount = 0;
 sal_Int32 nModelCount = 0;
 
+auto addRegularProp = [this, &nRegularCount](const beans::PropertyValue& 
rRegularProp)
+{
+m_aRegularProperties[nRegularCount] = rRegularProp;
+++nRegularCount;
+};
+auto addModelProp = [this, &nModelCount, &addRegularProp](const 
beans::PropertyValue& rModelProp)
+{
+addRegularProp(rModelProp);
+m_aModelProperties[nModelCount] = rModelProp;
+++nModelCount;
+};
+auto addDepreciatedProp = [this, &nDeprecatedCount](const 
beans::PropertyValue& rDeprecatedProp)
+{
+m_aDeprecatedProperties[nDeprecatedCount] = rDeprecatedProp;
+++nDeprecatedCount;
+};
+
 //read given rMediaDescriptor and store in internal structures:
 for( sal_Int32 i= rMediaDescriptor.getLength();i--;)
 {
 const beans::PropertyValue& rProp = rMediaDescriptor[i];
-WRITE_PROPERTY( AsTemplate, FLAG_MODEL )
-else WRITE_PROPERTY( Author, FLAG_MODEL )
-else WRITE_PROPERTY( CharacterSet, FLAG_MODEL )
-else WRITE_PROPERTY( Comment, FLAG_MODEL )
-else WRITE_PROPERTY( ComponentData, FLAG_MODEL )
-else WRITE_PROPERTY( FileName, FLAG_DEPRECATED )
-else WRITE_PROPERTY( FilterData, FLAG_MODEL )
-else WRITE_PROPERTY( FilterName, FLAG_MODEL )
-else WRITE_PROPERTY( FilterFlags, FLAG_DEPRECATED)
-else WRITE_PROPERTY( FilterOptions, FLAG_MODEL )
-else WRITE_PROPERTY( FrameName, FLAG_MODEL )
-else WRITE_PROPERTY( Hidden, FLAG_MODEL )
-else WRITE_PROPERTY( HierarchicalDocumentName, FLAG_MODEL )
-else WRITE_PROPERTY( OutputStream, 0 )
-else WRITE_PROPERTY( InputStream, 0 )
-else WRITE_PROPERTY( InteractionHandler, 0 )
-else WRITE_PROPERTY( JumpMark, 0 )
-else WRITE_PROPERTY( MediaType, FLAG_MODEL )
-else WRITE_PROPERTY( OpenFlags, FLAG_DEPRECATED )
-else WRITE_PROPERTY( OpenNewView, 0 )
-else WRITE_PROPERTY( Overwrite, FLAG_MODEL )
-else WRITE_PROPERTY( Password, FLAG_MODEL )
-else WRITE_PROPERTY( PosSize, 0 )
-else WRITE_PROPERTY( PostData, 0 )
-else WRITE_PROPERTY( PostString, FLAG_DEPRECATED )
-else WRITE_PROPERTY( Preview, FLAG_MODEL )
-else WRITE_PROPERTY( Re

Re: LibreOffice Online integration with Kolab

[Michael Meeks]

Hi Aleksander,

On 10/19/2016 09:36 AM, Aleksander Machniak wrote:
> Hello! I'm working on integrating CODE with Kolab (using WOPI API).

Cool =) some great ideas here to improve LibreOffice Online. Feel free
to file them as enhancement bugs in bugzilla vs. the online product.

All the best,

Michael.

-- 
michael.me...@collabora.com <><, Pseudo Engineer, itinerant idiot
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Maxim Monastirsky]

 include/svx/svxitems.hrc|3 -
 svx/source/items/svxitems.src   |4 -
 svx/source/tbxctrls/colorwindow.hxx |1 
 svx/source/tbxctrls/tbcontrl.cxx|   80 ++--
 4 files changed, 33 insertions(+), 55 deletions(-)

New commits:
commit b420a6ab0729530df6ff95c41d24673b5399ceae
Author: Maxim Monastirsky 
Date:   Wed Oct 19 22:59:08 2016 +0300

SvxColorWindow_Impl: Unify title setting

Change-Id: Ic61fddfc92d30bfc5a5d0a298605606fba7ca676

diff --git a/svx/source/tbxctrls/colorwindow.hxx 
b/svx/source/tbxctrls/colorwindow.hxx
index 56b9ed2..551db2b 100644
--- a/svx/source/tbxctrls/colorwindow.hxx
+++ b/svx/source/tbxctrls/colorwindow.hxx
@@ -66,7 +66,6 @@ public:
  BorderColorStatus& rBorderColorStatus,
  sal_uInt16 nSlotId,
  const css::uno::Reference< css::frame::XFrame >& 
rFrame,
- const OUString& rWndTitle,
  vcl::Window* pParentWindow,
  std::function 
const & maColorSelectFunction);
 virtual ~SvxColorWindow_Impl() override;
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 89da4fb..d1c26ba 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1249,7 +1249,6 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& 
   rCommand,
   BorderColorStatus& 
rBorderColorStatus,
   sal_uInt16 nSlotId,
   const Reference< XFrame >& rFrame,
-  const OUString&rWndTitle,
   vcl::Window*
pParentWindow,
   std::function const & aFunction):
 
@@ -1279,7 +1278,6 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& 
   rCommand,
 case SID_ATTR_CHAR_BACK_COLOR:
 {
 mpButtonAutoColor->SetText( SVX_RESSTR( RID_SVXSTR_TRANSPARENT ) );
-mpColorSet->SetAccessibleName( SVX_RESSTR( RID_SVXSTR_BACKGROUND ) 
);
 break;
 }
 case SID_ATTR_CHAR_COLOR:
@@ -1294,34 +1292,52 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const 
OUString&rCommand,
  OUString( ".uno:AutoColorInvalid" ));
 SfxItemState eState = aQueryStatus.QueryState( pDummy );
 if( (SfxItemState::DEFAULT > eState) || ( SID_EXTRUSION_3D_COLOR 
== theSlotId ) )
-{
 mpButtonAutoColor->SetText( SVX_RESSTR( RID_SVXSTR_AUTOMATIC ) 
);
-mpColorSet->SetAccessibleName( SVX_RESSTR( 
RID_SVXSTR_TEXTCOLOR ) );
-}
 break;
 }
-case SID_FRAME_LINECOLOR:
+default:
 {
 mpButtonAutoColor->Hide();
 mpAutomaticSeparator->Hide();
-mpColorSet->SetAccessibleName( SVX_RESSTR( RID_SVXSTR_FRAME_COLOR 
) );
 break;
 }
+}
+
+OUString aWindowTitle;
+switch ( theSlotId )
+{
+case SID_ATTR_CHAR_COLOR:
+case SID_ATTR_CHAR_COLOR2:
+aWindowTitle = SVX_RESSTR( RID_SVXSTR_TEXTCOLOR );
+break;
+
+case SID_ATTR_CHAR_COLOR_BACKGROUND:
+case SID_ATTR_CHAR_BACK_COLOR:
+aWindowTitle = SVX_RESSTR( RID_SVXSTR_EXTRAS_CHARBACKGROUND );
+break;
+
+case SID_BACKGROUND_COLOR:
+aWindowTitle = SVX_RESSTR( RID_SVXSTR_BACKGROUND );
+break;
+
+case SID_FRAME_LINECOLOR:
+aWindowTitle = SVX_RESSTR( RID_SVXSTR_FRAME_COLOR );
+break;
+
+case SID_EXTRUSION_3D_COLOR:
+aWindowTitle = SVX_RESSTR( RID_SVXSTR_EXTRUSION_COLOR );
+break;
+
 case SID_ATTR_LINE_COLOR:
-{
-mpButtonAutoColor->Hide();
-mpAutomaticSeparator->Hide();
-mpColorSet->SetAccessibleName( SVX_RESSTR( RID_SVXSTR_LINECOLOR ) 
);
+aWindowTitle = SVX_RESSTR( RID_SVXSTR_LINECOLOR );
 break;
-}
+
 case SID_ATTR_FILL_COLOR:
-{
-mpButtonAutoColor->Hide();
-mpAutomaticSeparator->Hide();
-mpColorSet->SetAccessibleName( SVX_RESSTR( RID_SVXSTR_FILLCOLOR ) 
);
+aWindowTitle = SVX_RESSTR( RID_SVXSTR_FILLCOLOR );
 break;
-}
 }
+SetText( aWindowTitle );
+mpColorSet->SetAccessibleName( aWindowTitle );
 
 mpPaletteListBox->SetStyle( mpPaletteListBox->GetStyle() | WB_BORDER | 
WB_AUTOSIZE );
 mpPaletteListBox->SetSelectHdl( LINK( this, SvxColorWindow_Impl, 
SelectPaletteHdl ) );
@@ -1342,7 +1358,6 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& 
   rCommand,
 mpRecentColorSet->SetSelectHdl( LINK( 

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

[Eike Rathke]

 sc/source/core/data/column.cxx |   16 ++--
 sc/source/core/tool/token.cxx  |3 +++
 2 files changed, 17 insertions(+), 2 deletions(-)

New commits:
commit dfa92e106f7eaa8c3fc6cda034001197ecc53a8f
Author: Eike Rathke 
Date:   Wed Oct 19 23:04:34 2016 +0200

Resolves: tdf#97968 adjust references during Cut&Paste of formula groups

... and split groups for cases where references point outside or into the 
moved
range.

Change-Id: Iab799e94eed1677f266413b6304651ac4d330e95

diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 6dfce01..ef991cb 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2072,6 +2072,7 @@ class UpdateRefOnNonCopy : public 
std::unary_functionaPos;
 ScAddress aOldPos = aPos;
 
+bool bCellMoved;
 if (mpCxt->maRange.In(aPos))
 {
+bCellMoved = true;
+
 // The cell is being moved or copied to a new position. The
 // position has already been updated prior to this call.
 // Determine its original position before the move which will be
@@ -2188,6 +2192,10 @@ class UpdateRefOnNonCopy : public 
std::unary_functionmnRowDelta,
 aPos.Tab() - mpCxt->mnTabDelta);
 }
+else
+{
+bCellMoved = false;
+}
 
 bool bRecalcOnMove = pCode->IsRecalcModeOnRefMove();
 if (bRecalcOnMove)
@@ -2224,7 +2232,10 @@ class UpdateRefOnNonCopy : public 
std::unary_functionSetDirty();
 }
 
-fillUndoDoc(aOldPos, rGroup.mnLength, *pOldCode);
+// Move from clipboard is Cut&Paste, then do not copy the original
+// positions' formula cells to the Undo document.
+if (!mbClipboardSource || !bCellMoved)
+fillUndoDoc(aOldPos, rGroup.mnLength, *pOldCode);
 }
 }
 
@@ -2264,7 +2275,8 @@ public:
 SCCOL nCol, SCTAB nTab, const sc::RefUpdateContext* pCxt,
 ScDocument* pUndoDoc) :
 mnCol(nCol), mnTab(nTab), mpCxt(pCxt),
-mpUndoDoc(pUndoDoc), mbUpdated(false) {}
+mpUndoDoc(pUndoDoc), mbUpdated(false),
+mbClipboardSource(pCxt->mrDoc.IsClipboardSource()){}
 
 void operator() ( sc::FormulaGroupEntry& rGroup )
 {
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 47a3d2a..9e3c956 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -4430,6 +4430,9 @@ void checkBounds(
 {
 assert(!"can't move");
 }
+
+// Check bounds also against the range moved into.
+pDeletedRange = &rCxt.maRange;
 }
 else if (rCxt.meMode == URM_INSDEL &&
 ((rCxt.mnColDelta < 0 && rCxt.maRange.aStart.Col() > 0) ||
___
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

[Eike Rathke]

 sc/source/core/data/column3.cxx|   13 -
 sc/source/core/data/document10.cxx |3 +++
 2 files changed, 11 insertions(+), 5 deletions(-)

New commits:
commit 19c46727fd6a287cc3ec0417cbab922e611282c1
Author: Eike Rathke 
Date:   Wed Oct 19 23:34:25 2016 +0200

sc-perf: SetFormulaCells: unnecessary number format check in clipboard/undo

Change-Id: Ica7495e95700db2e6be1dd475ec450d8450364a4

diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 89aa5e0..b804260 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -1922,12 +1922,15 @@ bool ScColumn::SetFormulaCells( SCROW nRow, 
std::vector& rCells
 // Detach all formula cells that will be overwritten.
 DetachFormulaCells(aPos, rCells.size());
 
-for (size_t i = 0, n = rCells.size(); i < n; ++i)
+if (!pDocument->IsClipOrUndo())
 {
-SCROW nThisRow = nRow + i;
-sal_uInt32 nFmt = GetNumberFormat(nThisRow);
-if ((nFmt % SV_COUNTRY_LANGUAGE_OFFSET) == 0)
-rCells[i]->SetNeedNumberFormat(true);
+for (size_t i = 0, n = rCells.size(); i < n; ++i)
+{
+SCROW nThisRow = nRow + i;
+sal_uInt32 nFmt = GetNumberFormat(nThisRow);
+if ((nFmt % SV_COUNTRY_LANGUAGE_OFFSET) == 0)
+rCells[i]->SetNeedNumberFormat(true);
+}
 }
 
 std::vector aDefaults(rCells.size(), sc::CellTextAttr());
commit 5f01b29876da20299326b466d9596c4121ed2dec
Author: Eike Rathke 
Date:   Wed Oct 19 23:28:21 2016 +0200

sc-perf: StartAllListeners: bail out early in cliboard or undo document

... and do not attempt to execute the overhead for all columns in the range
just to do nothing.

Change-Id: I88d26895cf641e8c71d7ccdf5534de8008070e61

diff --git a/sc/source/core/data/document10.cxx 
b/sc/source/core/data/document10.cxx
index 4d59838..8964999 100644
--- a/sc/source/core/data/document10.cxx
+++ b/sc/source/core/data/document10.cxx
@@ -469,6 +469,9 @@ void ScDocument::StartNeededListeners( const 
std::shared_ptr pPosSet(new 
sc::ColumnBlockPositionSet(*this));
 sc::StartListeningContext aStartCxt(*this, pPosSet);
 sc::EndListeningContext aEndCxt(*this, pPosSet);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Yousuf Philips]

 sc/res/xml/styles.xml |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit e459881f0c29398052b9ce28354f2668163626af
Author: Yousuf Philips 
Date:   Wed Oct 19 17:30:04 2016 +0400

tdf#90937 Correct cell style names that are missing a space

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

diff --git a/sc/res/xml/styles.xml b/sc/res/xml/styles.xml
index 699f191..d8e114a 100644
--- a/sc/res/xml/styles.xml
+++ b/sc/res/xml/styles.xml
@@ -3,10 +3,10 @@
 
 
 
-
+
 
 
-
+
 
 
 
@@ -43,15 +43,15 @@
 
 
 
-
+
 
 
 
-
+
 
 
 
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Yousuf Philips]

 officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu |   11 
 sc/UIConfig_scalc.mk |1 
 sc/uiconfig/scalc/ui/notebookbar_groups.ui   | 2255 
++
 3 files changed, 2267 insertions(+)

New commits:
commit ec6a1391d97c016b1b911f579c0460205564af6b
Author: Yousuf Philips 
Date:   Wed Oct 19 16:50:04 2016 +0400

tdf#103170 Heikobar: Add it to Calc

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

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu
index e339abb..36ff663 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu
@@ -61,6 +61,17 @@
 false
   
 
+
+  
+Contextual groups
+  
+  
+notebookbar_groups.ui
+  
+  
+true
+  
+
   
 
 
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 9ec5dac..5008729 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -144,6 +144,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/leftheaderdialog \
sc/uiconfig/scalc/ui/namerangesdialog \
sc/uiconfig/scalc/ui/notebookbar \
+   sc/uiconfig/scalc/ui/notebookbar_groups \
sc/uiconfig/scalc/ui/managenamesdialog \
sc/uiconfig/scalc/ui/mergecellsdialog \
sc/uiconfig/scalc/ui/movecopysheet \
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groups.ui 
b/sc/uiconfig/scalc/ui/notebookbar_groups.ui
new file mode 100644
index 000..5011d96
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/notebookbar_groups.ui
@@ -0,0 +1,2255 @@
+
+
+
+  
+  
+  
+  
+True
+False
+cmd/sc_bold.png
+  
+  
+True
+False
+cmd/sc_insertobjectchart.png
+  
+  
+True
+False
+cmd/sc_numberformatincdecimals.png
+  
+  
+True
+False
+cmd/sc_italic.png
+  
+  
+True
+False
+cmd/sc_inserthyperlink.png
+  
+  
+True
+False
+
+  
+True
+False
+.uno:HyperlinkDialog
+Hyperlink
+  
+
+
+  
+True
+False
+  
+
+
+  
+True
+False
+.uno:InsertFootnote
+Footnote
+True
+  
+
+
+  
+True
+False
+.uno:InsertEndnote
+Endnote
+True
+  
+
+
+  
+True
+False
+  
+
+
+  
+True
+False
+.uno:InsertBookmark
+Bookmark
+True
+  
+
+
+  
+True
+False
+.uno:InsertReferenceField
+Cross-Reference
+  
+
+  
+  
+True
+False
+cmd/lc_adddirect.png
+24
+  
+  
+True
+False
+cmd/lc_open.png
+24
+  
+  
+True
+False
+cmd/lc_designerdialog.png
+  
+  
+True
+False
+cmd/32/paste.png
+24
+  
+  
+True
+False
+cmd/lc_exportdirecttopdf.png
+24
+  
+  
+True
+False
+cmd/lc_print.png
+24
+  
+  
+True
+False
+cmd/lc_redo.png
+24
+  
+  
+True
+False
+cmd/32/save.png
+32
+3
+  
+  
+True
+False
+cmd/sc_numberformatdecdecimals.png
+  
+  
+True
+False
+
+  
+True
+False
+Default
+True
+  
+
+
+  
+True
+False
+  
+
+
+  
+True
+False
+Accent 1
+True
+  
+
+
+  
+True
+False
+Accent 2
+True
+  
+
+
+  
+True
+False
+Accent 3
+True
+  
+
+
+  
+True
+False
+  
+
+
+  
+True
+False
+Heading 1
+True
+  
+
+
+  
+True
+False
+Heading 2
+True
+  
+
+
+  
+True
+False
+  
+
+
+  
+True
+False
+Good
+True
+  
+
+
+  
+True
+False
+Neutral
+True
+  
+
+
+  
+True
+False
+Bad
+True
+  
+
+
+  
+True
+False
+Warning
+True
+  
+
+
+  
+True
+False
+Error
+True
+  
+
+
+  
+True
+False
+  
+
+
+  
+True
+False
+Note
+True
+  
+
+
+  
+True
+False
+Footnote
+True
+  
+
+  
+  
+True
+False
+cmd/lc_entirec

Re: Merging feature/commonsallayout branch

[yphilips]

So cloph asked in QA about testing SAL_USE_COMMON_LAYOUT on windows XP and i
did and it crashed on startup, so unless we want to alienate XP users from
running 5.3, we'd likely need to put in a flag to disable it for XP.



--
View this message in context: 
http://nabble.documentfoundation.org/Merging-feature-commonsallayout-branch-tp4197400p4197639.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Merging feature/commonsallayout branch

[Tor Lillqvist]

> unless we want to alienate XP users from
> running 5.3,


What would be so wrong in that?

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

Re: Merging feature/commonsallayout branch

[Khaled Hosny]

On Wed, Oct 19, 2016 at 03:11:25PM -0700, yphilips wrote:
> So cloph asked in QA about testing SAL_USE_COMMON_LAYOUT on windows XP and i
> did and it crashed on startup, so unless we want to alienate XP users from
> running 5.3, we'd likely need to put in a flag to disable it for XP.

So that is not as bad as I thought it would be. We can have a runtime
check for 5.3 that forces disable CommonSalLayout for Windows XP. We can
then communicate in advance that we are dropping Windows XP support in
5.4 (since we will remove the old code by then).

WDYT?

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

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

[Armin Le Grand]

 comphelper/source/misc/backupfilehelper.cxx |  563 ++--
 1 file changed, 363 insertions(+), 200 deletions(-)

New commits:
commit 8c4fdffb2029acf9219633627fa37e5ee4028f5a
Author: Armin Le Grand 
Date:   Wed Oct 19 17:42:03 2016 +0200

profilesafe: added xml read/modify to restore

To be able to restore the last saved state of enabled/disabled
extensions it is necessary in SafeMode to get and set that states
without XExtensionManager, so the configuration xml files have
to be accessed. Added this change

Change-Id: I00fe5795598427e7c08be0d3dd54bef68d038e24
Reviewed-on: https://gerrit.libreoffice.org/30062
Tested-by: Jenkins 
Reviewed-by: Armin Le Grand 

diff --git a/comphelper/source/misc/backupfilehelper.cxx 
b/comphelper/source/misc/backupfilehelper.cxx
index 5c55ca4..3e534bd 100644
--- a/comphelper/source/misc/backupfilehelper.cxx
+++ b/comphelper/source/misc/backupfilehelper.cxx
@@ -8,15 +8,6 @@
  */
 
 #include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
 #include 
 #include 
 #include 
@@ -26,6 +17,23 @@
 #include 
 #include 
 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
 using namespace css;
 static const sal_uInt32 BACKUP_FILE_HELPER_BLOCK_SIZE = 16384;
 
@@ -388,34 +396,48 @@ namespace
 
 namespace
 {
-enum PackageState { REGISTERED, NOT_REGISTERED, AMBIGUOUS, NOT_AVAILABLE };
+enum PackageRepository { USER, SHARED, BUNDLED };
 
 class ExtensionInfoEntry
 {
 private:
-PackageStatemeState;// REGISTERED, NOT_REGISTERED, 
AMBIGUOUS, NOT_AVAILABLE
-OString maRepositoryName;   // user|shared|bundled
-OString maName;
-OString maIdentifier;
-OString maVersion;
+OString maName; // extension name
+PackageRepository   maRepository;   // user|shared|bundled
+boolmbEnabled;  // state
 
 public:
 ExtensionInfoEntry()
-:   meState(NOT_AVAILABLE),
-maRepositoryName(),
-maName(),
-maIdentifier(),
-maVersion()
+:   maName(),
+maRepository(USER),
+mbEnabled(false)
+{
+}
+
+ExtensionInfoEntry(const OString& rName, bool bEnabled)
+:   maName(rName),
+maRepository(USER),
+mbEnabled(bEnabled)
 {
 }
 
 ExtensionInfoEntry(const uno::Reference< deployment::XPackage >& 
rxPackage)
-:   meState(NOT_AVAILABLE),
-maRepositoryName(OUStringToOString(rxPackage->getRepositoryName(), 
RTL_TEXTENCODING_ASCII_US)),
-maName(OUStringToOString(rxPackage->getName(), 
RTL_TEXTENCODING_ASCII_US)),
-maIdentifier(OUStringToOString(rxPackage->getIdentifier().Value, 
RTL_TEXTENCODING_ASCII_US)),
-maVersion(OUStringToOString(rxPackage->getVersion(), 
RTL_TEXTENCODING_ASCII_US))
+:   maName(OUStringToOString(rxPackage->getName(), 
RTL_TEXTENCODING_ASCII_US)),
+maRepository(USER),
+mbEnabled(false)
 {
+// check maRepository
+const OString 
aRepName(OUStringToOString(rxPackage->getRepositoryName(), 
RTL_TEXTENCODING_ASCII_US));
+
+if (aRepName == "shared")
+{
+maRepository = SHARED;
+}
+else if (aRepName == "bundled")
+{
+maRepository = BUNDLED;
+}
+
+// check mbEnabled
 const beans::Optional< beans::Ambiguous< sal_Bool > > option(
 rxPackage->isRegistered(uno::Reference< task::XAbortChannel 
>(),
 uno::Reference< ucb::XCommandEnvironment >()));
@@ -424,50 +446,25 @@ namespace
 {
 ::beans::Ambiguous< sal_Bool > const& reg = option.Value;
 
-if (reg.IsAmbiguous)
+if (!reg.IsAmbiguous)
 {
-meState = AMBIGUOUS;
-}
-else
-{
-meState = reg.Value ? REGISTERED : NOT_REGISTERED;
+mbEnabled = reg.Value;
 }
 }
-else
-{
-meState = NOT_AVAILABLE;
-}
 }
 
 bool isSameExtension(const ExtensionInfoEntry& rComp) const
 {
-return (0 == maRepositoryName.compareTo(rComp.maRepositoryName)
-&& 0 == maName.compareTo(rComp.maName)
-&& 0 == maVersion.compareTo(rComp.maVersion)
-&& 0 == maIdentifier.compareTo(rComp.maIdentifier));
+return (maRepository == rComp.maRepository && 0 == 
maName.compareTo(rComp.maName));
 }
 
 bool op

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

[Eike Rathke]

 sc/source/filter/excel/xilink.cxx |   12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 0d2797fdb06f504e7213b3859a53c363f4f56bc9
Author: Eike Rathke 
Date:   Thu Oct 20 00:58:06 2016 +0200

Resolves: tdf#85553 intern SharedString of cached external references result

Change-Id: I13f19b5bd5f2897eb48af69742be885803cca066

diff --git a/sc/source/filter/excel/xilink.cxx 
b/sc/source/filter/excel/xilink.cxx
index ebc9b8b..df8f5e3 100644
--- a/sc/source/filter/excel/xilink.cxx
+++ b/sc/source/filter/excel/xilink.cxx
@@ -71,7 +71,8 @@ public:
 /** Reads a CRN record (external referenced cell) at the specified 
address. */
 voidReadCrn( XclImpStream& rStrm, const XclAddress& 
rXclPos );
 
-voidLoadCachedValues(const 
ScExternalRefCache::TableTypeRef& pCacheTable);
+voidLoadCachedValues( const 
ScExternalRefCache::TableTypeRef& pCacheTable,
+  svl::SharedStringPool& rPool );
 
 private:
 typedef std::shared_ptr< XclImpCrn > XclImpCrnRef;
@@ -574,7 +575,8 @@ void XclImpSupbookTab::ReadCrn( XclImpStream& rStrm, const 
XclAddress& rXclPos )
 maCrnList.push_back( crnRef );
 }
 
-void XclImpSupbookTab::LoadCachedValues(const 
ScExternalRefCache::TableTypeRef& pCacheTable)
+void XclImpSupbookTab::LoadCachedValues( const 
ScExternalRefCache::TableTypeRef& pCacheTable,
+svl::SharedStringPool& rPool )
 {
 if (maCrnList.empty())
 return;
@@ -608,8 +610,8 @@ void XclImpSupbookTab::LoadCachedValues(const 
ScExternalRefCache::TableTypeRef&
 break;
 case EXC_CACHEDVAL_STRING:
 {
-const OUString& rStr = pCrn->GetString();
-ScExternalRefCache::TokenRef pToken(new 
formula::FormulaStringToken( svl::SharedString( rStr)));// string not 
interned
+svl::SharedString aSS( rPool.intern( pCrn->GetString()));
+ScExternalRefCache::TokenRef pToken(new 
formula::FormulaStringToken( aSS));
 pCacheTable->setCell(rAddr.mnCol, rAddr.mnRow, pToken, 0, 
false);
 }
 break;
@@ -753,7 +755,7 @@ void XclImpSupbook::LoadCachedValues()
 {
 const OUString& rTabName = (*itTab)->GetTabName();
 ScExternalRefCache::TableTypeRef pCacheTable = 
pRefMgr->getCacheTable(nFileId, rTabName, true);
-(*itTab)->LoadCachedValues(pCacheTable);
+(*itTab)->LoadCachedValues( pCacheTable, GetSharedStringPool());
 pCacheTable->setWholeTableCached();
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 formula/source/core/api/token.cxx   |5 -
 include/formula/tokenarray.hxx  |   11 +++
 sc/source/core/data/formulacell.cxx |5 -
 sc/source/core/tool/compiler.cxx|   26 --
 sc/source/core/tool/token.cxx   |1 +
 5 files changed, 40 insertions(+), 8 deletions(-)

New commits:
commit e3789123da397c82109a5fcead3d49f803ba6aad
Author: Kohei Yoshida 
Date:   Mon Oct 17 23:19:23 2016 -0400

tdf#93894: Prohibit grouping when certain token types are present.

For instance, column / row label tokens don't work correctly in
grouped cells with the current implementation.

Change-Id: Idf86312ef15fbfd4382aa90ee6d131c671a80683
(cherry picked from commit e944d9510404d8c67b3867d7cd9f313fd5091004)
Reviewed-on: https://gerrit.libreoffice.org/30027
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 

diff --git a/formula/source/core/api/token.cxx 
b/formula/source/core/api/token.cxx
index 29ac8a1..713998c 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -712,7 +712,8 @@ FormulaTokenArray::FormulaTokenArray() :
 nError(0),
 nMode(ScRecalcMode::NORMAL),
 bHyperLink(false),
-mbFromRangeName(false)
+mbFromRangeName(false),
+mbShareable(true)
 {
 }
 
@@ -735,6 +736,7 @@ void FormulaTokenArray::Assign( const FormulaTokenArray& r )
 nMode  = r.nMode;
 bHyperLink = r.bHyperLink;
 mbFromRangeName = r.mbFromRangeName;
+mbShareable = r.mbShareable;
 pCode  = nullptr;
 pRPN   = nullptr;
 FormulaToken** pp;
@@ -846,6 +848,7 @@ void FormulaTokenArray::Clear()
 nError = nLen = nIndex = nRPN = 0;
 bHyperLink = false;
 mbFromRangeName = false;
+mbShareable = true;
 ClearRecalcMode();
 }
 
diff --git a/include/formula/tokenarray.hxx b/include/formula/tokenarray.hxx
index 3faadec..78bbf57 100644
--- a/include/formula/tokenarray.hxx
+++ b/include/formula/tokenarray.hxx
@@ -118,6 +118,7 @@ protected:
 ScRecalcModenMode;  // Flags to indicate when to 
recalc this code
 boolbHyperLink; // If HYPERLINK() occurs in the 
formula.
 boolmbFromRangeName;// If this array originates from a 
named expression
+boolmbShareable;// Whether or not it can be shared 
with adjacent cells.
 
 protected:
 voidAssign( const FormulaTokenArray& );
@@ -166,6 +167,16 @@ public:
 void SetFromRangeName( bool b ) { mbFromRangeName = b; }
 bool IsFromRangeName() const { return mbFromRangeName; }
 
+void SetShareable( bool b ) { mbShareable = b; }
+
+/**
+ * Check if this token array is shareable between multiple adjacent
+ * formula cells. Certain tokens may not function correctly when shared.
+ *
+ * @return true if the token array is shareable, false otherwise.
+ */
+bool IsShareable() const { return mbShareable; }
+
 void Clear();
 void DelRPN();
 FormulaToken* First() { nIndex = 0; return Next(); }
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 04870c1..64a0bb4 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1293,7 +1293,7 @@ void ScFormulaCell::CompileXML( 
sc::CompileFormulaContext& rCxt, ScProgress& rPr
 ScAddress aPreviousCell( aPos );
 aPreviousCell.IncRow( -1 );
 ScFormulaCell *pPreviousCell = pDocument->GetFormulaCell( 
aPreviousCell );
-if( pPreviousCell )
+if (pPreviousCell && pPreviousCell->GetCode()->IsShareable())
 {
 // Now try to convert to a string quickly ...
 ScCompiler aBackComp( rCxt, aPos, *(pPreviousCell->pCode) );
@@ -3767,6 +3767,9 @@ ScFormulaCell::CompareState 
ScFormulaCell::CompareByTokenArray( ScFormulaCell& r
 if ( GetHash() != rOther.GetHash() )
 return NotEqual;
 
+if (!pCode->IsShareable() || !rOther.pCode->IsShareable())
+return NotEqual;
+
 FormulaToken **pThis = pCode->GetCode();
 sal_uInt16 nThisLen = pCode->GetCodeLen();
 FormulaToken **pOther = rOther.pCode->GetCode();
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index e5659d5..264b7c3 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -4386,6 +4386,12 @@ ScTokenArray* ScCompiler::CompileString( const OUString& 
rFormula )
 --nFunction;
 }
 break;
+case ocColRowName:
+case ocColRowNameAuto:
+// The current implementation of column / row labels doesn't
+// function correctly in grouped cells.
+aArr.SetShareable(false);
+break;
 default:
 break;
 }
@@ -5273,8 +5279,10 @@ bool ScCompiler::HandleColRowName()
 {
 ScSingleRefData aRefData;
   

RE: 700/500 LED Shadowless Operating lamp

[Mary]

Hi Friend,
Wish  you have a
nice day! 
Glad to meet
you in the market of medical equipment. This is Mary from Shanghai
Huifeng Medical Instrument Co., Ltd.
Are you interested
in the following operation table?  pls
contact us if you like it.
 
 

 







 


 







 
 
 


29th INDONESIAN HOSPITAL EXPO Time:19-22,Oct,2016 Booth No.: AS-221

---
CMEF Fair In Shenzhen Convention
Center
Time: 29th. Oct --1st. Nov, 2016Booth NO:
H8-E23
 













Best wishes Mary 
Ma
Sales
Director-Sales Dept.Shanghai Huifeng Medical Instrument Co., LTD.


Add: No. 7753,Chuannanfeng Highroad,Datuan Town,Pudong District,Shanghai,China

Tel: 86-21-60640265
QQ: 2355332341
TM: cn1000399872
Wechat / Line:
86-18917525227
Mobile/ Viber / whatsapp:
86-18917525227
skype:huifen...@hotmail.com 
Mail: huife...@sh-huifeng.com；huife...@huifeng-co.com
Web：en.huifeng-co.com
 
 




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

Re: Merging feature/commonsallayout branch

[Yousuf Philips]

On 10/20/2016 02:34 AM, Khaled Hosny wrote:

So that is not as bad as I thought it would be. We can have a runtime
check for 5.3 that forces disable CommonSalLayout for Windows XP. We can
then communicate in advance that we are dropping Windows XP support in
5.4 (since we will remove the old code by then).

WDYT?


As XP still has between 6 and 9% of desktop market share, which is 
around the same amount of Windows 8/8.1 and Mac OS X, it is in the top 5 
desktop OSes and i wouldnt recommend alienating them any time soon.


https://www.netmarketshare.com/operating-system-market-share.aspx?qprid=10&qpcustomd=0

http://gs.statcounter.com/#desktop-os-ww-monthly-201607-201607-bar

It would be useful to use the update ping stats to know what percentage 
of our user base are still on XP and if it isnt as high as the above 
stats perceive it to be, then it is worth dropping it sooner.



Regards,
Khaled


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

[Libreoffice-commits] core.git: scaddins/source scripting/source sdext/source sd/inc sd/source

[Noel Grandin]

 scaddins/source/analysis/analysishelper.cxx|2 +-
 scaddins/source/analysis/analysishelper.hxx|6 --
 scripting/source/provider/MasterScriptProvider.cxx |9 -
 scripting/source/provider/MasterScriptProvider.hxx |3 ---
 sd/inc/CustomAnimationPreset.hxx   |2 --
 sd/inc/cusshow.hxx |2 --
 sd/inc/sdiocmpt.hxx|1 -
 sd/source/core/CustomAnimationPreset.cxx   |7 +--
 sd/source/core/cusshow.cxx |2 +-
 sd/source/core/sdiocmpt.cxx|7 +--
 sd/source/ui/dlg/headerfooterdlg.cxx   |7 +--
 sd/source/ui/inc/PreviewRenderer.hxx   |1 -
 sd/source/ui/inc/headerfooterdlg.hxx   |1 -
 sd/source/ui/tools/PreviewRenderer.cxx |7 +--
 sd/source/ui/view/DocumentRenderer.cxx |7 +--
 sdext/source/presenter/PresenterAccessibility.cxx  |7 +--
 16 files changed, 12 insertions(+), 59 deletions(-)

New commits:
commit e7324c5705eaa38a2c9aa0636f01a73f033ba4d6
Author: Noel Grandin 
Date:   Wed Oct 19 10:06:11 2016 +0200

loplugin:expandablemethodds in scaddins..sdext

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

diff --git a/scaddins/source/analysis/analysishelper.cxx 
b/scaddins/source/analysis/analysishelper.cxx
index a0e25b8..80c2736 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -2182,7 +2182,7 @@ sal_Int16 ConvertData::GetMatchingLevel( const OUString& 
rRef ) const
 const sal_Unicode*  p = aStr.getStr();
 
 nLen = aStr.getLength();
-bool bPref = IsPrefixSupport();
+bool bPref = bPrefixSupport;
 bool bOneChar = (bPref && nLen > 1 && (aName == p + 1));
 if (bOneChar || (bPref && nLen > 2 && (aName == p + 2) &&
 *p == 'd' && *(p+1) == 'a'))
diff --git a/scaddins/source/analysis/analysishelper.hxx 
b/scaddins/source/analysis/analysishelper.hxx
index 190da12..6fe8038 100644
--- a/scaddins/source/analysis/analysishelper.hxx
+++ b/scaddins/source/analysis/analysishelper.hxx
@@ -473,7 +473,6 @@ public:
 virtual double  ConvertFromBase( double fVal, sal_Int16 
nMatchLevel ) const;
 
 inline ConvertDataClass Class() const;
-inline bool IsPrefixSupport() const;
 };
 
 class ConvertDataLinear : public ConvertData
@@ -659,11 +658,6 @@ inline ConvertDataClass ConvertData::Class() const
 return eClass;
 }
 
-inline bool ConvertData::IsPrefixSupport() const
-{
-return bPrefixSupport;
-}
-
 inline ConvertDataLinear::ConvertDataLinear( const sal_Char* p, double fC, 
double fO, ConvertDataClass e,
 bool bPrefSupport ) :
 ConvertData( p, fC, e, bPrefSupport ),
diff --git a/scripting/source/provider/MasterScriptProvider.cxx 
b/scripting/source/provider/MasterScriptProvider.cxx
index 7c6157d..83a55935 100644
--- a/scripting/source/provider/MasterScriptProvider.cxx
+++ b/scripting/source/provider/MasterScriptProvider.cxx
@@ -235,7 +235,7 @@ MasterScriptProvider::getScript( const OUString& scriptURI )
 throw ( provider::ScriptFrameworkErrorException,
 RuntimeException, std::exception )
 {
-if ( !isValid() )
+if ( !m_bIsValid )
 {
 throw provider::ScriptFrameworkErrorException(
 "MasterScriptProvider not initialised", Reference< XInterface >(),
@@ -389,7 +389,7 @@ OUString SAL_CALL
 MasterScriptProvider::getName()
 throw ( css::uno::RuntimeException, std::exception )
 {
-if ( !isPkgProvider() )
+if ( !m_bIsPkgMSP )
 {
 OUString sCtx = getContextString();
 if ( sCtx.startsWith( "vnd.sun.star.tdoc" ) )
@@ -421,9 +421,8 @@ MasterScriptProvider::getChildNodes()
 {
 Sequence< Reference< provider::XScriptProvider > > providers = 
getAllProviders();
 
-Reference< provider::XScriptProvider > pkgProv = getPkgProvider();
 sal_Int32 size = providers.getLength();
-bool hasPkgs = pkgProv.is();
+bool hasPkgs = m_xMSPPkg.is();
 if ( hasPkgs  )
 {
 size++;
@@ -437,7 +436,7 @@ MasterScriptProvider::getChildNodes()
 
 if ( hasPkgs  )
 {
-children[ provIndex ].set( pkgProv, UNO_QUERY );
+children[ provIndex ].set( m_xMSPPkg, UNO_QUERY );
 
 }
 
diff --git a/scripting/source/provider/MasterScriptProvider.hxx 
b/scripting/source/provider/MasterScriptProvider.hxx
index 38f6c1f..964a1a1 100644
--- a/scripting/source/provider/MasterScriptProvider.hxx
+++ b/scripting/source/provider/MasterScriptProvider.hxx
@@ -106,15 +106,12 @@ public:
 css::uno::Sequence< css::uno::Reference< 
css::script::provider::XScriptProvider > > SAL_CALL
 getAllProviders() throw ( css::uno::RuntimeException );
 
-bool isPkgProvider() { return m_bIsPk

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

[Noel Grandin]

 sfx2/source/doc/oleprops.hxx|4 +---
 slideshow/source/engine/animationnodes/animationsetnode.cxx |9 ++---
 slideshow/source/engine/animationnodes/animationsetnode.hxx |1 -
 slideshow/source/engine/shapes/drawinglayeranimation.cxx|8 ++--
 slideshow/source/engine/shapes/viewshape.cxx|2 +-
 slideshow/source/engine/shapes/viewshape.hxx|7 ---
 starmath/inc/parse.hxx  |3 ---
 starmath/inc/rect.hxx   |1 -
 starmath/inc/view.hxx   |5 -
 starmath/source/parse.cxx   |4 ++--
 starmath/source/rect.cxx|2 +-
 starmath/source/view.cxx|2 +-
 12 files changed, 10 insertions(+), 38 deletions(-)

New commits:
commit 40fc2c1a0d2ebdf47131651045107c9d5abb850d
Author: Noel Grandin 
Date:   Wed Oct 19 10:24:57 2016 +0200

loplugin:expandablemethodds in sfx2..starmath

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

diff --git a/sfx2/source/doc/oleprops.hxx b/sfx2/source/doc/oleprops.hxx
index a4190a2..dfadd52 100644
--- a/sfx2/source/doc/oleprops.hxx
+++ b/sfx2/source/doc/oleprops.hxx
@@ -170,8 +170,6 @@ public:
 inline explicit SfxOleObjectBase() : mnErrCode( ERRCODE_NONE ) {}
 virtual ~SfxOleObjectBase();
 
-/** Returns true, if an error code (other than ERRCODE_NONE) is set. */
-inline bool HasError() const { return mnErrCode != ERRCODE_NONE; }
 /** Returns the current error code. */
 inline ErrCode  GetError() const { return mnErrCode; }
 
@@ -183,7 +181,7 @@ public:
 protected:
 /** Sets the passed error code. Will be returned by Load() and Save() 
functions.
 Always the first error code is stored. Multiple calls have no effect. 
*/
-inline void SetError( ErrCode nErrCode ) { if( !HasError() ) 
mnErrCode = nErrCode; }
+inline void SetError( ErrCode nErrCode ) { if( mnErrCode == 
ERRCODE_NONE ) mnErrCode = nErrCode; }
 /** Loads the passed object from the stream. Sets returned error code as 
own error. */
 voidLoadObject( SvStream& rStrm, SfxOleObjectBase& rObj );
 /** Saves the passed object to the stream. Sets returned error code as own 
error. */
diff --git a/slideshow/source/engine/animationnodes/animationsetnode.cxx 
b/slideshow/source/engine/animationnodes/animationsetnode.cxx
index 0e19b7f..3770790 100644
--- a/slideshow/source/engine/animationnodes/animationsetnode.cxx
+++ b/slideshow/source/engine/animationnodes/animationsetnode.cxx
@@ -30,11 +30,6 @@ using namespace com::sun::star;
 namespace slideshow {
 namespace internal {
 
-void AnimationSetNode::implScheduleDeactivationEvent()
-{
-scheduleDeactivationEvent();
-}
-
 AnimationActivitySharedPtr AnimationSetNode::createActivity() const
 {
 ActivitiesFactory::CommonParameters aParms( fillCommonParameters() );
@@ -61,8 +56,8 @@ AnimationActivitySharedPtr AnimationSetNode::createActivity() 
const
 ENSURE_OR_THROW(
 pSelf, "cannot cast getSelf() to my type!" );
 aParms.mpEndEvent = makeEvent(
-[pSelf] () { pSelf->implScheduleDeactivationEvent(); },
-"AnimationSetNode::implScheduleDeactivationEvent");
+[pSelf] () { pSelf->scheduleDeactivationEvent(); },
+"AnimationSetNode::scheduleDeactivationEvent");
 }
 
 switch (AnimationFactory::classifyAttributeName( attrName )) {
diff --git a/slideshow/source/engine/animationnodes/animationsetnode.hxx 
b/slideshow/source/engine/animationnodes/animationsetnode.hxx
index ee63b42..9c39377 100644
--- a/slideshow/source/engine/animationnodes/animationsetnode.hxx
+++ b/slideshow/source/engine/animationnodes/animationsetnode.hxx
@@ -39,7 +39,6 @@ public:
 
 private:
 virtual AnimationActivitySharedPtr createActivity() const override;
-void implScheduleDeactivationEvent();
 };
 
 } // namespace internal
diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx 
b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
index 41e3097..63d1787 100644
--- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx
+++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
@@ -156,10 +156,6 @@ private:
 void updateShapeAttributes( double fTime,
 basegfx::B2DRectangle const& parentBounds );
 
-// Access to VisibleWhenSTarted flags
-bool IsVisibleWhenStarted() const { return mbVisibleWhenStarted; }
-bool IsVisibleWhenStopped() const { return mbVisibleWhenStopped; }
-
 // scroll horizontal? if sal_False, scroll is vertical.
 bool ScrollHorizontal() const {
 return (drawing::TextAnimation

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

[Noel Grandin]

 svgio/inc/svgcirclenode.hxx|3 --
 svgio/inc/svgellipsenode.hxx   |4 --
 svgio/inc/svggradientnode.hxx  |9 --
 svgio/inc/svggradientstopnode.hxx  |1 
 svgio/inc/svgimagenode.hxx |8 -
 svgio/inc/svglinenode.hxx  |4 --
 svgio/inc/svgmarkernode.hxx|6 
 svgio/inc/svgmasknode.hxx  |6 
 svgio/inc/svgpathnode.hxx  |1 
 svgio/inc/svgpatternnode.hxx   |5 ---
 svgio/inc/svgpolynode.hxx  |4 --
 svgio/inc/svgrectnode.hxx  |6 
 svgio/inc/svgstyleattributes.hxx   |   20 -
 svgio/inc/svgsvgnode.hxx   |8 -
 svgio/inc/svgsymbolnode.hxx|3 --
 svgio/inc/svgtextnode.hxx  |3 --
 svgio/inc/svgtextpathnode.hxx  |1 
 svgio/inc/svgusenode.hxx   |7 
 svgio/source/svgreader/svgcirclenode.cxx   |6 ++--
 svgio/source/svgreader/svgellipsenode.cxx  |8 ++---
 svgio/source/svgreader/svggradientnode.cxx |   18 ++--
 svgio/source/svgreader/svggradientstopnode.cxx |2 -
 svgio/source/svgreader/svgimagenode.cxx|   12 
 svgio/source/svgreader/svglinenode.cxx |8 ++---
 svgio/source/svgreader/svgmarkernode.cxx   |   12 
 svgio/source/svgreader/svgmasknode.cxx |   12 
 svgio/source/svgreader/svgpathnode.cxx |2 -
 svgio/source/svgreader/svgpatternnode.cxx  |   10 +++---
 svgio/source/svgreader/svgpolynode.cxx |6 ++--
 svgio/source/svgreader/svgrectnode.cxx |   12 
 svgio/source/svgreader/svgstyleattributes.cxx  |   36 -
 svgio/source/svgreader/svgsvgnode.cxx  |   12 
 svgio/source/svgreader/svgsymbolnode.cxx   |2 -
 svgio/source/svgreader/svgtextnode.cxx |2 -
 svgio/source/svgreader/svgtextpathnode.cxx |2 -
 svgio/source/svgreader/svgusenode.cxx  |8 ++---
 36 files changed, 85 insertions(+), 184 deletions(-)

New commits:
commit 58072c5a7f409cd500ecdc4e81a8f536aa3dda59
Author: Noel Grandin 
Date:   Wed Oct 19 12:21:42 2016 +0200

loplugin:expandablemethodds in svgio

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

diff --git a/svgio/inc/svgcirclenode.hxx b/svgio/inc/svgcirclenode.hxx
index edb0523..cd19de4 100644
--- a/svgio/inc/svgcirclenode.hxx
+++ b/svgio/inc/svgcirclenode.hxx
@@ -51,15 +51,12 @@ namespace svgio
 
 /// Cx content, set if found in current context
 const SvgNumber& getCx() const { return maCx; }
-void setCx(const SvgNumber& rCx) { maCx = rCx; }
 
 /// Cy content, set if found in current context
 const SvgNumber& getCy() const { return maCy; }
-void setCy(const SvgNumber& rCy) { maCy = rCy; }
 
 /// R content, set if found in current context
 const SvgNumber& getR() const { return maR; }
-void setR(const SvgNumber& rR) { maR = rR; }
 
 /// transform content, set if found in current context
 const basegfx::B2DHomMatrix* getTransform() const { return 
mpaTransform; }
diff --git a/svgio/inc/svgellipsenode.hxx b/svgio/inc/svgellipsenode.hxx
index d0ad622..ad7d223 100644
--- a/svgio/inc/svgellipsenode.hxx
+++ b/svgio/inc/svgellipsenode.hxx
@@ -52,19 +52,15 @@ namespace svgio
 
 /// Cx content, set if found in current context
 const SvgNumber& getCx() const { return maCx; }
-void setCx(const SvgNumber& rCx) { maCx = rCx; }
 
 /// Cy content, set if found in current context
 const SvgNumber& getCy() const { return maCy; }
-void setCy(const SvgNumber& rCy) { maCy = rCy; }
 
 /// Rx content, set if found in current context
 const SvgNumber& getRx() const { return maRx; }
-void setRx(const SvgNumber& rRx) { maRx = rRx; }
 
 /// Ry content, set if found in current context
 const SvgNumber& getRy() const { return maRy; }
-void setRy(const SvgNumber& rRy) { maRy = rRy; }
 
 /// transform content, set if found in current context
 const basegfx::B2DHomMatrix* getTransform() const { return 
mpaTransform; }
diff --git a/svgio/inc/svggradientnode.hxx b/svgio/inc/svggradientnode.hxx
index 3a10ed7..cffd427 100644
--- a/svgio/inc/svggradientnode.hxx
+++ b/svgio/inc/svggradientnode.hxx
@@ -76,39 +76,30 @@ namespace svgio
 
 /// x1 content
 const SvgNumber getX1() const;
-void setX1(const SvgNumber& rX1) { maX1 = rX1; }
 
 /// y1 content
 co

[Libreoffice-commits] core.git: include/svx svl/source svtools/source svx/inc svx/source

[Noel Grandin]

 include/svx/ctredlin.hxx |1 
 include/svx/dlgctrl.hxx  |1 
 include/svx/galtheme.hxx |2 -
 include/svx/imapdlg.hxx  |3 --
 include/svx/sdasitm.hxx  |2 -
 include/svx/sdr/attribute/sdrallfillattributeshelper.hxx |2 -
 include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx |3 --
 include/svx/sdr/overlay/overlayselection.hxx |1 
 include/svx/svddrgmt.hxx |1 
 include/svx/svdedtv.hxx  |1 
 include/svx/svdhdl.hxx   |2 -
 include/svx/svdmrkv.hxx  |2 -
 include/svx/svdobj.hxx   |5 ---
 include/svx/svdocapt.hxx |1 
 include/svx/svdoedge.hxx |2 -
 include/svx/svdograf.hxx |2 -
 include/svx/svdotext.hxx |4 --
 include/svx/svdpagv.hxx  |2 -
 include/svx/svdpntv.hxx  |7 
 include/svx/svdpoev.hxx  |1 
 include/svx/unoshape.hxx |2 -
 include/svx/xit.hxx  |1 
 svl/source/items/stylepool.cxx   |5 +--
 svtools/source/contnr/imivctl.hxx|2 -
 svtools/source/contnr/imivctl1.cxx   |4 +-
 svtools/source/control/roadmap.cxx   |4 --
 svtools/source/inc/unoiface.hxx  |1 
 svtools/source/misc/transfer.cxx |5 ---
 svtools/source/uno/unoiface.cxx  |7 
 svx/inc/sdr/overlay/overlaymanagerbuffered.hxx   |3 --
 svx/inc/sdr/overlay/overlayrectangle.hxx |6 
 svx/inc/sdr/overlay/overlayrollingrectangle.hxx  |6 
 svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx |1 
 svx/source/dialog/_contdlg.cxx   |2 -
 svx/source/dialog/contimp.hxx|1 
 svx/source/dialog/ctredlin.cxx   |7 
 svx/source/dialog/imapdlg.cxx|9 +-
 svx/source/form/fmexpl.cxx   |7 
 svx/source/form/fmitems.cxx  |2 -
 svx/source/form/fmshimp.cxx  |4 +-
 svx/source/gallery2/galtheme.cxx |6 +---
 svx/source/inc/fmexpl.hxx|1 
 svx/source/inc/fmitems.hxx   |2 -
 svx/source/inc/fmshimp.hxx   |4 --
 svx/source/items/customshapeitem.cxx |2 -
 svx/source/sdr/attribute/sdrallfillattributeshelper.cxx  |2 -
 svx/source/sdr/attribute/sdrformtextattribute.cxx|3 --
 svx/source/sdr/attribute/sdrtextattribute.cxx|6 +---
 svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx |   16 ++-
 svx/source/sdr/overlay/overlaymanagerbuffered.cxx|2 -
 svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx  |2 -
 svx/source/sdr/overlay/overlayrectangle.cxx  |8 ++---
 svx/source/sdr/overlay/overlayrollingrectangle.cxx   |6 ++--
 svx/source/sdr/overlay/overlayselection.cxx  |2 -
 svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx  |2 -
 svx/source/sidebar/text/TextCharacterSpacingControl.cxx  |2 -
 svx/source/sidebar/text/TextCharacterSpacingControl.hxx  |1 
 svx/source/svdraw/svddrgmt.cxx   |2 -
 svx/source/svdraw/svdedtv2.cxx   |2 -
 svx/source/svdraw/svdhdl.cxx |7 
 svx/source/svdraw/svdmrkv.cxx|2 -
 svx/source/svdraw/svdobj.cxx |7 
 svx/source/svdraw/svdocapt.cxx   |7 
 svx/source/svdraw/svdoedge.cxx   |2 -
 svx/source/svdraw/svdograf.cxx   |7 
 svx/source/svdraw/svdotext.cxx   |   12 
 svx/source/svdraw/svdotxat.cxx   |2 -
 svx/source/svdraw/svdpagv.cxx|8 -
 svx/source/svdraw/svdpntv.cxx|   16 ++-
 svx/source/svdraw/