cppuhelper/source/interfacecontainer.cxx | 10 +---------
vcl/source/filter/graphicfilter.cxx | 6 ------
vcl/source/window/paint.cxx | 5 +++--
3 files changed, 4 insertions(+), 17 deletions(-)
New commits:
commit c91feb2f7e9928ac365f5f51429d9c20bef378a0
Author: Noel Grandin <n...@peralex.com>
Date: Wed Dec 2 08:58:08 2015 +0200
fix Android build
after
commit 630ec7110ec822d1d380d5181bcbb2570a129a21
"tdf#92925 Remove XPM export"
and
commit 9027629b0e09b3b024a5821bb791308039bb5d8b
"tdf#92925 Remove RAS export"
Change-Id: I2b4e078530462fbab58aa3ce0e841d25437280f2
diff --git a/vcl/source/filter/graphicfilter.cxx
b/vcl/source/filter/graphicfilter.cxx
index fd9ffda..58484fe 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -1828,8 +1828,6 @@ extern "C" bool epbGraphicExport( SvStream& rStream,
Graphic& rGraphic, FilterCo
extern "C" bool epgGraphicExport( SvStream& rStream, Graphic& rGraphic,
FilterConfigItem* pConfigItem );
extern "C" bool eppGraphicExport( SvStream& rStream, Graphic& rGraphic,
FilterConfigItem* pConfigItem );
extern "C" bool epsGraphicExport( SvStream& rStream, Graphic& rGraphic,
FilterConfigItem* pConfigItem );
-extern "C" bool eptGraphicExport( SvStream& rStream, Graphic& rGraphic,
FilterConfigItem* pConfigItem );
-extern "C" bool eraGraphicExport( SvStream& rStream, Graphic& rGraphic,
FilterConfigItem* pConfigItem );
extern "C" bool etiGraphicExport( SvStream& rStream, Graphic& rGraphic,
FilterConfigItem* pConfigItem );
extern "C" bool expGraphicExport( SvStream& rStream, Graphic& rGraphic,
FilterConfigItem* pConfigItem );
@@ -2131,10 +2129,6 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic&
rGraphic, const OUString
pFunc =
reinterpret_cast<PFilterCall>(aLibrary.getFunctionSymbol("eppGraphicExport"));
else if (tmpFilterName == "eps")
pFunc =
reinterpret_cast<PFilterCall>(aLibrary.getFunctionSymbol("epsGraphicExport"));
- else if (tmpFilterName == "ept")
- pFunc =
reinterpret_cast<PFilterCall>(aLibrary.getFunctionSymbol("eptGraphicExport"));
- else if (tmpFilterName == "era")
- pFunc =
reinterpret_cast<PFilterCall>(aLibrary.getFunctionSymbol("eraGraphicExport"));
else if (tmpFilterName == "eti")
pFunc =
reinterpret_cast<PFilterCall>(aLibrary.getFunctionSymbol("etiGraphicExport"));
else if (tmpFilterName == "exp")
commit 7e9bdfe60784d49ab7d6ffe8df256834d39e1234
Author: Noel Grandin <n...@peralex.com>
Date: Tue Dec 1 14:55:35 2015 +0200
small optimisation in paint
no need to instantiate PaintHelper unless we are going to use it
Change-Id: I911f5f49ab566b33114a092823b89f91f4ab297a
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 6402639..c1722d2 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -601,10 +601,11 @@ void Window::ImplCallPaint(const vcl::Region* pRegion,
sal_uInt16 nPaintFlags)
nPaintFlags = mpWindowImpl->mnPaintFlags & ~(IMPL_PAINT_PAINT);
- PaintHelper aHelper(this, nPaintFlags);
-
if (mpWindowImpl->mnPaintFlags & IMPL_PAINT_PAINT)
+ {
+ PaintHelper aHelper(this, nPaintFlags);
aHelper.DoPaint(pRegion);
+ }
else
mpWindowImpl->mnPaintFlags = 0;
}
commit 947cc1b53a5c87431202811e231cbfad790c6e68
Author: Noel Grandin <n...@peralex.com>
Date: Tue Dec 1 12:30:38 2015 +0200
inline one-liner static method
Change-Id: I9e0bd7a34ed691b245738dd66ff5ba7cc879ebe5
diff --git a/cppuhelper/source/interfacecontainer.cxx
b/cppuhelper/source/interfacecontainer.cxx
index c824007..9d4a2ac 100644
--- a/cppuhelper/source/interfacecontainer.cxx
+++ b/cppuhelper/source/interfacecontainer.cxx
@@ -37,14 +37,6 @@ using namespace com::sun::star::lang;
namespace cppu
{
/**
- * Reallocate the sequence.
- */
-static void realloc( Sequence< Reference< XInterface > > & rSeq, sal_Int32
nNewLen )
-{
- rSeq.realloc( nNewLen );
-}
-
-/**
* Remove an element from an interface sequence.
*/
static void sequenceRemoveElementAt( Sequence< Reference< XInterface > > &
rSeq, sal_Int32 index )
@@ -211,7 +203,7 @@ sal_Int32 OInterfaceContainerHelper::addInterface( const
Reference<XInterface> &
if( bIsList )
{
sal_Int32 nLen = aData.pAsSequence->getLength();
- realloc( *aData.pAsSequence, nLen +1 );
+ aData.pAsSequence->realloc( nLen +1 );
aData.pAsSequence->getArray()[ nLen ] = rListener;
return nLen +1;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
