[Libreoffice-commits] core.git: 2 commits - desktop/source include/tools include/vcl rsc/inc rsc/source sw/source tools/source unusedcode.easy vcl/source writerfilter/source
Caolán McNamara
caolanm at redhat.com
Sun Jun 15 12:31:16 PDT 2014
desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 30 ------------
desktop/source/deployment/gui/dp_gui_extlistbox.hxx | 6 --
include/tools/rcid.h | 5 --
include/vcl/combobox.hxx | 1
include/vcl/field.hxx | 1
rsc/inc/rscdb.hxx | 2
rsc/source/parser/rscicpx.cxx | 41 -----------------
rsc/source/parser/rscinit.cxx | 8 ---
sw/source/uibase/dbui/mailmergehelper.cxx | 10 ----
sw/source/uibase/inc/mailmergehelper.hxx | 2
tools/source/rc/resmgr.cxx | 1
unusedcode.easy | 7 ++
vcl/source/control/combobox.cxx | 7 --
vcl/source/control/field.cxx | 15 ------
writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx | 3 -
15 files changed, 9 insertions(+), 130 deletions(-)
New commits:
commit 8d373129e9ade194ff7759c9e8736945c4a2fb42
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jun 14 21:36:11 2014 +0100
callcatcher: update unused code
and strip away some stuff in rsc that should now be dead
Change-Id: I6411e706c50dff299099680f1f942bf61c4e79f2
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 7e8a9b6..051220e 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -175,29 +175,6 @@ ExtensionRemovedListener::~ExtensionRemovedListener()
// ExtensionBox_Impl
-
-ExtensionBox_Impl::ExtensionBox_Impl( Window* pParent, TheExtensionManager *pManager ) :
- IExtensionListBox( pParent, WB_BORDER | WB_TABSTOP | WB_CHILDDLGCTRL ),
- m_bHasScrollBar( false ),
- m_bHasActive( false ),
- m_bNeedsRecalc( true ),
- m_bInCheckMode( false ),
- m_bAdjustActive( false ),
- m_bInDelete( false ),
- m_nActive( 0 ),
- m_nTopIndex( 0 ),
- m_nActiveHeight( 0 ),
- m_nExtraHeight( 2 ),
- m_aSharedImage( DialogHelper::getResId( RID_IMG_SHARED ) ),
- m_aLockedImage( DialogHelper::getResId( RID_IMG_LOCKED ) ),
- m_aWarningImage( DialogHelper::getResId( RID_IMG_WARNING ) ),
- m_aDefaultImage( DialogHelper::getResId( RID_IMG_EXTENSION ) ),
- m_pScrollBar( NULL ),
- m_pManager( pManager )
-{
- Init();
-}
-
ExtensionBox_Impl::ExtensionBox_Impl(Window* pParent) :
IExtensionListBox( pParent, WB_BORDER | WB_TABSTOP | WB_CHILDDLGCTRL ),
m_bHasScrollBar( false ),
@@ -422,13 +399,6 @@ void ExtensionBox_Impl::CalcActiveHeight( const long nPos )
m_nActiveHeight = aTextHeight + 2;
}
-
-const Size ExtensionBox_Impl::GetMinOutputSizePixel() const
-{
- return Size( 200, 80 );
-}
-
-
Rectangle ExtensionBox_Impl::GetEntryRect( const long nPos ) const
{
const ::osl::MutexGuard aGuard( m_entriesMutex );
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
index 019e804..e94eb41 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
@@ -182,9 +182,8 @@ class ExtensionBox_Impl : public ::svt::IExtensionListBox
void Init();
public:
- ExtensionBox_Impl(Window* pParent);
- ExtensionBox_Impl(Window* pParent, TheExtensionManager *pManager);
- virtual ~ExtensionBox_Impl();
+ ExtensionBox_Impl(Window* pParent);
+ virtual ~ExtensionBox_Impl();
virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
virtual void Paint( const Rectangle &rPaintRect ) SAL_OVERRIDE;
@@ -192,7 +191,6 @@ public:
virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
virtual Size GetOptimalSize() const SAL_OVERRIDE;
- const Size GetMinOutputSizePixel() const;
void SetExtraSize( long nSize ) { m_nExtraHeight = nSize; }
TEntry_Impl GetEntryData( long nPos ) { return m_vEntries[ nPos ]; }
long GetEntryCount() { return (long) m_vEntries.size(); }
diff --git a/include/tools/rcid.h b/include/tools/rcid.h
index 3d04f78..aef56b4 100644
--- a/include/tools/rcid.h
+++ b/include/tools/rcid.h
@@ -95,11 +95,6 @@
#define RSC_DATEFIELD (RSC_NOTYPE + 0x66)
#define RSC_TIMEFIELD (RSC_NOTYPE + 0x67)
-#define RSC_NUMERICBOX (RSC_NOTYPE + 0x69)
-
-
-
-
#define RSC_TOOLBOXITEM (RSC_NOTYPE + 0x70)
diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx
index 3ea2f64..f0dd459 100644
--- a/include/vcl/combobox.hxx
+++ b/include/vcl/combobox.hxx
@@ -85,7 +85,6 @@ protected:
SAL_DLLPRIVATE long getMaxWidthScrollBarAndDownButton() const;
protected:
- explicit ComboBox( WindowType nType );
bool IsDropDownBox() const { return mpFloatWin ? true : false; }
virtual void FillLayoutData() const SAL_OVERRIDE;
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index a7a9d6f..8a7f844 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -718,7 +718,6 @@ class VCL_DLLPUBLIC NumericBox : public ComboBox, public NumericFormatter
{
public:
explicit NumericBox( Window* pParent, WinBits nWinStyle );
- explicit NumericBox( Window* pParent, const ResId& );
virtual ~NumericBox();
virtual Size CalcMinimumSize() const SAL_OVERRIDE;
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 17e50a8..7414bae 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -205,7 +205,6 @@ class RscTypCont
RscTop * InitClassTime( RscTop * pSuper );
RscTop * InitClassDate( RscTop * pSuper );
- RscTop * InitClassPatternFormatter( RscTop * pSuper );
RscTop * InitClassNumericFormatter( RscTop * pSuper );
RscTop * InitClassMetricFormatter( RscTop * pSuper,
RscEnum * pFieldUnits );
@@ -218,7 +217,6 @@ class RscTypCont
RscTop * InitClassMetricField( RscTop * pSuper );
RscTop * InitClassDateField( RscTop * pSuper, RscTop * pClassDate );
RscTop * InitClassTimeField( RscTop * pSuper, RscTop * pClassTime );
- RscTop * InitClassNumericBox( RscTop * pSuper );
RscTop * InitClassDockingWindow( RscTop * pSuper,
RscEnum * pMapUnit );
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index 58f3a58..b49e2a9 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -1213,30 +1213,6 @@ RscTop * RscTypCont::InitClassDate( RscTop * pSuper )
return pClassDate;
}
-RscTop * RscTypCont::InitClassPatternFormatter( RscTop * pSuper )
-{
- Atom nId;
- RscTop * pClassPattern;
-
- // Klasse anlegen
- nId = pHS->getID( "PatternFormatter" );
- pClassPattern = new RscClass( nId, RSC_NOTYPE, pSuper );
- pClassPattern->SetCallPar( *pStdPar1, *pStdPar2, *pStdParType );
-
- // Variablen anlegen
- nId = aNmTb.Put( "StrictFormat", VARNAME );
- pClassPattern->SetVariable( nId, &aBool, NULL,
- 0, PATTERNFORMATTER_STRICTFORMAT );
- nId = aNmTb.Put( "EditMask", VARNAME );
- pClassPattern->SetVariable( nId, &aLangString, NULL,
- 0, PATTERNFORMATTER_EDITMASK );
- nId = aNmTb.Put( "LiteralMask", VARNAME );
- pClassPattern->SetVariable( nId, &aLangString, NULL,
- 0, PATTERNFORMATTER_LITTERALMASK );
-
- return pClassPattern;
-}
-
RscTop * RscTypCont::InitClassNumericFormatter( RscTop * pSuper )
{
Atom nId;
@@ -1469,23 +1445,6 @@ RscTop * RscTypCont::InitClassTimeField( RscTop * pSuper, RscTop * pClassTime )
return pClassTimeField;
}
-RscTop * RscTypCont::InitClassNumericBox( RscTop * pSuper )
-{
- Atom nId;
- RscTop * pClassNumericBox;
-
- // Klasse anlegen
- nId = pHS->getID( "NumericBox" );
- pClassNumericBox = new RscClass( nId, RSC_NUMERICBOX, pSuper );
- pClassNumericBox->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
-
- aNmTb.Put( nId, CLASSNAME, pClassNumericBox );
-
- // Variablen anlegen
-
- return pClassNumericBox;
-}
-
RscTop * RscTypCont::InitClassDockingWindow( RscTop * pSuper,
RscEnum * pMapUnit )
{
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index e0eca6b..9a67f1d 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -116,7 +116,6 @@ void RscTypCont::Init()
RscTop * pClassMetricField;
RscTop * pClassDateField;
RscTop * pClassTimeField;
- RscTop * pClassNumericBox;
RscTop * pClassDockingWindow;
RscTop * pClassToolBoxItem;
RscTop * pClassToolBox;
@@ -611,13 +610,6 @@ void RscTypCont::Init()
pClassTimeField = InitClassTimeField( pClassTmp, pClassTime );
pRoot->Insert( pClassTimeField );
}
- { // Mehrfachvererbung von Hand
- RscTop * pClassTmp = InitClassNumericFormatter( pClassComboBox );
- aBaseLst.push_back( pClassTmp );
-
- pClassNumericBox = InitClassNumericBox( pClassTmp );
- pRoot->Insert( pClassNumericBox );
- }
}
{
pClassDockingWindow = InitClassDockingWindow( pClassWindow, pMapUnit );
diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx
index 1d3826a..88f702a 100644
--- a/sw/source/uibase/dbui/mailmergehelper.cxx
+++ b/sw/source/uibase/dbui/mailmergehelper.cxx
@@ -185,16 +185,6 @@ struct SwAddressPreview_Impl
}
};
-SwAddressPreview::SwAddressPreview(Window* pParent, const ResId& rResId)
- : Window( pParent, rResId )
- , aVScrollBar(this, WB_VSCROLL)
- , pImpl(new SwAddressPreview_Impl())
-{
- aVScrollBar.SetScrollHdl(LINK(this, SwAddressPreview, ScrollHdl));
- positionScrollBar();
- Show();
-}
-
SwAddressPreview::SwAddressPreview(Window* pParent, WinBits nStyle)
: Window( pParent, nStyle )
, aVScrollBar(this, WB_VSCROLL)
diff --git a/sw/source/uibase/inc/mailmergehelper.hxx b/sw/source/uibase/inc/mailmergehelper.hxx
index 1a07a48..f31ebb2 100644
--- a/sw/source/uibase/inc/mailmergehelper.hxx
+++ b/sw/source/uibase/inc/mailmergehelper.hxx
@@ -76,8 +76,6 @@ class SW_DLLPUBLIC SwAddressPreview : public Window
DECL_LINK(ScrollHdl, void*);
public:
- SwAddressPreview(Window* pParent, const ResId& rResId);
-
SwAddressPreview(Window* pParent, WinBits nStyle=WB_BORDER);
void positionScrollBar();
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index 5d76d8d..f38098f 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -1496,7 +1496,6 @@ OString ResMgr::GetAutoHelpId()
case RSC_METRICFIELD: aHID.append( "MetricField" ); break;
case RSC_DATEFIELD: aHID.append( "DateField" ); break;
case RSC_TIMEFIELD: aHID.append( "TimeField" ); break;
- case RSC_NUMERICBOX: aHID.append( "NumericBox" ); break;
case RSC_IMAGEBUTTON: aHID.append( "ImageButton" ); break;
case RSC_MENUBUTTON: aHID.append( "MenuButton" ); break;
default:
diff --git a/unusedcode.easy b/unusedcode.easy
index 91a5f4b..f9019d6 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,6 +1,7 @@
(anonymous namespace)::flagToString(unsigned short)
BigInt::BigInt(unsigned int)
CalcUnoApiTest::CalcUnoApiTest(rtl::OUString const&)
+ChartTest::getChartDocFromDrawImpress(int, int)
DocumentHandler::DocumentHandler(com::sun::star::uno::Reference<com::sun::star::xml::sax::XDocumentHandler>&)
EditEngine::IsIdleFormatterActive() const
GDriveDocument::GDriveDocument(GDriveSession*)
@@ -202,6 +203,7 @@ sc::CLBuildKernelThread::produce()
sc::CellValues::transferTo(ScColumn&, int)
sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
+sd::framework::FrameworkHelper::Instance(com::sun::star::uno::Reference<com::sun::star::frame::XController> const&)
sfx2::SvBaseLink::SvBaseLink(rtl::OUString const&, unsigned short, sfx2::SvLinkSource*)
std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> >, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> > >::_Rb_tree(std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> >, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> > >&&)
std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr<formula::FormulaTokenArray>&)
@@ -209,3 +211,8 @@ std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr_ref<formula::F
std::vector<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread>, std::allocator<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread> > >::reserve(unsigned long)
utl::extractTime(com::sun::star::util::DateTime const&, com::sun::star::util::Time&)
vcl::MapChar(vcl::_TrueTypeFont*, unsigned short, bool)
+writerfilter::XPathLogger::endElement()
+writerfilter::XPathLogger::getXPath() const
+writerfilter::XPathLogger::startElement(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)
+writerfilter::ooxml::OOXMLParserState::getXPathLogger()
+writerfilter::xmlify(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index a5810f2..ecaca65 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -44,13 +44,6 @@ static void lcl_GetSelectedEntries( ::std::set< sal_Int32 >& rSelectedPos, const
}
}
-ComboBox::ComboBox( WindowType nType ) :
- Edit( nType )
-{
- ImplInitComboBoxData();
- SetWidthInChars(-1);
-}
-
ComboBox::ComboBox( Window* pParent, WinBits nStyle ) :
Edit( WINDOW_COMBOBOX )
{
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 81bd025..4b209e2 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -892,21 +892,6 @@ NumericBox::NumericBox( Window* pParent, WinBits nWinStyle ) :
Show();
}
-NumericBox::NumericBox( Window* pParent, const ResId& rResId ) :
- ComboBox( WINDOW_NUMERICBOX )
-{
- rResId.SetRT( RSC_NUMERICBOX );
- WinBits nStyle = ImplInitRes( rResId );
- ComboBox::ImplInit( pParent, nStyle );
- SetField( this );
- ComboBox::ImplLoadRes( rResId );
- NumericFormatter::ImplLoadRes( ResId( (RSHEADER_TYPE *)GetClassRes(), *rResId.GetResMgr() ) );
- Reformat();
-
- if ( !(nStyle & WB_HIDE ) )
- Show();
-}
-
Size NumericBox::CalcMinimumSize() const
{
Size aRet(calcMinimumSize(*this, *this));
commit 2f7eb939fe162cbe16af68bb09754a8a9800a78f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jun 14 15:47:57 2014 +0100
fix debug=2 build
Change-Id: If373905f4fd0ae4889b39b69a5dd089ccc9aff69
diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
index 41c9ed9..d714c8d 100644
--- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
@@ -19,9 +19,6 @@
#include <iostream>
#include <boost/shared_ptr.hpp>
-#ifdef DEBUG_ELEMENT
-#include "ooxmlLoggers.hxx"
-#endif
#include "OOXMLFastDocumentHandler.hxx"
#include "OOXMLFastContextHandler.hxx"
#include "ooxml/OOXMLFastTokens.hxx"
More information about the Libreoffice-commits
mailing list