[Libreoffice-commits] core.git: Changes to 'refs/changes/28/7328/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/28/7328/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/28/7328/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/29/7329/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/29/7329/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/27/7327/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/27/7327/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/27/7327/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/49/10149/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/04/4604/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/04/4604/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/32/2332/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/32/2332/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/32/2332/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svtools include/svx include/unotest svtools/source svx/source unotest/source unusedcode.easy
include/svtools/toolpanel/toolpaneldeck.hxx |1 - include/svx/dialcontrol.hxx |2 -- include/unotest/bootstrapfixturebase.hxx |3 --- svtools/source/toolpanel/toolpaneldeck.cxx |6 -- svx/source/dialog/dialcontrol.cxx|5 - svx/source/sidebar/line/LineWidthControl.cxx |8 svx/source/sidebar/line/LineWidthControl.hxx |1 - unotest/source/cpp/bootstrapfixturebase.cxx |6 -- unusedcode.easy |4 9 files changed, 36 deletions(-) New commits: commit db27efd29761a87fe3ab946c99c18530e828e58a Author: Petr Vorel petr.vo...@gmail.com Date: Thu Jan 9 08:52:53 2014 +0100 removed some unused code (svx, svtools, unotest) Change-Id: I1250581d69423030bd0a93a1529458b8d424ce3e Reviewed-on: https://gerrit.libreoffice.org/7329 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/include/svtools/toolpanel/toolpaneldeck.hxx b/include/svtools/toolpanel/toolpaneldeck.hxx index 8ba584b..3ad4fcd 100644 --- a/include/svtools/toolpanel/toolpaneldeck.hxx +++ b/include/svtools/toolpanel/toolpaneldeck.hxx @@ -155,7 +155,6 @@ namespace svt Calling this method has no effect if CreateAccessible had always been called. */ -voidSetAccessibleParentWindow( ::Window* i_pAccessibleParent ); ::Window* GetAccessibleParentWindow() const; // IToolPanelDeck diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx index f50cb59..06fecd1 100644 --- a/include/svx/dialcontrol.hxx +++ b/include/svx/dialcontrol.hxx @@ -119,8 +119,6 @@ public: /** The passed handler is called whenever the totation value changes. */ voidSetModifyHdl( const Link rLink ); -/** Returns the current modify handler. */ -const Link GetModifyHdl() const; /** Save value for later comparison */ voidSaveValue(); diff --git a/include/unotest/bootstrapfixturebase.hxx b/include/unotest/bootstrapfixturebase.hxx index c447f4f..d69be43 100644 --- a/include/unotest/bootstrapfixturebase.hxx +++ b/include/unotest/bootstrapfixturebase.hxx @@ -62,12 +62,9 @@ public: // return a Path to a given c-str path from the source directory OUString getPathFromSrc( const char *pPath ); - // return a URL to a given c-str path from the workdir directory OUString getURLFromWorkdir( const char *pPath ); - // return a Path to a given c-str path from the workdir directory - OUString getPathFromWorkdir( const char *pPath ); virtual void setUp(); virtual void tearDown(); diff --git a/svtools/source/toolpanel/toolpaneldeck.cxx b/svtools/source/toolpanel/toolpaneldeck.cxx index 81b6dac..92cbc87 100644 --- a/svtools/source/toolpanel/toolpaneldeck.cxx +++ b/svtools/source/toolpanel/toolpaneldeck.cxx @@ -516,12 +516,6 @@ namespace svt } // -void ToolPanelDeck::SetAccessibleParentWindow( Window* i_pAccessibleParent ) -{ -m_pImpl-SetAccessibleParentWindow( i_pAccessibleParent ); -} - -// Window* ToolPanelDeck::GetAccessibleParentWindow() const { Window* pAccessibleParent( m_pImpl-GetAccessibleParentWindow() ); diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx index 4a780a6..2e21ec9 100644 --- a/svx/source/dialog/dialcontrol.cxx +++ b/svx/source/dialog/dialcontrol.cxx @@ -432,11 +432,6 @@ void DialControl::SetModifyHdl( const Link rLink ) mpImpl-maModifyHdl = rLink; } -const Link DialControl::GetModifyHdl() const -{ -return mpImpl-maModifyHdl; -} - // private void DialControl::Init( const Size rWinSize, const Font rWinFont ) diff --git a/svx/source/sidebar/line/LineWidthControl.cxx b/svx/source/sidebar/line/LineWidthControl.cxx index 816f34e..7db6d4c 100644 --- a/svx/source/sidebar/line/LineWidthControl.cxx +++ b/svx/source/sidebar/line/LineWidthControl.cxx @@ -192,14 +192,6 @@ void LineWidthControl::GetFocus() -ValueSet LineWidthControl::GetValueSet() -{ -return maVSWidth; -} - - - - void LineWidthControl::SetWidthSelect( long lValue, bool bValuable, SfxMapUnit eMapUnit) { mbVSFocus = true; diff --git a/svx/source/sidebar/line/LineWidthControl.hxx b/svx/source/sidebar/line/LineWidthControl.hxx index e4060f9..b9808f1 100644 --- a/svx/source/sidebar/line/LineWidthControl.hxx +++ b/svx/source/sidebar/line/LineWidthControl.hxx @@ -38,7 +38,6 @@ public: virtual void Paint(const Rectangle rect); void SetWidthSelect( long lValue, bool bValuable, SfxMapUnit eMapUnit); -ValueSet GetValueSet(); bool IsCloseByEdit(); long GetTmpCustomWidth(); diff --git a/unotest/source/cpp
[Libreoffice-commits] core.git: unusedcode.easy
unusedcode.easy | 30 -- 1 file changed, 30 deletions(-) New commits: commit 92bc402aa9e036d2ab4fb64a89f351d7cee89495 Author: Petr Vorel petr.vo...@gmail.com Date: Thu Jan 9 08:38:08 2014 +0100 cleanup already removed items from unusedcode.easy Change-Id: I36648ef659e5d6a49ecd4874826bed009b5296e3 Reviewed-on: https://gerrit.libreoffice.org/7328 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/unusedcode.easy b/unusedcode.easy index 35f844a..5c244f6 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -180,33 +180,3 @@ svx::sidebar::LineWidthControl::GetValueSet() test::BootstrapFixtureBase::getPathFromWorkdir(char const*) utl::toISO8601(com::sun::star::util::Time const) vclmain::createApplication() -writerfilter::doctok::CpAndFc::CpAndFc(writerfilter::doctok::Cp const, writerfilter::doctok::Fc const, writerfilter::doctok::PropertyType) -writerfilter::doctok::DffBlock::DffBlock(writerfilter::doctok::WW8Stream, unsigned int, unsigned int, unsigned int) -writerfilter::doctok::DffBlock::getBlip(unsigned int) -writerfilter::doctok::DffBlock::getShape(unsigned int) -writerfilter::doctok::DffOPT::get_extraoffset(unsigned int) -writerfilter::doctok::DffRecord::DffRecord(writerfilter::doctok::WW8Stream, unsigned int, unsigned int) -writerfilter::doctok::DffRecord::DffRecord(writerfilter::doctok::WW8StructBase*, unsigned int, unsigned int) -writerfilter::doctok::DffRecord::calcSize() const -writerfilter::doctok::DffRecord::getShapeBid() -writerfilter::doctok::DffRecord::getShapeId() -writerfilter::doctok::WW8FOPTE::get_stringValue() -writerfilter::doctok::WW8FontTable::getEntry(unsigned int) -writerfilter::doctok::WW8FontTable::getEntryCount() -writerfilter::doctok::WW8LFOLevel::calcSize() -writerfilter::doctok::WW8LFOTable::getEntry(unsigned int) -writerfilter::doctok::WW8LFOTable::getEntryCount() -writerfilter::doctok::WW8ListTable::getEntry(unsigned int) -writerfilter::doctok::WW8ListTable::getEntryCount() -writerfilter::doctok::WW8PICF::get_DffRecord() -writerfilter::doctok::WW8PICF::get_ffdata() -writerfilter::doctok::WW8SttbRgtplc::getEntry(unsigned int) -writerfilter::doctok::WW8SttbRgtplc::getEntryCount() -writerfilter::doctok::WW8SttbTableResource::WW8SttbTableResource(boost::shared_ptrwriterfilter::doctok::WW8Sttbf) -writerfilter::doctok::WW8Sttbf::WW8Sttbf(writerfilter::doctok::WW8Stream, unsigned int, unsigned int) -writerfilter::doctok::WW8StyleSheet::getEntry(unsigned int) -writerfilter::doctok::WW8StyleSheet::getEntryCount() -writerfilter::dump(writerfilter::OutputWithDepthstd::basic_stringchar, std::char_traitschar, std::allocatorchar , char const*, boost::shared_ptrwriterfilter::Referencewriterfilter::BinaryObj ) -writerfilter::dump(writerfilter::OutputWithDepthstd::basic_stringchar, std::char_traitschar, std::allocatorchar , char const*, boost::shared_ptrwriterfilter::Referencewriterfilter::Properties ) -writerfilter::dump(writerfilter::OutputWithDepthstd::basic_stringchar, std::char_traitschar, std::allocatorchar , char const*, rtl::OUString const) -writerfilter::dump(writerfilter::OutputWithDepthstd::basic_stringchar, std::char_traitschar, std::allocatorchar , char const*, unsigned int) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: unusedcode.easy writerfilter/source
unusedcode.easy |1 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 10 -- writerfilter/source/ooxml/OOXMLFastContextHandler.hxx |2 - writerfilter/source/ooxml/OOXMLFastHelper.hxx | 28 -- writerfilter/source/ooxml/factoryimpl_ns.xsl | 10 -- 5 files changed, 51 deletions(-) New commits: commit 957676441635d236743b61ccb74128821d07d0d0 Author: Petr Vorel petr.vo...@gmail.com Date: Thu Jan 9 08:35:11 2014 +0100 remove unused code from writerfilter Not sure whether void OOXMLFastHelperT::mark(OOXMLFastContextHandler * pHandler, Id nId, const OUString rValue) is really unused (tested on linux build seems to be unused). If it IS unused the commit should NOT be included and writerfilter::ooxml::OOXMLFastContextHandler::mark(unsigned int const, boost::shared_ptrwriterfilter::ooxml::OOXMLValue) is to be put into unusedcode.exclude. Change-Id: I5ae08427e62f89df3d4112486837d8eb5fa752f0 Reviewed-on: https://gerrit.libreoffice.org/7327 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/unusedcode.easy b/unusedcode.easy index 6eb8fa6..35f844a 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -210,4 +210,3 @@ writerfilter::dump(writerfilter::OutputWithDepthstd::basic_stringchar, std::ch writerfilter::dump(writerfilter::OutputWithDepthstd::basic_stringchar, std::char_traitschar, std::allocatorchar , char const*, boost::shared_ptrwriterfilter::Referencewriterfilter::Properties ) writerfilter::dump(writerfilter::OutputWithDepthstd::basic_stringchar, std::char_traitschar, std::allocatorchar , char const*, rtl::OUString const) writerfilter::dump(writerfilter::OutputWithDepthstd::basic_stringchar, std::char_traitschar, std::allocatorchar , char const*, unsigned int) -writerfilter::ooxml::OOXMLFastContextHandler::mark(unsigned int const, boost::shared_ptrwriterfilter::ooxml::OOXMLValue) diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index 2d192ad..b1af30f 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -550,16 +550,6 @@ Token_t OOXMLFastContextHandler::getToken() const return mnToken; } -void OOXMLFastContextHandler::mark(const Id rId, OOXMLValue::Pointer_t pVal) -{ -OOXMLPropertySetImpl::Pointer_t pPropSet(new OOXMLPropertySetImpl()); -OOXMLPropertyImpl::Pointer_t pProperty -(new OOXMLPropertyImpl(rId, pVal, OOXMLPropertyImpl::ATTRIBUTE)); - -pPropSet-add(pProperty); -mpStream-props(pPropSet); -} - void OOXMLFastContextHandler::setParent (OOXMLFastContextHandler * pParent) { diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx index 86a3b25..c5909bf 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx @@ -151,8 +151,6 @@ public: virtual void setToken(Token_t nToken); virtual Token_t getToken() const; -void mark(const Id rId, OOXMLValue::Pointer_t pVal); - void resolveFootnote(const sal_Int32 nId); void resolveEndnote(const sal_Int32 nId); void resolveComment(const sal_Int32 nId); diff --git a/writerfilter/source/ooxml/OOXMLFastHelper.hxx b/writerfilter/source/ooxml/OOXMLFastHelper.hxx index 7198494..9a5f941 100644 --- a/writerfilter/source/ooxml/OOXMLFastHelper.hxx +++ b/writerfilter/source/ooxml/OOXMLFastHelper.hxx @@ -52,10 +52,6 @@ public: static void newProperty(OOXMLFastContextHandler * pHandler, Id nId, sal_Int32 nValue); -static void mark(OOXMLFastContextHandler * pHandler, - Id nId, - const OUString rValue); - static void attributes (OOXMLFastContextHandler * pContext, const uno::Reference xml::sax::XFastAttributeList Attribs); @@ -216,30 +212,6 @@ void OOXMLFastHelperT::newProperty(OOXMLFastContextHandler * pHandler, pHandler-newProperty(nId, pVal); } -template class T -void OOXMLFastHelperT::mark(OOXMLFastContextHandler * pHandler, - Id nId, - const OUString rValue) -{ -OOXMLValue::Pointer_t pVal(new T(rValue)); - -#ifdef DEBUG_HELPER -string aStr = (*QNameToString::Instance())(nId); - -debug_logger-startElement(helper.mark); -debug_logger-attribute(name, aStr); -debug_logger-attribute(value, -OUStringToOString -(rValue, RTL_TEXTENCODING_ASCII_US).getStr()); - -if (aStr.empty()) -debug_logger-element(unknown-qname); - -debug_logger-endElement(); -#endif - -pHandler-mark(nId, pVal); -} }} #endif // INCLUDED_FAST_HELPER_HXX diff --git a/writerfilter/source/ooxml/factoryimpl_ns.xsl b/writerfilter
[Libreoffice-commits] core.git: sd/source unotest/source unusedcode.easy
sd/source/ui/remotecontrol/BluetoothServer.cxx |5 - sd/source/ui/view/ViewShellBase.cxx|7 --- unotest/source/cpp/bootstrapfixturebase.cxx| 12 unusedcode.easy|3 --- 4 files changed, 27 deletions(-) New commits: commit 6a59659541e45198b8cda162f87f6abcd68c6101 Author: Petr Vorel petr.vo...@gmail.com Date: Thu Jun 27 21:36:48 2013 +0200 Remove unused code Change-Id: Id789250d6aeae642ef5c712e33c5583628638218 Reviewed-on: https://gerrit.libreoffice.org/4604 Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx index ce8bc3c..37836ee 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.cxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx @@ -274,11 +274,6 @@ bluezDetachCloseSocket( GMainContext *pContext, GPollFD *pSocketFD ) #endif // LINUX_BLUETOOTH -void BluetoothServer::addCommunicator( Communicator* pCommunicator ) -{ -mpCommunicators-push_back( pCommunicator ); -} - #if defined(MACOSX) OSXBluetoothWrapper::OSXBluetoothWrapper( IOBluetoothRFCOMMChannel* channel ) : diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 66707c3..b1e671fa 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -223,13 +223,6 @@ TYPEINIT1(ViewShellBase, SfxViewShell); // new ViewShellBase object has been constructed. SfxViewFactory* ViewShellBase::pFactory; -SfxViewShell* ViewShellBase::CreateInstance ( -SfxViewFrame *pFrame, SfxViewShell *pOldView) -{ -ViewShellBase* pBase = new ViewShellBase(pFrame, pOldView); -pBase-LateInit(); -return pBase; -} SFX_IMPL_INTERFACE(ViewShellBase, SfxViewShell, SdResId(0)) { diff --git a/unotest/source/cpp/bootstrapfixturebase.cxx b/unotest/source/cpp/bootstrapfixturebase.cxx index 2192b79..1ffab1e 100644 --- a/unotest/source/cpp/bootstrapfixturebase.cxx +++ b/unotest/source/cpp/bootstrapfixturebase.cxx @@ -76,18 +76,6 @@ OUString test::BootstrapFixtureBase::getPathFromSrc( const char *pPath ) return m_aSrcRootPath + OUString::createFromAscii( pPath ); } - -OUString test::BootstrapFixtureBase::getURLFromWorkdir( const char *pPath ) -{ -return m_aWorkdirRootURL + OUString::createFromAscii( pPath ); -} - -OUString test::BootstrapFixtureBase::getPathFromWorkdir( const char *pPath ) -{ -return m_aWorkdirRootPath + OUString::createFromAscii( pPath ); - -} - void test::BootstrapFixtureBase::setUp() { // set UserInstallation to user profile dir in test/user-template diff --git a/unusedcode.easy b/unusedcode.easy index 8a9bec0..50ec494 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -43,6 +43,3 @@ sd::BluetoothServer::addCommunicator(sd::Communicator*) sd::LeftDrawPaneShell::RegisterInterface(SfxModule*) sd::LeftImpressPaneShell::RegisterInterface(SfxModule*) sd::ToolPanelPaneShell::RegisterInterface(SfxModule*) -sd::ViewShellBase::CreateInstance(SfxViewFrame*, SfxViewShell*) -test::BootstrapFixtureBase::getPathFromWorkdir(char const*) -test::BootstrapFixtureBase::getURLFromWorkdir(char const*) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Subject: [PATCH] better usability of Import CSV dialog
Hi there, import CSV dialog window has two list boxes - language and charset. Both show just 6 options which seems to me quite uncomfortable to use. Could you please increase a bit their height? My patch does that, but maybe too much - both show 28 items now, but still fit into main dialog window (might have problems on some small resolutions), but making them even a bit higher would be nice. PS: Not sure if this is not waiting for rewriting https://wiki.documentfoundation.org/Development/WidgetLayout#ListBoxes_and_ComboBoxes Regards, Petr From 41b8a9d6c6735b9d9adfae2ed90ddba2ea0e8706 Mon Sep 17 00:00:00 2001 From: Petr Vorel petr.vo...@gmail.com Date: Thu, 14 Feb 2013 19:06:46 +0100 Subject: [PATCH] better usability of Import CSV dialog display more items in import CSV dialog window in list boxes Character set and Language (from current 6 to 28) Change-Id: Ibbc554c6574ff635f8284914b948827453375062 --- sc/source/ui/dbgui/asciiopt.src |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sc/source/ui/dbgui/asciiopt.src b/sc/source/ui/dbgui/asciiopt.src index f03c1ce..410bb26 100644 --- a/sc/source/ui/dbgui/asciiopt.src +++ b/sc/source/ui/dbgui/asciiopt.src @@ -65,7 +65,7 @@ ModalDialog RID_SCDLG_ASCII { HelpID = sc:ListBox:RID_SCDLG_ASCII:LB_CHARSET; Pos = MAP_APPFONT ( 76 , 14 ) ; -Size = MAP_APPFONT ( 130 , 61 ) ; +Size = MAP_APPFONT ( 130 , 250 ) ; TabStop = TRUE ; DropDown = TRUE ; Sort = TRUE; @@ -82,7 +82,7 @@ ModalDialog RID_SCDLG_ASCII { HelpID = sc:ListBox:RID_SCDLG_ASCII:LB_CUSTOMLANG; Pos = MAP_APPFONT ( 76 , 30 ) ; -Size = MAP_APPFONT ( 130 , 61 ) ; +Size = MAP_APPFONT ( 130 , 250 ) ; TabStop = TRUE ; DropDown = TRUE ; Sort = TRUE; -- 1.7.10.4 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fix duplicated import introduced in 63c508e3e86a140e35161c45d2be97779746f6cb
Hi there, there is tiny patch removing duplicity in import of python fax script. Regards, Petr From f55d2538eb844bb8a7e38314acf9d0eccf48f243 Mon Sep 17 00:00:00 2001 From: Petr Vorel petr.vo...@gmail.com Date: Sat, 11 Aug 2012 01:19:40 +0200 Subject: [PATCH] fix duplicated import introduced in 63c508e3e86a140e35161c45d2be97779746f6cb Change-Id: I07a90b15450d1150e70280f83f310c2efec585d1 --- wizards/com/sun/star/wizards/ui/event/ListModelBinder.py |1 - 1 file changed, 1 deletion(-) diff --git a/wizards/com/sun/star/wizards/ui/event/ListModelBinder.py b/wizards/com/sun/star/wizards/ui/event/ListModelBinder.py index 64d3841..c4f26f4 100644 --- a/wizards/com/sun/star/wizards/ui/event/ListModelBinder.py +++ b/wizards/com/sun/star/wizards/ui/event/ListModelBinder.py @@ -16,7 +16,6 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # from wizards.common.Helper import Helper -from wizards.common.Helper import Helper class ListModelBinder(object): -- 1.7.10.4 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] remove unused code (oox)
Hi there, removed unused classes from oox. Regards, Petr From b4350501d1fe85da2cce5750b480e33eb6409301 Mon Sep 17 00:00:00 2001 From: Petr Vorel petr.vo...@gmail.com Date: Mon, 2 Apr 2012 11:40:06 +0200 Subject: [PATCH] remove unused code (oox) --- oox/inc/oox/dump/dumperbase.hxx | 18 -- oox/inc/oox/dump/oledumper.hxx | 21 --- oox/source/dump/dumperbase.cxx | 107 oox/source/dump/oledumper.cxx | 114 --- unusedcode.easy | 17 -- 5 files changed, 0 insertions(+), 277 deletions(-) diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx index 7f18220..a099886 100644 --- a/oox/inc/oox/dump/dumperbase.hxx +++ b/oox/inc/oox/dump/dumperbase.hxx @@ -395,7 +395,6 @@ public: // token list - static void appendToken( ::rtl::OUStringBuffer rStr, const ::rtl::OUString rToken, sal_Unicode cSep = OOX_DUMP_LISTSEP ); -static void appendToken( ::rtl::OUStringBuffer rStr, sal_Int64 nToken, sal_Unicode cSep = OOX_DUMP_LISTSEP ); static void appendIndex( ::rtl::OUStringBuffer rStr, const ::rtl::OUString rIdx ); static void appendIndex( ::rtl::OUStringBuffer rStr, sal_Int64 nIdx ); @@ -1074,9 +1073,6 @@ public: voidwriteColRowRange( sal_Int32 nColRow1, sal_Int32 nColRow2 ); voidwriteColRange( sal_Int32 nCol1, sal_Int32 nCol2 ); voidwriteRowRange( sal_Int32 nRow1, sal_Int32 nRow2 ); -voidwriteAddress( const Address rPos ); -voidwriteRange( const Range rRange ); -voidwriteRangeList( const RangeList rRanges ); template typename Type inline void writeDec( Type nData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' ) @@ -1349,17 +1345,6 @@ protected: voidwriteArrayItem( const String rName, const sal_uInt8* pnData, sal_Size nSize, sal_Unicode cSep = OOX_DUMP_LISTSEP ); voidwriteDateTimeItem( const String rName, const ::com::sun::star::util::DateTime rDateTime ); voidwriteGuidItem( const String rName, const ::rtl::OUString rGuid ); -voidwriteColIndexItem( const String rName, sal_Int32 nCol ); -voidwriteRowIndexItem( const String rName, sal_Int32 nRow ); -voidwriteColRangeItem( const String rName, sal_Int32 nCol1, sal_Int32 nCol2 ); -voidwriteRowRangeItem( const String rName, sal_Int32 nRow1, sal_Int32 nRow2 ); -voidwriteAddressItem( const String rName, const Address rPos ); -voidwriteRangeItem( const String rName, const Range rRange ); -voidwriteRangeListItem( const String rName, const RangeList rRanges ); -voidwriteTokenAddressItem( const String rName, const TokenAddress rPos, bool bNameMode ); -voidwriteTokenAddress3dItem( const String rName, const ::rtl::OUString rRef, const TokenAddress rPos, bool bNameMode ); -voidwriteTokenRangeItem( const String rName, const TokenRange rRange, bool bNameMode ); -voidwriteTokenRange3dItem( const String rName, const ::rtl::OUString rRef, const TokenRange rRange, bool bNameMode ); template typename Type voidaddNameToItem( Type nData, const NameListWrapper rListWrp ); @@ -1753,9 +1738,6 @@ protected: const OutputObjectBase rParent, const BinaryInputStreamRef rxStrm, rtl_TextEncoding eTextEnc ); -voidconstruct( -const InputObjectBase rParent, -rtl_TextEncoding eTextEnc ); virtual boolimplIsValid() const; virtual voidimplDump(); diff --git a/oox/inc/oox/dump/oledumper.hxx b/oox/inc/oox/dump/oledumper.hxx index 4d3ceaa..64d3d5c 100644 --- a/oox/inc/oox/dump/oledumper.hxx +++ b/oox/inc/oox/dump/oledumper.hxx @@ -84,27 +84,6 @@ protected: }; // - -class StdHlinkObject : public OleInputObjectBase -{ -public: -explicitStdHlinkObject( const InputObjectBase rParent ); - -protected: -virtual voidimplDump(); - -private: -::rtl::OUString dumpHyperlinkString( const String rName, bool bUnicode ); - -booldumpGuidAndMoniker(); -voiddumpUrlMoniker(); -voiddumpFileMoniker(); -voiddumpItemMoniker(); -voiddumpAntiMoniker(); -voiddumpCompositeMoniker
[PATCH] remove unused code (oox)
Hi there, removed unused methods, hope better this time. Regards, Petr From 2d8c47fede9ec6842a98663f16c4efa70f833e22 Mon Sep 17 00:00:00 2001 From: Petr Vorel petr.vo...@gmail.com Date: Thu, 29 Mar 2012 11:54:36 +0200 Subject: [PATCH] remove unused code (oox) --- oox/inc/oox/dump/dffdumper.hxx |1 - oox/inc/oox/dump/dumperbase.hxx | 10 -- oox/inc/oox/dump/oledumper.hxx |1 - oox/inc/oox/ole/vbaprojectfilter.hxx |5 --- oox/source/dump/dffdumper.cxx|6 oox/source/dump/dumperbase.cxx | 53 -- oox/source/dump/oledumper.cxx|5 --- oox/source/ole/vbaprojectfilter.cxx |5 --- unusedcode.easy | 12 --- 9 files changed, 0 insertions(+), 98 deletions(-) diff --git a/oox/inc/oox/dump/dffdumper.hxx b/oox/inc/oox/dump/dffdumper.hxx index 10f84f3..de0913f 100644 --- a/oox/inc/oox/dump/dffdumper.hxx +++ b/oox/inc/oox/dump/dffdumper.hxx @@ -49,7 +49,6 @@ protected: inline explicit DffStreamObject() {} using SequenceRecordObjectBase::construct; -voidconstruct( const OutputObjectBase rParent, const BinaryInputStreamRef rxStrm ); virtual boolimplReadRecordHeader( BinaryInputStream rBaseStrm, sal_Int64 ornRecId, sal_Int64 ornRecSize ); virtual voidimplWriteExtHeader(); diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx index a8b16b0..0dd1abc 100644 --- a/oox/inc/oox/dump/dumperbase.hxx +++ b/oox/inc/oox/dump/dumperbase.hxx @@ -231,7 +231,6 @@ struct ItemFormat explicitItemFormat(); voidset( DataType eDataType, FormatType eFmtType, const ::rtl::OUString rItemName ); -voidset( DataType eDataType, FormatType eFmtType, const ::rtl::OUString rItemName, const ::rtl::OUString rListName ); /** Initializes the struct from a vector of strings containing the item format. @@ -398,7 +397,6 @@ public: static void appendToken( ::rtl::OUStringBuffer rStr, const ::rtl::OUString rToken, sal_Unicode cSep = OOX_DUMP_LISTSEP ); static void appendToken( ::rtl::OUStringBuffer rStr, sal_Int64 nToken, sal_Unicode cSep = OOX_DUMP_LISTSEP ); static void prependToken( ::rtl::OUStringBuffer rStr, const ::rtl::OUString rToken, sal_Unicode cSep = OOX_DUMP_LISTSEP ); -static void prependToken( ::rtl::OUStringBuffer rStr, sal_Int64 nToken, sal_Unicode cSep = OOX_DUMP_LISTSEP ); static void appendIndex( ::rtl::OUStringBuffer rStr, const ::rtl::OUString rIdx ); static void appendIndex( ::rtl::OUStringBuffer rStr, sal_Int64 nIdx ); @@ -1047,11 +1045,9 @@ public: voidincIndent(); voiddecIndent(); -voidresetIndent(); voidstartTable( sal_Int32 nW1 ); voidstartTable( sal_Int32 nW1, sal_Int32 nW2 ); -voidstartTable( sal_Int32 nW1, sal_Int32 nW2, sal_Int32 nW3 ); voidstartTable( sal_Int32 nW1, sal_Int32 nW2, sal_Int32 nW3, sal_Int32 nW4 ); voidstartTable( size_t nColCount, const sal_Int32* pnColWidths ); voidtab(); @@ -1209,8 +1205,6 @@ public: explicitStorageIterator( const StorageRef rxStrg ); virtual ~StorageIterator(); -size_t getElementCount() const; - StorageIteratoroperator++(); ::rtl::OUString getName() const; @@ -1251,8 +1245,6 @@ protected: // -voidreconstructConfig( const ConfigRef rxConfig ); - inline Config cfg() const { return *mxConfig; } private: @@ -1564,8 +1556,6 @@ protected: ::rtl::OUString dumpNullCharArray( const String rName, rtl_TextEncoding eTextEnc ); ::rtl::OUString dumpNullUnicodeArray( const String rName ); -double dumpRk( const String rName = EMPTY_STRING ); -sal_Int32 dumpColorABGR( const String rName = EMPTY_STRING ); ::com::sun::star::util::DateTime dumpFileTime( const String rName = EMPTY_STRING ); ::rtl::OUString dumpGuid( const String rName = EMPTY_STRING ); diff --git a/oox/inc/oox/dump/oledumper.hxx b/oox/inc/oox/dump/oledumper.hxx index 42abf2d..4d3ceaa 100644 --- a/oox/inc/oox/dump/oledumper.hxx +++ b/oox/inc/oox/dump/oledumper.hxx @@ -178,7 +178,6 @@ protected: using StorageObjectBase::construct; voidconstruct( const ObjectBase rParent, const StorageRef rxStrg, const ::rtl::OUString rSysPath ); -voidconstruct( const ObjectBase rParent ); virtual voidimplDumpStream( const ::com::sun::star::uno::Reference ::com::sun::star::io::XInputStream rxStrm, diff --git a/oox/inc/oox/ole/vbaprojectfilter.hxx
[PATCH] remove unused code (oox, sc)
Hi there, yet another remove unused code patch. Regards, Petr From 38a7f343736f7049d28aae132307eba02a019f27 Mon Sep 17 00:00:00 2001 From: Petr Vorel petr.vo...@gmail.com Date: Wed, 28 Mar 2012 11:20:18 +0200 Subject: [PATCH] remove unused code (oox, sc) --- oox/inc/oox/drawingml/textparagraphproperties.hxx |4 - oox/inc/oox/dump/dffdumper.hxx|2 - oox/inc/oox/dump/dumperbase.hxx | 13 oox/source/drawingml/textparagraphproperties.cxx | 25 oox/source/dump/dffdumper.cxx | 11 oox/source/dump/dumperbase.cxx| 65 - sd/source/filter/eppt/epptooxml.hxx |1 - sd/source/filter/eppt/pptx-epptooxml.cxx | 14 - unusedcode.easy | 14 - 9 files changed, 0 insertions(+), 149 deletions(-) diff --git a/oox/inc/oox/drawingml/textparagraphproperties.hxx b/oox/inc/oox/drawingml/textparagraphproperties.hxx index b2c5096..e037ff2 100644 --- a/oox/inc/oox/drawingml/textparagraphproperties.hxx +++ b/oox/inc/oox/drawingml/textparagraphproperties.hxx @@ -114,10 +114,6 @@ public: size can be zero and the default value is returned. */ float getCharHeightPoints( float fDefault ) const; -#if OSL_DEBUG_LEVEL 0 -void dump() const; -#endif - protected: TextCharacterProperties maTextCharacterProperties; diff --git a/oox/inc/oox/dump/dffdumper.hxx b/oox/inc/oox/dump/dffdumper.hxx index a23d071..10f84f3 100644 --- a/oox/inc/oox/dump/dffdumper.hxx +++ b/oox/inc/oox/dump/dffdumper.hxx @@ -49,7 +49,6 @@ protected: inline explicit DffStreamObject() {} using SequenceRecordObjectBase::construct; -voidconstruct( const ObjectBase rParent, const BinaryInputStreamRef rxStrm, const ::rtl::OUString rSysFileName ); voidconstruct( const OutputObjectBase rParent, const BinaryInputStreamRef rxStrm ); virtual boolimplReadRecordHeader( BinaryInputStream rBaseStrm, sal_Int64 ornRecId, sal_Int64 ornRecSize ); @@ -61,7 +60,6 @@ private: voidconstructDffObj(); sal_uInt32 dumpDffSimpleColor( const String rName ); -sal_uInt32 dumpDffColor( const String rName ); voiddumpDffOpt(); sal_uInt16 dumpDffOptPropHeader(); diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx index 5989c1e..68a4848 100644 --- a/oox/inc/oox/dump/dumperbase.hxx +++ b/oox/inc/oox/dump/dumperbase.hxx @@ -480,26 +480,18 @@ static const String EMPTY_STRING; class FormulaStack { public: -explicitFormulaStack(); - inline const ::rtl::OUString getFormulaString() const { return getString( maFmlaStack ); } inline const ::rtl::OUString getClassesString() const { return getString( maClassStack ); } voidpushOperand( const String rOp, const ::rtl::OUString rTokClass ); -voidpushOperand( const String rOp ); -voidpushUnaryOp( const String rLOp, const String rROp ); -voidpushBinaryOp( const String rOp ); -voidpushFuncOp( const String rFunc, const ::rtl::OUString rTokClass, sal_uInt8 nParamCount ); inline void setError() { mbError = true; } -voidreplaceOnTop( const ::rtl::OUString rOld, const ::rtl::OUString rNew ); private: typedef ::std::stack ::rtl::OUString StringStack; inline bool check( bool bCond ) { return (mbError |= !bCond) == false; } -const ::rtl::OUString getString( const StringStack rStack ) const; voidpushUnaryOp( StringStack rStack, const ::rtl::OUString rLOp, const ::rtl::OUString rROp ); voidpushBinaryOp( StringStack rStack, const ::rtl::OUString rOp ); voidpushFuncOp( StringStack rStack, const ::rtl::OUString rOp, sal_uInt8 nParamCount ); @@ -612,9 +604,6 @@ private: ::rtl::OUString orKey, ::rtl::OUString orData ) const; -LineTypereadConfigLine( -TextInputStream rStrm ) const; - voidprocessConfigItem( TextInputStream rStrm, const ::rtl::OUString rKey, @@ -1013,7 +1002,6 @@ public: template typename Type boolhasName( const NameListWrapper rListWrp, Type nKey ) const; -::com::sun::star::uno::Sequence ::com::sun::star::beans::NamedValue requestEncryptionData( ::comphelper::IDocPasswordVerifier rVerifier ); boolisPasswordCancelled() const; protected: @@ -1598,7 +1586,6 @@ protected: inline void dumpUnused( sal_Int32 nBytes ) { dumpArray( OOX_DUMP_UNUSED, nBytes ); } inline void dumpUnknown( sal_Int32 nBytes
Re: [PUSHED][PATCH] remove unused code (oox, sc)
FWIW, if a class has only one constructor and that constructor is unused then it indicates that the whole class (except perhaps for any static methods it might have) should be possible to be removed. Sorry, I'll think more next time. Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] remove unused code (oox, sc)
Hi there, another bits of unused code removed. Regards, Petr From e31c211d2ebb7cde8a260ec0bcef5359c0c1db8f Mon Sep 17 00:00:00 2001 From: Petr Vorel petr.vo...@gmail.com Date: Tue, 27 Mar 2012 11:03:09 +0200 Subject: [PATCH] remove unused code (oox, sc) --- oox/inc/oox/dump/dumperbase.hxx |4 -- oox/inc/oox/mathml/importutils.hxx|4 -- oox/inc/oox/ppt/pptshape.hxx |1 - oox/source/dump/dumperbase.cxx|5 --- oox/source/mathml/importutils.cxx | 10 - oox/source/ppt/pptshape.cxx |7 sc/source/filter/inc/addressconverter.hxx |1 - sc/source/filter/inc/biffoutputstream.hxx | 14 sc/source/filter/inc/sheetdatabuffer.hxx | 10 - sc/source/filter/oox/addressconverter.cxx |6 --- sc/source/filter/oox/biffoutputstream.cxx | 23 - sc/source/filter/oox/sheetdatabuffer.cxx | 52 + unusedcode.easy | 12 --- 13 files changed, 1 insertions(+), 148 deletions(-) diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx index 534776b..5989c1e 100644 --- a/oox/inc/oox/dump/dumperbase.hxx +++ b/oox/inc/oox/dump/dumperbase.hxx @@ -1860,10 +1860,6 @@ public: const BinaryInputStreamRef rxStrm, const ::rtl::OUString rSysFileName ); -explicitXmlStreamObject( -const OutputObjectBase rParent, -const BinaryInputStreamRef rxStrm ); - protected: virtual voidimplDumpText( TextInputStream rTextStrm ); }; diff --git a/oox/inc/oox/mathml/importutils.hxx b/oox/inc/oox/mathml/importutils.hxx index 9b90681..fc0e276 100644 --- a/oox/inc/oox/mathml/importutils.hxx +++ b/oox/inc/oox/mathml/importutils.hxx @@ -213,10 +213,6 @@ public: */ bool findTag( int token ); /** - Skips the given element (i.e. reads up to and including the matching closing tag). -*/ -void skipElement( int token ); -/** Handle the current (unexpected) tag. */ void handleUnexpectedTag(); diff --git a/oox/inc/oox/ppt/pptshape.hxx b/oox/inc/oox/ppt/pptshape.hxx index e06fda6..07ab723 100644 --- a/oox/inc/oox/ppt/pptshape.hxx +++ b/oox/inc/oox/ppt/pptshape.hxx @@ -67,7 +67,6 @@ public: static oox::drawingml::ShapePtr findPlaceholder( const sal_Int32 nMasterPlaceholder, std::vector oox::drawingml::ShapePtr rShapes ); static oox::drawingml::ShapePtr findPlaceholderByIndex( const sal_Int32 nIdx, std::vector oox::drawingml::ShapePtr rShapes ); -static oox::drawingml::ShapePtr findPlaceholder( sal_Int32 nFirstPlaceholder, sal_Int32 nSecondPlaceholder, std::vector oox::drawingml::ShapePtr rShapes ); static oox::drawingml::TextListStylePtr getSubTypeTextListStyle( const SlidePersist rSlidePersist, sal_Int32 nSubType ); diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx index f078111..366090c 100644 --- a/oox/source/dump/dumperbase.cxx +++ b/oox/source/dump/dumperbase.cxx @@ -2920,11 +2920,6 @@ XmlStreamObject::XmlStreamObject( const ObjectBase rParent, TextStreamObjectBase::construct( rParent, rxStrm, RTL_TEXTENCODING_UTF8, rSysFileName ); } -XmlStreamObject::XmlStreamObject( const OutputObjectBase rParent, const BinaryInputStreamRef rxStrm ) -{ -TextStreamObjectBase::construct( rParent, rxStrm, RTL_TEXTENCODING_UTF8 ); -} - void XmlStreamObject::implDumpText( TextInputStream rTextStrm ) { /* Buffers a start element and the following element text. Needed to dump diff --git a/oox/source/mathml/importutils.cxx b/oox/source/mathml/importutils.cxx index ab9d224..41a254d 100644 --- a/oox/source/mathml/importutils.cxx +++ b/oox/source/mathml/importutils.cxx @@ -114,11 +114,6 @@ static OUString tokenToString( int token ) } // namespace -bool XmlStream::AttributeList::hasAttribute( int token ) const -{ -return attrs.find( token ) != attrs.end(); -} - rtl::OUString XmlStream::AttributeList::attribute( int token, const rtl::OUString def ) const { std::map int, rtl::OUString ::const_iterator find = attrs.find( token ); @@ -304,11 +299,6 @@ bool XmlStream::findTagInternal( int token, bool silent ) return false; } -void XmlStream::skipElement( int token ) -{ -return skipElementInternal( token, true ); // no debug about skipping if called from outside -} - void XmlStream::skipElementInternal( int token, bool silent ) { int closing = ( token ~TAG_OPENING ) | TAG_CLOSING; // make it a closing tag diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx index a72a10c..2b017f0 100644 --- a/oox/source/ppt/pptshape.cxx +++ b/oox/source/ppt/pptshape.cxx @@ -423,13 +423,6 @@ oox::drawingml::ShapePtr PPTShape::findPlaceholderByIndex( const sal_Int32 nIdx, return aShapePtr; } -// if nFirstPlaceholder can't be found, it will be searched for nSecondPlaceholder -oox
[PATCH] remove unused code (oox)
Hi there, removed some code from oox. Regards, Petr From e04049e2554a94ce80dc21dfe390e91c8fd8bc41 Mon Sep 17 00:00:00 2001 From: Petr Vorel petr.vo...@gmail.com Date: Thu, 22 Mar 2012 20:14:13 +0100 Subject: [PATCH] remove unused code (oox) --- oox/source/ole/vbaprojectfilter.cxx | 13 - sc/source/filter/inc/biffinputstream.hxx | 27 +--- sc/source/filter/inc/biffoutputstream.hxx |5 -- sc/source/filter/inc/drawingmanager.hxx |4 -- sc/source/filter/oox/biffdetector.cxx |5 -- sc/source/filter/oox/biffinputstream.cxx | 11 - sc/source/filter/oox/biffoutputstream.cxx | 16 --- sc/source/filter/oox/drawingmanager.cxx | 71 - sc/source/filter/oox/excelfilter.cxx | 27 --- sc/source/filter/oox/ooxformulaparser.cxx |5 -- unusedcode.easy | 13 - 11 files changed, 1 insertions(+), 196 deletions(-) diff --git a/oox/source/ole/vbaprojectfilter.cxx b/oox/source/ole/vbaprojectfilter.cxx index e152598..f4698fa 100644 --- a/oox/source/ole/vbaprojectfilter.cxx +++ b/oox/source/ole/vbaprojectfilter.cxx @@ -77,19 +77,6 @@ OUString SAL_CALL WordVbaProjectFilter_getImplementationName() throw() return CREATE_OUSTRING( com.sun.star.comp.oox.WordVbaProjectFilter ); } -Sequence OUString SAL_CALL WordVbaProjectFilter_getSupportedServiceNames() throw() -{ -Sequence OUString aSeq( 1 ); -aSeq[ 0 ] = CREATE_OUSTRING( com.sun.star.document.ImportFilter ); -return aSeq; -} - -Reference XInterface SAL_CALL WordVbaProjectFilter_createInstance( -const Reference XComponentContext rxContext ) throw( Exception ) -{ -return static_cast ::cppu::OWeakObject* ( new WordVbaProjectFilter( rxContext ) ); -} - // WordVbaProjectFilter::WordVbaProjectFilter( const Reference XComponentContext rxContext ) throw( RuntimeException ) : diff --git a/sc/source/filter/inc/biffinputstream.hxx b/sc/source/filter/inc/biffinputstream.hxx index 9f01b02..47ee2b0 100644 --- a/sc/source/filter/inc/biffinputstream.hxx +++ b/sc/source/filter/inc/biffinputstream.hxx @@ -129,16 +129,7 @@ private: Trying to read over the record limits results in a stream error. The isValid() function indicates that by returning false. From now on the data returned by the read functions is undefined. The error state will be reset, -if the record is reset (with the function resetRecord()), or if the next -record is started. - -To switch off the automatic lookup of CONTINUE records, use resetRecord() -with false parameter. This is useful e.g. on import of drawing layer data, -where sometimes solely CONTINUE records will occur. The automatic lookup -keeps switched off until the method resetRecord() is called with parameter -true. All other settings done on the stream (e.g. alternative CONTINUE -record identifier, enabled decryption, NUL substitution character) will be -reset to default values, if a new record is started. +if the next record is started. The import stream supports decrypting the stream data. The contents of a record (not the record header) will be encrypted by Excel if the file has @@ -189,22 +180,6 @@ public: */ boolstartRecordByHandle( sal_Int64 nRecHandle ); -/** Sets stream pointer to begin of record content. - -@param bContLookup -Automatic CONTINUE lookup on/off. In difference to other stream -settings, this setting is persistent until next call of this -function (because it is wanted to receive the next CONTINUE records -separately). -@param nAltContId -Sets an alternative record identifier for content continuation. -This value is reset automatically when a new record is started with -startNextRecord(). - */ -voidresetRecord( -bool bContLookup, -sal_uInt16 nAltContId = BIFF_ID_UNKNOWN ); - /** Sets stream pointer before current record and invalidates stream. The next call to startNextRecord() will start again the current record. diff --git a/sc/source/filter/inc/biffoutputstream.hxx b/sc/source/filter/inc/biffoutputstream.hxx index a38bfdf..f7a6462 100644 --- a/sc/source/filter/inc/biffoutputstream.hxx +++ b/sc/source/filter/inc/biffoutputstream.hxx @@ -110,8 +110,6 @@ public: /** Returns the absolute position in the wrapped binary stream. */ sal_Int64 tellBase() const; -/** Returns the total size of the wrapped binary stream. */ -sal_Int64 sizeBase() const; // BinaryOutputStream interface (stream write access) - @@ -120,9 +118,6 @@ public: /** Writes nBytes bytes from the passed buffer pMem. */ virtual voidwriteMemory( const void* pMem
[PATCH] remove unused code (oox, sc)
Hi there, some unused code removed (oox, sc). Regards, Petr From 3c03ddd6eb8e0cefa229f3874e3da35bd0a57788 Mon Sep 17 00:00:00 2001 From: Petr Vorel petr.vo...@gmail.com Date: Sat, 17 Mar 2012 20:25:52 +0100 Subject: [PATCH 1/2] remove unused code (oox, sc) --- oox/inc/oox/dump/dumperbase.hxx |7 --- oox/inc/oox/dump/oledumper.hxx |5 - oox/inc/oox/ole/vbacontrol.hxx |2 -- oox/source/dump/dumperbase.cxx | 15 --- oox/source/dump/oledumper.cxx|7 --- oox/source/ole/vbacontrol.cxx|5 - sc/source/filter/inc/formulabase.hxx |3 --- sc/source/filter/oox/formulabase.cxx |9 - unusedcode.easy |7 --- 9 files changed, 0 insertions(+), 60 deletions(-) diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx index 7cba7ae..534776b 100644 --- a/oox/inc/oox/dump/dumperbase.hxx +++ b/oox/inc/oox/dump/dumperbase.hxx @@ -993,8 +993,6 @@ public: inline const StorageRef getRootStorage() const { return mxCfgData-getRootStorage(); } inline const ::rtl::OUString getSysFileName() const { return mxCfgData-getSysFileName(); } -voidsetStringOption( const String rKey, const String rData ); - const ::rtl::OUString getStringOption( const String rKey, const ::rtl::OUString rDefault ) const; boolgetBoolOption( const String rKey, bool bDefault ) const; template typename Type @@ -1005,7 +1003,6 @@ public: template typename ListType ::boost::shared_ptr ListType createNameList( const String rListName ); -voidsetNameList( const String rListName, const NameListRef rxList ); voideraseNameList( const String rListName ); NameListRef getNameList( const String rListName ) const; @@ -1792,10 +1789,6 @@ public: const BinaryInputStreamRef rxStrm, const ::rtl::OUString rSysFileName ); -explicitBinaryStreamObject( -const OutputObjectBase rParent, -const BinaryInputStreamRef rxStrm ); - protected: voiddumpBinaryStream( bool bShowOffset = true ); diff --git a/oox/inc/oox/dump/oledumper.hxx b/oox/inc/oox/dump/oledumper.hxx index 1a94e77..42abf2d 100644 --- a/oox/inc/oox/dump/oledumper.hxx +++ b/oox/inc/oox/dump/oledumper.hxx @@ -331,11 +331,6 @@ protected: const String rPropNameList, bool b64BitPropFlags = false ); voidconstruct( -const OutputObjectBase rParent, -const BinaryInputStreamRef rxStrm, -const String rPropNameList, -bool b64BitPropFlags = false ); -voidconstruct( const InputObjectBase rParent, const String rPropNameList, bool b64BitPropFlags = false ); diff --git a/oox/inc/oox/ole/vbacontrol.hxx b/oox/inc/oox/ole/vbacontrol.hxx index 4647245..b4d2afb 100644 --- a/oox/inc/oox/ole/vbacontrol.hxx +++ b/oox/inc/oox/ole/vbacontrol.hxx @@ -65,8 +65,6 @@ public: inline const AxPairData getPosition() const { return maPos; } /** Returns the unique identifier of this control. */ inline sal_Int32getId() const { return mnId; } -/** Returns true, if the control is visible. */ -boolisVisible() const; /** Returns true, if this control is a container control. */ boolisContainer() const; /** Returns the length of the stream data for stream based controls. */ diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx index 54159b440..f078111 100644 --- a/oox/source/dump/dumperbase.cxx +++ b/oox/source/dump/dumperbase.cxx @@ -1699,11 +1699,6 @@ void Config::construct( const sal_Char* pcEnvVar, const Reference XComponentCon mxCfgData.reset( new SharedConfigData( OUString::createFromAscii( pcFileName ), rxContext, rxRootStrg, rSysFileName, rMediaDesc ) ); } -void Config::setStringOption( const String rKey, const String rData ) -{ -mxCfgData-setOption( rKey, rData ); -} - const OUString Config::getStringOption( const String rKey, const OUString rDefault ) const { const OUString* pData = implGetOption( rKey ); @@ -1726,11 +1721,6 @@ bool Config::isImportEnabled() const return getBoolOption( enable-import, true ); } -void Config::setNameList( const String rListName, const NameListRef rxList ) -{ -mxCfgData-setNameList( rListName, rxList ); -} - void Config::eraseNameList( const String rListName ) { mxCfgData-eraseNameList( rListName ); @@ -2837,11 +2827,6 @@ BinaryStreamObject::BinaryStreamObject( const ObjectBase rParent, const BinaryI InputObjectBase::construct( rParent, rxStrm
[PATCH] removed unused code
Hi there, another unused code removed (part of oox). Regards, Petr From 2221c91a53383024121bfa01f01055510e3642ae Mon Sep 17 00:00:00 2001 From: Petr Vorel petr.vo...@gmail.com Date: Fri, 16 Mar 2012 12:44:20 +0100 Subject: [PATCH] removed unused code --- oox/inc/oox/drawingml/textbodyproperties.hxx |1 - oox/inc/oox/drawingml/textliststyle.hxx|4 - oox/inc/oox/export/chartexport.hxx |5 - oox/source/drawingml/chart/objectformatter.cxx | 14 -- oox/source/drawingml/fillproperties.cxx|5 - oox/source/drawingml/shape.cxx | 12 -- oox/source/drawingml/textbodyproperties.cxx|5 - oox/source/drawingml/textliststyle.cxx | 11 -- oox/source/export/ColorPropertySet.cxx | 10 -- oox/source/export/ColorPropertySet.hxx |3 - oox/source/export/chartexport.cxx | 187 oox/source/export/drawingml.cxx| 35 - unusedcode.easy| 14 -- 13 files changed, 0 insertions(+), 306 deletions(-) diff --git a/oox/inc/oox/drawingml/textbodyproperties.hxx b/oox/inc/oox/drawingml/textbodyproperties.hxx index e155d30..adb9c1f 100644 --- a/oox/inc/oox/drawingml/textbodyproperties.hxx +++ b/oox/inc/oox/drawingml/textbodyproperties.hxx @@ -47,7 +47,6 @@ struct TextBodyProperties explicitTextBodyProperties(); -voidpushToPropMap( PropertyMap rPropMap ) const; voidpushVertSimulation(); }; diff --git a/oox/inc/oox/drawingml/textliststyle.hxx b/oox/inc/oox/drawingml/textliststyle.hxx index 5ce8ef7..29d8f29 100644 --- a/oox/inc/oox/drawingml/textliststyle.hxx +++ b/oox/inc/oox/drawingml/textliststyle.hxx @@ -51,10 +51,6 @@ public: inline const TextParagraphPropertiesVector getAggregationListStyle() const { return maAggregationListStyle; }; inline TextParagraphPropertiesVector getAggregationListStyle() { return maAggregationListStyle; }; -#if OSL_DEBUG_LEVEL 0 -void dump() const; -#endif - protected: TextParagraphPropertiesVector maListStyle; diff --git a/oox/inc/oox/export/chartexport.hxx b/oox/inc/oox/export/chartexport.hxx index 5bca83f..e041c38 100644 --- a/oox/inc/oox/export/chartexport.hxx +++ b/oox/inc/oox/export/chartexport.hxx @@ -157,9 +157,6 @@ private: ::com::sun::star::uno::Reference ::com::sun::star::chart2::XDataSeriesaSeriesSeq, sal_Bool bJapaneseCandleSticks, sal_Int32 nAttachedAxis ); -void exportDataSeq( -const com::sun::star::uno::Reference ::com::sun::star::chart2::data::XDataSequence xValueSeq, -sal_Int32 elementTokenId ); void exportSeriesText( const com::sun::star::uno::Reference ::com::sun::star::chart2::data::XDataSequence xValueSeq ); void exportSeriesCategory( @@ -176,8 +173,6 @@ private: void exportFirstSliceAng(); void exportAxes( ); -void exportXAxis( AxisIdPair aAxisIdPair ); -void exportYAxis( AxisIdPair aAxisIdPair ); void exportAxis( AxisIdPair aAxisIdPair ); void _exportAxis( const ::com::sun::star::uno::Reference ::com::sun::star::beans::XPropertySet xAxisProp, diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx index ab9e4cc..2dfdaf9 100644 --- a/oox/source/drawingml/chart/objectformatter.cxx +++ b/oox/source/drawingml/chart/objectformatter.cxx @@ -728,11 +728,6 @@ public: PropertySet rPropSet, const TextCharacterProperties rTextProps ); -/** Sets automatic line properties to the passed property set. */ -voidconvertAutomaticLine( -PropertySet rPropSet, -sal_Int32 nSeriesIdx ); - /** Sets automatic fill properties to the passed property set. */ voidconvertAutomaticFill( PropertySet rPropSet, @@ -1017,15 +1012,6 @@ void ObjectTypeFormatter::convertTextFormatting( PropertySet rPropSet, const Te maTextFormatter.convertFormatting( rPropSet, rTextProps ); } -void ObjectTypeFormatter::convertAutomaticLine( PropertySet rPropSet, sal_Int32 nSeriesIdx ) -{ -ShapePropertyMap aPropMap( mrModelObjHelper, *mrEntry.mpPropInfo ); -ModelRef Shape xShapeProp; -maLineFormatter.convertFormatting( aPropMap, xShapeProp, nSeriesIdx ); -maEffectFormatter.convertFormatting( aPropMap, xShapeProp, nSeriesIdx ); -rPropSet.setProperties( aPropMap ); -} - void ObjectTypeFormatter::convertAutomaticFill( PropertySet rPropSet, sal_Int32 nSeriesIdx ) { ShapePropertyMap aPropMap( mrModelObjHelper, *mrEntry.mpPropInfo ); diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx index 0a49985..07df75d 100644 --- a/oox/source/drawingml/fillproperties.cxx +++ b/oox/source/drawingml/fillproperties.cxx @@ -376,11
[PATCH] remove unused code (oox, sd)
Hi there, remove some unused code in oox and sd. Regards, Petr From 2cc831282d53c3a14dd10fc8cb190f1d15df3354 Mon Sep 17 00:00:00 2001 From: Petr Vorel petr.vo...@gmail.com Date: Thu, 15 Mar 2012 11:40:15 +0100 Subject: [PATCH] remove unused code (oox, sd) --- oox/inc/oox/helper/attributelist.hxx |6 -- oox/inc/oox/helper/containerhelper.hxx | 16 oox/inc/oox/helper/graphichelper.hxx |2 -- oox/source/helper/attributelist.cxx | 10 -- oox/source/helper/containerhelper.cxx| 18 -- oox/source/helper/graphichelper.cxx |5 - sd/source/filter/eppt/epptooxml.hxx |1 - sd/source/filter/eppt/pptx-epptooxml.cxx | 10 -- unusedcode.easy |5 - 9 files changed, 0 insertions(+), 73 deletions(-) diff --git a/oox/inc/oox/helper/attributelist.hxx b/oox/inc/oox/helper/attributelist.hxx index d0a0600..c60c6f8 100644 --- a/oox/inc/oox/helper/attributelist.hxx +++ b/oox/inc/oox/helper/attributelist.hxx @@ -66,12 +66,6 @@ public: /** Returns the 32-bit signed integer value from the passed string (hexadecimal). */ static sal_Int32decodeIntegerHex( const ::rtl::OUString rValue ); - -/** Returns the 32-bit unsigned integer value from the passed string (hexadecimal). */ -static sal_uInt32 decodeUnsignedHex( const ::rtl::OUString rValue ); - -/** Returns the 64-bit signed integer value from the passed string (hexadecimal). */ -static sal_Int64decodeHyperHex( const ::rtl::OUString rValue ); }; // diff --git a/oox/inc/oox/helper/containerhelper.hxx b/oox/inc/oox/helper/containerhelper.hxx index 5c9dc88..eef9429 100644 --- a/oox/inc/oox/helper/containerhelper.hxx +++ b/oox/inc/oox/helper/containerhelper.hxx @@ -173,22 +173,6 @@ public: static ::com::sun::star::uno::Reference ::com::sun::star::container::XIndexContainer createIndexContainer( const ::com::sun::star::uno::Reference ::com::sun::star::uno::XComponentContext rxContext ); -/** Inserts an object into an indexed container. - -@param rxIndexContainer com.sun.star.container.XIndexContainer -interface of the indexed container. - -@param nIndex Insertion index for the object. - -@param rObject The object to be inserted. - -@return True = object successfully inserted. - */ -static bool insertByIndex( -const ::com::sun::star::uno::Reference ::com::sun::star::container::XIndexContainer rxIndexContainer, -sal_Int32 nIndex, -const ::com::sun::star::uno::Any rObject ); - // com.sun.star.container.XNameContainer -- /** Creates a new name container object from scratch. */ diff --git a/oox/inc/oox/helper/graphichelper.hxx b/oox/inc/oox/helper/graphichelper.hxx index d3507fa..9881200 100644 --- a/oox/inc/oox/helper/graphichelper.hxx +++ b/oox/inc/oox/helper/graphichelper.hxx @@ -93,8 +93,6 @@ public: sal_Int32 convertScreenPixelXToHmm( double fPixelX ) const; /** Converts the passed value from vertical screen pixels to 1/100 mm. */ sal_Int32 convertScreenPixelYToHmm( double fPixelY ) const; -/** Converts the passed point from screen pixels to 1/100 mm. */ -::com::sun::star::awt::Point convertScreenPixelToHmm( const ::com::sun::star::awt::Point rPixel ) const; /** Converts the passed size from screen pixels to 1/100 mm. */ ::com::sun::star::awt::Size convertScreenPixelToHmm( const ::com::sun::star::awt::Size rPixel ) const; diff --git a/oox/source/helper/attributelist.cxx b/oox/source/helper/attributelist.cxx index 33f4ed5..f1d114d 100644 --- a/oox/source/helper/attributelist.cxx +++ b/oox/source/helper/attributelist.cxx @@ -122,16 +122,6 @@ sal_Int32 AttributeConversion::decodeIntegerHex( const OUString rValue ) return rValue.toInt32( 16 ); } -sal_uInt32 AttributeConversion::decodeUnsignedHex( const OUString rValue ) -{ -return getLimitedValue sal_uInt32, sal_Int64 ( rValue.toInt64( 16 ), 0, SAL_MAX_UINT32 ); -} - -sal_Int64 AttributeConversion::decodeHyperHex( const OUString rValue ) -{ -return rValue.toInt64( 16 ); -} - // AttributeList::AttributeList( const Reference XFastAttributeList rxAttribs ) : diff --git a/oox/source/helper/containerhelper.cxx b/oox/source/helper/containerhelper.cxx index 23bad22..a19e9b4 100644 --- a/oox/source/helper/containerhelper.cxx +++ b/oox/source/helper/containerhelper.cxx @@ -119,24 +119,6 @@ Reference XIndexContainer ContainerHelper::createIndexContainer( const Refere return xContainer; } -bool ContainerHelper::insertByIndex( -const Reference XIndexContainer rxIndexContainer, -sal_Int32
[PATCH] remove unused code
Hi there, another patch removing unused code. Actually I need an advice this time. Is method oox::core::XmlFilterBase::getChartConverter() really unused / unwanted? As it's used in Shape::finalizeXShape (oox/source/drawingml/shape.cxx). So feel free to drop it if it's not valid. Btw can we really rely on the tool which generates unusedcode.easy? Regards, Petr From 94f6485cdfd7e87af6c432708c16aed061a8c2cb Mon Sep 17 00:00:00 2001 From: Petr Vorel petr.vo...@gmail.com Date: Thu, 8 Mar 2012 16:11:03 +0100 Subject: [PATCH] remove unused code --- oox/inc/oox/core/xmlfilterbase.hxx|4 oox/inc/oox/ppt/dgmimport.hxx |1 - oox/inc/oox/ppt/dgmlayout.hxx |1 - oox/inc/oox/ppt/pptimport.hxx |1 - oox/inc/oox/xls/excelfilter.hxx |1 - oox/source/core/xmlfilterbase.cxx |5 - oox/source/drawingml/shape.cxx|2 -- oox/source/ppt/dgmimport.cxx |5 - oox/source/ppt/dgmlayout.cxx |5 - oox/source/ppt/pptimport.cxx |5 - oox/source/shape/ShapeFilterBase.cxx |5 - oox/source/shape/ShapeFilterBase.hxx |2 -- oox/source/xls/excelfilter.cxx|5 - sc/source/filter/excel/xestream.cxx |6 -- sc/source/filter/inc/xestream.hxx |1 - sd/source/filter/eppt/epptooxml.hxx |1 - sw/source/filter/ww8/docxexportfilter.hxx |1 - unusedcode.easy |1 - 18 files changed, 0 insertions(+), 52 deletions(-) diff --git a/oox/inc/oox/core/xmlfilterbase.hxx b/oox/inc/oox/core/xmlfilterbase.hxx index 0e015da..09c76ee 100644 --- a/oox/inc/oox/core/xmlfilterbase.hxx +++ b/oox/inc/oox/core/xmlfilterbase.hxx @@ -95,10 +95,6 @@ public: /** Has to be implemented by each filter to return the collection of VML shapes. */ virtual ::oox::vml::Drawing* getVmlDrawing() = 0; -/** Has to be implemented by each filter, returns a filter-specific chart -converter object, that should be global per imported document. */ -virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() = 0; - /** Has to be implemented by each filter to return the table style list. */ virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles() = 0; diff --git a/oox/inc/oox/ppt/dgmimport.hxx b/oox/inc/oox/ppt/dgmimport.hxx index 74f8020..99332a8 100644 --- a/oox/inc/oox/ppt/dgmimport.hxx +++ b/oox/inc/oox/ppt/dgmimport.hxx @@ -57,7 +57,6 @@ public: virtual const oox::drawingml::table::TableStyleListPtr getTableStyles(); virtual oox::vml::Drawing* getVmlDrawing(); -virtual oox::drawingml::chart::ChartConverter* getChartConverter(); private: virtual ::rtl::OUString implGetImplementationName() const; diff --git a/oox/inc/oox/ppt/dgmlayout.hxx b/oox/inc/oox/ppt/dgmlayout.hxx index 35c0857..a263eed 100644 --- a/oox/inc/oox/ppt/dgmlayout.hxx +++ b/oox/inc/oox/ppt/dgmlayout.hxx @@ -57,7 +57,6 @@ public: virtual const oox::drawingml::table::TableStyleListPtr getTableStyles(); virtual ::oox::vml::Drawing* getVmlDrawing(); -virtual ::oox::drawingml::chart::ChartConverter* getChartConverter(); private: virtual ::rtl::OUString implGetImplementationName() const; diff --git a/oox/inc/oox/ppt/pptimport.hxx b/oox/inc/oox/ppt/pptimport.hxx index 79df421..ddb67a4 100644 --- a/oox/inc/oox/ppt/pptimport.hxx +++ b/oox/inc/oox/ppt/pptimport.hxx @@ -57,7 +57,6 @@ public: virtual const ::oox::drawingml::Theme* getCurrentTheme() const; virtual ::oox::vml::Drawing* getVmlDrawing(); virtual const oox::drawingml::table::TableStyleListPtr getTableStyles(); -virtual ::oox::drawingml::chart::ChartConverter* getChartConverter(); voidsetActualSlidePersist( SlidePersistPtr pActualSlidePersist ){ mpActualSlidePersist = pActualSlidePersist; }; std::map rtl::OUString, oox::drawingml::ThemePtr getThemes(){ return maThemes; }; diff --git a/oox/inc/oox/xls/excelfilter.hxx b/oox/inc/oox/xls/excelfilter.hxx index c15b6cc..8585dc2 100644 --- a/oox/inc/oox/xls/excelfilter.hxx +++ b/oox/inc/oox/xls/excelfilter.hxx @@ -71,7 +71,6 @@ public: virtual const ::oox::drawingml::Theme* getCurrentTheme() const; virtual ::oox::vml::Drawing* getVmlDrawing(); virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles(); -virtual ::oox::drawingml::chart::ChartConverter* getChartConverter(); virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence ::com::sun::star::beans::PropertyValue rDescriptor ) throw( ::com::sun::star::uno::RuntimeException ); diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx index f5868bf..f1aebdd 100644 --- a/oox/source/core/xmlfilterbase.cxx +++ b/oox/source/core/xmlfilterbase.cxx @@ -672,11 +672,6 @@ XmlFilterBase XmlFilterBase::exportDocumentProperties
[PATCH] remove unused code
Another unused code removed. From 226fccc7f2fd022ed9d329ac9c6bb373fbeff265 Mon Sep 17 00:00:00 2001 From: Petr Vorel petr.vo...@gmail.com Date: Sat, 3 Mar 2012 02:16:31 +0100 Subject: [PATCH] remove unused code --- oox/inc/oox/helper/binaryinputstream.hxx |4 oox/inc/oox/helper/modelobjecthelper.hxx |3 --- oox/inc/oox/helper/propertymap.hxx |1 - oox/inc/oox/helper/propertyset.hxx | 14 +++--- oox/source/drawingml/customshapeproperties.cxx |1 - oox/source/helper/binaryinputstream.cxx|8 oox/source/helper/modelobjecthelper.cxx| 13 - oox/source/helper/propertymap.cxx |5 - oox/source/helper/propertyset.cxx | 24 sd/source/filter/eppt/epptooxml.hxx|2 -- sd/source/filter/eppt/pptx-epptooxml.cxx | 16 unusedcode.easy|6 -- 12 files changed, 3 insertions(+), 94 deletions(-) diff --git a/oox/inc/oox/helper/binaryinputstream.hxx b/oox/inc/oox/helper/binaryinputstream.hxx index 5add5f4..6e952a2 100644 --- a/oox/inc/oox/helper/binaryinputstream.hxx +++ b/oox/inc/oox/helper/binaryinputstream.hxx @@ -164,10 +164,6 @@ public: template typename Type voidskipArray( sal_Int32 nElemCount ); -/** Reads a NUL-terminated byte character array and returns the string. - */ -::rtl::OString readNulCharArray(); - /** Reads a NUL-terminated Unicode character array and returns the string. */ ::rtl::OUString readNulUnicodeArray(); diff --git a/oox/inc/oox/helper/modelobjecthelper.hxx b/oox/inc/oox/helper/modelobjecthelper.hxx index 86459ec..10131de 100644 --- a/oox/inc/oox/helper/modelobjecthelper.hxx +++ b/oox/inc/oox/helper/modelobjecthelper.hxx @@ -56,9 +56,6 @@ public: /** Returns true, if the object with the passed name exists in the container. */ boolhasObject( const ::rtl::OUString rObjName ) const; -/** Returns the object with the passed name from the container. */ -::com::sun::star::uno::Any getObject( const ::rtl::OUString rObjName ) const; - /** Inserts the passed object into the container, returns its final name. */ ::rtl::OUString insertObject( const ::rtl::OUString rObjName, diff --git a/oox/inc/oox/helper/propertymap.hxx b/oox/inc/oox/helper/propertymap.hxx index 2696d49..dabd2e4 100644 --- a/oox/inc/oox/helper/propertymap.hxx +++ b/oox/inc/oox/helper/propertymap.hxx @@ -102,7 +102,6 @@ public: #if OSL_DEBUG_LEVEL 0 #ifdef DBG_UTIL static void dump( ::com::sun::star::uno::Reference ::com::sun::star::beans::XPropertySet rXPropSet); - void dump(); #endif static void dumpCode( ::com::sun::star::uno::Reference ::com::sun::star::beans::XPropertySet rXPropSet); void dumpCode(); diff --git a/oox/inc/oox/helper/propertyset.hxx b/oox/inc/oox/helper/propertyset.hxx index fd0c1a7..14ca79b 100644 --- a/oox/inc/oox/helper/propertyset.hxx +++ b/oox/inc/oox/helper/propertyset.hxx @@ -50,9 +50,9 @@ class PropertyMap; com.sun.star.beans.XPropertySet interface then). The reference to the property set will be kept as long as the instance of this class is alive. -The functions getProperties() and setProperties() try to handle all passed -values at once, using the com.sun.star.beans.XMultiPropertySet interface. -If the implementation does not support the XMultiPropertySet interface, all +The functions setProperties() tries to handle all passed values at once, +using the com.sun.star.beans.XMultiPropertySet interface. If the +implementation does not support the XMultiPropertySet interface, all properties are handled separately in a loop. */ class PropertySet @@ -103,14 +103,6 @@ public: @return true = property contains true; false = property contains false or error occurred. */ inline bool getBoolProperty( sal_Int32 nPropId ) const { bool bValue = false; return getProperty( bValue, nPropId ) bValue; } - -/** Gets the specified properties from the property set. Tries to use the XMultiPropertySet interface. -@param orValues (out-parameter) The related property values. -@param rPropNames The property names. MUST be ordered alphabetically. */ -voidgetProperties( -::com::sun::star::uno::Sequence ::com::sun::star::uno::Any orValues, -const ::com::sun::star::uno::Sequence ::rtl::OUString rPropNames ) const; - // Set properties - /** Puts the passed any into the property set. */ diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx index ab99e82..29844b8 100644 --- a/oox/source/drawingml/customshapeproperties.cxx +++ b
[PATCH] Removed unused code
Another patch removing some unused methods. From 9ab3fcd3e16bdb0c0ea565777d7537bd9bf761f0 Mon Sep 17 00:00:00 2001 From: Petr Vorel petr.vo...@gmail.com Date: Sun, 26 Feb 2012 00:04:49 +0100 Subject: [PATCH] Removed unused code --- sc/source/filter/excel/xepivot.cxx |9 - sc/source/filter/excel/xestring.cxx | 17 - sc/source/filter/excel/xestyle.cxx |6 -- sc/source/filter/excel/xlformula.cxx | 11 --- sc/source/filter/excel/xlstyle.cxx |5 - sc/source/filter/inc/xepivot.hxx |2 -- sc/source/filter/inc/xestring.hxx|2 -- sc/source/filter/inc/xestyle.hxx |6 -- sc/source/filter/inc/xlformula.hxx |3 --- sc/source/filter/inc/xlstyle.hxx |2 -- unusedcode.easy |6 -- 11 files changed, 0 insertions(+), 69 deletions(-) diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx index 60e2166..908b986 100644 --- a/sc/source/filter/excel/xepivot.cxx +++ b/sc/source/filter/excel/xepivot.cxx @@ -779,15 +779,6 @@ XclExpPCField* XclExpPivotCache::GetFieldAcc( sal_uInt16 nFieldIdx ) return maFieldList.GetRecord( nFieldIdx ).get(); } -XclExpPCField* XclExpPivotCache::GetFieldAcc( const rtl::OUString rFieldName ) -{ -XclExpPCField* pField = 0; -for( size_t nPos = 0, nSize = maFieldList.GetSize(); !pField (nPos nSize); ++nPos ) -if( maFieldList.GetRecord( nPos )-GetFieldName() == rFieldName ) -pField = maFieldList.GetRecord( nPos ).get(); -return pField; -} - void XclExpPivotCache::AddFields( const ScDPObject rDPObj ) { AddStdFields( rDPObj ); diff --git a/sc/source/filter/excel/xestring.cxx b/sc/source/filter/excel/xestring.cxx index d12ebe8..2053a68 100644 --- a/sc/source/filter/excel/xestring.cxx +++ b/sc/source/filter/excel/xestring.cxx @@ -184,23 +184,6 @@ void XclExpString::AppendByte( sal_Unicode cChar, rtl_TextEncoding eTextEnc ) // formatting runs -void XclExpString::SetFormats( const XclFormatRunVec rFormats ) -{ -maFormats = rFormats; -#if OSL_DEBUG_LEVEL 0 -if( IsRich() ) -{ -XclFormatRunVec::const_iterator aCurr = maFormats.begin(); -XclFormatRunVec::const_iterator aPrev = aCurr; -XclFormatRunVec::const_iterator aEnd = maFormats.end(); -for( ++aCurr; aCurr != aEnd; ++aCurr, ++aPrev ) -OSL_ENSURE( aPrev-mnChar aCurr-mnChar, XclExpString::SetFormats - invalid char order ); -OSL_ENSURE( aPrev-mnChar = mnLen, XclExpString::SetFormats - invalid char index ); -} -#endif -LimitFormatCount( mbIsBiff8 ? EXC_STR_MAXLEN : EXC_STR_MAXLEN_8BIT ); -} - void XclExpString::AppendFormat( sal_uInt16 nChar, sal_uInt16 nFontIdx, bool bDropDuplicate ) { OSL_ENSURE( maFormats.empty() || (maFormats.back().mnChar nChar), XclExpString::AppendFormat - invalid char index ); diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index 1d7f190..ae51486 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -1124,12 +1124,6 @@ sal_uInt16 XclExpFontBuffer::Insert( const SfxItemSet rItemSet, return Insert( aFont, eColorType, bAppFont ); } -sal_uInt16 XclExpFontBuffer::Insert( const ScPatternAttr rPattern, -sal_Int16 nScript, XclExpColorType eColorType, bool bAppFont ) -{ -return Insert( rPattern.GetItemSet(), nScript, eColorType, bAppFont ); -} - void XclExpFontBuffer::Save( XclExpStream rStrm ) { maFontList.Save( rStrm ); diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx index 02154ba..8685041 100644 --- a/sc/source/filter/excel/xlformula.cxx +++ b/sc/source/filter/excel/xlformula.cxx @@ -483,12 +483,6 @@ XclTokenArray::XclTokenArray( bool bVolatile ) : { } -XclTokenArray::XclTokenArray( ScfUInt8Vec rTokVec, bool bVolatile ) : -mbVolatile( bVolatile ) -{ -maTokVec.swap( rTokVec ); -} - XclTokenArray::XclTokenArray( ScfUInt8Vec rTokVec, ScfUInt8Vec rExtDataVec, bool bVolatile ) : mbVolatile( bVolatile ) { @@ -598,11 +592,6 @@ XclTokenArrayIterator::XclTokenArrayIterator( const XclTokenArrayIterator rTokA SkipSpaces(); } -void XclTokenArrayIterator::Init() -{ -mppScTokenBeg = mppScTokenEnd = mppScToken = 0; -} - void XclTokenArrayIterator::Init( const ScTokenArray rScTokArr, bool bSkipSpaces ) { sal_uInt16 nTokArrLen = rScTokArr.GetLen(); diff --git a/sc/source/filter/excel/xlstyle.cxx b/sc/source/filter/excel/xlstyle.cxx index db0603d..e8ef58e 100644 --- a/sc/source/filter/excel/xlstyle.cxx +++ b/sc/source/filter/excel/xlstyle.cxx @@ -1751,11 +1751,6 @@ void XclXFBase::SetAllUsedFlags( bool bUsed ) mbProtUsed = mbFontUsed = mbFmtUsed = mbAlignUsed = mbBorderUsed = mbAreaUsed = bUsed; } -bool XclXFBase::HasUsedFlags() const -{ -return mbProtUsed || mbFontUsed || mbFmtUsed || mbAlignUsed || mbBorderUsed
Re: [PATCH] fix building dictionaries when PERL_UNICODE environment
I run into troubles while building dictionaries, because I have on my system set PERL_UNICODE=SDL (perl script clone/dictionaries/dictionaries/util/th_check.pl dies as it's forced to use UTF-8, but not all dictionaries are in this encoding). Interesting, I'd never seen this environment variable before. :) Diacritics made me to learn . First, setting this to SDL emulates the behaviour of Perl 5.8.0 - this was deliberately fixed in 5.8.1 (see the perlrun and perl581delta docs), so I would be careful about putting it in your environment. It's likely to break more than just LibreOffice. Thank you for pointing L background. Well, I don't consider L as harmful, but I don't really need it. But it's broken even with PERL_UNICODE=SD. i implied by D is the source of troubles. So we need to remove i and D from env or set the env explicitly. 0 or S are working settings. I am tempted to push your patch as a temporary fix, but there must be a better way to handle this long-term... I'll check that I can reproduce the problem, first. Have you been successful? As an idea, would it be possible to identify and re-encode the dictionaries themselves as UTF-8? After which we could set the encoding of the filehandles explicitly in th_check.pl. First I thought it would be better to recode all of them to utf8. But these files are taken from ispell, aren't they? Do we want to increase diversity from upstream? So I thing it's better to set explicitly the env. But prj/tests.mk in dictionaries is IMHO better place than Makefile in core repo. See the patch. Petr From 272951e21383bfaccc46dadf99733849d7702333 Mon Sep 17 00:00:00 2001 From: Petr Vorel petr.vo...@gmail.com Date: Fri, 24 Feb 2012 17:11:40 +0100 Subject: [PATCH] Explicitly set PERL_UNICODE environment variable This prevents fail building when PERL_UNICODE contain i or D --- dictionaries/prj/tests.mk |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dictionaries/prj/tests.mk b/dictionaries/prj/tests.mk index 0eb6008..7048dd6 100644 --- a/dictionaries/prj/tests.mk +++ b/dictionaries/prj/tests.mk @@ -25,4 +25,4 @@ ALLTAR : test1 test1 .PHONY : @echo Validating thesaurus file - $(COMMAND_ECHO) ..$/util$/th_check.pl *.dat + $(COMMAND_ECHO) PERL_UNICODE=0 ..$/util$/th_check.pl *.dat -- 1.7.9.1 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Remove unused code
Hi there, another bit of unused core removed. Petr From deda0e8f7bfa57ff8b1568fd71466a8084c98efd Mon Sep 17 00:00:00 2001 From: Petr Vorel petr.vo...@gmail.com Date: Mon, 20 Feb 2012 00:25:26 +0100 Subject: [PATCH] Remove unused code --- basic/source/comp/symtbl.cxx |5 basic/source/inc/runtime.hxx |1 - basic/source/inc/symtbl.hxx|2 - basic/source/runtime/runtime.cxx |5 basic/source/sbx/sbxdec.cxx|7 - basic/source/sbx/sbxdec.hxx|1 - sc/inc/cell.hxx|1 - sc/source/core/data/cell.cxx | 26 .../filter/xml/XMLChangeTrackingImportHelper.cxx | 14 -- .../filter/xml/XMLChangeTrackingImportHelper.hxx |3 -- svtools/source/edit/svmedit.cxx|6 unusedcode.easy|5 12 files changed, 0 insertions(+), 76 deletions(-) diff --git a/basic/source/comp/symtbl.cxx b/basic/source/comp/symtbl.cxx index 8f00f4a..8144e76 100644 --- a/basic/source/comp/symtbl.cxx +++ b/basic/source/comp/symtbl.cxx @@ -110,11 +110,6 @@ SbiSymPool::~SbiSymPool() {} -void SbiSymPool::Clear() -{ -aData.DeleteAndDestroy( 0, aData.Count() ); -} - SbiSymDef* SbiSymPool::First() { nCur = (sal_uInt16) -1; diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx index 8c9064d..1c70828 100644 --- a/basic/source/inc/runtime.hxx +++ b/basic/source/inc/runtime.hxx @@ -433,7 +433,6 @@ public: sal_uInt16 GetDebugFlags() { return nFlags; } void SetDebugFlags( sal_uInt16 nFl ) { nFlags = nFl; } SbMethod* GetCaller(); -SbxArray* GetParams(); SbxVariable* GetExternalCaller(){ return mpExtCaller; } SbiForStack* FindForStackItemForCollection( class BasicCollection* pCollection ); diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx index b484c82..a0263f9 100644 --- a/basic/source/inc/symtbl.hxx +++ b/basic/source/inc/symtbl.hxx @@ -74,8 +74,6 @@ public: SbiSymPool( SbiStringPool, SbiSymScope ); ~SbiSymPool(); -void Clear(); - void SetParent( SbiSymPool* p ) { pParent = p; } void SetProcId( short n ) { nProcId = n; } sal_uInt16 GetSize() const { return aData.Count(); } diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index 39c48c3..7fe3b17 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -902,11 +902,6 @@ SbMethod* SbiRuntime::GetCaller() return pMeth; } -SbxArray* SbiRuntime::GetParams() -{ -return refParams; -} - // Stacks // The expression-stack is available for the continous evaluation diff --git a/basic/source/sbx/sbxdec.cxx b/basic/source/sbx/sbxdec.cxx index bf36d88..3f95fa6 100644 --- a/basic/source/sbx/sbxdec.cxx +++ b/basic/source/sbx/sbxdec.cxx @@ -254,12 +254,6 @@ bool SbxDecimal::getChar( sal_Unicode rVal ) return bRet; } -bool SbxDecimal::getByte( sal_uInt8 rVal ) -{ -bool bRet = ( VarUI1FromDec( maDec, rVal ) == S_OK ); -return bRet; -} - bool SbxDecimal::getShort( sal_Int16 rVal ) { bool bRet = ( VarI2FromDec( maDec, rVal ) == S_OK ); @@ -369,7 +363,6 @@ void SbxDecimal::setUInt( unsigned int val ){ (void)val; } bool SbxDecimal::setString( ::rtl::OUString* pOUString ){ (void)pOUString; return false; } bool SbxDecimal::getChar( sal_Unicode rVal ) { (void)rVal; return false; } -bool SbxDecimal::getByte( sal_uInt8 rVal ) { (void)rVal; return false; } bool SbxDecimal::getShort( sal_Int16 rVal ){ (void)rVal; return false; } bool SbxDecimal::getLong( sal_Int32 rVal ) { (void)rVal; return false; } bool SbxDecimal::getUShort( sal_uInt16 rVal ) { (void)rVal; return false; } diff --git a/basic/source/sbx/sbxdec.hxx b/basic/source/sbx/sbxdec.hxx index 533ffb9..3e86468 100644 --- a/basic/source/sbx/sbxdec.hxx +++ b/basic/source/sbx/sbxdec.hxx @@ -96,7 +96,6 @@ public: } bool getChar( sal_Unicode rVal ); -bool getByte( sal_uInt8 rVal ); bool getShort( sal_Int16 rVal ); bool getLong( sal_Int32 rVal ); bool getUShort( sal_uInt16 rVal ); diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx index 52244f6..387ff69 100644 --- a/sc/inc/cell.hxx +++ b/sc/inc/cell.hxx @@ -375,7 +375,6 @@ public: ScAddress aPos; ~ScFormulaCell(); -ScFormulaCell(); /** Empty formula cell, or with a preconstructed token array. */ ScFormulaCell( ScDocument*, const ScAddress, const ScTokenArray* = NULL, diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx index 74e9330..48d6391 100644 --- a/sc/source/core/data/cell.cxx +++ b/sc/source/core/data/cell.cxx @@ -723,32 +723,6 @@ ScStringCell::~ScStringCell() // ScFormulaCell
Re: [PUSHED] Removed unused code
This is my first contribution. This and any other is of course made available under the MPL/LGPLv3+. Do you think you could link yourself into the developers wiki page here, so we have a pointer to that: http://wiki.documentfoundation.org/Development/Developers Done. Much appreciated :-) Are you interested in some easy hacks ? or particularly annoying itches you have yourself ? Just some easy hacks. Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fix building dictionaries when PERL_UNICODE environment
Hi, I run into troubles while building dictionaries, because I have on my system set PERL_UNICODE=SDL (perl script clone/dictionaries/dictionaries/util/th_check.pl dies as it's forced to use UTF-8, but not all dictionaries are in this encoding). Not sure whether it's good idea to handle it. If yes, there is a working solution (I'm sure, there must be better place to reset the variable). Petr From 6877bd81333f6373fb80d66e6d6479a40e2294f5 Mon Sep 17 00:00:00 2001 From: Petr Vorel petr.vo...@gmail.com Date: Sat, 18 Feb 2012 23:19:22 +0100 Subject: [PATCH] fix building dictionaries when PERL_UNICODE environment variable is set --- Makefile |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index cb99243..7d619e2 100644 --- a/Makefile +++ b/Makefile @@ -267,7 +267,7 @@ define dmake_module_rules $(1): bootstrap fetch cd $(1) unset MAKEFLAGS \ -$(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) -- -P$(GMAKE_PARALLELISM) +PERL_UNICODE=0 $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) -- -P$(GMAKE_PARALLELISM) # PERL_UNICODE breaks th_check.pl during validating thesaurus files $(1).all: bootstrap fetch cd $(1) unset MAKEFLAGS \ -- 1.7.9 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Remove unused code
Hi, I removed a little bit of unused code (unusedcode.easy). Petr From fefa4759000f74d3ca90aa118247abc77cf9363f Mon Sep 17 00:00:00 2001 From: Petr Vorel petr.vo...@gmail.com Date: Sat, 18 Feb 2012 23:50:22 +0100 Subject: [PATCH] Remove unused code --- l10ntools/source/merge.cxx| 16 registry/source/keyimpl.cxx |8 registry/source/keyimpl.hxx |1 - svl/inc/svl/zforlist.hxx |1 - svl/source/numbers/zforlist.cxx |9 - svx/inc/svx/svdetc.hxx|1 - svx/source/svdraw/svdetc.cxx |5 - unotools/inc/unotools/numberformatcodewrapper.hxx |1 - unotools/source/i18n/numberformatcodewrapper.cxx | 16 unusedcode.easy |6 -- vcl/inc/vcl/menu.hxx |1 - vcl/source/window/menu.cxx|9 - 12 files changed, 0 insertions(+), 74 deletions(-) diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx index b9b8d40..55c62d1 100644 --- a/l10ntools/source/merge.cxx +++ b/l10ntools/source/merge.cxx @@ -129,22 +129,6 @@ void MergeData::Insert(PFormEntrys* pfEntrys ) aMap.insert( PFormEntrysHashMap::value_type( rtl::OString(RTL_CONSTASCII_STRINGPARAM(HACK)) , pfEntrys ) ); } -rtl::OString MergeData::Dump() -{ -printf(MergeData sTyp = %s , sGid = %s , sLid =%s , sFilename = %s\n, -sTyp.getStr(), sGID.getStr(), sLID.getStr(), sFilename.getStr()); - -PFormEntrysHashMap::const_iterator idbg; -for( idbg = aMap.begin() ; idbg != aMap.end(); ++idbg ) -{ -printf(aMap[ %s ] = ,idbg-first.getStr()); -( (PFormEntrys*)(idbg-second) )-Dump(); -printf(\n); -} -printf(\n); -return rtl::OString(RTL_CONSTASCII_STRINGPARAM(MergeData\n)); -} - PFormEntrys* MergeData::GetPFObject( const rtl::OString rPFO ) { if( aMap.find( rtl::OString(RTL_CONSTASCII_STRINGPARAM(HACK)) ) != aMap.end() ) diff --git a/registry/source/keyimpl.cxx b/registry/source/keyimpl.cxx index c48ae9c..adbb49e 100644 --- a/registry/source/keyimpl.cxx +++ b/registry/source/keyimpl.cxx @@ -61,14 +61,6 @@ ORegKey::~ORegKey() } //* -// acquireKey -// -RegError ORegKey::acquireKey(RegKeyHandle hKey) -{ -return m_pRegistry-acquireKey(hKey); -} - -//* // releaseKey // RegError ORegKey::releaseKey(RegKeyHandle hKey) diff --git a/registry/source/keyimpl.hxx b/registry/source/keyimpl.hxx index a384d20..fbd9c4c 100644 --- a/registry/source/keyimpl.hxx +++ b/registry/source/keyimpl.hxx @@ -46,7 +46,6 @@ public: sal_uInt32 release() { return --m_refCount; } -RegErroracquireKey(RegKeyHandle hKey); RegErrorreleaseKey(RegKeyHandle hKey); RegErrorcreateKey(const rtl::OUString keyName, RegKeyHandle* phNewKey); diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx index a8cca86..69645e1 100644 --- a/svl/inc/svl/zforlist.hxx +++ b/svl/inc/svl/zforlist.hxx @@ -247,7 +247,6 @@ private: public: -NfCurrencyEntry(); NfCurrencyEntry( const LocaleDataWrapper rLocaleData, LanguageType eLang ); NfCurrencyEntry( diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index 2ee058f..ca3ca49 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -3798,15 +3798,6 @@ sal_uInt16 SvNumberFormatter::GetCurrencyFormatStrings( NfWSStringsDtor rStrArr //--- NfCurrencyEntry -NfCurrencyEntry::NfCurrencyEntry() -: eLanguage( LANGUAGE_DONTKNOW ), -nPositiveFormat(3), -nNegativeFormat(8), -nDigits(2), -cZeroChar('0') -{ -} - NfCurrencyEntry::NfCurrencyEntry( const LocaleDataWrapper rLocaleData, LanguageType eLang ) { diff --git a/svx/inc/svx/svdetc.hxx b/svx/inc/svx/svdetc.hxx index b547289..08ba835 100644 --- a/svx/inc/svx/svdetc.hxx +++ b/svx/inc/svx/svdetc.hxx @@ -256,7 +256,6 @@ public: OLEObjCache(); SVX_DLLPUBLIC ~OLEObjCache(); -void SetSize(sal_uIntPtr nNewSize); void InsertObj(SdrOle2Obj* pObj); void RemoveObj(SdrOle2Obj* pObj); }; diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index 2672e82..0cc3c01 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -174,11 +174,6 @@ void OLEObjCache::UnloadOnDemand() } } -void OLEObjCache::SetSize(sal_uIntPtr nNewSize) -{ -nSize = nNewSize; -} - void OLEObjCache::InsertObj(SdrOle2Obj* pObj) { if ( Count() ) diff --git a/unotools/inc/unotools/numberformatcodewrapper.hxx b/unotools/inc
[PATCH] Removed unused code
Hi there, I removed a little bit of unused code (unusedcode.easy). This is my first contribution. This and any other is of course made available under the MPL/LGPLv3+. Regards, Petr From 445f0c71e523f06f42f622d401b8d9af22b159d3 Mon Sep 17 00:00:00 2001 From: Petr Vorel petr.vo...@gmail.com Date: Fri, 17 Feb 2012 18:07:24 +0100 Subject: [PATCH] Remove unused code. --- .../source/plugin/inc/plugin/unx/plugcon.hxx |3 -- extensions/source/plugin/unx/plugcon.cxx | 17 -- l10ntools/inc/export.hxx |2 - l10ntools/source/export.cxx| 23 linguistic/source/spelldsp.cxx | 15 - unusedcode.easy|5 vcl/inc/vcl/button.hxx |1 - vcl/source/control/button.cxx |6 - 8 files changed, 0 insertions(+), 72 deletions(-) diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx index 86c0e70..8c7175f 100644 --- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx +++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx @@ -184,9 +184,6 @@ public: LINK( this, PluginConnector, WorkOnNewMessageHdl ). Call( (Mediator*)this ); } - -ConnectorInstance* getInstance( NPP ); -ConnectorInstance* getInstanceById( sal_uInt32 ); }; enum CommandAtoms diff --git a/extensions/source/plugin/unx/plugcon.cxx b/extensions/source/plugin/unx/plugcon.cxx index c178c47..1a44624 100644 --- a/extensions/source/plugin/unx/plugcon.cxx +++ b/extensions/source/plugin/unx/plugcon.cxx @@ -59,23 +59,6 @@ sal_uInt32 PluginConnector::GetNPPID( NPP instance ) return UnknownNPPID; } -ConnectorInstance* PluginConnector::getInstance( NPP instance ) -{ -size_t nLen = m_aInstances.size(); -for( size_t i=0; i nLen; i++ ) -{ -ConnectorInstance* pInst = m_aInstances[i]; -if( pInst-instance == instance ) -return pInst; -} -return NULL; -} - -ConnectorInstance* PluginConnector::getInstanceById( sal_uInt32 nInstanceID ) -{ -return nInstanceID static_castsal_uInt32(m_aInstances.size()) ? m_aInstances[ nInstanceID ] : NULL; -} - struct PtrStruct { char* pData; diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx index c669a3b..97c5bf1 100644 --- a/l10ntools/inc/export.hxx +++ b/l10ntools/inc/export.hxx @@ -166,8 +166,6 @@ public: rtl::OString sPForm; -void Dump(); - ResData(const rtl::OString rPF, const rtl::OString rGId) : nWidth( 0 ), diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx index 6a43da8..3c0bff9 100644 --- a/l10ntools/source/export.cxx +++ b/l10ntools/source/export.cxx @@ -201,29 +201,6 @@ int GetError() // class ResData // -void ResData::Dump(){ -printf(**\nResData\n); -printf(sPForm = %s , sResTyp = %s , sId = %s , sGId = %s , sHelpId = %s\n, -sPForm.getStr(), sResTyp.getStr(), sId.getStr(), -sGId.getStr(), sHelpId.getStr()); - -rtl::OString a(*pStringList); -rtl::OString b(*pUIEntries); -rtl::OString c(*pFilterList); -rtl::OString d(*pItemList); -rtl::OString e(*pPairedList); -rtl::OString f(sText); - -Export::DumpMap( f , sText ); - -if( pStringList ) Export::DumpExportList( a , *pStringList ); -if( pUIEntries )Export::DumpExportList( b , *pUIEntries ); -if( pFilterList ) Export::DumpExportList( c , *pFilterList ); -if( pItemList ) Export::DumpExportList( d , *pItemList ); -if( pPairedList ) Export::DumpExportList( e , *pPairedList ); -printf(\n); -} - /*/ sal_Bool ResData::SetId( const rtl::OString rId, sal_uInt16 nLevel ) /*/ diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx index d809e9e..cf5a854 100644 --- a/linguistic/source/spelldsp.cxx +++ b/linguistic/source/spelldsp.cxx @@ -81,7 +81,6 @@ public: voidAppend( const OUString rNew ); voidAppend( const std::vector OUString rNew ); voidAppend( const Sequence OUString rNew ); -voidRemove( const OUString rText ); Sequence OUString GetSequence() const; }; @@ -164,20 +163,6 @@ Sequence OUString ProposalList::GetSequence() const return aRes; } -void ProposalList::Remove( const OUString rText ) -{ -size_t nLen = aVec.size(); -for (size_t i = 0; i nLen; ++i) -{ -OUString rEntry = aVec[i]; -if (rEntry == rText) -{ -rEntry = OUString(); -break; // there should be only one matching entry -} -} -} - sal_Bool SvcListHasLanguage( const LangSvcEntries_Spell rEntry, LanguageType nLanguage