[Libreoffice-commits] .: binfilter/bf_sw binfilter/inc
Stephan Bergmann
sbergmann at kemper.freedesktop.org
Wed Sep 28 01:52:23 PDT 2011
binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx | 21 ----
binfilter/bf_sw/source/core/unocore/sw_unosett.cxx | 2
binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx | 4
binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx | 92 ++------------------
binfilter/inc/bf_sw/unotxdoc.hxx | 1
5 files changed, 13 insertions(+), 107 deletions(-)
New commits:
commit d88e64fa42456362081a675ea2fd7144e2d85b95
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Sep 28 10:52:00 2011 +0200
Some more warning cleanup.
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx
index ca53894..9b05448 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx
@@ -1086,26 +1086,7 @@ void SwXFrame::setPropertyValue(const OUString& rPropertyName, const uno::Any& a
else if( rPropertyName.equalsAsciiL( SW_PROP_NAME(UNO_NAME_CHAIN_NEXT_NAME))
|| rPropertyName.equalsAsciiL( SW_PROP_NAME(UNO_NAME_CHAIN_PREV_NAME))
)
- {
- OUString uTemp;
- aValue >>= uTemp;
- String sChainName(uTemp);
- if(sChainName.Len())
- {
- sal_uInt16 nCount = pDoc->GetFlyCount(FLYCNTTYPE_FRM);
-
- SwFrmFmt* pChain = 0;
- for( sal_uInt16 i = 0; i < nCount; i++)
- {
- SwFrmFmt* pLclFmt = pDoc->GetFlyNum(i, FLYCNTTYPE_FRM);
- if(sChainName == pLclFmt->GetName() )
- {
- pChain = pLclFmt;
- break;
- }
- }
- }
- }
+ {}
else if(FN_UNO_Z_ORDER == pCur->nWID)
{
sal_Int32 nZOrder = - 1;
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unosett.cxx b/binfilter/bf_sw/source/core/unocore/sw_unosett.cxx
index 1de05cd..5486a15 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unosett.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unosett.cxx
@@ -1569,7 +1569,6 @@ void SwXNumberingRules::setNumberingRuleByIndex(
SvxBrushItem* pSetBrush = 0;
Size* pSetSize = 0;
SwFmtVertOrient* pSetVOrient = 0;
- BOOL bCharStyleNameSet = FALSE;
for(sal_uInt16 i = 0; i < nPropNameCount && !bExcept && !bWrongArg; i++)
{
@@ -1616,7 +1615,6 @@ void SwXNumberingRules::setNumberingRuleByIndex(
break;
case 4: //"CharStyleName",
{
- bCharStyleNameSet = TRUE;
OUString uTmp;
pData->aVal >>= uTmp;
String sCharFmtName;
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx b/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
index f3a70e7..66ec438 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
@@ -1343,7 +1343,7 @@ sal_Bool SwXTextTableCursor::goRight(sal_Int16 Count, sal_Bool Expand) throw( un
return bRet;
}
-sal_Bool SwXTextTableCursor::goUp(sal_Int16 Count, sal_Bool Expand) throw( uno::RuntimeException )
+sal_Bool SwXTextTableCursor::goUp(sal_Int16, sal_Bool Expand) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
sal_Bool bRet = sal_False;
@@ -1357,7 +1357,7 @@ sal_Bool SwXTextTableCursor::goUp(sal_Int16 Count, sal_Bool Expand) throw( uno::
return bRet;
}
-sal_Bool SwXTextTableCursor::goDown(sal_Int16 Count, sal_Bool Expand) throw( uno::RuntimeException )
+sal_Bool SwXTextTableCursor::goDown(sal_Int16, sal_Bool Expand) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
sal_Bool bRet = sal_False;
diff --git a/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx b/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx
index fe61ef5..6e7f30b 100644
--- a/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx
+++ b/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx
@@ -133,18 +133,6 @@ using ::osl::FileBase;
#define SW_CREATE_DRAW_DEFAULTS 0x07
-SwTxtFmtColl *lcl_GetParaStyle(const String& rCollName, SwDoc* pDoc)
-{
- SwTxtFmtColl* pColl = pDoc->FindTxtFmtCollByName( rCollName );
- if( !pColl )
- {
- sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName( rCollName, GET_POOLID_TXTCOLL );
- if( USHRT_MAX != nId )
- pColl = pDoc->GetTxtCollFromPool( nId );
- }
- return pColl;
-}
-
const Sequence< sal_Int8 > & SwXTextDocument::getUnoTunnelId()
{
static Sequence< sal_Int8 > aSeq = ::binfilter::CreateUnoTunnelId();
@@ -566,17 +554,11 @@ sal_Int32 SwXTextDocument::replaceAll(const Reference< util::XSearchDescriptor >
const SwXTextSearch* pSearch = (const SwXTextSearch*)
xDescTunnel->getSomething(SwXTextSearch::getUnoTunnelId());
- int eRanges(FND_IN_BODY|FND_IN_SELALL);
-
SearchOptions aSearchOpt;
pSearch->FillSearchOptions( aSearchOpt );
- SwDocPositions eStart = pSearch->bBack ? DOCPOS_END : DOCPOS_START;
- SwDocPositions eEnd = pSearch->bBack ? DOCPOS_START : DOCPOS_END;
-
// Suche soll ueberall stattfinden
pUnoCrsr->SetRemainInSection(sal_False);
- sal_uInt32 nResult;
UnoActionContext aContext(pDocShell->GetDoc());
//try attribute search first
if(pSearch->HasSearchAttributes()||pSearch->HasReplaceAttributes())
@@ -593,21 +575,8 @@ sal_Int32 SwXTextDocument::replaceAll(const Reference< util::XSearchDescriptor >
0);
pSearch->FillSearchItemSet(aSearch);
pSearch->FillReplaceItemSet(aReplace);
- nResult = 0;
}
- else if(pSearch->bStyles)
- {
- SwTxtFmtColl *pSearchColl = lcl_GetParaStyle(pSearch->sSearchText, pUnoCrsr->GetDoc());
- SwTxtFmtColl *pReplaceColl = lcl_GetParaStyle(pSearch->sReplaceText, pUnoCrsr->GetDoc());;
-
- nResult = 0;
-
- }
- else
- {
- nResult = 0;
- }
- return (sal_Int32)nResult;
+ return 0;
}
@@ -624,7 +593,6 @@ Reference< util::XSearchDescriptor > SwXTextDocument::createSearchDescriptor(vo
* --------------------------------------------------*/
SwUnoCrsr* SwXTextDocument::FindAny(const Reference< util::XSearchDescriptor > & xDesc,
Reference< XTextCursor > & xCrsr, sal_Bool bAll,
- sal_Int32& nResult,
Reference< XInterface > xLastResult)
{
Reference< XUnoTunnel > xDescTunnel(xDesc, UNO_QUERY);
@@ -692,10 +660,7 @@ SwUnoCrsr* SwXTextDocument::FindAny(const Reference< util::XSearchDescriptor >
eRanges = FND_IN_OTHER;
if(bAll) //immer - ueberall?
eRanges = FND_IN_SELALL;
- SwDocPositions eStart = !bAll ? DOCPOS_CURR : pSearch->bBack ? DOCPOS_END : DOCPOS_START;
- SwDocPositions eEnd = pSearch->bBack ? DOCPOS_START : DOCPOS_END;
- nResult = 0;
sal_uInt16 nSearchProc = 0;
while(nSearchProc < 2)
{
@@ -709,19 +674,9 @@ SwUnoCrsr* SwXTextDocument::FindAny(const Reference< util::XSearchDescriptor >
RES_TXTATR_INETFMT, RES_TXTATR_INETFMT,
0);
pSearch->FillSearchItemSet(aSearch);
- nResult = 0;
- }
- else if(pSearch->bStyles)
- {
- SwTxtFmtColl *pSearchColl = lcl_GetParaStyle(pSearch->sSearchText, pUnoCrsr->GetDoc());
- nResult = 0;
- }
- else
- {
- nResult = 0;
}
nSearchProc++;
- if(nResult || (eRanges&(FND_IN_SELALL|FND_IN_OTHER)))
+ if(eRanges&(FND_IN_SELALL|FND_IN_OTHER))
break;
//second step - find in other
eRanges = FND_IN_OTHER;
@@ -735,18 +690,12 @@ Reference< XIndexAccess >
{
SolarMutexGuard aGuard;
Reference< XInterface > xTmp;
- sal_Int32 nResult = 0;
Reference< XTextCursor > xCrsr;
- SwUnoCrsr* pResultCrsr = FindAny(xDesc, xCrsr, sal_True, nResult, xTmp);
+ SwUnoCrsr* pResultCrsr = FindAny(xDesc, xCrsr, sal_True, xTmp);
if(!pResultCrsr)
throw RuntimeException();
- Reference< XIndexAccess > xRet;
- if(nResult)
- xRet = new SwXTextRanges(pResultCrsr);
- else
- xRet = new SwXTextRanges();
delete pResultCrsr;
- return xRet;
+ return new SwXTextRanges();
}
Reference< XInterface > SwXTextDocument::findFirst(const Reference< util::XSearchDescriptor > & xDesc)
@@ -754,22 +703,12 @@ Reference< XInterface > SwXTextDocument::findFirst(const Reference< util::XSear
{
SolarMutexGuard aGuard;
Reference< XInterface > xTmp;
- sal_Int32 nResult = 0;
Reference< XTextCursor > xCrsr;
- SwUnoCrsr* pResultCrsr = FindAny(xDesc, xCrsr, sal_False, nResult, xTmp);
+ SwUnoCrsr* pResultCrsr = FindAny(xDesc, xCrsr, sal_False, xTmp);
if(!pResultCrsr)
throw RuntimeException();
- Reference< XInterface > xRet;
- if(nResult)
- {
- Reference< XTextRange > xTempRange = SwXTextRange::CreateTextRangeFromPosition(
- pDocShell->GetDoc(),
- *pResultCrsr->GetPoint(),
- pResultCrsr->GetMark());
- xRet = *new SwXTextCursor(xTempRange->getText(), pResultCrsr);
- delete pResultCrsr;
- }
- return xRet;
+ delete pResultCrsr;
+ return Reference< XInterface >();
}
Reference< XInterface > SwXTextDocument::findNext(const Reference< XInterface > & xStartAt,
@@ -778,25 +717,14 @@ Reference< XInterface > SwXTextDocument::findNext(const Reference< XInterface >
{
SolarMutexGuard aGuard;
Reference< XInterface > xTmp;
- sal_Int32 nResult = 0;
Reference< XTextCursor > xCrsr;
if(!xStartAt.is())
throw RuntimeException();
- SwUnoCrsr* pResultCrsr = FindAny(xDesc, xCrsr, sal_False, nResult, xStartAt);
+ SwUnoCrsr* pResultCrsr = FindAny(xDesc, xCrsr, sal_False, xStartAt);
if(!pResultCrsr)
throw RuntimeException();
- Reference< XInterface > xRet;
- if(nResult)
- {
- Reference< XTextRange > xTempRange = SwXTextRange::CreateTextRangeFromPosition(
- pDocShell->GetDoc(),
- *pResultCrsr->GetPoint(),
- pResultCrsr->GetMark());
-
- xRet = *new SwXTextCursor(xTempRange->getText(), pResultCrsr);
- delete pResultCrsr;
- }
- return xRet;
+ delete pResultCrsr;
+ return Reference< XInterface >();
}
Sequence< beans::PropertyValue > SwXTextDocument::getPagePrintSettings(void)
diff --git a/binfilter/inc/bf_sw/unotxdoc.hxx b/binfilter/inc/bf_sw/unotxdoc.hxx
index 507f181..faec344 100644
--- a/binfilter/inc/bf_sw/unotxdoc.hxx
+++ b/binfilter/inc/bf_sw/unotxdoc.hxx
@@ -375,7 +375,6 @@ public:
SwUnoCrsr* CreateCursorForSearch(::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > & xCrsr);
SwUnoCrsr* FindAny(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor > & xDesc,
::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > & xCrsr, sal_Bool bAll,
- sal_Int32& nResult,
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xLastResult);
SwDocShell* GetDocShell() {return pDocShell;}
More information about the Libreoffice-commits
mailing list