diff options
-rw-r--r-- | hwpfilter/source/hwpreader.cxx | 12 | ||||
-rw-r--r-- | hwpfilter/source/hwpreader.hxx | 4 | ||||
-rw-r--r-- | linguistic/source/convdiclist.cxx | 2 | ||||
-rw-r--r-- | linguistic/source/dlistimp.cxx | 11 | ||||
-rw-r--r-- | linguistic/source/gciterator.cxx | 3 | ||||
-rw-r--r-- | linguistic/source/lngopt.cxx | 2 | ||||
-rw-r--r-- | linguistic/source/lngreg.cxx | 17 | ||||
-rw-r--r-- | linguistic/source/lngreg.hxx | 15 | ||||
-rw-r--r-- | linguistic/source/lngsvcmgr.cxx | 3 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpfribframe.cxx | 2 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpfribframe.hxx | 2 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpfribptr.cxx | 2 |
12 files changed, 28 insertions, 47 deletions
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx index fa93b38b1d63..a07afb5a058a 100644 --- a/hwpfilter/source/hwpreader.cxx +++ b/hwpfilter/source/hwpreader.cxx @@ -3005,7 +3005,7 @@ void HwpReader::make_text_p3(HWPPara * para,bool bParaStart) if( !tstart ) {STARTT;} makeChars(str); } - makeTab(static_cast<Tab*>(para->hhstr[n].get())); + makeTab(); break; case CH_TEXT_BOX: /* 10 - ordered by Table/text box/formula/button/hypertext */ { @@ -3066,7 +3066,6 @@ void HwpReader::make_text_p3(HWPPara * para,bool bParaStart) } case CH_LINE: // 14 { - Line *hbox = static_cast<Line*>(para->hhstr[n].get()); if (str.size() > 0) { if( !pstart ) {STARTP;} @@ -3075,7 +3074,7 @@ void HwpReader::make_text_p3(HWPPara * para,bool bParaStart) } if( tstart ) {ENDT;} if( pstart ) {ENDP;} - makeLine(hbox); + makeLine(); pstart = true; break; } @@ -3447,7 +3446,7 @@ void HwpReader::makeDateCode(DateCode * hbox) } -void HwpReader::makeTab(Tab * ) /*hbox */ +void HwpReader::makeTab() { rstartEl("text:tab-stop", mxList.get()); rendEl("text:tab-stop"); @@ -4582,10 +4581,7 @@ void HwpReader::makePictureDRAW(HWPDrawingObject *drawobj, Picture * hbox) } -/** - * - */ -void HwpReader::makeLine(Line * ) +void HwpReader::makeLine() { padd("text:style-name", sXML_CDATA, "Horizontal Line"); rstartEl( "text:p", mxList.get()); diff --git a/hwpfilter/source/hwpreader.hxx b/hwpfilter/source/hwpreader.hxx index a0c7d0d8c0ee..9500aca6ae14 100644 --- a/hwpfilter/source/hwpreader.hxx +++ b/hwpfilter/source/hwpreader.hxx @@ -120,14 +120,14 @@ private: void makeBookmark(Bookmark *hbox); //6 void makeDateFormat(DateCode *hbox); //7 void makeDateCode(DateCode *hbox); //8 - void makeTab(Tab *hbox); //9 + void makeTab(); //9 void makeTable(TxtBox *hbox); void makeTextBox(TxtBox *hbox); void makeFormula(TxtBox *hbox); void makeHyperText(TxtBox *hbox); void makePicture(Picture *hbox); void makePictureDRAW(HWPDrawingObject *drawobj, Picture *hbox); - void makeLine(Line *hbox); + void makeLine(); void makeHidden(Hidden *hbox); void makeFootnote(Footnote *hbox); void makeAutoNum(AutoNum *hbox); diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index b852077ab3e8..0951d6796ed8 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -568,7 +568,7 @@ uno::Reference< uno::XInterface > SAL_CALL ConvDicList_CreateInstance( void * SAL_CALL ConvDicList_getFactory( const sal_Char * pImplName, - XMultiServiceFactory * pServiceManager, void * ) + XMultiServiceFactory * pServiceManager ) { void * pRet = nullptr; if ( ConvDicList::getImplementationName_Static().equalsAscii( pImplName ) ) diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx index e432114d75ab..bff87e2f66ad 100644 --- a/linguistic/source/dlistimp.cxx +++ b/linguistic/source/dlistimp.cxx @@ -89,8 +89,7 @@ public: void DisposeAndClear( const EventObject &rEvtObj ); bool AddDicListEvtListener( - const uno::Reference< XDictionaryListEventListener >& rxListener, - bool bReceiveVerbose ); + const uno::Reference< XDictionaryListEventListener >& rxListener ); bool RemoveDicListEvtListener( const uno::Reference< XDictionaryListEventListener >& rxListener ); sal_Int16 BeginCollectEvents() { return ++nNumCollectEvtListeners;} @@ -203,8 +202,7 @@ void SAL_CALL DicEvtListenerHelper::processDictionaryEvent( bool DicEvtListenerHelper::AddDicListEvtListener( - const uno::Reference< XDictionaryListEventListener >& xListener, - bool /*bReceiveVerbose*/ ) + const uno::Reference< XDictionaryListEventListener >& xListener ) { DBG_ASSERT( xListener.is(), "empty reference" ); sal_Int32 nCount = aDicListEvtListeners.getLength(); @@ -474,8 +472,7 @@ sal_Bool SAL_CALL DicList::addDictionaryListEventListener( bool bRes = false; if (xListener.is()) //! don't add empty references { - bRes = mxDicEvtLstnrHelper-> - AddDicListEvtListener( xListener, bReceiveVerbose ); + bRes = mxDicEvtLstnrHelper->AddDicListEvtListener( xListener ); } return bRes; } @@ -711,7 +708,7 @@ uno::Sequence< OUString > DicList::getSupportedServiceNames_Static() throw() } void * SAL_CALL DicList_getFactory( const sal_Char * pImplName, - XMultiServiceFactory * pServiceManager, void * ) + XMultiServiceFactory * pServiceManager ) { void * pRet = nullptr; if ( DicList::getImplementationName_Static().equalsAscii( pImplName ) ) diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx index a86813acb07d..6b2540ab18ab 100644 --- a/linguistic/source/gciterator.cxx +++ b/linguistic/source/gciterator.cxx @@ -1139,8 +1139,7 @@ static uno::Reference< uno::XInterface > SAL_CALL GrammarCheckingIterator_create void * SAL_CALL GrammarCheckingIterator_getFactory( const sal_Char *pImplName, - lang::XMultiServiceFactory *pServiceManager, - void * /*pRegistryKey*/ ) + lang::XMultiServiceFactory *pServiceManager ) { void * pRet = nullptr; if ( GrammarCheckingIterator_getImplementationName().equalsAscii( pImplName ) ) diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx index 96908dd1ac73..8a7cfb4d7dca 100644 --- a/linguistic/source/lngopt.cxx +++ b/linguistic/source/lngopt.cxx @@ -451,7 +451,7 @@ Locale LinguProps::getPropertyLocale(const OUString& aPropertyName) } void * SAL_CALL LinguProps_getFactory( const sal_Char * pImplName, - XMultiServiceFactory *pServiceManager, void * ) + XMultiServiceFactory *pServiceManager ) { void * pRet = nullptr; if ( LinguProps::getImplementationName_Static().equalsAscii( pImplName ) ) diff --git a/linguistic/source/lngreg.cxx b/linguistic/source/lngreg.cxx index 16f8bf1da4ef..dee7d0f97d6c 100644 --- a/linguistic/source/lngreg.cxx +++ b/linguistic/source/lngreg.cxx @@ -32,37 +32,32 @@ extern "C" { SAL_DLLPUBLIC_EXPORT void * SAL_CALL lng_component_getFactory( - const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) + const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = LngSvcMgr_getFactory( pImplName, - static_cast< XMultiServiceFactory * >( pServiceManager ), - pRegistryKey ); + static_cast< XMultiServiceFactory * >( pServiceManager ) ); if(!pRet) pRet = LinguProps_getFactory( pImplName, - static_cast< XMultiServiceFactory * >( pServiceManager ), - pRegistryKey ); + static_cast< XMultiServiceFactory * >( pServiceManager ) ); if(!pRet) pRet = DicList_getFactory( pImplName, - static_cast< XMultiServiceFactory * >( pServiceManager ), - pRegistryKey ); + static_cast< XMultiServiceFactory * >( pServiceManager ) ); if(!pRet) pRet = ConvDicList_getFactory( pImplName, - static_cast< XMultiServiceFactory * >( pServiceManager ), - pRegistryKey ); + static_cast< XMultiServiceFactory * >( pServiceManager ) ); if(!pRet) pRet = GrammarCheckingIterator_getFactory( pImplName, - static_cast< XMultiServiceFactory * >( pServiceManager ), - pRegistryKey ); + static_cast< XMultiServiceFactory * >( pServiceManager ) ); return pRet; } } diff --git a/linguistic/source/lngreg.hxx b/linguistic/source/lngreg.hxx index 370e079ba1d0..fb6800ab1c8d 100644 --- a/linguistic/source/lngreg.hxx +++ b/linguistic/source/lngreg.hxx @@ -31,36 +31,31 @@ namespace com { namespace sun { namespace star { namespace lang { extern void * SAL_CALL LngSvcMgr_getFactory ( const sal_Char * pImplName, - css::lang::XMultiServiceFactory * pServiceManager, - void * /*pRegistryKey*/ + css::lang::XMultiServiceFactory * pServiceManager ); extern void * SAL_CALL DicList_getFactory ( const sal_Char * pImplName, - css::lang::XMultiServiceFactory * pServiceManager, - void * + css::lang::XMultiServiceFactory * pServiceManager ); void * SAL_CALL LinguProps_getFactory ( const sal_Char * pImplName, - css::lang::XMultiServiceFactory * pServiceManager, - void * + css::lang::XMultiServiceFactory * pServiceManager ); extern void * SAL_CALL ConvDicList_getFactory ( const sal_Char * pImplName, - css::lang::XMultiServiceFactory * pServiceManager, - void * + css::lang::XMultiServiceFactory * pServiceManager ); extern void * SAL_CALL GrammarCheckingIterator_getFactory ( const sal_Char * pImplName, - css::lang::XMultiServiceFactory * pServiceManager, - void * + css::lang::XMultiServiceFactory * pServiceManager ); #endif diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index 380b30f61acf..dbaf1de9c0d6 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -1988,8 +1988,7 @@ uno::Reference< uno::XInterface > SAL_CALL LngSvcMgr_CreateInstance( void * SAL_CALL LngSvcMgr_getFactory( const sal_Char * pImplName, - lang::XMultiServiceFactory * pServiceManager, - void * /*pRegistryKey*/ ) + lang::XMultiServiceFactory * pServiceManager ) { void * pRet = nullptr; diff --git a/lotuswordpro/source/filter/lwpfribframe.cxx b/lotuswordpro/source/filter/lwpfribframe.cxx index a257284b8618..5cbeb319265e 100644 --- a/lotuswordpro/source/filter/lwpfribframe.cxx +++ b/lotuswordpro/source/filter/lwpfribframe.cxx @@ -228,7 +228,7 @@ void LwpFribRubyFrame::RegisterStyle(LwpFoundry* pFoundry) * @descr: convert Ruby frame * */ -void LwpFribRubyFrame::XFConvert(XFContentContainer* /*pCont*/) +void LwpFribRubyFrame::XFConvert() { LwpRubyLayout* pLayout = GetLayout(); if (pLayout) diff --git a/lotuswordpro/source/filter/lwpfribframe.hxx b/lotuswordpro/source/filter/lwpfribframe.hxx index 85c25bca3b62..a4a43341ab30 100644 --- a/lotuswordpro/source/filter/lwpfribframe.hxx +++ b/lotuswordpro/source/filter/lwpfribframe.hxx @@ -86,7 +86,7 @@ public: void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) override; LwpRubyLayout* GetLayout(); void RegisterStyle(LwpFoundry* pFoundry) override; - void XFConvert(XFContentContainer* pCont); + void XFConvert(); private: LwpObjectID m_objLayout; }; diff --git a/lotuswordpro/source/filter/lwpfribptr.cxx b/lotuswordpro/source/filter/lwpfribptr.cxx index 304678ebfc2e..e02c58950037 100644 --- a/lotuswordpro/source/filter/lwpfribptr.cxx +++ b/lotuswordpro/source/filter/lwpfribptr.cxx @@ -349,7 +349,7 @@ void LwpFribPtr::XFConvert() case FRIB_TAG_RUBYFRAME: { LwpFribRubyFrame* rubyfrmeFrib = static_cast<LwpFribRubyFrame*>(pFrib); - rubyfrmeFrib->XFConvert(m_pXFPara); + rubyfrmeFrib->XFConvert(); break; } default : |