[Libreoffice-commits] .: 8 commits - cppcanvas/source drawinglayer/Library_drawinglayer.mk editeng/source svx/source
Tor Lillqvist
tml at kemper.freedesktop.org
Fri Oct 7 02:53:07 PDT 2011
cppcanvas/source/mtfrenderer/textaction.cxx | 2 --
drawinglayer/Library_drawinglayer.mk | 2 +-
editeng/source/misc/svxacorr.cxx | 9 +++++++++
editeng/source/misc/txtrange.cxx | 4 ++--
svx/source/items/viewlayoutitem.cxx | 2 --
svx/source/items/zoomitem.cxx | 2 --
svx/source/items/zoomslideritem.cxx | 2 --
svx/source/svdraw/svdhdl.cxx | 3 ---
svx/source/svdraw/svdmodel.cxx | 4 ++--
svx/source/svdraw/svdpage.cxx | 2 +-
svx/source/xml/xmlexport.cxx | 4 ++--
svx/source/xml/xmlxtexp.cxx | 4 ++--
svx/source/xml/xmlxtimp.cxx | 2 +-
13 files changed, 20 insertions(+), 22 deletions(-)
New commits:
commit cdad6cb3bfad8709ee984a7581664725948e24fb
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Thu Oct 6 18:00:03 2011 +0300
WaE: unreferenced local variable
diff --git a/svx/source/xml/xmlexport.cxx b/svx/source/xml/xmlexport.cxx
index 5eabfa5..c14a71d 100644
--- a/svx/source/xml/xmlexport.cxx
+++ b/svx/source/xml/xmlexport.cxx
@@ -139,7 +139,7 @@ sal_Bool SvxDrawingLayerExport( SdrModel* pModel, const uno::Reference<io::XOutp
}
}
}
- catch(uno::Exception const& e)
+ catch(uno::Exception const&)
{
DBG_UNHANDLED_EXCEPTION();
bDocRet = sal_False;
@@ -258,7 +258,7 @@ sal_Bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInpu
}
}
}
- catch( uno::Exception& r )
+ catch( uno::Exception& )
{
DBG_UNHANDLED_EXCEPTION();
}
diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx
index 4e61362..2074d4f 100644
--- a/svx/source/xml/xmlxtexp.cxx
+++ b/svx/source/xml/xmlxtexp.cxx
@@ -287,7 +287,7 @@ bool SvxXMLXTableExportComponent::save(
{
try {
xSubStorage = xStorage->openStorageElement( aPath, eCreate );
- } catch (uno::Exception &e) {
+ } catch (uno::Exception &) {
OSL_FAIL( "no output storage!" );
return false;
}
@@ -301,7 +301,7 @@ bool SvxXMLXTableExportComponent::save(
return false;
initializeStreamMetadata( xStream );
xOut = xStream->getOutputStream();
- } catch (uno::Exception &e) {
+ } catch (uno::Exception &) {
OSL_FAIL( "no output stream!" );
return false;
}
diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx
index fa7c23a..fd6b8ee 100644
--- a/svx/source/xml/xmlxtimp.cxx
+++ b/svx/source/xml/xmlxtimp.cxx
@@ -425,7 +425,7 @@ bool SvxXMLXTableImport::load( const rtl::OUString &rPath,
try {
xSubStorage = comphelper::OStorageHelper::GetStorageAtPath(
xStorage, rPath, embed::ElementModes::READ, aNasty );
- } catch (uno::Exception &e) {
+ } catch (uno::Exception &) {
}
if( xSubStorage.is() )
openStorageStream( &aParserInput, &pGraphicHelper, xSubStorage );
commit 61a0a9e30014f707e30e872e011be5c6bde36a6f
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Thu Oct 6 17:43:12 2011 +0300
WaE: signed/unsigned mismatch
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index dbd8a39..77f739b 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -1771,7 +1771,7 @@ XubString SdrPage::GetLayoutName() const
void SdrPage::SetInserted( bool bIns )
{
- if( mbInserted != bIns )
+ if( (bool) mbInserted != bIns )
{
mbInserted = bIns;
commit 2d55a917a46f89ab0e82acc8bcca2f5a9dfce822
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Thu Oct 6 17:20:05 2011 +0300
WaE: bool/sal_Bool mismatch
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 5f89813..07331e5 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -1944,7 +1944,7 @@ void SdrModel::SetCharCompressType( sal_uInt16 nType )
void SdrModel::SetKernAsianPunctuation( sal_Bool bEnabled )
{
- if( mbKernAsianPunctuation != bEnabled )
+ if( mbKernAsianPunctuation != (bool) bEnabled )
{
mbKernAsianPunctuation = bEnabled;
ImpSetOutlinerDefaults( pDrawOutliner );
@@ -1954,7 +1954,7 @@ void SdrModel::SetKernAsianPunctuation( sal_Bool bEnabled )
void SdrModel::SetAddExtLeading( sal_Bool bEnabled )
{
- if( mbAddExtLeading != bEnabled )
+ if( mbAddExtLeading != (bool) bEnabled )
{
mbAddExtLeading = bEnabled;
ImpSetOutlinerDefaults( pDrawOutliner );
commit f2b0bd07b37f40048a4b58a561a3c787eb6a885b
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Thu Oct 6 17:20:05 2011 +0300
WaE: unreachable code
diff --git a/svx/source/items/viewlayoutitem.cxx b/svx/source/items/viewlayoutitem.cxx
index b109835..6876f31 100644
--- a/svx/source/items/viewlayoutitem.cxx
+++ b/svx/source/items/viewlayoutitem.cxx
@@ -206,8 +206,6 @@ bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt
OSL_FAIL("svx::SvxViewLayoutItem::PutValue(), Wrong MemberId!");
return false;
}
-
- return true;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/items/zoomitem.cxx b/svx/source/items/zoomitem.cxx
index d15a5e4..4a2153b 100644
--- a/svx/source/items/zoomitem.cxx
+++ b/svx/source/items/zoomitem.cxx
@@ -225,8 +225,6 @@ bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMem
OSL_FAIL("svx::SvxZoomItem::PutValue(), Wrong MemberId!");
return false;
}
-
- return true;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx
index 816f260..dd8ab76 100644
--- a/svx/source/items/zoomslideritem.cxx
+++ b/svx/source/items/zoomslideritem.cxx
@@ -262,8 +262,6 @@ bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt
OSL_FAIL("svx::SvxZoomSliderItem::PutValue(), Wrong MemberId!");
return false;
}
-
- return true;
}
void SvxZoomSliderItem::AddSnappingPoint( sal_Int32 nNew )
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 837dcb9..62ee66b 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -267,9 +267,6 @@ const BitmapEx& SdrHdlBitmapSet::GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal
return impGetOrCreateTargetBitmap((KIND_COUNT * INDEX_COUNT) + 3, Rectangle(Point(48, 68), Size(24, 23)));
}
}
-
- // cannot happen since all pathes return something; return Rect_7x7 as default (see switch)
- return maRealMarkers[0];
}
////////////////////////////////////////////////////////////////////////////////////////////////////
commit 5c46f61892c90e179a74e06d0d87e25c09fa7589
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Thu Oct 6 16:22:57 2011 +0300
drawinglayer/source/geometry/viewinformation2d.cxx does neeed exceptions
At least in a MSVC --enable-dbgutil build.
diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk
index de5cb2b..d51aee5 100644
--- a/drawinglayer/Library_drawinglayer.mk
+++ b/drawinglayer/Library_drawinglayer.mk
@@ -85,6 +85,7 @@ $(eval $(call gb_Library_add_exception_objects,drawinglayer,\
drawinglayer/source/attribute/sdrsceneattribute3d \
drawinglayer/source/attribute/sdrshadowattribute \
drawinglayer/source/attribute/strokeattribute \
+ drawinglayer/source/geometry/viewinformation2d \
drawinglayer/source/primitive2d/animatedprimitive2d \
drawinglayer/source/primitive2d/backgroundcolorprimitive2d \
drawinglayer/source/primitive2d/baseprimitive2d \
@@ -179,7 +180,6 @@ $(eval $(call gb_Library_add_exception_objects,drawinglayer,\
))
$(eval $(call gb_Library_add_noexception_objects,drawinglayer,\
- drawinglayer/source/geometry/viewinformation2d \
drawinglayer/source/geometry/viewinformation3d \
))
commit a9cb605b3ac95225d1b1678b4a9a72bca478d95e
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Thu Oct 6 16:15:20 2011 +0300
WaE: unsafe mix of type 'sal_Bool' and type 'bool' in operation
diff --git a/editeng/source/misc/txtrange.cxx b/editeng/source/misc/txtrange.cxx
index 0c16dd5..9afdb86 100644
--- a/editeng/source/misc/txtrange.cxx
+++ b/editeng/source/misc/txtrange.cxx
@@ -130,7 +130,7 @@ class SvxBoundArgs
sal_Bool bMultiple : 1;
sal_Bool bConcat : 1;
sal_Bool bRotate : 1;
- void NoteRange( sal_Bool bToggle );
+ void NoteRange( bool bToggle );
long Cut( long nY, const Point& rPt1, const Point& rPt2 );
void Add();
void _NoteFarPoint( long nPx, long nPyDiff, long nDiff );
@@ -246,7 +246,7 @@ void SvxBoundArgs::_NoteFarPoint( long nPa, long nPbDiff, long nDiff )
NoteMargin( nTmpA, nPbDiff );
}
-void SvxBoundArgs::NoteRange( sal_Bool bToggle )
+void SvxBoundArgs::NoteRange( bool bToggle )
{
DBG_ASSERT( nMax >= nMin || bInner, "NoteRange: Min > Max?");
if( nMax < nMin )
commit 6b9fbc03b84bd97404107973a9d569432b6f74c0
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Thu Oct 6 16:10:32 2011 +0300
WaE: assignment within conditional expression
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 72c3018..7e53771 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -643,6 +643,11 @@ sal_Bool SvxAutoCorrect::FnChgToEnEmDash(
return bRet;
}
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4706) // assignment within conditional expression
+#endif
+
sal_Bool SvxAutoCorrect::FnAddNonBrkSpace(
SvxAutoCorrDoc& rDoc, const String& rTxt,
xub_StrLen, xub_StrLen nEndPos,
@@ -724,6 +729,10 @@ sal_Bool SvxAutoCorrect::FnAddNonBrkSpace(
return bRet;
}
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
sal_Bool SvxAutoCorrect::FnSetINetAttr( SvxAutoCorrDoc& rDoc, const String& rTxt,
xub_StrLen nSttPos, xub_StrLen nEndPos,
LanguageType eLang )
commit 288ce7b4ab9c55554b7ca085106eae2e56bc0a3c
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Thu Oct 6 15:48:46 2011 +0300
WaE: unreachable code
diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx
index ec353ea..2e0f78a 100644
--- a/cppcanvas/source/mtfrenderer/textaction.cxx
+++ b/cppcanvas/source/mtfrenderer/textaction.cxx
@@ -2286,8 +2286,6 @@ namespace cppcanvas
rState ) );
}
}
- // Unreachable; to avoid bogus warning:
- return ActionSharedPtr();
}
}
}
More information about the Libreoffice-commits
mailing list