date:20150108

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

2015-01-08 Thread Noel Grandin

 include/tools/poly.hxx  |   22 +++---
 svtools/source/uno/unoimap.cxx  |2 +-
 svx/source/dialog/frmsel.cxx|4 ++--
 sw/source/core/layout/fly.cxx   |2 +-
 sw/source/core/unocore/unoframe.cxx |2 +-
 tools/source/generic/poly.cxx   |   16 
 tools/source/generic/poly2.cxx  |   12 ++--
 vcl/source/gdi/impvect.cxx  |4 ++--
 vcl/source/gdi/pdfwriter_impl.cxx   |2 +-
 vcl/source/outdev/hatch.cxx |4 ++--
 10 files changed, 39 insertions(+), 31 deletions(-)

New commits:
commit 278b400511a76a9be5e0afc0377a9c69823cc230
Author: Noel Grandin 
Date:   Sun Jan 4 19:34:19 2015 +0200

fdo#84938: convert POLY_OPTIMIZE_ #defines to 'enum class'

Change-Id: I163bd3f521473c5357c23c3ce4978f984be7b6fe

diff --git a/include/tools/poly.hxx b/include/tools/poly.hxx
index bfc14ea..af157b2 100644
--- a/include/tools/poly.hxx
+++ b/include/tools/poly.hxx
@@ -22,17 +22,25 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
 #define POLY_APPEND (0x)
 #define POLYPOLY_APPEND (0x)
 
-#define POLY_OPTIMIZE_OPEN  0x0001UL
-#define POLY_OPTIMIZE_CLOSE 0x0002UL
-#define POLY_OPTIMIZE_NO_SAME   0x0004UL
-#define POLY_OPTIMIZE_REDUCE0x0008UL
-#define POLY_OPTIMIZE_EDGES 0x0010UL
+enum class PolyOptimizeFlags {
+NONE  = 0x,
+OPEN  = 0x0001,
+CLOSE = 0x0002,
+NO_SAME   = 0x0004,
+REDUCE= 0x0008,
+EDGES = 0x0010,
+};
+namespace o3tl
+{
+template<> struct typed_flags : 
is_typed_flags {};
+}
 
 enum PolyStyle
 {
@@ -134,7 +142,7 @@ public:
 boolIsRightOrientated() const;
 double  CalcDistance( sal_uInt16 nPt1, sal_uInt16 nPt2 );
 voidClip( const Rectangle& rRect, bool bPolygon = true );
-voidOptimize( sal_uIntPtr nOptimizeFlags, const 
PolyOptimizeData* pData = NULL );
+voidOptimize( PolyOptimizeFlags nOptimizeFlags, const 
PolyOptimizeData* pData = NULL );
 
 /** Adaptive subdivision of polygons with curves
 
@@ -223,7 +231,7 @@ public:
 sal_uInt16  Count() const;
 Rectangle   GetBoundRect() const;
 voidClip( const Rectangle& rRect );
-voidOptimize( sal_uIntPtr nOptimizeFlags, const 
PolyOptimizeData* pData = NULL );
+voidOptimize( PolyOptimizeFlags nOptimizeFlags, const 
PolyOptimizeData* pData = NULL );
 
 /** Adaptive subdivision of polygons with curves
 
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx
index b4ece34..ab16d84 100644
--- a/svtools/source/uno/unoimap.cxx
+++ b/svtools/source/uno/unoimap.cxx
@@ -290,7 +290,7 @@ IMapObject* SvUnoImageMapObject::createIMapObject() const
 aPoly.SetPoint( aPoint, nPoint );
 }
 
-aPoly.Optimize( POLY_OPTIMIZE_CLOSE );
+aPoly.Optimize( PolyOptimizeFlags::CLOSE );
 pNewIMapObject = new IMapPolygonObject( aPoly, aURL, aAltText, 
aDesc, aTarget, aName, mbIsActive, false );
 }
 break;
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index 86772ce..7de0506 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -531,7 +531,7 @@ void FrameSelectorImpl::DrawBackground()
 tools::PolyPolygon aPPoly;
 for( FrameBorderCIter aIt( maEnabBorders ); aIt.Is(); ++aIt )
 (*aIt)->MergeFocusToPolyPolygon( aPPoly );
-aPPoly.Optimize( POLY_OPTIMIZE_CLOSE );
+aPPoly.Optimize( PolyOptimizeFlags::CLOSE );
 maVirDev.SetLineColor( maBackCol );
 maVirDev.SetFillColor( maBackCol );
 maVirDev.DrawPolyPolygon( aPPoly );
@@ -687,7 +687,7 @@ void FrameSelectorImpl::DrawAllTrackingRects()
 // no frame border selected -> draw tracking rectangle around entire 
control
 aPPoly.Insert( Polygon( Rectangle( maVirDevPos, 
maVirDev.GetOutputSizePixel() ) ) );
 
-aPPoly.Optimize( POLY_OPTIMIZE_CLOSE );
+aPPoly.Optimize( PolyOptimizeFlags::CLOSE );
 for( sal_uInt16 nIdx = 0, nCount = aPPoly.Count(); nIdx < nCount; ++nIdx )
 mrFrameSel.InvertTracking( aPPoly.GetObject( nIdx ), SHOWTRACK_SMALL | 
SHOWTRACK_WINDOW );
 }
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 80773d3..ddec469 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -2529,7 +2529,7 @@ bool SwFlyFrm::GetContour( tools::PolyPolygon&   rContour,
 if( !aClip.Height() )
 aClip.Height( 1 );
 rContour.Clip( aClip.SVRect() );
-rContour.Optimize(POLY_OPTIMIZE_CLOSE);
+rContour.Optimize(PolyOptimizeFlags::CLOSE);
 bRet = true;
 }
 }
diff --git a/sw/source/core/unocore/unoframe.cxx 
b/sw/source/core/unocore/unoframe.cxx
index 1db4715..123af06 100644
--- a/sw/source/core/unocore/uno

[Bug 84938] replace #defined constants with ‘enum class’

2015-01-08 Thread bugzilla-daemon

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

--- Comment #28 from Commit Notification 
 ---
Noel Grandin committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=278b400511a76a9be5e0afc0377a9c69823cc230

fdo#84938: convert POLY_OPTIMIZE_ #defines to 'enum class'

It will be available in 4.5.0.

The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
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: sd/Library_sd.mk sd/source svx/Library_svxcore.mk svx/source sw/Library_sw.mk sw/source toolkit/Library_tk.mk toolkit/source vcl/Library_vcl.mk vcl/source vcl/unx

2015-01-08 Thread Matúš Kukan

 sd/Library_sd.mk  |1 +
 sd/source/ui/dlg/sdabstdlg.cxx|2 +-
 svx/Library_svxcore.mk|1 +
 svx/source/form/dbtoolsclient.cxx |2 +-
 sw/Library_sw.mk  |2 ++
 sw/source/uibase/dbui/swdbtoolsclient.cxx |2 +-
 sw/source/uibase/dialog/swabstdlg.cxx |2 +-
 toolkit/Library_tk.mk |1 +
 toolkit/source/awt/vclxtoolkit.cxx|2 +-
 vcl/Library_vcl.mk|4 
 vcl/source/app/svapp.cxx  |2 +-
 vcl/source/window/abstdlg.cxx |3 +--
 vcl/unx/generic/plugadapt/salplug.cxx |4 ++--
 13 files changed, 18 insertions(+), 10 deletions(-)

New commits:
commit 5c5edaef89e953d260501678c3d62c47ad9763ac
Author: MatÃºÅ¡ Kukan 
Date:   Thu Jan 8 21:14:04 2015 +0100

Revert "Use SVLIBRARY instead of gb_Library_get_runtime_filename"

$(call gb_Library__get_name,foo) returns "libmerged" if library foo is 
merged.

This reverts commit ee567a63fad9e755b11ca28696da35f00ed3b0fc.

Change-Id: I6ab9b7f0b01262a6f9d5a6834a6cffdd6ffc6f8a

diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index a38b6eb..2afcf9b 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -49,6 +49,7 @@ $(eval $(call gb_Library_set_include,sd,\
 
 $(eval $(call gb_Library_add_defs,sd,\
-DSD_DLLIMPLEMENTATION \
+   -DSDUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call 
gb_Library__get_name,sdui))\" \
 ))
 
 ifneq ($(strip $(dbg_anim_log)$(DBG_ANIM_LOG)),)
diff --git a/sd/source/ui/dlg/sdabstdlg.cxx b/sd/source/ui/dlg/sdabstdlg.cxx
index 4594295..acf4705 100644
--- a/sd/source/ui/dlg/sdabstdlg.cxx
+++ b/sd/source/ui/dlg/sdabstdlg.cxx
@@ -42,7 +42,7 @@ SdAbstractDialogFactory* SdAbstractDialogFactory::Create()
 #if HAVE_FEATURE_DESKTOP
 #ifndef DISABLE_DYNLOADING
 static ::osl::Module aDialogLibrary;
-static const OUString sLibName(SVLIBRARY("sdui"));
+static const OUString sLibName(SDUI_DLL_NAME);
 if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, 
sLibName ) )
 fp = ( SdAbstractDialogFactory* (SAL_CALL*)() )
 aDialogLibrary.getFunctionSymbol( "SdCreateDialogFactory" );
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index a1c7696..39d6be5 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -47,6 +47,7 @@ $(eval $(call 
gb_Library_set_precompiled_header,svxcore,$(SRCDIR)/svx/inc/pch/pr
 $(eval $(call gb_Library_add_defs,svxcore,\
 -DSVX_DLLIMPLEMENTATION \
 -DBOOST_SPIRIT_USE_OLD_NAMESPACE \
+-DDBTOOLS_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call 
gb_Library__get_name,dbtools))\" \
 ))
 
 $(eval $(call gb_Library_use_libraries,svxcore,\
diff --git a/svx/source/form/dbtoolsclient.cxx 
b/svx/source/form/dbtoolsclient.cxx
index baee838..79e6eab 100644
--- a/svx/source/form/dbtoolsclient.cxx
+++ b/svx/source/form/dbtoolsclient.cxx
@@ -116,7 +116,7 @@ namespace svxform
 
 // load the dbtools library
 s_hDbtoolsModule = osl_loadModuleRelative(
-&thisModule, OUString(SVLIBRARY("dbtools")).pData, 0);
+&thisModule, OUString(DBTOOLS_DLL_NAME).pData, 0);
 OSL_ENSURE(NULL != s_hDbtoolsModule, 
"ODbtoolsClient::registerClient: could not load the dbtools library!");
 if (NULL != s_hDbtoolsModule)
 {
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index a5b853a..2af35f2 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -43,6 +43,8 @@ $(eval $(call gb_Library_use_sdk_api,sw))
 
 $(eval $(call gb_Library_add_defs,sw,\
 -DSW_DLLIMPLEMENTATION \
+   -DSWUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call 
gb_Library__get_name,swui))\" \
+   -DDBTOOLS_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call 
gb_Library__get_name,dbtools))\" \
 ))
 
 $(eval $(call gb_Library_use_libraries,sw,\
diff --git a/sw/source/uibase/dbui/swdbtoolsclient.cxx 
b/sw/source/uibase/dbui/swdbtoolsclient.cxx
index 2c1ce9a..a7bc6d9 100644
--- a/sw/source/uibase/dbui/swdbtoolsclient.cxx
+++ b/sw/source/uibase/dbui/swdbtoolsclient.cxx
@@ -102,7 +102,7 @@ void SwDbtoolsClient::registerClient()
 
 #if HAVE_FEATURE_DESKTOP
 #ifndef DISABLE_DYNLOADING
-const OUString sModuleName(SVLIBRARY("dbtools"));
+const OUString sModuleName(DBTOOLS_DLL_NAME);
 
 // load the dbtools library
 getDbToolsClientModule() = osl_loadModuleRelative(
diff --git a/sw/source/uibase/dialog/swabstdlg.cxx 
b/sw/source/uibase/dialog/swabstdlg.cxx
index 127ac29..7b5ec71 100644
--- a/sw/source/uibase/dialog/swabstdlg.cxx
+++ b/sw/source/uibase/dialog/swabstdlg.cxx
@@ -41,7 +41,7 @@ SwAbstractDialogFactory* SwAbstractDialogFactory::Create()
 #if HAVE_FEATURE_DESKTOP
 #ifndef DISABLE_DYNLOADING
 static ::osl::Module aDialogLibrary;
-static const OUString sLibName(SVLIBRARY("swui"));
+static const OUString sLibName(S

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

2015-01-08 Thread Zolnai Tamás

Tag 'cp-4.2-22' created by Andras Timar  at 
2015-01-09 06:07 -0800

cp-4.2-22

Changes since libreoffice-4-2-branch-point-7:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-08 Thread Christian Lohmaier

Tag 'cp-4.2-22' created by Andras Timar  at 
2015-01-09 06:07 -0800

cp-4.2-22

Changes since cp-4.2-19:
Christian Lohmaier (1):
  update translations for 4.2.8 rc1

---
 source/ar/sw/uiconfig/swriter/ui.po|   13 
 source/as/padmin/source.po |8 
 source/cs/officecfg/registry/data/org/openoffice/Office/UI.po  |8 
 source/da/cui/uiconfig/ui.po   |6 
 source/da/filter/source/config/fragments/filters.po|   12 
 source/da/helpcontent2/source/text/sbasic/shared.po|   14 
 source/da/helpcontent2/source/text/scalc/01.po |   12 
 source/da/helpcontent2/source/text/schart/01.po|   10 
 source/da/helpcontent2/source/text/shared/00.po|   10 
 source/da/helpcontent2/source/text/shared/01.po|   14 
 source/da/helpcontent2/source/text/shared/autopi.po|   10 
 source/da/helpcontent2/source/text/shared/explorer/database.po |   14 
 source/da/helpcontent2/source/text/simpress/01.po  |   14 
 source/da/helpcontent2/source/text/simpress/guide.po   |   16 
 source/da/helpcontent2/source/text/smath/01.po |   10 
 source/da/helpcontent2/source/text/smath/guide.po  |   10 
 source/da/helpcontent2/source/text/swriter/01.po   |8 
 source/da/helpcontent2/source/text/swriter/guide.po|   12 
 source/da/officecfg/registry/data/org/openoffice/Office/UI.po  |   10 
 source/da/scp2/source/writer.po|   10 
 source/da/sd/source/ui/app.po  |   10 
 source/da/sw/uiconfig/swriter/ui.po|   10 
 source/de/helpcontent2/source/text/shared/guide.po |   14 
 source/de/sw/uiconfig/swriter/ui.po|   10 
 source/gl/officecfg/registry/data/org/openoffice/Office/UI.po  |   10 
 source/gl/sc/source/ui/src.po  |   10 
 source/gl/sd/source/ui/view.po |   12 
 source/gl/sw/uiconfig/swriter/ui.po|   12 
 source/nl/cui/uiconfig/ui.po   |   12 
 source/nl/instsetoo_native/inc_openoffice/windows/msi_languages.po |   10 
 source/nl/officecfg/registry/data/org/openoffice/Office/UI.po  |   10 
 source/nl/sc/source/ui/src.po  |8 
 source/nl/svtools/uiconfig/ui.po   |   12 
 source/nl/svx/source/dialog.po |   10 
 source/nl/sw/uiconfig/swriter/ui.po|   10 
 source/nl/vcl/source/src.po|   10 
 source/ru/cui/uiconfig/ui.po   |   12 
 source/ru/helpcontent2/source/text/shared/optionen.po  |   10 
 source/sv/sc/source/ui/src.po  |6 
 source/th/basic/source/classes.po  |6 
 source/th/connectivity/source/resource.po  |   25 -
 source/th/cui/source/customize.po  |6 
 source/th/cui/uiconfig/ui.po   |   33 -
 source/th/dbaccess/source/ui/dlg.po|6 
 source/th/dbaccess/source/ui/querydesign.po|6 
 source/th/desktop/source/app.po|6 
 source/th/desktop/source/deployment/gui.po |6 
 source/th/extensions/source/scanner.po |   14 
 source/th/filter/uiconfig/ui.po|6 
 source/th/formula/source/ui/dlg.po |   14 
 source/th/instsetoo_native/inc_openoffice/windows/msi_languages.po |8 
 source/th/officecfg/registry/data/org/openoffice/Office/UI.po  |6 
 source/th/readlicense_oo/docs.po   |6 
 source/th/sc/source/ui/src.po  |  209 
--
 source/th/sc/uiconfig/scalc/ui.po  |   14 
 source/th/scp2/source/accessories.po   |   18 
 source/th/scp2/source/ooo.po   |   14 
 source/th/sd/source/ui/app.po  |7 
 source/th/sd/uiconfig/sdraw/ui.po  |8 
 source/th/sd/uiconfig/simpress/ui.po   |6 
 source/th/sfx2/uiconfig/ui.po  |7 
 source/th/svl/source/misc.po   |7 
 source/th/svx/uiconfig/ui.po   |   21 -
 source/th/sw/source/ui

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

2015-01-08 Thread Andras Timar

Tag 'cp-4.2-22' created by Andras Timar  at 
2015-01-09 06:07 -0800

cp-4.2-22

Changes since cp-4.2-21-14:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-08 Thread Olivier R

Tag 'cp-4.2-22' created by Andras Timar  at 
2015-01-09 06:07 -0800

cp-4.2-22

Changes since cp-4.2-9:
Olivier R (1):
  French dictionary update: v5.2

---
 fr_FR/README_fr.txt   |   13 
 fr_FR/description.xml |2 
 fr_FR/fr.aff  |14658 +++---
 fr_FR/fr.dic  |15695 ++
 4 files changed, 15644 insertions(+), 14724 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

LibreOffice Gerrit News for core on 2015-01-09

2015-01-08 Thread gerrit

Moin!

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

 First time contributors doing great things! 
+ fdo#87675-"Edit" Button for next style in edit paragraph style
  in https://gerrit.libreoffice.org/13639 from Heena Gupta
  about module include, sfx2
+ fdo#87675-"Edit" Button for linked style in edit paragraph style
  in https://gerrit.libreoffice.org/13785 from Heena Gupta
  about module include, sfx2
+ fdo#87675: Disable 'edit' when next style is same as current one.
  in https://gerrit.libreoffice.org/13811 from Heena Gupta
  about module include, sfx2
+ fdo#88045-Edit Button for Numbering Style in Edit Paragraph Style
  in https://gerrit.libreoffice.org/13740 from Heena Gupta
  about module sw
+ fdo#75825-"Send Document as E-Mail" not working
  in https://gerrit.libreoffice.org/13786 from Charu Tyagi
  about module shell
 End of freshness 

+ fdo#85818: rename KumZinsZ to CumIpmt
  in https://gerrit.libreoffice.org/13816 from Laurent Charrière
  about module formula, include, sc
+ fdo#85818: rename Kapz to Ppmt
  in https://gerrit.libreoffice.org/13815 from Laurent Charrière
  about module formula, include, sc
+ fdo#85818: rename Kombin, Kombin2, Variationen, Variationen2
  in https://gerrit.libreoffice.org/13814 from Laurent Charrière
  about module formula, include, sc
+ fdo#85818: rename ZinsZ enum name, constant, function to Ipmt
  in https://gerrit.libreoffice.org/13813 from Laurent Charrière
  about module formula, include, sc
+ Fix user data pointer setting on x86_64 platform on windows
  in https://gerrit.libreoffice.org/13807 from David Ostrovsky
  about module vcl
+ Disable ado unit test on x86_64 platform on windows
  in https://gerrit.libreoffice.org/13367 from David Ostrovsky
  about module connectivity
+ crop-pixel: Disable test on x86_64 platform on windows
  in https://gerrit.libreoffice.org/13661 from David Ostrovsky
  about module sw
+ Fix Python build in debug mode on x86_64 platform on windows
  in https://gerrit.libreoffice.org/13089 from David Ostrovsky
  about module external


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

+ Resolves fdo#87789: show groups in collected addresses
  in https://gerrit.libreoffice.org/13760 from Julien Nabet
+ coinmp: Don't hard code Win32 platform on Windows
  in https://gerrit.libreoffice.org/13231 from David Ostrovsky
+ Disable html tests on x86_64 on windows
  in https://gerrit.libreoffice.org/13660 from David Ostrovsky
+ brute-force find-and-remove of unused #define constants.
  in https://gerrit.libreoffice.org/13623 from Noel Grandin
+ avoid copying of vector
  in https://gerrit.libreoffice.org/13489 from Michael Weghorn
+ Windows cursor improvements. Fixes fdo#53148 and fdo#53151.
  in https://gerrit.libreoffice.org/13780 from Rimas Kudelis


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

+ Signed/Unsigned mismatch on x86_64 platform on windows
  in https://gerrit.libreoffice.org/13659 from David Ostrovsky
+ Related fdo#87834: add 2 unit tests
  in https://gerrit.libreoffice.org/13708 from Julien Nabet
+ Really remove events
  in https://gerrit.libreoffice.org/13681 from Julien Nabet
+ Cleanup ImplSVData constructor
  in https://gerrit.libreoffice.org/13778 from Julien Nabet
+ fdo#53151: We are using the same hand stock cursor for POINTER_HAND and P
  in https://gerrit.libreoffice.org/13809 from Rimas Kudelis


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

+ gbuild-to-ide fixes
  in https://gerrit.libreoffice.org/11754 from Peter Foley
+ fdo#82335.
  in https://gerrit.libreoffice.org/11555 from Sudarshan Rao
+ fdo#39625 Make existing CppUnittests work
  in https://gerrit.libreoffice.org/11605 from Tobias Madl
+ fdo#86606 removal of direct formatting options from the context menu
  in https://gerrit.libreoffice.org/13196 from Yousuf Philips
+ fdo#86784 make soffice commandline in juh Bootstrap.bootstrap() configura
  in https://gerrit.libreoffice.org/13290 from Christoph Lutz
+ Replace image-sort.pl with image-sort.py
  in https://gerrit.libreoffice.org/13124 from Marcos Paulo de Souza
+ start detection of kf5 stuff in configure.ac
  in https://gerrit.libreoffice.org/13079 from Jonathan Riddell
+ fdo#65209 attempt to enable daylight saving time
  in https://gerrit.libreoffice.org/11441 from Lim Jing
+ Move more places to boost::signal2 in math
  in https://gerrit.libreoffice.org/13065 from Marcos Paulo de Souza
+ more breeze icons
  in https://gerrit.libreoffice.org/13058 from Jonathan Riddell
+ vcl: change Timer and Idle to use boost's Signal2
  in https://gerrit.libreoffice.org/12528 from Chris Sherlock
+ Removed useless includes in accessibility/ tree
  in https://gerrit.libreoffice.org/12948 from Andrea Gelmini
+ Perftest for loading autocorrect dictionaries, related fdo#79761
  in https://gerrit.libreoffice.org/11296 from Matúš Kukan
+ HIG-ification of GSoC Color Picker dialog
  in https://gerrit.libreoffice.

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

2015-01-08 Thread Christian Lohmaier

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

New commits:
commit 34341a9f1c733afeaa4f907f653634a14bd42fcf
Author: Christian Lohmaier 
Date:   Wed Dec 10 23:17:02 2014 +0100

Updated core
Project: translations  d5a64312dc569301c2bc332ea1515fdbb5d2d866

diff --git a/translations b/translations
index 5da7698..d5a6431 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 5da7698be5086a031dceb18dbccb89a2fa69
+Subproject commit d5a64312dc569301c2bc332ea1515fdbb5d2d866
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-08 Thread Andras Timar

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

New commits:
commit b184df5fa02e293cbbbd1c7baec6c990097dd5bc
Author: Andras Timar 
Date:   Sun Jan 4 11:22:08 2015 +0100

Updated core
Project: dictionaries  8f2ef41f65a6199446b74283c6561e75d7f0faf7

diff --git a/dictionaries b/dictionaries
index 1a7b24c..8f2ef41 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 1a7b24c01ee7cdca23797878cf283f8e78ad4ebb
+Subproject commit 8f2ef41f65a6199446b74283c6561e75d7f0faf7
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Branch 'distro/collabora/cp-4.3' - sl_SI/description.xml sl_SI/README_th_sl_SI.txt sl_SI/th_sl_SI_v2.dat

2015-01-08 Thread Andras Timar

 sl_SI/README_th_sl_SI.txt |4 
 sl_SI/description.xml |2 
 sl_SI/th_sl_SI_v2.dat | 2087 ++
 3 files changed, 1590 insertions(+), 503 deletions(-)

New commits:
commit 8f2ef41f65a6199446b74283c6561e75d7f0faf7
Author: Andras Timar 
Date:   Sun Jan 4 11:22:08 2015 +0100

Updated Slovenian thesaurus

Change-Id: Id22b493e01df2cbc6baf5b99a3ef09e8bd17c3dc
(cherry picked from commit 09b0646f984780d190ea53976f35ae23c99bd06c)
Reviewed-on: https://gerrit.libreoffice.org/13729
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sl_SI/README_th_sl_SI.txt b/sl_SI/README_th_sl_SI.txt
index 0b3b8bb..a90862c 100644
--- a/sl_SI/README_th_sl_SI.txt
+++ b/sl_SI/README_th_sl_SI.txt
@@ -2,7 +2,7 @@ The Slovenian thesaurus is developed as a part of project/
 Slovenski tezaver nastaja v okviru projekta:
OdprtiTezaver (www.tezaver.si)
 This dictionary pack includes version/Paket vsebuje razliÄico:
-   1.6.16500
+   1.7.17000
 Thesaurus managed and edited by/Tezaver pripravlja in ureja:
Martin Srebotnjak (miles at filmsi net)
 Thesaurus data licensed under both/Podatki tezavra so izdani pod licencama:
@@ -18,7 +18,7 @@ Bug report/O napakah poroÄajte:
 http://external.openoffice.org/ form data:
 
 Product Name: Slovenian thesaurus
-Product Version: 1.6.16500
+Product Version: 1.7.17000
 Vendor or Owner Name: Martin Srebotnjak
 Vendor or Owner Contact: mi...@filmsi.net
 OpenOffice.org Contact: fil...@openoffice.org
diff --git a/sl_SI/description.xml b/sl_SI/description.xml
index 6505c5d..07b658b 100644
--- a/sl_SI/description.xml
+++ b/sl_SI/description.xml
@@ -1,6 +1,6 @@
 
 http://openoffice.org/extensions/description/2006"; 
xmlns:d="http://openoffice.org/extensions/description/2006"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
-
+
 
 
 Slovenian spelling dictionary, hyphenation rules, 
and thesaurus
diff --git a/sl_SI/th_sl_SI_v2.dat b/sl_SI/th_sl_SI_v2.dat
index 6081fd4..f1a6a7c 100644
--- a/sl_SI/th_sl_SI_v2.dat
+++ b/sl_SI/th_sl_SI_v2.dat
@@ -20,9 +20,11 @@ ISO8859-2
 ¹aljiv|1
 (prid.)|hudomu¹en|komièen|pavlihast
 ¹aljivec|1
-(sam.)|¹toser (¾argon)|neresne¾
+(sam.)|¹toser (¾argon)|lahkomiselne¾|neresne¾|obe¹enjak
 ¹aman|1
 (sam.)|vraè
+¹amoa|1
+(sam.)|irhovina
 ¹amota|1
 (sam.)|retorta
 ¹ampanjec|1
@@ -213,7 +215,7 @@ ISO8859-2
 ¹kripanje|1
 (sam.)|¹krip|¹kripot
 ¹kripniti|2
-(gl.)|¹kripniti (nizko)|gagniti (nizko)|gavzniti (nizko)|guzniti 
(nizko)|hropniti (nizko)|izdihniti|izhirati (ekspresivno)|iztegniti pete 
(ekspresivno)|preminiti|umreti
+(gl.)|¹kripniti (nizko)|crkniti (nizko)|gagniti (nizko)|gavzniti 
(nizko)|guzniti (nizko)|hropniti (nizko)|izdihniti|izhirati 
(ekspresivno)|iztegniti pete (ekspresivno)|preminiti|umreti
 (gl.)|za¹kripniti
 ¹kripot|1
 (sam.)|¹krip|¹kripanje
@@ -236,17 +238,19 @@ ISO8859-2
 ¹latati|1
 (gl.)|¹latati (nizko)|otipavati|tipati
 ¹levast|1
-(prid.)|¹levast (slab¹alno)|bojazljiv|bojeè|neodloèen|plah|plahoten|ustra¹ljiv
+(prid.)|¹levast (slab¹alno)|bojazljiv|bojeè|neodloèen|plah|plahoten|trepetav 
(ekspresivno)|ustra¹ljiv
 ¹logati|1
 (gl.)|¹logati (pogovorno)|prerokovati|vede¾evati
 ¹luk|1
-(sam.)|¹luk (neknji¾no)|po¾irek
+(sam.)|¹luk (neknji¾no)|po¾ir (starinsko)|po¾irek
 ¹majser|1
 (sam.)|¹majser (¾argon)|avtomat|brzostrelka
 ¹ment|1
 
(sam.)|¹ent|hudiè|hudiman|hudimar|hudir|parkelj|peklen¹èek|rogaè|satan|sku¹njavec|vrag|vragec|vranè|zlobec|zlodej
 ¹minka|1
 (sam.)|lièilo
+¹minkanje|1
+(sam.)|¹minkanje (pogovorno)|lièenje
 ¹minkati|1
 (gl.)|¹minkati (pogovorno)|lièiti
 ¹nofati|3
@@ -321,7 +325,7 @@ ISO8859-2
 ¹portnik|1
 (sam.)|fizkulturnik|telovadec
 ¹pranja|1
-(sam.)|poka (starinsko)|poklina (starinsko)|raza|razpoka
+(sam.)|poka (starinsko)|poklina (starinsko)|raza|razpoka|rega
 ¹pricati|1
 (gl.)|¹kropiti|¹pricati (nizko)
 ¹pula|1
@@ -381,7 +385,7 @@ ISO8859-2
 ¹torast|1
 (prid.)|¹kornjast (ekspresivno)|¹torast (slab¹alno)|¹torkljast 
(ekspresivno)|bukov 
(ekspresivno)|coklast|neokreten|neroden|nespreten|okoren|te¾konog
 ¹torija|2
-(sam.)|¹torija 
(pogovorno)|bajka|èenèa|fabula|izmi¹ljenina|izmi¹ljija|izmi¹ljotina|kvanta|marnja
+(sam.)|¹torija 
(pogovorno)|bajka|èenèa|fabula|izmi¹ljenina|izmi¹ljija|izmi¹ljotina|kvanta|marenj|marnja
 (sam.)|¹torija (pogovorno)|fabula|storija (ekspresivno)|zgodba
 ¹torklja|1
 (sam.)|¾abogolt (ekspresivno)
@@ -391,7 +395,7 @@ ISO8859-2
 (sam.)|¹ala|¹tos (¾argon)|vic
 (sam.)|¹tos (¾argon)|potegav¹èina
 ¹toser|1
-(sam.)|¹aljivec|¹toser (¾argon)|neresne¾
+(sam.)|¹aljivec|¹toser (¾argon)|lahkomiselne¾|neresne¾|obe¹enjak
 ¹trajk|1
 (sam.)|¹trajk (pogovorno)|stavka
 ¹trajkar|1
@@ -473,16 +477,24 @@ ISO8859-2
 (sam.)|oro¾nik
 ¾anr|1
 (sam.)|slog|zvrst
+¾ar|1
+(sam.)|¾arenje|¾arina|sijanje|soj
 ¾ara|1
 (sam.)|urna
+¾areè|1
+(prid.)|¾arek|¾arovit
 ¾areèina|1
 (sam.)|¾arja|magma
+¾arek|1
+(prid.)|¾areè|¾arovit
 ¾arenje|1
-(sam.)|sijanje|soj
+(sam.)|¾ar|¾arina|sijanje|soj
 ¾ari¹èe|1
 (sam.)|fokus
 ¾arilo|1
 (sam.)|sevalec|sevaln

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - configure.ac

2015-01-08 Thread Andras Timar

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 74fb0cb74bc62b5d652f0fb10f8dc3b4795c6cd3
Author: Andras Timar 
Date:   Thu Jan 8 14:19:24 2015 -0800

Bump version to 4.2-22

Change-Id: Ib43b42caac84aa0218be5944b2b4f808860da9c0

diff --git a/configure.ac b/configure.ac
index 35c7af1..3edc486 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[4.2.10.21],[],[],[https://libreoffice-from-collabora.com/])
+AC_INIT([LibreOffice],[4.2.10.22],[],[],[https://libreoffice-from-collabora.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-08 Thread Caolán McNamara

 basegfx/source/tools/unotools.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 6b084f0001fc15112bf3c40d20a0c7096c83b7fe
Author: CaolÃ¡n McNamara 
Date:   Thu Jan 8 20:58:24 2015 +

asan: global-buffer-overflow on fdo55736-1.docx

Change-Id: If69a57aa9ff011cc670f868cb87b3a1c4d904435

diff --git a/basegfx/source/tools/unotools.cxx 
b/basegfx/source/tools/unotools.cxx
index f5b1e273..2a923e1 100644
--- a/basegfx/source/tools/unotools.cxx
+++ b/basegfx/source/tools/unotools.cxx
@@ -52,7 +52,10 @@ namespace unotools
 {
 const sal_Int32 nInnerSequenceCount(pInnerSequence->getLength());
 
-if(pInnerSequenceFlags->getLength() != nInnerSequenceCount)
+if (!nInnerSequenceCount)
+throw lang::IllegalArgumentException();
+
+if (pInnerSequenceFlags->getLength() != nInnerSequenceCount)
 throw lang::IllegalArgumentException();
 
 // prepare new polygon
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-08 Thread Caolán McNamara

 basic/source/runtime/methods.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 869402a58720b45e7227438b2e56e5a9532c
Author: CaolÃ¡n McNamara 
Date:   Thu Jan 8 20:35:28 2015 +

Revert "Resolves: #i94895# fix illegal result of Replace runtime function"

This reverts commit 340ca294d43f2c5b9fda1afbf178609a015f71e3 as 
CppunitTest_basic_vba
breaks, so needs revisiting to see which is right

Change-Id: I10168d454a8c67d91eee5bb8939aff74bba42954

diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index baa9603..7ccbab7 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -1405,7 +1405,7 @@ RTLFUNC(Replace)
 if( nPos >= 0 )
 {
 aExpStr = aExpStr.replaceAt( nPos, nFindStrLen, 
aReplaceStr );
-nPos = nPos + nReplaceStrLen;
+nPos = nPos - nFindStrLen + nReplaceStrLen + 1;
 nCounts++;
 }
 else
@@ -1414,7 +1414,7 @@ RTLFUNC(Replace)
 }
 }
 }
-rPar.Get(0)->PutString( aExpStr  );
+rPar.Get(0)->PutString( aExpStr.copy( lStartPos - 1 )  );
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

minutes of ESC call ...

2015-01-08 Thread Michael Meeks

* Present:
+ Norbert, Ptyl, Eike, Kendy, Cloph, Stephan, Caolan, David, Robinson,
  Moggi, Miklos, Andras, Michael S, Bjoern, Jacobo, Chris Sherlock
 
* Completed Action Items:
+ check Matus' startup performance measurement for layered images.zip 
(Kendy)
AI: [ check the stats vs. master ] (Kendy)
 
* Pending Action Items:
+ fix BSA login / XML-RPC issues (Cloph)
[ confident we'll have a solution in time for switch-over ]
 
* Bugzilla migration update (Robinson)
+ looking good, talked with Tollef on the 6th
+ doing more testing this weekend
+ BugZilla migration on track for => Saturday, January 24, ~1600 UTC
 
* Release Engineering update (Cloph)
+ 4.4.0 RC2
+ tagged today and the libreoffice-4-4-0 branch created
+ builds for all platforms triggered
+ announce to early testing late tonight / tomorrow
+ includes new templates - result of the competition
+ thanks to Kendy/David for making that happen.
+ thanks too to template submitters:
+ Alexander Wilms
+ Edmund Laugasson
+ Jun NOGATA
+ Michael Kovarik
+ Péter Szathmáry
+ Zirk
+ no further late features expected
+ libreoffice-4-4   - one extra review for bug fixes 
+ libreoffice-4-4-0 - triple review required ie. pick from -4-4 +2 reviews
+ 4.3.6 RC1
+ due this Monday - January 12th
+ Android / iOS Remote
+ patches in gerrit to add support for new UI (android wearable)
+ iOS - update translations, was it pushed ?
+ Pebble watch port added by Gülşah
+ thanks to Norbert for merging repositories
+ 4.2
+ is a review still necessary ?
+ some people still push to 4.2
   - some Linux Distros are still on it.
   + do we still want to review that ? or let anyone do it ?
   + not concern wrt. Eike / Markus (Michael)
=> still do reviews.
 
* Crashtest update (Markus)
+ mailed the new asan results out
+ some fun in there with binary filters.
+ Caolan fixed a number of things
+ crash-testing didn't change much over Xmas - since few large changes.
+ has new hardware got provisioned yet ?
+ problems with complex disks setup
+ all disks go in some big raid or somesuch.
-> helps other machines as backup.
+ concerns over writing GB's of basically junk data to a cluster
+ new host will be a backup space as well as a testing machine.
+ more disks for high-availability than the crash-test VM
+ down to the targetted bit more than 1x day for the run.
+ now at nearly 80k files.
+ how big is the win below 1x day ?
+ not so many crasher related crashes.
+ want to dedicate more cores for performance regressions
+ want to run again with memory sanitizer
+ only a handful of crashers left in the list (Caolan)
+ most remaining import crashers are just paranoid / misleading asserts.
+ still some left on export crashers (Markus)
+ may want to run some image formats at some point (Markus)
+ opportunities with fonts too (Michael)
 
* Easy Hack extension (Bjoern)
+ looked at last year's easy-hacks stats
+ 100x easy-hacks created in 2014 - 40x resolved.
+ total # open easy-hacks is much reduced.
+ with GSOC coming up it is important to have them.
+ Design easy-hacks (Kendy)
+ add a new TopicUI or TopicDesign (Bjoern)
+ when you see something silly in the code (has that ever happened?) 
(Michael)
+ restrain yourself & instead file a bug, set whiteboard to:
"EasyHack DifficultyBeginner SkillCpp TopicCleanup"
+ and move on.
+ please people file at least one.
+ some new C++11 features which may help
+ could we make Coverity reports easy hacks ?
+ concern wrt. keeping # down - takes a while to fix them (Michael)
+ concern to get Easy Hackers -> move to harder stuff
+ how can we get people into bigger / bug-fixing ? (Michael)
+ problem: experienced people taking things that should go
  to new contributors (Moggi)
+ somewhat anti-social / wasting an entry point.
+ please point this out if we see it happening & encourage -> harder 
bugs.
+ 40% opened & closed in 2014 
+ down-side, lots of others are ancient.
+ should we just close those ?
AI: + look at closing un-touched easy-hacks next time.
 
* FOSDEM bits (Kendy)
+ Bruessels, Belgium -- February 2015
+ Cor doing T-shirts (hopefully)
+ 20+ talks submitted / update - lots of good content.
+ kendy presenting the LibreOffice design team in open-source design 
dev-roomn
+ Book a room at 'Hotel Astrid' to be near the team: cheap as well ...
 
* Win64 work (DavidO

Minutes of the Design Hangout: 2015-01-07

2015-01-08 Thread Jan Holesovsky

* Present: Heiko, Ibrahim, Jay, Kendy, Stuart
 
* Completed Action Items:
+ Kendy/Marketing: Publish the blog post to collect templates
+ Kendy: GSoC task (or so) for converting "Manage Changes..." to
  sidebar (instead of non-modal dialog)
  https://gerrit.libreoffice.org/#/c/13085/ - proof of concept,
  thanks to the hackfest :-)
  Some improvements are needed - 
https://bugs.freedesktop.org/show_bug.cgi?id=87695 (Jay)
+ Kendy: try to do a link to the Templates site for 4.4 - not too
  probable
  [abandoned, cannot make it for 4.4]
+ Heiko, Jay: Impress survey results published
  http://user-prompt.com/how-people-utilize-libreoffice-impress/
 
* Pending Action Items:
 
+ Jay: Ask what is the plan with the templates on the new Extensions site
  [Andreas mailed design@ ML, Jay will respond.]
+ Jay: Send a mail to documentat...@global.libreoffice.org with the
  wiki page that collects changes in menus
+ Kendy: Collecting of the user information should be incremental,
  somewhere in the user's profile
+ Ahmed: Push the new Sifr icons he's done recently
+ Kendy: Talk to Milos wrt. 
https://bugs.freedesktop.org/show_bug.cgi?id=48622
+ Alex: Gnome 2.20-style 'a' icons & Gnome 3-style text line icons
+ Samuel: Formulas and Navigator should open in the sidebar, not as
  a special window
  https://bugs.freedesktop.org/show_bug.cgi?id=85897
 
* Easy Hacks to be filed:
 
+ Kendy: Do / find someone / easy-hack-ize automatic opening of the
  Track changes toolbar when there are tracked changes
+ Kendy: Check how hard it is to make sidebar honor the icon size
  setting
+ Kendy: Easy Hack-ize fixing of uno commands that need to be
  duplicated in Draw and Impress
+ https://bugs.freedesktop.org/show_bug.cgi?id=84258#c2
+ Kendy: Create Easy Hack for the Hi-contrast Sifr
+ Kendy: Adding 1.15 to the drop down list
  https://bugs.freedesktop.org/show_bug.cgi?id=85949
+ Kendy: Research what is needed to do to only disable (not hide)
  the formula bar in Calc when Chart component is activated
+ Kendy: Tell Jay how to fiddle with the default position of
  toolbars (so that he can tweak the Chart's toolbars)
+ Kendy: Only activate image toolbar when an image is selected -
  https://bugs.freedesktop.org/show_bug.cgi?id=87362
+ Adolfo: Create easy hacks for the options Design decided to drop
  since 2012:
  https://wiki.documentfoundation.org/Design/Whiteboards/Options/Global
+ Kendy: Should border around an image have no padding by default
  https://bugs.freedesktop.org/show_bug.cgi?id=87360
 
* GSoC tasks to be filed:
 
+ Jay/Kendy: GSoC for application (color) themes.
+ Jay: add a Styles usability improvements section + list the
  various things to implement to GSoC-next ideas
+ https://wiki.documentfoundation.org/Development/GSoC/GenialIdeas
  [styles previews in the sidebar etc.]
+ Ahmed, Jay: Brainstorm about some nice / more styles for Calc
  https://redmine.documentfoundation.org/boards/1/topics/493
  [longer term - maybe better to add to the GSoC Styles task?]
+ Kendy: More work around templates repository / online templates /
  integration into the start screen / ...
  https://bugs.freedesktop.org/show_bug.cgi?id=85420
  https://bugs.freedesktop.org/attachment.cgi?id=108377
 
* UI changes integrated the last week:
 
+ [actually the last 3 weeks this time :-)]
+ New image context menu in Writer (Jay)
  https://bugs.freedesktop.org/show_bug.cgi?id=87185
+ Rearrange slide/page context menu in Impress/Draw (Jay)
  https://bugs.freedesktop.org/show_bug.cgi?id=84233
+ Rearrangement/Improvements to impress's format menu (Jay)
+ Rearrangement of Writer's frame toolbar (Jay)
+ Addition of wrap left and wrap right to Writer's context menu (Jay)
  https://bugs.freedesktop.org/show_bug.cgi?id=83565
+ Improvements in the printing-related UI files (Adolfo)
+ Changes sidebar - implemented sidebar for change tracking (Kendy)
+ still work in progress of course; it's a bigger change :-)
+ Lots of src -> ui conversions / cleanups (Caolán)
+ Heading 3 and 4 again use Automatic color (Stuart)
+ google docs uses grey too - probably where it comes from (Jay)
+ we still can have a separate template with grey color (Kendy)
+ and it was the problem of html -> LibreOffice paste (Stuart)
+ Improvements in the sheet tabs in Calc (Tomaž)
+ draw sheet color even when selected (line at the bottom)
+ option to still draw tabs next to the scrollbar
+ Hi-DPI improvements (Tomaž)
+ scale menu icons
+ scale status bar icons
+ tabbar
+ Arrange help button in the secondary group in ui files (Adolfo)
 
* Bugzilla workflow / ux-advise bugs (Kendy)
 
+ turns out that it was not cle

VPS2 Semester of Code - Interest?

2015-01-08 Thread Joel Madero

Hi All,

http://vps2.semesterofcode.com/
https://www.jiscmail.ac.uk/cgi-bin/webadmin?A2=ind1412&L=vals-soc&F=&S=&P=54

We have until January 15th if there is interest to do this. Anyone have
the bandwidth to go through the process and any mentors available to
take on a student or two?


Best,
Joel

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

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

2015-01-08 Thread Tsutomu Uchino

 basic/inc/basic/sbxmeth.hxx |   11 ---
 basic/inc/basic/sbxobj.hxx  |2 +-
 basic/source/comp/parser.cxx|   10 +-
 basic/source/runtime/stdobj.cxx |2 +-
 basic/source/sbx/sbxobj.cxx |4 ++--
 5 files changed, 21 insertions(+), 8 deletions(-)

New commits:
commit 7470c682e136a4a89c1e9474bbc79b2d61f31048
Author: Tsutomu Uchino 
Date:   Thu Jan 8 16:28:11 2015 +

#i63614# fix strange type missmatch when Iif runtime function is used

Second or later compilation uses value type returned by previous execution 
of code.
Use the defined type as return value of the runtime function of Basic 
always.

diff --git a/basic/inc/basic/sbxmeth.hxx b/basic/inc/basic/sbxmeth.hxx
index dc25ee9..7fa7eed 100644
--- a/basic/inc/basic/sbxmeth.hxx
+++ b/basic/inc/basic/sbxmeth.hxx
@@ -31,17 +31,22 @@ class SbxMethodImpl;
 class SbxMethod : public SbxVariable
 {
 SbxMethodImpl* mpSbxMethodImpl; // Impl data
+bool   mbIsRuntimeFunction;
+SbxDataTypembRuntimeFunctionReturnType;
 
 public:
 SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_METHOD,1);
 TYPEINFO();
-SbxMethod( const String& r, SbxDataType t )
-: SbxVariable( t ) { SetName( r ); }
-SbxMethod( const SbxMethod& r ) : SvRefBase( r ), SbxVariable( r ) {}
+SbxMethod( const String& r, SbxDataType t, bool bIsRuntimeFunction=false )
+: SbxVariable( t ), mbIsRuntimeFunction( bIsRuntimeFunction ), 
mbRuntimeFunctionReturnType( t ) { SetName( r ); }
+SbxMethod( const SbxMethod& r )
+: SvRefBase( r ), SbxVariable( r ), mbIsRuntimeFunction( 
r.IsRuntimeFunction() ) {}
 SbxMethod& operator=( const SbxMethod& r )
 { SbxVariable::operator=( r ); return *this; }
 sal_Bool Run( SbxValues* pValues = NULL );
 virtual SbxClassType GetClass() const;
+bool IsRuntimeFunction() const { return mbIsRuntimeFunction; }
+SbxDataType GetRuntimeFunctionReturnType() const{ return 
mbRuntimeFunctionReturnType; }
 };
 
 #ifndef __SBX_SBXMETHODREF_HXX
diff --git a/basic/inc/basic/sbxobj.hxx b/basic/inc/basic/sbxobj.hxx
index 989ea40..f78d453 100644
--- a/basic/inc/basic/sbxobj.hxx
+++ b/basic/inc/basic/sbxobj.hxx
@@ -80,7 +80,7 @@ public:
 SbxVariable* Execute( const String& );
 // Manage elements
 virtual sal_Bool GetAll( SbxClassType ) { return sal_True; }
-SbxVariable* Make( const String&, SbxClassType, SbxDataType );
+SbxVariable* Make( const String&, SbxClassType, SbxDataType, bool 
bIsRuntimeFunction = false );
 virtual SbxObject* MakeObject( const String&, const String& );
 virtual void Insert( SbxVariable* );
 // AB 23.4.1997, Optimization, Insertion without check for duplicate 
Entries and
diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx
index 85c4920..b06e997 100644
--- a/basic/source/comp/parser.cxx
+++ b/basic/source/comp/parser.cxx
@@ -169,7 +169,15 @@ SbiSymDef* SbiParser::CheckRTLForSym( const String& rSym, 
SbxDataType eType )
 if( pVar->IsA( TYPE(SbxMethod) ) )
 {
 SbiProcDef* pProc_ = aRtlSyms.AddProc( rSym );
-pProc_->SetType( pVar->GetType() );
+SbxMethod* pMethod = (SbxMethod*) pVar;
+if ( pMethod && pMethod->IsRuntimeFunction() )
+{
+pProc_->SetType( pMethod->GetRuntimeFunctionReturnType() );
+}
+else
+{
+pProc_->SetType( pVar->GetType() );
+}
 pDef = pProc_;
 }
 else
diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx
index 8e1058a..eb3cdcc 100644
--- a/basic/source/runtime/stdobj.cxx
+++ b/basic/source/runtime/stdobj.cxx
@@ -715,7 +715,7 @@ SbxVariable* SbiStdObject::Find( const String& rName, 
SbxClassType t )
 eCT = SbxCLASS_PROPERTY;
 else if( nType & _METHOD )
 eCT = SbxCLASS_METHOD;
-pVar = Make( aName_, eCT, p->eType );
+pVar = Make( aName_, eCT, p->eType, ( p->nArgs & _FUNCTION ) == 
_FUNCTION );
 pVar->SetUserData( nIndex + 1 );
 pVar->SetFlags( nAccess );
 }
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index 9934331..ce30eed 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -376,7 +376,7 @@ SbxArray* SbxObject::FindVar( SbxVariable* pVar, 
sal_uInt16& nArrayIdx )
 // Falls ein neues Objekt eingerichtet wird, wird es, falls es bereits
 // eines mit diesem Namen gibt, indiziert.
 
-SbxVariable* SbxObject::Make( const XubString& rName, SbxClassType ct, 
SbxDataType dt )
+SbxVariable* SbxObject::Make( const XubString& rName, SbxClassType ct, 
SbxDataType dt, bool bIsRuntimeFunction )
 {
 // Ist das Objekt bereits vorhanden?
 SbxArray* pArray = NULL;
@@ -422,7 +422,7 @@ SbxVariable* SbxObject::Make( const XubString& rName, 
SbxClassType ct, SbxDataTy
 pVar = new SbxProperty( rName, dt );
 break;

[Bug 79641] LibreOffice 4.4 most annoying bugs

2015-01-08 Thread bugzilla-daemon

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

--- Comment #29 from Joel Madero  ---
Added bug 88194 - regression + crash

Pasting a cell that has a comment into a lot of other cells causes a hard
freeze. Works fine in 4.3.5, broken in 4.4 beta 2 (and master).

-- 
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

2015-01-08 Thread bugzilla-daemon

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

Joel Madero  changed:

   What|Removed |Added

 Depends on||88194

-- 
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: include/svtools

2015-01-08 Thread Stephan Bergmann

 include/svtools/grfmgr.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1c67621d53e0b2cbeb6f0fc37bf66c1bc3b2a0eb
Author: Stephan Bergmann 
Date:   Thu Jan 8 18:09:57 2015 +0100

An odd way to say "nullptr"

Change-Id: I6d83714b78c4d149dff5ea56483d7afa6d0eb677

diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx
index 607ecb5..fcfa661 100644
--- a/include/svtools/grfmgr.hxx
+++ b/include/svtools/grfmgr.hxx
@@ -32,7 +32,7 @@
 
 // AutoSwap defines
 
-#define GRFMGR_AUTOSWAPSTREAM_LINK  
(reinterpret_cast(0xUL))
+#define GRFMGR_AUTOSWAPSTREAM_LINK nullptr
 #define GRFMGR_AUTOSWAPSTREAM_LOADED 
reinterpret_cast(sal_IntPtr(-3))
 #define GRFMGR_AUTOSWAPSTREAM_TEMP   
reinterpret_cast(sal_IntPtr(-2))
 #define GRFMGR_AUTOSWAPSTREAM_NONE   
reinterpret_cast(sal_IntPtr(-1))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 88206] Change uses of cppu::WeakImplHelper* and cppu::ImplInheritanceHelper* to use variadic variants instead

2015-01-08 Thread bugzilla-daemon

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

Stephan Bergmann  changed:

   What|Removed |Added

 Whiteboard||EasyHack DifficultyBeginner
   ||SkillCpp TopicCleanup

-- 
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 88206] New: Change uses of cppu::WeakImplHelper* and cppu::ImplInheritanceHelper* to use variadic variants instead

2015-01-08 Thread bugzilla-daemon

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

Bug ID: 88206
   Summary: Change uses of cppu::WeakImplHelper* and
cppu::ImplInheritanceHelper* to use variadic variants
instead
   Product: LibreOffice
   Version: unspecified
  Hardware: All
OS: All
Status: NEW
  Severity: normal
  Priority: medium
 Component: Libreoffice
  Assignee: libreoffice-b...@lists.freedesktop.org
  Reporter: sberg...@redhat.com
CC: libreoffice@lists.freedesktop.org

Since

"Variadic cppu::WeakImplHelper" and

"Variadic cppu::ImplInheritanceHelper" uses of cppu::WeakImplHelper1,
cppu::WeakImplHelper2, etc. can drop the trailing "1," "2," etc. (and likewise
for cppu::ImplInheritanceHelper), and instead of the various
cppuhelper/implbase1.hxx, cppuhelper/implbase2.hxx, include just
cppuhelper/implbase.hxx.

Find (lots of) places in the code that can be cleaned up (see the two commits
for examples).

(Note that this is a LIBO_INTERNAL_ONLY feature that cannot be used in external
code though; in general, just keep away from files in include/cppu,
include/cppuhelper, include/sal, include/salhelper, include/uno, and
odk/examples.)

-- 
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 'refs/notes/commits' - 04/ab3dd01c668890a60773d597304688ccad603a

2015-01-08 Thread Caolán McNamara

 04/ab3dd01c668890a60773d597304688ccad603a |1 +
 1 file changed, 1 insertion(+)

New commits:
commit bfa4f0fd302191ee05339ac47d84933e37717f02
Author: CaolÃ¡n McNamara 
Date:   Thu Jan 8 16:56:00 2015 +

Notes added by 'git notes add'

diff --git a/04/ab3dd01c668890a60773d597304688ccad603a 
b/04/ab3dd01c668890a60773d597304688ccad603a
new file mode 100644
index 000..b2fbc83
--- /dev/null
+++ b/04/ab3dd01c668890a60773d597304688ccad603a
@@ -0,0 +1 @@
+prefer: b5eb7921a002d9e5a002013af83bc135b4efbb20
___
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' - sc/source

2015-01-08 Thread Michael Stahl

 sc/source/filter/xml/xmlimprt.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit f3ea88ef4431541ef85a26412b71e0e29b5cc529
Author: Michael Stahl 
Date:   Thu Jan 8 13:07:41 2015 +0100

sc: ODF import of data pilot:

Revert part of 8e417a8fed528034e946bd25e66ce346c1b5384d that
looks unnecessary:

this is used in ScXMLDataPilotMembersContext::CreateChildContext() which
is below table:data-pilot-level which actually uses the
data-pilot-member element, whereas the data-pilot-group element occurs
below table:data-pilot-groups.

Change-Id: I7a3183bd3dbfa98b3bdf5e581b700910025af965
(cherry picked from commit 4680eba921cccefc05587a42e8c7348cc95750a1)
Reviewed-on: https://gerrit.libreoffice.org/13810
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sc/source/filter/xml/xmlimprt.cxx 
b/sc/source/filter/xml/xmlimprt.cxx
index 84c1ad8..1620f44 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -1785,7 +1785,6 @@ const SvXMLTokenMap& 
ScXMLImport::GetDataPilotMembersElemTokenMap()
 static const SvXMLTokenMapEntry aDataPilotMembersElemTokenMap[] =
 {
 { XML_NAMESPACE_TABLE, XML_DATA_PILOT_MEMBER,   
XML_TOK_DATA_PILOT_MEMBERS_ELEM_DATA_PILOT_MEMBER   },
-{ XML_NAMESPACE_TABLE, XML_DATA_PILOT_GROUP_MEMBER,   
XML_TOK_DATA_PILOT_MEMBERS_ELEM_DATA_PILOT_MEMBER   },
 XML_TOKEN_MAP_END
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - a2/700f75af61837033ff213607445cc1f74b36d6

2015-01-08 Thread Caolán McNamara

 a2/700f75af61837033ff213607445cc1f74b36d6 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b1b503015916ca9498a336bd60ba9a09390048fe
Author: CaolÃ¡n McNamara 
Date:   Thu Jan 8 16:51:57 2015 +

Notes added by 'git notes add'

diff --git a/a2/700f75af61837033ff213607445cc1f74b36d6 
b/a2/700f75af61837033ff213607445cc1f74b36d6
new file mode 100644
index 000..ca1da1c
--- /dev/null
+++ b/a2/700f75af61837033ff213607445cc1f74b36d6
@@ -0,0 +1 @@
+merged as: 340ca294d43f2c5b9fda1afbf178609a015f71e3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 88205] Adapt uses of css::uno::Sequence to use initializer_list ctor

2015-01-08 Thread bugzilla-daemon

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

Stephan Bergmann  changed:

   What|Removed |Added

 Whiteboard||EasyHack DifficultyBeginner
   ||SkillCpp TopicCleanup

-- 
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: basic/source

2015-01-08 Thread Tsutomu Uchino

 basic/source/runtime/methods.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 340ca294d43f2c5b9fda1afbf178609a015f71e3
Author: Tsutomu Uchino 
Date:   Thu Jan 8 12:56:45 2015 +

Resolves: #i94895# fix illegal result of Replace runtime function

(cherry picked from commit a2700f75af61837033ff213607445cc1f74b36d6)

Conflicts:
basic/source/runtime/methods.cxx

Change-Id: If9c671a612de87d8d37bfc40704a97a6062fd150

diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 7ccbab7..baa9603 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -1405,7 +1405,7 @@ RTLFUNC(Replace)
 if( nPos >= 0 )
 {
 aExpStr = aExpStr.replaceAt( nPos, nFindStrLen, 
aReplaceStr );
-nPos = nPos - nFindStrLen + nReplaceStrLen + 1;
+nPos = nPos + nReplaceStrLen;
 nCounts++;
 }
 else
@@ -1414,7 +1414,7 @@ RTLFUNC(Replace)
 }
 }
 }
-rPar.Get(0)->PutString( aExpStr.copy( lStartPos - 1 )  );
+rPar.Get(0)->PutString( aExpStr  );
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 88205] New: Adapt uses of css::uno::Sequence to use initializer_list ctor

2015-01-08 Thread bugzilla-daemon

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

Bug ID: 88205
   Summary: Adapt uses of css::uno::Sequence to use
initializer_list ctor
   Product: LibreOffice
   Version: unspecified
  Hardware: All
OS: All
Status: NEW
  Severity: normal
  Priority: medium
 Component: Libreoffice
  Assignee: libreoffice-b...@lists.freedesktop.org
  Reporter: sberg...@redhat.com
CC: libreoffice@lists.freedesktop.org

Since

"css::uno::Sequence ctor with initializer_list," that class has a ctor taking a
C++11 std::initializer_list, which can greatly simplify some code constructing
Sequence instances (see the commit for some examples).

Find places in the code that would benefit from adapting them (good candidates
are "getSupportedServiceNames" functions that return statically known OUString
Sequences).

(Note that this is a LIBO_INTERNAL_ONLY feature that cannot be used in external
code though; in general, just keep away from files in include/cppu,
include/cppuhelper, include/sal, include/salhelper, include/uno, and
odk/examples.)

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

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

2015-01-08 Thread Caolán McNamara

 sd/source/ui/tools/PreviewRenderer.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit d4cac1465ab5b12c77c4566b62bc0d367ec27400
Author: CaolÃ¡n McNamara 
Date:   Thu Jan 8 15:18:08 2015 +

Fraction fiasco: avoid assert on clicking "master pages" in impress sidebar

avoids the dread assert in vcl wrt. "detect overflows" in ImplLogicToPixel 
of
vcl/source/outdev/map.cxx but the whole thing looks a nightmare if a high
precision double is given as an arg to Fraction and the underlying boost foo
uses longs longer than 32bits to represent that.

Change-Id: Ia0fa911cf07ed613e0b1bbd97b63a291f29628cb
(cherry picked from commit 00205f178f4c1edfc2201fa298e7335ca3dd7b44)
Reviewed-on: https://gerrit.libreoffice.org/13812
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/sd/source/ui/tools/PreviewRenderer.cxx 
b/sd/source/ui/tools/PreviewRenderer.cxx
index 4de09a1..b5f2b71 100644
--- a/sd/source/ui/tools/PreviewRenderer.cxx
+++ b/sd/source/ui/tools/PreviewRenderer.cxx
@@ -171,9 +171,9 @@ Image PreviewRenderer::RenderSubstitution (
 // visible.
 MapMode aMapMode (mpPreviewDevice->GetMapMode());
 aMapMode.SetMapUnit(MAP_100TH_MM);
-const double nFinalScale (25.0 * rPreviewPixelSize.Width() / 28000.0);
-aMapMode.SetScaleX(nFinalScale);
-aMapMode.SetScaleY(nFinalScale);
+Fraction aFinalScale(25 * rPreviewPixelSize.Width(), 28000);
+aMapMode.SetScaleX(aFinalScale);
+aMapMode.SetScaleY(aFinalScale);
 const sal_Int32 nFrameWidth (mbHasFrame ? snFrameWidth : 0);
 aMapMode.SetOrigin(mpPreviewDevice->PixelToLogic(
 Point(nFrameWidth,nFrameWidth),aMapMode));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-08 Thread Stephan Bergmann

 include/svtools/grfmgr.hxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 522563d79a81afc9a24e8a9f9b8f1bc763726180
Author: Stephan Bergmann 
Date:   Thu Jan 8 17:23:42 2015 +0100

Sane SvStream* fake pointer values for 64-bit platforms

cf.  "Signed/Unsigned mismatch 
on
x86_64 platform on windows"

Change-Id: Ie526ee431f59be374d61fe8c38bdf2a579a7234b

diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx
index 88e6b45..607ecb5 100644
--- a/include/svtools/grfmgr.hxx
+++ b/include/svtools/grfmgr.hxx
@@ -33,9 +33,9 @@
 // AutoSwap defines
 
 #define GRFMGR_AUTOSWAPSTREAM_LINK  
(reinterpret_cast(0xUL))
-#define GRFMGR_AUTOSWAPSTREAM_LOADED
(reinterpret_cast(0xfffdUL))
-#define GRFMGR_AUTOSWAPSTREAM_TEMP  
(reinterpret_cast(0xfffeUL))
-#define GRFMGR_AUTOSWAPSTREAM_NONE  
(reinterpret_cast(0xUL))
+#define GRFMGR_AUTOSWAPSTREAM_LOADED 
reinterpret_cast(sal_IntPtr(-3))
+#define GRFMGR_AUTOSWAPSTREAM_TEMP   
reinterpret_cast(sal_IntPtr(-2))
+#define GRFMGR_AUTOSWAPSTREAM_NONE   
reinterpret_cast(sal_IntPtr(-1))
 
 // Adjustment defines
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - 2 commits - desktop/source include/LibreOfficeKit libreofficekit/qa vcl/inc

2015-01-08 Thread Miklos Vajna

 desktop/source/lib/init.cxx |   18 ++
 include/LibreOfficeKit/LibreOfficeKit.h |4 
 include/LibreOfficeKit/LibreOfficeKit.hxx   |   11 +++
 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |8 +++-
 vcl/inc/headless/svpframe.hxx   |4 ++--
 5 files changed, 42 insertions(+), 3 deletions(-)

New commits:
commit 2056d411d8c1fb352f6c60ddd58a240e04edc15c
Author: Miklos Vajna 
Date:   Thu Jan 8 17:14:28 2015 +0100

gtktiledviewer: invoke lok::Office::postKeyEvent() on key press / release

Change-Id: I82587fb48f5b7d037d66c0eb0e4aa1c7cee8702a

diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx 
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index bb3c28a..c4725f2 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -125,8 +125,14 @@ void changeQuadView( GtkWidget* /*pButton*/, gpointer /* 
pItem */ )
 }
 
 /// Receives a key press or release event.
-static void signalKey(GtkWidget* /*pWidget*/, GdkEventKey* /*pEvent*/, 
gpointer /*pData*/)
+static void signalKey(GtkWidget* /*pWidget*/, GdkEventKey* pEvent, gpointer 
/*pData*/)
 {
+LOKDocView* pLOKDocView = LOK_DOCVIEW(pDocView);
+
+if (pEvent->type == GDK_KEY_RELEASE)
+pLOKDocView->pOffice->pClass->postKeyEvent(pLOKDocView->pOffice, 1, 
gdk_keyval_to_unicode(pEvent->keyval));
+else
+pLOKDocView->pOffice->pClass->postKeyEvent(pLOKDocView->pOffice, 0, 
gdk_keyval_to_unicode(pEvent->keyval));
 }
 
 // GtkComboBox requires gtk 2.24 or later
commit e4037c22988934eb14e99ac6eb7270c582d1c09f
Author: Miklos Vajna 
Date:   Thu Jan 8 17:13:20 2015 +0100

Add lok::Office::postKeyEvent()

Change-Id: Ib80a8dd433b22a5e88aaab8e11d5c42ced8097ae

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 08a353f..c3eedf5 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -54,6 +54,7 @@
 #if defined(UNX) && !defined(MACOSX) && !defined(ENABLE_HEADLESS)
 // And let's also grab the SvpSalInstance and SvpSalVirtualDevice
 #include 
+#include 
 #include 
 
 #include 
@@ -251,6 +252,8 @@ static voidlo_destroy   
(LibreOfficeKit* pThis);
 static int lo_initialize(LibreOfficeKit* pThis, const 
char* pInstallPath);
 static LibreOfficeKitDocument* lo_documentLoad  (LibreOfficeKit* pThis, const 
char* pURL);
 static char *  lo_getError  (LibreOfficeKit* pThis);
+static voidlo_postKeyEvent  (LibreOfficeKit* pThis, int 
nType, int nCode);
+
 
 struct LibLibreOffice_Impl : public _LibreOfficeKit
 {
@@ -268,6 +271,7 @@ struct LibLibreOffice_Impl : public _LibreOfficeKit
 m_pOfficeClass->destroy = lo_destroy;
 m_pOfficeClass->documentLoad = lo_documentLoad;
 m_pOfficeClass->getError = lo_getError;
+m_pOfficeClass->postKeyEvent = lo_postKeyEvent;
 
 gOfficeClass = m_pOfficeClass;
 }
@@ -647,6 +651,20 @@ static char* lo_getError (LibreOfficeKit *pThis)
 return pMemory;
 }
 
+static void lo_postKeyEvent(LibreOfficeKit* /*pThis*/, int nType, int nCode)
+{
+#if defined(UNX) && !defined(MACOSX) && !defined(ENABLE_HEADLESS)
+if (SalFrame *pFocus = SvpSalFrame::GetFocusFrame())
+{
+KeyEvent aEvent(nCode, nCode, 0);
+if (nType == 0)
+Application::PostKeyEvent(VCLEVENT_WINDOW_KEYINPUT, 
pFocus->GetWindow(), &aEvent);
+else
+Application::PostKeyEvent(VCLEVENT_WINDOW_KEYUP, 
pFocus->GetWindow(), &aEvent);
+}
+#endif
+}
+
 static void force_c_locale(void)
 {
 // force locale (and resource files loaded) to en-US
diff --git a/include/LibreOfficeKit/LibreOfficeKit.h 
b/include/LibreOfficeKit/LibreOfficeKit.h
index 573e44d..d4c1f99 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/include/LibreOfficeKit/LibreOfficeKit.h
@@ -79,6 +79,7 @@ struct _LibreOfficeKitClass
   void(*destroy)   (LibreOfficeKit* pThis);
   LibreOfficeKitDocument* (*documentLoad)  (LibreOfficeKit* pThis, const char* 
pURL);
   char*   (*getError)  (LibreOfficeKit* pThis);
+  void(*postKeyEvent)  (LibreOfficeKit* pThis, int nType, 
int nCode);
 };
 
 #define LIBREOFFICEKIT_DOCUMENT_HAS(pDoc,member) 
LIBREOFFICEKIT_HAS_MEMBER(LibreOfficeKitDocumentClass,member,(pDoc)->pClass->nSize)
@@ -143,6 +144,9 @@ struct _LibreOfficeKitDocumentClass
   void (*registerCallback)   (LibreOfficeKitDocument* pThis,
   LibreOfficeKitCallback pCallback,
   void* pData);
+  void (*postKeyEvent) (LibreOfficeKitDocument* pThis,
+int nType,
+int nCode);
 #endif // LOK_USE_UNSTABLE_API
 };
 
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx 
b/include/LibreOfficeKit/LibreOf

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

2015-01-08 Thread Regina Henschel

 sd/source/ui/view/sdview4.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 04ab3dd01c668890a60773d597304688ccad603a
Author: Regina Henschel 
Date:   Thu Jan 8 15:46:16 2015 +

#i125613# Insert Picture from file do not work

The patch restores the behavior, that Insert from file replaces the empty 
outline object in Impress
Patch by:Regina Henschel 

diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index 802661d..7cf35e0 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -109,7 +109,11 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, 
sal_Int8& rAction,
 
 const bool bIsGraphic(0 != dynamic_cast< SdrGrafObj* >(pPickObj));
 
-if(pPickObj && !bIsGraphic && pPickObj->IsClosedObj() && !dynamic_cast< 
SdrOle2Obj* >(pPickObj))
+if(pPickObj
+&& !bIsGraphic
+&& !(pPickObj->IsEmptyPresObj() )
+&& pPickObj->IsClosedObj()
+&& !dynamic_cast< SdrOle2Obj* >(pPickObj))
 {
 // fill style change (fill object with graphic), independent of 
mnAction
 // and thus of DND_ACTION_LINK or DND_ACTION_MOVE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-08 Thread Caolán McNamara

 sd/source/ui/tools/PreviewRenderer.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 00205f178f4c1edfc2201fa298e7335ca3dd7b44
Author: CaolÃ¡n McNamara 
Date:   Thu Jan 8 15:18:08 2015 +

Fraction fiasco: avoid assert on clicking "master pages" in impress sidebar

avoids the dread assert in vcl wrt. "detect overflows" in ImplLogicToPixel 
of
vcl/source/outdev/map.cxx but the whole thing looks a nightmare if a high
precision double is given as an arg to Fraction and the underlying boost foo
uses longs longer than 32bits to represent that.

Change-Id: Ia0fa911cf07ed613e0b1bbd97b63a291f29628cb

diff --git a/sd/source/ui/tools/PreviewRenderer.cxx 
b/sd/source/ui/tools/PreviewRenderer.cxx
index 4de09a1..b5f2b71 100644
--- a/sd/source/ui/tools/PreviewRenderer.cxx
+++ b/sd/source/ui/tools/PreviewRenderer.cxx
@@ -171,9 +171,9 @@ Image PreviewRenderer::RenderSubstitution (
 // visible.
 MapMode aMapMode (mpPreviewDevice->GetMapMode());
 aMapMode.SetMapUnit(MAP_100TH_MM);
-const double nFinalScale (25.0 * rPreviewPixelSize.Width() / 28000.0);
-aMapMode.SetScaleX(nFinalScale);
-aMapMode.SetScaleY(nFinalScale);
+Fraction aFinalScale(25 * rPreviewPixelSize.Width(), 28000);
+aMapMode.SetScaleX(aFinalScale);
+aMapMode.SetScaleY(aFinalScale);
 const sal_Int32 nFrameWidth (mbHasFrame ? snFrameWidth : 0);
 aMapMode.SetOrigin(mpPreviewDevice->PixelToLogic(
 Point(nFrameWidth,nFrameWidth),aMapMode));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-08 Thread Markus Mohrhard

 sc/source/core/data/table4.cxx |2 +-
 sc/source/core/tool/token.cxx  |3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 94311ca03b03936c59024c9e39a0920f67ab9131
Author: Markus Mohrhard 
Date:   Sun Dec 7 09:17:50 2014 +0100

handle all fill cases correctly, fdo#86754

That special case only works if the whole source range contains formula
cells. For now we just limit it to the special case of a single source
cell.

Change-Id: I71ccfde06edd97e5a9c78da22053583d05aac411
Reviewed-on: https://gerrit.libreoffice.org/13344
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit 8176253a7f8b061eb18015763ca674ea959ddf37)

diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index 24effea..39f35f4 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -1297,7 +1297,7 @@ void ScTable::FillAutoSimple(
 if (bVertical)  // rInner&:=nRow, rOuter&:=nCol
 {
 aSrcCell = aCol[rCol].GetCellValue(nSource);
-if (aSrcCell.meType == CELLTYPE_FORMULA)
+if (nISrcStart == nISrcEnd && aSrcCell.meType == 
CELLTYPE_FORMULA)
 {
 FillFormulaVertical(*aSrcCell.mpFormula, rInner, rCol, 
nIStart, nIEnd, pProgress, rProgress);
 return;
commit 50fbf7fef622e25fbb88183c8b9c7399cefa5d99
Author: Markus Mohrhard 
Date:   Mon Dec 8 08:05:34 2014 +0100

don't update range name if ref not in update range, fdo#85304

Change-Id: I1ccfacd98bd10f6ae1d4eaf7a705fe8863045697
Reviewed-on: https://gerrit.libreoffice.org/13363
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit ba874864eb57e38b6368256ccadcb8274eec4f2c)

diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index ebc072e..f7dbbfa 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -3131,6 +3131,9 @@ bool adjustSingleRefInName(
 return false;
 }
 
+if (!rCxt.maRange.In(rRef.toAbs(rPos)))
+return false;
+
 bool bChanged = false;
 
 if (rCxt.mnColDelta)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - 65 commits - connectivity/registry connectivity/source cui/source cui/uiconfig dbaccess/source dbaccess/uiconfig desktop/unx download

2015-01-08 Thread Markus Mohrhard

 connectivity/registry/postgresql/org/openoffice/Office/DataAccess/Drivers.xcu  
  |5 
 connectivity/source/drivers/file/FResultSet.cxx
  |1 
 connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx   
  |   11 
 connectivity/source/drivers/postgresql/pq_tools.cxx
  |2 
 cui/source/tabpages/autocdlg.cxx   
  |2 
 cui/uiconfig/ui/movemenu.ui
  |2 
 dbaccess/source/ui/dlg/advancedsettings.cxx
  |5 
 dbaccess/uiconfig/ui/specialsettingspage.ui
  |   36 +-
 desktop/unx/source/file_image_unx.c
  |6 
 download.lst   
  |2 
 editeng/source/editeng/impedit4.cxx
  |6 
 embeddedobj/source/msole/oleembed.cxx  
  |   11 
 external/icu/UnpackedTarball_icu.mk
  |1 
 external/icu/icu4c-icu11451.patch.1
  |   11 
 external/libmspub/ExternalProject_libmspub.mk  
  |1 
 external/poppler/ExternalProject_poppler.mk
  |1 
 filter/source/graphicfilter/itiff/itiff.cxx
  |   11 
 framework/source/fwe/classes/addonsoptions.cxx 
  |   44 +-
 include/oox/export/shapes.hxx  
  |2 
 include/vcl/outdev.hxx 
  |2 
 include/vcl/print.hxx  
  |1 
 include/xmloff/xmltoken.hxx
  |1 
 l10ntools/source/export.cxx
  |   19 -
 oox/source/drawingml/shape.cxx 
  |   13 
 oox/source/drawingml/textparagraphproperties.cxx   
  |   12 
 oox/source/drawingml/textparagraphpropertiescontext.cxx
  |5 
 oox/source/export/shapes.cxx   
  |  114 --
 
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
|3 
 
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
 |   57 +--
 reportdesign/source/ui/inspection/GeometryHandler.cxx  
  |1 
 sc/inc/scmatrix.hxx
  |8 
 sc/source/core/data/column2.cxx
  |   27 +
 sc/source/core/data/compressedarray.cxx
  |4 
 sc/source/core/data/documen2.cxx   
  |3 
 sc/source/core/data/documen4.cxx   
  |2 
 sc/source/core/data/document.cxx   
  |   19 -
 sc/source/core/data/formulacell.cxx
  |   11 
 sc/source/core/data/funcdesc.cxx   
  |3 
 sc/source/core/data/table5.cxx 
  |2 
 sc/source/core/tool/interpr1.cxx   
  |4 
 sc/source/core/tool/scmatrix.cxx   
  |  173 ++
 sc/source/filter/excel/excform8.cxx
  |   18 -
 sc/source/filter/excel/impop.cxx   
  |   12 
 sc/source/filter/excel/xeformula.cxx   
  |4 
 sc/source/filter/excel/xelink.cxx

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

2015-01-08 Thread Markus Mohrhard

 sc/source/core/data/table4.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8176253a7f8b061eb18015763ca674ea959ddf37
Author: Markus Mohrhard 
Date:   Sun Dec 7 09:17:50 2014 +0100

handle all fill cases correctly, fdo#86754

That special case only works if the whole source range contains formula
cells. For now we just limit it to the special case of a single source
cell.

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

diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index 24effea..39f35f4 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -1297,7 +1297,7 @@ void ScTable::FillAutoSimple(
 if (bVertical)  // rInner&:=nRow, rOuter&:=nCol
 {
 aSrcCell = aCol[rCol].GetCellValue(nSource);
-if (aSrcCell.meType == CELLTYPE_FORMULA)
+if (nISrcStart == nISrcEnd && aSrcCell.meType == 
CELLTYPE_FORMULA)
 {
 FillFormulaVertical(*aSrcCell.mpFormula, rInner, rCol, 
nIStart, nIEnd, pProgress, rProgress);
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-08 Thread David Tardon

 include/xmloff/shapeexport.hxx   |4 +---
 reportdesign/source/filter/xml/xmlExport.cxx |4 ++--
 sc/source/filter/xml/xmlexprt.cxx|8 
 xmloff/source/chart/SchXMLExport.cxx |4 ++--
 xmloff/source/draw/shapeexport.cxx   |   27 +--
 xmloff/source/text/txtparae.cxx  |2 +-
 6 files changed, 19 insertions(+), 30 deletions(-)

New commits:
commit 5672dab6b59268cd8ce08752178d3f7564d5e8d7
Author: David Tardon 
Date:   Thu Jan 8 10:35:27 2015 +0100

Revert "Don't assume that the ZOrder property of shapes is an enumeration"

This reverts commit 66c7dbbf7dfba8cfab63f8d1df72ace87e5bf7ca.

See https://gerrit.libreoffice.org/#/c/13554/ .

Conflicts:
include/xmloff/shapeexport.hxx
reportdesign/source/filter/xml/xmlExport.cxx
sc/source/filter/xml/xmlexprt.cxx
xmloff/source/draw/shapeexport.cxx

Change-Id: I14fed9ad043a756a9e2d390c76fa907c349c3a2e

diff --git a/include/xmloff/shapeexport.hxx b/include/xmloff/shapeexport.hxx
index 6cc70a4..64538e2 100644
--- a/include/xmloff/shapeexport.hxx
+++ b/include/xmloff/shapeexport.hxx
@@ -250,13 +250,11 @@ public:
 
 // This method collects all automatic styles for the given XShape
 void collectShapeAutoStyles(
-const com::sun::star::uno::Reference < com::sun::star::drawing::XShape 
>& xShape,
-sal_Int32 nShapeId = -1);
+const com::sun::star::uno::Reference < com::sun::star::drawing::XShape 
>& xShape);
 
 // This method exports the given XShape
 void exportShape(
 const com::sun::star::uno::Reference < com::sun::star::drawing::XShape 
>& xShape,
-sal_Int32 nShapeId = -1,
 XMLShapeExportFlags nFeatures = SEF_DEFAULT,
 com::sun::star::awt::Point* pRefPoint = NULL,
 SvXMLAttributeList* pAttrList = NULL
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx 
b/reportdesign/source/filter/xml/xmlExport.cxx
index d90b0e2..bf7594e9 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -674,7 +674,7 @@ void ORptExport::exportReportComponentAutoStyles(const 
Reference& _xPr
 rtl::Reference< XMLShapeExport > xShapeExport = GetShapeExport();
 xShapeExport->seekShapes(_xProp.get());
 SolarMutexGuard aGuard;
-xShapeExport->collectShapeAutoStyles(xShape.get(), i);
+xShapeExport->collectShapeAutoStyles(xShape.get());
 }
 else
 {
@@ -1501,7 +1501,7 @@ void ORptExport::exportShapes(const Reference< XSection>& 
_xSection,bool _bAddPa
 }
 
 AddAttribute( XML_NAMESPACE_TEXT, XML_ANCHOR_TYPE, XML_PARAGRAPH );
-xShapeExport->exportShape(xShape.get(), i, 
SEF_DEFAULT|XMLShapeExportFlags::NO_WS,&aRefPoint);
+xShapeExport->exportShape(xShape.get(), 
SEF_DEFAULT|XMLShapeExportFlags::NO_WS,&aRefPoint);
 }
 }
 }
diff --git a/sc/source/filter/xml/xmlexprt.cxx 
b/sc/source/filter/xml/xmlexprt.cxx
index 436b7d8..fa6c944 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -3470,7 +3470,7 @@ void ScXMLExport::ExportShape(const uno::Reference < 
drawing::XShape >& xShape,
 pAttrList->AddAttribute(
 
GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_DRAW, GetXMLToken( 
XML_NOTIFY_ON_UPDATE_OF_RANGES ) ), sRanges );
 }
-GetShapeExport()->exportShape( xShape, 
-1, XMLShapeExportFlags::NO_CHART_DATA | SEF_DEFAULT, pPoint, pAttrList );
+GetShapeExport()->exportShape( xShape, 
XMLShapeExportFlags::NO_CHART_DATA | SEF_DEFAULT, pPoint, pAttrList );
 }
 }
 }
@@ -3504,7 +3504,7 @@ void ScXMLExport::ExportShape(const uno::Reference < 
drawing::XShape >& xShape,
 pAttrList->AddAttribute(
 GetNamespaceMap().GetQNameByKey( 
XML_NAMESPACE_DRAW, GetXMLToken(XML_NOTIFY_ON_UPDATE_OF_RANGES) ), sRanges );
 }
-GetShapeExport()->exportShape(xShape, -1, 
XMLShapeExportFlags::NO_CHART_DATA | SEF_DEFAULT, pPoint, pAttrList);
+GetShapeExport()->exportShape(xShape, 
XMLShapeExportFlags::NO_CHART_DATA | SEF_DEFAULT, pPoint, pAttrList);
 }
 }
 }
@@ -3546,7 +3546,7 @@ void ScXMLExport::ExportShape(const uno::Reference < 
drawing::XShape >& xShape,
 // re-add pre-loaded attributes
 AddAttributeList( xSaveAttribs );
 }
-GetShapeExport()->exportShape(xShape, -1, SEF_DEFAULT, pPoint);

[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - libreofficekit/qa

2015-01-08 Thread Miklos Vajna

 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 7389f2fa5484897ee3b02ea50a88b1a40f8257fa
Author: Miklos Vajna 
Date:   Thu Jan 8 10:13:54 2015 +0100

gtktiledviewer: react to key releases

Change-Id: I5cbbd482fcf2e36851e1f82efc1cd511d856d10b

diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx 
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index 6aea0f8..bb3c28a 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -124,8 +124,8 @@ void changeQuadView( GtkWidget* /*pButton*/, gpointer /* 
pItem */ )
 }
 }
 
-/// Receives a key press event.
-static void docViewKeyPress(GtkWidget* /*pWidget*/, GdkEvent* /*pEvent*/, 
gpointer /*pData*/)
+/// Receives a key press or release event.
+static void signalKey(GtkWidget* /*pWidget*/, GdkEventKey* /*pEvent*/, 
gpointer /*pData*/)
 {
 }
 
@@ -284,7 +284,8 @@ int main( int argc, char* argv[] )
 pDocViewQuad = 0;
 
 // Input handling.
-g_signal_connect(pWindow, "key-press-event", G_CALLBACK(docViewKeyPress), 
NULL);
+g_signal_connect(pWindow, "key-press-event", G_CALLBACK(signalKey), NULL);
+g_signal_connect(pWindow, "key-release-event", G_CALLBACK(signalKey), 
NULL);
 
 gtk_container_add( GTK_CONTAINER(pVBox), pDocView );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Offering temporary use of MacBook with OS X 10.7 for fixing bug 75467

2015-01-08 Thread Peter Nowee

Hi,

I was wondering if I could be of any help in fixing bug 75467 : OS X
integration: selecting a file in Open File dialog adds resource fork,
changes size and mod date (10.6/10.7). It was marked WONTFIX, but it's
really quite an ugly bug and LO 4.3 is still advertised to work on OS
X 10.6/10.7.

I'm not much of a developer, but I prepared my laptop (OS X 10.7.5)
with XCode 4.6.3, SDK 10.7.5, Command Line Tools, autoconf, automake,
ccache and a git clone of LO core.

So I'm offering my laptop to be used by a LO developer (in my
presence), if that would be of help to fix this bug. I live around
Breda, The Netherlands. I can also take it with me to FOSDEM in
Brussels.

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

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

2015-01-08 Thread Markus Mohrhard

 sc/source/core/tool/token.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit ba874864eb57e38b6368256ccadcb8274eec4f2c
Author: Markus Mohrhard 
Date:   Mon Dec 8 08:05:34 2014 +0100

don't update range name if ref not in update range, fdo#85304

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

diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index ebc072e..f7dbbfa 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -3131,6 +3131,9 @@ bool adjustSingleRefInName(
 return false;
 }
 
+if (!rCxt.maRange.In(rRef.toAbs(rPos)))
+return false;
+
 bool bChanged = false;
 
 if (rCxt.mnColDelta)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-08 Thread Tsutomu Uchino

 basic/source/runtime/methods.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a2700f75af61837033ff213607445cc1f74b36d6
Author: Tsutomu Uchino 
Date:   Thu Jan 8 12:56:45 2015 +

#i94895# fix illegal result of Replace runtime function

diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index f55424c71..6b55dad 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -1439,7 +1439,7 @@ RTLFUNC(Replace)
 if( nPos != STRING_NOTFOUND )
 {
 aExpStr.Replace( nPos, nFindStrLen, aReplaceStr );
-nPos = nPos - nFindStrLen + nReplaceStrLen + 1;
+nPos = nPos + nReplaceStrLen;
 nCounts++;
 }
 else
@@ -1448,7 +1448,7 @@ RTLFUNC(Replace)
 }
 }
 }
-rPar.Get(0)->PutString( aExpStr.Copy( 
static_cast(lStartPos - 1) )  );
+rPar.Get(0)->PutString( aExpStr.Copy() );
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-08 Thread David Tardon

 sc/source/core/tool/token.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit aa2c14d7ad8990afa25603f637c7ef2628b77873
Author: David Tardon 
Date:   Mon Oct 6 20:24:52 2014 +0200

avoid use of ref. to possibly deleted object

Change-Id: If5977b280fed8d8b053f59852d3984a59ce61a69
(cherry picked from commit ce5cc7afb0f1c99237d04e0c754527c725d8491c)
Reviewed-on: https://gerrit.libreoffice.org/11832
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index eb83c8c..ba01d9a 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -2386,9 +2386,9 @@ void ScTokenArray::ReadjustAbsolute3DReferences( const 
ScDocument* pOldDoc, cons
 sal_uInt16 nFileId;
 GetExternalTableData(pOldDoc, pNewDoc, rRef.Tab(), 
aTabName, nFileId);
 //replace with ScExternalSingleRefToken and adjust 
references
-pCode[j]->DecRef();
 ScExternalSingleRefToken* pToken = new 
ScExternalSingleRefToken(nFileId, aTabName, rRef);
 pToken->IncRef();
+pCode[j]->DecRef(); // ATTENTION: rRef can't be used after 
this point
 pCode[j] = pToken;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-08 Thread Michael Stahl

 sw/qa/extras/odfimport/data/fdo79269.odt|binary
 sw/qa/extras/odfimport/data/fdo79269_header.odt |binary
 sw/qa/extras/odfimport/odfimport.cxx|   35 
 sw/source/core/unocore/unostyle.cxx |   35 +---
 4 files changed, 55 insertions(+), 15 deletions(-)

New commits:
commit 6c64dfb95cf4b23627e5d5ead930c089f2ebb50c
Author: Michael Stahl 
Date:   Tue Sep 30 17:59:08 2014 +0200

fdo#79269: fix ODF import of style:footer-first

The implementation of SwXStyle's FirstIsShared property is busted, and
that causes xmloff to write the footer-first content into the master
footer.

This is a re-implementation of 0f21f932081471b2a5eda820fa1a194fbf3ab85c
because unostyle.cxx is very different on master...

Reviewed-on: https://gerrit.libreoffice.org/11722
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 
(cherry picked from commit 902de8a1cbdb86c1eb1a05c8307b109fd75f493c)

Conflicts:
sw/source/core/unocore/unostyle.cxx

Change-Id: I485d8089c1fb5ba3ca369fbfe8f3115bf700ba13
Reviewed-on: https://gerrit.libreoffice.org/11752
Reviewed-by: BjÃ¶rn Michaelsen 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sw/qa/extras/odfimport/data/fdo79269.odt 
b/sw/qa/extras/odfimport/data/fdo79269.odt
new file mode 100644
index 000..2e3bf1e
Binary files /dev/null and b/sw/qa/extras/odfimport/data/fdo79269.odt differ
diff --git a/sw/qa/extras/odfimport/data/fdo79269_header.odt 
b/sw/qa/extras/odfimport/data/fdo79269_header.odt
new file mode 100644
index 000..6f1a839
Binary files /dev/null and b/sw/qa/extras/odfimport/data/fdo79269_header.odt 
differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index f1651bd..4fa3600 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -272,6 +272,41 @@ DECLARE_ODFIMPORT_TEST(testFdo60842, "fdo60842.odt")
 getCell(xTable, "E1", "01/04/2012");
 }
 
+DECLARE_ODFIMPORT_TEST(testFdo79269, "fdo79269.odt")
+{
+uno::Reference xModel(mxComponent, uno::UNO_QUERY);
+uno::Reference 
xTextViewCursorSupplier(xModel->getCurrentController(), uno::UNO_QUERY);
+uno::Reference 
xCursor(xTextViewCursorSupplier->getViewCursor(), uno::UNO_QUERY);
+xCursor->jumpToLastPage();
+CPPUNIT_ASSERT_EQUAL(sal_Int16(2), xCursor->getPage());
+
+// The problem was that the first-footer was shared.
+uno::Reference 
xPropSet(getStyles("PageStyles")->getByName(DEFAULT_STYLE), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(false, getProperty(xPropSet, "FirstIsShared"));
+
+uno::Reference xFooter1 = getProperty< 
uno::Reference >(xPropSet, "FooterTextFirst");
+CPPUNIT_ASSERT_EQUAL(OUString("forst"), xFooter1->getString());
+uno::Reference xFooter = getProperty< 
uno::Reference >(xPropSet, "FooterText");
+CPPUNIT_ASSERT_EQUAL(OUString("second"), xFooter->getString());
+}
+
+DECLARE_ODFIMPORT_TEST(testFdo79269_header, "fdo79269_header.odt")
+{
+uno::Reference xModel(mxComponent, uno::UNO_QUERY);
+uno::Reference 
xTextViewCursorSupplier(xModel->getCurrentController(), uno::UNO_QUERY);
+uno::Reference 
xCursor(xTextViewCursorSupplier->getViewCursor(), uno::UNO_QUERY);
+xCursor->jumpToLastPage();
+CPPUNIT_ASSERT_EQUAL(sal_Int16(2), xCursor->getPage());
+
+uno::Reference 
xPropSet(getStyles("PageStyles")->getByName(DEFAULT_STYLE), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(false, getProperty(xPropSet, "FirstIsShared"));
+
+uno::Reference xFooter1 = getProperty< 
uno::Reference >(xPropSet, "HeaderTextFirst");
+CPPUNIT_ASSERT_EQUAL(OUString("forst"), xFooter1->getString());
+uno::Reference xFooter = getProperty< 
uno::Reference >(xPropSet, "HeaderText");
+CPPUNIT_ASSERT_EQUAL(OUString("second"), xFooter->getString());
+}
+
 DECLARE_ODFIMPORT_TEST(testFdo56272, "fdo56272.odt")
 {
 uno::Reference xShape = getShape(1);
diff --git a/sw/source/core/unocore/unostyle.cxx 
b/sw/source/core/unocore/unostyle.cxx
index d5589ec..97d161c 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -467,6 +467,24 @@ SwXStyleFamily::~SwXStyleFamily()
 
 }
 
+static bool lcl_GetHeaderFooterItem(
+SfxItemSet const& rSet, OUString const& rPropName, bool const bFooter,
+SvxSetItem const*& o_rpItem)
+{
+SfxItemState eState = rSet.GetItemState(
+(bFooter) ? SID_ATTR_PAGE_FOOTERSET : SID_ATTR_PAGE_HEADERSET,
+false, reinterpret_cast(&o_rpItem));
+if (SFX_ITEM_SET != eState &&
+rPropName == "FirstIsShared")
+{   // fdo#79269 header may not exist, check footer then
+eState = rSet.GetItemState(
+(!bFooter) ? SID_ATTR_PAGE_FOOTERSET : SID_ATTR_PAGE_HEADERSET,
+false, reinterpret_cast(&o_rpItem));
+}
+return SFX_ITEM_SET == eState;
+}
+
+
 static sal_Int32 lcl_GetCountOrName(const SwDoc

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

2015-01-08 Thread Markus Mohrhard

 sc/source/core/data/documen4.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 96409fd72c6fca3b64254666471f590ff89b9a26
Author: Markus Mohrhard 
Date:   Wed Dec 24 04:52:25 2014 +0100

we want to compare two different cells, fdo#85353

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

diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx
index b8e5958..6e0da40 100644
--- a/sc/source/core/data/documen4.cxx
+++ b/sc/source/core/data/documen4.cxx
@@ -1324,7 +1324,7 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc )
 if ( ValidCol(nOtherCol) && ValidRow(nOtherRow) )
 {
 ScAddress aOtherPos( nOtherCol, nOtherRow, nOtherTab );
-aOtherCell.assign(*this, aOtherPos);
+aOtherCell.assign(rOtherDoc, aOtherPos);
 }
 
 if (!aThisCell.equalsWithoutFormat(aOtherCell))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-08 Thread Eike Rathke

 sc/source/filter/inc/unitconverter.hxx   |3 +++
 sc/source/filter/oox/sheetdatabuffer.cxx |   11 +--
 sc/source/filter/oox/unitconverter.cxx   |   14 ++
 3 files changed, 18 insertions(+), 10 deletions(-)

New commits:
commit 992673fb89b79a1b2abd28173b013ccbc3987364
Author: Eike Rathke 
Date:   Tue Dec 16 01:37:31 2014 +0100

fdo#79249 call formula compiler with error string

... instead of attempting to stringize a NaN coded error value.

Regression introduced with 30a20743ae17e6e02183a65603d38968253b3ffb

(cherry picked from commit 994607b55104b9ae4554554c13b001b8d5d513b6)

construct grouped ScFormulaCell with bDirty=true, fdo#79249 related

Noticed when loading
https://bugs.freedesktop.org/attachment.cgi?id=99844
with fdo#79249 fix where oox::xls::applyCellFormulas() groups the
consecutive =#N/A formulas. Only A1 result was displayed, other cells
were displayed empty.

(cherry picked from commit a1dc5e97da273bf35d58d54e625149022569a993)

correct error string, #N/A instead of #NA

(cherry picked from commit 758755e31b3d9e1ed2eab522d4794282178346ac)

implement an actually working setErrorCell() from BIFF error codes

(cherry picked from commit ca9a81b2ca858b82e863e1e6f917928916fea79e)

3a541f74d3d25e1515a1c6d47f02ec6a8e817c93
15019072b6e812b9ffe29d3ee6afacd9ab526948
67b8fc324779875ba14e2d69204c40fe27cc180e
Reviewed-on: https://gerrit.libreoffice.org/13492
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

Conflicts:
sc/source/filter/oox/sheetdatabuffer.cxx

Change-Id: Ia7a8ca39938820ac75db169404446fa696c6ee1b

diff --git a/sc/source/filter/inc/unitconverter.hxx 
b/sc/source/filter/inc/unitconverter.hxx
index 88921d1..dbd6424 100644
--- a/sc/source/filter/inc/unitconverter.hxx
+++ b/sc/source/filter/inc/unitconverter.hxx
@@ -88,6 +88,9 @@ public:
 /** Returns a BIFF error code from the passed error string. */
 sal_uInt8   calcBiffErrorCode( const OUString& rErrorCode ) const;
 
+/** Returns an error string from the passed BIFF error code. */
+const OUString& calcErrorString( sal_uInt8 nErrorCode ) const;
+
 private:
 /** Adds an error code to the internal maps. */
 voidaddErrorCode( sal_uInt8 nErrorCode, const OUString& 
rErrorCode );
diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx 
b/sc/source/filter/oox/sheetdatabuffer.cxx
index 98cf684..11c9c7f 100644
--- a/sc/source/filter/oox/sheetdatabuffer.cxx
+++ b/sc/source/filter/oox/sheetdatabuffer.cxx
@@ -216,16 +216,7 @@ void SheetDataBuffer::setErrorCell( const CellModel& 
rModel, const OUString& rEr
 
 void SheetDataBuffer::setErrorCell( const CellModel& rModel, sal_uInt8 
nErrorCode )
 {
-assert(!"stringizing any NaN will only give 'nan'");
-/* FIXME: map nErrorCode to error string and call setErrorCell() above. */
-
-OUStringBuffer aBuf;
-aBuf.append('{');
-aBuf.append(BiffHelper::calcDoubleFromError(nErrorCode));
-aBuf.append('}');
-
-getFormulaBuffer().setCellFormula(rModel.maCellAddr, 
aBuf.makeStringAndClear());
-setCellFormat( rModel );
+setErrorCell( rModel, getUnitConverter().calcErrorString( nErrorCode));
 }
 
 void SheetDataBuffer::setDateCell( const CellModel& rModel, const OUString& 
rDateString )
diff --git a/sc/source/filter/oox/unitconverter.cxx 
b/sc/source/filter/oox/unitconverter.cxx
index 108b248..2eff676 100644
--- a/sc/source/filter/oox/unitconverter.cxx
+++ b/sc/source/filter/oox/unitconverter.cxx
@@ -226,6 +226,20 @@ sal_uInt8 UnitConverter::calcBiffErrorCode( const 
OUString& rErrorCode ) const
 return (aIt == maOoxErrCodes.end()) ? BIFF_ERR_NA : aIt->second;
 }
 
+const OUString& UnitConverter::calcErrorString( sal_uInt8 nErrorCode ) const
+{
+OoxErrorCodeMap::const_iterator iFail( maOoxErrCodes.end());
+for (OoxErrorCodeMap::const_iterator aIt( maOoxErrCodes.begin()); aIt != 
maOoxErrCodes.end(); ++aIt)
+{
+if (aIt->second == nErrorCode)
+return aIt->first;
+if (aIt->second == BIFF_ERR_NA)
+iFail = aIt;
+}
+assert(iFail != maOoxErrCodes.end());   // BIFF_ERR_NA really should be in 
the map..
+return iFail->first;
+}
+
 void UnitConverter::addErrorCode( sal_uInt8 nErrorCode, const OUString& 
rErrorCode )
 {
 maOoxErrCodes[ rErrorCode ]  = nErrorCode;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-08 Thread Markus Mohrhard

 sc/source/filter/inc/sheetdatabuffer.hxx  |   14 +-
 sc/source/filter/inc/worksheethelper.hxx  |2 +-
 sc/source/filter/oox/sheetdatabuffer.cxx  |   19 ++-
 sc/source/filter/oox/sheetdatacontext.cxx |7 ++-
 4 files changed, 30 insertions(+), 12 deletions(-)

New commits:
commit c931268890fdd0e9aec1bdab939495f299e11011
Author: Markus Mohrhard 
Date:   Wed Dec 24 04:11:08 2014 +0100

reimplement shared formula import for xlsb, fdo#86734

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

diff --git a/sc/source/filter/inc/sheetdatabuffer.hxx 
b/sc/source/filter/inc/sheetdatabuffer.hxx
index 1a3ae9a..9d05f64 100644
--- a/sc/source/filter/inc/sheetdatabuffer.hxx
+++ b/sc/source/filter/inc/sheetdatabuffer.hxx
@@ -126,6 +126,10 @@ public:
 /** Inserts a ISO 8601 date cell into the sheet. */
 voidsetDateCell( const CellModel& rModel, const OUString& 
rDateString );
 
+voidcreateSharedFormula(
+const com::sun::star::table::CellAddress& rRange,
+const ApiTokenSequence& rTokens);
+
 /** Inserts the passed token array as array formula. */
 voidcreateArrayFormula(
 const ::com::sun::star::table::CellRangeAddress& 
rRange,
@@ -151,17 +155,17 @@ public:
 /** Final processing after the sheet has been imported. */
 voidfinalizeImport();
 
-private:
-struct XfIdRowRange;
-
 /** Sets the passed formula token array into a cell. */
 voidsetCellFormula(
 const ::com::sun::star::table::CellAddress& 
rCellAddr,
 const ApiTokenSequence& rTokens );
 
+private:
+struct XfIdRowRange;
+
 /** Creates a formula token array representing the shared formula with the
 passed identifier. */
-ApiTokenSequenceresolveSharedFormula( const BinAddress& rMapKey ) 
const;
+ApiTokenSequenceresolveSharedFormula( const css::table::CellAddress& 
rMapKey ) const;
 
 /** Inserts the passed array formula into the sheet. */
 voidfinalizeArrayFormula(
@@ -234,7 +238,7 @@ private:
 SharedFormulaMapmaSharedFormulas;   /// Maps shared formula base 
address to defined name token index.
 ::com::sun::star::table::CellAddress
 maSharedFmlaAddr;   /// Address of a cell 
containing a pending shared formula.
-BinAddress  maSharedBaseAddr;   /// Base address of the 
pending shared formula.
+css::table::CellAddress maSharedBaseAddr;   /// Base address of the 
pending shared formula.
 XfIdRowRangemaXfIdRowRange; /// Cached XF identifier for a 
range of rows.
 XfIdRangeListMapmaXfIdRangeLists;   /// Collected XF identifiers 
for cell rangelists.
 MergedRangeList maMergedRanges; /// Merged cell ranges.
diff --git a/sc/source/filter/inc/worksheethelper.hxx 
b/sc/source/filter/inc/worksheethelper.hxx
index 26c6999..3dd60c0 100644
--- a/sc/source/filter/inc/worksheethelper.hxx
+++ b/sc/source/filter/inc/worksheethelper.hxx
@@ -59,7 +59,7 @@ class WorksheetSettings;
 
 typedef ::std::map< OUString, void* >  ExtLst;
 
-typedef ::std::map< BinAddress, sal_Int32 > SharedFormulaMap;
+typedef ::std::map< BinAddress, ApiTokenSequence > SharedFormulaMap;
 
 /** An enumeration for all types of sheets in a workbook. */
 enum WorksheetType
diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx 
b/sc/source/filter/oox/sheetdatabuffer.cxx
index 68b39db..c77f43f 100644
--- a/sc/source/filter/oox/sheetdatabuffer.cxx
+++ b/sc/source/filter/oox/sheetdatabuffer.cxx
@@ -220,6 +220,14 @@ void SheetDataBuffer::setDateCell( const CellModel& 
rModel, const OUString& rDat
 setValueCell( rModel, fValue );
 }
 
+void SheetDataBuffer::createSharedFormula(const CellAddress& rAddr, const 
ApiTokenSequence& rTokens)
+{
+BinAddress aAddr(rAddr);
+maSharedFormulas[aAddr] = rTokens;
+if( mbPendingSharedFmla )
+setCellFormula( maSharedFmlaAddr, resolveSharedFormula( 
maSharedBaseAddr ) );
+}
+
 void SheetDataBuffer::setFormulaCell( const CellModel& rModel, const 
ApiTokenSequence& rTokens )
 {
 mbPendingSharedFmla = false;
@@ -249,11 +257,11 @@ void SheetDataBuffer::setFormulaCell( const CellModel& 
rModel, const ApiTokenSeq
 reading the formula definition it will be retried to insert the
 formula via retryPendingSharedFormulaCell(). */
 BinAddress aBaseAddr( aTokenInfo.First );
-aTokens = resolveSharedFormula( aBaseAddr );
+aTokens = resolveSharedFormula( aTokenInfo.First );
 if( !aTokens.hasElements() )
 {
 maSharedFmlaAddr = rModel.maCellAddr;
-maSharedBaseAddr = aBaseAddr;
+maShare

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

2015-01-08 Thread Tor Lillqvist

 sc/source/core/opencl/op_math.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4852e6d27be16866bfd55309271558ce41edb232
Author: Tor Lillqvist 
Date:   Thu Jan 8 15:34:45 2015 +0200

Use a more boring value of pi

Innovativeness is good but perhaps not for mathematical constants.

Change-Id: Icef93802ce9123120c8527f3fa07e524b6e067d0

diff --git a/sc/source/core/opencl/op_math.cxx 
b/sc/source/core/opencl/op_math.cxx
index 60f9438..557a926 100644
--- a/sc/source/core/opencl/op_math.cxx
+++ b/sc/source/core/opencl/op_math.cxx
@@ -1851,7 +1851,7 @@ void 
OpRadians::GenSlidingWindowFunction(std::stringstream &ss,
 ss << "double tmp;\n";
 GenTmpVariables(ss,vSubArguments);
 CheckAllSubArgumentIsNan(ss,vSubArguments);
-ss << "tmp = tmp0 * 3.141592657 * pow(180.0,-1);\n";
+ss << "tmp = tmp0 * 3.14159265358979 * pow(180.0,-1);\n";
 ss << "return tmp;\n";
 ss << "}";
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-08 Thread Markus Mohrhard

 sc/source/filter/excel/xelink.cxx |   18 +++---
 1 file changed, 11 insertions(+), 7 deletions(-)

New commits:
commit 62bc15f270614afa37c6615fc34cd79f45026da5
Author: Markus Mohrhard 
Date:   Mon Dec 22 06:22:45 2014 +0100

fix another validation error for OOXML, related fdo#40746

e.g. exporting fdo40746-2.ods as OOXML

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

diff --git a/sc/source/filter/excel/xelink.cxx 
b/sc/source/filter/excel/xelink.cxx
index 3de8363..08b2afb 100644
--- a/sc/source/filter/excel/xelink.cxx
+++ b/sc/source/filter/excel/xelink.cxx
@@ -242,7 +242,7 @@ protected:
 /** Writes the list of externalName elements. */
 voidWriteExtNameBufferXml( XclExpXmlStream& rStrm );
 
-private:
+protected:
 typedef boost::shared_ptr< XclExpExtNameBuffer >   XclExpExtNameBfrRef;
 XclExpExtNameBfrRef mxExtNameBfr;   /// List of EXTERNNAME records.
 };
@@ -1684,14 +1684,18 @@ void XclExpSupbook::SaveXml( XclExpXmlStream& rStrm )
 
 }
 
-pExternalLink->startElement( XML_sheetDataSet, FSEND);
+if (!maXctList.IsEmpty() || mxExtNameBfr)
+{
+pExternalLink->startElement( XML_sheetDataSet, FSEND);
 
-// sheetData elements
-maXctList.SaveXml( rStrm );
-// externalName elements
-WriteExtNameBufferXml( rStrm );
+// sheetData elements
+maXctList.SaveXml( rStrm );
+// externalName elements
+WriteExtNameBufferXml( rStrm );
 
-pExternalLink->endElement( XML_sheetDataSet);
+pExternalLink->endElement( XML_sheetDataSet);
+
+}
 pExternalLink->endElement( XML_externalBook);
 pExternalLink->endElement( XML_externalLink);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-08 Thread Markus Mohrhard

 sc/source/filter/excel/xelink.cxx |   16 ++--
 1 file changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 1eb1d5a643f3526d540abe783edac78c8ded476b
Author: Markus Mohrhard 
Date:   Mon Dec 22 06:18:07 2014 +0100

fix OOXML validation error, related fdo#40746

e.g. fdo40746-2.ods exported to OOXML

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

diff --git a/sc/source/filter/excel/xelink.cxx 
b/sc/source/filter/excel/xelink.cxx
index 234e65b..3de8363 100644
--- a/sc/source/filter/excel/xelink.cxx
+++ b/sc/source/filter/excel/xelink.cxx
@@ -1671,14 +1671,18 @@ void XclExpSupbook::SaveXml( XclExpXmlStream& rStrm )
 FSNS(XML_r, XML_id),XclXmlUtils::ToOString( sId ).getStr(),
 FSEND);
 
-pExternalLink->startElement( XML_sheetNames, FSEND);
-for (size_t nPos = 0, nSize = maXctList.GetSize(); nPos < nSize; ++nPos)
+if (!maXctList.IsEmpty())
 {
-pExternalLink->singleElement( XML_sheetName,
-XML_val,XclXmlUtils::ToOString( maXctList.GetRecord( nPos 
)->GetTabName()).getStr(),
-FSEND);
+pExternalLink->startElement( XML_sheetNames, FSEND);
+for (size_t nPos = 0, nSize = maXctList.GetSize(); nPos < nSize; 
++nPos)
+{
+pExternalLink->singleElement( XML_sheetName,
+XML_val,XclXmlUtils::ToOString( maXctList.GetRecord( 
nPos )->GetTabName()).getStr(),
+FSEND);
+}
+pExternalLink->endElement( XML_sheetNames);
+
 }
-pExternalLink->endElement( XML_sheetNames);
 
 pExternalLink->startElement( XML_sheetDataSet, FSEND);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-08 Thread Markus Mohrhard

 sc/source/filter/xcl97/XclExpChangeTrack.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 995a06e212c1a5ca6b5f29ad01d445a1c0d460f1
Author: Markus Mohrhard 
Date:   Mon Dec 22 05:00:24 2014 +0100

fix OOXML validation errors

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

diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx 
b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
index 93b5a09..7104c4e 100644
--- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
@@ -1079,6 +1079,12 @@ void XclExpChTrCellContent::SaveXml( XclExpXmlStream& 
rRevisionLogStrm )
 if( pOldData )
 {
 lcl_WriteCell( rRevisionLogStrm, XML_oc, aPosition, pOldData );
+if (!pNewData)
+{
+pStream->singleElement(XML_nc,
+XML_r,  XclXmlUtils::ToOString( aPosition ).getStr(),
+FSEND);
+}
 }
 if( pNewData )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-08 Thread Stephan Bergmann

 bridges/source/cpp_uno/gcc3_linux_intel/except.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit c85e36bc856f52f7992ef120cb12d02f52ca0419
Author: Stephan Bergmann 
Date:   Thu Jan 8 14:19:16 2015 +0100

loplugin:cstylecast,stringconstant

Change-Id: Iffc8cbf108310099318e37378c4b3033ea087cee

diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx 
b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
index a6543c5..faabee7 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
@@ -170,7 +170,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription 
*pTypeDescr )
 type_info * base_rtti = getRTTI(
 (typelib_CompoundTypeDescription 
*)pTypeDescr->pBaseTypeDescription );
 rtti = new __si_class_type_info(
-strdup( rttiName ), (__class_type_info *)base_rtti );
+strdup( rttiName ), static_cast<__class_type_info 
*>(base_rtti) );
 }
 else
 {
@@ -233,7 +233,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * 
pUno2Cpp )
 if (! pTypeDescr)
 {
 throw RuntimeException(
-OUString("cannot get typedescription for type ") +
+"cannot get typedescription for type " +
 *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName 
) );
 }
 
@@ -263,7 +263,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * 
pUno2Cpp )
 if (! rtti)
 {
 throw RuntimeException(
-OUString("no rtti for type ") +
+"no rtti for type " +
 *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName 
) );
 }
 }
@@ -291,7 +291,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * 
pUnoExc, uno_Mapping
 typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
 if (0 == pExcTypeDescr)
 {
-RuntimeException aRE( OUString("exception type not found: ") + unoName 
);
+RuntimeException aRE( "exception type not found: " + unoName );
 Type const & rType = ::getCppuType( &aRE );
 uno_type_any_constructAndConvert( pUnoExc, &aRE, 
rType.getTypeLibType(), pCpp2Uno );
 SAL_WARN("bridges", aRE.Message);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-08 Thread Tor Lillqvist

 sc/source/core/opencl/formulagroupcl.cxx |  147 ---
 1 file changed, 3 insertions(+), 144 deletions(-)

New commits:
commit 58f2e4c62647ceeaffd3aa9b693d97321748d7ba
Author: Tor Lillqvist 
Date:   Thu Jan 8 14:55:43 2015 +0200

Bin obsolete conditional compilation

UNROLLING_FACTOR (or UNROLLING) has been defined since November 2013. No 
need
to keep old code around inside ifdefs. We have this thing called version
control.

Change-Id: I1f10f205df95014f8c223bd7a8716757577eade0

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 0fd192f..d90cce9 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -606,55 +606,7 @@ public:
 {
 assert(mpDVR);
 size_t nCurWindowSize = mpDVR->GetRefRowSize();
-// original for loop
-#ifndef UNROLLING_FACTOR
-needBody = true;
-// No need to generate a for-loop for degenerated cases
-if (nCurWindowSize == 1)
-{
-ss << "if (gid0 <" << mpDVR->GetArrayLength();
-ss << ")\n\t{\tint i = 0;\n\t\t";
-return nCurWindowSize;
-}
-
-ss << "for (int i = ";
-if (!bIsStartFixed && bIsEndFixed)
-{
-#ifdef  ISNAN
-ss << "gid0; i < " << mpDVR->GetArrayLength();
-ss << " && i < " << nCurWindowSize  << "; i++){\n\t\t";
-#else
-ss << "gid0; i < " << nCurWindowSize << "; i++)\n\t\t";
-#endif
-}
-else if (bIsStartFixed && !bIsEndFixed)
-{
-#ifdef  ISNAN
-ss << "0; i < " << mpDVR->GetArrayLength();
-ss << " && i < gid0+" << nCurWindowSize << "; i++){\n\t\t";
-#else
-ss << "0; i < gid0+" << nCurWindowSize << "; i++)\n\t\t";
-#endif
-}
-else if (!bIsStartFixed && !bIsEndFixed)
-{
-#ifdef  ISNAN
-ss << "0; i + gid0 < " << mpDVR->GetArrayLength();
-ss << " &&  i < " << nCurWindowSize << "; i++){\n\t\t";
-#else
-ss << "0; i < " << nCurWindowSize << "; i++)\n\t\t";
-#endif
-}
-else
-{
-unsigned limit =
-std::min(mpDVR->GetArrayLength(), nCurWindowSize);
-ss << "0; i < " << limit << "; i++){\n\t\t";
-}
-return nCurWindowSize;
-#endif
 
-#ifdef UNROLLING_FACTOR
 {
 if (!mpDVR->IsStartFixed() && mpDVR->IsEndFixed())
 {
@@ -757,7 +709,6 @@ public:
 return nCurWindowSize;
 }
 }
-#endif
 }
 ~DynamicKernelSlidingArgument()
 {
@@ -1472,76 +1423,7 @@ public:
 ss << ") {\n";
 ss << "double tmp = 0.0;\n";
 ss << "int gid0 = get_global_id(0);\n";
-#ifndef UNROLLING_FACTOR
-ss << "int i ;\n";
-ss << "for (i = 0; i < " << nCurWindowSize << "; i++)\n";
-ss << "{\n";
-for (unsigned i = 0; i < vSubArguments.size(); i++)
-{
-tmpCur = vSubArguments[i]->GetFormulaToken();
-if (ocPush == tmpCur->GetOpCode())
-{
-pCurDVR = static_cast(tmpCur);
-if (!pCurDVR->IsStartFixed() && !pCurDVR->IsEndFixed())
-{
-ss << "int currentCount";
-ss << i;
-ss << " =i+gid0+1;\n";
-}
-else
-{
-ss << "int currentCount";
-ss << i;
-ss << " =i+1;\n";
-}
-}
-}
-ss << "tmp += fsum(";
-for (unsigned i = 0; i < vSubArguments.size(); i++)
-{
-if (i)
-ss << "*";
-#ifdef  ISNAN
-if (ocPush == vSubArguments[i]->GetFormulaToken()->GetOpCode())
-{
-ss << "(";
-ss << "(currentCount";
-ss << i;
-ss << ">";
-if (vSubArguments[i]->GetFormulaToken()->GetType() ==
-formula::svSingleVectorRef)
-{
-const formula::SingleVectorRefToken* pSVR =
-static_cast
-(vSubArguments[i]->GetFormulaToken());
-ss << pSVR->GetArrayLength();
-}
-else if (vSubArguments[i]->GetFormulaToken()->GetType() ==
-formula::svDoubleVectorRef)
-{
-const formula::DoubleVectorRefToken* pSVR =
-static_cast
-(vSubArguments[i]->GetFormulaToken());
-ss << pSVR->GetArrayLength();
-}
-ss << ")||isNan(" << vSubArguments[i]
-->GenSlidingWindowDeclRef(true);
-ss << ")?0:";
-ss << vSubArguments[i]->GenSlidingWind

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

2015-01-08 Thread Stephan Bergmann

 include/tools/link.hxx |   42 +-
 1 file changed, 21 insertions(+), 21 deletions(-)

New commits:
commit 25e291438231611823dadc195fd26d26a1b8ece4
Author: Stephan Bergmann 
Date:   Thu Jan 8 14:06:24 2015 +0100

Properly change Link class to use sal_IntPtr instead of long

...follow-up to 4e41227dd6af52ec562d10efcb365defba6bd36e "mingw64: change 
Link
class to use sal_IntPtr instead of long;" should make obsolete
 "Signed/Unsigned mismatch on 
x86_64
platform on windows"

Change-Id: I9fcc947bb96e104816c2820cb338fc34c528bae0

diff --git a/include/tools/link.hxx b/include/tools/link.hxx
index db80283..c14eb01 100644
--- a/include/tools/link.hxx
+++ b/include/tools/link.hxx
@@ -24,50 +24,50 @@
 #include 
 #include 
 
-typedef long (*PSTUB)( void*, void* );
+typedef sal_IntPtr (*PSTUB)( void*, void* );
 
 #define DECL_LINK( Method, ArgType ) \
-long Method( ArgType ); \
-static long LinkStub##Method( void* pThis, void* )
+sal_IntPtr Method( ArgType ); \
+static sal_IntPtr LinkStub##Method( void* pThis, void* )
 
 #define DECL_STATIC_LINK( Class, Method, ArgType ) \
-static long LinkStub##Method( void* pThis, void* ); \
-static long Method( Class*, ArgType )
+static sal_IntPtr LinkStub##Method( void* pThis, void* ); \
+static sal_IntPtr Method( Class*, ArgType )
 
 #define DECL_DLLPRIVATE_LINK(Method, ArgType) \
-SAL_DLLPRIVATE long Method(ArgType); \
-SAL_DLLPRIVATE static long LinkStub##Method(void * pThis, void *)
+SAL_DLLPRIVATE sal_IntPtr Method(ArgType); \
+SAL_DLLPRIVATE static sal_IntPtr LinkStub##Method(void * pThis, void *)
 
 #define DECL_DLLPRIVATE_STATIC_LINK(Class, Method, ArgType) \
-SAL_DLLPRIVATE static long LinkStub##Method( void* pThis, void* ); \
-SAL_DLLPRIVATE static long Method(Class *, ArgType)
+SAL_DLLPRIVATE static sal_IntPtr LinkStub##Method( void* pThis, void* ); \
+SAL_DLLPRIVATE static sal_IntPtr Method(Class *, ArgType)
 
 #define IMPL_STUB(Class, Method, ArgType) \
-long Class::LinkStub##Method( void* pThis, void* pCaller) \
+sal_IntPtr Class::LinkStub##Method( void* pThis, void* pCaller) \
 { \
 return static_cast(pThis)->Method( (ArgType)pCaller ); \
 }
 
 #define IMPL_STATIC_LINK( Class, Method, ArgType, ArgName ) \
-long Class::LinkStub##Method( void* pThis, void* pCaller) \
+sal_IntPtr Class::LinkStub##Method( void* pThis, void* pCaller) \
 { \
 return Method( static_cast(pThis), (ArgType)pCaller ); \
 } \
-long Class::Method( Class* pThis, ArgType ArgName )
+sal_IntPtr Class::Method( Class* pThis, ArgType ArgName )
 
 #define IMPL_STATIC_LINK_NOINSTANCE( Class, Method, ArgType, ArgName ) \
-long Class::LinkStub##Method( void* pThis, void* pCaller) \
+sal_IntPtr Class::LinkStub##Method( void* pThis, void* pCaller) \
 { \
 return Method( static_cast(pThis), (ArgType)pCaller ); \
 } \
-long Class::Method( SAL_UNUSED_PARAMETER Class*, ArgType ArgName )
+sal_IntPtr Class::Method( SAL_UNUSED_PARAMETER Class*, ArgType ArgName )
 
 #define IMPL_STATIC_LINK_NOINSTANCE_NOARG( Class, Method ) \
-long Class::LinkStub##Method( void* pThis, void* pCaller) \
+sal_IntPtr Class::LinkStub##Method( void* pThis, void* pCaller) \
 { \
 return Method( static_cast(pThis), pCaller ); \
 } \
-long Class::Method( SAL_UNUSED_PARAMETER Class*, SAL_UNUSED_PARAMETER 
void* )
+sal_IntPtr Class::Method( SAL_UNUSED_PARAMETER Class*, 
SAL_UNUSED_PARAMETER void* )
 
 #define LINK( Inst, Class, Member ) \
 Link( static_cast(Inst), (PSTUB)&Class::LinkStub##Member )
@@ -76,26 +76,26 @@ typedef long (*PSTUB)( void*, void* );
 
 #define IMPL_LINK( Class, Method, ArgType, ArgName ) \
 IMPL_STUB( Class, Method, ArgType ) \
-long Class::Method( ArgType ArgName )
+sal_IntPtr Class::Method( ArgType ArgName )
 
 #define IMPL_LINK_NOARG( Class, Method ) \
 IMPL_STUB( Class, Method, void* ) \
-long Class::Method( SAL_UNUSED_PARAMETER void* )
+sal_IntPtr Class::Method( SAL_UNUSED_PARAMETER void* )
 
 #define IMPL_LINK_INLINE_START( Class, Method, ArgType, ArgName ) \
-inline long Class::Method( ArgType ArgName )
+inline sal_IntPtr Class::Method( ArgType ArgName )
 
 #define IMPL_LINK_INLINE_END( Class, Method, ArgType, ArgName ) \
 IMPL_STUB( Class, Method, ArgType )
 
 #define IMPL_LINK_NOARG_INLINE_START( Class, Method ) \
-inline long Class::Method( SAL_UNUSED_PARAMETER void* )
+inline sal_IntPtr Class::Method( SAL_UNUSED_PARAMETER void* )
 
 #define IMPL_LINK_NOARG_INLINE_END( Class, Method ) \
 IMPL_STUB( Class, Method, void* )
 
 #define IMPL_LINK_INLINE( Class, Method, ArgType, ArgName, Body ) \
-long Class::Method( ArgType ArgName ) \
+sal_IntPtr Class::Method( ArgType ArgName ) \
 Body \
 IMPL_STUB( Class, Method, ArgType )
 
___

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

2015-01-08 Thread Stephan Bergmann

 setup_native/scripts/source/getuid.c |8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 08476b7788530ff5ecb6eb379afc0a5998824f84
Author: Stephan Bergmann 
Date:   Thu Jan 8 14:04:37 2015 +0100

-Werror,-Wtautological-pointer-compare

Change-Id: I55db1220e234b92f5d0a3794f416154495da8b69

diff --git a/setup_native/scripts/source/getuid.c 
b/setup_native/scripts/source/getuid.c
index d3660f4..9a9f826 100644
--- a/setup_native/scripts/source/getuid.c
+++ b/setup_native/scripts/source/getuid.c
@@ -137,11 +137,9 @@ int __lxstat64(int n, const char *path, struct stat64 *buf)
 p_lstat = (int (*)(int n, const char *path, struct stat64 *buf))
 dlsym (RTLD_NEXT, "__lxstat64");
 ret = (*p_lstat)(n, path, buf);
-if (buf != NULL)
-{
-buf->st_uid = 0;
-buf->st_gid = 0;
-}
+assert(buf != NULL);
+buf->st_uid = 0;
+buf->st_gid = 0;
 return ret;
 }
 #endif
___
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' - configure.ac

2015-01-08 Thread Christian Lohmaier

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7160250ba4c3970a1d29a0bfc7482e4a73fb068f
Author: Christian Lohmaier 
Date:   Thu Jan 8 13:44:39 2015 +0100

actually bump product version to 4.4.1.0.0+

Change-Id: I79384d49f45d5f0647e285e743cf366ae6b83696

diff --git a/configure.ac b/configure.ac
index 76eb0b1..4a1ac6f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[4.4.0.2.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.4.1.0.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4.4.0.2'

2015-01-08 Thread Christian Lohmaier

Tag 'libreoffice-4.4.0.2' created by Christian Lohmaier 
 at 2015-01-08 12:40 -0800

Tag libreoffice-4.4.0.2
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJUrnq7AAoJEPQ0oe+v7q6jauUP/25WEo2KzHAyZTNqKOPG/7f9
Zs8tLwaUd3rr9e/cO71YUXJsXupNiemDAdMfurB/ZSjPgNzddzrC+1k2Y3c5cbxp
S90fK5iLRi3vzHe0BrRtgnf5Ut5ISrZRn8LQpz8iUo2IoVPpM5WI3XbouagwY06z
sI283bdzna5+CW8qS0BQgyuuzYiDp5zywaJ2V4xagRT2JgJwpvQboKJ9JI183GQj
038rVHwpagWGw9O9/OPJ9BRk7w6xX+d/f9E7a3MPVPCpXA6UpKoYm8TO5hcsI9Pt
fha613nwdA8cN7FmNkFju64EwitcuZrnSaKh+QtLab7kr0IChWZnvLyfr3tV0+lU
fu3jqaYE7oJPW9xfkdJcrgELB3mxnffkYN0MZKZuzYroN4c3InD7dKMl+Z1VfNXK
Fk2ahnwVp7wDun8WEUYGzKf69HTfzV5L/Siu9mLMhDibrPgMKxdgG/5wiQfzMt+i
eamefJPNaNq8rybG1LvI1XyZsnqrMiO3/ytBvXPHaTmFhElrGHBqDxphGI1bJ+Ha
d6jrm0LveOAnsptC9oDc6L/FZqiOo9uxWPRONbWxzpzCDQGTAB4Wd6FwIDb07aWf
izmzLfb7YTZ3Ux3q5eOJx+pVOJFNTXjk2tQ44izceTMyw+dNxg+3PsDLhG5Ockn3
LGSUkB/3l2nMNwxMtanL
=6P/B
-END PGP SIGNATURE-

Changes since libreoffice-4-4-branch-point-669:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.4.0.2'

2015-01-08 Thread Christian Lohmaier

Tag 'libreoffice-4.4.0.2' created by Christian Lohmaier 
 at 2015-01-08 12:40 -0800

Tag libreoffice-4.4.0.2
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJUrnq4AAoJEPQ0oe+v7q6jUGgQAIMN+yI2GNdr2i8omqEhbzVg
YmdV+ZzlJIAYqipJh/OClGXCKiz0vK4adc+ZbxLM+mfAlA1GjzT8iJtl3Xcbm79i
rhmGjRItaQJKmbV+k6A9At1drbzatkGaZCvruwPBOyRLz0uqnsPm6IM7tt9Azxru
7h7dtZSlfENeyWMDAPaW52vEghCLqM6JoR2TgU+p3ztQ7DmkL3Zhig2FwqP+PMJP
141ACqjILPBmDOP6ptkzymkGGLijfLaOoPu83ZwI5Szz/z7eU3cPXAe//7QFiwFI
w5b98XBMw/K+wdRYPmD2xOQGmSET27++w5J8zBu/lwyr1B6vlmuM/lTkbAyZNauh
f4DBnxmkt9wnPF1jD1bzKBmVya5Pv8BaUckbckn1OARA4KPHkidIV1DxP8AlW4qA
6dOIQa8DX7FwUGr8xRAYQRIGf3KrY7nDbxZ+aR83fuc2myCwqE5VF+8FFBdX2XlZ
nmOK5VAyHkmZN35lFrdP0jUYyckQqnD/LUfD+VWxuWgpjn5JDrlUs5LsRH9vMkgR
qy4L2x7lJnYn9m8YLJUmN3S8yl3tLry8WQI4Cjx9glfCgaygv6713dkgN4xEMmJh
vPom/5Td/heW3wCUTMQqHWj7oazlhCU4aAllSZKTTLnT16uOC71DFBaEAIsCgyMD
IKzuhU8Jn1jbJ583ppG5
=XiNu
-END PGP SIGNATURE-

Changes since libreoffice-4-4-branch-point-9:
---
 0 files changed
---
___
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-0' - configure.ac

2015-01-08 Thread Christian Lohmaier

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5ddd95d3daa53ec0fd075f5ef70932063d7f5aea
Author: Christian Lohmaier 
Date:   Thu Jan 8 13:41:54 2015 +0100

bump product version to 4.4.0.2.0+

Change-Id: I648aa21bd6b831c77f77675e4672db70e9ea9fb9

diff --git a/configure.ac b/configure.ac
index a6c5d7d..76eb0b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[4.4.0.1.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.4.0.2.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.4.0.2'

2015-01-08 Thread Christian Lohmaier

Tag 'libreoffice-4.4.0.2' created by Christian Lohmaier 
 at 2015-01-08 12:40 -0800

Tag libreoffice-4.4.0.2
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJUrnq0AAoJEPQ0oe+v7q6jYfUQAMtRQMfa6HOvD1AeXyXmQ4Ch
+BsxABVNulU80Hi8Wyev0ow2ABC2TDdaJ8p0QZBwzcmsWnw2v3krSzQ2hTv26QaS
/cIfp3AjkujVVX9Uj+mFSoFOeib9ZB5xUq1Omnca55O12wKNaHpyLvfM2XK11bL4
2bwPyszv6odQRt8mC90I7D2r9k4/jf2ggowKayr0DSg4qx/S2j7SuPqPVGewIh2f
xJ3nxAhH+xwxi7EUWFMb/18chnlLFQiBloTEsIiduMqr51b2Sy66vbFC05qxHiuT
E8JgTF83RNQIJI0tepaGj2zcVueNUagk0Rqf9Fr6MonRJZaFqyeeK8ssukWPVElH
RlsMlYnOGBSIoDqtbSd1vY6SacKlwjf7Oi/Fl2pwWvrjV48lch5mlHoWGAKWYQr9
ENrlri1U971VySKsiAxPTgdA2vZMJGGRVi1ebZ3fKHG0UQIL4G7+9133E2V+GDHx
OezF8qKpUGbsJvZrTMhxO2dejklgKkBEXs0r7+xhdhqCqZnIvnm1JPxmFqp3y5Uo
jzKP6Z2QzcwcvZCNRkcMRH3hzxZjyRBxSEz6axQ2F6XFxUJfKYuJ2XqvB9YD41F2
kvn88kulFgwFnSi5bcd8+kUf8v9artOTbxJ61HkPJtdfAph2q0t0KZ95NVnbKzyk
GVM+dqo3nyS3S15L6OUG
=Jzkq
-END PGP SIGNATURE-

Changes since libreoffice-4-4-branch-point-3:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4.4.0.2'

2015-01-08 Thread Christian Lohmaier

Tag 'libreoffice-4.4.0.2' created by Christian Lohmaier 
 at 2015-01-08 12:40 -0800

Tag libreoffice-4.4.0.2
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJUrnqrAAoJEPQ0oe+v7q6jDBgP/1sWWPBp7ZStF7gPZNY9hSFT
GJ7wfM0vTgKM7XktR9iJDvU6Ez/lsKd9202uyH+oJKvIhemFL6HOTO7NR3Xg1sl7
bOkvR179fwBrnjR8sTZo/xQls/alQyooZiKRDpqa+42I7/rI4kGBfa77kBdxgRbs
Ml3oTISLBLlrTGm1DyFEpIOEdlWIVy+zhTE0QGeAfBDZMkSx3XyyXhbvlZkU5M+4
Em8apzE7/oaPstV1Gyzl+GPJ+eyMo0MTT3PFfxw4KgYR4h71wYbOsRwOAtl1p60+
N7GXU3YftghGEnQl+TbWWpdzq0lJstYu26Ig2vR3QNfS5uKxS58WmMndVW5NJmTe
oE7bt6RYqxoSt+tpnuMyPtV02QfcSmBw4NlLUKLM1/JlxmJ27UXnVZ6/MYbr8XZP
/OxV5fZFfj2IZ9MhBVJVZv1etCO4XTTwTzWQOBKtE9A+SUHcUnGniFmU/K36+HJM
HEcucxjja6dRFMMstEotb9Wr6o1h+QAjI69Pwk/VnzJGilQpckIogmn9P7hJp7mW
mHzULYEphJ7fwxL4937wStE5I/ooyl+qrfQX/eRqVP3jRKC+HmCHatxk1XKjC4/C
hROSUdgz0+daknztL8xbMpbl7Z23I5UTfH6Wtnvd5N+mysKxB2oUId56wNRoGLRX
BRNaMIL+NSzVgg+wiPP0
=+67K
-END PGP SIGNATURE-

Changes since libreoffice-4-4-branch-point-2:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-08 Thread Andras Timar

 sw/inc/hintids.hxx  |1 
 sw/qa/extras/ww8export/data/commented-table.doc |binary
 sw/qa/extras/ww8export/ww8export.cxx|   12 ++
 sw/source/filter/inc/fltshell.hxx   |2 
 sw/source/filter/ww1/fltshell.cxx   |   15 ++
 sw/source/filter/ww8/ww8par.cxx |  144 
 sw/source/filter/ww8/ww8par.hxx |6 -
 sw/source/filter/ww8/ww8par5.cxx|   13 ++
 sw/source/filter/ww8/ww8par6.cxx|3 
 sw/source/filter/ww8/ww8scan.cxx|  141 +++
 sw/source/filter/ww8/ww8scan.hxx|   39 ++
 sw/source/filter/ww8/ww8struc.hxx   |8 -
 12 files changed, 221 insertions(+), 163 deletions(-)

New commits:
commit 519796c7bafdad4d8de3b59a0b8dedde91a8a0dc
Author: Andras Timar 
Date:   Thu Jan 8 12:01:11 2015 +0100

i#93570 DOC import: handle commented text ranges via RES_FLTR_ANNOTATIONMARK

backport from master:
271722d923610d128a358528e64d7233641ea0dc
677fdd4fa235466649911042577bc4980d42deb6
0ec0ec267986644084baaa5bda5ba917dc5744df

diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index 2381982..7d9d7b7 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -361,6 +361,7 @@ RES_FLTRATTR_BEGIN = RES_MSG_END,
 RES_FLTR_SECTION,
 RES_FLTR_REDLINE,
 RES_FLTR_SCRIPTTYPE,
+RES_FLTR_ANNOTATIONMARK,
 RES_FLTRATTR_END
 };
 
diff --git a/sw/qa/extras/ww8export/data/commented-table.doc 
b/sw/qa/extras/ww8export/data/commented-table.doc
new file mode 100644
index 000..049c7e3
Binary files /dev/null and b/sw/qa/extras/ww8export/data/commented-table.doc 
differ
diff --git a/sw/qa/extras/ww8export/ww8export.cxx 
b/sw/qa/extras/ww8export/ww8export.cxx
index 050b270..1a3f0b9 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -357,6 +357,18 @@ DECLARE_WW8EXPORT_TEST(testBnc636128, "bnc636128.doc")
 }
 #endif
 
+DECLARE_WW8EXPORT_TEST(testCommentedTable, "commented-table.doc")
+{
+// Document has a non-trivial commented text range, as the range contains 
a table.
+uno::Reference xTextFieldsSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xFieldsAccess(xTextFieldsSupplier->getTextFields());
+uno::Reference 
xFields(xFieldsAccess->createEnumeration());
+uno::Reference xField(xFields->nextElement(), 
uno::UNO_QUERY);
+// After first import, there was an off-by-one during import, so this was 
"efore.\nA1\nB1\nAfte". (Notice the additional "e" prefix.)
+// After export and import, things got worse, this was "\nA1\nB1\nAfte".
+CPPUNIT_ASSERT_EQUAL(OUString("fore." SAL_NEWLINE_STRING "A1" 
SAL_NEWLINE_STRING "B1" SAL_NEWLINE_STRING "Afte"), 
xField->getAnchor()->getString());
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/inc/fltshell.hxx 
b/sw/source/filter/inc/fltshell.hxx
index 71cc1db..36f49fa 100644
--- a/sw/source/filter/inc/fltshell.hxx
+++ b/sw/source/filter/inc/fltshell.hxx
@@ -150,7 +150,6 @@ protected:
 SwDoc* pDoc;
 bool bIsEndStack;
 
-void MoveAttrs( const SwPosition&  rPos );
 virtual void SetAttrInDoc(const SwPosition& rTmpPos, SwFltStackEntry& 
rEntry);
 virtual sal_Int32 GetCurrAttrCP() const {return -1;}
 virtual bool IsParaEndInCPs(sal_Int32 nStart,sal_Int32 nEnd,bool 
bSdOD=true) const;
@@ -161,6 +160,7 @@ protected:
 bool HasSdOD();
 
 public:
+void MoveAttrs( const SwPosition&  rPos );
 enum Flags
 {
 HYPO,
diff --git a/sw/source/filter/ww1/fltshell.cxx 
b/sw/source/filter/ww1/fltshell.cxx
index 5eca85e..6fd4c3d 100644
--- a/sw/source/filter/ww1/fltshell.cxx
+++ b/sw/source/filter/ww1/fltshell.cxx
@@ -30,6 +30,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -342,12 +343,16 @@ SwFltStackEntry* SwFltControlStack::SetAttr(const 
SwPosition& rPos,
 }
 else if (nAttrId == rEntry.pAttr->Which())
 {
-if( nAttrId != RES_FLTR_BOOKMARK )
+if( nAttrId != RES_FLTR_BOOKMARK && nAttrId != 
RES_FLTR_ANNOTATIONMARK )
 {
 // query handle
 bF = true;
 }
-else if (nHand == 
((SwFltBookmark*)(rEntry.pAttr))->GetHandle())
+else if (nAttrId == RES_FLTR_BOOKMARK && nHand == 
static_cast(rEntry.pAttr)->GetHandle())
+{
+bF = true;
+}
+else if (nAttrId == RES_FLTR_ANNOTATIONMARK && nHand == 
static_cast(rEntry.pAttr)->GetValue())
 {
 bF = true;
 }
@@ -582,6 +587,12 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& 
rTmpPos,
 }
 }
 break;
+case RES_FLTR_ANNOTATIONMARK:
+{
+MakeBookRegionOrPoint(rEntry, pD

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - configure.ac

2015-01-08 Thread Christian Lohmaier

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 87a5760fb7536871c676735578704b007490bcdd
Author: Christian Lohmaier 
Date:   Thu Jan 8 13:37:40 2015 +0100

bump product version to 4.4.0.2.0+

Change-Id: I290091169d23465c89539a32a4fdb132f11a886e

diff --git a/configure.ac b/configure.ac
index a6c5d7d..76eb0b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[4.4.0.1.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.4.0.2.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'libreoffice-4-4-0'

2015-01-08 Thread Christian Lohmaier

New branch 'libreoffice-4-4-0' available with the following commits:
commit d1a2dca082d19cdf595aed8b1c51f659ec4ddcf0
Author: Christian Lohmaier 
Date:   Thu Jan 8 13:34:37 2015 +0100

Branch libreoffice-4-4-0

This is 'libreoffice-4-4-0' - the stable branch for the 4.4.0 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 4.4.x release,
please use the 'libreoffice-4-4' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I34cad9bc9d5196f14a7a58cddc481e7b6d103f89

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

[Libreoffice-commits] translations.git: Changes to 'libreoffice-4-4-0'

2015-01-08 Thread Christian Lohmaier

New branch 'libreoffice-4-4-0' available with the following commits:
commit 639f763ec24474cb2ad8f6945a6c3f5db80f400e
Author: Christian Lohmaier 
Date:   Thu Jan 8 13:34:09 2015 +0100

Branch libreoffice-4-4-0

This is 'libreoffice-4-4-0' - the stable branch for the 4.4.0 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 4.4.x release,
please use the 'libreoffice-4-4' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I9b53566feeefe076be35881756c3863a389f357f

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

[Libreoffice-commits] help.git: Changes to 'libreoffice-4-4-0'

2015-01-08 Thread Christian Lohmaier

New branch 'libreoffice-4-4-0' available with the following commits:
commit 7a1dd6d909011aebaa6bf55d912b0e9671bc2cc5
Author: Christian Lohmaier 
Date:   Thu Jan 8 13:34:09 2015 +0100

Branch libreoffice-4-4-0

This is 'libreoffice-4-4-0' - the stable branch for the 4.4.0 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 4.4.x release,
please use the 'libreoffice-4-4' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I44ddf01b3c328d0069af89a64497ad37de4d838b

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

[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-4-4-0'

2015-01-08 Thread Christian Lohmaier

New branch 'libreoffice-4-4-0' available with the following commits:
commit 9545949e3c82a68f2045b253ac213984528090ea
Author: Christian Lohmaier 
Date:   Thu Jan 8 13:34:09 2015 +0100

Branch libreoffice-4-4-0

This is 'libreoffice-4-4-0' - the stable branch for the 4.4.0 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 4.4.x release,
please use the 'libreoffice-4-4' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I8d9824cfbda6a7ad2c5dbdd826d67a444e3069bf

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

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

2015-01-08 Thread Markus Mohrhard

 sc/source/core/data/documen2.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit c9770b4fc95e87e1f56f01b7b448d20e57277d50
Author: Markus Mohrhard 
Date:   Sun Dec 7 05:14:10 2014 +0100

we need the original context that contains the data, fdo#85856

Conflicts:
sc/source/core/data/documen2.cxx

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

diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 98cb68f..79e6f63 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -897,9 +897,8 @@ bool ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, 
const ScMarkData* pOnlyM
 aRefCxt.mnTabDelta = nDz;
 maTabs[nNewPos]->UpdateReference(aRefCxt, NULL);
 
-sc::RefUpdateInsertTabContext aInsTabCxt(nNewPos, 1);
 maTabs[nNewPos]->UpdateInsertTabAbs(nNewPos); // alle abs. um eins 
hoch!!
-maTabs[nOldPos]->UpdateInsertTab(aInsTabCxt);
+maTabs[nOldPos]->UpdateInsertTab(aCxt);
 
 maTabs[nOldPos]->UpdateCompile();
 maTabs[nNewPos]->UpdateCompile( true ); //  maybe already compiled in 
Clone, but used names need recompilation
___
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' - readlicense_oo/license

2015-01-08 Thread Christian Lohmaier

 readlicense_oo/license/CREDITS.fodt | 2302 +++-
 1 file changed, 1225 insertions(+), 1077 deletions(-)

New commits:
commit e63be1e4bbe3d9b42391bb2b4217f4dcc38c66cd
Author: Christian Lohmaier 
Date:   Thu Jan 8 13:19:53 2015 +0100

update credits

Change-Id: I3bdfd178f62e8e68c5dbce7341a07277d49a29fc

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 6a5cfeb..124efe7 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,24 +1,24 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits Â» 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/4.3.4.1$Linux_X86_64
 
LibreOffice_project/bc356b2f991740509f321d70e4512a6a54c5f2432012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits Â» 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/4.3.5.2$Linux_X86_64
 
LibreOffice_project/3a87456aaa6a95c63eea1c1b3201acedf0751bd52012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   607
+   501
501
-   32757
-   15162
+   36846
+   24493
true
true

 
  view2
- 3676
- 3471
+ 3709
+ 3475
  501
- 607
- 33256
- 15767
+ 501
+ 37345
+ 24993
  0
  0
  false
@@ -82,7 +82,7 @@
false
0

-   2340509
+   2396569
false

true
@@ -301,55 +301,55 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
-  
-  
-   
+   
   
   

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
+  
+  
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -358,19 +358,19 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -379,24 +379,24 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -1005,14 +1005,13 @@

   
  Credits
-991 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2014-12-10 04:45:44.
+1007 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2015-01-08 12:37:24.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
  
  
- 
- 
+ 
  
   
Ruediger 
TimmCommits: 82464Joined: 
2000-10-10
@@ -1032,38 +1031,38 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   CaolÃ¡n 
McNamaraCommits: 16038Joined: 
2000-10-10
+   CaolÃ¡n 
McNamaraCommits: 16225Joined: 
2000-10-10
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
   
   
-   Stephan 
BergmannCommits: 7648Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 7898Joined: 
2000-10-04
   
  
  
   
-   Tor 
Lillqvist

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

2015-01-08 Thread Markus Mohrhard

 include/xmloff/xmltoken.hxx   |1 +
 sc/source/filter/xml/xmldpimp.cxx |2 +-
 sc/source/filter/xml/xmlimprt.cxx |1 +
 xmloff/source/core/xmltoken.cxx   |1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 21afec83dbb6ab338e43db647345cda81db1039a
Author: Markus Mohrhard 
Date:   Mon Dec 8 00:47:44 2014 +0100

import part for: " use correct xml element name, related fdo#45266"

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

diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 549446c..8bc0b1a 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -2619,6 +2619,7 @@ namespace xmloff { namespace token {
 XML_STEP,
 XML_DATA_PILOT_GROUPS,
 XML_DATA_PILOT_GROUP,
+XML_DATA_PILOT_GROUP_MEMBER,
 
 XML_JAPANESE_CANDLE_STICK,
 XML_NAMED_SYMBOL,
diff --git a/sc/source/filter/xml/xmldpimp.cxx 
b/sc/source/filter/xml/xmldpimp.cxx
index 3840a78..db4cb90 100644
--- a/sc/source/filter/xml/xmldpimp.cxx
+++ b/sc/source/filter/xml/xmldpimp.cxx
@@ -1868,7 +1868,7 @@ SvXMLImportContext 
*ScXMLDataPilotGroupContext::CreateChildContext( sal_uInt16 n
 
 if (nPrefix == XML_NAMESPACE_TABLE)
 {
-if (IsXMLToken(rLName, XML_DATA_PILOT_MEMBER))
+if (IsXMLToken(rLName, XML_DATA_PILOT_MEMBER) || IsXMLToken(rLName, 
XML_DATA_PILOT_GROUP_MEMBER))
 pContext = new ScXMLDataPilotGroupMemberContext(GetScImport(), 
nPrefix, rLName, xAttrList, this);
 }
 
diff --git a/sc/source/filter/xml/xmlimprt.cxx 
b/sc/source/filter/xml/xmlimprt.cxx
index 379bb52..a3fb7d5 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -1792,6 +1792,7 @@ const SvXMLTokenMap& 
ScXMLImport::GetDataPilotMembersElemTokenMap()
 static const SvXMLTokenMapEntry aDataPilotMembersElemTokenMap[] =
 {
 { XML_NAMESPACE_TABLE, XML_DATA_PILOT_MEMBER,   
XML_TOK_DATA_PILOT_MEMBERS_ELEM_DATA_PILOT_MEMBER   },
+{ XML_NAMESPACE_TABLE, XML_DATA_PILOT_GROUP_MEMBER,   
XML_TOK_DATA_PILOT_MEMBERS_ELEM_DATA_PILOT_MEMBER   },
 XML_TOKEN_MAP_END
 };
 
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 5833f04..4c96192 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -2624,6 +2624,7 @@ namespace xmloff { namespace token {
 TOKEN( "step", XML_STEP ),
 TOKEN( "data-pilot-groups",XML_DATA_PILOT_GROUPS ),
 TOKEN( "data-pilot-group", XML_DATA_PILOT_GROUP ),
+TOKEN( "data-pilot-group-member",  
XML_DATA_PILOT_GROUP_MEMBER ),
 TOKEN( "japanese-candle-stick",XML_JAPANESE_CANDLE_STICK ),
 TOKEN( "named-symbol", XML_NAMED_SYMBOL ),
 TOKEN( "diamond",  XML_DIAMOND ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: readlicense_oo/license

2015-01-08 Thread Christian Lohmaier

 readlicense_oo/license/CREDITS.fodt | 2302 +++-
 1 file changed, 1225 insertions(+), 1077 deletions(-)

New commits:
commit 9763b55eb946cf425220d26dab91bf220890b180
Author: Christian Lohmaier 
Date:   Thu Jan 8 13:17:30 2015 +0100

update credits

Change-Id: Id69fb63e8f77a1f26491fc2a5d50d17a4d6421eb

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 6a5cfeb..124efe7 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,24 +1,24 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits Â» 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/4.3.4.1$Linux_X86_64
 
LibreOffice_project/bc356b2f991740509f321d70e4512a6a54c5f2432012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits Â» 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/4.3.5.2$Linux_X86_64
 
LibreOffice_project/3a87456aaa6a95c63eea1c1b3201acedf0751bd52012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   607
+   501
501
-   32757
-   15162
+   36846
+   24493
true
true

 
  view2
- 3676
- 3471
+ 3709
+ 3475
  501
- 607
- 33256
- 15767
+ 501
+ 37345
+ 24993
  0
  0
  false
@@ -82,7 +82,7 @@
false
0

-   2340509
+   2396569
false

true
@@ -301,55 +301,55 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
-  
-  
-   
+   
   
   

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
+  
+  
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -358,19 +358,19 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -379,24 +379,24 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -1005,14 +1005,13 @@

   
  Credits
-991 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2014-12-10 04:45:44.
+1007 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2015-01-08 12:37:24.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
  
  
- 
- 
+ 
  
   
Ruediger 
TimmCommits: 82464Joined: 
2000-10-10
@@ -1032,38 +1031,38 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   CaolÃ¡n 
McNamaraCommits: 16038Joined: 
2000-10-10
+   CaolÃ¡n 
McNamaraCommits: 16225Joined: 
2000-10-10
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
   
   
-   Stephan 
BergmannCommits: 7648Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 7898Joined: 
2000-10-04
   
  
  
   
-   Tor 
Lillqvist

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

2015-01-08 Thread Michael Stahl

 sc/source/filter/xml/xmlimprt.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 4680eba921cccefc05587a42e8c7348cc95750a1
Author: Michael Stahl 
Date:   Thu Jan 8 13:07:41 2015 +0100

sc: ODF import of data pilot:

Revert part of 8e417a8fed528034e946bd25e66ce346c1b5384d that
looks unnecessary:

this is used in ScXMLDataPilotMembersContext::CreateChildContext() which
is below table:data-pilot-level which actually uses the
data-pilot-member element, whereas the data-pilot-group element occurs
below table:data-pilot-groups.

Change-Id: I7a3183bd3dbfa98b3bdf5e581b700910025af965

diff --git a/sc/source/filter/xml/xmlimprt.cxx 
b/sc/source/filter/xml/xmlimprt.cxx
index 7097819..4b6f92b 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -1784,7 +1784,6 @@ const SvXMLTokenMap& 
ScXMLImport::GetDataPilotMembersElemTokenMap()
 static const SvXMLTokenMapEntry aDataPilotMembersElemTokenMap[] =
 {
 { XML_NAMESPACE_TABLE, XML_DATA_PILOT_MEMBER,   
XML_TOK_DATA_PILOT_MEMBERS_ELEM_DATA_PILOT_MEMBER   },
-{ XML_NAMESPACE_TABLE, XML_DATA_PILOT_GROUP_MEMBER,   
XML_TOK_DATA_PILOT_MEMBERS_ELEM_DATA_PILOT_MEMBER   },
 XML_TOKEN_MAP_END
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/vclref' - 2 commits - compilerplugins/clang include/vcl vcl/source

2015-01-08 Thread Noel Grandin

 compilerplugins/clang/vclwidgets.cxx |  106 ---
 include/vcl/combobox.hxx |1 
 include/vcl/dialog.hxx   |1 
 include/vcl/layout.hxx   |2 
 vcl/source/control/combobox.cxx  |6 +
 vcl/source/window/dialog.cxx |7 ++
 vcl/source/window/layout.cxx |6 +
 7 files changed, 108 insertions(+), 21 deletions(-)

New commits:
commit 398470ef5de2d88147ce3226890cee9809e4bb82
Author: Noel Grandin 
Date:   Thu Jan 8 14:09:13 2015 +0200

compilerplugin: check that necessary Window subclasses have a dispose method

i.e. the ones that declare any VclPtr fields

Change-Id: I7adfc3b3b190a2ede60bfccd08f85a269fae33ca

diff --git a/compilerplugins/clang/vclwidgets.cxx 
b/compilerplugins/clang/vclwidgets.cxx
index aa2af7f..896cd3f 100644
--- a/compilerplugins/clang/vclwidgets.cxx
+++ b/compilerplugins/clang/vclwidgets.cxx
@@ -31,6 +31,8 @@ public:
 
 virtual void run() override { 
TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); }
 
+bool VisitCXXRecordDecl(const CXXRecordDecl * decl);
+
 bool VisitFieldDecl(const FieldDecl * decl);
 
 bool VisitParmVarDecl(ParmVarDecl const * decl);
@@ -76,6 +78,44 @@ bool isPointerToWindowSubclass(const QualType& pType) {
 return isDerivedFromWindow(recordDecl);
 }
 
+bool VCLWidgets::VisitCXXRecordDecl(const CXXRecordDecl * recordDecl) {
+if (ignoreLocation(recordDecl)) {
+return true;
+}
+if (!recordDecl->isCompleteDefinition())
+return true;
+// check if this field is derived from Window
+if (!isDerivedFromWindow(recordDecl)) {
+return true;
+}
+bool foundVclPtr = false;
+for(auto fieldDecl : recordDecl->fields()) {
+if (fieldDecl->getType().getAsString().find("VclPtr")==0) {
+   foundVclPtr = true;
+   break;
+}
+}
+if (!foundVclPtr) {
+return true;
+}
+bool foundDispose = false;
+for(auto methodDecl : recordDecl->methods()) {
+if (methodDecl->isInstance() && methodDecl->param_size()==0 && 
methodDecl->getNameAsString() == "dispose") {
+   foundDispose = true;
+   break;
+}
+}
+if (!foundDispose) {
+report(
+DiagnosticsEngine::Warning,
+"vcl::Window subclass with VclPtr members should declare a 
dispose() method.",
+recordDecl->getLocation())
+  << recordDecl->getSourceRange();
+}
+return true;
+}
+
+
 bool VCLWidgets::VisitFieldDecl(const FieldDecl * fieldDecl) {
 if (ignoreLocation(fieldDecl)) {
 return true;
diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx
index 99db232..62f0326 100644
--- a/include/vcl/combobox.hxx
+++ b/include/vcl/combobox.hxx
@@ -91,6 +91,7 @@ protected:
 boolIsDropDownBox() const { return mpFloatWin ? true : false; }
 
 virtual voidFillLayoutData() const SAL_OVERRIDE;
+virtual voiddispose() SAL_OVERRIDE;
 public:
 explicitComboBox( vcl::Window* pParent, WinBits nStyle = 0 );
 explicitComboBox( vcl::Window* pParent, const ResId& );
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index 832c239..cf1c6ff 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -63,6 +63,7 @@ private:
 protected:
 using Window::ImplInit;
 SAL_DLLPRIVATE voidImplInit( vcl::Window* pParent, WinBits nStyle );
+virtualvoiddispose() SAL_OVERRIDE;
 
 public:
 SAL_DLLPRIVATE boolIsInClose() const { return mbInClose; }
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 7df6fe0..8f57140 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -620,6 +620,8 @@ private:
 };
 
 VclPtr m_aEventBoxHelper;
+protected:
+virtual void dispose() SAL_OVERRIDE;
 public:
 VclEventBox(vcl::Window* pParent)
 : VclBin(pParent)
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index bba84b6..39a3164 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -78,6 +78,12 @@ ComboBox::~ComboBox()
 delete mpBtn;
 }
 
+void ComboBox::dispose()
+{
+mpSubEdit.disposeAndClear();
+Edit::dispose();
+}
+
 void ComboBox::ImplInitComboBoxData()
 {
 mpSubEdit.disposeAndClear();
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 6375621..4526f8a 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -545,6 +545,13 @@ Dialog::~Dialog()
 mpDialogImpl = NULL;
 }
 
+void Dialog::dispose()
+{
+mpActionArea.disposeAndClear();
+mpContentArea.disposeAndClear();
+SystemWindow::dispose();
+}
+
 IMPL_LINK_NOARG(Dialog, ImplAsyncCloseHdl)
 {
 Close();
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 64688e5..85694cb 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1878

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

2015-01-08 Thread Julien Nabet

 cui/source/tabpages/autocdlg.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4d782fe3ba2f40804cad202d88ea64fde1396032
Author: Julien Nabet 
Date:   Mon Dec 22 23:57:50 2014 +0100

Resolves fdo#87581: Pb to delete words with 2 initials in Autocorr Except

Cherry-picked from a5811c70bb443190a76a52585580659f96a58a04

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

diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 1ac62ea..b8de639 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -1489,7 +1489,7 @@ bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet&  )
 for( i = nCount; i; )
 {
 OUString aString = (*pWrdList)[ --i ];
-if( USHRT_MAX == m_pDoubleCapsLB->GetEntryPos(aString) )
+if( LISTBOX_ENTRY_NOTFOUND == 
m_pDoubleCapsLB->GetEntryPos(aString) )
 {
 pWrdList->erase(i);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-08 Thread Stephan Bergmann

 include/osl/detail/component-defines.h |   25 +
 1 file changed, 25 insertions(+)

New commits:
commit fe6b4cf280dc851e2cc8c1d7023fc3f5b85f6a88
Author: Stephan Bergmann 
Date:   Thu Jan 8 12:37:24 2015 +0100

osl/detail/component-defines.h is used in cppumaker-generated code

see ServiceType::dumpHxxFile and SingletonType::dumpHxxFile in
codemaker/source/cppumaker/cpputype.cxx

partial revert of 45ec1d9b56cec41596f806ebf845ebfcd30c9f46 "brute-force
find-and-remove of unused #define constants."

Change-Id: I3c3d10f2d81926ad0b86330d46b8bf52416bc361

diff --git a/include/osl/detail/component-defines.h 
b/include/osl/detail/component-defines.h
index bb51035..9a31cee 100644
--- a/include/osl/detail/component-defines.h
+++ b/include/osl/detail/component-defines.h
@@ -17,6 +17,31 @@
 
 #define LO_URE_CURRENT_ENV 1 /*TODO*/
 
+// sax/source/expatwrap/expwrap.component
+#define LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_xml_dot_sax_dot_FastParser 1 
/*TODO*/
+#define LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_xml_dot_sax_dot_FastParser 
com_sun_star_comp_extensions_xml_sax_FastParser_get_implementation
+#define LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_xml_dot_sax_dot_Parser 1 
/*TODO*/
+#define LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_xml_dot_sax_dot_Parser 
com_sun_star_comp_extensions_xml_sax_ParserExpat_get_implementation
+// sfx2/util/sfx.component
+#define 
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_document_dot_DocumentProperties 1
+#define 
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_document_dot_DocumentProperties 
SfxDocumentMetaData_get_implementation
+#define LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_frame_dot_OfficeFrameLoader 1
+#define LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_frame_dot_OfficeFrameLoader 
com_sun_star_comp_office_FrameLoader_get_implementation
+#define 
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_frame_dot_SynchronousFrameLoader 1
+#define 
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_frame_dot_SynchronousFrameLoader  
com_sun_star_comp_office_FrameLoader_get_implementation
+#define LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_frame_dot_DocumentTemplates 1
+#define LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_frame_dot_DocumentTemplates 
com_sun_star_comp_sfx2_DocumentTemplates_get_implementation
+#define 
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_frame_dot_GlobalEventBroadcaster 1
+#define 
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_frame_dot_GlobalEventBroadcaster 
com_sun_star_comp_sfx2_GlobalEventBroadcaster_get_implementation
+#define 
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_frame_dot_theGlobalEventBroadcaster 1
+#define 
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_frame_dot_theGlobalEventBroadcaster 
com_sun_star_comp_sfx2_GlobalEventBroadcaster_get_implementation
+// svtools/util/svt_dot_component
+#define LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_graphic_dot_GraphicProvider 1
+#define LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_graphic_dot_GraphicProvider 
com_sun_star_comp_graphic_GraphicProvider_get_implementation
+// svx/util/svx_dot_component
+#define LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_drawing_dot_CustomShapeEngine 
1
+#define LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_drawing_dot_CustomShapeEngine 
com_sun_star_drawing_EnhancedCustomShapeEngine_get_implementation
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-08 Thread Stephan Bergmann

 include/osl/process.h   |   17 --
 sal/osl/all/compat.cxx  |   11 
 sal/osl/unx/process.cxx |   17 --
 sal/osl/w32/process.cxx |  128 
 4 files changed, 11 insertions(+), 162 deletions(-)

New commits:
commit 6e6cb0ec83dc1ad1131fb6ef1466e449ffed
Author: Stephan Bergmann 
Date:   Thu Jan 8 12:25:49 2015 +0100

[API CHANGE] remove oslDescriptorType/Flag

...apparently unused since the corresponding code was removed with
2ad023906439164a10e7e2bbd6ae85f0e8958efe "#87132#removed obsolete parameter 
in
executeProcess" in 2001

(detected after 45ec1d9b56cec41596f806ebf845ebfcd30c9f46 "brute-force
find-and-remove of unused #define constants" boldly removed the 
corresponding
osl_Process_DF* defines from osl/process.h)

Change-Id: I49c20aec9b4acb08d42bfa0371ee1149d6c4e9d4

diff --git a/include/osl/process.h b/include/osl/process.h
index 96be678..068ef0c 100644
--- a/include/osl/process.h
+++ b/include/osl/process.h
@@ -69,16 +69,6 @@ typedef enum {
 osl_Process_E_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
 } oslProcessError;
 
-typedef enum {
-osl_Process_TypeNone,   /* no descriptor */
-osl_Process_TypeSocket, /* socket */
-osl_Process_TypeFile,   /* file   */
-osl_Process_TypePipe,   /* pipe   */
-osl_Process_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
-} oslDescriptorType;
-
-typedef sal_Int32 oslDescriptorFlag;
-
 #ifdef SAL_W32
 #   pragma pack(push, 8)
 #endif
commit 393132ca73f2deead95c000ea7381727a25731e2
Author: Stephan Bergmann 
Date:   Thu Jan 8 12:21:16 2015 +0100

[API CHANGE] Remove osl_send/receiveResourcePipe

...they had not been documented in osl/process.h and the sal/osl/unx
implementation had been stubbed out since
7b37265b8e1afe480a6bbd271bf48fa1cbb44d55 "sal: remove unx implementation of
osl_sendResourcePipe/osl_receiveResourcePipe" in 2012

Change-Id: Ia3ae853d95b6f3b2d2743f06755ef8f6246501d8

diff --git a/include/osl/process.h b/include/osl/process.h
index 4f334b0..96be678 100644
--- a/include/osl/process.h
+++ b/include/osl/process.h
@@ -433,13 +433,6 @@ SAL_DLLPUBLIC oslProcessError SAL_CALL 
osl_getProcessLocale(
 SAL_DLLPUBLIC oslProcessError SAL_CALL osl_setProcessLocale(
 rtl_Locale * pLocale );
 
-
-SAL_DLLPUBLIC sal_Bool SAL_CALL osl_sendResourcePipe(
-oslPipe Pipe, oslSocket Socket );
-
-SAL_DLLPUBLIC oslSocket SAL_CALL osl_receiveResourcePipe(
-oslPipe Pipe );
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/sal/osl/all/compat.cxx b/sal/osl/all/compat.cxx
index 3f072a1..592ac90 100644
--- a/sal/osl/all/compat.cxx
+++ b/sal/osl/all/compat.cxx
@@ -12,6 +12,8 @@
 #include 
 
 #include "osl/module.h"
+#include "osl/pipe.h"
+#include "osl/socket.h"
 #include "osl/time.h"
 #include "sal/types.h"
 
@@ -49,6 +51,10 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL 
osl_getEthernetAddress(sal_uInt8 *) {
 for (;;) { std::abort(); } // avoid "must return a value" warnings
 }
 
+SAL_DLLPUBLIC_EXPORT oslSocket SAL_CALL osl_receiveResourcePipe(oslPipe) {
+for (;;) { std::abort(); } // avoid "must return a value" warnings
+}
+
 SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL osl_releaseSemaphore(void *) {
 for (;;) { std::abort(); } // avoid "must return a value" warnings
 }
@@ -59,6 +65,11 @@ SAL_DLLPUBLIC_EXPORT sal_Int32 SAL_CALL osl_reportError(
 for (;;) { std::abort(); } // avoid "must return a value" warnings
 }
 
+SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL osl_sendResourcePipe(oslPipe, oslSocket)
+{
+for (;;) { std::abort(); } // avoid "must return a value" warnings
+}
+
 namespace {
 typedef void (SAL_CALL * pfunc_osl_printDebugMessage)(char const *);
 }
diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx
index 8030664..ea60b2b 100644
--- a/sal/osl/unx/process.cxx
+++ b/sal/osl/unx/process.cxx
@@ -110,23 +110,6 @@ oslProcessError SAL_CALL osl_psz_executeProcess(sal_Char 
*pszImageName,
 
 /**
  *
- *  New io resource transfer functions
- *
- */
-
-sal_Bool osl_sendResourcePipe(oslPipe /*pPipe*/, oslSocket /*pSocket*/)
-{
-return osl_Process_E_InvalidError;
-}
-
-oslSocket osl_receiveResourcePipe(oslPipe /*pPipe*/)
-{
-oslSocket pSocket = 0;
-return pSocket;
-}
-
-/**
- *
  *  Functions for starting a process
  *
  */
diff --git a/sal/osl/w32/process.cxx b/sal/osl/w32/process.cxx
index 087ee2e..23001f9 100644
--- a/sal/osl/w32/process.cxx
+++ b/sal/osl/w32/process.cxx
@@ -506,132 +506,4 @@ oslProcessError SAL_CALL osl_setProcessLocale( rtl_Locale 
* pLocale )
 return osl_Process_E_None;
 }
 
-/
- * Portal send/

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

2015-01-08 Thread Caolán McNamara

 vcl/source/gdi/dibtools.cxx |   23 ++-
 1 file changed, 14 insertions(+), 9 deletions(-)

New commits:
commit 350824178333b58948dbc3826ad759f10b0f026e
Author: CaolÃ¡n McNamara 
Date:   Thu Jan 8 10:33:51 2015 +

valgrind, zero out the trailing unused alignment bytes

as seen with fdo55736-1.docx

Change-Id: Ie1dec06282a600e600f606a3b4ddd814613b0108

diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index d226edc..3f940af 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -1102,17 +1102,18 @@ bool ImplWriteDIBBits(SvStream& rOStm, 
BitmapReadAccess& rAcc, BitmapReadAccess*
 const long nWidth(rAcc.Width());
 const long nHeight(rAcc.Height());
 boost::scoped_array pBuf(new sal_uInt8[ nAlignedWidth 
]);
-sal_uInt8* pTmp(0);
-sal_uInt8 cTmp(0);
-
 switch( nBitCount )
 {
 case( 1 ):
 {
+//valgrind, zero out the trailing unused alignment bytes
+size_t nUnusedBytes = nAlignedWidth - ((nWidth+7) / 8);
+memset(pBuf.get() + nAlignedWidth - nUnusedBytes, 0, 
nUnusedBytes);
+
 for( long nY = nHeight - 1; nY >= 0L; nY-- )
 {
-pTmp = pBuf.get();
-cTmp = 0;
+sal_uInt8* pTmp = pBuf.get();
+sal_uInt8 cTmp = 0;
 
 for( long nX = 0L, nShift = 8L; nX < nWidth; nX++ )
 {
@@ -1134,10 +1135,14 @@ bool ImplWriteDIBBits(SvStream& rOStm, 
BitmapReadAccess& rAcc, BitmapReadAccess*
 
 case( 4 ):
 {
+//valgrind, zero out the trailing unused alignment bytes
+size_t nUnusedBytes = nAlignedWidth - ((nWidth+1) / 2);
+memset(pBuf.get() + nAlignedWidth - nUnusedBytes, 0, 
nUnusedBytes);
+
 for( long nY = nHeight - 1; nY >= 0L; nY-- )
 {
-pTmp = pBuf.get();
-cTmp = 0;
+sal_uInt8* pTmp = pBuf.get();
+sal_uInt8 cTmp = 0;
 
 for( long nX = 0L, nShift = 2L; nX < nWidth; nX++ )
 {
@@ -1160,7 +1165,7 @@ bool ImplWriteDIBBits(SvStream& rOStm, BitmapReadAccess& 
rAcc, BitmapReadAccess*
 {
 for( long nY = nHeight - 1; nY >= 0L; nY-- )
 {
-pTmp = pBuf.get();
+sal_uInt8* pTmp = pBuf.get();
 
 for( long nX = 0L; nX < nWidth; nX++ )
 *pTmp++ = rAcc.GetPixelIndex( nY, nX );
@@ -1180,7 +1185,7 @@ bool ImplWriteDIBBits(SvStream& rOStm, BitmapReadAccess& 
rAcc, BitmapReadAccess*
 
 for( long nY = nHeight - 1; nY >= 0L; nY-- )
 {
-pTmp = pBuf.get();
+sal_uInt8* pTmp = pBuf.get();
 
 for( long nX = 0L; nX < nWidth; nX++ )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 88138] ICU libs should be checked using pkg-config/.pc instead of icu-config

2015-01-08 Thread bugzilla-daemon

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

David Tardon  changed:

   What|Removed |Added

 CC||libreoffice@lists.freedeskt
   ||op.org

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

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

2015-01-08 Thread Christian Lohmaier

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

New commits:
commit b7b6cda56dc1c2c6332949477cada401db33e5a4
Author: Christian Lohmaier 
Date:   Thu Jan 8 02:10:17 2015 +0100

Updated core
Project: translations  2ef79455b8f8a5a8bc2161117261814887197242

diff --git a/translations b/translations
index 2c8c16b..2ef7945 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 2c8c16bfaa482fdf9b8776f4763e19bf417aa54a
+Subproject commit 2ef79455b8f8a5a8bc2161117261814887197242
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: CppunitTest_sw_ooxmlsdrexport: division by zero in chart2/source/controller/chartapiwrapper/LegendWrapper.cxx

2015-01-08 Thread Stephan Bergmann


On 01/08/2015 09:45 AM, Stephan Bergmann wrote:

Running CppunitTest_sw_ooxmlsdrexport with
-fsanitize=float-divide-by-zero fails with

[...]

ensuing IRC conversation:


 vmiklos, maybe you have some idea about the
 "CppunitTest_sw_ooxmlsdrexport: division by zero in
 chart2/source/controller/chartapiwrapper/LegendWrapper.cxx" mail I just sent to
 the list?
 sberg: i'm not entirely sure what is the proper level to fix it; i
 know that at various places we do "if height is 0, let it 1", and doing the
 same at the lowest level (chart2) would solve the problem; but there might be
 a better fix.
 vmiklos, would that height=width=100 special case be relevant in this
 scenario, or is it a red herring?
 sberg: i think the height=width=100 case is for ole objects embedded
 as an icon, which is not relevant for this bugdoc. but even if that happens,
 that should be handled, i guess LegendWrapper::setPosition() can be invoked by
 a user basic macro as well, so not dividing by 0 for any user input there is
 necessary.
 vmiklos, in LegendWrapper::setPosition() it's not the (user-controlled)
 position that caused div by zero, but the model's page size;  anyway, will see
 to hack-fix it at the SvxOle2Shape::createObject level then, maybe not calling
 xObj->setVisualAreaSize if GetLogicRect returns an empty rect and see how that
 works out
 sberg: ah, i see. yes, i would just work it around in the lower level,
 then ask moggi if he thinks there is a more proper way. i don't have too much
 clue about chart2, either.
 vmiklos: sberg: I have no idea, I would have some if it would be odf
 import but I have no idea how docx import handles chart init (there are quite
 a few corner cases that you can only hit in the import code)
 moggi: it's the same as chart-in-xlsx, OOXML handling for charts is
 all in oox, so i guess it's not specific to Writer/docx
 vmiklos: at least the second backtrace in sberg's mail is writer
 specific
 moggi: hmm, writerfilter just sends all SAX events of the shape to
 oox, and then at the end it calls oox::shape::ShapeContextHandler::getShape()
 to get the shape. so it doesn't know too much if the resulting shape will be a
 chart or a ellipse or something else.
 moggi: of the resulting*
 vmiklos: the ChartModel::setVisualArea that sets the 0 size is from
 parsing the document.xml file and not the chart file, the containing
 application is responsible for the size of the shape and not the chart stream
 moggi: aha, indeed. writerfilter first imports the chart, and once it
 has an uno reference to the chart, it sets the size -- is that unexpected?
 vmiklos: let me check what calc is doing
 vmiklos: I checked and at least in calc we call setVisualAreaSize only
 with non zero values, in some places we have some code to set a default size if
 we requested a zero sized chart
 vmiklos: e.g. fuins2.cxx:338
 moggi: so you first create the chart uno object, set its size, and
 only then do the real import?
 vmiklos: yes
 moggi: OK, thanks
 vmiklos: I think one problem if you go the other way is that some
 positions/sizes might not be correct if the chart size is not correct
 e.g. places where we need to convert from relative to absolute
 positioning
 i see.
 and in calc the whole spreadsheet data needs to be imported as otherwise
 we might switch from calc data provider to internal data provider


worked around for now with 
 
"HACK to avoid empty page size/div by 0 in chart2 
LegendWrapper::setPosition"


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

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

2015-01-08 Thread Stephan Bergmann

 svx/source/unodraw/unoshap4.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8eb880a04d17c888c2c986426e935e02ae309e7a
Author: Stephan Bergmann 
Date:   Thu Jan 8 11:55:20 2015 +0100

HACK to avoid empty page size/div by 0 in chart2 LegendWrapper::setPosition

see thread starting at

"CppunitTest_sw_ooxmlsdrexport: division by zero in
chart2/source/controller/chartapiwrapper/LegendWrapper.cxx"

Change-Id: If8fde31dff04d9a223687838df6dd9fe4e57ee8b

diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index 0054afc..75f8846 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -429,7 +429,7 @@ bool SvxOle2Shape::createObject( const SvGlobalName 
&aClassName )
 {}
 pOle2Obj->SetLogicRect( aRect );
 }
-else
+else if (!aRect.IsEmpty()) //HACK: can aRect legally be empty?
 {
 awt::Size aSz;
 Size aSize = aRect.GetSize();
commit 51d004b1d761193aa092a7532748935970e82ec8
Author: Stephan Bergmann 
Date:   Thu Jan 8 10:04:00 2015 +0100

Re-use aRect

Change-Id: Ic63daa16e6931dd7842faae0d3c83ae0fdeb132f

diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index 111883e..0054afc 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -432,7 +432,7 @@ bool SvxOle2Shape::createObject( const SvGlobalName 
&aClassName )
 else
 {
 awt::Size aSz;
-Size aSize = pOle2Obj->GetLogicRect().GetSize();
+Size aSize = aRect.GetSize();
 aSz.Width = aSize.Width();
 aSz.Height = aSize.Height();
 xObj->setVisualAreaSize(  pOle2Obj->GetAspect(), aSz );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-08 Thread Tor Lillqvist

 compilerplugins/clang/compat.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5d17e1ec8540d966092d459f53fd2074b6a3a3f4
Author: Tor Lillqvist 
Date:   Thu Jan 8 12:37:05 2015 +0200

Fix typo

Change-Id: Ifdbcbcc51c29dc14b2a3b4c845481b45300313d6

diff --git a/compilerplugins/clang/compat.hxx b/compilerplugins/clang/compat.hxx
index 44452bd..66963db 100644
--- a/compilerplugins/clang/compat.hxx
+++ b/compilerplugins/clang/compat.hxx
@@ -60,7 +60,7 @@ inline bool isInExternCContext(clang::FunctionDecl const & 
decl) {
 #if (__clang_major__ == 3 && __clang_minor__ >= 4) || __clang_major__ > 3
 return decl.isInExternCContext();
 #else
-return isExternalCContext(*decl.getCanonicalDecl()->getDeclContext());
+return isExternCContext(*decl.getCanonicalDecl()->getDeclContext());
 #endif
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-08 Thread David Ostrovsky

 RepositoryExternal.mk |   12 ++--
 external/coinmp/ExternalPackage_coinmp.mk |5 -
 external/coinmp/ExternalProject_coinmp.mk |2 +-
 external/coinmp/windows.build.patch.1 |   16 
 4 files changed, 31 insertions(+), 4 deletions(-)

New commits:
commit 152e2a2eb7ccd63900d8cfbd8ada47fa75891cbb
Author: David Ostrovsky 
Date:   Sun Nov 30 18:26:01 2014 +0100

coinmp: Don't hard code Win32 platform on Windows

Change-Id: I39eafa22b12e62c766a182c2ebc2b115084f4cef
Reviewed-on: https://gerrit.libreoffice.org/13231
Reviewed-by: David Ostrovsky 
Tested-by: David Ostrovsky 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 06088c8..5799da2 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -27,6 +27,14 @@
 # in the system case, no libraries should be registered, but the target-local
 # variable LIBS should be set to FOO_LIBS, and INCLUDES to FOO_CFLAGS.
 
+
+ifeq ($(CPUNAME),X86_64)
+wnt_arch_subdir_optional=x64/
+wnt_arch_subdir_mandatory=x64
+else ifeq ($(CPUNAME),INTEL)
+wnt_arch_subdir_mandatory=Win32
+endif
+
 # External headers
 
 ifneq ($(SYSTEM_MESA_HEADERS),)
@@ -262,7 +270,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 
 ifeq ($(COM),MSC)
 $(call gb_LinkTarget_add_libs,$(1),\
-   $(call gb_UnpackedTarball_get_dir,glew)/lib/$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug/Win32/glew32d.lib,Release/Win32/glew32.lib) \
+   $(call gb_UnpackedTarball_get_dir,glew)/lib/$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug/$(wnt_arch_subdir_mandatory)/glew32d.lib,Release/$(wnt_arch_subdir_mandatory)/glew32.lib)
 \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
@@ -2320,7 +2328,7 @@ define gb_LinkTarget__use_coinmp
 $(call gb_LinkTarget_use_package,$(1),coinmp)
 ifeq ($(COM),MSC)
 $(call gb_LinkTarget_add_libs,$(1),\
-   $(call gb_UnpackedTarball_get_dir,coinmp)/CoinMP/MSVisualStudio/v9/$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release)/CoinMP.lib \
+   $(call 
gb_UnpackedTarball_get_dir,coinmp)/CoinMP/MSVisualStudio/v9/$(wnt_arch_subdir_optional)$(if
 $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)/CoinMP.lib \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
diff --git a/external/coinmp/ExternalPackage_coinmp.mk 
b/external/coinmp/ExternalPackage_coinmp.mk
index 694a886..23fbb10 100644
--- a/external/coinmp/ExternalPackage_coinmp.mk
+++ b/external/coinmp/ExternalPackage_coinmp.mk
@@ -12,7 +12,10 @@ $(eval $(call 
gb_ExternalPackage_ExternalPackage,coinmp,coinmp))
 $(eval $(call gb_ExternalPackage_use_external_project,coinmp,coinmp))
 
 ifeq ($(OS),WNT)
-$(eval $(call 
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/CoinMP.dll,CoinMP/MSVisualStudio/v9/$(if
 $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)/CoinMP.dll))
+ifeq ($(CPUNAME),X86_64)
+coinmp_arch_subdir=x64/
+endif
+$(eval $(call 
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/CoinMP.dll,CoinMP/MSVisualStudio/v9/$(coinmp_arch_subdir)$(if
 $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)/CoinMP.dll))
 else ifneq ($(DISABLE_DYNLOADING),)
 # Just use the static archives from workdir. See bin/lo-all-static-libs
 else ifeq ($(OS),MACOSX)
diff --git a/external/coinmp/ExternalProject_coinmp.mk 
b/external/coinmp/ExternalProject_coinmp.mk
index c140d0e..4a7122d 100644
--- a/external/coinmp/ExternalProject_coinmp.mk
+++ b/external/coinmp/ExternalProject_coinmp.mk
@@ -18,7 +18,7 @@ $(call gb_ExternalProject_get_state_target,coinmp,build) :
$(call gb_ExternalProject_run,build,\
MSBuild.exe CoinMP.sln /t:Build \
/p:Configuration=$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
-   /p:Platform=Win32 \
+   /p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if 
$(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \
$(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 
/p:VisualStudioVersion=12.0 /ToolsVersion:12.0) \
,CoinMP/MSVisualStudio/v9)
diff --git a/external/coinmp/windows.build.patch.1 
b/external/coinmp/windows.build.patch.1
index 560f9ba..e2e292e 100644
--- a/external/coinmp/windows.build.patch.1
+++ b/external/coinmp/windows.build.patch.1
@@ -2150,6 +2150,22 @@ diff -urN coinmp.org/CoinMP/MSVisualStudio/v9/CoinMP.sln 
coinmp/CoinMP/MSVisualS
  EndProject
  Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
+@@ -121,6 +123,7 @@
+   {175F0674-F0B9-479C-9C9D-76969C06D794}.Debug|Win32.ActiveCfg = 
Debug|Win32
+   {175F0674-F0B9-479C-9C9D-76969C06D794}.Debug|Win32.Build.0 = 
Debug|Win32
+   {175F0674-F0B9-479C-9C9D-76969C06D794}.Debug|x64.ActiveCfg = 
Debug|x64
++  {175F0674-F0B9-479C-9C9D-76969C06D794}.Debug|x64.Build.0 = 
Debug|x64
+   {175F0674-F0B9-479C-9C9D-76969C06D794}.Release|Any 
CPU.ActiveCfg = Release|Win32
+   {175F0674-F0B9-479C-9C9D-76969C06D794}.Rele

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

2015-01-08 Thread David Ostrovsky

 sw/qa/extras/htmlexport/htmlexport.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1b5b918626c4210d1472db17a080460e7ca3d7c9
Author: David Ostrovsky 
Date:   Fri Dec 26 14:10:12 2014 +0100

Disable html tests on x86_64 on windows

Change-Id: Idae98f65bd87d08c62b27c5c604e4d98fcacbe1e
Reviewed-on: https://gerrit.libreoffice.org/13660
Reviewed-by: David Ostrovsky 
Tested-by: David Ostrovsky 

diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx 
b/sw/qa/extras/htmlexport/htmlexport.cxx
index d8c673c..e83c807 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -203,7 +203,7 @@ DECLARE_HTMLEXPORT_TEST(testExportImageProperties, 
"HTMLImage.odt")
 //
 // It would make sense to switch to use CSS and use "real world" units 
instead
 // i.e. (style="margin: 0cm 1.5cm; width: 1cm; height: 1cm")
-#ifndef MACOSX
+#if !defined(MACOSX) && !defined(_WIN64)
 assertXPath(pDoc, "/html/body/p/a/font/img", "hspace", "38");
 assertXPath(pDoc, "/html/body/p/a/font/img", "vspace", "19");
 assertXPath(pDoc, "/html/body/p/a/font/img", "width", "222");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Build breaks under Windows

2015-01-08 Thread Juergen Funk Mailinglist

Hi all,

i see in Jenkins and in my Build 4.5 master following errors

[build UPK] graphite2-1.2.4.tgz
C:/cygwin/home/tdf/lode/jenkins/workspace/lo_gerrit_master/Gerrit/Gerrit/Platform/Windows/sal/systools/win32/uwinapi/legacy.c
 : fatal error C1041: cannot open program database 
'c:cygwinhometdflodejenkinsworkspacelo_gerrit_mastergerritgerritplatformwindowsworkdirlinktargetlibraryuwinapi.dll.objects.pdb';
 if multiple CL.EXE write to the same .PDB file, please use /FS
C:/cygwin/home/tdf/lode/jenkins/workspace/lo_gerrit_master/Gerrit/Gerrit/Platform/Windows/sal/systools/win32/uwinapi/snprintf.c
 : fatal error C1041: cannot open program database 
'c:cygwinhometdflodejenkinsworkspacelo_gerrit_mastergerritgerritplatformwindowsworkdirlinktargetlibraryuwinapi.dll.objects.pdb';
 if multiple CL.EXE write to the same .PDB file, please use /FS
C:/cygwin/home/tdf/lode/jenkins/workspace/lo_gerrit_master/Gerrit/Gerrit/Platform/Windows/solenv/gbuild/LinkTarget.mk:138:
 recipe for target 
'C:/cygwin/home/tdf/lode/jenkins/workspace/lo_gerrit_master/Gerrit/Gerrit/Platform/Windows/workdir/CObject/sal/systools/win32/uwinapi/snprintf.o'
 failed
make[2]: accessibility aclocal.m4 android animations apple_remote autogen.sh 
autom4te.cache avmedia basctl basebmp basegfx basic bean bin binaryurp bridges 
build.log canvas chart2


Yesterday at 12:00 the build was stop on the unit-test 
(http://lists.freedesktop.org/archives/libreoffice/2015-January/065687.html), 
but after 15:00 I get this errors

Under Linux build is always okay.


My autogen.input is

--enable-pch
--disable-ccache
--enable-dbgutil
--with-external-tar=/cygdrive/d/src/lo/externalsrc
--with-ant-home=/cygdrive/d/src/lo/apache-ant-1.9.4
--with-junit=/cygdrive/d/src/lo/junit-4.10.jar
--with-visual-studio=2013
--disable-activex 
--disable-atl
--with-lang=de en-GB



Have everywhere an idea?





Juergen

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

[Libreoffice-commits] core.git: avmedia/Library_avmediavlc.mk avmedia/source configure.ac

2015-01-08 Thread Michael Meeks

 avmedia/Library_avmediavlc.mk |4 
 avmedia/source/vlc/vlcuno.cxx |   15 +++
 configure.ac  |2 +-
 3 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit 8f4044afa2426befb3f86dda21963576dbb19a9f
Author: Michael Meeks 
Date:   Thu Jan 8 10:03:08 2015 +

avmedia: disable VLC unless in experimental model.

The code is really not in an ideal state, the key-frame generation is
horrible - involving playing the video for three seconds each time etc.
While the idea is great - the impl. and libvlc API use needs some love
from a VLC expert really.

Change-Id: If1787749d9952e30c1d80846e925cf1f65231463

diff --git a/avmedia/Library_avmediavlc.mk b/avmedia/Library_avmediavlc.mk
index 12b006c..15363ee 100644
--- a/avmedia/Library_avmediavlc.mk
+++ b/avmedia/Library_avmediavlc.mk
@@ -16,6 +16,10 @@ $(eval $(call gb_Library_set_include,avmediavlc,\
 -I$(SRCDIR)/avmedia/source/inc \
 ))
 
+$(eval $(call gb_Library_use_custom_headers,avmediavlc,\
+   officecfg/registry \
+))
+
 $(eval $(call gb_Library_use_sdk_api,avmediavlc))
 
 $(eval $(call gb_Library_use_externals,avmediavlc,\
diff --git a/avmedia/source/vlc/vlcuno.cxx b/avmedia/source/vlc/vlcuno.cxx
index 312b85a..e82b4a3 100644
--- a/avmedia/source/vlc/vlcuno.cxx
+++ b/avmedia/source/vlc/vlcuno.cxx
@@ -17,6 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
+#include 
+#include 
+
 #include "vlccommon.hxx"
 #include "vlcmanager.hxx"
 
@@ -28,6 +32,12 @@ using namespace ::com::sun::star;
 static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const 
uno::Reference< lang::XMultiServiceFactory >& rxFact )
 {
 SAL_INFO("avmedia", "create VLC Media player !\n");
+
+// Experimental for now - code is neither elegant nor well tested.
+uno::Reference< uno::XComponentContext > xContext = 
comphelper::getProcessComponentContext();
+if (!xContext.is() || 
!officecfg::Office::Common::Misc::ExperimentalMode::get(xContext))
+return NULL;
+
 static uno::Reference< uno::XInterface > manager( *new 
::avmedia::vlc::Manager( rxFact ) );
 return manager;
 }
@@ -37,6 +47,11 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL 
avmediavlc_component_getFactory(
 uno::Reference< lang::XSingleServiceFactory > xFactory;
 void*   pRet = 0;
 
+// Experimental for now - code is neither elegant nor well tested.
+uno::Reference< uno::XComponentContext > xContext = 
comphelper::getProcessComponentContext();
+if (!xContext.is() || 
!officecfg::Office::Common::Misc::ExperimentalMode::get(xContext))
+return NULL;
+
 SAL_INFO("avmedia", "Create VLC Media component: '" << pImplName << "'\n");
 if( rtl_str_compare( pImplName, IMPL_NAME ) == 0 )
 {
diff --git a/configure.ac b/configure.ac
index 9ab1ef3..cb12418 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1198,7 +1198,7 @@ AC_ARG_ENABLE(gstreamer-0-10,
 
 AC_ARG_ENABLE(vlc,
 AS_HELP_STRING([--enable-vlc],
-[Enable building with the VLC avmedia backend.]),
+[Enable building with the (experimental) VLC avmedia backend.]),
 ,enable_vlc=no)
 
 AC_ARG_ENABLE(neon,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-08 Thread Stephan Bergmann

 compilerplugins/clang/compat.hxx |8 ++
 compilerplugins/clang/cstylecast.cxx |   42 +--
 2 files changed, 43 insertions(+), 7 deletions(-)

New commits:
commit 44d0e286c8c7a0ddb8e14fb2c3afe5af35311ef7
Author: Stephan Bergmann 
Date:   Thu Jan 8 10:59:24 2015 +0100

loplugin:cstylecast: improve detection of C code

Change-Id: Id5dd1ee1a29c4e1c7cb2b58419d6ccb1f032bffe

diff --git a/compilerplugins/clang/compat.hxx b/compilerplugins/clang/compat.hxx
index e0e3cbb..44452bd 100644
--- a/compilerplugins/clang/compat.hxx
+++ b/compilerplugins/clang/compat.hxx
@@ -56,6 +56,14 @@ inline bool isExternCContext(clang::DeclContext const & 
ctxt) {
 #endif
 }
 
+inline bool isInExternCContext(clang::FunctionDecl const & decl) {
+#if (__clang_major__ == 3 && __clang_minor__ >= 4) || __clang_major__ > 3
+return decl.isInExternCContext();
+#else
+return isExternalCContext(*decl.getCanonicalDecl()->getDeclContext());
+#endif
+}
+
 #if (__clang_major__ == 3 && __clang_minor__ >= 3) || __clang_major__ > 3
 typedef clang::LinkageInfo LinkageInfo;
 #else
diff --git a/compilerplugins/clang/cstylecast.cxx 
b/compilerplugins/clang/cstylecast.cxx
index 5492dc4..53b7d88 100644
--- a/compilerplugins/clang/cstylecast.cxx
+++ b/compilerplugins/clang/cstylecast.cxx
@@ -7,6 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include 
 #include 
 #include "plugin.hxx"
 #include "compat.hxx"
@@ -17,6 +18,10 @@
 
 namespace {
 
+bool hasCLanguageLinkageType(FunctionDecl const * decl) {
+return decl->isExternC() || compat::isInExternCContext(*decl);
+}
+
 QualType resolvePointers(QualType type) {
 while (type->isPointerType()) {
 type = type->getAs()->getPointeeType();
@@ -28,7 +33,9 @@ class CStyleCast:
 public RecursiveASTVisitor, public loplugin::Plugin
 {
 public:
-explicit CStyleCast(InstantiationData const & data): Plugin(data) {}
+explicit CStyleCast(InstantiationData const & data):
+Plugin(data), externCFunction(false)
+{}
 
 virtual void run() override {
 if (compiler.getLangOpts().CPlusPlus) {
@@ -36,7 +43,12 @@ public:
 }
 }
 
+bool TraverseFunctionDecl(FunctionDecl * decl);
+
 bool VisitCStyleCastExpr(const CStyleCastExpr * expr);
+
+private:
+bool externCFunction;
 };
 
 static const char * recommendedFix(clang::CastKind ck) {
@@ -48,6 +60,20 @@ static const char * recommendedFix(clang::CastKind ck) {
 }
 }
 
+bool CStyleCast::TraverseFunctionDecl(FunctionDecl * decl) {
+bool ext = hasCLanguageLinkageType(decl)
+&& decl->isThisDeclarationADefinition();
+if (ext) {
+assert(!externCFunction);
+externCFunction = true;
+}
+bool ret = RecursiveASTVisitor::TraverseFunctionDecl(decl);
+if (ext) {
+externCFunction = false;
+}
+return ret;
+}
+
 bool CStyleCast::VisitCStyleCastExpr(const CStyleCastExpr * expr) {
 if (ignoreLocation(expr)) {
 return true;
@@ -89,12 +115,14 @@ bool CStyleCast::VisitCStyleCastExpr(const CStyleCastExpr 
* expr) {
 if( expr->getCastKind() == CK_Dependent ) {
 return true;
 }
-SourceLocation spellingLocation = 
compiler.getSourceManager().getSpellingLoc(
-  expr->getLocStart());
-StringRef filename = 
compiler.getSourceManager().getFilename(spellingLocation);
-// ignore C code
-if ( filename.endswith(".h") ) {
-return true;
+if (externCFunction || expr->getLocStart().isMacroID()) {
+SourceLocation spellingLocation = 
compiler.getSourceManager().getSpellingLoc(
+expr->getLocStart());
+StringRef filename = 
compiler.getSourceManager().getFilename(spellingLocation);
+// ignore C code
+if ( filename.endswith(".h") ) {
+return true;
+}
 }
 report(
 DiagnosticsEngine::Warning,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: jvmfwk/plugins

2015-01-08 Thread Michael Weghorn

 jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx |   24 +---
 1 file changed, 7 insertions(+), 17 deletions(-)

New commits:
commit bb65b09678d4b6da657f6ccc180d8ff5096e3006
Author: Michael Weghorn 
Date:   Mon Dec 15 20:27:00 2014 +0100

avoid copying of vector

Change-Id: I06ce27f4fa52637bbeaa6d84fdecdf81364e15a7
Reviewed-on: https://gerrit.libreoffice.org/13489
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index de1d979..a73a007 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -456,13 +456,13 @@ javaPluginError jfw_plugin_getJavaInfosFromPath(
 vector> vecInfosFromPath;
 addJavaInfosFromPath(infos, vecInfosFromPath);
 
-vector > vecVerifiedInfos;
+vector vecVerifiedInfos;
 
-// copy JREs that meet version requirements to vecVerifiedInfos
+// copy infos of JREs that meet version requirements to vecVerifiedInfos
 typedef vector >::iterator it;
 for (it i= vecInfosFromPath.begin(); i != vecInfosFromPath.end(); ++i)
 {
-const rtl::Reference& cur = *i;
+const rtl::Reference& currentInfo = *i;
 
 typedef std::vector>::const_iterator 
ci_pl;
 for (ci_pl vendorInfo = vecVendorInfos.begin(); vendorInfo != 
vecVendorInfos.end(); ++vendorInfo)
@@ -470,10 +470,10 @@ javaPluginError jfw_plugin_getJavaInfosFromPath(
 const OUString& vendor = vendorInfo->first;
 jfw::VersionInfo versionInfo = vendorInfo->second;
 
-if (vendor.equals(cur->getVendor()))
+if (vendor.equals(currentInfo->getVendor()))
 {
 javaPluginError errorcode = checkJavaVersionRequirements(
-cur,
+currentInfo,
 versionInfo.sMinVersion,
 versionInfo.sMaxVersion,
 versionInfo.getExcludeVersions(),
@@ -481,7 +481,7 @@ javaPluginError jfw_plugin_getJavaInfosFromPath(
 
 if (errorcode == JFW_PLUGIN_E_NONE)
 {
-vecVerifiedInfos.push_back(*i);
+vecVerifiedInfos.push_back(createJavaInfo(currentInfo));
 }
 }
 }
@@ -490,17 +490,7 @@ javaPluginError jfw_plugin_getJavaInfosFromPath(
 if (vecVerifiedInfos.empty())
 return JFW_PLUGIN_E_NO_JRE;
 
-// Now vecVerifiedInfos contains all those JREs which meet the version 
requirements
-// Transfer them into the vector that is passed out.
-vector infosFromPath;
-
-typedef vector >::const_iterator cit;
-for (cit ii = vecVerifiedInfos.begin(); ii != vecVerifiedInfos.end(); ++ii)
-{
-infosFromPath.push_back(createJavaInfo(*ii));
-}
-
-javaInfosFromPath = infosFromPath;
+javaInfosFromPath = vecVerifiedInfos;
 
 return JFW_PLUGIN_E_NONE;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-08 Thread Rimas Kudelis

 dev/null   |binary
 vcl/WinResTarget_vcl.mk|   10 --
 vcl/inc/win/salids.hrc |   12 
 vcl/win/source/src/salsrc.rc   |   12 
 vcl/win/source/window/salframe.cxx |   15 +--
 5 files changed, 9 insertions(+), 40 deletions(-)

New commits:
commit 2abbc6fa577565376910a1b8e5e8931a2202e989
Author: Rimas Kudelis 
Date:   Tue Jan 6 22:42:31 2015 +0200

Windows cursor improvements. Fixes fdo#53148 and fdo#53151.

* Use stock Windows cursors where possible.

Change-Id: Ic5bb308441ad7faf30f6340299653251c99f1cc0
Reviewed-on: https://gerrit.libreoffice.org/13780
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/vcl/WinResTarget_vcl.mk b/vcl/WinResTarget_vcl.mk
index fc20e5b..0416db7 100644
--- a/vcl/WinResTarget_vcl.mk
+++ b/vcl/WinResTarget_vcl.mk
@@ -55,38 +55,30 @@ $(eval $(call gb_WinResTarget_add_dependencies,vcl/salsrc,\
 vcl/win/source/src/tblsels.cur \
 vcl/win/source/src/asne.cur \
 vcl/win/source/src/crook.cur \
-vcl/win/source/src/hand.cur \
 vcl/win/source/src/movept.cur \
 vcl/win/source/src/tblselse.cur \
 vcl/win/source/src/asns.cur \
 vcl/win/source/src/crop.cur \
-vcl/win/source/src/neswsize.cur \
 vcl/win/source/src/tblselsw.cur \
 vcl/win/source/src/asnswe.cur \
-vcl/win/source/src/cross.cur \
 vcl/win/source/src/hshear.cur \
-vcl/win/source/src/notallow.cur \
 vcl/win/source/src/tblselw.cur \
 vcl/win/source/src/asnw.cur \
 vcl/win/source/src/darc.cur \
-vcl/win/source/src/hsize.cur \
 vcl/win/source/src/nullptr.cur \
 vcl/win/source/src/timemove.cur \
 vcl/win/source/src/ass.cur \
 vcl/win/source/src/dbezier.cur \
 vcl/win/source/src/hsizebar.cur \
-vcl/win/source/src/nwsesize.cur \
 vcl/win/source/src/timesize.cur \
 vcl/win/source/src/asse.cur \
 vcl/win/source/src/dcapt.cur \
 vcl/win/source/src/hsplit.cur \
-vcl/win/source/src/pen.cur \
 vcl/win/source/src/vshear.cur \
 vcl/win/source/src/assw.cur \
 vcl/win/source/src/dcirccut.cur \
 vcl/win/source/src/linkdata.cur \
 vcl/win/source/src/pivotcol.cur \
-vcl/win/source/src/vsize.cur \
 vcl/win/source/src/asw.cur \
 vcl/win/source/src/dconnect.cur \
 vcl/win/source/src/linkf.cur \
@@ -104,12 +96,10 @@ $(eval $(call gb_WinResTarget_add_dependencies,vcl/salsrc,\
 vcl/win/source/src/vtext.cur \
 vcl/win/source/src/chainnot.cur \
 vcl/win/source/src/dfree.cur \
-vcl/win/source/src/move.cur \
 vcl/win/source/src/pntbrsh.cur \
 vcl/win/source/src/chart.cur \
 vcl/win/source/src/dline.cur \
 vcl/win/source/src/movebw.cur \
-vcl/win/source/src/refhand.cur \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/inc/win/salids.hrc b/vcl/inc/win/salids.hrc
index a351bba..acc0f43 100644
--- a/vcl/inc/win/salids.hrc
+++ b/vcl/inc/win/salids.hrc
@@ -22,21 +22,10 @@
 
 // Cursor
 #define SAL_RESID_POINTER_NULL  1
-#ifndef WNT
-#define SAL_RESID_POINTER_HSIZE 10002
-#define SAL_RESID_POINTER_VSIZE 10003
-#define SAL_RESID_POINTER_NESWSIZE  10004
-#define SAL_RESID_POINTER_NWSESIZE  10005
-#endif
-#define SAL_RESID_POINTER_CROSS 10006
-#define SAL_RESID_POINTER_MOVE  10007
 #define SAL_RESID_POINTER_HSPLIT10008
 #define SAL_RESID_POINTER_VSPLIT10009
 #define SAL_RESID_POINTER_HSIZEBAR  10010
 #define SAL_RESID_POINTER_VSIZEBAR  10011
-#define SAL_RESID_POINTER_HAND  10012
-#define SAL_RESID_POINTER_REFHAND   10013
-#define SAL_RESID_POINTER_PEN   10014
 #define SAL_RESID_POINTER_MAGNIFY   10015
 #define SAL_RESID_POINTER_FILL  10016
 #define SAL_RESID_POINTER_ROTATE10017
@@ -59,7 +48,6 @@
 #define SAL_RESID_POINTER_COPYFILELINK  10034
 #define SAL_RESID_POINTER_MOVEFILES 10035
 #define SAL_RESID_POINTER_COPYFILES 10036
-#define SAL_RESID_POINTER_NOTALLOWED10037
 #define SAL_RESID_POINTER_DRAW_LINE 10038
 #define SAL_RESID_POINTER_DRAW_RECT 10039
 #define SAL_RESID_POINTER_DRAW_POLYGON  10040
diff --git a/vcl/win/source/src/cross.cur b/vcl/win/source/src/cross.cur
deleted file mode 100644
index 8fd9762..000
Binary files a/vcl/win/source/src/cross.cur and /dev/null differ
diff --git a/vcl/win/source/src/hand.cur b/vcl/win/source/src/hand.cur
deleted file mode 100644
index fc0e53b..000
Binary files a/vcl/win/source/src/hand.cur and /dev/null differ
diff --git a/vcl/win/source/src/hsize.cur b/vcl/win/source/src/hsize.cur
deleted file mode 100644
index 571dd0e..000
Binary files a/vcl/win/source/src/hsize.cur

Re: tubes/source/conference.cxx:251:79: error: 'OSL_ENSURE' was not declared in this scope

2015-01-08 Thread Stephan Bergmann


On 01/07/2015 11:37 AM, Bjoern Michaelsen wrote:

Personal opinion: The double bookkeeping of log areas is bad, and people ignore
it because its a direct violation of DRY. IMHO if that plugin is active, it
should just add the missing log areas. Whoever is caring about consistency in
the log areas then simply needs to look at that file once in a while and tweak
existing log areas into a consistent state. Consistency is not something that
can be achieved by forcing over 200 people to do edits to one file(*), it needs 
to
be maintained by 1-2 people with a good context on what is there and what the
customs are.


Not sure about the double-bookkeeping and DRY-ness arguments.  (For 
amusement, there's even a real, printed book out there, touting itself 
as a guidebook on contemporary C, that recommends using string literals 
instead of enums; you can't make that up.)


Regarding the remainder, my perspective is somewhat more relaxed:  Log 
area inconsistencies become a problem when one wants to filter on them. 
 But at least as long as the logging is only enabled in (developers') 
debug builds, a developer who wants to do filtering and is bitten by 
some inconsistency can just clean up the relevant code.  So as long as 
the proliferation of log areas does not grow too much out of control, I 
think we can happily live with the status quo.

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

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

2015-01-08 Thread Caolán McNamara

 cppu/source/uno/lbmap.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d5c3a25aaec6136dda35e7d9904d9aaa2c015ed9
Author: CaolÃ¡n McNamara 
Date:   Thu Jan 8 09:23:12 2015 +

valgrind: uninitialized variable

Change-Id: I1e166c7e3b58ed565aaf478fa0b6505d1f68b604

diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index 0313022..454653b 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -407,7 +407,7 @@ static Mapping loadExternalMapping(
 #else
 // find proper lib
 osl::Module aModule;
-bool bModule;
+bool bModule(false);
 OUString aName;
 
 if ( EnvDcp::getTypeName(rFrom.getTypeName()) == UNO_LB_UNO )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ee/8796b44908bc35ca1dd0e367b2f15cc9d80e91

2015-01-08 Thread Caolán McNamara

 ee/8796b44908bc35ca1dd0e367b2f15cc9d80e91 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ba024e7bcbbcbc25fb9deb8829437243da6fc583
Author: CaolÃ¡n McNamara 
Date:   Thu Jan 8 09:17:39 2015 +

Notes added by 'git notes add'

diff --git a/ee/8796b44908bc35ca1dd0e367b2f15cc9d80e91 
b/ee/8796b44908bc35ca1dd0e367b2f15cc9d80e91
new file mode 100644
index 000..36c8872
--- /dev/null
+++ b/ee/8796b44908bc35ca1dd0e367b2f15cc9d80e91
@@ -0,0 +1 @@
+prefer: 8575d575251eae2141d2bbc1bed33a9d52eed352
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - a7/eba49f6f3ae816a03086298a5869c871362660

2015-01-08 Thread Caolán McNamara

 a7/eba49f6f3ae816a03086298a5869c871362660 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 90eb16f8ec25f40406f59e7fe531dd116b54ecf6
Author: CaolÃ¡n McNamara 
Date:   Thu Jan 8 09:17:24 2015 +

Notes added by 'git notes add'

diff --git a/a7/eba49f6f3ae816a03086298a5869c871362660 
b/a7/eba49f6f3ae816a03086298a5869c871362660
new file mode 100644
index 000..36c8872
--- /dev/null
+++ b/a7/eba49f6f3ae816a03086298a5869c871362660
@@ -0,0 +1 @@
+prefer: 8575d575251eae2141d2bbc1bed33a9d52eed352
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 6f/31a5f6f752a9724acd270b0eb806bcb21c2db1

2015-01-08 Thread Caolán McNamara

 6f/31a5f6f752a9724acd270b0eb806bcb21c2db1 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 29974e3db885210072f2da9d0f71232d2a1940e6
Author: CaolÃ¡n McNamara 
Date:   Thu Jan 8 09:16:56 2015 +

Notes added by 'git notes add'

diff --git a/6f/31a5f6f752a9724acd270b0eb806bcb21c2db1 
b/6f/31a5f6f752a9724acd270b0eb806bcb21c2db1
new file mode 100644
index 000..36c8872
--- /dev/null
+++ b/6f/31a5f6f752a9724acd270b0eb806bcb21c2db1
@@ -0,0 +1 @@
+prefer: 8575d575251eae2141d2bbc1bed33a9d52eed352
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: LibreOffice is up and running on windows 64 bit

2015-01-08 Thread Caolán McNamara

On Thu, 2015-01-08 at 01:41 +0100, David Ostrovsky wrote:
> I am pleased to share with you, that with these pending
> Gerrit changes [1] LibreOffice is up and running on
> Windows 64 bit.

That's v. impressive.

C.

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

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

2015-01-08 Thread Caolán McNamara

 cppu/source/uno/lbenv.cxx  |   13 ++---
 cppu/source/uno/lbmap.cxx  |   33 +
 cppu/source/uno/loadmodule.cxx |6 +++---
 cppu/source/uno/loadmodule.hxx |7 +++
 4 files changed, 29 insertions(+), 30 deletions(-)

New commits:
commit 900a2996c47a6fd32abf324db17bf1526894da36
Author: CaolÃ¡n McNamara 
Date:   Wed Jan 7 21:04:04 2015 +

coverity#1261762 Resource leak

still leaks the handle of course, but c++izes the code and hides
the leak from coverity as a side-effect

Change-Id: Ieaab1545a98da1d699df93d020f0cb452ddf2516

diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index e8fa57d..721005d 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -1055,20 +1055,19 @@ static bool loadEnv(OUString const  & cLibStem,
 #else
 // late init with some code from matching uno language binding
 // will be unloaded by environment
-oslModule hMod = cppu::detail::loadModule( cLibStem );
+osl::Module aMod;
+bool bMod = cppu::detail::loadModule(aMod, cLibStem);
 
-if (!hMod)
+if (!bMod)
 return false;
 
 OUString aSymbolName(UNO_INIT_ENVIRONMENT);
-uno_initEnvironmentFunc fpInit = (uno_initEnvironmentFunc)
-::osl_getFunctionSymbol( hMod, aSymbolName.pData );
+uno_initEnvironmentFunc fpInit = 
(uno_initEnvironmentFunc)aMod.getSymbol(aSymbolName);
 
 if (!fpInit)
-{
-::osl_unloadModule( hMod );
 return false;
-}
+
+aMod.release();
 #endif
 
 (*fpInit)( pEnv ); // init of environment
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index a887f89..0313022 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -337,7 +337,7 @@ static uno_ext_getMappingFunc selectMapFunc( const OUString 
& rBridgeName )
 
 #else
 
-static inline oslModule loadModule( const OUString & rBridgeName )
+static inline bool loadModule(osl::Module & rModule, const OUString & 
rBridgeName)
 {
 bool bNeg;
 {
@@ -347,16 +347,16 @@ static inline oslModule loadModule( const OUString & 
rBridgeName )
 bNeg = (iFind != rData.aNegativeLibs.end());
 }
 
-if (! bNeg)
+if (!bNeg)
 {
-oslModule hModule = cppu::detail::loadModule( rBridgeName );
+bool bModule = cppu::detail::loadModule(rModule, rBridgeName);
 
-if (hModule)
-return hModule;
+if (bModule)
+return true;
 
 setNegativeBridge( rBridgeName ); // no load again
 }
-return 0;
+return false;
 }
 
 #endif
@@ -406,22 +406,22 @@ static Mapping loadExternalMapping(
 }
 #else
 // find proper lib
-oslModule hModule = 0;
+osl::Module aModule;
+bool bModule;
 OUString aName;
 
 if ( EnvDcp::getTypeName(rFrom.getTypeName()) == UNO_LB_UNO )
-hModule = loadModule( aName = getBridgeName( rTo, rFrom, 
rAddPurpose ) );
-if (! hModule)
-hModule = loadModule( aName = getBridgeName( rFrom, rTo, 
rAddPurpose ) );
-if (! hModule)
-hModule = loadModule( aName = getBridgeName( rTo, rFrom, 
rAddPurpose ) );
+bModule = loadModule( aModule, aName = getBridgeName( rTo, rFrom, 
rAddPurpose ) );
+if (!bModule)
+bModule = loadModule( aModule, aName = getBridgeName( rFrom, rTo, 
rAddPurpose ) );
+if (!bModule)
+bModule = loadModule( aModule, aName = getBridgeName( rTo, rFrom, 
rAddPurpose ) );
 
-if (hModule)
+if (bModule)
 {
 OUString aSymbolName( UNO_EXT_GETMAPPING );
 uno_ext_getMappingFunc fpGetMapFunc =
-(uno_ext_getMappingFunc)::osl_getFunctionSymbol(
-hModule, aSymbolName.pData );
+(uno_ext_getMappingFunc)aModule.getSymbol( aSymbolName );
 
 if (fpGetMapFunc)
 {
@@ -430,10 +430,11 @@ static Mapping loadExternalMapping(
 OSL_ASSERT( aExt.is() );
 if (aExt.is())
 {
+aModule.release();
 return aExt;
 }
 }
-::osl_unloadModule( hModule );
+aModule.unload();
 setNegativeBridge( aName );
 }
 #endif
diff --git a/cppu/source/uno/loadmodule.cxx b/cppu/source/uno/loadmodule.cxx
index f00936d..1d8ab75 100644
--- a/cppu/source/uno/loadmodule.cxx
+++ b/cppu/source/uno/loadmodule.cxx
@@ -31,16 +31,16 @@ namespace cppu { namespace detail {
 
 #ifndef DISABLE_DYNLOADING
 
-::oslModule loadModule(rtl::OUString const & name) {
+bool loadModule(osl::Module& rModule, rtl::OUString const & name) {
 rtl::OUStringBuffer b;
 #if defined SAL_DLLPREFIX
 b.append(SAL_DLLPREFIX);
 #endif
 b.append(name);
 b.append(SAL_DLLEXTENSION);
-return ::osl_loadModuleRelative(
+return rModule.loadRelative(
 reinterpret_cast< oslGenericFunction >(&load

CppunitTest_sw_ooxmlsdrexport: division by zero in chart2/source/controller/chartapiwrapper/LegendWrapper.cxx

2015-01-08 Thread Stephan Bergmann

Running CppunitTest_sw_ooxmlsdrexport with 
-fsanitize=float-divide-by-zero fails with



/home/sbergman/lo-clang/core/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx:305:56:
 runtime error: division by zero
#0 0x2acf0a3111b5 in 
chart::wrapper::LegendWrapper::setPosition(com::sun::star::awt::Point const&) 
/home/sbergman/lo-clang/core/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx:305:37
#1 0x2acf0a31195e in non-virtual thunk to 
chart::wrapper::LegendWrapper::setPosition(com::sun::star::awt::Point const&) 
/home/sbergman/lo-clang/core/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx:295:30
#2 0x2aceacd8b3eb in 
SchXMLLegendContext::StartElement(com::sun::star::uno::Reference
 const&) 
/home/sbergman/lo-clang/core/xmloff/source/chart/SchXMLLegendContext.cxx:192:9
#3 0x2acead21f7a4 in SvXMLImport::startElement(rtl::OUString const&, 
com::sun::star::uno::Reference const&) 
/home/sbergman/lo-clang/core/xmloff/source/core/xmlimp.cxx:734:5
#4 0x2acead16 in non-virtual thunk to SvXMLImport::startElement(rtl::OUString 
const&, com::sun::star::uno::Reference 
const&) /home/sbergman/lo-clang/core/xmloff/source/core/xmlimp.cxx:634:28
#5 0x2acebfae1fea in (anonymous 
namespace)::SaxExpatParser_Impl::callbackStartElement(void*, char const*, char 
const**) /home/sbergman/lo-clang/core/sax/source/expatwrap/sax_expat.cxx:788:1
#6 0x2acebfac1054 in (anonymous 
namespace)::call_callbackStartElement(void*, char const*, char const**) 
/home/sbergman/lo-clang/core/sax/source/expatwrap/sax_expat.cxx:280:9
#7 0x2acebfc957b6 in doContent 
/home/sbergman/lo-clang/core/workdir/UnpackedTarball/expat/lib/xmlparse.c:2469:11
#8 0x2acebfc7c71e in contentProcessor 
/home/sbergman/lo-clang/core/workdir/UnpackedTarball/expat/lib/xmlparse.c:2105:27
#9 0x2acebfc5f5e6 in doProlog 
/home/sbergman/lo-clang/core/workdir/UnpackedTarball/expat/lib/xmlparse.c:4016:14
#10 0x2acebfc58deb in prologProcessor 
/home/sbergman/lo-clang/core/workdir/UnpackedTarball/expat/lib/xmlparse.c:3739:10
#11 0x2acebfcbc6d5 in prologInitProcessor 
/home/sbergman/lo-clang/core/workdir/UnpackedTarball/expat/lib/xmlparse.c:3556:10
#12 0x2acebfc41fcb in XML_ParseBuffer 
/home/sbergman/lo-clang/core/workdir/UnpackedTarball/expat/lib/xmlparse.c:1651:15
#13 0x2acebfc3dd6e in XML_Parse 
/home/sbergman/lo-clang/core/workdir/UnpackedTarball/expat/lib/xmlparse.c:1617:14
#14 0x2acebfac1a53 in (anonymous namespace)::SaxExpatParser_Impl::parse() 
/home/sbergman/lo-clang/core/sax/source/expatwrap/sax_expat.cxx:718:28
#15 0x2acebfabf150 in (anonymous 
namespace)::SaxExpatParser::parseStream(com::sun::star::xml::sax::InputSource 
const&) /home/sbergman/lo-clang/core/sax/source/expatwrap/sax_expat.cxx:517:9
#16 0x2acebfac0d8e in non-virtual thunk to (anonymous 
namespace)::SaxExpatParser::parseStream(com::sun::star::xml::sax::InputSource 
const&) /home/sbergman/lo-clang/core/sax/source/expatwrap/sax_expat.cxx:445:22
#17 0x2acf11e82d3d in chart::XMLFilter::impl_ImportStream(rtl::OUString const&, rtl::OUString const&, 
com::sun::star::uno::Reference const&, 
com::sun::star::uno::Reference const&, 
com::sun::star::uno::Reference const&, 
com::sun::star::uno::Reference const&, 
com::sun::star::uno::Reference&) 
/home/sbergman/lo-clang/core/chart2/source/model/filter/XMLFilter.cxx:512:17
#18 0x2acf11e7acaf in 
chart::XMLFilter::impl_Import(com::sun::star::uno::Reference
 const&, com::sun::star::uno::Sequence const&) 
/home/sbergman/lo-clang/core/chart2/source/model/filter/XMLFilter.cxx:406:37
#19 0x2acf11e6dafd in 
chart::XMLFilter::filter(com::sun::star::uno::Sequence
 const&) /home/sbergman/lo-clang/core/chart2/source/model/filter/XMLFilter.cxx:238:13
#20 0x2acf11e7c4de in non-virtual thunk to 
chart::XMLFilter::filter(com::sun::star::uno::Sequence
 const&) /home/sbergman/lo-clang/core/chart2/source/model/filter/XMLFilter.cxx:213:30
#21 0x2acf12000440 in 
chart::ChartModel::impl_load(com::sun::star::uno::Sequence
 const&, com::sun::star::uno::Reference const&) 
/home/sbergman/lo-clang/core/chart2/source/model/main/ChartModel_Persistence.cxx:581:9
#22 0x2acf12004941 in 
chart::ChartModel::loadFromStorage(com::sun::star::uno::Reference
 const&, com::sun::star::uno::Sequence const&) 
/home/sbergman/lo-clang/core/chart2/source/model/main/ChartModel_Persistence.cxx:757:5
#23 0x2acf12004a36 in non-virtual thunk to 
chart::ChartModel::loadFromStorage(com::sun::star::uno::Reference
 const&, com::sun::star::uno::Sequence const&) 
/home/sbergman/lo-clang/core/chart2/source/model/main/ChartModel_Persistence.cxx:747:27
#24 0x2acf08f86d0f in OCommonEmbeddedObject::LoadDocumentFromStorage_Impl() 
/home/sbergman/lo-clang/core/embeddedobj/source/commonembedding/persistence.cxx:535:13
#25 0x2acf08f1208f in OCommonEmbeddedObject::SwitchStateTo_Impl(int) 
/home/sbergman/lo-clang/core/embeddedobj/source/commonembedding/embedobj.cxx:181:49
#26 0x2acf08f1d697 in OCo

[Libreoffice-commits] core.git: Branch 'feature/vclref' - 2 commits - compilerplugins/clang include/vcl vcl/source

2015-01-08 Thread Noel Grandin

 compilerplugins/clang/passstuffbyref.cxx |3 ++-
 include/vcl/edit.hxx |2 +-
 include/vcl/layout.hxx   |8 
 vcl/source/control/edit.cxx  |2 +-
 vcl/source/window/layout.cxx |   10 +-
 5 files changed, 13 insertions(+), 12 deletions(-)

New commits:
commit 6a124a1dd629cfeec35a5820ed62e0d138b00302
Author: Noel Grandin 
Date:   Thu Jan 8 10:38:15 2015 +0200

vcl: plugin: check that VclPtr is passed by reference

to avoid unnecessary increment/decrement traffic

Change-Id: Ice4e08df002b815105aa0b1c9430511c0cec3d28

diff --git a/compilerplugins/clang/passstuffbyref.cxx 
b/compilerplugins/clang/passstuffbyref.cxx
index 51e324a..e233093 100644
--- a/compilerplugins/clang/passstuffbyref.cxx
+++ b/compilerplugins/clang/passstuffbyref.cxx
@@ -58,6 +58,7 @@ bool PassStuffByRef::VisitFunctionDecl(const FunctionDecl * 
functionDecl) {
 bool bFound = false;
 if (typeName == "class rtl::OUString" ||
 typeName == "class rtl::OString" ||
+typeName.find("class VclPtr") == 0 ||
 typeName.find("class com::sun::star::uno::Sequence") == 0) {
 bFound = true;
 }
@@ -75,7 +76,7 @@ bool PassStuffByRef::VisitFunctionDecl(const FunctionDecl * 
functionDecl) {
 if (bFound) {
 report(
 DiagnosticsEngine::Warning,
-"passing " + typeName + " by value, rather pass by reference 
.e.g. 'const " + typeName + "&'",
+"passing " + typeName + " by value, rather pass by const 
reference .e.g. 'const " + typeName + "&'",
 pvDecl->getSourceRange().getBegin())
   << pvDecl->getSourceRange();
 }
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index ff9d2a0..59d1ce0 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -236,7 +236,7 @@ public:
 virtual const Link& GetModifyHdl() const { return maModifyHdl; }
 virtual voidSetUpdateDataHdl( const Link& rLink ) { 
maUpdateDataHdl = rLink; }
 
-voidSetSubEdit( VclPtr pEdit );
+voidSetSubEdit( const VclPtr& pEdit );
 Edit*   GetSubEdit() const { return mpSubEdit; }
 
 boost::signals2::signal< void ( Edit* ) > autocompleteSignal;
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index ab3b1f0..3f17870 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -2706,7 +2706,7 @@ void Edit::ClearModifyFlag()
 mbModified = false;
 }
 
-void Edit::SetSubEdit( VclPtr pEdit )
+void Edit::SetSubEdit( const VclPtr& pEdit )
 {
 mpSubEdit.disposeAndClear();
 mpSubEdit = pEdit;
commit ded247661f2200d703c71377a6f83d9a3480958a
Author: Noel Grandin 
Date:   Thu Jan 8 10:29:24 2015 +0200

vcl: a couple more places that shouldn't be stack-allocating Window objects

Change-Id: I773fb5ed066db2c22b3d50198dff350b755ab24a

diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index ed84144..7df6fe0 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -577,7 +577,7 @@ private:
 bool m_bUserManagedScrolling;
 VclPtr m_pVScroll;
 VclPtr m_pHScroll;
-ScrollBarBox m_aScrollBarBox;
+VclPtr m_aScrollBarBox;
 };
 
 class VCL_DLLPUBLIC VclViewport : public VclBin
@@ -619,13 +619,13 @@ private:
 }
 };
 
-EventBoxHelper m_aEventBoxHelper;
+VclPtr m_aEventBoxHelper;
 public:
 VclEventBox(vcl::Window* pParent)
 : VclBin(pParent)
-, m_aEventBoxHelper(this)
+, m_aEventBoxHelper(new EventBoxHelper(this))
 {
-m_aEventBoxHelper.Show();
+m_aEventBoxHelper->Show();
 }
 virtual vcl::Window *get_child() SAL_OVERRIDE;
 virtual const vcl::Window *get_child() const SAL_OVERRIDE;
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 107c6a2..64688e5 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1612,7 +1612,7 @@ VclScrolledWindow::VclScrolledWindow(vcl::Window 
*pParent, WinBits nStyle)
 , m_bUserManagedScrolling(false)
 , m_pVScroll(new ScrollBar(this, WB_HIDE | WB_VERT))
 , m_pHScroll(new ScrollBar(this, WB_HIDE | WB_HORZ))
-, m_aScrollBarBox(this, WB_HIDE)
+, m_aScrollBarBox(new ScrollBarBox(this, WB_HIDE))
 {
 SetType(WINDOW_SCROLLWINDOW);
 
@@ -1764,12 +1764,12 @@ void VclScrolledWindow::setAllocation(const Size 
&rAllocation)
 if (m_pVScroll->IsVisible() && m_pHScroll->IsVisible())
 {
 Point aBoxPos(aInnerSize.Width(), aInnerSize.Height());
-m_aScrollBarBox.SetPosSizePixel(aBoxPos, Size(nScrollBarWidth, 
nScrollBarHeight));
-m_aScrollBarBox.Show();
+m_aScrollBarBox->SetPosSizePixel(aBoxPos, Size(nScrollBarWidth, 
nScrollBarHeight));
+m_aScrollBarBox->Show();
 }
 else
 {
-m_aScrollBarBox.Hide();
+m_aScrollBarBox->Hide();
 }

[Libreoffice-commits] core.git: basic/source bin/find-unused-defines.awk bin/find-unused-defines.sh chart2/source connectivity/source cui/source dbaccess/inc dbaccess/source desktop/source dtrans/sour

2015-01-08 Thread Noel Grandin

 UnoControls/source/inc/framecontrol.hxx  |
1 
 UnoControls/source/inc/progressmonitor.hxx   |
1 
 basic/source/inc/runtime.hxx |
4 
 basic/source/sbx/sbxres.hxx  |   
22 
 bin/find-unused-defines.awk  |   
18 
 bin/find-unused-defines.sh   |   
27 
 chart2/source/controller/inc/HelpIds.hrc |   
10 
 chart2/source/inc/servicenames.hxx   |
1 
 chart2/source/view/main/OpenGLRender.hxx |
1 
 connectivity/source/drivers/evoab2/NDriver.hxx   |
5 
 connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx   |
1 
 connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx |
1 
 connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx   |
1 
 cui/source/customize/acccfg.hrc  |
1 
 cui/source/dialogs/scriptdlg.hrc |
5 
 cui/source/inc/cuioptgenrl.hxx   |
1 
 cui/source/inc/helpid.hrc|   
13 
 cui/source/inc/iconcdlg.hxx  |
1 
 cui/source/inc/scriptdlg.hxx |
1 
 cui/source/tabpages/align.hrc|
3 
 cui/source/tabpages/page.h   |
4 
 dbaccess/inc/dbaccess_helpid.hrc |   
76 -
 dbaccess/source/core/inc/dbamiscres.hrc  |   
24 
 dbaccess/source/inc/dsntypes.hxx |
1 
 dbaccess/source/ui/inc/browserids.hxx|
2 
 dbaccess/source/ui/inc/dbu_resource.hrc  |
4 
 desktop/source/app/desktop.hrc   |
1 
 dtrans/source/win32/dtobj/DTransHelper.hxx   |
3 
 filter/source/graphicfilter/icgm/chart.hxx   |   
11 
 filter/source/placeware/zipfile.hxx  |   
51 -
 filter/source/svg/svgwriter.hxx  |
2 
 forms/source/component/EditBase.hxx  |
6 
 formula/source/ui/dlg/formdlgs.hrc   |   
11 
 fpicker/source/office/iodlg.hxx  |
2 
 fpicker/source/win32/filepicker/resource.h   |
4 
 framework/inc/classes/resource.hrc   |
1 
 framework/inc/properties.h   |   
59 -
 framework/inc/services.h |   
36 
 framework/source/jobs/joburl.cxx |
1 
 framework/source/layoutmanager/helpers.hxx   |
1 
 hwpfilter/source/drawdef.h   |
8 
 hwpfilter/source/hbox.h  |   
16 
 hwpfilter/source/hwplib.h|
1 
 i18npool/inc/servicename.hxx |
1 
 idl/inc/basobj.hxx   |
4 
 include/basic/sbxdef.hxx |   
12 
 include/clew/clew.h  |  
199 -
 include/comphelper/classids.hxx  |
1 
 include/comphelper/documentconstants.hxx |   
23 
 include/cppuhelper/factory.hxx   |
1 
 include/editeng/editdata.hxx |
2 
 include/editeng/eeitemid.hxx |   
20 
 include/editeng/outliner.hxx |
3 
 include/editeng/unoprnms.hxx |   
41 -
 include/filter/msfilter/escherex.hxx |  
397 --
 include/filter/msfilter/msdffimp.hxx |
5 
 include/filter/msfilter/svdfppt.hxx  |  
109 --
 include/oox/ole/olehelper.hxx|
1 
 include/osl/detail/component-defines.h   |   
25 
 include/osl/process.h|
2

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

2015-01-08 Thread Miklos Vajna

 include/svx/xfltrit.hxx |1 +
 svx/source/xoutdev/xattr2.cxx   |   10 ++
 sw/source/core/docnode/nodedump.cxx |7 ---
 3 files changed, 15 insertions(+), 3 deletions(-)

New commits:
commit 0748a5f8298e2ea817e131234f5e99300ed7f9f7
Author: Miklos Vajna 
Date:   Thu Jan 8 09:01:28 2015 +0100

Factor out XFillTransparenceItem::dumpAsXml() from sw

Change-Id: If8e7a8da9e0ce04dafd2354f31abc249058784a7

diff --git a/include/svx/xfltrit.hxx b/include/svx/xfltrit.hxx
index 8ba5db6..3424a69 100644
--- a/include/svx/xfltrit.hxx
+++ b/include/svx/xfltrit.hxx
@@ -41,6 +41,7 @@ public:
 SfxMapUnit eCoreMetric,
 SfxMapUnit ePresMetric,
 OUString &rText, const IntlWrapper * = 0 ) 
const SAL_OVERRIDE;
+virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const;
 };
 
 #endif
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index ac87203..1daf63a 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -32,6 +32,8 @@
 #include 
 #include 
 
+#include 
+
 TYPEINIT1_AUTOFACTORY(XLineTransparenceItem, SfxUInt16Item);
 
 XLineTransparenceItem::XLineTransparenceItem(sal_uInt16 nLineTransparence) :
@@ -435,6 +437,14 @@ bool XFillTransparenceItem::GetPresentation
 }
 }
 
+void XFillTransparenceItem::dumpAsXml(xmlTextWriterPtr pWriter) const
+{
+xmlTextWriterStartElement(pWriter, BAD_CAST("xFillTransparenceItem"));
+xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), 
BAD_CAST(OString::number(Which()).getStr()));
+xmlTextWriterWriteAttribute(pWriter, BAD_CAST("value"), 
BAD_CAST(OString::number(GetValue()).getStr()));
+xmlTextWriterEndElement(pWriter);
+}
+
 TYPEINIT1_AUTOFACTORY(XFormTextShadowTranspItem, SfxUInt16Item);
 
 XFormTextShadowTranspItem::XFormTextShadowTranspItem(sal_uInt16 
nShdwTransparence) :
diff --git a/sw/source/core/docnode/nodedump.cxx 
b/sw/source/core/docnode/nodedump.cxx
index 8bc14bc..6a17aae 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cxx
@@ -55,6 +55,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -463,6 +464,9 @@ void lcl_dumpSfxItemSet(WriterHelper& writer, const 
SfxItemSet* pSet)
 case XATTR_FILLBITMAP:
 static_cast(pItem)->dumpAsXml(writer);
 break;
+case XATTR_FILLTRANSPARENCE:
+static_cast(pItem)->dumpAsXml(writer);
+break;
 default: bDone = false; break;
 }
 if (bDone)
@@ -477,9 +481,6 @@ void lcl_dumpSfxItemSet(WriterHelper& writer, const 
SfxItemSet* pSet)
 boost::optional oValue;
 switch (pItem->Which())
 {
-case XATTR_FILLTRANSPARENCE:
-pWhich = "fill transparence";
-break;
 case XATTR_FILLBMP_TILE:
 pWhich = "fill bitmap tile";
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

1 2 >

1 - 100 of 101 matches

Mail list logo