accessibility/source/standard/vclxaccessibletoolboxitem.cxx
| 8
android/Bootstrap/src/org/libreoffice/kit/Document.java
| 3
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
| 2
bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
| 4
bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
| 5
bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
| 6
bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
| 5
bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
| 6
bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
| 1
bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
| 6
bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
| 1
bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
| 6
bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx
| 6
bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
| 5
bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
| 1
bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
| 6
bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
| 6
bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
| 6
bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx
| 6
bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
| 6
bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
| 6
bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
| 6
bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
| 1
bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
| 5
bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
| 6
bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
| 6
bridges/source/cpp_uno/mingw_intel/except.cxx
| 6
bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx
| 1
bridges/source/cpp_uno/mingw_x86-64/except.cxx
| 6
bridges/source/cpp_uno/msvc_win32_intel/except.cxx
| 5
bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
| 5
bridges/source/cpp_uno/shared/vtablefactory.cxx
| 4
bridges/test/java_uno/any/transport.cxx
| 2
comphelper/source/misc/random.cxx
| 21 -
compilerplugins/clang/cstylecast.cxx
| 8
connectivity/source/drivers/hsqldb/HStorageAccess.cxx
| 21 -
connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
| 7
connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
| 15
connectivity/source/inc/hsqldb/HStorageAccess.h
| 116 -------
connectivity/source/inc/hsqldb/HStorageAccess.hxx
| 4
connectivity/source/inc/hsqldb/StorageFileAccess.h
| 58 ---
connectivity/source/inc/hsqldb/StorageNativeInputStream.h
| 91 -----
cui/source/customize/cfg.cxx
| 6
cui/uiconfig/ui/movemenu.ui
| 10
cui/uiconfig/ui/namedialog.ui
| 9
dbaccess/source/filter/xml/xmlExport.cxx
| 18 -
dbaccess/source/filter/xml/xmlExport.hxx
| 2
desktop/source/lib/init.cxx
| 12
desktop/source/lib/lokandroid.cxx
| 7
desktop/source/splash/splash.cxx
| 4
drawinglayer/source/primitive2d/polygonprimitive2d.cxx
| 3
editeng/source/xml/xmltxtexp.cxx
| 2
external/openssl/UnpackedTarball_openssl.mk
| 1
external/openssl/ubsan.patch.0
| 10
external/python3/UnpackedTarball_python3.mk
| 1
external/python3/ubsan.patch.0
| 22 +
filter/source/svg/svgexport.cxx
| 2
filter/source/xslt/import/uof/uof2odf_presentation.xsl
| 4
framework/inc/uielement/uielement.hxx
| 6
framework/source/fwe/classes/addonsoptions.cxx
| 51 +--
framework/source/layoutmanager/layoutmanager.cxx
| 2
framework/source/layoutmanager/toolbarlayoutmanager.cxx
| 4
include/LibreOfficeKit/LibreOfficeKit.h
| 4
include/LibreOfficeKit/LibreOfficeKit.hxx
| 6
include/comphelper/random.hxx
| 2
include/o3tl/typed_flags_set.hxx
| 39 ++
include/rsc/rsc-vcl-shared-types.hxx
| 6
include/svx/xflclit.hxx
| 2
include/vcl/ITiledRenderable.hxx
| 4
include/vcl/salnativewidgets.hxx
| 37 +-
include/vcl/seleng.hxx
| 54 +--
include/vcl/toolbox.hxx
| 2
include/xmloff/XMLTextTableContext.hxx
| 3
include/xmloff/shapeexport.hxx
| 85 ++---
include/xmloff/txtparae.hxx
| 3
include/xmloff/txtprmap.hxx
| 28 -
include/xmloff/xmlerror.hxx
| 16
include/xmloff/xmlexp.hxx
| 49 +-
include/xmloff/xmlexppr.hxx
| 36 +-
include/xmloff/xmlimp.hxx
| 41 +-
jurt/source/pipe/staticsalhack.cxx
| 7
linguistic/source/convdicxml.hxx
| 2
reportdesign/source/filter/xml/xmlExport.cxx
| 44 +-
reportdesign/source/filter/xml/xmlExport.hxx
| 2
reportdesign/source/filter/xml/xmlfilter.cxx
| 18 -
reportdesign/source/filter/xml/xmlfilter.hxx
| 2
rsc/inc/rscdb.hxx
| 3
rsc/source/parser/rscicpx.cxx
| 6
sal/rtl/string.cxx
| 9
sal/rtl/ustring.cxx
| 9
sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
| 2
sc/source/filter/xml/XMLTableShapeResizer.cxx
| 2
sc/source/filter/xml/xmlexprt.cxx
| 46 +-
sc/source/filter/xml/xmlexprt.hxx
| 2
sc/source/filter/xml/xmlfonte.cxx
| 2
sc/source/filter/xml/xmlimprt.cxx
| 44 +-
sc/source/filter/xml/xmlimprt.hxx
| 2
sc/source/filter/xml/xmlstyle.cxx
| 2
sc/source/filter/xml/xmlstyle.hxx
| 2
sc/source/filter/xml/xmlwrap.cxx
| 2
sc/source/ui/cctrl/checklistmenu.cxx
| 14
scaddins/source/analysis/analysis.cxx
| 3
sd/Library_sd.mk
| 1
sd/source/ui/dlg/sdabstdlg.cxx
| 2
sfx2/source/doc/templatedlg.cxx
| 4
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
| 3
starmath/source/mathmlexport.cxx
| 16
starmath/source/mathmlexport.hxx
| 2
starmath/source/mathmlimport.cxx
| 8
starmath/source/mathmlimport.hxx
| 2
svtools/source/contnr/svimpbox.cxx
| 2
svtools/source/contnr/svlbitm.cxx
| 10
svtools/source/contnr/treelistbox.cxx
| 4
svtools/source/control/headbar.cxx
| 10
svtools/source/control/tabbar.cxx
| 2
svtools/source/control/toolbarmenu.cxx
| 18 -
svtools/source/toolpanel/paneltabbar.cxx
| 10
svx/Library_svxcore.mk
| 1
svx/source/form/dbtoolsclient.cxx
| 2
svx/source/xml/xmlxtexp.cxx
| 2
svx/source/xml/xmlxtimp.cxx
| 2
svx/source/xoutdev/xattr.cxx
| 8
svx/uiconfig/ui/floatingcontour.ui
| 3
sw/Library_sw.mk
| 2
sw/inc/unotxdoc.hxx
| 1
sw/source/core/docnode/nodedump.cxx
| 7
sw/source/core/draw/dview.cxx
| 6
sw/source/core/swg/SwXMLBlockImport.cxx
| 4
sw/source/filter/ww8/README-rtf.txt
| 2
sw/source/filter/xml/xmlexp.cxx
| 40 +-
sw/source/filter/xml/xmlexp.hxx
| 2
sw/source/filter/xml/xmlexpit.cxx
| 24 -
sw/source/filter/xml/xmlexpit.hxx
| 20 -
sw/source/filter/xml/xmlfmte.cxx
| 16
sw/source/filter/xml/xmlfonte.cxx
| 2
sw/source/filter/xml/xmlimp.cxx
| 30 -
sw/source/filter/xml/xmlimp.hxx
| 2
sw/source/filter/xml/xmliteme.cxx
| 4
sw/source/filter/xml/xmlmeta.cxx
| 2
sw/source/filter/xml/xmltble.cxx
| 4
sw/source/filter/xml/xmltexte.cxx
| 12
sw/source/uibase/config/StoredChapterNumbering.cxx
| 2
sw/source/uibase/dbui/mailmergechildwindow.cxx
| 2
sw/source/uibase/dbui/swdbtoolsclient.cxx
| 2
sw/source/uibase/dialog/swabstdlg.cxx
| 2
sw/source/uibase/uno/unotxdoc.cxx
| 16
toolkit/Library_tk.mk
| 1
toolkit/source/awt/vclxtoolkit.cxx
| 2
vcl/Executable_vcldemo.mk
| 7
vcl/Library_vcl.mk
| 4
vcl/inc/svdata.hxx
| 4
vcl/osx/salnativewidgets.cxx
| 96 ++---
vcl/source/app/help.cxx
| 2
vcl/source/app/svapp.cxx
| 2
vcl/source/control/button.cxx
| 76 ++--
vcl/source/control/combobox.cxx
| 8
vcl/source/control/edit.cxx
| 2
vcl/source/control/ilstbox.cxx
| 12
vcl/source/control/lstbox.cxx
| 10
vcl/source/control/scrbar.cxx
| 74 ++--
vcl/source/control/slider.cxx
| 8
vcl/source/control/spinfld.cxx
| 38 +-
vcl/source/control/tabctrl.cxx
| 20 -
vcl/source/filter/jpeg/jpegc.cxx
| 2
vcl/source/outdev/nativecontrols.cxx
| 2
vcl/source/window/abstdlg.cxx
| 3
vcl/source/window/brdwin.cxx
| 12
vcl/source/window/builder.cxx
| 2
vcl/source/window/decoview.cxx
| 6
vcl/source/window/dockingarea.cxx
| 2
vcl/source/window/menu.cxx
| 30 -
vcl/source/window/menubarwindow.cxx
| 12
vcl/source/window/menufloatingwindow.cxx
| 6
vcl/source/window/paint.cxx
| 4
vcl/source/window/seleng.cxx
| 106 +++---
vcl/source/window/status.cxx
| 8
vcl/source/window/tabpage.cxx
| 6
vcl/source/window/toolbox.cxx
| 36 +-
vcl/source/window/toolbox2.cxx
| 6
vcl/source/window/window.cxx
| 2
vcl/unx/generic/plugadapt/salplug.cxx
| 4
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
| 78 ++--
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
| 16
vcl/unx/kde/salnativewidgets-kde.cxx
| 66 ++--
vcl/unx/kde4/KDESalGraphics.cxx
| 28 -
vcl/win/source/gdi/salnativewidgets-luna.cxx
| 164 +++++-----
vcl/workben/vcldemo.cxx
| 56 ++-
xmloff/inc/MetaExportComponent.hxx
| 2
xmloff/inc/SchXMLExport.hxx
| 2
xmloff/inc/SchXMLImport.hxx
| 2
xmloff/inc/XMLChartPropertySetMapper.hxx
| 2
xmloff/qa/unit/uxmloff.cxx
| 2
xmloff/source/chart/PropertyMaps.cxx
| 4
xmloff/source/chart/SchXMLExport.cxx
| 18 -
xmloff/source/chart/SchXMLImport.cxx
| 12
xmloff/source/chart/contexts.cxx
| 8
xmloff/source/core/xmlexp.cxx
| 120 +++----
xmloff/source/core/xmlimp.cxx
| 16
xmloff/source/draw/animationexport.cxx
| 2
xmloff/source/draw/animationimport.cxx
| 2
xmloff/source/draw/sdpropls.cxx
| 14
xmloff/source/draw/sdpropls.hxx
| 4
xmloff/source/draw/sdxmlexp.cxx
| 70 ++--
xmloff/source/draw/sdxmlexp_impl.hxx
| 2
xmloff/source/draw/sdxmlimp.cxx
| 36 +-
xmloff/source/draw/sdxmlimp_impl.hxx
| 2
xmloff/source/draw/shapeexport.cxx
| 144 ++++----
xmloff/source/draw/ximpshap.cxx
| 2
xmloff/source/forms/elementexport.cxx
| 4
xmloff/source/forms/layerimport.cxx
| 2
xmloff/source/meta/MetaExportComponent.cxx
| 8
xmloff/source/style/PageMasterExportPropMapper.cxx
| 2
xmloff/source/style/PageMasterExportPropMapper.hxx
| 2
xmloff/source/style/XMLFontAutoStylePool.cxx
| 46 ++
xmloff/source/style/XMLPageExport.cxx
| 2
xmloff/source/style/impastpl.cxx
| 6
xmloff/source/style/styleexp.cxx
| 6
xmloff/source/style/xmlaustp.cxx
| 4
xmloff/source/style/xmlexppr.cxx
| 16
xmloff/source/text/XMLAutoTextEventExport.cxx
| 8
xmloff/source/text/XMLAutoTextEventExport.hxx
| 2
xmloff/source/text/XMLTextListAutoStylePool.cxx
| 4
xmloff/source/text/txtexppr.cxx
| 4
xmloff/source/text/txtexppr.hxx
| 2
xmloff/source/text/txtflde.cxx
| 4
xmloff/source/text/txtimp.cxx
| 22 -
xmloff/source/text/txtparae.cxx
| 36 +-
xmloff/source/text/txtprmap.cxx
| 30 -
xmloff/source/text/txtstyle.cxx
| 4
229 files changed, 1692 insertions(+), 1640 deletions(-)
New commits:
commit 18ad91eec1a1c23d676355d1270fe4b7b503d262
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Jan 6 11:19:31 2015 +0000
boost::random->std::random
Change-Id: I1b823b6c17b731e427bff88c6fff7897f66ddb5c
diff --git a/comphelper/source/misc/random.cxx
b/comphelper/source/misc/random.cxx
index 4da4acb..4a96b59 100644
--- a/comphelper/source/misc/random.cxx
+++ b/comphelper/source/misc/random.cxx
@@ -10,12 +10,13 @@
* Copyright (C) 2012 Tino Kluge <tino.kl...@hrz.tu-chemnitz.de>
*/
-#include <boost/random.hpp>
#include <comphelper/random.hxx>
#include <rtl/instance.hxx>
+#include <assert.h>
+#include <random>
// this is nothing but a simple wrapper around
-// the boost random generators
+// the std::random generators
namespace comphelper
{
@@ -23,21 +24,21 @@ namespace rng
{
// underlying random number generator
-// boost::mt19937 implements the Mersenne twister algorithm which
+// std::mt19937 implements the Mersenne twister algorithm which
// is fast and has good statistical properties, it produces integers
// in the range of [0, 2^32-1] internally
// memory requirement: 625*sizeof(uint32_t)
// http://en.wikipedia.org/wiki/Mersenne_twister
-#define BOOST_RNG_ALGO boost::mt19937
+#define STD_RNG_ALGO std::mt19937
struct RandomNumberGenerator
{
- BOOST_RNG_ALGO global_rng;
+ STD_RNG_ALGO global_rng;
RandomNumberGenerator()
{
// initialises the state of the global random number generator
// should only be called once.
- // (note, a few boost::variate_generator<> (like normal) have their
+ // (note, a few std::variate_generator<> (like normal) have their
// own state which would need a reset as well to guarantee identical
// sequence of numbers, e.g. via myrand.distribution().reset())
global_rng.seed(time(NULL));
@@ -55,21 +56,21 @@ void reseed(int i)
// uniform ints [a,b] distribution
int uniform_int_distribution(int a, int b)
{
- boost::random::uniform_int_distribution<int> dist(a, b);
+ std::uniform_int_distribution<int> dist(a, b);
return dist(theRandomNumberGenerator::get().global_rng);
}
// uniform ints [a,b] distribution
unsigned int uniform_uint_distribution(unsigned int a, unsigned int b)
{
- boost::random::uniform_int_distribution<unsigned int> dist(a, b);
+ std::uniform_int_distribution<unsigned int> dist(a, b);
return dist(theRandomNumberGenerator::get().global_rng);
}
// uniform size_t [a,b] distribution
size_t uniform_size_distribution(size_t a, size_t b)
{
- boost::random::uniform_int_distribution<size_t> dist(a, b);
+ std::uniform_int_distribution<size_t> dist(a, b);
return dist(theRandomNumberGenerator::get().global_rng);
}
@@ -77,7 +78,7 @@ size_t uniform_size_distribution(size_t a, size_t b)
double uniform_real_distribution(double a, double b)
{
assert(a < b);
- boost::random::uniform_real_distribution<double> dist(a, b);
+ std::uniform_real_distribution<double> dist(a, b);
return dist(theRandomNumberGenerator::get().global_rng);
}
commit f86a1dbf2a6761b23f9430b6bc61e789190290c9
Author: David Tardon <dtar...@redhat.com>
Date: Tue Jan 6 16:09:35 2015 +0100
fdo#78921 save embedded fonts in Flat ODF
Change-Id: I9d8614a5c20bab8e3b3d7c40e2504348c4386b64
diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx
b/xmloff/source/style/XMLFontAutoStylePool.cxx
index 813f010..0441001 100644
--- a/xmloff/source/style/XMLFontAutoStylePool.cxx
+++ b/xmloff/source/style/XMLFontAutoStylePool.cxx
@@ -31,7 +31,9 @@
#include <com/sun/star/embed/ElementModes.hpp>
#include <com/sun/star/embed/XTransactedObject.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/ucb/SimpleFileAccess.hpp>
+#include "XMLBase64Export.hxx"
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -217,6 +219,25 @@ OUString XMLFontAutoStylePool::Find(
return sName;
}
+namespace
+{
+
+OUString lcl_checkFontFile( const OUString &fileUrl )
+{
+ osl::DirectoryItem aDirItem;
+ if( osl::DirectoryItem::get( fileUrl, aDirItem ) == osl::File::E_None )
+ {
+ osl::FileStatus aStatus( osl_FileStatus_Mask_Type );
+ if( aDirItem.getFileStatus( aStatus ) == osl::File::E_None )
+ {
+ if( !aStatus.isDirectory() )
+ return fileUrl;
+ }
+ }
+ return OUString();
+}
+
+}
void XMLFontAutoStylePool::exportXML()
{
@@ -272,6 +293,7 @@ void XMLFontAutoStylePool::exportXML()
if( tryToEmbedFonts )
{
+ const bool bExportFlat( GetExport().getExportFlags() &
SvXMLExportFlags::EMBEDDED );
std::vector< OUString > fileUrls;
static const FontWeight weight[] = { WEIGHT_NORMAL, WEIGHT_BOLD,
WEIGHT_NORMAL, WEIGHT_BOLD };
static const FontItalic italic[] = { ITALIC_NONE, ITALIC_NONE,
ITALIC_NORMAL, ITALIC_NORMAL };
@@ -289,7 +311,7 @@ void XMLFontAutoStylePool::exportXML()
continue;
if( !fontFilesMap.count( fileUrl ))
{
- OUString docUrl = embedFontFile( fileUrl );
+ const OUString docUrl = bExportFlat ? lcl_checkFontFile(
fileUrl ) : embedFontFile( fileUrl );
if( !docUrl.isEmpty())
fontFilesMap[ fileUrl ] = docUrl;
else
@@ -307,11 +329,29 @@ void XMLFontAutoStylePool::exportXML()
{
if( fontFilesMap.count( *it ))
{
- GetExport().AddAttribute( XML_NAMESPACE_XLINK,
XML_HREF, fontFilesMap[ *it ] );
- GetExport().AddAttribute( XML_NAMESPACE_XLINK,
XML_TYPE, "simple" );
+ if( !bExportFlat )
+ {
+ GetExport().AddAttribute( XML_NAMESPACE_XLINK,
XML_HREF, fontFilesMap[ *it ] );
+ GetExport().AddAttribute( XML_NAMESPACE_XLINK,
XML_TYPE, "simple" );
+ }
SvXMLElementExport fontFaceUri( GetExport(),
XML_NAMESPACE_SVG,
XML_FONT_FACE_URI, true, true );
+ if( bExportFlat )
+ {
+ const uno::Reference< ucb::XSimpleFileAccess >
xFileAccess( ucb::SimpleFileAccess::create( GetExport().getComponentContext() )
);
+ try
+ {
+ const uno::Reference< io::XInputStream >
xInput( xFileAccess->openFileRead( fontFilesMap[ *it ] ) );
+ XMLBase64Export aBase64Exp( GetExport() );
+ aBase64Exp.exportOfficeBinaryDataElement(
xInput );
+ }
+ catch( const uno::Exception & )
+ {
+ // opening the file failed, ignore
+ }
+ }
+
GetExport().AddAttribute( XML_NAMESPACE_SVG,
XML_STRING, "truetype" );
SvXMLElementExport fontFaceFormat( GetExport(),
XML_NAMESPACE_SVG,
XML_FONT_FACE_FORMAT, true, true );
commit ca1fb20a47d68caeb8ff5a658c5f365c10e56b59
Author: Michael Meeks <michael.me...@collabora.com>
Date: Tue Jan 6 15:09:53 2015 +0000
vcldemo: add threading mode.
Change-Id: I6ad5524c518a79cac7ec343398242515ef0bbb5f
diff --git a/vcl/Executable_vcldemo.mk b/vcl/Executable_vcldemo.mk
index 44f13b2..9d2e55e 100644
--- a/vcl/Executable_vcldemo.mk
+++ b/vcl/Executable_vcldemo.mk
@@ -25,12 +25,13 @@ $(eval $(call gb_Executable_set_include,vcldemo,\
$(eval $(call gb_Executable_use_libraries,vcldemo,\
basegfx \
+ comphelper \
+ cppu \
+ cppuhelper \
tl \
sal \
+ salhelper \
vcl \
- cppu \
- cppuhelper \
- comphelper \
))
$(eval $(call gb_Executable_add_exception_objects,vcldemo,\
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index b42ef14..b4e5ed6 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -17,6 +17,7 @@
#include <vcl/vclmain.hxx>
#include <vcl/layout.hxx>
+#include <salhelper/thread.hxx>
#include <tools/urlobj.hxx>
#include <tools/stream.hxx>
@@ -1196,16 +1197,42 @@ class DemoWin : public WorkWindow
{
DemoRenderer &mrRenderer;
bool underTesting;
+ bool testThreads;
+
+ class RenderThread : public salhelper::Thread {
+ DemoWin &mrWin;
+ public:
+ RenderThread(DemoWin &rWin)
+ : Thread("vcldemo render thread")
+ , mrWin(rWin)
+ {
+ launch();
+ }
+ virtual ~RenderThread()
+ {
+ join();
+ }
+ virtual void execute()
+ {
+ SolarMutexGuard aGuard;
+ fprintf (stderr, "render from a different thread\n");
+ mrWin.Paint(Rectangle());
+ }
+ };
+ rtl::Reference<RenderThread> mxThread;
+
public:
- DemoWin(DemoRenderer &rRenderer) :
+ DemoWin(DemoRenderer &rRenderer, bool bThreads) :
WorkWindow(NULL, WB_APP | WB_STDWORK),
- mrRenderer(rRenderer)
+ mrRenderer(rRenderer),
+ testThreads(bThreads)
{
mrRenderer.addInvalidate(this);
underTesting = false;
}
virtual ~DemoWin()
{
+ mxThread.clear();
mrRenderer.removeInvalidate(this);
}
virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE
@@ -1213,9 +1240,16 @@ public:
mrRenderer.SetSizePixel(GetSizePixel());
if (!mrRenderer.MouseButtonDown(rMEvt))
{
- DemoWin *pNewWin = new DemoWin(mrRenderer);
- pNewWin->SetText("Another interactive VCL demo window");
- pNewWin->Show();
+ if (testThreads)
+ { // render this window asynchronously in a new thread
+ mxThread = new RenderThread(*this);
+ }
+ else
+ { // spawn another window
+ DemoWin *pNewWin = new DemoWin(mrRenderer, testThreads);
+ pNewWin->SetText("Another interactive VCL demo window");
+ pNewWin->Show();
+ }
}
}
virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE
@@ -1314,7 +1348,8 @@ class DemoApp : public Application
fprintf(stderr," %s\n",
rtl::OUStringToOString(aRenderers,
RTL_TEXTENCODING_UTF8).getStr());
fprintf(stderr," --test <iterCount> - create benchmark data\n");
- fprintf(stderr, " --widgets - launch the widget test.\n");
+ fprintf(stderr," --widgets - launch the widget test.\n");
+ fprintf(stderr," --threads - render from multiple
threads.\n");
fprintf(stderr, "\n");
return 0;
}
@@ -1326,7 +1361,7 @@ public:
{
try
{
- bool bWidgets = false;
+ bool bWidgets = false, bThreads = false;
DemoRenderer aRenderer;
for (sal_Int32 i = 0; i < GetCommandLineParamCount(); i++)
@@ -1351,9 +1386,11 @@ public:
}
else if (aArg == "--widgets")
bWidgets = true;
+ else if (aArg == "--threads")
+ bThreads = true;
}
- DemoWin aMainWin(aRenderer);
+ DemoWin aMainWin(aRenderer, bThreads);
boost::scoped_ptr<DemoWidgets> aWidgets;
aMainWin.SetText("Interactive VCL demo #1");
commit 2005e34177503cc160348c4d63d70bfeab10d531
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
Date: Tue Jan 6 23:53:39 2015 +0900
android: set single page mode in writer when init for tiled render
Change-Id: Id01b373fe7ec6620ca036b1ee7bc5debf64a92b4
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
index 513d13d..e1aeba3 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
@@ -66,6 +66,8 @@ public class LOKitTileProvider implements TileProvider {
}
public void postLoad() {
+ mDocument.initializeForRendering();
+
int parts = mDocument.getParts();
Log.i(LOGTAG, "Document parts: " + parts);
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index de1507b..16a8a14 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -441,6 +441,7 @@ public:
long nTileWidth,
long nTileHeight ) SAL_OVERRIDE;
virtual Size getDocumentSize() SAL_OVERRIDE;
+ virtual void initializeForTiledRendering() SAL_OVERRIDE;
void Invalidate();
void Reactivate(SwDocShell* pNewDocShell);
diff --git a/sw/source/uibase/uno/unotxdoc.cxx
b/sw/source/uibase/uno/unotxdoc.cxx
index d504fc0..a3493bf 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -3146,6 +3146,17 @@ Size SwXTextDocument::getDocumentSize()
aDocSize.Height() + 2L * DOCUMENTBORDER);
}
+void SwXTextDocument::initializeForTiledRendering()
+{
+ bool bBookMode = false;
+ sal_Int16 nColumns = 1;
+
+ SwView* pView = pDocShell->GetView();
+ if (!pView)
+ return;
+ pView->SetViewLayout(nColumns, bBookMode, true);
+}
+
void * SAL_CALL SwXTextDocument::operator new( size_t t) throw()
{
return SwXTextDocumentBaseClass::operator new(t);
commit 83e84b9a22f959d2feae7ac89ec5a0b0ef678770
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
Date: Tue Jan 6 23:07:42 2015 +0900
android: take document borders into account for document size
Change-Id: I62b0afd635b439653850a3d830de032006505bac
diff --git a/sw/source/uibase/uno/unotxdoc.cxx
b/sw/source/uibase/uno/unotxdoc.cxx
index ea3683f..d504fc0 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -3140,7 +3140,10 @@ Size SwXTextDocument::getDocumentSize()
{
SwDoc* pDoc = pDocShell->GetDoc();
SwViewShell* pViewShell =
pDoc->getIDocumentLayoutAccess().GetCurrentViewShell();
- return pViewShell->GetDocSize();
+ Size aDocSize = pViewShell->GetDocSize();
+
+ return Size(aDocSize.Width() + 2L * DOCUMENTBORDER,
+ aDocSize.Height() + 2L * DOCUMENTBORDER);
}
void * SAL_CALL SwXTextDocument::operator new( size_t t) throw()
commit 6123d6a9fbb268f823224d054cb0fe215aa3015a
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
Date: Mon Dec 29 16:10:48 2014 +0900
android: Add initializeForRendering to LOK
Change-Id: Ibf4721bf4358ef215efde09ef688b2551604bfa2
diff --git a/android/Bootstrap/src/org/libreoffice/kit/Document.java
b/android/Bootstrap/src/org/libreoffice/kit/Document.java
index aad4d5a..e415d8f 100644
--- a/android/Bootstrap/src/org/libreoffice/kit/Document.java
+++ b/android/Bootstrap/src/org/libreoffice/kit/Document.java
@@ -59,4 +59,7 @@ public class Document {
public void paintTile(ByteBuffer buffer, int canvasWidth, int
canvasHeight, int tilePositionX, int tilePositionY, int tileWidth, int
tileHeight) {
paintTileNative(buffer, canvasWidth, canvasHeight, tilePositionX,
tilePositionY, tileWidth, tileHeight);
}
+
+ public native void initializeForRendering();
+
}
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index b3593d0..8a8538e 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -197,6 +197,8 @@ void doc_paintTile(LibreOfficeKitDocument* pThis,
static void doc_getDocumentSize(LibreOfficeKitDocument* pThis,
long* pWidth,
long* pHeight);
+static void doc_initializeForRendering(LibreOfficeKitDocument* pThis);
+
struct LibLODocument_Impl : public _LibreOfficeKitDocument
{
@@ -222,6 +224,7 @@ struct LibLODocument_Impl : public _LibreOfficeKitDocument
m_pDocumentClass->setPartMode = doc_setPartMode;
m_pDocumentClass->paintTile = doc_paintTile;
m_pDocumentClass->getDocumentSize = doc_getDocumentSize;
+ m_pDocumentClass->initializeForRendering =
doc_initializeForRendering;
gDocumentClass = m_pDocumentClass;
}
@@ -608,6 +611,15 @@ static void doc_getDocumentSize(LibreOfficeKitDocument*
pThis,
}
}
+static void doc_initializeForRendering(LibreOfficeKitDocument* pThis)
+{
+ ITiledRenderable* pDoc = getTiledRenderable(pThis);
+ if (pDoc)
+ {
+ pDoc->initializeForTiledRendering();
+ }
+}
+
static char* lo_getError (LibreOfficeKit *pThis)
{
LibLibreOffice_Impl* pLib = static_cast<LibLibreOffice_Impl*>(pThis);
diff --git a/desktop/source/lib/lokandroid.cxx
b/desktop/source/lib/lokandroid.cxx
index 0f408ea..2b18071 100644
--- a/desktop/source/lib/lokandroid.cxx
+++ b/desktop/source/lib/lokandroid.cxx
@@ -165,6 +165,13 @@ extern "C" SAL_JNI_EXPORT jlong JNICALL
Java_org_libreoffice_kit_Document_getDoc
return nWidth;
}
+extern "C" SAL_JNI_EXPORT void JNICALL
Java_org_libreoffice_kit_Document_initializeForRendering
+ (JNIEnv* pEnv, jobject aObject)
+{
+ LibreOfficeKitDocument* pDocument =
getHandle<LibreOfficeKitDocument>(pEnv, aObject);
+ pDocument->pClass->initializeForRendering(pDocument);
+}
+
extern "C" SAL_JNI_EXPORT jint JNICALL Java_org_libreoffice_kit_Office_saveAs
(JNIEnv* pEnv, jobject aObject, jstring sUrl, jstring sFormat, jstring
sOptions)
{
diff --git a/include/LibreOfficeKit/LibreOfficeKit.h
b/include/LibreOfficeKit/LibreOfficeKit.h
index d7b8e41..de5df7f 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/include/LibreOfficeKit/LibreOfficeKit.h
@@ -113,6 +113,10 @@ struct _LibreOfficeKitDocumentClass
void (*getDocumentSize) (LibreOfficeKitDocument* pThis,
long* pWidth,
long* pHeight);
+
+ // Initialize document for rendering.
+ void (*initializeForRendering) (LibreOfficeKitDocument* pThis);
+
#endif // LOK_USE_UNSTABLE_API
};
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx
b/include/LibreOfficeKit/LibreOfficeKit.hxx
index f1255f4..274509c 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -87,6 +87,12 @@ public:
{
mpDoc->pClass->getDocumentSize(mpDoc, pWidth, pHeight);
}
+
+ inline void initializeForRendering()
+ {
+ mpDoc->pClass->initializeForRendering(mpDoc);
+ }
+
#endif // LOK_USE_UNSTABLE_API
};
diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx
index f07ccd5..d54bbef 100644
--- a/include/vcl/ITiledRenderable.hxx
+++ b/include/vcl/ITiledRenderable.hxx
@@ -83,6 +83,10 @@ public:
{
(void) ePartMode;
}
+
+ virtual void initializeForTiledRendering()
+ {
+ }
};
} // namespace vcl
commit 766c1243e6f8904e6fab70d56d143dd153e2dff1
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Jan 6 14:44:03 2015 +0000
reorient name dialog and make a little narrower
Change-Id: I59769d286dc3e5a7fee77d4f72711e6b48b8b7ed
diff --git a/cui/uiconfig/ui/namedialog.ui b/cui/uiconfig/ui/namedialog.ui
index c21d411..4d7bef0 100644
--- a/cui/uiconfig/ui/namedialog.ui
+++ b/cui/uiconfig/ui/namedialog.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="NameDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
@@ -9,12 +10,12 @@
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="layout_style">end</property>
+ <property name="layout_style">start</property>
<child>
<object class="GtkButton" id="ok">
<property name="label">gtk-ok</property>
@@ -95,7 +96,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">â¢</property>
- <property name="width_chars">55</property>
+ <property name="width_chars">40</property>
</object>
<packing>
<property name="expand">False</property>
commit d4206deb884a7dcce40104e566b6885131ee0d5a
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Jan 6 14:41:02 2015 +0000
add a border
Change-Id: I44f696cd09f39c425a77ae202854a77c7c2d7d20
diff --git a/cui/uiconfig/ui/movemenu.ui b/cui/uiconfig/ui/movemenu.ui
index 891ebb5..d6533a4 100644
--- a/cui/uiconfig/ui/movemenu.ui
+++ b/cui/uiconfig/ui/movemenu.ui
@@ -211,7 +211,7 @@
<property name="vexpand">True</property>
<property name="spacing">12</property>
<child>
- <object class="svtlo-SvTreeListBox" id="menulist">
+ <object class="svtlo-SvTreeListBox" id="menulist:border">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
commit c762831e46558a90b3ddca9dfb72c5d114230331
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Jan 6 14:37:56 2015 +0000
set default button
Change-Id: I3662ef26c96525480812f25706e6324ceca3e153
diff --git a/cui/uiconfig/ui/movemenu.ui b/cui/uiconfig/ui/movemenu.ui
index 8dc7e2a..891ebb5 100644
--- a/cui/uiconfig/ui/movemenu.ui
+++ b/cui/uiconfig/ui/movemenu.ui
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.16.1 -->
<interface>
<requires lib="gtk+" version="3.0"/>
- <requires lib="LibreOffice" version="1.0"/>
+ <!-- interface-requires LibreOffice 1.0 -->
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -32,6 +32,8 @@
<property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
commit 3fda8cb3ed7c790d1b591f4f833054b777e5b490
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Jan 6 14:36:05 2015 +0000
Resolves: fdo#87823 Move Menu->New Menu
Change-Id: I677b519a1bcae3266baff4577b63971b6f8add75
diff --git a/cui/uiconfig/ui/movemenu.ui b/cui/uiconfig/ui/movemenu.ui
index 952955c..8dc7e2a 100644
--- a/cui/uiconfig/ui/movemenu.ui
+++ b/cui/uiconfig/ui/movemenu.ui
@@ -16,7 +16,7 @@
<object class="GtkDialog" id="MoveMenuDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Move Menu</property>
+ <property name="title" translatable="yes">New Menu</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
commit ba9c2376f14c2c07f4449bcf6d1345e9d82c343d
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Jan 6 13:42:51 2015 +0000
OSL_ENSURE->assert when followed by unconditional deref
Change-Id: If2130dbbb7b4afd3d88553da449163f60cdc0c1e
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index e0a75d2..77355c3 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -346,8 +346,7 @@ void SwDrawView::_MoveRepeatedObjs( const SwAnchoredObject&
_rMovedAnchoredObj,
std::list<SwAnchoredObject*> aAnchoredObjs;
{
const SwContact* pContact = ::GetUserCall(
_rMovedAnchoredObj.GetDrawObj() );
- OSL_ENSURE( pContact,
- "SwDrawView::_MoveRepeatedObjs(..) - missing contact object ->
crash." );
+ assert(pContact && "SwDrawView::_MoveRepeatedObjs(..) - missing
contact object -> crash.");
pContact->GetAnchoredObjs( aAnchoredObjs );
}
@@ -389,8 +388,7 @@ void SwDrawView::_MoveRepeatedObjs( const SwAnchoredObject&
_rMovedAnchoredObj,
SdrObject* pChildObj = (*aObjIter);
{
const SwContact* pContact = ::GetUserCall( pChildObj );
- OSL_ENSURE( pContact,
- "SwDrawView::_MoveRepeatedObjs(..) - missing contact
object -> crash." );
+ assert(pContact && "SwDrawView::_MoveRepeatedObjs(..) -
missing contact object -> crash.");
pContact->GetAnchoredObjs( aAnchoredObjs );
}
// move 'repeated' ones to the same order number as the already
moved one.
commit 2d66de44ea456e5525ee5515c4bef1421a26c0b9
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Jan 6 15:22:17 2015 +0100
external/python3: Work around -fsanitize=bounds
Change-Id: I608ec429696e6a02aa528b10057d93da63544eb4
diff --git a/external/python3/UnpackedTarball_python3.mk
b/external/python3/UnpackedTarball_python3.mk
index 72d856f..8c5b1b7 100644
--- a/external/python3/UnpackedTarball_python3.mk
+++ b/external/python3/UnpackedTarball_python3.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
external/python3/python-3.3.5-vs2013.patch.1 \
external/python3/python-msvc-disable-sse2.patch.1 \
external/python3/python-lsan.patch.0 \
+ external/python3/ubsan.patch.0 \
))
ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD SOLARIS,$(OS)),)
diff --git a/external/python3/ubsan.patch.0 b/external/python3/ubsan.patch.0
new file mode 100644
index 0000000..acfd189
--- /dev/null
+++ b/external/python3/ubsan.patch.0
@@ -0,0 +1,22 @@
+--- Objects/listobject.c
++++ Objects/listobject.c
+@@ -2036,7 +2036,7 @@
+ if (keys != NULL) {
+ for (i = 0; i < saved_ob_size; i++)
+ Py_DECREF(keys[i]);
+- if (keys != &ms.temparray[saved_ob_size+1])
++ if (keys != ((char *) ms.temparray) + (saved_ob_size+1) * sizeof
(PyObject *))
+ PyMem_FREE(keys);
+ }
+
+--- Objects/longobject.c
++++ Objects/longobject.c
+@@ -36,7 +36,7 @@
+ static PyObject *
+ get_small_int(sdigit ival)
+ {
+- PyObject *v = (PyObject*)(small_ints + ival + NSMALLNEGINTS);
++ PyObject *v = (PyObject*)(small_ints + (ival + NSMALLNEGINTS));
+ Py_INCREF(v);
+ #ifdef COUNT_ALLOCS
+ if (ival >= 0)
commit 86b436d797081f63036a0db91802bc74aa0501aa
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Jan 6 15:21:42 2015 +0100
external/openssl: Work around -fsanitize=null
Change-Id: Ic47a1b43323f84971aed9b3cdb2ec83f9e931d6a
diff --git a/external/openssl/UnpackedTarball_openssl.mk
b/external/openssl/UnpackedTarball_openssl.mk
index 98844b9..cf5f5dd 100644
--- a/external/openssl/UnpackedTarball_openssl.mk
+++ b/external/openssl/UnpackedTarball_openssl.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,openssl,\
$(if $(filter SOLARIS,$(OS)),external/openssl/opensslsol.patch) \
$(if $(filter IOS,$(OS)),external/openssl/opensslios.patch) \
$(if $(filter
MACOSXPOWERPC,$(OS)$(CPUNAME)),external/openssl/opensslosxppc.patch) \
+ external/openssl/ubsan.patch.0 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/openssl/ubsan.patch.0 b/external/openssl/ubsan.patch.0
new file mode 100644
index 0000000..c3fffb3
--- /dev/null
+++ b/external/openssl/ubsan.patch.0
@@ -0,0 +1,10 @@
+--- crypto/engine/eng_table.c
++++ crypto/engine/eng_table.c
+@@ -346,6 +346,6 @@
+ ENGINE_PILE_DOALL dall;
+ dall.cb = cb;
+ dall.arg = arg;
+- lh_ENGINE_PILE_doall_arg(&table->piles, LHASH_DOALL_ARG_FN(int_cb),
++ lh_ENGINE_PILE_doall_arg(table ? &table->piles : NULL,
LHASH_DOALL_ARG_FN(int_cb),
+ ENGINE_PILE_DOALL, &dall);
+ }
commit 8672eca430213c28936a526df6266226ecb7ab2d
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Jan 6 14:35:18 2015 +0100
-Werror,-Wmacro-redefined (under Clang -fsanitize=*)
Change-Id: Ifd23373b1ac4919793d1b4251ed90cf2dd6f2bda
diff --git a/jurt/source/pipe/staticsalhack.cxx
b/jurt/source/pipe/staticsalhack.cxx
index b2c10d4..23afde1 100644
--- a/jurt/source/pipe/staticsalhack.cxx
+++ b/jurt/source/pipe/staticsalhack.cxx
@@ -14,13 +14,6 @@
#undef SAL_LOG_WARN
#include <sal/rtl/string.cxx>
-#undef IMPL_RTL_EMPTYSTRING
-#undef IMPL_RTL_STRCODE
-#undef IMPL_RTL_STRINGDATA
-#undef IMPL_RTL_STRINGNAME
-#undef IMPL_RTL_STRNAME
-#undef IMPL_RTL_USTRCODE
-#undef RTL_LOG_STRING_BITS
#include <sal/rtl/ustring.cxx>
#include <sal/osl/unx/conditn.cxx>
diff --git a/sal/rtl/string.cxx b/sal/rtl/string.cxx
index 07842ec..a71ba16 100644
--- a/sal/rtl/string.cxx
+++ b/sal/rtl/string.cxx
@@ -76,6 +76,15 @@ static rtl_String const aImplEmpty_rtl_String =
#include "strtmpl.cxx"
+#undef IMPL_RTL_EMPTYSTRING
+#undef IMPL_RTL_IS_USTRING
+#undef IMPL_RTL_STRCODE
+#undef IMPL_RTL_STRINGDATA
+#undef IMPL_RTL_STRINGNAME
+#undef IMPL_RTL_STRNAME
+#undef IMPL_RTL_USTRCODE
+#undef RTL_LOG_STRING_BITS
+
sal_Int32 SAL_CALL rtl_str_valueOfFloat(sal_Char * pStr, float f)
SAL_THROW_EXTERN_C()
{
diff --git a/sal/rtl/ustring.cxx b/sal/rtl/ustring.cxx
index a9406d8..0828425 100644
--- a/sal/rtl/ustring.cxx
+++ b/sal/rtl/ustring.cxx
@@ -84,6 +84,15 @@ static void internRelease (rtl_uString *pThis);
#include "strtmpl.cxx"
+#undef IMPL_RTL_EMPTYSTRING
+#undef IMPL_RTL_IS_USTRING
+#undef IMPL_RTL_STRCODE
+#undef IMPL_RTL_STRINGDATA
+#undef IMPL_RTL_STRINGNAME
+#undef IMPL_RTL_STRNAME
+#undef IMPL_RTL_USTRCODE
+#undef RTL_LOG_STRING_BITS
+
sal_Int32 rtl_ustr_indexOfAscii_WithLength(
sal_Unicode const * str, sal_Int32 len,
char const * subStr, sal_Int32 subLen) SAL_THROW_EXTERN_C()
commit 1b9d9680d9c444a126413ebb996b3bf6b2085de5
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Jan 6 14:34:34 2015 +0100
Work around loplugin:cstylecast under -fsanitize=*
Change-Id: I467d032296607d22e850c95e56c452fe7e62cebe
diff --git a/compilerplugins/clang/cstylecast.cxx
b/compilerplugins/clang/cstylecast.cxx
index bce3e0f..7c41073 100644
--- a/compilerplugins/clang/cstylecast.cxx
+++ b/compilerplugins/clang/cstylecast.cxx
@@ -103,7 +103,13 @@ bool CStyleCast::VisitCStyleCastExpr(const CStyleCastExpr
* expr) {
}
} else {
if (filename.startswith(SRCDIR "/include/tools/solar.h")
- || filename.startswith(SRCDIR "/include/cppuhelper/")) {
+ || filename.startswith(SRCDIR "/include/cppuhelper/")
+ || ((StringRef(
+ compiler.getSourceManager().getFileEntryForID(
+ compiler.getSourceManager().getMainFileID())
+ ->getName())
+ == SRCDIR "/jurt/source/pipe/staticsalhack.cxx")
+ && filename.startswith(SRCDIR "/sal/"))) {
return true;
}
}
commit 8d2501feb2a43e11bd144581bb7ffc7684d1afec
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Jan 6 13:22:33 2015 +0100
Remove unnecessary include files declaring JNI functions
Change-Id: Ie9e083a9dcdaebf9f481bae920eddef69e47c3bc
diff --git a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
index 4c38968..9ec7230 100644
--- a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
@@ -23,7 +23,6 @@
#include <com/sun/star/embed/ElementModes.hpp>
#include <com/sun/star/io/XStream.hpp>
#include "hsqldb/HStorageMap.hxx"
-#include "hsqldb/StorageNativeInputStream.h"
#include "accesslog.hxx"
#include "diagnose_ex.h"
#include <osl/diagnose.h>
@@ -45,7 +44,7 @@ using namespace ::connectivity::hsqldb;
* Method: openStream
* Signature: (Ljava/lang/String;Ljava/lang/String;I)V
*/
-void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_openStream
+extern "C" SAL_JNI_EXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_openStream
(JNIEnv * env, jobject /*obj_this*/,jstring name, jstring key, jint mode)
{
#ifdef HSQLDB_DBG
@@ -63,7 +62,7 @@ void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_openStream
* Method: close
* Signature: (Ljava/lang/String;Ljava/lang/String;)V
*/
-void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_close
+extern "C" SAL_JNI_EXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_close
(JNIEnv * env, jobject /*obj_this*/,jstring name, jstring key)
{
#ifdef HSQLDB_DBG
@@ -102,7 +101,7 @@ void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_close
* Method: getFilePointer
* Signature: (Ljava/lang/String;Ljava/lang/String;)J
*/
-jlong JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_getFilePointer
+extern "C" SAL_JNI_EXPORT jlong JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_getFilePointer
(JNIEnv * env, jobject /*obj_this*/,jstring name, jstring key)
{
#ifdef HSQLDB_DBG
@@ -126,7 +125,7 @@ jlong JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_getFilePoi
* Method: length
* Signature: (Ljava/lang/String;Ljava/lang/String;)J
*/
-jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_length
+extern "C" SAL_JNI_EXPORT jlong JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_length
(JNIEnv * env, jobject /*obj_this*/,jstring name, jstring key)
{
#ifdef HSQLDB_DBG
@@ -193,7 +192,7 @@ jint read_from_storage_stream( JNIEnv * env, jobject
/*obj_this*/, jstring name,
* Method: read
* Signature: (Ljava/lang/String;Ljava/lang/String;)I
*/
-jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava_lang_String_2Ljava_lang_String_2
+extern "C" SAL_JNI_EXPORT jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava_lang_String_2Ljava_lang_String_2
(JNIEnv* env, jobject obj_this, jstring name, jstring key)
{
#ifdef HSQLDB_DBG
@@ -266,7 +265,7 @@ jint read_from_storage_stream_into_buffer( JNIEnv * env,
jobject /*obj_this*/,js
* Method: read
* Signature: (Ljava/lang/String;Ljava/lang/String;[BII)I
*/
-jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava_lang_String_2Ljava_lang_String_2_3BII
+extern "C" SAL_JNI_EXPORT jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava_lang_String_2Ljava_lang_String_2_3BII
(JNIEnv * env, jobject obj_this,jstring name, jstring key, jbyteArray
buffer, jint off, jint len)
{
#ifdef HSQLDB_DBG
@@ -287,7 +286,7 @@ jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava
* Method: readInt
* Signature: (Ljava/lang/String;Ljava/lang/String;)I
*/
-jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_readInt
+extern "C" SAL_JNI_EXPORT jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_readInt
(JNIEnv * env, jobject /*obj_this*/,jstring name, jstring key)
{
#ifdef HSQLDB_DBG
@@ -355,7 +354,7 @@ jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_readInt
* Method: seek
* Signature: (Ljava/lang/String;Ljava/lang/String;J)V
*/
-void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_seek
+extern "C" SAL_JNI_EXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_seek
(JNIEnv * env, jobject /*obj_this*/,jstring name, jstring key, jlong
position)
{
#ifdef HSQLDB_DBG
@@ -467,7 +466,7 @@ void write_to_storage_stream_from_buffer( JNIEnv* env,
jobject /*obj_this*/, jst
* Method: write
* Signature: (Ljava/lang/String;Ljava/lang/String;[BII)V
*/
-void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_write
+extern "C" SAL_JNI_EXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_write
(JNIEnv * env, jobject obj_this,jstring name, jstring key, jbyteArray
buffer, jint off, jint len)
{
#ifdef HSQLDB_DBG
@@ -526,7 +525,7 @@ void write_to_storage_stream( JNIEnv* env, jobject
/*obj_this*/, jstring name, j
* Method: writeInt
* Signature: (Ljava/lang/String;Ljava/lang/String;I)V
*/
-void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_writeInt
+extern "C" SAL_JNI_EXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_writeInt
(JNIEnv * env, jobject obj_this,jstring name, jstring key, jint v)
{
#ifdef HSQLDB_DBG
diff --git a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
index 04c7d80..740fe73 100644
--- a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
@@ -23,7 +23,6 @@
#endif
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/embed/XStorage.hpp>
-#include "hsqldb/StorageFileAccess.h"
#include "hsqldb/HStorageMap.hxx"
#include <osl/diagnose.h>
@@ -40,7 +39,7 @@ using namespace ::connectivity::hsqldb;
* Method: isStreamElement
* Signature: (Ljava/lang/String;Ljava/lang/String;)Z
*/
-jboolean JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_isStreamElement
+extern "C" SAL_JNI_EXPORT jboolean JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_isStreamElement
(JNIEnv * env, jobject /*obj_this*/,jstring key, jstring name)
{
TStorages::mapped_type aStoragePair =
StorageContainer::getRegisteredStorage(StorageContainer::jstring2ustring(env,key));
@@ -92,7 +91,7 @@ jboolean JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_isStreamE
* Method: removeElement
* Signature: (Ljava/lang/String;Ljava/lang/String;)V
*/
-void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_removeElement
+extern "C" SAL_JNI_EXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_removeElement
(JNIEnv * env, jobject /*obj_this*/,jstring key, jstring name)
{
#ifdef HSQLDB_DBG
@@ -127,7 +126,7 @@ void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_removeElement
* Method: renameElement
* Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
*/
-void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_renameElement
+extern "C" SAL_JNI_EXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_renameElement
(JNIEnv * env, jobject /*obj_this*/,jstring key, jstring oldname, jstring
newname)
{
#ifdef HSQLDB_DBG
diff --git a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
index 435218e..fea9a9c 100644
--- a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
@@ -29,7 +29,6 @@
#include <comphelper/types.hxx>
#include "hsqldb/HStorageAccess.hxx"
#include "hsqldb/HStorageMap.hxx"
-#include "hsqldb/StorageNativeInputStream.h"
#include <jvmaccess/virtualmachine.hxx>
#include <com/sun/star/lang/XSingleComponentFactory.hpp>
@@ -57,7 +56,7 @@ using namespace ::connectivity::hsqldb;
* Method: openStream
* Signature: (Ljava/lang/String;Ljava/lang/String;I)V
*/
-void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_openStream
+extern "C" SAL_JNI_EXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_openStream
(JNIEnv * env, jobject /*obj_this*/,jstring key, jstring name, jint mode)
{
#ifdef HSQLDB_DBG
@@ -75,7 +74,7 @@ void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_openSt
* Method: read
* Signature: (Ljava/lang/String;Ljava/lang/String;)I
*/
-jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2
+extern "C" SAL_JNI_EXPORT jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2
(JNIEnv * env, jobject obj_this,jstring key, jstring name)
{
#ifdef HSQLDB_DBG
@@ -94,7 +93,7 @@ jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__
* Method: read
* Signature: (Ljava/lang/String;Ljava/lang/String;[BII)I
*/
-jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2_3BII
+extern "C" SAL_JNI_EXPORT jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2_3BII
(JNIEnv * env, jobject obj_this,jstring key, jstring name, jbyteArray
buffer, jint off, jint len)
{
#ifdef HSQLDB_DBG
@@ -113,7 +112,7 @@ jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__
* Method: close
* Signature: (Ljava/lang/String;Ljava/lang/String;)V
*/
-void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_close
+extern "C" SAL_JNI_EXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_close
(JNIEnv * env, jobject /*obj_this*/,jstring key, jstring name)
{
#ifdef HSQLDB_DBG
@@ -133,7 +132,7 @@ void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_close
* Method: skip
* Signature: (Ljava/lang/String;Ljava/lang/String;J)J
*/
-jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_skip
+extern "C" SAL_JNI_EXPORT jlong JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_skip
(JNIEnv * env, jobject /*obj_this*/,jstring key, jstring name, jlong n)
{
#ifdef HSQLDB_DBG
@@ -199,7 +198,7 @@ jlong JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_skip
* Method: available
* Signature: (Ljava/lang/String;Ljava/lang/String;)I
*/
-jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_available
+extern "C" SAL_JNI_EXPORT jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_available
(JNIEnv * env, jobject /*obj_this*/,jstring key, jstring name)
{
#ifdef HSQLDB_DBG
@@ -241,7 +240,7 @@ jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_availa
* Method: read
* Signature: (Ljava/lang/String;Ljava/lang/String;[B)I
*/
-jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2_3B
+extern "C" SAL_JNI_EXPORT jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2_3B
(JNIEnv * env, jobject /*obj_this*/,jstring key, jstring name, jbyteArray
buffer)
{
#ifdef HSQLDB_DBG
diff --git a/connectivity/source/inc/hsqldb/HStorageAccess.h
b/connectivity/source/inc/hsqldb/HStorageAccess.h
deleted file mode 100644
index 9d26fda..0000000
--- a/connectivity/source/inc/hsqldb/HStorageAccess.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/* -*- 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 .
- */
-
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess */
-
-#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HSTORAGEACCESS_H
-#define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HSTORAGEACCESS_H
-
-#include <sal/config.h>
-
-#include <sal/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-/* Inaccessible static:
class_00024com_00024sun_00024star_00024sdbcx_00024comp_00024hsqldb_00024StorageNativeOutputStream
*/
-/*
- * Class: com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
- * Method: openStream
- * Signature: (Ljava/lang/String;Ljava/lang/String;I)V
- */
-SAL_JNI_EXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_openStream
- (JNIEnv *, jobject, jstring, jstring, jint);
-
-/*
- * Class: com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
- * Method: close
- * Signature: (Ljava/lang/String;Ljava/lang/String;)V
- */
-SAL_JNI_EXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_close
- (JNIEnv *, jobject, jstring, jstring);
-
-/*
- * Class: com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
- * Method: getFilePointer
- * Signature: (Ljava/lang/String;Ljava/lang/String;)J
- */
-SAL_JNI_EXPORT jlong JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_getFilePointer
- (JNIEnv *, jobject, jstring, jstring);
-
-/*
- * Class: com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
- * Method: length
- * Signature: (Ljava/lang/String;Ljava/lang/String;)J
- */
-SAL_JNI_EXPORT jlong JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_length
- (JNIEnv *, jobject, jstring, jstring);
-
-/*
- * Class: com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
- * Method: read
- * Signature: (Ljava/lang/String;Ljava/lang/String;)I
- */
-SAL_JNI_EXPORT jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava_lang_String_2Ljava_lang_String_2
- (JNIEnv *, jobject, jstring, jstring);
-
-/*
- * Class: com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
- * Method: read
- * Signature: (Ljava/lang/String;Ljava/lang/String;[BII)I
- */
-SAL_JNI_EXPORT jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava_lang_String_2Ljava_lang_String_2_3BII
- (JNIEnv *, jobject, jstring, jstring, jbyteArray, jint, jint);
-
-/*
- * Class: com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
- * Method: readInt
- * Signature: (Ljava/lang/String;Ljava/lang/String;)I
- */
-SAL_JNI_EXPORT jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_readInt
- (JNIEnv *, jobject, jstring, jstring);
-
-/*
- * Class: com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
- * Method: seek
- * Signature: (Ljava/lang/String;Ljava/lang/String;J)V
- */
-SAL_JNI_EXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_seek
- (JNIEnv *, jobject, jstring, jstring, jlong);
-
-/*
- * Class: com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
- * Method: write
- * Signature: (Ljava/lang/String;Ljava/lang/String;[BII)V
- */
-SAL_JNI_EXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_write
- (JNIEnv *, jobject, jstring, jstring, jbyteArray, jint, jint);
-
-/*
- * Class: com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
- * Method: writeInt
- * Signature: (Ljava/lang/String;Ljava/lang/String;I)V
- */
-SAL_JNI_EXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_writeInt
- (JNIEnv *, jobject, jstring, jstring, jint);
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/hsqldb/HStorageAccess.hxx
b/connectivity/source/inc/hsqldb/HStorageAccess.hxx
index b1e6b85..0133691 100644
--- a/connectivity/source/inc/hsqldb/HStorageAccess.hxx
+++ b/connectivity/source/inc/hsqldb/HStorageAccess.hxx
@@ -20,7 +20,9 @@
#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HSTORAGEACCESS_HXX
#define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HSTORAGEACCESS_HXX
-#include "hsqldb/HStorageAccess.h"
+#include <sal/config.h>
+
+#include <jni.h>
namespace connectivity { namespace hsqldb
{
diff --git a/connectivity/source/inc/hsqldb/StorageFileAccess.h
b/connectivity/source/inc/hsqldb/StorageFileAccess.h
deleted file mode 100644
index dbbe073..0000000
--- a/connectivity/source/inc/hsqldb/StorageFileAccess.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- 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 .
- */
-
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess */
-
-#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_STORAGEFILEACCESS_H
-#define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_STORAGEFILEACCESS_H
-
-#include <sal/config.h>
-
-#include <sal/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class: com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess
- * Method: isStreamElement
- * Signature: (Ljava/lang/String;Ljava/lang/String;)Z
- */
-SAL_JNI_EXPORT jboolean JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_isStreamElement
- (JNIEnv *, jobject, jstring, jstring);
-
-/*
- * Class: com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess
- * Method: removeElement
- * Signature: (Ljava/lang/String;Ljava/lang/String;)V
- */
-SAL_JNI_EXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_removeElement
- (JNIEnv *, jobject, jstring, jstring);
-
-/*
- * Class: com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess
- * Method: renameElement
- * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
- */
-SAL_JNI_EXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_renameElement
- (JNIEnv *, jobject, jstring, jstring, jstring);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/hsqldb/StorageNativeInputStream.h
b/connectivity/source/inc/hsqldb/StorageNativeInputStream.h
deleted file mode 100644
index 76f9a0f..0000000
--- a/connectivity/source/inc/hsqldb/StorageNativeInputStream.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* -*- 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 .
- */
-
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream */
-
-#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_STORAGENATIVEINPUTSTREAM_H
-#define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_STORAGENATIVEINPUTSTREAM_H
-
-#include <sal/config.h>
-
-#include <sal/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-/* Inaccessible static:
class_00024com_00024sun_00024star_00024sdbcx_00024comp_00024hsqldb_00024StorageNativeOutputStream
*/
-/*
- * Class: com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream
- * Method: openStream
- * Signature: (Ljava/lang/String;Ljava/lang/String;I)V
- */
-SAL_JNI_EXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_openStream
- (JNIEnv * env, jobject obj_this,jstring key, jstring name, jint);
-
-/*
- * Class: com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream
- * Method: read
- * Signature: (Ljava/lang/String;Ljava/lang/String;)I
- */
-SAL_JNI_EXPORT jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2
- (JNIEnv * env, jobject obj_this,jstring key, jstring name);
-
-/*
- * Class: com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream
- * Method: read
- * Signature: (Ljava/lang/String;Ljava/lang/String;[BII)I
- */
-SAL_JNI_EXPORT jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2_3BII
- (JNIEnv * env, jobject obj_this,jstring key, jstring name, jbyteArray, jint,
jint);
-
-/*
- * Class: com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream
- * Method: close
- * Signature: (Ljava/lang/String;Ljava/lang/String;)V
- */
-SAL_JNI_EXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_close
- (JNIEnv *, jobject, jstring, jstring);
-
-/*
- * Class: com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream
- * Method: skip
- * Signature: (Ljava/lang/String;Ljava/lang/String;J)J
- */
-SAL_JNI_EXPORT jlong JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_skip
- (JNIEnv *, jobject, jstring, jstring, jlong);
-
-/*
- * Class: com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream
- * Method: available
- * Signature: (Ljava/lang/String;Ljava/lang/String;)I
- */
-SAL_JNI_EXPORT jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_available
- (JNIEnv *, jobject, jstring, jstring);
-
-/*
- * Class: com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream
- * Method: read
- * Signature: (Ljava/lang/String;Ljava/lang/String;[B)I
- */
-SAL_JNI_EXPORT jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2_3B
- (JNIEnv *, jobject, jstring, jstring, jbyteArray);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 09a5910c96a822c6e7fc4b82d89c00c22e905eba
Author: Eike Rathke <er...@redhat.com>
Date: Tue Jan 6 13:00:59 2015 +0100
move nScanLineBufferComponents to where it is used [-Werror=clobbered]
gcc (GCC) 4.9.2 20141101 (Red Hat 4.9.2-1)
vcl/source/filter/jpeg/jpegc.cxx: In function âvoid ReadJPEG(JPEGReader*,
void*, long int*, const Size&)â:
vcl/source/filter/jpeg/jpegc.cxx:72:10: error: variable
ânScanLineBufferComponentsâ might be clobbered by âlongjmpâ or
âvforkâ [-Werror=clobbered]
long nScanLineBufferComponents = 0;
^
Change-Id: I90a0d02977c49d2471069788a02fb1c7d28c039a
diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx
index 04aa3a2..411b17b 100644
--- a/vcl/source/filter/jpeg/jpegc.cxx
+++ b/vcl/source/filter/jpeg/jpegc.cxx
@@ -69,7 +69,6 @@ void ReadJPEG( JPEGReader* pJPEGReader, void* pInputStream,
long* pLines,
long nAlignedWidth;
JSAMPLE* aRangeLimit;
boost::scoped_array<unsigned char> pScanLineBuffer;
- long nScanLineBufferComponents = 0;
if ( setjmp( jerr.setjmp_buffer ) )
{
@@ -150,6 +149,7 @@ void ReadJPEG( JPEGReader* pJPEGReader, void* pInputStream,
long* pLines,
nAlignedWidth = aCreateBitmapParam.nAlignedWidth;
aRangeLimit = cinfo.sample_range_limit;
+ long nScanLineBufferComponents = 0;
if ( cinfo.out_color_space == JCS_CMYK )
{
nScanLineBufferComponents = cinfo.output_width * 4;
commit 84caa11fef97c8095c22f3eb33c8f920d701f48b
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Jan 6 12:08:26 2015 +0100
Replace JNIEXPORT -> SAL_JNI_EXPORT
cf. 9a745cbf549aa391be2b67f41c83056bd44db97a "Introdude SAL_JNI_EXPORT and
use
that instead of JNIEXPORT"
Change-Id: I81dcc8dfcb878d3e935d807f491b99927637c23c
diff --git a/bridges/test/java_uno/any/transport.cxx
b/bridges/test/java_uno/any/transport.cxx
index 9f0b143..2f943f9 100644
--- a/bridges/test/java_uno/any/transport.cxx
+++ b/bridges/test/java_uno/any/transport.cxx
@@ -51,7 +51,7 @@ Any Transport::mapAny( Any const & any )
}
}
-extern "C" JNIEXPORT jobject JNICALL
Java_test_java_1uno_anytest_TestJni_create_1jni_1transport(
+extern "C" SAL_JNI_EXPORT jobject JNICALL
Java_test_java_1uno_anytest_TestJni_create_1jni_1transport(
JNIEnv * jni_env, jclass, jobject loader )
SAL_THROW_EXTERN_C()
{
diff --git a/connectivity/source/inc/hsqldb/HStorageAccess.h
b/connectivity/source/inc/hsqldb/HStorageAccess.h
index 27139ab..9d26fda 100644
--- a/connectivity/source/inc/hsqldb/HStorageAccess.h
+++ b/connectivity/source/inc/hsqldb/HStorageAccess.h
@@ -23,6 +23,11 @@
#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HSTORAGEACCESS_H
#define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HSTORAGEACCESS_H
+
+#include <sal/config.h>
+
+#include <sal/types.h>
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -32,7 +37,7 @@ extern "C" {
* Method: openStream
* Signature: (Ljava/lang/String;Ljava/lang/String;I)V
*/
-JNIEXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_openStream
+SAL_JNI_EXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_openStream
(JNIEnv *, jobject, jstring, jstring, jint);
/*
@@ -40,7 +45,7 @@ JNIEXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_o
* Method: close
* Signature: (Ljava/lang/String;Ljava/lang/String;)V
*/
-JNIEXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_close
+SAL_JNI_EXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_close
(JNIEnv *, jobject, jstring, jstring);
/*
@@ -48,7 +53,7 @@ JNIEXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_c
* Method: getFilePointer
* Signature: (Ljava/lang/String;Ljava/lang/String;)J
*/
-JNIEXPORT jlong JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_getFilePointer
+SAL_JNI_EXPORT jlong JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_getFilePointer
(JNIEnv *, jobject, jstring, jstring);
/*
@@ -56,7 +61,7 @@ JNIEXPORT jlong JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_
* Method: length
* Signature: (Ljava/lang/String;Ljava/lang/String;)J
*/
-JNIEXPORT jlong JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_length
+SAL_JNI_EXPORT jlong JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_length
(JNIEnv *, jobject, jstring, jstring);
/*
@@ -64,7 +69,7 @@ JNIEXPORT jlong JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_
* Method: read
* Signature: (Ljava/lang/String;Ljava/lang/String;)I
*/
-JNIEXPORT jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava_lang_String_2Ljava_lang_String_2
+SAL_JNI_EXPORT jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava_lang_String_2Ljava_lang_String_2
(JNIEnv *, jobject, jstring, jstring);
/*
@@ -72,7 +77,7 @@ JNIEXPORT jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_r
* Method: read
* Signature: (Ljava/lang/String;Ljava/lang/String;[BII)I
*/
-JNIEXPORT jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava_lang_String_2Ljava_lang_String_2_3BII
+SAL_JNI_EXPORT jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava_lang_String_2Ljava_lang_String_2_3BII
(JNIEnv *, jobject, jstring, jstring, jbyteArray, jint, jint);
/*
@@ -80,7 +85,7 @@ JNIEXPORT jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_r
* Method: readInt
* Signature: (Ljava/lang/String;Ljava/lang/String;)I
*/
-JNIEXPORT jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_readInt
+SAL_JNI_EXPORT jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_readInt
(JNIEnv *, jobject, jstring, jstring);
/*
@@ -88,7 +93,7 @@ JNIEXPORT jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_r
* Method: seek
* Signature: (Ljava/lang/String;Ljava/lang/String;J)V
*/
-JNIEXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_seek
+SAL_JNI_EXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_seek
(JNIEnv *, jobject, jstring, jstring, jlong);
/*
@@ -96,7 +101,7 @@ JNIEXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_s
* Method: write
* Signature: (Ljava/lang/String;Ljava/lang/String;[BII)V
*/
-JNIEXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_write
+SAL_JNI_EXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_write
(JNIEnv *, jobject, jstring, jstring, jbyteArray, jint, jint);
/*
@@ -104,7 +109,7 @@ JNIEXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_w
* Method: writeInt
* Signature: (Ljava/lang/String;Ljava/lang/String;I)V
*/
-JNIEXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_writeInt
+SAL_JNI_EXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_writeInt
(JNIEnv *, jobject, jstring, jstring, jint);
diff --git a/connectivity/source/inc/hsqldb/StorageFileAccess.h
b/connectivity/source/inc/hsqldb/StorageFileAccess.h
index b75c835..dbbe073 100644
--- a/connectivity/source/inc/hsqldb/StorageFileAccess.h
+++ b/connectivity/source/inc/hsqldb/StorageFileAccess.h
@@ -23,6 +23,11 @@
#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_STORAGEFILEACCESS_H
#define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_STORAGEFILEACCESS_H
+
+#include <sal/config.h>
+
+#include <sal/types.h>
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -31,7 +36,7 @@ extern "C" {
* Method: isStreamElement
* Signature: (Ljava/lang/String;Ljava/lang/String;)Z
*/
-JNIEXPORT jboolean JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_isStreamElement
+SAL_JNI_EXPORT jboolean JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_isStreamElement
(JNIEnv *, jobject, jstring, jstring);
/*
@@ -39,7 +44,7 @@ JNIEXPORT jboolean JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess
* Method: removeElement
* Signature: (Ljava/lang/String;Ljava/lang/String;)V
*/
-JNIEXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_removeElement
+SAL_JNI_EXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_removeElement
(JNIEnv *, jobject, jstring, jstring);
/*
@@ -47,7 +52,7 @@ JNIEXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_rem
* Method: renameElement
* Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
*/
-JNIEXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_renameElement
+SAL_JNI_EXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_renameElement
(JNIEnv *, jobject, jstring, jstring, jstring);
#ifdef __cplusplus
diff --git a/connectivity/source/inc/hsqldb/StorageNativeInputStream.h
b/connectivity/source/inc/hsqldb/StorageNativeInputStream.h
index 8ca0ce3..76f9a0f 100644
--- a/connectivity/source/inc/hsqldb/StorageNativeInputStream.h
+++ b/connectivity/source/inc/hsqldb/StorageNativeInputStream.h
@@ -23,6 +23,11 @@
#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_STORAGENATIVEINPUTSTREAM_H
#define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_STORAGENATIVEINPUTSTREAM_H
+
+#include <sal/config.h>
+
+#include <sal/types.h>
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -32,7 +37,7 @@ extern "C" {
* Method: openStream
* Signature: (Ljava/lang/String;Ljava/lang/String;I)V
*/
-JNIEXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_openStream
+SAL_JNI_EXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_openStream
(JNIEnv * env, jobject obj_this,jstring key, jstring name, jint);
/*
@@ -40,7 +45,7 @@ JNIEXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStr
* Method: read
* Signature: (Ljava/lang/String;Ljava/lang/String;)I
*/
-JNIEXPORT jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2
+SAL_JNI_EXPORT jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2
(JNIEnv * env, jobject obj_this,jstring key, jstring name);
/*
@@ -48,7 +53,7 @@ JNIEXPORT jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStr
* Method: read
* Signature: (Ljava/lang/String;Ljava/lang/String;[BII)I
*/
-JNIEXPORT jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2_3BII
+SAL_JNI_EXPORT jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2_3BII
(JNIEnv * env, jobject obj_this,jstring key, jstring name, jbyteArray, jint,
jint);
/*
@@ -56,7 +61,7 @@ JNIEXPORT jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStr
* Method: close
* Signature: (Ljava/lang/String;Ljava/lang/String;)V
*/
-JNIEXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_close
+SAL_JNI_EXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_close
(JNIEnv *, jobject, jstring, jstring);
/*
@@ -64,7 +69,7 @@ JNIEXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStr
* Method: skip
* Signature: (Ljava/lang/String;Ljava/lang/String;J)J
*/
-JNIEXPORT jlong JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_skip
+SAL_JNI_EXPORT jlong JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_skip
(JNIEnv *, jobject, jstring, jstring, jlong);
/*
@@ -72,7 +77,7 @@ JNIEXPORT jlong JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputSt
* Method: available
* Signature: (Ljava/lang/String;Ljava/lang/String;)I
*/
-JNIEXPORT jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_available
+SAL_JNI_EXPORT jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_available
(JNIEnv *, jobject, jstring, jstring);
/*
@@ -80,7 +85,7 @@ JNIEXPORT jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStr
* Method: read
* Signature: (Ljava/lang/String;Ljava/lang/String;[B)I
*/
-JNIEXPORT jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2_3B
+SAL_JNI_EXPORT jint JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2_3B
(JNIEnv *, jobject, jstring, jstring, jbyteArray);
#ifdef __cplusplus
commit 8e94c40f1341c1b42b67b4643c56e941d66f6474
Author: Eike Rathke <er...@redhat.com>
Date: Tue Jan 6 11:57:40 2015 +0100
how about scope
Change-Id: I4c9e5f754974b6726fc86bc87775ba81832b3984
diff --git a/framework/source/fwe/classes/addonsoptions.cxx
b/framework/source/fwe/classes/addonsoptions.cxx
index 7ba81c3..cde340f 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -499,9 +499,6 @@ static Image ScaleImage( const Image &rImage, bool bBig )
Image AddonsOptions_Impl::GetImageFromURL( const OUString& aURL, bool bBig,
bool bNoScale )
{
Image aImage;
- ImageSize eSize = bBig ? IMGSIZE_BIG : IMGSIZE_SMALL;
- int nIdx = (int)eSize;
- int nOtherIdx = nIdx ? 0 : 1;
SAL_INFO("fwk", "Expensive: Addons GetImageFromURL " << aURL <<
" big " << (bBig?"big":"litte") <<
@@ -510,6 +507,10 @@ Image AddonsOptions_Impl::GetImageFromURL( const OUString&
aURL, bool bBig, bool
ImageManager::iterator pIter = m_aImageManager.find(aURL);
if ( pIter != m_aImageManager.end() )
{
+ ImageSize eSize = bBig ? IMGSIZE_BIG : IMGSIZE_SMALL;
+ int nIdx = (int)eSize;
+ int nOtherIdx = nIdx ? 0 : 1;
+
OneImageEntry& rSizeEntry = pIter->second.aSizeEntry[nIdx];
OneImageEntry& rOtherEntry = pIter->second.aSizeEntry[nOtherIdx];
// actually read the image ...
commit 485e4432b737ec20ce78fe5afd44365000eda6f3
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Jan 6 11:50:03 2015 +0100
Fix o3tl::typed_flags to bool conversions
Change-Id: Iaed915b3765a3d23aea7f771a7c912956d864c5b
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx
b/vcl/unx/kde/salnativewidgets-kde.cxx
index e1a7322..bd3dbaa 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -516,7 +516,7 @@ bool WidgetPainter::drawStyledWidget( QWidget *pWidget,
pWidget->move( 0, 0 );
// Enable/disable the widget
- pWidget->setEnabled( nState & ControlState::ENABLED );
+ pWidget->setEnabled( bool(nState & ControlState::ENABLED) );
// Create pixmap to paint to
KDEX11Pixmap xPixmap( pWidget->width(), pWidget->height() );
@@ -1413,7 +1413,7 @@ bool KDESalGraphics::drawNativeControl( ControlType
nType, ControlPart nPart,
if ( (nType == CTRL_PUSHBUTTON) && (nPart == PART_ENTIRE_CONTROL) )
{
bReturn = pWidgetPainter->drawStyledWidget(
- pWidgetPainter->pushButton( rControlRegion, (nState &
ControlState::DEFAULT) ),
+ pWidgetPainter->pushButton( rControlRegion, bool(nState &
ControlState::DEFAULT) ),
nState, aValue, this );
}
else if ( (nType == CTRL_RADIOBUTTON) && (nPart == PART_ENTIRE_CONTROL) )
@@ -1542,7 +1542,7 @@ bool KDESalGraphics::getNativeControlRegion( ControlType
nType, ControlPart nPar
{
// Metrics of the push button
case CTRL_PUSHBUTTON:
- pWidget = pWidgetPainter->pushButton( rControlRegion, ( nState &
ControlState::DEFAULT ) );
+ pWidget = pWidgetPainter->pushButton( rControlRegion, bool( nState &
ControlState::DEFAULT ) );
switch ( nPart )
{
diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index 282566c..0c43fd28 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -337,7 +337,7 @@ bool KDESalGraphics::drawNativeControl( ControlType type,
ControlPart part,
QStyleOptionMenuItem option;
option.checkType = ( part == PART_MENU_ITEM_CHECK_MARK )
? QStyleOptionMenuItem::NonExclusive :
QStyleOptionMenuItem::Exclusive;
- option.checked = (nControlState & ControlState::PRESSED) ? true :
false;
+ option.checked = bool( nControlState & ControlState::PRESSED );
// widgetRect is now the rectangle for the checkbox/radiobutton
itself, but Qt
// paints the whole menu item, so translate position (and it'll be
clipped);
// it is also necessary to fill the background transparently
first, as this
commit 549b7fad48bb9ddcba7dfa92daea6ce917853a03
Author: Eike Rathke <er...@redhat.com>
Date: Mon Jan 5 22:28:34 2015 +0100
workaround a weird gcc optimization werror bug
gcc (GCC) 4.9.2 20141101 (Red Hat 4.9.2-1)
framework/source/fwe/classes/addonsoptions.cxx: In member function âvoid
framework::AddonsOptions_Impl::ReadAndAssociateImages(const rtl::OUString&,
const rtl::OUString&)â:
framework/source/fwe/classes/addonsoptions.cxx:267:16: error: array
subscript is above array bounds [-Werror=array-bounds]
struct ImageEntry
^
The combination of aScaled[2]; aImage[2]; aURL[2] in sequence apparently
lead
to some overoptimization and/or alignment problem, already declaring
aImage[3]
helped (but not aScaled[3]), but that's not what we want.
Change-Id: I82e28d4887ab8072a17d0a9341d322c1cf61aedc
diff --git a/framework/source/fwe/classes/addonsoptions.cxx
b/framework/source/fwe/classes/addonsoptions.cxx
index 95b096d..7ba81c3 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -217,19 +217,24 @@ class AddonsOptions_Impl : public ConfigItem
private:
enum ImageSize
{
- IMGSIZE_SMALL,
+ IMGSIZE_SMALL = 0,
IMGSIZE_BIG
};
+ struct OneImageEntry
+ {
+ Image aScaled; ///< cached scaled image
+ Image aImage; ///< original un-scaled image
+ OUString aURL; ///< URL in case it is not loaded yet
+ };
+
struct ImageEntry
{
// if the image is set, it was embedded in some way,
// otherwise we use the associated URL to load on demand
// accessed in this order
- Image aScaled[2]; // cached scaled images
- Image aImage[2]; // original un-scaled images
- OUString aURL[2]; // URLs in case they are not loaded yet
+ OneImageEntry aSizeEntry[2];
ImageEntry() {}
void addImage(ImageSize eSize, const Image &rImage, const OUString
&rURL);
};
@@ -309,8 +314,8 @@ void AddonsOptions_Impl::ImageEntry::addImage(ImageSize
eSize,
const Image &rImage,
const OUString &rURL)
{
- aImage[(int)eSize] = rImage;
- aURL[(int)eSize] = rURL;
+ aSizeEntry[(int)eSize].aImage = rImage;
+ aSizeEntry[(int)eSize].aURL = rURL;
}
// constructor
@@ -505,35 +510,36 @@ Image AddonsOptions_Impl::GetImageFromURL( const
OUString& aURL, bool bBig, bool
ImageManager::iterator pIter = m_aImageManager.find(aURL);
if ( pIter != m_aImageManager.end() )
{
- ImageEntry &rEntry = pIter->second;
+ OneImageEntry& rSizeEntry = pIter->second.aSizeEntry[nIdx];
+ OneImageEntry& rOtherEntry = pIter->second.aSizeEntry[nOtherIdx];
// actually read the image ...
- if (!rEntry.aImage[nIdx])
- rEntry.aImage[nIdx] = ReadImageFromURL(rEntry.aURL[nIdx]);
+ if (!rSizeEntry.aImage)
+ rSizeEntry.aImage = ReadImageFromURL(rSizeEntry.aURL);
- if (!rEntry.aImage[nIdx])
+ if (!rSizeEntry.aImage)
{ // try the other size and scale it
- aImage = ScaleImage(ReadImageFromURL(rEntry.aURL[nOtherIdx]),
bBig);
- rEntry.aImage[nIdx] = aImage;
- if (!rEntry.aImage[nIdx])
+ aImage = ScaleImage(ReadImageFromURL(rOtherEntry.aURL), bBig);
+ rSizeEntry.aImage = aImage;
+ if (!rSizeEntry.aImage)
SAL_WARN("fwk", "failed to load addons image " << aURL);
}
// FIXME: bNoScale is not terribly meaningful or useful
if (!aImage && bNoScale)
- aImage = rEntry.aImage[nIdx];
+ aImage = rSizeEntry.aImage;
- if (!aImage && !!rEntry.aScaled[nIdx])
- aImage = rEntry.aScaled[nIdx];
+ if (!aImage && !!rSizeEntry.aScaled)
+ aImage = rSizeEntry.aScaled;
else // scale to the correct size for the theme / toolbox
{
- aImage = rEntry.aImage[nIdx];
+ aImage = rSizeEntry.aImage;
if (!aImage) // use and scale the other if one size is missing
- aImage = rEntry.aImage[nOtherIdx];
+ aImage = rOtherEntry.aImage;
aImage = ScaleImage(aImage, bBig);
- rEntry.aScaled[nIdx] = aImage; // cache for next time
+ rSizeEntry.aScaled = aImage; // cache for next time
}
}
commit 5c0e20240a8e55972e5f46b7f9f5c0d8f9733924
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Jan 6 09:47:19 2015 +0000
fix build after enumification of ControlState
Change-Id: If6ab3a27a958e83419f576f720ab891a9c36c684
diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index d0f5e63..282566c 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -337,7 +337,7 @@ bool KDESalGraphics::drawNativeControl( ControlType type,
ControlPart part,
QStyleOptionMenuItem option;
option.checkType = ( part == PART_MENU_ITEM_CHECK_MARK )
? QStyleOptionMenuItem::NonExclusive :
QStyleOptionMenuItem::Exclusive;
- option.checked = ( nControlState & ControlState::PRESSED );
+ option.checked = (nControlState & ControlState::PRESSED) ? true :
false;
// widgetRect is now the rectangle for the checkbox/radiobutton
itself, but Qt
// paints the whole menu item, so translate position (and it'll be
clipped);
// it is also necessary to fill the background transparently
first, as this
commit 1b5c8e4a031af17c47a2900da09c1db1df1242df
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Jan 6 09:23:24 2015 +0000
Resolves: fdo#86911 add tooltip for Color Tolerance spinbutton
Change-Id: I9a30d81124da4e4037834caaf41a8f78fd320290
diff --git a/svx/uiconfig/ui/floatingcontour.ui
b/svx/uiconfig/ui/floatingcontour.ui
index 2edef22..78662a8 100644
--- a/svx/uiconfig/ui/floatingcontour.ui
+++ b/svx/uiconfig/ui/floatingcontour.ui
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.1 -->
<interface>
- <requires lib="gtk+" version="3.0"/>
<!-- interface-requires LibreOffice 1.0 -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">99</property>
<property name="value">10</property>
@@ -307,6 +307,7 @@
<object class="GtkSpinButton" id="spinbutton:0%">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="tooltip_text" translatable="yes">Color
Tolerance</property>
<property name="adjustment">adjustment1</property>
</object>
<packing>
commit 8bc3fb58ffb3ccd2958caeb0f094397e3cdb5098
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Jan 6 10:33:29 2015 +0100
typo
Change-Id: Icad2b01388d46aa2802f1abd9e61d4ce854cca3e
diff --git a/sw/source/uibase/dialog/swabstdlg.cxx
b/sw/source/uibase/dialog/swabstdlg.cxx
index 9db7812..127ac29 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(SVLIBRARY("swui"));
if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule,
sLibName,
SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) )
fp = ( SwAbstractDialogFactory* (SAL_CALL*)() )
commit ee567a63fad9e755b11ca28696da35f00ed3b0fc
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Jan 6 10:28:26 2015 +0100
Use SVLIBRARY instead of gb_Library_get_runtime_filename
Change-Id: I0d21d9685cdc801f7d6975a752999788c1f132e4
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 2afcf9b..a38b6eb 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -49,7 +49,6 @@ $(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 acf4705..4594295 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(SDUI_DLL_NAME);
+ static const OUString sLibName(SVLIBRARY("sdui"));
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 39d6be5..a1c7696 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -47,7 +47,6 @@ $(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 79e6eab..baee838 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(DBTOOLS_DLL_NAME).pData, 0);
+ &thisModule, OUString(SVLIBRARY("dbtools")).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 2af35f2..a5b853a 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -43,8 +43,6 @@ $(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 a7bc6d9..2c1ce9a 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(DBTOOLS_DLL_NAME);
+ const OUString sModuleName(SVLIBRARY("dbtools"));
// load the dbtools library
getDbToolsClientModule() = osl_loadModuleRelative(
diff --git a/sw/source/uibase/dialog/swabstdlg.cxx
b/sw/source/uibase/dialog/swabstdlg.cxx
index 7b5ec71..9db7812 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(SWUI_DLL_NAME);
+ static const OUString sLibName(SVLIBRARY("SWUI"));
if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule,
sLibName,
SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) )
fp = ( SwAbstractDialogFactory* (SAL_CALL*)() )
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index 31ea037..29ca9cf 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Library_set_include,tk,\
$(eval $(call gb_Library_add_defs,tk,\
-DTOOLKIT_DLLIMPLEMENTATION \
- -DSVT_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call
gb_Library__get_name,svt))\" \
))
$(eval $(call gb_Library_use_sdk_api,tk))
diff --git a/toolkit/source/awt/vclxtoolkit.cxx
b/toolkit/source/awt/vclxtoolkit.cxx
index 38b55027..599381e 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -1206,7 +1206,7 @@ css::uno::Reference< css::awt::XWindowPeer >
VCLXToolkit::ImplCreateWindow(
)
{
#ifndef DISABLE_DYNLOADING
- OUString aLibName(SVT_DLL_NAME);
+ OUString aLibName(SVLIBRARY("svt"));
hSvToolsLib = osl_loadModuleRelative(
&thisModule, aLibName.pData, SAL_LOADMODULE_DEFAULT );
if ( hSvToolsLib )
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index e8df725..1595954 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -46,10 +46,6 @@ $(eval $(call gb_Library_set_include,vcl,\
$(eval $(call gb_Library_add_defs,vcl,\
-DVCL_DLLIMPLEMENTATION \
-DVCLOPENGL_DLLIMPLEMENTATION \
- -DCUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call
gb_Library__get_name,cui))\" \
- -DDESKTOP_DETECTOR_DLL_NAME=\"$(call
gb_Library_get_runtime_filename,$(call
gb_Library__get_name,desktop_detector))\" \
- -DTK_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call
gb_Library__get_name,tk))\" \
- -DVCLPLUG_SVP_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call
gb_Library__get_name,vclplug_svp))\" \
))
$(eval $(call gb_Library_use_sdk_api,vcl))
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index da305249..9a4ce12 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1389,7 +1389,7 @@ UnoWrapperBase* Application::GetUnoWrapper( bool
bCreateIfNotExist )
{
#ifndef DISABLE_DYNLOADING
osl::Module aTkLib;
- OUString aLibName(TK_DLL_NAME);
+ OUString aLibName(SVLIBRARY("tk"));
aTkLib.loadRelative(&thisModule, aLibName, SAL_LOADMODULE_DEFAULT);
if (aTkLib.is())
{
diff --git a/vcl/source/window/abstdlg.cxx b/vcl/source/window/abstdlg.cxx
index 869800a..652ac5e 100644
--- a/vcl/source/window/abstdlg.cxx
+++ b/vcl/source/window/abstdlg.cxx
@@ -21,6 +21,7 @@
#include <rtl/ustring.hxx>
#include <osl/module.hxx>
+#include <tools/solar.h>
#include <vcl/abstdlg.hxx>
typedef VclAbstractDialogFactory* (SAL_CALL *FuncPtrCreateDialogFactory)();
@@ -38,7 +39,7 @@ VclAbstractDialogFactory* VclAbstractDialogFactory::Create()
#ifndef DISABLE_DYNLOADING
static ::osl::Module aDialogLibrary;
if (aDialogLibrary.is() ||
- aDialogLibrary.loadRelative(&thisModule, CUI_DLL_NAME,
+ aDialogLibrary.loadRelative(&thisModule, SVLIBRARY("cui"),
SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY))
{
fp = ( VclAbstractDialogFactory* (SAL_CALL*)() )
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx
b/vcl/unx/generic/plugadapt/salplug.cxx
index 80b5acf..0d829ae 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -79,7 +79,7 @@ static SalInstance* tryInstance( const OUString& rModuleBase,
bool bForce = fals
"vclplug_" + rModuleBase + "lo" SAL_DLLEXTENSION );
// vclplug_svp is in libmerged
if (rModuleBase == "svp")
- aModule = VCLPLUG_SVP_DLL_NAME;
+ aModule = SVLIBRARY("vclplug_svp");
oslModule aMod = osl_loadModuleRelative(
reinterpret_cast< oslGenericFunction >( &tryInstance ), aModule.pData,
@@ -141,7 +141,7 @@ static SalInstance* tryInstance( const OUString&
rModuleBase, bool bForce = fals
static DesktopType get_desktop_environment()
{
- OUString aModule(DESKTOP_DETECTOR_DLL_NAME);
+ OUString aModule(SVLIBRARY("desktop_detector"));
oslModule aMod = osl_loadModuleRelative(
reinterpret_cast< oslGenericFunction >( &tryInstance ), aModule.pData,
SAL_LOADMODULE_DEFAULT );
commit 5f5649420bb836094213f684830b062b3a800eb2
Author: Noel Grandin <n...@peralex.com>
Date: Tue Jan 6 11:18:12 2015 +0200
spelling
Change-Id: Iae4280c42a4820eb2ffd11695cd6ff5bf4ea2132
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 6cf5df8..2510202 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -2017,7 +2017,7 @@ void VclBuilder::handleChild(vcl::Window *pParent,
xmlreader::XmlReader &reader)
else
{
// We want to sort labels before contents of frames
- // for key board traversal, especially if there
+ // for keyboard traversal, especially if there
// are multiple widgets using the same mnemonic
if (sType.equals("label"))
{
commit 7cc8e0c302a5e7b669778337576a37f34754478c
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Jan 5 14:38:04 2015 +0000
boost::math::nextafter->std::nextafter
Change-Id: I868b3fcf367e61c40e77e64bcc153b2a2feefa0b
diff --git a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
index 4a2944b..a4f667e 100644
--- a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
@@ -25,7 +25,6 @@
#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
#include <drawinglayer/geometry/viewinformation2d.hxx>
#include <basegfx/polygon/b2dlinegeometry.hxx>
-#include <boost/math/special_functions/next.hpp>
#include <com/sun/star/drawing/LineCap.hpp>
#include <comphelper/random.hxx>
@@ -218,7 +217,7 @@ namespace drawinglayer
{
double getRandomColorRange()
{
- return comphelper::rng::uniform_real_distribution(0.0,
boost::math::nextafter(1.0, DBL_MAX));
+ return comphelper::rng::uniform_real_distribution(0.0,
std::nextafter(1.0, DBL_MAX));
}
}
diff --git a/include/comphelper/random.hxx b/include/comphelper/random.hxx
index 3b1fabb..ca0d3dd 100644
--- a/include/comphelper/random.hxx
+++ b/include/comphelper/random.hxx
@@ -23,7 +23,7 @@ namespace rng
COMPHELPER_DLLPUBLIC void reseed(int i);
// note that uniform_int_distribution is inclusive of b, i.e. [a,b] while
-// uniform_real_distribution is exclusive of b, i.e. [a,b),
[std/boost]::nextafter may be your friend there
+// uniform_real_distribution is exclusive of b, i.e. [a,b), std::nextafter may
be your friend there
/// uniform distribution in [a,b)
COMPHELPER_DLLPUBLIC double uniform_real_distribution(double a = 0.0, double b
= 1.0);
diff --git a/scaddins/source/analysis/analysis.cxx
b/scaddins/source/analysis/analysis.cxx
index 00ed821..28ccc2d 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -31,7 +31,6 @@
#include <string.h>
#include <tools/resmgr.hxx>
#include <tools/rcid.h>
-#include <boost/math/special_functions/next.hpp>
#define ADDIN_SERVICE "com.sun.star.sheet.AddIn"
#define MY_SERVICE "com.sun.star.sheet.addin.Analysis"
@@ -702,7 +701,7 @@ double SAL_CALL AnalysisAddIn::getRandbetween( double fMin,
double fMax ) throw(
if( fMin > fMax )
throw lang::IllegalArgumentException();
- double fRet = floor(comphelper::rng::uniform_real_distribution(fMin,
boost::math::nextafter(fMax+1, -DBL_MAX)));
+ double fRet = floor(comphelper::rng::uniform_real_distribution(fMin,
std::nextafter(fMax+1, -DBL_MAX)));
RETURN_FINITE( fRet );
}
diff --git
a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
index ce78ab0..736c8c7 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
@@ -32,7 +32,6 @@
#include <utility>
#include <boost/make_shared.hpp>
-#include <boost/math/special_functions/next.hpp>
#include <comphelper/random.hxx>
#include "OGLTrans_TransitionImpl.hxx"
@@ -676,7 +675,7 @@ boost::shared_ptr<OGLTransitionImpl> makeRochade()
inline double randFromNeg1to1()
{
- return comphelper::rng::uniform_real_distribution(-1.0,
boost::math::nextafter(1.0, DBL_MAX));
+ return comphelper::rng::uniform_real_distribution(-1.0,
std::nextafter(1.0, DBL_MAX));
}
// TODO(Q3): extract to basegfx
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index a9d3634..b42ef14 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -32,7 +32,6 @@
#include <vcl/bmpacc.hxx>
#include <basegfx/numeric/ftools.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <boost/math/special_functions/next.hpp>
#include <vcldemo-debug.hxx>
#include <rtl/math.hxx>
@@ -318,7 +317,7 @@ public:
for (int i = 0; i < PRINT_N_TEXT; i++) {
rDev.SetTextColor(Color(nCols[i % SAL_N_ELEMENTS(nCols)]));
// random font size to avoid buffering
- vcl::Font aFont(maFontNames[i % maFontNames.size()], Size(0, 1
+ i * (0.9 + comphelper::rng::uniform_real_distribution(0.0,
boost::math::nextafter(0.1, DBL_MAX))) * (r.Top() - r.Bottom())/PRINT_N_TEXT));
+ vcl::Font aFont(maFontNames[i % maFontNames.size()], Size(0, 1
+ i * (0.9 + comphelper::rng::uniform_real_distribution(0.0,
std::nextafter(0.1, DBL_MAX))) * (r.Top() - r.Bottom())/PRINT_N_TEXT));
rDev.SetFont(aFont);
rDev.DrawText(r, aText.copy(0, 4 + (aText.getLength() - 4) *
(PRINT_N_TEXT - i)/PRINT_N_TEXT));
}
commit 3976739f2378391fa09379c48844daf0e2790f5b
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Jan 6 09:14:10 2015 +0000
Revert "boost::unordered_map->std::unordered_map"
as an experiment to see if that's somehow the cause of
NEXT An uncaught exception of type com.sun.star.sdbc.SQLException
NEXT - General error: java.lang.UnsatisfiedLinkError:
com.sun.star.sdbcx.comp.hsqldb.StorageFileAccess.isStreamElement(Ljava/lang/String;Ljava/lang/String;)Z
NEXT ##Failure Location unknown## : Error
Test name: HSQLDBTest::testEmptyDBConnection
NEXT An uncaught exception of type com.sun.star.sdbc.SQLException
NEXT - General error: java.lang.UnsatisfiedLinkError:
com.sun.star.sdbcx.comp.hsqldb.StorageFileAccess.isStreamElement(Ljava/lang/String;Ljava/lang/String;)Z
under clang
This reverts commit ce7f442bd0b600c0acc74d4757e894a2ba382c53.
Change-Id: Ieed0be5721953b9644e4be411173e0ea73f33ed8
diff --git a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
index 4216566..1e9a488 100644
--- a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
+++ b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
@@ -26,7 +26,7 @@
#include "sal/types.h"
#include "typelib/typedescription.hxx"
-#include <unordered_map>
+#include <boost/unordered_map.hpp>
/*See: http://people.redhat.com/drepper/selinux-mem.html*/
#if defined(LINUX) || defined(OPENBSD) || defined(FREEBSD) \
@@ -207,7 +207,7 @@ private:
static void flushCode(
unsigned char const * begin, unsigned char const * end);
- typedef std::unordered_map< OUString, Vtables, OUStringHash > Map;
+ typedef boost::unordered_map< OUString, Vtables, OUStringHash > Map;
osl::Mutex m_mutex;
Map m_map;
diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
b/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
index 2e22d92..8d74357 100644
--- a/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
@@ -21,6 +21,7 @@
#include <stdio.h>
#include <dlfcn.h>
#include <cxxabi.h>
+#include <boost/unordered_map.hpp>
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
@@ -29,7 +30,7 @@
#include <com/sun/star/uno/genfunc.hxx>
#include <typelib/typedescription.hxx>
#include <uno/any2.h>
-#include <unordered_map>
+
#include "share.hxx"
#include <string.h>
@@ -88,7 +89,7 @@ static OUString toUNOname( char const * p )
class RTTI
{
- typedef std::unordered_map< OUString, type_info *, OUStringHash >
t_rtti_map;
+ typedef boost::unordered_map< OUString, type_info *, OUStringHash >
t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
index 8085445..d20bf42 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
@@ -22,6 +22,8 @@
#include <dlfcn.h>
#include <boost/static_assert.hpp>
+#include <boost/unordered_map.hpp>
+
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
#include <osl/mutex.hxx>
@@ -33,7 +35,7 @@
#include <com/sun/star/ucb/NameClashException.hpp>
#include <typelib/typedescription.hxx>
#include <uno/any2.h>
-#include <unordered_map>
+
#include "share.hxx"
using namespace ::osl;
@@ -128,7 +130,7 @@ static OUString toUNOname( char const * p )
class RTTI
{
- typedef std::unordered_map< OUString, std::type_info *, OUStringHash >
t_rtti_map;
+ typedef boost::unordered_map< OUString, std::type_info *, OUStringHash >
t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
index 1620467..cdfaea2 100644
--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
@@ -27,6 +27,7 @@
#include <cxxabi.h>
#include <dlfcn.h>
+#include <boost/unordered_map.hpp>
#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/uno/genfunc.h>
#include <rtl/strbuf.hxx>
@@ -39,8 +40,8 @@
#include <uno/mapping.h>
#include <abi.hxx>
+
#include <osl/mutex.hxx>
-#include <unordered_map>
namespace {
@@ -81,7 +82,7 @@ public:
std::type_info * getRtti(typelib_TypeDescription const & type);
private:
- typedef std::unordered_map<OUString, std::type_info *, OUStringHash> Map;
+ typedef boost::unordered_map<OUString, std::type_info *, OUStringHash> Map;
void * app_;
diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
b/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
index bd7164c..ddf2c06 100644
--- a/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
@@ -22,6 +22,8 @@
#include <string.h>
#include <dlfcn.h>
#include <cxxabi.h>
+#include <boost/unordered_map.hpp>
+
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
