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

[Stephan Bergmann]

 oox/source/export/drawingml.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e1ebdf38969a17af9453f674c81663187411597d
Author: Stephan Bergmann 
Date:   Tue May 12 09:06:59 2015 +0200

loplugin:cstylecast

Change-Id: I1c0f16d4f68013f126a52976d4ff9f7dde9f3eaf

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index e7bea03..2287fdf 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1671,7 +1671,7 @@ void DrawingML::WriteParagraphNumbering( Reference< 
XPropertySet > rXPropSet, sa
 }
 else if(aPropName == "BulletColor")
 {
-nBulletColor = *( (sal_Int32*)pValue );
+nBulletColor = *static_cast(pValue);
 }
 else if ( aPropName == "BulletChar" )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: LO 5.0 alpha : erroneous character in soffice script ?

[Jean-Baptiste Faure]

Le 12/05/2015 07:17, Jean-Baptiste Faure a écrit :
> Hi,
> 
> My last build of master (LO 5.0 alpha) refuses to start because it can't
> open 'ooenv}' which does not exist :
> 
> .../LibO/master/instdir/program/soffice: 60: .: Can't open
> .../LibO/master/instdir/program/ooenv}
> 
> Removing the closing } at the end of ooenv in the block
> 
> # linked build needs additional settings
> if [ -e "${sd_prog}/ooenv" ] ; then
> . "${sd_prog}/ooenv}"
> fi
> 
> in the script soffice fixed the problem for me.

This closing } has been added by this commit:
https://gerrit.libreoffice.org/gitweb?p=core.git;a=commit;h=23c0e00b50f7fae7a82134ef064eabf9514a941b

Best regards.
JBF

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

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

[Joren De Cuyper]

 writerfilter/source/dmapper/GraphicImport.cxx |  219 --
 1 file changed, 109 insertions(+), 110 deletions(-)

New commits:
commit ab81e3bff2a1844be67209bc8947d539edbaf8e6
Author: Joren De Cuyper 
Date:   Mon May 11 22:14:41 2015 +0200

tdf#76941 : image greyscale not imported correctly

The eColorMode and other graphic attributes were never checked due to this 
statement.
This statement is last altered by 0f0a22ade666d33a10d9c83c0f636be9acf1ed39
This only fixes the import.

Change-Id: I9ba7e745582faf37898f284600d638aa4806a362
Reviewed-on: https://gerrit.libreoffice.org/15710
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index 56c3741..a97da37 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -1220,126 +1220,125 @@ uno::Reference< text::XTextContent > 
GraphicImport::createGraphicObject( const b
 
xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( 
PROP_SIZE_PROTECTED ),
 uno::makeAny(true));
 
-if (m_pImpl->eGraphicImportType == IMPORT_AS_DETECTED_ANCHOR)
-{
-sal_Int32 nWidth = m_pImpl->nRightPosition - 
m_pImpl->nLeftPosition;
-//adjust margins
-if( (m_pImpl->nHoriOrient == text::HoriOrientation::LEFT &&
+sal_Int32 nWidth = m_pImpl->nRightPosition - 
m_pImpl->nLeftPosition;
+//adjust margins
+if( (m_pImpl->nHoriOrient == text::HoriOrientation::LEFT &&
+(m_pImpl->nHoriRelation == 
text::RelOrientation::PAGE_PRINT_AREA ||
+m_pImpl->nHoriRelation == text::RelOrientation::FRAME) ) ||
+(m_pImpl->nHoriOrient == text::HoriOrientation::INSIDE &&
+m_pImpl->nHoriRelation == 
text::RelOrientation::PAGE_PRINT_AREA ))
+m_pImpl->nLeftMargin = 0;
+if((m_pImpl->nHoriOrient == text::HoriOrientation::RIGHT &&
 (m_pImpl->nHoriRelation == 
text::RelOrientation::PAGE_PRINT_AREA ||
 m_pImpl->nHoriRelation == text::RelOrientation::FRAME) 
) ||
- (m_pImpl->nHoriOrient == text::HoriOrientation::INSIDE &&
-   m_pImpl->nHoriRelation == 
text::RelOrientation::PAGE_PRINT_AREA ))
-m_pImpl->nLeftMargin = 0;
-if((m_pImpl->nHoriOrient == text::HoriOrientation::RIGHT &&
-(m_pImpl->nHoriRelation == 
text::RelOrientation::PAGE_PRINT_AREA ||
-m_pImpl->nHoriRelation == 
text::RelOrientation::FRAME) ) ||
-(m_pImpl->nHoriOrient == text::HoriOrientation::INSIDE &&
-m_pImpl->nHoriRelation == 
text::RelOrientation::PAGE_PRINT_AREA ))
-m_pImpl->nRightMargin = 0;
-// adjust top/bottom margins
-if( m_pImpl->nVertOrient == text::VertOrientation::TOP &&
-( m_pImpl->nVertRelation == 
text::RelOrientation::PAGE_PRINT_AREA ||
-m_pImpl->nVertRelation == 
text::RelOrientation::PAGE_FRAME))
-m_pImpl->nTopMargin = 0;
-if( m_pImpl->nVertOrient == text::VertOrientation::BOTTOM &&
-( m_pImpl->nVertRelation == 
text::RelOrientation::PAGE_PRINT_AREA ||
-m_pImpl->nVertRelation == 
text::RelOrientation::PAGE_FRAME))
-m_pImpl->nBottomMargin = 0;
-if( m_pImpl->nVertOrient == text::VertOrientation::BOTTOM &&
-m_pImpl->nVertRelation == 
text::RelOrientation::PAGE_PRINT_AREA )
-m_pImpl->nBottomMargin = 0;
-
-//adjust alignment
-if( m_pImpl->nHoriOrient == text::HoriOrientation::INSIDE &&
-m_pImpl->nHoriRelation == 
text::RelOrientation::PAGE_FRAME )
-{
-// convert 'left to page' to 'from left - to page 
text area'
-m_pImpl->nHoriOrient = text::HoriOrientation::NONE;
-m_pImpl->nHoriRelation = 
text::RelOrientation::PAGE_PRINT_AREA;
-m_pImpl->nLeftPosition = - nWidth;
-}
-else if( m_pImpl->nHoriOrient == 
text::HoriOrientation::OUTSIDE &&
-m_pImpl->nHoriRelation == 
text::RelOrientation::PAGE_FRAME )
-{
-// convert 'right to page' to 'from left 0 to right page 
border'
-m_pImpl->nHoriOrient = text::HoriOrientation::NONE;
-m_pImpl->nHoriRelation = text::RelOrientation::PAGE_RIGHT;
-m_pImpl->nLeftPosition = 0;
-}
-
-m_pImpl->applyPosition(xGraphicObjectPropertie

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - Makefile.in

[Tor Lillqvist]

 Makefile.in |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 22523e47c1d5139d73dfff787c491edadd7b57a1
Author: Tor Lillqvist 
Date:   Tue Sep 9 10:35:51 2014 +0300

Remove potential old leftover before moving the app bundle

Change-Id: I7f0a8ae184a2f3d8a4476415b56df4ad8e4e342f

diff --git a/Makefile.in b/Makefile.in
index 445d22b..1d47158 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -324,6 +324,7 @@ endif
 
 mac-app-store-package: test-install
 ifneq ($(MACOSX_PACKAGE_SIGNING_IDENTITY),)
+   rm -rf "$(MACOSX_APP_NAME).app"
mv "$(TESTINSTALLDIR)/$(PRODUCTNAME).app" "$(MACOSX_APP_NAME).app"
productbuild --component "$(MACOSX_APP_NAME).app" /Applications --sign 
$(MACOSX_PACKAGE_SIGNING_IDENTITY) $(shell echo "$(MACOSX_APP_NAME)" | tr ' ' 
'-').pkg
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basctl/source chart2/source cui/source dbaccess/source desktop/source extensions/source formula/source include/vcl sc/source sd/source sfx2/source starmath/source svtoo

[Michael Meeks]

 basctl/source/basicide/bastype2.cxx|2 -
 basctl/source/basicide/moduldl2.cxx|2 -
 basctl/source/basicide/moduldlg.cxx|4 --
 chart2/source/controller/dialogs/tp_DataSourceControls.cxx |2 -
 cui/source/customize/acccfg.cxx|2 -
 cui/source/customize/cfgutil.cxx   |4 +-
 cui/source/customize/macropg.cxx   |2 -
 cui/source/customize/selector.cxx  |4 +-
 cui/source/dialogs/SpellDialog.cxx |2 -
 cui/source/dialogs/colorpicker.cxx |6 +--
 cui/source/dialogs/cuigrfflt.cxx   |4 --
 cui/source/dialogs/hlmarkwn.cxx|2 -
 cui/source/options/optcolor.cxx|2 -
 cui/source/tabpages/autocdlg.cxx   |2 -
 cui/source/tabpages/backgrnd.cxx   |2 -
 cui/source/tabpages/grfpage.cxx|2 -
 dbaccess/source/ui/control/curledit.cxx|2 -
 dbaccess/source/ui/control/tabletree.cxx   |2 -
 dbaccess/source/ui/dlg/indexfieldscontrol.cxx  |2 -
 desktop/source/deployment/gui/dp_gui_dialog2.cxx   |4 --
 desktop/source/deployment/gui/dp_gui_extlistbox.cxx|2 -
 desktop/source/deployment/gui/license_dialog.cxx   |2 -
 extensions/source/propctrlr/taborder.cxx   |3 -
 extensions/source/scanner/sanedlg.cxx  |2 -
 formula/source/ui/dlg/funcutl.cxx  |2 -
 include/vcl/builder.hxx|4 +-
 include/vcl/builderfactory.hxx |9 ++--
 sc/source/ui/cctrl/editfield.cxx   |2 -
 sc/source/ui/condformat/condformatdlg.cxx  |2 -
 sc/source/ui/dbgui/pvfundlg.cxx|2 -
 sc/source/ui/dbgui/validate.cxx|2 -
 sc/source/ui/miscdlgs/tabbgcolordlg.cxx|2 -
 sc/source/ui/pagedlg/tphfedit.cxx  |2 -
 sd/source/filter/html/htmlattr.cxx |2 -
 sd/source/ui/dlg/RemoteDialogClientBox.cxx |2 -
 sd/source/ui/dlg/dlgassim.cxx  |2 -
 sd/source/ui/dlg/dlgctrls.cxx  |2 -
 sd/source/ui/dlg/docprev.cxx   |2 -
 sd/source/ui/dlg/sdtreelb.cxx  |2 -
 sd/source/ui/table/TableDesignPane.cxx |2 -
 sfx2/source/appl/newhelp.cxx   |   18 -
 sfx2/source/control/templateremoteview.cxx |2 -
 sfx2/source/doc/new.cxx|2 -
 starmath/source/dialog.cxx |7 +--
 svtools/source/contnr/fileview.cxx |6 ---
 svtools/source/contnr/svtabbx.cxx  |2 -
 svtools/source/contnr/treelistbox.cxx  |2 -
 svtools/source/control/ctrlbox.cxx |   20 +-
 svtools/source/control/inettbc.cxx |4 +-
 svtools/source/control/urlcontrol.cxx  |4 +-
 svtools/source/control/valueset.cxx|2 -
 svx/source/dialog/checklbx.cxx |2 -
 svx/source/dialog/connctrl.cxx |2 -
 svx/source/dialog/dlgctrl.cxx  |   24 ++---
 svx/source/dialog/fntctrl.cxx  |3 -
 svx/source/dialog/fontlb.cxx   |2 -
 svx/source/dialog/frmdirlbox.cxx   |4 +-
 svx/source/dialog/frmsel.cxx   |2 -
 svx/source/dialog/graphctl.cxx |2 -
 svx/source/dialog/langbox.cxx  |8 ++--
 svx/source/dialog/measctrl.cxx |2 -
 svx/source/dialog/relfld.cxx   |   15 +++-
 svx/source/dialog/txencbox.cxx |9 +---
 svx/source/gallery2/galctrl.cxx|2 -
 svx/source/tbxctrls/SvxColorValueSet.cxx   |2 -
 sw/source/ui/config/optload.cxx|6 +--
 sw/source/ui/dbui/createaddresslistdialog.cxx  |2 -
 sw/source/ui/dbui/mmaddressblockpage.cxx   |4 +-
 sw/source/ui/fldui/FldRefTreeListBox.cxx   |2 -
 sw/source/ui/fldui/fldvar.cxx  |5 +-
 sw/source/ui/index/cnttab.cxx  |2 -
 sw/source/ui/table/tautofmt.cxx

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

[Thorsten Behrens]

 desktop/scripts/soffice.sh |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 27491725a689d98e6b327bd1faaf4258b923783f
Author: Thorsten Behrens 
Date:   Tue May 12 10:36:51 2015 +0200

Fixup my earlier quoting fix.

Change-Id: I9a7afb28e09f7f8aa577e180f647839d67964bdf

diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index 3a83c22..8729368 100755
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -57,7 +57,7 @@ cd "$sd_cwd"
 
 # linked build needs additional settings
 if [ -e "${sd_prog}/ooenv" ] ; then
-. "${sd_prog}/ooenv}"
+. "${sd_prog}/ooenv"
 fi
 
 # try to get some debug output?
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Heena Gupta]

 cui/source/dialogs/multipat.src|5 +
 cui/source/inc/cuires.hrc  |1 
 cui/source/inc/numpages.hxx|5 +
 cui/source/tabpages/numpages.cxx   |  109 +
 cui/uiconfig/ui/pickgraphicpage.ui |   16 -
 5 files changed, 133 insertions(+), 3 deletions(-)

New commits:
commit 511499b3ba08024e3d6853f096ad1d96f96b216d
Author: Heena Gupta 
Date:   Wed May 6 15:14:20 2015 +0530

tdf#91904-Import Image for bullets through "Add and Resize" Button

Change-Id: I25390268da3b16261d054cd4c093b35a9ee3ce26
Reviewed-on: https://gerrit.libreoffice.org/15642
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/source/dialogs/multipat.src b/cui/source/dialogs/multipat.src
index 09b3718..0dfc110 100644
--- a/cui/source/dialogs/multipat.src
+++ b/cui/source/dialogs/multipat.src
@@ -39,4 +39,9 @@ String RID_SVXSTR_MULTIFILE_DBL_ERR
 Text [ en-US ] = "The file %1 already exists." ;
 };
 
+String RID_SVXSTR_ADD_IMAGE
+{
+Text [ en-US ] = "Add Image" ;
+};
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index d6852c3..3214b51 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -208,6 +208,7 @@
 #define RID_SVXSTR_ARCHIVE_TITLE(RID_SVX_START + 484)
 #define RID_SVXSTR_ARCHIVE_HEADLINE (RID_SVX_START + 485)
 #define RID_SVXSTR_MULTIFILE_DBL_ERR(RID_SVX_START + 486)
+#define RID_SVXSTR_ADD_IMAGE(RID_SVX_START + 487)
 
 // script organizer
 #define RID_SVXSTR_DELQUERY (RID_SVX_START + 1027)
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index fdb7219..032ad45 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -31,7 +31,7 @@
 #include 
 #include 
 #include 
-
+#include 
 
 class SvxNumRule;
 class SvxBmpNumValueSet;
@@ -215,6 +215,7 @@ class SvxBitmapPickTabPage : public SfxTabPage
 
 VclPtr  m_pErrorText;
 VclPtr  m_pExamplesVS;
+VclPtr m_pBtBrowseFile;
 
 std::vector aGrfNames;
 OUStringsNumCharFmtName;
@@ -231,6 +232,8 @@ protected:
 DECL_LINK(NumSelectHdl_Impl, void *);
 DECL_LINK(DoubleClickHdl_Impl, void *);
 DECL_LINK(LinkBmpHdl_Impl, void *);
+DECL_LINK(ClickAddBrowseHdl_Impl, void * );
+
 
 public:
 SvxBitmapPickTabPage(vcl::Window* pParent,
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index c6e0f22..07de0c9 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -72,6 +72,15 @@
 #include 
 #include 
 #include 
+#include 
+#include "svx/gallery1.hxx"
+#include "svx/galtheme.hxx"
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 using namespace css;
 using namespace css::uno;
@@ -92,6 +101,8 @@ using namespace css::style;
 
 #define MAX_BMP_WIDTH   16
 #define MAX_BMP_HEIGHT  16
+#define SEARCHPATH_DELIMITER((sal_Unicode)';')
+#define SEARCHFILENAME_DELIMITER((sal_Unicode)'/')
 
 static bool bLastRelative = false;
 static const sal_Char cNumberingType[] = "NumberingType";
@@ -813,8 +824,11 @@ SvxBitmapPickTabPage::SvxBitmapPickTabPage(vcl::Window* 
pParent,
 SetExchangeSupport();
 get(m_pErrorText, "errorft");
 get(m_pExamplesVS, "valueset");
+get(m_pBtBrowseFile, "browseBtn");
+
 m_pExamplesVS->SetSelectHdl(LINK(this, SvxBitmapPickTabPage, 
NumSelectHdl_Impl));
 m_pExamplesVS->SetDoubleClickHdl(LINK(this, SvxBitmapPickTabPage, 
DoubleClickHdl_Impl));
+m_pBtBrowseFile->SetClickHdl(LINK(this, SvxBitmapPickTabPage, 
ClickAddBrowseHdl_Impl));
 
 eCoreUnit = 
rSet.GetPool()->GetMetric(rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE));
 
@@ -856,6 +870,7 @@ void SvxBitmapPickTabPage::dispose()
 pActNum = NULL;
 delete pSaveNum;
 pSaveNum = NULL;
+m_pBtBrowseFile.clear();
 m_pErrorText.clear();
 m_pExamplesVS.clear();
 SfxTabPage::dispose();
@@ -1001,6 +1016,100 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage, 
DoubleClickHdl_Impl)
 return 0;
 }
 
+IMPL_LINK_NOARG(SvxBitmapPickTabPage, ClickAddBrowseHdl_Impl)
+{
+
+sfx2::FileDialogHelper aFileDialog(0, 0);
+aFileDialog.SetTitle(CUI_RES(RID_SVXSTR_ADD_IMAGE));
+if ( aFileDialog.Execute() != ERRCODE_NONE )
+return 0;
+
+OUString aPath = SvtPathOptions().GetGalleryPath();
+OUString aPathToken = aPath.getToken( 1 , SEARCHPATH_DELIMITER );
+
+OUString aUserImageURL = aFileDialog.GetPath();
+
+sal_Int32 nSub = comphelper::string::getTokenCount( aUserImageURL, '/');
+OUString aFileName = aUserImageURL.getToken( nSub-1 , 
SEARCHFILENAME_DELIMITER );
+
+OUString aUserGalleryURL = aPathToken + "/" + aFileName;
+INetURLObject aURL( aUserImageURL );
+DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NotValid, "invalid URL" );
+
+GraphicDescriptor a

Re: LO 5.0 alpha : erroneous character in soffice script ?

[Thorsten Behrens]

Jean-Baptiste Faure wrote:
> This closing } has been added by this commit:
>
Apologies. Fixup is pushed.

Cheers,

-- Thorsten


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

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

[PriyankaGaikwad]

 include/oox/export/drawingml.hxx   |1 
 oox/source/export/drawingml.cxx|   75 +++--
 sd/qa/unit/data/pptx/bulletMarginAndIndent.pptx|binary
 sd/qa/unit/data/pptx/paraMarginAndIndentation.pptx |binary
 sd/qa/unit/export-tests.cxx|   68 +++
 5 files changed, 138 insertions(+), 6 deletions(-)

New commits:
commit a878ffae876610bf7522d79685b6e07191a88214
Author: PriyankaGaikwad 
Date:   Thu Mar 26 13:41:47 2015 +0530

tdf#90246 PPTX paragraph and bullet leftMargin and Indentation is not 
exported

Problem Description :
XML Difference
Original :


After RT :


Solution : added support for marL and indent for paragraph and bullet.

Change-Id: I1132d7b90ac1d7fc924f9a048f189e07e255e33b
Reviewed-on: https://gerrit.libreoffice.org/15016
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index 24867c2..2707852 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -185,6 +185,7 @@ public:
 void WriteShape3DEffects( ::com::sun::star::uno::Reference< 
::com::sun::star::beans::XPropertySet > rXPropSet );
 void WriteArtisticEffect( ::com::sun::star::uno::Reference< 
::com::sun::star::beans::XPropertySet > rXPropSet );
 OString WriteWdpPicture( const OUString& rFileId, const 
::com::sun::star::uno::Sequence< sal_Int8 >& rPictureData );
+sal_Int32 getBulletMarginIndentation (::com::sun::star::uno::Reference< 
::com::sun::star::beans::XPropertySet > rXPropSet,sal_Int16 nLevel, const 
OUString& propName);
 
 static void ResetCounters();
 
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 2287fdf..36c0a96 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1764,6 +1764,48 @@ void DrawingML::WriteParagraphNumbering( Reference< 
XPropertySet > rXPropSet, sa
 }
 }
 
+sal_Int32 DrawingML::getBulletMarginIndentation (Reference< XPropertySet > 
rXPropSet,sal_Int16 nLevel, const OUString& propName)
+{
+if( nLevel < 0 || !GETA( NumberingRules ) )
+return 0;
+
+Reference< XIndexAccess > rXIndexAccess;
+
+if (!(mAny >>= rXIndexAccess) || nLevel >= rXIndexAccess->getCount())
+return 0;
+
+DBG(fprintf (stderr, "numbering rules\n"));
+
+Sequence aPropertySequence;
+rXIndexAccess->getByIndex(nLevel) >>= aPropertySequence;
+
+if (!aPropertySequence.hasElements())
+return 0;
+
+sal_Int32 nPropertyCount = aPropertySequence.getLength();
+
+const PropertyValue* pPropValue = aPropertySequence.getArray();
+
+sal_Int16 nNumberingType = SVX_NUM_NUMBER_NONE;
+
+for ( sal_Int32 i = 0; i < nPropertyCount; i++ )
+{
+const void* pValue = pPropValue[ i ].Value.getValue();
+if ( pValue )
+{
+OUString aPropName( pPropValue[ i ].Name );
+DBG(fprintf (stderr, "pro name: %s\n", OUStringToOString( 
aPropName, RTL_TEXTENCODING_UTF8 ).getStr()));
+if ( aPropName == propName )
+return *( static_cast(pValue) );
+}
+}
+
+if (nNumberingType == SVX_NUM_NUMBER_NONE)
+return 0;
+
+return 0;
+}
+
 const char* DrawingML::GetAlignment( sal_Int32 nAlignment )
 {
 const char* sAlignment = NULL;
@@ -1832,16 +1874,37 @@ void DrawingML::WriteParagraphProperties( Reference< 
XTextContent > rParagraph )
 }
 }
 
+sal_Int32 nParaLeftMargin = 0;
+sal_Int32 nParaFirstLineIndent = 0;
+
+GET( nParaLeftMargin, ParaLeftMargin );
+GET( nParaFirstLineIndent,ParaFirstLineIndent);
+
+sal_Int32 nLeftMargin =  getBulletMarginIndentation ( rXPropSet, 
nLevel,"LeftMargin");
+sal_Int32 nLineIndentation = getBulletMarginIndentation ( rXPropSet, 
nLevel,"FirstLineOffset");
+
 if( nLevel != -1
 || nAlignment != style::ParagraphAdjust_LEFT
 || bHasLinespacing )
 {
-mpFS->startElementNS( XML_a, XML_pPr,
-  XML_lvl, nLevel > 0 ? I32S( nLevel ) : NULL,
-  XML_marL, NULL,
-  XML_algn, GetAlignment( nAlignment ),
-  XML_rtl, bRtl ? BS(bRtl) : NULL,
-  FSEND );
+if (nParaLeftMargin) // For Paraghraph
+mpFS->startElementNS( XML_a, XML_pPr,
+   XML_lvl, nLevel > 0 ? I32S( nLevel ) : NULL,
+   XML_marL, nParaLeftMargin > 0 ? I32S( 
oox::drawingml::convertHmmToEmu( nParaLeftMargin ) ) : NULL,
+   XML_indent, nParaFirstLineIndent ? I32S( 
oox::drawingml::convertHmmToEmu( nParaFirstLineIndent ) ) : NULL,
+   XML_algn, GetAlignment( nAlignment ),
+   XML_rtl, bRtl ? BS(bRtl) : NULL,
+   

[Libreoffice-commits] core.git: icon-themes/classic icon-themes/galaxy icon-themes/hicontrast icon-themes/human icon-themes/oxygen starmath/inc starmath/Library_sm.mk starmath/source starmath/uiconfig

[Julien Nabet]

 dev/null   |binary
 icon-themes/classic/classic_images.tar.gz  |binary
 starmath/Library_sm.mk |1 
 starmath/UIConfig_smath.mk |1 
 starmath/inc/toolbox.hxx   |   91 --
 starmath/source/document.cxx   |1 
 starmath/source/smdll.cxx  |2 
 starmath/source/toolbox.cxx|  367 -
 starmath/source/toolbox.src|   51 ---
 starmath/source/view.cxx   |   19 -
 starmath/uiconfig/smath/ui/floatingelements.ui |  195 -
 11 files changed, 728 deletions(-)

New commits:
commit 3dfe2fc394ca1e168e800ffcc3ac0f69b4eeb173
Author: Julien Nabet 
Date:   Sat May 2 19:03:21 2015 +0200

tdf#68871: Remove the old Elements panel from Math

Conflicts:
starmath/inc/toolbox.hxx
starmath/source/toolbox.cxx

Change-Id: Ie148d57dc14ed3f38566c24ee027f23e25987810
Reviewed-on: https://gerrit.libreoffice.org/15599
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/icon-themes/classic/classic_images.tar.gz 
b/icon-themes/classic/classic_images.tar.gz
index f013ecb..808223c 100644
Binary files a/icon-themes/classic/classic_images.tar.gz and 
b/icon-themes/classic/classic_images.tar.gz differ
diff --git a/icon-themes/galaxy/starmath/res/im21101.png 
b/icon-themes/galaxy/starmath/res/im21101.png
deleted file mode 100644
index dd2a486..000
Binary files a/icon-themes/galaxy/starmath/res/im21101.png and /dev/null differ
diff --git a/icon-themes/galaxy/starmath/res/im21102.png 
b/icon-themes/galaxy/starmath/res/im21102.png
deleted file mode 100644
index f5803af..000
Binary files a/icon-themes/galaxy/starmath/res/im21102.png and /dev/null differ
diff --git a/icon-themes/galaxy/starmath/res/im21103.png 
b/icon-themes/galaxy/starmath/res/im21103.png
deleted file mode 100644
index e1ac12a..000
Binary files a/icon-themes/galaxy/starmath/res/im21103.png and /dev/null differ
diff --git a/icon-themes/galaxy/starmath/res/im21104.png 
b/icon-themes/galaxy/starmath/res/im21104.png
deleted file mode 100644
index 5b68252..000
Binary files a/icon-themes/galaxy/starmath/res/im21104.png and /dev/null differ
diff --git a/icon-themes/galaxy/starmath/res/im21105.png 
b/icon-themes/galaxy/starmath/res/im21105.png
deleted file mode 100644
index 226dcd3..000
Binary files a/icon-themes/galaxy/starmath/res/im21105.png and /dev/null differ
diff --git a/icon-themes/galaxy/starmath/res/im21106.png 
b/icon-themes/galaxy/starmath/res/im21106.png
deleted file mode 100644
index 4278374..000
Binary files a/icon-themes/galaxy/starmath/res/im21106.png and /dev/null differ
diff --git a/icon-themes/galaxy/starmath/res/im21107.png 
b/icon-themes/galaxy/starmath/res/im21107.png
deleted file mode 100644
index 5130d8e..000
Binary files a/icon-themes/galaxy/starmath/res/im21107.png and /dev/null differ
diff --git a/icon-themes/galaxy/starmath/res/im21108.png 
b/icon-themes/galaxy/starmath/res/im21108.png
deleted file mode 100644
index 36e1b7b..000
Binary files a/icon-themes/galaxy/starmath/res/im21108.png and /dev/null differ
diff --git a/icon-themes/galaxy/starmath/res/im21117.png 
b/icon-themes/galaxy/starmath/res/im21117.png
deleted file mode 100644
index db73bf8..000
Binary files a/icon-themes/galaxy/starmath/res/im21117.png and /dev/null differ
diff --git a/icon-themes/galaxy/starmath/res/un21201.png 
b/icon-themes/galaxy/starmath/res/un21201.png
deleted file mode 100644
index 043373c..000
Binary files a/icon-themes/galaxy/starmath/res/un21201.png and /dev/null differ
diff --git a/icon-themes/galaxy/starmath/res/un21202.png 
b/icon-themes/galaxy/starmath/res/un21202.png
deleted file mode 100644
index bc991ee..000
Binary files a/icon-themes/galaxy/starmath/res/un21202.png and /dev/null differ
diff --git a/icon-themes/galaxy/starmath/res/un21203.png 
b/icon-themes/galaxy/starmath/res/un21203.png
deleted file mode 100644
index b90586d..000
Binary files a/icon-themes/galaxy/starmath/res/un21203.png and /dev/null differ
diff --git a/icon-themes/galaxy/starmath/res/un21204.png 
b/icon-themes/galaxy/starmath/res/un21204.png
deleted file mode 100644
index 85c808f..000
Binary files a/icon-themes/galaxy/starmath/res/un21204.png and /dev/null differ
diff --git a/icon-themes/galaxy/starmath/res/un21205.png 
b/icon-themes/galaxy/starmath/res/un21205.png
deleted file mode 100644
index ae04edc..000
Binary files a/icon-themes/galaxy/starmath/res/un21205.png and /dev/null differ
diff --git a/icon-themes/galaxy/starmath/res/un21206.png 
b/icon-themes/galaxy/starmath/res/un21206.png
deleted file mode 100644
index efd102c..000
Binary files a/icon-themes/galaxy/starmath/res/un21206.png and /dev/null differ
diff --git a/icon-themes/galaxy/starmath/res/un21207.png 
b/icon-themes/galaxy/starmath/res/un21207.png
deleted file mode 10

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

[David Tardon]

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

New commits:
commit 7a66dbe982623be620ad6ac426fe689a434e5f51
Author: David Tardon 
Date:   Tue May 12 10:37:53 2015 +0200

java dir for powepc64 and powepc64le can differ

E.g., RHEL >= 7.1 uses ppc64le for reasons listed in
https://bugs.openjdk.java.net/browse/JDK-8073139 .

Change-Id: I982e65cdf9e8a5ed23cf444ccb2aee764c4c

diff --git a/configure.ac b/configure.ac
index 26071dc..55157a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6997,9 +6997,12 @@ then
 powerpc)
 my_java_arch=ppc
 ;;
-powerpc64*)
+powerpc64)
 my_java_arch=ppc64
 ;;
+powerpc64le)
+AS_IF([test -d "$JAVA_HOME/jre/lib/ppc64le"], 
[my_java_arch=ppc64le], [my_java_arch=ppc64])
+;;
 x86_64)
 my_java_arch=amd64
 ;;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 include/vcl/tabctrl.hxx  |9 +
 svtools/source/toolpanel/paneltabbar.cxx |   11 +--
 vcl/source/control/tabctrl.cxx   |9 -
 3 files changed, 18 insertions(+), 11 deletions(-)

New commits:
commit cc5baa41fee257498661320e24169bb3f05391fb
Author: Caolán McNamara 
Date:   Tue May 12 09:53:41 2015 +0100

fix build

Change-Id: I2afc99ec7b54f366044835a8d8e1ceeb1783ca2c

diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx
index b9defc9..4a6a530 100644
--- a/include/vcl/tabctrl.hxx
+++ b/include/vcl/tabctrl.hxx
@@ -34,6 +34,15 @@ class ListBox;
 #define TAB_PAGE_NOTFOUND   ((sal_uInt16)0x)
 #endif /* !TAB_APPEND */
 
+#define TAB_OFFSET  3
+#define TAB_TABOFFSET_X 3
+#define TAB_TABOFFSET_Y 3
+#define TAB_EXTRASPACE_X6
+#define TAB_BORDER_LEFT 1
+#define TAB_BORDER_TOP  1
+#define TAB_BORDER_RIGHT2
+#define TAB_BORDER_BOTTOM   2
+
 class VCL_DLLPUBLIC TabControl : public Control
 {
 private:
diff --git a/svtools/source/toolpanel/paneltabbar.cxx 
b/svtools/source/toolpanel/paneltabbar.cxx
index 4c12b9f..b1f28b5 100644
--- a/svtools/source/toolpanel/paneltabbar.cxx
+++ b/svtools/source/toolpanel/paneltabbar.cxx
@@ -296,7 +296,10 @@ namespace svt
 {
 const ControlState nState( lcl_ItemToControlState( i_nItemFlags ) );
 
-TabitemValue tiValue;
+TabitemValue tiValue(Rectangle(i_rContentArea.Left() + TAB_TABOFFSET_X,
+   i_rContentArea.Right() - 
TAB_TABOFFSET_X,
+   i_rContentArea.Top() + TAB_TABOFFSET_Y,
+   i_rContentArea.Bottom() - 
TAB_TABOFFSET_Y));
 
 Rectangle aBoundingRegion, aContentRegion;
 bool bNativeOK = getTargetDevice().GetNativeControlRegion(
@@ -316,7 +319,11 @@ namespace svt
 {
 const ControlState nState = lcl_ItemToControlState( i_nItemFlags );
 
-TabitemValue tiValue;
+TabitemValue tiValue(Rectangle(i_rContentRect.Left() + TAB_TABOFFSET_X,
+   i_rContentRect.Right() - 
TAB_TABOFFSET_X,
+   i_rContentRect.Top() + TAB_TABOFFSET_Y,
+   i_rContentRect.Bottom() - 
TAB_TABOFFSET_Y));
+
 if ( i_nItemFlags & ITEM_POSITION_FIRST )
 tiValue.mnAlignment |= TABITEM_FIRST_IN_GROUP;
 if ( i_nItemFlags & ITEM_POSITION_LAST )
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 7a0e2a6..e121896 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -70,15 +70,6 @@ struct ImplTabCtrlData
 VclPtr mpListBox;
 };
 
-#define TAB_OFFSET  3
-#define TAB_TABOFFSET_X 3
-#define TAB_TABOFFSET_Y 3
-#define TAB_EXTRASPACE_X6
-#define TAB_BORDER_LEFT 1
-#define TAB_BORDER_TOP  1
-#define TAB_BORDER_RIGHT2
-#define TAB_BORDER_BOTTOM   2
-
 // for the Tab positions
 #define TAB_PAGERECT0x
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'feature/propose-master-cib'

[Jan-Marek Glogowski]

New branch 'feature/propose-master-cib' available with the following commits:
commit 3ba43557dd4e323b5fe14d608241d9174d57ac7b
Author: Jan-Marek Glogowski 
Date:   Mon Dec 16 21:11:14 2013 +0100

Handle fixed page size printer option.

Correctly handle the printer option "fixed page size". If set,
pages are centered and trimmed onto the fixed page, regardless
of the page size option.

(cherry picked from commit b002226b5c9a970960de39be535e97e861860866)

Conflicts:

vcl/source/gdi/print3.cxx

Change-Id: I10f6f5a10268c452847f032e204df8f363be99a1

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky]

 sw/source/core/doc/htmltbl.cxx  |4 
 sw/source/core/docnode/ndcopy.cxx   |   77 +-
 sw/source/core/docnode/ndtbl1.cxx   |   28 +++---
 sw/source/core/edit/acorrect.cxx|   16 +--
 sw/source/core/fields/reffld.cxx|6 -
 sw/source/core/inc/acorrect.hxx |   28 +++---
 sw/source/core/inc/txmsrt.hxx   |6 -
 sw/source/ui/fldui/fldpage.cxx  |2 
 sw/source/uibase/fldui/fldmgr.cxx   |  148 ++--
 sw/source/uibase/inc/fldmgr.hxx |   49 +--
 sw/source/uibase/shells/textsh2.cxx |4 
 11 files changed, 185 insertions(+), 183 deletions(-)

New commits:
commit 443d5205d22aa952f8b6975a96ffe8dc0e24d409
Author: Jan Holesovsky 
Date:   Tue May 12 11:15:13 2015 +0200

sw: Rename a variable.

Change-Id: I1b026273942d325eefdd53f0268e5ca5505ede04

diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index 6ea05f5..f75eedf 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -288,13 +288,13 @@ void SwGetRefField::UpdateField( const SwTxtFld* 
pFldTxtAttr )
 return ;
 }
 // where is the category name (e.g. "Illustration")?
-OUString const sText = pTxtNd->GetTxt();
-const sal_Int32 nCatStart = sText.indexOf(sSetRefName);
+const OUString aText = pTxtNd->GetTxt();
+const sal_Int32 nCatStart = aText.indexOf(sSetRefName);
 const bool bHasCat = nCatStart>=0;
 const sal_Int32 nCatEnd = bHasCat ? nCatStart + sSetRefName.getLength() : 
-1;
 
 // length of the referenced text
-const sal_Int32 nLen = sText.getLength();
+const sal_Int32 nLen = aText.getLength();
 
 // which format?
 switch( GetFormat() )
commit fe036ea3fa0cd594e65f99d9c2ff07c8623e5f5e
Author: Jan Holesovsky 
Date:   Tue May 12 11:11:27 2015 +0200

sw: Prefix LinesAndTable member variables.

Change-Id: Ic5c8e439de38a421e2ac056fc1c11c872cee34f7

diff --git a/sw/source/core/docnode/ndtbl1.cxx 
b/sw/source/core/docnode/ndtbl1.cxx
index fe857d4..3411323 100644
--- a/sw/source/core/docnode/ndtbl1.cxx
+++ b/sw/source/core/docnode/ndtbl1.cxx
@@ -164,12 +164,12 @@ static bool lcl_IsAnLower( const SwTableLine *pLine, 
const SwTableLine *pAssumed
 
 struct LinesAndTable
 {
-std::vector &rLines;
-const SwTable &rTable;
-bool  bInsertLines;
+std::vector &m_rLines;
+const SwTable &m_rTable;
+bool  m_bInsertLines;
 
-LinesAndTable( std::vector &rL, const SwTable &rTbl ) :
-  rLines( rL ), rTable( rTbl ), bInsertLines( true ) {}
+LinesAndTable(std::vector &rL, const SwTable &rTbl) :
+  m_rLines(rL), m_rTable(rTbl), m_bInsertLines(true) {}
 };
 
 bool _FindLine( _FndLine & rLine, LinesAndTable* pPara );
@@ -178,27 +178,27 @@ bool _FindBox( _FndBox & rBox, LinesAndTable* pPara )
 {
 if (!rBox.GetLines().empty())
 {
-pPara->bInsertLines = true;
-for( _FndLine & rFndLine : rBox.GetLines() )
-_FindLine( rFndLine, pPara );
-if ( pPara->bInsertLines )
+pPara->m_bInsertLines = true;
+for (_FndLine & rFndLine : rBox.GetLines())
+_FindLine(rFndLine, pPara);
+
+if (pPara->m_bInsertLines)
 {
 const SwTableLines &rLines = (rBox.GetBox())
 ? rBox.GetBox()->GetTabLines()
-: pPara->rTable.GetTabLines();
+: pPara->m_rTable.GetTabLines();
 if (rBox.GetLines().size() == rLines.size())
 {
 for ( auto pLine : rLines )
-::InsertLine( pPara->rLines, pLine );
+::InsertLine(pPara->m_rLines, pLine);
 }
 else
-pPara->bInsertLines = false;
+pPara->m_bInsertLines = false;
 }
 }
 else if (rBox.GetBox())
 {
-::InsertLine( pPara->rLines,
-  static_cast(rBox.GetBox()->GetUpper()));
+::InsertLine(pPara->m_rLines, 
static_cast(rBox.GetBox()->GetUpper()));
 }
 return true;
 }
commit 6a298f0ef5e2de59cf42decd01cb25230c960f75
Author: Jan Holesovsky 
Date:   Tue May 12 11:05:48 2015 +0200

sw: Prefix _CopyTable member variables.

Change-Id: I12a020f4912921761a8bc4f8913638b5b41a91b5

diff --git a/sw/source/core/docnode/ndcopy.cxx 
b/sw/source/core/docnode/ndcopy.cxx
index 0dd84b4..21dd4b9 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -120,18 +120,18 @@ static bool lcl_SrchNew( const _MapTblFrmFmt& rMap, 
SwFrmFmt** pPara )
 
 struct _CopyTable
 {
-SwDoc* pDoc;
-sal_uLong nOldTblSttIdx;
-_MapTblFrmFmts& rMapArr;
-SwTableLine* pInsLine;
-SwTableBox* pInsBox;
-SwTableNode *pTblNd;
-const SwTable *pOldTable;
-
-_CopyTable( SwDoc* pDc, _MapTblFrmFmts& rArr, sal_uLong nOldStt,
-SwTa

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

[Arnaud Versini]

 basic/source/comp/scanner.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7ff58e1a8965606a9fb45153a377b84593746420
Author: Arnaud Versini 
Date:   Sun Mar 1 13:23:55 2015 +0100

Basic: Doesn't allow non ASCII characters in numeric literals

Change-Id: I8b7755dbea56953a04cd7687181ec246fc680c43
Reviewed-on: https://gerrit.libreoffice.org/14691
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx
index 13d37c8..2e20a0e 100644
--- a/basic/source/comp/scanner.cxx
+++ b/basic/source/comp/scanner.cxx
@@ -438,7 +438,7 @@ bool SbiScanner::NextSym()
 // e.g. -2,147,483,648 through 2,147,483,647 (signed)
 sal_uInt64 lu = 0;
 bool bOverflow = false;
-while(nCol < aLine.getLength() &&  
theBasicCharClass::get().isAlphaNumeric(aLine[nCol], bCompatible))
+while(nCol < aLine.getLength() &&  
theBasicCharClass::get().isAlphaNumeric(aLine[nCol], false))
 {
 sal_Unicode ch = rtl::toAsciiUpperCase(aLine[nCol]);
 ++pLine; ++nCol;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[yogesh . bharate001]

 sd/qa/unit/data/pptx/n80340.pptx |binary
 sd/qa/unit/import-tests.cxx  |   25 +
 svx/source/table/cell.cxx|2 +-
 3 files changed, 26 insertions(+), 1 deletion(-)

New commits:
commit 4f2c8194f485b1527fb4f4dfe23ce804937f1f9c
Author: yogesh.bharate001 
Date:   Fri Mar 20 20:37:52 2015 +0530

tdf#80340: Table changes format in PPTX format

Problem:
- If the PPTX contains embedded table i.e copied from excel, when we open 
it in
impress it row height increase due to this table format changes.
- Table contents empty row i.e without text, then row height increase 
because
text height is added also added for empty row.

Solution:
- Added check whether row contents text or not.

Change-Id: I9f8a99aa407384505f0075168cf64fd51b8b4c7b
Reviewed-on: https://gerrit.libreoffice.org/14925
Tested-by: Jenkins 
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/sd/qa/unit/data/pptx/n80340.pptx b/sd/qa/unit/data/pptx/n80340.pptx
new file mode 100755
index 000..6702075
Binary files /dev/null and b/sd/qa/unit/data/pptx/n80340.pptx differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index c2f00b9..6b7f993 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -58,6 +58,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -102,6 +103,7 @@ public:
 #endif
 void testBulletSuffix();
 void testBnc910045();
+void testRowHeight();
 
 CPPUNIT_TEST_SUITE(SdImportTest);
 
@@ -140,6 +142,7 @@ public:
 #endif
 CPPUNIT_TEST(testBulletSuffix);
 CPPUNIT_TEST(testBnc910045);
+CPPUNIT_TEST(testRowHeight);
 
 CPPUNIT_TEST_SUITE_END();
 };
@@ -1173,6 +1176,28 @@ void SdImportTest::testBnc910045()
 CPPUNIT_ASSERT_EQUAL(sal_Int32(5210557), nColor);
 }
 
+void SdImportTest::testRowHeight()
+{
+::sd::DrawDocShellRef xDocShRef = loadURL( 
getURLFromSrc("/sd/qa/unit/data/pptx/n80340.pptx"), PPTX );
+
+SdDrawDocument *pDoc = xDocShRef->GetDoc();
+CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
+
+const SdrPage *pPage = pDoc->GetPage(1);
+CPPUNIT_ASSERT_MESSAGE( "no page", pPage != NULL );
+
+sdr::table::SdrTableObj *pTableObj = 
dynamic_cast(pPage->GetObj(0));
+CPPUNIT_ASSERT( pTableObj );
+
+sal_Int32 nHeight;
+const OUString sHeight("Height");
+uno::Reference< com::sun::star::table::XTable > 
xTable(pTableObj->getTable(), uno::UNO_QUERY_THROW);
+uno::Reference< com::sun::star::table::XTableRows > xRows( 
xTable->getRows(), uno::UNO_QUERY_THROW);
+uno::Reference< beans::XPropertySet > xRefRow( xRows->getByIndex(0), 
uno::UNO_QUERY_THROW );
+xRefRow->getPropertyValue( sHeight ) >>= nHeight;
+CPPUNIT_ASSERT_EQUAL( sal_Int32(508), nHeight);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SdImportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 11aedb8..71da0f1 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -727,7 +727,7 @@ sal_Int32 Cell::getMinimumHeight()
 pEditOutliner->SetMaxAutoPaperSize(aSize);
 nMinimumHeight = pEditOutliner->GetTextHeight()+1;
 }
-else /*if ( hasText() )*/
+else if ( hasText() )
 {
 Outliner& rOutliner=rTableObj.ImpGetDrawOutliner();
 rOutliner.SetPaperSize(aSize);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

RE: Color Pallete Issue

[Winfried Donkers]

Hi Vijay,

> Issue: Cannot apply color gradient to text in LO Impress. Also gradient 
> applied to text in ppt is not view-able in LO.
> [When we are select the text in impress and applied color gradient to that 
> text, then the color will be applied to whole page not to that particular 
> selected area .]
> Could you please help me out in figuring where exactly this functionality is 
>taking place so that I can fix this issue.

Do you mean to the text itself, or to the text background? And have filed a bug 
report (with sample documents) that explains the problem with step-by-step 
description of how to reproduce the problem?
That may help to be able to advise where in the code you should look.


> Also any ideas on debugging LibreOffice with switch-over option so that could 
> figure out where exactly this function is getting called.

Possibly I don't get your point, but with gdb you can always switch from 
Impress to gdb command mode with Ctrl-C in the gdb pane.

I hope this helps, and there's always chance an Impress/Draw expert notices 
your request and offers you better suggestions ;)

Winfried

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

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

[Henry Castro]

 sc/inc/sc.hrc |2 
 sc/inc/scabstdlg.hxx  |2 
 sc/source/ui/app/scdll.cxx|1 
 sc/source/ui/attrdlg/scdlgfact.cxx|5 
 sc/source/ui/attrdlg/scdlgfact.hxx|2 
 sc/source/ui/condformat/condformatdlg.cxx |  245 +++---
 sc/source/ui/condformat/condformatmgr.cxx |   70 +---
 sc/source/ui/inc/condformatdlg.hxx|   25 ++-
 sc/source/ui/inc/condformatmgr.hxx|2 
 sc/source/ui/inc/reffact.hxx  |1 
 sc/source/ui/view/cellsh1.cxx |  161 ---
 sc/source/ui/view/reffact.cxx |3 
 sc/source/ui/view/tabvwsh.cxx |1 
 sc/source/ui/view/tabvwshc.cxx|   56 ++
 14 files changed, 437 insertions(+), 139 deletions(-)

New commits:
commit 2b5915da481990fd6ea272104215d82b6fbf5dbb
Author: Henry Castro 
Date:   Thu Jan 29 23:47:00 2015 -0400

tdf#60573 Conditional formatting does not allow scrolling

If you need to apply conditional formatting to a cell not shown presently
on your screen you cannot scroll to the position you would like to use.

Change-Id: I18549316d2c725ce032a65cffb969bed21b771c3
Reviewed-on: https://gerrit.libreoffice.org/14258
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 174db9b..d70f489 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1115,6 +1115,8 @@
 #define RID_POPUPPANEL_APPEARANCE_CELL_LINESTYLE (SC_DIALOGS_START + 162)
 #define RID_POPUPPANEL_APPEARANCE_CELL_BORDERSTYLE (SC_DIALOGS_START + 163)
 
+#define WID_CONDFRMT_REF(SC_DIALOGS_START + 164)
+
 #define SC_DIALOGS_END  
(RID_POPUPPANEL_APPEARANCE_CELL_BORDERSTYLE + 1)
 
 #ifndef STD_MASKCOLOR
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 6e6841b..3fcedfc 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -81,6 +81,8 @@ public:
 virtual ScConditionalFormatList* GetConditionalFormatList() = 0;
 
 virtual bool CondFormatsChanged() = 0;
+
+virtual ScConditionalFormat* GetCondFormatSelected() = 0;
 };
 
 class AbstractScDataPilotDatabaseDlg  :public VclAbstractDialog
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 40765e0..384ae4c 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -278,6 +278,7 @@ void ScDLL::Init()
 
 ScValidityRefChildWin::RegisterChildWindow(false, pMod);
 sc::SearchResultsDlgWrapper::RegisterChildWindow(false, pMod);
+ScCondFormatDlgWrapper::RegisterChildWindow(false, pMod);
 
 // EditEngine Field; insofar not already defined in OfficeApplication::Init
 SvClassManager& rClassManager = SvxFieldItem::GetClassManager();
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 0e142fd..5b9fb73 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -429,6 +429,11 @@ bool 
AbstractScCondFormatManagerDlg_Impl::CondFormatsChanged()
 return pDlg->CondFormatsChanged();
 }
 
+ScConditionalFormat* 
AbstractScCondFormatManagerDlg_Impl::GetCondFormatSelected()
+{
+return pDlg->GetCondFormatSelected();
+}
+
 long AbstractScMetricInputDlg_Impl::GetInputValue( FieldUnit eUnit ) const
 {
 
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx 
b/sc/source/ui/attrdlg/scdlgfact.hxx
index 9f90132..99b9d83 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -131,6 +131,8 @@ class AbstractScCondFormatManagerDlg_Impl : public 
AbstractScCondFormatManagerDl
 virtual ScConditionalFormatList* GetConditionalFormatList() SAL_OVERRIDE;
 
 virtual bool CondFormatsChanged() SAL_OVERRIDE;
+
+virtual ScConditionalFormat* GetCondFormatSelected() SAL_OVERRIDE;
 };
 
 class AbstractScDataPilotDatabaseDlg_Impl  :public 
AbstractScDataPilotDatabaseDlg
diff --git a/sc/source/ui/condformat/condformatdlg.cxx 
b/sc/source/ui/condformat/condformatdlg.cxx
index 2fa4e20..5154830 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -20,6 +20,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "anyrefdg.hxx"
 #include "document.hxx"
@@ -413,19 +414,25 @@ IMPL_LINK_NOARG( ScCondFormatList, ScrollHdl )
 return 0;
 }
 
-//ScCondFormatDlg
-
-ScCondFormatDlg::ScCondFormatDlg(vcl::Window* pParent, ScDocument* pDoc,
+// ---
+// Conditional Format Dialog
+//
+ScCondFormatDlg::ScCondFormatDlg(SfxBindings* pB, SfxChildWindow* pCW,
+vcl::Window* pParent, ScViewData* pViewData,
 const ScConditionalFormat* pFormat, const ScRangeList& rRange,
-const ScAddress& rPos, condformat::dialog::ScCondFormatDialogType eType)
-: ScAnyRefModalDlg(pParent, "ConditionalFormatDialog",
-"modules/scalc/ui/conditionalformatdialog.ui")
+const ScAddress& rPos, condfo

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

[Ravindra_Vidhate]

 include/svx/svxcommands.h |1 +
 include/svx/svxids.hrc|4 +++-
 sc/sdi/cellsh.sdi |1 +
 sc/source/ui/src/popup.src|6 ++
 sc/source/ui/view/cellsh.cxx  |   24 +++-
 sc/source/ui/view/cellsh1.cxx |1 +
 svx/sdi/svx.sdi   |   23 +++
 7 files changed, 58 insertions(+), 2 deletions(-)

New commits:
commit d2ef03ce0b9295034f9078bc04acbf4cfc939ef6
Author: Ravindra_Vidhate 
Date:   Tue May 12 14:17:06 2015 +0530

tdf#84153: "Edit Comment" in context menu when a cell has a comment

Problem Description :
1. When a cell doesn't has comment, the contextual menu shows menu
item "Insert Comment".

2. Also when the cell has the comment, the contextual menu shows
following menu items
"Insert Comment"
"Delete Comment"
"Show Comment"

In the second case mentioned above, the contextual menu should show
the menu item "Edit Comment" instead of "Insert Comment"

XML difference: None
After RT : None

Solution :
In this patch, a new menu item "Edit Comment" have been added. So at the
time of the display it checks whether cell has comment associated with it.
If comments are present for cell, it will display "Edit Comment" in the
contextual menu otherwise "Insert Comment" will be displayed.

TODO: Writing a UT seems to be tricky for this change.
Need to analyze and will raise the UT in separate CL.

Change-Id: Ie0499d02157c4fd18894c5f203c363f64659f3b3
Reviewed-on: https://gerrit.libreoffice.org/15713
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/svx/svxcommands.h b/include/svx/svxcommands.h
index 6516bc8..df3ddee 100644
--- a/include/svx/svxcommands.h
+++ b/include/svx/svxcommands.h
@@ -82,6 +82,7 @@
 #define CMD_SID_GRID_USE".uno:GridUse"
 #define CMD_SID_GRID_VISIBLE".uno:GridVisible"
 #define CMD_SID_INSERT_POSTIT   ".uno:InsertAnnotation"
+#define CMD_SID_EDIT_POSTIT ".uno:InsertAnnotation"
 #define CMD_SID_REPLYTO_POSTIT  ".uno:ReplyToAnnotation"
 #define CMD_SID_RULER   ".uno:ShowRuler"
 #define CMD_SID_DELETE_POSTIT   ".uno:DeleteAnnotation"
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 274cf9a..ed45af0 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -1008,8 +1008,10 @@
 
 #define SID_OBJECT_CROP ( SID_SVX_START + 1147 
)
 
+#define SID_EDIT_POSTIT ( SID_SVX_START + 1148 
)
+
 // IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id
-#define SID_SVX_FIRSTFREE   ( SID_OBJECT_CROP + 1 )
+#define SID_SVX_FIRSTFREE   (SID_EDIT_POSTIT + 1)
 
 // Overflow check for slot IDs
 
diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi
index 7aca440..6da3c75 100644
--- a/sc/sdi/cellsh.sdi
+++ b/sc/sdi/cellsh.sdi
@@ -192,6 +192,7 @@ interface CellSelection
 SID_CHARMAP [ ExecMethod = ExecuteEdit; StateMethod = GetCellState; ]
 
 SID_INSERT_POSTIT   [ ExecMethod = ExecuteEdit; StateMethod = 
GetCellState; ]
+SID_EDIT_POSTIT   [ ExecMethod = ExecuteEdit; StateMethod = GetCellState; ]
 
 SID_COLLABORATION   [ ExecMethod = Execute; ]
 SID_TABOP   [ ExecMethod = ExecuteEdit; StateMethod = 
GetState; ]
diff --git a/sc/source/ui/src/popup.src b/sc/source/ui/src/popup.src
index 16b88c3..7090d0d 100644
--- a/sc/source/ui/src/popup.src
+++ b/sc/source/ui/src/popup.src
@@ -150,6 +150,12 @@ Menu RID_POPUP_CELLS
 };
 MenuItem
 {
+Identifier = SID_EDIT_POSTIT ;
+HelpId = CMD_SID_EDIT_POSTIT ;
+Text [ en-US ] = "Edit Co~mment" ;
+};
+MenuItem
+{
 Identifier = SID_DELETE_NOTE ;
 HelpId = CMD_SID_DELETE_NOTE ;
 Text [ en-US ] = "D~elete Comment" ;
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index c0eac46..b8627ba 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -326,7 +326,29 @@ void ScCellShell::GetCellState( SfxItemSet& rSet )
 break;
 case SID_INSERT_POSTIT:
 {
-if ( pDocShell && pDocShell->IsDocShared() )
+ScAddress aPos( GetViewData()->GetCurX(), 
GetViewData()->GetCurY(), GetViewData()->GetTabNo() );
+if( rDoc.GetNote(aPos) )
+{
+bDisable = true;
+}
+else
+{
+bDisable = false;
+if ( pDocShell && pDocShell->IsDocShared() )
+{
+bDisable = true;
+  

[Libreoffice-commits] core.git: config_host/config_java.h.in configure.ac jvmfwk/inc

[David Tardon]

 config_host/config_java.h.in |6 ++
 configure.ac |3 +++
 jvmfwk/inc/vendorbase.hxx|6 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit d8eee8e4d1a303044bf34b28c2e95bd6da23fd79
Author: David Tardon 
Date:   Tue May 12 12:10:16 2015 +0200

java dir for powepc64 and powepc64le can differ

E.g., RHEL >= 7.1 uses ppc64le for reasons listed in
https://bugs.openjdk.java.net/browse/JDK-8073139 .

This is a follow-up to commit 7a66dbe982623be620ad6ac426fe689a434e5f51.

Change-Id: I685f76d51e9775788a7fb225c6a5e2309a45ceb7

diff --git a/config_host/config_java.h.in b/config_host/config_java.h.in
new file mode 100644
index 000..8b23de9
--- /dev/null
+++ b/config_host/config_java.h.in
@@ -0,0 +1,6 @@
+#ifndef CONFIG_JAVA_H
+#define CONFIG_JAVA_H
+
+#undef JAVA_ARCH
+
+#endif
diff --git a/configure.ac b/configure.ac
index 55157a9..5414754 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7002,6 +7002,7 @@ then
 ;;
 powerpc64le)
 AS_IF([test -d "$JAVA_HOME/jre/lib/ppc64le"], 
[my_java_arch=ppc64le], [my_java_arch=ppc64])
+JAVA_ARCH=$my_java_arch
 ;;
 x86_64)
 my_java_arch=amd64
@@ -7011,6 +7012,7 @@ then
 ;;
 esac
 JAWTLIB="-L$JAVA_HOME/jre/lib/$my_java_arch -ljawt"
+AS_IF([test "$JAVA_ARCH" != ""], [AC_DEFINE_UNQUOTED([JAVA_ARCH], 
["$JAVA_ARCH"])])
 fi
 AC_MSG_RESULT([$JAWTLIB])
 fi
@@ -12988,6 +12990,7 @@ AC_CONFIG_HEADERS([config_host/config_folders.h])
 AC_CONFIG_HEADERS([config_host/config_gcc.h])
 AC_CONFIG_HEADERS([config_host/config_global.h])
 AC_CONFIG_HEADERS([config_host/config_graphite.h])
+AC_CONFIG_HEADERS([config_host/config_java.h])
 AC_CONFIG_HEADERS([config_host/config_lgpl.h])
 AC_CONFIG_HEADERS([config_host/config_liblangtag.h])
 AC_CONFIG_HEADERS([config_host/config_locales.h])
diff --git a/jvmfwk/inc/vendorbase.hxx b/jvmfwk/inc/vendorbase.hxx
index 2ecd01f..a01db56 100644
--- a/jvmfwk/inc/vendorbase.hxx
+++ b/jvmfwk/inc/vendorbase.hxx
@@ -20,6 +20,8 @@
 #ifndef INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_VENDORBASE_HXX
 #define INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_VENDORBASE_HXX
 
+#include "config_java.h"
+
 #include "rtl/ustring.hxx"
 #include "rtl/ref.hxx"
 #include "osl/endian.h"
@@ -31,7 +33,9 @@ namespace jfw_plugin
 
 
 //Used by subclasses of VendorBase to build paths to Java runtime
-#if defined(__sparcv9)
+#if defined(JAVA_ARCH)
+#define JFW_PLUGIN_ARCH JAVA_ARCH
+#elif defined(__sparcv9)
 #define JFW_PLUGIN_ARCH "sparcv9"
 #elif defined SPARC
 #define JFW_PLUGIN_ARCH "sparc"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski]

 sw/qa/extras/rtfimport/data/copypaste-footnote-paste.rtf |3 -
 sw/source/filter/rtf/swparrtf.cxx|   25 ++-
 writerfilter/inc/rtftok/RTFDocument.hxx  |3 +
 writerfilter/source/dmapper/DomainMapper.cxx |3 +
 writerfilter/source/dmapper/DomainMapper_Impl.cxx|4 +-
 writerfilter/source/filter/RtfFilter.cxx |3 +
 writerfilter/source/rtftok/rtfdocumentfactory.cxx|5 +--
 writerfilter/source/rtftok/rtfdocumentimpl.cxx   |   13 ---
 writerfilter/source/rtftok/rtfdocumentimpl.hxx   |6 +++
 9 files changed, 50 insertions(+), 15 deletions(-)

New commits:
commit 0ddd9f9ff45f61013ea18763eca4c68aedce6caa
Author: Mike Kaganski 
Date:   Mon May 11 02:31:39 2015 +1000

tdf#70318: don't forget to clean up second fake paragraph

RTF insert is made into an empty paragraph. To do that, two splits
are made before the insert, but only one is reverted afterwards.
This patch removes the second.

Also fixes a memory leak from unreleased heap object

The corresponding unit test is corrected. It was incorrect
because \par doesn't begin new paragraph; it only ends paragraph.
If a RTF is ended with \par } then no newline is added to its end.
The old unit test only worked because of the bug fixed by this
patch. Correct way of inserting new paragraph in the end of a RTF
is \par \par}

Change-Id: I63d50a940d7960beb35f7d774c833ed8499acbef

diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 648f3ea..f0a1449 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -287,7 +287,7 @@ void SwUiWriterTest::testImportRTF()
 CPPUNIT_ASSERT_EQUAL(sal_uLong(0), aReader.Read(*pRTFReader));
 
 sal_uLong nIndex = pWrtShell->GetCrsr()->GetNode().GetIndex();
-//CPPUNIT_ASSERT_EQUAL(OUString("fooHello world!"), 
pDoc->GetNodes()[nIndex - 1]->GetTxtNode()->GetTxt());
+CPPUNIT_ASSERT_EQUAL(OUString("fooHello world!"), pDoc->GetNodes()[nIndex 
- 1]->GetTxtNode()->GetTxt());
 CPPUNIT_ASSERT_EQUAL(OUString("bar"), 
pDoc->GetNodes()[nIndex]->GetTxtNode()->GetTxt());
 }
 
diff --git a/sw/source/filter/rtf/swparrtf.cxx 
b/sw/source/filter/rtf/swparrtf.cxx
index 2730561b..987fba8 100644
--- a/sw/source/filter/rtf/swparrtf.cxx
+++ b/sw/source/filter/rtf/swparrtf.cxx
@@ -50,7 +50,7 @@ sal_uLong SwRTFReader::Read(SwDoc& rDoc, const OUString& 
/*rBaseURL*/, SwPaM& rP
 // Step 1: XTextRange will be updated when content is inserted, so we know
 // the end position.
 const uno::Reference xInsertPosition = 
SwXTextRange::CreateXTextRange(rDoc, *rPam.GetPoint(), 0);
-SwNodeIndex* pSttNdIdx = new SwNodeIndex(rDoc.GetNodes());
+std::shared_ptr pSttNdIdx(new SwNodeIndex(rDoc.GetNodes()));
 const SwPosition* pPos = rPam.GetPoint();
 
 // Step 2: Split once and remember the node that has been split.
@@ -59,6 +59,8 @@ sal_uLong SwRTFReader::Read(SwDoc& rDoc, const OUString& 
/*rBaseURL*/, SwPaM& rP
 
 // Step 3: Split again.
 rDoc.getIDocumentContentOperations().SplitNode(*pPos, false);
+std::shared_ptr pSttNdIdx2(new SwNodeIndex(rDoc.GetNodes()));
+*pSttNdIdx2 = pPos->nNode.GetIndex();
 
 // Step 4: Insert all content into the new node
 rPam.Move(fnMoveBackward);
@@ -126,6 +128,27 @@ sal_uLong SwRTFReader::Read(SwDoc& rDoc, const OUString& 
/*rBaseURL*/, SwPaM& rP
 }
 }
 
+if (pSttNdIdx2->GetIndex())
+{
+// If we are in insert mode, join the split node that is after
+// the new content with the last new node. Or in other words:
+// Revert the second split node.
+SwTxtNode* pTxtNode = pSttNdIdx2->GetNode().GetTxtNode();
+SwNodeIndex aPrevIdx(*pSttNdIdx2);
+if (pTxtNode && pTxtNode->CanJoinPrev(&aPrevIdx) && 
pSttNdIdx2->GetIndex() - 1 == aPrevIdx.GetIndex())
+{
+// If the last new node isn't empty, convert  the node's text
+// attributes into hints. Otherwise, set the new node's
+// paragraph style at the next (empty) node.
+SwTxtNode* pDelNd = aPrevIdx.GetNode().GetTxtNode();
+if (pTxtNode->GetTxt().getLength())
+pDelNd->FmtToTxtAttr(pTxtNode);
+else
+pTxtNode->ChgFmtColl(pDelNd->GetTxtColl());
+pTxtNode->JoinPrev();
+}
+}
+
 return ret;
 }
 
commit e702c78843e387d83fd9c8fbd1597cbe27e3e656
Author: Miklos Vajna 
Date:   Mon May 11 23:24:22 2015 +0200

tdf#90260 writerfilter: pasted RTF documents may contain no \par

sw core is not yet adapted, will be done in the next commit.

Change-Id: If8da12427e0cdaced4c1c1776b9f0b8cbde5c57c

diff --git a/sw/qa/extras/rtfimport/data/copypaste-footnote-paste.rtf 
b/sw/qa/extras/rtfimport/data/copypaste-footnote-paste.rtf
index 1f4a75e..a7c6bb2 100644
--- a/sw/qa/extras/r

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

[Jan Holesovsky]

 sw/source/core/doc/doc.cxx |4 ++--
 sw/source/core/docnode/nodes.cxx   |   10 +-
 sw/source/core/fields/fldbas.cxx   |6 +++---
 sw/source/core/layout/trvlfrm.cxx  |   12 ++--
 sw/source/core/table/swtable.cxx   |4 ++--
 sw/source/core/undo/SwUndoPageDesc.cxx |   20 ++--
 sw/source/core/unocore/unotbl.cxx  |4 ++--
 7 files changed, 30 insertions(+), 30 deletions(-)

New commits:
commit 54c38ff4780355720f2f6065d7bd542f288a5ec8
Author: Jan Holesovsky 
Date:   Tue May 12 12:40:39 2015 +0200

sw: Rename some variables.

Change-Id: I6cf30f74b8e6f32afed83fec1325ddf4d1f00ced

diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 5eba073..e90448e 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1539,8 +1539,8 @@ bool SwDoc::ConvertFieldsToText()
 aInsertPam.SetMark();
 
 // go to the end of the field
-const SwTxtFld *pTxtField = 
sw::DocumentFieldsManager::GetTxtFldAtPos( *aInsertPam.End() );
-if (pTxtField && pTxtField->Which() == 
RES_TXTATR_INPUTFIELD)
+const SwTxtFld *pFieldAtEnd = 
sw::DocumentFieldsManager::GetTxtFldAtPos(*aInsertPam.End());
+if (pFieldAtEnd && pFieldAtEnd->Which() == 
RES_TXTATR_INPUTFIELD)
 {
 SwPosition &rEndPos = *aInsertPam.GetPoint();
 rEndPos.nContent = SwCrsrShell::EndOfInputFldAtPos( 
*aInsertPam.End() );
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index dd47eab..807100a 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -2118,13 +2118,13 @@ SwNode* SwNodes::FindPrvNxtFrmNode( SwNodeIndex& 
rFrmIdx,
 // Undo when merging a table with one before, if there is 
also one after it.
 // However, if the node is in a table, it needs to be 
returned if the
 // SttNode is a section or a table!
-SwTableNode* pTblNd;
-if( pSttNd->IsTableNode() &&
-0 != ( pTblNd = pFrmNd->FindTableNode() ) &&
+SwTableNode* pTableNode;
+if (pSttNd->IsTableNode() &&
+0 != (pTableNode = pFrmNd->FindTableNode()) &&
 // TABLE IN TABLE:
-pTblNd != 
pSttNd->StartOfSectionNode()->FindTableNode() )
+pTableNode != 
pSttNd->StartOfSectionNode()->FindTableNode())
 {
-pFrmNd = pTblNd;
+pFrmNd = pTableNode;
 rFrmIdx = *pFrmNd;
 }
 else
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index f2d34ad..3024f9c 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -617,10 +617,10 @@ sal_uInt32 
SwValueField::GetSystemFormat(SvNumberFormatter* pFormatter, sal_uInt
 
 OUString sFmt(pEntry->GetFormatstring());
 
-sal_uInt32 nFormat = nFmt;
+sal_uInt32 nTempFormat = nFmt;
 pFormatter->PutandConvertEntry(sFmt, nDummy, nType,
-   nFormat, pEntry->GetLanguage(), 
nLng);
-nFmt = nFormat;
+   nTempFormat, pEntry->GetLanguage(), 
nLng);
+nFmt = nTempFormat;
 }
 else
 nFmt = nNewFormat;
diff --git a/sw/source/core/layout/trvlfrm.cxx 
b/sw/source/core/layout/trvlfrm.cxx
index 076f215..4e37665 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -231,12 +231,12 @@ bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point 
&rPoint,
 }
 }
 
-SwCntntNode* pTextNd = aTextPos.nNode.GetNode( ).GetCntntNode( );
+SwCntntNode* pContentNode = aTextPos.nNode.GetNode().GetCntntNode();
 bool bConsiderBackground = true;
 // If the text position is a clickable field, then that should have 
priority.
-if (pTextNd && pTextNd->IsTxtNode())
+if (pContentNode && pContentNode->IsTxtNode())
 {
-SwTxtNode* pTxtNd = pTextNd->GetTxtNode();
+SwTxtNode* pTxtNd = pContentNode->GetTxtNode();
 SwTxtAttr* pTxtAttr = 
pTxtNd->GetTxtAttrForCharAt(aTextPos.nContent.GetIndex(), RES_TXTATR_FIELD);
 if (pTxtAttr)
 {
@@ -270,9 +270,9 @@ bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point 
&rPoint,
  */
 double nTextDistance = 0;
 bool bValidTextDistance = false;
-if ( pTextNd )
+if (pContentNode)
 {
-SwCntntFrm* pTextFrm = pTextNd->getLayoutFrm( getRootFrm( ) );
+SwCntntFrm* pTextFrm = pConte

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

[Michael Stahl]

 sw/source/core/unocore/unotext.cxx |   16 
 1 file changed, 4 insertions(+), 12 deletions(-)

New commits:
commit 2ed1c696c3a45705d1d5e5f38f8ee7aff48f0436
Author: Michael Stahl 
Date:   Tue May 12 13:05:54 2015 +0200

sw: remove unused pFirstPaM variable in SwXText::convertToTable()

Change-Id: Ic7ddd39334c318ff2b966fe1ff04fb62aa3eed4b

diff --git a/sw/source/core/unocore/unotext.cxx 
b/sw/source/core/unocore/unotext.cxx
index e07403b..488f8e9 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -112,7 +112,6 @@ public:
 void ConvertCell(
 const uno::Sequence< uno::Reference< text::XTextRange > > & rCell,
 ::std::vector & rRowNodes,
-::std::unique_ptr< SwPaM > & rpFirstPaM,
 SwNodeRange *const pLastCell,
 bool & rbExcept);
 
@@ -1817,7 +1816,6 @@ static bool lcl_SimilarPosition( const sal_Int32 nPos1, 
const sal_Int32 nPos2 )
 void SwXText::Impl::ConvertCell(
 const uno::Sequence< uno::Reference< text::XTextRange > > & rCell,
 ::std::vector & rRowNodes,
-::std::unique_ptr< SwPaM > & rpFirstPaM,
 SwNodeRange *const pLastCell,
 bool & rbExcept)
 {
@@ -1978,11 +1976,6 @@ void SwXText::Impl::ConvertCell(
 SwNodeRange aCellRange(aStartCellPam.Start()->nNode,
 aEndCellPam.End()->nNode);
 rRowNodes.push_back(aCellRange); // note: invalidates pLastCell!
-if (!pLastCell)
-{
-assert(!rpFirstPaM);
-rpFirstPaM.reset(new SwPaM(*aStartCellPam.Start()));
-}
 }
 
 typedef uno::Sequence< text::TableColumnSeparator > TableColumnSeparators;
@@ -2232,7 +2225,6 @@ throw (lang::IllegalArgumentException, 
uno::RuntimeException, std::exception)
 //at first collect the text ranges as SwPaMs
 const uno::Sequence< uno::Sequence< uno::Reference< text::XTextRange > > >*
 pTableRanges = rTableRanges.getConstArray();
-std::unique_ptr < SwPaM > pFirstPaM;
 std::vector< std::vector > aTableNodes;
 bool bExcept = false;
 for (sal_Int32 nRow = 0; !bExcept && (nRow < rTableRanges.getLength());
@@ -2250,7 +2242,7 @@ throw (lang::IllegalArgumentException, 
uno::RuntimeException, std::exception)
 ? ((nRow == 0) ? nullptr : 
&*aTableNodes.rbegin()->rbegin())
 : &*aRowNodes.rbegin());
 m_pImpl->ConvertCell(pRow[nCell],
-aRowNodes, pFirstPaM, pLastCell, bExcept);
+aRowNodes, pLastCell, bExcept);
 }
 aTableNodes.push_back(aRowNodes);
 }
commit c74631a0ffd32d3e0794fdd861582ca5b1d55b45
Author: Michael Stahl 
Date:   Tue May 12 13:00:16 2015 +0200

sw: remove redundant parameter of SwXText::Impl::ConvertCell()

Change-Id: I8f435c4a8bb8e2ad118abd001df56162a3996521

diff --git a/sw/source/core/unocore/unotext.cxx 
b/sw/source/core/unocore/unotext.cxx
index 8b3facc..e07403b 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -110,7 +110,6 @@ public:
 throw (lang::IllegalArgumentException, uno::RuntimeException);
 
 void ConvertCell(
-const bool bFirstCell,
 const uno::Sequence< uno::Reference< text::XTextRange > > & rCell,
 ::std::vector & rRowNodes,
 ::std::unique_ptr< SwPaM > & rpFirstPaM,
@@ -1816,7 +1815,6 @@ static bool lcl_SimilarPosition( const sal_Int32 nPos1, 
const sal_Int32 nPos2 )
 }
 
 void SwXText::Impl::ConvertCell(
-const bool bFirstCell,
 const uno::Sequence< uno::Reference< text::XTextRange > > & rCell,
 ::std::vector & rRowNodes,
 ::std::unique_ptr< SwPaM > & rpFirstPaM,
@@ -1905,7 +1903,7 @@ void SwXText::Impl::ConvertCell(
 have to be aligned on paragraph borders by inserting paragraph
 breaks. Non-consecutive ranges must initiate an exception.
  */
-if (bFirstCell)
+if (!pLastCell) // first cell?
 {
 // align the beginning - if necessary
 if (aStartCellPam.Start()->nContent.GetIndex())
@@ -1980,8 +1978,9 @@ void SwXText::Impl::ConvertCell(
 SwNodeRange aCellRange(aStartCellPam.Start()->nNode,
 aEndCellPam.End()->nNode);
 rRowNodes.push_back(aCellRange); // note: invalidates pLastCell!
-if (bFirstCell)
+if (!pLastCell)
 {
+assert(!rpFirstPaM);
 rpFirstPaM.reset(new SwPaM(*aStartCellPam.Start()));
 }
 }
@@ -2250,7 +2249,7 @@ throw (lang::IllegalArgumentException, 
uno::RuntimeException, std::exception)
 (nCell == 0)
 ? ((nRow == 0) ? nullptr : 
&*aTableNodes.rbegin()->rbegin())
 : &*aRowNodes.rbegin());
-m_pImpl->ConvertCell((nCell == 0) && (nRow == 0), pRow[nCell],
+m_pImpl->ConvertCell(pRow[nCell],
 aRowNodes, pFirstPaM, pLastCell, bExcept);
 }
 aTableNodes.push_back(aRowNodes);
commit 36a7ac0de3c97168f401e84f4ce45d1e7a1776c3
Author: Michael Stahl 
Date:   Tue May 12 12

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

[Michael Meeks]

 svtools/source/contnr/treelistbox.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 6e908d3c3f28c507de72579e33c31a99fb4f1ce9
Author: Michael Meeks 
Date:   Tue May 12 12:50:13 2015 +0100

svtools: hold strong VclPtr references for global state.

Change-Id: I55c384495a0b1e0e128ac71ec3ae4afee6964fde

diff --git a/svtools/source/contnr/treelistbox.cxx 
b/svtools/source/contnr/treelistbox.cxx
index 5d7ec97..377244a 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -48,9 +48,8 @@
 using namespace css::accessibility;
 
 // Drag&Drop
-static SvTreeListBox* pDDSource = NULL;
-static SvTreeListBox* pDDTarget = NULL;
-
+static VclPtr pDDSource;
+static VclPtr pDDTarget;
 
 #define SVLBOX_ACC_RETURN 1
 #define SVLBOX_ACC_ESCAPE 2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky]

 sw/source/core/undo/untbl.cxx |  106 +-
 1 file changed, 53 insertions(+), 53 deletions(-)

New commits:
commit 195e7b98a3bdf837215d2c621df29343069f6a0e
Author: Jan Holesovsky 
Date:   Tue May 12 14:02:13 2015 +0200

sw: Prefix _SaveTable member variables.

Change-Id: I202f2fcab01ceb3dbc684a3eb7d7440d6d4ff451

diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index abbd5bd..6e8cd9c 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -114,15 +114,15 @@ class _SaveTable
 {
 friend class _SaveBox;
 friend class _SaveLine;
-SfxItemSet aTblSet;
-_SaveLine* pLine;
-const SwTable* pSwTable;
-SfxItemSets aSets;
-SwFrmFmts aFrmFmts;
-sal_uInt16 nLineCount;
-bool bModifyBox : 1;
-bool bSaveFormula : 1;
-bool bNewModel : 1;
+SfxItemSet m_aTblSet;
+_SaveLine* m_pLine;
+const SwTable* m_pSwTable;
+SfxItemSets m_aSets;
+SwFrmFmts m_aFrmFmts;
+sal_uInt16 m_nLineCount;
+bool m_bModifyBox : 1;
+bool m_bSaveFormula : 1;
+bool m_bNewModel : 1;
 
 public:
 _SaveTable( const SwTable& rTbl, sal_uInt16 nLnCnt = USHRT_MAX,
@@ -137,7 +137,7 @@ public:
 void SaveCntntAttrs( SwDoc* pDoc );
 void CreateNew( SwTable& rTbl, bool bCreateFrms = true,
 bool bRestoreChart = true );
-bool IsNewModel() const { return bNewModel; }
+bool IsNewModel() const { return m_bNewModel; }
 };
 
 class _SaveLine
@@ -864,32 +864,32 @@ void SwUndoTblHeadline::RepeatImpl(::sw::RepeatContext & 
rContext)
 }
 
 _SaveTable::_SaveTable( const SwTable& rTbl, sal_uInt16 nLnCnt, bool bSaveFml )
-: aTblSet( *rTbl.GetFrmFmt()->GetAttrSet().GetPool(), aTableSetRange ),
-pSwTable( &rTbl ), nLineCount( nLnCnt ), bSaveFormula( bSaveFml )
+: m_aTblSet(*rTbl.GetFrmFmt()->GetAttrSet().GetPool(), aTableSetRange),
+  m_pSwTable(&rTbl), m_nLineCount(nLnCnt), m_bSaveFormula(bSaveFml)
 {
-bModifyBox = false;
-bNewModel = rTbl.IsNewModel();
-aTblSet.Put( rTbl.GetFrmFmt()->GetAttrSet() );
-pLine = new _SaveLine( 0, *rTbl.GetTabLines()[ 0 ], *this );
+m_bModifyBox = false;
+m_bNewModel = rTbl.IsNewModel();
+m_aTblSet.Put(rTbl.GetFrmFmt()->GetAttrSet());
+m_pLine = new _SaveLine( 0, *rTbl.GetTabLines()[ 0 ], *this );
 
-_SaveLine* pLn = pLine;
+_SaveLine* pLn = m_pLine;
 if( USHRT_MAX == nLnCnt )
 nLnCnt = rTbl.GetTabLines().size();
 for( sal_uInt16 n = 1; n < nLnCnt; ++n )
 pLn = new _SaveLine( pLn, *rTbl.GetTabLines()[ n ], *this );
 
-aFrmFmts.clear();
-pSwTable = 0;
+m_aFrmFmts.clear();
+m_pSwTable = 0;
 }
 
 _SaveTable::~_SaveTable()
 {
-delete pLine;
+delete m_pLine;
 }
 
 sal_uInt16 _SaveTable::AddFmt( SwFrmFmt* pFmt, bool bIsLine )
 {
-size_t nRet = aFrmFmts.GetPos( pFmt );
+size_t nRet = m_aFrmFmts.GetPos(pFmt);
 if( SIZE_MAX == nRet )
 {
 // Create copy of ItemSet
@@ -903,9 +903,9 @@ sal_uInt16 _SaveTable::AddFmt( SwFrmFmt* pFmt, bool bIsLine 
)
 if( SfxItemState::SET == pSet->GetItemState( RES_BOXATR_FORMULA, true, 
&pItem ))
 {
 pSet->ClearItem( RES_BOXATR_VALUE );
-if( pSwTable && bSaveFormula )
+if (m_pSwTable && m_bSaveFormula)
 {
-SwTableFmlUpdate aMsgHnt( pSwTable );
+SwTableFmlUpdate aMsgHnt(m_pSwTable);
 aMsgHnt.eFlags = TBL_BOXNAME;
 SwTblBoxFormula* pFormulaItem = 
const_cast(static_cast(pItem));
 pFormulaItem->ChgDefinedIn( pFmt );
@@ -913,22 +913,22 @@ sal_uInt16 _SaveTable::AddFmt( SwFrmFmt* pFmt, bool 
bIsLine )
 pFormulaItem->ChgDefinedIn( 0 );
 }
 }
-nRet = aSets.size();
-aSets.push_back( pSet );
-aFrmFmts.insert( aFrmFmts.begin() + nRet, pFmt );
+nRet = m_aSets.size();
+m_aSets.push_back(pSet);
+m_aFrmFmts.insert(m_aFrmFmts.begin() + nRet, pFmt);
 }
 return static_cast(nRet);
 }
 
 void _SaveTable::RestoreAttr( SwTable& rTbl, bool bMdfyBox )
 {
-bModifyBox = bMdfyBox;
+m_bModifyBox = bMdfyBox;
 
 // first, get back attributes of TableFrmFormat
 SwFrmFmt* pFmt = rTbl.GetFrmFmt();
 SfxItemSet& rFmtSet  = (SfxItemSet&)pFmt->GetAttrSet();
 rFmtSet.ClearItem();
-rFmtSet.Put( aTblSet );
+rFmtSet.Put(m_aTblSet);
 
 if( pFmt->IsInCache() )
 {
@@ -947,14 +947,14 @@ void _SaveTable::RestoreAttr( SwTable& rTbl, bool 
bMdfyBox )
 
 // fill FrmFmts with defaults (0)
 pFmt = 0;
-for( size_t n = aSets.size(); n; --n )
-aFrmFmts.push_back( pFmt );
+for (size_t n = m_aSets.size(); n; --n)
+m_aFrmFmts.push_back(pFmt);
 
-const size_t nLnCnt = ( USHRT_MAX == nLineCount )
+const size_t nLnCnt = (USHRT_MAX == m_nLineCount)
 ? rTbl.GetTabLines().size()
-: nLineCount;
+: m_nLineCount;
 
-_

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

[Jan Holesovsky]

 sw/source/uibase/inc/column.hxx |4 ++--
 sw/source/uibase/inc/wrap.hxx   |3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 3d664cc3d9ac4c2b8a6eafc650b434886dfeb29c
Author: Jan Holesovsky 
Date:   Tue May 12 14:10:23 2015 +0200

sw: Rename some variables.

Change-Id: I5b7e0a9d9138dc6b14c74492b2beff70438a7998

diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx
index fda9458..94a3d96 100644
--- a/sw/source/uibase/inc/column.hxx
+++ b/sw/source/uibase/inc/column.hxx
@@ -184,9 +184,9 @@ public:
 void SetFrmMode(bool bMod);
 void SetPageWidth(long nPageWidth);
 
-void SetFormatUsed(bool bFmt)
+void SetFormatUsed(bool bFormatUsed)
 {
-bFormat = bFmt;
+bFormat = bFormatUsed;
 }
 
 void ShowBalance(bool bShow)
diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx
index cf5eda2..8d977c1 100644
--- a/sw/source/uibase/inc/wrap.hxx
+++ b/sw/source/uibase/inc/wrap.hxx
@@ -107,8 +107,7 @@ public:
 
 static const sal_uInt16* GetRanges() { return aWrapPageRg; }
 inline void SetNewFrame(bool bNewFrame) { bNew = bNewFrame; }
-inline void SetFormatUsed(bool bFmt, bool bDrw) { bFormat = bFmt;
-bDrawMode = bDrw; }
+inline void SetFormatUsed(bool bFormatUsed, bool bDrw) { bFormat = 
bFormatUsed; bDrawMode = bDrw; }
 inline void SetShell(SwWrtShell* pSh) { pWrtSh = pSh; }
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 basic/source/classes/sb.cxx |   19 ---
 1 file changed, 16 insertions(+), 3 deletions(-)

New commits:
commit be88e305eeac88e51f83efc004d4b60b87f1e757
Author: Michael Stahl 
Date:   Tue May 12 13:47:38 2015 +0200

tdf#90969: basic: add horrible hack to avoid crash due to ...

... the stupid global variable GaDocBasicItems.

Change-Id: Ib849e0e2b661e54005d00091f6d6fc474dc5549b

diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 559cb3c..a8f1bc6 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -109,10 +110,22 @@ DocBasicItem::DocBasicItem( StarBASIC& rDocBasic ) :
 
 DocBasicItem::~DocBasicItem()
 {
-SolarMutexGuard g;
+// tdf#90969 HACK: don't use SolarMutexGuard - there is a horrible global
+// map GaDocBasicItems holding instances, and these get deleted from exit
+// handlers, when the SolarMutex is already dead
+tools::SolarMutex::Acquire();
 
-stopListening();
-mxClassModules.Clear(); // release with SolarMutex locked
+try
+{
+stopListening();
+mxClassModules.Clear(); // release with SolarMutex locked
+}
+catch (...)
+{
+assert(false);
+}
+
+tools::SolarMutex::Release();
 }
 
 void DocBasicItem::clearDependingVarsOnDelete( StarBASIC& rDeletedBasic )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sc/source/ui/condformat/condformatdlg.cxx |2 +-
 sc/source/ui/inc/condformatdlg.hxx|4 ++--
 sc/source/ui/view/cellsh1.cxx |4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 7f1004ba170df6e7085803c63d0839f85df70349
Author: Stephan Bergmann 
Date:   Tue May 12 14:37:41 2015 +0200

loplugin:salbool etc.

Change-Id: I0cd65a88fba241725476a407143e2d4d03961dc5

diff --git a/sc/source/ui/condformat/condformatdlg.cxx 
b/sc/source/ui/condformat/condformatdlg.cxx
index 5154830..e256f74 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -421,7 +421,7 @@ ScCondFormatDlg::ScCondFormatDlg(SfxBindings* pB, 
SfxChildWindow* pCW,
 vcl::Window* pParent, ScViewData* pViewData,
 const ScConditionalFormat* pFormat, const ScRangeList& rRange,
 const ScAddress& rPos, condformat::dialog::ScCondFormatDialogType eType,
-sal_Bool bManaged)
+bool bManaged)
 : ScAnyRefDlg(pB, pCW, pParent, "ConditionalFormatDialog",
 "modules/scalc/ui/conditionalformatdialog.ui")
 , mbManaged(bManaged)
diff --git a/sc/source/ui/inc/condformatdlg.hxx 
b/sc/source/ui/inc/condformatdlg.hxx
index 676dc4e..5d8391c 100644
--- a/sc/source/ui/inc/condformatdlg.hxx
+++ b/sc/source/ui/inc/condformatdlg.hxx
@@ -110,7 +110,7 @@ private:
 VclPtr mpCondFormList;
 sal_Int32 maKey;
 
-sal_Bool mbManaged;
+bool mbManaged;
 ScAddress maPos;
 ScViewData* mpViewData;
 
@@ -127,7 +127,7 @@ public:
 SC_DLLPUBLIC ScCondFormatDlg(SfxBindings* pB, SfxChildWindow* pCW, 
vcl::Window* pWindow,
  ScViewData* pViewData, const 
ScConditionalFormat* pFormat,
  const ScRangeList& rRange, const ScAddress& 
rPos,
- condformat::dialog::ScCondFormatDialogType 
eType, sal_Bool bManaged);
+ condformat::dialog::ScCondFormatDialogType 
eType, bool bManaged);
 virtual ~ScCondFormatDlg();
 virtual void dispose() SAL_OVERRIDE;
 
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 237028e..32236d9 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -1935,7 +1935,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
 SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame();
 SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId );
 
-pScMod->SetRefDialog( nId, pWnd ? false : sal_True );
+pScMod->SetRefDialog( nId, pWnd == nullptr );
 break;
 }
 
@@ -2057,7 +2057,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
 SfxViewFrame*   pViewFrm = pTabViewShell->GetViewFrame();
 SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId );
 
-pScMod->SetRefDialog( nId, pWnd ? false : sal_True );
+pScMod->SetRefDialog( nId, pWnd == nullptr );
 }
 }
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky]

 sw/source/core/unocore/unotbl.cxx|6 +-
 sw/source/filter/html/htmlctxt.cxx   |7 +--
 sw/source/filter/html/htmldrawreader.cxx |7 +--
 sw/source/filter/html/htmlfld.cxx|   47 ++
 sw/source/filter/html/htmltab.cxx|   30 ++
 sw/source/filter/html/swhtml.cxx |   64 ++-
 sw/source/filter/xml/xmltble.cxx |   24 +--
 7 files changed, 86 insertions(+), 99 deletions(-)

New commits:
commit 3fde334a5ddb340b5ee6510bdb56c1732f554750
Author: Jan Holesovsky 
Date:   Tue May 12 14:42:09 2015 +0200

sw: More variable renaming.

Change-Id: I390b5da7c4d88de3f26c774bc525db823d1d5e96

diff --git a/sw/source/core/unocore/unotbl.cxx 
b/sw/source/core/unocore/unotbl.cxx
index 23b29bb..522886f 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -2988,10 +2988,10 @@ void SwXTextTable::setName(const OUString& rName) 
throw( uno::RuntimeException,
 if(pFmt)
 {
 const OUString aOldName( pFmt->GetName() );
-const SwFrmFmts* pTbl = pFmt->GetDoc()->GetTblFrmFmts();
-for( size_t i = pTbl->size(); i; )
+const SwFrmFmts* pFrameFormats = pFmt->GetDoc()->GetTblFrmFmts();
+for (size_t i = pFrameFormats->size(); i;)
 {
-const SwFrmFmt* pTmpFmt = (*pTbl)[ --i ] ;
+const SwFrmFmt* pTmpFmt = (*pFrameFormats)[--i];
 if( !pTmpFmt->IsDefault() &&
 pTmpFmt->GetName() == rName &&
 pFmt->GetDoc()->IsUsed( *pTmpFmt ))
diff --git a/sw/source/filter/html/htmlctxt.cxx 
b/sw/source/filter/html/htmlctxt.cxx
index a6e77ee..07b6a8d 100644
--- a/sw/source/filter/html/htmlctxt.cxx
+++ b/sw/source/filter/html/htmlctxt.cxx
@@ -142,11 +142,10 @@ void SwHTMLParser::SplitAttrTab( const SwPosition& 
rNewPos )
 
 // alle noch offenen Attribute beenden und hinter der Tabelle
 // neu aufspannen
-_HTMLAttr** pTbl = reinterpret_cast<_HTMLAttr**>(&aAttrTab);
-for( sal_uInt16 nCnt = sizeof( _HTMLAttrTable ) / sizeof( _HTMLAttr* );
-nCnt--; ++pTbl )
+_HTMLAttr** pHTMLAttributes = reinterpret_cast<_HTMLAttr**>(&aAttrTab);
+for (sal_uInt16 nCnt = sizeof(_HTMLAttrTable) / sizeof(_HTMLAttr*); 
nCnt--; ++pHTMLAttributes)
 {
-_HTMLAttr *pAttr = *pTbl;
+_HTMLAttr *pAttr = *pHTMLAttributes;
 while( pAttr )
 {
 _HTMLAttr *pNext = pAttr->GetNext();
diff --git a/sw/source/filter/html/htmldrawreader.cxx 
b/sw/source/filter/html/htmldrawreader.cxx
index 53a1673..2a29c7b 100644
--- a/sw/source/filter/html/htmldrawreader.cxx
+++ b/sw/source/filter/html/htmldrawreader.cxx
@@ -432,11 +432,10 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
 }
 
 // die Attribute der Umgebung am Draw-Objekt setzen
-_HTMLAttr** pTbl = reinterpret_cast<_HTMLAttr**>(&aAttrTab);
-for( sal_uInt16 nCnt = sizeof( _HTMLAttrTable ) / sizeof( _HTMLAttr* );
- nCnt--; ++pTbl )
+_HTMLAttr** pHTMLAttributes = reinterpret_cast<_HTMLAttr**>(&aAttrTab);
+for (sal_uInt16 nCnt = sizeof(_HTMLAttrTable) / sizeof(_HTMLAttr*); 
nCnt--; ++pHTMLAttributes)
 {
-_HTMLAttr *pAttr = *pTbl;
+_HTMLAttr *pAttr = *pHTMLAttributes;
 if( pAttr )
 PutEEPoolItem( aItemSet, pAttr->GetItem() );
 }
diff --git a/sw/source/filter/html/htmlfld.cxx 
b/sw/source/filter/html/htmlfld.cxx
index 9554ab8..a052f71 100644
--- a/sw/source/filter/html/htmlfld.cxx
+++ b/sw/source/filter/html/htmlfld.cxx
@@ -285,7 +285,7 @@ void SwHTMLParser::NewField()
 nWhich = RES_DATETIMEFLD;
 
 SwFieldType* pType = pDoc->getIDocumentFieldsAccess().GetSysFldType( 
nWhich );
-SwField *pFld = 0;
+SwField *pNewField = 0;
 bool bInsOnEndTag = false;
 
 switch( (RES_FIELDS)nType )
@@ -301,8 +301,7 @@ void SwHTMLParser::NewField()
 bInsOnEndTag = true;
 }
 if( pSubOption->GetEnum( nSub, aHTMLExtUsrFldSubTable ) )
-pFld = new SwExtUserField( 
static_cast(pType),
-   nSub, nFmt );
+pNewField = new 
SwExtUserField(static_cast(pType), nSub, nFmt);
 }
 break;
 
@@ -317,7 +316,7 @@ void SwHTMLParser::NewField()
 bInsOnEndTag = true;
 }
 
-pFld = new SwAuthorField( static_cast(pType), 
nFmt );
+pNewField = new 
SwAuthorField(static_cast(pType), nFmt);
 }
 break;
 
@@ -367,11 +366,10 @@ void SwHTMLParser::NewField()
 nNumFmt = pFormatter->GetFormatIndex( pFmtTbl[i].eFmt,
   LANGUAGE_SYSTEM);
 
-pFld = new SwDateTimeField( static_cast(pType),
-  nSub, nNumFmt );
+pNewField = new SwDateTimeField(static_cast(pType), nSub, nNumFmt);
 
 if (nSub & FIXEDFLD)
-   

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

[Michael Stahl]

 vcl/unx/kde4/KDE4FilePicker.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2b999dd6da5a90db66afe852a007fab8c62ffaec
Author: Michael Stahl 
Date:   Tue May 12 14:39:02 2015 +0200

vcl: kde4: loplugin:staticmethods

Change-Id: Ie51eaa11e1ed1e811c9b671c1284f81e1459151d

diff --git a/vcl/unx/kde4/KDE4FilePicker.hxx b/vcl/unx/kde4/KDE4FilePicker.hxx
index 2159e54..98e9af6 100644
--- a/vcl/unx/kde4/KDE4FilePicker.hxx
+++ b/vcl/unx/kde4/KDE4FilePicker.hxx
@@ -221,7 +221,7 @@ private:
 //add a custom control widget to the file dialog
 void addCustomControl(sal_Int16 controlId);
 
-QString getResString( sal_Int16 aRedId );
+static QString getResString( sal_Int16 aRedId );
 
 private Q_SLOTS:
 void cleanupProxy();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

user profile for master / LO 5.0

[Jean-Baptiste Faure]

Hi,

Is it intentional if LO 5.0.0.0.alpha1+ still use .../libreoffice/4 as
user profile directory ?
The problem is that you can't use a LO 4.x profile for LO 4 again once
it has been used by LO 5.

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

Re: user profile for master / LO 5.0

[Stephan Bergmann]

On 05/12/2015 03:12 PM, Jean-Baptiste Faure wrote:

Is it intentional if LO 5.0.0.0.alpha1+ still use .../libreoffice/4 as
user profile directory ?


Yes.  (We discussed it in the ESC and decided to avoid as much technical 
trouble as possible by not needing any migration etc., even at the 
expense of some potential user confusion.)



The problem is that you can't use a LO 4.x profile for LO 4 again once
it has been used by LO 5.


What is the exact problem?  That would not be intentional.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Jan Holesovsky]

 sw/source/uibase/inc/content.hxx|4 ++--
 sw/source/uibase/utlui/numfmtlb.cxx |   30 +++---
 2 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 083b54c7d198ae402e9038a930a66be818475ac3
Author: Jan Holesovsky 
Date:   Tue May 12 15:20:51 2015 +0200

sw: More renaming.

Change-Id: I7f8d0d7285a95899484ec972ae38bdb8543ae2e1

diff --git a/sw/source/uibase/inc/content.hxx b/sw/source/uibase/inc/content.hxx
index 4029997..d065065 100644
--- a/sw/source/uibase/inc/content.hxx
+++ b/sw/source/uibase/inc/content.hxx
@@ -95,10 +95,10 @@ class SwPostItContent : public SwContent
 public:
 SwPostItContent( const SwContentType* pCnt,
 const OUString& rName,
-const SwFmtFld* pField,
+const SwFmtFld* pFormatField,
 long nYPos )
 : SwContent(pCnt, rName, nYPos)
-, pFld(pField)
+, pFld(pFormatField)
 , pRedline(NULL)
 , mbPostIt(true)
 {}
diff --git a/sw/source/uibase/utlui/numfmtlb.cxx 
b/sw/source/uibase/utlui/numfmtlb.cxx
index 953032b..a12a7ce 100644
--- a/sw/source/uibase/utlui/numfmtlb.cxx
+++ b/sw/source/uibase/utlui/numfmtlb.cxx
@@ -52,7 +52,7 @@ using namespace ::com::sun::star::lang;
 /**
  *  Description:
  * nFormatType: Display the formats of this Type
- * nDefFmt: Select this format and possibly insert it
+ * nDefaultFormat: Select this format and possibly insert it
  */
 
 NumFormatListBox::NumFormatListBox(vcl::Window* pWin, WinBits nStyle) :
@@ -270,11 +270,11 @@ void NumFormatListBox::SetFormatType(const short 
nFormatType)
 }
 }
 
-void NumFormatListBox::SetDefFormat(const sal_uLong nDefFmt)
+void NumFormatListBox::SetDefFormat(const sal_uLong nDefaultFormat)
 {
-if (nDefFmt == ULONG_MAX)
+if (nDefaultFormat == ULONG_MAX)
 {
-nDefFormat = nDefFmt;
+nDefFormat = nDefaultFormat;
 return;
 }
 
@@ -291,11 +291,11 @@ void NumFormatListBox::SetDefFormat(const sal_uLong 
nDefFmt)
 pFormatter = rSh.GetNumberFormatter();
 }
 
-short nType = pFormatter->GetType(nDefFmt);
+short nType = pFormatter->GetType(nDefaultFormat);
 
 SetFormatType(nType);
 
-sal_uLong nFormat = pFormatter->GetFormatForLanguageIfBuiltIn(nDefFmt, 
eCurLanguage);
+sal_uLong nFormat = 
pFormatter->GetFormatForLanguageIfBuiltIn(nDefaultFormat, eCurLanguage);
 
 for (sal_Int32 i = 0; i < GetEntryCount(); i++)
 {
@@ -315,11 +315,11 @@ void NumFormatListBox::SetDefFormat(const sal_uLong 
nDefFmt)
 
 if (nType == css::util::NumberFormat::TEXT)
 {
-pFormatter->GetOutputString("\"ABC\"", nDefFmt, sValue, &pCol);
+pFormatter->GetOutputString("\"ABC\"", nDefaultFormat, sValue, &pCol);
 }
 else
 {
-pFormatter->GetOutputString(fValue, nDefFmt, sValue, &pCol);
+pFormatter->GetOutputString(fValue, nDefaultFormat, sValue, &pCol);
 }
 
 sal_Int32 nPos = 0;
@@ -337,15 +337,15 @@ void NumFormatListBox::SetDefFormat(const sal_uLong 
nDefFmt)
 sal_uLong nLongDateFormatForLanguage = 
pFormatter->GetFormatForLanguageIfBuiltIn(nSysLongDateFmt, LANGUAGE_SYSTEM );
 
 if (
- nDefFmt == nSysNumFmt ||
- nDefFmt == nSysShortDateFmt ||
- nDefFmt == nSysLongDateFmt ||
+ nDefaultFormat == nSysNumFmt ||
+ nDefaultFormat == nSysShortDateFmt ||
+ nDefaultFormat == nSysLongDateFmt ||
  (
bSysLang &&
(
- nDefFmt == nNumFormatForLanguage ||
- nDefFmt == nShortDateFormatForLanguage ||
- nDefFmt == nLongDateFormatForLanguage
+ nDefaultFormat == nNumFormatForLanguage ||
+ nDefaultFormat == nShortDateFormatForLanguage ||
+ nDefaultFormat == nLongDateFormatForLanguage
)
  )
)
@@ -354,7 +354,7 @@ void NumFormatListBox::SetDefFormat(const sal_uLong nDefFmt)
 }
 
 nPos = InsertEntry(sValue, nPos);   // Insert as first numeric entry
-SetEntryData(nPos, reinterpret_cast(nDefFmt));
+SetEntryData(nPos, reinterpret_cast(nDefaultFormat));
 SelectEntryPos(nPos);
 nDefFormat = GetFormat();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sfx2/source/sidebar/SidebarController.cxx |   90 --
 1 file changed, 37 insertions(+), 53 deletions(-)

New commits:
commit 0be1277c5ad9f3ea2e8ff78c12431f8c512293cc
Author: Caolán McNamara 
Date:   Thu May 7 14:37:36 2015 +0100

Resolves: tdf#72007: on switching decks keep our left indent, don't assume 0

Change-Id: I878c999611e1294d5107f1cf2c000d9ed5f88cb1
(cherry picked from commit 4073afa350387f9fc9194347ad78c6cbdabbb812)

Related: tdf#72007 align to right if undocked

Change-Id: Ia0af0493e0af6c945006e6a1f6f918f7b104068d
(cherry picked from commit 8b867887022903bc5788b01db51dfcec521dc878)
Reviewed-on: https://gerrit.libreoffice.org/15689
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/sfx2/source/sidebar/SidebarController.cxx 
b/sfx2/source/sidebar/SidebarController.cxx
index 620bfeb..5f275ee 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -344,62 +344,33 @@ void SidebarController::NotifyResize (void)
 if (mpCurrentDeck)
 {
 SfxSplitWindow* pSplitWindow = GetSplitWindow();
-if (pSplitWindow)   //in sidebar mode
+WindowAlign eAlign = pSplitWindow ? pSplitWindow->GetAlign() : 
WINDOWALIGN_RIGHT;
+long nDeckX, nTabX;
+if (eAlign == WINDOWALIGN_LEFT) // attach the Sidebar towards the 
left-side of screen
 {
-// Find out that which side of the Window do we need to attach the 
Sidebar?
-if ( pSplitWindow->GetAlign() == WINDOWALIGN_RIGHT )// 
attach the Sidebar towards the right-side of screen
-{
-// Place the deck first.
-{
-if (bIsDeckVisible)
-{
-mpCurrentDeck->setPosSizePixel(0,0, 
nWidth-nTabBarDefaultWidth, nHeight);
-mpCurrentDeck->Show();
-mpCurrentDeck->RequestLayout();
-}
-else
-mpCurrentDeck->Hide();
-}
-
-// Now place the tab bar.
-
mpTabBar->setPosSizePixel(nWidth-nTabBarDefaultWidth,0,nTabBarDefaultWidth,nHeight);
-mpTabBar->Show();
-}
-else if ( pSplitWindow->GetAlign() == WINDOWALIGN_LEFT) // 
attach the Sidebar towards the left-side of screen
-{
-// Place the tab bar first.
-mpTabBar->setPosSizePixel(0,0,nTabBarDefaultWidth,nHeight);
-mpTabBar->Show();
-
-// Now place the deck.
-if (bIsDeckVisible)
-{
-mpCurrentDeck->setPosSizePixel(nTabBarDefaultWidth,0, 
nWidth-nTabBarDefaultWidth, nHeight);
-mpCurrentDeck->Show();
-mpCurrentDeck->RequestLayout();
-}
-else
-mpCurrentDeck->Hide();
-}
+nDeckX = nTabBarDefaultWidth;
+nTabX = 0;
 }
-else //floating window mode
+else   // attach the Sidebar towards the right-side of screen
 {
-// Place the deck first.
-{
-if (bIsDeckVisible)
-{
-mpCurrentDeck->setPosSizePixel(0,0, 
nWidth-nTabBarDefaultWidth, nHeight);
-mpCurrentDeck->Show();
-mpCurrentDeck->RequestLayout();
-}
-else
-mpCurrentDeck->Hide();
-}
+nDeckX = 0;
+nTabX = nWidth-nTabBarDefaultWidth;
+}
 
-// Now place the tab bar.
-
mpTabBar->setPosSizePixel(nWidth-nTabBarDefaultWidth,0,nTabBarDefaultWidth,nHeight);
-mpTabBar->Show();
+// Place the deck first.
+if (bIsDeckVisible)
+{
+mpCurrentDeck->setPosSizePixel(nDeckX, 0, nWidth - 
nTabBarDefaultWidth, nHeight);
+mpCurrentDeck->Show();
+mpCurrentDeck->RequestLayout();
 }
+else
+mpCurrentDeck->Hide();
+
+// Now place the tab bar.
+mpTabBar->setPosSizePixel(nTabX, 0, nTabBarDefaultWidth, nHeight);
+mpTabBar->Show();
+
 }
 
 // Determine if the closer of the deck can be shown.
@@ -693,11 +664,24 @@ void SidebarController::SwitchToDeck (
 }
 aNewPanels.resize(nWriteIndex);
 
+SfxSplitWindow* pSplitWindow = GetSplitWindow();
+sal_Int32 nTabBarDefaultWidth = TabBar::GetDefaultWidth() * 
mpTabBar->GetDPIScaleFactor();
+WindowAlign eAlign = pSplitWindow ? pSplitWindow->GetAlign() : 
WINDOWALIGN_RIGHT;
+long nDeckX;
+if (eAlign == WINDOWALIGN_LEFT) // attach the Sidebar towards the 
left-side of screen
+{
+nDeckX = nTabBarDefaultWidth;
+}
+else   // attach the Sidebar towards the right-side of s

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

[Jan Holesovsky]

 sw/source/filter/ww8/wrtw8esh.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 247d080b366083b3ee4054675b70af2ccbbb34bf
Author: Jan Holesovsky 
Date:   Tue May 12 15:42:14 2015 +0200

sw: Another rename.

Change-Id: I3d7bf8a5db4dcae4b5653fe5e033bc9e626b7bbf

diff --git a/sw/source/filter/ww8/wrtw8esh.cxx 
b/sw/source/filter/ww8/wrtw8esh.cxx
index 4fec434..10f2559 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -929,13 +929,13 @@ bool PlcDrawObj::Append( WW8Export& rWrt, WW8_CP nCp, 
const sw::Frame& rFmt,
 const Point& rNdTopLeft )
 {
 bool bRet = false;
-const SwFrmFmt &rFormat = rFmt.GetFrmFmt();
+const SwFrmFmt &rFrameFormat = rFmt.GetFrmFmt();
 if (TXT_HDFT == rWrt.m_nTxtTyp || TXT_MAINTEXT == rWrt.m_nTxtTyp)
 {
-if (RES_FLYFRMFMT == rFormat.Which())
+if (RES_FLYFRMFMT == rFrameFormat.Which())
 {
 // check for textflyframe and if it is the first in a Chain
-if (rFormat.GetCntnt().GetCntntIdx())
+if (rFrameFormat.GetCntnt().GetCntntIdx())
 bRet = true;
 }
 else
@@ -944,7 +944,7 @@ bool PlcDrawObj::Append( WW8Export& rWrt, WW8_CP nCp, const 
sw::Frame& rFmt,
 
 if (bRet)
 {
-DrawObj aObj(rFmt, nCp, rNdTopLeft, rWrt.TrueFrameDirection(rFormat),
+DrawObj aObj(rFmt, nCp, rNdTopLeft, 
rWrt.TrueFrameDirection(rFrameFormat),
 rWrt.GetHdFtIndex());
 maDrawObjs.push_back(aObj);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: user profile for master / LO 5.0

[Jean-Baptiste Faure]

Le 12/05/2015 15:18, Stephan Bergmann a écrit :
> On 05/12/2015 03:12 PM, Jean-Baptiste Faure wrote:
>> Is it intentional if LO 5.0.0.0.alpha1+ still use .../libreoffice/4 as
>> user profile directory ?
> 
> Yes.  (We discussed it in the ESC and decided to avoid as much technical
> trouble as possible by not needing any migration etc., even at the
> expense of some potential user confusion.)

Ok.
> 
>> The problem is that you can't use a LO 4.x profile for LO 4 again once
>> it has been used by LO 5.
> 
> What is the exact problem?  That would not be intentional.

LO 4 refused to start. Seems to have been a temporary bug because I just
tried again and it seems to work without problem. I will do more tests
this evening.

Best regards.
JBF

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

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

[Miklos Vajna]

 sw/qa/extras/rtfimport/data/tdf90260-nopar.rtf |2 ++
 sw/qa/extras/rtfimport/data/tdf90260-par.rtf   |2 ++
 sw/qa/extras/rtfimport/rtfimport.cxx   |   18 ++
 3 files changed, 22 insertions(+)

New commits:
commit 8931abc0b9fded1ee78eca6bf28e8d2438a76add
Author: Miklos Vajna 
Date:   Tue May 12 15:45:53 2015 +0200

tdf#90260 testcase

Change-Id: I06a5ff604e6782863c4a2d6e002c9d67d42912fb

diff --git a/sw/qa/extras/rtfimport/data/tdf90260-nopar.rtf 
b/sw/qa/extras/rtfimport/data/tdf90260-nopar.rtf
new file mode 100644
index 000..c54eedd
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/tdf90260-nopar.rtf
@@ -0,0 +1,2 @@
+{\rtf1\ansi\ansicpg1252\deff0\deflang1035{\fonttbl{\f0\fnil\fcharset0 
Calibri;}}
+\uc1\pard\sa200\sl276\slmult1\lang11\f0\fs22 simple}
diff --git a/sw/qa/extras/rtfimport/data/tdf90260-par.rtf 
b/sw/qa/extras/rtfimport/data/tdf90260-par.rtf
new file mode 100644
index 000..e2115b6
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/tdf90260-par.rtf
@@ -0,0 +1,2 @@
+{\rtf1\ansi\ansicpg1252\deff0\deflang1035{\fonttbl{\f0\fnil\fcharset0 
Calibri;}}
+\uc1\pard\sa200\sl276\slmult1\lang11\f0\fs22 simple\par}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index adbd74f..fff3c7d 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2270,6 +2270,24 @@ DECLARE_RTFIMPORT_TEST(testTdf91074, "tdf91074.rtf")
 CPPUNIT_ASSERT_EQUAL(static_cast(COL_LIGHTRED), 
getProperty(xShape, "TopBorder").Color);
 }
 
+DECLARE_RTFIMPORT_TEST(testTdf90260Nopar, "hello.rtf")
+{
+uno::Reference xTextDocument(mxComponent, 
uno::UNO_QUERY);
+uno::Reference xText(xTextDocument->getText(), 
uno::UNO_QUERY);
+uno::Reference xEnd = xText->getEnd();
+paste("tdf90260-nopar.rtf", xEnd);
+CPPUNIT_ASSERT_EQUAL(1, getParagraphs());
+}
+
+DECLARE_RTFIMPORT_TEST(testTdf90260Par, "hello.rtf")
+{
+uno::Reference xTextDocument(mxComponent, 
uno::UNO_QUERY);
+uno::Reference xText(xTextDocument->getText(), 
uno::UNO_QUERY);
+uno::Reference xEnd = xText->getEnd();
+paste("tdf90260-par.rtf", xEnd);
+CPPUNIT_ASSERT_EQUAL(2, getParagraphs());
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Crash test update

[Crashtest VM]

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


exportCrashes.csv
Description: Binary data


importCrash.csv
Description: Binary data


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

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

[Philippe Jung]

 basic/source/runtime/methods.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2bb4d6cad41765db299db45511d2554984666085
Author: Philippe Jung 
Date:   Tue May 12 15:50:29 2015 +0200

Missing disposeAndClear in MsgBox basic function

Change-Id: Ida3d792a6f3797a6173b31b86a49b72ad7353340
Reviewed-on: https://gerrit.libreoffice.org/15717
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index d05c3fa..377b66c 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -4649,6 +4649,7 @@ RTLFUNC(MsgBox)
 nMappedRet = nButtonMap[ nRet ];
 }
 rPar.Get(0)->PutInteger( nMappedRet );
+pBox.disposeAndClear();
 }
 
 RTLFUNC(SetAttr)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky]

 sw/source/ui/chrdlg/swuiccoll.cxx |4 ++--
 sw/source/ui/fldui/fldvar.cxx |8 
 sw/source/ui/frmdlg/frmpage.cxx   |   10 +-
 sw/source/ui/table/tabledlg.cxx   |   10 +-
 sw/source/ui/table/tautofmt.cxx   |4 ++--
 5 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit 2a2a180d610eb92a6d856336527f3f8388244832
Author: Jan Holesovsky 
Date:   Tue May 12 16:17:43 2015 +0200

sw: Hopefully the last round of renames.

Change-Id: I85eb5e9ca018afa25a06947eed5af1ab529dd65d

diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx 
b/sw/source/ui/chrdlg/swuiccoll.cxx
index 3757b44..6989e6e 100644
--- a/sw/source/ui/chrdlg/swuiccoll.cxx
+++ b/sw/source/ui/chrdlg/swuiccoll.cxx
@@ -295,9 +295,9 @@ IMPL_LINK( SwCondCollPage, SelectHdl, ListBox*, pBox)
 return 0;
 }
 
-void SwCondCollPage::SetCollection( SwFmt* pFormat, bool bNew )
+void SwCondCollPage::SetCollection(SwFmt* pNewFormat, bool bNew)
 {
-pFmt = pFormat;
+pFmt = pNewFormat;
 bNewTemplate = bNew;
 }
 
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index 615ff1e..72bfdcf 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -1024,14 +1024,14 @@ IMPL_LINK_TYPED( SwFldVarPage, TBClickHdl, ToolBox *, 
pBox, void )
 {
 if (nNumFormatPos != LISTBOX_ENTRY_NOTFOUND)
 {
-sal_uLong nFmt = nNumFormatPos == 0 ? 0 : 
m_pNumFormatLB->GetFormat();
-if (nFmt)
+sal_uLong nNumberFormat = nNumFormatPos == 0 ? 0 : 
m_pNumFormatLB->GetFormat();
+if (nNumberFormat)
 {   // Switch language to office-language because 
Kalkulator expects
 // String in office format and it should be fed 
into dialog like
 // that
-nFmt = 
SwValueField::GetSystemFormat(pSh->GetNumberFormatter(), nFmt);
+nNumberFormat = 
SwValueField::GetSystemFormat(pSh->GetNumberFormatter(), nNumberFormat);
 }
-
static_cast(pType)->SetContent(m_pValueED->GetText(), nFmt);
+
static_cast(pType)->SetContent(m_pValueED->GetText(), 
nNumberFormat);
 static_cast(pType)->SetType(
 nNumFormatPos == 0 ? nsSwGetSetExpType::GSE_STRING 
: nsSwGetSetExpType::GSE_EXPR );
 }
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 17e23f5..faa0ff4 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -2358,10 +2358,10 @@ void SwFrmPage::Init(const SfxItemSet& rSet, bool 
bReset)
 m_pRelHeightRelationLB->SelectEntryPos(0);
 }
 
-void SwFrmPage::SetFormatUsed(bool bFmt)
+void SwFrmPage::SetFormatUsed(bool bFormatUsed)
 {
-bFormat = bFmt;
-if(bFormat)
+bFormat = bFormatUsed;
+if (bFormat)
 {
 m_pAnchorFrame->Hide();
 }
@@ -3210,9 +3210,9 @@ IMPL_LINK_NOARG(SwFrmAddPage, EditModifyHdl)
 return 0;
 }
 
-void SwFrmAddPage::SetFormatUsed(bool bFmt)
+void SwFrmAddPage::SetFormatUsed(bool bFormatUsed)
 {
-bFormat = bFmt;
+bFormat = bFormatUsed;
 if (bFormat)
 {
 pNameFrame->Hide();
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 30f5dd4..19b3b79 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -984,7 +984,7 @@ void   SwTableColumnPage::ModifyHdl( MetricField* pField )
 UpdateCols( aValueTbl[i] );
 }
 
-void   SwTableColumnPage::UpdateCols( sal_uInt16 nAktPos )
+void SwTableColumnPage::UpdateCols( sal_uInt16 nAktPos )
 {
 SwTwips nSum = 0;
 
@@ -994,10 +994,10 @@ void   SwTableColumnPage::UpdateCols( sal_uInt16 nAktPos )
 }
 SwTwips nDiff = nSum - nTableWidth;
 
-bool bModifyTable = m_pModifyTableCB->IsChecked();
+bool bModifyTableChecked = m_pModifyTableCB->IsChecked();
 bool bProp =m_pProportionalCB->IsChecked();
 
-if(!bModifyTable && !bProp )
+if (!bModifyTableChecked && !bProp)
 {
 //The table width is constant, the difference is balanced with the 
other columns
 sal_uInt16 nLoopCount = 0;
@@ -1037,7 +1037,7 @@ void   SwTableColumnPage::UpdateCols( sal_uInt16 nAktPos )
 }
 }
 }
-else if(bModifyTable && !bProp)
+else if (bModifyTableChecked && !bProp)
 {
 //Difference is balanced by the width of the table,
 //other columns remain unchanged.
@@ -1053,7 +1053,7 @@ void   SwTableColumnPage::UpdateCols( sal_uInt16 nAktPos )
 nTableWidth += nDiff;
 }
 }
-else if(bModifyTable && bProp)
+else if (bModifyTableChecked && bProp)
 {
 //All columns will be changed proportionally with,
 //the table width is adjusted accordingly.
diff --git

Re: user profile for master / LO 5.0

[Stephan Bergmann]

On 05/12/2015 03:51 PM, Jean-Baptiste Faure wrote:

Le 12/05/2015 15:18, Stephan Bergmann a écrit :

On 05/12/2015 03:12 PM, Jean-Baptiste Faure wrote:

The problem is that you can't use a LO 4.x profile for LO 4 again once
it has been used by LO 5.


What is the exact problem?  That would not be intentional.


LO 4 refused to start. Seems to have been a temporary bug because I just
tried again and it seems to work without problem. I will do more tests
this evening.


Might have been related to what happened to get fixed yesterday with 
 
"Add back functionality erroneously removed," where before that fix 
old-style .rdb files generated by LO master were broken and could not be 
read by older LO versions.

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

[Libreoffice-commits] core.git: bin/rename-sw-abbreviations.sh

[Jan Holesovsky]

 bin/rename-sw-abbreviations.sh |   43 +
 1 file changed, 43 insertions(+)

New commits:
commit c4e59041660f10a5a410ec6930db3e524439e4d4
Author: Jan Holesovsky 
Date:   Tue May 12 16:22:46 2015 +0200

sw: Script to rename the most annoying abbrvs in Writer.

Change-Id: I8d09d7f1a307cd5026fd007a2c82b21de925145e

diff --git a/bin/rename-sw-abbreviations.sh b/bin/rename-sw-abbreviations.sh
new file mode 100755
index 000..aea9604
--- /dev/null
+++ b/bin/rename-sw-abbreviations.sh
@@ -0,0 +1,43 @@
+#! /bin/bash
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# This script renames the most annoying abbreviations in Writer (and partially
+# in the shared code too).  Just run it in the source directory.
+
+# sw only:
+
+for I in "FrmFmt/FrameFormat" "Fmt/Format" "Cntnt/Content" "Txt/Text" 
"Tbl/Table" "GotoFld/GotoFormatField" "Fld/Field" "Ftn/Footnote" "Updt/Update" 
"Fml/Formula" "Hnt/Hint"
+do
+S="${I%/*}"
+# change all except the filenames (in the .mk and in #include)
+# also avoid XML_numFmt, that's a token name
+git grep -l "$S" sw/ | grep -v '\.mk' | xargs sed -i 
'/\(#include\|XML_numFmt\)/ !{ s/'"$I"'/g }'
+done
+
+# global:
+
+for I in "SvxSwAutoFmtFlags/SvxSwAutoFormatFlags" 
"GetCharFmtName/GetCharFormatName" \
+"SvxFmtBreakItem/SvxFormatBreakItem" "SvxFmtKeepItem/SvxFormatKeepItem" \
+"SvxFmtSplitItem/SvxFormatSplitItem" "etTxtLeft/etTextLeft" \
+"etTxtFirstLineOfst/etTextFirstLineOfst" "CntntProtected/ContentProtected" 
\
+"etTxtColor/etTextColor" "ClearFldColor/ClearFieldColor" \
+"etCntntProtect/etContentProtect" 
"etPropTxtFirstLineOfst/etPropTextFirstLineOfst" \
+"etCharFmtName/etCharFormatName" "HasMergeFmtTbl/HasMergeFormatTable" \
+"etMergeFmtIndex/etMergeFormatIndex" "bAFmtByInput/bAFormatByInput" \
+"bAFmt/bAFormat" "IsTxtFmt/IsTextFormat" "BuildWhichTbl/BuildWhichTable" \
+"etFld/etField" "IsAutoFmtByInput/IsAutoFormatByInput" \
+"etAutoFmtByInput/etAutoFormatByInput" "etMacroTbl/etMacroTable" \
+"SvxClipboardFmtItem/SvxClipboardFormatItem" 
"SwFlyFrmFmt/SwFlyFrameFormat" \
+"etTxtSize/etTextSize"
+do
+S="${I%/*}"
+git grep -l "$S" | grep -v '\.mk' | xargs sed -i "s/$I/g"
+done
+
+# vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/rename-sw-abbreviations.sh

[Jan Holesovsky]

 bin/rename-sw-abbreviations.sh |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 44067f6f2ca09e53a3195553637aea97fcb23239
Author: Jan Holesovsky 
Date:   Tue May 12 16:36:13 2015 +0200

rename-sw-abbreviations.sh: Avoid changing itself.

Change-Id: Ifbcd57a6ecbea67eefc89c2bbd72967b683362a3

diff --git a/bin/rename-sw-abbreviations.sh b/bin/rename-sw-abbreviations.sh
index aea9604..3fb4f56 100755
--- a/bin/rename-sw-abbreviations.sh
+++ b/bin/rename-sw-abbreviations.sh
@@ -37,7 +37,7 @@ for I in "SvxSwAutoFmtFlags/SvxSwAutoFormatFlags" 
"GetCharFmtName/GetCharFormatN
 "etTxtSize/etTextSize"
 do
 S="${I%/*}"
-git grep -l "$S" | grep -v '\.mk' | xargs sed -i "s/$I/g"
+git grep -l "$S" | grep -v -e '\.mk' -e 'rename-sw-abbreviations.sh' | 
xargs sed -i "s/$I/g"
 done
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/rename-sw-abbreviations.sh

[Jan Holesovsky]

 bin/rename-sw-abbreviations.sh |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c326b9daaa58e2177c0a48fc03a34e7830997fab
Author: Jan Holesovsky 
Date:   Tue May 12 17:01:09 2015 +0200

rename-sw-abbreviations.sh: Don't change the test documents.

Change-Id: I772d04cbc2ec02438c59024ed83d810557ad4da3

diff --git a/bin/rename-sw-abbreviations.sh b/bin/rename-sw-abbreviations.sh
index 3fb4f56..ccaab39 100755
--- a/bin/rename-sw-abbreviations.sh
+++ b/bin/rename-sw-abbreviations.sh
@@ -17,7 +17,7 @@ do
 S="${I%/*}"
 # change all except the filenames (in the .mk and in #include)
 # also avoid XML_numFmt, that's a token name
-git grep -l "$S" sw/ | grep -v '\.mk' | xargs sed -i 
'/\(#include\|XML_numFmt\)/ !{ s/'"$I"'/g }'
+git grep -l "$S" sw/ | grep -v -e '\.mk' -e '/data/' | xargs sed -i 
'/\(#include\|XML_numFmt\)/ !{ s/'"$I"'/g }'
 done
 
 # global:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 external/libexttextcat/ExternalProject_exttextcat.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ce30343fcbee32d002181bf69dd3e935e4072193
Author: Michael Stahl 
Date:   Tue May 12 17:05:43 2015 +0200

exttextcat: suppress -Qunused-arguments warning for Apple clang

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

diff --git a/external/libexttextcat/ExternalProject_exttextcat.mk 
b/external/libexttextcat/ExternalProject_exttextcat.mk
index 89bd169..fdad93b 100644
--- a/external/libexttextcat/ExternalProject_exttextcat.mk
+++ b/external/libexttextcat/ExternalProject_exttextcat.mk
@@ -18,7 +18,8 @@ $(call gb_ExternalProject_get_state_target,exttextcat,build):
./configure --disable-shared --with-pic \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_DEBUG_CFLAGS) 
$(gb_COMPILEROPTFLAGS) \
-   $(if $(filter AIX,$(OS)),-D_LINUX_SOURCE_COMPAT)" \
+   $(if $(COM_GCC_IS_CLANG),-Qunused-arguments) \
+   $(if $(filter AIX,$(OS)),-D_LINUX_SOURCE_COMPAT)" \
&& $(MAKE) \
)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/qa/extras/rtfimport/rtfimport.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 8f822faa709b85c282ccc25b1e6988d26fc5a6f5
Author: Miklos Vajna 
Date:   Tue May 12 17:22:16 2015 +0200

CppunitTest_sw_rtfimport: error C3861: 'paste': identifier not found

Change-Id: I6abcce4f526834648409ebce17c8b9f13bf956e2

diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index fff3c7d..1a4dbfe 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -91,7 +91,6 @@ public:
 
 protected:
 /// Copy&paste helper.
-#if !defined WNT
 void paste(const OUString& aFilename, uno::Reference 
xTextRange = uno::Reference())
 {
 uno::Reference 
xFilter(m_xSFactory->createInstance("com.sun.star.comp.Writer.RtfFilter"), 
uno::UNO_QUERY_THROW);
@@ -111,7 +110,6 @@ protected:
 }
 xFilter->filter(aDescriptor);
 }
-#endif
 AllSettings m_aSavedSettings;
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/filter/ww8/rtfattributeoutput.cxx |  329 ++--
 1 file changed, 166 insertions(+), 163 deletions(-)

New commits:
commit 67f15c1d7666dc746358d3ac2e4aab400247800e
Author: Caolán McNamara 
Date:   Tue May 12 16:26:21 2015 +0100

avoid crash on export of ooo121238-1.odt to rtf

Change-Id: I2ba426168f861e69ef81850bb23576036b30fc76

diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx 
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index eed6681..a3bbd24 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -1823,182 +1823,185 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const 
sw::Frame& rFrame, const Poin
 uno::Reference< awt::XControlModel > xControlModel =
 pFormObj->GetUnoControlModel();
 uno::Reference< lang::XServiceInfo > xInfo(xControlModel, 
uno::UNO_QUERY);
-uno::Reference xPropSet(xControlModel, 
uno::UNO_QUERY);
-uno::Reference xPropSetInfo = 
xPropSet->getPropertySetInfo();
-OUString sName;
-if 
(xInfo->supportsService("com.sun.star.form.component.CheckBox"))
+if (xInfo.is())
 {
-
-
m_aRun->append(OUStringToOString(OUString(FieldString(ww::eFORMCHECKBOX)), 
m_rExport.eCurrentEncoding));
-m_aRun->append("{" OOO_STRING_SVTOOLS_RTF_IGNORE 
OOO_STRING_SVTOOLS_RTF_FORMFIELD "{");
-m_aRun->append(OOO_STRING_SVTOOLS_RTF_FFTYPE "1"); // 1 = 
checkbox
-// checkbox size in half points, this seems to be always 
20, see WW8Export::DoCheckBox()
-m_aRun->append(OOO_STRING_SVTOOLS_RTF_FFHPS "20");
-
-OUString aStr;
-sName = "Name";
-if (xPropSetInfo->hasPropertyByName(sName))
+uno::Reference 
xPropSet(xControlModel, uno::UNO_QUERY);
+uno::Reference xPropSetInfo = 
xPropSet->getPropertySetInfo();
+OUString sName;
+if 
(xInfo->supportsService("com.sun.star.form.component.CheckBox"))
 {
-xPropSet->getPropertyValue(sName) >>= aStr;
-m_aRun->append("{" OOO_STRING_SVTOOLS_RTF_IGNORE 
OOO_STRING_SVTOOLS_RTF_FFNAME " ");
-m_aRun->append(OUStringToOString(aStr, 
m_rExport.eCurrentEncoding));
-m_aRun->append('}');
-}
-
-sName = "HelpText";
-if (xPropSetInfo->hasPropertyByName(sName))
-{
-xPropSet->getPropertyValue(sName) >>= aStr;
-m_aRun->append(OOO_STRING_SVTOOLS_RTF_FFOWNHELP);
-m_aRun->append("{" OOO_STRING_SVTOOLS_RTF_IGNORE 
OOO_STRING_SVTOOLS_RTF_FFHELPTEXT " ");
-m_aRun->append(OUStringToOString(aStr, 
m_rExport.eCurrentEncoding));
-m_aRun->append('}');
-}
-
-sName = "HelpF1Text";
-if (xPropSetInfo->hasPropertyByName(sName))
-{
-xPropSet->getPropertyValue(sName) >>= aStr;
-m_aRun->append(OOO_STRING_SVTOOLS_RTF_FFOWNSTAT);
-m_aRun->append("{" OOO_STRING_SVTOOLS_RTF_IGNORE 
OOO_STRING_SVTOOLS_RTF_FFSTATTEXT " ");
-m_aRun->append(OUStringToOString(aStr, 
m_rExport.eCurrentEncoding));
-m_aRun->append('}');
-}
-
-sal_Int16 nTemp = 0;
-xPropSet->getPropertyValue("DefaultState") >>= nTemp;
-m_aRun->append(OOO_STRING_SVTOOLS_RTF_FFDEFRES);
-m_aRun->append((sal_Int32)nTemp);
-xPropSet->getPropertyValue("State") >>= nTemp;
-m_aRun->append(OOO_STRING_SVTOOLS_RTF_FFRES);
-m_aRun->append((sal_Int32)nTemp);
 
-m_aRun->append("}}");
-
-// field result is empty, ffres already contains the form 
result
-m_aRun->append("}{" OOO_STRING_SVTOOLS_RTF_FLDRSLT " ");
-}
-else if 
(xInfo->supportsService("com.sun.star.form.component.TextField"))
-{
-OStringBuffer aBuf;
-OString aStr;
-OUString aTmp;
-const sal_Char* pStr;
-
-
m_aRun->append(OUStringToOString(OUString(FieldString(ww::eFORMTEXT)), 
m_rExport.eCurrentEncoding));
-m_aRun->append("{" OOO_STRING_SVTOOLS_RTF_IGNORE 
OOO_STRING_SVTOOLS_RTF_DATAFIELD " ");
-for (int i = 0; i < 8; i++) aBuf.append((sal_Char)0x00);
-xPropSet->getPropertyValue("Name") >>= aTmp;
- 

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

[Adolfo Jayme Barrientos]

 sc/source/ui/src/scfuncs.src |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4e871a9b225c0d21ed703b45400b4e8476214bce
Author: Adolfo Jayme Barrientos 
Date:   Tue May 12 11:01:15 2015 -0500

Hyphenate this compound word

Change-Id: I60bbc40e1b3c6369a10ad1241c310fc790329b11

diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index de9894a..3fb51a9 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -12231,7 +12231,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
 };
 String 3 // Description of Parameter 1
 {
-Text [ en-US ] = "A string to be URL encoded";
+Text [ en-US ] = "A string to be URL-encoded";
 };
 };
 Resource SC_OPCODE_ERF_MS
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang cppu/source dbaccess/source sd/source sfx2/source shell/source svtools/source vcl/unx

[Stephan Bergmann]

 compilerplugins/clang/redundantcast.cxx |   74 +++-
 cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx |2 
 dbaccess/source/core/dataaccess/intercept.cxx   |2 
 dbaccess/source/ui/app/AppDetailView.cxx|2 
 sd/source/ui/app/sdmod1.cxx |4 -
 sd/source/ui/sidebar/PreviewValueSet.cxx|3 
 sfx2/source/appl/newhelp.cxx|2 
 shell/source/unix/sysshell/recently_used_file.cxx   |4 -
 svtools/source/graphic/grfmgr.cxx   |2 
 vcl/unx/gtk/window/gtksalframe.cxx  |2 
 10 files changed, 55 insertions(+), 42 deletions(-)

New commits:
commit 0bfc98e63b062bc847fd0f37308c050ac618c56f
Author: Stephan Bergmann 
Date:   Tue May 12 18:27:37 2015 +0200

loplugin:redundantcast: reinterpret_cast to void*

Change-Id: I947b49cfb15f0e7d6ddfaae386656c70e4bd48ba

diff --git a/compilerplugins/clang/redundantcast.cxx 
b/compilerplugins/clang/redundantcast.cxx
index 3abf66a..474dafa 100644
--- a/compilerplugins/clang/redundantcast.cxx
+++ b/compilerplugins/clang/redundantcast.cxx
@@ -207,45 +207,59 @@ bool RedundantCast::VisitImplicitCastExpr(const 
ImplicitCastExpr * expr) {
 bool RedundantCast::VisitCXXReinterpretCastExpr(
 CXXReinterpretCastExpr const * expr)
 {
-if (ignoreLocation(expr)
-|| !expr->getSubExpr()->getType()->isVoidPointerType())
-{
-return true;
-}
-auto t = expr->getType()->getAs();
-if (t == nullptr || !t->getPointeeType()->isObjectType()) {
+if (ignoreLocation(expr)) {
 return true;
 }
-if (rewriter != nullptr) {
-auto loc = expr->getLocStart();
-while (compiler.getSourceManager().isMacroArgExpansion(loc)) {
-loc = compiler.getSourceManager().getImmediateMacroCallerLoc(loc);
+if (expr->getSubExpr()->getType()->isVoidPointerType()) {
+auto t = expr->getType()->getAs();
+if (t == nullptr || !t->getPointeeType()->isObjectType()) {
+return true;
 }
-if (compat::isMacroBodyExpansion(compiler, loc)) {
-auto loc2 = expr->getLocEnd();
-while (compiler.getSourceManager().isMacroArgExpansion(loc2)) {
-loc2 = compiler.getSourceManager().getImmediateMacroCallerLoc(
-loc2);
+if (rewriter != nullptr) {
+auto loc = expr->getLocStart();
+while (compiler.getSourceManager().isMacroArgExpansion(loc)) {
+loc = compiler.getSourceManager().getImmediateMacroCallerLoc(
+loc);
 }
-if (compat::isMacroBodyExpansion(compiler, loc2)) {
-//TODO: check loc, loc2 are in same macro body expansion
-loc = compiler.getSourceManager().getSpellingLoc(loc);
+if (compat::isMacroBodyExpansion(compiler, loc)) {
+auto loc2 = expr->getLocEnd();
+while (compiler.getSourceManager().isMacroArgExpansion(loc2)) {
+loc2 = compiler.getSourceManager()
+.getImmediateMacroCallerLoc(loc2);
+}
+if (compat::isMacroBodyExpansion(compiler, loc2)) {
+//TODO: check loc, loc2 are in same macro body expansion
+loc = compiler.getSourceManager().getSpellingLoc(loc);
+}
+}
+auto s = compiler.getSourceManager().getCharacterData(loc);
+auto n = Lexer::MeasureTokenLength(
+loc, compiler.getSourceManager(), compiler.getLangOpts());
+std::string tok(s, n);
+if (tok == "reinterpret_cast" && replaceText(loc, n, 
"static_cast"))
+{
+return true;
 }
 }
-auto s = compiler.getSourceManager().getCharacterData(loc);
-auto n = Lexer::MeasureTokenLength(
-loc, compiler.getSourceManager(), compiler.getLangOpts());
-std::string tok(s, n);
-if (tok == "reinterpret_cast" && replaceText(loc, n, "static_cast")) {
+report(
+DiagnosticsEngine::Warning,
+"reinterpret_cast from %0 to %1 can be simplified to static_cast",
+expr->getExprLoc())
+<< expr->getSubExprAsWritten()->getType() << expr->getType()
+<< expr->getSourceRange();
+} else if (expr->getType()->isVoidPointerType()) {
+auto t = expr->getSubExpr()->getType()->getAs();
+if (t == nullptr || !t->getPointeeType()->isObjectType()) {
 return true;
 }
+report(
+DiagnosticsEngine::Warning,
+("reinterpret_cast from %0 to %1 can be simplified to static_cast"
+ " or an implicit conversion"),
+expr->getExprLoc())
+<< expr->getSubExprAsWritten()->getType() << expr->getType()
+<< expr->getSourceRange();
 }
-report(
-Diagnosti

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - postprocess/Rdb_services.mk scp2/Module_scp2.mk scripting/Module_scripting.mk

[Andras Timar]

 postprocess/Rdb_services.mk   |4 +++-
 scp2/Module_scp2.mk   |4 +++-
 scripting/Module_scripting.mk |4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 8c81c4059ec29eabfa7a4b2b7d3b00adca7bf039
Author: Andras Timar 
Date:   Tue May 12 18:37:26 2015 +0200

build fixes for --disable-python option

Change-Id: I57ecd757f0f39d533129eda566f5e13751b25a0f

diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 06906d9..72a31bb 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -168,7 +168,9 @@ $(eval $(call gb_Rdb_add_components,services,\
scripting/source/basprov/basprov \
scripting/source/dlgprov/dlgprov \
scripting/source/protocolhandler/protocolhandler \
-   scripting/source/pyprov/mailmerge \
+   $(if $(filter TRUE,$(DISABLE_PYTHON)),,\
+   scripting/source/pyprov/mailmerge \
+   ) \
wizards/com/sun/star/wizards/fax/fax \
wizards/com/sun/star/wizards/letter/letter \
wizards/com/sun/star/wizards/agenda/agenda \
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index be02cd8..3720386 100644
--- a/scp2/Module_scp2.mk
+++ b/scp2/Module_scp2.mk
@@ -22,7 +22,9 @@ $(eval $(call gb_Module_add_targets,scp2,\
InstallModule_math \
InstallModule_onlineupdate \
InstallModule_ooo \
-   InstallModule_python \
+   $(if $(filter TRUE,$(DISABLE_PYTHON)),,\
+   InstallModule_python \
+   ) \
InstallModule_ure \
InstallModule_writer \
InstallModule_xsltfilter \
diff --git a/scripting/Module_scripting.mk b/scripting/Module_scripting.mk
index de90fe7..fffa925 100644
--- a/scripting/Module_scripting.mk
+++ b/scripting/Module_scripting.mk
@@ -40,7 +40,9 @@ $(eval $(call gb_Module_add_targets,scripting,\
Library_scriptframe \
Library_stringresource \
Library_vbaevents \
-   Pyuno_mailmerge \
+   $(if $(filter TRUE,$(DISABLE_PYTHON)),,\
+   Pyuno_mailmerge \
+   ) \
 ))
 
 endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Renaming in sw/

[Jan Holesovsky]

Hi Bjoern, all,

Bjoern Michaelsen píše v Čt 07. 05. 2015 v 14:56 +0200:

> IMHO lets leave Frm -> Frame out of the change in this round. In the end, we
> should have the SwFrm/sw::Frame situation sorted out in a consistent way,
> ideally with most of the Writer stuff actually namespaced in sw.

OK; still I did a small change there - s/FrmFmt/FrameFormat/ - as
SwFrmFormat was really annoying after the change :-) - hope that's fine.

> As such I'd propose to do this round with all the nonconflicting stuff (Fmt,
> Cntnt, Txt, Fld, Ftn, Updt, Fml, Hnt) and leave Frm as is. Lets also see how
> painful those others are on their own.

http://cgit.freedesktop.org/libreoffice/core/tree/bin/rename-sw-abbreviations.sh

I'm now running a test build in

https://gerrit.libreoffice.org/15718

The build seems to be clean, without 'shadow' warnings and similar
errors - I have renamed the variables that were doing problems in
separate commits directly (using m_ prefixes or better names).  I might
have overlooked something though, so review / feedback appreciated.

All the best,
Kendy

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

Re: Renaming in sw/

[Philippe Jung]

Kendy, it seems you don't apply renaming to modules other than sw.
I mean there are references to sw at least in comments in other modules (svx 
for example). Maybe replacement should be done here too.

Philippe

Le 12 mai 2015 19:04:28 CEST, Jan Holesovsky  a écrit :
>Hi Bjoern, all,
>
>Bjoern Michaelsen píše v Čt 07. 05. 2015 v 14:56 +0200:
>
>> IMHO lets leave Frm -> Frame out of the change in this round. In the
>end, we
>> should have the SwFrm/sw::Frame situation sorted out in a consistent
>way,
>> ideally with most of the Writer stuff actually namespaced in sw.
>
>OK; still I did a small change there - s/FrmFmt/FrameFormat/ - as
>SwFrmFormat was really annoying after the change :-) - hope that's
>fine.
>
>> As such I'd propose to do this round with all the nonconflicting
>stuff (Fmt,
>> Cntnt, Txt, Fld, Ftn, Updt, Fml, Hnt) and leave Frm as is. Lets also
>see how
>> painful those others are on their own.
>
>http://cgit.freedesktop.org/libreoffice/core/tree/bin/rename-sw-abbreviations.sh
>
>I'm now running a test build in
>
>https://gerrit.libreoffice.org/15718
>
>The build seems to be clean, without 'shadow' warnings and similar
>errors - I have renamed the variables that were doing problems in
>separate commits directly (using m_ prefixes or better names).  I might
>have overlooked something though, so review / feedback appreciated.
>
>All the best,
>Kendy
>
>___
>LibreOffice mailing list
>LibreOffice@lists.freedesktop.org
>http://lists.freedesktop.org/mailman/listinfo/libreoffice

-- 
Envoyé de mon téléphone Android avec K-9 Mail. Excusez la brièveté.___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Renaming in sw/

[Jan Holesovsky]

Hi Philippe,

Philippe Jung píše v Út 12. 05. 2015 v 19:15 +0200:

> Kendy, it seems you don't apply renaming to modules other than sw.

That was deliberate - I renamed only the stuff in sw, for the other
modules only where sw depended on that (the script has 2 parts - sw/
only and global).

> I mean there are references to sw at least in comments in other
> modules (svx for example). Maybe replacement should be done here too.

Doing it everywhere would be quite risky, I've spent the entire day
today sorting out variable name conflicts in sw/ only, so I'd prefer to
do the rest separately - eg. before 5.1.

Regarding the comments - please do you have some hotspots that should be
addressed?

Thank you,
Kendy

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

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

[Michael Stahl]

 basic/source/classes/sb.cxx |   19 ---
 1 file changed, 16 insertions(+), 3 deletions(-)

New commits:
commit 098817edf3c5d16ab476fbb996807e7654597990
Author: Michael Stahl 
Date:   Tue May 12 13:47:38 2015 +0200

tdf#90969: basic: add horrible hack to avoid crash due to ...

... the stupid global variable GaDocBasicItems.

Change-Id: Ib849e0e2b661e54005d00091f6d6fc474dc5549b
(cherry picked from commit be88e305eeac88e51f83efc004d4b60b87f1e757)
Reviewed-on: https://gerrit.libreoffice.org/15715
Reviewed-by: Björn Michaelsen 
Tested-by: Björn Michaelsen 

diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index c24828a..2f5be56 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -109,10 +110,22 @@ DocBasicItem::DocBasicItem( StarBASIC& rDocBasic ) :
 
 DocBasicItem::~DocBasicItem()
 {
-SolarMutexGuard g;
+// tdf#90969 HACK: don't use SolarMutexGuard - there is a horrible global
+// map GaDocBasicItems holding instances, and these get deleted from exit
+// handlers, when the SolarMutex is already dead
+tools::SolarMutex::Acquire();
 
-stopListening();
-mxClassModules.Clear(); // release with SolarMutex locked
+try
+{
+stopListening();
+mxClassModules.Clear(); // release with SolarMutex locked
+}
+catch (...)
+{
+assert(false);
+}
+
+tools::SolarMutex::Release();
 }
 
 void DocBasicItem::clearDependingVarsOnDelete( StarBASIC& rDeletedBasic )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 sw/source/core/text/porlay.cxx   |6 +++---
 sw/source/core/text/pormulti.cxx |2 +-
 sw/source/core/text/portxt.cxx   |8 +---
 sw/source/core/text/portxt.hxx   |2 +-
 sw/source/core/text/txthyph.cxx  |   17 -
 5 files changed, 18 insertions(+), 17 deletions(-)

New commits:
commit 21ab418859d5f8fc16730dc26f1dda149ee132fc
Author: Michael Stahl 
Date:   Tue May 12 19:02:06 2015 +0200

sw: replace that awful constructor that overloads SwTxtPortion copy-ctor

... with a CopyLinePortion function; how can you even...

Change-Id: Ie7d459ee317522e35fdbbd3974afabe7a136fe62

diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 78572be..72845e8 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -139,7 +139,7 @@ SwLinePortion *SwLineLayout::Insert( SwLinePortion *pIns )
 {
 if( GetLen() )
 {
-pPortion = new SwTxtPortion(*static_cast(this));
+pPortion = SwTxtPortion::CopyLinePortion(*this);
 if( IsBlinking() && pBlink )
 {
 SetBlinking( false );
@@ -161,7 +161,7 @@ SwLinePortion *SwLineLayout::Append( SwLinePortion *pIns )
 // First attribute change: copy mass and length from *pIns into the first
 // text portion
 if( !pPortion )
-pPortion = new SwTxtPortion(*static_cast(this));
+pPortion = SwTxtPortion::CopyLinePortion(*this);
 // Call with scope or we'll end up with recursion!
 return pPortion->SwLinePortion::Append( pIns );
 }
@@ -184,7 +184,7 @@ SwMarginPortion *SwLineLayout::CalcLeftMargin()
 SwMarginPortion *pLeft = (GetPortion() && GetPortion()->IsMarginPortion()) 
?
 static_cast(GetPortion()) : 0;
 if( !GetPortion() )
- SetPortion(new SwTxtPortion(*static_cast(this)));
+ SetPortion(SwTxtPortion::CopyLinePortion(*this));
 if( !pLeft )
 {
 pLeft = new SwMarginPortion( 0 );
diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx
index 6b24834..755869f 100644
--- a/sw/source/core/text/pormulti.cxx
+++ b/sw/source/core/text/pormulti.cxx
@@ -678,7 +678,7 @@ void SwRubyPortion::_Adjust( SwTxtFormatInfo &rInf )
 if( nLeft || nRight )
 {
 if( !pCurr->GetPortion() )
-pCurr->SetPortion(new 
SwTxtPortion(*static_cast(pCurr)));
+pCurr->SetPortion(SwTxtPortion::CopyLinePortion(*pCurr));
 if( nLeft )
 {
 SwMarginPortion *pMarg = new SwMarginPortion( 0 );
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index 691a716..4b78981 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -208,10 +208,12 @@ static sal_Int32 lcl_AddSpace( const SwTxtSizeInfo &rInf, 
const OUString* pStr,
 return nCnt;
 }
 
-SwTxtPortion::SwTxtPortion( const SwLinePortion &rPortion )
-  : SwLinePortion( rPortion )
+SwTxtPortion * SwTxtPortion::CopyLinePortion(const SwLinePortion &rPortion)
 {
-SetWhichPor( POR_TXT );
+SwTxtPortion *const pNew(new SwTxtPortion);
+static_cast(*pNew) = rPortion;
+pNew->SetWhichPor( POR_TXT ); // overwrite that!
+return pNew;
 }
 
 void SwTxtPortion::BreakCut( SwTxtFormatInfo &rInf, const SwTxtGuess &rGuess )
diff --git a/sw/source/core/text/portxt.hxx b/sw/source/core/text/portxt.hxx
index 51ed3f1..3f30ba7 100644
--- a/sw/source/core/text/portxt.hxx
+++ b/sw/source/core/text/portxt.hxx
@@ -34,7 +34,7 @@ class SwTxtPortion : public SwLinePortion
 
 public:
 inline SwTxtPortion(){ SetWhichPor( POR_TXT ); }
-SwTxtPortion( const SwLinePortion &rPortion );
+static SwTxtPortion * CopyLinePortion(const SwLinePortion &rPortion);
 virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
 virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
 virtual void FormatEOL( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
commit ba587924b14d3e03f5c2bddf66d1da18089fc580
Author: Michael Stahl 
Date:   Tue May 12 18:44:08 2015 +0200

sw: let's try without a SwHyphPortion copy ctor

It looks like it can be easily avoided.

Change-Id: Ied8a047871c431b809569e1bbf232ce769d498ec

diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx
index 9d73441..54316b9 100644
--- a/sw/source/core/text/txthyph.cxx
+++ b/sw/source/core/text/txthyph.cxx
@@ -296,8 +296,8 @@ bool SwTxtPortion::CreateHyphen( SwTxtFormatInfo &rInf, 
SwTxtGuess &rGuess )
 else
 {
 // second case: no alternative spelling
-SwHyphPortion aHyphPor;
-aHyphPor.SetLen( 1 );
+pHyphPor = new SwHyphPortion;
+pHyphPor->SetLen( 1 );
 
 static const void* pLastMagicNo = 0;
 static sal_uInt16 aMiniCacheH = 0, aMiniCacheW = 0;
@@ -306,15 +306,14 @@ bool SwTxtPortion::CreateHyphen( SwTxtFormatInfo &rInf, 
SwTxtGuess &rGuess )
 rInf.GetFont()->GetMagic( pTmpMagic, nFntIdx, 
rInf.GetFont()->GetActual() );
   

RE: user profile for master / LO 5.0

[elderdanlewis]

Slight correction: this uses libreofficedev/4 which is not the same as 
libreoffice/4. Because of this, the configuration files a are written in the 
libreofficedev folder. So there's no interference between 4.x and 5.0.0.
   Alpha and beta versions of libreoffice use the libreofficedev folder for the 
user profile. RC versions use the libreoffice folder for the user profile. 
  
   You can install 5.0.0 in parallel if you are concerned. 

Dan



 Original message 
From: Jean-Baptiste Faure  
Date:05/12/2015  9:12 AM  (GMT-05:00) 
To: libreoffice@lists.freedesktop.org 
Subject: user profile for master / LO 5.0 

Hi,

Is it intentional if LO 5.0.0.0.alpha1+ still use .../libreoffice/4 as
user profile directory ?
The problem is that you can't use a LO 4.x profile for LO 4 again once
it has been used by LO 5.

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

[Bug 79641] LibreOffice 4.4 most annoying bugs

[bugzilla-daemon]

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

--- Comment #59 from meneerjanse...@gmail.com ---
Outline numbering bug in Word docs after re-opening the doc: bug #76817

This bug is very, very, very, very, very, very, very, annoying because chapter
numbering is one of the most used features of a Word Processor. And the .doc(x)
format is one of the most used in the world. Basically you can NOT use LibO to
edit a Word doc in which the chapters are automatically numbered, which is
EVERY document ever produced by mankind. Please fix asap if you can.

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

[Bug 79641] LibreOffice 4.4 most annoying bugs

[bugzilla-daemon]

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

meneerjanse...@gmail.com changed:

   What|Removed |Added

 Depends on||76817

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

Goodbye MAB - Hello "Highest"

[Joel Madero]

Hi All,

It's time to try moving away from "MAB" list and towards using
priorities correctly. That being said:

1) "Highest" reflects that it's equivalent to a MAB;

2) Highest can be matched with any severity (minor, normal, major,
critical, blocker) but should be dictated by common sense logic:
*# of users affected;
*regression
*fully triaged (with bibisect, crash log, etc...)
*obviously major, critical, blocker make it to the list faster than
minor/normal issues

Guide:
https://wiki.documentfoundation.org/File:Prioritizing_Bugs_Flowchart.jpg

On the test bugzilla server we now have priority/severity locked -
hopefully this gets moved to the actual instance of bugzilla in the
coming weeks - it still needs tested thoroughly (see previous email)

Worst case if this fails, we can always move "highest" to a new MAB
tracker but I'm really hoping this is unnecessary.


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

[Libreoffice-commits] core.git: 7 commits - chart2/qa include/oox oox/source

[Markus Mohrhard]

 chart2/qa/extras/chart2export.cxx  |1 
 include/oox/export/chartexport.hxx |4 +
 oox/source/export/chartexport.cxx  |   76 +++--
 3 files changed, 54 insertions(+), 27 deletions(-)

New commits:
commit b34b648fc3262c5d9aa295f621e8fe9c97d4c6b2
Author: Markus Mohrhard 
Date:   Tue May 12 03:13:41 2015 +0200

uno::Sequence provides now begin and end

Change-Id: I7af0db5381737c7d28a491e4aca673d9cc4b1e19

diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index 4fcf803..8a9c30f 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -161,7 +161,7 @@ template< typename T >
 void lcl_SequenceToVectorAppend( const Sequence< T > & rSource, 
::std::vector< T > & rDestination )
 {
 rDestination.reserve( rDestination.size() + rSource.getLength());
-::std::copy( rSource.getConstArray(), rSource.getConstArray() + 
rSource.getLength(),
+::std::copy( rSource.begin(), rSource.end(),
  ::std::back_inserter( rDestination ));
 }
 
@@ -377,7 +377,7 @@ void lcl_fillCategoriesIntoStringVector(
 {
 rOutCategories.clear();
 Sequence< OUString > aTextData( 
xTextualDataSequence->getTextualData());
-::std::copy( aTextData.getConstArray(), aTextData.getConstArray() + 
aTextData.getLength(),
+::std::copy( aTextData.begin(), aTextData.end(),
  ::std::back_inserter( rOutCategories ));
 }
 else
@@ -399,7 +399,7 @@ void lcl_fillCategoriesIntoStringVector(
 if( xNumSeq.is())
 {
 Sequence< double > aValues( xNumSeq->getNumericalData());
-::std::copy( aValues.getConstArray(), aValues.getConstArray() + 
aValues.getLength(),
+::std::copy( aValues.begin(), aValues.end(),
  ::std::back_inserter( aResult ));
 }
 else if( xSeq.is())
commit ceac38106de4f2657e854d5e1d657d6df9321032
Author: Markus Mohrhard 
Date:   Tue May 12 02:54:19 2015 +0200

add test to make sure only one x axis is non-deleted in exported doc

Change-Id: I8172015668cc43b4383276f2cd20cce4b0704277

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index 7e4491c..d90cb64 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -1457,6 +1457,7 @@ void Chart2ExportTest::testMultipleAxisXLSX()
 assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart[1]/c:ser", 1);
 assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart[2]/c:ser", 1);
 assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx", 4);
+assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:valAx/c:delete[@val='1']", 1);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest);
commit 1573315ec978b7f53a8babeb7ad44e104896209e
Author: Markus Mohrhard 
Date:   Tue May 12 02:33:08 2015 +0200

export each axis only once non-deleted, related tdf#84347

Change-Id: Ia0e23faf43fd266b8314f807b77423e9a3e15797

diff --git a/include/oox/export/chartexport.hxx 
b/include/oox/export/chartexport.hxx
index 186ea75..c043fd7 100644
--- a/include/oox/export/chartexport.hxx
+++ b/include/oox/export/chartexport.hxx
@@ -30,6 +30,8 @@
 #include 
 #include 
 
+#include 
+
 namespace com { namespace sun { namespace star {
 namespace chart {
 class XDiagram;
@@ -103,6 +105,8 @@ private:
 boolmbStacked;
 boolmbPercent;
 
+std::set maExportedAxis;
+
 private:
 sal_Int32 getChartType();
 
diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index 9c56a7e..4fcf803 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -2611,6 +2611,7 @@ void ChartExport::_exportAxis(
 
 pFS->startElement( FSNS( XML_c, XML_scaling ),
 FSEND );
+
 // logBase, min, max
 if(GetProperty( xAxisProp, "Logarithmic" ) )
 {
@@ -2671,8 +2672,15 @@ void ChartExport::_exportAxis(
 OUString ("Visible")) >>=  bVisible;
 }
 
+// only export each axis only once non-deleted
+bool bDeleted = std::find(maExportedAxis.begin(),
+maExportedAxis.end(), rAxisIdPair.nAxisType) != 
maExportedAxis.end();
+
+if (!bDeleted)
+maExportedAxis.insert(rAxisIdPair.nAxisType);
+
 pFS->singleElement( FSNS( XML_c, XML_delete ),
-XML_val, bVisible ? "0" : "1",
+XML_val, !bDeleted && bVisible ? "0" : "1",
 FSEND );
 
 // FIXME: axPos, need to check the property "ReverseDirection"
commit aec34850ed7d27938bee2a3a7b8761e9eb74acdc
Author: Markus Mohrhard 
Date:   Tue May 12 02:14:54 2015 +0200

remove and replace old OSL_TRACE messages

Change-Id: Id6de1425c03be8552d1dd2597001bf0632292e90

diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index 467c7ca..9c56a7e 100644
--- a/oox/source/export/chartexport.cxx
+++ b/o

[Bug 79641] LibreOffice 4.4 most annoying bugs

[bugzilla-daemon]

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

--- Comment #60 from Cor Nouws  ---
(In reply to meneerjansen00 from comment #59)
> Basically you can
> NOT use LibO to edit a Word doc in which the chapters are automatically
> numbered, 

Did you do some good tests, before writing that? I cannot confirm the problem
as a general issue. (Would have been unlikely, that such an issue would have
gone unnoticed for years.)

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

[Bug 79641] LibreOffice 4.4 most annoying bugs

[bugzilla-daemon]

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

V Stuart Foote  changed:

   What|Removed |Added

 Depends on|76817   |

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

[Bug 79641] LibreOffice 4.4 most annoying bugs

[bugzilla-daemon]

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

--- Comment #61 from V Stuart Foote  ---
(In reply to meneerjansen00 from comment #59)
removed bug 76817 from mab4.4 -- assigned to bug 88137

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

[Bug 79641] LibreOffice 4.4 most annoying bugs

[bugzilla-daemon]

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

Cor Nouws  changed:

   What|Removed |Added

 Depends on||91242

--- Comment #62 from Cor Nouws  ---
Adding Bug 91242 - Saving as .docx adds the outline number, which is not
applied, before the header after reopening

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

[Bug 79641] LibreOffice 4.4 most annoying bugs

[bugzilla-daemon]

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

--- Comment #63 from V Stuart Foote  ---
(In reply to V Stuart Foote from comment #61)
> (In reply to meneerjansen00 from comment #59)
> removed bug 76817 from mab4.4 -- assigned to bug 88137

s/ bug 88137/ bug 88173/

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

[Libreoffice-commits] core.git: Branch 'feature/unitver' - 10 commits - sc/inc sc/qa sc/source

[Andrzej Hunt]

 sc/inc/units.hxx  |   27 +-
 sc/qa/unit/units.cxx  |  337 ++-
 sc/source/core/units/unitsimpl.cxx|  362 +++---
 sc/source/core/units/unitsimpl.hxx|   46 ++-
 sc/source/core/units/utunit.cxx   |3 
 sc/source/core/units/utunit.hxx   |   39 ++-
 sc/source/ui/condformat/condformatdlg.cxx |   33 ++
 sc/source/ui/inc/condformatdlg.hxx|4 
 8 files changed, 629 insertions(+), 222 deletions(-)

New commits:
commit f732a2444a6cc18c016cc79b0c364a87cc7d87e8
Author: Andrzej Hunt 
Date:   Tue May 12 21:16:13 2015 +0100

Convert convertCellUnits to handle ranges

Change-Id: Ibe95cbd9ea9efd08a48e0651f469434802bfa40e

diff --git a/sc/inc/units.hxx b/sc/inc/units.hxx
index b5e12da..8e15af4 100644
--- a/sc/inc/units.hxx
+++ b/sc/inc/units.hxx
@@ -107,7 +107,7 @@ public:
  * rsInputUnit overrides the automatic determination of input units, i.e. 
disables
  * input unit detection.
  */
-virtual bool convertCellUnits(const ScRange& rRange,
+virtual bool convertCellUnits(const ScRangeList& rRanges,
   ScDocument* pDoc,
   const OUString& rsOutputUnit) = 0;
 
diff --git a/sc/qa/unit/units.cxx b/sc/qa/unit/units.cxx
index 29dfc2b..b35cd40 100644
--- a/sc/qa/unit/units.cxx
+++ b/sc/qa/unit/units.cxx
@@ -820,6 +820,7 @@ void UnitsTest::testRangeConversion() {
 // TODO: we need to test:
 // 1. mixture of units that can't be converted
 // 2. mixtures of local and header annotations
+// 3. actual sensible ranges
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(UnitsTest);
diff --git a/sc/source/core/units/unitsimpl.cxx 
b/sc/source/core/units/unitsimpl.cxx
index f2aa9e0..0f79edb 100644
--- a/sc/source/core/units/unitsimpl.cxx
+++ b/sc/source/core/units/unitsimpl.cxx
@@ -799,7 +799,7 @@ bool UnitsImpl::convertCellUnitsForColumnRange(const 
ScRange& rRange,
 return bAllConverted;
 }
 
-bool UnitsImpl::convertCellUnits(const ScRange& rRange,
+bool UnitsImpl::convertCellUnits(const ScRangeList& rRangeList,
  ScDocument* pDoc,
  const OUString& rsOutputUnit) {
 UtUnit aOutputUnit;
@@ -807,26 +807,28 @@ bool UnitsImpl::convertCellUnits(const ScRange& rRange,
 return false;
 }
 
-ScRange aRange(rRange);
-aRange.PutInOrder();
-
-SCCOL nStartCol, nEndCol;
-SCROW nStartRow, nEndRow;
-SCTAB nStartTab, nEndTab;
-aRange.GetVars(nStartCol, nStartRow, nStartTab,
-   nEndCol, nEndRow, nEndTab);
-
-// Can only handle ranges in a single sheet for now
-assert(nStartTab == nEndTab);
-
-// Each column is independent hence we are able to handle each separately.
 bool bAllConverted = true;
-for (SCCOL nCol = nStartCol; nCol <= nEndCol; nCol++) {
-ScRange aSubRange(ScAddress(nCol, nStartRow, nStartTab), 
ScAddress(nCol, nEndRow, nStartTab));
-bAllConverted = bAllConverted &&
-convertCellUnitsForColumnRange(aSubRange, pDoc, 
aOutputUnit);
-}
 
+for (size_t i = 0; i < rRangeList.size(); i++) {
+ScRange aRange(*rRangeList[i]);
+
+aRange.PutInOrder();
+
+SCCOL nStartCol, nEndCol;
+SCROW nStartRow, nEndRow;
+SCTAB nStartTab, nEndTab;
+aRange.GetVars(nStartCol, nStartRow, nStartTab,
+   nEndCol, nEndRow, nEndTab);
+
+// Each column is independent hence we are able to handle each 
separately.
+for (SCTAB nTab = nStartTab; nTab <= nEndTab; nTab++) {
+for (SCCOL nCol = nStartCol; nCol <= nEndCol; nCol++) {
+ScRange aSubRange(ScAddress(nCol, nStartRow, nTab), 
ScAddress(nCol, nEndRow, nTab));
+bAllConverted = bAllConverted &&
+convertCellUnitsForColumnRange(aSubRange, 
pDoc, aOutputUnit);
+}
+}
+}
 return bAllConverted;
 }
 
diff --git a/sc/source/core/units/unitsimpl.hxx 
b/sc/source/core/units/unitsimpl.hxx
index e7b4597..58e0971 100644
--- a/sc/source/core/units/unitsimpl.hxx
+++ b/sc/source/core/units/unitsimpl.hxx
@@ -103,7 +103,7 @@ public:
  const OUString& rsNewUnit,
  const OUString& rsOldUnit) 
SAL_OVERRIDE;
 
-virtual bool convertCellUnits(const ScRange& rRange,
+virtual bool convertCellUnits(const ScRangeList& rRanges,
   ScDocument* pDoc,
   const OUString& rsOutputUnit) SAL_OVERRIDE;
 
commit d60765f6ebba774787d3e553dbd680bf1de1fb0a
Author: Andrzej Hunt 
Date:   Tue May 12 20:57:20 2015 +0100

Split convertCellUnits and change contract

This is in preparation for rewriting convertCellUnits to handle
ScRangeList's.

Change-Id: I17fecdb64674af79a33f2b1a62b4b46150177af5

diff

[Libreoffice-commits] core.git: 25 commits - cui/source include/svtools include/svx include/tools include/vcl sc/qa svtools/source svx/source sw/source vcl/source

[Tomaž Vajngerl]

 cui/source/inc/paragrph.hxx  |4 
 cui/source/tabpages/paragrph.cxx |   16 
 include/svtools/toolbarmenu.hxx  |   20 
 include/svx/charmap.hxx  |   14 
 include/svx/dlgctrl.hxx  |   48 -
 include/svx/fntctrl.hxx  |   15 
 include/svx/graphctl.hxx |   40 -
 include/svx/measctrl.hxx |   16 
 include/svx/pagectrl.hxx |  236 ---
 include/svx/paraprev.hxx |  119 ++-
 include/svx/swframeexample.hxx   |6 
 include/tools/gen.hxx|   25 
 include/vcl/window.hxx   |   13 
 sc/qa/extras/recordchanges-test.cxx  |   12 
 svtools/source/control/toolbarmenu.cxx   |  312 -
 svtools/source/control/valueset.cxx  |8 
 svx/source/dialog/_bmpmask.cxx   |   17 
 svx/source/dialog/charmap.cxx|  269 
 svx/source/dialog/connctrl.cxx   |   10 
 svx/source/dialog/contwnd.cxx|   79 +-
 svx/source/dialog/dialcontrol.cxx|   14 
 svx/source/dialog/dlgctl3d.cxx   |4 
 svx/source/dialog/dlgctrl.cxx|  289 -
 svx/source/dialog/fntctrl.cxx|  851 +--
 svx/source/dialog/frmsel.cxx |   54 -
 svx/source/dialog/graphctl.cxx   |   12 
 svx/source/dialog/measctrl.cxx   |   83 +-
 svx/source/dialog/pagectrl.cxx   |  174 ++---
 svx/source/dialog/paraprev.cxx   |  111 +--
 svx/source/dialog/rubydialog.cxx |  435 +++--
 svx/source/dialog/swframeexample.cxx |   63 +
 svx/source/gallery2/galctrl.cxx  |  115 +--
 svx/source/inc/frmselimpl.hxx|  109 +--
 svx/source/sidebar/line/LineWidthControl.cxx |   24 
 svx/source/sidebar/line/LineWidthControl.hxx |   47 -
 svx/source/sidebar/tools/PopupControl.cxx|   10 
 svx/source/tbxctrls/layctrl.cxx  |  121 ++-
 sw/source/ui/dialog/uiregionsw.cxx   |2 
 sw/source/uibase/frmdlg/colex.cxx|  106 +--
 sw/source/uibase/inc/colex.hxx   |   25 
 vcl/source/window/paint.cxx  |  156 
 41 files changed, 2175 insertions(+), 1909 deletions(-)

New commits:
commit 5b3a30f40a7ce476922649b734f6ede1c2fdef4b
Author: Tomaž Vajngerl 
Date:   Wed May 13 10:49:42 2015 +0900

fix warning when running "make check" with werror

Change-Id: I490568b715f21c94a1078fe04368ed7c9132c311

diff --git a/sc/qa/extras/recordchanges-test.cxx 
b/sc/qa/extras/recordchanges-test.cxx
index 67e84e3..fa3b36e 100644
--- a/sc/qa/extras/recordchanges-test.cxx
+++ b/sc/qa/extras/recordchanges-test.cxx
@@ -42,8 +42,8 @@ void ScRecordChangesTest::testSetRecordChanges()
 uno::Reference< sheet::XSpreadsheetDocument > xDoc(xComponent, 
UNO_QUERY_THROW);
 uno::Reference< beans::XPropertySet > xDocSettingsPropSet (xDoc, 
UNO_QUERY_THROW);
 
-bool recordChangesValue;
-bool protectionValue;
+bool recordChangesValue = true;
+bool protectionValue = true;
 
 CPPUNIT_ASSERT(xDocSettingsPropSet->getPropertyValue("RecordChanges") >>= 
recordChangesValue);
 
CPPUNIT_ASSERT(xDocSettingsPropSet->getPropertyValue("IsRecordChangesProtected")
 >>= protectionValue);
@@ -52,7 +52,7 @@ void ScRecordChangesTest::testSetRecordChanges()
 CPPUNIT_ASSERT_MESSAGE("a new document does not protect record changes", 
!protectionValue);
 
 // now activate recording
-uno::Any xValue;;
+uno::Any xValue;
 xValue <<= true;
 xDocSettingsPropSet->setPropertyValue("RecordChanges", xValue);
 
@@ -72,8 +72,8 @@ void ScRecordChangesTest::testCheckRecordChangesProtection()
 uno::Reference< sheet::XSpreadsheetDocument > xDoc(xComponent, 
UNO_QUERY_THROW);
 uno::Reference< beans::XPropertySet > xDocSettingsPropSet (xDoc, 
UNO_QUERY_THROW);
 
-bool recordChangesValue;
-bool protectionValue;
+bool recordChangesValue = false;
+bool protectionValue = false;
 
 CPPUNIT_ASSERT(xDocSettingsPropSet->getPropertyValue("RecordChanges") >>= 
recordChangesValue);
 
CPPUNIT_ASSERT(xDocSettingsPropSet->getPropertyValue("IsRecordChangesProtected")
 >>= protectionValue);
@@ -82,7 +82,7 @@ void ScRecordChangesTest::testCheckRecordChangesProtection()
 CPPUNIT_ASSERT_MESSAGE("the protection should be active", protectionValue);
 
 // try to de-activate recording
-uno::Any xValue;;
+uno::Any xValue;
 xValue <<= false;
 xDocSettingsPropSet->setPropertyValue("RecordChanges", xValue);
 
commit cb7b94bfcc6709ff3cf8fb98ca7a1a3768092b39
Author: Tomaž Vajngerl 
Date:   Wed May 13 10:35:58 2015 +0900

refactor TableWindow, ColumnWindow to use RenderContext

Change-Id: I000ac253a57f9fdbb14c700e4a0163c3ba18a7bb

diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cx

Re: user profile for master / LO 5.0

[Jean-Baptiste Faure]

Le 12/05/2015 19:18, elderdanlewis a écrit :
> Slight correction: this uses libreofficedev/4 which is not the same as
> libreoffice/4. Because of this, the configuration files a are written in
> the libreofficedev folder. So there's no interference between 4.x and 5.0.0.
>Alpha and beta versions of libreoffice use the libreofficedev folder
> for the user profile. RC versions use the libreoffice folder for the
> user profile. 

The versions of LO I was referring to are built at home in release
configuration. So the product is LibreOffice, not libreofficedev

>You can install 5.0.0 in parallel if you are concerned. 

Yes, LO 4 and LO 5 work well together, if each one has its own user profile.

Best regards
JBF

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

[Libreoffice-commits] core.git: 4 commits - chart2/qa oox/source sc/CppunitTest_sc_copypaste.mk sc/CppunitTest_sc_subsequent_filters_test.mk sc/Module_sc.mk sc/qa

[Markus Mohrhard]

 chart2/qa/extras/chart2export.cxx|2 
 oox/source/export/chartexport.cxx|2 
 sc/CppunitTest_sc_copypaste.mk   |  127 ++
 sc/CppunitTest_sc_subsequent_filters_test.mk |1 
 sc/Module_sc.mk  |1 
 sc/qa/unit/copy_paste_test.cxx   |  151 +++
 sc/qa/unit/subsequent_filters-test.cxx   |3 
 7 files changed, 286 insertions(+), 1 deletion(-)

New commits:
commit f61c275f091de4b8b66685dbb5e7f948cc51c158
Author: Markus Mohrhard 
Date:   Wed May 13 06:21:46 2015 +0200

add test for primary and secondary axis position

Change-Id: I8e790153c45c8ec2a4a94d629fbc0e36e60617d8

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index d90cb64..5b40560 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -1458,6 +1458,8 @@ void Chart2ExportTest::testMultipleAxisXLSX()
 assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart[2]/c:ser", 1);
 assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx", 4);
 assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:valAx/c:delete[@val='1']", 1);
+assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:valAx/c:axPos[@val='l']", 1);
+assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:valAx/c:axPos[@val='r']", 1);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest);
commit 33dd700085441e0903a1cfdc876f2d6338c76bef
Author: Markus Mohrhard 
Date:   Wed May 13 06:18:10 2015 +0200

extract copy&paste test from import tests

It makes more sense to use an independent test for these type of tests.

Change-Id: Ied0cf3e42ccd391594f1dc884617f9dc498e700e

diff --git a/sc/CppunitTest_sc_copypaste.mk b/sc/CppunitTest_sc_copypaste.mk
new file mode 100644
index 000..7df4f51
--- /dev/null
+++ b/sc/CppunitTest_sc_copypaste.mk
@@ -0,0 +1,127 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,sc_copypaste))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_copypaste, \
+sc/qa/unit/copy_paste_test \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sc_copypaste, \
+   boost_headers \
+   mdds_headers \
+   orcus \
+   orcus-parser \
+   libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sc_copypaste, \
+basegfx \
+comphelper \
+cppu \
+cppuhelper \
+drawinglayer \
+editeng \
+for \
+forui \
+i18nlangtag \
+msfilter \
+oox \
+sal \
+salhelper \
+sax \
+sb \
+sc \
+scqahelper \
+sfx \
+sot \
+subsequenttest \
+svl \
+svt \
+svx \
+svxcore \
+   test \
+tk \
+tl \
+ucbhelper \
+   unotest \
+utl \
+vbahelper \
+vcl \
+xo \
+   $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sc_copypaste,\
+-I$(SRCDIR)/sc/source/ui/inc \
+-I$(SRCDIR)/sc/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sc_copypaste,\
+offapi \
+udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sc_copypaste))
+$(eval $(call gb_CppunitTest_use_vcl,sc_copypaste))
+
+$(eval $(call gb_CppunitTest_use_components,sc_copypaste,\
+   basic/util/sb \
+chart2/source/chartcore \
+chart2/source/controller/chartcontroller \
+comphelper/util/comphelp \
+configmgr/source/configmgr \
+dbaccess/util/dba \
+embeddedobj/util/embobj \
+eventattacher/source/evtatt \
+filter/source/config/cache/filterconfig1 \
+forms/util/frm \
+framework/util/fwk \
+i18npool/source/search/i18nsearch \
+i18npool/util/i18npool \
+linguistic/source/lng \
+oox/util/oox \
+package/source/xstor/xstor \
+package/util/package2 \
+sax/source/expatwrap/expwrap \
+scaddins/source/analysis/analysis \
+scaddins/source/datefunc/date \
+sc/util/sc \
+sc/util/scfilt \
+sfx2/util/sfx \
+sot/util/sot \
+svl/util/svl \
+svl/source/fsstor/fsstorage \
+svtools/util/svt \
+toolkit/util/tk \
+ucb/source/core/ucb1 \
+ucb/source/ucp/file/ucpfile1 \
+ucb/source/ucp/tdoc/ucptdoc1 \
+unotools/util/utl \
+unoxml/source/rdf/unordf \
+unoxml/source/service/unoxml \
+xmloff/util/xo \
+xmlsecurity/util/xmlsecurity \
+xmlsecurity/util/xsec_fw \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_CppunitTest_use_components,sc_copypaste,\
+xmlsecurity/util/xsec_xmlsec.windows \
+))
+else
+$(eval $(call gb_CppunitTest_use_components,sc_copypaste,\
+xmlsecurity/util/xsec_xmlsec \
+))
+endif
+
+$(eval $(call gb_CppunitTest_use_configurat

Re: user profile for master / LO 5.0

[Jean-Baptiste Faure]

Le 12/05/2015 16:22, Stephan Bergmann a écrit :
> On 05/12/2015 03:51 PM, Jean-Baptiste Faure wrote:
>> Le 12/05/2015 15:18, Stephan Bergmann a écrit :
>>> On 05/12/2015 03:12 PM, Jean-Baptiste Faure wrote:
 The problem is that you can't use a LO 4.x profile for LO 4 again once
 it has been used by LO 5.
>>>
>>> What is the exact problem?  That would not be intentional.
>>
>> LO 4 refused to start. Seems to have been a temporary bug because I just
>> tried again and it seems to work without problem. I will do more tests
>> this evening.
> 
> Might have been related to what happened to get fixed yesterday with
> 
> "Add back functionality erroneously removed," where before that fix
> old-style .rdb files generated by LO master were broken and could not be
> read by older LO versions.

I installed both versions 4.4.4.0.+ and 5.0.0.0.alpha1 built at home in
release configuration. Open 4.4, play with some file, close LO, open
5.0, play with some file, close LO, reopen 4.4, etc. No problem
detected. Both work well with the same user profile.
Did not try to use both versions at the same time.

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

[Libreoffice-commits] core.git: 2 commits - chart2/source include/sfx2 include/vcl sc/source sd/source sfx2/source sw/source vcl/source

[Tomaž Vajngerl]

 chart2/source/controller/main/ChartWindow.cxx |6 +-
 chart2/source/controller/main/ChartWindow.hxx |4 -
 include/sfx2/recentdocsview.hxx   |   12 ++--
 include/vcl/window.hxx|3 -
 sc/source/ui/inc/gridwin.hxx  |4 -
 sc/source/ui/view/gridwin4.cxx|4 -
 sd/source/ui/inc/Window.hxx   |2 
 sd/source/ui/view/sdwindow.cxx|2 
 sfx2/source/control/recentdocsview.cxx|   67 --
 sw/source/uibase/docvw/edtwin2.cxx|2 
 sw/source/uibase/inc/edtwin.hxx   |4 -
 vcl/source/window/paint.cxx   |   34 +++--
 12 files changed, 75 insertions(+), 69 deletions(-)

New commits:
commit 0ac80267730300f53e2410ffe9c0883f19f656a6
Author: Tomaž Vajngerl 
Date:   Wed May 13 13:36:14 2015 +0900

add PostPaint and change PrePaint to include RenderContext param.

Change-Id: I26e03159fa6115025c6cf376e6ce71443bc98cec

diff --git a/chart2/source/controller/main/ChartWindow.cxx 
b/chart2/source/controller/main/ChartWindow.cxx
index c050b5a..57a3066 100644
--- a/chart2/source/controller/main/ChartWindow.cxx
+++ b/chart2/source/controller/main/ChartWindow.cxx
@@ -93,12 +93,12 @@ void ChartWindow::clear()
 this->ReleaseMouse();
 }
 
-void ChartWindow::PrePaint()
+void ChartWindow::PrePaint(vcl::RenderContext& /*rRenderContext*/)
 {
 // forward VCLs PrePaint window event to DrawingLayer
-if( m_pWindowController )
+if (m_pWindowController)
 {
-m_pWindowController->PrePaint();
+   m_pWindowController->PrePaint();
 }
 }
 
diff --git a/chart2/source/controller/main/ChartWindow.hxx 
b/chart2/source/controller/main/ChartWindow.hxx
index d00c2f6..99a0c5f 100644
--- a/chart2/source/controller/main/ChartWindow.hxx
+++ b/chart2/source/controller/main/ChartWindow.hxx
@@ -42,8 +42,8 @@ public:
 void clear();
 
 //from base class Window:
-virtual void PrePaint() SAL_OVERRIDE;
-virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& 
rRect ) SAL_OVERRIDE;
+virtual void PrePaint(vcl::RenderContext& rRenderContext) SAL_OVERRIDE;
+virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& 
rRect) SAL_OVERRIDE;
 virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
 virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
 virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE;
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index d509a55..04cdb0f 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -715,8 +715,9 @@ public:
 virtual voidMouseButtonUp( const MouseEvent& rMEvt 
);
 virtual voidKeyInput( const KeyEvent& rKEvt );
 virtual voidKeyUp( const KeyEvent& rKEvt );
-virtual voidPrePaint();
+virtual voidPrePaint(vcl::RenderContext& 
rRenderContext);
 virtual voidPaint(vcl::RenderContext& 
rRenderContext, const Rectangle& rRect);
+virtual voidPostPaint(vcl::RenderContext& 
rRenderContext);
 virtual voidErase() SAL_OVERRIDE;
 virtual voidErase( const Rectangle& rRect ) 
SAL_OVERRIDE { ::OutputDevice::Erase( rRect ); }
 
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index aa683cb..e4bb56a 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -293,8 +293,8 @@ class ScGridWindow : public vcl::Window, public 
DropTargetHelper, public DragSou
 voidGetSelectionRects( ::std::vector< Rectangle >& rPixelRects 
);
 
 protected:
-virtual voidPrePaint() SAL_OVERRIDE;
-virtual voidPaint( vcl::RenderContext& rRenderContext, const 
Rectangle& rRect ) SAL_OVERRIDE;
+virtual voidPrePaint(vcl::RenderContext& rRenderContext) SAL_OVERRIDE;
+virtual voidPaint(vcl::RenderContext& rRenderContext, const Rectangle& 
rRect) SAL_OVERRIDE;
 virtual voidGetFocus() SAL_OVERRIDE;
 virtual voidLoseFocus() SAL_OVERRIDE;
 
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 2f291d7..a3e5170 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -283,7 +283,7 @@ void ScGridWindow::DoInvertRect( const Rectangle& rPixel )
 UpdateHeaderOverlay();  // uses aInvertRect
 }
 
-void ScGridWindow::PrePaint()
+void ScGridWindow::PrePaint(vcl::RenderContext& /*rRenderContext*/)
 {
 // forward PrePaint to DrawingLayer
 ScTabViewShell* pTabViewShell = pViewData->GetViewShell();
@@ -292,7 +292,7 @@ void ScGridWindow::PrePaint()
 {
 SdrView* pDrawView = pTabViewShell->GetSdrView();
 
-if(pDrawView)
+if (pDrawView)
 {
 pDrawView->PrePaint();
   

LibreOffice Gerrit News for core on 2015-05-13

[gerrit]

Moin!

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

 First time contributors doing great things! 
+ tdf#87373: Bad text spacing on OS X
  in https://gerrit.libreoffice.org/15633 from Thorsten Wagner
  about module vcl
+ tdf#86138 Context menu should state the name of the toolbar
  in https://gerrit.libreoffice.org/15716 from Philippe Jung
  about module framework, include, vcl
+ tdf#74932 FILESAVE: Shapes appear when saving a .XLSX file with filter
  in https://gerrit.libreoffice.org/15662 from Priyanka Gaikwad
  about module oox, sc
 End of freshness 

+ tdf#76941 : docx export image greyscale
  in https://gerrit.libreoffice.org/15722 from Joren De Cuyper
  about module sw
+ tdf#65509 - Auto Save Also Too Disabled
  in https://gerrit.libreoffice.org/15721 from Joel Madero
  about module cui
+ perform a proper boundary check, just in case
  in https://gerrit.libreoffice.org/15720 from Takeshi Abe
  about module chart2
+ DON'T PUSH TO MASTER: Test of buildability after rename-sw-abbreviations.
  in https://gerrit.libreoffice.org/15718 from Jan Holesovsky
  about module chart2, cui, editeng, filter, include, sc, sd, sfx2, starmath, 
svl, svtools, svx, sw
+ slideshow: simplify code by replacing std::find_if by std::any_of/std::no
  in https://gerrit.libreoffice.org/15714 from Takeshi Abe
  about module slideshow


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

+ Unit test for tdf#83366
  in https://gerrit.libreoffice.org/15670 from Henry Castro
+ exttextcat: suppress -Qunused-arguments warning for Apple clang
  in https://gerrit.libreoffice.org/15719 from Michael Stahl
+ Missing disposeAndClear in MsgBox basic function
  in https://gerrit.libreoffice.org/15717 from Philippe Jung
+ tdf#70318: don't forget to clean up second fake paragraph
  in https://gerrit.libreoffice.org/15697 from Mike Kaganski
+ tdf#84153: "Edit Comment" in context menu when a cell has a comment
  in https://gerrit.libreoffice.org/15713 from Ravindra Vidhate
+ tdf#60573 Conditional formatting does not allow scrolling
  in https://gerrit.libreoffice.org/14258 from Henry Castro
+ Switch VclBuilder constructors to use VclPtr.
  in https://gerrit.libreoffice.org/15708 from Michael Meeks
+ tdf#91904-Import Image for bullets through "Add and Resize" Button
  in https://gerrit.libreoffice.org/15642 from Heena Gupta
+ tdf#90246 PPTX paragraph and bullet leftMargin and Indentation is not exp
  in https://gerrit.libreoffice.org/15016 from Priyanka Gaikwad
+ tdf#80340: Table changes format in PPTX format
  in https://gerrit.libreoffice.org/14925 from Yogesh Bharate
+ Basic: Doesn't allow non ASCII characters in numeric literals
  in https://gerrit.libreoffice.org/14691 from Arnaud Versini
+ tdf#68871: Remove the old Elements panel from Math
  in https://gerrit.libreoffice.org/15599 from Julien Nabet
+ tdf#76941 : image greyscale not imported correctly
  in https://gerrit.libreoffice.org/15710 from Joren De Cuyper
+ convert SYMBOL_DRAW constants to scoped enum
  in https://gerrit.libreoffice.org/15676 from Noel Grandin
+ convert CURSOR_DIRECTION constants to scoped enum
  in https://gerrit.libreoffice.org/15675 from Noel Grandin


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

+ CppunitTest_sd_export_tests: fix validation errors
  in https://gerrit.libreoffice.org/15709 from Joren De Cuyper
+ tdf#91052 - more macros for 'make' constructors.
  in https://gerrit.libreoffice.org/15707 from Michael Meeks
+ tdf#91052 - more macros for 'make' constructors.
  in https://gerrit.libreoffice.org/15703 from Michael Meeks
+ WaE: unused parameter.
  in https://gerrit.libreoffice.org/15704 from Michael Meeks
+ tdf#91138 - hold reference until idle dispose.
  in https://gerrit.libreoffice.org/15706 from Michael Meeks
+ tdf#91052 - more macros for 'make' constructors.
  in https://gerrit.libreoffice.org/15705 from Michael Meeks
+ tdf#91052 - use macros to standardize 'make' constructors for VclBuilder.
  in https://gerrit.libreoffice.org/15702 from Michael Meeks


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

+ Resolves tdf#83365 Other: Access across spreadsheet returns Err:504
  in https://gerrit.libreoffice.org/15363 from Henry Castro
+ tdf#46037: Exchange some uses of configurationhelper for officecfg in Wri
  in https://gerrit.libreoffice.org/15611 from Marcos Paulo de Souza
+ Fixed two strings in the context menu for consistency with other entries
  in https://gerrit.libreoffice.org/15537 from Yousuf Philips
+ tdf#90494-Add new Attribute for exporting gradient angle diagonally
  in https://gerrit.libreoffice.org/15323 from Heena Gupta
+ preserve whitespaces here, tdf#88137, tdf#89254
  in https://gerrit.libreoffice.org/15375 from Markus Mohrhard
+ add kde5 build of vcl
  in https://gerrit.libreoffice.org/15327 from Jonathan Riddell
+ added currency dropdown menu may have some erors
  in https://gerrit.libreoffice.org/15274 from raja

[Libreoffice-commits] core.git: include/svtools include/vcl sd/source sfx2/source starmath/source svtools/source vcl/osx vcl/source vcl/unx

[Noel Grandin]

 include/svtools/valueset.hxx |3 +
 include/vcl/decoview.hxx |   37 ---
 sd/source/ui/dlg/headerfooterdlg.cxx |2 -
 sfx2/source/dialog/dockwin.cxx   |2 -
 starmath/source/view.cxx |4 +-
 svtools/source/control/valueset.cxx  |6 +--
 vcl/osx/salnativewidgets.cxx |6 +--
 vcl/source/control/button.cxx|   10 ++---
 vcl/source/control/ctrl.cxx  |2 -
 vcl/source/control/fixed.cxx |2 -
 vcl/source/edit/vclmedit.cxx |2 -
 vcl/source/window/brdwin.cxx |   34 +-
 vcl/source/window/decoview.cxx   |   58 ---
 vcl/source/window/menu.cxx   |2 -
 vcl/source/window/printdlg.cxx   |4 +-
 vcl/source/window/splitwin.cxx   |2 -
 vcl/source/window/status.cxx |   10 ++---
 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |   10 ++---
 vcl/unx/kde4/KDESalGraphics.cxx  |2 -
 19 files changed, 107 insertions(+), 91 deletions(-)

New commits:
commit 61eb53d39a8d90167dc5599c2a2092626788a630
Author: Noel Grandin 
Date:   Fri May 8 15:40:06 2015 +0200

convert FRAME_DRAW constants to scoped enum

Change-Id: I98e52aa56ec063ecc8f3d10baef65eb293c726bf

diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index 7bb41f7..0497bdd 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -39,6 +39,7 @@ struct ValueSetItem;
 
 class ValueSetAcc;
 class ValueItemAcc;
+enum class DrawFrameStyle;
 
 /*
 
@@ -219,7 +220,7 @@ private:
 sal_uInt16  mnUserVisLines;
 sal_uInt16  mnFirstLine;
 sal_uInt16  mnSpacing;
-sal_uInt16  mnFrameStyle;
+DrawFrameStyle  mnFrameStyle;
 Color   maColor;
 Link<>  maDoubleClickHdl;
 Link<>  maSelectHdl;
diff --git a/include/vcl/decoview.hxx b/include/vcl/decoview.hxx
index ef54996..a57c527 100644
--- a/include/vcl/decoview.hxx
+++ b/include/vcl/decoview.hxx
@@ -43,18 +43,29 @@ namespace o3tl
 }
 
 // Flags for DrawFrame()
-#define FRAME_DRAW_IN   ((sal_uInt16)0x0001)
-#define FRAME_DRAW_OUT  ((sal_uInt16)0x0002)
-#define FRAME_DRAW_GROUP((sal_uInt16)0x0003)
-#define FRAME_DRAW_DOUBLEIN ((sal_uInt16)0x0004)
-#define FRAME_DRAW_DOUBLEOUT((sal_uInt16)0x0005)
-#define FRAME_DRAW_NWF  ((sal_uInt16)0x0006)
-#define FRAME_DRAW_MENU ((sal_uInt16)0x0010)
-#define FRAME_DRAW_WINDOWBORDER ((sal_uInt16)0x0020)
-#define FRAME_DRAW_BORDERWINDOWBORDER   ((sal_uInt16)0x0040)
-#define FRAME_DRAW_MONO ((sal_uInt16)0x1000)
-#define FRAME_DRAW_NODRAW   ((sal_uInt16)0x8000)
-#define FRAME_DRAW_STYLE((sal_uInt16)0x000F)
+enum class DrawFrameStyle
+{
+NONE = 0x,
+In   = 0x0001,
+Out  = 0x0002,
+Group= 0x0003,
+DoubleIn = 0x0004,
+DoubleOut= 0x0005,
+NWF  = 0x0006,
+};
+enum class DrawFrameFlags
+{
+NONE = 0x,
+Menu = 0x0010,
+WindowBorder = 0x0020,
+BorderWindowBorder   = 0x0040,
+Mono = 0x1000,
+NoDraw   = 0x8000,
+};
+namespace o3tl
+{
+template<> struct typed_flags : 
is_typed_flags {};
+}
 
 // Flags for DrawHighlightFrame()
 #define FRAME_HIGHLIGHT_IN  ((sal_uInt16)0x0001)
@@ -92,7 +103,7 @@ public:
const Color& rRightBottomColor );
 voidDrawHighlightFrame( const Rectangle& rRect,
 sal_uInt16 nStyle = 
FRAME_HIGHLIGHT_OUT );
-Rectangle   DrawFrame( const Rectangle& rRect, sal_uInt16 nStyle = 
FRAME_DRAW_OUT );
+Rectangle   DrawFrame( const Rectangle& rRect, DrawFrameStyle 
nStyle = DrawFrameStyle::Out, DrawFrameFlags nFlags = DrawFrameFlags::NONE );
 Rectangle   DrawButton( const Rectangle& rRect, sal_uInt16 nStyle 
);
 voidDrawSeparator( const Point& rStart, const Point& 
rStop, bool bVertical = true );
 voidDrawHandle(const Rectangle& rRectangle, bool bVertical 
= true);
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx 
b/sd/source/ui/dlg/headerfooterdlg.cxx
index 93246b8..041d61a 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -806,7 +806,7 @@ void PresLayoutPreview::Paint( vcl::RenderContext& 
/*rRenderContext*/, const Rec
 
 // draw decoration frame
 DecorationView aDecoView( this );
-maOutRect = aDecoView.DrawFrame( m

[Libreoffice-commits] core.git: 3 commits - cui/source dbaccess/source include/vcl sc/source svtools/source vcl/inc vcl/source

[Noel Grandin]

 cui/source/customize/cfg.cxx   |8 -
 cui/source/dialogs/hangulhanjadlg.cxx  |3 
 cui/source/options/optdict.cxx |2 
 dbaccess/source/ui/browser/sbagrid.cxx |2 
 include/vcl/button.hxx |   11 -
 include/vcl/decoview.hxx   |   47 +++---
 include/vcl/event.hxx  |   28 +--
 include/vcl/window.hxx |   19 ++
 sc/source/ui/cctrl/cbuttonw.cxx|4 
 sc/source/ui/view/select.cxx   |2 
 svtools/source/contnr/imivctl1.cxx |8 -
 svtools/source/contnr/svlbitm.cxx  |   24 +--
 svtools/source/control/valueset.cxx|2 
 vcl/inc/brdwin.hxx |   71 -
 vcl/source/control/button.cxx  |  246 -
 vcl/source/control/scrbar.cxx  |   12 -
 vcl/source/control/slider.cxx  |6 
 vcl/source/control/spinfld.cxx |   14 -
 vcl/source/window/brdwin.cxx   |  140 +-
 vcl/source/window/decoview.cxx |   54 +++
 vcl/source/window/dialog.cxx   |2 
 vcl/source/window/mouse.cxx|4 
 vcl/source/window/toolbox.cxx  |8 -
 vcl/source/window/window.cxx   |4 
 vcl/source/window/window2.cxx  |   10 -
 vcl/source/window/winproc.cxx  |8 -
 26 files changed, 378 insertions(+), 361 deletions(-)

New commits:
commit 4c27e84145fc8546b180b81c15f58d2382779ac9
Author: Noel Grandin 
Date:   Tue May 12 08:15:34 2015 +0200

convert ENDTRACK_ constants to scoped enum

Change-Id: Iaccd9c3be1ae24f7f9861f9049cd5b52f155170f

diff --git a/dbaccess/source/ui/browser/sbagrid.cxx 
b/dbaccess/source/ui/browser/sbagrid.cxx
index d9537a8..c2509dc 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -599,7 +599,7 @@ bool SbaGridHeader::ImplStartColumnDrag(sal_Int8 _nAction, 
const Point& _rMouseP
 if (!bResizingCol)
 {
 // force the base class to end it's drag mode
-EndTracking(ENDTRACK_CANCEL | ENDTRACK_END);
+EndTracking(TrackingEventFlags::Cancel | TrackingEventFlags::End);
 
 // because we have 3d-buttons the select handler is called from 
MouseButtonUp, but StartDrag
 // occurs earlier (while the mouse button is down)
diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx
index 89929d0..9732033 100644
--- a/include/vcl/event.hxx
+++ b/include/vcl/event.hxx
@@ -338,18 +338,6 @@ inline UserDrawEvent::UserDrawEvent( OutputDevice* pOut,
 }
 
 
-// - Tracking-Types -
-
-
-#define ENDTRACK_CANCEL ((sal_uInt16)0x0001)
-#define ENDTRACK_KEY((sal_uInt16)0x0002)
-#define ENDTRACK_FOCUS  ((sal_uInt16)0x0004)
-#define ENDTRACK_END((sal_uInt16)0x1000)
-#define ENDTRACK_DONTCALLHDL((sal_uInt16)0x8000)
-
-#define TRACKING_REPEAT ((sal_uInt16)0x0100)
-
-
 // - TrackingEvent -
 
 
@@ -357,32 +345,32 @@ class VCL_DLLPUBLIC TrackingEvent
 {
 private:
 MouseEvent  maMEvt;
-sal_uInt16  mnFlags;
+TrackingEventFlags  mnFlags;
 
 public:
 explicitTrackingEvent();
 explicitTrackingEvent( const MouseEvent&,
-   sal_uInt16 nTrackFlags = 0 );
+   TrackingEventFlags nTrackFlags = 
TrackingEventFlags::NONE );
 
 const MouseEvent&   GetMouseEvent() const { return maMEvt; }
 
 boolIsTrackingRepeat() const
-{ return ((mnFlags & TRACKING_REPEAT) != 0); }
+{ return bool(mnFlags & 
TrackingEventFlags::Repeat); }
 
 boolIsTrackingEnded() const
-{ return ((mnFlags & ENDTRACK_END) != 0); }
+{ return bool(mnFlags & TrackingEventFlags::End); }
 boolIsTrackingCanceled() const
-{ return ((mnFlags & ENDTRACK_CANCEL) != 0); }
-sal_uInt16  GetTrackingFlags() const { return mnFlags; }
+{ return bool(mnFlags & 
TrackingEventFlags::Cancel); }
+TrackingEventFlags  GetTrackingFlags() const { return mnFlags; }
 };
 
 inline TrackingEvent::TrackingEvent()
 {
-mnFlags = 0;
+mnFlags = TrackingEventFlags::NONE;
 }
 
 inline TrackingEvent::TrackingEvent( const MouseEvent& rMEvt,
- sal_uInt16 nTrackFlags ) :
+ TrackingEventFlags nTrackFlags ) :
 maMEvt( rMEvt )
 {
 mnFlags = nTrackFlags;
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 04cdb0f..1b23608 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -122,6 +122,23 @@ namespace svt { class PopupWindowControllerImpl; }
 template class VclPtr;
 
 
+
+enum class TrackingEventFlags
+{
+NONE   = 0x,
+Cancel = 0x0001,
+Key= 0x0002,
+Focus

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

[Noel Grandin]

 vcl/osx/salnativewidgets.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5b76c5023faf345814a7dd874d2b7cfd3dd05096
Author: Noel Grandin 
Date:   Wed May 13 08:55:56 2015 +0200

fix OSX build

after my commit 7ac403aa7cb2bd531245280d88bdc9fe6553c711
"convert FRAME_DRAW constants to scoped enum"

Change-Id: Id76d76d5549cd09b35b1d9e8fb68c9549f9fd3a9

diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx
index 8ef6ed6..0e762ed 100644
--- a/vcl/osx/salnativewidgets.cxx
+++ b/vcl/osx/salnativewidgets.cxx
@@ -1013,7 +1013,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
 
 case CTRL_FRAME:
 {
-sal_uInt16 nStyle = aValue.getNumericVal();
+DrawFrameFlags nStyle = 
static_cast(aValue.getNumericVal());
 if( nPart == PART_BORDER ) {
 if(!( nStyle & DrawFrameFlags::Menu ) && !(nStyle & 
DrawFrameFlags::WindowBorder) )
 {
@@ -1319,7 +1319,7 @@ bool AquaSalGraphics::getNativeControlRegion( ControlType 
nType, ControlPart nPa
 break;
 case CTRL_FRAME:
 {
-sal_uInt16 nStyle = aValue.getNumericVal();
+DrawFrameFlags nStyle = 
static_cast(aValue.getNumericVal());
 if(  ( nPart == PART_BORDER ) &&
 !( nStyle & (DrawFrameFlags::Menu | 
DrawFrameFlags::WindowBorder | DrawFrameFlags::BorderWindowBorder) ) )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits