[Libreoffice-commits] .: oox/source scripting/source sc/source toolkit/source xmlscript/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Nov 16 10:21:03 PST 2012
oox/source/ole/axcontrol.cxx | 6 ------
oox/source/ole/vbacontrol.cxx | 10 ----------
sc/source/filter/inc/drawingfragment.hxx | 2 +-
sc/source/filter/oox/drawingfragment.cxx | 4 ----
scripting/source/dlgprov/dlgevtatt.cxx | 6 +++---
toolkit/source/awt/vclxwindows.cxx | 4 ----
toolkit/source/controls/dialogcontrol.cxx | 9 +++++----
xmlscript/source/xmldlg_imexp/imp_share.hxx | 6 +++---
8 files changed, 12 insertions(+), 35 deletions(-)
New commits:
commit 41c77ac5e814e8f0080468ca79fe7c2473402720
Author: Noel Power <noel.power at suse.com>
Date: Fri Nov 16 17:06:02 2012 +0000
targetted cleanup of misc. vba pieces.
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index f2b2bc8..e056fde 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -58,8 +58,6 @@
namespace oox {
namespace ole {
-// ============================================================================
-
using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
@@ -73,10 +71,6 @@ using namespace ::com::sun::star::style;
using namespace ::com::sun::star::table;
using namespace ::com::sun::star::uno;
-using ::rtl::OUString;
-
-// ============================================================================
-
namespace {
const sal_uInt32 COMCTL_ID_SIZE = 0x12344321;
diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx
index 91474c6..5e109b0 100644
--- a/oox/source/ole/vbacontrol.cxx
+++ b/oox/source/ole/vbacontrol.cxx
@@ -40,8 +40,6 @@
namespace oox {
namespace ole {
-// ============================================================================
-
using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::frame;
@@ -49,11 +47,6 @@ using namespace ::com::sun::star::io;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
-
-// ============================================================================
-
namespace {
const sal_uInt16 VBA_SITE_CLASSIDINDEX = 0x8000;
@@ -455,9 +448,6 @@ bool VbaFormControl::convertProperties( const Reference< XControlModel >& rxCtrl
PropertySet aPropSet( rxCtrlModel );
aPropSet.setProperties( aPropMap );
- // bind to control source and row source range
- mxSiteModel->bindToSources( rxCtrlModel, rConv );
-
// create and convert all embedded controls
if( !maControls.empty() ) try
{
diff --git a/sc/source/filter/inc/drawingfragment.hxx b/sc/source/filter/inc/drawingfragment.hxx
index e8b1ed7..b34583a 100644
--- a/sc/source/filter/inc/drawingfragment.hxx
+++ b/sc/source/filter/inc/drawingfragment.hxx
@@ -31,9 +31,9 @@
#include <com/sun/star/awt/Rectangle.hpp>
#include <com/sun/star/awt/Size.hpp>
-#include "oox/drawingml/shape.hxx"
#include "oox/drawingml/shapegroupcontext.hxx"
#include "oox/ole/axcontrol.hxx"
+#include "oox/drawingml/shape.hxx"
#include "oox/ole/vbaproject.hxx"
#include "oox/vml/vmldrawing.hxx"
#include "oox/vml/vmldrawingfragment.hxx"
diff --git a/sc/source/filter/oox/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx
index afc0ca1..a65c224 100644
--- a/sc/source/filter/oox/drawingfragment.cxx
+++ b/sc/source/filter/oox/drawingfragment.cxx
@@ -49,10 +49,6 @@
namespace oox {
namespace xls {
-using ::rtl::OUString;
-
-// ============================================================================
-
using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
diff --git a/scripting/source/dlgprov/dlgevtatt.cxx b/scripting/source/dlgprov/dlgevtatt.cxx
index f202278..40147ca 100644
--- a/scripting/source/dlgprov/dlgevtatt.cxx
+++ b/scripting/source/dlgprov/dlgevtatt.cxx
@@ -311,12 +311,12 @@ namespace dlgprov
sal_Int32 nControlCount = aControls.getLength();
Sequence< Reference< XInterface > > aObjects( nControlCount );
- Reference< XInterface >* pObjectsModify = aObjects.getArray();
+ Reference< XInterface >* pObjects2 = aObjects.getArray();
const Reference< XControl >* pControls = aControls.getConstArray();
- for ( sal_Int32 j = 0; j < nControlCount; ++j )
+ for ( sal_Int32 i2 = 0; i2 < nControlCount; ++i2 )
{
- pObjectsModify[j] = Reference< XInterface >( pControls[j], UNO_QUERY );
+ pObjects2[i2] = Reference< XInterface >( pControls[i2], UNO_QUERY );
}
nestedAttachEvents( aObjects, Helper, sDialogCodeName );
}
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index aa69a69..3c97f1d 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -6611,10 +6611,6 @@ throw(::com::sun::star::uno::RuntimeException)
{
SolarMutexGuard aGuard;
-#if OSL_DEBUG_LEVEL > 0
- sal_Bool bVoid = Value.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID;
- (void)bVoid;
-#endif
VCLXContainer::setProperty( PropertyName, Value );
}
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index 4989cd5..922ad41 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -637,13 +637,14 @@ UnoMultiPageControl::~UnoMultiPageControl()
}
// XTabListener
-void SAL_CALL UnoMultiPageControl::inserted( ::sal_Int32 /*ID*/ ) throw (RuntimeException)
+void SAL_CALL UnoMultiPageControl::inserted( SAL_UNUSED_PARAMETER ::sal_Int32 ) throw (RuntimeException)
{
}
-void SAL_CALL UnoMultiPageControl::removed( ::sal_Int32 /*ID*/ ) throw (RuntimeException)
+void SAL_CALL UnoMultiPageControl::removed( SAL_UNUSED_PARAMETER ::sal_Int32 ) throw (RuntimeException)
{
}
-void SAL_CALL UnoMultiPageControl::changed( ::sal_Int32 /*ID*/, const Sequence< NamedValue >& /*Properties*/ ) throw (RuntimeException)
+void SAL_CALL UnoMultiPageControl::changed( SAL_UNUSED_PARAMETER ::sal_Int32 ID,
+ SAL_UNUSED_PARAMETER const Sequence< NamedValue >& ) throw (RuntimeException)
{
}
void SAL_CALL UnoMultiPageControl::activated( ::sal_Int32 ID ) throw (RuntimeException)
@@ -651,7 +652,7 @@ void SAL_CALL UnoMultiPageControl::activated( ::sal_Int32 ID ) throw (RuntimeExc
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_MULTIPAGEVALUE ), uno::makeAny( ID ), sal_False );
}
-void SAL_CALL UnoMultiPageControl::deactivated( ::sal_Int32 /*ID*/ ) throw (RuntimeException)
+void SAL_CALL UnoMultiPageControl::deactivated( SAL_UNUSED_PARAMETER ::sal_Int32 ) throw (RuntimeException)
{
}
void SAL_CALL UnoMultiPageControl::disposing(const EventObject&) throw (RuntimeException)
diff --git a/xmlscript/source/xmldlg_imexp/imp_share.hxx b/xmlscript/source/xmldlg_imexp/imp_share.hxx
index 5ea50d3..8700c44 100644
--- a/xmlscript/source/xmldlg_imexp/imp_share.hxx
+++ b/xmlscript/source/xmldlg_imexp/imp_share.hxx
@@ -107,9 +107,8 @@ inline bool getLongAttr(
class ImportContext;
//==============================================================================
-typedef ::cppu::WeakImplHelper1< css::xml::input::XRoot > DialogImport_Base;
struct DialogImport
- : DialogImport_Base
+ : public ::cppu::WeakImplHelper1< css::xml::input::XRoot >
{
friend class ImportContext;
@@ -162,7 +161,8 @@ public:
, _xDialogModelFactory( xDialogModel, css::uno::UNO_QUERY_THROW ), _xDoc( xDoc )
{ OSL_ASSERT( _xDialogModel.is() && _xDialogModelFactory.is() &&
_xContext.is() ); }
- inline DialogImport( const DialogImport& rOther ) : DialogImport_Base()
+ inline DialogImport( const DialogImport& rOther ) :
+ ::cppu::WeakImplHelper1< css::xml::input::XRoot >()
, _xContext( rOther._xContext )
, _xSupplier( rOther._xSupplier )
, _pStyleNames( rOther._pStyleNames )
More information about the Libreoffice-commits
mailing list