[Libreoffice-commits] core.git: 2 commits - basctl/inc chart2/source cui/source extensions/inc extensions/source formula/inc formula/Library_forui.mk formula/source include/sfx2 include/svx include/xm

2016-06-06 Thread Noel Grandin 
 basctl/inc/basidesh.hrc|3 
 chart2/source/controller/inc/ShapeController.hrc   |4 
 cui/source/inc/cuires.hrc  |2 
 extensions/inc/propctrlr.hrc   |   10 --
 extensions/source/bibliography/bib.hrc |4 
 extensions/source/dbpilots/dbpresid.hrc|2 
 extensions/source/propctrlr/listselectiondlg.hrc   |2 
 formula/Library_forui.mk   |1 
 formula/inc/helpids.hrc|   30 --
 formula/source/ui/dlg/formdlgs.hrc |3 
 formula/source/ui/dlg/formdlgs.src |1 
 formula/source/ui/dlg/parawin.cxx  |1 
 formula/source/ui/dlg/parawin.src  |1 
 include/sfx2/sfx.hrc   |5 -
 include/sfx2/sidebar/ResourceDefinitions.hrc   |3 
 include/svx/AccessibleControlShape.hxx |2 
 include/svx/dialogs.hrc|   18 ---
 include/svx/dlgctrl.hxx|2 
 include/svx/fmshell.hxx|4 
 include/svx/fmtools.hxx|5 -
 include/svx/fmview.hxx |4 
 include/svx/graphctl.hxx   |2 
 include/svx/gridctrl.hxx   |2 
 include/svx/svdmodel.hxx   |4 
 include/svx/svdotable.hxx  |2 
 include/svx/svxids.hrc |   28 -
 include/svx/unoshtxt.hxx   |5 -
 include/xmloff/shapeimport.hxx |   12 +-
 include/xmloff/xmlimp.hxx  |2 
 reportdesign/inc/RptResId.hrc  |4 
 reportdesign/inc/helpids.hrc   |5 -
 sc/inc/sc.hrc  |   25 -
 sd/source/ui/dlg/headerfooterdlg.cxx   |1 
 sd/source/ui/dlg/masterlayoutdlg.cxx   |1 
 sd/source/ui/inc/dialogs.hrc   |   28 -
 sfx2/source/dialog/dialog.hrc  |3 
 sfx2/source/doc/doc.hrc|2 
 sfx2/source/inc/helpid.hrc |3 
 sfx2/source/inc/sfxlocal.hrc   |   10 --
 starmath/inc/starmath.hrc  |   33 --
 svx/inc/float3d.hrc|   83 -
 svx/inc/helpid.hrc |5 -
 svx/source/accessibility/AccessibleControlShape.cxx|4 
 svx/source/dialog/dlgctrl.cxx  |   11 --
 svx/source/dialog/graphctl.cxx |   10 --
 svx/source/dialog/imapdlg.hrc  |7 -
 svx/source/fmcomp/gridcell.cxx |   45 +++--
 svx/source/fmcomp/gridctrl.cxx |   23 +---
 svx/source/form/filtnav.cxx|7 -
 svx/source/form/fmshell.cxx|3 
 svx/source/form/fmsrcimp.cxx   |4 
 svx/source/form/fmtools.cxx|   15 ---
 svx/source/form/fmview.cxx |8 -
 svx/source/form/formcontroller.cxx |   40 ++--
 svx/source/form/formcontrolling.cxx|8 -
 svx/source/form/navigatortreemodel.cxx |   16 +--
 svx/source/form/tabwin.cxx |   11 --
 svx/source/inc/filtnav.hxx |2 
 svx/source/inc/fmexpl.hxx  |2 
 svx/source/inc/formcontroller.hxx  |4 
 svx/source/inc/formcontrolling.hxx |7 -
 svx/source/inc/gridcell.hxx|8 -
 svx/source/inc/tabwin.hxx  |2 
 svx/source/sidebar/text/TextPropertyPanel.hrc  |1 
 svx/source/svdraw/svdmodel.cxx |   11 --
 svx/source/table/svdotable.cxx |   73 +++---
 svx/source/unodraw/unoshtxt.cxx|8 -
 sw/source/uibase/inc/frmui.hrc |1 
 sw/source/uibase/sidebar/PropertyPanel.hrc |2 
 ucb/source/core/ucbstore.cxx   |   25 +
 ucb/source/sorter/sortresult.cxx   |9 -
 ucb/source/sorter/sortresult.hxx   |3 
 unotools/source/misc/eventlisteneradapter.cxx  |   24 +---
 vcl/inc/win/salids.hrc |2 
 xmloff/source/core/xmlimp.cxx  |   15 ---
 xmloff/source/draw/sdxmlexp.cxx|   35 +--

[Libreoffice-commits] core.git: 2 commits - comphelper/source connectivity/source editeng/source extensions/source framework/Library_fwi.mk framework/source include/comphelper include/framework includ

2016-06-06 Thread Noel Grandin 
 comphelper/source/misc/accessiblewrapper.cxx |   22 --
 connectivity/source/drivers/dbase/DIndexIter.cxx |   19 -
 connectivity/source/drivers/mork/MConnection.cxx |7 
 connectivity/source/drivers/mork/MConnection.hxx |6 
 connectivity/source/drivers/postgresql/pq_connection.cxx |   10 
 connectivity/source/inc/dbase/DIndexIter.hxx |5 
 editeng/source/xml/editsource.hxx|2 
 editeng/source/xml/xmltxtexp.cxx |   34 ---
 extensions/source/bibliography/framectr.cxx  |   22 --
 extensions/source/bibliography/framectr.hxx  |2 
 framework/Library_fwi.mk |1 
 framework/source/fwe/dispatch/interaction.cxx|   15 -
 include/comphelper/accessiblewrapper.hxx |3 
 include/framework/interaction.hxx|3 
 include/sfx2/brokenpackageint.hxx|9 
 include/svl/slstitm.hxx  |3 
 include/ucbhelper/proxydecider.hxx   |3 
 reportdesign/inc/RptModel.hxx|4 
 reportdesign/source/core/sdr/RptModel.cxx|   10 
 sc/inc/datauno.hxx   |7 
 sc/inc/dptabsrc.hxx  |6 
 sc/source/core/data/dptabsrc.cxx |   35 ---
 sc/source/ui/drawfunc/drtxtob.cxx|   16 -
 sc/source/ui/inc/drtxtob.hxx |2 
 sc/source/ui/inc/editsh.hxx  |2 
 sc/source/ui/unoobj/datauno.cxx  |   46 +---
 sc/source/ui/view/editsh.cxx |   16 -
 sd/source/ui/inc/DrawViewShell.hxx   |2 
 sd/source/ui/inc/OutlineViewShell.hxx|2 
 sd/source/ui/view/drviews7.cxx   |7 
 sd/source/ui/view/drviewsa.cxx   |   10 
 sd/source/ui/view/outlnvsh.cxx   |   15 -
 sfx2/source/appl/appuno.cxx  |   14 -
 stoc/source/defaultregistry/defaultregistry.cxx  |  158 +++
 svl/source/items/slstitm.cxx |  100 ++---
 svtools/source/inc/unoiface.hxx  |2 
 svtools/source/uno/unoiface.cxx  |   17 -
 svtools/source/uno/unoimap.cxx   |   15 -
 svx/source/fmcomp/gridctrl.cxx   |   13 -
 ucbhelper/source/client/proxydecider.cxx |   12 -
 xmloff/source/draw/animationexport.cxx   |   14 -
 xmlscript/source/xmlflat_imexp/xmlbas_import.cxx |   44 +---
 xmlscript/source/xmlflat_imexp/xmlbas_import.hxx |5 
 xmlscript/source/xmllib_imexp/imp_share.hxx  |5 
 xmlscript/source/xmllib_imexp/xmllib_import.cxx  |   51 +---
 xmlscript/source/xmlmod_imexp/imp_share.hxx  |5 
 xmlscript/source/xmlmod_imexp/xmlmod_import.cxx  |   23 --
 47 files changed, 323 insertions(+), 501 deletions(-)

New commits:
commit 0323253a7c67316cb96e4a64792ab4fe74aac1ca
Author: Noel Grandin 
Date:   Wed Jun 1 16:22:29 2016 +0200

remove some manual ref-counting

triggered when I noticed a class doing acquire() in the
constructor and then release() in the destructor.

found mostly by
git grep -n -B5 -e '->release()'

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

diff --git a/comphelper/source/misc/accessiblewrapper.cxx 
b/comphelper/source/misc/accessiblewrapper.cxx
index e106b9d..41fb4f5 100644
--- a/comphelper/source/misc/accessiblewrapper.cxx
+++ b/comphelper/source/misc/accessiblewrapper.cxx
@@ -347,18 +347,15 @@ namespace comphelper
 ,m_xInnerContext( _rxInnerAccessibleContext )
 ,m_xOwningAccessible( _rxOwningAccessible )
 ,m_xParentAccessible( _rxParentAccessible )
-,m_pChildMapper( nullptr )
-{
 // initialize the mapper for our children
-m_pChildMapper = new OWrappedAccessibleChildrenManager( 
getComponentContext() );
-m_pChildMapper->acquire();
-
+,m_xChildMapper( new OWrappedAccessibleChildrenManager( 
getComponentContext() ) )
+{
 // determine if we're allowed to cache children
 Reference< XAccessibleStateSet > xStates( 
m_xInnerContext->getAccessibleStateSet( ) );
 OSL_ENSURE( xStates.is(), 
"OAccessibleContextWrapperHelper::OAccessibleContextWrapperHelper: no inner 
state set!" );
-m_pChildMapper->setTransientChildren( !xStates.is() || 
xStates->contains( AccessibleStateType::MANAGES_DESCENDANTS) );
+m_xChildMapper->setTransientChildren( !xStates.is() || 
xStates->contains( Accessib

[Libreoffice-commits] core.git: 3 commits - chart2/source cui/source dbaccess/source include/sfx2 include/svx sc/source sd/source sfx2/source svx/source sw/source writerfilter/source xmlhelp/source

2016-06-06 Thread Noel Grandin 
 chart2/source/controller/dialogs/tp_AxisPositions.cxx |4 
 chart2/source/controller/dialogs/tp_AxisPositions.hxx |2 
 chart2/source/controller/dialogs/tp_Scale.cxx |8 -
 chart2/source/controller/dialogs/tp_Scale.hxx |2 
 cui/source/dialogs/hltpbase.cxx   |4 
 cui/source/dialogs/iconcdlg.cxx   |   16 +--
 cui/source/inc/align.hxx  |2 
 cui/source/inc/autocdlg.hxx   |4 
 cui/source/inc/backgrnd.hxx   |2 
 cui/source/inc/border.hxx |2 
 cui/source/inc/chardlg.hxx|8 -
 cui/source/inc/cuioptgenrl.hxx|2 
 cui/source/inc/cuitabarea.hxx |   14 +--
 cui/source/inc/cuitabline.hxx |6 -
 cui/source/inc/grfpage.hxx|2 
 cui/source/inc/hltpbase.hxx   |2 
 cui/source/inc/iconcdlg.hxx   |   12 --
 cui/source/inc/numfmt.hxx |2 
 cui/source/inc/numpages.hxx   |   12 +-
 cui/source/inc/page.hxx   |2 
 cui/source/inc/paragrph.hxx   |6 -
 cui/source/inc/swpossizetabpage.hxx   |2 
 cui/source/inc/tabstpge.hxx   |2 
 cui/source/inc/transfrm.hxx   |6 -
 cui/source/options/optcolor.cxx   |4 
 cui/source/options/optcolor.hxx   |2 
 cui/source/options/optgdlg.cxx|4 
 cui/source/options/optgdlg.hxx|2 
 cui/source/options/optgenrl.cxx   |4 
 cui/source/options/optinet2.cxx   |4 
 cui/source/options/optinet2.hxx   |2 
 cui/source/options/optmemory.cxx  |4 
 cui/source/options/optmemory.hxx  |2 
 cui/source/options/treeopt.cxx|8 -
 cui/source/tabpages/align.cxx |4 
 cui/source/tabpages/autocdlg.cxx  |8 -
 cui/source/tabpages/backgrnd.cxx  |6 -
 cui/source/tabpages/border.cxx|4 
 cui/source/tabpages/chardlg.cxx   |   16 +--
 cui/source/tabpages/grfpage.cxx   |4 
 cui/source/tabpages/numfmt.cxx|4 
 cui/source/tabpages/numpages.cxx  |   24 ++---
 cui/source/tabpages/page.cxx  |6 -
 cui/source/tabpages/paragrph.cxx  |   12 +-
 cui/source/tabpages/swpossizetabpage.cxx  |4 
 cui/source/tabpages/tabstpge.cxx  |4 
 cui/source/tabpages/tparea.cxx|4 
 cui/source/tabpages/tpbitmap.cxx  |6 -
 cui/source/tabpages/tpcolor.cxx   |6 -
 cui/source/tabpages/tpgradnt.cxx  |6 -
 cui/source/tabpages/tphatch.cxx   |6 -
 cui/source/tabpages/tpline.cxx|4 
 cui/source/tabpages/tplnedef.cxx  |4 
 cui/source/tabpages/tplneend.cxx  |4 
 cui/source/tabpages/tpshadow.cxx  |4 
 cui/source/tabpages/tptrans.cxx   |4 
 cui/source/tabpages/transfrm.cxx  |   12 +-
 dbaccess/source/ui/dlg/adminpages.cxx |6 -
 dbaccess/source/ui/dlg/adminpages.hxx |2 
 dbaccess/source/ui/dlg/dbwizsetup.cxx |5 -
 dbaccess/source/ui/dlg/tablespage.cxx |4 
 dbaccess/source/ui/dlg/tablespage.hxx |2 
 include/sfx2/dinfdlg.hxx  |4 
 include/sfx2/mgetempl.hxx |2 
 include/sfx2/printopt.hxx |2 
 include/sfx2/tabdlg.hxx   |   24 +++--
 include/svx/hdft.hxx  |2 
 include/svx/optgrid.hxx   |2 
 sc/source/ui/attrdlg/tabpages.cxx |4 
 sc/source/ui/dbgui/tpsort.cxx |8 -
 sc/source/ui/inc/tabpages.hxx |2 
 sc/source/ui/inc/tpcalc.hxx   |2 
 sc/source/ui/inc/tpcompatibility.hxx  |2 
 sc/source/ui/inc/tpdefaults.hxx   |2 
 sc/source/ui/inc/tpformula.hxx|2 
 sc/source/ui/inc/tphf.hxx |2 
 sc/source/ui/inc/tpprint.hxx  |2 
 sc/source/ui/inc/tpsort.hxx   |4 
 sc/source/ui/inc/tptable.hxx

[Libreoffice-commits] core.git: icon-themes/galaxy include/sfx2 sfx2/source

2016-06-06 Thread Akshay Deep 
 icon-themes/galaxy/res/templatestar.png  |binary
 include/sfx2/templateabstractview.hxx|4 +++
 include/sfx2/templateviewitem.hxx|6 
 sfx2/source/control/templateabstractview.cxx |   35 +++
 sfx2/source/control/templateview.hrc |1 
 sfx2/source/control/templateview.src |5 +++
 sfx2/source/control/templateviewitem.cxx |   26 +++-
 sfx2/source/doc/templatedlg.cxx  |5 +++
 8 files changed, 81 insertions(+), 1 deletion(-)

New commits:
commit a6ea18a9cc83a85f4bf4fce78b7dbef3d1a419c6
Author: Akshay Deep 
Date:   Thu Jun 2 16:06:12 2016 +0530

Mark Default Templates in Template Manager

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

diff --git a/icon-themes/galaxy/res/templatestar.png 
b/icon-themes/galaxy/res/templatestar.png
new file mode 100644
index 000..96bf3cb
Binary files /dev/null and b/icon-themes/galaxy/res/templatestar.png differ
diff --git a/include/sfx2/templateabstractview.hxx 
b/include/sfx2/templateabstractview.hxx
index 5a7..53641a7 100644
--- a/include/sfx2/templateabstractview.hxx
+++ b/include/sfx2/templateabstractview.hxx
@@ -112,6 +112,8 @@ public:
 long getThumbnailWidth() const  { return mnThumbnailWidth;}
 long getThumbnailHeight() const {return mnThumbnailHeight;}
 
+void RemoveDefaultTemplateIcon( OUString rPath);
+
 static BitmapEx scaleImg (const BitmapEx &rImg, long width, long height);
 
 static BitmapEx getDefaultThumbnail( const OUString& rPath );
@@ -122,6 +124,8 @@ protected:
 
 virtual void OnItemDblClicked(ThumbnailViewItem *pItem) override;
 
+bool IsDefaultTemplate(const OUString& rPath);
+
 protected:
 
 sal_uInt16 mnCurRegionId;
diff --git a/include/sfx2/templateviewitem.hxx 
b/include/sfx2/templateviewitem.hxx
index 180444e..10d4634 100644
--- a/include/sfx2/templateviewitem.hxx
+++ b/include/sfx2/templateviewitem.hxx
@@ -24,6 +24,10 @@ public:
 
 const OUString& getPath () const { return maPath; }
 
+void showDefaultIcon(bool bVal) { mbIsDefaultTemplate = bVal; }
+
+Rectangle getDefaultIconArea() const;
+
 virtual void Paint (drawinglayer::processor2d::BaseProcessor2D *pProcessor,
 const ThumbnailItemAttributes *pAttrs) override;
 
@@ -33,6 +37,8 @@ public:
 private:
 
 OUString maPath;
+BitmapEx maDefaultBitmap;
+bool mbIsDefaultTemplate;
 };
 
 #endif // INCLUDED_SFX2_TEMPLATEVIEWITEM_HXX
diff --git a/sfx2/source/control/templateabstractview.cxx 
b/sfx2/source/control/templateabstractview.cxx
index cf0f497..a9f358b 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -13,9 +13,11 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -34,6 +36,7 @@
 
 using namespace basegfx;
 using namespace drawinglayer::primitive2d;
+using namespace ::com::sun::star::uno;
 
 bool ViewFilter_Application::isFilteredExtension(FILTER_APPLICATION filter, 
const OUString &rExt)
 {
@@ -126,6 +129,9 @@ void TemplateAbstractView::insertItems(const 
std::vector
 pChild->setHelpText(pCur->aRegionName);
 pChild->maPreview1 = pCur->aThumbnail;
 
+if(IsDefaultTemplate(pCur->aPath))
+pChild->showDefaultIcon(true);
+
 if ( pCur->aThumbnail.IsEmpty() )
 {
 // Use the default thumbnail if we have nothing else
@@ -245,6 +251,35 @@ BitmapEx TemplateAbstractView::scaleImg (const BitmapEx 
&rImg, long width, long
 return aImg;
 }
 
+bool TemplateAbstractView::IsDefaultTemplate(const OUString& rPath)
+{
+SvtModuleOptions aModOpt;
+std::vector aList;
+const css::uno::Sequence &aServiceNames = 
aModOpt.GetAllServiceNames();
+
+for( sal_Int32 i=0, nCount = aServiceNames.getLength(); i < nCount; ++i )
+{
+const OUString defaultPath = SfxObjectFactory::GetStandardTemplate( 
aServiceNames[i] );
+if(defaultPath.match(rPath))
+return true;
+}
+
+return false;
+}
+
+void TemplateAbstractView::RemoveDefaultTemplateIcon( OUString rPath)
+{
+for (ThumbnailViewItem* pItem : mItemList)
+{
+TemplateViewItem* pViewItem = dynamic_cast(pItem);
+if(pViewItem->getPath().match(rPath))
+{
+pViewItem->showDefaultIcon(false);
+return;
+}
+}
+}
+
 BitmapEx TemplateAbstractView::getDefaultThumbnail( const OUString& rPath )
 {
 BitmapEx aImg;
diff --git a/sfx2/source/control/templateview.hrc 
b/sfx2/source/control/templateview.hrc
index d2073bc..ae679b8 100644
--- a/sfx2/source/control/templateview.hrc
+++ b/sfx2/source/control/templateview.hrc
@@ -14,5 +14,6 @@
 #define IMG_WELCOME  261
 #define IMG_RECENTDOC_REMOVE 262
 #define IMG_RECENTDOC_REMOVE

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

2016-06-06 Thread Xisco Fauli 
 include/svx/sdrpagewindow.hxx   |3 ++-
 svx/source/svdraw/sdrpagewindow.cxx |2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit e41d9a9ef9579c1f31dbca988d27f8320146a334
Author: Xisco Fauli 
Date:   Mon Jun 6 00:44:22 2016 +0200

tdf#89329: use unique_ptr for pImpl in sdrpagewindow

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

diff --git a/include/svx/sdrpagewindow.hxx b/include/svx/sdrpagewindow.hxx
index 48845fb..0adc7e4 100644
--- a/include/svx/sdrpagewindow.hxx
+++ b/include/svx/sdrpagewindow.hxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -47,7 +48,7 @@ class SVX_DLLPUBLIC SdrPageWindow
 {
 struct Impl;
 
-Impl* mpImpl;
+std::unique_ptr mpImpl;
 
 SdrPageWindow( const SdrPageWindow& ) = delete;
 SdrPageWindow& operator= ( const SdrPageWindow& ) = delete;
diff --git a/svx/source/svdraw/sdrpagewindow.cxx 
b/svx/source/svdraw/sdrpagewindow.cxx
index 642c867..e6db452 100644
--- a/svx/source/svdraw/sdrpagewindow.cxx
+++ b/svx/source/svdraw/sdrpagewindow.cxx
@@ -149,8 +149,6 @@ SdrPageWindow::~SdrPageWindow()
 uno::Reference< lang::XComponent > 
xComponent(mpImpl->mxControlContainer, uno::UNO_QUERY);
 xComponent->dispose();
 }
-
-delete mpImpl;
 }
 
 SdrPageView& SdrPageWindow::GetPageView() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-06 Thread Xisco Fauli 
 include/svx/svdmodel.hxx   |2 +-
 svx/source/svdraw/svdmodel.cxx |3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit fd393faa68d5979d319900438a789d40630a56ec
Author: Xisco Fauli 
Date:   Mon Jun 6 00:50:58 2016 +0200

tdf#89329: use unique_ptr for pImpl in svdmodel

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

diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 65889f4..b0e4d56 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -226,7 +226,7 @@ public:
 SdrOutlinerCache*   mpOutlinerCache;
 //get a vector of all the SdrOutliner belonging to the model
 std::vector GetActiveOutliners() const;
-SdrModelImpl*   mpImpl;
+std::unique_ptr   mpImpl;
 sal_uInt16  mnCharCompressType;
 sal_uInt16  mnHandoutPageCount;
 sal_uInt16  nReserveUInt6;
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index b654568..acef3ac 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -107,7 +107,7 @@ struct SdrModelImpl
 void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* 
_pEmbeddedHelper,
 bool bUseExtColorTable)
 {
-mpImpl = new SdrModelImpl;
+mpImpl.reset(new SdrModelImpl);
 mpImpl->mpUndoManager=nullptr;
 mpImpl->mpUndoFactory=nullptr;
 mbInDestruction = false;
@@ -316,7 +316,6 @@ SdrModel::~SdrModel()
 delete mpNumberFormatter;
 
 delete mpImpl->mpUndoFactory;
-delete mpImpl;
 }
 
 void SdrModel::SetSwapGraphics()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-06 Thread Xisco Fauli 
 connectivity/source/commontools/TColumnsHelper.cxx |5 +
 include/connectivity/TColumnsHelper.hxx|2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 8a9559c59c0ee78cdab929b3e01fcd4bc9d569b2
Author: Xisco Fauli 
Date:   Sat Jun 4 23:14:20 2016 +0200

tdf#89329: use unique_ptr for pImpl in TColumnHelper

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

diff --git a/connectivity/source/commontools/TColumnsHelper.cxx 
b/connectivity/source/commontools/TColumnsHelper.cxx
index 5d6fcf8..6cf821b 100644
--- a/connectivity/source/commontools/TColumnsHelper.cxx
+++ b/connectivity/source/commontools/TColumnsHelper.cxx
@@ -64,15 +64,12 @@ OColumnsHelper::OColumnsHelper( ::cppu::OWeakObject& 
_rParent
 ,const TStringVector &_rVector
 ,bool _bUseHardRef
 ) : 
OCollection(_rParent,_bCase,_rMutex,_rVector,false,_bUseHardRef)
-,m_pImpl(nullptr)
 ,m_pTable(nullptr)
 {
 }
 
 OColumnsHelper::~OColumnsHelper()
 {
-delete m_pImpl;
-m_pImpl = nullptr;
 }
 
 
@@ -82,7 +79,7 @@ sdbcx::ObjectType OColumnsHelper::createObject(const 
OUString& _rName)
 Reference xConnection = m_pTable->getConnection();
 
 if ( !m_pImpl )
-m_pImpl = new OColumnsHelperImpl(isCaseSensitive());
+m_pImpl.reset(new OColumnsHelperImpl(isCaseSensitive()));
 
 bool bQueryInfo = true;
 bool bAutoIncrement = false;
diff --git a/include/connectivity/TColumnsHelper.hxx 
b/include/connectivity/TColumnsHelper.hxx
index 0c970ae..d4e5296 100644
--- a/include/connectivity/TColumnsHelper.hxx
+++ b/include/connectivity/TColumnsHelper.hxx
@@ -33,7 +33,7 @@ namespace connectivity
 */
 class OOO_DLLPUBLIC_DBTOOLS OColumnsHelper : public sdbcx::OCollection
 {
-OColumnsHelperImpl* m_pImpl;
+std::unique_ptr m_pImpl;
 protected:
 OTableHelper*   m_pTable;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-06 Thread Xisco Fauli 
 include/sfx2/viewsh.hxx|2 
 sfx2/source/view/sfxbasecontroller.cxx |2 
 sfx2/source/view/viewprn.cxx   |   14 +--
 sfx2/source/view/viewsh.cxx|  136 -
 4 files changed, 76 insertions(+), 78 deletions(-)

New commits:
commit 82407c651ee8b5d8876d4a1f76898de33c69e232
Author: Xisco Fauli 
Date:   Sun Jun 5 00:53:03 2016 +0200

tdf#89329: use unique_ptr for pImpl in viewsh

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

diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index f76e00c..936df38 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -148,7 +148,7 @@ friend class SfxBaseController;
 friend class SfxPrinterController;
 #endif
 
-struct SfxViewShell_Impl*   pImp;
+std::unique_ptr   pImpl;
 SfxViewFrame*   pFrame;
 SfxShell*   pSubShell;
 VclPtr pWindow;
diff --git a/sfx2/source/view/sfxbasecontroller.cxx 
b/sfx2/source/view/sfxbasecontroller.cxx
index eca3f8a..11c316c 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -996,7 +996,7 @@ void SAL_CALL SfxBaseController::dispose() throw( 
RuntimeException, std::excepti
 if ( pFrame && pFrame->GetViewShell() == m_pData->m_pViewShell )
 pFrame->GetFrame().SetIsClosing_Impl();
 m_pData->m_pViewShell->DiscardClients_Impl();
-m_pData->m_pViewShell->pImp->m_bControllerSet = false;
+m_pData->m_pViewShell->pImpl->m_bControllerSet = false;
 
 if ( pFrame )
 {
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 1ce85c4..87b0869 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -397,7 +397,7 @@ void SfxPrinterController::jobFinished( 
css::view::PrintableState nState )
 
 if ( mpViewShell )
 {
-mpViewShell->pImp->m_xPrinterController.reset();
+mpViewShell->pImpl->m_xPrinterController.reset();
 }
 }
 }
@@ -567,7 +567,7 @@ void SfxViewShell::SetPrinter_Impl( VclPtr& 
pNewPrinter )
 
 void SfxViewShell::StartPrint( const uno::Sequence < beans::PropertyValue >& 
rProps, bool bIsAPI, bool bIsDirect )
 {
-assert( pImp->m_xPrinterController.get() == nullptr );
+assert( pImpl->m_xPrinterController.get() == nullptr );
 
 // get the current selection; our controller should know it
 Reference< frame::XController > xController( GetController() );
@@ -605,7 +605,7 @@ void SfxViewShell::StartPrint( const uno::Sequence < 
beans::PropertyValue >& rPr

this,

rProps

));
-pImp->m_xPrinterController = xNewController;
+pImpl->m_xPrinterController = xNewController;
 
 SfxObjectShell *pObjShell = GetObjectShell();
 xNewController->setValue( "JobName",
@@ -624,13 +624,13 @@ void SfxViewShell::ExecPrint( const uno::Sequence < 
beans::PropertyValue >& rPro
 
 const std::shared_ptr< vcl::PrinterController >& 
SfxViewShell::GetPrinterController() const
 {
-return pImp->m_xPrinterController;
+return pImpl->m_xPrinterController;
 }
 
 Printer* SfxViewShell::GetActivePrinter() const
 {
-return (pImp->m_xPrinterController)
-?  pImp->m_xPrinterController->getPrinter().get() : nullptr;
+return (pImpl->m_xPrinterController)
+?  pImpl->m_xPrinterController->getPrinter().get() : nullptr;
 }
 
 void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
@@ -821,7 +821,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
 VclPtrInstance pPrintSetupDlg( GetWindow() 
);
 std::unique_ptr pExecutor;
 
-if (pImp->m_bHasPrintOptions && HasPrintOptionsPage())
+if (pImpl->m_bHasPrintOptions && HasPrintOptionsPage())
 {
 // additional controls for dialog
 pExecutor.reset( new SfxDialogExecutor_Impl( this, 
pPrintSetupDlg ) );
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index a957c14..e3ec058 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -381,12 +381,12 @@ OUString impl_searchFormatTypeForApp(const 
css::uno::Reference< css::frame::XFra
 
 void SfxViewShell::NewIPClient_Impl( SfxInPlaceClient *pIPClient )
 {
-pImp->GetIPClientList_Impl()->push_back(pIPClient);
+pImpl->GetIPClientList_Impl()->push_back(pIPClient);
 }
 
 void SfxViewShell::IPClientGone_Impl( SfxInPlaceClient *pIPClient )
 {
-SfxInPlaceClientList* pClientList = pImp->GetIPClientList_Impl();
+SfxInPlaceClientList* pClientList = pImpl->GetIPClientList_Impl();

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

2016-06-06 Thread Miklos Vajna 
 writerfilter/source/rtftok/rtfdispatchvalue.cxx |2 +-
 writerfilter/source/rtftok/rtfdocumentimpl.cxx  |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 101e7d94092291c2117b7a1a61b1a8155a5e750b
Author: Miklos Vajna 
Date:   Mon Jun 6 09:09:27 2016 +0200

writerfilter: fix excessive whitespace

Change-Id: I87eee678fb3d50adb0a51143f1779d64a780eab0

diff --git a/writerfilter/source/rtftok/rtfdispatchvalue.cxx 
b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
index d89cf08..2c75dab 100644
--- a/writerfilter/source/rtftok/rtfdispatchvalue.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
@@ -151,7 +151,7 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword 
nKeyword, int nParam)
 {
 case RTF_FS:
 case RTF_AFS:
-nSprm =  (m_aStates.top().isRightToLeft || m_aStates.top().eRunType == 
RTFParserState::RunType::HICH)
+nSprm = (m_aStates.top().isRightToLeft || m_aStates.top().eRunType == 
RTFParserState::RunType::HICH)
 ? NS_ooxml::LN_EG_RPrBase_szCs : NS_ooxml::LN_EG_RPrBase_sz;
 break;
 case RTF_ANIMTEXT:
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 30ace13..3874ccf 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1674,12 +1674,12 @@ RTFError RTFDocumentImpl::dispatchToggle(RTFKeyword 
nKeyword, bool bParam, int n
 {
 case RTF_B:
 case RTF_AB:
-nSprm =   (m_aStates.top().isRightToLeft || m_aStates.top().eRunType 
== RTFParserState::RunType::HICH)
+nSprm = (m_aStates.top().isRightToLeft || m_aStates.top().eRunType == 
RTFParserState::RunType::HICH)
 ? NS_ooxml::LN_EG_RPrBase_bCs : NS_ooxml::LN_EG_RPrBase_b;
 break;
 case RTF_I:
 case RTF_AI:
-nSprm =   (m_aStates.top().isRightToLeft || m_aStates.top().eRunType 
== RTFParserState::RunType::HICH)
+nSprm = (m_aStates.top().isRightToLeft || m_aStates.top().eRunType == 
RTFParserState::RunType::HICH)
 ? NS_ooxml::LN_EG_RPrBase_iCs : NS_ooxml::LN_EG_RPrBase_i;
 break;
 case RTF_OUTL:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-06 Thread Xisco Fauli 
 include/unotools/accessiblerelationsethelper.hxx  |3 ++-
 unotools/source/accessibility/accessiblerelationsethelper.cxx |9 +++--
 2 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 353e5ea62ed6a273a3856bd1e3cb4d2380804e83
Author: Xisco Fauli 
Date:   Sat Jun 4 23:03:57 2016 +0200

tdf#89329: use unique_ptr for pImpl in accessiblerelationsethelper

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

diff --git a/include/unotools/accessiblerelationsethelper.hxx 
b/include/unotools/accessiblerelationsethelper.hxx
index 538d6cd..f2a9f97 100644
--- a/include/unotools/accessiblerelationsethelper.hxx
+++ b/include/unotools/accessiblerelationsethelper.hxx
@@ -30,6 +30,7 @@
 #include 
 #include 
 #include 
+#include 
 
 class AccessibleRelationSetHelperImpl;
 
@@ -136,7 +137,7 @@ protected:
 
 private:
 /// The implementation of this helper interface.
-AccessibleRelationSetHelperImpl*mpHelperImpl;
+std::unique_ptrmpHelperImpl;
 };
 
 }
diff --git a/unotools/source/accessibility/accessiblerelationsethelper.cxx 
b/unotools/source/accessibility/accessiblerelationsethelper.cxx
index 726943c..0c62e6c 100644
--- a/unotools/source/accessibility/accessiblerelationsethelper.cxx
+++ b/unotools/source/accessibility/accessiblerelationsethelper.cxx
@@ -123,24 +123,21 @@ void AccessibleRelationSetHelperImpl::AddRelation(const 
AccessibleRelation& rRel
 //=  internal  
 
 AccessibleRelationSetHelper::AccessibleRelationSetHelper ()
-: mpHelperImpl(nullptr)
+: mpHelperImpl(new AccessibleRelationSetHelperImpl)
 {
-mpHelperImpl = new AccessibleRelationSetHelperImpl();
 }
 
 AccessibleRelationSetHelper::AccessibleRelationSetHelper (const 
AccessibleRelationSetHelper& rHelper)
 : cppu::WeakImplHelper1()
-, mpHelperImpl(nullptr)
 {
 if (rHelper.mpHelperImpl)
-mpHelperImpl = new 
AccessibleRelationSetHelperImpl(*rHelper.mpHelperImpl);
+mpHelperImpl.reset(new 
AccessibleRelationSetHelperImpl(*rHelper.mpHelperImpl));
 else
-mpHelperImpl = new AccessibleRelationSetHelperImpl();
+mpHelperImpl.reset(new AccessibleRelationSetHelperImpl());
 }
 
 AccessibleRelationSetHelper::~AccessibleRelationSetHelper()
 {
-delete mpHelperImpl;
 }
 
 //=  XAccessibleRelationSet  ==
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-06 Thread Xisco Fauli 
 include/sfx2/mailmodelapi.hxx|7 ---
 sfx2/source/dialog/mailmodel.cxx |   20 +++-
 2 files changed, 11 insertions(+), 16 deletions(-)

New commits:
commit 3e2ce043daeb4ba470a64909765336e9bc931fd4
Author: Xisco Fauli 
Date:   Sun Jun 5 00:14:37 2016 +0200

tdf#89329: use unique_ptr for pImpl in mailmodelapi

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

diff --git a/include/sfx2/mailmodelapi.hxx b/include/sfx2/mailmodelapi.hxx
index ba8285e..7d048b7 100644
--- a/include/sfx2/mailmodelapi.hxx
+++ b/include/sfx2/mailmodelapi.hxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 
 // class AddressList_Impl 
 typedef ::std::vector< OUString > AddressList_Impl;
@@ -71,9 +72,9 @@ protected:
   OUString& rFileNamePath );
 
 private:
-AddressList_Impl*   mpToList;
-AddressList_Impl*   mpCcList;
-AddressList_Impl*   mpBccList;
+std::unique_ptr   mpToList;
+std::unique_ptr   mpCcList;
+std::unique_ptr   mpBccList;
 OUStringmaFromAddress;
 OUStringmaSubject;
 
diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index 3622c9f..1522234 100644
--- a/sfx2/source/dialog/mailmodel.cxx
+++ b/sfx2/source/dialog/mailmodel.cxx
@@ -648,18 +648,12 @@ SfxMailModel::SaveResult 
SfxMailModel::SaveDocumentAsFormat(
 return eRet;
 }
 
-SfxMailModel::SfxMailModel() :
-mpToList( nullptr ),
-mpCcList( nullptr ),
-mpBccList   ( nullptr )
+SfxMailModel::SfxMailModel()
 {
 }
 
 SfxMailModel::~SfxMailModel()
 {
-delete mpToList;
-delete mpCcList;
-delete mpBccList;
 }
 
 void SfxMailModel::AddAddress( const OUString& rAddress, AddressRole eRole )
@@ -672,22 +666,22 @@ void SfxMailModel::AddAddress( const OUString& rAddress, 
AddressRole eRole )
 {
 if ( !mpToList )
 // create the list
-mpToList = new AddressList_Impl();
-pList = mpToList;
+mpToList.reset(new AddressList_Impl);
+pList = mpToList.get();
 }
 else if ( ROLE_CC == eRole )
 {
 if ( !mpCcList )
 // create the list
-mpCcList = new AddressList_Impl();
-pList = mpCcList;
+mpCcList.reset(new AddressList_Impl);
+pList = mpCcList.get();
 }
 else if ( ROLE_BCC == eRole )
 {
 if ( !mpBccList )
 // create the list
-mpBccList = new AddressList_Impl();
-pList = mpBccList;
+mpBccList.reset(new AddressList_Impl);
+pList = mpBccList.get();
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-06 Thread Jochen Nitschke 
 chart2/source/view/axes/VCartesianAxis.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 738aefb51aa034188a5342b4b04e15629038e087
Author: Jochen Nitschke 
Date:   Mon Jun 6 02:12:08 2016 +0200

follow up fix: initialise PointSequenceSequence directly

commit e95be04a73e977022455335d7cbf56804638f761
uses wrong ctor: Sequence( sal_Int32 len )

Change-Id: I08751c10942f705ead008155a6e7e9dcfb0a2ca9
Reviewed-on: https://gerrit.libreoffice.org/25945
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/chart2/source/view/axes/VCartesianAxis.cxx 
b/chart2/source/view/axes/VCartesianAxis.cxx
index a8561dc..59a4972 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -1849,9 +1849,10 @@ void VCartesianAxis::createShapes()
 AxisLabelAlignment aLabelAlign = 
m_aAxisProperties.maLabelAlignment;
 get2DAxisMainLine(aStart, aEnd, aLabelAlign, 
fExtraLineCrossesOtherAxis);
 m_aAxisProperties.maLabelAlignment = aLabelAlign;
-drawing::PointSequenceSequence aPoints{{
+drawing::PointSequenceSequence 
aPoints{std::initializer_list>
+{std::initializer_list{
 {static_cast(aStart.getX()), 
static_cast(aStart.getY())},
-{static_cast(aEnd.getX()), 
static_cast(aEnd.getY())} }};
+{static_cast(aEnd.getX()), 
static_cast(aEnd.getY())} }}};
 Reference< drawing::XShape > xShape = 
m_pShapeFactory->createLine2D(
 m_xGroupShape_Shapes, aPoints, 
&m_aAxisProperties.m_aLineProperties );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: clang/qa clang/rename.cxx

2016-06-06 Thread Miklos Vajna 
 clang/qa/data/rename-cxx-dynamic-cast-expr.cxx  |   12 
 clang/qa/data/rename-cxx-dynamic-cast-expr.cxx.expected |   12 
 clang/qa/test-rename.sh |4 
 clang/rename.cxx|   14 +-
 4 files changed, 41 insertions(+), 1 deletion(-)

New commits:
commit feb699d7a1dd037463254e0f24263e36d517f820
Author: Miklos Vajna 
Date:   Mon Jun 6 09:12:25 2016 +0200

clang: handle dynamic_cast in rename

Refactor to do the same as what is done already for static_cast.

diff --git a/clang/qa/data/rename-cxx-dynamic-cast-expr.cxx 
b/clang/qa/data/rename-cxx-dynamic-cast-expr.cxx
new file mode 100644
index 000..753c44e
--- /dev/null
+++ b/clang/qa/data/rename-cxx-dynamic-cast-expr.cxx
@@ -0,0 +1,12 @@
+class C
+{
+public:
+int getValue() const { return 0; }
+};
+
+int main()
+{
+C* pC = new C();
+dynamic_cast(*pC).getValue();
+dynamic_cast(pC)->getValue();
+}
diff --git a/clang/qa/data/rename-cxx-dynamic-cast-expr.cxx.expected 
b/clang/qa/data/rename-cxx-dynamic-cast-expr.cxx.expected
new file mode 100644
index 000..4eb064a
--- /dev/null
+++ b/clang/qa/data/rename-cxx-dynamic-cast-expr.cxx.expected
@@ -0,0 +1,12 @@
+class D
+{
+public:
+int getValue() const { return 0; }
+};
+
+int main()
+{
+D* pC = new D();
+dynamic_cast(*pC).getValue();
+dynamic_cast(pC)->getValue();
+}
diff --git a/clang/qa/test-rename.sh b/clang/qa/test-rename.sh
index 6755779..c18fd0a 100755
--- a/clang/qa/test-rename.sh
+++ b/clang/qa/test-rename.sh
@@ -95,6 +95,10 @@ declare_rename_test "testCXXStaticCastExpr" 
"rename-cxx-static-cast-expr.cxx"
 bin/rename -old-name=C -new-name=D $test_input --
 test_assert_equal $test_expected $test_output
 
+declare_rename_test "testCXXDynamicCastExpr" "rename-cxx-dynamic-cast-expr.cxx"
+bin/rename -old-name=C -new-name=D $test_input --
+test_assert_equal $test_expected $test_output
+
 declare_rename_test "testCXXDestructorDecl" "rename-cxx-destructor-decl.cxx"
 bin/rename -old-name=C -new-name=D $test_input --
 test_assert_equal $test_expected $test_output
diff --git a/clang/rename.cxx b/clang/rename.cxx
index 892e33a..329aacd 100644
--- a/clang/rename.cxx
+++ b/clang/rename.cxx
@@ -268,8 +268,10 @@ public:
  *
  * ... static_cast(...) ...;
  *   ^ ... and this.
+ *
+ * ... and the same for dynamic_cast<>().
  */
-bool VisitCXXStaticCastExpr(clang::CXXStaticCastExpr* pExpr)
+bool handleCXXNamedCastExpr(clang::CXXNamedCastExpr* pExpr)
 {
 clang::QualType pType = pExpr->getType();
 const clang::RecordDecl* pDecl = pType->getPointeeCXXRecordDecl();
@@ -283,6 +285,16 @@ public:
 }
 return true;
 }
+
+bool VisitCXXStaticCastExpr(clang::CXXStaticCastExpr* pExpr)
+{
+return handleCXXNamedCastExpr(pExpr);
+}
+
+bool VisitCXXDynamicCastExpr(clang::CXXDynamicCastExpr* pExpr)
+{
+return handleCXXNamedCastExpr(pExpr);
+}
 };
 
 class RenameASTConsumer : public clang::ASTConsumer
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-06 Thread Xisco Fauli 
 include/sfx2/app.hxx  |4 +-
 sfx2/source/appl/app.cxx  |   62 --
 sfx2/source/appl/appbas.cxx   |   12 
 sfx2/source/appl/appchild.cxx |   24 
 sfx2/source/appl/appdde.cxx   |   42 ++--
 sfx2/source/appl/appinit.cxx  |   54 ++--
 sfx2/source/appl/appmain.cxx  |8 ++---
 sfx2/source/appl/appmisc.cxx  |8 ++---
 sfx2/source/appl/appquit.cxx  |   54 ++--
 sfx2/source/appl/appreg.cxx   |   12 
 sfx2/source/appl/appserv.cxx  |   18 ++--
 11 files changed, 148 insertions(+), 150 deletions(-)

New commits:
commit d2e0d10d481f76e142635463bdccb6bc6706cc13
Author: Xisco Fauli 
Date:   Sun Jun 5 00:27:48 2016 +0200

tdf#89329: use unique_ptr for pImpl in app

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

diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index 4978bc7..2b02ed1 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -107,7 +107,7 @@ class SfxObjectShellLock;
 
 class SFX2_DLLPUBLIC SfxApplication: public SfxShell
 {
-SfxAppData_Impl*pAppData_Impl;
+std::unique_ptrpImpl;
 
 DECL_DLLPRIVATE_LINK_TYPED( GlobalBasicErrorHdl_Impl, StarBASIC*, bool );
 
@@ -183,7 +183,7 @@ public:
 SAL_DLLPRIVATE void SetOptions_Impl(const SfxItemSet &);
 SAL_DLLPRIVATE void Initialize_Impl();
 
-SAL_DLLPRIVATE SfxAppData_Impl* Get_Impl() const { return pAppData_Impl; }
+SAL_DLLPRIVATE SfxAppData_Impl* Get_Impl() const { return pImpl.get(); }
 
 // Object-Factories/global arrays
 SAL_DLLPRIVATE void RegisterChildWindow_Impl(SfxModule*, 
SfxChildWinFactory*);
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 085961e..8619727 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -165,14 +165,13 @@ SfxApplication* SfxApplication::GetOrCreate()
 }
 
 SfxApplication::SfxApplication()
-: pAppData_Impl( nullptr )
+: pImpl( new SfxAppData_Impl( this ) )
 {
 SetName( "StarOffice" );
 if (!utl::ConfigManager::IsAvoidConfig())
 SvtViewOptions::AcquireOptions();
 
-pAppData_Impl = new SfxAppData_Impl( this );
-pAppData_Impl->m_xImeStatusWindow->init();
+pImpl->m_xImeStatusWindow->init();
 
 SAL_INFO( "sfx.appl", "{ initialize DDE" );
 
@@ -220,14 +219,13 @@ SfxApplication::~SfxApplication()
 if (!utl::ConfigManager::IsAvoidConfig())
 SvtViewOptions::ReleaseOptions();
 
-if ( !pAppData_Impl->bDowning )
+if ( !pImpl->bDowning )
 Deinitialize();
 
 #if HAVE_FEATURE_SCRIPTING
 delete pBasic;
 #endif
 
-delete pAppData_Impl;
 g_pSfxApplication = nullptr;
 }
 
@@ -247,7 +245,7 @@ const OUString& SfxApplication::GetLastDir_Impl() const
 */
 
 {
-return pAppData_Impl->aLastDir;
+return pImpl->aLastDir;
 }
 
 const OUString& SfxApplication::GetLastSaveDirectory() const
@@ -280,28 +278,28 @@ void SfxApplication::SetLastDir_Impl
 */
 
 {
-pAppData_Impl->aLastDir = rNewDir;
+pImpl->aLastDir = rNewDir;
 }
 
 
 void SfxApplication::ResetLastDir()
 {
-pAppData_Impl->aLastDir.clear();
+pImpl->aLastDir.clear();
 }
 
 
 SfxDispatcher* SfxApplication::GetDispatcher_Impl()
 {
-return pAppData_Impl->pViewFrame? 
pAppData_Impl->pViewFrame->GetDispatcher(): pAppData_Impl->pAppDispat;
+return pImpl->pViewFrame? pImpl->pViewFrame->GetDispatcher(): 
pImpl->pAppDispat;
 }
 
 
 void SfxApplication::SetViewFrame_Impl( SfxViewFrame *pFrame )
 {
-if ( pFrame != pAppData_Impl->pViewFrame )
+if ( pFrame != pImpl->pViewFrame )
 {
 // get the containerframes ( if one of the frames is an InPlaceFrame )
-SfxViewFrame *pOldContainerFrame = pAppData_Impl->pViewFrame;
+SfxViewFrame *pOldContainerFrame = pImpl->pViewFrame;
 while ( pOldContainerFrame && 
pOldContainerFrame->GetParentViewFrame_Impl() )
 pOldContainerFrame = pOldContainerFrame->GetParentViewFrame_Impl();
 SfxViewFrame *pNewContainerFrame = pFrame;
@@ -323,7 +321,7 @@ void SfxApplication::SetViewFrame_Impl( SfxViewFrame 
*pFrame )
 pOldContainerFrame->GetProgress()->Suspend();
 }
 
-pAppData_Impl->pViewFrame = pFrame;
+pImpl->pViewFrame = pFrame;
 
 if( pNewContainerFrame )
 {
@@ -343,9 +341,9 @@ void SfxApplication::SetViewFrame_Impl( SfxViewFrame 
*pFrame )
 pProgress->SetState( pProgress->GetState() );
 }
 
-if ( pAppData_Impl->pViewFrame->GetViewShell() )
+if ( pImpl->pViewFrame->GetViewShell() )
 {
-SfxDispatcher* pDisp = 
pAppData_Impl->pViewFrame->GetDispatcher();
+SfxDispatcher* pDisp = pImpl->pViewFrame->GetDispatcher();

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

2016-06-06 Thread Xisco Fauli 
 include/sfx2/unoctitm.hxx|2 +-
 sfx2/source/control/unoctitm.cxx |   38 +++---
 2 files changed, 20 insertions(+), 20 deletions(-)

New commits:
commit cc813c946c2fdb2e050db773572431a537e37215
Author: Xisco Fauli 
Date:   Sun Jun 5 00:00:45 2016 +0200

tdf#89329: use unique_ptr for pImpl in unoctitm

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

diff --git a/include/sfx2/unoctitm.hxx b/include/sfx2/unoctitm.hxx
index 8d58738..235c815 100644
--- a/include/sfx2/unoctitm.hxx
+++ b/include/sfx2/unoctitm.hxx
@@ -73,7 +73,7 @@ class SfxDispatchController_Impl;
 class SfxOfficeDispatch : public ::cppu::ImplInheritanceHelper1< 
SfxStatusDispatcher, css::lang::XUnoTunnel >
 {
 friend class SfxDispatchController_Impl;
-SfxDispatchController_Impl*  pControllerItem;
+std::unique_ptr  pImpl;
 public:
 SfxOfficeDispatch( SfxBindings& rBind,
SfxDispatcher* pDispat,
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 7c1fefe..3c00b52 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -161,24 +161,24 @@ sal_Int64 SAL_CALL SfxOfficeDispatch::getSomething( const 
css::uno::Sequence< sa
 }
 
 SfxOfficeDispatch::SfxOfficeDispatch( SfxBindings& rBindings, SfxDispatcher* 
pDispat, const SfxSlot* pSlot, const css::util::URL& rURL )
+: pImpl( new SfxDispatchController_Impl( this, &rBindings, pDispat, pSlot, 
rURL ))
 {
-// this object is an adapter that shows a css::frame::XDispatch-Interface 
to the outside and uses a SfxControllerItem to monitor a state
-pControllerItem = new SfxDispatchController_Impl( this, &rBindings, 
pDispat, pSlot, rURL );
+// pImpl is an adapter that shows a css::frame::XDispatch-Interface to the 
outside and uses a SfxControllerItem to monitor a state
+
 }
 
 SfxOfficeDispatch::SfxOfficeDispatch( SfxDispatcher* pDispat, const SfxSlot* 
pSlot, const css::util::URL& rURL )
+: pImpl( new SfxDispatchController_Impl( this, nullptr, pDispat, pSlot, 
rURL ))
 {
-// this object is an adapter that shows a css::frame::XDispatch-Interface 
to the outside and uses a SfxControllerItem to monitor a state
-pControllerItem = new SfxDispatchController_Impl( this, nullptr, pDispat, 
pSlot, rURL );
+// pImpl is an adapter that shows a css::frame::XDispatch-Interface to the 
outside and uses a SfxControllerItem to monitor a state
 }
 
 SfxOfficeDispatch::~SfxOfficeDispatch()
 {
-if ( pControllerItem )
+if ( pImpl )
 {
 // when dispatch object is released, destroy its connection to this 
object and destroy it
-pControllerItem->UnBindController();
-delete pControllerItem;
+pImpl->UnBindController();
 }
 }
 
@@ -194,7 +194,7 @@ const css::uno::Sequence< sal_Int8 >& 
SfxOfficeDispatch::impl_getStaticIdentifie
 void SAL_CALL SfxOfficeDispatch::dispatch( const css::util::URL& aURL, const 
css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw ( 
css::uno::RuntimeException, std::exception )
 {
 // ControllerItem is the Impl class
-if ( pControllerItem )
+if ( pImpl )
 {
 #if HAVE_FEATURE_JAVA
 // The JavaContext contains an interaction handler which is used when
@@ -206,7 +206,7 @@ void SAL_CALL SfxOfficeDispatch::dispatch( const 
css::util::URL& aURL, const css
 css::uno::ContextLayer layer(
 new svt::JavaContext( css::uno::getCurrentContext() ) );
 #endif
-pControllerItem->dispatch( aURL, aArgs, css::uno::Reference < 
css::frame::XDispatchResultListener >() );
+pImpl->dispatch( aURL, aArgs, css::uno::Reference < 
css::frame::XDispatchResultListener >() );
 }
 }
 
@@ -215,41 +215,41 @@ void SAL_CALL 
SfxOfficeDispatch::dispatchWithNotification( const css::util::URL&
 const css::uno::Reference< css::frame::XDispatchResultListener >& 
rListener ) throw( css::uno::RuntimeException, std::exception )
 {
 // ControllerItem is the Impl class
-if ( pControllerItem )
+if ( pImpl )
 {
 #if HAVE_FEATURE_JAVA
 // see comment for SfxOfficeDispatch::dispatch
 css::uno::ContextLayer layer( new svt::JavaContext( 
css::uno::getCurrentContext() ) );
 #endif
-pControllerItem->dispatch( aURL, aArgs, rListener );
+pImpl->dispatch( aURL, aArgs, rListener );
 }
 }
 
 void SAL_CALL SfxOfficeDispatch::addStatusListener(const css::uno::Reference< 
css::frame::XStatusListener > & aListener, const css::util::URL& aURL) throw ( 
css::uno::RuntimeException, std::exception )
 {
 GetListeners().addInterface( aURL.Complete, aListener );
-if ( pControllerItem )
+if ( pImpl )
 {
 // ControllerItem is the Impl class
-pControllerItem->addStatusListener( aListener, aURL );
+pImpl->addStat

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

2016-06-06 Thread Xisco Fauli 
 include/vcl/dialog.hxx   |2 +-
 vcl/source/window/dialog.cxx |5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 4fcbf856049e56f916d1044fa8cd7e3759a87079
Author: Xisco Fauli 
Date:   Sat Jun 4 23:20:57 2016 +0200

tdf#89329: use unique_ptr for pImpl in dialog

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

diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index 3aa38f5..9c07747 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -37,7 +37,7 @@ public:
 
 private:
 VclPtr  mpPrevExecuteDlg;
-DialogImpl* mpDialogImpl;
+std::unique_ptr mpDialogImpl;
 longmnMousePositioned;
 boolmbInExecute;
 boolmbInClose;
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index b3b39ae..30f051f 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -362,7 +362,7 @@ void Dialog::ImplInitDialogData()
 mpContentArea.clear();
 mpActionArea.clear();
 mnMousePositioned   = 0;
-mpDialogImpl= new DialogImpl;
+mpDialogImpl.reset(new DialogImpl);
 }
 
 void Dialog::ImplInit( vcl::Window* pParent, WinBits nStyle, InitFlag eFlag )
@@ -583,8 +583,7 @@ Dialog::~Dialog()
 
 void Dialog::dispose()
 {
-delete mpDialogImpl;
-mpDialogImpl = nullptr;
+mpDialogImpl.reset();
 mpPrevExecuteDlg.clear();
 mpActionArea.clear();
 mpContentArea.clear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-06 Thread Xisco Fauli 
 include/vcl/window.hxx|4 -
 vcl/source/window/window.cxx  |2 
 vcl/source/window/window2.cxx |   96 +-
 3 files changed, 51 insertions(+), 51 deletions(-)

New commits:
commit 7f3116bb8d58897e35505ff1d012f9e5bf2cfa72
Author: Xisco Fauli 
Date:   Sat Jun 4 23:54:17 2016 +0200

tdf#89329: use unique_ptr for pImpl in window

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

diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index e93870c..3a3e980 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -538,7 +538,7 @@ private:
 //   Please do *not* add new members or inline functions to class 
Window,
 //   but use class WindowImpl instead
 
-WindowImpl* mpWindowImpl;
+std::unique_ptr mpWindowImpl;
 
 #ifdef DBG_UTIL
 friend const char* ::ImplDbgCheckWindow( const void* pObj );
@@ -580,7 +580,7 @@ public:
 
 SAL_DLLPRIVATE void ImplIsInTaskPaneList( bool 
mbIsInTaskList );
 
-SAL_DLLPRIVATE WindowImpl*  ImplGetWindowImpl() const { return 
mpWindowImpl; }
+SAL_DLLPRIVATE WindowImpl*  ImplGetWindowImpl() const { return 
mpWindowImpl.get(); }
 
 SAL_DLLPRIVATE PointImplFrameToOutput( const Point& rPos );
 
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index e37a052..6cdb1f6 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -550,7 +550,7 @@ void Window::dispose()
 }
 
 // should be the last statements
-delete mpWindowImpl; mpWindowImpl = nullptr;
+mpWindowImpl.reset();
 
 OutputDevice::dispose();
 }
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 801943b..fa9fc15 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1381,7 +1381,7 @@ namespace
 
 void Window::InvalidateSizeCache()
 {
-WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ? 
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ? 
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
 pWindowImpl->mnOptimalWidthCache = -1;
 pWindowImpl->mnOptimalHeightCache = -1;
 }
@@ -1398,7 +1398,7 @@ void Window::queue_resize(StateChangedType eReason)
 InvalidateSizeCache();
 }
 
-WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ? 
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ? 
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
 if (pWindowImpl->m_xSizeGroup && pWindowImpl->m_xSizeGroup->get_mode() != 
VCL_SIZE_GROUP_NONE)
 {
 std::set > &rWindows = 
pWindowImpl->m_xSizeGroup->get_widgets();
@@ -1645,7 +1645,7 @@ void Window::set_height_request(sal_Int32 nHeightRequest)
 if (!mpWindowImpl)
 return;
 
-WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ? 
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ? 
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
 
 if ( pWindowImpl->mnHeightRequest != nHeightRequest )
 {
@@ -1659,7 +1659,7 @@ void Window::set_width_request(sal_Int32 nWidthRequest)
 if (!mpWindowImpl)
 return;
 
-WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ? 
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ? 
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
 
 if ( pWindowImpl->mnWidthRequest != nWidthRequest )
 {
@@ -1674,7 +1674,7 @@ Size Window::get_ungrouped_preferred_size() const
 if (aRet.Width() == -1 || aRet.Height() == -1)
 {
 //cache gets blown away by queue_resize
-WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ? 
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ? 
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
 if (pWindowImpl->mnOptimalWidthCache == -1 || 
pWindowImpl->mnOptimalHeightCache == -1)
 {
 Size aOptimal(GetOptimalSize());
@@ -1694,7 +1694,7 @@ Size Window::get_preferred_size() const
 {
 Size aRet(get_ungrouped_preferred_size());
 
-WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ? 
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ? 
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
 if (pWindowImpl->m_xSizeGroup)
 {
 const VclSizeGroupMode eMode = pWindowImpl->m_xSizeGroup->get_mode();
@@ -1723,247 +1723,247 @@ Size Window::get_preferred_size() const
 
 VclAlign

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

2016-06-06 Thread Xisco Fauli 
 include/sfx2/viewfrm.hxx  |2 
 sfx2/source/view/viewfrm.cxx  |  122 --
 sfx2/source/view/viewfrm2.cxx |   20 +++---
 3 files changed, 71 insertions(+), 73 deletions(-)

New commits:
commit 1c087eb58df11bbfb14a564e5ad73e29664b73ce
Author: Xisco Fauli 
Date:   Sun Jun 5 00:33:58 2016 +0200

tdf#89329: use unique_ptr for pImpl in viewfrm

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

diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index 3a3e8dd..4c40587 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -64,7 +64,7 @@ namespace basegfx
 
 class SFX2_DLLPUBLIC SfxViewFrame: public SfxShell, public SfxListener
 {
-struct SfxViewFrame_Impl*   m_pImp;
+std::unique_ptr   m_pImpl;
 
 SfxObjectShellRef   m_xObjSh;
 SfxDispatcher*  m_pDispatcher;
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 4537a6a..fc96248 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -204,12 +204,12 @@ static bool AskPasswordToModify_Impl( const 
uno::Reference< task::XInteractionHa
 
 void SfxViewFrame::SetDowning_Impl()
 {
-m_pImp->bIsDowning = true;
+m_pImpl->bIsDowning = true;
 }
 
 bool SfxViewFrame::IsDowning_Impl() const
 {
-return m_pImp->bIsDowning;
+return m_pImpl->bIsDowning;
 }
 
 class SfxViewNotificatedFrameList_Impl :
@@ -549,7 +549,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
 if(  pForceReloadItem && !pForceReloadItem->GetValue() &&
 !pSh->GetMedium()->IsExpired() )
 return;
-if( m_pImp->bReloading || pSh->IsInModalMode() )
+if( m_pImpl->bReloading || pSh->IsInModalMode() )
 return;
 
 // AutoLoad is prohibited if possible
@@ -559,7 +559,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
 return;
 
 SfxObjectShellLock xOldObj( pSh );
-m_pImp->bReloading = true;
+m_pImpl->bReloading = true;
 const SfxStringItem* pURLItem = 
rReq.GetArg(SID_FILE_NAME);
 // Open as editable?
 bool bForEdit = !pSh->IsReadOnly();
@@ -824,7 +824,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
 // Record as not done
 rReq.Done();
 rReq.SetReturnValue(SfxBoolItem(rReq.GetSlot(), false));
-m_pImp->bReloading = false;
+m_pImpl->bReloading = false;
 return;
 }
 }
@@ -1077,16 +1077,16 @@ void SfxViewFrame::ReleaseObjectShell_Impl()
 Notify( *m_xObjSh, SfxSimpleHint(SFX_HINT_TITLECHANGED) );
 Notify( *m_xObjSh, SfxSimpleHint(SFX_HINT_DOCCHANGED) );
 
-if ( 1 == m_xObjSh->GetOwnerLockCount() && m_pImp->bObjLocked && 
m_xObjSh->GetCreateMode() == SfxObjectCreateMode::EMBEDDED )
+if ( 1 == m_xObjSh->GetOwnerLockCount() && m_pImpl->bObjLocked && 
m_xObjSh->GetCreateMode() == SfxObjectCreateMode::EMBEDDED )
 m_xObjSh->DoClose();
 SfxObjectShellRef xDyingObjSh = m_xObjSh;
 m_xObjSh.Clear();
-if( ( GetFrameType() & SFXFRAME_HASTITLE ) && m_pImp->nDocViewNo )
-xDyingObjSh->GetNoSet_Impl().ReleaseIndex(m_pImp->nDocViewNo-1);
-if ( m_pImp->bObjLocked )
+if( ( GetFrameType() & SFXFRAME_HASTITLE ) && m_pImpl->nDocViewNo )
+xDyingObjSh->GetNoSet_Impl().ReleaseIndex(m_pImpl->nDocViewNo-1);
+if ( m_pImpl->bObjLocked )
 {
 xDyingObjSh->OwnerLock( false );
-m_pImp->bObjLocked = false;
+m_pImpl->bObjLocked = false;
 }
 }
 
@@ -1177,7 +1177,7 @@ void SfxViewFrame::SetBorderPixelImpl
 )
 
 {
-m_pImp->aBorder = rBorder;
+m_pImpl->aBorder = rBorder;
 
 if ( IsResizeInToOut_Impl() && !GetFrame().IsInPlace() )
 {
@@ -1212,7 +1212,7 @@ void SfxViewFrame::SetBorderPixelImpl
 
 const SvBorder& SfxViewFrame::GetBorderPixelImpl() const
 {
-return m_pImp->aBorder;
+return m_pImpl->aBorder;
 }
 
 void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
@@ -1372,19 +1372,19 @@ IMPL_LINK_NOARG_TYPED(SfxViewFrame, 
SwitchReadOnlyHandler, Button*, void)
 
 void SfxViewFrame::Construct_Impl( SfxObjectShell *pObjSh )
 {
-m_pImp->bResizeInToOut = true;
-m_pImp->bDontOverwriteResizeInToOut = false;
-m_pImp->bObjLocked = false;
-m_pImp->pFocusWin = nullptr;
-m_pImp->pActiveChild = nullptr;
-m_pImp->nCurViewId = 0;
-m_pImp->bReloading = false;
-m_pImp->bIsDowning = false;
-m_pImp->bModal = false;
-m_pImp->bEnabled = true;
-m_pImp->nDocViewNo = 0;
-m_pImp->aMargin = Size( -1, -1 );
-m_pImp->pWindow = nullptr;
+m_pImpl->bResizeInToOut = true;
+m_pImpl->bDontOverwriteResizeInT

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

2016-06-06 Thread Xisco Fauli 
 include/sfx2/prnmon.hxx  |2 +-
 sfx2/source/view/printer.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6b51e9afe01171a46f19fb96b1c2a2074d5a92ca
Author: Xisco Fauli 
Date:   Sat Jun 4 23:54:47 2016 +0200

tdf#89329: use unique_ptr for pImpl in prnmon

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

diff --git a/include/sfx2/prnmon.hxx b/include/sfx2/prnmon.hxx
index 289d57d..f54e883 100644
--- a/include/sfx2/prnmon.hxx
+++ b/include/sfx2/prnmon.hxx
@@ -34,7 +34,7 @@ struct SfxPrintOptDlg_Impl;
 class SfxPrintOptionsDialog : public ModalDialog
 {
 private:
-SfxPrintOptDlg_Impl*pDlgImpl;
+std::unique_ptr   pDlgImpl;
 SfxViewShell*   pViewSh;
 SfxItemSet* pOptions;
 VclPtr  pPage;
diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx
index 7f95cf8..996ab8a 100644
--- a/sfx2/source/view/printer.cxx
+++ b/sfx2/source/view/printer.cxx
@@ -222,7 +222,7 @@ SfxPrintOptionsDialog::~SfxPrintOptionsDialog()
 
 void SfxPrintOptionsDialog::dispose()
 {
-delete pDlgImpl;
+pDlgImpl.reset();
 pPage.disposeAndClear();
 delete pOptions;
 ModalDialog::dispose();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-06 Thread Xisco Fauli 
 include/sfx2/objsh.hxx   |6 -
 sfx2/source/doc/objcont.cxx  |   58 +-
 sfx2/source/doc/objembed.cxx |   22 ++--
 sfx2/source/doc/objmisc.cxx  |  228 +--
 sfx2/source/doc/objserv.cxx  |   38 +++
 sfx2/source/doc/objstor.cxx  |  172 
 sfx2/source/doc/objxtor.cxx  |  114 ++---
 7 files changed, 318 insertions(+), 320 deletions(-)

New commits:
commit 37c0fd253e7a73d08d35b60fecd7aa09816d9073
Author: Xisco Fauli 
Date:   Sun Jun 5 01:01:51 2016 +0200

tdf#89329: use unique_ptr for pImpl in objsh

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

diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 24b1d82..ee86c34 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -205,7 +205,7 @@ friend struct ModifyBlocker_Impl;
 friend class SfxObjectShellLock;
 
 private:
-struct SfxObjectShell_Impl* pImp; // internal data
+std::unique_ptr pImpl; // internal data
 
 SfxMedium * pMedium;  // Description of the file for 
example
   // storage that contains the object
@@ -654,12 +654,12 @@ public:
 SAL_DLLPRIVATE bool IsModifyPasswordEntered();
 
 SAL_DLLPRIVATE void InitBasicManager_Impl();
-SAL_DLLPRIVATE SfxObjectShell_Impl* Get_Impl() { return pImp; }
+SAL_DLLPRIVATE SfxObjectShell_Impl* Get_Impl() { return pImpl.get(); }
 
 SAL_DLLPRIVATE static bool UseInteractionToHandleError(
 const css::uno::Reference< css::task::XInteractionHandler 
>& xHandler,
 sal_uInt32 nError );
-SAL_DLLPRIVATE const SfxObjectShell_Impl* Get_Impl() const { return pImp; }
+SAL_DLLPRIVATE const SfxObjectShell_Impl* Get_Impl() const { return 
pImpl.get(); }
 
 SAL_DLLPRIVATE void SetCreateMode_Impl( SfxObjectCreateMode nMode );
 
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index 7219e3f..e5681b8 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -238,19 +238,19 @@ void SfxObjectShell::UpdateTime_Impl(
 
 // Safe impossible cases!
 // User has changed time to the past between last editing and now ... its 
not possible!!!
-DBG_ASSERT( !(aNow.GetDate()nTime.GetDate()), "Timestamp of last 
change is in the past ?!..." );
+DBG_ASSERT( !(aNow.GetDate()nTime.GetDate()), "Timestamp of last 
change is in the past ?!..." );
 
 // Do the follow only, if user has NOT changed time to the past.
 // Else add a time of 0 to aOldTime ... !!!
-if (aNow.GetDate()>=pImp->nTime.GetDate())
+if (aNow.GetDate()>=pImpl->nTime.GetDate())
 {
 // Get count of days last editing.
-nDays = aNow.GetSecFromDateTime(pImp->nTime.GetDate())/86400 ;
+nDays = aNow.GetSecFromDateTime(pImpl->nTime.GetDate())/86400 ;
 
 if (nDays==0)
 {
 // If no day between now and last editing - calculate time 
directly.
-nAddTime=   (const tools::Time&)aNow - (const 
tools::Time&)pImp->nTime ;
+nAddTime=   (const tools::Time&)aNow - (const 
tools::Time&)pImpl->nTime ;
 }
 else if (nDays<=31)
 {
@@ -261,14 +261,14 @@ void SfxObjectShell::UpdateTime_Impl(
 // nAddTime = (24h - nTime) + (nDays * 24h) + aNow
 --nDays;
  nAddTime=  nDays*n24Time.GetTime() ;
-nAddTime+=  n24Time-(const tools::Time&)pImp->nTime;
+nAddTime+=  n24Time-(const tools::Time&)pImpl->nTime;
 nAddTime+=  aNow;
 }
 
 lcl_add(editDuration, nAddTime);
 }
 
-pImp->nTime = aNow;
+pImpl->nTime = aNow;
 try {
 const sal_Int32 newSecs( (editDuration.Hours*3600)
 + (editDuration.Minutes*60) + editDuration.Seconds);
@@ -545,77 +545,77 @@ void SfxObjectShell::ResetFromTemplate( const OUString& 
rTemplateName, const OUS
 
 bool SfxObjectShell::IsQueryLoadTemplate() const
 {
-return pImp->bQueryLoadTemplate;
+return pImpl->bQueryLoadTemplate;
 }
 
 bool SfxObjectShell::IsUseUserData() const
 {
-return pImp->bUseUserData;
+return pImpl->bUseUserData;
 }
 
 bool SfxObjectShell::IsUseThumbnailSave() const
 {
-return pImp->bUseThumbnailSave;
+return pImpl->bUseThumbnailSave;
 }
 
 void SfxObjectShell::SetQueryLoadTemplate( bool bNew )
 {
-if ( pImp->bQueryLoadTemplate != bNew )
+if ( pImpl->bQueryLoadTemplate != bNew )
 SetModified();
-pImp->bQueryLoadTemplate = bNew;
+pImpl->bQueryLoadTemplate = bNew;
 }
 
 void SfxObjectShell::SetUseUserData( bool bNew )
 {
-if ( pImp->bUseUserData != bNew )
+if ( pImpl->bUseUserData != bNew )
 SetModified();
-pImp->bUseUserData = bNew;
+pImpl->bUseUserData = bNew;
 }
 
 vo

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

2016-06-06 Thread Xisco Fauli 
 include/xmloff/xmlnumfe.hxx  |3 ++-
 xmloff/source/style/xmlnumfe.cxx |5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 52af06b471ed3e4627be3950330ad311b71c275b
Author: Xisco Fauli 
Date:   Wed Jun 1 01:03:01 2016 +0200

tdf#89329: use unique_ptr for pImpl in xmlnumfe

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

diff --git a/include/xmloff/xmlnumfe.hxx b/include/xmloff/xmlnumfe.hxx
index 8e47ff6..be72e4b 100644
--- a/include/xmloff/xmlnumfe.hxx
+++ b/include/xmloff/xmlnumfe.hxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #define XML_WRITTENNUMBERSTYLES "WrittenNumberStyles"
 
@@ -49,7 +50,7 @@ private:
 OUString sPrefix;
 SvNumberFormatter*  pFormatter;
 OUStringBuffer   sTextContent;
-SvXMLNumUsedList_Impl*  pUsedList;
+std::unique_ptr  pUsedList;
 CharClass*  pCharClass;
 LocaleDataWrapper*  pLocaleData;
 
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index dc785d07..78bd915 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -254,7 +254,7 @@ SvXMLNumFmtExport::SvXMLNumFmtExport(
 pLocaleData = new LocaleDataWrapper( rExport.getComponentContext(), 
aLanguageTag );
 }
 
-pUsedList = new SvXMLNumUsedList_Impl;
+pUsedList.reset(new SvXMLNumUsedList_Impl);
 }
 
 SvXMLNumFmtExport::SvXMLNumFmtExport(
@@ -288,12 +288,11 @@ SvXMLNumFmtExport::SvXMLNumFmtExport(
 pLocaleData = new LocaleDataWrapper( rExport.getComponentContext(), 
aLanguageTag );
 }
 
-pUsedList = new SvXMLNumUsedList_Impl;
+pUsedList.reset(new SvXMLNumUsedList_Impl);
 }
 
 SvXMLNumFmtExport::~SvXMLNumFmtExport()
 {
-delete pUsedList;
 delete pLocaleData;
 delete pCharClass;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-06 Thread Xisco Fauli 
 include/unotools/accessiblestatesethelper.hxx  |3 ++-
 unotools/source/accessibility/accessiblestatesethelper.cxx |   12 
 2 files changed, 6 insertions(+), 9 deletions(-)

New commits:
commit c9ff3efd2cc1a0bcf09b073972ecf21b244f9fd8
Author: Xisco Fauli 
Date:   Sat Jun 4 23:07:09 2016 +0200

tdf#89329: use unique_ptr for pImpl in accessiblestatesethelper

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

diff --git a/include/unotools/accessiblestatesethelper.hxx 
b/include/unotools/accessiblestatesethelper.hxx
index f880302..86d4950 100644
--- a/include/unotools/accessiblestatesethelper.hxx
+++ b/include/unotools/accessiblestatesethelper.hxx
@@ -29,6 +29,7 @@
 #include 
 #include 
 #include 
+#include 
 
 class AccessibleStateSetHelperImpl;
 
@@ -144,7 +145,7 @@ protected:
 
 private:
 /// The implementation of this helper interface.
-AccessibleStateSetHelperImpl*   mpHelperImpl;
+std::unique_ptr   mpHelperImpl;
 };
 
 }
diff --git a/unotools/source/accessibility/accessiblestatesethelper.cxx 
b/unotools/source/accessibility/accessiblestatesethelper.cxx
index 1608b97..aa9e8a7 100644
--- a/unotools/source/accessibility/accessiblestatesethelper.cxx
+++ b/unotools/source/accessibility/accessiblestatesethelper.cxx
@@ -126,31 +126,27 @@ inline void 
AccessibleStateSetHelperImpl::RemoveState(sal_Int16 aState)
 //=  internal  
 
 AccessibleStateSetHelper::AccessibleStateSetHelper ()
-: mpHelperImpl(nullptr)
+: mpHelperImpl(new AccessibleStateSetHelperImpl)
 {
-mpHelperImpl = new AccessibleStateSetHelperImpl();
 }
 
 AccessibleStateSetHelper::AccessibleStateSetHelper ( const sal_Int64 
_nInitialStates )
-: mpHelperImpl(nullptr)
+: mpHelperImpl(new AccessibleStateSetHelperImpl)
 {
-mpHelperImpl = new AccessibleStateSetHelperImpl();
 mpHelperImpl->AddStates( _nInitialStates );
 }
 
 AccessibleStateSetHelper::AccessibleStateSetHelper (const 
AccessibleStateSetHelper& rHelper)
 : cppu::WeakImplHelper1()
-, mpHelperImpl(nullptr)
 {
 if (rHelper.mpHelperImpl)
-mpHelperImpl = new AccessibleStateSetHelperImpl(*rHelper.mpHelperImpl);
+mpHelperImpl.reset(new 
AccessibleStateSetHelperImpl(*rHelper.mpHelperImpl));
 else
-mpHelperImpl = new AccessibleStateSetHelperImpl();
+mpHelperImpl.reset(new AccessibleStateSetHelperImpl());
 }
 
 AccessibleStateSetHelper::~AccessibleStateSetHelper()
 {
-delete mpHelperImpl;
 }
 
 //=  XAccessibleStateSet  ==
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-06 Thread Xisco Fauli 
 include/unotools/configvaluecontainer.hxx   |4 ++--
 unotools/source/config/configvaluecontainer.cxx |1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit a4a97fb56c526a0f3793e55826afce42f4b0eeef
Author: Xisco Fauli 
Date:   Sat Jun 4 23:09:16 2016 +0200

tdf#89329: use unique_ptr for pImpl in configvaluecontainer

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

diff --git a/include/unotools/configvaluecontainer.hxx 
b/include/unotools/configvaluecontainer.hxx
index 970bc18..664f10a 100644
--- a/include/unotools/configvaluecontainer.hxx
+++ b/include/unotools/configvaluecontainer.hxx
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 
 
 enum class CVCFlags
@@ -65,8 +66,7 @@ namespace utl
 class UNOTOOLS_DLLPUBLIC OConfigurationValueContainer
 {
 private:
-OConfigurationValueContainerImpl*
-m_pImpl;
+std::unique_ptr m_pImpl;
 
 protected:
 
diff --git a/unotools/source/config/configvaluecontainer.cxx 
b/unotools/source/config/configvaluecontainer.cxx
index a13b52a..df0a002 100644
--- a/unotools/source/config/configvaluecontainer.cxx
+++ b/unotools/source/config/configvaluecontainer.cxx
@@ -220,7 +220,6 @@ namespace utl
 
 OConfigurationValueContainer::~OConfigurationValueContainer()
 {
-delete m_pImpl;
 }
 
 void OConfigurationValueContainer::implConstruct( const OUString& 
_rConfigLocation,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-06 Thread Yousuf Philips 
 sw/uiconfig/swriter/toolbar/drawbar.xml |5 +++--
 sw/uiconfig/swriter/toolbar/standardbar.xml |2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 33459c1b7c76f909ccdbaa707ef27d7e3be80550
Author: Yousuf Philips 
Date:   Sat Jun 4 20:10:40 2016 +0400

tdf#81475 Minor tweaks to writer toolbars

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

diff --git a/sw/uiconfig/swriter/toolbar/drawbar.xml 
b/sw/uiconfig/swriter/toolbar/drawbar.xml
index 52986b5..cb002a4 100644
--- a/sw/uiconfig/swriter/toolbar/drawbar.xml
+++ b/sw/uiconfig/swriter/toolbar/drawbar.xml
@@ -22,10 +22,11 @@
  
  
  
+ 
  
- 
+ 
  
- 
+ 
  
  
  
diff --git a/sw/uiconfig/swriter/toolbar/standardbar.xml 
b/sw/uiconfig/swriter/toolbar/standardbar.xml
index 50a94e8..8b1401e 100644
--- a/sw/uiconfig/swriter/toolbar/standardbar.xml
+++ b/sw/uiconfig/swriter/toolbar/standardbar.xml
@@ -68,7 +68,7 @@
  
  
  
- 
+ 
  
  
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-06 Thread Yousuf Philips 
 sc/uiconfig/scalc/toolbar/drawbar.xml |   16 +++-
 sc/uiconfig/scalc/toolbar/formatobjectbar.xml |2 ++
 sc/uiconfig/scalc/toolbar/standardbar.xml |1 +
 3 files changed, 14 insertions(+), 5 deletions(-)

New commits:
commit 3eb15d6119ff36d79aed3b8a42bac42c25afea4e
Author: Yousuf Philips 
Date:   Sat Jun 4 20:35:30 2016 +0400

tdf#85594 Unify Calc drawing toolbar with Writer

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

diff --git a/sc/uiconfig/scalc/toolbar/drawbar.xml 
b/sc/uiconfig/scalc/toolbar/drawbar.xml
index e724e75..fef6c7e 100644
--- a/sc/uiconfig/scalc/toolbar/drawbar.xml
+++ b/sc/uiconfig/scalc/toolbar/drawbar.xml
@@ -20,19 +20,25 @@
 http://openoffice.org/2001/toolbar"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
  
  
+ 
  
+ 
+ 
+ 
+ 
+ 
+ 
  
- 
  
- 
- 
+ 
+ 
  
- 
+ 
  
  
  
  
- 
+ 
  
  
  
diff --git a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml 
b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
index 6c2deea..800db8d 100644
--- a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
+++ b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
@@ -24,6 +24,8 @@
  
  
  
+ 
+ 
  
  
  
diff --git a/sc/uiconfig/scalc/toolbar/standardbar.xml 
b/sc/uiconfig/scalc/toolbar/standardbar.xml
index c3d5c5d..bbd8f42 100644
--- a/sc/uiconfig/scalc/toolbar/standardbar.xml
+++ b/sc/uiconfig/scalc/toolbar/standardbar.xml
@@ -59,6 +59,7 @@
  
  
  
+ 
  
  
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Update to Firebird 3.0

2016-06-06 Thread Lionel Elie Mamane 
On Sun, Jun 05, 2016 at 04:50:24PM +0200, Bunth Tamás wrote:

>> With what path was it opened during the build before your change?

> /home/wastack/libreoffice/core/workdir/UnpackedTarball/firebird/gen/Release/firebird/plugins/Engine12.so
> were passed to the dlopen().

So, need to understand how it is (through what mechanism) that path
changes from
/home/wastack/libreoffice/core/workdir/UnpackedTarball/firebird/gen/Release/firebird/plugins/libEngine12.so
to
/usr/local/lib/firebird/plugins/libEngine12.so

between build-time and "running as part of LibreOffice" time. That was
the idea behind by question "are they using a specific firebird.conf
during build".

If it is an API call that sets the root path where the files are
expected, then that is perfect! We can "just" make the same API call,
adapting the path passed to the API call.

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

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

2016-06-06 Thread Tor Lillqvist 
 include/sfx2/templateabstractview.hxx|4 ++--
 sfx2/source/control/templateabstractview.cxx |3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 9d4bc00abbada676e17ff44c5bc1cc7a77765575
Author: Tor Lillqvist 
Date:   Mon Jun 6 10:22:49 2016 +0300

loplugin:staticmethods

Change-Id: I1c178eedb1443372cdc474e36133400c0ad476ba

diff --git a/include/sfx2/templateabstractview.hxx 
b/include/sfx2/templateabstractview.hxx
index d10da23..e6029685 100644
--- a/include/sfx2/templateabstractview.hxx
+++ b/include/sfx2/templateabstractview.hxx
@@ -124,7 +124,7 @@ protected:
 
 virtual void OnItemDblClicked(ThumbnailViewItem *pItem) override;
 
-bool IsDefaultTemplate(const OUString& rPath);
+static bool IsDefaultTemplate(const OUString& rPath);
 
 protected:
 
commit d6efb4e417b3f85782c82fd97788db6b26740a19
Author: Tor Lillqvist 
Date:   Mon Jun 6 10:21:56 2016 +0300

loplugin:unusedvariablecheck

Change-Id: Icbf2138d3ac69fb0022134fb7ceab34935ccdc2a

diff --git a/sfx2/source/control/templateabstractview.cxx 
b/sfx2/source/control/templateabstractview.cxx
index e9656f3..5d95c37 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -254,7 +254,6 @@ BitmapEx TemplateAbstractView::scaleImg (const BitmapEx 
&rImg, long width, long
 bool TemplateAbstractView::IsDefaultTemplate(const OUString& rPath)
 {
 SvtModuleOptions aModOpt;
-std::vector aList;
 const css::uno::Sequence &aServiceNames = 
aModOpt.GetAllServiceNames();
 
 for( sal_Int32 i=0, nCount = aServiceNames.getLength(); i < nCount; ++i )
commit 043b2900aed2f6e2c22e90710302b15afec312b4
Author: Tor Lillqvist 
Date:   Mon Jun 6 10:17:46 2016 +0300

loplugin:passstuffbyref

Change-Id: Ie1cd7d63aaf2963137138def86cf5f4e141569b2

diff --git a/include/sfx2/templateabstractview.hxx 
b/include/sfx2/templateabstractview.hxx
index 53641a7..d10da23 100644
--- a/include/sfx2/templateabstractview.hxx
+++ b/include/sfx2/templateabstractview.hxx
@@ -112,7 +112,7 @@ public:
 long getThumbnailWidth() const  { return mnThumbnailWidth;}
 long getThumbnailHeight() const {return mnThumbnailHeight;}
 
-void RemoveDefaultTemplateIcon( OUString rPath);
+void RemoveDefaultTemplateIcon( const OUString& rPath);
 
 static BitmapEx scaleImg (const BitmapEx &rImg, long width, long height);
 
diff --git a/sfx2/source/control/templateabstractview.cxx 
b/sfx2/source/control/templateabstractview.cxx
index a9f358b..e9656f3 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -267,7 +267,7 @@ bool TemplateAbstractView::IsDefaultTemplate(const 
OUString& rPath)
 return false;
 }
 
-void TemplateAbstractView::RemoveDefaultTemplateIcon( OUString rPath)
+void TemplateAbstractView::RemoveDefaultTemplateIcon(const OUString& rPath)
 {
 for (ThumbnailViewItem* pItem : mItemList)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basctl/source include/sfx2 sc/source sd/source sfx2/source starmath/source sw/source

2016-06-06 Thread Mark Page 
 basctl/source/basicide/basicmod.hxx |2 
 include/sfx2/module.hxx |7 --
 sc/source/ui/app/scmod.cxx  |2 
 sd/source/ui/app/sdmod.cxx  |2 
 sfx2/source/appl/module.cxx |  105 ++--
 starmath/source/smmod.cxx   |2 
 sw/source/uibase/app/swmodule.cxx   |2 
 7 files changed, 38 insertions(+), 84 deletions(-)

New commits:
commit e319ef1171dab61fff2201f5c1470ca09894c395
Author: Mark Page 
Date:   Fri Jun 3 11:16:49 2016 +0100

Simplify sfx2 removing SfxModuleArr_Impl and dummy SfxModule flag

The SfxModuleArr_Impl is a static container of SfxModule, since
this is private to the SfxModule class it does not require
wrapping.

The bDummy flag is unused, and complicates the class

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

diff --git a/basctl/source/basicide/basicmod.hxx 
b/basctl/source/basicide/basicmod.hxx
index f462927..b52a1c7 100644
--- a/basctl/source/basicide/basicmod.hxx
+++ b/basctl/source/basicide/basicmod.hxx
@@ -31,7 +31,7 @@ class Module : public SfxModule
 static Module* mpModule;
 public:
 Module ( ResMgr *pMgr, SfxObjectFactory *pObjFact) :
-SfxModule( pMgr, false, pObjFact, nullptr )
+SfxModule( pMgr, pObjFact, nullptr )
 { }
 public:
 static Module*& Get () { return mpModule; }
diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx
index 6e10d7c..7871675 100644
--- a/include/sfx2/module.hxx
+++ b/include/sfx2/module.hxx
@@ -35,7 +35,6 @@ class SfxObjectFactory;
 class ModalDialog;
 class SfxObjectFactory;
 class SfxModule;
-class SfxModuleArr_Impl;
 class SfxModule_Impl;
 class SfxSlotPool;
 struct SfxChildWinContextFactory;
@@ -54,7 +53,6 @@ class SFX2_DLLPUBLIC SfxModule : public SfxShell
 {
 private:
 ResMgr* pResMgr;
-boolbDummy : 1;
 SfxModule_Impl* pImpl;
 
 SAL_DLLPRIVATE void Construct_Impl();
@@ -68,8 +66,7 @@ private:
 
 public:
 
-SfxModule( ResMgr* pMgrP, bool bDummy,
-SfxObjectFactory* pFactoryP, ... );
+SfxModule( ResMgr* pMgrP, SfxObjectFactory* 
pFactoryP, ... );
 virtual ~SfxModule();
 
 ResMgr* GetResMgr();
@@ -96,7 +93,7 @@ public:
 static FieldUnitGetModuleFieldUnit( css::uno::Reference< 
css::frame::XFrame > const & i_frame );
 FieldUnit   GetFieldUnit() const;
 
-SAL_DLLPRIVATE static SfxModuleArr_Impl& GetModules_Impl();
+SAL_DLLPRIVATE static std::vector& GetModules_Impl();
 SAL_DLLPRIVATE static void DestroyModules_Impl();
 SAL_DLLPRIVATE SfxTbxCtrlFactArr_Impl* GetTbxCtrlFactories_Impl() const;
 SAL_DLLPRIVATE SfxStbCtrlFactArr_Impl* GetStbCtrlFactories_Impl() const;
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 359fb23..c45480f 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -130,7 +130,7 @@ void ScModule::InitInterface_Impl()
 }
 
 ScModule::ScModule( SfxObjectFactory* pFact ) :
-SfxModule( ResMgr::CreateResMgr( "sc" ), false, pFact, nullptr ),
+SfxModule( ResMgr::CreateResMgr( "sc" ), pFact, nullptr ),
 aIdleTimer("sc ScModule IdleTimer"),
 aSpellIdle("sc ScModule SpellIdle"),
 mpDragData(new ScDragData),
diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx
index 59f62db..9b54068 100644
--- a/sd/source/ui/app/sdmod.cxx
+++ b/sd/source/ui/app/sdmod.cxx
@@ -67,7 +67,7 @@ void SdModule::InitInterface_Impl()
 
 // Ctor
 SdModule::SdModule(SfxObjectFactory* pFact1, SfxObjectFactory* pFact2 )
-:   SfxModule( ResMgr::CreateResMgr("sd"), false,
+:   SfxModule( ResMgr::CreateResMgr("sd"),
   pFact1, pFact2, nullptr ),
 pTransferClip(nullptr),
 pTransferDrag(nullptr),
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index 2cedda8..bb1730d 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.cxx
@@ -42,41 +42,7 @@
 #include "childwinimpl.hxx"
 #include 
 
-class SfxModuleArr_Impl
-{
-typedef ::std::vector DataType;
-DataType maData;
-public:
-
-typedef DataType::iterator iterator;
-
-iterator begin()
-{
-return maData.begin();
-}
-
-void erase( const iterator& it )
-{
-maData.erase(it);
-}
-
-SfxModule* operator[] ( size_t i )
-{
-return maData[i];
-}
-
-void push_back( SfxModule* p )
-{
-maData.push_back(p);
-}
-
-size_t size() const
-{
-return maData.size();
-}
-};
-
-static SfxModuleArr_Impl* pModules=nullptr;
+static std::vector* pModules=nullptr;
 
 class SfxModule_Impl
 {
@@ -136,9 +102,8 @@ ResMgr* SfxModule::GetResMgr()
 return pResMgr

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

2016-06-06 Thread Jakub Trzebiatowski 
 sw/inc/docstyle.hxx  |3 -
 sw/inc/poolfmt.hrc   |   16 +++
 sw/inc/poolfmt.hxx   |   16 +++
 sw/source/core/doc/SwStyleNameMapper.cxx |   18 
 sw/source/core/doc/tblafmt.cxx   |   12 ++---
 sw/source/core/unocore/unostyle.cxx  |   10 ++--
 sw/source/ui/utlui/poolfmt.src   |   64 +++
 sw/source/uibase/app/docstyle.cxx|   25 
 8 files changed, 152 insertions(+), 12 deletions(-)

New commits:
commit efb38949a44dec7e9f5fee7e9ec34164633d926c
Author: Jakub Trzebiatowski 
Date:   Sat Jun 4 10:39:41 2016 +0200

fdo47267 fix import crash

fixed import crash introduced in d4188f643db050c962a937547d19a9a08bd2235d

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

diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index a58ba3a..89a0745 100644
--- a/sw/inc/docstyle.hxx
+++ b/sw/inc/docstyle.hxx
@@ -36,6 +36,7 @@ class SwCharFormat;
 class SwTextFormatColl;
 class SwFrameFormat;
 class SwNumRule;
+class SwTableAutoFormat;
 
 // Temporary StyleSheet.
 class SW_DLLPUBLIC SwDocStyleSheet : public SfxStyleSheetBase
@@ -48,7 +49,7 @@ class SW_DLLPUBLIC SwDocStyleSheet : public SfxStyleSheetBase
 SwFrameFormat*   pFrameFormat;
 const SwPageDesc*   pDesc;
 const SwNumRule*pNumRule;
-
+const SwTableAutoFormat* pTableFormat;
 SwDoc&  rDoc;
 SfxItemSet  aCoreSet;
 
diff --git a/sw/inc/poolfmt.hrc b/sw/inc/poolfmt.hrc
index c1140fb..3cc6858 100644
--- a/sw/inc/poolfmt.hrc
+++ b/sw/inc/poolfmt.hrc
@@ -266,6 +266,22 @@
 // Table styles
 
 #define STR_TABSTYLE_DEFAULT(RC_POOLTABSTYLE_BEGIN+  0)
+#define STR_TABSTYLE_3D (RC_POOLTABSTYLE_BEGIN+  1)
+#define STR_TABSTYLE_BLACK1 (RC_POOLTABSTYLE_BEGIN+  2)
+#define STR_TABSTYLE_BLACK2 (RC_POOLTABSTYLE_BEGIN+  3)
+#define STR_TABSTYLE_BLUE   (RC_POOLTABSTYLE_BEGIN+  4)
+#define STR_TABSTYLE_BROWN  (RC_POOLTABSTYLE_BEGIN+  5)
+#define STR_TABSTYLE_CURRENCY   (RC_POOLTABSTYLE_BEGIN+  6)
+#define STR_TABSTYLE_CURRENCY_3D(RC_POOLTABSTYLE_BEGIN+  7)
+#define STR_TABSTYLE_CURRENCY_GRAY  (RC_POOLTABSTYLE_BEGIN+  8)
+#define STR_TABSTYLE_CURRENCY_LAVENDER  (RC_POOLTABSTYLE_BEGIN+  9)
+#define STR_TABSTYLE_CURRENCY_TURQUOISE (RC_POOLTABSTYLE_BEGIN+  10)
+#define STR_TABSTYLE_GRAY   (RC_POOLTABSTYLE_BEGIN+  11)
+#define STR_TABSTYLE_GREEN  (RC_POOLTABSTYLE_BEGIN+  12)
+#define STR_TABSTYLE_LAVENDER   (RC_POOLTABSTYLE_BEGIN+  13)
+#define STR_TABSTYLE_RED(RC_POOLTABSTYLE_BEGIN+  14)
+#define STR_TABSTYLE_TURQUOISE  (RC_POOLTABSTYLE_BEGIN+  15)
+#define STR_TABSTYLE_YELLOW (RC_POOLTABSTYLE_BEGIN+  16)
 
 #endif
 
diff --git a/sw/inc/poolfmt.hxx b/sw/inc/poolfmt.hxx
index 65a6d07..6707c43 100644
--- a/sw/inc/poolfmt.hxx
+++ b/sw/inc/poolfmt.hxx
@@ -203,6 +203,22 @@ enum RES_POOL_TABSTYLE_TYPE
 {
 RES_POOLTABSTYLE_BEGIN = POOLGRP_TABSTYLE,
 RES_POOLTABSTYLE_DEFAULT = RES_POOLTABSTYLE_BEGIN,
+RES_POOLTABLESTYLE_3D,
+RES_POOLTABLESTYLE_BLACK1,
+RES_POOLTABLESTYLE_BLACK2,
+RES_POOLTABLESTYLE_BLUE,
+RES_POOLTABLESTYLE_BROWN,
+RES_POOLTABLESTYLE_CURRENCY,
+RES_POOLTABLESTYLE_CURRENCY_3D,
+RES_POOLTABLESTYLE_CURRENCY_GRAY,
+RES_POOLTABLESTYLE_CURRENCY_LAVENDER,
+RES_POOLTABLESTYLE_CURRENCY_TURQUOISE,
+RES_POOLTABLESTYLE_GRAY,
+RES_POOLTABLESTYLE_GREEN,
+RES_POOLTABLESTYLE_LAVENDER,
+RES_POOLTABLESTYLE_RED,
+RES_POOLTABLESTYLE_TURQUOISE,
+RES_POOLTABLESTYLE_YELLOW,
 RES_POOLTABSTYLE_END
 };
 
diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx 
b/sw/source/core/doc/SwStyleNameMapper.cxx
index 4d23cca..f644bbf 100644
--- a/sw/source/core/doc/SwStyleNameMapper.cxx
+++ b/sw/source/core/doc/SwStyleNameMapper.cxx
@@ -317,7 +317,23 @@ const struct SwTableEntry NumRuleProgNameTable [] =
 
 const struct SwTableEntry TableStyleProgNameTable [] =
 {
-ENTRY( "Default Style" ), // RES_POOLTABLESTYLE_DEFAULT
+ENTRY( "Default Style" ), // RES_POOLTABLESTYLE_DEFAULT
+ENTRY( "3D" ),// RES_POOLTABLESTYLE_3D
+ENTRY( "Black 1" ),   // RES_POOLTABLESTYLE_BLACK1
+ENTRY( "Black 2" ),   // RES_POOLTABLESTYLE_BLACK2
+ENTRY( "Blue" ),  // RES_POOLTABLESTYLE_BLUE
+ENTRY( "Brown" ), // RES_POOLTABLESTYLE_BROWN
+ENTRY( "Currency" ),  // RES_POOLTABLESTYLE_CURRENCY
+ENTRY( "Currency 3D" ),   // RES_POOLTABLESTYLE_CURRENCY_3D
+ENTRY( "Currency Gray" ), // RES_POOLTABLESTYLE_CURRENCY_GRAY
+ENTRY( "Currency Lavender" ), // RES_POOLTABLESTYLE_CURRENCY_LAVENDER
+ENTRY( "Currency Turquoise" ),// RES_POOLTABLESTYLE_CURRENCY_TURQUOISE
+ENTRY( "Gray" ),  // RES_POOLTABLESTYLE_GRAY
+ENTRY( "Green" ),

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sd/qa

2016-06-06 Thread Tor Lillqvist 
 sd/qa/unit/export-tests.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit a7df5753d91c17fb102cf9783e34cf0f60178a51
Author: Tor Lillqvist 
Date:   Fri Jun 3 16:49:30 2016 +0300

Try to fix tinderbox build running in RDP session from Linux on Windows 
pre-10

It is a complicated scenario, but I think something like this is going
on:

Before Windows 10, only OpenGL 1.1 was supported in RDP sessions. Our
code detects RDP and tries to disable the use of OpenGL in that
case. This code for this is in the neighbourhood of the blacklisting
of OpenGL implementations. But the use of OpenGL in GLTF and chart2
does not go through code paths that would take that into
consideration, so it tries to use OpenGL anyway, and eventually we end
up in InitGLEW(), where the recently added check for OpenGL 3.0 or
newer causes an (intentional) abrupt termination of the process.

Change-Id: Ia57bfc8d2cefe4e6d7a00282973608d17967d3fd
(cherry picked from commit f062b89b277a0830f038cafdd13bd074b5188455)
Reviewed-on: https://gerrit.libreoffice.org/25955
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 624d290..1665ac2 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -30,7 +30,6 @@
 
 #include 
 
-
 #include 
 #include 
 #include 
@@ -44,6 +43,8 @@
 #include 
 #include 
 
+#include 
+
 #include 
 #include 
 #include 
@@ -443,6 +444,9 @@ void SdExportTest::testTransparentBackground()
 
 void SdExportTest::testMediaEmbedding()
 {
+if (!OpenGLWrapper::isVCLOpenGLEnabled())
+return;
+
 ::sd::DrawDocShellRef xDocShRef = 
loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/media_embedding.odp"), 
ODP);
 
 #if HAVE_FEATURE_GLTF
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-06 Thread Jan Holesovsky 
 sdext/source/presenter/PresenterWindowManager.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 6aa46396f6cb3de4e34a7684c59162bb6a3f37fe
Author: Jan Holesovsky 
Date:   Mon Jun 6 09:26:55 2016 +0200

Reintroduce some code removed with "Remove unneeded Pane code in ..."

This code was removed in 71cf1aefca1ecf10272308d7c75201bd39d3b0f6, but it 
was
guarded by an "ifndef", not by an "ifdef", so it should still stay (unless 
I'm
missing something).

Change-Id: Ib344e73d39d1fcd3b84784977769708726d8ed1e

diff --git a/sdext/source/presenter/PresenterWindowManager.cxx 
b/sdext/source/presenter/PresenterWindowManager.cxx
index 02e409a..557b4f9 100644
--- a/sdext/source/presenter/PresenterWindowManager.cxx
+++ b/sdext/source/presenter/PresenterWindowManager.cxx
@@ -108,6 +108,7 @@ void SAL_CALL PresenterWindowManager::disposing()
 {
 (*iPane)->mxBorderWindow->removeWindowListener(this);
 (*iPane)->mxBorderWindow->removeFocusListener(this);
+(*iPane)->mxBorderWindow->removeMouseListener(this);
 }
 }
 }
@@ -306,7 +307,11 @@ void SAL_CALL PresenterWindowManager::mousePressed (const 
css::awt::MouseEvent&
 void SAL_CALL PresenterWindowManager::mouseReleased (const 
css::awt::MouseEvent& rEvent)
 throw(css::uno::RuntimeException, std::exception)
 {
-(void)rEvent;
+if (mbIsMouseClickPending)
+{
+mbIsMouseClickPending = false;
+mpPresenterController->HandleMouseClick(rEvent);
+}
 }
 
 void SAL_CALL PresenterWindowManager::mouseEntered (const 
css::awt::MouseEvent& rEvent)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - connectivity/source include/o3tl scaddins/source

2016-06-06 Thread Stephan Bergmann 
 connectivity/source/commontools/dbexception.cxx   |   17 ++--
 connectivity/source/commontools/dbtools.cxx   |   73 --
 connectivity/source/commontools/warningscontainer.cxx |3 
 connectivity/source/drivers/postgresql/pq_tools.cxx   |   35 
 include/o3tl/any.hxx  |   41 --
 scaddins/source/analysis/analysis.cxx |3 
 scaddins/source/analysis/analysishelper.cxx   |   14 +--
 7 files changed, 111 insertions(+), 75 deletions(-)

New commits:
commit 9f0ed9d8ebdc31fe546ba280966481a0b2a6994e
Author: Stephan Bergmann 
Date:   Mon Jun 6 09:47:11 2016 +0200

Use o3tl/any.hxx in scaddins

Change-Id: Ifb19d216a00db90d6a267099077f90e6c54cd942

diff --git a/scaddins/source/analysis/analysis.cxx 
b/scaddins/source/analysis/analysis.cxx
index 3375481..b7e1c98 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1150,7 +1151,7 @@ OUString SAL_CALL AnalysisAddIn::getComplex( double fR, 
double fI, const uno::An
 break;
 case uno::TypeClass_STRING:
 {
-const OUString*   pSuff = static_cast(rSuff.getValue());
+auto   pSuff = o3tl::forceGet(rSuff);
 bi = *pSuff == "i" || pSuff->isEmpty();
 if( !bi && *pSuff != "j" )
 throw lang::IllegalArgumentException();
diff --git a/scaddins/source/analysis/analysishelper.cxx 
b/scaddins/source/analysis/analysishelper.cxx
index 8c65fcb..8bb963e 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -22,6 +22,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1591,8 +1592,9 @@ void ScaDoubleList::Append(
 const uno::Any& rAny,
 bool bIgnoreEmpty ) throw( uno::RuntimeException, 
lang::IllegalArgumentException )
 {
-if( rAny.getValueTypeClass() == uno::TypeClass_SEQUENCE )
-Append( rAnyConv, *static_cast< const uno::Sequence< uno::Sequence< 
uno::Any > >* >( rAny.getValue() ), bIgnoreEmpty );
+if( auto s = o3tl::tryGet<
+css::uno::Sequence>>(rAny) )
+Append( rAnyConv, *s, bIgnoreEmpty );
 else
 {
 double fValue;
@@ -2120,10 +2122,10 @@ void ComplexList::Append( const uno::Sequence< uno::Any 
>& aMultPars, ComplListA
 case uno::TypeClass_VOID:   break;
 case uno::TypeClass_STRING:
 {
-const OUString*   pStr = static_cast(r.getValue());
+auto   pStr = o3tl::forceGet(r);
 
 if( !pStr->isEmpty() )
-Append( new Complex( *static_cast(r.getValue()) ) );
+Append( new Complex( *pStr ) );
 else if( bEmpty0 )
 Append( new Complex( 0.0 ) );
 else if( bErrOnEmpty )
@@ -2131,7 +2133,7 @@ void ComplexList::Append( const uno::Sequence< uno::Any 
>& aMultPars, ComplListA
 }
 break;
 case uno::TypeClass_DOUBLE:
-Append( new Complex( *static_cast(r.getValue()), 0.0 ) );
+Append( new Complex( *o3tl::forceGet(r), 0.0 ) );
 break;
 case uno::TypeClass_SEQUENCE:
 {
@@ -2870,7 +2872,7 @@ bool ScaAnyConverter::getDouble(
 break;
 case uno::TypeClass_STRING:
 {
-const OUString* pString = static_cast< const OUString* >( 
rAny.getValue() );
+auto pString = o3tl::forceGet< OUString >( rAny );
 if( !pString->isEmpty() )
 rfResult = convertToDouble( *pString );
 else
commit 61e0433fdf1bfd391378ff9fcbf697aec4c5e61a
Author: Stephan Bergmann 
Date:   Mon Jun 6 09:47:01 2016 +0200

Use o3tl/any.hxx in connectivity

Change-Id: I5c0d84b20b9146c4fc65bfdc0e9c65a05c93d71c

diff --git a/connectivity/source/commontools/dbexception.cxx 
b/connectivity/source/commontools/dbexception.cxx
index f718a3c..38251b7 100644
--- a/connectivity/source/commontools/dbexception.cxx
+++ b/connectivity/source/commontools/dbexception.cxx
@@ -20,6 +20,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -174,14 +175,14 @@ bool SQLExceptionInfo::isKindOf(TYPE _eType) const
 SQLExceptionInfo::operator const css::sdbc::SQLException*() const
 {
 OSL_ENSURE(isKindOf(TYPE::SQLException), "SQLExceptionInfo::operator 
SQLException* : invalid call !");
-return static_cast(m_aContent.getValue());
+return o3tl::doGet(m_aContent);
 }
 
 
 SQLExceptionInfo::operator const css::sdb::SQLContext*() const
 {
 OSL_ENSURE(isKindOf(TYPE::SQLContext), "SQLExceptionInfo::operator 
SQLException* : invalid call !");
-return static_cast(m_aContent.getValue());
+return o3tl::doGet(m_aContent);
 }
 
 
@@ -212,10 +213,10 @@

Re: Collabora Online 1.0 Engine License

2016-06-06 Thread Michael Meeks 
Hi Adam,

On Fri, 2016-06-03 at 20:39 -0400, Adam Saunders wrote:
> I understand that the Collabora Online Development Edition (CODE) is 
> fully free-and-open-source

All the source code we release as binaries is available under an
open-source license and all of it is in public git repositories - I
don't see that changing any-time soon either =)

All the best,

Michael.

-- 
michael.me...@collabora.com <><, GM Collabora Productivity & Hacker
 Skype: mmeeks, Google Hangout: mejme...@gmail.com
 (M) +44 7795 666 147 - timezone usually UK / Europe

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

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

2016-06-06 Thread Markus Mohrhard 
 desktop/source/minidump/minidump.cxx|9 +++
 desktop/source/minidump/minidump_upload.cxx |4 ++-
 include/desktop/minidump.hxx|2 -
 svx/source/dialog/crashreportdlg.cxx|   29 +++
 svx/source/dialog/crashreportdlg.hxx|5 
 svx/uiconfig/ui/crashreportdlg.ui   |   35 +---
 6 files changed, 69 insertions(+), 15 deletions(-)

New commits:
commit 7d351e021aadbf2c75be35a9b1db5185b7f2a7c6
Author: Markus Mohrhard 
Date:   Fri Jun 3 13:26:46 2016 +0200

report the crash id back to the user

Change-Id: I5cc1e698294a5674d691529af8cc14e4cd87a711
Reviewed-on: https://gerrit.libreoffice.org/25865
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 
(cherry picked from commit 660b91b07788077cfee9ba309d45db6819c00781)
Reviewed-on: https://gerrit.libreoffice.org/25933

diff --git a/desktop/source/minidump/minidump.cxx 
b/desktop/source/minidump/minidump.cxx
index c0d68c2..0075ca9 100644
--- a/desktop/source/minidump/minidump.cxx
+++ b/desktop/source/minidump/minidump.cxx
@@ -82,7 +82,7 @@ std::string generate_json(const std::map& parameters)
 return stream.str();
 }
 
-bool uploadContent(std::map& parameters)
+bool uploadContent(std::map& parameters, 
std::string& response)
 {
 CURL* curl = curl_easy_init();
 if (!curl)
@@ -175,6 +175,7 @@ bool uploadContent(std::map& 
parameters)
 
 std::cerr << response_body << " " << error_description << std::endl;
 
+response = response_body;
 
 if( CURLE_OK != cc )
 return false;
@@ -182,7 +183,7 @@ bool uploadContent(std::map& 
parameters)
 return true;
 }
 
-bool readConfig(const std::string& iniPath)
+bool readConfig(const std::string& iniPath, std::string& response)
 {
 std::ifstream file(iniPath);
 std::map parameters = readStrings(file);
@@ -200,7 +201,7 @@ bool readConfig(const std::string& iniPath)
 return false;
 }
 
-return uploadContent(parameters);
+return uploadContent(parameters, response);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/minidump/minidump_upload.cxx 
b/desktop/source/minidump/minidump_upload.cxx
index 6a581db..934f1ad 100644
--- a/desktop/source/minidump/minidump_upload.cxx
+++ b/desktop/source/minidump/minidump_upload.cxx
@@ -20,9 +20,11 @@ int main(int argc, char** argv)
 }
 
 std::string iniPath(argv[1]);
-if (!readConfig(iniPath))
+std::string response;
+if (!readConfig(iniPath, response))
 return EXIT_FAILURE;
 
+std::cout << "Response: " << response << std::endl;
 return EXIT_SUCCESS;
 }
 
diff --git a/include/desktop/minidump.hxx b/include/desktop/minidump.hxx
index 21d52e8..bdd91b2 100644
--- a/include/desktop/minidump.hxx
+++ b/include/desktop/minidump.hxx
@@ -12,7 +12,7 @@
 
 #include 
 
-bool readConfig(const std::string& iniPath);
+bool readConfig(const std::string& iniPath, std::string& response);
 
 #endif
 
diff --git a/svx/source/dialog/crashreportdlg.cxx 
b/svx/source/dialog/crashreportdlg.cxx
index 511199b..00dcedd 100644
--- a/svx/source/dialog/crashreportdlg.cxx
+++ b/svx/source/dialog/crashreportdlg.cxx
@@ -23,9 +23,13 @@ CrashReportDialog::CrashReportDialog(vcl::Window* pParent):
 {
 get(mpBtnSend, "btn_send");
 get(mpBtnCancel, "btn_cancel");
+get(mpBtnClose, "btn_close");
+get(mpEditPreUpload, "ed_pre");
+get(mpEditPostUpload, "ed_post");
 
 mpBtnSend->SetClickHdl(LINK(this, CrashReportDialog, BtnHdl));
 mpBtnCancel->SetClickHdl(LINK(this, CrashReportDialog, BtnHdl));
+mpBtnClose->SetClickHdl(LINK(this, CrashReportDialog, BtnHdl));
 }
 
 CrashReportDialog::~CrashReportDialog()
@@ -37,6 +41,9 @@ void CrashReportDialog::dispose()
 {
 mpBtnSend.clear();
 mpBtnCancel.clear();
+mpBtnClose.clear();
+mpEditPreUpload.clear();
+mpEditPostUpload.clear();
 
 Dialog::dispose();
 }
@@ -59,17 +66,29 @@ IMPL_LINK_TYPED(CrashReportDialog, BtnHdl, Button*, pBtn, 
void)
 {
 std::string ini_path = CrashReporter::getIniFileName();
 
-readConfig(ini_path);
-// TODO: moggi: return the id for the user to look it up
-Close();
+std::string response;
+bool bSuccess = readConfig(ini_path, response);
+
+OUString aCrashID = OUString::createFromAscii(response.c_str());
+
+if (bSuccess)
+mpEditPostUpload->SetText(mpEditPostUpload->GetText() + " " + 
aCrashID);
+else
+mpEditPostUpload->SetText(mpEditPostUpload->GetText() + " Error!");
+
+mpBtnClose->Show();
+mpEditPreUpload->Hide();
+mpEditPostUpload->Show();
+mpBtnSend->Hide();
+mpBtnCancel->Hide();
 }
 else if (pBtn == mpBtnCancel.get())
 {
 Close();
 }
-else
+else if (pBtn == mpBtnClose.get())
 {
-assert(false);
+Close();
 }
 }
 
diff --git a/svx/source/dialog/crashreportdlg.hxx 
b/svx/s

[Libreoffice-commits] core.git: basctl/source include/sfx2 sc/source sd/source sfx2/source starmath/source sw/source

2016-06-06 Thread Noel Grandin 
 basctl/source/basicide/basicmod.hxx |2 
 include/sfx2/module.hxx |7 +-
 sc/source/ui/app/scmod.cxx  |2 
 sd/source/ui/app/sdmod.cxx  |2 
 sfx2/source/appl/module.cxx |  105 +---
 starmath/source/smmod.cxx   |2 
 sw/source/uibase/app/swmodule.cxx   |2 
 7 files changed, 84 insertions(+), 38 deletions(-)

New commits:
commit abde31a2bc68302e1afafe1fcc3f5d85369010f8
Author: Noel Grandin 
Date:   Mon Jun 6 10:16:23 2016 +0200

Revert "Simplify sfx2 removing SfxModuleArr_Impl and dummy SfxModule flag"

This reverts commit e319ef1171dab61fff2201f5c1470ca09894c395.

Apparently, at some point, someone added a 'bool bDummy' param to
SfxModule, but only updated 2 of the 5 callsites. Since we're
passing in pointers here, at the other call sites, the bDummy
param evaluated to 'true'.

diff --git a/basctl/source/basicide/basicmod.hxx 
b/basctl/source/basicide/basicmod.hxx
index b52a1c7..f462927 100644
--- a/basctl/source/basicide/basicmod.hxx
+++ b/basctl/source/basicide/basicmod.hxx
@@ -31,7 +31,7 @@ class Module : public SfxModule
 static Module* mpModule;
 public:
 Module ( ResMgr *pMgr, SfxObjectFactory *pObjFact) :
-SfxModule( pMgr, pObjFact, nullptr )
+SfxModule( pMgr, false, pObjFact, nullptr )
 { }
 public:
 static Module*& Get () { return mpModule; }
diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx
index 7871675..6e10d7c 100644
--- a/include/sfx2/module.hxx
+++ b/include/sfx2/module.hxx
@@ -35,6 +35,7 @@ class SfxObjectFactory;
 class ModalDialog;
 class SfxObjectFactory;
 class SfxModule;
+class SfxModuleArr_Impl;
 class SfxModule_Impl;
 class SfxSlotPool;
 struct SfxChildWinContextFactory;
@@ -53,6 +54,7 @@ class SFX2_DLLPUBLIC SfxModule : public SfxShell
 {
 private:
 ResMgr* pResMgr;
+boolbDummy : 1;
 SfxModule_Impl* pImpl;
 
 SAL_DLLPRIVATE void Construct_Impl();
@@ -66,7 +68,8 @@ private:
 
 public:
 
-SfxModule( ResMgr* pMgrP, SfxObjectFactory* 
pFactoryP, ... );
+SfxModule( ResMgr* pMgrP, bool bDummy,
+SfxObjectFactory* pFactoryP, ... );
 virtual ~SfxModule();
 
 ResMgr* GetResMgr();
@@ -93,7 +96,7 @@ public:
 static FieldUnitGetModuleFieldUnit( css::uno::Reference< 
css::frame::XFrame > const & i_frame );
 FieldUnit   GetFieldUnit() const;
 
-SAL_DLLPRIVATE static std::vector& GetModules_Impl();
+SAL_DLLPRIVATE static SfxModuleArr_Impl& GetModules_Impl();
 SAL_DLLPRIVATE static void DestroyModules_Impl();
 SAL_DLLPRIVATE SfxTbxCtrlFactArr_Impl* GetTbxCtrlFactories_Impl() const;
 SAL_DLLPRIVATE SfxStbCtrlFactArr_Impl* GetStbCtrlFactories_Impl() const;
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index c45480f..359fb23 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -130,7 +130,7 @@ void ScModule::InitInterface_Impl()
 }
 
 ScModule::ScModule( SfxObjectFactory* pFact ) :
-SfxModule( ResMgr::CreateResMgr( "sc" ), pFact, nullptr ),
+SfxModule( ResMgr::CreateResMgr( "sc" ), false, pFact, nullptr ),
 aIdleTimer("sc ScModule IdleTimer"),
 aSpellIdle("sc ScModule SpellIdle"),
 mpDragData(new ScDragData),
diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx
index 9b54068..59f62db 100644
--- a/sd/source/ui/app/sdmod.cxx
+++ b/sd/source/ui/app/sdmod.cxx
@@ -67,7 +67,7 @@ void SdModule::InitInterface_Impl()
 
 // Ctor
 SdModule::SdModule(SfxObjectFactory* pFact1, SfxObjectFactory* pFact2 )
-:   SfxModule( ResMgr::CreateResMgr("sd"),
+:   SfxModule( ResMgr::CreateResMgr("sd"), false,
   pFact1, pFact2, nullptr ),
 pTransferClip(nullptr),
 pTransferDrag(nullptr),
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index bb1730d..2cedda8 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.cxx
@@ -42,7 +42,41 @@
 #include "childwinimpl.hxx"
 #include 
 
-static std::vector* pModules=nullptr;
+class SfxModuleArr_Impl
+{
+typedef ::std::vector DataType;
+DataType maData;
+public:
+
+typedef DataType::iterator iterator;
+
+iterator begin()
+{
+return maData.begin();
+}
+
+void erase( const iterator& it )
+{
+maData.erase(it);
+}
+
+SfxModule* operator[] ( size_t i )
+{
+return maData[i];
+}
+
+void push_back( SfxModule* p )
+{
+maData.push_back(p);
+}
+
+size_t size() const
+{
+return maData.size();
+}
+};
+
+static SfxModuleArr_Impl* pModules=nullptr;
 
 class SfxModule_Impl
 {
@@ -102,8 +136,9 @@ ResMgr* SfxModule::GetResMgr()
 return pResMgr;
 }
 
-SfxModule::SfxModule( ResMgr* pMgrP, SfxObjectFactory*

RE: converting Calc functions to jump functions

2016-06-06 Thread Winfried Donkers 
Hi Eike,

> > And that is where I get stuck.
> 
> I can imagine..

I wasn't surprised either ;-)

> 
> > The first argument is on the stack, i.e. GetStackType() returns a type
> and ScInterpreter::sp is 1.
> > When I jump to the next argument to be evaluated, with aCode.Jump(
> pJump[ nIdx ], pJump[ pJump[ 0 ] ] ), ScInterpreter::sp is 0 afterwards.
> 
> Apart from that,  aCode.Jump( pJump[ nIdx ], pJump[ pJump[ 0 ] ] ) looks
> wrong to me, pJump[0] returns an offset into the RPN array, which can't be
> used as an index for another pJump.

I changed the code in my mail, the actual line reads
aCode.Jump( pJump[ nIdx ], pJump[ nJumpCount ] );
and nJumpCount has the value of pJump[ 0 ].

> See also the description of formula::FormulaTokenIterator::Jump() in
> include/formula/tokenarray.hxx
> 
> For understanding it helps to step into such Jump() and see what it does
> to the counters and on the subsequent iteration of the while loop in
> ScInterpreter::Interpret() step into its condition where aCode.Next() is
> executed and analyze what happens to the token array and counters.

Will do.
 
> > How do I get the argument I jumped to (that part works) on the stack to
> be evaluated?
> 
> I'm not sure at the moment. 
> [...]
> 
> Basically both approaches would work, the latter might be even "easier"
> (I know it's not easy at all) to code with what is already implemented.

I will start digging and experimenting, which may take some time.

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

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

2016-06-06 Thread Tor Lillqvist 
 drawinglayer/source/processor2d/vclprocessor2d.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 6bac502897585a32c9ad9256c344499d73f7d5ba
Author: Tor Lillqvist 
Date:   Wed Jun 1 13:30:59 2016 +0300

tdf#95581: Assume tiny shears are rounding artefacts etc and can be ignored

See bug report for more discussion.

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

diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index fda9de5..45a92ae 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
 #include 
 #include "vclprocessor2d.hxx"
 #include 
@@ -123,7 +124,9 @@ namespace drawinglayer
 aLocalTransform.decompose(aFontScaling, aTranslate, fRotate, 
fShearX);
 bool bPrimitiveAccepted(false);
 
-if(basegfx::fTools::equalZero(fShearX))
+// tdf#95581: Assume tiny shears are rounding artefacts or 
whatever and can be ignored,
+// especially if the effect is less than a pixel.
+if(std::abs(aFontScaling.getY() * fShearX) < 1)
 {
 if(basegfx::fTools::less(aFontScaling.getX(), 0.0) && 
basegfx::fTools::less(aFontScaling.getY(), 0.0))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-06 Thread Caolán McNamara 
 sw/qa/core/data/html/pass/tdf93971-1.html |   78 ++
 sw/source/filter/html/swhtml.cxx  |2 
 2 files changed, 79 insertions(+), 1 deletion(-)

New commits:
commit 6317bcfd353a02d957811f2b6cb343cc3a3bbbec
Author: Caolán McNamara 
Date:   Fri Jun 3 09:59:11 2016 +0100

Resolves: tdf#93971 freeze on load of specific html doc

this is similar to

commit 6acd5c45c764d81aea1539e66adbfadb51df0aa3
Author: Caolán McNamara 
Date:   Wed Jan 21 15:25:03 2015 +

Resolves: fdo#87601 specific html doc hangs on load

and is a consequence of the old changeover from unsigned shorts for old 
string
class to signed int for new string class

Change-Id: I47022c641cbc329d8802765927005d43211b0d88
(cherry picked from commit e8db81b2fb3bde736deb42d23f3ecfd680212767)
(cherry picked from commit 3e50a7bf0e3437a22b6440d0f36c242e40c451ae)
Reviewed-on: https://gerrit.libreoffice.org/25856
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/core/data/html/pass/tdf93971-1.html 
b/sw/qa/core/data/html/pass/tdf93971-1.html
new file mode 100644
index 000..f516556
--- /dev/null
+++ b/sw/qa/core/data/html/pass/tdf93971-1.html
@@ -0,0 +1,78 @@
+
+
+
+
+   
+   
+   
+   
+
+   
+   
+
+   Сражение у мыса Тендра
+   
+   
+   
+   

+   
+
+
+
+
+
+
+Содержание
+ [https://ru.wikipedia.org/w/index.php?title=%D0%A1%D1%80%D0%B0%D0%B6%D0%B5%D0%BD%D0%B8%D0%B5_%D1%83_%D0%BC%D1%8B%D1%81%D0%B0_%D0%A2%D0%B5%D0%BD%D0%B4%D1%80%D0%B0&printable=yes#";
 id="togglelink">убрать] 
+
+https://ru.wikipedia.org/w/index.php?title=%D0%A1%D1%80%D0%B0%D0%B6%D0%B5%D0%BD%D0%B8%D0%B5_%D1%83_%D0%BC%D1%8B%D1%81%D0%B0_%D0%A2%D0%B5%D0%BD%D0%B4%D1%80%D0%B0&printable=yes#.D0.9F.D1.80.D0.B5.D0.B4.D1.8B.D1.81.D1.82.D0.BE.D1.80.D0.B8.D1.8F";>1 Предыстория
+https://ru.wikipedia.org/w/index.php?title=%D0%A1%D1%80%D0%B0%D0%B6%D0%B5%D0%BD%D0%B8%D0%B5_%D1%83_%D0%BC%D1%8B%D1%81%D0%B0_%D0%A2%D0%B5%D0%BD%D0%B4%D1%80%D0%B0&printable=yes#28_.D0.B0.D0.B2.D0.B3.D1.83.D1.81.D1.82.D0.B0";>2 28 
августа
+https://ru.wikipedia.org/w/index.php?title=%D0%A1%D1%80%D0%B0%D0%B6%D0%B5%D0%BD%D0%B8%D0%B5_%D1%83_%D0%BC%D1%8B%D1%81%D0%B0_%D0%A2%D0%B5%D0%BD%D0%B4%D1%80%D0%B0&printable=yes#29_.D0.B0.D0.B2.D0.B3.D1.83.D1.81.D1.82.D0.B0";>3 29 
августа
+https://ru.wikipedia.org/w/index.php?title=%D0%A1%D1%80%D0%B0%D0%B6%D0%B5%D0%BD%D0%B8%D0%B5_%D1%83_%D0%BC%D1%8B%D1%81%D0%B0_%D0%A2%D0%B5%D0%BD%D0%B4%D1%80%D0%B0&printable=yes#.D0.98.D1.82.D0.BE.D0.B3";>4 Итог
+https://ru.wikipedia.org/w/index.php?title=%D0%A1%D1%80%D0%B0%D0%B6%D0%B5%D0%BD%D0%B8%D0%B5_%D1%83_%D0%BC%D1%8B%D1%81%D0%B0_%D0%A2%D0%B5%D0%BD%D0%B4%D1%80%D0%B0&printable=yes#.D0.A1.D0.BC._.D1.82.D0.B0.D0.BA.D0.B6.D0.B5";>5 См. 
также
+https://ru.wikipedia.org/w/index.php?title=%D0%A1%D1%80%D0%B0%D0%B6%D0%B5%D0%BD%D0%B8%D0%B5_%D1%83_%D0%BC%D1%8B%D1%81%D0%B0_%D0%A2%D0%B5%D0%BD%D0%B4%D1%80%D0%B0&printable=yes#.D0.9F.D1.80.D0.B8.D0.BC.D0.B5.D1.87.D0.B0.D0.BD.D0.B8.D1.8F";>6 Примечания
+https://ru.wikipedia.org/w/index.php?title=%D0%A1%D1%80%D0%B0%D0%B6%D0%B5%D0%BD%D0%B8%D0%B5_%D1%83_%D0%BC%D1%8B%D1%81%D0%B0_%D0%A2%D0%B5%D0%BD%D0%B4%D1%80%D0%B0&printable=yes#.D0.A1.D1.81.D1.8B.D0.BB.D0.BA.D0.B8";>7 Ссылки
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+   
+   
+   
+   
+   
+   
+
+
+   
+
+
\ No newline at end of file
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 42c4ff1..94a06fd 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -2178,7 +2178,7 @@ bool SwHTMLParser::AppendTextNode( SwHTMLAppendMode 
eMode, bool bUpdateNum )
 rText, pAttr->GetSttCnt() );
 sal_Int32 nScriptEnd = g_pBreakIt->GetBreakIter()
 ->endOfScript( rText, nStt, nScriptText );
-while( nScriptEnd < nEndCnt )
+while (nScriptEnd < nEndCnt && nScriptEnd != -1)
 {
 if( nScriptItem == nScriptText )
 {
___

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

2016-06-06 Thread Lionel Elie Mamane 
 dbaccess/source/ui/querydesign/querydlg.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 22ea5aef84996520062b2c5d58757cd6f00c98ee
Author: Lionel Elie Mamane 
Date:   Sat Jun 4 17:40:09 2016 +0200

tdf#96516 fixup: when removing entry, entry count does not stay constant

Change-Id: I192a2d14787581545e66c46a84507f6dfd191c57
Reviewed-on: https://gerrit.libreoffice.org/25891
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 
Reviewed-by: Miklos Vajna 

diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx 
b/dbaccess/source/ui/querydesign/querydlg.cxx
index 3ea04b4..48b2195 100644
--- a/dbaccess/source/ui/querydesign/querydlg.cxx
+++ b/dbaccess/source/ui/querydesign/querydlg.cxx
@@ -122,8 +122,7 @@ DlgQryJoin::DlgQryJoin( OQueryTableView * pParent,
 }
 else
 {
-const sal_Int32 nCount = m_pLB_JoinType->GetEntryCount();
-for (sal_Int32 i = 0; i < nCount;)
+for (sal_Int32 i = 0; i < m_pLB_JoinType->GetEntryCount();)
 {
 const sal_IntPtr nJoinTyp = 
reinterpret_cast(m_pLB_JoinType->GetEntryData(i));
 if ( !bSupportFullJoin && nJoinTyp == ID_FULL_JOIN )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-06 Thread Caolán McNamara 
 sw/source/core/text/porfld.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit a7d4185bad915b51c23e8e5e40fbaa528852face
Author: Caolán McNamara 
Date:   Tue Mar 15 21:06:21 2016 +

crashtesting: Resolves: tdf#91291 crash on inserting text into footnote

(cherry picked from commit 367f13fd584d5b67cbc3a7787892f12655a65d6c)

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

diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 01026dc..63b6756 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -375,7 +375,8 @@ bool SwFieldPortion::Format( SwTextFormatInfo &rInf )
 
 // These characters should not be contained in the follow
 // field portion. They are handled via the HookChar mechanism.
-switch( aNew[0] )
+const sal_Unicode nNew = !aNew.isEmpty() ? aNew[0] : 0;
+switch (nNew)
 {
 case CH_BREAK  : bFull = true;
 // no break
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: jurt/com

2016-06-06 Thread Stephan Bergmann 
 jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 5c2f970557791aa2b4a65a1c1298492a0f313225
Author: Stephan Bergmann 
Date:   Mon Jun 6 10:49:11 2016 +0200

cid#1362511: Concurrent data access violation

Change-Id: I35a381f9601178a3aab98b11172d33372d5c3dc1

diff --git a/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java 
b/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java
index 131f2b5..7b96414 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java
+++ b/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java
@@ -89,9 +89,11 @@ public class JobQueue {
 try {
   enter(2000, _disposeId);
 } catch(Throwable throwable) {
-if(!jobList.isEmpty() || _active) { // there was a job in 
progress, so give a stack
-System.err.println(getClass().getName() + " - exception 
occurred:" + throwable);
-throwable.printStackTrace(System.err);
+synchronized (this) {
+if(!jobList.isEmpty() || _active) { // there was a job in 
progress, so give a stack
+System.err.println(getClass().getName() + " - 
exception occurred:" + throwable);
+throwable.printStackTrace(System.err);
+}
 }
 }
 finally {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-06 Thread Jan Holesovsky 
 sc/qa/unit/copy_paste_test.cxx |  106 -
 1 file changed, 105 insertions(+), 1 deletion(-)

New commits:
commit 47d0e1be83810ccdb2d5350167c3713ea5d923ba
Author: Jan Holesovsky 
Date:   Mon Jun 6 10:29:42 2016 +0200

tdf#84411 unit test: Trivial follow-up updates.

Change-Id: Ia19fec237d3301297e4e1caa2338519264c4b724

diff --git a/sc/qa/unit/copy_paste_test.cxx b/sc/qa/unit/copy_paste_test.cxx
index 7db0bf9..0e9addf 100644
--- a/sc/qa/unit/copy_paste_test.cxx
+++ b/sc/qa/unit/copy_paste_test.cxx
@@ -123,6 +123,8 @@ void ScCopyPasteTest::testCopyPasteXLS()
 xComponent->dispose();
 }
 
+namespace {
+
 void lcl_copy( const OUString& rSrcRange, const OUString& rDstRange, 
ScDocument& rDoc, ScTabViewShell* pViewShell )
 {
 ScDocument aClipDoc(SCDOCMODE_CLIP);
@@ -142,6 +144,8 @@ void lcl_copy( const OUString& rSrcRange, const OUString& 
rDstRange, ScDocument&
 pViewShell->GetViewData().GetView()->PasteFromClip(InsertDeleteFlags::ALL, 
&aClipDoc);
 }
 
+} // anonymous namespace
+
 void ScCopyPasteTest::testTdf84411()
 {
 uno::Reference< frame::XDesktop2 > xDesktop = 
frame::Desktop::create(::comphelper::getProcessComponentContext());
@@ -202,6 +206,7 @@ void ScCopyPasteTest::testTdf84411()
 // 3. Disable OpenCL
 ScModelObj* pModel = 
ScModelObj::getImplementation(pFoundShell->GetModel());
 CPPUNIT_ASSERT(pModel != nullptr);
+bool bOpenCLState = ScCalcConfig::isOpenCLEnabled();
 pModel->enableOpenCL(false);
 CPPUNIT_ASSERT(ScCalcConfig::isOpenCLEnabled() == false);
 pModel->enableAutomaticCalculation(true);
@@ -217,6 +222,7 @@ void ScCopyPasteTest::testTdf84411()
 
 
 // 5. Close the document (Ctrl-W)
+pModel->enableOpenCL(bOpenCLState);
 xComponent->dispose();
 }
 
@@ -246,5 +252,4 @@ CPPUNIT_TEST_SUITE_REGISTRATION(ScCopyPasteTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 770493f3cf4c724e115b51a4280b00fe00b7f42e
Author: Marco Cecchetti 
Date:   Sun Jun 5 21:31:15 2016 +0200

tdf#84411 - unit test

Change-Id: I0be17c6e9e7f14d73597410a52539240f22a9b68

diff --git a/sc/qa/unit/copy_paste_test.cxx b/sc/qa/unit/copy_paste_test.cxx
index cf1ea0e..7db0bf9 100644
--- a/sc/qa/unit/copy_paste_test.cxx
+++ b/sc/qa/unit/copy_paste_test.cxx
@@ -32,9 +32,11 @@ public:
 virtual void tearDown() override;
 
 void testCopyPasteXLS();
+void testTdf84411();
 
 CPPUNIT_TEST_SUITE(ScCopyPasteTest);
 CPPUNIT_TEST(testCopyPasteXLS);
+CPPUNIT_TEST(testTdf84411);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -121,6 +123,103 @@ void ScCopyPasteTest::testCopyPasteXLS()
 xComponent->dispose();
 }
 
+void lcl_copy( const OUString& rSrcRange, const OUString& rDstRange, 
ScDocument& rDoc, ScTabViewShell* pViewShell )
+{
+ScDocument aClipDoc(SCDOCMODE_CLIP);
+
+// 1. Copy
+ScRange aSrcRange;
+ScRefFlags nRes = aSrcRange.Parse(rSrcRange, &rDoc, 
rDoc.GetAddressConvention());
+CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & ScRefFlags::VALID));
+pViewShell->GetViewData().GetMarkData().SetMarkArea(aSrcRange);
+pViewShell->GetViewData().GetView()->CopyToClip(&aClipDoc, false, false, 
false, false);
+
+// 2. Paste
+ScRange aDstRange;
+nRes = aDstRange.Parse(rDstRange, &rDoc, rDoc.GetAddressConvention());
+CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & ScRefFlags::VALID));
+pViewShell->GetViewData().GetMarkData().SetMarkArea(aDstRange);
+pViewShell->GetViewData().GetView()->PasteFromClip(InsertDeleteFlags::ALL, 
&aClipDoc);
+}
+
+void ScCopyPasteTest::testTdf84411()
+{
+uno::Reference< frame::XDesktop2 > xDesktop = 
frame::Desktop::create(::comphelper::getProcessComponentContext());
+CPPUNIT_ASSERT( xDesktop.is() );
+
+// create a frame
+Reference< frame::XFrame > xTargetFrame = xDesktop->findFrame( "_blank", 0 
);
+CPPUNIT_ASSERT( xTargetFrame.is() );
+
+// 1. Create spreadsheet
+uno::Sequence< beans::PropertyValue > aEmptyArgList;
+uno::Reference< lang::XComponent > xComponent = 
xDesktop->loadComponentFromURL(
+"private:factory/scalc",
+"_blank",
+0,
+aEmptyArgList );
+CPPUNIT_ASSERT( xComponent.is() );
+
+// Get the document model
+SfxObjectShell* pFoundShell = 
SfxObjectShell::GetShellFromComponent(xComponent);
+CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell);
+
+ScDocShellRef xDocSh = dynamic_cast(pFoundShell);
+CPPUNIT_ASSERT(xDocSh != nullptr);
+
+uno::Reference< frame::XModel2 > xModel2 ( xDocSh->GetModel(), UNO_QUERY );
+CPPUNIT_ASSERT( xModel2.is() );
+
+Reference< frame::XController2 > xController ( 
xModel2->createDefaultViewController( xTargetFrame ), UNO_QUERY );
+CPPUNIT_ASSERT( xController.is() );
+
+// introduce model/view/controller to each other
+xController->attachModel( xModel2.get() );
+xModel2->connectController( xCon

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

2016-06-06 Thread Akshay Deep 
 include/sfx2/saveastemplatedlg.hxx|2 ++
 sfx2/source/doc/saveastemplatedlg.cxx |   33 -
 sfx2/uiconfig/ui/saveastemplatedlg.ui |   18 --
 3 files changed, 50 insertions(+), 3 deletions(-)

New commits:
commit f944195baabfda068cc37bd4e8ddf60e6cc990b7
Author: Akshay Deep 
Date:   Sun Jun 5 07:53:03 2016 +0530

tdf#94131 Easier access to set a default template when saving a template

Change-Id: I2a3732a178f47ce49c77089a6e0865b609efd499
Reviewed-on: https://gerrit.libreoffice.org/25916
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/include/sfx2/saveastemplatedlg.hxx 
b/include/sfx2/saveastemplatedlg.hxx
index 691d4f0..bc3eade 100644
--- a/include/sfx2/saveastemplatedlg.hxx
+++ b/include/sfx2/saveastemplatedlg.hxx
@@ -18,6 +18,7 @@
 
 class Edit;
 class ListBox;
+class CheckBox;
 class SfxDocumentTemplates;
 
 //  class SfxSaveAsTemplateDialog 
---
@@ -27,6 +28,7 @@ class SFX2_DLLPUBLIC SfxSaveAsTemplateDialog : public 
ModalDialog
 
 private:
 VclPtr mpLBCategory;
+VclPtrmpCBXDefault;
 VclPtrmpTemplateNameEdit;
 VclPtr  mpOKButton;
 
diff --git a/sfx2/source/doc/saveastemplatedlg.cxx 
b/sfx2/source/doc/saveastemplatedlg.cxx
index 28025e1..3042b4b 100644
--- a/sfx2/source/doc/saveastemplatedlg.cxx
+++ b/sfx2/source/doc/saveastemplatedlg.cxx
@@ -11,13 +11,20 @@
 
 #include 
 #include 
+#include 
 #include 
+#include 
+#include 
+#include 
 #include 
+#include 
 #include 
 #include 
 #include 
+#include 
 
 #include 
+#include 
 
 #include "doc.hrc"
 
@@ -34,6 +41,7 @@ SfxSaveAsTemplateDialog::SfxSaveAsTemplateDialog( 
vcl::Window* pParent):
 mpDocTemplates(new SfxDocumentTemplates)
 {
 get(mpLBCategory, "categorylb");
+get(mpCBXDefault, "defaultcb");
 get(mpTemplateNameEdit, "name_entry");
 get(mpOKButton, "ok");
 
@@ -158,10 +166,33 @@ bool SfxSaveAsTemplateDialog::SaveTemplate()
 
 sal_uInt16 nDocId = mpDocTemplates->GetCount(mnRegionPos);
 OUString sURL = 
mpDocTemplates->GetTemplateTargetURLFromComponent(msSelectedCategory, 
msTemplateName);
+bool bIsSaved = mpDocTemplates->InsertTemplate( mnRegionPos, nDocId, 
msTemplateName, sURL);
 
-if(!mpDocTemplates->InsertTemplate( mnRegionPos, nDocId, msTemplateName, 
sURL))
+if (!bIsSaved)
 return false;
 
+if ( !sURL.isEmpty() && mpCBXDefault->IsChecked() )
+{
+OUString aServiceName;
+try
+{
+uno::Reference< embed::XStorage > xStorage =
+comphelper::OStorageHelper::GetStorageFromURL( sURL, 
embed::ElementModes::READ );
+
+SotClipboardFormatId nFormat = SotStorage::GetFormatID( xStorage );
+
+std::shared_ptr pFilter = 
SfxGetpApp()->GetFilterMatcher().GetFilter4ClipBoardId( nFormat );
+
+if ( pFilter )
+aServiceName = pFilter->GetServiceName();
+}
+catch( uno::Exception& )
+{}
+
+if(!aServiceName.isEmpty())
+SfxObjectFactory::SetStandardTemplate(aServiceName, sURL);
+}
+
 mpDocTemplates->Update();
 return true;
 }
diff --git a/sfx2/uiconfig/ui/saveastemplatedlg.ui 
b/sfx2/uiconfig/ui/saveastemplatedlg.ui
index da673a3..d8ff31c 100644
--- a/sfx2/uiconfig/ui/saveastemplatedlg.ui
+++ b/sfx2/uiconfig/ui/saveastemplatedlg.ui
@@ -113,9 +113,9 @@
 
 
   
+300
 True
 True
-300
   
   
 False
@@ -153,8 +153,8 @@
 
 
   
-150
 300
+150
 True
 False
 2
@@ -175,6 +175,20 @@
 1
   
 
+
+  
+Set as Default 
Template
+True
+True
+False
+0
+True
+  
+  
+0
+2
+  
+
   
   
 False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/Rosemary/change-tracking' - include/xmloff sw/source sw/util

2016-06-06 Thread Rosemary Sebastian 
 include/xmloff/xmlimp.hxx   |1 +
 sw/source/filter/xml/swxml.cxx  |7 +++
 sw/source/filter/xml/xmlimp.cxx |   11 +++
 sw/util/sw.component|   10 +++---
 4 files changed, 26 insertions(+), 3 deletions(-)

New commits:
commit ae525ba046e444a32fc01cbefe4e7ca110521bc7
Author: Rosemary Sebastian 
Date:   Mon Jun 6 12:06:24 2016 +0530

Import tracked changes from undo.xml - Part 1

Change-Id: If1003968accbc31acdb4b503940c53c01264e60c
Reviewed-on: https://gerrit.libreoffice.org/25950
Reviewed-by: Rosemary Sebastian 
Tested-by: Rosemary Sebastian 

diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 2261e47..c2c2474 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -96,6 +96,7 @@ enum class SvXMLImportFlags {
 SETTINGS= 0x0040,
 FONTDECLS   = 0x0080,
 EMBEDDED= 0x0100,
+UNDO= 0x0200,
 ALL = 0x
 };
 namespace o3tl
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 33c976f..95708ad 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -875,6 +875,13 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& 
rBaseURL, SwPaM &rPaM, c
 : "com.sun.star.comp.Writer.XMLContentImporter"),
aFilterArgs, rName, true );
 
+if( !nRet && !(IsOrganizerMode() || aOpt.IsFormatsOnly()) )
+nRet = ReadThroughComponent(
+   xStorage, xModelComp, "undo.xml", nullptr, xContext,
+(bOASIS ? "com.sun.star.comp.Writer.XMLOasisUndoImporter"
+: "com.sun.star.comp.Writer.XMLUndoImporter"),
+   aEmptyArgs, rName, true );
+
 if( !(IsOrganizerMode() || IsBlockMode() || bInsertMode ||
   aOpt.IsFormatsOnly() ) )
 {
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index e749b3a..f583259 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -95,6 +95,7 @@ enum SwXMLDocTokens
 XML_TOK_DOC_MASTERSTYLES,
 XML_TOK_DOC_META,
 XML_TOK_DOC_BODY,
+XML_TOK_DOC_UNDO,
 XML_TOK_DOC_SCRIPT,
 XML_TOK_DOC_SETTINGS,
 XML_TOK_DOC_XFORMS,
@@ -109,6 +110,7 @@ static SvXMLTokenMapEntry aDocTokenMap[] =
 { XML_NAMESPACE_OFFICE, XML_MASTER_STYLES,   XML_TOK_DOC_MASTERSTYLES   },
 { XML_NAMESPACE_OFFICE, XML_META,   XML_TOK_DOC_META},
 { XML_NAMESPACE_OFFICE, XML_BODY,   XML_TOK_DOC_BODY},
+{ XML_NAMESPACE_OFFICE, XML_UNDO,   XML_TOK_DOC_UNDO},
 { XML_NAMESPACE_OFFICE, XML_SCRIPTS,XML_TOK_DOC_SCRIPT  },
 { XML_NAMESPACE_OFFICE, XML_SETTINGS,   XML_TOK_DOC_SETTINGS},
 { XML_NAMESPACE_XFORMS, XML_MODEL,  XML_TOK_DOC_XFORMS  },
@@ -1596,4 +1598,13 @@ 
com_sun_star_comp_Writer_XMLOasisSettingsImporter_get_implementation(css::uno::X
 return cppu::acquire(new SwXMLImport(context, 
OUString("com.sun.star.comp.Writer.XMLOasisSettingsImporter"),
 SvXMLImportFlags::SETTINGS));
 }
+
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_Writer_XMLOasisUndoImporter_get_implementation(css::uno::XComponentContext*
 context,
+css::uno::Sequence const &)
+{
+return cppu::acquire(new SwXMLImport(context, 
OUString("com.sun.star.comp.Writer.XMLOasisUndoImporter"),
+SvXMLImportFlags::UNDO | SvXMLImportFlags::AUTOSTYLES));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/util/sw.component b/sw/util/sw.component
index a76d30a..478e4a2 100644
--- a/sw/util/sw.component
+++ b/sw/util/sw.component
@@ -76,13 +76,17 @@
   
constructor="com_sun_star_comp_Writer_XMLOasisContentExporter_get_implementation">
 
   
+  
+
+  
   
 
   
-  
-
+  
+
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-06 Thread Akshay Deep 
 include/sfx2/templatedlg.hxx|1 +
 sfx2/source/doc/templatedlg.cxx |7 +++
 2 files changed, 8 insertions(+)

New commits:
commit 1efbab1eb4e01ae3116301df861067a2e488c717
Author: Akshay Deep 
Date:   Sun Jun 5 07:10:26 2016 +0530

Hitting return in search field should not open a template

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

diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx
index d9730d1..9dadcf8 100644
--- a/include/sfx2/templatedlg.hxx
+++ b/include/sfx2/templatedlg.hxx
@@ -88,6 +88,7 @@ protected:
 DECL_LINK_TYPED(DefaultTemplateHdl, ThumbnailViewItem*, void);
 
 DECL_LINK_TYPED(SearchUpdateHdl, Edit&, void);
+DECL_LINK_TYPED(GetFocusHdl, Control&, void);
 
 void OnTemplateImportCategory(const OUString& sCategory);
 static void OnTemplateLink ();
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 14181cfe..db75aa7 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -261,6 +261,7 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg(vcl::Window 
*parent)
 
 mpSearchFilter->SetUpdateDataHdl(LINK(this, SfxTemplateManagerDlg, 
SearchUpdateHdl));
 mpSearchFilter->EnableUpdateData();
+mpSearchFilter->SetGetFocusHdl(LINK( this, SfxTemplateManagerDlg, 
GetFocusHdl ));
 
 SvtMiscOptions aMiscOptions;
 if ( !aMiscOptions.IsExperimentalMode() )
@@ -915,6 +916,12 @@ IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, 
SearchUpdateHdl, Edit&, void)
 }
 }
 
+IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, GetFocusHdl, Control&, void)
+{
+mpCurView->deselectItems();
+maSelTemplates.clear();
+}
+
 void SfxTemplateManagerDlg::OnTemplateState (const ThumbnailViewItem *pItem)
 {
 bool bInSelection = maSelTemplates.find(pItem) != maSelTemplates.end();
___
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' - include/sfx2 sfx2/source sfx2/uiconfig

2016-06-06 Thread Akshay Deep 
 include/sfx2/saveastemplatedlg.hxx|2 ++
 sfx2/source/doc/saveastemplatedlg.cxx |   33 -
 sfx2/uiconfig/ui/saveastemplatedlg.ui |   18 --
 3 files changed, 50 insertions(+), 3 deletions(-)

New commits:
commit cf81f59455ec0aa73f8d3e71ba7f39725ca77139
Author: Akshay Deep 
Date:   Sun Jun 5 07:53:03 2016 +0530

tdf#94131 Easier access to set a default template when saving a template

Change-Id: I2a3732a178f47ce49c77089a6e0865b609efd499
Reviewed-on: https://gerrit.libreoffice.org/25916
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 
(cherry picked from commit f944195baabfda068cc37bd4e8ddf60e6cc990b7)
Reviewed-on: https://gerrit.libreoffice.org/25957
Reviewed-by: Akshay Deep 
Tested-by: Akshay Deep 

diff --git a/include/sfx2/saveastemplatedlg.hxx 
b/include/sfx2/saveastemplatedlg.hxx
index 691d4f0..bc3eade 100644
--- a/include/sfx2/saveastemplatedlg.hxx
+++ b/include/sfx2/saveastemplatedlg.hxx
@@ -18,6 +18,7 @@
 
 class Edit;
 class ListBox;
+class CheckBox;
 class SfxDocumentTemplates;
 
 //  class SfxSaveAsTemplateDialog 
---
@@ -27,6 +28,7 @@ class SFX2_DLLPUBLIC SfxSaveAsTemplateDialog : public 
ModalDialog
 
 private:
 VclPtr mpLBCategory;
+VclPtrmpCBXDefault;
 VclPtrmpTemplateNameEdit;
 VclPtr  mpOKButton;
 
diff --git a/sfx2/source/doc/saveastemplatedlg.cxx 
b/sfx2/source/doc/saveastemplatedlg.cxx
index beef6e6..315f897 100644
--- a/sfx2/source/doc/saveastemplatedlg.cxx
+++ b/sfx2/source/doc/saveastemplatedlg.cxx
@@ -11,13 +11,20 @@
 
 #include 
 #include 
+#include 
 #include 
+#include 
+#include 
+#include 
 #include 
+#include 
 #include 
 #include 
 #include 
+#include 
 
 #include 
+#include 
 
 #include "doc.hrc"
 
@@ -34,6 +41,7 @@ SfxSaveAsTemplateDialog::SfxSaveAsTemplateDialog( 
vcl::Window* pParent):
 mpDocTemplates(new SfxDocumentTemplates)
 {
 get(mpLBCategory, "categorylb");
+get(mpCBXDefault, "defaultcb");
 get(mpTemplateNameEdit, "name_entry");
 get(mpOKButton, "ok");
 
@@ -158,10 +166,33 @@ bool SfxSaveAsTemplateDialog::SaveTemplate()
 
 sal_uInt16 nDocId = mpDocTemplates->GetCount(mnRegionPos);
 OUString sURL = 
mpDocTemplates->GetTemplateTargetURLFromComponent(msSelectedCategory, 
msTemplateName);
+bool bIsSaved = mpDocTemplates->InsertTemplate( mnRegionPos, nDocId, 
msTemplateName, sURL);
 
-if(!mpDocTemplates->InsertTemplate( mnRegionPos, nDocId, msTemplateName, 
sURL))
+if (!bIsSaved)
 return false;
 
+if ( !sURL.isEmpty() && mpCBXDefault->IsChecked() )
+{
+OUString aServiceName;
+try
+{
+uno::Reference< embed::XStorage > xStorage =
+comphelper::OStorageHelper::GetStorageFromURL( sURL, 
embed::ElementModes::READ );
+
+SotClipboardFormatId nFormat = SotStorage::GetFormatID( xStorage );
+
+std::shared_ptr pFilter = 
SfxGetpApp()->GetFilterMatcher().GetFilter4ClipBoardId( nFormat );
+
+if ( pFilter )
+aServiceName = pFilter->GetServiceName();
+}
+catch( uno::Exception& )
+{}
+
+if(!aServiceName.isEmpty())
+SfxObjectFactory::SetStandardTemplate(aServiceName, sURL);
+}
+
 mpDocTemplates->Update();
 return true;
 }
diff --git a/sfx2/uiconfig/ui/saveastemplatedlg.ui 
b/sfx2/uiconfig/ui/saveastemplatedlg.ui
index da673a3..d8ff31c 100644
--- a/sfx2/uiconfig/ui/saveastemplatedlg.ui
+++ b/sfx2/uiconfig/ui/saveastemplatedlg.ui
@@ -113,9 +113,9 @@
 
 
   
+300
 True
 True
-300
   
   
 False
@@ -153,8 +153,8 @@
 
 
   
-150
 300
+150
 True
 False
 2
@@ -175,6 +175,20 @@
 1
   
 
+
+  
+Set as Default 
Template
+True
+True
+False
+0
+True
+  
+  
+0
+2
+  
+
   
   
 False
___
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' - include/sfx2 sfx2/source

2016-06-06 Thread Akshay Deep 
 include/sfx2/templatedlg.hxx|1 +
 sfx2/source/doc/templatedlg.cxx |7 +++
 2 files changed, 8 insertions(+)

New commits:
commit 55d75f4c28509234f70b860eeb47ca4294072695
Author: Akshay Deep 
Date:   Sun Jun 5 07:10:26 2016 +0530

Hitting return in search field should not open a template

Change-Id: I85d8096489debdbda1b3883f9335dd1218e567ec
Reviewed-on: https://gerrit.libreoffice.org/25915
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 1efbab1eb4e01ae3116301df861067a2e488c717)
Reviewed-on: https://gerrit.libreoffice.org/25958
Reviewed-by: Akshay Deep 
Tested-by: Akshay Deep 

diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx
index 97fd3e5..6fbcf65 100644
--- a/include/sfx2/templatedlg.hxx
+++ b/include/sfx2/templatedlg.hxx
@@ -88,6 +88,7 @@ private:
 DECL_LINK_TYPED(DefaultTemplateHdl, ThumbnailViewItem*, void);
 
 DECL_LINK_TYPED(SearchUpdateHdl, Edit&, void);
+DECL_LINK_TYPED(GetFocusHdl, Control&, void);
 
 void OnTemplateImportCategory(const OUString& sCategory);
 static void OnTemplateLink ();
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index cf01788..9f71a4d 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -261,6 +261,7 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg(vcl::Window 
*parent)
 
 mpSearchFilter->SetUpdateDataHdl(LINK(this, SfxTemplateManagerDlg, 
SearchUpdateHdl));
 mpSearchFilter->EnableUpdateData();
+mpSearchFilter->SetGetFocusHdl(LINK( this, SfxTemplateManagerDlg, 
GetFocusHdl ));
 
 SvtMiscOptions aMiscOptions;
 if ( !aMiscOptions.IsExperimentalMode() )
@@ -910,6 +911,12 @@ IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, 
SearchUpdateHdl, Edit&, void)
 }
 }
 
+IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, GetFocusHdl, Control&, void)
+{
+mpCurView->deselectItems();
+maSelTemplates.clear();
+}
+
 void SfxTemplateManagerDlg::OnTemplateState (const ThumbnailViewItem *pItem)
 {
 bool bInSelection = maSelTemplates.find(pItem) != maSelTemplates.end();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: converting Calc functions to jump functions

2016-06-06 Thread Eike Rathke 
Hi Winfried,

On Monday, 2016-06-06 10:30:25 +0200, Winfried Donkers wrote:

> > Apart from that,  aCode.Jump( pJump[ nIdx ], pJump[ pJump[ 0 ] ] ) looks
> > wrong to me, pJump[0] returns an offset into the RPN array, which can't be
> > used as an index for another pJump.
> 
> I changed the code in my mail, the actual line reads
> aCode.Jump( pJump[ nIdx ], pJump[ nJumpCount ] );
> and nJumpCount has the value of pJump[ 0 ].

Ah right, that makes sense if it was literally pJump[0] and not any
other pJump[x], it slipped my attention that 0 one is the total jump
count. Sorry for fuzz.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


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

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

2016-06-06 Thread Akshay Deep 
 include/sfx2/templatedlg.hxx|3 +++
 sd/source/ui/app/sdmod1.cxx |3 +++
 sfx2/source/doc/doc.hrc |1 +
 sfx2/source/doc/doc.src |4 
 sfx2/source/doc/templatedlg.cxx |   21 -
 sfx2/uiconfig/ui/templatedlg.ui |   18 --
 6 files changed, 47 insertions(+), 3 deletions(-)

New commits:
commit ecece54942a8e5f20ae6dc69f25a2499d38c78bd
Author: Akshay Deep 
Date:   Sun Jun 5 05:38:13 2016 +0530

Improve Impress Template Selection Dialog

1. Hide controls: export, move, action menu, repository menu, Online Button
2. Checkbox to easily hide the dialog

Change-Id: Id2899edb9ba280c9a714d09fa534f975600b05af
Reviewed-on: https://gerrit.libreoffice.org/25913
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx
index 9dadcf8..3affc1b 100644
--- a/include/sfx2/templatedlg.hxx
+++ b/include/sfx2/templatedlg.hxx
@@ -149,6 +149,7 @@ protected:
 VclPtr mpExportButton;
 VclPtr mpImportButton;
 VclPtr mpLinkButton;
+VclPtr mpCBXHideDlg;
 VclPtr mpActionBar;
 VclPtr mpSearchView;
 VclPtr mpCurView;
@@ -222,9 +223,11 @@ public:
 virtual short Execute() override;
 
 inline OUString const & getTemplatePath() const { return msTemplatePath; };
+inline bool IsStartWithTemplate() const { return 
mpCBXHideDlg->IsChecked(); };
 
 private:
 DECL_LINK_TYPED(OpenTemplateHdl, ThumbnailViewItem*, void);
+DECL_LINK_TYPED(OkClickHdl, Button*, void);
 
 OUString   msTemplatePath;
 };
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 2bb372a..1e5dab9 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -559,6 +559,9 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
 ScopedVclPtrInstance< SfxTemplateSelectionDlg > aTemplDlg;
 aTemplDlg->Execute();
 
+//check to disable the dialog
+pOpt->SetStartWithTemplate( aTemplDlg->IsStartWithTemplate() );
+
 //pFrame is loaded with the desired template
 if(!aTemplDlg->getTemplatePath().isEmpty())
 pFrame = CreateFromTemplate(aTemplDlg->getTemplatePath(), 
xTargetFrame);
diff --git a/sfx2/source/doc/doc.hrc b/sfx2/source/doc/doc.hrc
index 10877ab..c802ccc 100644
--- a/sfx2/source/doc/doc.hrc
+++ b/sfx2/source/doc/doc.hrc
@@ -123,6 +123,7 @@
 #define STR_CREATE_ERROR(RID_SFX_DOC_START+103)
 #define STR_ERROR_SAVEAS(RID_SFX_DOC_START+105)
 #define STR_CATEGORY_RENAME (RID_SFX_DOC_START+109)
+#define STR_TEMPLATE_SELECTION  (RID_SFX_DOC_START+120)
 
 // please update to the last id
 #define ACT_SFX_DOC_END IMG_ACTION_REFRESH
diff --git a/sfx2/source/doc/doc.src b/sfx2/source/doc/doc.src
index ed7f8db..84c9456 100644
--- a/sfx2/source/doc/doc.src
+++ b/sfx2/source/doc/doc.src
@@ -80,6 +80,10 @@ String STR_RENAME_TEMPLATE
 {
 Text [ en-US ] = "Enter New Name: " ;
 };
+String STR_TEMPLATE_SELECTION
+{
+Text [ en-US ] = "Select a Template" ;
+};
 String STR_AUTOMATICVERSION
 {
 Text [ en-US ] = "Automatically saved version" ;
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index db75aa7..9ba3b7c 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -179,6 +179,7 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg(vcl::Window 
*parent)
 get(mpExportButton, "export_btn");
 get(mpImportButton, "import_btn");
 get(mpLinkButton, "online_link");
+get(mpCBXHideDlg, "hidedialogcb");
 
 // Create popup menus
 mpActionMenu = new PopupMenu;
@@ -326,6 +327,7 @@ void SfxTemplateManagerDlg::dispose()
 mpExportButton.clear();
 mpImportButton.clear();
 mpLinkButton.clear();
+mpCBXHideDlg.clear();
 mpSearchFilter.clear();
 mpCBApp.clear();
 mpCBFolder.clear();
@@ -1646,8 +1648,8 @@ 
SfxTemplateSelectionDlg::SfxTemplateSelectionDlg(vcl::Window* pParent):
 msTemplatePath(OUString())
 {
 mpCBApp->SelectEntryPos(MNI_IMPRESS);
-mpCBApp->Disable();
 mpCBFolder->SelectEntryPos(0);
+SetText(SfxResId(STR_TEMPLATE_SELECTION).toString());
 
 if(mpLocalView->IsVisible())
 {
@@ -1655,8 +1657,17 @@ 
SfxTemplateSelectionDlg::SfxTemplateSelectionDlg(vcl::Window* pParent):
 mpLocalView->showAllTemplates();
 }
 
+mpCBApp->Disable();
+mpActionBar->Hide();
+mpLinkButton->Hide();
+mpMoveButton->Hide();
+mpExportButton->Hide();
+mpCBXHideDlg->Show();
+mpCBXHideDlg->Check(true);
+
 mpLocalView->setOpenTemplateHdl(LINK(this,SfxTemplateSelectionDlg, 
OpenTemplateHdl));
 mpSearchView->setOpenTemplateHdl(LINK(this,SfxTemplateSelectionDlg, 
OpenTemplateHdl));
+mpOKButton->SetClickHdl(LINK(this, SfxTemplateSelectionDlg, OkClickHdl));
 }
 
 SfxTemplateSelectionDlg::~SfxTemplateSelectionDlg()
@@ -1682,4 +169

Re: old deprecated import filters

2016-06-06 Thread Eike Rathke 
Hi Rich,

On Saturday, 2016-06-04 20:15:45 -0600, Rich Reynolds wrote:

> im looking for when very old import filters were deprecated. i have some
> very old files that need updating to rational file formats.

It would had helped if you indicated which filter type or at least the
file extension of your "very old files".. I can just assume you're
referring the StarOffice binary file format with file name extensions
such as .sdw, .sdc, ... the last version supporting these was
LibreOffice 3.6 where the filters could be explicitly selected in the
installation setup (assuming you're running on Windows). You'd have to
grab an old install set from
https://downloadarchive.documentfoundation.org/libreoffice/old/ and
install it in parallel, see
https://wiki.documentfoundation.org/Installing_in_parallel

Anyway, this is a developer mailing list you were writing to, for user
questions we have https://ask.libreoffice.org/ and the community mailing
lists https://www.libreoffice.org/get-help/mailing-lists/

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


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

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

2016-06-06 Thread Susobhan Ghosh 
 sw/source/uibase/sidebar/PageFormatPanel.cxx |  165 +--
 sw/source/uibase/sidebar/PageFormatPanel.hxx |   33 -
 sw/source/uibase/sidebar/SwPanelFactory.cxx  |2 
 sw/uiconfig/swriter/ui/pageformatpanel.ui|   35 +
 4 files changed, 214 insertions(+), 21 deletions(-)

New commits:
commit 8b99402338773150fc0c8c6f894eb610e056d79e
Author: Susobhan Ghosh 
Date:   Wed May 25 09:43:31 2016 +0530

tdf#83830: Page Format Panel

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

diff --git a/sw/source/uibase/sidebar/PageFormatPanel.cxx 
b/sw/source/uibase/sidebar/PageFormatPanel.cxx
index 5af1159..46c92c2 100644
--- a/sw/source/uibase/sidebar/PageFormatPanel.cxx
+++ b/sw/source/uibase/sidebar/PageFormatPanel.cxx
@@ -34,31 +34,43 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 namespace sw { namespace sidebar{
 
 VclPtr PageFormatPanel::Create(
 vcl::Window* pParent,
-const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& 
rxFrame)
+const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& 
rxFrame,
+SfxBindings* pBindings)
 {
 if( pParent == nullptr )
 throw ::com::sun::star::lang::IllegalArgumentException("no parent 
window given to PageFormatPanel::Create", nullptr, 0);
 if( !rxFrame.is() )
 throw ::com::sun::star::lang::IllegalArgumentException("no XFrame 
given to PageFormatPanel::Create", nullptr, 0);
 
-return VclPtr::Create(pParent, rxFrame);
+return VclPtr::Create(pParent, rxFrame, pBindings);
 }
 
 PageFormatPanel::PageFormatPanel(
 vcl::Window* pParent,
-const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& 
rxFrame
-) :
-PanelLayout(pParent, "PageFormatPanel", 
"modules/swriter/ui/pageformatpanel.ui", rxFrame)
+const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& 
rxFrame,
+SfxBindings* pBindings) :
+PanelLayout(pParent, "PageFormatPanel", 
"modules/swriter/ui/pageformatpanel.ui", rxFrame),
+mpBindings( pBindings ),
+maPaperSizeController(SID_ATTR_PAGE_SIZE, *pBindings, *this),
+maPaperOrientationController(SID_ATTR_PAGE, *pBindings, *this),
+maMetricController(SID_ATTR_METRIC, *pBindings,*this),
+mpPageItem( new SvxPageItem(SID_ATTR_PAGE) ),
+meFUnit(GetModuleFieldUnit()),
+meLastFUnit(GetModuleFieldUnit()),
+meUnit()
 {
-get(mpPaperSizeLB, "papersize");
+get(mpPaperSizeBox, "papersize");
 get(mpPaperWidth, "paperwidth");
 get(mpPaperHeight, "paperheight");
 get(mpPaperOrientation, "paperorientation");
+Initialize();
 }
 
 PageFormatPanel::~PageFormatPanel()
@@ -68,21 +80,152 @@ PageFormatPanel::~PageFormatPanel()
 
 void PageFormatPanel::dispose()
 {
-mpPaperSizeLB.disposeAndClear();
+mpPaperSizeBox.disposeAndClear();
 mpPaperWidth.disposeAndClear();
 mpPaperHeight.disposeAndClear();
 mpPaperOrientation.disposeAndClear();
 
+maMetricController.dispose();
+maPaperOrientationController.dispose();
+maPaperSizeController.dispose();
+mpPageItem.reset();
+
 PanelLayout::dispose();
 }
 
+void PageFormatPanel::Initialize()
+{
+mpPaperSizeBox->FillPaperSizeEntries( PaperSizeStd );
+mpPaperSizeBox->SetDropDownLineCount(6);
+meUnit = maPaperSizeController.GetCoreMetric();
+SetFieldUnit( *mpPaperWidth, meFUnit );
+SetFieldUnit( *mpPaperHeight, meFUnit );
+
+const SvtOptionsDrawinglayer aDrawinglayerOpt;
+
mpPaperWidth->SetMax(mpPaperWidth->Normalize(aDrawinglayerOpt.GetMaximumPaperWidth()),
 FUNIT_CM);
+
mpPaperWidth->SetLast(mpPaperWidth->Normalize(aDrawinglayerOpt.GetMaximumPaperWidth()),
 FUNIT_CM);
+
mpPaperHeight->SetMax(mpPaperHeight->Normalize(aDrawinglayerOpt.GetMaximumPaperHeight()),
 FUNIT_CM);
+
mpPaperHeight->SetLast(mpPaperHeight->Normalize(aDrawinglayerOpt.GetMaximumPaperHeight()),
 FUNIT_CM);
+
+mpPaperSizeBox->SetSelectHdl( LINK(this, PageFormatPanel, 
PaperFormatModifyHdl ));
+mpPaperOrientation->SetSelectHdl( LINK(this, PageFormatPanel, 
PaperFormatModifyHdl ));
+mpPaperHeight->SetModifyHdl( LINK(this, PageFormatPanel, 
PaperSizeModifyHdl ));
+mpPaperWidth->SetModifyHdl( LINK(this, PageFormatPanel, PaperSizeModifyHdl 
));
+
+mpBindings->Update(SID_ATTR_METRIC);
+mpBindings->Update(SID_ATTR_PAGE);
+mpBindings->Update(SID_ATTR_PAGE_SIZE);
+}
+
 void PageFormatPanel::NotifyItemUpdate(
-const sal_uInt16 /*nSid*/,
-const SfxItemState /*eState*/,
-const SfxPoolItem* /*pState*/,
-const bool /*bIsEnabled*/)
+const sal_uInt16 nSId,
+const SfxItemState eState,
+const SfxPoolItem* pState,
+const bool bIsEnabled)
 {
+(void)bIsEnabled;
+
+switch(nSId)
+{
+case SID_ATTR_PAGE_SIZE:
+{
+const SvxSizeItem* pSizeItem = nu

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

2016-06-06 Thread Pranav Kant 
 sc/source/ui/docshell/impex.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 14a27ac51d52c7741c8597a2603d2683572e5254
Author: Pranav Kant 
Date:   Fri Jun 3 00:46:48 2016 +0530

sc: Don't export in case of invalid range

For example, copying an empty column or row range, and then
pasting as unformatted text exports all the newline characters
inspite of the fact that this is an invalid data range.

The problem becomes worse when someone tries to copy an entire
column which implies exporting MAXROW times newline characters.

Change-Id: Ie0a09890e2d0cd5f44d89d520959248e65365ad7
(cherry picked from commit 432b27ec73940738bb0b4f9d3d749c70a2525700)

diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 6e75c9b..afb77b7 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -1599,7 +1599,8 @@ bool ScImportExport::Doc2Text( SvStream& rStrm )
 SCTAB nEndTab = aRange.aEnd.Tab();
 
 if (!pDoc->GetClipParam().isMultiRange() && nStartTab == nEndTab)
-pDoc->ShrinkToDataArea( nStartTab, nStartCol, nStartRow, nEndCol, 
nEndRow );
+if (!pDoc->ShrinkToDataArea( nStartTab, nStartCol, nStartRow, nEndCol, 
nEndRow ))
+return false;
 
 OUString aCell;
 
___
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' - vcl/opengl vcl/source

2016-06-06 Thread Tor Lillqvist 
 vcl/opengl/win/gdiimpl.cxx  |   53 ++--
 vcl/source/opengl/OpenGLContext.cxx |   17 ++-
 2 files changed, 61 insertions(+), 9 deletions(-)

New commits:
commit 0b89ccb60f9bd270d762667e8b649faeef7496c5
Author: Tor Lillqvist 
Date:   Fri Jun 3 09:25:13 2016 +0300

tdf#100193: Check earlier and harder whether OpenGL is good enough on 
Windows

If we notice early enough that OpenGL is broken or not good enough, we
can disable it and terminate with EXITHELPER_NORMAL_RESTART. Not
beautiful, but works.

The earlier added check whether shader compilation and loading of
shader program binaries from a cached file works is now just one of
the aspects that are checked.

Change-Id: I9382576cc607f1916f6002f1fa78a62e23180fe3
(cherry picked from commit 210c39dd9a6ebaa964c03c20e4b442ea36941ae9)
Reviewed-on: https://gerrit.libreoffice.org/25853
Tested-by: Jenkins 
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/vcl/opengl/win/gdiimpl.cxx b/vcl/opengl/win/gdiimpl.cxx
index 8bc7943..310eb14 100644
--- a/vcl/opengl/win/gdiimpl.cxx
+++ b/vcl/opengl/win/gdiimpl.cxx
@@ -353,6 +353,12 @@ bool InitMultisample(const PIXELFORMATDESCRIPTOR& pfd, 
int& rPixelFormat,
 namespace
 {
 
+void disableOpenGLAndTerminateForRestart()
+{
+OpenGLZone::hardDisable();
+TerminateProcess(GetCurrentProcess(), EXITHELPER_NORMAL_RESTART);
+}
+
 bool tryShaders(const OUString& rVertexShader, const OUString& 
rFragmentShader, const OUString& rGeometryShader = "", const OString& rPreamble 
= "")
 {
 GLint nId;
@@ -440,12 +446,6 @@ bool compiledShaderBinariesWork()
  tryShaders("textureVertexShader", "convolutionFragmentShader") &&
  tryShaders("textureVertexShader", "areaScaleFastFragmentShader"));
 
-if (!bResult)
-{
-OpenGLZone::hardDisable();
-TerminateProcess(GetCurrentProcess(), EXITHELPER_NORMAL_RESTART);
-}
-
 return bResult;
 }
 
@@ -453,6 +453,16 @@ bool compiledShaderBinariesWork()
 
 bool WinOpenGLContext::ImplInit()
 {
+// Failures here typically means that OpenGL can't be used. Returning 
false is fairly pointless
+// as the calling code doesn't even check, but oh well. If we notice that 
OpenGL is broken the
+// first time being called, it is not too late to call
+// disableOpenGLAndTerminateForRestart(). The first time this will be 
called is from displaying
+// the splash screen, so if OpenGL is broken, it is "early enough" for us 
to be able to disable
+// OpenGL and terminate bluntly with EXITHELPER_NORMAL_RESTART, thus 
causing the wrapper process
+// to restart us, then without using OpenGL.
+
+static bool bFirstCall = true;
+
 OpenGLZone aZone;
 
 VCL_GL_INFO("OpenGLContext::ImplInitstart");
@@ -504,6 +514,9 @@ bool WinOpenGLContext::ImplInit()
 if (WindowPix == 0)
 {
 SAL_WARN("vcl.opengl", "Invalid pixelformat");
+if (bFirstCall)
+disableOpenGLAndTerminateForRestart();
+bFirstCall = false;
 return false;
 }
 
@@ -511,6 +524,9 @@ bool WinOpenGLContext::ImplInit()
 {
 ImplWriteLastError(GetLastError(), "SetPixelFormat in 
OpenGLContext::ImplInit");
 SAL_WARN("vcl.opengl", "SetPixelFormat failed");
+if (bFirstCall)
+disableOpenGLAndTerminateForRestart();
+bFirstCall = false;
 return false;
 }
 
@@ -519,6 +535,9 @@ bool WinOpenGLContext::ImplInit()
 {
 ImplWriteLastError(GetLastError(), "wglCreateContext in 
OpenGLContext::ImplInit");
 SAL_WARN("vcl.opengl", "wglCreateContext failed");
+if (bFirstCall)
+disableOpenGLAndTerminateForRestart();
+bFirstCall = false;
 return false;
 }
 
@@ -526,13 +545,17 @@ bool WinOpenGLContext::ImplInit()
 {
 ImplWriteLastError(GetLastError(), "wglMakeCurrent in 
OpenGLContext::ImplInit");
 SAL_WARN("vcl.opengl", "wglMakeCurrent failed");
+if (bFirstCall)
+disableOpenGLAndTerminateForRestart();
+bFirstCall = false;
 return false;
 }
 
 if (!InitGLEW())
 {
-wglMakeCurrent(NULL, NULL);
-wglDeleteContext(hTempRC);
+if (bFirstCall)
+disableOpenGLAndTerminateForRestart();
+bFirstCall = false;
 return false;
 }
 
@@ -544,6 +567,9 @@ bool WinOpenGLContext::ImplInit()
 {
 wglMakeCurrent(NULL, NULL);
 wglDeleteContext(hTempRC);
+if (bFirstCall)
+disableOpenGLAndTerminateForRestart();
+bFirstCall = false;
 return false;
 }
 
@@ -563,6 +589,9 @@ bool WinOpenGLContext::ImplInit()
 SAL_WARN("vcl.opengl", "wglCreateContextAttribsARB failed");
 wglMakeCurrent(NULL, NULL);
 wglDeleteContext(hTempRC);
+if (bFirstCall)
+disableOpenGLAndTerminateForRestart();
+bFirstCall = false;

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

2016-06-06 Thread Mark Hung 
 opencl/source/opencl_device.cxx |   11 ---
 opencl/source/openclwrapper.cxx |2 ++
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 40b0b9ab7703a165295b008f47df14d2ec076fb1
Author: Mark Hung 
Date:   Fri May 13 19:58:18 2016 +0800

Ensure that OpenCL device id returned from getDeviceSelection() is valid.

Change-Id: I756bb57d471db3d3ca1d9c3733d359c7c16b4e66
Reviewed-on: https://gerrit.libreoffice.org/24959
Tested-by: Jenkins 
Reviewed-by: Mark Page 
Reviewed-by: Tomaž Vajngerl 

diff --git a/opencl/source/opencl_device.cxx b/opencl/source/opencl_device.cxx
index bfe81b5..a653ac7 100644
--- a/opencl/source/opencl_device.cxx
+++ b/opencl/source/opencl_device.cxx
@@ -636,10 +636,15 @@ ds_device getDeviceSelection(
 }
 
 /* Final device selection */
-selectedDevice = aProfile->devices[bestDeviceIdx];
-bIsDeviceSelected = true;
+if (bestDeviceIdx >=0 && static_cast< 
std::vector::size_type> ( bestDeviceIdx ) < aProfile->devices.size() 
)
+{
+selectedDevice = aProfile->devices[bestDeviceIdx];
+bIsDeviceSelected = true;
 
-writeDevicesLog(aProfile, sProfilePath, bestDeviceIdx);
+writeDevicesLog(aProfile, sProfilePath, bestDeviceIdx);
+} else {
+selectedDevice.eType = DeviceType::NativeCPU;
+}
 }
 return selectedDevice;
 }
diff --git a/opencl/source/openclwrapper.cxx b/opencl/source/openclwrapper.cxx
index 1655cb6..ab65091 100644
--- a/opencl/source/openclwrapper.cxx
+++ b/opencl/source/openclwrapper.cxx
@@ -703,6 +703,8 @@ bool switchOpenCLDevice(const OUString* pDevice, bool 
bAutoSelect, bool bForceEv
 OUString path;
 osl::FileBase::getSystemPathFromFileURL(url,path);
 ds_device aSelectedDevice = getDeviceSelection(path, bForceEvaluation);
+if ( aSelectedDevice.eType != DeviceType::OpenCLDevice)
+return false;
 pDeviceId = aSelectedDevice.aDeviceID;
 
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-06 Thread Eike Rathke 
 i18npool/source/localedata/data/be_BY.xml  |4 ++--
 i18npool/source/localedata/data/br_FR.xml  |4 ++--
 i18npool/source/localedata/data/cu_RU.xml  |4 ++--
 i18npool/source/localedata/data/da_DK.xml  |4 ++--
 i18npool/source/localedata/data/de_AT.xml  |4 ++--
 i18npool/source/localedata/data/de_DE.xml  |4 ++--
 i18npool/source/localedata/data/de_LU.xml  |4 ++--
 i18npool/source/localedata/data/dsb_DE.xml |4 ++--
 i18npool/source/localedata/data/es_AR.xml  |4 ++--
 i18npool/source/localedata/data/es_BO.xml  |4 ++--
 i18npool/source/localedata/data/es_CL.xml  |4 ++--
 i18npool/source/localedata/data/es_CR.xml  |4 ++--
 i18npool/source/localedata/data/es_EC.xml  |4 ++--
 i18npool/source/localedata/data/es_ES.xml  |4 ++--
 i18npool/source/localedata/data/es_GT.xml  |4 ++--
 i18npool/source/localedata/data/es_PE.xml  |4 ++--
 i18npool/source/localedata/data/fo_FO.xml  |4 ++--
 i18npool/source/localedata/data/fr_BE.xml  |4 ++--
 i18npool/source/localedata/data/fr_BF.xml  |4 ++--
 i18npool/source/localedata/data/fr_CA.xml  |4 ++--
 i18npool/source/localedata/data/fr_FR.xml  |4 ++--
 i18npool/source/localedata/data/fr_LU.xml  |4 ++--
 i18npool/source/localedata/data/gsc_FR.xml |4 ++--
 i18npool/source/localedata/data/hsb_DE.xml |4 ++--
 i18npool/source/localedata/data/ka_GE.xml  |4 ++--
 i18npool/source/localedata/data/kl_GL.xml  |4 ++--
 i18npool/source/localedata/data/lb_LU.xml  |4 ++--
 i18npool/source/localedata/data/ln_CD.xml  |4 ++--
 i18npool/source/localedata/data/lt_LT.xml  |4 ++--
 i18npool/source/localedata/data/ro_RO.xml  |4 ++--
 i18npool/source/localedata/data/ru_RU.xml  |4 ++--
 i18npool/source/localedata/data/sk_SK.xml  |4 ++--
 i18npool/source/localedata/data/sl_SI.xml  |4 ++--
 i18npool/source/localedata/data/sv_FI.xml  |4 ++--
 i18npool/source/localedata/data/sv_SE.xml  |4 ++--
 i18npool/source/localedata/data/tk_TM.xml  |4 ++--
 36 files changed, 72 insertions(+), 72 deletions(-)

New commits:
commit d5146c0e3ca7459db4fdc3b348cec4012555ea35
Author: Eike Rathke 
Date:   Mon Jun 6 12:47:21 2016 +0200

no-break space between number and percent sign, tdf#63272

Change-Id: Ifa02ad6bd1d06dc44a776b3a4dbf6c4b366394fc

diff --git a/i18npool/source/localedata/data/be_BY.xml 
b/i18npool/source/localedata/data/be_BY.xml
index 545ceeb..38ab18d 100644
--- a/i18npool/source/localedata/data/be_BY.xml
+++ b/i18npool/source/localedata/data/be_BY.xml
@@ -82,10 +82,10 @@
   ##0,00E+00
 
 
-  0%
+  0" "%
 
 
-  0,00%
+  0,00" "%
 
 
   # ##0[$р.-423];-# ##0[$р.-423]
diff --git a/i18npool/source/localedata/data/br_FR.xml 
b/i18npool/source/localedata/data/br_FR.xml
index f322f2c..9c60659 100644
--- a/i18npool/source/localedata/data/br_FR.xml
+++ b/i18npool/source/localedata/data/br_FR.xml
@@ -83,10 +83,10 @@
   ##0,00E+00
 
 
-  0%
+  0" "%
 
 
-  0,00%
+  0,00" "%
 
 
   # ##0 [CURRENCY];-# ##0 [CURRENCY]
diff --git a/i18npool/source/localedata/data/cu_RU.xml 
b/i18npool/source/localedata/data/cu_RU.xml
index 0d580af..95d82c4 100644
--- a/i18npool/source/localedata/data/cu_RU.xml
+++ b/i18npool/source/localedata/data/cu_RU.xml
@@ -86,10 +86,10 @@
   ##0,00E+00
 
 
-  0%
+  0" "%
 
 
-  0,00%
+  0,00" "%
 
 
   # ##0 [CURRENCY];-# ##0 [CURRENCY]
diff --git a/i18npool/source/localedata/data/da_DK.xml 
b/i18npool/source/localedata/data/da_DK.xml
index 899..552f15e 100644
--- a/i18npool/source/localedata/data/da_DK.xml
+++ b/i18npool/source/localedata/data/da_DK.xml
@@ -81,10 +81,10 @@
   ##0,00E+00
 
 
-  0%
+  0" "%
 
 
-  0,00%
+  0,00" "%
 
 
   [$kr-406] #.##0;[$kr-406] -#.##0
diff --git a/i18npool/source/localedata/data/de_AT.xml 
b/i18npool/source/localedata/data/de_AT.xml
index cd248ca..9d0b867 100644
--- a/i18npool/source/localedata/data/de_AT.xml
+++ b/i18npool/source/localedata/data/de_AT.xml
@@ -81,10 +81,10 @@
   ##0,00E+00
 
 
-  0%
+  0" "%
 
 
-  0,00%
+  0,00" "%
 
 
   [$öS-C07] #.##0;-[$öS-C07] #.##0
diff --git a/i18npool/source/localedata/data/de_DE.xml 
b/i18npool/source/localedata/data/de_DE.xml
index da88701..46f89a2 100644
--- a/i18npool/source/localedata/data/de_DE.xml
+++ b/i18npool/source/localedata/data/de_DE.xml
@@ -81,10 +81,10 @@
   ##0,00E+00
 
 
-  0%
+  0" "%
 
 
-  0,00%
+  0,00" "%
 
 
   #.##0 [$DM-407];-#.##0 [$DM-407]
diff --git a/i18npool/source/localedata/data/de_LU.xml 
b/i18npool/source/localedata/data/de_LU.xml
index 40e3b74..9d12a26 100644
--- a/i18npool/source/localedata/data/de_LU.xml
+++ b/i18npool/source/localedata/data/de_LU.xml
@@ -81,10 +81,10 @@
   ##0,00E+00
 
 
-  0%
+  0" "%

[Libreoffice-commits] online.git: 3 commits - loleaflet/dist loleaflet/node_modules loleaflet/package.json loleaflet/README

2016-06-06 Thread Pranav Kant 
 dev/null   |binary
 loleaflet/README   |   12 +++-
 loleaflet/dist/toolbar.css |2 +-
 loleaflet/package.json |8 +++-
 4 files changed, 7 insertions(+), 15 deletions(-)

New commits:
commit b230dcb26f344d166b77faa4f3538dbe82af9ac1
Author: Pranav Kant 
Date:   Mon Jun 6 16:28:57 2016 +0530

loleaflet: Kill modules.zip

... and save ~3MB of space.

Change-Id: Iaa5cb62936d66044b657e6a507237a90f1d0a537

diff --git a/loleaflet/README b/loleaflet/README
index fedd119..4da5145 100644
--- a/loleaflet/README
+++ b/loleaflet/README
@@ -10,14 +10,10 @@ Build dependencies
 First you need to install 'jake'.  As root, do:
 
 npm install -g jake
-npm install
 
 npm is provided by the nodejs package.
-Alternatively, you can use the provided zip (as a normal user):
 
-unzip node_modules/modules.zip -d node_modules
-
-A third way is to use npm as a user, but set its prefix to a directory where
+Another way is to use npm as a user, but set its prefix to a directory where
 you have write access. If you want that, you need to have an ~/.npmrc with the
 line e.g.
 
@@ -26,11 +22,9 @@ line e.g.
 Building
 
 
-As a normal user:
+Just do:
 
-jake build
-cd plugins/draw-0.2.4
-jake build
+make
 
 Running
 ---
diff --git a/loleaflet/node_modules/modules.zip 
b/loleaflet/node_modules/modules.zip
deleted file mode 100644
index 89f2848..000
Binary files a/loleaflet/node_modules/modules.zip and /dev/null differ
commit a32ded97525e375e5e7cf0177db1752592bf6622
Author: Pranav Kant 
Date:   Sat Jun 4 15:38:08 2016 +0530

loleaflet: Move websocket module to devDependencies

This module is only used from tests. These are not hard
depedencies.

Change-Id: I9b63562de827f9d2e12fa108555cc783a5689db2

diff --git a/loleaflet/package.json b/loleaflet/package.json
index 883699c..618dff4 100644
--- a/loleaflet/package.json
+++ b/loleaflet/package.json
@@ -16,7 +16,8 @@
 "karma-safari-launcher": "~0.1.1",
 "mocha": "~2.1.0",
 "tin": "^0.5.0",
-"uglify-js": "~2.4.16"
+"uglify-js": "~2.4.16",
+"ws": "~0.7.2"
   },
   "main": "dist/leaflet-src.js",
   "style": "dist/leaflet.css",
@@ -38,8 +39,5 @@
   "type": "BSD-2-Clause",
   "url": "https://github.com/Leaflet/Leaflet/blob/master/LICENSE";
 }
-  ],
-  "dependencies": {
-"ws": "~0.7.2"
-  }
+  ]
 }
commit 3ec6c6b6625c04a55b7a704d903b3887abc029b9
Author: Pranav Kant 
Date:   Sat Jun 4 15:16:33 2016 +0530

loleaflet: Reduce z-index of auxiliary toolbar

Otherwise, when the screen becomes inactive, it is the only
widget to shine separately.

Change-Id: Idf22e2cece3fd465ff37e7304f4776dbfdef66a8

diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index abc6c25..35e7976 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -34,7 +34,7 @@
 width: 200px;
 top: 65px;
 border: 1px solid darkgrey;
-z-index: 8000;
+z-index: 1000;
 display: none;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-06 Thread Michael Stahl 
 vcl/source/filter/igif/gifread.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5abd4093a64e0de74100c6b280bafa4b283e2aae
Author: Michael Stahl 
Date:   Thu Jun 2 14:11:40 2016 +0200

vcl: GIF import: don't use __LP64__ to check for a 64-bit system

__LP64__ is not defined in MSVC AMD64 builds, since it doesn't have
64-bit longs.  This caused the vcl_filters_test to fail because loading
the file for which that check is a work-around succeeded.

Change-Id: I4df48d4b196a1d08e9bd5ef61b64ec63501037c9
(cherry picked from commit f6ed2305abb0289ad51605ceeaee607a0bc8d7bd)
Reviewed-on: https://gerrit.libreoffice.org/25829
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 
(cherry picked from commit 80d7ed6dc3ddaa364e7be84b4dd7d1783802b8da)
Reviewed-on: https://gerrit.libreoffice.org/25857
Reviewed-by: David Ostrovsky 
Reviewed-by: Tomaž Vajngerl 
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/vcl/source/filter/igif/gifread.cxx 
b/vcl/source/filter/igif/gifread.cxx
index 9b4d690..083924c 100644
--- a/vcl/source/filter/igif/gifread.cxx
+++ b/vcl/source/filter/igif/gifread.cxx
@@ -89,7 +89,7 @@ bool GIFReader::CreateBitmaps( long nWidth, long nHeight, 
BitmapPalette* pPal,
 {
 const Size aSize( nWidth, nHeight );
 
-#ifdef __LP64__
+#if SAL_TYPES_SIZEOFPOINTER == 8
 // Don't bother allocating a bitmap of a size that would fail on a
 // 32-bit system. We have at least one unit tests that is expected
 // to fail (loading a 65535*65535 size GIF
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[GSoC] Review of Sidebar & It's functionality - Weekly Report #2

2016-06-06 Thread Susobhan Ghosh 
Hi,

The second week of GSoC is over, and this is what I've done from last week:

1. Writer Page Tab:
a) Format Panel - Merged (https://gerrit.libreoffice.org/#/c/25530/)
b) Margin Panel - On gerrit, to be modified. (
https://gerrit.libreoffice.org/#/c/25520/)
c) Styles Panel - Column Count, Page Number Format, and Layout done.
d) Header/Footer Panel - Was stuck with SIDs for Header Footer in Writer.
Would go ahead with multiple SIDs (if no better solution comes up). Wasn't
able to finish up the deck due to this bottleneck.

TO-DO:
1. Finish Background Fill in Styles Panel, and Header/Footer Panels.
2. Start fixing Area Content Panel once the Writer Page Deck is done.

Regards,
Susobhan Ghosh
IRC: susobhang70
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: jurt/com

2016-06-06 Thread Noel Grandin 
 jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 02858c3d4900fba4d7fa596b221eb426b35ca3e9
Author: Noel Grandin 
Date:   Mon Jun 6 12:57:43 2016 +0200

fix synchronization of JobQueue

Change-Id: I51d58896065a06564d7963aab1145ba9083fdefc

diff --git a/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java 
b/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java
index 7b96414..0ab2a29 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java
+++ b/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java
@@ -89,7 +89,7 @@ public class JobQueue {
 try {
   enter(2000, _disposeId);
 } catch(Throwable throwable) {
-synchronized (this) {
+synchronized (JobQueue.this) {
 if(!jobList.isEmpty() || _active) { // there was a job in 
progress, so give a stack
 System.err.println(getClass().getName() + " - 
exception occurred:" + throwable);
 throwable.printStackTrace(System.err);
___
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' - i18npool/source

2016-06-06 Thread Eike Rathke 
 i18npool/source/localedata/data/be_BY.xml  |4 ++--
 i18npool/source/localedata/data/br_FR.xml  |4 ++--
 i18npool/source/localedata/data/cu_RU.xml  |4 ++--
 i18npool/source/localedata/data/da_DK.xml  |4 ++--
 i18npool/source/localedata/data/de_AT.xml  |4 ++--
 i18npool/source/localedata/data/de_DE.xml  |4 ++--
 i18npool/source/localedata/data/de_LU.xml  |4 ++--
 i18npool/source/localedata/data/dsb_DE.xml |4 ++--
 i18npool/source/localedata/data/es_AR.xml  |4 ++--
 i18npool/source/localedata/data/es_BO.xml  |4 ++--
 i18npool/source/localedata/data/es_CL.xml  |4 ++--
 i18npool/source/localedata/data/es_CR.xml  |4 ++--
 i18npool/source/localedata/data/es_EC.xml  |4 ++--
 i18npool/source/localedata/data/es_ES.xml  |4 ++--
 i18npool/source/localedata/data/es_GT.xml  |4 ++--
 i18npool/source/localedata/data/es_PE.xml  |4 ++--
 i18npool/source/localedata/data/fo_FO.xml  |4 ++--
 i18npool/source/localedata/data/fr_BE.xml  |4 ++--
 i18npool/source/localedata/data/fr_BF.xml  |4 ++--
 i18npool/source/localedata/data/fr_CA.xml  |4 ++--
 i18npool/source/localedata/data/fr_FR.xml  |4 ++--
 i18npool/source/localedata/data/fr_LU.xml  |4 ++--
 i18npool/source/localedata/data/gsc_FR.xml |4 ++--
 i18npool/source/localedata/data/hsb_DE.xml |4 ++--
 i18npool/source/localedata/data/ka_GE.xml  |4 ++--
 i18npool/source/localedata/data/kl_GL.xml  |4 ++--
 i18npool/source/localedata/data/lb_LU.xml  |4 ++--
 i18npool/source/localedata/data/ln_CD.xml  |4 ++--
 i18npool/source/localedata/data/lt_LT.xml  |4 ++--
 i18npool/source/localedata/data/ro_RO.xml  |4 ++--
 i18npool/source/localedata/data/ru_RU.xml  |4 ++--
 i18npool/source/localedata/data/sk_SK.xml  |4 ++--
 i18npool/source/localedata/data/sl_SI.xml  |4 ++--
 i18npool/source/localedata/data/sv_FI.xml  |4 ++--
 i18npool/source/localedata/data/sv_SE.xml  |4 ++--
 i18npool/source/localedata/data/tk_TM.xml  |4 ++--
 36 files changed, 72 insertions(+), 72 deletions(-)

New commits:
commit 6eb7dbe4d18098ccebf5c942c0de928bc4c49689
Author: Eike Rathke 
Date:   Mon Jun 6 12:47:21 2016 +0200

no-break space between number and percent sign, tdf#63272

Change-Id: Ifa02ad6bd1d06dc44a776b3a4dbf6c4b366394fc
(cherry picked from commit d5146c0e3ca7459db4fdc3b348cec4012555ea35)
Reviewed-on: https://gerrit.libreoffice.org/25968
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/i18npool/source/localedata/data/be_BY.xml 
b/i18npool/source/localedata/data/be_BY.xml
index 545ceeb..38ab18d 100644
--- a/i18npool/source/localedata/data/be_BY.xml
+++ b/i18npool/source/localedata/data/be_BY.xml
@@ -82,10 +82,10 @@
   ##0,00E+00
 
 
-  0%
+  0" "%
 
 
-  0,00%
+  0,00" "%
 
 
   # ##0[$р.-423];-# ##0[$р.-423]
diff --git a/i18npool/source/localedata/data/br_FR.xml 
b/i18npool/source/localedata/data/br_FR.xml
index f322f2c..9c60659 100644
--- a/i18npool/source/localedata/data/br_FR.xml
+++ b/i18npool/source/localedata/data/br_FR.xml
@@ -83,10 +83,10 @@
   ##0,00E+00
 
 
-  0%
+  0" "%
 
 
-  0,00%
+  0,00" "%
 
 
   # ##0 [CURRENCY];-# ##0 [CURRENCY]
diff --git a/i18npool/source/localedata/data/cu_RU.xml 
b/i18npool/source/localedata/data/cu_RU.xml
index 0d580af..95d82c4 100644
--- a/i18npool/source/localedata/data/cu_RU.xml
+++ b/i18npool/source/localedata/data/cu_RU.xml
@@ -86,10 +86,10 @@
   ##0,00E+00
 
 
-  0%
+  0" "%
 
 
-  0,00%
+  0,00" "%
 
 
   # ##0 [CURRENCY];-# ##0 [CURRENCY]
diff --git a/i18npool/source/localedata/data/da_DK.xml 
b/i18npool/source/localedata/data/da_DK.xml
index 899..552f15e 100644
--- a/i18npool/source/localedata/data/da_DK.xml
+++ b/i18npool/source/localedata/data/da_DK.xml
@@ -81,10 +81,10 @@
   ##0,00E+00
 
 
-  0%
+  0" "%
 
 
-  0,00%
+  0,00" "%
 
 
   [$kr-406] #.##0;[$kr-406] -#.##0
diff --git a/i18npool/source/localedata/data/de_AT.xml 
b/i18npool/source/localedata/data/de_AT.xml
index cd248ca..9d0b867 100644
--- a/i18npool/source/localedata/data/de_AT.xml
+++ b/i18npool/source/localedata/data/de_AT.xml
@@ -81,10 +81,10 @@
   ##0,00E+00
 
 
-  0%
+  0" "%
 
 
-  0,00%
+  0,00" "%
 
 
   [$öS-C07] #.##0;-[$öS-C07] #.##0
diff --git a/i18npool/source/localedata/data/de_DE.xml 
b/i18npool/source/localedata/data/de_DE.xml
index da88701..46f89a2 100644
--- a/i18npool/source/localedata/data/de_DE.xml
+++ b/i18npool/source/localedata/data/de_DE.xml
@@ -81,10 +81,10 @@
   ##0,00E+00
 
 
-  0%
+  0" "%
 
 
-  0,00%
+  0,00" "%
 
 
   #.##0 [$DM-407];-#.##0 [$DM-407]
diff --git a/i18npool/source/localedata/data/de_LU.xml 
b/i18npool/source/localedata/data/de_LU.xml
index 40e3b74..9d12a26

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

2016-06-06 Thread Noel Grandin 
 svl/source/items/slstitm.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3fff330558232ea8df6558117b60b781f98e9ff5
Author: Noel Grandin 
Date:   Mon Jun 6 13:19:04 2016 +0200

fix crash

introduced by commit 4d666f5092d7c4f2ece9702dda4d874e44cdc6f7
"tdf#89329: use shared_ptr for pImpl in slstitm"

Change-Id: I69da5a716f1e6c9f56e0be5a97182be9dd329abc

diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx
index 2419a1a..e66c4ae 100644
--- a/svl/source/items/slstitm.cxx
+++ b/svl/source/items/slstitm.cxx
@@ -81,7 +81,7 @@ SfxStringListItem::SfxStringListItem( sal_uInt16 which, 
SvStream& rStream ) :
 
 SfxStringListItem::SfxStringListItem( const SfxStringListItem& rItem ) :
 SfxPoolItem( rItem ),
-pImpl(rItem.pImpl.get())
+pImpl(rItem.pImpl)
 {
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

tdf50488 no assignee?

2016-06-06 Thread Winfried Donkers 
Hi Eike,

I noticed that you changed the cc of tdf50488 last Friday.
I also noticed now (I didn't get a message about it) that you are no longer the 
assignee of the bug report.
I think you were assignee because FINDB, SEARCHB and REPLACEB were on your to 
do list, but I may be mistaken.

Are you still intending to add the above?
Shall I put the renaming of (P)DURATION(_ADD) on my list?

Winfried

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

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

2016-06-06 Thread Stephan Bergmann 
 sfx2/source/doc/templatedlg.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5d9ea4129458a329c6f5b98b5c925f24b771f149
Author: Stephan Bergmann 
Date:   Mon Jun 6 13:31:48 2016 +0200

loplugin:defaultparams

Change-Id: Ib86c93a1858ef29323a1dd7b766497dde470b712

diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 9ba3b7c..fbd8967 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -1663,7 +1663,7 @@ 
SfxTemplateSelectionDlg::SfxTemplateSelectionDlg(vcl::Window* pParent):
 mpMoveButton->Hide();
 mpExportButton->Hide();
 mpCBXHideDlg->Show();
-mpCBXHideDlg->Check(true);
+mpCBXHideDlg->Check();
 
 mpLocalView->setOpenTemplateHdl(LINK(this,SfxTemplateSelectionDlg, 
OpenTemplateHdl));
 mpSearchView->setOpenTemplateHdl(LINK(this,SfxTemplateSelectionDlg, 
OpenTemplateHdl));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-06 Thread Stephan Bergmann 
 sw/source/uibase/sidebar/PageFormatPanel.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 69c997428b748357918994ae1b0e2dbd052687d0
Author: Stephan Bergmann 
Date:   Mon Jun 6 14:15:34 2016 +0200

loplugin:sallogareas

Change-Id: I76a1ca53ea51488f1338276042e1e435ed34f602

diff --git a/sw/source/uibase/sidebar/PageFormatPanel.cxx 
b/sw/source/uibase/sidebar/PageFormatPanel.cxx
index 46c92c2..8244738 100644
--- a/sw/source/uibase/sidebar/PageFormatPanel.cxx
+++ b/sw/source/uibase/sidebar/PageFormatPanel.cxx
@@ -220,7 +220,7 @@ FieldUnit PageFormatPanel::GetCurrentUnit( SfxItemState 
eState, const SfxPoolIte
 }
 else
 {
-SAL_WARN("sw.sidebar", "GetModuleFieldUnit(): no module 
found");
+SAL_WARN("sw.ui", "GetModuleFieldUnit(): no module found");
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-06 Thread Miklos Vajna 
 sw/source/uibase/inc/unodispatch.hxx |7 ++-
 sw/source/uibase/uno/unodispatch.cxx |   10 ++
 2 files changed, 16 insertions(+), 1 deletion(-)

New commits:
commit b0d819ac5667a07f629f2acb5d3c542fa76d348b
Author: Miklos Vajna 
Date:   Mon Jun 6 12:34:08 2016 +0200

SwXDispatchProviderInterceptor: implement frame::XInterceptorInfo

With this, framework::InterceptionHelper can make a better decision what
interceptor to call: it can avoid calling SwXDispatchProviderInterceptor
when the sw code would just call the previous interceptor anyway.

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

diff --git a/sw/source/uibase/inc/unodispatch.hxx 
b/sw/source/uibase/inc/unodispatch.hxx
index 0124c2e..d741151 100644
--- a/sw/source/uibase/inc/unodispatch.hxx
+++ b/sw/source/uibase/inc/unodispatch.hxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -35,7 +36,8 @@ class SwXDispatchProviderInterceptor : public 
cppu::WeakImplHelper
 <
 css::frame::XDispatchProviderInterceptor,
 css::lang::XEventListener,
-css::lang::XUnoTunnel
+css::lang::XUnoTunnel,
+css::frame::XInterceptorInfo
 >
 {
 class DispatchMutexLock_Impl
@@ -82,6 +84,9 @@ public:
 static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
 virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< 
sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) 
override;
 
+// XInterceptorInfo
+virtual css::uno::Sequence SAL_CALL getInterceptedURLs() throw 
(css::uno::RuntimeException, std::exception) override;
+
 // view destroyed
 voidInvalidate();
 };
diff --git a/sw/source/uibase/uno/unodispatch.cxx 
b/sw/source/uibase/uno/unodispatch.cxx
index 985f283..3335eeb 100644
--- a/sw/source/uibase/uno/unodispatch.cxx
+++ b/sw/source/uibase/uno/unodispatch.cxx
@@ -88,6 +88,16 @@ uno::Reference< frame::XDispatch > 
SwXDispatchProviderInterceptor::queryDispatch
 return xResult;
 }
 
+uno::Sequence SAL_CALL 
SwXDispatchProviderInterceptor::getInterceptedURLs() throw 
(uno::RuntimeException, std::exception)
+{
+uno::Sequence aRet =
+{
+ OUString(".uno:DataSourceBrowser/*")
+};
+
+return aRet;
+}
+
 uno::Sequence< uno::Reference< frame::XDispatch > > 
SwXDispatchProviderInterceptor::queryDispatches(
 const uno::Sequence< frame::DispatchDescriptor >& aDescripts ) 
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: include/sal

2016-06-06 Thread Noel Grandin 
 include/sal/log-areas.dox |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 94e6d9d0667781fc733bd18d7cf2b81d4a5366cb
Author: Noel Grandin 
Date:   Mon Jun 6 14:20:03 2016 +0200

loplugin:sallogareas

Change-Id: Id285f7b7f100f7bfd21ca786ef260243aad35825

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index cbb93eb..c7a97ce 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -470,6 +470,7 @@ certain functionality.
 @li @c sw.level2
 @li @c sw.mailmerge - Writer mail merge
 @li @c sw.rtf - .rtf export filter
+@li @c sw.sidebar
 @li @c sw.tiled
 @li @c sw.ui
 @li @c sw.uno - Writer UNO interfaces
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Gökhan Gurbetoğlu license statement

2016-06-06 Thread Gökhan Gurbetoğlu 
All of my past & future contributions to LibreOffice may be licensed 
under the MPLv2/LGPLv3+ dual license.

--
*Gökhan Gurbetoğlu*
gokhan.gurbeto...@pardus.org.tr 
pardus.org.tr 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 2 commits - framework/qa qadevOOo/runner qadevOOo/tests scripting/java swext/mediawiki wizards/com

2016-06-06 Thread Noel Grandin 
 framework/qa/complex/XTitle/CheckXTitle.java   
  |7 ---
 qadevOOo/runner/lib/MultiPropertyTest.java 
  |3 ---
 qadevOOo/tests/java/ifc/configuration/backend/_XMultiLayerStratum.java 
  |1 -
 qadevOOo/tests/java/ifc/task/_XInteractionHandler.java 
  |1 -
 
scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
 |1 -
 swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java  
  |1 -
 wizards/com/sun/star/wizards/document/OfficeDocument.java  
  |1 -
 7 files changed, 15 deletions(-)

New commits:
commit f4608bde584f9606781d12065a12e3683d6ea101
Author: Noel Grandin 
Date:   Mon Jun 6 14:26:05 2016 +0200

remove unused field

Change-Id: Ic8c9b50f496ee97da3f03af966005f28c37ff7e9

diff --git a/framework/qa/complex/XTitle/CheckXTitle.java 
b/framework/qa/complex/XTitle/CheckXTitle.java
index 7fa28a8..3e00864 100644
--- a/framework/qa/complex/XTitle/CheckXTitle.java
+++ b/framework/qa/complex/XTitle/CheckXTitle.java
@@ -60,7 +60,6 @@ public class CheckXTitle
 private static final String UNO_URL_FOR_PRINT_PREVIEW = 
".uno:PrintPreview";
 private static final String UNO_URL_FOR_CLOSING_PRINT_PREVIEW = 
".uno:ClosePreview";
 private static final String UNO_URL_FOR_CLOSING_DOC   = 
".uno:CloseWin";
-private static final String UNO_URL_FOR_READ_ONLY = 
".uno:OpenReadOnly";
 
 // members
 
commit 5f42a268c30c1feccc13fd0a08ac2f0ed54fdbac
Author: Noel Grandin 
Date:   Mon Jun 6 14:23:39 2016 +0200

remove unused imports in java code

Change-Id: I95041f49dd22ba9a15da3598b04a010eecf761a8

diff --git a/framework/qa/complex/XTitle/CheckXTitle.java 
b/framework/qa/complex/XTitle/CheckXTitle.java
index e798732..7fa28a8 100644
--- a/framework/qa/complex/XTitle/CheckXTitle.java
+++ b/framework/qa/complex/XTitle/CheckXTitle.java
@@ -22,7 +22,6 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.fail;
-import helper.URLHelper;
 import util.utils;
 
 import org.junit.After;
@@ -31,22 +30,17 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.openoffice.test.OfficeConnection;
-import org.openoffice.test.OfficeFileUrl;
-
 import com.sun.star.beans.PropertyValue;
 import com.sun.star.frame.Desktop;
-import com.sun.star.frame.FrameSearchFlag;
 import com.sun.star.frame.XComponentLoader;
 import com.sun.star.frame.XFrame2;
 import com.sun.star.frame.XModel;
 import com.sun.star.frame.XTitle;
 import com.sun.star.frame.XController;
-import com.sun.star.frame.XStorable;
 import com.sun.star.lang.XComponent;
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.util.URLTransformer;
-import com.sun.star.util.XCloseable;
 import com.sun.star.util.XURLTransformer;
 import com.sun.star.util.URL;
 import com.sun.star.frame.XDispatchProvider;
diff --git a/qadevOOo/runner/lib/MultiPropertyTest.java 
b/qadevOOo/runner/lib/MultiPropertyTest.java
index 2d5e067..a9e49be 100644
--- a/qadevOOo/runner/lib/MultiPropertyTest.java
+++ b/qadevOOo/runner/lib/MultiPropertyTest.java
@@ -23,11 +23,8 @@ import com.sun.star.beans.PropertyVetoException;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.beans.XPropertySetInfo;
 import com.sun.star.beans.UnknownPropertyException;
-import com.sun.star.lang.XServiceInfo;
 import com.sun.star.lang.IllegalArgumentException;
 import com.sun.star.lang.WrappedTargetException;
-import com.sun.star.uno.UnoRuntime;
-
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
diff --git 
a/qadevOOo/tests/java/ifc/configuration/backend/_XMultiLayerStratum.java 
b/qadevOOo/tests/java/ifc/configuration/backend/_XMultiLayerStratum.java
index f4e0777..c0b7c43 100644
--- a/qadevOOo/tests/java/ifc/configuration/backend/_XMultiLayerStratum.java
+++ b/qadevOOo/tests/java/ifc/configuration/backend/_XMultiLayerStratum.java
@@ -20,7 +20,6 @@ package ifc.configuration.backend;
 import com.sun.star.configuration.backend.XLayer;
 import com.sun.star.configuration.backend.XMultiLayerStratum;
 import com.sun.star.configuration.backend.XUpdatableLayer;
-import com.sun.star.uno.Exception;
 import lib.MultiMethodTest;
 
 import util.XLayerHandlerImpl;
diff --git a/qadevOOo/tests/java/ifc/task/_XInteractionHandler.java 
b/qadevOOo/tests/java/ifc/task/_XInteractionHandler.java
index 4967910..d36cc58 100644
--- a/qadevOOo/tests/java/ifc/task/_XInteractionHandler.java
+++ b/qadevOOo/tests/java/ifc/task/_XInteractionHandler.java
@@ -36,7 +36,6 @@ import lib.MultiMethodTest;
 import lib.Status;
 
 import com.sun.star.task.XInteractionHandler;
-import com.sun.star.task.XInteractionRequest;
 
 /**

[Libreoffice-commits] core.git: Branch 'feature/fixes23' -

2016-06-06 Thread László Németh 
 0 files changed

New commits:
commit bc32c382c1815f57cd2c5348ab86f356b7764e80
Author: László Németh 
Date:   Mon Jun 6 14:27:29 2016 +0200

empty commit (new tests)

Change-Id: I165444ef13ada5ca382b3b570587c3d7159150d5
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-06 Thread Stephan Bergmann 
 sc/qa/unit/copy_paste_test.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9321b5288d2263247b0c089151a31aeba8e1a0d3
Author: Stephan Bergmann 
Date:   Mon Jun 6 14:30:47 2016 +0200

loplugin:simplifybool

Change-Id: I38d30d086bfd819eab806696aa4c9ad830667113

diff --git a/sc/qa/unit/copy_paste_test.cxx b/sc/qa/unit/copy_paste_test.cxx
index 0e9addf..8f7b959 100644
--- a/sc/qa/unit/copy_paste_test.cxx
+++ b/sc/qa/unit/copy_paste_test.cxx
@@ -208,7 +208,7 @@ void ScCopyPasteTest::testTdf84411()
 CPPUNIT_ASSERT(pModel != nullptr);
 bool bOpenCLState = ScCalcConfig::isOpenCLEnabled();
 pModel->enableOpenCL(false);
-CPPUNIT_ASSERT(ScCalcConfig::isOpenCLEnabled() == false);
+CPPUNIT_ASSERT(!ScCalcConfig::isOpenCLEnabled());
 pModel->enableAutomaticCalculation(true);
 CPPUNIT_ASSERT( ScCalcConfig::isSwInterpreterEnabled() );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/sal

2016-06-06 Thread Stephan Bergmann 
 include/sal/log-areas.dox |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 2562d39d56bb48df3fb7daf8365ef93ff5f0dfdb
Author: Stephan Bergmann 
Date:   Mon Jun 6 14:47:32 2016 +0200

Revert "loplugin:sallogareas"

This reverts commit 94e6d9d0667781fc733bd18d7cf2b81d4a5366cb, which wasn't
necessary after 69c997428b748357918994ae1b0e2dbd052687d0 
"loplugin:sallogareas".

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index c7a97ce..cbb93eb 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -470,7 +470,6 @@ certain functionality.
 @li @c sw.level2
 @li @c sw.mailmerge - Writer mail merge
 @li @c sw.rtf - .rtf export filter
-@li @c sw.sidebar
 @li @c sw.tiled
 @li @c sw.ui
 @li @c sw.uno - Writer UNO interfaces
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-06 Thread Miklos Vajna 
 sw/source/uibase/inc/unodispatch.hxx |7 ++-
 sw/source/uibase/uno/unodispatch.cxx |   10 ++
 2 files changed, 16 insertions(+), 1 deletion(-)

New commits:
commit 651eea40e6fa80ec0a64adaa0d6ff42bee829dd4
Author: Miklos Vajna 
Date:   Mon Jun 6 12:34:08 2016 +0200

SwXDispatchProviderInterceptor: implement frame::XInterceptorInfo

With this, framework::InterceptionHelper can make a better decision what
interceptor to call: it can avoid calling SwXDispatchProviderInterceptor
when the sw code would just call the previous interceptor anyway.

Reviewed-on: https://gerrit.libreoffice.org/25961
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 
(cherry picked from commit b0d819ac5667a07f629f2acb5d3c542fa76d348b)

Conflicts:
sw/source/uibase/inc/unodispatch.hxx

Change-Id: I92897f2c8baa264dc9ccbc11b63f415da30a910d

diff --git a/sw/source/uibase/inc/unodispatch.hxx 
b/sw/source/uibase/inc/unodispatch.hxx
index 3871d3c..952fc75 100644
--- a/sw/source/uibase/inc/unodispatch.hxx
+++ b/sw/source/uibase/inc/unodispatch.hxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -35,7 +36,8 @@ class SwXDispatchProviderInterceptor : public 
cppu::WeakImplHelper
 <
 ::com::sun::star::frame::XDispatchProviderInterceptor,
 ::com::sun::star::lang::XEventListener,
-::com::sun::star::lang::XUnoTunnel
+::com::sun::star::lang::XUnoTunnel,
+::com::sun::star::frame::XInterceptorInfo
 >
 {
 class DispatchMutexLock_Impl
@@ -83,6 +85,9 @@ public:
 static const ::com::sun::star::uno::Sequence< sal_Int8 > & 
getUnoTunnelId();
 virtual sal_Int64 SAL_CALL getSomething( const 
::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) 
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
+// XInterceptorInfo
+virtual css::uno::Sequence SAL_CALL getInterceptedURLs() throw 
(css::uno::RuntimeException, std::exception) override;
+
 // view destroyed
 voidInvalidate();
 };
diff --git a/sw/source/uibase/uno/unodispatch.cxx 
b/sw/source/uibase/uno/unodispatch.cxx
index 07f783a..ffd41e8 100644
--- a/sw/source/uibase/uno/unodispatch.cxx
+++ b/sw/source/uibase/uno/unodispatch.cxx
@@ -88,6 +88,16 @@ uno::Reference< frame::XDispatch > 
SwXDispatchProviderInterceptor::queryDispatch
 return xResult;
 }
 
+uno::Sequence SAL_CALL 
SwXDispatchProviderInterceptor::getInterceptedURLs() throw 
(uno::RuntimeException, std::exception)
+{
+uno::Sequence aRet =
+{
+ OUString(".uno:DataSourceBrowser/*")
+};
+
+return aRet;
+}
+
 uno::Sequence< uno::Reference< frame::XDispatch > > 
SwXDispatchProviderInterceptor::queryDispatches(
 const uno::Sequence< frame::DispatchDescriptor >& aDescripts ) 
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: 7 commits - connectivity/source filter/source include/filter lotuswordpro/source sc/source vcl/source

2016-06-06 Thread Michael Stahl 
 connectivity/source/drivers/dbase/DIndex.cxx  |   32 
 connectivity/source/drivers/dbase/DIndexes.cxx|2 
 connectivity/source/drivers/dbase/DTable.cxx  |   11 +
 connectivity/source/inc/dbase/DIndex.hxx  |2 
 filter/source/graphicfilter/itga/itga.cxx |   11 +
 filter/source/msfilter/svdfppt.cxx|1 
 include/filter/msfilter/svdfppt.hxx   |4 
 lotuswordpro/source/filter/lwpsdwfileloader.cxx   |2 
 lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx |   26 +--
 sc/source/filter/starcalc/scflt.cxx   |   14 +
 vcl/source/filter/sgfbram.cxx |  130 +++---
 vcl/source/filter/sgvmain.cxx |   26 +--
 12 files changed, 144 insertions(+), 117 deletions(-)

New commits:
commit 1bf3cafd4cd6c3133adaad764e4f216a5d0ead1c
Author: Michael Stahl 
Date:   Mon Jun 6 13:56:43 2016 +0200

sc: StarCalc/DOS import: fix an endian issue

Change-Id: I0f76661d1aec104ee7e22a8abd5f734553796c33

diff --git a/sc/source/filter/starcalc/scflt.cxx 
b/sc/source/filter/starcalc/scflt.cxx
index 0d7f37c..44088e3 100644
--- a/sc/source/filter/starcalc/scflt.cxx
+++ b/sc/source/filter/starcalc/scflt.cxx
@@ -1021,7 +1021,19 @@ void Sc10Import::LoadFileInfo()
 void Sc10Import::LoadEditStateInfo()
 {
 Sc10EditStateInfo EditStateInfo;
-rStream.Read(&EditStateInfo, sizeof(EditStateInfo));
+
+sal_uInt64 const nOldPos(rStream.Tell());
+
+rStream.ReadUInt16(EditStateInfo.CarretX);
+rStream.ReadUInt16(EditStateInfo.CarretY);
+rStream.ReadUInt16(EditStateInfo.CarretZ);
+rStream.ReadUInt16(EditStateInfo.DeltaX);
+rStream.ReadUInt16(EditStateInfo.DeltaY);
+rStream.ReadUInt16(EditStateInfo.DeltaZ);
+rStream.ReadUChar(EditStateInfo.DataBaseMode);
+rStream.Read(EditStateInfo.Reserved, sizeof(EditStateInfo.Reserved));
+
+assert(rStream.GetError() || rStream.Tell() == nOldPos + 
sizeof(Sc10EditStateInfo));
 
 nError = rStream.GetError();
 nShowTab = static_cast(EditStateInfo.DeltaZ);
commit da4f7d5d76e054627b61521657d40141b9728e15
Author: Michael Stahl 
Date:   Fri Jun 3 23:50:14 2016 +0200

filter: "tga" import: fix some endian issues in ImplReadPalette

Change-Id: Ia8ec7b7e19cf9b6b19497cbd77ae5a4e2fdccee7

diff --git a/filter/source/graphicfilter/itga/itga.cxx 
b/filter/source/graphicfilter/itga/itga.cxx
index 20a9006..6bf858c 100644
--- a/filter/source/graphicfilter/itga/itga.cxx
+++ b/filter/source/graphicfilter/itga/itga.cxx
@@ -734,14 +734,21 @@ bool TGAReader::ImplReadPalette()
 break;
 
 case 32 :
-m_rTGA.Read( mpColorMap, 4 * nColors );
+for (sal_uInt16 i = 0; i < nColors; i++)
+{
+m_rTGA.ReadUInt32(mpColorMap[i]);
+}
 break;
 
 case 24 :
 {
 for ( sal_uLong i = 0; i < nColors; i++ )
 {
-m_rTGA.Read( &mpColorMap[ i ], 3 );
+sal_uInt8 nBlue;
+sal_uInt8 nGreen;
+sal_uInt8 nRed;
+
m_rTGA.ReadUChar(nBlue).ReadUChar(nGreen).ReadUChar(nRed);
+mpColorMap[i] = (nRed << 16) | (nGreen << 8) | nBlue;
 }
 }
 break;
commit 3e9aa8b2b29f5222d93ace0e02207fe3bd7d853f
Author: Michael Stahl 
Date:   Fri Jun 3 23:28:10 2016 +0200

lotuswordpro: fix some endian issues

Change-Id: I224c2d894071d6ec7d0afd5e2780a42b842aa32e

diff --git a/lotuswordpro/source/filter/lwpsdwfileloader.cxx 
b/lotuswordpro/source/filter/lwpsdwfileloader.cxx
index b30097a..ac2687a 100644
--- a/lotuswordpro/source/filter/lwpsdwfileloader.cxx
+++ b/lotuswordpro/source/filter/lwpsdwfileloader.cxx
@@ -84,7 +84,7 @@ void LwpSdwFileLoader::CreateDrawObjects(std::vector< 
rtl::Reference >*
 if (BinSignature[0] == 'S' && BinSignature[1] == 'M')
 {
 unsigned short nVersion;
-m_pStream->Read(&nVersion,2);
+m_pStream->ReadUInt16(nVersion);
 
 m_pStream->Seek(0);
 if (nVersion<0x0102)
diff --git a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx 
b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx
index de653c5..6d134a0 100644
--- a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx
+++ b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx
@@ -106,7 +106,7 @@ void LwpSdwGroupLoaderV0102::BeginDrawObjects(std::vector< 
rtl::ReferenceRead(&nVersion,2);
+m_pStream->ReadUInt16(nVersion);
 if (nVersion<0x0102)
 {
 assert(false);
@@ -116,15 +116,15 @@ void 
LwpSdwGroupLoaderV0102::BeginDrawObjects(std::vector< rtl::ReferenceSeekRel(4);
 //record count
 unsigned short nRecCount;
-m_pStream->Read(&nRecCount,2);
+m_pStream->ReadUInt16(nRecCount);
 // selCount

[Libreoffice-commits] core.git: include/com

2016-06-06 Thread Stephan Bergmann 
 include/com/sun/star/uno/Any.h   |5 +
 include/com/sun/star/uno/Any.hxx |   33 +
 2 files changed, 38 insertions(+)

New commits:
commit 0fbe22a77289a624e1346ab457734c2f64f8e6fb
Author: Stephan Bergmann 
Date:   Mon Jun 6 15:05:16 2016 +0200

css::uno::Any move semantics (for LIBO_INTERNAL_ONLY)

Change-Id: Ib582a744321e0f209395651ac2edffe30152ffba

diff --git a/include/com/sun/star/uno/Any.h b/include/com/sun/star/uno/Any.h
index 26127f4..d6c7477 100644
--- a/include/com/sun/star/uno/Any.h
+++ b/include/com/sun/star/uno/Any.h
@@ -135,6 +135,11 @@ public:
 */
 inline Any & SAL_CALL operator = ( const Any & rAny );
 
+#if defined LIBO_INTERNAL_ONLY
+inline Any(Any && other);
+inline Any & operator =(Any && other);
+#endif
+
 /** Gets the type of the set value.
 
 @return a Type object of the set value
diff --git a/include/com/sun/star/uno/Any.hxx b/include/com/sun/star/uno/Any.hxx
index 8859fa7..1e1f24e 100644
--- a/include/com/sun/star/uno/Any.hxx
+++ b/include/com/sun/star/uno/Any.hxx
@@ -21,6 +21,7 @@
 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -120,6 +121,38 @@ inline Any & Any::operator = ( const Any & rAny )
 return *this;
 }
 
+#if defined LIBO_INTERNAL_ONLY
+
+namespace detail {
+
+inline void moveAnyInternals(Any & from, Any & to) {
+uno_any_construct(&to, nullptr, nullptr, &cpp_acquire);
+std::swap(from.pType, to.pType);
+std::swap(from.pData, to.pData);
+std::swap(from.pReserved, to.pReserved);
+if (to.pData == &from.pReserved) {
+to.pData = &to.pReserved;
+}
+// This leaves to.pData (where "to" is now VOID) dangling to somewhere (cf.
+// CONSTRUCT_EMPTY_ANY, cppu/source/uno/prim.hxx), but what's relevant is
+// only that it isn't a nullptr (as e.g. >>= -> uno_type_assignData ->
+// _assignData takes a null pSource to mean "construct a default value").
+}
+
+}
+
+Any::Any(Any && other) {
+detail::moveAnyInternals(other, *this);
+}
+
+Any & Any::operator =(Any && other) {
+uno_any_destruct(this, &cpp_release);
+detail::moveAnyInternals(other, *this);
+return *this;
+}
+
+#endif
+
 inline ::rtl::OUString Any::getValueTypeName() const
 {
 return ::rtl::OUString( pType->pTypeName );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Alexis PAQUIN license statement

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

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

2016-06-06 Thread Stephan Bergmann 
 vcl/source/filter/sgfbram.cxx |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit 77a64e38637de0332f9f4ccf968bdd246f0b36eb
Author: Stephan Bergmann 
Date:   Mon Jun 6 15:12:50 2016 +0200

-Werror=unused-variable

Change-Id: I173624a5740ae01b33138eeaa25b9d79ecd22d59

diff --git a/vcl/source/filter/sgfbram.cxx b/vcl/source/filter/sgfbram.cxx
index 98644cd..b7825d9 100644
--- a/vcl/source/filter/sgfbram.cxx
+++ b/vcl/source/filter/sgfbram.cxx
@@ -35,7 +35,9 @@ SgfHeader::SgfHeader()
 
 SvStream& ReadSgfHeader(SvStream& rIStream, SgfHeader& rHead)
 {
+#if !defined NDEBUG
 sal_uInt64 const nOldPos(rIStream.Tell());
+#endif
 rIStream.ReadUInt16(rHead.Magic);
 rIStream.ReadUInt16(rHead.Version);
 rIStream.ReadUInt16(rHead.Typ);
@@ -66,7 +68,9 @@ SgfEntry::SgfEntry()
 
 SvStream& ReadSgfEntry(SvStream& rIStream, SgfEntry& rEntr)
 {
+#if !defined NDEBUG
 sal_uInt64 const nOldPos(rIStream.Tell());
+#endif
 rIStream.ReadUInt16(rEntr.Typ);
 rIStream.ReadUInt16(rEntr.iFrei);
 rIStream.ReadUInt16(rEntr.lFreiLo);
@@ -83,7 +87,9 @@ sal_uInt32 SgfEntry::GetOffset()
 
 SvStream& ReadSgfVector(SvStream& rIStream, SgfVector& rVect)
 {
+#if !defined NDEBUG
 sal_uInt64 const nOldPos(rIStream.Tell());
+#endif
 rIStream.ReadUInt16(rVect.Flag);
 rIStream.ReadInt16(rVect.x);
 rIStream.ReadInt16(rVect.y);
@@ -95,7 +101,9 @@ SvStream& ReadSgfVector(SvStream& rIStream, SgfVector& rVect)
 
 SvStream& WriteBmpFileHeader(SvStream& rOStream, BmpFileHeader& rHead)
 {
+#if !defined NDEBUG
 sal_uInt64 const nOldPos(rOStream.Tell());
+#endif
 rOStream.WriteUInt16(rHead.Typ);
 rOStream.WriteUInt16(rHead.SizeLo);
 rOStream.WriteUInt16(rHead.SizeHi);
@@ -126,7 +134,9 @@ sal_uInt32 BmpFileHeader::GetOfs()
 
 SvStream& WriteBmpInfoHeader(SvStream& rOStream, BmpInfoHeader& rInfo)
 {
+#if !defined NDEBUG
 sal_uInt64 const nOldPos(rOStream.Tell());
+#endif
 rOStream.WriteUInt32(rInfo.Size);
 rOStream.WriteInt32(rInfo.Width);
 rOStream.WriteInt32(rInfo.Hight);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-06 Thread Xisco Fauli 
 include/sfx2/querystatus.hxx|4 ++--
 sfx2/source/control/querystatus.cxx |6 ++
 2 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit f6d6a9c26448996498ec2a19c9ec64e6056a82f8
Author: Xisco Fauli 
Date:   Sun Jun 5 00:28:22 2016 +0200

tdf#89329: use rtl::Reference for pImpl in querystatus

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

diff --git a/include/sfx2/querystatus.hxx b/include/sfx2/querystatus.hxx
index 4f7f5b58..5422331 100644
--- a/include/sfx2/querystatus.hxx
+++ b/include/sfx2/querystatus.hxx
@@ -30,6 +30,7 @@
 #include 
 
 #include 
+#include 
 
 class SfxQueryStatus_Impl;
 class SFX2_DLLPUBLIC SfxQueryStatus
@@ -45,8 +46,7 @@ class SFX2_DLLPUBLIC SfxQueryStatus
 SfxQueryStatus( const SfxQueryStatus& ) = delete;
 SfxQueryStatus& operator=( const SfxQueryStatus& ) = delete;
 
-css::uno::Reference< css::frame::XStatusListener >   m_xStatusListener;
-SfxQueryStatus_Impl* 
m_pSfxQueryStatusImpl;
+rtl::Reference< SfxQueryStatus_Impl >   m_pImpl;
 };
 
 #endif // INCLUDED_SFX2_QUERYSTATUS_HXX
diff --git a/sfx2/source/control/querystatus.cxx 
b/sfx2/source/control/querystatus.cxx
index 2f939a7..2fd76fd 100644
--- a/sfx2/source/control/querystatus.cxx
+++ b/sfx2/source/control/querystatus.cxx
@@ -205,10 +205,8 @@ SfxItemState SfxQueryStatus_Impl::QueryState( 
SfxPoolItem*& rpPoolItem )
 
 
 SfxQueryStatus::SfxQueryStatus( const Reference< XDispatchProvider >& 
rDispatchProvider, sal_uInt16 nSlotId, const OUString& rCommand )
+: m_pImpl(new SfxQueryStatus_Impl( rDispatchProvider, nSlotId, rCommand ))
 {
-m_pSfxQueryStatusImpl = new SfxQueryStatus_Impl( rDispatchProvider, 
nSlotId, rCommand );
-m_xStatusListener.set( static_cast< cppu::OWeakObject* >( 
m_pSfxQueryStatusImpl ),
-   UNO_QUERY );
 }
 
 SfxQueryStatus::~SfxQueryStatus()
@@ -218,7 +216,7 @@ SfxQueryStatus::~SfxQueryStatus()
 SfxItemState SfxQueryStatus::QueryState( SfxPoolItem*& rpPoolItem )
 {
 SolarMutexGuard aGuard;
-return m_pSfxQueryStatusImpl->QueryState( rpPoolItem );
+return m_pImpl->QueryState( rpPoolItem );
 }
 
 /* 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: connectivity/source

2016-06-06 Thread Stephan Bergmann 
 connectivity/source/drivers/dbase/DIndex.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6bd1465395064f60c4ac45bbd79571149a702d0b
Author: Stephan Bergmann 
Date:   Mon Jun 6 15:27:23 2016 +0200

loplugin:sallogareas

Change-Id: I32a1b278643ab54dd16966d0e41f3cee0bafb024

diff --git a/connectivity/source/drivers/dbase/DIndex.cxx 
b/connectivity/source/drivers/dbase/DIndex.cxx
index 0a6e225..d5470de 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -391,7 +391,7 @@ SvStream& connectivity::dbase::WriteODbaseIndex(SvStream 
&rStream, ODbaseIndex&
 rStream.WriteUChar(rIndex.m_aHeader.db_unique);
 rStream.Write(&rIndex.m_aHeader.db_name, 488);
 assert(rStream.GetError() || rStream.Tell() == nOldPos + DINDEX_PAGE_SIZE);
-SAL_WARN_IF(rStream.GetError(), "connectivity.dbase", "write error");
+SAL_WARN_IF(rStream.GetError(), "connectivity.drivers", "write error");
 return rStream;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

GSoC Weekly Report #2 - Table Styles

2016-06-06 Thread Jakub Trzebiatowski 

Dear Community,

This was the second week. This week I was working on:

- added table-template property to an existing table UNO API
  https://gerrit.libreoffice.org/#/c/25688/
- basic export of a table-template. However it appeared it is too early 
to do

  that.
- fixed a fdo47267 import crash which I introduced last week
  https://gerrit.libreoffice.org/#/c/25887/
- working on Cell Styles UNO family. Still have to resolve doubts. How and
  where will be unassigned Cell Styles stored.
  https://gerrit.libreoffice.org/#/c/25896/2

Plans for this week:
- finish Cell Styles UNO family
- research, and try to do a proper, basic table-template export
- I'll have two exams this week, so I'll have to skip a day or two

If you have any remarks and/or suggestions, please share.

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

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

2016-06-06 Thread Michael Stahl 
 connectivity/source/drivers/dbase/DIndex.cxx |7 ---
 connectivity/source/drivers/dbase/DTable.cxx |2 ++
 sc/source/filter/starcalc/scflt.cxx  |2 ++
 svx/source/dialog/crashreportdlg.cxx |   12 
 4 files changed, 8 insertions(+), 15 deletions(-)

New commits:
commit 55a07417c8df1f451cac33d5dfc6a2ef450fa544
Author: Michael Stahl 
Date:   Mon Jun 6 15:13:44 2016 +0200

svx: -Werror=unused-function

Change-Id: Ifa7e36e44ac1f2bdfb91e9b4bf29e7436dc68509

diff --git a/svx/source/dialog/crashreportdlg.cxx 
b/svx/source/dialog/crashreportdlg.cxx
index 00dcedd..8cb5c29 100644
--- a/svx/source/dialog/crashreportdlg.cxx
+++ b/svx/source/dialog/crashreportdlg.cxx
@@ -48,18 +48,6 @@ void CrashReportDialog::dispose()
 Dialog::dispose();
 }
 
-namespace {
-
-OUString getLibDir()
-{
-OUString aOriginal = "$BRAND_BASE_DIR/" LIBO_LIBEXEC_FOLDER;
-rtl::Bootstrap::expandMacros(aOriginal);
-
-return aOriginal;
-}
-
-}
-
 IMPL_LINK_TYPED(CrashReportDialog, BtnHdl, Button*, pBtn, void)
 {
 if (pBtn == mpBtnSend.get())
commit 296125b0bf28af9ec6f0ab1459b392e26ed3eb3f
Author: Michael Stahl 
Date:   Mon Jun 6 15:19:44 2016 +0200

connectivity: -Werror=unused-variable

Change-Id: Idaef923205a5f21d7c4c84cc74d3a369107f7325

diff --git a/connectivity/source/drivers/dbase/DIndex.cxx 
b/connectivity/source/drivers/dbase/DIndex.cxx
index d5470de..423fd3a 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -352,7 +352,9 @@ ONDXPage* ODbaseIndex::CreatePage(sal_uInt32 nPagePos, 
ONDXPage* pParent, bool b
 void connectivity::dbase::ReadHeader(
 SvStream & rStream, ODbaseIndex::NDXHeader & rHeader)
 {
+#if !defined(NDEBUG)
 sal_uInt64 const nOldPos(rStream.Tell());
+#endif
 rStream.ReadUInt32(rHeader.db_rootpage);
 rStream.ReadUInt32(rHeader.db_pagecount);
 rStream.Read(&rHeader.db_frei, 4);
@@ -379,7 +381,6 @@ SvStream& connectivity::dbase::operator >> (SvStream 
&rStream, ODbaseIndex& rInd
 SvStream& connectivity::dbase::WriteODbaseIndex(SvStream &rStream, 
ODbaseIndex& rIndex)
 {
 rStream.Seek(0);
-sal_uInt64 const nOldPos(rStream.Tell());
 rStream.WriteUInt32(rIndex.m_aHeader.db_rootpage);
 rStream.WriteUInt32(rIndex.m_aHeader.db_pagecount);
 rStream.Write(&rIndex.m_aHeader.db_frei, 4);
@@ -390,8 +391,8 @@ SvStream& connectivity::dbase::WriteODbaseIndex(SvStream 
&rStream, ODbaseIndex&
 rStream.Write(&rIndex.m_aHeader.db_frei1, 3);
 rStream.WriteUChar(rIndex.m_aHeader.db_unique);
 rStream.Write(&rIndex.m_aHeader.db_name, 488);
-assert(rStream.GetError() || rStream.Tell() == nOldPos + DINDEX_PAGE_SIZE);
-SAL_WARN_IF(rStream.GetError(), "connectivity.drivers", "write error");
+assert(rStream.GetError() || rStream.Tell() == DINDEX_PAGE_SIZE);
+SAL_WARN_IF(rStream.GetError(), "connectivity.dbase", "write error");
 return rStream;
 }
 
diff --git a/connectivity/source/drivers/dbase/DTable.cxx 
b/connectivity/source/drivers/dbase/DTable.cxx
index 95c65ca..7dce6fe 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -323,7 +323,9 @@ void ODbaseTable::fillColumns()
 for (; i < nFieldCount; i++)
 {
 DBFColumn aDBFColumn;
+#if !defined(NDEBUG)
 sal_uInt64 const nOldPos(m_pFileStream->Tell());
+#endif
 m_pFileStream->Read(aDBFColumn.db_fnm, 11);
 m_pFileStream->ReadUChar(aDBFColumn.db_typ);
 m_pFileStream->ReadUInt32(aDBFColumn.db_adr);
commit 722f6109296e115f56281bae548f809ef60327c2
Author: Michael Stahl 
Date:   Mon Jun 6 15:17:14 2016 +0200

sc: -Werror=unused-variable

Change-Id: Ife22868a5bdc41b5c30bbd187f207998791487eb

diff --git a/sc/source/filter/starcalc/scflt.cxx 
b/sc/source/filter/starcalc/scflt.cxx
index 44088e3..b4309cc 100644
--- a/sc/source/filter/starcalc/scflt.cxx
+++ b/sc/source/filter/starcalc/scflt.cxx
@@ -1022,7 +1022,9 @@ void Sc10Import::LoadEditStateInfo()
 {
 Sc10EditStateInfo EditStateInfo;
 
+#if !defined(NDEBUG)
 sal_uInt64 const nOldPos(rStream.Tell());
+#endif
 
 rStream.ReadUInt16(EditStateInfo.CarretX);
 rStream.ReadUInt16(EditStateInfo.CarretY);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basctl/source include/sfx2 sc/source sd/source sfx2/source starmath/source sw/source

2016-06-06 Thread Noel Grandin 
 basctl/source/basicide/basicmod.hxx |2 
 include/sfx2/module.hxx |7 --
 sc/source/ui/app/scmod.cxx  |2 
 sd/source/ui/app/sdmod.cxx  |2 
 sfx2/source/appl/module.cxx |  105 ++--
 starmath/source/smmod.cxx   |2 
 sw/source/uibase/app/swmodule.cxx   |2 
 7 files changed, 38 insertions(+), 84 deletions(-)

New commits:
commit dfa8ecef62f4f55aa614013a80ad9aeb61a4fdac
Author: Noel Grandin 
Date:   Mon Jun 6 13:25:46 2016 +0200

Revert "Revert "Simplify sfx2 removing SfxModuleArr_Impl and dummy 
SfxModule flag""

This reverts commit abde31a2bc68302e1afafe1fcc3f5d85369010f8.

Since my analysis was completely incorrect, and the bug was elsewhere.

diff --git a/basctl/source/basicide/basicmod.hxx 
b/basctl/source/basicide/basicmod.hxx
index f462927..b52a1c7 100644
--- a/basctl/source/basicide/basicmod.hxx
+++ b/basctl/source/basicide/basicmod.hxx
@@ -31,7 +31,7 @@ class Module : public SfxModule
 static Module* mpModule;
 public:
 Module ( ResMgr *pMgr, SfxObjectFactory *pObjFact) :
-SfxModule( pMgr, false, pObjFact, nullptr )
+SfxModule( pMgr, pObjFact, nullptr )
 { }
 public:
 static Module*& Get () { return mpModule; }
diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx
index 6e10d7c..7871675 100644
--- a/include/sfx2/module.hxx
+++ b/include/sfx2/module.hxx
@@ -35,7 +35,6 @@ class SfxObjectFactory;
 class ModalDialog;
 class SfxObjectFactory;
 class SfxModule;
-class SfxModuleArr_Impl;
 class SfxModule_Impl;
 class SfxSlotPool;
 struct SfxChildWinContextFactory;
@@ -54,7 +53,6 @@ class SFX2_DLLPUBLIC SfxModule : public SfxShell
 {
 private:
 ResMgr* pResMgr;
-boolbDummy : 1;
 SfxModule_Impl* pImpl;
 
 SAL_DLLPRIVATE void Construct_Impl();
@@ -68,8 +66,7 @@ private:
 
 public:
 
-SfxModule( ResMgr* pMgrP, bool bDummy,
-SfxObjectFactory* pFactoryP, ... );
+SfxModule( ResMgr* pMgrP, SfxObjectFactory* 
pFactoryP, ... );
 virtual ~SfxModule();
 
 ResMgr* GetResMgr();
@@ -96,7 +93,7 @@ public:
 static FieldUnitGetModuleFieldUnit( css::uno::Reference< 
css::frame::XFrame > const & i_frame );
 FieldUnit   GetFieldUnit() const;
 
-SAL_DLLPRIVATE static SfxModuleArr_Impl& GetModules_Impl();
+SAL_DLLPRIVATE static std::vector& GetModules_Impl();
 SAL_DLLPRIVATE static void DestroyModules_Impl();
 SAL_DLLPRIVATE SfxTbxCtrlFactArr_Impl* GetTbxCtrlFactories_Impl() const;
 SAL_DLLPRIVATE SfxStbCtrlFactArr_Impl* GetStbCtrlFactories_Impl() const;
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 359fb23..c45480f 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -130,7 +130,7 @@ void ScModule::InitInterface_Impl()
 }
 
 ScModule::ScModule( SfxObjectFactory* pFact ) :
-SfxModule( ResMgr::CreateResMgr( "sc" ), false, pFact, nullptr ),
+SfxModule( ResMgr::CreateResMgr( "sc" ), pFact, nullptr ),
 aIdleTimer("sc ScModule IdleTimer"),
 aSpellIdle("sc ScModule SpellIdle"),
 mpDragData(new ScDragData),
diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx
index 59f62db..9b54068 100644
--- a/sd/source/ui/app/sdmod.cxx
+++ b/sd/source/ui/app/sdmod.cxx
@@ -67,7 +67,7 @@ void SdModule::InitInterface_Impl()
 
 // Ctor
 SdModule::SdModule(SfxObjectFactory* pFact1, SfxObjectFactory* pFact2 )
-:   SfxModule( ResMgr::CreateResMgr("sd"), false,
+:   SfxModule( ResMgr::CreateResMgr("sd"),
   pFact1, pFact2, nullptr ),
 pTransferClip(nullptr),
 pTransferDrag(nullptr),
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index 2cedda8..bb1730d 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.cxx
@@ -42,41 +42,7 @@
 #include "childwinimpl.hxx"
 #include 
 
-class SfxModuleArr_Impl
-{
-typedef ::std::vector DataType;
-DataType maData;
-public:
-
-typedef DataType::iterator iterator;
-
-iterator begin()
-{
-return maData.begin();
-}
-
-void erase( const iterator& it )
-{
-maData.erase(it);
-}
-
-SfxModule* operator[] ( size_t i )
-{
-return maData[i];
-}
-
-void push_back( SfxModule* p )
-{
-maData.push_back(p);
-}
-
-size_t size() const
-{
-return maData.size();
-}
-};
-
-static SfxModuleArr_Impl* pModules=nullptr;
+static std::vector* pModules=nullptr;
 
 class SfxModule_Impl
 {
@@ -136,9 +102,8 @@ ResMgr* SfxModule::GetResMgr()
 return pResMgr;
 }
 
-SfxModule::SfxModule( ResMgr* pMgrP, bool bDummyP,
-  SfxObjectFactory* pFactoryP, ... )
-: pResMgr( pMgrP ), bDummy( bDummyP ), pImpl(nullptr)
+SfxModule::SfxModule( ResMgr* pMg

[Libreoffice-commits] core.git: include/sal

2016-06-06 Thread Michael Stahl 
 include/sal/log-areas.dox |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 106bcf136892944d9430ffa70d21de641bb1
Author: Michael Stahl 
Date:   Mon Jun 6 15:31:13 2016 +0200

loplugin:sallogareas

Change-Id: Id9204f2499bd995f36c5962da56a6d486fe4ca59

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index cbb93eb..06da4f8 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -72,7 +72,8 @@ certain functionality.
 
 @li @c connectivity.commontools
 @li @c connectivity.cpool
-@li @c connectivity.drivers
+@li @c connectivity.drivers - a bit overly general, maybe it should be removed?
+@li @c connectivity.dbase
 @li @c connectivity.evoab2
 @li @c connectivity.firebird
 @li @c connectivity.flat
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-06 Thread Miklos Vajna 
 sw/source/core/bastyp/swcache.cxx |  158 +++---
 sw/source/core/inc/swcache.hxx|   22 ++---
 2 files changed, 90 insertions(+), 90 deletions(-)

New commits:
commit 07f5d9839fc28343447b2879a3ccf138bd025544
Author: Miklos Vajna 
Date:   Mon Jun 6 09:11:48 2016 +0200

sw: prefix members of SwCache

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

diff --git a/sw/source/core/bastyp/swcache.cxx 
b/sw/source/core/bastyp/swcache.cxx
index 9eef25f..c1efc78 100644
--- a/sw/source/core/bastyp/swcache.cxx
+++ b/sw/source/core/bastyp/swcache.cxx
@@ -27,36 +27,36 @@
 #ifdef DBG_UTIL
 void SwCache::Check()
 {
-if ( !pRealFirst )
+if ( !m_pRealFirst )
 return;
 
 // consistency check
-SAL_WARN_IF( pLast->GetNext(), "sw.core", "Last but not last." );
-SAL_WARN_IF( pRealFirst->GetPrev(), "sw.core", "First but not first." );
+SAL_WARN_IF( m_pLast->GetNext(), "sw.core", "Last but not last." );
+SAL_WARN_IF( m_pRealFirst->GetPrev(), "sw.core", "First but not first." );
 sal_uInt16 nCnt = 0;
 bool bFirstFound = false;
-SwCacheObj *pObj = pRealFirst;
-SwCacheObj *const pOldRealFirst = pRealFirst;
+SwCacheObj *pObj = m_pRealFirst;
+SwCacheObj *const pOldRealFirst = m_pRealFirst;
 while ( pObj )
 {
 // the object must be found also when moving backwards
-SwCacheObj *pTmp = pLast;
+SwCacheObj *pTmp = m_pLast;
 while ( pTmp && pTmp != pObj )
 pTmp = pTmp->GetPrev();
 SAL_WARN_IF( !pTmp, "sw.core", "Object not found." );
 
 ++nCnt;
-if ( pObj == pFirst )
+if ( pObj == m_pFirst )
 bFirstFound = true;
 if ( !pObj->GetNext() )
-SAL_WARN_IF( pObj != pLast, "sw.core", "Last not Found." );
+SAL_WARN_IF( pObj != m_pLast, "sw.core", "Last not Found." );
 pObj = pObj->GetNext();
 SAL_WARN_IF(pObj == pOldRealFirst, "sw.core", "Recursion in SwCache.");
 }
 SAL_WARN_IF( !bFirstFound, "sw.core", "First not Found." );
-SAL_WARN_IF( nCnt + aFreePositions.size() != size(), "sw.core", "Lost 
Chain." );
+SAL_WARN_IF( nCnt + m_aFreePositions.size() != size(), "sw.core", "Lost 
Chain." );
 SAL_WARN_IF(
-size() == nCurMax && nCurMax != aFreePositions.size() + nCnt, 
"sw.core",
+size() == m_nCurMax && m_nCurMax != m_aFreePositions.size() + nCnt, 
"sw.core",
 "Lost FreePositions." );
 }
 
@@ -74,10 +74,10 @@ SwCache::SwCache( const sal_uInt16 nInitSize
 #endif
 ) :
 m_aCacheObjects(),
-pRealFirst( nullptr ),
-pFirst( nullptr ),
-pLast( nullptr ),
-nCurMax( nInitSize )
+m_pRealFirst( nullptr ),
+m_pFirst( nullptr ),
+m_pLast( nullptr ),
+m_nCurMax( nInitSize )
 #ifdef DBG_UTIL
 , m_aName( rNm )
 , m_nAppend( 0 )
@@ -126,8 +126,8 @@ SwCache::~SwCache()
 void SwCache::Flush()
 {
 INCREMENT( m_nFlushCnt );
-SwCacheObj *pObj = pRealFirst;
-pRealFirst = pFirst = pLast = nullptr;
+SwCacheObj *pObj = m_pRealFirst;
+m_pRealFirst = m_pFirst = m_pLast = nullptr;
 SwCacheObj *pTmp;
 while ( pObj )
 {
@@ -135,17 +135,17 @@ void SwCache::Flush()
 if ( pObj->IsLocked() )
 {
 OSL_FAIL( "Flushing locked objects." );
-if ( !pRealFirst )
+if ( !m_pRealFirst )
 {
-pRealFirst = pFirst = pLast = pObj;
+m_pRealFirst = m_pFirst = m_pLast = pObj;
 pTmp = pObj->GetNext();
 pObj->SetNext( nullptr ); pObj->SetPrev( nullptr );
 pObj = pTmp;
 }
 else
-{   pLast->SetNext( pObj );
-pObj->SetPrev( pLast );
-pLast = pObj;
+{   m_pLast->SetNext( pObj );
+pObj->SetPrev( m_pLast );
+m_pLast = pObj;
 pTmp = pObj->GetNext();
 pObj->SetNext( nullptr );
 pObj = pTmp;
@@ -156,7 +156,7 @@ void SwCache::Flush()
 {
 pTmp = pObj;
 pObj = pTmp->GetNext();
-aFreePositions.push_back( pTmp->GetCachePos() );
+m_aFreePositions.push_back( pTmp->GetCachePos() );
 m_aCacheObjects[pTmp->GetCachePos()] = nullptr;
 delete pTmp;
 INCREMENT( m_nFlushedObjects );
@@ -169,27 +169,27 @@ void SwCache::ToTop( SwCacheObj *pObj )
 INCREMENT( m_nToTop );
 
 // cut object out of chain and insert at beginning
-if ( pRealFirst == pObj )   // pFirst was checked by caller
+if ( m_pRealFirst == pObj )   // pFirst was checked by caller
 {
 CHECK;
 return;
 }
 
-if ( !pRealFirst )
+if ( !m_pRealFirst )
 {
 // the first will be inserted
-OSL_ENSURE( !pFirst && !pLast, "First not first." );
-

[GSoC] Zoner Draw import, Week 2 report

2016-06-06 Thread Alex P 
During the second week I implemented parsing and output of ellipses and
arcs (except rotation) in libzmf.
http://i.imgur.com/iVeZ9hj.pnghttp://i.imgur.com/DUazEdi.png
Also I continued reverse engineering and submitted some information about
colors, pen, fill, transparency, shadow styles, text to OLE Toy.
https://github.com/renyxa/re-lab/commits/master?author=AlexP11223
Next I am planing to implement pen and fill colors/styles in libzmf.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 6e/fa10d535351216e97c3a736a17ea9f597482b5

2016-06-06 Thread Caolán McNamara 
 6e/fa10d535351216e97c3a736a17ea9f597482b5 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6d0771bf6d40a131510745b926b6629415d88aa3
Author: Caolán McNamara 
Date:   Mon Jun 6 15:21:41 2016 +0100

Notes added by 'git notes add'

diff --git a/6e/fa10d535351216e97c3a736a17ea9f597482b5 
b/6e/fa10d535351216e97c3a736a17ea9f597482b5
new file mode 100644
index 000..06e0996
--- /dev/null
+++ b/6e/fa10d535351216e97c3a736a17ea9f597482b5
@@ -0,0 +1 @@
+prefer: a24006e0f9ecc3a6fec9b974bc9a204d869d5819
___
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 include/comphelper include/connectivity include/svx pyuno/inc sd/source svx/source

2016-06-06 Thread Stephan Bergmann 
 connectivity/source/drivers/kab/KDriver.hxx|8 
 connectivity/source/drivers/macab/MacabDriver.hxx  |8 
 dbaccess/source/core/dataaccess/databasedocument.hxx   |6 +++---
 dbaccess/source/core/dataaccess/documentdefinition.hxx |2 +-
 dbaccess/source/ui/inc/asyncmodaldialog.hxx|2 +-
 include/comphelper/officeresourcebundle.hxx|2 +-
 include/connectivity/dbexception.hxx   |2 +-
 include/svx/AccessibleShape.hxx|2 +-
 include/svx/ChildrenManager.hxx|2 +-
 include/svx/IAccessibleParent.hxx  |2 +-
 pyuno/inc/pyuno.hxx|2 +-
 sd/source/ui/inc/AccessiblePageShape.hxx   |2 +-
 sd/source/ui/unoidl/unolayer.hxx   |2 +-
 svx/source/accessibility/ChildrenManagerImpl.hxx   |2 +-
 svx/source/inc/GraphCtlAccessibleContext.hxx   |2 +-
 15 files changed, 23 insertions(+), 23 deletions(-)

New commits:
commit d0bc637426060593046c8d3a4d01d0b05b052cc5
Author: Stephan Bergmann 
Date:   Mon Jun 6 17:07:25 2016 +0200

Normalize on using @throws instead of @raise[s]

...as the former is used almost exclusively

Change-Id: I38ff11cd0d5125534550df99dd427666011c3b7b

diff --git a/connectivity/source/drivers/kab/KDriver.hxx 
b/connectivity/source/drivers/kab/KDriver.hxx
index 24e411a..5174c90 100644
--- a/connectivity/source/drivers/kab/KDriver.hxx
+++ b/connectivity/source/drivers/kab/KDriver.hxx
@@ -85,9 +85,9 @@ namespace connectivity
 
 /** initializes the implementation module.
 
-@raises css::uno::RuntimeException
+@throws css::uno::RuntimeException
 if the module could be loaded, but required symbols are 
missing
-@raises css::sdbc::SQLException
+@throws css::sdbc::SQLException
 if the KDE version we're running against is not supported, 
or no KDE was found at all
 */
 void init();
@@ -99,7 +99,7 @@ namespace connectivity
 /** creates a new connection
 @precond
 init has been called before
-@raises css::uno::RuntimeException
+@throws css::uno::RuntimeException
 if no connection object could be created (which is a 
severe error, normally impossible)
 */
 css::uno::Reference createConnection(
@@ -112,7 +112,7 @@ namespace connectivity
 
 @return  if the module could be loaded successfully.
 
-@raises css::uno::RuntimeException
+@throws css::uno::RuntimeException
 if the module could be loaded, but required symbols are 
missing
 */
 boolimpl_loadModule();
diff --git a/connectivity/source/drivers/macab/MacabDriver.hxx 
b/connectivity/source/drivers/macab/MacabDriver.hxx
index 8f19c87..20063ff 100644
--- a/connectivity/source/drivers/macab/MacabDriver.hxx
+++ b/connectivity/source/drivers/macab/MacabDriver.hxx
@@ -64,9 +64,9 @@ namespace connectivity
 
 /** initializes the implementation module.
 
-@raises css::uno::RuntimeException
+@throws css::uno::RuntimeException
 if the module could be loaded, but required symbols are 
missing
-@raises css::sdbc::SQLException
+@throws css::sdbc::SQLException
 if no Mac OS was found at all
 */
 void init();
@@ -78,7 +78,7 @@ namespace connectivity
 /** creates a new connection
 @precond
 init has been called before
-@raises css::uno::RuntimeException
+@throws css::uno::RuntimeException
 if no connection object could be created (which is a 
severe error, normally impossible)
 */
 MacabConnection*  createConnection( MacabDriver* _pDriver ) const;
@@ -90,7 +90,7 @@ namespace connectivity
 
 @return  if the module could be loaded successfully.
 
-@raises css::uno::RuntimeException
+@throws css::uno::RuntimeException
 if the module could be loaded, but required symbols are 
missing
 */
 boolimpl_loadModule();
diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx 
b/dbaccess/source/core/dataaccess/databasedocument.hxx
index f9d4107..0b91ad8 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.hxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.hxx
@@ -488,7 +488,7 @@ private:
 determines if the ownership should be transferred to the component 
which
 possibly vetos the closing
 
-@raises css::util::CloseVetoException
+@throws css::util::CloseVetoExcep

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

2016-06-06 Thread Pranav Kant 
 loleaflet/dist/toolbar.css |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5ebcef2a40014b4fd01e511ea3a37ce822ef9f92
Author: Pranav Kant 
Date:   Sat Jun 4 15:16:33 2016 +0530

loleaflet: Reduce z-index of auxiliary toolbar

Otherwise, when the screen becomes inactive, it is the only
widget to shine separately.

Change-Id: Idf22e2cece3fd465ff37e7304f4776dbfdef66a8
(cherry picked from commit 3ec6c6b6625c04a55b7a704d903b3887abc029b9)

diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index abc6c25..35e7976 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -34,7 +34,7 @@
 width: 200px;
 top: 65px;
 border: 1px solid darkgrey;
-z-index: 8000;
+z-index: 1000;
 display: none;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/fixes23' -

2016-06-06 Thread László Németh 
 0 files changed

New commits:
commit b69f52f58413029f5d4e04d4508229c5a813d98e
Author: László Németh 
Date:   Mon Jun 6 17:37:55 2016 +0200

empty commit (Writer first proc. idle)

Change-Id: I326396edc18d0eda2c12e3f82892112ff4aab01e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

GSOC report : Week #2

2016-06-06 Thread Jaskaran Singh 
Hi ,
I'm working on the project to  implement import of odf styles through Orcus
.The following work has been done during the Second Week :-

   1. Implementation of cell protection in Orcus (under review). Orcus can
   now make sense of the various cell protection attributes stored in the xml
   file.
   2. Written test for the above work(under review).

In this week , I would be going for the following work.

   1. Implementation of Font underline in Orcus.
   2. Implementation of Number Format in Orcus.
   3. Tests for Font styles in Orcus.
   4. Tests for Number Format in Orcus.

Apart from this , I have also noticed a bug in Orcus, that prevents Border
styles like solid, dash dot dot to be imported. Will fix that too this week.

Thanks for reading this report.
Jaskaran Singh.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'private/Rosemary/change-tracking' - 2 commits - include/xmloff sw/source xmloff/source

2016-06-06 Thread Rosemary Sebastian 
Rebased ref, commits from common ancestor:
commit 28e1d02543b437e54c6dfa06141758ff8fe78baf
Author: Rosemary Sebastian 
Date:   Mon Jun 6 21:04:49 2016 +0530

Export addition of format

All the values are hardcoded currently.

Change-Id: I56ddfaa7f7facfc9c2359cd50031e6531ed05120

diff --git a/include/xmloff/xmlnmspe.hxx b/include/xmloff/xmlnmspe.hxx
index ae588d2..da467d1 100644
--- a/include/xmloff/xmlnmspe.hxx
+++ b/include/xmloff/xmlnmspe.hxx
@@ -70,6 +70,8 @@ XML_NAMESPACE( REPORT,  33U )
 XML_NAMESPACE( OF,  34U )   // OpenFormula aka ODFF
 XML_NAMESPACE( XHTML,   35U )
 XML_NAMESPACE( GRDDL,   36U )
+XML_NAMESPACE( ADD, 37U )
+XML_NAMESPACE( DEL, 38U )
 
 // namespaces for odf extended formats
 
@@ -77,14 +79,14 @@ XML_NAMESPACE( GRDDL,   36U )
 const sal_uInt16 XML_NAMESPACE_##prefix##_EXT   = key; \
 const sal_uInt16 XML_NAMESPACE_##prefix##_EXT_IDX   = key;
 
-XML_NAMESPACE_EXT( OFFICE,  37U )
-XML_NAMESPACE_EXT( TABLE,   38U )
-XML_NAMESPACE_EXT( CHART,   39U )
-XML_NAMESPACE_EXT( DRAW,40U )
-XML_NAMESPACE_EXT( CALC,41U )
-XML_NAMESPACE_EXT( LO,  42U )
+XML_NAMESPACE_EXT( OFFICE,  39U )
+XML_NAMESPACE_EXT( TABLE,   40U )
+XML_NAMESPACE_EXT( CHART,   41U )
+XML_NAMESPACE_EXT( DRAW,42U )
+XML_NAMESPACE_EXT( CALC,43U )
+XML_NAMESPACE_EXT( LO,  44U )
 
-#define XML_OLD_NAMESPACE_BASE 43U
+#define XML_OLD_NAMESPACE_BASE 45U
 
 // namespaces used in the technical preview (SO 5.2)
 XML_OLD_NAMESPACE( FO,  0U )
diff --git a/xmloff/source/text/XMLRedlineExport.cxx 
b/xmloff/source/text/XMLRedlineExport.cxx
index f7b38ef..c59fae5 100644
--- a/xmloff/source/text/XMLRedlineExport.cxx
+++ b/xmloff/source/text/XMLRedlineExport.cxx
@@ -487,6 +487,25 @@ void XMLRedlineExport::ExportChangeInfo(
 rExport.Characters(sBuf.makeStringAndClear());
 }
 
+aAny = rPropSet->getPropertyValue(sRedlineType);
+OUString sType;
+aAny >>= sType;
+if(sType == sFormat) // TODO: Find out if the style is inserted or deleted 
to give the proper namespace
+{
+SvXMLElementExport aTypeElem( rExport, XML_NAMESPACE_DEL,
+  XML_TYPE, true, false );
+rExport.Characters("style");
+SvXMLElementExport aNameElem( rExport, XML_NAMESPACE_DEL,
+  XML_NAME, true, false );
+rExport.Characters("bold"); // TODO: Get the correct style name
+SvXMLElementExport aStartElem( rExport, XML_NAMESPACE_DEL,
+  XML_START, true, false );
+rExport.Characters("start"); // TODO: Get the correct start position
+SvXMLElementExport aEndElem( rExport, XML_NAMESPACE_DEL,
+  XML_END, true, false );
+rExport.Characters("end"); // TODO: Get the correct end position
+}
+
 // comment as  sequence
 aAny = rPropSet->getPropertyValue(sRedlineComment);
 aAny >>= sTmp;
diff --git a/xmloff/source/text/XMLRedlineExport.hxx 
b/xmloff/source/text/XMLRedlineExport.hxx
index 5ef3d2e..08e8973 100644
--- a/xmloff/source/text/XMLRedlineExport.hxx
+++ b/xmloff/source/text/XMLRedlineExport.hxx
@@ -66,6 +66,10 @@ class XMLRedlineExport
 const OUString sRedlineSuccessorData;
 const OUString sRedlineText;
 const OUString sRedlineType;
+const OUString sRedlineUndoType;
+const OUString sRedlineUndoName;
+const OUString sRedlineUndoStart;
+const OUString sRedlineUndoEnd;
 const OUString sUnknownChange;
 const OUString sStartRedline;
 const OUString sEndRedline;
commit 49fa48961b58bae09b7872f8ff536b73d2a88f82
Author: Rosemary Sebastian 
Date:   Fri Jun 3 20:45:24 2016 +0530

WIP Save tracked changes in undo.xml

Change-Id: I41326b89788ad85646b777d2a8df81f03619ae9f

diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index 87993a2..4213eb5 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -132,7 +132,7 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass 
)
 SwDoc *pDoc = getDoc();
 
 if( getExportFlags() & 
(SvXMLExportFlags::FONTDECLS|SvXMLExportFlags::STYLES|
-
SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::CONTENT))
+
SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::UNDO))
 {
 if( getDefaultVersion() > SvtSaveOptions::ODFVER_012 )
 {
@@ -268,7 +268,7 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass 
)
 // set redline mode if we export STYLES or CONTENT, unless redline
 // mode is taken care of outside (through info XPropertySet)
 bool bSaveRedline =
-bool( getExportFlags() & 
(SvXMLExportFlags::CONTENT|SvXMLExportFlags::STYLES) );
+bool( getExportFlags() & 
(SvXMLExportFlags::UNDO|SvXMLEx

[Libreoffice-commits] core.git: Branch 'private/Rosemary/change-tracking' - include/xmloff sw/source sw/util

2016-06-06 Thread Rosemary Sebastian 
 include/xmloff/xmlimp.hxx   |1 +
 sw/source/filter/xml/swxml.cxx  |7 +++
 sw/source/filter/xml/xmlimp.cxx |   11 +++
 sw/util/sw.component|   10 +++---
 4 files changed, 26 insertions(+), 3 deletions(-)

New commits:
commit cf849897b91af349afbf352bb529acf2b5e9ecfc
Author: Rosemary Sebastian 
Date:   Mon Jun 6 12:06:24 2016 +0530

Import tracked changes from undo.xml

Change-Id: If1003968accbc31acdb4b503940c53c01264e60c

diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 2261e47..c2c2474 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -96,6 +96,7 @@ enum class SvXMLImportFlags {
 SETTINGS= 0x0040,
 FONTDECLS   = 0x0080,
 EMBEDDED= 0x0100,
+UNDO= 0x0200,
 ALL = 0x
 };
 namespace o3tl
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 33c976f..95708ad 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -875,6 +875,13 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& 
rBaseURL, SwPaM &rPaM, c
 : "com.sun.star.comp.Writer.XMLContentImporter"),
aFilterArgs, rName, true );
 
+if( !nRet && !(IsOrganizerMode() || aOpt.IsFormatsOnly()) )
+nRet = ReadThroughComponent(
+   xStorage, xModelComp, "undo.xml", nullptr, xContext,
+(bOASIS ? "com.sun.star.comp.Writer.XMLOasisUndoImporter"
+: "com.sun.star.comp.Writer.XMLUndoImporter"),
+   aEmptyArgs, rName, true );
+
 if( !(IsOrganizerMode() || IsBlockMode() || bInsertMode ||
   aOpt.IsFormatsOnly() ) )
 {
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index e749b3a..f583259 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -95,6 +95,7 @@ enum SwXMLDocTokens
 XML_TOK_DOC_MASTERSTYLES,
 XML_TOK_DOC_META,
 XML_TOK_DOC_BODY,
+XML_TOK_DOC_UNDO,
 XML_TOK_DOC_SCRIPT,
 XML_TOK_DOC_SETTINGS,
 XML_TOK_DOC_XFORMS,
@@ -109,6 +110,7 @@ static SvXMLTokenMapEntry aDocTokenMap[] =
 { XML_NAMESPACE_OFFICE, XML_MASTER_STYLES,   XML_TOK_DOC_MASTERSTYLES   },
 { XML_NAMESPACE_OFFICE, XML_META,   XML_TOK_DOC_META},
 { XML_NAMESPACE_OFFICE, XML_BODY,   XML_TOK_DOC_BODY},
+{ XML_NAMESPACE_OFFICE, XML_UNDO,   XML_TOK_DOC_UNDO},
 { XML_NAMESPACE_OFFICE, XML_SCRIPTS,XML_TOK_DOC_SCRIPT  },
 { XML_NAMESPACE_OFFICE, XML_SETTINGS,   XML_TOK_DOC_SETTINGS},
 { XML_NAMESPACE_XFORMS, XML_MODEL,  XML_TOK_DOC_XFORMS  },
@@ -1596,4 +1598,13 @@ 
com_sun_star_comp_Writer_XMLOasisSettingsImporter_get_implementation(css::uno::X
 return cppu::acquire(new SwXMLImport(context, 
OUString("com.sun.star.comp.Writer.XMLOasisSettingsImporter"),
 SvXMLImportFlags::SETTINGS));
 }
+
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_Writer_XMLOasisUndoImporter_get_implementation(css::uno::XComponentContext*
 context,
+css::uno::Sequence const &)
+{
+return cppu::acquire(new SwXMLImport(context, 
OUString("com.sun.star.comp.Writer.XMLOasisUndoImporter"),
+SvXMLImportFlags::UNDO | SvXMLImportFlags::AUTOSTYLES));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/util/sw.component b/sw/util/sw.component
index a76d30a..478e4a2 100644
--- a/sw/util/sw.component
+++ b/sw/util/sw.component
@@ -76,13 +76,17 @@
   
constructor="com_sun_star_comp_Writer_XMLOasisContentExporter_get_implementation">
 
   
+  
+
+  
   
 
   
-  
-
+  
+
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - boost/boost_1_55_0.patch

2016-06-06 Thread Don Lewis 
 boost/boost_1_55_0.patch |  225 +++
 1 file changed, 170 insertions(+), 55 deletions(-)

New commits:
commit 34aa1d4ae4620182702659d3461739d666d2d63d
Author: Don Lewis 
Date:   Mon Jun 6 14:32:23 2016 +

#i126888#:  bundled boost headers generate an excessive number of

warnings when building with modern compilers

When building OpenOffice with modern compilers, the bundled boost
headers generate an excessive number of warnings.  This is especially
bad with recent versions of clang, which generates very verbose
warning messages.

The attached patch updates the current boost_1_55_0.patch with
additional changes cherry picked from upstream boost, up through
version 1.60.  These additional changes have been used with the
FreeBSD boost 1.55.0 port for a while.

This patch greatly reduces the number of warnings and size of the
OpenOffice build log.  Compiling trunk r1735889 on FreeBSD 11.0
with clang 3.8, the number of warnings is reduced from 53260 to
13741, and the size of the build log is reduced from 117 MB to 44
MB.

Tested by:  kschenk

diff --git a/boost/boost_1_55_0.patch b/boost/boost_1_55_0.patch
index 3f7f6f6..a4ef939 100644
--- a/boost/boost_1_55_0.patch
+++ b/boost/boost_1_55_0.patch
@@ -1,5 +1,167 @@
 misc/boost_1_55_0/boost/unordered/detail/equivalent.hpp2012-12-05 
23:06:57.0 +0100
-+++ misc/build/boost_1_55_0/boost/unordered/detail/equivalent.hpp  
2014-01-07 10:33:59.550621750 +0100
+diff -ur misc/boost_1_55_0/boost/asio/ssl/impl/context.ipp 
misc/build/boost_1_55_0/boost/asio/ssl/impl/context.ipp
+--- misc/boost_1_55_0/boost/asio/ssl/impl/context.ipp  2013-10-26 
16:25:53.0 -0700
 misc/build/boost_1_55_0/boost/asio/ssl/impl/context.ipp2016-03-23 
01:11:12.425434000 -0700
+@@ -87,6 +87,14 @@
+ handle_ = ::SSL_CTX_new(::SSLv2_server_method());
+ break;
+ #endif // defined(OPENSSL_NO_SSL2)
++#if defined(OPENSSL_NO_SSL3)
++  case context::sslv3:
++  case context::sslv3_client:
++  case context::sslv3_server:
++boost::asio::detail::throw_error(
++boost::asio::error::invalid_argument, "context");
++break;
++#else // defined(OPENSSL_NO_SSL3)
+   case context::sslv3:
+ handle_ = ::SSL_CTX_new(::SSLv3_method());
+ break;
+@@ -96,6 +104,7 @@
+   case context::sslv3_server:
+ handle_ = ::SSL_CTX_new(::SSLv3_server_method());
+ break;
++#endif // defined(OPENSSL_NO_SSL3)
+   case context::tlsv1:
+ handle_ = ::SSL_CTX_new(::TLSv1_method());
+ break;
+diff -ur 
misc/boost_1_55_0/boost/asio/ssl/old/detail/openssl_context_service.hpp 
misc/build/boost_1_55_0/boost/asio/ssl/old/detail/openssl_context_service.hpp
+--- misc/boost_1_55_0/boost/asio/ssl/old/detail/openssl_context_service.hpp
2013-05-20 05:32:20.0 -0700
 
misc/build/boost_1_55_0/boost/asio/ssl/old/detail/openssl_context_service.hpp   
   2016-03-23 01:11:12.426497000 -0700
+@@ -85,6 +85,13 @@
+   impl = ::SSL_CTX_new(::SSLv2_server_method());
+   break;
+ #endif // defined(OPENSSL_NO_SSL2)
++#if defined(OPENSSL_NO_SSL3)
++case context_base::sslv3:
++case context_base::sslv3_client:
++case context_base::sslv3_server:
++  boost::asio::detail::throw_error(boost::asio::error::invalid_argument);
++  break;
++#else // defined(OPENSSL_NO_SSL3)
+ case context_base::sslv3:
+   impl = ::SSL_CTX_new(::SSLv3_method());
+   break;
+@@ -94,6 +101,7 @@
+ case context_base::sslv3_server:
+   impl = ::SSL_CTX_new(::SSLv3_server_method());
+   break;
++#endif // defined(OPENSSL_NO_SSL3)
+ case context_base::tlsv1:
+   impl = ::SSL_CTX_new(::TLSv1_method());
+   break;
+diff -ur misc/boost_1_55_0/boost/bind/arg.hpp 
misc/build/boost_1_55_0/boost/bind/arg.hpp
+--- misc/boost_1_55_0/boost/bind/arg.hpp   2007-11-25 10:07:19.0 
-0800
 misc/build/boost_1_55_0/boost/bind/arg.hpp 2016-03-23 01:11:12.42153 
-0700
+@@ -33,8 +33,7 @@
+ 
+ template< class T > arg( T const & /* t */ )
+ {
+-// static assert I == is_placeholder::value
+-typedef char T_must_be_placeholder[ I == is_placeholder::value? 1: 
-1 ];
++BOOST_STATIC_ASSERT( I == is_placeholder::value );
+ }
+ };
+ 
+diff -ur misc/boost_1_55_0/boost/concept/detail/general.hpp 
misc/build/boost_1_55_0/boost/concept/detail/general.hpp
+--- misc/boost_1_55_0/boost/concept/detail/general.hpp 2010-06-08 
12:31:13.0 -0700
 misc/build/boost_1_55_0/boost/concept/detail/general.hpp   2016-03-23 
01:11:12.388374000 -0700
+@@ -65,10 +65,19 @@
+   
+ # endif
+ 
++// Version check from https://svn.boost.org/trac/boost/changeset/82886
++// (boost/static_assert.hpp)
++#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && 
(__GNUC_MINOR__ >= 7))) || defined(__clang__)
++#define BOOST_CONCEPT_UNUSED_TYPEDEF __attribute__((unused))
++#else
++#define BOOST_CONCEPT_UNUSED_T

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - b8/c138916ac725f4c1ae974e51d7366c706e2ca3

2016-06-06 Thread Caolán McNamara 
 b8/c138916ac725f4c1ae974e51d7366c706e2ca3 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 50315659efc7fe26aa43e137bea490fb85a46309
Author: Caolán McNamara 
Date:   Mon Jun 6 17:57:32 2016 +0100

Notes added by 'git notes add'

diff --git a/b8/c138916ac725f4c1ae974e51d7366c706e2ca3 
b/b8/c138916ac725f4c1ae974e51d7366c706e2ca3
new file mode 100644
index 000..8ebbe55
--- /dev/null
+++ b/b8/c138916ac725f4c1ae974e51d7366c706e2ca3
@@ -0,0 +1 @@
+ignore: obsolete
___
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' - b3/e1789692ff7db6cc86155558eb920f3e4285d8

2016-06-06 Thread Caolán McNamara 
 b3/e1789692ff7db6cc8618eb920f3e4285d8 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6e7f39148724104eb106828ad04cba78e55a3f07
Author: Caolán McNamara 
Date:   Mon Jun 6 17:57:51 2016 +0100

Notes added by 'git notes add'

diff --git a/b3/e1789692ff7db6cc8618eb920f3e4285d8 
b/b3/e1789692ff7db6cc8618eb920f3e4285d8
new file mode 100644
index 000..8ebbe55
--- /dev/null
+++ b/b3/e1789692ff7db6cc8618eb920f3e4285d8
@@ -0,0 +1 @@
+ignore: obsolete
___
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' - 34/aa1d4ae4620182702659d3461739d666d2d63d

2016-06-06 Thread Caolán McNamara 
 34/aa1d4ae4620182702659d3461739d666d2d63d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 518599247be6e774f8c26418d1670d636a2e58a8
Author: Caolán McNamara 
Date:   Mon Jun 6 17:58:11 2016 +0100

Notes added by 'git notes add'

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

Re: tdf50488 no assignee?

2016-06-06 Thread Eike Rathke 
Hi Winfried,

On Monday, 2016-06-06 13:22:44 +0200, Winfried Donkers wrote:

> I noticed that you changed the cc of tdf50488 last Friday.
> I also noticed now (I didn't get a message about it) that you are no longer 
> the assignee of the bug report.
> I think you were assignee because FINDB, SEARCHB and REPLACEB were on your to 
> do list, but I may be mistaken.

Yes, but I'm not working on it, nor do I intend to in the near future,
so I rather leave it unassigned to reflect reality.

> Are you still intending to add the above?
> Shall I put the renaming of (P)DURATION(_ADD) on my list?

Would be good, also best to do the renaming along with the CONVERT vs
CONVERT_ADD and maybe others that might need it all together in one
release.

Likely for CONVERT it was something along CONVERT to CONVERT_OOO and
CONVERT_ADD to CONVERT.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


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

GSoC Week 2: Redesigning the Template Manager

2016-06-06 Thread Akshay Deep 
Hello,
I'm working with on the Template Manager as my GSoC project. The
feature is being implemented in master as well as in Libreoffice 5.2.
(Mentors: Samuel Mehrbrodt and Yousuf Philips )

Important tasks completed last week:
1. Template Selection dialog for Impress
   ( https://gerrit.libreoffice.org/#/c/25642/ )
   ( https://gerrit.libreoffice.org/#/c/25913/ )
2. Remove Presentation wizard from Impress
3. Default Template Handling Improvements
   ( https://gerrit.libreoffice.org/#/c/25916/ )
   ( https://gerrit.libreoffice.org/#/c/25816/ )
4. Improved keyboard navigation in template manager and start center
and a few other fixes. ( https://gerrit.libreoffice.org/#/q/akki95 )

Blog: akkidevblog.wordpress.com for keeping track of all ideas and changes.

TODO List: https://trello.com/b/TyXddFQQ/libreoffice-new-template-manager#
Most of the tasks related to the project has been completed.

This week: I'll fix the remaining bugs for master and 5.2 and will look
into the details of integrating online templates by parsing JSON using
Orcus (5.3 only).

Regards,
Akshay  ( IRC: Akki )
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2016-06-06 Thread Michael Stahl 
 sw/source/filter/ww8/attributeoutputbase.hxx |2 +-
 sw/source/filter/ww8/docxattributeoutput.cxx |8 ++--
 sw/source/filter/ww8/docxattributeoutput.hxx |2 +-
 sw/source/filter/ww8/rtfattributeoutput.cxx  |2 +-
 sw/source/filter/ww8/rtfattributeoutput.hxx  |2 +-
 sw/source/filter/ww8/wrtw8sty.cxx|   13 +++--
 sw/source/filter/ww8/ww8attributeoutput.hxx  |2 +-
 7 files changed, 10 insertions(+), 21 deletions(-)

New commits:
commit 2a11499583cfc8c65e2fa99fbcdfdd7b94e966c1
Author: Michael Stahl 
Date:   Mon Jun 6 12:49:17 2016 +0200

sw: simplify identical branches in WW8AttributeOutput::DefaultStyle

Change-Id: I0d500ecbcd0bc0d6b9f772304345acd4ddb5df11

diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx 
b/sw/source/filter/ww8/attributeoutputbase.hxx
index 092153a..d09988f 100644
--- a/sw/source/filter/ww8/attributeoutputbase.hxx
+++ b/sw/source/filter/ww8/attributeoutputbase.hxx
@@ -267,7 +267,7 @@ public:
 virtual void EndStyles( sal_uInt16 nNumberOfStyles ) = 0;
 
 /// Write default style.
-virtual void DefaultStyle( sal_uInt16 nStyle ) = 0;
+virtual void DefaultStyle() = 0;
 
 /// Start of a style in the styles table.
 virtual void StartStyle( const OUString& rName, StyleType eType,
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 6dc190e..9e40395 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4107,14 +4107,10 @@ void DocxAttributeOutput::EndStyles( sal_uInt16 
nNumberOfStyles )
 m_pSerializer->endElementNS( XML_w, XML_styles );
 }
 
-void DocxAttributeOutput::DefaultStyle( sal_uInt16 nStyle )
+void DocxAttributeOutput::DefaultStyle()
 {
 // are these the values of enum ww::sti (see ../inc/wwstyles.hxx)?
-#if OSL_DEBUG_LEVEL > 1
-OSL_TRACE( "TODO DocxAttributeOutput::DefaultStyle( sal_uInt16 nStyle )- 
%d", nStyle );
-#else
-(void) nStyle; // to quiet the warning
-#endif
+OSL_TRACE("TODO DocxAttributeOutput::DefaultStyle()");
 }
 
 /* Writes  tag back to document.xml if a file conatins a cropped 
image.
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx 
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 611ad01..ab0a43a 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -250,7 +250,7 @@ public:
 virtual void EndStyles( sal_uInt16 nNumberOfStyles ) override;
 
 /// Write default style.
-virtual void DefaultStyle( sal_uInt16 nStyle ) override;
+virtual void DefaultStyle() override;
 
 /// Write Doc Defaults
 void DocDefaults( );
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx 
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 854b599..7fbcee2 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -1129,7 +1129,7 @@ void RtfAttributeOutput::EndStyles(sal_uInt16 
/*nNumberOfStyles*/)
 m_rExport.Strm().WriteChar('}');
 }
 
-void RtfAttributeOutput::DefaultStyle(sal_uInt16 /*nStyle*/)
+void RtfAttributeOutput::DefaultStyle()
 {
 /* noop, the default style is always 0 in RTF */
 }
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx 
b/sw/source/filter/ww8/rtfattributeoutput.hxx
index 1c3e32e..baa3cce 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -134,7 +134,7 @@ public:
 virtual void EndStyles(sal_uInt16 nNumberOfStyles) override;
 
 /// Write default style.
-virtual void DefaultStyle(sal_uInt16 nStyle) override;
+virtual void DefaultStyle() override;
 
 /// Start of a style in the styles table.
 virtual void StartStyle(const OUString& rName, StyleType eType,
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx 
b/sw/source/filter/ww8/wrtw8sty.cxx
index e7121af..21fcf62 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -563,16 +563,9 @@ void MSWordStyles::GetStyleData( SwFormat* pFormat, bool& 
bFormatColl, sal_uInt1
 nNext = GetSlot( pNext );
 }
 
-void WW8AttributeOutput::DefaultStyle( sal_uInt16 nStyle )
+void WW8AttributeOutput::DefaultStyle()
 {
-if ( nStyle == 10 )   // Default Char-Style ( only WW )
-{
-m_rWW8Export.pTableStrm->WriteUInt16(0);   // empty Style
-}
-else
-{
-m_rWW8Export.pTableStrm->WriteUInt16(0);   // empty Style
-}
+m_rWW8Export.pTableStrm->WriteUInt16(0);   // empty Style
 }
 
 void MSWordStyles::OutputStyle(const SwNumRule* pNumRule, sal_uInt16 nPos)
@@ -588,7 +581,7 @@ void MSWordStyles::OutputStyle(const SwNumRule* pNumRule, 
sal_uInt16 nPos)
 void MSWordStyles::OutputStyle( SwFormat* pFormat, sal_uInt16 nPos )
 {
 if ( !pFormat )
-m_rExport.AttrOutput().DefaultStyle( nPos );
+m_rExport.AttrOutput().DefaultStyle();
 else
 {
 bool bFormatColl;
diff --git a/sw/source/f

[Libreoffice-commits] core.git: Branch 'feature/fixes23' -

2016-06-06 Thread László Németh 
 0 files changed

New commits:
commit 96ce864aae6169010311a818cf8ca612833823fe
Author: László Németh 
Date:   Mon Jun 6 20:31:36 2016 +0200

empty commit (repeat)

Change-Id: Id91553d177444eb896517d00ff5ccb06ec9bace3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[GSoC] Weekly Report #2 - Toolbars infrastructure via .ui files

2016-06-06 Thread Szymon Kłos 
This week I made possible reusing controls from Slide Transition Pane.
I had some problems with early initialization. Similar problem I met in
the paragraph spacing controller which I didn't finished yet.

Tasks not related with GSoC:
I've updated my GDrive 2FA patch after review. Also I fixed one bug in
the AutoText Dialog. While using it I noticed that interface wasn't
updated after user actions.

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

  1   2   >