date:20141021

LibreOffice Gerrit News for core on 2014-10-21

2014-10-21 Thread gerrit

Moin!

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

 First time contributors doing great things! 
+ SIFR: fix issues color icons, control code icon, and large underline icon
  in https://gerrit.libreoffice.org/12053 from Yousuf Philips
  about module icon-themes
+ coinmp: conditional patch
  in https://gerrit.libreoffice.org/12040 from Robert Antoni Buj i Gelonch
  about module external
+ coinmp: change the install path of dylib files
  in https://gerrit.libreoffice.org/12041 from Robert Antoni Buj i Gelonch
  about module external
+ fdo#83579 - 'Extrusion On/Off' should be added to Fontwork toolbar
  in https://gerrit.libreoffice.org/12046 from Yousuf Philips
  about module sc, sd, sw
+ solenv: windows: A better way to place separator of dir path to.
  in https://gerrit.libreoffice.org/12045 from YiiChang Yen
  about module build, solenv
+ GPU Calc:Support string parameter in SUMIF an SUMIFS.
  in https://gerrit.libreoffice.org/12044 from Hao Chen
  about module sc
 End of freshness 

+ fdo#39468 Translate German Comments - sc/source/filter/{lotus,starcalc,xm
  in https://gerrit.libreoffice.org/12036 from Christian M. Heller
  about module sc
+ uno::Reference leak detection hack for valgrind
  in https://gerrit.libreoffice.org/12054 from Michael Stahl
  about module chart2, cppu, filter, include, solenv
+ fdo#84938: replace WINDOW_BORDER constants with enum
  in https://gerrit.libreoffice.org/12043 from Noel Grandin
  about module cui, dbaccess, forms, include, reportdesign, rsc, sc, sd, sfx2, 
starmath, svx, sw, toolkit, vcl
+ fdo#81596 WIP export to OOXML that need argument changes
  in https://gerrit.libreoffice.org/10831 from Winfried Donkers
  about module formula, include
+ vcl: mv mirror from SalGraphics to OutputDevice - pt9: polypolygonbezier
  in https://gerrit.libreoffice.org/12051 from Chris Sherlock
  about module include, vcl
+ vcl: mv mirror from SalGraphics to OutputDevice - part 9: polygon bezier
  in https://gerrit.libreoffice.org/12048 from Chris Sherlock
  about module include, vcl
+ vcl: mv mirror from SalGraphics to OutputDevice - part 8: polylinebezier
  in https://gerrit.libreoffice.org/12037 from Chris Sherlock
  about module include, vcl
+ vcl: move mirror from SalGraphics to OutputDevice - part 7: polypolygons
  in https://gerrit.libreoffice.org/12035 from Chris Sherlock
  about module include, vcl
+ vcl: move mirror from SalGraphics to OutputDevice - part 6: polygons
  in https://gerrit.libreoffice.org/12032 from Chris Sherlock
  about module include, vcl
+ vcl: move mirror from SalGraphics to OutputDevice - part 5: polylines
  in https://gerrit.libreoffice.org/12030 from Chris Sherlock
  about module include, vcl
+ vcl: move mirror from SalGraphics to OutputDevice - part 4: rectangles
  in https://gerrit.libreoffice.org/12029 from Chris Sherlock
  about module include, vcl
+ vcl: move mirror from SalGraphics to OutputDevice - part 3: lines
  in https://gerrit.libreoffice.org/12028 from Chris Sherlock
  about module include, vcl
+ vcl: move mirror from SalGraphics to OutputDevice - part 2: clipping
  in https://gerrit.libreoffice.org/12027 from Chris Sherlock
  about module vcl
+ vcl: mv mirror from SalGraphics to OutputDevice - part 1 mirror  pixel
  in https://gerrit.libreoffice.org/12026 from Chris Sherlock
  about module include, vcl
+ Remove OUString possible overflow in SwIoSystem::GetFileFilter
  in https://gerrit.libreoffice.org/12039 from Arnaud Versini
  about module sw


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

+ fdo#85185 Copy OUString argument to avoid a use after free
  in https://gerrit.libreoffice.org/12031 from Matthew Francis
+ fdo#84938: replace TIB_ constants with enum
  in https://gerrit.libreoffice.org/12023 from Noel Grandin
+ fdo#78826 HIG: missing colons and capitalization in sc
  in https://gerrit.libreoffice.org/12015 from Adolfo Jayme Barrientos
+ CppunitTest_sw_odfimport: enable all but one asserts on OS X
  in https://gerrit.libreoffice.org/12020 from Miklos Vajna
+ convert SV_BMP_ constants to enum
  in https://gerrit.libreoffice.org/12018 from Noel Grandin
+ fix problem with gcc compiler complaining on variable type
  in https://gerrit.libreoffice.org/12047 from Adam CloudOn
+ fdo#75757: remove inheritance to std::map
  in https://gerrit.libreoffice.org/12042 from Daniel Sikeler
+ Fix MSI comment when productname contains whitespace
  in https://gerrit.libreoffice.org/11994 from YiiChang Yen
+ Increase assert coverage of OStringBuffer arguments
  in https://gerrit.libreoffice.org/12007 from Matthew Francis


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

+ fdo#85006 Ignore rare fonts with names ending in )
  in https://gerrit.libreoffice.org/12022 from Matthew Francis


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

+ fdo#58194 - export DOCX Automatic indent as firstLine indent
  in

[Libreoffice-commits] core.git: 2 commits - external/nss

2014-10-21 Thread Tor Lillqvist

 external/nss/ExternalProject_nss.mk |6 +-
 external/nss/nss-ios.patch  |4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit a8c24b25fd9fb21097a08a22797bf61b59099ea1
Author: Tor Lillqvist t...@collabora.com
Date:   Tue Oct 21 01:49:38 2014 +0300

Cross-compilation fix

Change-Id: I205afbd9c1cbe3a286359036cbdcf6aa9d986f71

diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index 6d2ab45..f518bb4 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -72,7 +72,11 @@ $(call gb_ExternalProject_get_state_target,nss,build): 
$(call gb_ExternalProject
$(if $(filter IOS-ARM,$(OS)-$(CPUNAME)),CPU_ARCH=arm) \
NSINSTALL=$(call 
gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py) 
\
NSDISTMODE=copy \
-   $(MAKE) -j1 AR=$(AR) RANLIB=$(RANLIB) NMEDIT=$(NM)edit 
nss_build_all \
+   $(MAKE) -j1 AR=$(AR) \
+   RANLIB=$(RANLIB) \
+   NMEDIT=$(NM)edit \
+   $(if 
$(CROSS_COMPILING),NSPR_CONFIGURE_OPTS=--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
+   nss_build_all \
 rm -f $(call 
gb_UnpackedTarball_get_dir,nss)/dist/out/lib/*.a \
$(if $(filter MACOSX,$(OS)),\
 chmod u+w $(call 
gb_UnpackedTarball_get_dir,nss)/dist/out/lib/*.dylib \
commit bf8fb8cfc3d08bf251b2099db6590af6c09c015e
Author: Tor Lillqvist t...@collabora.com
Date:   Tue Oct 21 01:48:36 2014 +0300

Make the patch apply again after NSS update

Change-Id: I935188ee90b4c56c5a4d7cc374a26e4b182beb5f

diff --git a/external/nss/nss-ios.patch b/external/nss/nss-ios.patch
index 0601573..d4107d7 100644
--- a/external/nss/nss-ios.patch
+++ b/external/nss/nss-ios.patch
@@ -85,9 +85,9 @@
  #define _PR_SI_ARCHITECTURE arm
 +#elif defined(__arm64__)
 +#define _PR_SI_ARCHITECTURE arm64
+ #elif defined(__aarch64__)
+ #define _PR_SI_ARCHITECTURE aarch64
  #else
- #error Unknown CPU architecture
- #endif
 --- a/a/nspr/pr/src/Makefile.in
 +++ a/a/nspr/pr/src/Makefile.in
 @@ -180,7 +180,7 @@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-21 Thread Stephan Bergmann

 jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx |   19 ++-
 jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx |3 ---
 2 files changed, 2 insertions(+), 20 deletions(-)

New commits:
commit 42a05b4b2aa980cc8443813e6ab903034f9f4dbc
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Oct 21 08:52:43 2014 +0200

Remove unnecessary jfw_plugin::getVendorNames

Change-Id: I3c134c27db4c1496fcacc519da68af10ab3ce574

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
index 3f23ff3..ee4d6d0 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
@@ -53,27 +53,12 @@ BEGIN_VENDOR_MAP()
 END_VENDOR_MAP()
 
 
-SequenceOUString getVendorNames()
+bool isVendorSupported(const OUString sVendor)
 {
 const size_t count = sizeof(gVendorMap) / sizeof (VendorSupportMapEntry) - 
1;
-OUString arNames[count];
 for ( size_t pos = 0; pos  count; ++pos )
 {
-OString sVendor(gVendorMap[pos].sVendorName);
-arNames[pos] = OStringToOUString(sVendor, RTL_TEXTENCODING_UTF8);
-}
-return SequenceOUString(arNames, count);
-}
-
-bool isVendorSupported(const OUString sVendor)
-{
-SequenceOUString seqNames = getVendorNames();
-const OUString * arNames = seqNames.getConstArray();
-sal_Int32 count = seqNames.getLength();
-
-for (int i = 0; i  count; i++)
-{
-if (sVendor.equals(arNames[i]))
+if (sVendor.equalsAscii(gVendorMap[pos].sVendorName))
 return true;
 }
 #if OSL_DEBUG_LEVEL = 2
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx 
b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
index 72fd317..5709e79 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
@@ -45,9 +45,6 @@ VendorSupportMapEntry gVendorMap[] ={
 #define END_VENDOR_MAP() \
 {NULL, NULL, NULL} };
 
-
-com::sun::star::uno::SequenceOUString getVendorNames();
-
 /* Examines if the vendor supplied in parameter sVendor is part of the
list of supported vendors. That is the arry of VendorSupportMapEntry
is search for an respective entry.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-21 Thread Miklos Vajna

 include/svx/svdtrans.hxx  |6 +--
 sc/source/core/data/drwlayer.cxx  |2 -
 sc/source/ui/app/client.cxx   |2 -
 sd/source/core/drawdoc2.cxx   |2 -
 sd/source/ui/docshell/sdclient.cxx|2 -
 svx/source/customshapes/EnhancedCustomShape2d.cxx |4 +-
 svx/source/customshapes/EnhancedCustomShapeEngine.cxx |   16 
 svx/source/sdr/contact/viewcontactofgraphic.cxx   |2 -
 svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx |2 -
 svx/source/sdr/contact/viewcontactofsdrcircobj.cxx|2 -
 svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx |   12 +++---
 svx/source/sdr/contact/viewcontactofsdrole2obj.cxx|2 -
 svx/source/sdr/contact/viewcontactofsdrpathobj.cxx|2 -
 svx/source/sdr/contact/viewcontactofsdrrectobj.cxx|2 -
 svx/source/svdraw/svdedtv2.cxx|6 +--
 svx/source/svdraw/svdoashp.cxx|   26 ++---
 svx/source/svdraw/svdocirc.cxx|   28 +++---
 svx/source/svdraw/svdograf.cxx|4 +-
 svx/source/svdraw/svdopath.cxx|   12 +++---
 svx/source/svdraw/svdorect.cxx|   18 -
 svx/source/svdraw/svdotext.cxx|   20 +-
 svx/source/svdraw/svdotxdr.cxx|8 ++--
 svx/source/svdraw/svdotxtr.cxx|   18 -
 svx/source/svdraw/svdouno.cxx |4 +-
 svx/source/svdraw/svdtrans.cxx|8 ++--
 svx/source/table/viewcontactoftableobj.cxx|2 -
 svx/source/tbxctrls/grafctrl.cxx  |4 +-
 27 files changed, 108 insertions(+), 108 deletions(-)

New commits:
commit 43327878920f424f8bac1114bee51c54609796c5
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Tue Oct 21 08:56:06 2014 +0200

nShearWink - nShearAngle

Change-Id: I122f16783db4025b9335ed82a12f051516d98d4c

diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx
index 9790327..ef2aba8 100644
--- a/include/svx/svdtrans.hxx
+++ b/include/svx/svdtrans.hxx
@@ -198,13 +198,13 @@ long GetLen(const Point rPnt);
 class GeoStat { // Geometrischer Status fuer ein Rect
 public:
 long nRotationAngle;
-long nShearWink;
-double   nTan;  // tan(nShearWink)
+long nShearAngle;
+double   nTan;  // tan(nShearAngle)
 double   nSin;  // sin(nRotationAngle)
 double   nCos;  // cos(nRotationAngle)
 bool bMirrored; // Horizontal gespiegelt? (ni)
 public:
-GeoStat(): 
nRotationAngle(0),nShearWink(0),nTan(0.0),nSin(0.0),nCos(1.0),bMirrored(false) 
{}
+GeoStat(): 
nRotationAngle(0),nShearAngle(0),nTan(0.0),nSin(0.0),nCos(1.0),bMirrored(false) 
{}
 void RecalcSinCos();
 void RecalcTan();
 };
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index adcb84c..672c860 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -1963,7 +1963,7 @@ IMapObject* ScDrawLayer::GetHitIMapObject( SdrObject* 
pObj,
 aRelPoint.X() = aLogRect.Right() + aLogRect.Left() - 
aRelPoint.X();
 
 // ggf. Unshear:
-if ( rGeo.nShearWink )
+if ( rGeo.nShearAngle )
 ShearPoint( aRelPoint, aLogRect.TopLeft(), -rGeo.nTan );
 
 if ( rGraphic.GetPrefMapMode().GetMapUnit() == MAP_PIXEL )
diff --git a/sc/source/ui/app/client.cxx b/sc/source/ui/app/client.cxx
index a9d7f74..a2c7fd0 100644
--- a/sc/source/ui/app/client.cxx
+++ b/sc/source/ui/app/client.cxx
@@ -158,7 +158,7 @@ void ScClient::ObjectAreaChanged()
 // #i118524# if sheared/rotated, center to non-rotated LogicRect
 pDrawObj-setSuppressSetVisAreaSize(true);
 
-if(pDrawObj-GetGeoStat().nRotationAngle || 
pDrawObj-GetGeoStat().nShearWink)
+if(pDrawObj-GetGeoStat().nRotationAngle || 
pDrawObj-GetGeoStat().nShearAngle)
 {
 pDrawObj-SetLogicRect( aNewRectangle );
 
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index ed3c1ad..d81be4c 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -998,7 +998,7 @@ IMapObject* SdDrawDocument::GetHitIMapObject( SdrObject* 
pObj,
 aRelPoint.X() = rRect.Right() + rRect.Left() - aRelPoint.X();
 
 // Undo shearing
-if ( rGeo.nShearWink )
+if ( rGeo.nShearAngle )
 ShearPoint( aRelPoint, rRect.TopLeft(), -rGeo.nTan );
 
 if ( pGrafObj-GetGrafPrefMapMode().GetMapUnit() == MAP_PIXEL )
diff --git a/sd/source/ui/docshell/sdclient.cxx 
b/sd/source/ui/docshell/sdclient.cxx
index 9166417..6ea9d13 100644
---

[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - vcl/inc vcl/Library_vcl.mk vcl/source

2014-10-21 Thread Markus Mohrhard

 vcl/Library_vcl.mk|1 
 vcl/inc/salgdiimpl.hxx|  196 ++
 vcl/source/gdi/salgdiimpl.cxx |   26 +
 3 files changed, 223 insertions(+)

New commits:
commit 68a6645f6d625bcff56ea93294754a9a695b01e0
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Tue Oct 21 08:48:02 2014 +0200

add Impl version for SalGraphics

Using an Impl pattern here allows us to switch the rendering in each
plugin without introducing any additional plugins.

The SalGraphics subclass will just forward the rendering call to the
Impl which can either be the normal native one or the OpenGL one.

Change-Id: Id234c60335305bfb42bf3d2b912f02d1f542bd06

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index dea1d8d..52a224c 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -273,6 +273,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 vcl/source/gdi/region \
 vcl/source/gdi/regionband \
 vcl/source/gdi/salgdilayout \
+vcl/source/gdi/salgdiimpl \
 vcl/source/gdi/sallayout \
 vcl/source/gdi/salmisc \
 vcl/source/gdi/salnativewidgets-none \
diff --git a/vcl/inc/salgdiimpl.hxx b/vcl/inc/salgdiimpl.hxx
new file mode 100644
index 000..58d6c1a
--- /dev/null
+++ b/vcl/inc/salgdiimpl.hxx
@@ -0,0 +1,196 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the License); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include rtl/ustring.hxx
+
+#include tools/solar.h
+
+#include vcl/salgtype.hxx
+#include vcl/region.hxx
+#include vcl/salnativewidgets.hxx
+
+#include com/sun/star/drawing/LineCap.hpp
+
+class SalGraphics;
+class SalBitmap;
+
+class SalGraphicsImpl
+{
+public:
+
+virtual ~SalGraphicsImpl();
+
+virtual bool setClipRegion( const vcl::Region ) = 0;
+//
+// get the depth of the device
+virtual sal_uInt16  GetBitCount() const = 0;
+
+// get the width of the device
+virtual longGetGraphicsWidth() const = 0;
+
+// set the clip region to empty
+virtual voidResetClipRegion() = 0;
+
+// set the line color to transparent (= don't draw lines)
+
+virtual voidSetLineColor() = 0;
+
+// set the line color to a specific color
+virtual voidSetLineColor( SalColor nSalColor ) = 0;
+
+// set the fill color to transparent (= don't fill)
+virtual voidSetFillColor() = 0;
+
+// set the fill color to a specific color, shapes will be
+// filled accordingly
+virtual voidSetFillColor( SalColor nSalColor ) = 0;
+
+// enable/disable XOR drawing
+virtual voidSetXORMode( bool bSet, bool bInvertOnly ) = 0;
+
+// set line color for raster operations
+virtual voidSetROPLineColor( SalROPColor nROPColor ) = 0;
+
+// set fill color for raster operations
+virtual voidSetROPFillColor( SalROPColor nROPColor ) = 0;
+
+// draw -- LineColor and FillColor and RasterOp and ClipRegion
+virtual void drawPixel( long nX, long nY ) = 0;
+virtual void drawPixel( long nX, long nY, SalColor nSalColor ) = 0;
+
+virtual void drawLine( long nX1, long nY1, long nX2, long nY2 ) = 0;
+
+virtual void drawRect( long nX, long nY, long nWidth, long nHeight ) = 0;
+
+virtual void drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) = 
0;
+
+virtual void drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) = 0;
+
+virtual void drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, 
PCONSTSALPOINT* pPtAry ) = 0;
+virtual bool drawPolyPolygon( const ::basegfx::B2DPolyPolygon, double 
fTransparency ) = 0;
+
+virtual bool drawPolyLine(
+const ::basegfx::B2DPolygon,
+double fTransparency,
+const ::basegfx::B2DVector rLineWidths,
+basegfx::B2DLineJoin,
+com::sun::star::drawing::LineCap) = 0;
+
+virtual bool drawPolyLineBezier(
+sal_uInt32 nPoints,
+const SalPoint* pPtAry,
+const sal_uInt8* pFlgAry ) = 0;
+
+virtual bool

[Libreoffice-commits] core.git: cui/source dbaccess/source forms/source include/rsc include/vcl reportdesign/source rsc/inc rsc/source sc/source sd/source sfx2/source starmath/source svx/source sw/sou

2014-10-21 Thread Noel Grandin

 cui/source/dialogs/hangulhanjadlg.cxx |2 
 cui/source/options/optcolor.cxx   |2 
 cui/source/tabpages/backgrnd.cxx  |2 
 cui/source/tabpages/connect.cxx   |2 
 cui/source/tabpages/grfpage.cxx   |2 
 cui/source/tabpages/measure.cxx   |2 
 cui/source/tabpages/numfmt.cxx|2 
 cui/source/tabpages/numpages.cxx  |2 
 dbaccess/source/ui/app/AppDetailPageHelper.cxx|2 
 dbaccess/source/ui/app/AppTitleWindow.cxx |2 
 dbaccess/source/ui/app/AppView.cxx|4 -
 forms/source/solar/control/navtoolbar.cxx |2 
 include/rsc/rsc-vcl-shared-types.hxx  |   22 
+
 include/vcl/combobox.hxx  |2 
 include/vcl/window.hxx|4 -
 reportdesign/source/ui/dlg/GroupsSorting.cxx  |2 
 rsc/inc/rscdb.hxx |1 
 rsc/source/parser/rscicpx.cxx |8 
+--
 sc/source/ui/app/inputwin.cxx |2 
 sc/source/ui/miscdlgs/autofmt.cxx |2 
 sc/source/ui/miscdlgs/crnrdlg.cxx |2 
 sd/source/filter/html/pubdlg.cxx  |   10 
++--
 sd/source/ui/dlg/animobjs.cxx |2 
 sd/source/ui/dlg/docprev.cxx  |2 
 sd/source/ui/dlg/vectdlg.cxx  |4 -
 sd/source/ui/framework/factories/FullScreenPane.cxx   |2 
 sfx2/source/dialog/dinfdlg.cxx|2 
 sfx2/source/doc/iframe.cxx|4 -
 sfx2/source/doc/sfxbasemodel.cxx  |4 -
 sfx2/source/view/frame.cxx|2 
 sfx2/source/view/frame2.cxx   |2 
 sfx2/source/view/impviewframe.hxx |2 
 starmath/source/ElementsDockingWindow.cxx |2 
 starmath/source/dialog.cxx|   10 
++--
 svx/source/dialog/dlgctrl.cxx |2 
 svx/source/dialog/fntctrl.cxx |2 
 svx/source/dialog/paraprev.cxx|2 
 svx/source/dialog/rubydialog.cxx  |2 
 svx/source/sidebar/tools/Popup.cxx|2 
 svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx |2 
 sw/source/ui/chrdlg/drpcps.cxx|2 
 sw/source/ui/config/optload.cxx   |2 
 sw/source/ui/envelp/envfmt.cxx|2 
 sw/source/ui/envelp/envlop1.cxx   |2 
 sw/source/ui/table/tautofmt.cxx   |2 
 sw/source/uibase/frmdlg/colex.cxx |2 
 toolkit/source/awt/vclxwindow.cxx |   11 
++--
 toolkit/source/awt/vclxwindows.cxx|2 
 vcl/inc/brdwin.hxx|6 +-
 vcl/source/control/combobox.cxx   |2 
 vcl/source/control/fixed.cxx  |2 
 vcl/source/control/imgctrl.cxx|2 
 vcl/source/control/prgsbar.cxx|2 
 vcl/source/window/brdwin.cxx  |   24 
+-
 vcl/source/window/menu.cxx|4 -
 vcl/source/window/resource.cxx|2 
 vcl/source/window/window.cxx  |8 
+--
 57 files changed, 108 insertions(+), 100 deletions(-)

New commits:
commit 182fc4f184b77330fdbb32096b64f5fbc5b5f874
Author: Noel Grandin n...@peralex.com
Date:   Mon Oct 20 09:10:45 2014 +0200

fdo#84938: replace WINDOW_BORDER constants with enum

Change-Id: I91ca8e09971aee26f16257a4fd01125cfb2ebcdb

diff --git a/cui/source/dialogs/hangulhanjadlg.cxx 
b/cui/source/dialogs/hangulhanjadlg.cxx
index a571654..1391bd5 100644
---

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

2014-10-21 Thread Caolán McNamara

 sd/source/filter/eppt/pptx-epptbase.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a29301cf696ac093c03de05248c3c6adffd14818
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Oct 21 09:09:31 2014 +0100

fix debugging build

Change-Id: I7264f670dd60f6121a23a4cb5524edc3bf1dcee7

diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx 
b/sd/source/filter/eppt/pptx-epptbase.cxx
index 28d73ec..1e17c09 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -471,7 +471,7 @@ PHLayout PPTWriterBase::GetLayout( sal_Int32 nOffset ) 
const
 if( nOffset = 0  nOffset  EPP_LAYOUT_SIZE )
 return pPHLayout[ nOffset ];
 
-DBG(printf(asked % SAL_PRIdINT32  for layout outside of 0,%d array 
scope\n, nOffset, EppLayout::SIZE ));
+DBG(printf(asked % SAL_PRIdINT32  for layout outside of 0,%d array 
scope\n, nOffset, EPP_LAYOUT_SIZE ));
 
 return pPHLayout[ 0 ];
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - set_soenv.in vcl/aqua

2014-10-21 Thread Herbert Dürr

 set_soenv.in   |8 ++--
 vcl/aqua/source/gdi/salprn.cxx |5 +
 2 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 603a37eb46a5ed08d3c9c9b342386705cbd00109
Author: Herbert DÃ¼rr h...@apache.org
Date:   Tue Oct 21 07:43:39 2014 +

#i125776# handle OSX SDK 10.9 changes regarding NSPrintingOrientation - 
NSPaperOrientation

SDK 10.9 changed the NSPrintInfo::orientation method to take a parameter of 
type
NSPaperOrientation (i.e. enum) instead of NSPrintingOrientation (i.e. 
NSUInteger).
The actual values are the same so the binaries work fine on older and newer 
platforms,
but the type mismatch on the newer SDK would break the build.

diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx
index ae5edf5..2d6a496 100644
--- a/vcl/aqua/source/gdi/salprn.cxx
+++ b/vcl/aqua/source/gdi/salprn.cxx
@@ -76,8 +76,13 @@ AquaSalInfoPrinter::AquaSalInfoPrinter( const 
SalPrinterQueueInfo i_rQueue ) :
 {
 mpPrintInfo = [pShared copy];
 [mpPrintInfo setPrinter: mpPrinter];
+#ifdef __MAC_10_9 // code for SDK 10.9 or newer
+mePageOrientation = ([mpPrintInfo orientation] == 
NSPaperOrientationLandscape) ? ORIENTATION_LANDSCAPE : ORIENTATION_PORTRAIT;
+[mpPrintInfo setOrientation: NSPaperOrientationPortrait];
+#else // code for SDK 10.8 or older
 mePageOrientation = ([mpPrintInfo orientation] == 
NSLandscapeOrientation) ? ORIENTATION_LANDSCAPE : ORIENTATION_PORTRAIT;
 [mpPrintInfo setOrientation: NSPortraitOrientation];
+#endif
 }
 
 mpGraphics = new AquaSalGraphics();
commit 2786d200b010a44a41a9453bfb56f0e41358422e
Author: JÃ¼rgen Schmidt j...@apache.org
Date:   Tue Oct 21 07:25:11 2014 +

#125776# adapt STL include path for Xcode 6

diff --git a/set_soenv.in b/set_soenv.in
index 5cd279f..ae70515 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1482,8 +1482,12 @@ elsif ($platform =~ m/darwin/)
 {
 $FRAMEWORKSHOME = @MACOSX_SDK_PATH@/System/Library/Frameworks;
 chomp( my $TOOLSPATH = `xcode-select --print-path` );
-my $STLINC .= 
$I.$TOOLSPATH/Toolchains/XcodeDefault.xctoolchain/usr/lib/c++/v1/;
-$SOLARINC .= $STLINC . 
$I.$FRAMEWORKSHOME.$ds.JavaVM.framework.$ds.Headers;
+my $STLINC = 
$TOOLSPATH/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/;
+   if ( !(-e $STLINC)  !(-d $STLINC) ) {
+  # Xcode 5
+  $STLINC = 
$TOOLSPATH/Toolchains/XcodeDefault.xctoolchain/usr/lib/c++/v1/;
+   } 
+$SOLARINC .= $I.$STLINC . 
$I.$FRAMEWORKSHOME.$ds.JavaVM.framework.$ds.Headers;
 $GUIBASE  = aqua;
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Java problem when running CppunitTest_dbaccess_dialog_save on OS X 10.10 with Oracle JDK 1.8

2014-10-21 Thread Robert Antoni Buj i Gelonch

Oracle doesn’t bundle /Library/Internet
Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin/../../../../../Frameworks/JavaVM.framework/JavaVM,
it comes with /Library/Internet
Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin/../lib/server/libjvm.dylib.

I've upload the patch https://gerrit.libreoffice.org/#/c/12057/.

Regards,

Robert

On Mon, Oct 20, 2014 at 4:12 PM, Tor Lillqvist t...@iki.fi wrote:

(Forwarding to the development list.)

On 20 October 2014 16:39, Robert Antoni Buj i Gelonch
robert@gmail.com wrote:

Xcode doesn't include the java framework.

jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx:
/../../../../../Frameworks/*JavaVM*.framework/*JavaVM* //as of
1.6.0_22

You mean that that line used to end up referring to something that came
with an Xcode installation, but was otherwise not present? I do have
a /System/Library/Frameworks/JavaVM.framework. Probably that is what the
above entry was supposed to point to, but as the location of the java
binary changed at some point, that relative path does not work any longer?
Maybe using a relative path here is pointless even? This code is
over-complicated, patches to simplify it are more than welcome;)

We also have the tool /usr/libexec/java_home and work with the output
of /usr/libexec/java_home -V or something similar.

Yep. It is used in configure.ac to set up a JAVA_HOME environment
variable for *build-time* use. Whether that is strictly necessary or not, I
have no idea. (IMHO it might be cleaner if at build-time the same automated
mechanism was used to find the JVM to use as at LibreOffice run-time.)

--tml

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

--
http://about.me/rbuj
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2014-10-21 Thread David Tardon

 sc/source/core/data/drwlayer.cxx |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 166eaf213b3d43e54f2f5206d9680f75f720847f
Author: David Tardon dtar...@redhat.com
Date:   Tue Oct 21 10:05:31 2014 +0200

conversion to double should not be necessary

Change-Id: I12ad83453b68077fe672576680b0cd5fd9acf49f

diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 672c860..c51b58f 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -822,9 +822,13 @@ void ScDrawLayer::RecalcPos( SdrObject* pObj, 
ScDrawObjData rData, bool bNegati
 Size aSizeMove(aNew.Left()-aOld.Left(), 
aNew.Top()-aOld.Top());
 pObj-NbcMove(aSizeMove);
 
-double fXFrac = static_castdouble(aNew.GetWidth()) / 
static_castdouble(aOld.GetWidth());
-double fYFrac = static_castdouble(aNew.GetHeight()) / 
static_castdouble(aOld.GetHeight());
-pObj-NbcResize(aNew.TopLeft(), 
rational_FromDouble(fXFrac), rational_FromDouble(fYFrac));
+boost::rationalsal_Int64 aXFrac;
+boost::rationalsal_Int64 aYFrac;
+if (aOld.GetWidth() != 0)
+aXFrac.assign(aNew.GetWidth(), aOld.GetWidth());
+if (aOld.GetHeight() != 0)
+aYFrac.assign(aNew.GetHeight(), aOld.GetHeight());
+pObj-NbcResize(aNew.TopLeft(), aXFrac, aYFrac);
 }
 // order of these lines is important, modify rData.maLastRect 
carefully it is used as both
 // a value and a flag for initialisation
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Java problem when running CppunitTest_dbaccess_dialog_save on OS X 10.10 with Oracle JDK 1.8

2014-10-21 Thread Robert Antoni Buj i Gelonch

FIX: Oracle doesn’t bundle
JAVA_HOME/../../../../../Frameworks/JavaVM.framework/JavaVM, it comes
with JAVA_HOME/jre/lib/server/libjvm.dylib.

(note that Apple installs under /System/Library, Oracle installs under
/Library)


On Tue, Oct 21, 2014 at 10:21 AM, Robert Antoni Buj i Gelonch 
robert@gmail.com wrote:

 Oracle doesn’t bundle /Library/Internet
 Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin/../../../../../Frameworks/JavaVM.framework/JavaVM,
 it comes with /Library/Internet
 Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin/../lib/server/libjvm.dylib.

 I've upload the patch https://gerrit.libreoffice.org/#/c/12057/.


 Regards,

 Robert

 On Mon, Oct 20, 2014 at 4:12 PM, Tor Lillqvist t...@iki.fi wrote:

 (Forwarding to the development list.)

 On 20 October 2014 16:39, Robert Antoni Buj i Gelonch 
 robert@gmail.com wrote:

 Xcode doesn't include the java framework.

 jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx:
 /../../../../../Frameworks/*JavaVM*.framework/*JavaVM*  //as of
 1.6.0_22

 You mean that that line used to end up referring to something that came
 with an Xcode installation, but was otherwise not present? I do have
 a /System/Library/Frameworks/JavaVM.framework. Probably that is what the
 above entry was supposed to point to, but as the location of the java
 binary changed at some point, that relative path does not work any longer?
 Maybe using a relative path here is pointless even? This code is
 over-complicated, patches to simplify it are more than welcome;)

  We also have the tool /usr/libexec/java_home and work with the
 output of /usr/libexec/java_home -V or something similar.

 Yep. It is used in configure.ac to set up a JAVA_HOME environment
 variable for *build-time* use. Whether that is strictly necessary or not, I
 have no idea. (IMHO it might be cleaner if at build-time the same automated
 mechanism was used to find the JVM to use as at LibreOffice run-time.)

 --tml



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




 --
 http://about.me/rbuj




-- 
http://about.me/rbuj
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2014-10-21 Thread Caolán McNamara

 sd/qa/unit/data/pptx/pass/CVE-2014-4114.ppsx |binary
 sd/qa/unit/filters-test.cxx  |4 
 2 files changed, 4 insertions(+)

New commits:
commit fd92dffe05f6bf5c849df65c03de56ea0b3e7df0
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Oct 21 10:02:39 2014 +0100

add CVE-2014-4114 test

Change-Id: I4d195f5ff7f9dc12747a8748915e82ab06d770fa

diff --git a/sd/qa/unit/data/pptx/fail/.gitignore 
b/sd/qa/unit/data/pptx/fail/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/sd/qa/unit/data/pptx/indeterminate/.gitignore 
b/sd/qa/unit/data/pptx/indeterminate/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/sd/qa/unit/data/pptx/pass/.gitignore 
b/sd/qa/unit/data/pptx/pass/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/sd/qa/unit/data/pptx/pass/CVE-2014-4114.ppsx 
b/sd/qa/unit/data/pptx/pass/CVE-2014-4114.ppsx
new file mode 100644
index 000..ee80cbe
Binary files /dev/null and b/sd/qa/unit/data/pptx/pass/CVE-2014-4114.ppsx differ
diff --git a/sd/qa/unit/filters-test.cxx b/sd/qa/unit/filters-test.cxx
index 1d18531..e0e5905 100644
--- a/sd/qa/unit/filters-test.cxx
+++ b/sd/qa/unit/filters-test.cxx
@@ -84,6 +84,10 @@ void SdFiltersTest::testCVEs()
 getURLFromSrc(/sd/qa/unit/data/ppt/),
 OUString(sdfilt));
 
+testDir(OUString(Impress Office Open XML),
+getURLFromSrc(/sd/qa/unit/data/pptx/),
+OUString(),  (SFX_FILTER_IMPORT | SFX_FILTER_ALIEN | 
SFX_FILTER_STARONEFILTER));
+
 testDir(OUString(impress8),
 getURLFromSrc(/sd/qa/unit/data/odp/),
 OUString(sdfilt));
___
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' - 27/86d200b010a44a41a9453bfb56f0e41358422e

2014-10-21 Thread Caolán McNamara

 27/86d200b010a44a41a9453bfb56f0e41358422e |1 +
 1 file changed, 1 insertion(+)

New commits:
commit da3b2e1d2e55eea436a158d20a0653a1af87c9fe
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Oct 21 10:19:17 2014 +0100

Notes added by 'git notes add'

diff --git a/27/86d200b010a44a41a9453bfb56f0e41358422e 
b/27/86d200b010a44a41a9453bfb56f0e41358422e
new file mode 100644
index 000..8ebbe55
--- /dev/null
+++ b/27/86d200b010a44a41a9453bfb56f0e41358422e
@@ -0,0 +1 @@
+ignore: obsolete
___
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' - 60/3a37eb46a5ed08d3c9c9b342386705cbd00109

2014-10-21 Thread Caolán McNamara

 60/3a37eb46a5ed08d3c9c9b342386705cbd00109 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 32a9a17c0312f96df0dab711cb24ef26ba55078a
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Oct 21 10:21:08 2014 +0100

Notes added by 'git notes add'

diff --git a/60/3a37eb46a5ed08d3c9c9b342386705cbd00109 
b/60/3a37eb46a5ed08d3c9c9b342386705cbd00109
new file mode 100644
index 000..06ce8e8
--- /dev/null
+++ b/60/3a37eb46a5ed08d3c9c9b342386705cbd00109
@@ -0,0 +1 @@
+prefer: 3a897cf0514612137c6b5cb57f8b1e0d9623106f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: unotools/CppunitTest_unotools_fontdefs.mk unotools/qa

2014-10-21 Thread Chris Sherlock

 unotools/CppunitTest_unotools_fontdefs.mk |2 
 unotools/qa/unit/testGetEnglishSearchName.cxx |   64 ++
 unotools/qa/unit/testGetEnlishSearchName.cxx  |   64 --
 3 files changed, 65 insertions(+), 65 deletions(-)

New commits:
commit 23cebb364b6fd57debd31a86975a6ae6f119dd99
Author: Chris Sherlock chris.sherloc...@gmail.com
Date:   Tue Oct 21 20:22:41 2014 +1100

unotools: correct filename spelling - testGetEnglishSearchName.cxx

Change-Id: I9d8bc0b8d9257e8bd2453a0707081c134cc775c3

diff --git a/unotools/CppunitTest_unotools_fontdefs.mk 
b/unotools/CppunitTest_unotools_fontdefs.mk
index 468838b..c96385c 100644
--- a/unotools/CppunitTest_unotools_fontdefs.mk
+++ b/unotools/CppunitTest_unotools_fontdefs.mk
@@ -17,7 +17,7 @@ $(eval $(call gb_CppunitTest_use_api,unotools_fontdefs, \
 ))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,unotools_fontdefs, \
-unotools/qa/unit/testGetEnlishSearchName \
+unotools/qa/unit/testGetEnglishSearchName \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,unotools_fontdefs, \
diff --git a/unotools/qa/unit/testGetEnlishSearchName.cxx 
b/unotools/qa/unit/testGetEnglishSearchName.cxx
similarity index 100%
rename from unotools/qa/unit/testGetEnlishSearchName.cxx
rename to unotools/qa/unit/testGetEnglishSearchName.cxx
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: tracking down reference counting memory leaks

2014-10-21 Thread Noel Grandin




On 2014-10-20 06:27 PM, Michael Stahl wrote:

there are 2 ways i've tried to track down the 2 leaking acquire()s:

1. instrument the acquire()/release() method and run the test in gdb,
the script just takes 2 minutes to run (90 seconds of which are spent in
a single regex) but unfortunately printing 4000 stack traces with gdb
takes  3 hours on my laptop; probably that can be sped up by disabling


The backtrace API in GLIBC would speed this up considerably
http://www.gnu.org/software/libc/manual/html_node/Backtraces.html



2. instrument the uno::Reference class so that every acquire()/release()

... is the gerrit patch; it can detect only uno::Reference leaks, but
requires further work to detect rtl::Reference, uno::Any (and maybe
uno::Sequence and whatever other weird things?) too.



But I think this approach is much nicer. Very neat!

Perhaps we could compile it in for --enable-dbgutl
but only activate it when doing the valgrind run, perhaps with some sort of 
environment flag?

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

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

2014-10-21 Thread Caolán McNamara

 svx/uiconfig/ui/floatingundoredo.ui |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a2f80c9436faaace2cdabbc58be4e2e200f4ae3f
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Oct 21 11:34:24 2014 +0100

Related: fdo#84676 make the undo popup not center under windows

Change-Id: Idef87a0ec74b7da4779a34ec2c18e7243eb328ac

diff --git a/svx/uiconfig/ui/floatingundoredo.ui 
b/svx/uiconfig/ui/floatingundoredo.ui
index 66f30a6..10491f8 100644
--- a/svx/uiconfig/ui/floatingundoredo.ui
+++ b/svx/uiconfig/ui/floatingundoredo.ui
@@ -3,6 +3,7 @@
 interface
   requires lib=gtk+ version=3.0/
   object class=GtkWindow id=FloatingUndoRedo:border
+property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=hexpandTrue/property
 property name=vexpandTrue/property
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-21 Thread Stephan Bergmann

 include/sfx2/objface.hxx |2 --
 include/sfx2/shell.hxx   |5 +
 2 files changed, 1 insertion(+), 6 deletions(-)

New commits:
commit e73ee8db850f292aadbc2c7c853c6b4fb1dd5100
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Oct 21 12:35:49 2014 +0200

Remove unused SfxInterface::GetResManager_Impl

Change-Id: Ia9ad8072b07f0121af18377445c90480ff7c2600

diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx
index 35d9357..8a83741 100644
--- a/include/sfx2/objface.hxx
+++ b/include/sfx2/objface.hxx
@@ -93,8 +93,6 @@ public:
 
 SAL_DLLPRIVATE bool ContainsSlot_Impl( const SfxSlot *pSlot ) const
 { return pSlot = pSlots  pSlot  pSlots + 
Count(); }
-SAL_DLLPRIVATE ResMgr*  GetResManager_Impl() const
-{ return aNameResId.GetResMgr(); }
 };
 
 
commit 5309cab855f2ccd129de97834d781524e2aa961e
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Oct 21 12:35:30 2014 +0200

Remove unused pSfxFormalArgs_Impl

Change-Id: I0c1e8c42fd03bd861323cbff172031f5405c1597

diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index c574b6f..05c5e48 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx
@@ -567,12 +567,10 @@ inline void SfxShell::SetPool
 pPool = pNewPool;
 }
 
-#define SFX_SLOTMAP(ShellClass) static SfxFormalArgument 
a##ShellClass##Args_Impl[1]; \
-static SfxSlot a##ShellClass##Slots_Impl[] =
+#define SFX_SLOTMAP(ShellClass) static SfxSlot a##ShellClass##Slots_Impl[] =
 
 #define SFX_DECL_INTERFACE(nId) \
 static SfxInterface*pInterface; \
-static const SfxFormalArgument* pSfxFormalArgs_Impl;\
 static SfxInterface*GetStaticInterface();   \
 static SfxInterfaceId   GetInterfaceId() {return 
SfxInterfaceId(nId);} \
 static void RegisterInterface(SfxModule* 
pMod=NULL); \
@@ -581,7 +579,6 @@ inline void SfxShell::SetPool
 #define SFX_IMPL_INTERFACE(Class,SuperClass,NameResId)  \
 \
 SfxInterface* Class::pInterface = 0;\
-const SfxFormalArgument* Class::pSfxFormalArgs_Impl = a##Class##Args_Impl;\
 SfxInterface* Class::GetStaticInterface()  \
 {   \
 if ( !pInterface )  \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

1 2 3 4 >

1 - 100 of 312 matches

Mail list logo