[Libreoffice-commits] .: 17 commits - clucene/CustomTarget_source.mk clucene/patches comphelper/source connectivity/source dbaccess/source extensions/source forms/source hunspell/hunspell-1.3.2-literal.patch hunspell/hunspell-1.3.2-nullptr.patch hunspell/makefile.mk hwpfilter/source l10ntools/inc l10ntools/source mysqlc/source reportdesign/source rsc/inc sal/inc sal/qa stoc/source svl/inc toolkit/inc toolkit/source unotools/source vcl/generic vcl/inc vcl/source xmlhelp/source
Stephan Bergmann
sbergmann at kemper.freedesktop.org
Tue Aug 14 01:40:36 PDT 2012
clucene/CustomTarget_source.mk | 1
clucene/patches/clucene-nullptr.patch | 22 +++
comphelper/source/eventattachermgr/eventattachermgr.cxx | 2
comphelper/source/misc/accessiblecontexthelper.cxx | 12 -
connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx | 8 -
connectivity/source/commontools/dbexception.cxx | 8 -
connectivity/source/drivers/ado/AColumn.cxx | 2
connectivity/source/drivers/ado/AUser.cxx | 2
connectivity/source/drivers/file/FResultSet.cxx | 8 -
connectivity/source/drivers/file/FStatement.cxx | 16 +-
connectivity/source/drivers/hsqldb/HUser.cxx | 2
connectivity/source/drivers/mysql/YUser.cxx | 2
connectivity/source/inc/propertyids.hxx | 2
connectivity/source/parse/PColumn.cxx | 18 +-
connectivity/source/sdbcx/VCatalog.cxx | 2
connectivity/source/sdbcx/VColumn.cxx | 14 +-
connectivity/source/sdbcx/VIndex.cxx | 2
connectivity/source/sdbcx/VKey.cxx | 8 -
connectivity/source/sdbcx/VKeyColumn.cxx | 2
connectivity/source/sdbcx/VTable.cxx | 8 -
connectivity/source/sdbcx/VView.cxx | 8 -
dbaccess/source/core/api/RowSet.cxx | 62 +++++-----
dbaccess/source/core/api/TableDeco.cxx | 2
dbaccess/source/ui/browser/sbagrid.cxx | 2
extensions/source/resource/ResourceIndexAccess.cxx | 4
extensions/source/resource/ResourceIndexAccess.hxx | 2
forms/source/component/ComboBox.cxx | 2
forms/source/component/ListBox.cxx | 6
forms/source/inc/property.hxx | 4
hunspell/hunspell-1.3.2-literal.patch | 11 +
hunspell/hunspell-1.3.2-nullptr.patch | 20 +++
hunspell/makefile.mk | 4
hwpfilter/source/hwpfile.h | 1
l10ntools/inc/export.hxx | 4
l10ntools/inc/helpmerge.hxx | 4
l10ntools/inc/l10ntools/HelpLinker.hxx | 5
l10ntools/inc/lngmerge.hxx | 4
l10ntools/inc/xrmmerge.hxx | 2
l10ntools/source/cfgmerge.cxx | 7 -
l10ntools/source/export.cxx | 14 --
l10ntools/source/helpex.cxx | 13 --
l10ntools/source/helpmerge.cxx | 6
l10ntools/source/lngex.cxx | 5
l10ntools/source/lngmerge.cxx | 5
l10ntools/source/merge.cxx | 2
l10ntools/source/xrmmerge.cxx | 5
mysqlc/source/mysqlc_propertyids.hxx | 2
mysqlc/source/mysqlc_types.cxx | 2
reportdesign/source/ui/report/ReportController.cxx | 2
rsc/inc/rscpar.hxx | 1
sal/inc/rtl/math.h | 2
sal/qa/osl/file/osl_File.cxx | 33 ++---
stoc/source/servicemanager/servicemanager.cxx | 1
svl/inc/svl/strmadpt.hxx | 3
svl/inc/svl/style.hxx | 1
toolkit/inc/toolkit/awt/vclxaccessiblecomponent.hxx | 3
toolkit/inc/toolkit/awt/vclxdevice.hxx | 3
toolkit/inc/toolkit/awt/vclxtabpagecontainer.hxx | 1
toolkit/inc/toolkit/controls/tabpagecontainer.hxx | 1
toolkit/source/controls/grid/gridcontrol.cxx | 1
toolkit/source/controls/grid/gridcontrol.hxx | 2
unotools/source/config/moduleoptions.cxx | 8 -
unotools/source/config/syslocaleoptions.cxx | 2
vcl/generic/glyphs/gcach_ftyp.cxx | 4
vcl/generic/glyphs/gcach_ftyp.hxx | 1
vcl/inc/canvasbitmap.hxx | 1
vcl/inc/generic/printerjob.hxx | 1
vcl/inc/impfont.hxx | 1
vcl/inc/impoct.hxx | 5
vcl/inc/vcl/field.hxx | 2
vcl/inc/vcl/lineinfo.hxx | 3
vcl/inc/vcl/settings.hxx | 5
vcl/source/gdi/bitmap3.cxx | 2
vcl/source/gdi/impanmvw.hxx | 1
vcl/source/gdi/pngread.cxx | 1
vcl/source/gdi/pngwrite.cxx | 5
vcl/source/helper/canvasbitmap.cxx | 1
vcl/source/window/scrwnd.hxx | 1
xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx | 21 ---
xmlhelp/source/cxxhelp/inc/qe/Query.hxx | 4
xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx | 5
xmlhelp/source/cxxhelp/provider/databases.cxx | 7 -
xmlhelp/source/cxxhelp/provider/databases.hxx | 1
xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx | 1
xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx | 1
xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 5
xmlhelp/source/cxxhelp/provider/urlparameter.hxx | 7 -
xmlhelp/source/cxxhelp/qe/DocGenerator.cxx | 7 -
88 files changed, 216 insertions(+), 290 deletions(-)
New commits:
commit e7b2c4b13f1572e4ded8613dfc7b187aafad87ff
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Aug 13 18:12:14 2012 +0200
-Werror,-Wunused-private-field (Clang towards 3.2)
Change-Id: I8287b7eb761fc4b88e7f5acc7a0837b7a4634970
diff --git a/toolkit/inc/toolkit/awt/vclxaccessiblecomponent.hxx b/toolkit/inc/toolkit/awt/vclxaccessiblecomponent.hxx
index 97fe519..002c39b 100644
--- a/toolkit/inc/toolkit/awt/vclxaccessiblecomponent.hxx
+++ b/toolkit/inc/toolkit/awt/vclxaccessiblecomponent.hxx
@@ -66,9 +66,6 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow> mxWindow;
VCLXWindow* mpVCLXindow;
- sal_uLong nDummy1;
- sal_uLong nDummy2;
- void* pDummy1;
VCLExternalSolarLock* m_pSolarLock;
protected:
diff --git a/toolkit/inc/toolkit/awt/vclxdevice.hxx b/toolkit/inc/toolkit/awt/vclxdevice.hxx
index eb9451b..a817c59 100644
--- a/toolkit/inc/toolkit/awt/vclxdevice.hxx
+++ b/toolkit/inc/toolkit/awt/vclxdevice.hxx
@@ -113,9 +113,6 @@ public:
class VCLXVirtualDevice : public VCLXDevice
{
-private:
- VirtualDevice* mpVDev;
-
public:
~VCLXVirtualDevice();
diff --git a/toolkit/inc/toolkit/awt/vclxtabpagecontainer.hxx b/toolkit/inc/toolkit/awt/vclxtabpagecontainer.hxx
index 04fdb25..b68b1f5 100644
--- a/toolkit/inc/toolkit/awt/vclxtabpagecontainer.hxx
+++ b/toolkit/inc/toolkit/awt/vclxtabpagecontainer.hxx
@@ -83,7 +83,6 @@ public:
protected:
virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
private:
- sal_Int16 m_nActiveTabPageId;
TabPageListenerMultiplexer m_aTabPageListeners;
::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPage > > m_aTabPages;
};
diff --git a/toolkit/inc/toolkit/controls/tabpagecontainer.hxx b/toolkit/inc/toolkit/controls/tabpagecontainer.hxx
index 134febb..0de305e 100644
--- a/toolkit/inc/toolkit/controls/tabpagecontainer.hxx
+++ b/toolkit/inc/toolkit/controls/tabpagecontainer.hxx
@@ -139,7 +139,6 @@ protected:
virtual void updateFromModel();
private:
TabPageListenerMultiplexer m_aTabPageListeners;
- sal_Int16 m_nActiveTabPageId;
};
#endif // _TOOLKIT_TABPAGE_CONTAINER_HXX
diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx
index 97ceeff..23663a6 100644
--- a/toolkit/source/controls/grid/gridcontrol.cxx
+++ b/toolkit/source/controls/grid/gridcontrol.cxx
@@ -272,7 +272,6 @@ Reference< XPropertySetInfo > UnoGridModel::getPropertySetInfo( ) throw(Runtime
//======================================================================================================================
UnoGridControl::UnoGridControl( const Reference< XMultiServiceFactory >& i_factory )
:UnoGridControl_Base( i_factory )
- ,mSelectionMode(SelectionType(1))
,m_aSelectionListeners( *this )
,m_pEventForwarder( new GridEventForwarder( *this ) )
{
diff --git a/toolkit/source/controls/grid/gridcontrol.hxx b/toolkit/source/controls/grid/gridcontrol.hxx
index 97283e7..dfcbede 100644
--- a/toolkit/source/controls/grid/gridcontrol.hxx
+++ b/toolkit/source/controls/grid/gridcontrol.hxx
@@ -30,7 +30,6 @@
#define TOOLKIT_GRID_CONTROL_HXX
#include <com/sun/star/awt/grid/XGridControl.hpp>
-#include <com/sun/star/view/SelectionType.hpp>
#include <toolkit/controls/unocontrolbase.hxx>
#include <toolkit/controls/unocontrolmodel.hxx>
@@ -123,7 +122,6 @@ protected:
~UnoGridControl();
private:
- ::com::sun::star::view::SelectionType mSelectionMode;
SelectionListenerMultiplexer m_aSelectionListeners;
::boost::scoped_ptr< GridEventForwarder > m_pEventForwarder;
};
commit bc8a8443a4c9f85dbfa8e064d14c603f5a2d160f
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Aug 13 17:15:34 2012 +0200
-Werror,-Wunused-private-field (Clang towards 3.2)
Change-Id: I5d37ddd95068d807d0f28dd2f00d43b227e910c5
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index ca35f54..8ac55e4 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -500,7 +500,7 @@ void FtFontInfo::AnnounceFont( ImplDevFontList* pFontList )
// =======================================================================
FreetypeManager::FreetypeManager()
-: mnMaxFontId( 0 ), mnNextFontId( 0x1000 )
+: mnMaxFontId( 0 )
{
/*FT_Error rcFT =*/ FT_Init_FreeType( &aLibFT );
@@ -2153,7 +2153,6 @@ private:
sal_uInt16 mnMaxPoints;
sal_uInt16 mnPoints;
sal_uInt16 mnPoly;
- long mnHeight;
bool bHasOffline;
};
@@ -2164,7 +2163,6 @@ PolyArgs::PolyArgs( PolyPolygon& rPolyPoly, sal_uInt16 nMaxPoints )
mnMaxPoints(nMaxPoints),
mnPoints(0),
mnPoly(0),
- mnHeight(0),
bHasOffline(false)
{
mpPointAry = new Point[ mnMaxPoints ];
diff --git a/vcl/generic/glyphs/gcach_ftyp.hxx b/vcl/generic/glyphs/gcach_ftyp.hxx
index 8dd292f..192704f 100644
--- a/vcl/generic/glyphs/gcach_ftyp.hxx
+++ b/vcl/generic/glyphs/gcach_ftyp.hxx
@@ -170,7 +170,6 @@ private:
FontList maFontList;
sal_IntPtr mnMaxFontId;
- sal_IntPtr mnNextFontId;
};
// -----------------------------------------------------------------------
diff --git a/vcl/inc/canvasbitmap.hxx b/vcl/inc/canvasbitmap.hxx
index c57c6ed..68deab2 100644
--- a/vcl/inc/canvasbitmap.hxx
+++ b/vcl/inc/canvasbitmap.hxx
@@ -55,7 +55,6 @@ namespace unotools
sal_Int32 m_nAlphaIndex;
sal_Int32 m_nIndexIndex;
sal_Int8 m_nEndianness;
- bool m_bSwap;
bool m_bPalette;
SAL_DLLPRIVATE void setComponentInfo( sal_uLong redShift, sal_uLong greenShift, sal_uLong blueShift );
diff --git a/vcl/inc/generic/printerjob.hxx b/vcl/inc/generic/printerjob.hxx
index aa05394..831fda4 100644
--- a/vcl/inc/generic/printerjob.hxx
+++ b/vcl/inc/generic/printerjob.hxx
@@ -78,7 +78,6 @@ private: // private data
double mfXScale;
double mfYScale;
- sal_Int32 mnErrorCode;
bool m_bQuickJob;
private: // private methods
diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx
index 9173771..5ea1cd7 100644
--- a/vcl/inc/impfont.hxx
+++ b/vcl/inc/impfont.hxx
@@ -79,7 +79,6 @@ private:
FontStrikeout meStrikeout;
FontRelief meRelief;
FontEmphasisMark meEmphasisMark;
- FontType meType; // used by metrics only
short mnOrientation;
FontKerning mnKerning;
sal_Bool mbWordLine:1,
diff --git a/vcl/inc/impoct.hxx b/vcl/inc/impoct.hxx
index de6d6f2..81431c0 100644
--- a/vcl/inc/impoct.hxx
+++ b/vcl/inc/impoct.hxx
@@ -31,7 +31,6 @@ class ImpErrorQuad
long nRed;
long nGreen;
long nBlue;
- long nReserved;
public:
@@ -124,10 +123,6 @@ inline BitmapColor ImpErrorQuad::ImplGetColor()
class ImpNodeCache
{
OctreeNode* pActNode;
- sal_uLong nNew;
- sal_uLong nDelete;
- sal_uLong nGet;
- sal_uLong nRelease;
public:
diff --git a/vcl/inc/vcl/field.hxx b/vcl/inc/vcl/field.hxx
index c9d9911..03809e1 100644
--- a/vcl/inc/vcl/field.hxx
+++ b/vcl/inc/vcl/field.hxx
@@ -321,7 +321,6 @@ private:
Date maMax;
Date maCorrectedDate;
sal_Bool mbLongFormat;
- sal_Bool mbEmptyDate;
sal_Bool mbShowDateCentury;
sal_uInt16 mnDateFormat;
sal_uLong mnExtDateFormat;
@@ -419,7 +418,6 @@ private:
TimeFieldFormat meFormat;
sal_uInt16 mnTimeFormat;
sal_Bool mbDuration;
- sal_Bool mbEmptyTime;
sal_Bool mbEnforceValidValue;
SAL_DLLPRIVATE void ImplInit();
diff --git a/vcl/inc/vcl/lineinfo.hxx b/vcl/inc/vcl/lineinfo.hxx
index 069a1f0..124ab3a 100644
--- a/vcl/inc/vcl/lineinfo.hxx
+++ b/vcl/inc/vcl/lineinfo.hxx
@@ -72,9 +72,6 @@ class VCL_DLLPUBLIC LineInfo
private:
ImplLineInfo* mpImplLineInfo;
- long n1;
- long n2;
- long n3;
SAL_DLLPRIVATE void ImplMakeUnique();
diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx
index 2f62cee..b8713d5 100644
--- a/vcl/inc/vcl/settings.hxx
+++ b/vcl/inc/vcl/settings.hxx
@@ -79,7 +79,6 @@ private:
sal_uLong mnFollow;
sal_uInt16 mnMiddleButtonAction;
sal_uInt16 mnWheelBehavior;
- sal_Bool mbAlign1;
};
// -----------------
@@ -227,8 +226,6 @@ class ImplStyleData
private:
sal_uLong mnRefCount;
- void* mpStyleData_NotUsedYet;
-
Color maActiveBorderColor;
Color maActiveColor;
Color maActiveColor2;
@@ -947,7 +944,6 @@ public:
// -----------------------
// - ImplAllSettingsData -
// -----------------------
-class LocaleConfigurationListener;
class ImplAllSettingsData
{
friend class AllSettings;
@@ -972,7 +968,6 @@ private:
LocaleDataWrapper* mpUILocaleDataWrapper;
vcl::I18nHelper* mpI18nHelper;
vcl::I18nHelper* mpUII18nHelper;
- LocaleConfigurationListener* mpLocaleCfgListener;
SvtSysLocale maSysLocale;
};
diff --git a/vcl/source/gdi/impanmvw.hxx b/vcl/source/gdi/impanmvw.hxx
index 455a6ee..fe728a5 100644
--- a/vcl/source/gdi/impanmvw.hxx
+++ b/vcl/source/gdi/impanmvw.hxx
@@ -52,7 +52,6 @@ private:
sal_uLong mnActPos;
Disposal meLastDisposal;
sal_Bool mbPause;
- sal_Bool mbFirst;
sal_Bool mbMarked;
sal_Bool mbHMirr;
sal_Bool mbVMirr;
diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index a7cf7ec..a01b66d 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -123,7 +123,6 @@ private:
sal_uInt32 mnYAdd; // the increment for input images Y coords for the current pass
int mnPreviewShift; // shift to convert orig image coords into preview image coords
int mnPreviewMask; // == ((1 << mnPreviewShift) - 1)
- sal_uInt16 mnIStmOldMode;
sal_uInt16 mnTargetDepth; // pixel depth of target bitmap
sal_uInt8 mnTransRed;
sal_uInt8 mnTransGreen;
diff --git a/vcl/source/gdi/pngwrite.cxx b/vcl/source/gdi/pngwrite.cxx
index 3d8de49..9a90fd9 100644
--- a/vcl/source/gdi/pngwrite.cxx
+++ b/vcl/source/gdi/pngwrite.cxx
@@ -98,8 +98,6 @@ private:
sal_uLong mnBBP; // bytes per pixel ( needed for filtering )
sal_Bool mbTrueAlpha;
sal_uLong mnCRC;
- long mnChunkDatSize;
- sal_uLong mnLastPercent;
void ImplWritepHYs( const BitmapEx& rBitmapEx );
void ImplWriteIDAT();
@@ -124,8 +122,7 @@ PNGWriterImpl::PNGWriterImpl( const BitmapEx& rBmpEx,
mpAccess ( NULL ),
mpMaskAccess ( NULL ),
mpZCodec ( new ZCodec( DEFAULT_IN_BUFSIZE, DEFAULT_OUT_BUFSIZE, MAX_MEM_USAGE ) ),
- mnCRC(0UL),
- mnLastPercent ( 0UL )
+ mnCRC(0UL)
{
if ( !rBmpEx.IsEmpty() )
{
diff --git a/vcl/source/helper/canvasbitmap.cxx b/vcl/source/helper/canvasbitmap.cxx
index b2f145d..d54240b 100644
--- a/vcl/source/helper/canvasbitmap.cxx
+++ b/vcl/source/helper/canvasbitmap.cxx
@@ -122,7 +122,6 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) :
m_nAlphaIndex(-1),
m_nIndexIndex(-1),
m_nEndianness(0),
- m_bSwap(false),
m_bPalette(false)
{
if( m_aBmpEx.IsTransparent() )
diff --git a/vcl/source/window/scrwnd.hxx b/vcl/source/window/scrwnd.hxx
index efcb7b7..7acc2f5 100644
--- a/vcl/source/window/scrwnd.hxx
+++ b/vcl/source/window/scrwnd.hxx
@@ -62,7 +62,6 @@ private:
sal_uLong mnTimeout;
sal_uLong mnWheelMode;
sal_uLong mnMaxWidth;
- sal_uLong mnActWidth;
sal_uLong mnActDist;
long mnActDeltaX;
long mnActDeltaY;
commit 0cbc03f46828296b06bb58ae7e7face7bc1a6364
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Aug 13 16:55:35 2012 +0200
-Werror,-Wnon-literal-null-conversion (Clang towards 3.2)
Change-Id: Idab8116ac30f8ed3100292dd7a9a6a0c03a9e806
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index 66198e3..41a1dc3 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -328,7 +328,7 @@ sal_Bool Bitmap::Convert( BmpConversion eConversion )
case( BMP_CONVERSION_24BIT ):
{
if( nBitCount < 24 )
- bRet = ImplConvertUp( 24, sal_False );
+ bRet = ImplConvertUp( 24, NULL );
else
bRet = sal_True;
}
commit 58d03e38aa42c1515c0b467148ae796402872776
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Aug 13 15:31:42 2012 +0200
-Werror,-Wunused-private-field (Clang towards 3.2)
Change-Id: I792247193e98cbf9225ec103911920e7f63640bf
diff --git a/svl/inc/svl/strmadpt.hxx b/svl/inc/svl/strmadpt.hxx
index aec2dca..167d369 100644
--- a/svl/inc/svl/strmadpt.hxx
+++ b/svl/inc/svl/strmadpt.hxx
@@ -71,11 +71,10 @@ class SVL_DLLPUBLIC SvLockBytesInputStream: public cppu::OWeakObject,
{
SvLockBytesRef m_xLockBytes;
sal_Int64 m_nPosition;
- bool m_bDone;
public:
SvLockBytesInputStream(SvLockBytes * pTheLockBytes):
- m_xLockBytes(pTheLockBytes), m_nPosition(0), m_bDone(false) {}
+ m_xLockBytes(pTheLockBytes), m_nPosition(0) {}
virtual com::sun::star::uno::Any SAL_CALL
queryInterface(const com::sun::star::uno::Type & rType)
diff --git a/svl/inc/svl/style.hxx b/svl/inc/svl/style.hxx
index 34edeb5..e8eb492 100644
--- a/svl/inc/svl/style.hxx
+++ b/svl/inc/svl/style.hxx
@@ -179,7 +179,6 @@ private:
SVL_DLLPRIVATE sal_Bool IsTrivialSearch();
SVL_DLLPRIVATE sal_Bool DoesStyleMatch(SfxStyleSheetBase *pStyle);
- void* pImp;
SfxStyleSheetBase* pAktStyle;
sal_uInt16 nAktPosition;
sal_Bool bSearchUsed;
commit 103be64d430aec45ed4c6b170aad5001e16354df
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Aug 13 15:11:31 2012 +0200
-Wc++11-narrowing (Clang towards 3.2)
Change-Id: I5b5e61995671aa194f97c4f337b2c429842917c0
diff --git a/mysqlc/source/mysqlc_types.cxx b/mysqlc/source/mysqlc_types.cxx
index 75f74ae..253cf00 100644
--- a/mysqlc/source/mysqlc_types.cxx
+++ b/mysqlc/source/mysqlc_types.cxx
@@ -163,7 +163,7 @@ TypeInfoDef mysqlc_types[] = {
{
"LONGBLOB", // Typename
com::sun::star::sdbc::DataType::LONGVARBINARY, // sdbc-type
- 0xFFFFFFFF, // Precision
+ -1, // Precision
"'", // Literal prefix
"'", // Literal suffix
"", // Create params
commit ed93117447a3217fab0e2425f8761e24423024b5
Author: Jung-uk Kim <jkim at FreeBSD.org>
Date: Mon Aug 13 15:04:39 2012 +0200
fdo#53061: Fix for C++11 #define NULL nullptr
Change-Id: Ia1805aab4bec7fef02c96ec4e7a7a0ed9991d3c3
Signed-off-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index 69ee04d..a03d6c1 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -82,10 +82,10 @@ ODatabaseMetaDataResultSet::~ODatabaseMetaDataResultSet()
// -------------------------------------------------------------------------
void ODatabaseMetaDataResultSet::construct()
{
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, 0,&m_nFetchSize, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::READONLY,&m_nResultSetType, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, 0, &m_nFetchDirection, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY, PropertyAttribute::READONLY,&m_nResultSetConcurrency, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, 0,&m_nFetchSize, ::getCppuType(static_cast<sal_Int32*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::READONLY,&m_nResultSetType, ::getCppuType(static_cast<sal_Int32*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, 0, &m_nFetchDirection, ::getCppuType(static_cast<sal_Int32*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY, PropertyAttribute::READONLY,&m_nResultSetConcurrency, ::getCppuType(static_cast<sal_Int32*>(0)));
}
// -----------------------------------------------------------------------------
void ODatabaseMetaDataResultSet::setType(MetaDataResultSetType _eType)
diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx
index c064d69..02ae48c 100644
--- a/connectivity/source/commontools/dbexception.cxx
+++ b/connectivity/source/commontools/dbexception.cxx
@@ -128,7 +128,7 @@ const SQLExceptionInfo& SQLExceptionInfo::operator=(const ::com::sun::star::uno:
//------------------------------------------------------------------------------
SQLExceptionInfo::SQLExceptionInfo(const staruno::Any& _rError)
{
- const staruno::Type& aSQLExceptionType = ::getCppuType(reinterpret_cast< ::com::sun::star::sdbc::SQLException*>(NULL));
+ const staruno::Type& aSQLExceptionType = ::getCppuType(static_cast< ::com::sun::star::sdbc::SQLException*>(0));
sal_Bool bValid = isAssignableFrom(aSQLExceptionType, _rError.getValueType());
if (bValid)
m_aContent = _rError;
@@ -142,9 +142,9 @@ void SQLExceptionInfo::implDetermineType()
{
staruno::Type aContentType = m_aContent.getValueType();
- const Type& aSQLExceptionType = ::getCppuType( reinterpret_cast< SQLException* >( NULL ) );
- const Type& aSQLWarningType = ::getCppuType( reinterpret_cast< SQLWarning* >( NULL ) );
- const Type& aSQLContextType = ::getCppuType( reinterpret_cast< SQLContext* >( NULL ) );
+ const Type& aSQLExceptionType = ::getCppuType( static_cast< SQLException* >( 0 ) );
+ const Type& aSQLWarningType = ::getCppuType( static_cast< SQLWarning* >( 0 ) );
+ const Type& aSQLContextType = ::getCppuType( static_cast< SQLContext* >( 0 ) );
if ( isAssignableFrom( aSQLContextType, m_aContent.getValueType() ) )
m_eType = SQL_CONTEXT;
diff --git a/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx
index c377b04..7780447 100644
--- a/connectivity/source/drivers/ado/AColumn.cxx
+++ b/connectivity/source/drivers/ado/AColumn.cxx
@@ -108,7 +108,7 @@ void OAdoColumn::construct()
sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY;
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISASCENDING), PROPERTY_ID_ISASCENDING, nAttrib,&m_IsAscending, ::getBooleanCppuType());
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RELATEDCOLUMN), PROPERTY_ID_RELATEDCOLUMN, nAttrib,&m_ReferencedColumn, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RELATEDCOLUMN), PROPERTY_ID_RELATEDCOLUMN, nAttrib,&m_ReferencedColumn, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
}
// -----------------------------------------------------------------------------
void OAdoColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception)
diff --git a/connectivity/source/drivers/ado/AUser.cxx b/connectivity/source/drivers/ado/AUser.cxx
index 61d77af..b552920 100644
--- a/connectivity/source/drivers/ado/AUser.cxx
+++ b/connectivity/source/drivers/ado/AUser.cxx
@@ -136,7 +136,7 @@ OUserExtend::OUserExtend(OCatalog* _pParent,sal_Bool _bCase, const ::rtl::OUStri
void OUserExtend::construct()
{
OUser_TYPEDEF::construct();
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(static_cast< ::rtl::OUString*>(0)));
}
// -----------------------------------------------------------------------------
cppu::IPropertyArrayHelper* OUserExtend::createArrayHelper() const
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index 7dfe8e4..43c23e8 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -143,10 +143,10 @@ OResultSet::~OResultSet()
void OResultSet::construct()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen at sun.com", "OResultSet::construct" );
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, 0,&m_nFetchSize, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::READONLY,&m_nResultSetType, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, 0,&m_nFetchDirection, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY,PropertyAttribute::READONLY,&m_nResultSetConcurrency, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, 0,&m_nFetchSize, ::getCppuType(static_cast<sal_Int32*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::READONLY,&m_nResultSetType, ::getCppuType(static_cast<sal_Int32*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, 0,&m_nFetchDirection, ::getCppuType(static_cast<sal_Int32*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY,PropertyAttribute::READONLY,&m_nResultSetConcurrency, ::getCppuType(static_cast<sal_Int32*>(0)));
}
// -------------------------------------------------------------------------
void OResultSet::disposing(void)
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index 8581d04..5667260 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -81,16 +81,16 @@ OStatement_Base::OStatement_Base(OConnection* _pConnection )
sal_Int32 nAttrib = 0;
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), PROPERTY_ID_CURSORNAME, nAttrib,&m_aCursorName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXFIELDSIZE), PROPERTY_ID_MAXFIELDSIZE, nAttrib,&m_nMaxFieldSize, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXROWS), PROPERTY_ID_MAXROWS, nAttrib,&m_nMaxRows, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_QUERYTIMEOUT), PROPERTY_ID_QUERYTIMEOUT, nAttrib,&m_nQueryTimeOut, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, nAttrib,&m_nFetchSize, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, nAttrib,&m_nResultSetType, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, nAttrib,&m_nFetchDirection, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), PROPERTY_ID_CURSORNAME, nAttrib,&m_aCursorName, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXFIELDSIZE), PROPERTY_ID_MAXFIELDSIZE, nAttrib,&m_nMaxFieldSize, ::getCppuType(static_cast<sal_Int32*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXROWS), PROPERTY_ID_MAXROWS, nAttrib,&m_nMaxRows, ::getCppuType(static_cast<sal_Int32*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_QUERYTIMEOUT), PROPERTY_ID_QUERYTIMEOUT, nAttrib,&m_nQueryTimeOut, ::getCppuType(static_cast<sal_Int32*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, nAttrib,&m_nFetchSize, ::getCppuType(static_cast<sal_Int32*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, nAttrib,&m_nResultSetType, ::getCppuType(static_cast<sal_Int32*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, nAttrib,&m_nFetchDirection, ::getCppuType(static_cast<sal_Int32*>(0)));
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ESCAPEPROCESSING),PROPERTY_ID_ESCAPEPROCESSING, nAttrib,&m_bEscapeProcessing,::getCppuBooleanType());
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY, nAttrib,&m_nResultSetConcurrency, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY, nAttrib,&m_nResultSetConcurrency, ::getCppuType(static_cast<sal_Int32*>(0)));
}
// -----------------------------------------------------------------------------
OStatement_Base::~OStatement_Base()
diff --git a/connectivity/source/drivers/hsqldb/HUser.cxx b/connectivity/source/drivers/hsqldb/HUser.cxx
index 80a00d5..daa4a30 100644
--- a/connectivity/source/drivers/hsqldb/HUser.cxx
+++ b/connectivity/source/drivers/hsqldb/HUser.cxx
@@ -61,7 +61,7 @@ OUserExtend::OUserExtend( const ::com::sun::star::uno::Reference< ::com::sun::
// -------------------------------------------------------------------------
void OUserExtend::construct()
{
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(static_cast< ::rtl::OUString*>(0)));
}
// -----------------------------------------------------------------------------
cppu::IPropertyArrayHelper* OUserExtend::createArrayHelper() const
diff --git a/connectivity/source/drivers/mysql/YUser.cxx b/connectivity/source/drivers/mysql/YUser.cxx
index 42b2237..d184230 100644
--- a/connectivity/source/drivers/mysql/YUser.cxx
+++ b/connectivity/source/drivers/mysql/YUser.cxx
@@ -61,7 +61,7 @@ OUserExtend::OUserExtend( const ::com::sun::star::uno::Reference< ::com::sun::
// -------------------------------------------------------------------------
void OUserExtend::construct()
{
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(static_cast< ::rtl::OUString*>(0)));
}
// -----------------------------------------------------------------------------
cppu::IPropertyArrayHelper* OUserExtend::createArrayHelper() const
diff --git a/connectivity/source/inc/propertyids.hxx b/connectivity/source/inc/propertyids.hxx
index 8361f23..de5b4eb 100644
--- a/connectivity/source/inc/propertyids.hxx
+++ b/connectivity/source/inc/propertyids.hxx
@@ -66,7 +66,7 @@ namespace connectivity
//------------------------------------------------------------------------------
#define DECL_PROP1IMPL(varname, type) \
-pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_##varname), PROPERTY_ID_##varname, ::getCppuType(reinterpret_cast< type*>(NULL)),
+pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_##varname), PROPERTY_ID_##varname, ::getCppuType(static_cast< type*>(0)),
//------------------------------------------------------------------------------
#define DECL_PROP0(varname, type) \
DECL_PROP1IMPL(varname, type) 0)
diff --git a/connectivity/source/parse/PColumn.cxx b/connectivity/source/parse/PColumn.cxx
index aaa316b..f9523c9 100644
--- a/connectivity/source/parse/PColumn.cxx
+++ b/connectivity/source/parse/PColumn.cxx
@@ -167,13 +167,13 @@ OParseColumn::~OParseColumn()
// -------------------------------------------------------------------------
void OParseColumn::construct()
{
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION), PROPERTY_ID_FUNCTION, 0, &m_bFunction, ::getCppuType(reinterpret_cast< sal_Bool*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_AGGREGATEFUNCTION), PROPERTY_ID_AGGREGATEFUNCTION, 0, &m_bAggregateFunction, ::getCppuType(reinterpret_cast< sal_Bool*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TABLENAME), PROPERTY_ID_TABLENAME, 0, &m_aTableName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME), PROPERTY_ID_REALNAME, 0, &m_aRealName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DBASEPRECISIONCHANGED), PROPERTY_ID_DBASEPRECISIONCHANGED, 0, &m_bDbasePrecisionChanged, ::getCppuType(reinterpret_cast<sal_Bool*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISSEARCHABLE), PROPERTY_ID_ISSEARCHABLE, 0, &m_bIsSearchable, ::getCppuType(reinterpret_cast< sal_Bool*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_LABEL), PROPERTY_ID_LABEL, 0, &m_sLabel, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION), PROPERTY_ID_FUNCTION, 0, &m_bFunction, ::getCppuType(static_cast< sal_Bool*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_AGGREGATEFUNCTION), PROPERTY_ID_AGGREGATEFUNCTION, 0, &m_bAggregateFunction, ::getCppuType(static_cast< sal_Bool*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TABLENAME), PROPERTY_ID_TABLENAME, 0, &m_aTableName, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME), PROPERTY_ID_REALNAME, 0, &m_aRealName, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DBASEPRECISIONCHANGED), PROPERTY_ID_DBASEPRECISIONCHANGED, 0, &m_bDbasePrecisionChanged, ::getCppuType(static_cast<sal_Bool*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISSEARCHABLE), PROPERTY_ID_ISSEARCHABLE, 0, &m_bIsSearchable, ::getCppuType(static_cast< sal_Bool*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_LABEL), PROPERTY_ID_LABEL, 0, &m_sLabel, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
}
// -----------------------------------------------------------------------------
::cppu::IPropertyArrayHelper* OParseColumn::createArrayHelper() const
@@ -259,9 +259,9 @@ OOrderColumn::~OOrderColumn()
void OOrderColumn::construct()
{
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISASCENDING), PROPERTY_ID_ISASCENDING,
- PropertyAttribute::READONLY, const_cast< sal_Bool* >( &m_bAscending ), ::getCppuType( reinterpret_cast< sal_Bool* >( NULL ) ) );
+ PropertyAttribute::READONLY, const_cast< sal_Bool* >( &m_bAscending ), ::getCppuType( static_cast< sal_Bool* >( 0 ) ) );
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TABLENAME), PROPERTY_ID_TABLENAME,
- PropertyAttribute::READONLY, const_cast< ::rtl::OUString* >( &m_sTableName ), ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
+ PropertyAttribute::READONLY, const_cast< ::rtl::OUString* >( &m_sTableName ), ::getCppuType(static_cast< ::rtl::OUString*>(0)));
}
// -----------------------------------------------------------------------------
::cppu::IPropertyArrayHelper* OOrderColumn::createArrayHelper() const
diff --git a/connectivity/source/sdbcx/VCatalog.cxx b/connectivity/source/sdbcx/VCatalog.cxx
index c0b7283..cae74e2 100644
--- a/connectivity/source/sdbcx/VCatalog.cxx
+++ b/connectivity/source/sdbcx/VCatalog.cxx
@@ -220,7 +220,7 @@ void OCatalog::fillNames(Reference< XResultSet >& _xResult,TStringVector& _rName
void ODescriptor::construct()
{
sal_Int32 nAttrib = isNew() ? 0 : ::com::sun::star::beans::PropertyAttribute::READONLY;
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME), PROPERTY_ID_NAME ,nAttrib,&m_Name,::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME), PROPERTY_ID_NAME ,nAttrib,&m_Name,::getCppuType(static_cast< ::rtl::OUString*>(0)));
}
// -------------------------------------------------------------------------
ODescriptor::~ODescriptor()
diff --git a/connectivity/source/sdbcx/VColumn.cxx b/connectivity/source/sdbcx/VColumn.cxx
index 1c39f1d..f69cb5e 100644
--- a/connectivity/source/sdbcx/VColumn.cxx
+++ b/connectivity/source/sdbcx/VColumn.cxx
@@ -157,13 +157,13 @@ void OColumn::construct()
sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY;
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME), PROPERTY_ID_TYPENAME, nAttrib,&m_TypeName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION), PROPERTY_ID_DESCRIPTION, nAttrib,&m_Description, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE), PROPERTY_ID_DEFAULTVALUE, nAttrib,&m_DefaultValue, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION), PROPERTY_ID_PRECISION, nAttrib,&m_Precision, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE), PROPERTY_ID_TYPE, nAttrib,&m_Type, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE), PROPERTY_ID_SCALE, nAttrib,&m_Scale, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE), PROPERTY_ID_ISNULLABLE, nAttrib,&m_IsNullable, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME), PROPERTY_ID_TYPENAME, nAttrib,&m_TypeName, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION), PROPERTY_ID_DESCRIPTION, nAttrib,&m_Description, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE), PROPERTY_ID_DEFAULTVALUE, nAttrib,&m_DefaultValue, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION), PROPERTY_ID_PRECISION, nAttrib,&m_Precision, ::getCppuType(static_cast<sal_Int32*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE), PROPERTY_ID_TYPE, nAttrib,&m_Type, ::getCppuType(static_cast<sal_Int32*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE), PROPERTY_ID_SCALE, nAttrib,&m_Scale, ::getCppuType(static_cast<sal_Int32*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE), PROPERTY_ID_ISNULLABLE, nAttrib,&m_IsNullable, ::getCppuType(static_cast<sal_Int32*>(0)));
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT), PROPERTY_ID_ISAUTOINCREMENT, nAttrib,&m_IsAutoIncrement, ::getBooleanCppuType());
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISROWVERSION), PROPERTY_ID_ISROWVERSION, nAttrib,&m_IsRowVersion, ::getBooleanCppuType());
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY), PROPERTY_ID_ISCURRENCY, nAttrib,&m_IsCurrency, ::getBooleanCppuType());
diff --git a/connectivity/source/sdbcx/VIndex.cxx b/connectivity/source/sdbcx/VIndex.cxx
index 11ac577..253a939 100644
--- a/connectivity/source/sdbcx/VIndex.cxx
+++ b/connectivity/source/sdbcx/VIndex.cxx
@@ -133,7 +133,7 @@ void OIndex::construct()
sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY;
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOG), PROPERTY_ID_CATALOG, nAttrib,&m_Catalog, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOG), PROPERTY_ID_CATALOG, nAttrib,&m_Catalog, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISUNIQUE), PROPERTY_ID_ISUNIQUE, nAttrib,&m_IsUnique, ::getBooleanCppuType());
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISPRIMARYKEYINDEX),PROPERTY_ID_ISPRIMARYKEYINDEX, nAttrib,&m_IsPrimaryKeyIndex, ::getBooleanCppuType());
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCLUSTERED), PROPERTY_ID_ISCLUSTERED, nAttrib,&m_IsClustered, ::getBooleanCppuType());
diff --git a/connectivity/source/sdbcx/VKey.cxx b/connectivity/source/sdbcx/VKey.cxx
index b03fb9d..cc9b23b 100644
--- a/connectivity/source/sdbcx/VKey.cxx
+++ b/connectivity/source/sdbcx/VKey.cxx
@@ -128,10 +128,10 @@ void OKey::construct()
sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY;
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REFERENCEDTABLE), PROPERTY_ID_REFERENCEDTABLE, nAttrib,&m_aProps->m_ReferencedTable, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE), PROPERTY_ID_TYPE, nAttrib,&m_aProps->m_Type, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_UPDATERULE), PROPERTY_ID_UPDATERULE, nAttrib,&m_aProps->m_UpdateRule, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELETERULE), PROPERTY_ID_DELETERULE, nAttrib,&m_aProps->m_DeleteRule, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REFERENCEDTABLE), PROPERTY_ID_REFERENCEDTABLE, nAttrib,&m_aProps->m_ReferencedTable, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE), PROPERTY_ID_TYPE, nAttrib,&m_aProps->m_Type, ::getCppuType(static_cast<sal_Int32*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_UPDATERULE), PROPERTY_ID_UPDATERULE, nAttrib,&m_aProps->m_UpdateRule, ::getCppuType(static_cast<sal_Int32*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELETERULE), PROPERTY_ID_DELETERULE, nAttrib,&m_aProps->m_DeleteRule, ::getCppuType(static_cast<sal_Int32*>(0)));
}
// -------------------------------------------------------------------------
void SAL_CALL OKey::disposing()
diff --git a/connectivity/source/sdbcx/VKeyColumn.cxx b/connectivity/source/sdbcx/VKeyColumn.cxx
index 1a4c2d1..edb0522 100644
--- a/connectivity/source/sdbcx/VKeyColumn.cxx
+++ b/connectivity/source/sdbcx/VKeyColumn.cxx
@@ -106,7 +106,7 @@ OKeyColumn::~OKeyColumn()
void OKeyColumn::construct()
{
sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY;
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RELATEDCOLUMN), PROPERTY_ID_RELATEDCOLUMN, nAttrib,&m_ReferencedColumn, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RELATEDCOLUMN), PROPERTY_ID_RELATEDCOLUMN, nAttrib,&m_ReferencedColumn, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
}
// -----------------------------------------------------------------------------
diff --git a/connectivity/source/sdbcx/VTable.cxx b/connectivity/source/sdbcx/VTable.cxx
index e9f1836..53aad4a 100644
--- a/connectivity/source/sdbcx/VTable.cxx
+++ b/connectivity/source/sdbcx/VTable.cxx
@@ -112,10 +112,10 @@ void OTable::construct()
sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY;
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOGNAME), PROPERTY_ID_CATALOGNAME,nAttrib,&m_CatalogName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME), PROPERTY_ID_SCHEMANAME, nAttrib,&m_SchemaName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION), PROPERTY_ID_DESCRIPTION,nAttrib,&m_Description, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE), PROPERTY_ID_TYPE, nAttrib,&m_Type, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOGNAME), PROPERTY_ID_CATALOGNAME,nAttrib,&m_CatalogName, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME), PROPERTY_ID_SCHEMANAME, nAttrib,&m_SchemaName, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION), PROPERTY_ID_DESCRIPTION,nAttrib,&m_Description, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE), PROPERTY_ID_TYPE, nAttrib,&m_Type, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
}
// -----------------------------------------------------------------------------
void SAL_CALL OTable::acquire() throw()
diff --git a/connectivity/source/sdbcx/VView.cxx b/connectivity/source/sdbcx/VView.cxx
index 6829fef..903782f 100644
--- a/connectivity/source/sdbcx/VView.cxx
+++ b/connectivity/source/sdbcx/VView.cxx
@@ -69,10 +69,10 @@ void OView::construct()
sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY;
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOGNAME), PROPERTY_ID_CATALOGNAME,nAttrib,&m_CatalogName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME), PROPERTY_ID_SCHEMANAME, nAttrib,&m_SchemaName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_COMMAND), PROPERTY_ID_COMMAND, nAttrib,&m_Command, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CHECKOPTION), PROPERTY_ID_CHECKOPTION,nAttrib,&m_CheckOption, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOGNAME), PROPERTY_ID_CATALOGNAME,nAttrib,&m_CatalogName, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME), PROPERTY_ID_SCHEMANAME, nAttrib,&m_SchemaName, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_COMMAND), PROPERTY_ID_COMMAND, nAttrib,&m_Command, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CHECKOPTION), PROPERTY_ID_CHECKOPTION,nAttrib,&m_CheckOption, ::getCppuType(static_cast< sal_Int32*>(0)));
}
// -------------------------------------------------------------------------
void OView::disposing(void)
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index e5cf7fd..7b21b40 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -167,45 +167,45 @@ ORowSet::ORowSet( const Reference< ::com::sun::star::lang::XMultiServiceFactory
m_aPrematureParamValues.get().resize( 0 );
// sdb.RowSet Properties
- registerMayBeVoidProperty(PROPERTY_ACTIVE_CONNECTION,PROPERTY_ID_ACTIVE_CONNECTION, PropertyAttribute::MAYBEVOID|PropertyAttribute::TRANSIENT|PropertyAttribute::BOUND, &m_aActiveConnection, ::getCppuType(reinterpret_cast< Reference< XConnection >* >(NULL)));
- registerProperty(PROPERTY_DATASOURCENAME, PROPERTY_ID_DATASOURCENAME, PropertyAttribute::BOUND, &m_aDataSourceName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(PROPERTY_COMMAND, PROPERTY_ID_COMMAND, PropertyAttribute::BOUND, &m_aCommand, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(PROPERTY_COMMAND_TYPE, PROPERTY_ID_COMMAND_TYPE, PropertyAttribute::BOUND, &m_nCommandType, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
- registerProperty(PROPERTY_ACTIVECOMMAND, PROPERTY_ID_ACTIVECOMMAND, nRBT, &m_aActiveCommand, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
+ registerMayBeVoidProperty(PROPERTY_ACTIVE_CONNECTION,PROPERTY_ID_ACTIVE_CONNECTION, PropertyAttribute::MAYBEVOID|PropertyAttribute::TRANSIENT|PropertyAttribute::BOUND, &m_aActiveConnection, ::getCppuType(static_cast< Reference< XConnection >* >(0)));
+ registerProperty(PROPERTY_DATASOURCENAME, PROPERTY_ID_DATASOURCENAME, PropertyAttribute::BOUND, &m_aDataSourceName, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
+ registerProperty(PROPERTY_COMMAND, PROPERTY_ID_COMMAND, PropertyAttribute::BOUND, &m_aCommand, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
+ registerProperty(PROPERTY_COMMAND_TYPE, PROPERTY_ID_COMMAND_TYPE, PropertyAttribute::BOUND, &m_nCommandType, ::getCppuType(static_cast< sal_Int32*>(0)));
+ registerProperty(PROPERTY_ACTIVECOMMAND, PROPERTY_ID_ACTIVECOMMAND, nRBT, &m_aActiveCommand, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
registerProperty(PROPERTY_IGNORERESULT, PROPERTY_ID_IGNORERESULT, PropertyAttribute::BOUND, &m_bIgnoreResult, ::getBooleanCppuType());
- registerProperty(PROPERTY_FILTER, PROPERTY_ID_FILTER, PropertyAttribute::BOUND, &m_aFilter, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(PROPERTY_HAVING_CLAUSE, PROPERTY_ID_HAVING_CLAUSE, PropertyAttribute::BOUND, &m_aHavingClause, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(PROPERTY_GROUP_BY, PROPERTY_ID_GROUP_BY, PropertyAttribute::BOUND, &m_aGroupBy, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(PROPERTY_FILTER, PROPERTY_ID_FILTER, PropertyAttribute::BOUND, &m_aFilter, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
+ registerProperty(PROPERTY_HAVING_CLAUSE, PROPERTY_ID_HAVING_CLAUSE, PropertyAttribute::BOUND, &m_aHavingClause, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
+ registerProperty(PROPERTY_GROUP_BY, PROPERTY_ID_GROUP_BY, PropertyAttribute::BOUND, &m_aGroupBy, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
registerProperty(PROPERTY_APPLYFILTER, PROPERTY_ID_APPLYFILTER, PropertyAttribute::BOUND, &m_bApplyFilter, ::getBooleanCppuType());
- registerProperty(PROPERTY_ORDER, PROPERTY_ID_ORDER, PropertyAttribute::BOUND, &m_aOrder, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(PROPERTY_PRIVILEGES, PROPERTY_ID_PRIVILEGES, nRT, &m_nPrivileges, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
+ registerProperty(PROPERTY_ORDER, PROPERTY_ID_ORDER, PropertyAttribute::BOUND, &m_aOrder, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
+ registerProperty(PROPERTY_PRIVILEGES, PROPERTY_ID_PRIVILEGES, nRT, &m_nPrivileges, ::getCppuType(static_cast< sal_Int32*>(0)));
registerProperty(PROPERTY_ISMODIFIED, PROPERTY_ID_ISMODIFIED, nBT, &m_bModified, ::getBooleanCppuType());
registerProperty(PROPERTY_ISNEW, PROPERTY_ID_ISNEW, nRBT, &m_bNew, ::getBooleanCppuType());
- registerProperty(PROPERTY_SINGLESELECTQUERYCOMPOSER,PROPERTY_ID_SINGLESELECTQUERYCOMPOSER, nRT, &m_xComposer, ::getCppuType(reinterpret_cast< Reference< XSingleSelectQueryComposer >* >(NULL)));
+ registerProperty(PROPERTY_SINGLESELECTQUERYCOMPOSER,PROPERTY_ID_SINGLESELECTQUERYCOMPOSER, nRT, &m_xComposer, ::getCppuType(static_cast< Reference< XSingleSelectQueryComposer >* >(0)));
// sdbcx.ResultSet Properties
registerProperty(PROPERTY_ISBOOKMARKABLE, PROPERTY_ID_ISBOOKMARKABLE, nRT, &m_bIsBookmarkable, ::getBooleanCppuType());
registerProperty(PROPERTY_CANUPDATEINSERTEDROWS,PROPERTY_ID_CANUPDATEINSERTEDROWS, nRT, &m_bCanUpdateInsertedRows, ::getBooleanCppuType());
// sdbc.ResultSet Properties
- registerProperty(PROPERTY_RESULTSETCONCURRENCY, PROPERTY_ID_RESULTSETCONCURRENCY, PropertyAttribute::TRANSIENT, &m_nResultSetConcurrency,::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
- registerProperty(PROPERTY_RESULTSETTYPE, PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::TRANSIENT, &m_nResultSetType, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
- registerProperty(PROPERTY_FETCHDIRECTION, PROPERTY_ID_FETCHDIRECTION, PropertyAttribute::TRANSIENT, &m_nFetchDirection, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
- registerProperty(PROPERTY_FETCHSIZE, PROPERTY_ID_FETCHSIZE, PropertyAttribute::TRANSIENT, &m_nFetchSize, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
+ registerProperty(PROPERTY_RESULTSETCONCURRENCY, PROPERTY_ID_RESULTSETCONCURRENCY, PropertyAttribute::TRANSIENT, &m_nResultSetConcurrency,::getCppuType(static_cast< sal_Int32*>(0)));
+ registerProperty(PROPERTY_RESULTSETTYPE, PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::TRANSIENT, &m_nResultSetType, ::getCppuType(static_cast< sal_Int32*>(0)));
+ registerProperty(PROPERTY_FETCHDIRECTION, PROPERTY_ID_FETCHDIRECTION, PropertyAttribute::TRANSIENT, &m_nFetchDirection, ::getCppuType(static_cast< sal_Int32*>(0)));
+ registerProperty(PROPERTY_FETCHSIZE, PROPERTY_ID_FETCHSIZE, PropertyAttribute::TRANSIENT, &m_nFetchSize, ::getCppuType(static_cast< sal_Int32*>(0)));
// sdbc.RowSet Properties
- registerProperty(PROPERTY_URL, PROPERTY_ID_URL, 0, &m_aURL, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(PROPERTY_TRANSACTIONISOLATION, PROPERTY_ID_TRANSACTIONISOLATION, PropertyAttribute::TRANSIENT, &m_nTransactionIsolation,::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
- registerMayBeVoidProperty(PROPERTY_TYPEMAP, PROPERTY_ID_TYPEMAP, PropertyAttribute::MAYBEVOID|PropertyAttribute::TRANSIENT, &m_aTypeMap, ::getCppuType(reinterpret_cast< Reference< XNameAccess >* >(NULL)));
+ registerProperty(PROPERTY_URL, PROPERTY_ID_URL, 0, &m_aURL, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
+ registerProperty(PROPERTY_TRANSACTIONISOLATION, PROPERTY_ID_TRANSACTIONISOLATION, PropertyAttribute::TRANSIENT, &m_nTransactionIsolation,::getCppuType(static_cast< sal_Int32*>(0)));
+ registerMayBeVoidProperty(PROPERTY_TYPEMAP, PROPERTY_ID_TYPEMAP, PropertyAttribute::MAYBEVOID|PropertyAttribute::TRANSIENT, &m_aTypeMap, ::getCppuType(static_cast< Reference< XNameAccess >* >(0)));
registerProperty(PROPERTY_ESCAPE_PROCESSING,PROPERTY_ID_ESCAPE_PROCESSING, PropertyAttribute::BOUND, &m_bUseEscapeProcessing,::getBooleanCppuType() );
- registerProperty(PROPERTY_QUERYTIMEOUT, PROPERTY_ID_QUERYTIMEOUT, PropertyAttribute::TRANSIENT, &m_nQueryTimeOut, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
- registerProperty(PROPERTY_MAXFIELDSIZE, PROPERTY_ID_MAXFIELDSIZE, PropertyAttribute::TRANSIENT, &m_nMaxFieldSize, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
- registerProperty(PROPERTY_MAXROWS, PROPERTY_ID_MAXROWS, 0, &m_nMaxRows, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)) );
- registerProperty(PROPERTY_USER, PROPERTY_ID_USER, PropertyAttribute::TRANSIENT, &m_aUser, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(PROPERTY_PASSWORD, PROPERTY_ID_PASSWORD, PropertyAttribute::TRANSIENT, &m_aPassword, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(PROPERTY_QUERYTIMEOUT, PROPERTY_ID_QUERYTIMEOUT, PropertyAttribute::TRANSIENT, &m_nQueryTimeOut, ::getCppuType(static_cast< sal_Int32*>(0)));
+ registerProperty(PROPERTY_MAXFIELDSIZE, PROPERTY_ID_MAXFIELDSIZE, PropertyAttribute::TRANSIENT, &m_nMaxFieldSize, ::getCppuType(static_cast< sal_Int32*>(0)));
+ registerProperty(PROPERTY_MAXROWS, PROPERTY_ID_MAXROWS, 0, &m_nMaxRows, ::getCppuType(static_cast< sal_Int32*>(0)) );
+ registerProperty(PROPERTY_USER, PROPERTY_ID_USER, PropertyAttribute::TRANSIENT, &m_aUser, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
+ registerProperty(PROPERTY_PASSWORD, PROPERTY_ID_PASSWORD, PropertyAttribute::TRANSIENT, &m_aPassword, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
- registerProperty(PROPERTY_UPDATE_CATALOGNAME, PROPERTY_ID_UPDATE_CATALOGNAME, PropertyAttribute::BOUND, &m_aUpdateCatalogName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(PROPERTY_UPDATE_SCHEMANAME, PROPERTY_ID_UPDATE_SCHEMANAME, PropertyAttribute::BOUND, &m_aUpdateSchemaName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(PROPERTY_UPDATE_TABLENAME, PROPERTY_ID_UPDATE_TABLENAME, PropertyAttribute::BOUND, &m_aUpdateTableName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(PROPERTY_UPDATE_CATALOGNAME, PROPERTY_ID_UPDATE_CATALOGNAME, PropertyAttribute::BOUND, &m_aUpdateCatalogName, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
+ registerProperty(PROPERTY_UPDATE_SCHEMANAME, PROPERTY_ID_UPDATE_SCHEMANAME, PropertyAttribute::BOUND, &m_aUpdateSchemaName, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
+ registerProperty(PROPERTY_UPDATE_TABLENAME, PROPERTY_ID_UPDATE_TABLENAME, PropertyAttribute::BOUND, &m_aUpdateTableName, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
// ???
registerProperty(PROPERTY_CHANGE_NOTIFICATION_ENABLED, PROPERTY_ID_PROPCHANGE_NOTIFY, PropertyAttribute::BOUND, &m_bPropChangeNotifyEnabled, ::getBooleanCppuType());
@@ -2795,11 +2795,11 @@ ORowSetClone::ORowSetClone( const ::comphelper::ComponentContext& _rContext, ORo
sal_Int32 nRT = PropertyAttribute::READONLY | PropertyAttribute::TRANSIENT;
// sdb.RowSet Properties
- registerMayBeVoidProperty(PROPERTY_ACTIVE_CONNECTION,PROPERTY_ID_ACTIVE_CONNECTION, PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, &rParent.m_aActiveConnection, ::getCppuType(reinterpret_cast< Reference< XConnection >* >(NULL)));
- registerProperty(PROPERTY_RESULTSETCONCURRENCY, PROPERTY_ID_RESULTSETCONCURRENCY, PropertyAttribute::READONLY, &m_nResultSetConcurrency,::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
- registerProperty(PROPERTY_RESULTSETTYPE, PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::READONLY, &m_nResultSetType, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
- registerProperty(PROPERTY_FETCHDIRECTION, PROPERTY_ID_FETCHDIRECTION, PropertyAttribute::TRANSIENT, &m_nFetchDirection, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
- registerProperty(PROPERTY_FETCHSIZE, PROPERTY_ID_FETCHSIZE, PropertyAttribute::TRANSIENT, &m_nFetchSize, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
+ registerMayBeVoidProperty(PROPERTY_ACTIVE_CONNECTION,PROPERTY_ID_ACTIVE_CONNECTION, PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, &rParent.m_aActiveConnection, ::getCppuType(static_cast< Reference< XConnection >* >(0)));
+ registerProperty(PROPERTY_RESULTSETCONCURRENCY, PROPERTY_ID_RESULTSETCONCURRENCY, PropertyAttribute::READONLY, &m_nResultSetConcurrency,::getCppuType(static_cast< sal_Int32*>(0)));
+ registerProperty(PROPERTY_RESULTSETTYPE, PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::READONLY, &m_nResultSetType, ::getCppuType(static_cast< sal_Int32*>(0)));
+ registerProperty(PROPERTY_FETCHDIRECTION, PROPERTY_ID_FETCHDIRECTION, PropertyAttribute::TRANSIENT, &m_nFetchDirection, ::getCppuType(static_cast< sal_Int32*>(0)));
+ registerProperty(PROPERTY_FETCHSIZE, PROPERTY_ID_FETCHSIZE, PropertyAttribute::TRANSIENT, &m_nFetchSize, ::getCppuType(static_cast< sal_Int32*>(0)));
registerProperty(PROPERTY_ISBOOKMARKABLE, PROPERTY_ID_ISBOOKMARKABLE, nRT, &m_bIsBookmarkable, ::getBooleanCppuType());
}
diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx
index c065325..1b24b96 100644
--- a/dbaccess/source/core/api/TableDeco.cxx
+++ b/dbaccess/source/core/api/TableDeco.cxx
@@ -162,7 +162,7 @@ sal_Bool SAL_CALL ODBTableDecorator::convertFastPropertyValue(
{
Any aValue;
getFastPropertyValue(aValue,nHandle);
- bRet = ::comphelper::tryPropertyValue(rConvertedValue,rOldValue,rValue,aValue,::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
+ bRet = ::comphelper::tryPropertyValue(rConvertedValue,rOldValue,rValue,aValue,::getCppuType(static_cast< ::rtl::OUString*>(0)));
}
break; // we assume that it works
}
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 082fae1..a77df93 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -579,7 +579,7 @@ Sequence< Type > SAL_CALL SbaXGridPeer::getTypes() throw (RuntimeException)
Sequence< Type > aTypes = FmXGridPeer::getTypes();
sal_Int32 nOldLen = aTypes.getLength();
aTypes.realloc(nOldLen + 1);
- aTypes.getArray()[nOldLen] = ::getCppuType( reinterpret_cast< Reference< ::com::sun::star::frame::XDispatch >* >(NULL) );
+ aTypes.getArray()[nOldLen] = ::getCppuType( static_cast< Reference< ::com::sun::star::frame::XDispatch >* >(0) );
return aTypes;
}
diff --git a/extensions/source/resource/ResourceIndexAccess.cxx b/extensions/source/resource/ResourceIndexAccess.cxx
index 7b99e83..66c263d 100644
--- a/extensions/source/resource/ResourceIndexAccess.cxx
+++ b/extensions/source/resource/ResourceIndexAccess.cxx
@@ -94,7 +94,7 @@ namespace
virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
// XElementAccessBase
virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException)
- { return ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)); };
+ { return ::getCppuType(static_cast< ::rtl::OUString*>(0)); };
};
class ResourceStringListIndexAccess : public ResourceIndexAccessBase
@@ -106,7 +106,7 @@ namespace
virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
// XElementAccessBase
virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException)
- { return ::getCppuType(reinterpret_cast<Sequence<PropertyValue> * >(NULL)); };
+ { return ::getCppuType(static_cast<Sequence<PropertyValue> * >(0)); };
};
}
diff --git a/extensions/source/resource/ResourceIndexAccess.hxx b/extensions/source/resource/ResourceIndexAccess.hxx
index e5675ab..036c03f 100644
--- a/extensions/source/resource/ResourceIndexAccess.hxx
+++ b/extensions/source/resource/ResourceIndexAccess.hxx
@@ -58,7 +58,7 @@ namespace extensions { namespace resource
virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
// XElementAccess
virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException)
- { return ::getCppuType(reinterpret_cast< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>*>(NULL)); };
+ { return ::getCppuType(static_cast< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>*>(0)); };
virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException)
{ return static_cast<bool>(m_pResMgr.get()); };
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index c080548..a8a3717 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -225,7 +225,7 @@ void OComboBoxModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const
switch (_nHandle)
{
case PROPERTY_ID_LISTSOURCETYPE :
- DBG_ASSERT(_rValue.getValueType().equals(::getCppuType(reinterpret_cast<ListSourceType*>(NULL))),
+ DBG_ASSERT(_rValue.getValueType().equals(::getCppuType(static_cast<ListSourceType*>(0))),
"OComboBoxModel::setFastPropertyValue_NoBroadcast : invalid type !" );
_rValue >>= m_eListSourceType;
break;
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index 495df87..21a54fd 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -302,7 +302,7 @@ namespace frm
break;
case PROPERTY_ID_LISTSOURCETYPE :
- DBG_ASSERT(_rValue.getValueType().equals(::getCppuType(reinterpret_cast<ListSourceType*>(NULL))),
+ DBG_ASSERT(_rValue.getValueType().equals(::getCppuType(static_cast<ListSourceType*>(0))),
"OComboBoxModel::setFastPropertyValue_NoBroadcast : invalid type !" );
_rValue >>= m_eListSourceType;
break;
@@ -341,7 +341,7 @@ namespace frm
throw PropertyVetoException();
case PROPERTY_ID_DEFAULT_SELECT_SEQ :
- DBG_ASSERT(_rValue.getValueType().equals(::getCppuType(reinterpret_cast< Sequence<sal_Int16>*>(NULL))),
+ DBG_ASSERT(_rValue.getValueType().equals(::getCppuType(static_cast< Sequence<sal_Int16>*>(0))),
"OListBoxModel::setFastPropertyValue_NoBroadcast : invalid type !" );
_rValue >>= m_aDefaultSelectSeq;
@@ -376,7 +376,7 @@ namespace frm
switch (_nHandle)
{
case PROPERTY_ID_BOUNDCOLUMN :
- bModified = tryPropertyValue(_rConvertedValue, _rOldValue, _rValue, m_aBoundColumn, ::getCppuType(reinterpret_cast<sal_Int16*>(NULL)));
+ bModified = tryPropertyValue(_rConvertedValue, _rOldValue, _rValue, m_aBoundColumn, ::getCppuType(static_cast<sal_Int16*>(0)));
break;
case PROPERTY_ID_LISTSOURCETYPE:
diff --git a/forms/source/inc/property.hxx b/forms/source/inc/property.hxx
index 81102c6..025cc8d 100644
--- a/forms/source/inc/property.hxx
+++ b/forms/source/inc/property.hxx
@@ -113,7 +113,7 @@ public:
//------------------------------------------------------------------------------
#define DECL_PROP_IMPL(varname, type) \
- *pProperties++ = com::sun::star::beans::Property(PROPERTY_##varname, PROPERTY_ID_##varname, ::getCppuType(reinterpret_cast< type* >(NULL)),
+ *pProperties++ = com::sun::star::beans::Property(PROPERTY_##varname, PROPERTY_ID_##varname, ::getCppuType(static_cast< type* >(0)),
//------------------------------------------------------------------------------
#define DECL_BOOL_PROP_IMPL(varname) \
@@ -121,7 +121,7 @@ public:
//------------------------------------------------------------------------------
#define DECL_IFACE_PROP_IMPL(varname, type) \
- *pProperties++ = com::sun::star::beans::Property(PROPERTY_##varname, PROPERTY_ID_##varname, ::getCppuType(reinterpret_cast< com::sun::star::uno::Reference< type >* >(NULL)),
+ *pProperties++ = com::sun::star::beans::Property(PROPERTY_##varname, PROPERTY_ID_##varname, ::getCppuType(static_cast< com::sun::star::uno::Reference< type >* >(0)),
//------------------------------------------------------------------------------
#define BEGIN_DESCRIBE_PROPERTIES( count, baseclass ) \
diff --git a/mysqlc/source/mysqlc_propertyids.hxx b/mysqlc/source/mysqlc_propertyids.hxx
index 4f88b0c..3118813 100644
--- a/mysqlc/source/mysqlc_propertyids.hxx
+++ b/mysqlc/source/mysqlc_propertyids.hxx
@@ -136,7 +136,7 @@ enum
//------------------------------------------------------------------------------
#define DECL_PROP1IMPL(varname, type) \
-pProperties[nPos++] = Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_##varname), PROPERTY_ID_##varname, ::getCppuType(reinterpret_cast< type*>(NULL)),
+pProperties[nPos++] = Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_##varname), PROPERTY_ID_##varname, ::getCppuType(static_cast< type*>(0)),
//------------------------------------------------------------------------------
#define DECL_PROP0(varname, type) \
DECL_PROP1IMPL(varname, type) 0)
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 1218bb4..ea1d04c 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -324,7 +324,7 @@ OReportController::OReportController(Reference< XComponentContext > const & xCon
m_sMode = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("normal"));
DBG_CTOR( rpt_OReportController,NULL);
- registerProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ZoomValue")),PROPERTY_ID_ZOOMVALUE,beans::PropertyAttribute::BOUND| beans::PropertyAttribute::TRANSIENT,&m_nZoomValue,::getCppuType(reinterpret_cast< sal_Int16*>(NULL)));
+ registerProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ZoomValue")),PROPERTY_ID_ZOOMVALUE,beans::PropertyAttribute::BOUND| beans::PropertyAttribute::TRANSIENT,&m_nZoomValue,::getCppuType(static_cast< sal_Int16*>(0)));
}
// -----------------------------------------------------------------------------
commit 9272ce4e6f54bc283bbbe6106f66fd48c4ce8d82
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Aug 13 14:57:39 2012 +0200
-Werror,-Wunused-private-field (Clang towards 3.2)
Change-Id: I40354853ad44024c342babd3b706ce305a059ff4
diff --git a/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx b/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx
index 59cef1c..c0546e4 100644
--- a/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx
+++ b/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx
@@ -61,30 +61,9 @@ namespace xmlsearch {
static RoleFiller roleFiller_;
sal_uInt32 m_nRefcount;
- sal_uInt8 fixedRole_;
- sal_Int16 filled_;
- sal_Int32 begin_,end_,parentContext_,limit_;
- RoleFiller* next_;
std::vector< RoleFiller* > fillers_;
};
-
-
- class GeneratorHeap
- {
- public:
-
- GeneratorHeap()
- : heapSize_( 0 ),
- free_( 0 )
- { }
- private:
-
- sal_Int32 heapSize_,free_;
- };
-
-
-
}
}
diff --git a/xmlhelp/source/cxxhelp/inc/qe/Query.hxx b/xmlhelp/source/cxxhelp/inc/qe/Query.hxx
index 9a3eb48..b34fa76 100644
--- a/xmlhelp/source/cxxhelp/inc/qe/Query.hxx
+++ b/xmlhelp/source/cxxhelp/inc/qe/Query.hxx
@@ -121,10 +121,9 @@ namespace xmlsearch {
{
public:
- QueryHitData( double penalty,const rtl::OUString& document,sal_Int32 termsL, rtl::OUString* terms )
+ QueryHitData( double penalty,const rtl::OUString& document, rtl::OUString* terms )
: penalty_( penalty ),
document_( document ),
- termsL_( termsL ),
terms_( terms ) { }
~QueryHitData() { delete[] terms_; }
@@ -140,7 +139,6 @@ namespace xmlsearch {
const rtl::OUString document_;
- sal_Int32 termsL_;
rtl::OUString* terms_;
}; // end class QueryHitData
diff --git a/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx b/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx
index 94b1ce8..44da18d 100644
--- a/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx
+++ b/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx
@@ -42,8 +42,7 @@ namespace xmlsearch {
public:
Decompressor()
- : toRead_( 0 ),
- path_( 0 )
+ : toRead_( 0 )
{
}
@@ -61,7 +60,7 @@ namespace xmlsearch {
static const sal_Int32 BitsInByte;
static const sal_Int32 NBits;
- sal_Int32 readByte_, toRead_, path_;
+ sal_Int32 toRead_;
};
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index 69f02c1..ba26e5f 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -146,7 +146,6 @@ Databases::Databases( sal_Bool showBasic,
Reference< uno::XComponentContext > xContext )
: m_xContext( xContext ),
m_bShowBasic(showBasic),
- m_nErrorDocLength( 0 ),
m_pErrorDoc( 0 ),
m_nCustomCSSDocLength( 0 ),
m_pCustomCSSDoc( 0 ),
@@ -782,7 +781,6 @@ void KeywordInfo::KeywordElement::init( Databases *pDatabases,Db* pDb,const rtl:
listAnchor.realloc( id.size() );
listTitle.realloc( id.size() );
- int nSize = 0;
Dbt data;
DBData aDBData;
const sal_Char* pData = NULL;
@@ -793,7 +791,6 @@ void KeywordInfo::KeywordElement::init( Databases *pDatabases,Db* pDb,const rtl:
listId[i] = id[i];
listAnchor[i] = anchor[i];
- nSize = 0;
pData = pEmpty;
if( pDb )
{
@@ -804,7 +801,6 @@ void KeywordInfo::KeywordElement::init( Databases *pDatabases,Db* pDb,const rtl:
bool bSuccess = pDBHelp->getValueForKey( idi, aDBData );
if( bSuccess )
{
- nSize = aDBData.getSize();
pData = aDBData.getData();
}
}
@@ -813,12 +809,11 @@ void KeywordInfo::KeywordElement::init( Databases *pDatabases,Db* pDb,const rtl:
Dbt key_( static_cast< void* >( const_cast< sal_Char* >( idi.getStr() ) ),
idi.getLength() );
pDb->get( 0,&key_,&data,0 );
- nSize = data.get_size();
pData = static_cast<sal_Char*>( data.get_data() );
}
}
- DbtToStringConverter converter( pData, nSize );
+ DbtToStringConverter converter( pData );
rtl::OUString title = converter.getTitle();
pDatabases->replaceName( title );
diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx
index f315328..2398960 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.hxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.hxx
@@ -296,7 +296,6 @@ namespace chelp {
com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess2 > m_xSFA;
sal_Bool m_bShowBasic;
- int m_nErrorDocLength;
char* m_pErrorDoc;
int m_nCustomCSSDocLength;
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
index 240edff..cd361c8 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
@@ -90,7 +90,6 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF
URLParameter& aURLParameter,
Databases* pDatabases )
: ResultSetBase( xMSF,xProvider,nOpenMode,seq,seqSort ),
- m_pDatabases( pDatabases ),
m_aURLParameter( aURLParameter )
{
Reference< XTransliteration > xTrans(
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx
index c24ba8d..8f7d7f3 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx
@@ -47,7 +47,6 @@ namespace chelp {
private:
- Databases* m_pDatabases;
URLParameter m_aURLParameter;
};
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
index 2060c3d..39c7281 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
@@ -290,7 +290,6 @@ void URLParameter::readBerkeley()
DataBaseIterator aDbIt( *m_pDatabases, aModule, aLanguage, false );
bool bSuccess = false;
- int nSize = 0;
const sal_Char* pData = NULL;
Dbt data;
@@ -311,7 +310,6 @@ void URLParameter::readBerkeley()
bSuccess = pDBHelp->getValueForKey( keyStr, aDBData );
if( bSuccess )
{
- nSize = aDBData.getSize();
pData = aDBData.getData();
break;
}
@@ -324,7 +322,6 @@ void URLParameter::readBerkeley()
if( err == 0 )
{
bSuccess = true;
- nSize = data.get_size();
pData = static_cast<sal_Char*>( data.get_data() );
break;
}
@@ -333,7 +330,7 @@ void URLParameter::readBerkeley()
if( bSuccess )
{
- DbtToStringConverter converter( pData, nSize );
+ DbtToStringConverter converter( pData );
m_aTitle = converter.getTitle();
m_pDatabases->replaceName( m_aTitle );
m_aPath = converter.getFile();
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
index 63b8dd8..775e833 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
@@ -48,9 +48,8 @@ namespace chelp {
{
public:
- DbtToStringConverter( const sal_Char* ptr,sal_Int32 len )
- : m_len( len ),
- m_ptr( ptr )
+ DbtToStringConverter( const sal_Char* ptr )
+ : m_ptr( ptr )
{
}
@@ -109,8 +108,6 @@ namespace chelp {
private:
- sal_Int32 m_len;
-
const sal_Char* m_ptr;
};
diff --git a/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx b/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx
index ebbc457..e64ddc7 100644
--- a/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx
+++ b/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx
@@ -33,13 +33,6 @@ RoleFiller RoleFiller::roleFiller_;
RoleFiller::RoleFiller()
: m_nRefcount( 0 ),
- fixedRole_( 0 ),
- filled_( 0 ),
- begin_( 0 ),
- end_( 0 ),
- parentContext_( 0 ),
- limit_( 0 ),
- next_( 0 ),
fillers_( 0 )
{
}
commit 0e10d1627dbe41e67a159bc32c8e3c385093d172
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Aug 13 14:49:08 2012 +0200
-Werror,-Wunused-private-field (Clang towards 3.2)
Change-Id: Id5343222eea264c956ed0a6b545c59125352e110
diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx
index 98667f5..e81f3ad 100644
--- a/unotools/source/config/moduleoptions.cxx
+++ b/unotools/source/config/moduleoptions.cxx
@@ -322,7 +322,7 @@ class SvtModuleOptions_Impl : public ::utl::ConfigItem
//---------------------------------------------------------------------------------------------------------
// constructor / destructor
//---------------------------------------------------------------------------------------------------------
- SvtModuleOptions_Impl(SvtModuleOptions* pOutsideClass);
+ SvtModuleOptions_Impl();
~SvtModuleOptions_Impl();
//---------------------------------------------------------------------------------------------------------
@@ -369,7 +369,6 @@ class SvtModuleOptions_Impl : public ::utl::ConfigItem
private:
FactoryInfoList m_lFactories;
sal_Bool m_bReadOnlyStatesWellKnown;
- SvtModuleOptions* m_pOutsideClass;
};
/*-************************************************************************************************************//**
@@ -386,10 +385,9 @@ class SvtModuleOptions_Impl : public ::utl::ConfigItem
@onerror -
@threadsafe no
*//*-*************************************************************************************************************/
-SvtModuleOptions_Impl::SvtModuleOptions_Impl(SvtModuleOptions* pOutsideClass)
+SvtModuleOptions_Impl::SvtModuleOptions_Impl()
: ::utl::ConfigItem( ROOTNODE_FACTORIES )
, m_bReadOnlyStatesWellKnown( sal_False )
- , m_pOutsideClass( pOutsideClass )
{
// First initialize list of factory infos! Otherwise we couldnt gurantee right working of these class.
for( sal_Int32 nFactory=0; nFactory<FACTORYCOUNT; ++nFactory )
@@ -1021,7 +1019,7 @@ SvtModuleOptions::SvtModuleOptions()
if( m_nRefCount == 1 )
{
RTL_LOGFILE_CONTEXT(aLog, "unotools ( ??? ) ::SvtModuleOptions_Impl::ctor()");
- m_pDataContainer = new SvtModuleOptions_Impl(this);
+ m_pDataContainer = new SvtModuleOptions_Impl();
ItemHolder1::holdConfigItem(E_MODULEOPTIONS);
}
diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx
index 004b9e3..d790d48 100644
--- a/unotools/source/config/syslocaleoptions.cxx
+++ b/unotools/source/config/syslocaleoptions.cxx
@@ -77,7 +77,6 @@ class SvtSysLocaleOptions_Impl : public utl::ConfigItem
OUString m_aLocaleString; // en-US or de-DE or empty for SYSTEM
OUString m_aUILocaleString; // en-US or de-DE or empty for SYSTEM
OUString m_aCurrencyString; // USD-en-US or EUR-de-DE
- sal_uLong m_nBlockedHint; // pending hints
sal_Bool m_bDecimalSeparator; //use decimal separator same as locale
sal_Bool m_bROLocale;
@@ -150,7 +149,6 @@ const Sequence< OUString > SvtSysLocaleOptions_Impl::GetPropertyNames()
SvtSysLocaleOptions_Impl::SvtSysLocaleOptions_Impl()
: ConfigItem( ROOTNODE_SYSLOCALE )
- , m_nBlockedHint( 0 )
, m_bDecimalSeparator( sal_True )
, m_bROLocale(CFG_READONLY_DEFAULT)
, m_bROUILocale(CFG_READONLY_DEFAULT)
commit 8074622112f7b3889d74a633846e914b86fb27c5
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Aug 13 14:44:06 2012 +0200
-Werror,-Wunused-private-field (Clang towards 3.2)
Change-Id: Icf1c673acb703e6518f4d65994b76c6374c16f1e
diff --git a/rsc/inc/rscpar.hxx b/rsc/inc/rscpar.hxx
index 1f0c77d..0833e22 100644
--- a/rsc/inc/rscpar.hxx
+++ b/rsc/inc/rscpar.hxx
@@ -32,7 +32,6 @@ class RscFileInst
ERRTYPE aFirstError;// Erster Fehler
sal_uInt32 nErrorLine; // Zeile des ersten Fehlers
sal_uInt32 nErrorPos; // Position des ersten Fehlers
- sal_Bool bIncLine; // Muss Zeilennummer incrementiert werden
sal_uInt32 nLineNo; // Zeile in der Eingabedatei
sal_uLong lFileIndex; // Index auf Eingabedatei
sal_uLong lSrcIndex; // Index auf Basisdatei
commit 5df29c9fdc4123b37d5264d9cf1409a4ea136a63
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Aug 13 14:43:52 2012 +0200
-Werror,-Wunused-private-field (Clang towards 3.2)
Change-Id: I1f9341d1b70b9b996f3b344433e949647e12edf6
diff --git a/hwpfilter/source/hwpfile.h b/hwpfilter/source/hwpfile.h
index 5540975..d6f9738 100644
--- a/hwpfilter/source/hwpfile.h
+++ b/hwpfilter/source/hwpfile.h
@@ -267,7 +267,6 @@ class DLLEXPORT HWPFile
private:
/* hwp ÆÄÀÏ À̸§ */
- char fname[256];
int m_nCurrentPage;
int m_nMaxSettedPage;
HIODev *hiodev;
commit 8aca4d43cc117d8b02d53e8a2849e80350d92737
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Aug 13 14:13:21 2012 +0200
-Werror,-Wunused-private-field (Clang towards 3.2)
Change-Id: I28dba7f4c7310da931831319aa33a3a67c845381
diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx
index 04606b0..abcbffa 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -324,7 +324,6 @@ private:
Mutex aMutex;
HashSet_Ref aImplementationMap;
HashSet_Ref::iterator aIt;
- sal_Int32 nNext;
Reference<XInterface > xNext;
};
commit cbe5a8c85868be56ab1fac5534b105692789b9d8
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Aug 13 13:17:14 2012 +0200
-Werror,-Wunused-private-field (Clang towards 3.2)
Change-Id: I213bc96fd6c9049c0dba0a527e827ae5d8f0ace3
diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx
index 98637f2..3ade1e7 100644
--- a/comphelper/source/eventattachermgr/eventattachermgr.cxx
+++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx
@@ -157,7 +157,6 @@ class AttacherAllListener_Impl : public WeakImplHelper1< XAllListener >
Reference< XEventAttacherManager > xManager;
OUString aScriptType;
OUString aScriptCode;
- sal_Int16 nVersion;
void convertToEventReturn( Any & rRet, const Type & rRetType )
throw( CannotConvertException );
@@ -184,7 +183,6 @@ AttacherAllListener_Impl::AttacherAllListener_Impl
, xManager( pManager_ )
, aScriptType( rScriptType_ )
, aScriptCode( rScriptCode_ )
- , nVersion( 2 )
{
}
diff --git a/comphelper/source/misc/accessiblecontexthelper.cxx b/comphelper/source/misc/accessiblecontexthelper.cxx
index dbe5d1e..4841020 100644
--- a/comphelper/source/misc/accessiblecontexthelper.cxx
+++ b/comphelper/source/misc/accessiblecontexthelper.cxx
@@ -43,10 +43,8 @@ namespace comphelper
class OContextHelper_Impl
{
private:
- OAccessibleContextHelper* m_pAntiImpl; // the owning instance
IMutex* m_pExternalLock; // the optional additional external lock
- ::cppu::OInterfaceContainerHelper* m_pEventListeners;
WeakReference< XAccessible > m_aCreator; // the XAccessible which created our XAccessibleContext
AccessibleEventNotifier::TClientId m_nClientId;
@@ -64,10 +62,8 @@ namespace comphelper
{ m_nClientId = _nId; }
public:
- OContextHelper_Impl( OAccessibleContextHelper* _pAntiImpl )
- :m_pAntiImpl( _pAntiImpl )
- ,m_pExternalLock( NULL )
- ,m_pEventListeners( NULL )
+ OContextHelper_Impl()
+ :m_pExternalLock( NULL )
,m_nClientId( 0 )
{
}
@@ -87,7 +83,7 @@ namespace comphelper
:OAccessibleContextHelper_Base( GetMutex() )
,m_pImpl( NULL )
{
- m_pImpl = new OContextHelper_Impl( this );
+ m_pImpl = new OContextHelper_Impl();
}
//---------------------------------------------------------------------
@@ -95,7 +91,7 @@ namespace comphelper
:OAccessibleContextHelper_Base( GetMutex() )
,m_pImpl( NULL )
{
- m_pImpl = new OContextHelper_Impl( this );
+ m_pImpl = new OContextHelper_Impl();
m_pImpl->setExternalLock( _pExternalLock );
}
commit 31c52706fcb73c4f088ade5b949035c53e6d36f0
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Aug 13 12:46:28 2012 +0200
-Werror,-Wunused-private-field (Clang towards 3.2)
Change-Id: I4b541b2a0de4fd395a613a47c9a3868199f42513
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 7e6a912..a1c66e3 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -435,7 +435,6 @@ public:
class MergeDataFile
{
private:
- sal_Bool bErrorLog;
rtl::OString sErrorLog;
MergeDataHashMap aMap;
std::set<rtl::OString> aLanguageSet;
@@ -448,7 +447,7 @@ class MergeDataFile
const rtl::OString &sFilename, bool bCaseSensitive);
public:
explicit MergeDataFile(const rtl::OString &rFileName,
- const rtl::OString& rFile, bool bErrLog, bool bCaseSensitive = false);
+ const rtl::OString& rFile, bool bCaseSensitive);
~MergeDataFile();
@@ -497,7 +496,6 @@ private:
Export& aExport;
bool bStart;
- bool bStartNext;
inline void Pop( std::queue<QueueEntry>& aQueue );
diff --git a/l10ntools/inc/helpmerge.hxx b/l10ntools/inc/helpmerge.hxx
index 3311e47..bc2a6af 100644
--- a/l10ntools/inc/helpmerge.hxx
+++ b/l10ntools/inc/helpmerge.hxx
@@ -40,8 +40,6 @@ class HelpParser
{
private:
rtl::OString sHelpFile;
- bool bUTF8;
- bool bHasInputList;
#if OSL_DEBUG_LEVEL > 2
/// Debugmethod, prints the content of the map to stdout
@@ -52,7 +50,7 @@ private:
#endif
public:
- HelpParser( const rtl::OString &rHelpFile, bool bUTF8 , bool bHasInputList );
+ HelpParser( const rtl::OString &rHelpFile );
~HelpParser(){};
/// Method creates/append a SDF file with the content of a parsed XML file
diff --git a/l10ntools/inc/l10ntools/HelpLinker.hxx b/l10ntools/inc/l10ntools/HelpLinker.hxx
index b718623..4befcd4 100644
--- a/l10ntools/inc/l10ntools/HelpLinker.hxx
+++ b/l10ntools/inc/l10ntools/HelpLinker.hxx
@@ -68,14 +68,12 @@ public:
throw( HelpProcessingException );
HelpLinker()
- : init(true)
- , m_pIndexerPreProcessor(NULL)
+ : m_pIndexerPreProcessor(NULL)
{}
~HelpLinker()
{ delete m_pIndexerPreProcessor; }
private:
- int locCount, totCount;
Stringtable additionalFiles;
HashSet helpFiles;
fs::path sourceRoot;
@@ -93,7 +91,6 @@ private:
bool bExtensionMode;
fs::path indexDirName;
fs::path indexDirParentName;
- bool init;
IndexerPreProcessor* m_pIndexerPreProcessor;
void initIndexerPreProcessor();
void link() throw( HelpProcessingException );
diff --git a/l10ntools/inc/lngmerge.hxx b/l10ntools/inc/lngmerge.hxx
index 9649c34..dd9cbf6 100644
--- a/l10ntools/inc/lngmerge.hxx
+++ b/l10ntools/inc/lngmerge.hxx
@@ -50,9 +50,7 @@ private:
sal_uInt16 nError;
LngLineList *pLines;
rtl::OString sSource;
- sal_Bool bDBIsUTF8;
sal_Bool bULF;
- bool bQuiet;
std::vector<rtl::OString> aLanguages;
bool isNextGroup(rtl::OString &sGroup_out, rtl::OString &sLine_in);
@@ -62,7 +60,7 @@ private:
const rtl::OString &rPrj, const rtl::OString &rRoot,
const rtl::OString &rActFileName, const rtl::OString &rID);
public:
- LngParser(const rtl::OString &rLngFile, sal_Bool bUTF8,
+ LngParser(const rtl::OString &rLngFile,
sal_Bool bULFFormat);
~LngParser();
diff --git a/l10ntools/inc/xrmmerge.hxx b/l10ntools/inc/xrmmerge.hxx
index d4232c5..b80d37a 100644
--- a/l10ntools/inc/xrmmerge.hxx
+++ b/l10ntools/inc/xrmmerge.hxx
@@ -43,8 +43,6 @@ private:
sal_Bool bError;
sal_Bool bText;
- bool sLocalized;
-
rtl::OString sCurrentOpenTag;
rtl::OString sCurrentCloseTag;
rtl::OString sCurrentText;
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index 92427af..cca19c9 100644
--- a/l10ntools/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.cxx
@@ -48,7 +48,6 @@ namespace {
namespace global {
bool mergeMode = false;
-bool errorLog = true;
char const * prj = 0;
char const * prjRoot = 0;
char const * inputPathname = 0;
@@ -61,7 +60,7 @@ boost::scoped_ptr< CfgParser > parser;
void handleArguments(int argc, char ** argv) {
for (int i = 1; i != argc; ++i) {
if (std::strcmp(argv[i], "-e") == 0) {
- global::errorLog = false;
+ // ignored, used to be "Disable writing errorlog"
} else if (std::strcmp(argv[i], "-i") == 0) {
if (++i == argc) {
global::inputPathname = 0; // no valid command line
@@ -114,7 +113,7 @@ void handleArguments(int argc, char ** argv) {
" FileIn: Source files (*.src)\n"
" FileOut: Destination file (*.*)\n"
" DataBase: Mergedata (*.sdf)\n"
- " -e: Disable writing errorlog\n"
+ " -e: ignored\n"
" -l: Restrict the handled languages; l1, l2, ... are elements of"
" (de, en-US, ...)\n"));
std::exit(EXIT_FAILURE);
@@ -547,7 +546,7 @@ CfgMerge::CfgMerge(
if (rMergeSource.getLength())
{
pMergeDataFile = new MergeDataFile(
- rMergeSource, global::inputPathname, global::errorLog, true );
+ rMergeSource, global::inputPathname, true );
if (Export::sLanguages.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("ALL")))
{
Export::SetLanguages( pMergeDataFile->GetLanguages() );
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index fc6f5bc..9cc3a56 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -52,7 +52,6 @@ MergeDataFile * pMergeDataFile = 0; //TODO
namespace global {
bool mergeMode = false;
-bool errorLog = true;
char const * prj = 0;
char const * prjRoot = 0;
char const * inputPathname = 0;
@@ -65,7 +64,7 @@ boost::scoped_ptr< Export > exporter;
void handleArguments(int argc, char ** argv) {
for (int i = 1; i != argc; ++i) {
if (std::strcmp(argv[i], "-e") == 0) {
- global::errorLog = false;
+ // ingored, used to be "Disable writing errorlog"
} else if (std::strcmp(argv[i], "-i") == 0) {
if (++i == argc) {
global::inputPathname = 0; // no valid command line
@@ -118,7 +117,7 @@ void handleArguments(int argc, char ** argv) {
" FileIn: Source files (*.src)\n"
" FileOut: Destination file (*.*)\n"
" DataBase: Mergedata (*.sdf)\n"
- " -e: Disable writing errorlog\n"
+ " -e: ignored\n"
" -l: Restrict the handled languages; l1, l2, ... are elements of"
" (de, en-US, ...)\n"));
std::exit(EXIT_FAILURE);
@@ -321,7 +320,7 @@ Export::~Export()
if ( bMergeMode ) {
if ( !pMergeDataFile )
- pMergeDataFile = new MergeDataFile(sMergeSrc, global::inputPathname, global::errorLog);
+ pMergeDataFile = new MergeDataFile(sMergeSrc, global::inputPathname, false);
delete pMergeDataFile;
}
@@ -1588,7 +1587,7 @@ sal_Bool Export::PrepareTextToMerge(rtl::OString &rText, sal_uInt16 nTyp,
// search for merge data
if ( !pMergeDataFile ){
- pMergeDataFile = new MergeDataFile( sMergeSrc, global::inputPathname, global::errorLog );
+ pMergeDataFile = new MergeDataFile( sMergeSrc, global::inputPathname, false );
// Init Languages
if( Export::sLanguages.equalsIgnoreAsciiCase("ALL") )
@@ -1689,7 +1688,7 @@ void Export::MergeRest( ResData *pResData, sal_uInt16 nMode )
/*****************************************************************************/
{
if ( !pMergeDataFile ){
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list