[Libreoffice-commits] core.git: 12 commits - basic/source boost/boost.wdeprecated-register.patch.0 boost/UnpackedTarball_boost.mk config_host.mk.in cui/source filter/source i18npool/source idl/source include/svx nss/nss.wheader-guard.patch.0 nss/UnpackedTarball_nss.mk oox/source scaddins/source sc/source sfx2/inc sfx2/source starmath/inc svl/source svtools/source sw/inc sw/source ucb/source unoxml/source vcl/generic writerfilter/source
Stephan Bergmann
sbergman at redhat.com
Mon Jul 8 08:39:50 PDT 2013
basic/source/sbx/sbxscan.cxx | 4 -
boost/UnpackedTarball_boost.mk | 1
boost/boost.wdeprecated-register.patch.0 | 36 +++++++++++++++
config_host.mk.in | 1
cui/source/inc/cuires.hrc | 2
filter/source/graphicfilter/ipbm/ipbm.cxx | 6 +-
filter/source/graphicfilter/ipcd/ipcd.cxx | 2
filter/source/graphicfilter/ipcx/ipcx.cxx | 2
filter/source/graphicfilter/iras/iras.cxx | 2
filter/source/graphicfilter/itga/itga.cxx | 2
filter/source/svg/tokenmap.cxx | 11 ++++
i18npool/source/search/levdis.cxx | 4 -
i18npool/source/search/textsearch.cxx | 4 -
idl/source/objects/types.cxx | 2
include/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx | 2
nss/UnpackedTarball_nss.mk | 1
nss/nss.wheader-guard.patch.0 | 11 ++++
oox/source/ppt/animvariantcontext.hxx | 2
oox/source/token/tokenmap.cxx | 11 ++++
sc/source/core/tool/compiler.cxx | 2
sc/source/core/tool/interpr1.cxx | 6 +-
sc/source/core/tool/interpr2.cxx | 2
sc/source/core/tool/token.cxx | 2
sc/source/filter/excel/fontbuff.cxx | 4 -
sc/source/filter/excel/namebuff.cxx | 4 -
sc/source/filter/ftools/ftools.cxx | 6 +-
sc/source/filter/lotus/tool.cxx | 4 -
sc/source/ui/app/inputhdl.cxx | 2
sc/source/ui/unoobj/scdetect.cxx | 2
sc/source/ui/vba/vbaaxis.hxx | 2
scaddins/source/analysis/analysishelper.cxx | 2
sfx2/inc/bluthsndapi.hxx | 6 +-
sfx2/source/appl/sfxhelp.cxx | 4 -
starmath/inc/smcommands.h | 4 -
svl/source/inc/fsfactory.hxx | 4 -
svtools/source/dialogs/mcvmath.cxx | 6 +-
svtools/source/misc/sampletext.cxx | 2
svtools/source/svhtml/parhtml.cxx | 6 +-
svtools/source/svrtf/parrtf.cxx | 4 -
sw/inc/unotbl.hxx | 2
sw/inc/viewsh.hxx | 2
sw/source/core/inc/frame.hxx | 2
sw/source/core/inc/frmtool.hxx | 2
sw/source/core/unocore/unotbl.cxx | 2
sw/source/core/view/vprint.cxx | 2
ucb/source/ucp/webdav-neon/LinkSequence.hxx | 2
unoxml/source/dom/saxbuilder.cxx | 6 +-
vcl/generic/fontmanager/parseAFM.cxx | 11 ++++
writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx | 12 +++++
49 files changed, 157 insertions(+), 66 deletions(-)
New commits:
commit 39f42b0b03489459540404dd218c38709853c021
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Jul 8 16:54:27 2013 +0200
error: friend declaration specifying a default argument must be a definition
...(Clang trunk towards 3.4); this appears to be specific to C++11, which added at
the end of 8.3.6/4 [dcl.fct.default]: "If a friend declaration specifies a default
argument expression, that declaration shall be a definition and shall be the only
declaration of the function or function template in the translation unit."
Change-Id: I750c60a2206d7af41322ebb31aa6deca2491067f
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index a8cc7b9..38aa412 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -71,7 +71,7 @@ class SwXCell : public SwXCellBaseClass,
public SwClient
{
friend void sw_setString( SwXCell &rCell, const OUString &rTxt,
- sal_Bool bKeepNumberFmt = sal_False );
+ sal_Bool bKeepNumberFmt );
friend double sw_getValue( SwXCell &rCell );
friend void sw_setValue( SwXCell &rCell, double nVal );
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 72d7c48..92c5f0e 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -109,7 +109,7 @@ class SW_DLLPUBLIC ViewShell : public Ring
// Set SwVisArea in order to enable clean formatting before printing.
- friend void SetSwVisArea( ViewShell *pSh, const SwRect &, sal_Bool bPDFExport = sal_False );
+ friend void SetSwVisArea( ViewShell *pSh, const SwRect & );
static BitmapEx* mpReplaceBmp; ///< replaced display of still loaded images
static BitmapEx* mpErrorBmp; ///< error display of missed images
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index f93ae67..eeb84d8 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -234,7 +234,7 @@ class SwFrm: public SwClient, public SfxBroadcaster
friend class SwLooping;
// voids lower during creation of a column
- friend SwFrm *SaveCntnt( SwLayoutFrm *, SwFrm* pStart = NULL );
+ friend SwFrm *SaveCntnt( SwLayoutFrm *, SwFrm* pStart );
friend void RestoreCntnt( SwFrm *, SwLayoutFrm *, SwFrm *pSibling, bool bGrow );
#ifdef DBG_UTIL
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index fc2e763..45b63bf 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -70,7 +70,7 @@ SwFlyFrm *GetFlyFromMarked( const SdrMarkList *pLst, ViewShell *pSh );
sal_uLong SqRt( BigInt nX );
-SwFrm *SaveCntnt( SwLayoutFrm *pLay, SwFrm *pStart );
+SwFrm *SaveCntnt( SwLayoutFrm *pLay, SwFrm *pStart = NULL );
void RestoreCntnt( SwFrm *pSav, SwLayoutFrm *pParent, SwFrm *pSibling, bool bGrow );
// Get CntntNodes, create CntntFrms, and add them to LayFrm.
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 8110f66..a4ff255 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -692,7 +692,7 @@ static inline OUString lcl_getString( SwXCell &rCell )
/* non UNO function call to set string in SwXCell */
void sw_setString( SwXCell &rCell, const OUString &rTxt,
- sal_Bool bKeepNumberFmt )
+ sal_Bool bKeepNumberFmt = sal_False )
{
if(rCell.IsValid())
{
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index 6cea260..6f5f8ce8 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -172,7 +172,7 @@ void SwPaintQueue::Remove( ViewShell *pSh )
}
}
-void SetSwVisArea( ViewShell *pSh, const SwRect &rRect, sal_Bool /*bPDFExport*/ )
+void SetSwVisArea( ViewShell *pSh, const SwRect &rRect )
{
OSL_ENSURE( !pSh->GetWin(), "Drucken mit Window?" );
pSh->maVisArea = rRect;
commit b63524d269a792e20777a91e4ed7e8ceae7ff55f
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Jul 8 13:40:12 2013 +0200
error: comparison between pointer and integer (Clang trunk towards 3.4)
...the check in itga.cxx was useless anyway, as new[] does not return null.
Change-Id: I4de5a46e14a83ab134d0a098a62748e909dc9c00
diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx b/filter/source/graphicfilter/ipbm/ipbm.cxx
index 5ca1c7b..6bf0324 100644
--- a/filter/source/graphicfilter/ipbm/ipbm.cxx
+++ b/filter/source/graphicfilter/ipbm/ipbm.cxx
@@ -102,7 +102,7 @@ sal_Bool PBMReader::ReadPBM(Graphic & rGraphic )
{
case 0 :
maBmp = Bitmap( Size( mnWidth, mnHeight ), 1 );
- if ( ( mpAcc = maBmp.AcquireWriteAccess() ) == sal_False )
+ if ( ( mpAcc = maBmp.AcquireWriteAccess() ) == 0 )
return sal_False;
mpAcc->SetPaletteEntryCount( 2 );
mpAcc->SetPaletteColor( 0, BitmapColor( 0xff, 0xff, 0xff ) );
@@ -117,7 +117,7 @@ sal_Bool PBMReader::ReadPBM(Graphic & rGraphic )
else
maBmp = Bitmap( Size( mnWidth, mnHeight ), 8);
- if ( ( mpAcc = maBmp.AcquireWriteAccess() ) == sal_False )
+ if ( ( mpAcc = maBmp.AcquireWriteAccess() ) == 0 )
return sal_False;
mnCol = (sal_uInt16)mnMaxVal + 1;
if ( mnCol > 256 )
@@ -132,7 +132,7 @@ sal_Bool PBMReader::ReadPBM(Graphic & rGraphic )
break;
case 2 :
maBmp = Bitmap( Size( mnWidth, mnHeight ), 24 );
- if ( ( mpAcc = maBmp.AcquireWriteAccess() ) == sal_False )
+ if ( ( mpAcc = maBmp.AcquireWriteAccess() ) == 0 )
return sal_False;
break;
}
diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx
index d9f249b..26cc4c2 100644
--- a/filter/source/graphicfilter/ipcd/ipcd.cxx
+++ b/filter/source/graphicfilter/ipcd/ipcd.cxx
@@ -151,7 +151,7 @@ sal_Bool PCDReader::ReadPCD( Graphic & rGraphic, FilterConfigItem* pConfigItem )
nBMPHeight = nWidth;
}
aBmp = Bitmap( Size( nBMPWidth, nBMPHeight ), 24 );
- if ( ( mpAcc = aBmp.AcquireWriteAccess() ) == sal_False )
+ if ( ( mpAcc = aBmp.AcquireWriteAccess() ) == 0 )
return sal_False;
ReadImage( 5 ,65 );
diff --git a/filter/source/graphicfilter/ipcx/ipcx.cxx b/filter/source/graphicfilter/ipcx/ipcx.cxx
index c45f98c..397b4ce 100644
--- a/filter/source/graphicfilter/ipcx/ipcx.cxx
+++ b/filter/source/graphicfilter/ipcx/ipcx.cxx
@@ -100,7 +100,7 @@ sal_Bool PCXReader::ReadPCX(Graphic & rGraphic)
if ( nStatus )
{
aBmp = Bitmap( Size( nWidth, nHeight ), nDestBitsPerPixel );
- if ( ( pAcc = aBmp.AcquireWriteAccess() ) == sal_False )
+ if ( ( pAcc = aBmp.AcquireWriteAccess() ) == 0 )
return sal_False;
if ( nDestBitsPerPixel <= 8 )
diff --git a/filter/source/graphicfilter/iras/iras.cxx b/filter/source/graphicfilter/iras/iras.cxx
index 36241e5..87b9258 100644
--- a/filter/source/graphicfilter/iras/iras.cxx
+++ b/filter/source/graphicfilter/iras/iras.cxx
@@ -98,7 +98,7 @@ sal_Bool RASReader::ReadRAS(Graphic & rGraphic)
return sal_False;
maBmp = Bitmap( Size( mnWidth, mnHeight ), mnDstBitsPerPix );
- if ( ( mpAcc = maBmp.AcquireWriteAccess() ) == sal_False )
+ if ( ( mpAcc = maBmp.AcquireWriteAccess() ) == 0 )
return sal_False;
if ( mnDstBitsPerPix <= 8 ) // paletten bildchen
diff --git a/filter/source/graphicfilter/itga/itga.cxx b/filter/source/graphicfilter/itga/itga.cxx
index e3967e9..e27d2ae 100644
--- a/filter/source/graphicfilter/itga/itga.cxx
+++ b/filter/source/graphicfilter/itga/itga.cxx
@@ -732,8 +732,6 @@ sal_Bool TGAReader::ImplReadPalette()
mpFileHeader->nColorMapEntrySize = 0x3f; // patch for the following switch routine
}
mpColorMap = new sal_uInt32[ nColors ]; // we will always index dwords
- if ( mpColorMap == sal_False )
- return sal_False; // out of memory %&!$&/!"�$
switch( mpFileHeader->nColorMapEntrySize )
{
commit 3aa8917d448a90bb5d4a4913f2d92c0d5a6681b6
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Jul 8 15:37:02 2013 +0200
-Werror,-Wheader-guard (Clang trunk towards 3.4)
...in external nss header; an alternative could be to use -isystem instead of -I
in gb_LinkTarget__use_nss3.
Change-Id: I399e6990dd0110e0e16baea0d20a16050acfdeb1
diff --git a/nss/UnpackedTarball_nss.mk b/nss/UnpackedTarball_nss.mk
index 683b468..ea7ca1c 100644
--- a/nss/UnpackedTarball_nss.mk
+++ b/nss/UnpackedTarball_nss.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
$(if $(filter WNTGCC,$(OS)$(COM)),nss/nspr-4.9-build.patch.3 \
nss/nss-3.13.3-build.patch.3 \
nss/nss.mingw.patch.3) \
+ nss/nss.wheader-guard.patch.0 \
))
# vim: set noet sw=4 ts=4:
diff --git a/nss/nss.wheader-guard.patch.0 b/nss/nss.wheader-guard.patch.0
new file mode 100644
index 0000000..a5d4060
--- /dev/null
+++ b/nss/nss.wheader-guard.patch.0
@@ -0,0 +1,11 @@
+--- mozilla/security/nss/lib/pk11wrap/secmod.h
++++ mozilla/security/nss/lib/pk11wrap/secmod.h
+@@ -34,7 +34,7 @@
+ *
+ * ***** END LICENSE BLOCK ***** */
+ #ifndef _SECMOD_H_
+-#define _SEDMOD_H_
++#define _SECMOD_H_
+ #include "seccomon.h"
+ #include "secmodt.h"
+ #include "prinrval.h"
commit 35acb8a54171eb14555632179e69cbb9cf28f9e8
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Jul 8 11:52:53 2013 +0200
-Werror,-Wheader-guard (Clang trunk towards 3.4)
Change-Id: I6da069a27d569e4b28c0a8fe783616c767c108d0
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index bdb022d..16b6ce5 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -18,7 +18,7 @@
*/
#ifndef _CUI_RESID_HRC
-#define _CUI_REDID_HRC
+#define _CUI_RESID_HRC
#include <sfx2/sfx.hrc>
#include <sfx2/dialogs.hrc>
diff --git a/include/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx
index e1405b1..29afa51 100644
--- a/include/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx
+++ b/include/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SDR_PRIMITIVE2D_SdrOleContentPrimitive2D_HXX
+#ifndef INCLUDED_SDR_PRIMITIVE2D_SDROLECONTENTPRIMITIVE2D_HXX
#define INCLUDED_SDR_PRIMITIVE2D_SDROLECONTENTPRIMITIVE2D_HXX
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
diff --git a/oox/source/ppt/animvariantcontext.hxx b/oox/source/ppt/animvariantcontext.hxx
index 2795633..4a1e70f 100644
--- a/oox/source/ppt/animvariantcontext.hxx
+++ b/oox/source/ppt/animvariantcontext.hxx
@@ -20,7 +20,7 @@
#ifndef OOX_PPT_ANIMVARIANTCONTEXT
-#define OOX_PPT_ANIMVERIANTCONTEXT
+#define OOX_PPT_ANIMVARIANTCONTEXT
#include <com/sun/star/uno/Any.hxx>
diff --git a/sc/source/ui/vba/vbaaxis.hxx b/sc/source/ui/vba/vbaaxis.hxx
index 028d82c..9f081b6 100644
--- a/sc/source/ui/vba/vbaaxis.hxx
+++ b/sc/source/ui/vba/vbaaxis.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef SC_VBA_AXIS_HXX
-#define SC_VBA_AXOS_HXX
+#define SC_VBA_AXIS_HXX
#include <com/sun/star/beans/XPropertySet.hpp>
#include <ooo/vba/excel/XAxis.hpp>
#include <ooo/vba/excel/XChart.hpp>
diff --git a/sfx2/inc/bluthsndapi.hxx b/sfx2/inc/bluthsndapi.hxx
index 84d0288..202c579 100644
--- a/sfx2/inc/bluthsndapi.hxx
+++ b/sfx2/inc/bluthsndapi.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_SFX_BLUETOOTHL_HXX
-#define INCLUDED_SFX_BLUETOOTH_HXX
+#ifndef INCLUDED_SFX_BLUTHSNDAPI_HXX
+#define INCLUDED_SFX_BLUTHSNDAPI_HXX
#include <vector>
#include <com/sun/star/frame/XFrame.hpp>
@@ -29,6 +29,6 @@ public:
SendMailResult Send( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame );
};
-#endif // INCLUDED_SFX_BLUETOOTH_HXX
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/smcommands.h b/starmath/inc/smcommands.h
index 8ab9610..a0fd020 100644
--- a/starmath/inc/smcommands.h
+++ b/starmath/inc/smcommands.h
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SM_SNCOMMANDS_HRC
-#define SM_SMCOMMANDS_HRC
+#ifndef SM_SMCOMMANDS_H
+#define SM_SMCOMMANDS_H
#define CMD_SID_ADJUST ".uno:Adjust"
#define CMD_SID_ALIGN ".uno:ChangeAlignment"
diff --git a/svl/source/inc/fsfactory.hxx b/svl/source/inc/fsfactory.hxx
index 4e5294a..09b1989 100644
--- a/svl/source/inc/fsfactory.hxx
+++ b/svl/source/inc/fsfactory.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __FSFACTORY_HXX_
-#define __FSACTORY_HXX_
+#ifndef INCLUDED_SVL_SOURCE_INC_FSFACTORY_HXX
+#define INCLUDED_SVL_SOURCE_INC_FSFACTORY_HXX
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/ucb/source/ucp/webdav-neon/LinkSequence.hxx b/ucb/source/ucp/webdav-neon/LinkSequence.hxx
index ceec0f3..e270936 100644
--- a/ucb/source/ucp/webdav-neon/LinkSequence.hxx
+++ b/ucb/source/ucp/webdav-neon/LinkSequence.hxx
@@ -27,7 +27,7 @@
************************************************************************/
#ifndef _LINKSEQUENCE_HXX_
-#define _LINKKSEQUENCE_HXX_
+#define _LINKSEQUENCE_HXX_
#include <rtl/string.hxx>
#include <com/sun/star/uno/Sequence.hxx>
commit 9e31cf2ae6b085259e664fa90f052b09815b4c18
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Jul 8 12:16:12 2013 +0200
-Werror,-Wdeprecated-register (Clang trunk towards 3.4)
...in files generated by gperf; an alternative could be to use -isystem instead
of -I in gb_Library_use_custom_headers.
Change-Id: I316684ab5342977655a5642903b13e127adaf95c
diff --git a/filter/source/svg/tokenmap.cxx b/filter/source/svg/tokenmap.cxx
index 2c9132f..05fefc0 100644
--- a/filter/source/svg/tokenmap.cxx
+++ b/filter/source/svg/tokenmap.cxx
@@ -23,7 +23,18 @@
namespace svgi
{
+#if defined __clang__
+#if __has_warning("-Wdeprecated-register")
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-register"
+#endif
+#endif
#include "tokens.cxx"
+#if defined __clang__
+#if __has_warning("-Wdeprecated-register")
+#pragma GCC diagnostic pop
+#endif
+#endif
sal_Int32 getTokenId( const char* sIdent, sal_Int32 nLen )
{
diff --git a/oox/source/token/tokenmap.cxx b/oox/source/token/tokenmap.cxx
index bd2657c..5460b7c 100644
--- a/oox/source/token/tokenmap.cxx
+++ b/oox/source/token/tokenmap.cxx
@@ -32,7 +32,18 @@ using ::com::sun::star::uno::Sequence;
namespace {
// include auto-generated Perfect_Hash
+#if defined __clang__
+#if __has_warning("-Wdeprecated-register")
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-register"
+#endif
+#endif
#include "tokenhash.inc"
+#if defined __clang__
+#if __has_warning("-Wdeprecated-register")
+#pragma GCC diagnostic pop
+#endif
+#endif
} // namespace
// ============================================================================
diff --git a/vcl/generic/fontmanager/parseAFM.cxx b/vcl/generic/fontmanager/parseAFM.cxx
index af444db..0f29586 100644
--- a/vcl/generic/fontmanager/parseAFM.cxx
+++ b/vcl/generic/fontmanager/parseAFM.cxx
@@ -329,7 +329,18 @@ static char *linetoken( FileInputStream* stream )
*
* The algorithm is a standard Knuth binary search.
*/
+#if defined __clang__
+#if __has_warning("-Wdeprecated-register")
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-register"
+#endif
+#endif
#include "afm_hash.hpp"
+#if defined __clang__
+#if __has_warning("-Wdeprecated-register")
+#pragma GCC diagnostic pop
+#endif
+#endif
static inline enum parseKey recognize( char* ident, int len)
{
diff --git a/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx b/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx
index 3dbf308..096de7f 100644
--- a/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx
@@ -21,7 +21,19 @@
#include <string.h>
#include <ooxml/resourceids.hxx>
#include "OOXMLFastTokenHandler.hxx"
+
+#if defined __clang__
+#if __has_warning("-Wdeprecated-register")
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-register"
+#endif
+#endif
#include "gperffasttoken.hxx"
+#if defined __clang__
+#if __has_warning("-Wdeprecated-register")
+#pragma GCC diagnostic pop
+#endif
+#endif
namespace writerfilter {
namespace ooxml
commit bebfef0110a2776326d6e9293ef06b5bd56452ae
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Jul 8 15:07:04 2013 +0200
-Werror,-Wdeprecated-register (Clang trunk towards 3.4)
...in external Boost header; an alternative for all the warning patches in
boost/ could be to use -isystem instead of -I in
gb_LinkTarget__use_boost_headers.
Change-Id: Idc515acea9b90e87a92627c89e4363537e9336a7
diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk
index 36b8285..3f78005 100644
--- a/boost/UnpackedTarball_boost.mk
+++ b/boost/UnpackedTarball_boost.mk
@@ -45,6 +45,7 @@ boost_patches += boost.wundef.patch
boost_patches += boost.wunused.patch
boost_patches += boost.wshadow.patch
boost_patches += boost.wconstexpr-not-const.patch.0
+boost_patches += boost.wdeprecated-register.patch.0
$(eval $(call gb_UnpackedTarball_UnpackedTarball,boost))
diff --git a/boost/boost.wdeprecated-register.patch.0 b/boost/boost.wdeprecated-register.patch.0
new file mode 100644
index 0000000..d11de3a
--- /dev/null
+++ b/boost/boost.wdeprecated-register.patch.0
@@ -0,0 +1,36 @@
+--- boost/math/special_functions/detail/lanczos_sse2.hpp
++++ boost/math/special_functions/detail/lanczos_sse2.hpp
+@@ -51,11 +51,11 @@
+ static_cast<double>(23531376880.41075968857200767445163675473L),
+ static_cast<double>(0u)
+ };
+- register __m128d vx = _mm_load1_pd(&x);
+- register __m128d sum_even = _mm_load_pd(coeff);
+- register __m128d sum_odd = _mm_load_pd(coeff+2);
+- register __m128d nc_odd, nc_even;
+- register __m128d vx2 = _mm_mul_pd(vx, vx);
++ __m128d vx = _mm_load1_pd(&x);
++ __m128d sum_even = _mm_load_pd(coeff);
++ __m128d sum_odd = _mm_load_pd(coeff+2);
++ __m128d nc_odd, nc_even;
++ __m128d vx2 = _mm_mul_pd(vx, vx);
+
+ sum_even = _mm_mul_pd(sum_even, vx2);
+ nc_even = _mm_load_pd(coeff + 4);
+@@ -136,11 +136,11 @@
+ static_cast<double>(56906521.91347156388090791033559122686859L),
+ static_cast<double>(0u)
+ };
+- register __m128d vx = _mm_load1_pd(&x);
+- register __m128d sum_even = _mm_load_pd(coeff);
+- register __m128d sum_odd = _mm_load_pd(coeff+2);
+- register __m128d nc_odd, nc_even;
+- register __m128d vx2 = _mm_mul_pd(vx, vx);
++ __m128d vx = _mm_load1_pd(&x);
++ __m128d sum_even = _mm_load_pd(coeff);
++ __m128d sum_odd = _mm_load_pd(coeff+2);
++ __m128d nc_odd, nc_even;
++ __m128d vx2 = _mm_mul_pd(vx, vx);
+
+ sum_even = _mm_mul_pd(sum_even, vx2);
+ nc_even = _mm_load_pd(coeff + 4);
commit abba78f6447070643e683da95f9e2c466533aab9
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Jul 8 11:49:12 2013 +0200
-Werror,-Wdeprecated-register (Clang trunk towards 3.4)
Change-Id: I64e4933f7a0a8026ccc7ce98804bfc497d3f0eed
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index c136e95..157407e 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -313,7 +313,7 @@ static void myftoa( double nNum, char * pBuf, short nPrec, short nExpWidth,
short nExp = 0;
short nDig = nPrec + 1;
short nDec; // number of positions before decimal point
- register int i;
+ int i;
sal_Unicode cDecimalSep, cThousandSep;
ImpGetIntntlSep( cDecimalSep, cThousandSep );
@@ -362,7 +362,7 @@ static void myftoa( double nNum, char * pBuf, short nPrec, short nExpWidth,
// output number
if( nDig > 0 )
{
- register int digit;
+ int digit;
for( i = 0 ; ; ++i )
{
if( i < 16 )
diff --git a/i18npool/source/search/levdis.cxx b/i18npool/source/search/levdis.cxx
index eaba9fd..53dfc2f 100644
--- a/i18npool/source/search/levdis.cxx
+++ b/i18npool/source/search/levdis.cxx
@@ -80,7 +80,7 @@
{ \
if ( jj != ii ) \
{ \
- register sal_Int32 k; \
+ sal_Int32 k; \
if ( jj > 0 ) \
for ( k=0; k < jj; k++ ) \
if ( cpPattern[k] == c ) \
@@ -223,7 +223,7 @@ int WLevDistance::WLD( const sal_Unicode* cString, sal_Int32 nStringLen )
nSPMin = npDistance[0];
int nReplacePos = -1; // tristate Flag
// fuer jede Patternspalte den String durchgehen
- for ( register sal_Int32 i=1; i <= nStringLen; i++ )
+ for ( sal_Int32 i=1; i <= nStringLen; i++ )
{
d1 = d2; // WLD( X(i-1), Y(j-1) )
d2 = npDistance[i]; // WLD( X(i) , Y(j-1) )
diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx
index 7762832..6953377 100644
--- a/i18npool/source/search/textsearch.cxx
+++ b/i18npool/source/search/textsearch.cxx
@@ -908,7 +908,7 @@ SearchResult TextSearch::ApproxSrchFrwrd( const OUString& searchStr,
OUString aWTemp( searchStr );
- register sal_Int32 nStt, nEnd;
+ sal_Int32 nStt, nEnd;
Boundary aWBnd = xBreak->getWordBoundary( aWTemp, startPos,
aSrchPara.Locale,
@@ -955,7 +955,7 @@ SearchResult TextSearch::ApproxSrchBkwrd( const OUString& searchStr,
OUString aWTemp( searchStr );
- register sal_Int32 nStt, nEnd;
+ sal_Int32 nStt, nEnd;
Boundary aWBnd = xBreak->getWordBoundary( aWTemp, startPos,
aSrchPara.Locale,
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 9b4c4d1..442d995 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -2603,7 +2603,7 @@ bool ScCompiler::IsValue( const String& rSym )
bool ScCompiler::IsString()
{
- register const sal_Unicode* p = cSymbol;
+ const sal_Unicode* p = cSymbol;
while ( *p )
p++;
xub_StrLen nLen = sal::static_int_cast<xub_StrLen>( p - cSymbol - 1 );
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 8b738fa..6164e89 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -3194,8 +3194,8 @@ void ScInterpreter::ScTrim()
// Doesn't only trim but also removes duplicated blanks within!
String aVal = comphelper::string::strip(GetString(), ' ');
String aStr;
- register const sal_Unicode* p = aVal.GetBuffer();
- register const sal_Unicode* const pEnd = p + aVal.Len();
+ const sal_Unicode* p = aVal.GetBuffer();
+ const sal_Unicode* const pEnd = p + aVal.Len();
while ( p < pEnd )
{
if ( *p != ' ' || p[-1] != ' ' ) // first can't be ' ', so -1 is fine
@@ -3226,7 +3226,7 @@ void ScInterpreter::ScPropper()
{
String aUpr( ScGlobal::pCharClass->uppercase( aStr ) );
String aLwr( ScGlobal::pCharClass->lowercase( aStr ) );
- register sal_Unicode* pStr = aStr.GetBufferAccess();
+ sal_Unicode* pStr = aStr.GetBufferAccess();
const sal_Unicode* pUpr = aUpr.GetBuffer();
const sal_Unicode* pLwr = aLwr.GetBuffer();
*pStr = *pUpr;
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index 40a82f1..a53c6da 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -2515,7 +2515,7 @@ void ScInterpreter::ScDecimal()
{
double fVal = 0.0;
int nBase = (int) fBase;
- register const sal_Unicode* p = aStr.GetBuffer();
+ const sal_Unicode* p = aStr.GetBuffer();
while ( *p == ' ' || *p == '\t' )
p++; // strip leading white space
if ( nBase == 16 )
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 3ce8fda..1af428f 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -113,7 +113,7 @@ xub_StrLen ScRawToken::GetStrLen( const sal_Unicode* pStr )
{
if ( !pStr )
return 0;
- register const sal_Unicode* p = pStr;
+ const sal_Unicode* p = pStr;
while ( *p )
p++;
return sal::static_int_cast<xub_StrLen>( p - pStr );
diff --git a/sc/source/filter/excel/fontbuff.cxx b/sc/source/filter/excel/fontbuff.cxx
index 478d2ed..c869fd6 100644
--- a/sc/source/filter/excel/fontbuff.cxx
+++ b/sc/source/filter/excel/fontbuff.cxx
@@ -86,7 +86,7 @@ void LotusFontBuffer::SetName( const sal_uInt16 nIndex, const String& rName )
OSL_ENSURE( nIndex < nSize, "*LotusFontBuffer::SetName(): Array too small!" );
if( nIndex < nSize )
{
- register ENTRY* pEntry = pData + nIndex;
+ ENTRY* pEntry = pData + nIndex;
pEntry->TmpName( rName );
if( pEntry->nType >= 0 )
@@ -108,7 +108,7 @@ void LotusFontBuffer::SetType( const sal_uInt16 nIndex, const sal_uInt16 nType )
OSL_ENSURE( nIndex < nSize, "*LotusFontBuffer::SetType(): Array too small!" );
if( nIndex < nSize )
{
- register ENTRY* pEntry = pData + nIndex;
+ ENTRY* pEntry = pData + nIndex;
pEntry->Type( nType );
if( pEntry->pTmpName )
diff --git a/sc/source/filter/excel/namebuff.cxx b/sc/source/filter/excel/namebuff.cxx
index 55a7ae7..eb9e90cc 100644
--- a/sc/source/filter/excel/namebuff.cxx
+++ b/sc/source/filter/excel/namebuff.cxx
@@ -35,9 +35,9 @@
sal_uInt32 StringHashEntry::MakeHashCode( const String& r )
{
- register sal_uInt32 n = 0;
+ sal_uInt32 n = 0;
const sal_Unicode* pAkt = r.GetBuffer();
- register sal_Unicode cAkt = *pAkt;
+ sal_Unicode cAkt = *pAkt;
while( cAkt )
{
diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx
index 4a9cdcd..aab9afd 100644
--- a/sc/source/filter/ftools/ftools.cxx
+++ b/sc/source/filter/ftools/ftools.cxx
@@ -64,8 +64,8 @@ SEEEEEEE EEEEEEEE IMMMMMMM MMMMMMMM MMMMMMMM MMMMMMMM MMMMMMMM MMMMMMMM MMMMMMMM
14321098 76543210 02109876 54321098 76543210 98765432 10987654 32109876 54321098 76543210 Bit in Group
*/
- register long double lfDouble = 0.0;
- register long double lfFakt = 256.0;
+ long double lfDouble = 0.0;
+ long double lfFakt = 256.0;
sal_uInt8 pDouble10[ 10 ];
rStrm.Read( pDouble10, 10 ); // Intel-10 in pDouble10
@@ -90,7 +90,7 @@ SEEEEEEE EEEEEEEE IMMMMMMM MMMMMMMM MMMMMMMM MMMMMMMM MMMMMMMM MMMMMMMM MMMMMMMM
if( lfDouble != 0.0 )
{
// exponent
- register sal_Int32 nExp;
+ sal_Int32 nExp;
nExp = pDouble10[ 9 ] & 0x7F;
nExp <<= 8;
nExp += pDouble10[ 8 ];
diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx
index 136e607..d6f4fcf 100644
--- a/sc/source/filter/lotus/tool.cxx
+++ b/sc/source/filter/lotus/tool.cxx
@@ -515,8 +515,8 @@ void RangeNameBufferWK3::Add( const String& rOrgName, const ScComplexRefData& rC
pScTokenArray->Clear();
- register const ScSingleRefData& rRef1 = rCRD.Ref1;
- register const ScSingleRefData& rRef2 = rCRD.Ref2;
+ const ScSingleRefData& rRef1 = rCRD.Ref1;
+ const ScSingleRefData& rRef2 = rCRD.Ref2;
if( rRef1.nCol == rRef2.nCol && rRef1.nRow == rRef2.nRow && rRef1.nTab == rRef2.nTab )
{
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 090d0cd..9fa2e0f 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -441,7 +441,7 @@ xub_StrLen lcl_MatchParenthesis( const String& rStr, xub_StrLen nPos )
return STRING_NOTFOUND;
xub_StrLen nLen = rStr.Len();
const sal_Unicode* p0 = rStr.GetBuffer();
- register const sal_Unicode* p;
+ const sal_Unicode* p;
const sal_Unicode* p1;
sal_uInt16 nQuotes = 0;
if ( nPos < nLen / 2 )
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index 6d8a7dc..c843159 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -603,7 +603,7 @@ OUString SAL_CALL ScFilterDetect::detect( uno::Sequence<beans::PropertyValue>& l
bSync = sal_True;
while( !rStr.IsEof() && bSync )
{
- register sal_uInt16 nMuster = *pSearch;
+ sal_uInt16 nMuster = *pSearch;
if( nMuster < 0x0100 )
{ // direkter Byte-Vergleich
diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx
index 9c0095c..ffd9f46 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -628,7 +628,7 @@ double ConvertToDec( const OUString& aStr, sal_uInt16 nBase, sal_uInt16 nCharLim
double fVal = 0.0;
- register const sal_Unicode* p = aStr.getStr();
+ const sal_Unicode* p = aStr.getStr();
sal_uInt16 nFirstDig = 0;
sal_Bool bFirstDig = sal_True;
diff --git a/svtools/source/dialogs/mcvmath.cxx b/svtools/source/dialogs/mcvmath.cxx
index 64c43a8..4b0141f 100644
--- a/svtools/source/dialogs/mcvmath.cxx
+++ b/svtools/source/dialogs/mcvmath.cxx
@@ -68,9 +68,9 @@ Fix ImpMultBig2( const Fix& a, const Fix& b )
sal_uInt16 ImpSqrt( sal_uLong nRadi )
{
- register sal_uLong inf = 1;
- register sal_uLong sup = nRadi;
- register sal_uLong sqr;
+ sal_uLong inf = 1;
+ sal_uLong sup = nRadi;
+ sal_uLong sqr;
if ( !nRadi )
return 0;
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index 2430d72..4a59b02 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -170,7 +170,7 @@ void HTMLOption::GetNumbers( std::vector<sal_uInt32> &rNumbers, bool bSpaceDelim
sal_uLong nNum = 0;
for( xub_StrLen i=0; i<aValue.Len(); i++ )
{
- register sal_Unicode c = aValue.GetChar( i );
+ sal_Unicode c = aValue.GetChar( i );
if( c>='0' && c<='9' )
{
nNum *= 10;
@@ -196,7 +196,7 @@ void HTMLOption::GetNumbers( std::vector<sal_uInt32> &rNumbers, bool bSpaceDelim
xub_StrLen nPos = 0;
while( nPos < aValue.Len() )
{
- register sal_Unicode c;
+ sal_Unicode c;
while( nPos < aValue.Len() &&
((c=aValue.GetChar(nPos)) == ' ' || c == '\t' ||
c == '\n' || c== '\r' ) )
@@ -244,7 +244,7 @@ void HTMLOption::GetColor( Color& rColor ) const
{
// Whatever Netscape does to get color values,
// at maximum three characters < '0' are ignored.
- register sal_Unicode c = nPos<aTmp.Len() ? aTmp.GetChar( nPos++ )
+ sal_Unicode c = nPos<aTmp.Len() ? aTmp.GetChar( nPos++ )
: '0';
if( c < '0' )
{
diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx
index 0ca1c79..807459f 100644
--- a/svtools/source/svrtf/parrtf.cxx
+++ b/svtools/source/svrtf/parrtf.cxx
@@ -287,8 +287,8 @@ int SvRTFParser::_GetNextToken()
sal_Unicode SvRTFParser::GetHexValue()
{
// Hex-Wert sammeln
- register int n;
- register sal_Unicode nHexVal = 0;
+ int n;
+ sal_Unicode nHexVal = 0;
for( n = 0; n < 2; ++n )
{
commit b67e29e9adfe9423c086d06a133fc9c551f430e7
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Jul 8 14:02:40 2013 +0200
-Werror,-Wlogical-not-parentheses (Clang trunk towards 3.4)
...apparently mistyped conditions happened to work as intended (E_None being 0).
Change-Id: I3ffd849fc4790bfaea36d614b900eceae5f1e8eb
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 4fecc9e..aaed112 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -120,7 +120,7 @@ static OUString HelpLocaleString()
OUString::createFromAscii(szHelpPath) + aLocaleStr;
osl::DirectoryItem aDirItem;
- if (!osl::DirectoryItem::get(sHelpPath, aDirItem) == osl::FileBase::E_None)
+ if (osl::DirectoryItem::get(sHelpPath, aDirItem) != osl::FileBase::E_None)
{
bOk = false;
OUString sLang(aLocaleStr);
@@ -131,7 +131,7 @@ static OUString HelpLocaleString()
sLang = sLang.copy( 0, nSepPos );
sHelpPath = aBaseInstallPath +
OUString::createFromAscii(szHelpPath) + sLang;
- if (!osl::DirectoryItem::get(sHelpPath, aDirItem) == osl::FileBase::E_None)
+ if (osl::DirectoryItem::get(sHelpPath, aDirItem) != osl::FileBase::E_None)
bOk = false;
}
}
commit 480ab6c6bad30f153d30143ca7353566b66a7d59
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Jul 8 13:42:15 2013 +0200
-Werror,-Wlogical-not-parentheses (Clang trunk towards 3.4)
...happened to work as intended (according to Caolán), as USCRIPT_COMMON is 0.
Change-Id: Ief2bf2844c7f47f3d5dcdc360a645d80edfd5e63
diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx
index f3279c9..9c3da44 100644
--- a/svtools/source/misc/sampletext.cxx
+++ b/svtools/source/misc/sampletext.cxx
@@ -1160,7 +1160,7 @@ OUString makeShortRepresentativeTextForSelectedFont(OutputDevice &rDevice)
//script and the font name is itself in Latin, then show a small
//chunk of representative text for that script
UScriptCode eScript = getScript(aFontCapabilities);
- if (!eScript != USCRIPT_COMMON)
+ if (eScript == USCRIPT_COMMON)
return OUString();
eScript = attemptToDisambiguateHan(eScript, rDevice);
commit 05fac639a2fb44fdb95309d578124816f3b70bb2
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Jul 8 11:45:19 2013 +0200
-Werror,-Wlogical-not-parentheses (Clang trunk towards 3.4)
...the apparently mistyped condition happened to work as intended, given that
TYPE_METHOD is zero.
Change-Id: I468013ab61caff45c174da752ffb1c9ca9d373bd
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index d55083f..c1ecbf8 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -1980,7 +1980,7 @@ OString SvMetaAttribute::Compare( SvMetaAttribute* pAttr )
if ( aType->GetType() == TYPE_METHOD )
{
// Test only when the attribute is a method not if it has one!
- if ( !pAttr->GetType()->GetType() == TYPE_METHOD )
+ if ( pAttr->GetType()->GetType() != TYPE_METHOD )
aStr.append(" IsMethod\n");
else if ( aType->GetReturnType() &&
aType->GetReturnType()->GetType() != pAttr->GetType()->GetReturnType()->GetType() )
commit ae91d60b363a2d7e0f57d090c911137a790d970f
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Jul 8 11:33:17 2013 +0200
-Werror,-Wlogical-not-parentheses (Clang trunk towards 3.4)
...the apparently mistyped conditions happened to work well for the expected
values of m_aState.
Change-Id: I75f1f4ff8343098be4932c286ddb101d5e913183
diff --git a/unoxml/source/dom/saxbuilder.cxx b/unoxml/source/dom/saxbuilder.cxx
index 8d2ad2b..75edd9a 100644
--- a/unoxml/source/dom/saxbuilder.cxx
+++ b/unoxml/source/dom/saxbuilder.cxx
@@ -130,7 +130,7 @@ namespace DOM
// start a new document fragment and push it onto the stack
// we have to be in a clean state to do this
- if (!m_aState == SAXDocumentBuilderState_READY)
+ if (m_aState != SAXDocumentBuilderState_READY)
throw RuntimeException();
m_aDocument = ownerDoc;
@@ -164,7 +164,7 @@ namespace DOM
// start a new document and push it onto the stack
// we have to be in a clean state to do this
- if (!m_aState == SAXDocumentBuilderState_READY)
+ if (m_aState != SAXDocumentBuilderState_READY)
throw SAXException();
Reference< XDocumentBuilder > aBuilder(DocumentBuilder::create(comphelper::getComponentContext(m_aServiceManager)));
@@ -179,7 +179,7 @@ namespace DOM
::osl::MutexGuard g(m_Mutex);
// there should only be the document left on the node stack
- if (!m_aState == SAXDocumentBuilderState_BUILDING_DOCUMENT)
+ if (m_aState != SAXDocumentBuilderState_BUILDING_DOCUMENT)
throw SAXException();
Reference< XNode > aNode = m_aNodeStack.top();
commit 029cca3f6fbfff3dbaa7bb4fefa53fce3ee3c267
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Jul 8 12:00:10 2013 +0200
Duplicate line
Change-Id: I02799a057d33826ec716ef19326ca2fb0880cd1f
diff --git a/config_host.mk.in b/config_host.mk.in
index f3470f3..58d2a0e 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -189,7 +189,6 @@ export GOBJECT_CFLAGS=$(gb_SPACE)@GOBJECT_CFLAGS@
export GOBJECT_LIBS=$(gb_SPACE)@GOBJECT_LIBS@
export GOOGLE_DOCS_EXTENSION_PACK=@GOOGLE_DOCS_EXTENSION_PACK@
export GPERF=@GPERF@
-export GPERF=@GPERF@
export GRAPHITE_CFLAGS=$(gb_SPACE)@GRAPHITE_CFLAGS@
export GRAPHITE_LIBS=$(gb_SPACE)@GRAPHITE_LIBS@
export HARFBUZZ_CFLAGS=$(gb_SPACE)@HARFBUZZ_CFLAGS@
More information about the Libreoffice-commits
mailing list