avmedia/source/win/player.cxx | 12
avmedia/source/win/player.hxx | 8
avmedia/source/win/window.cxx | 28 -
avmedia/source/win/window.hxx | 8
basic/source/sbx/sbxdec.cxx | 6
canvas/source/directx/dx_9rm.cxx | 21
canvas/source/directx/dx_canvas.hxx | 6
canvas/source/directx/dx_canvasbitmap.hxx | 12
canvas/source/directx/dx_canvascustomsprite.hxx | 8
canvas/source/directx/dx_spritecanvas.hxx | 10
canvas/source/directx/dx_spritedevicehelper.cxx | 4
canvas/source/directx/dx_surfacebitmap.cxx | 8
canvas/source/directx/dx_textlayout.cxx | 11
canvas/source/directx/dx_textlayout_drawhelper.cxx | 2
canvas/source/directx/dx_textlayout_drawhelper.hxx | 4
configure.ac | 6
connectivity/source/drivers/ado/AResultSet.cxx | 2
connectivity/source/drivers/ado/AView.cxx | 2
connectivity/source/inc/ado/ACallableStatement.hxx | 50 -
connectivity/source/inc/ado/AConnection.hxx | 48 -
connectivity/source/inc/ado/APreparedStatement.hxx | 71 +-
connectivity/source/inc/ado/AResultSet.hxx | 1
connectivity/source/inc/ado/AStatement.hxx | 56 +-
cppu/qa/test_unotype.cxx | 21
cppuhelper/source/servicemanager.cxx | 2
cppuhelper/source/servicemanager.hxx | 2
embeddedobj/source/msole/oleembed.cxx | 2
extensions/source/scanner/scanwin.cxx | 12
fpicker/source/office/iodlg.cxx | 4
fpicker/source/win32/filepicker/FileOpenDlg.cxx | 6
fpicker/source/win32/filepicker/FilePicker.cxx | 1
fpicker/source/win32/filepicker/VistaFilePicker.cxx | 4
fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx | 5
hwpfilter/source/hwpreader.cxx | 8
idl/source/prj/database.cxx | 2
include/LibreOfficeKit/LibreOfficeKitInit.h | 4
include/cppu/unotype.hxx | 6
include/filter/msfilter/escherex.hxx | 22
include/rtl/ustrbuf.hxx | 3
include/svx/pageitem.hxx | 2
odk/source/unoapploader/win/unoapploader.c | 4
sc/source/core/tool/simplerangelist.cxx | 4
sdext/source/pdfimport/wrapper/wrapper.cxx | 8
sdext/source/presenter/PresenterScrollBar.cxx | 1
sdext/source/presenter/PresenterTextView.cxx | 1
sdext/source/presenter/PresenterUIPainter.cxx | 4
shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx | 274
----------
shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx | 4
shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx | 2
svl/source/items/poolio.cxx | 1
svl/source/misc/adrparse.cxx | 4
svx/source/items/pageitem.cxx | 2
svx/source/table/cell.hxx | 3
vcl/glyphy/demo.cxx | 4
vcl/inc/glyphy/demo.hxx | 2
vcl/opengl/win/WinDeviceInfo.cxx | 24
vcl/opengl/win/blocklist_parser.cxx | 4
vcl/source/gdi/pdfwriter_impl.cxx | 9
vcl/win/source/gdi/salgdi.cxx | 26
vcl/win/source/gdi/salgdi3.cxx | 73 --
vcl/win/source/gdi/salprn.cxx | 3
vcl/win/source/gdi/winlayout.cxx | 52 -
62 files changed, 303 insertions(+), 696 deletions(-)
New commits:
commit 80c0767b98c656e844b86bcc4bde93c232ee7bab
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Nov 27 09:52:31 2015 +0100
Work around clang-cl PR25641
"defaultbootstrap.o : error LNK2001: unresolved external symbol
'[thunk]:private: virtual class com::sun::star::uno::Sequence<class
rtl::OUString> __cdecl
cppuhelper::ServiceManager::getAvailableServiceNames`adjustor{24}'
(void)'
(?getAvailableServiceNames@ServiceManager@cppuhelper@@GBI@EAA?AV?$Sequence@VOUString@rtl@@@uno@star@sun@com@@XZ)"
Change-Id: I04b7353305ffeeb316d70ab8408aeb52ea0f7186
diff --git a/cppuhelper/source/servicemanager.cxx
b/cppuhelper/source/servicemanager.cxx
index 9f93d70..2d824d4 100644
--- a/cppuhelper/source/servicemanager.cxx
+++ b/cppuhelper/source/servicemanager.cxx
@@ -1353,6 +1353,8 @@ sal_Bool cppuhelper::ServiceManager::hasPropertyByName(
return Name == "DefaultContext";
}
+cppuhelper::ServiceManager::~ServiceManager() {}
+
void cppuhelper::ServiceManager::disposing(
css::lang::EventObject const & Source)
throw (css::uno::RuntimeException, std::exception)
diff --git a/cppuhelper/source/servicemanager.hxx
b/cppuhelper/source/servicemanager.hxx
index d7f8f90..c217cbc 100644
--- a/cppuhelper/source/servicemanager.hxx
+++ b/cppuhelper/source/servicemanager.hxx
@@ -204,7 +204,7 @@ public:
std::shared_ptr< Data::Implementation > & implementation);
private:
- virtual ~ServiceManager() {}
+ virtual ~ServiceManager();
virtual void SAL_CALL disposing() override;
commit 985d259e7dbc3f04666ee3046fb9a3104663dd65
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Nov 27 09:48:07 2015 +0100
Silence clang-cl warnings in gperf-generated code
Change-Id: Id30e7afb3024d94cacf392bcd72c952d5a2ba5c4
diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx
b/sdext/source/pdfimport/wrapper/wrapper.cxx
index 74e17f8..e536a80 100644
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -128,7 +128,15 @@ enum parseKey {
NONE
};
+#if defined _MSC_VER && defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-register"
+#pragma clang diagnostic ignored "-Wextra-tokens"
+#endif
#include "hash.cxx"
+#if defined _MSC_VER && defined __clang__
+#pragma clang diagnostic pop
+#endif
class Parser
{
commit bc2fe2249b7d4e472bcb2a7eeb05d5e0e6a37fb9
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Nov 27 09:44:10 2015 +0100
Adapt to true wchar_t in clang-cl
Change-Id: Id127668e6786665b819b7c0b1c0cd424ebff96bf
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index a39ff94..dab0d65 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -1720,7 +1720,7 @@ void HwpReader::makePageStyle()
if( hwpinfo.back_info.type == 1 ){
#ifdef _WIN32
padd("xlink:href", sXML_CDATA,
- hconv(kstr2hstr((uchar*)
urltowin(hwpinfo.back_info.filename).c_str()).c_str()));
+ reinterpret_cast<sal_Unicode const
*>(hconv(kstr2hstr((uchar*)
urltowin(hwpinfo.back_info.filename).c_str()).c_str())));
#else
padd("xlink:href", sXML_CDATA,
reinterpret_cast<sal_Unicode const *>(hconv(kstr2hstr(
reinterpret_cast<uchar const
*>(urltounix(hwpinfo.back_info.filename).c_str())).c_str())));
@@ -3831,9 +3831,9 @@ void HwpReader::makePicture(Picture * hbox)
padd("xlink:type", sXML_CDATA, "simple");
#ifdef _WIN32
if( hbox->follow[4] != 0 )
- padd("xlink:href", sXML_CDATA,
(hconv(kstr2hstr(hbox->follow + 4).c_str())));
+ padd("xlink:href", sXML_CDATA,
reinterpret_cast<sal_Unicode const *>(hconv(kstr2hstr(hbox->follow +
4).c_str())));
else
- padd("xlink:href", sXML_CDATA,
(hconv(kstr2hstr(hbox->follow + 5).c_str())));
+ padd("xlink:href", sXML_CDATA,
reinterpret_cast<sal_Unicode const *>(hconv(kstr2hstr(hbox->follow +
5).c_str())));
#else
if( hbox->follow[4] != 0 )
padd("xlink:href", sXML_CDATA,
@@ -3892,7 +3892,7 @@ void HwpReader::makePicture(Picture * hbox)
if ( hbox->pictype == PICTYPE_FILE ){
#ifdef _WIN32
sprintf(buf, "file:///%s", hbox->picinfo.picun.path );
- padd("xlink:href", sXML_CDATA, (hconv(kstr2hstr((uchar *)
buf).c_str())));
+ padd("xlink:href", sXML_CDATA, reinterpret_cast<sal_Unicode
const *>(hconv(kstr2hstr((uchar *) buf).c_str())));
#else
padd("xlink:href", sXML_CDATA,
reinterpret_cast<sal_Unicode const
*>(hconv(kstr2hstr(reinterpret_cast<uchar const
*>(urltounix(hbox->picinfo.picun.path).c_str())).c_str())));
commit 0475ab72081016c8a651b9fc6cdbccc31c718cb6
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Nov 27 09:43:27 2015 +0100
Adapt to true wchar_t in clang-cl
Change-Id: I14c2dc0be12151b5d4ea2ba3b65030f6f4494905
diff --git a/cppu/qa/test_unotype.cxx b/cppu/qa/test_unotype.cxx
index 338c6f7..a0b63fa 100644
--- a/cppu/qa/test_unotype.cxx
+++ b/cppu/qa/test_unotype.cxx
@@ -233,7 +233,8 @@ void Test::testUnoType() {
}
void Test::testGetTypeFavourUnsigned() {
-#if defined SAL_W32 && !defined __MINGW32__ // cf. sal/types.h sal_Unicode
+#if defined SAL_W32 && !defined __MINGW32__ && !defined __clang__
+ // cf. sal/types.h sal_Unicode
CPPUNIT_ASSERT(typeid(sal_Unicode) == typeid(sal_uInt16));
#else
CPPUNIT_ASSERT(typeid(sal_Unicode) != typeid(sal_uInt16));
@@ -281,7 +282,8 @@ void Test::testGetTypeFavourUnsigned() {
CPPUNIT_ASSERT_EQUAL(
cppu::getTypeFavourUnsigned(static_cast<cppu::UnoCharType *>(nullptr)),
cppu::UnoType<cppu::UnoCharType>::get());
-#if defined SAL_W32 && !defined __MINGW32__ // cf. sal/types.h sal_Unicode
+#if defined SAL_W32 && !defined __MINGW32__ && !defined __clang__
+ // cf. sal/types.h sal_Unicode
CPPUNIT_ASSERT_EQUAL(
cppu::getTypeFavourUnsigned(static_cast<sal_Unicode *>(nullptr)),
cppu::UnoType<cppu::UnoUnsignedShortType>::get());
@@ -326,7 +328,8 @@ void Test::testGetTypeFavourUnsigned() {
cppu::UnoType<
cppu::UnoSequenceType<
cppu::UnoSequenceType<cppu::UnoUnsignedShortType>>>::get());
-#if defined SAL_W32 && !defined __MINGW32__ // cf. sal/types.h sal_Unicode
+#if defined SAL_W32 && !defined __MINGW32__ && !defined __clang__
+ // cf. sal/types.h sal_Unicode
CPPUNIT_ASSERT_EQUAL(
cppu::getTypeFavourUnsigned(
static_cast<css::uno::Sequence<sal_Unicode> *>(nullptr)),
@@ -424,7 +427,8 @@ void Test::testGetTypeFavourUnsigned() {
}
void Test::testGetTypeFavourChar() {
-#if defined SAL_W32 && !defined __MINGW32__ // cf. sal/types.h sal_Unicode
+#if defined SAL_W32 && !defined __MINGW32__ && !defined __clang__
+ // cf. sal/types.h sal_Unicode
CPPUNIT_ASSERT(typeid(sal_Unicode) == typeid(sal_uInt16));
#else
CPPUNIT_ASSERT(typeid(sal_Unicode) != typeid(sal_uInt16));
@@ -448,7 +452,8 @@ void Test::testGetTypeFavourChar() {
cppu::getTypeFavourChar(
static_cast<cppu::UnoUnsignedShortType *>(nullptr)),
cppu::UnoType<cppu::UnoUnsignedShortType>::get());
-#if defined SAL_W32 && !defined __MINGW32__ // cf. sal/types.h sal_Unicode
+#if defined SAL_W32 && !defined __MINGW32__ && !defined __clang__
+ // cf. sal/types.h sal_Unicode
CPPUNIT_ASSERT_EQUAL(
cppu::getTypeFavourChar(static_cast<sal_uInt16 *>(nullptr)),
cppu::UnoType<cppu::UnoCharType>::get());
@@ -496,7 +501,8 @@ void Test::testGetTypeFavourChar() {
cppu::UnoSequenceType<cppu::UnoUnsignedShortType> *>(nullptr)),
cppu::UnoType<
cppu::UnoSequenceType<cppu::UnoUnsignedShortType>>::get());
-#if defined SAL_W32 && !defined __MINGW32__ // cf. sal/types.h sal_Unicode
+#if defined SAL_W32 && !defined __MINGW32__ && !defined __clang__
+ // cf. sal/types.h sal_Unicode
CPPUNIT_ASSERT_EQUAL(
cppu::getTypeFavourChar(
static_cast<css::uno::Sequence<sal_uInt16> *>(nullptr)),
@@ -517,7 +523,8 @@ void Test::testGetTypeFavourChar() {
cppu::UnoType<
cppu::UnoSequenceType<
cppu::UnoSequenceType<cppu::UnoUnsignedShortType>>>::get());
-#if defined SAL_W32 && !defined __MINGW32__ // cf. sal/types.h sal_Unicode
+#if defined SAL_W32 && !defined __MINGW32__ && !defined __clang__
+ // cf. sal/types.h sal_Unicode
CPPUNIT_ASSERT_EQUAL(
cppu::getTypeFavourChar(
static_cast<
diff --git a/include/cppu/unotype.hxx b/include/cppu/unotype.hxx
index a594450..a4d7501 100644
--- a/include/cppu/unotype.hxx
+++ b/include/cppu/unotype.hxx
@@ -149,7 +149,8 @@ cppu_detail_getUnoType(
::typelib_TypeClass_UNSIGNED_SHORT);
}
-#if LIBO_INTERNAL_ONLY && (!defined SAL_W32 || defined __MINGW32__)
+#if LIBO_INTERNAL_ONLY \
+ && (!defined SAL_W32 || defined __MINGW32__ || defined __clang__)
// cf. sal/types.h sal_Unicode
inline css::uno::Type const &
cppu_detail_getUnoType(SAL_UNUSED_PARAMETER sal_uInt16 const *) {
@@ -194,7 +195,8 @@ cppu_detail_getUnoType(SAL_UNUSED_PARAMETER
::cppu::UnoCharType const *) {
return ::cppu::detail::getTypeFromTypeClass(::typelib_TypeClass_CHAR);
}
-#if LIBO_INTERNAL_ONLY && (!defined SAL_W32 || defined __MINGW32__)
+#if LIBO_INTERNAL_ONLY \
+ && (!defined SAL_W32 || defined __MINGW32__ || defined __clang__)
// cf. sal/types.h sal_Unicode
inline css::uno::Type const &
cppu_detail_getUnoType(SAL_UNUSED_PARAMETER sal_Unicode const *) {
diff --git a/include/rtl/ustrbuf.hxx b/include/rtl/ustrbuf.hxx
index f8dda00..1b10679 100644
--- a/include/rtl/ustrbuf.hxx
+++ b/include/rtl/ustrbuf.hxx
@@ -638,7 +638,8 @@ public:
return append( &c, 1 );
}
-#if LIBO_INTERNAL_ONLY && (!defined SAL_W32 || defined __MINGW32__)
+#if LIBO_INTERNAL_ONLY && \
+ (!defined SAL_W32 || defined __MINGW32__ || defined __clang__)
// cf. sal/types.h sal_Unicode
void append(sal_uInt16) = delete;
#endif
commit 9c49ece604ae70a166fa032397fe5c904283c8a7
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Nov 27 09:35:53 2015 +0100
-Werror,-Wdelete-non-virtual-dtor
"thumbviewer.cxx(168,9) : error: delete called on 'StreamOnZipBuffer' that
has
virtual functions but non-virtual destructor"
Change-Id: I34510d54b9a99d8f1f9e8da0236625023c3fd94c
diff --git a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
index 3062f84..8d929e8 100644
--- a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
+++ b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
@@ -117,7 +117,7 @@ namespace internal
}
}
-class StreamOnZipBuffer : public IStream
+class StreamOnZipBuffer final : public IStream
{
public:
StreamOnZipBuffer(const ZipFile::ZipContentBuffer_t& zip_buffer);
commit b98febded45cea4d20cae284be84ac4b65e27775
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Nov 27 09:33:41 2015 +0100
-Werror,-Wduplicate-decl-specifier (extern "C" already in STDAPI)
Change-Id: I2f170c8ad2ef30f49062fdeee4bcdcf5baf552db
diff --git a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
index f380706..b9c5864 100644
--- a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
+++ b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
@@ -406,7 +406,7 @@ bool CClassFactory::IsLocked()
}
-extern "C" STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void** ppv)
+STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void** ppv)
{
OutputDebugStringFormat( "DllGetClassObject.\n" );
*ppv = 0;
@@ -423,7 +423,7 @@ extern "C" STDAPI DllGetClassObject(REFCLSID rclsid, REFIID
riid, void** ppv)
}
-extern "C" STDAPI DllCanUnloadNow()
+STDAPI DllCanUnloadNow()
{
OutputDebugStringFormat( "DllCanUnloadNow.\n" );
if (CClassFactory::IsLocked() || g_DllRefCnt > 0)
commit feea3810b778fd4054188b11ad6452d4d032c84d
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Nov 27 09:32:20 2015 +0100
-Werror,-Wunused-function
...since ce59f8851472776f2ea364f7597ac887e77081c5 "INTEGRATION: CWS
desktintgr03: #i34294#" commented out the uses (whicht got later removed
completely with 45f0cc2ec176f02592a4e67942b1220f7837ab9f "Remove commented
code
in libs-core/shell")
Change-Id: Icb7f97b72634d07045f5880af33b372be36e66b2
diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
index 819d5a4..a4d038f 100644
--- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
@@ -953,280 +953,6 @@ extern "C" SCODE STDMETHODCALLTYPE DllCanUnloadNow()
// E_UNEXPECTED
// (not implemented)
-
-
-//F-------------------------------------------------------------------------
-// helper functions to register the Indexing Service.
-
-
-namespace /* private */
-{
- const char* GUID_PLACEHOLDER = "{GUID}";
- const char* GUID_PERSIST_PLACEHOLDER = "{GUIDPERSIST}";
- const char* EXTENSION_PLACEHOLDER = "{EXT}";
-
- const char* CLSID_GUID_INPROC_ENTRY =
"CLSID\\{GUID}\\InProcServer32";
- const char* CLSID_GUID_ENTRY = "CLSID\\{GUID}";
- const char* CLSID_GUID_PERSIST_ADDIN_ENTRY =
"CLSID\\{GUID}\\PersistentAddinsRegistered\\{GUIDPERSIST}";
- const char* CLSID_PERSIST_ENTRY =
"CLSID\\{GUID}\\PersistentHandler";
- const char* EXT_PERSIST_ENTRY =
"{EXT}\\PersistentHandler";
-
- const char* INDEXING_FILTER_DLLSTOREGISTER =
"SYSTEM\\CurrentControlSet\\Control\\ContentIndex";
-
-
- // "String Placeholder" ->
- // "String Replacement"
-
-
- void SubstitutePlaceholder(std::string& String, const std::string&
Placeholder, const std::string& Replacement)
- {
- std::string::size_type idx = String.find(Placeholder);
- std::string::size_type len = Placeholder.length();
-
- while (std::string::npos != idx)
- {
- String.replace(idx, len, Replacement);
- idx = String.find(Placeholder);
- }
- }
-
-
- // Make the registry entry and set Filter Handler
- // HKCR\CLSID\{7BC0E710-5703-45be-A29D-5D46D8B39262} = LibreOffice Filter
- // InProcServer32 (Default) = Path\ooofilt.dll
- // ThreadingModel = Both
-
-
- HRESULT RegisterFilterHandler(const char* FilePath, const CLSID&
FilterGuid)
- {
- std::string ClsidEntry = CLSID_GUID_ENTRY;
- SubstitutePlaceholder(ClsidEntry, GUID_PLACEHOLDER,
ClsidToString(FilterGuid));
-
- if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry.c_str(), "",
"LibreOffice Filter"))
- return E_FAIL;
-
- ClsidEntry = CLSID_GUID_INPROC_ENTRY;
- SubstitutePlaceholder(ClsidEntry, GUID_PLACEHOLDER,
ClsidToString(FilterGuid));
-
- if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry.c_str(), "",
FilePath))
- return E_FAIL;
-
- if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry.c_str(),
"ThreadingModel", "Both"))
- return E_FAIL;
-
- return S_OK;
- }
-
-
- // Make the registry entry and set Persistent Handler
- // HKCR\CLSID\{7BC0E713-5703-45be-A29D-5D46D8B39262} = LibreOffice
Persistent Handler
- // PersistentAddinsRegistered
- // {89BCB740-6119-101A-BCB7-00DD010655AF} =
{7BC0E710-5703-45be-A29D-5D46D8B39262}
-
-
- HRESULT RegisterPersistentHandler(const CLSID& FilterGuid, const CLSID&
PersistentGuid)
- {
- std::string ClsidEntry_Persist = CLSID_GUID_ENTRY;
- SubstitutePlaceholder(ClsidEntry_Persist, GUID_PLACEHOLDER,
ClsidToString(PersistentGuid));
-
-
- if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry_Persist.c_str(), "",
"LibreOffice Persistent Handler"))
- return E_FAIL;
-
- // Add missing entry
- std::string ClsidEntry_Persist_Entry = CLSID_PERSIST_ENTRY;
- SubstitutePlaceholder(ClsidEntry_Persist_Entry,
- GUID_PLACEHOLDER,
- ClsidToString(PersistentGuid));
-
- if (!SetRegistryKey(HKEY_CLASSES_ROOT,
ClsidEntry_Persist_Entry.c_str(), "", ClsidToString(PersistentGuid).c_str()))
- return E_FAIL;
-
- std::string ClsidEntry_Persist_Addin = CLSID_GUID_PERSIST_ADDIN_ENTRY;
- SubstitutePlaceholder(ClsidEntry_Persist_Addin,
- GUID_PLACEHOLDER,
- ClsidToString(PersistentGuid));
- SubstitutePlaceholder(ClsidEntry_Persist_Addin,
- GUID_PERSIST_PLACEHOLDER,
- ClsidToString(CLSID_PERSISTENT_HANDLER_ADDIN));
-
- if (!SetRegistryKey(HKEY_CLASSES_ROOT,
ClsidEntry_Persist_Addin.c_str(), "", ClsidToString(FilterGuid).c_str() ))
- return E_FAIL;
-
- return S_OK;
- }
-
-
- // Unregister Filter Handler or persistent handler
-
-
- HRESULT UnregisterHandler(const CLSID& Guid)
- {
- std::string tmp = "CLSID\\";
- tmp += ClsidToString(Guid);
- return DeleteRegistryKey(HKEY_CLASSES_ROOT, tmp.c_str()) ? S_OK :
E_FAIL;
- }
-
-
- // Register Indexing Service ext and class.
- // HKCR\{EXT}\PersistentHandler = {7BC0E713-5703-45be-A29D-5D46D8B39262}
- // HKCR\{GUID\PersistentHandler = {7BC0E713-5703-45be-A29D-5D46D8B39262}
-
-
- HRESULT RegisterSearchHandler(const char* ModuleFileName)
- {
- if (FAILED(RegisterFilterHandler(ModuleFileName,
CLSID_FILTER_HANDLER)))
- return E_FAIL;
-
- if (FAILED(RegisterPersistentHandler(CLSID_FILTER_HANDLER,
CLSID_PERSISTENT_HANDLER )))
- return E_FAIL;
-
- std::string sExtPersistEntry;
-
- for(size_t i = 0; i < OOFileExtensionTableSize; i++)
- {
- // first, register extension.
- sExtPersistEntry = EXT_PERSIST_ENTRY;
- SubstitutePlaceholder(sExtPersistEntry, EXTENSION_PLACEHOLDER,
OOFileExtensionTable[i].ExtensionAnsi);
- if (!SetRegistryKey(HKEY_CLASSES_ROOT,
- sExtPersistEntry.c_str(),
- "",
-
ClsidToString(CLSID_PERSISTENT_HANDLER).c_str()))
- return E_FAIL;
-
- // second, register class.
- char extClassName[MAX_PATH];
- if (QueryRegistryKey(HKEY_CLASSES_ROOT,
OOFileExtensionTable[i].ExtensionAnsi, "", extClassName,MAX_PATH))
- {
- ::std::string extCLSIDName( extClassName );
- extCLSIDName += "\\CLSID";
- char extCLSID[MAX_PATH];
-
- if (QueryRegistryKey( HKEY_CLASSES_ROOT, extCLSIDName.c_str(),
"", extCLSID, MAX_PATH))
- {
- std::string ClsidEntry_CLSID_Persist = CLSID_PERSIST_ENTRY;
- SubstitutePlaceholder(ClsidEntry_CLSID_Persist,
- GUID_PLACEHOLDER,
- extCLSID);
-
- if (!SetRegistryKey(HKEY_CLASSES_ROOT,
- ClsidEntry_CLSID_Persist.c_str(),
- "",
-
ClsidToString(CLSID_PERSISTENT_HANDLER).c_str() ))
- return E_FAIL;
- }
- }
- }
-
- return S_OK;
- }
-
- // Register Indexing Service ext and class.
- HRESULT UnregisterSearchHandler()
- {
- std::string sExtPersistEntry;
-
- for (size_t i = 0; i < OOFileExtensionTableSize; i++)
- {
- // first, unregister extension
- sExtPersistEntry = EXT_PERSIST_ENTRY;
- SubstitutePlaceholder(sExtPersistEntry, EXTENSION_PLACEHOLDER,
OOFileExtensionTable[i].ExtensionAnsi);
- DeleteRegistryKey(HKEY_CLASSES_ROOT, sExtPersistEntry.c_str());
-
- // second, unregister class
- char extClassName[MAX_PATH];
- if (QueryRegistryKey(HKEY_CLASSES_ROOT,
OOFileExtensionTable[i].ExtensionAnsi, "", extClassName,MAX_PATH))
- {
- ::std::string extCLSIDName( extClassName );
- extCLSIDName += "\\CLSID";
- char extCLSID[MAX_PATH];
-
- if (QueryRegistryKey( HKEY_CLASSES_ROOT, extCLSIDName.c_str(),
"", extCLSID, MAX_PATH))
- {
- std::string ClsidEntry_CLSID_Persist = CLSID_PERSIST_ENTRY;
- SubstitutePlaceholder(ClsidEntry_CLSID_Persist,
- GUID_PLACEHOLDER,
- extCLSID);
-
- DeleteRegistryKey(HKEY_CLASSES_ROOT,
ClsidEntry_CLSID_Persist.c_str());
- }
- }
- }
-
- return ((UnregisterHandler(CLSID_FILTER_HANDLER)==S_OK) &&
(UnregisterHandler(CLSID_PERSISTENT_HANDLER)==S_OK))?S_OK:E_FAIL;
- }
-
-
- // add or remove an entry to DllsToRegister entry of Indexing
- // Filter to let Indexing Service register our filter automatically
- // each time.
-
- HRESULT AddOrRemoveDllsToRegisterList( const ::std::string & DllPath, bool
isAdd )
- {
- char DllsToRegisterList[4096];
- if (QueryRegistryKey(HKEY_LOCAL_MACHINE,
- INDEXING_FILTER_DLLSTOREGISTER,
- "DLLsToRegister",
- DllsToRegisterList,
- 4096))
- {
- char * pChar = DllsToRegisterList;
- for ( ; *pChar != '\0' || *(pChar +1) != '\0'; pChar++)
- if ( *pChar == '\0')
- *pChar = ';';
- *pChar = ';';
- *(pChar+1) = '\0';
-
- ::std::string DllList(DllsToRegisterList);
- if ( ( isAdd )&&( DllList.find( DllPath ) == ::std::string::npos )
)
- DllList.append( DllPath );
- else if ( ( !isAdd )&&( DllList.find( DllPath ) !=
::std::string::npos ) )
- DllList.erase( DllList.find( DllPath )-1, DllPath.length()+1 );
- else
- return S_OK;
-
- pChar = DllsToRegisterList;
- for ( size_t nChar = 0; nChar < DllList.length(); pChar++,nChar++)
- {
- if ( DllList[nChar] == ';')
- *pChar = '\0';
- else
- *pChar = DllList[nChar];
- }
- *pChar = *( pChar+1 ) ='\0';
-
- HKEY hSubKey;
- char dummy[] = "";
- int rc = RegCreateKeyExA(HKEY_LOCAL_MACHINE,
- INDEXING_FILTER_DLLSTOREGISTER,
- 0,
- dummy,
- REG_OPTION_NON_VOLATILE,
- KEY_WRITE,
- 0,
- &hSubKey,
- 0);
-
- if (ERROR_SUCCESS == rc)
- {
- rc = RegSetValueExA( hSubKey,
- "DLLsToRegister",
- 0,
- REG_MULTI_SZ,
- reinterpret_cast<const
BYTE*>(DllsToRegisterList),
- static_cast<DWORD>(DllList.length() + 2));
-
- RegCloseKey(hSubKey);
- }
-
- return (ERROR_SUCCESS == rc)?S_OK:E_FAIL;
- }
-
- return S_OK;
- }
-
-} // namespace /* private */
-
STDAPI DllRegisterServer()
{
return S_OK;
commit fa906e531bd1b6d5e3b9ecef7016f6d67c987fa7
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Nov 27 09:31:07 2015 +0100
-Werror,-Wunused-function
Change-Id: Icb5476f117ec44f5a4dc3026595305293b99fdd8
diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h
b/include/LibreOfficeKit/LibreOfficeKitInit.h
index e54bdd1..a5b5035 100644
--- a/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -253,7 +253,7 @@ static LibreOfficeKit *lok_init_2( const char
*install_path, const char *user_p
}
static
-#ifdef __GNUC__
+#if defined __GNUC__ || defined __clang__
__attribute__((used))
#endif
LibreOfficeKit *lok_init( const char *install_path )
commit 2fe2ca2677d8613140e99da78a6a24a531943260
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Nov 27 09:30:38 2015 +0100
-Wmicrosoft-cast
Change-Id: I205861dd46d635b4b7be87ec8eb84cb70d8bf4d7
diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h
b/include/LibreOfficeKit/LibreOfficeKitInit.h
index e2af109..e54bdd1 100644
--- a/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -97,7 +97,7 @@ extern "C"
void *lok_dlsym(void *Hnd, const char *pName)
{
- return GetProcAddress((HINSTANCE) Hnd, pName);
+ return reinterpret_cast<void *>(GetProcAddress((HINSTANCE) Hnd,
pName));
}
int lok_dlclose(void *Hnd)
commit 353b7dde331a30ccad159a5948376fb011cd781c
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Nov 27 09:26:42 2015 +0100
-Werror,-Wstring-plus-int
Change-Id: Ie16ca73ac3d622d00583ef454780f9a01b32d436
diff --git a/odk/source/unoapploader/win/unoapploader.c
b/odk/source/unoapploader/win/unoapploader.c
index 7579aa4..9b2c1d3 100644
--- a/odk/source/unoapploader/win/unoapploader.c
+++ b/odk/source/unoapploader/win/unoapploader.c
@@ -112,8 +112,8 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE
hPrevInstance,
}
wcscpy(
cmd + pathsize,
- (L"\\unoinfo.exe\" c++" +
- (pathsize == 1 || cmd[pathsize - 1] != L'\\' ? 0 : 1)));
+ &L"\\unoinfo.exe\" c++"[
+ pathsize == 1 || cmd[pathsize - 1] != L'\\' ? 0 : 1]);
sec.nLength = sizeof (SECURITY_ATTRIBUTES);
sec.lpSecurityDescriptor = NULL;
sec.bInheritHandle = TRUE;
commit 687d97b96ab97fa8bbd1c5112a0e4b43914c69f6
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Nov 27 09:21:42 2015 +0100
Make Clang version detection work for clang-cl
...which does not behave as expected with the given command line arguments,
so
just strip "-cl.exe" (and any hard-coded command line arguments following
it in
$CC, but that's probably rather harmless here). Expects that clang-cl is
given
with an ".exe" extension in $CC (not assuming that and stripping "-cl" and
everything that might follow could be a bit too agressive).
Change-Id: If99f964dda1369b7d4bbb63b3d634b93c9f935a8
diff --git a/configure.ac b/configure.ac
index 01d24e9..c02189b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3762,8 +3762,8 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
if test "$COM_IS_CLANG" = TRUE; then
AC_MSG_CHECKING([the Clang version])
- clang_version=`echo __clang_major__.__clang_minor__.__clang_patchlevel__ |
$CC -E -P -`
- CLANG_FULL_VERSION=`echo __clang_version__ | $CC -E -P -`
+ clang_version=`echo __clang_major__.__clang_minor__.__clang_patchlevel__ |
${CC%-cl.exe*} -E -P -`
+ CLANG_FULL_VERSION=`echo __clang_version__ | ${CC%-cl.exe*} -E -P -`
CLANGVER=`echo $clang_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
AC_MSG_RESULT([Clang $CLANG_FULL_VERSION, $CLANGVER])
AC_DEFINE_UNQUOTED(CLANG_FULL_VERSION,$CLANG_FULL_VERSION)
commit d8a423399014b77d58d4546564ea4f44e1a5cf0b
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Nov 27 09:02:20 2015 +0100
-Werror,-Wformat
Change-Id: I60589ff9a5b47bcc3c749238a9cd3d8e910b7ba5
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index 4f513a0..5dccf9b 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -463,7 +463,7 @@ void SvIdlDataBase::WriteError( const OString& rErrWrn,
sal_uLong nRow, sal_uLong nColumn )
{
// error treatment
- fprintf( stderr, "\n%s --- %s: ( %ld, %ld )\n",
+ fprintf( stderr, "\n%s --- %s: ( %" SAL_PRIuUINTPTR ", %" SAL_PRIuUINTPTR
" )\n",
rFileName.getStr(), rErrWrn.getStr(), nRow, nColumn );
if( !rErrorText.isEmpty() )
commit 1cb4fa339159f6d22b28ba2da98284f265ca1c1d
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Nov 27 09:01:41 2015 +0100
-Werror,-Wmicrosoft-enum-value
Change-Id: I50aaeb264c901146c119192cbd961b20117788e1
diff --git a/svl/source/misc/adrparse.cxx b/svl/source/misc/adrparse.cxx
index 96849b1..23fa558 100644
--- a/svl/source/misc/adrparse.cxx
+++ b/svl/source/misc/adrparse.cxx
@@ -67,8 +67,8 @@ class SvAddressParser_Impl
{
enum State { BEFORE_COLON, BEFORE_LESS, AFTER_LESS, AFTER_GREATER };
- enum TokenType { TOKEN_QUOTED = 0x80000000, TOKEN_DOMAIN, TOKEN_COMMENT,
- TOKEN_ATOM };
+ enum TokenType: sal_uInt32 {
+ TOKEN_QUOTED = 0x80000000, TOKEN_DOMAIN, TOKEN_COMMENT, TOKEN_ATOM };
sal_Unicode const * m_pInputPos;
sal_Unicode const * m_pInputEnd;
commit 813080fde9c0e168337fad0784cfa4f78eb07191
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Nov 27 08:15:11 2015 +0100
Missing include
Change-Id: I62fd53d6f39349405865783bc44edbb7929664a1
diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx
index 4edf4aa..092f5d5 100644
--- a/svl/source/items/poolio.cxx
+++ b/svl/source/items/poolio.cxx
@@ -27,6 +27,7 @@
#include <svl/SfxBroadcaster.hxx>
#include <svl/filerec.hxx>
#include "poolio.hxx"
+#include <algorithm>
#include <memory>
/**
commit aef3bc8b586938df5208bd888ebccfbd4e3a8761
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Nov 26 23:38:51 2015 +0100
Missing include
Change-Id: If88aae978bc7cabe212f645f8eedff14d36c062f
diff --git a/sc/source/core/tool/simplerangelist.cxx
b/sc/source/core/tool/simplerangelist.cxx
index 4c428e2..326f87d 100644
--- a/sc/source/core/tool/simplerangelist.cxx
+++ b/sc/source/core/tool/simplerangelist.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <algorithm>
+
#include "simplerangelist.hxx"
#include "rangelst.hxx"
commit 017aa343a4eb47a7cf7cd129e223a13a94801b07
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Nov 26 22:43:40 2015 +0100
Missing include
Change-Id: I1516acb038f08479cdd4ffd42d5af1e7ec555d10
diff --git a/sdext/source/presenter/PresenterScrollBar.cxx
b/sdext/source/presenter/PresenterScrollBar.cxx
index 8b63eda..774b674 100644
--- a/sdext/source/presenter/PresenterScrollBar.cxx
+++ b/sdext/source/presenter/PresenterScrollBar.cxx
@@ -32,6 +32,7 @@
#include <com/sun/star/rendering/TexturingMode.hpp>
#include <com/sun/star/rendering/XPolyPolygon2D.hpp>
#include <boost/bind.hpp>
+#include <algorithm>
#include <memory>
#include <math.h>
diff --git a/sdext/source/presenter/PresenterTextView.cxx
b/sdext/source/presenter/PresenterTextView.cxx
index 3498906..8425180 100644
--- a/sdext/source/presenter/PresenterTextView.cxx
+++ b/sdext/source/presenter/PresenterTextView.cxx
@@ -22,6 +22,7 @@
#include "PresenterGeometryHelper.hxx"
#include "PresenterTimer.hxx"
+#include <algorithm>
#include <cmath>
#include <com/sun/star/accessibility/AccessibleTextType.hpp>
diff --git a/sdext/source/presenter/PresenterUIPainter.cxx
b/sdext/source/presenter/PresenterUIPainter.cxx
index e248a6d..0041ef3 100644
--- a/sdext/source/presenter/PresenterUIPainter.cxx
+++ b/sdext/source/presenter/PresenterUIPainter.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <algorithm>
+
#include "PresenterUIPainter.hxx"
#include "PresenterCanvasHelper.hxx"
commit 6760dc5f168317b3954b852859b2a9548b18a37e
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Nov 26 22:31:51 2015 +0100
-Werror,-Wunused-const-variable
Change-Id: I4331396f5bbc37306c09f0e9a1c6b2969922f66f
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
index cbe46f7..dffa6a3 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
@@ -220,9 +220,6 @@ void SAL_CALL
VistaFilePickerEventHandler::removeFilePickerListener( const css::
void VistaFilePickerEventHandler::startListening( const TFileDialog&
pBroadcaster )
{
- static const sal_Bool STARTUP_SUSPENDED = sal_True;
- static const sal_Bool STARTUP_WORKING = sal_False;
-
if (m_pDialog.is())
return;
commit a649689fac426b8114d680b5d7b52f3598cdd6f5
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Nov 26 22:30:57 2015 +0100
-Werror,-Wreorder
Change-Id: I0988cf701dea563e3990b4179879fbcd3778662d
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
index 36838fd..cbe46f7 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
@@ -50,8 +50,8 @@
VistaFilePickerEventHandler::VistaFilePickerEventHandler(IVistaFilePickerInterna
: m_nRefCount (0 )
, m_nListenerHandle (0 )
, m_pDialog ( )
- , m_lListener (m_aMutex)
, m_pInternalNotify (pInternalNotify)
+ , m_lListener (m_aMutex)
{
}
commit adf2c523526eb0c96c7c55cfa71c2e4367b9f614
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Nov 26 22:30:10 2015 +0100
-Werror,-Wunused-const-variable
Change-Id: Ie539b4f3e4295a8dcb1126371e5f2c75e9d723ab
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index 4970b4e..3cc0e5d 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
@@ -72,10 +72,6 @@ namespace vista{
namespace
{
- // controlling event notifications
- const bool STARTUP_SUSPENDED = true;
- const bool STARTUP_ALIVE = false;
-
css::uno::Sequence< OUString > SAL_CALL
VistaFilePicker_getSupportedServiceNames()
{
css::uno::Sequence< OUString > aRet(2);
commit dd706ea26dc53e888ad85ccccd7621c0fe2f831a
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Nov 26 22:29:27 2015 +0100
-Werror,-Wunused-const-variable
Change-Id: Ib725e544d058c735e485db1586743746a5236488
diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx
b/fpicker/source/win32/filepicker/FilePicker.cxx
index 9a3c455..837277f 100644
--- a/fpicker/source/win32/filepicker/FilePicker.cxx
+++ b/fpicker/source/win32/filepicker/FilePicker.cxx
@@ -53,7 +53,6 @@ namespace
{
// controlling event notifications
const bool STARTUP_SUSPENDED = true;
- const bool STARTUP_ALIVE = false;
uno::Sequence<OUString> SAL_CALL FilePicker_getSupportedServiceNames()
{
commit 3493c74970f4023490d7e13833c24c9c6d434e18
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Nov 26 22:25:14 2015 +0100
Avoid ambiguity which OUStringBuffer ctor to select
...for size_t (i.e., unsigned long long on Windows 64-bit), chosing among
the
int, unsigned int, long, unsigned long overloads. MSVC apparently happily
picks
one of them, but clang-cl rightly complains.
Change-Id: Ib245925bdf9e4a34add6ca435a95559f4f07c4d7
diff --git a/fpicker/source/win32/filepicker/FileOpenDlg.cxx
b/fpicker/source/win32/filepicker/FileOpenDlg.cxx
index 6e4b242..9246879 100644
--- a/fpicker/source/win32/filepicker/FileOpenDlg.cxx
+++ b/fpicker/source/win32/filepicker/FileOpenDlg.cxx
@@ -38,9 +38,9 @@ namespace /* private */
// OK button so that we determine the size of the text
// currently in the edit field and resize our buffer
// appropriately - in the future we will do this
- const size_t MAX_FILENAME_BUFF_SIZE = 32000;
- const size_t MAX_FILETITLE_BUFF_SIZE = 32000;
- const size_t MAX_FILTER_BUFF_SIZE = 4096;
+ const sal_Int32 MAX_FILENAME_BUFF_SIZE = 32000;
+ const sal_Int32 MAX_FILETITLE_BUFF_SIZE = 32000;
+ const sal_Int32 MAX_FILTER_BUFF_SIZE = 4096;
const LPCTSTR CURRENT_INSTANCE = TEXT("CurrInst");
commit 1ef0dd7aefd9be9e267196b90b53fce19a2fe988
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Nov 26 22:12:22 2015 +0100
-Werror,-Wunused-function
Change-Id: Id53c00a90f4f2d87e469ae4fe4121a5678dff5a4
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 73e9c44..5b32695 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -238,7 +238,7 @@ namespace
}
}
-
+#if defined( UNX )
bool lcl_getHomeDirectory( const OUString& _rForURL, OUString& /* [out] */
_rHomeDir )
{
_rHomeDir.clear();
@@ -273,7 +273,7 @@ namespace
}
return !_rHomeDir.isEmpty();
}
-
+#endif
static OUString lcl_ensureFinalSlash( const OUString& _rDir )
{
commit 61057a61aba6ff032a50c3ee3629387c1669404d
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Nov 26 22:02:37 2015 +0100
-Werror,-Wmicrosoft-exception-spec
Change-Id: I0a4256047ae0142a03903101036d2a3c8d17429b
diff --git a/extensions/source/scanner/scanwin.cxx
b/extensions/source/scanner/scanwin.cxx
index 0ce2ab7..4c8858f 100644
--- a/extensions/source/scanner/scanwin.cxx
+++ b/extensions/source/scanner/scanwin.cxx
@@ -769,7 +769,7 @@ void ScannerManager::ReleaseData()
}
}
-awt::Size ScannerManager::getSize() throw()
+awt::Size ScannerManager::getSize() throw(std::exception)
{
awt::Size aRet;
HGLOBAL hDIB = (HGLOBAL)(sal_IntPtr) mpData;
@@ -794,7 +794,7 @@ awt::Size ScannerManager::getSize() throw()
return aRet;
}
-uno::Sequence< sal_Int8 > ScannerManager::getDIB() throw()
+uno::Sequence< sal_Int8 > ScannerManager::getDIB() throw(std::exception)
{
uno::Sequence< sal_Int8 > aRet;
@@ -854,7 +854,7 @@ uno::Sequence< sal_Int8 > ScannerManager::getDIB() throw()
return aRet;
}
-uno::Sequence< ScannerContext > SAL_CALL
ScannerManager::getAvailableScanners() throw()
+uno::Sequence< ScannerContext > SAL_CALL
ScannerManager::getAvailableScanners() throw(std::exception)
{
osl::MutexGuard aGuard( maProtector );
uno::Sequence< ScannerContext > aRet( 1 );
@@ -880,7 +880,7 @@ sal_Bool SAL_CALL ScannerManager::configureScannerAndScan(
ScannerContext& rCont
}
void SAL_CALL ScannerManager::startScan( const ScannerContext& rContext, const
uno::Reference< lang::XEventListener >& rxListener )
- throw( ScannerException )
+ throw( ScannerException, std::exception )
{
osl::MutexGuard aGuard( maProtector );
uno::Reference< XScannerManager > xThis( this );
@@ -893,7 +893,7 @@ void SAL_CALL ScannerManager::startScan( const
ScannerContext& rContext, const u
}
ScanError SAL_CALL ScannerManager::getError( const ScannerContext& rContext )
- throw( ScannerException )
+ throw( ScannerException, std::exception )
{
osl::MutexGuard aGuard( maProtector );
uno::Reference< XScannerManager > xThis( this );
@@ -905,7 +905,7 @@ ScanError SAL_CALL ScannerManager::getError( const
ScannerContext& rContext )
}
uno::Reference< awt::XBitmap > SAL_CALL ScannerManager::getBitmap( const
ScannerContext& /*rContext*/ )
- throw( ScannerException )
+ throw( ScannerException, std::exception )
{
osl::MutexGuard aGuard( maProtector );
return uno::Reference< awt::XBitmap >( this );
commit 018b561aa456fc18858060ec2810df856f152ed3
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Nov 26 18:52:32 2015 +0100
-Werror,-Wunused-function
Change-Id: I6103a8539c4d788fff1a7e3c3530a6ec7cd1f0c6
diff --git a/embeddedobj/source/msole/oleembed.cxx
b/embeddedobj/source/msole/oleembed.cxx
index aeb7e51..6768940 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -674,6 +674,7 @@ sal_Int32 SAL_CALL OleEmbeddedObject::getCurrentState()
namespace
{
+#ifndef WNT
bool lcl_CopyStream(uno::Reference<io::XInputStream> xIn,
uno::Reference<io::XOutputStream> xOut)
{
const sal_Int32 nChunkSize = 4096;
@@ -688,6 +689,7 @@ namespace
} while (nRead == nChunkSize);
return nTotalRead != 0;
}
+#endif
//Dump the objects content to a tempfile, just the "CONTENTS" stream if
//there is one for non-compound documents, otherwise the whole content.
commit e5d211eb8ee90ce7ec5a9acca1caa707f0d55291
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Nov 26 16:58:32 2015 +0100
Remove unused ESCHER_ShadeType
...apparently a copy of MSO_ShadeType removed with
e336d7f80fd9f7ada4b12c37f9434df411d28466 "Remove unused MSO_ShadeType" and
equally unused
Change-Id: If1660faa45c1445c302ac0c9a1a160674691c15d
diff --git a/include/filter/msfilter/escherex.hxx
b/include/filter/msfilter/escherex.hxx
index bfa931f..dabdae2 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -323,28 +323,6 @@ enum ESCHER_dzType
ESCHER_dzTypeMax = 11
};
-// how to interpret the colors in a shaded fill.
-enum ESCHER_ShadeType
-{
- ESCHER_ShadeNone = 0, // Interpolate without correction between
RGBs
- ESCHER_ShadeGamma = 1, // Apply gamma correction to colors
- ESCHER_ShadeSigma = 2, // Apply a sigma transfer function to
position
- ESCHER_ShadeBand = 4, // Add a flat band at the start of the shade
- ESCHER_ShadeOneColor = 8, // This is a one color shade
-
- /* A parameter for the band or sigma function can be stored in the top
- 16 bits of the value - this is a proportion of *each* band of the
- shade to make flat (or the approximate equal value for a sigma
- function). NOTE: the parameter is not used for the sigma function,
- instead a built in value is used. This value should not be changed
- from the default! */
- ESCHER_ShadeParameterShift = 16,
- ESCHER_ShadeParameterMask = 0xffff0000,
-
- ESCHER_ShadeDefault = (ESCHER_ShadeGamma|ESCHER_ShadeSigma|
- (16384<<ESCHER_ShadeParameterShift))
-};
-
// compound line style
enum ESCHER_LineStyle
{
commit 7ecdffbef79bad6fd9b3ada83db56e745ce531ca
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Nov 26 15:52:34 2015 +0100
Don't leave sdr::table::Cell members implicitly declared
...otherwise, as the class is SVX_DLLPUBLIC and---for better or worse---
SVX_DLLPUBLIC is shared between Library_svxcore and Library_svxcore, all
.cxx in
Library_svx that happen to include cell.hxx would emit them (as well as
those in
Library_svxcore, of course), and the copy ctor requires the vtable, which in
turn requires an adjustor thunk for Cell::getPropertyStates, which happens
to
not be emitted into any of the Library_svx .cxx that require it under
clang-cl
due to <https://llvm.org/bugs/show_bug.cgi?id=25641> "clang-cl: vtordisp
thunks
not emitted for functions with class template specializations in their
signatures."
Change-Id: Ib03b7002f9dfe3c2df742640ef7406cf24a7cecd
diff --git a/svx/source/table/cell.hxx b/svx/source/table/cell.hxx
index 20ab6b4..e2a28a0 100644
--- a/svx/source/table/cell.hxx
+++ b/svx/source/table/cell.hxx
@@ -206,6 +206,9 @@ private:
SVX_DLLPRIVATE Cell( SdrTableObj& rTableObj, OutlinerParaObject*
pOutlinerParaObject ) throw(css::uno::RuntimeException);
SVX_DLLPRIVATE virtual ~Cell() throw();
+ Cell(Cell const &) = delete;
+ void operator =(Cell const &) = delete;
+
const SvxItemPropertySet* mpPropSet;
sdr::properties::TextProperties* mpProperties;
commit 2283dd0b0a5117fb7b875bf97742f81820f6a1e0
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Nov 26 15:12:20 2015 +0100
Non-implicit virtual SvxPageItem dtor
...otherwise, as the class is SVX_DLLPUBLIC and---for better or worse---
SVX_DLLPUBLIC is shared between Library_svxcore and Library_svx, all .cxx in
Library_svxcore that happen to include svx/pageitem.hxx would emit it (as
well
as those in Library_svx, of course). But at least clang-cl at /O0 would
want
to put SvxPageItem's (base-class) vtable in place in the dtor, so would also
emit the vtable, so would depend on SvxPageItem::operator==, but that is
defined
in pageitem.cxx in Library_svx, against which Library_svxcore doesn't link.
Change-Id: Ibfc393c1de3e0bd6621c057d88b1b0f272820154
diff --git a/include/svx/pageitem.hxx b/include/svx/pageitem.hxx
index 0a2b0c3..988c039 100644
--- a/include/svx/pageitem.hxx
+++ b/include/svx/pageitem.hxx
@@ -72,6 +72,8 @@ public:
SvxPageItem( const sal_uInt16 nId );
SvxPageItem( const SvxPageItem& rItem );
+ virtual ~SvxPageItem();
+
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const
override;
virtual bool operator==( const SfxPoolItem& ) const override;
diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx
index 6153f0e7..ee99635 100644
--- a/svx/source/items/pageitem.cxx
+++ b/svx/source/items/pageitem.cxx
@@ -51,6 +51,8 @@ SvxPageItem::SvxPageItem( const SvxPageItem& rItem )
eUse = rItem.eUse;
}
+SvxPageItem::~SvxPageItem() {}
+
// Clone
SfxPoolItem* SvxPageItem::Clone( SfxItemPool * ) const
{
commit a6608ad5821710092ad92a115f74a9a98da539c3
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Nov 26 11:44:38 2015 +0100
-Werror,-Wunused-private-field
Change-Id: I539326ee46615adfd648acb15cbd3eacfd914989
diff --git a/connectivity/source/drivers/ado/AResultSet.cxx
b/connectivity/source/drivers/ado/AResultSet.cxx
index 7e7f553..5739ae4 100644
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
@@ -78,7 +78,6 @@ OResultSet::OResultSet(ADORecordset*
_pRecordSet,OStatement_Base* pStmt) : ORes
,m_xStatement(*pStmt)
,m_xMetaData(NULL)
,m_nRowPos(0)
- ,m_bWasNull(sal_False)
,m_bEOF(sal_False)
,m_bOnFirstAfterOpen(sal_False)
{
@@ -91,7 +90,6 @@ OResultSet::OResultSet(ADORecordset* _pRecordSet) :
OResultSet_BASE(m_aMutex)
,m_xStatement(NULL)
,m_xMetaData(NULL)
,m_nRowPos(0)
- ,m_bWasNull(sal_False)
,m_bEOF(sal_False)
,m_bOnFirstAfterOpen(sal_False)
{
diff --git a/connectivity/source/inc/ado/AResultSet.hxx
b/connectivity/source/inc/ado/AResultSet.hxx
index e11ec8e..6a0508d 100644
--- a/connectivity/source/inc/ado/AResultSet.hxx
+++ b/connectivity/source/inc/ado/AResultSet.hxx
@@ -70,7 +70,6 @@ namespace connectivity
::std::vector<OLEVariant> m_aBookmarks;
OLEVariant m_aValue;
ADO_LONGPTR m_nRowPos;
- sal_Bool m_bWasNull;
sal_Bool m_bEOF;
sal_Bool m_bOnFirstAfterOpen;
commit 13df75cc5ae49c8225f2011834bec9e9ed5e7971
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Nov 26 11:40:39 2015 +0100
-Werror,-Winconsistent-missing-override
Change-Id: Ie8cfbb51b706e3b2c1d0b33aef5156438e9c7134
diff --git a/connectivity/source/inc/ado/ACallableStatement.hxx
b/connectivity/source/inc/ado/ACallableStatement.hxx
index 02569ae..54862eb 100644
--- a/connectivity/source/inc/ado/ACallableStatement.hxx
+++ b/connectivity/source/inc/ado/ACallableStatement.hxx
@@ -44,34 +44,34 @@ namespace connectivity
// a Constructor, that is needed for when Returning the Object is
needed:
OCallableStatement( OConnection* _pConnection,const OTypeInfoMap&
_TypeInfo,const OUString& sql );
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const
::com::sun::star::uno::Type & rType )
throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL acquire() throw();
- virtual void SAL_CALL release() throw();
+ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const
::com::sun::star::uno::Type & rType )
throw(::com::sun::star::uno::RuntimeException) override;
+ virtual void SAL_CALL acquire() throw() override;
+ virtual void SAL_CALL release() throw() override;
// XRow
- virtual sal_Bool SAL_CALL wasNull( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual OUString SAL_CALL getString( sal_Int32 columnIndex )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual float SAL_CALL getFloat( sal_Int32 columnIndex )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual double SAL_CALL getDouble( sal_Int32 columnIndex )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
getBytes( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::util::Date SAL_CALL getDate( sal_Int32
columnIndex ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::util::Time SAL_CALL getTime( sal_Int32
columnIndex ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::util::DateTime SAL_CALL getTimestamp(
sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32
columnIndex ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32
columnIndex ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getObject( sal_Int32
columnIndex, const ::com::sun::star::uno::Reference<
::com::sun::star::container::XNameAccess >& typeMap )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL wasNull( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual OUString SAL_CALL getString( sal_Int32 columnIndex )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual float SAL_CALL getFloat( sal_Int32 columnIndex )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual double SAL_CALL getDouble( sal_Int32 columnIndex )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
getBytes( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual ::com::sun::star::util::Date SAL_CALL getDate( sal_Int32
columnIndex ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual ::com::sun::star::util::Time SAL_CALL getTime( sal_Int32
columnIndex ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual ::com::sun::star::util::DateTime SAL_CALL getTimestamp(
sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual ::com::sun::star::uno::Reference<
::com::sun::star::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32
columnIndex ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual ::com::sun::star::uno::Reference<
::com::sun::star::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32
columnIndex ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual ::com::sun::star::uno::Any SAL_CALL getObject( sal_Int32
columnIndex, const ::com::sun::star::uno::Reference<
::com::sun::star::container::XNameAccess >& typeMap )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
// XOutParameters
- virtual void SAL_CALL registerOutParameter( sal_Int32
parameterIndex, sal_Int32 sqlType, const OUString& typeName )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL registerNumericOutParameter( sal_Int32
parameterIndex, sal_Int32 sqlType, sal_Int32 scale )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL registerOutParameter( sal_Int32
parameterIndex, sal_Int32 sqlType, const OUString& typeName )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual void SAL_CALL registerNumericOutParameter( sal_Int32
parameterIndex, sal_Int32 sqlType, sal_Int32 scale )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
};
}
}
diff --git a/connectivity/source/inc/ado/APreparedStatement.hxx
b/connectivity/source/inc/ado/APreparedStatement.hxx
index b9f2b45..8b1f227 100644
--- a/connectivity/source/inc/ado/APreparedStatement.hxx
+++ b/connectivity/source/inc/ado/APreparedStatement.hxx
@@ -63,50 +63,50 @@ namespace connectivity
// a Constructor, that is needed for when Returning the Object is
needed:
OPreparedStatement( OConnection* _pConnection,const OTypeInfoMap&
_TypeInfo,const OUString& sql);
- virtual void SAL_CALL acquire() throw();
- virtual void SAL_CALL release() throw();
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const
::com::sun::star::uno::Type & rType )
throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL acquire() throw() override;
+ virtual void SAL_CALL release() throw() override;
+ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const
::com::sun::star::uno::Type & rType )
throw(::com::sun::star::uno::RuntimeException) override;
//XTypeProvider
- virtual ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Type > SAL_CALL getTypes( )
throw(::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Type > SAL_CALL getTypes( )
throw(::com::sun::star::uno::RuntimeException) override;
// XPreparedStatement
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
using OStatement_Base::executeQuery;
- virtual sal_Int32 SAL_CALL executeUpdate( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
+ virtual sal_Int32 SAL_CALL executeUpdate( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
using OStatement_Base::executeUpdate;
- virtual sal_Bool SAL_CALL execute( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL execute( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
using OStatement_Base::execute;
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
// XParameters
- virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32
sqlType ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex,
sal_Int32 sqlType, const OUString& typeName )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex,
sal_Bool x ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8
x ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setShort( sal_Int32 parameterIndex,
sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32
x ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64
x ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x
) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double
x ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setString( sal_Int32 parameterIndex, const
OUString& x ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const
::com::sun::star::uno::Sequence< sal_Int8 >& x )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const
::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const
::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex,
const ::com::sun::star::util::DateTime& x )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex,
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >&
x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setCharacterStream( sal_Int32
parameterIndex, const ::com::sun::star::uno::Reference<
::com::sun::star::io::XInputStream >& x, sal_Int32 length )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const
::com::sun::star::uno::Any& x ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex,
const ::com::sun::star::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef >& x )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& x )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob >& x )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray >& x )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL clearParameters( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32
sqlType ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex,
sal_Int32 sqlType, const OUString& typeName )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex,
sal_Bool x ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8
x ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual void SAL_CALL setShort( sal_Int32 parameterIndex,
sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32
x ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64
x ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x
) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double
x ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual void SAL_CALL setString( sal_Int32 parameterIndex, const
OUString& x ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const
::com::sun::star::uno::Sequence< sal_Int8 >& x )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const
::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const
::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex,
const ::com::sun::star::util::DateTime& x )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex,
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >&
x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual void SAL_CALL setCharacterStream( sal_Int32
parameterIndex, const ::com::sun::star::uno::Reference<
::com::sun::star::io::XInputStream >& x, sal_Int32 length )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const
::com::sun::star::uno::Any& x ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex,
const ::com::sun::star::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef >& x )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& x )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob >& x )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray >& x )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual void SAL_CALL clearParameters( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
// XCloseable
- virtual void SAL_CALL close( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL close( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
// XResultSetMetaDataSupplier
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
// OComponentHelper
- virtual void SAL_CALL disposing();
+ virtual void SAL_CALL disposing() override;
};
}
}
commit 0f513b1f80a0c176cb3d460943d605f0b6fb0def
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Nov 26 11:36:08 2015 +0100
-Werror,-Woverloaded-virtual
Change-Id: I40a88271b32d81f5857dd41b237e2c486c7059a0
diff --git a/connectivity/source/inc/ado/APreparedStatement.hxx
b/connectivity/source/inc/ado/APreparedStatement.hxx
index 7d0b22d..b9f2b45 100644
--- a/connectivity/source/inc/ado/APreparedStatement.hxx
+++ b/connectivity/source/inc/ado/APreparedStatement.hxx
@@ -71,8 +71,11 @@ namespace connectivity
// XPreparedStatement
virtual ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
+ using OStatement_Base::executeQuery;
virtual sal_Int32 SAL_CALL executeUpdate( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
+ using OStatement_Base::executeUpdate;
virtual sal_Bool SAL_CALL execute( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
+ using OStatement_Base::execute;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
// XParameters
virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32
sqlType ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
commit 2630d44085ae3d5eb5ae10c9588a92635ed43b2e
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Nov 26 11:22:25 2015 +0100
error: ambiguous conversion
...for C-style cast from 'connectivity::ado::OLEString' to 'rtl::OUString',
as
connectivity::ado::OLEString has conversion operators to both OUString and
BSTR
(i.e., wchar_t*), so both the OUString copy ctor and
OUString(sal_Unicode const*) ctor match. At least MSVC 2013 happily
compiles
that without complaining, but clang-cl does.
Change-Id: Ica634cf19c0fcf1dbff377cb503f6ea6c8257898
diff --git a/connectivity/source/drivers/ado/AView.cxx
b/connectivity/source/drivers/ado/AView.cxx
index dba3c8e..2c036cd 100644
--- a/connectivity/source/drivers/ado/AView.cxx
+++ b/connectivity/source/drivers/ado/AView.cxx
@@ -89,7 +89,7 @@ void OAdoView::getFastPropertyValue(Any& rValue,sal_Int32
nHandle) const
ADOCommand* pCom = (ADOCommand*)aVar.getIDispatch();
OLEString aBSTR;
pCom->get_CommandText(&aBSTR);
- rValue <<= (OUString) aBSTR;
+ rValue <<= aBSTR.operator OUString();
}
}
break;
commit f470927e8542170d7c5a08bf16bcceeac1ad46ac
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Nov 26 11:02:34 2015 +0100
-Werror,-Winconsistent-missing-override
Change-Id: I607bd38a8cbed1f6b140a1adeb198cf3334a9c5e
diff --git a/connectivity/source/inc/ado/AConnection.hxx
b/connectivity/source/inc/ado/AConnection.hxx
index 7b45d1b..a52ab58 100644
--- a/connectivity/source/inc/ado/AConnection.hxx
+++ b/connectivity/source/inc/ado/AConnection.hxx
@@ -81,39 +81,39 @@ namespace connectivity
void closeAllStatements () throw(
::com::sun::star::sdbc::SQLException);
//XUnoTunnel
- virtual sal_Int64 SAL_CALL getSomething( const
::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw
(::com::sun::star::uno::RuntimeException);
+ virtual sal_Int64 SAL_CALL getSomething( const
::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw
(::com::sun::star::uno::RuntimeException) override;
static ::com::sun::star::uno::Sequence< sal_Int8 >
getUnoTunnelImplementationId();
// XServiceInfo
DECLARE_SERVICE_INFO();
// OComponentHelper
- virtual void SAL_CALL disposing();
+ virtual void SAL_CALL disposing() override;
// XInterface
- virtual void SAL_CALL release() throw();
+ virtual void SAL_CALL release() throw() override;
// XConnection
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const
OUString& sql ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const
OUString& sql ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual OUString SAL_CALL nativeSQL( const OUString& sql )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL getAutoCommit( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL commit( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL rollback( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL isClosed( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setReadOnly( sal_Bool readOnly )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL isReadOnly( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setCatalog( const OUString& catalog )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual OUString SAL_CALL getCatalog( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setTransactionIsolation( sal_Int32 level )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL getTransactionIsolation( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setTypeMap( const
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >&
typeMap ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const
OUString& sql ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const
OUString& sql ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual OUString SAL_CALL nativeSQL( const OUString& sql )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual sal_Bool SAL_CALL getAutoCommit( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual void SAL_CALL commit( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual void SAL_CALL rollback( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual sal_Bool SAL_CALL isClosed( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual void SAL_CALL setReadOnly( sal_Bool readOnly )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual sal_Bool SAL_CALL isReadOnly( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual void SAL_CALL setCatalog( const OUString& catalog )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual OUString SAL_CALL getCatalog( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual void SAL_CALL setTransactionIsolation( sal_Int32 level )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual sal_Int32 SAL_CALL getTransactionIsolation( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual ::com::sun::star::uno::Reference<
::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual void SAL_CALL setTypeMap( const
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >&
typeMap ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
// XCloseable
- virtual void SAL_CALL close( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL close( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
// XWarningsSupplier
- virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL clearWarnings( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual void SAL_CALL clearWarnings( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
WpADOConnection* getConnection() { return m_pAdoConnection; }
void setCatalog(const ::com::sun::star::uno::WeakReference<
::com::sun::star::sdbcx::XTablesSupplier>& _xCat) { m_xCatalog = _xCat; }
diff --git a/connectivity/source/inc/ado/AStatement.hxx
b/connectivity/source/inc/ado/AStatement.hxx
index 4db83c4..58bd072 100644
--- a/connectivity/source/inc/ado/AStatement.hxx
+++ b/connectivity/source/inc/ado/AStatement.hxx
@@ -115,55 +115,55 @@ namespace connectivity
void disposeResultSet();
// OPropertyArrayUsageHelper
- virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const;
+ virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const
override;
// OPropertySetHelper
- virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper();
+ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper()
override;
virtual sal_Bool SAL_CALL convertFastPropertyValue(
::com::sun::star::uno::Any & rConvertedValue,
::com::sun::star::uno::Any & rOldValue,
sal_Int32 nHandle,
const ::com::sun::star::uno::Any& rValue )
- throw
(::com::sun::star::lang::IllegalArgumentException);
+ throw
(::com::sun::star::lang::IllegalArgumentException) override;
virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
sal_Int32 nHandle,
const ::com::sun::star::uno::Any& rValue
)
- throw (::com::sun::star::uno::Exception);
+ throw (::com::sun::star::uno::Exception)
override;
virtual void SAL_CALL getFastPropertyValue(
::com::sun::star::uno::Any& rValue,
sal_Int32 nHandle
- ) const;
+ ) const override;
public:
OStatement_Base(OConnection* _pConnection );
using OStatement_BASE::operator ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface >;
// OComponentHelper
- virtual void SAL_CALL disposing();
+ virtual void SAL_CALL disposing() override;
// XInterface
- virtual void SAL_CALL acquire() throw();
- virtual void SAL_CALL release() throw();
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const
::com::sun::star::uno::Type & rType )
throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL acquire() throw() override;
+ virtual void SAL_CALL release() throw() override;
+ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const
::com::sun::star::uno::Type & rType )
throw(::com::sun::star::uno::RuntimeException) override;
//XTypeProvider
- virtual ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Type > SAL_CALL getTypes( )
throw(::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Type > SAL_CALL getTypes( )
throw(::com::sun::star::uno::RuntimeException) override;
// XPropertySet
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( )
throw(::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( )
throw(::com::sun::star::uno::RuntimeException) override;
// XStatement
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql
) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) ;
- virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) ;
- virtual sal_Bool SAL_CALL execute( const OUString& sql )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) ;
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) ;
+ virtual ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql
) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual sal_Bool SAL_CALL execute( const OUString& sql )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
// XWarningsSupplier
- virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL clearWarnings( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual void SAL_CALL clearWarnings( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
// XCancellable
- virtual void SAL_CALL cancel( )
throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL cancel( )
throw(::com::sun::star::uno::RuntimeException) override;
// XCloseable
- virtual void SAL_CALL close( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL close( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
// XMultipleResults
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XResultSet > SAL_CALL getResultSet( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL getUpdateCount( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL getMoreResults( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XResultSet > SAL_CALL getResultSet( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual sal_Int32 SAL_CALL getUpdateCount( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual sal_Bool SAL_CALL getMoreResults( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
};
class OStatement : public OStatement_Base,
@@ -177,13 +177,13 @@ namespace connectivity
DECLARE_SERVICE_INFO();
- virtual void SAL_CALL acquire() throw();
- virtual void SAL_CALL release() throw();
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const
::com::sun::star::uno::Type & rType )
throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL acquire() throw() override;
+ virtual void SAL_CALL release() throw() override;
+ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const
::com::sun::star::uno::Type & rType )
throw(::com::sun::star::uno::RuntimeException) override;
// XBatchExecution
- virtual void SAL_CALL addBatch( const OUString& sql )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL clearBatch( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL
executeBatch( ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addBatch( const OUString& sql )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual void SAL_CALL clearBatch( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
+ virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL
executeBatch( ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) override;
};
}
}
commit 8fa059fe65af262812fc3e4c499640f80ab73558
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Nov 26 09:18:59 2015 +0100
C++17 nested namespace definition
Change-Id: I49fd2093d619743d0d5aaaa4784bd5ef5bb330c6
diff --git a/canvas/source/directx/dx_textlayout_drawhelper.hxx
b/canvas/source/directx/dx_textlayout_drawhelper.hxx
index b524254..41f293f 100644
--- a/canvas/source/directx/dx_textlayout_drawhelper.hxx
+++ b/canvas/source/directx/dx_textlayout_drawhelper.hxx
@@ -31,7 +31,9 @@
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/vector/b2isize.hxx>
-class css::rendering::XCanvasFont;
+namespace com { namespace sun { namespace star { namespace rendering {
+ class XCanvasFont;
+} } } }
namespace Gdiplus { class Graphics; }
commit e54e5ee95975b515efcc285b8357ed40995a3e68
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Nov 26 09:17:17 2015 +0100
Unused forward decl
Change-Id: Id332cdff634be042e026faf7cc75d8eaeb44a13e
diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx
b/canvas/source/directx/dx_textlayout_drawhelper.cxx
index c530aaa..0d63181 100644
--- a/canvas/source/directx/dx_textlayout_drawhelper.cxx
+++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx
@@ -44,8 +44,6 @@
#include "dx_impltools.hxx"
#include "dx_textlayout_drawhelper.hxx"
-class css::rendering::XCanvasFont;
-
using namespace ::com::sun::star;
commit 675fbe9e2d4e3d94d575cdc087c17b0860354fb3
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Nov 26 09:16:39 2015 +0100
-Werror,-Wunused-function
Change-Id: Ic238339b521dbff2d7fbe899127ac7954036300f
diff --git a/canvas/source/directx/dx_textlayout.cxx
b/canvas/source/directx/dx_textlayout.cxx
index fc3111a..cca3201 100644
--- a/canvas/source/directx/dx_textlayout.cxx
+++ b/canvas/source/directx/dx_textlayout.cxx
@@ -209,17 +209,6 @@ namespace dxcanvas
return maText;
}
- namespace
- {
- // TODO(P2): Check whether this gets inlined. If not, make functor
- // out of it
- inline Gdiplus::PointF gdiPlusPointFromDx( const double& dx )
- {
- return Gdiplus::PointF( static_cast<Gdiplus::REAL>(dx),
- 0.0f );
- }
- }
-
bool TextLayout::draw( const GraphicsSharedPtr&
rGraphics,
const rendering::ViewState&
rViewState,
const rendering::RenderState&
rRenderState,
commit 85453425a8d95e9fa70cb9a084c830077e385ef0
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Nov 26 09:15:51 2015 +0100
-Werror,-Wunused-private-field
Change-Id: Ie14d3b3474b7886add80bd6e223e76fbf964144e
diff --git a/canvas/source/directx/dx_surfacebitmap.cxx
b/canvas/source/directx/dx_surfacebitmap.cxx
index 13ce06f..6509a68 100644
--- a/canvas/source/directx/dx_surfacebitmap.cxx
+++ b/canvas/source/directx/dx_surfacebitmap.cxx
@@ -48,8 +48,7 @@ namespace dxcanvas
DXColorBuffer( const COMReference<surface_type>& rSurface,
const ::basegfx::B2IVector& rSize ) :
maSize(rSize),
- mpSurface(rSurface),
- mbAlpha(false)
+ mpSurface(rSurface)
{
}
@@ -68,7 +67,6 @@ namespace dxcanvas
::basegfx::B2IVector maSize;
mutable D3DLOCKED_RECT maLockedRect;
mutable COMReference<surface_type> mpSurface;
- bool mbAlpha;
};
sal_uInt8* DXColorBuffer::lock() const
@@ -114,8 +112,7 @@ namespace dxcanvas
GDIColorBuffer( const BitmapSharedPtr& rSurface,
const ::basegfx::B2IVector& rSize ) :
maSize(rSize),
- mpGDIPlusBitmap(rSurface),
- mbAlpha(true)
+ mpGDIPlusBitmap(rSurface)
{
}
@@ -134,7 +131,6 @@ namespace dxcanvas
::basegfx::B2IVector maSize;
mutable Gdiplus::BitmapData aBmpData;
BitmapSharedPtr mpGDIPlusBitmap;
- bool mbAlpha;
};
sal_uInt8* GDIColorBuffer::lock() const
commit 6694e10a230d871a78f27b035d3a7a856cf622dd
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Nov 26 09:14:12 2015 +0100
-Werror,-Wreorder
Change-Id: I27eb5c497985267dd00b5be2fb3c17f8d79745cf
diff --git a/canvas/source/directx/dx_surfacebitmap.cxx
b/canvas/source/directx/dx_surfacebitmap.cxx
index d69a4ea..13ce06f 100644
--- a/canvas/source/directx/dx_surfacebitmap.cxx
+++ b/canvas/source/directx/dx_surfacebitmap.cxx
@@ -47,8 +47,8 @@ namespace dxcanvas
public:
DXColorBuffer( const COMReference<surface_type>& rSurface,
const ::basegfx::B2IVector& rSize ) :
- mpSurface(rSurface),
maSize(rSize),
+ mpSurface(rSurface),
mbAlpha(false)
{
}
@@ -113,8 +113,8 @@ namespace dxcanvas
GDIColorBuffer( const BitmapSharedPtr& rSurface,
const ::basegfx::B2IVector& rSize ) :
- mpGDIPlusBitmap(rSurface),
maSize(rSize),
+ mpGDIPlusBitmap(rSurface),
mbAlpha(true)
{
}
commit 6adbf1322b7eefa753e680e58b17fa32f67ccef9
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Nov 26 09:12:17 2015 +0100
-Werror,-Wreorder
Change-Id: I0a3384505d8ab7fe70c0dccb93a96d9d3e991367
diff --git a/canvas/source/directx/dx_spritedevicehelper.cxx
b/canvas/source/directx/dx_spritedevicehelper.cxx
index bb1a547..8f1f0a9 100644
--- a/canvas/source/directx/dx_spritedevicehelper.cxx
+++ b/canvas/source/directx/dx_spritedevicehelper.cxx
@@ -44,9 +44,9 @@ namespace dxcanvas
SpriteDeviceHelper::SpriteDeviceHelper() :
DeviceHelper(),
mpSpriteCanvas( NULL ),
+ mpBackBuffer(),
mpSurfaceProxyManager(),
- mpRenderModule(),
- mpBackBuffer()
+ mpRenderModule()
{
}
commit df077447eecd148742c195d4bf0f624f3e51448a
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Nov 26 09:10:48 2015 +0100
-Werror,-Wunused-function
Change-Id: I99246a9de5f266154f9927bff322a0a1697bcdee
diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx
index 1a6fc47..9677d16 100644
--- a/canvas/source/directx/dx_9rm.cxx
+++ b/canvas/source/directx/dx_9rm.cxx
@@ -263,27 +263,6 @@ namespace dxcanvas
static sal_uInt32 gNumSurfaces = 0;
#endif
- void fillRect( sal_uInt32 *pDest,
- sal_uInt32 dwWidth,
- sal_uInt32 dwHeight,
- sal_uInt32 dwPitch,
- sal_uInt32 dwColor )
- {
- for(sal_uInt32 i=0; i<dwWidth; ++i)
- {
- pDest[i]=dwColor;
- pDest[((dwHeight-1)*dwPitch)+i]=dwColor;
- }
-
- for(sal_uInt32 j=0; j<dwHeight; ++j)
- {
- pDest[0]=dwColor;
- pDest[dwWidth-1]=dwColor;
- pDest += dwPitch;
- }
- }
-
-
// DXSurface::DXSurface
commit 1145de8660691eb295a72fe8216092afdcde6d60
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Nov 26 09:07:47 2015 +0100
-Werror,-Winconsistent-missing-override
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
