sal/inc/sal/log-areas.dox | 1 +
sw/qa/extras/rtfimport/rtfimport.cxx | 1 -
sw/source/core/crsr/crstrvl.cxx | 2 +-
sw/source/core/unocore/unostyle.cxx | 2 +-
sw/source/ui/app/docsh2.cxx | 1 -
sw/source/ui/ribbar/workctrl.cxx | 4 +---
6 files changed, 4 insertions(+), 7 deletions(-)
New commits:
commit 8275c8fc33b63aa40a0a8a8c215f32b9986edab6
Author: Miklos Vajna <vmik...@suse.cz>
Date: Wed Jan 2 19:55:34 2013 +0100
sw: fix loplugin warnings
Change-Id: I090a51c112c960b8cc9b208bc7378a5aa3754552
diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox
index 428c7fb..5232778 100644
--- a/sal/inc/sal/log-areas.dox
+++ b/sal/inc/sal/log-areas.dox
@@ -182,6 +182,7 @@ certain functionality.
@section Writer
@li @c sw
+@li @c sw.level2
@li @c sw.core - Writer core
@li @c sw.rtf - .rtf export filter
@li @c sw.uno - Writer UNO interfaces
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index be8c34d..88e6797 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -527,7 +527,6 @@ void Test::testFdo48356()
uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XEnumerationAccess>
xParaEnumAccess(xTextDocument->getText(), uno::UNO_QUERY);
uno::Reference<container::XEnumeration> xParaEnum =
xParaEnumAccess->createEnumeration();
- OUStringBuffer aBuf;
int i = 0;
while (xParaEnum->hasMoreElements())
{
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 5229fc9..040e998 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -1377,7 +1377,7 @@ sal_Bool SwCrsrShell::GetContentAtPos( const Point& rPt,
rCntntAtPos.eCntntAtPos =
SwContentAtPos::SW_TABLEBOXVALUE;
else
#endif
- ((SwTblBoxFormula*)pItem)->PtrToBoxNm(
&pTblNd->GetTable() );
+ ((SwTblBoxFormula*)pItem)->PtrToBoxNm(
&pTblNd->GetTable() );
bRet = sal_True;
if( bSetCrsr )
diff --git a/sw/source/core/unocore/unostyle.cxx
b/sw/source/core/unocore/unostyle.cxx
index 71e7d72..7dc7524 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -873,7 +873,7 @@ void SwXStyleFamily::insertByName(const OUString& rName,
const uno::Any& rElemen
#if OSL_DEBUG_LEVEL > 1
SfxStyleSheetBase& rNewBase =
#endif
- pBasePool->Make(sStyleName, eFamily, nMask);
+ pBasePool->Make(sStyleName, eFamily, nMask);
pNewStyle->SetDoc(pDocShell->GetDoc(), pBasePool);
pNewStyle->SetStyleName(sStyleName);
String sParentStyleName(pNewStyle->GetParentStyleName());
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index f3cbb08..58bbd6d 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -1691,7 +1691,6 @@ sal_uLong SwDocShell::LoadStylesFromFile( const String&
rURL,
// Create a URL from filename
INetURLObject aURLObj( rURL );
- String sURL( aURLObj.GetMainURL( INetURLObject::NO_DECODE ) );
// Set filter:
String
sFactory(rtl::OUString::createFromAscii(SwDocShell::Factory().GetShortName()));
diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx
index 4e21205..41088d1 100644
--- a/sw/source/ui/ribbar/workctrl.cxx
+++ b/sw/source/ui/ribbar/workctrl.cxx
@@ -208,13 +208,12 @@ SfxPopupWindow* SwTbxAutoTextCtrl::CreatePopupWindow()
{
// Gruppenname mit Pfad-Extension besorgen
String sTitle;
- String sGroupName = pGlossaryList->GetGroupName(i - 1,
sal_False, &sTitle);
sal_uInt16 nBlockCount = pGlossaryList->GetBlockCount(i
-1);
if(nBlockCount)
{
sal_uInt16 nIndex = 100 * (i);
// aber ohne extension einfuegen
- pPopup->InsertItem( i,
sTitle);//sGroupName.GetToken(0, GLOS_DELIM));
+ pPopup->InsertItem( i, sTitle);
PopupMenu* pSub = new PopupMenu;
pSub->SetSelectHdl(aLnk);
pPopup->SetPopupMenu(i, pSub);
@@ -306,7 +305,6 @@ IMPL_LINK(SwTbxAutoTextCtrl, PopupHdl, PopupMenu*, pMenu)
SwGlossaryList* pGlossaryList = ::GetGlossaryList();
String sShortName;
String sGroup = pGlossaryList->GetGroupName(nBlock - 1, sal_False);
- String sLongName(pGlossaryList->GetBlockName(nBlock - 1, nId - (100 *
nBlock) - 1, sShortName));
SwGlossaryHdl* pGlosHdl = pView->GetGlosHdl();
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
