[Libreoffice-commits] .: 11 commits - extensions/source sc/source sd/source sw/source
Tor Lillqvist
tml at kemper.freedesktop.org
Mon Oct 10 02:53:34 PDT 2011
extensions/source/bibliography/datman.cxx | 2 +-
extensions/source/nsplugin/source/so_main.cxx | 2 ++
extensions/source/ole/oleobjw.cxx | 3 +--
extensions/source/ole/oleobjw.hxx | 15 ++++-----------
sc/source/filter/excel/xeescher.cxx | 2 --
sc/source/ui/vba/vbaapplication.cxx | 2 --
sd/source/core/drawdoc.cxx | 2 +-
sd/source/filter/eppt/epptbase.hxx | 2 +-
sd/source/filter/eppt/text.hxx | 4 ++--
sw/source/core/crsr/crsrsh.cxx | 2 +-
10 files changed, 13 insertions(+), 23 deletions(-)
New commits:
commit a62e3205030d17a402255c9a84d0f484c18d25a9
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Oct 10 12:47:30 2011 +0300
WaE: unsafe mix of type 'bool' and type 'sal_Bool' in operation
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 8a8cd4e..f402e02 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -679,7 +679,7 @@ int SwCrsrShell::SetCrsr( const Point &rLPt, sal_Bool bOnlyText, bool bBlock )
// Toggle the Header/Footer mode if needed
bool bInHeaderFooter = pFrm && ( pFrm->IsHeaderFrm() || pFrm->IsFooterFrm() );
- if ( bInHeaderFooter ^ IsHeaderFooterEdit() )
+ if ( bInHeaderFooter ^ (bool) IsHeaderFooterEdit() )
ToggleHeaderFooterEdit();
if( pBlockCrsr && bBlock )
commit 2a0a3a15b985258f678c97890527216fdda8eead
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Oct 10 12:46:39 2011 +0300
WaE: inconsistent dll linkage
diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx
index 371c70b..d1102b7 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -137,8 +137,6 @@ using ::rtl::OUString;
#define FILE_PATH_SEPERATOR "\\"
#endif
-uno::Any sbxToUnoValue( SbxVariable* pVar );
-
class ActiveWorkbook : public ScVbaWorkbook
{
protected:
commit 76fd28341d36b55af448be2703a405d5095bafbd
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Oct 10 12:45:10 2011 +0300
WaE: unreachable code
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx
index e466614..2a290c3 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -136,7 +136,6 @@ static const char *ToHorizAlign( SdrTextHorzAdjust eAdjust )
default:
return "left";
}
- return "unknown";
}
static const char *ToVertAlign( SdrTextVertAdjust eAdjust )
@@ -153,7 +152,6 @@ static const char *ToVertAlign( SdrTextVertAdjust eAdjust )
default:
return "top";
}
- return "unknown";
}
static void lcl_WriteAnchorVertex( sax_fastparser::FSHelperPtr rComments, Rectangle &aRect )
commit b76d47d9ad25fd5c6bc1c4499d000a2ea85079a3
Author: Noel Power <noel.power at novell.com>
Date: Mon Oct 10 12:43:19 2011 +0300
So just drop the duplicate XInvocation base class then
diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx
index 1820fdd..275c6a8 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -166,7 +166,7 @@ Any IUnknownWrapper_Impl::queryInterface(const Type& t)
// properties. Note: Currently the basic runtime doesn't call put properties directly, it should... after all the basic runtime should know whether it is calling a put or get property.
// For the moment for ease of merging we will let the XDirectInvoke and XAuthomationInvocation interfaces stay side by side ( and for the momemnt at least I would prefer the basic
// runtime to call XAutomationInvocation instead of XDirectInvoke
- return WeakImplHelper8<XInvocation, XBridgeSupplier2,
+ return WeakImplHelper7<XBridgeSupplier2,
XInitialization, XAutomationObject, XDefaultProperty, XDefaultMethod, XDirectInvocation, XAutomationInvocation >::queryInterface(t);
}
diff --git a/extensions/source/ole/oleobjw.hxx b/extensions/source/ole/oleobjw.hxx
index 5e7769a..bbbf08d 100644
--- a/extensions/source/ole/oleobjw.hxx
+++ b/extensions/source/ole/oleobjw.hxx
@@ -41,15 +41,9 @@
#include <boost/unordered_map.hpp>
#include <tools/postsys.h>
-#ifdef _MSC_VER
-#pragma warning (push,1)
-// warning C4584: 'cppu::WeakImplHelper8<Ifc1,Ifc2,Ifc3,Ifc4,Ifc5,Ifc6,Ifc7,Ifc8>' : base-class 'com::sun::star::script::XInvocation' is already a base-class of 'com::sun::star::script::XAutomationInvocation'
-#pragma warning (disable:4584)
-#endif
-
#include <cppuhelper/implbase3.hxx>
#include <cppuhelper/implbase4.hxx>
-#include <cppuhelper/implbase8.hxx>
+#include <cppuhelper/implbase7.hxx>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/bridge/oleautomation/XAutomationObject.hpp>
@@ -82,7 +76,7 @@ typedef boost::unordered_multimap<OUString, unsigned int, hashOUString_Impl, equ
// This class wraps an IDispatch and maps XInvocation calls to IDispatch calls on the wrapped object.
// If m_TypeDescription is set then this class represents an UNO interface implemented in a COM component.
// The interface is not a real interface in terms of an abstract class but is realized through IDispatch.
-class IUnknownWrapper_Impl : public WeakImplHelper8< XInvocation, XBridgeSupplier2, XInitialization, XAutomationObject, XDefaultProperty, XDefaultMethod, XDirectInvocation, XAutomationInvocation >,
+class IUnknownWrapper_Impl : public WeakImplHelper7< XBridgeSupplier2, XInitialization, XAutomationObject, XDefaultProperty, XDefaultMethod, XDirectInvocation, XAutomationInvocation >,
public UnoConversionUtilities<IUnknownWrapper_Impl>
@@ -289,10 +283,6 @@ protected:
} // end namespace
-#ifdef _MSC_VER
-#pragma warning (pop)
-#endif
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 51a1995381ddd85d19a9baf3532aa5527c972d5d
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Oct 10 12:35:45 2011 +0300
WaE: type name first seen using 'struct' now seen using 'class'
diff --git a/sd/source/filter/eppt/text.hxx b/sd/source/filter/eppt/text.hxx
index 24f1800..4deab90 100644
--- a/sd/source/filter/eppt/text.hxx
+++ b/sd/source/filter/eppt/text.hxx
@@ -37,10 +37,10 @@
#include <com/sun/star/lang/Locale.hpp>
namespace com { namespace sun { namespace star {
-namespace awt { class FontDescriptor; }
+namespace awt { struct FontDescriptor; }
namespace beans { class XPropertyState; }
namespace text { class XTextRange; class XTextContent; class XSimpleText; }
-namespace style { class TabStop; }
+namespace style { struct TabStop; }
}}}
struct SOParagraph
commit 1babb8f66b1cc68dd39a1c9602fb932550b153c5
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Oct 10 12:34:10 2011 +0300
WaE: class has virtual functions, but destructor is not virtual
diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx
index 1aef0aa..f21db68 100644
--- a/sd/source/filter/eppt/epptbase.hxx
+++ b/sd/source/filter/eppt/epptbase.hxx
@@ -400,7 +400,7 @@ public:
PPTWriterBase( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & rModel,
const ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > & rStatInd );
- ~PPTWriterBase();
+ virtual ~PPTWriterBase();
void exportPPT();
commit 1459d574f4aefc95a6e8d55ccb5285f3ecdd4e75
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Oct 10 12:33:06 2011 +0300
WaE: reinterpret_cast used between related classes
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index 671dbfa..4ae6df0 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -773,7 +773,7 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool
std::vector<SfxStyleSheetBase*>::iterator iter;
for (iter = aOutlineList.begin(); iter != aOutlineList.end(); ++iter)
{
- SfxStyleSheet* pSheet = reinterpret_cast<SfxStyleSheet*>(*iter);
+ SfxStyleSheet* pSheet = static_cast<SfxStyleSheet*>(*iter);
if (pSheet)
{
commit 97e2637337f422e8b934e990ddccddd2ef8189d3
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Oct 10 12:27:39 2011 +0300
WaE: unreachable code
diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx
index 83a8d6b..1820fdd 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -716,7 +716,6 @@ sal_Bool SAL_CALL IUnknownWrapper_Impl::hasProperty( const OUString& aName )
{
throw RuntimeException(OUSTR("[automation bridge] The object does not have an "
"IDispatch interface"), Reference<XInterface>());
- return sal_False;
}
sal_Bool ret = sal_False;
try
commit d1a8ce5f59a3c39875842d01e1e12e467f351e9b
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Oct 10 12:23:46 2011 +0300
WaE: C4584: foo is already a base-class of bar
'cppu::WeakImplHelper8<Ifc1,Ifc2,Ifc3,Ifc4,Ifc5,Ifc6,Ifc7,Ifc8>' :
base-class 'com::sun::star::script::XInvocation' is already a
base-class of 'com::sun::star::script::XAutomationInvocation'
So ignore that warning. No idea if the duplicate base class
XInvocation is intentional or not, and I certainly won't dare touch
it.
I guess the existing pragma to ignore warning C4548 was a typo, and
what was intended was this warning, C4584.
diff --git a/extensions/source/ole/oleobjw.hxx b/extensions/source/ole/oleobjw.hxx
index 9282de1..5e7769a 100644
--- a/extensions/source/ole/oleobjw.hxx
+++ b/extensions/source/ole/oleobjw.hxx
@@ -30,16 +30,11 @@
#define __OLEOBJW_HXX
#include "ole2uno.hxx"
-#ifdef _MSC_VER
-#pragma warning (push,1)
-#pragma warning (disable:4548)
-#endif
-
#include <tools/presys.h>
#define _WIN32_WINNT 0x0403
#if defined(_MSC_VER) && (_MSC_VER >= 1300)
-#undef _DEBUG
+#undef _DEBUG // why?
#endif
#include <atlbase.h>
#include <vector>
@@ -47,8 +42,11 @@
#include <tools/postsys.h>
#ifdef _MSC_VER
-#pragma warning (pop)
+#pragma warning (push,1)
+// warning C4584: 'cppu::WeakImplHelper8<Ifc1,Ifc2,Ifc3,Ifc4,Ifc5,Ifc6,Ifc7,Ifc8>' : base-class 'com::sun::star::script::XInvocation' is already a base-class of 'com::sun::star::script::XAutomationInvocation'
+#pragma warning (disable:4584)
#endif
+
#include <cppuhelper/implbase3.hxx>
#include <cppuhelper/implbase4.hxx>
#include <cppuhelper/implbase8.hxx>
@@ -290,6 +288,11 @@ protected:
};
} // end namespace
+
+#ifdef _MSC_VER
+#pragma warning (pop)
+#endif
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 6c29671175ca42e4918df2cf5df5325b58350a87
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Oct 10 12:01:52 2011 +0300
WaE: unreachable code
diff --git a/extensions/source/nsplugin/source/so_main.cxx b/extensions/source/nsplugin/source/so_main.cxx
index ccd8790..d371627 100644
--- a/extensions/source/nsplugin/source/so_main.cxx
+++ b/extensions/source/nsplugin/source/so_main.cxx
@@ -493,7 +493,9 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
}
NSP_Close_Pipe(la_read_fd);
_exit(0);
+#ifndef _MSC_VER
return EXIT_SUCCESS; // avoid warnings
+#endif
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit d41d645f55bf41f9a69f7894107f1a2732a3b7b3
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Oct 10 12:01:11 2011 +0300
WaE: unreferenced local variable
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 2654965..f825c6f 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -1022,7 +1022,7 @@ void BibDataManager::setFilter(const ::rtl::OUString& rQuery)
xFormProps->setPropertyValue( C2U( "ApplyFilter" ), makeAny( sal_True ) );
reload();
}
- catch(Exception& e )
+ catch(Exception&)
{
DBG_UNHANDLED_EXCEPTION();
}
More information about the Libreoffice-commits
mailing list