[Libreoffice-commits] .: 2 commits - binfilter/bf_sc binfilter/bf_sch binfilter/bf_sd binfilter/bf_svx binfilter/inc
Joseph Powers
jpowers at kemper.freedesktop.org
Tue Jan 11 19:37:17 PST 2011
binfilter/bf_sc/source/filter/xml/sc_xmlexprt.cxx | 24 +---
binfilter/bf_sch/source/ui/inc/ChXDiagram.hxx | 62 +++++-----
binfilter/bf_sd/source/ui/inc/unomodel.hxx | 6 -
binfilter/bf_sd/source/ui/unoidl/sd_UnoDocumentSettings.cxx | 68 ++++++------
binfilter/bf_sd/source/ui/unoidl/unoobj.hxx | 6 -
binfilter/bf_sd/source/ui/unoidl/unopback.hxx | 5
binfilter/bf_sd/source/ui/unoidl/unopres.hxx | 6 -
binfilter/bf_sd/source/ui/unoidl/unopstyl.hxx | 4
binfilter/bf_svx/source/unodraw/svx_unoipset.cxx | 47 ++------
binfilter/inc/bf_svx/unoipset.hxx | 9 +
binfilter/inc/bf_svx/unoprov.hxx | 2
binfilter/inc/bf_svx/unoshape.hxx | 4
12 files changed, 108 insertions(+), 135 deletions(-)
New commits:
commit 05532273d1980b9009e3cb79e7ee5febdf418a2d
Author: Joseph Powers <jpowers27 at cox.net>
Date: Tue Jan 11 19:35:08 2011 -0800
Remove DECLARE_LIST( SvxIDPropertyCombineList, SvxIDPropertyCombine * )
diff --git a/binfilter/bf_svx/source/unodraw/svx_unoipset.cxx b/binfilter/bf_svx/source/unodraw/svx_unoipset.cxx
index a2afce1..ad76cea 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unoipset.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unoipset.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -26,13 +26,9 @@
*
************************************************************************/
-
-
-
#include <hash_map>
#include <vector>
-
#include "svxids.hrc"
#include "unoshprp.hxx"
#include "unoapi.hxx"
@@ -130,7 +126,7 @@ uno::Reference< beans::XPropertySetInfo > SvxInfoSetCache::getCachedPropertySetI
implementation is designed for a limited number of different SfxItemPropertyMap
pointers */
DBG_ASSERT( mpGlobalCache->maInfoMap.size() < 200, "WARNING: SvxInfoSetCache::get(), possible cache overflow!" );
-
+
return xInfo;
}
@@ -143,7 +139,7 @@ void SvxInfoSetCache::dispose( SvxCachedItemPropertySetInfo* pInfo )
if( pInfo )
{
::osl::MutexGuard aGuard(maMutex);
-
+
InfoMap::iterator aIt(mpGlobalCache->maInfoMap.find(pInfo->getMap()));
if (aIt != mpGlobalCache->maInfoMap.end())
{
@@ -215,7 +211,7 @@ const SfxItemPropertyMap* SvxInfoSetCache::getSortedPropertyMap( const SfxItemPr
pointers */
DBG_ASSERT( mpGlobalCache->maPropertyMap.size() < 200, "WARNING: SvxInfoSetCache::get(), possible cache overflow!" );
}
-
+
return pSortedMap;
}
@@ -227,8 +223,6 @@ struct SvxIDPropertyCombine
uno::Any aAny;
};
-DECLARE_LIST( SvxIDPropertyCombineList, SvxIDPropertyCombine * )//STRIP008 ;
-
SvxItemPropertySet::SvxItemPropertySet( const SfxItemPropertyMap* pMap, sal_Bool bConvertTwips )
: _pMap(SvxInfoSetCache::getSortedPropertyMap(pMap)), mbConvertTwips(bConvertTwips)
{
@@ -239,12 +233,6 @@ SvxItemPropertySet::SvxItemPropertySet( const SfxItemPropertyMap* pMap, sal_Bool
//----------------------------------------------------------------------
SvxItemPropertySet::~SvxItemPropertySet()
{
-/*
- if(pItemPool)
- delete pItemPool;
- pItemPool = NULL;
-*/
-
if(pCombiList)
delete pCombiList;
pCombiList = NULL;
@@ -253,16 +241,11 @@ SvxItemPropertySet::~SvxItemPropertySet()
//----------------------------------------------------------------------
uno::Any* SvxItemPropertySet::GetUsrAnyForID(sal_uInt16 nWID) const
{
- if(pCombiList && pCombiList->Count())
+ if( pCombiList && pCombiList->size() )
{
- SvxIDPropertyCombine* pActual = pCombiList->First();
- while(pActual)
- {
- if(pActual->nWID == nWID)
- return &pActual->aAny;
- pActual = pCombiList->Next();
-
- }
+ for ( size_t i = 0, n = pCombiList->size(); i < n; ++i )
+ if ( (*pCombiList)[ i ]->nWID == nWID )
+ return &(*pCombiList)[ i ]->aAny;
}
return NULL;
}
@@ -276,7 +259,7 @@ void SvxItemPropertySet::AddUsrAnyForID(const uno::Any& rAny, sal_uInt16 nWID)
SvxIDPropertyCombine* pNew = new SvxIDPropertyCombine;
pNew->nWID = nWID;
pNew->aAny = rAny;
- pCombiList->Insert(pNew);
+ pCombiList->push_back( pNew );
}
//----------------------------------------------------------------------
@@ -346,7 +329,7 @@ sal_Bool SvxUnoCheckForConversion( const SfxItemSet& rSet, sal_Int32 nWID, const
case XATTR_FILLBMP_SIZEX:
case XATTR_FILLBMP_SIZEY:
{
- sal_Int32 nValue;
+ sal_Int32 nValue(0);
if( rVal >>= nValue )
bConvert = nValue > 0;
break;
@@ -368,7 +351,7 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertyMap* pMap, c
const SfxPoolItem* pItem = 0;
SfxItemPool* pPool = rSet.GetPool();
- SfxItemState eState = rSet.GetItemState( pMap->nWID, pMap->nWID != SDRATTR_XMLATTRIBUTES, &pItem );
+ rSet.GetItemState( pMap->nWID, pMap->nWID != SDRATTR_XMLATTRIBUTES, &pItem );
if( NULL == pItem && pPool )
{
@@ -393,7 +376,7 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertyMap* pMap, c
{
if( SvxUnoCheckForConversion( rSet, pMap->nWID, aVal ) )
SvxUnoConvertToMM( eMapUnit, aVal );
- }
+ }
}
// convert typeless SfxEnumItem to enum type
else if ( pMap->pType->getTypeClass() == uno::TypeClass_ENUM &&
@@ -451,7 +434,7 @@ void SvxItemPropertySet::setPropertyValue( const SfxItemPropertyMap* pMap, const
{
if( SvxUnoCheckForConversion( rSet, pMap->nWID, aValue ) )
SvxUnoConvertFromMM( eMapUnit, aValue );
- }
+ }
}
pNewItem = pItem->Clone();
@@ -524,7 +507,7 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertyMap* pMap )
if(pMap->nMemberId & SFX_METRIC_ITEM && eMapUnit != SFX_MAPUNIT_100TH_MM)
{
SvxUnoConvertToMM( eMapUnit, aVal );
- }
+ }
}
if ( pMap->pType->getTypeClass() == uno::TypeClass_ENUM &&
@@ -555,7 +538,7 @@ void SvxItemPropertySet::setPropertyValue( const SfxItemPropertyMap* pMap, const
const SfxItemPropertyMap* SvxItemPropertySet::getPropertyMapEntry(const OUString &rName) const
{
const SfxItemPropertyMap* pMap = mpLastMap ? mpLastMap : _pMap;
- while ( pMap->pName )
+ while ( pMap->pName )
{
if( rName.equalsAsciiL( pMap->pName, pMap->nNameLen ) )
{
diff --git a/binfilter/inc/bf_svx/unoipset.hxx b/binfilter/inc/bf_svx/unoipset.hxx
index c4282f5..e115765 100644
--- a/binfilter/inc/bf_svx/unoipset.hxx
+++ b/binfilter/inc/bf_svx/unoipset.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -30,12 +30,16 @@
#define _SVX_UNOIPSET_HXX_
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <vector>
+
namespace binfilter {
struct SfxItemPropertyMap;
class SfxItemSet;
-class SvxIDPropertyCombineList;
+class SvxIDPropertyCombine;
class SdrItemPool;
+typedef ::std::vector< SvxIDPropertyCombine* > SvxIDPropertyCombineList;
+
class SvxShape;
class SvxItemPropertySet
@@ -44,7 +48,6 @@ class SvxItemPropertySet
const SfxItemPropertyMap* mpLastMap;
SvxIDPropertyCombineList* pCombiList;
sal_Bool mbConvertTwips;
-//-/ void Generate3DAttrDefaultItem(sal_uInt16 nWID, SfxItemSet& rSet);
public:
SvxItemPropertySet( const SfxItemPropertyMap *pMap, sal_Bool bConvertTwips = sal_False );
commit 6dc02d7eadfe71fc443fb243601f57304d3307fc
Author: Joseph Powers <jpowers27 at cox.net>
Date: Tue Jan 11 19:34:18 2011 -0800
Remove extra #include & white space & quite warnings
diff --git a/binfilter/bf_sc/source/filter/xml/sc_xmlexprt.cxx b/binfilter/bf_sc/source/filter/xml/sc_xmlexprt.cxx
index eeede8b..a245851 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_xmlexprt.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_xmlexprt.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -85,7 +85,7 @@
#include <com/sun/star/sheet/XCellRangeReferrer.hpp>
#include <com/sun/star/sheet/NamedRangeFlag.hpp>
#include <com/sun/star/form/XFormsSupplier.hpp>
-#include <legacysmgr/legacy_binfilters_smgr.hxx> //STRIP002
+#include <legacysmgr/legacy_binfilters_smgr.hxx> //STRIP002
namespace binfilter {
//! not found in unonames.hxx
#define SC_STANDARDFORMAT "StandardFormat"
@@ -234,7 +234,7 @@ void ScXMLShapeExport::onExport( const uno::Reference < drawing::XShape >& xShap
uno::Reference< beans::XPropertySet > xShapeProp( xShape, uno::UNO_QUERY );
if( xShapeProp.is() )
{
- sal_Int16 nLayerID;
+ sal_Int16 nLayerID(0);
if( (xShapeProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_LAYERID ))) >>= nLayerID) && (nLayerID == SC_LAYER_BACK) )
GetExport().AddAttribute(XML_NAMESPACE_TABLE, XML_TABLE_BACKGROUND, XML_TRUE);
}
@@ -251,7 +251,7 @@ sal_Int16 ScXMLExport::GetFieldUnit()
if (xProperties.is())
{
::com::sun::star::uno::Any aAny = xProperties->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Metric")));
- sal_Int16 nFieldUnit;
+ sal_Int16 nFieldUnit(0);
if (aAny >>= nFieldUnit)
return nFieldUnit;
}
@@ -262,7 +262,7 @@ sal_Int16 ScXMLExport::GetFieldUnit()
// #110680#
ScXMLExport::ScXMLExport(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory,
- const sal_uInt16 nExportFlag)
+ const sal_uInt16 nExportFlag)
: SvXMLExport( xServiceFactory, SvXMLUnitConverter::GetMapUnit(GetFieldUnit()), XML_SPREADSHEET, nExportFlag ),
pDoc(NULL),
pNumberFormatAttributesExportHelper(NULL),
@@ -429,7 +429,7 @@ void ScXMLExport::CollectSharedData(sal_Int32& nTableCount, sal_Int32& nShapesCo
if( xShapeProp.is() )
{
uno::Any aPropAny = xShapeProp->getPropertyValue(sLayerID);
- sal_Int16 nLayerID;
+ sal_Int16 nLayerID(0);
if( aPropAny >>= nLayerID )
{
if( nLayerID == SC_LAYER_INTERN )
@@ -1452,7 +1452,7 @@ void ScXMLExport::_ExportStyles( sal_Bool bUsed )
if (aCellStyle >>= xCellProperties)
{
uno::Any aNumberFormat = xCellProperties->getPropertyValue(sNumberFormat);
- sal_Int32 nNumberFormat;
+ sal_Int32 nNumberFormat(0);
if (aNumberFormat >>= nNumberFormat)
addDataStyle(nNumberFormat);
}
@@ -1665,12 +1665,10 @@ void ScXMLExport::_ExportAutoStyles()
nColumns++;
pColumnStyles->AddNewTable(nTable, aCellAddress.EndColumn);
}
- // else if (nColumns < MAXCOL)
- // pColumnStyles->AddNewTable(nTable, ++nColumns);
else
pColumnStyles->AddNewTable(nTable, nColumns);
sal_Int32 nColumn = 0;
- while (/*nColumn <= nColumns && */nColumn <= MAXCOL)
+ while ( nColumn <= MAXCOL )
{
sal_Int32 nIndex(-1);
sal_Bool bIsVisible(sal_True);
@@ -1733,12 +1731,10 @@ void ScXMLExport::_ExportAutoStyles()
nRows++;
pRowStyles->AddNewTable(nTable, aCellAddress.EndRow);
}
- // else if (nRows < MAXROW)
- // pRowStyles->AddNewTable(nTable, ++nRows);
else
pRowStyles->AddNewTable(nTable, nRows);
sal_Int32 nRow = 0;
- while ( /*nRow <= nRows && */nRow <= MAXROW)
+ while ( nRow <= MAXROW)
{
sal_Int32 nIndex(0);
uno::Any aRow = xTableRows->getByIndex(nRow);
@@ -2161,7 +2157,7 @@ void ScXMLExport::ExportShape(const uno::Reference < drawing::XShape >& xShape,
if (xShapeProps.is())
{
uno::Any aTmpAny = xShapeProps->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ZOrder")));
- sal_Int32 nZOrder;
+ sal_Int32 nZOrder(0);
if (aTmpAny >>= nZOrder)
{
::rtl::OUStringBuffer sBuffer;
diff --git a/binfilter/bf_sch/source/ui/inc/ChXDiagram.hxx b/binfilter/bf_sch/source/ui/inc/ChXDiagram.hxx
index 0c1a083..667260a 100644
--- a/binfilter/bf_sch/source/ui/inc/ChXDiagram.hxx
+++ b/binfilter/bf_sch/source/ui/inc/ChXDiagram.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -55,7 +55,7 @@ namespace binfilter {
class ChartModel;
class SchChartDocShell;
} //namespace binfilter
-// GrP gcc 2.95.2 on Mac OS X chokes on this huge template class.
+// GrP gcc 2.95.2 on Mac OS X chokes on this huge template class.
// Expand the template by hand.
//#if ! (defined(MACOSX) && ( __GNUC__ < 3 ))
#if 1
@@ -95,19 +95,19 @@ namespace cppu {
class SAL_NO_VTABLE ImplHelperBase14
: public ::com::sun::star::lang::XTypeProvider
- , public ::com::sun::star::chart::XDiagram,
- public ::com::sun::star::chart::XAxisZSupplier,
- public ::com::sun::star::chart::XTwoAxisXSupplier,
- public ::com::sun::star::chart::XTwoAxisYSupplier,
- public ::com::sun::star::chart::XStatisticDisplay,
- public ::com::sun::star::chart::X3DDisplay,
- public ::com::sun::star::beans::XPropertySet,
- public ::com::sun::star::beans::XMultiPropertySet,
- public ::com::sun::star::beans::XPropertyState,
- public ::com::sun::star::beans::XMultiPropertyStates,
- public ::com::sun::star::lang::XServiceInfo,
- public ::com::sun::star::lang::XUnoTunnel,
- public ::com::sun::star::lang::XComponent,
+ , public ::com::sun::star::chart::XDiagram,
+ public ::com::sun::star::chart::XAxisZSupplier,
+ public ::com::sun::star::chart::XTwoAxisXSupplier,
+ public ::com::sun::star::chart::XTwoAxisYSupplier,
+ public ::com::sun::star::chart::XStatisticDisplay,
+ public ::com::sun::star::chart::X3DDisplay,
+ public ::com::sun::star::beans::XPropertySet,
+ public ::com::sun::star::beans::XMultiPropertySet,
+ public ::com::sun::star::beans::XPropertyState,
+ public ::com::sun::star::beans::XMultiPropertyStates,
+ public ::com::sun::star::lang::XServiceInfo,
+ public ::com::sun::star::lang::XUnoTunnel,
+ public ::com::sun::star::lang::XComponent,
public ::com::sun::star::lang::XEventListener
{
protected:
@@ -196,8 +196,8 @@ namespace cppu {
#endif
namespace binfilter {//STRIP009
- class ChXDiagram : public ::cppu::WeakImplHelper14
- <
+ class ChXDiagram : public ::cppu::WeakImplHelper14
+ <
::com::sun::star::chart::XDiagram,
::com::sun::star::chart::XAxisZSupplier,
::com::sun::star::chart::XTwoAxisXSupplier, // : XAxisXSupplier
@@ -211,8 +211,8 @@ namespace binfilter {//STRIP009
::com::sun::star::lang::XServiceInfo,
::com::sun::star::lang::XUnoTunnel,
::com::sun::star::lang::XComponent,
- ::com::sun::star::lang::XEventListener
- >
+ ::com::sun::star::lang::XEventListener
+ >
{
private:
::rtl::OUString maServiceName;
@@ -373,20 +373,20 @@ public:
// XMultiPropertySet
virtual void SAL_CALL setPropertyValues (
const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames,
- const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues )
+ const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues )
throw (::com::sun::star::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues (
- const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames )
+ const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames )
throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addPropertiesChangeListener (
const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames,
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
+ const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removePropertiesChangeListener (
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
+ const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL firePropertiesChangeEvent (
const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames,
@@ -418,9 +418,9 @@ public:
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults (
- const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames )
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::lang::WrappedTargetException,
+ const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames )
+ throw (::com::sun::star::beans::UnknownPropertyException,
+ ::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
// XServiceInfo
@@ -443,23 +443,23 @@ public:
throw( ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener )
throw( ::com::sun::star::uno::RuntimeException );
-
+
// XEventListener
virtual void SAL_CALL disposing (const ::com::sun::star::lang::EventObject & Source)
throw (::com::sun::star::uno::RuntimeException);
-
+
protected:
/** @descr In an array of SfxItemPropertyMap entries advance from the position pointed to
- by pProperty to that property that has the name given by pPropertyName. If the
+ by pProperty to that property that has the name given by pPropertyName. If the
property list does not contain such an entry an UnknownPropertyException is thrown.
@param pProperty Pointer into an array of properties. It is modified such that after
the methods returns it points to a property with the same name as pPropertyName.
@param pPropertyName Name of the property that is searched for.
*/
- void AdvanceToName (const SfxItemPropertyMap *& pProperty,
+ void AdvanceToName (const SfxItemPropertyMap *& pProperty,
const ::rtl::OUString * pPropertyName)
throw (::com::sun::star::beans::UnknownPropertyException);
-
+
private:
/// Mutex used by the interface container.
::osl::Mutex maMutex;
diff --git a/binfilter/bf_sd/source/ui/inc/unomodel.hxx b/binfilter/bf_sd/source/ui/inc/unomodel.hxx
index 657b016..de685ce 100644
--- a/binfilter/bf_sd/source/ui/inc/unomodel.hxx
+++ b/binfilter/bf_sd/source/ui/inc/unomodel.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -189,9 +189,9 @@ public:
// XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_UnoDocumentSettings.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_UnoDocumentSettings.cxx
index eec0599..9158c5b 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_UnoDocumentSettings.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_UnoDocumentSettings.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -214,7 +214,7 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c
if( NULL == pDoc || NULL == pDocSh )
throw UnknownPropertyException();
- sal_Bool bOk, bChanged = sal_False, bValue;
+ sal_Bool bOk, bChanged = sal_False, bValue = sal_False;
SfxPrinter* pPrinter = NULL;
SdOptionsPrintItem* pPrinterOptions = NULL;
@@ -242,9 +242,9 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c
if( *pValues >>= aURLString )
{
INetURLObject aURL( aURLString );
- INetURLObject aPathURL( aURL );
-
- aPathURL.removeSegment();
+ INetURLObject aPathURL( aURL );
+
+ aPathURL.removeSegment();
aPathURL.removeFinalSlash();
XColorTable* pColTab = new XColorTable( aPathURL.GetMainURL( INetURLObject::NO_DECODE ), (XOutdevItemPool*)&pDoc->GetPool() );
@@ -264,9 +264,9 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c
if( *pValues >>= aURLString )
{
INetURLObject aURL( aURLString );
- INetURLObject aPathURL( aURL );
-
- aPathURL.removeSegment();
+ INetURLObject aPathURL( aURL );
+
+ aPathURL.removeSegment();
aPathURL.removeFinalSlash();
XDashList* pDashTab = new XDashList( aPathURL.GetMainURL( INetURLObject::NO_DECODE ), (XOutdevItemPool*)&pDoc->GetPool() );
@@ -286,9 +286,9 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c
if( *pValues >>= aURLString )
{
INetURLObject aURL( aURLString );
- INetURLObject aPathURL( aURL );
-
- aPathURL.removeSegment();
+ INetURLObject aPathURL( aURL );
+
+ aPathURL.removeSegment();
aPathURL.removeFinalSlash();
XLineEndList* pTab = new XLineEndList( aPathURL.GetMainURL( INetURLObject::NO_DECODE ), (XOutdevItemPool*)&pDoc->GetPool() );
@@ -308,9 +308,9 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c
if( *pValues >>= aURLString )
{
INetURLObject aURL( aURLString );
- INetURLObject aPathURL( aURL );
-
- aPathURL.removeSegment();
+ INetURLObject aPathURL( aURL );
+
+ aPathURL.removeSegment();
aPathURL.removeFinalSlash();
XHatchList* pTab = new XHatchList( aPathURL.GetMainURL( INetURLObject::NO_DECODE ), (XOutdevItemPool*)&pDoc->GetPool() );
@@ -330,9 +330,9 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c
if( *pValues >>= aURLString )
{
INetURLObject aURL( aURLString );
- INetURLObject aPathURL( aURL );
-
- aPathURL.removeSegment();
+ INetURLObject aPathURL( aURL );
+
+ aPathURL.removeSegment();
aPathURL.removeFinalSlash();
XGradientList* pTab = new XGradientList( aPathURL.GetMainURL( INetURLObject::NO_DECODE ), (XOutdevItemPool*)&pDoc->GetPool() );
@@ -352,9 +352,9 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c
if( *pValues >>= aURLString )
{
INetURLObject aURL( aURLString );
- INetURLObject aPathURL( aURL );
-
- aPathURL.removeSegment();
+ INetURLObject aPathURL( aURL );
+
+ aPathURL.removeSegment();
aPathURL.removeFinalSlash();
XBitmapList* pTab = new XBitmapList( aPathURL.GetMainURL( INetURLObject::NO_DECODE ), (XOutdevItemPool*)&pDoc->GetPool() );
@@ -375,7 +375,7 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c
break;
case HANDLE_APPLYUSERDATA:
{
- sal_Bool bApplyUserData;
+ sal_Bool bApplyUserData(sal_False);
if( *pValues >>= bApplyUserData )
{
SfxDocumentInfo& rInfo = pDocSh->GetDocInfo();
@@ -481,7 +481,7 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c
break;
case HANDLE_PRINTQUALITY:
{
- sal_Int32 nValue;
+ sal_Int32 nValue(0);
if( *pValues >>= nValue )
{
pPrinterOptions->SetOutputQuality( (sal_uInt16)nValue );
@@ -491,7 +491,7 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c
break;
case HANDLE_MEASUREUNIT:
{
- sal_Int16 nValue;
+ sal_Int16 nValue(0);
if( *pValues >>= nValue )
{
short nFieldUnit;
@@ -505,7 +505,7 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c
break;
case HANDLE_SCALE_NUM:
{
- sal_Int32 nValue;
+ sal_Int32 nValue(0);
if( *pValues >>= nValue )
{
Fraction aFract( nValue, pDoc->GetUIScale().GetDenominator() );
@@ -517,7 +517,7 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c
break;
case HANDLE_SCALE_DOM:
{
- sal_Int32 nValue;
+ sal_Int32 nValue(0);
if( *pValues >>= nValue )
{
Fraction aFract( pDoc->GetUIScale().GetNumerator(), nValue );
@@ -530,7 +530,7 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c
case HANDLE_TABSTOP:
{
- sal_Int32 nValue;
+ sal_Int32 nValue(0);
if( (*pValues >>= nValue) && (nValue >= 0) )
{
pDoc->SetDefaultTabulator((sal_uInt16)nValue);
@@ -541,7 +541,7 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c
break;
case HANDLE_PAGENUMFMT:
{
- sal_Int32 nValue;
+ sal_Int32 nValue(0);
if( (*pValues >>= nValue ) && (nValue >= SVX_CHARS_UPPER_LETTER ) && (nValue <= SVX_PAGEDESC) )
{
pDoc->SetPageNumType((SvxNumType)nValue);
@@ -575,7 +575,7 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c
SvMemoryStream aStream (aSequence.getArray(), nSize, STREAM_READ );
aStream.Seek ( STREAM_SEEK_TO_BEGIN );
SfxItemSet* pItemSet;
-
+
if( pPrinter )
{
pItemSet = pPrinter->GetOptions().Clone();
@@ -601,10 +601,10 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c
}
}
break;
-
+
case HANDLE_PARAGRAPHSUMMATION :
{
- sal_Bool bIsSummationOfParagraphs;
+ sal_Bool bIsSummationOfParagraphs(sal_False);
if ( *pValues >>= bIsSummationOfParagraphs )
{
bOk = sal_True;
@@ -638,7 +638,7 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c
case HANDLE_CHARCOMPRESS:
{
- sal_Int16 nCharCompressType;
+ sal_Int16 nCharCompressType(0);
if( *pValues >>= nCharCompressType )
{
bOk = sal_True;
@@ -663,7 +663,7 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c
}
case HANDLE_ASIANPUNCT:
{
- sal_Bool bAsianPunct;
+ sal_Bool bAsianPunct(sal_False);
if( *pValues >>= bAsianPunct )
{
bOk = sal_True;
@@ -688,7 +688,7 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c
}
case HANDLE_UPDATEFROMTEMPLATE:
{
- sal_Bool bLclValue;
+ sal_Bool bLclValue(sal_False);
if( *pValues >>= bLclValue )
{
SfxDocumentInfo& rInfo = pDocSh->GetDocInfo();
@@ -704,7 +704,7 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c
// the document and determine it really differs from the old
// one.
sal_Int16 nOldValue = pDoc->GetPrinterIndependentLayout ();
- sal_Int16 nValue;
+ sal_Int16 nValue(0);
if (*pValues >>= nValue)
{
pDoc->SetPrinterIndependentLayout (nValue);
diff --git a/binfilter/bf_sd/source/ui/unoidl/unoobj.hxx b/binfilter/bf_sd/source/ui/unoidl/unoobj.hxx
index 37a1019..7394530 100644
--- a/binfilter/bf_sd/source/ui/unoidl/unoobj.hxx
+++ b/binfilter/bf_sd/source/ui/unoidl/unoobj.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -40,8 +40,6 @@
#include <bf_svx/unomaster.hxx>
-#include <bf_svx/unoipset.hxx>
-
#include <cppuhelper/implbase2.hxx>
struct SvEventDescription;
namespace binfilter {
@@ -100,7 +98,7 @@ public:
//XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
//XPropertyState
virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
diff --git a/binfilter/bf_sd/source/ui/unoidl/unopback.hxx b/binfilter/bf_sd/source/ui/unoidl/unopback.hxx
index 458510f..f6ed136 100644
--- a/binfilter/bf_sd/source/ui/unoidl/unopback.hxx
+++ b/binfilter/bf_sd/source/ui/unoidl/unopback.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,6 @@
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <bf_svx/unoshprp.hxx>
-#include <bf_svx/unoipset.hxx>
#include <comphelper/servicehelper.hxx>
@@ -47,7 +46,7 @@ const SfxItemPropertyMap* ImplGetPageBackgroundPropertyMap();
class SdrObject;
class SdDrawDocument;
-class SdUnoPageBackground : public ::cppu::WeakImplHelper4<
+class SdUnoPageBackground : public ::cppu::WeakImplHelper4<
::com::sun::star::beans::XPropertySet,
::com::sun::star::lang::XServiceInfo,
::com::sun::star::beans::XPropertyState,
diff --git a/binfilter/bf_sd/source/ui/unoidl/unopres.hxx b/binfilter/bf_sd/source/ui/unoidl/unopres.hxx
index 5ec134d..a2e8d45 100644
--- a/binfilter/bf_sd/source/ui/unoidl/unopres.hxx
+++ b/binfilter/bf_sd/source/ui/unoidl/unopres.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,6 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/presentation/XPresentation.hpp>
-#include <bf_svx/unoipset.hxx>
-
#include <cppuhelper/implbase3.hxx>
namespace binfilter {
@@ -41,7 +39,7 @@ namespace binfilter {
class SdXImpressDocument;
-class SdXPresentation : public ::cppu::WeakImplHelper3<
+class SdXPresentation : public ::cppu::WeakImplHelper3<
::com::sun::star::presentation::XPresentation,
::com::sun::star::beans::XPropertySet,
::com::sun::star::lang::XServiceInfo>
diff --git a/binfilter/bf_sd/source/ui/unoidl/unopstyl.hxx b/binfilter/bf_sd/source/ui/unoidl/unopstyl.hxx
index f6029f5..6cb4d86 100644
--- a/binfilter/bf_sd/source/ui/unoidl/unopstyl.hxx
+++ b/binfilter/bf_sd/source/ui/unoidl/unopstyl.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -37,8 +37,6 @@
#include <bf_svtools/lstner.hxx>
-#include <bf_svx/unoipset.hxx>
-
#include <comphelper/servicehelper.hxx>
#include <prlayout.hxx>
diff --git a/binfilter/inc/bf_svx/unoprov.hxx b/binfilter/inc/bf_svx/unoprov.hxx
index e2b032b..c8c5365 100644
--- a/binfilter/inc/bf_svx/unoprov.hxx
+++ b/binfilter/inc/bf_svx/unoprov.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/binfilter/inc/bf_svx/unoshape.hxx b/binfilter/inc/bf_svx/unoshape.hxx
index 7e8928b..a918fc6 100644
--- a/binfilter/inc/bf_svx/unoshape.hxx
+++ b/binfilter/inc/bf_svx/unoshape.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -48,8 +48,6 @@
#include <bf_svtools/lstner.hxx>
-#include <bf_svx/unoipset.hxx>
-
#include <cppuhelper/weak.hxx>
#include <cppuhelper/weakagg.hxx>
#include <cppuhelper/interfacecontainer.h>
More information about the Libreoffice-commits
mailing list