sal/osl/unx/file.cxx | 2 +-
sw/source/core/unocore/unomap.cxx | 6 +++---
sw/source/ui/docvw/SidebarWin.cxx | 5 +----
sw/source/ui/shells/langhelper.cxx | 5 +----
4 files changed, 6 insertions(+), 12 deletions(-)
New commits:
commit 40106014f7b5c414faf087472a5ae350e683db53
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Tue May 29 21:31:44 2012 +0200
Some cppcheck cleaning
see
http://nabble.documentfoundation.org/Advice-needed-about-some-cppcheck-reports-td3986408.html
Change-Id: I4b3b2c87031ab48641e78fce56bd7f86c606b48b
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index dbf256d..1d8ab6c 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -1258,7 +1258,7 @@ SAL_CALL osl_mapFile (
{
c^= pData[0];
pData += nSize;
- nSize -= nSize;
+ nSize = 0;
}
}
}
diff --git a/sw/source/core/unocore/unomap.cxx
b/sw/source/core/unocore/unomap.cxx
index b21defd..9eba818 100644
--- a/sw/source/core/unocore/unomap.cxx
+++ b/sw/source/core/unocore/unomap.cxx
@@ -962,11 +962,11 @@ const SfxItemPropertyMapEntry*
SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
COMMON_CRSR_PARA_PROPERTIES_WITHOUT_FN_01
TABSTOPS_MAP_ENTRY
- { SW_PROP_NMID(UNO_NAME_BACK_COLOR),
FN_UNO_TABLE_CELL_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32),
PropertyAttribute::MAYBEVOID|PropertyAttribute::MAYBEVOID ,MID_BACK_COLOR
},
+ { SW_PROP_NMID(UNO_NAME_BACK_COLOR),
FN_UNO_TABLE_CELL_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32),
PropertyAttribute::MAYBEVOID, MID_BACK_COLOR },
{ SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND,
CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID ,MID_GRAPHIC_URL
},
{ SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER),
RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID
,MID_GRAPHIC_FILTER },
- { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION),
FN_UNO_TABLE_CELL_BACKGROUND, CPPU_E2T(CPPUTYPE_GRAPHICLOC),
PropertyAttribute::MAYBEVOID|PropertyAttribute::MAYBEVOID
,MID_GRAPHIC_POSITION},
- { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT),
FN_UNO_TABLE_CELL_BACKGROUND, CPPU_E2T(CPPUTYPE_BOOLEAN),
PropertyAttribute::MAYBEVOID|PropertyAttribute::MAYBEVOID
,MID_GRAPHIC_TRANSPARENT },
+ { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION),
FN_UNO_TABLE_CELL_BACKGROUND, CPPU_E2T(CPPUTYPE_GRAPHICLOC),
PropertyAttribute::MAYBEVOID, MID_GRAPHIC_POSITION},
+ { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT),
FN_UNO_TABLE_CELL_BACKGROUND, CPPU_E2T(CPPUTYPE_BOOLEAN),
PropertyAttribute::MAYBEVOID, MID_GRAPHIC_TRANSPARENT },
{ SW_PROP_NMID(UNO_NAME_NUMBER_FORMAT), RES_BOXATR_FORMAT,
CPPU_E2T(CPPUTYPE_INT32), PropertyAttribute::MAYBEVOID ,0
},
{ SW_PROP_NMID(UNO_NAME_VERT_ORIENT), RES_VERT_ORIENT,
CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE ,MID_VERTORIENT_ORIENT },
{ SW_PROP_NMID(UNO_NAME_CHART_ROW_AS_LABEL),
FN_UNO_RANGE_ROW_LABEL, CPPU_E2T(CPPUTYPE_BOOLEAN),
PropertyAttribute::MAYBEVOID, 0},
diff --git a/sw/source/ui/docvw/SidebarWin.cxx
b/sw/source/ui/docvw/SidebarWin.cxx
index 606ee29..e7c73d5 100644
--- a/sw/source/ui/docvw/SidebarWin.cxx
+++ b/sw/source/ui/docvw/SidebarWin.cxx
@@ -791,10 +791,7 @@ void SwSidebarWin::SetLanguage(const SvxLanguageItem
aNewItem)
const SwViewOption* pVOpt = mrView.GetWrtShellPtr()->GetViewOptions();
sal_uLong nCntrl = Engine()->GetControlWord();
// turn off
- if (!pVOpt->IsOnlineSpell())
- nCntrl &= ~EE_CNTRL_ONLINESPELLING;
- else
- nCntrl &= ~EE_CNTRL_ONLINESPELLING;
+ nCntrl &= ~EE_CNTRL_ONLINESPELLING;
Engine()->SetControlWord(nCntrl);
//turn back on
diff --git a/sw/source/ui/shells/langhelper.cxx
b/sw/source/ui/shells/langhelper.cxx
index 830f345..0a3ab12 100644
--- a/sw/source/ui/shells/langhelper.cxx
+++ b/sw/source/ui/shells/langhelper.cxx
@@ -209,10 +209,7 @@ namespace SwLangHelper
const SwViewOption* pVOpt =
rView.GetWrtShellPtr()->GetViewOptions();
sal_uLong nCntrl = pEditEngine->GetControlWord();
// turn off
- if (!pVOpt->IsOnlineSpell())
- nCntrl &= ~EE_CNTRL_ONLINESPELLING;
- else
- nCntrl &= ~EE_CNTRL_ONLINESPELLING;
+ nCntrl &= ~EE_CNTRL_ONLINESPELLING;
pEditEngine->SetControlWord(nCntrl);
//turn back on
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
