[Libreoffice-commits] .: editeng/inc editeng/source unusedcode.easy vcl/inc vcl/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Nov 23 00:47:02 PST 2012
editeng/inc/editeng/unotext.hxx | 3 ++-
editeng/source/uno/unotext.cxx | 9 ---------
unusedcode.easy | 15 +++++++++++++++
vcl/inc/vcl/wrkwin.hxx | 2 --
vcl/source/window/wrkwin.cxx | 23 -----------------------
5 files changed, 17 insertions(+), 35 deletions(-)
New commits:
commit b5a89ad137d0750b65f0820ebc9fa4e13a84067b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 23 02:37:24 2012 +0000
callcatcher: update list
.ui conversion has finally make inroads into core vcl widgets, no
WorkWindow are initialized from ResIds anymore post conversion
of the xslt filter dialog
Change-Id: I4a1764d9fb9be9e252630e3afc9972221bc16be6
diff --git a/editeng/inc/editeng/unotext.hxx b/editeng/inc/editeng/unotext.hxx
index 39b63f1..397e64b 100644
--- a/editeng/inc/editeng/unotext.hxx
+++ b/editeng/inc/editeng/unotext.hxx
@@ -471,7 +471,8 @@ public:
virtual ~SvxUnoText() throw();
// Internal
- UNO3_GETIMPLEMENTATION_DECL( SvxUnoText )
+ static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
+ virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException);
// ::com::sun::star::uno::XInterface
virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index d6ab43a..589b693 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -2399,15 +2399,6 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxUnoText::getImplementationId( ) throw( un
return theSvxUnoTextImplementationId::get().getSeq();
}
-SvxUnoText* SvxUnoText::getImplementation( const uno::Reference< uno::XInterface >& xInt )
-{
- uno::Reference< lang::XUnoTunnel > xUT( xInt, uno::UNO_QUERY );
- if( xUT.is() )
- return reinterpret_cast<SvxUnoText*>(sal::static_int_cast<sal_uIntPtr>(xUT->getSomething( SvxUnoText::getUnoTunnelId())));
- else
- return NULL;
-}
-
namespace
{
class theSvxUnoTextUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSvxUnoTextUnoTunnelId > {};
diff --git a/unusedcode.easy b/unusedcode.easy
index b227222..af3fe87 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,8 +1,14 @@
+FileStream::checkAccessMode(FileAccessMode)
FontSelectPattern::FontSelectPattern(PhysicalFontFace const&, Size const&, float, int, bool)
GraphicObject::SwapIn(SvStream*)
+HelpParser::GetOutpath(rtl::OString const&, rtl::OString const&, rtl::OString const&)
+HelpParser::MakeDir(rtl::OString const&)
+HelpParser::parse_languages(std::__debug::vector<rtl::OString, std::allocator<rtl::OString> >&, MergeDataFile&)
LiblantagDataRef::presetDataPath(rtl::OUString const&)
Line::GetLength() const
Line::Intersection(Rectangle const&, Line&) const
+OGLTransitionImpl::clearScene()
+PoHeader::getLanguage() const
SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*, unsigned int, unsigned char)
ScFiltersTest::testColorScaleODS()
ScFiltersTest::testColorScaleXLSX()
@@ -10,7 +16,9 @@ ScMenuFloatingWindow::getDoc()
ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any const&)
String::String(unsigned short)
+SvNumberFormatter::PutandConvertEntrySystem(rtl::OUString&, int&, short&, unsigned int&, unsigned short, unsigned short)
SvTreeList::GetChildIterators(SvTreeListEntry const*) const
+SvTreeListBox::GetParent(SvTreeListEntry const*) const
SvtGraphicStroke::toString() const
TextEngine::GetLeftMargin() const
ThumbnailViewItemAcc::FireAccessibleEvent(short, com::sun::star::uno::Any const&, com::sun::star::uno::Any const&)
@@ -45,9 +53,11 @@ connectivity::file::OStatement_Base::reset()
connectivity::mork::OColumnAlias::OColumnAlias()
connectivity::sdbcx::OGroup::OGroup(rtl::OUString const&, unsigned char)
connectivity::sdbcx::OGroup::OGroup(unsigned char)
+desktop::Lockfile::clean()
framework::OReadMenuDocumentHandler::getServiceFactory()
jfw_plugin::VendorBase::createInstance()
oox::drawingml::TextListStyle::dump() const
+oox::ole::VbaSiteModel::bindToSources(com::sun::star::uno::Reference<com::sun::star::awt::XControlModel> const&, oox::ole::ControlConverter const&) const
oox::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper const&)
oox::xls::FormulaProcessorBase::generateRangeList2dString(oox::xls::ApiCellRangeList const&, bool, unsigned short, bool)
sc_apitest::main()
@@ -64,4 +74,9 @@ unicode::isDigit(unsigned short)
unicode::isLower(unsigned short)
unicode::isPrint(unsigned short)
unicode::isUpper(unsigned short)
+writerfilter::WW8Analyzer::WW8Analyzer()
writerfilter::createStreamHandler()
+writerfilter::doctokidsToXML(std::basic_ostream<char, std::char_traits<char> >&)
+writerfilter::ooxmlidsToXML(std::basic_ostream<char, std::char_traits<char> >&)
+writerfilter::ooxmlsprmidsToXML(std::basic_ostream<char, std::char_traits<char> >&)
+writerfilter::sprmidsToXML(std::basic_ostream<char, std::char_traits<char> >&)
diff --git a/vcl/inc/vcl/wrkwin.hxx b/vcl/inc/vcl/wrkwin.hxx
index f8b4e8d..e283400 100644
--- a/vcl/inc/vcl/wrkwin.hxx
+++ b/vcl/inc/vcl/wrkwin.hxx
@@ -59,11 +59,9 @@ private:
protected:
WorkWindow( WindowType nType );
SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData = NULL );
- SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
SAL_DLLPRIVATE void ImplSetFrameState( sal_uLong aFrameState );
public:
- WorkWindow( Window* pParent, const ResId& rResId );
WorkWindow( Window* pParent, WinBits nStyle = WB_STDWORK );
WorkWindow( Window* pParent, const ::com::sun::star::uno::Any& aSystemWorkWindowToken, WinBits nStyle = WB_STDWORK );
WorkWindow( SystemParentData* pParent ); // Not in the REMOTE-Version
diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx
index 69f8779..1256f25 100644
--- a/vcl/source/window/wrkwin.cxx
+++ b/vcl/source/window/wrkwin.cxx
@@ -119,18 +119,6 @@ WorkWindow::WorkWindow( Window* pParent, WinBits nStyle ) :
// -----------------------------------------------------------------------
-WorkWindow::WorkWindow( Window* pParent, const ResId& rResId ) :
- SystemWindow( WINDOW_WORKWINDOW )
-{
- ImplInitWorkWindowData();
- rResId.SetRT( RSC_WORKWIN );
- WinBits nStyle = ImplInitRes( rResId );
- ImplInit( pParent, nStyle );
- ImplLoadRes( rResId );
-}
-
-// -----------------------------------------------------------------------
-
WorkWindow::WorkWindow( Window* pParent, const ::com::sun::star::uno::Any& aSystemWorkWindowToken, WinBits nStyle ) :
SystemWindow( WINDOW_WORKWINDOW )
{
@@ -151,17 +139,6 @@ WorkWindow::WorkWindow( SystemParentData* pParent ) :
// -----------------------------------------------------------------------
-void WorkWindow::ImplLoadRes( const ResId& rResId )
-{
- SystemWindow::ImplLoadRes( rResId );
-
- ReadLongRes();
- if ( !(rResId.GetWinBits() & WB_HIDE) && (RSC_WORKWIN == rResId.GetRT()) )
- Show();
-}
-
-// -----------------------------------------------------------------------
-
WorkWindow::~WorkWindow()
{
ImplSVData* pSVData = ImplGetSVData();
More information about the Libreoffice-commits
mailing list