[Libreoffice-commits] core.git: 2 commits - filter/source include/tools include/vcl rsc/inc rsc/source tools/source unusedcode.easy vcl/source
Caolán McNamara
caolanm at redhat.com
Wed Jun 11 02:49:10 PDT 2014
filter/source/config/cache/filtercache.cxx | 23 -------------
filter/source/config/cache/filtercache.hxx | 35 ---------------------
include/tools/rcid.h | 12 +++----
include/vcl/tabdlg.hxx | 1
rsc/inc/rscdb.hxx | 3 -
rsc/source/parser/rscicpx.cxx | 48 -----------------------------
rsc/source/parser/rscinit.cxx | 39 -----------------------
tools/source/rc/resmgr.cxx | 1
unusedcode.easy | 6 ++-
vcl/source/window/tabdlg.cxx | 8 ----
10 files changed, 9 insertions(+), 167 deletions(-)
New commits:
commit 0e7ca4fad0405200f12041ac11f3ac0289709a6f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jun 11 10:29:50 2014 +0100
cut out the rsc loading support for stuff thats now .ui only
Change-Id: I54880de44ee10d4f71c8a514f905e8e00774fde7
diff --git a/include/tools/rcid.h b/include/tools/rcid.h
index 0b2ac17..3d04f78 100644
--- a/include/tools/rcid.h
+++ b/include/tools/rcid.h
@@ -55,7 +55,7 @@
#define RSC_WINDOW (RSC_NOTYPE + 0x35)
#define RSC_SYSWINDOW (RSC_NOTYPE + 0x36)
#define RSC_WORKWIN (RSC_NOTYPE + 0x37)
-#define RSC_MDIWINDOW (RSC_NOTYPE + 0x38)
+
#define RSC_FLOATINGWINDOW (RSC_NOTYPE + 0x39)
#define RSC_DIALOG (RSC_NOTYPE + 0x3a)
#define RSC_MODELESSDIALOG (RSC_NOTYPE + 0x3b)
@@ -85,17 +85,16 @@
#define RSC_FIXEDIMAGE (RSC_NOTYPE + 0x5a)
#define RSC_GROUPBOX (RSC_NOTYPE + 0x5c)
#define RSC_SCROLLBAR (RSC_NOTYPE + 0x5d)
-#define RSC_SCROLLBARBOX (RSC_NOTYPE + 0x5e)
+
#define RSC_SPLITTER (RSC_NOTYPE + 0x5f)
#define RSC_SPLITWINDOW (RSC_NOTYPE + 0x60)
#define RSC_SPINFIELD (RSC_NOTYPE + 0x61)
-#define RSC_PATTERNFIELD (RSC_NOTYPE + 0x62)
+
#define RSC_NUMERICFIELD (RSC_NOTYPE + 0x63)
#define RSC_METRICFIELD (RSC_NOTYPE + 0x64)
#define RSC_DATEFIELD (RSC_NOTYPE + 0x66)
#define RSC_TIMEFIELD (RSC_NOTYPE + 0x67)
-#define RSC_PATTERNBOX (RSC_NOTYPE + 0x68)
#define RSC_NUMERICBOX (RSC_NOTYPE + 0x69)
@@ -106,12 +105,11 @@
#define RSC_TOOLBOXITEM (RSC_NOTYPE + 0x70)
#define RSC_TOOLBOX (RSC_NOTYPE + 0x71)
#define RSC_DOCKINGWINDOW (RSC_NOTYPE + 0x72)
-#define RSC_STATUSBAR (RSC_NOTYPE + 0x73)
+
#define RSC_TABPAGE (RSC_NOTYPE + 0x74)
#define RSC_TABCONTROL (RSC_NOTYPE + 0x75)
-#define RSC_TABDIALOG (RSC_NOTYPE + 0x76)
#define RSC_TABCONTROLITEM (RSC_NOTYPE + 0x77)
-#define RSC_TREELISTBOX (RSC_NOTYPE + 0x78)
+
#define RSC_STRINGARRAY (RSC_NOTYPE + 0x79)
// (RSC_NOTYPE + 0x200) - (RSC_NOTYPE + 0x300) reserved for Sfx
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index b824483..17e50a8 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -214,12 +214,10 @@ class RscTypCont
RscEnum * pTimeFieldFormat );
RscTop * InitClassSpinField( RscTop * pSuper );
- RscTop * InitClassPatternField( RscTop * pSuper );
RscTop * InitClassNumericField( RscTop * pSuper );
RscTop * InitClassMetricField( RscTop * pSuper );
RscTop * InitClassDateField( RscTop * pSuper, RscTop * pClassDate );
RscTop * InitClassTimeField( RscTop * pSuper, RscTop * pClassTime );
- RscTop * InitClassPatternBox( RscTop * pSuper );
RscTop * InitClassNumericBox( RscTop * pSuper );
RscTop * InitClassDockingWindow( RscTop * pSuper,
@@ -229,7 +227,6 @@ class RscTypCont
RscEnum * pTriState );
RscTop * InitClassToolBox( RscTop * pSuper, RscTop * pClassToolBoxItem,
RscTop * pClassImageList );
- RscTop * InitClassStatusBar( RscTop * pSuper );
RscTop * InitClassFloatingWindow( RscTop * pSuper,
RscEnum * pMapUnit );
RscTop * InitClassTabControlItem( RscTop * pSuper );
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index 45139c3..58f3a58 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -1376,21 +1376,6 @@ RscTop * RscTypCont::InitClassSpinField( RscTop * pSuper )
return pClassSpinField;
}
-RscTop * RscTypCont::InitClassPatternField( RscTop * pSuper )
-{
- Atom nId;
- RscTop * pClassPatternField;
-
- // Klasse anlegen
- nId = pHS->getID( "PatternField" );
- pClassPatternField = new RscClass( nId, RSC_PATTERNFIELD, pSuper );
- pClassPatternField->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
-
- aNmTb.Put( nId, CLASSNAME, pClassPatternField );
-
- return pClassPatternField;
-}
-
RscTop * RscTypCont::InitClassNumericField( RscTop * pSuper )
{
Atom nId;
@@ -1484,21 +1469,6 @@ RscTop * RscTypCont::InitClassTimeField( RscTop * pSuper, RscTop * pClassTime )
return pClassTimeField;
}
-RscTop * RscTypCont::InitClassPatternBox( RscTop * pSuper )
-{
- Atom nId;
- RscTop * pClassPatternBox;
-
- // Klasse anlegen
- nId = pHS->getID( "PatternBox" );
- pClassPatternBox = new RscClass( nId, RSC_PATTERNBOX, pSuper );
- pClassPatternBox->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
-
- aNmTb.Put( nId, CLASSNAME, pClassPatternBox );
-
- return pClassPatternBox;
-}
-
RscTop * RscTypCont::InitClassNumericBox( RscTop * pSuper )
{
Atom nId;
@@ -1764,24 +1734,6 @@ RscTop * RscTypCont::InitClassToolBox( RscTop * pSuper,
return pClassToolBox;
}
-RscTop * RscTypCont::InitClassStatusBar( RscTop * pSuper )
-{
- Atom nId;
- RscTop * pClassStatusBar;
-
- // Klasse anlegen
- nId = pHS->getID( "StatusBar" );
- pClassStatusBar = new RscClass( nId, RSC_STATUSBAR, pSuper );
- pClassStatusBar->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
- aNmTb.Put( nId, CLASSNAME, pClassStatusBar );
-
- // Variablen anlegen
- INS_WINBIT(pClassStatusBar,Left)
- INS_WINBIT(pClassStatusBar,Right)
-
- return pClassStatusBar;
-}
-
RscTop * RscTypCont::InitClassFloatingWindow( RscTop * pSuper,
RscEnum * pMapUnit )
{
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index 60798ab..e0eca6b 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -112,24 +112,19 @@ void RscTypCont::Init()
RscTop * pClassTime;
RscTop * pClassDate;
RscTop * pClassSpinField;
- RscTop * pClassPatternField;
RscTop * pClassNumericField;
RscTop * pClassMetricField;
RscTop * pClassDateField;
RscTop * pClassTimeField;
- RscTop * pClassPatternBox;
RscTop * pClassNumericBox;
RscTop * pClassDockingWindow;
RscTop * pClassToolBoxItem;
RscTop * pClassToolBox;
- RscTop * pClassStatusBar;
RscTop * pClassFloatingWindow;
RscTop * pClassTabPage;
- RscTop * pClassTabDialog;
RscTop * pClassTabControlItem;
RscTop * pClassTabControl;
RscTop * pClassFixedLine;
- RscTop * pClassScrollBarBox;
RscTop * pClassSfxStyleFamilyItem;
RscTop * pClassSfxTemplateDialog;
RscTop * pClassSfxSlotInfo;
@@ -586,13 +581,6 @@ void RscTypCont::Init()
}
{
{ // Mehrfachvererbung von Hand
- RscTop * pClassTmp = InitClassPatternFormatter( pClassSpinField );
- aBaseLst.push_back( pClassTmp );
-
- pClassPatternField = InitClassPatternField( pClassTmp );
- pRoot->Insert( pClassPatternField );
- }
- { // Mehrfachvererbung von Hand
RscTop * pClassTmp = InitClassNumericFormatter( pClassSpinField );
aBaseLst.push_back( pClassTmp );
@@ -624,13 +612,6 @@ void RscTypCont::Init()
pRoot->Insert( pClassTimeField );
}
{ // Mehrfachvererbung von Hand
- RscTop * pClassTmp = InitClassPatternFormatter( pClassComboBox );
- aBaseLst.push_back( pClassTmp );
-
- pClassPatternBox = InitClassPatternBox( pClassTmp );
- pRoot->Insert( pClassPatternBox );
- }
- { // Mehrfachvererbung von Hand
RscTop * pClassTmp = InitClassNumericFormatter( pClassComboBox );
aBaseLst.push_back( pClassTmp );
@@ -650,9 +631,6 @@ void RscTypCont::Init()
pClassImageList );
pRoot->Insert( pClassToolBox );
- pClassStatusBar = InitClassStatusBar( pClassWindow );
- pRoot->Insert( pClassStatusBar );
-
pClassFloatingWindow = InitClassFloatingWindow( pClassSystemWindow,
pMapUnit );
pRoot->Insert( pClassFloatingWindow );
@@ -665,14 +643,6 @@ void RscTypCont::Init()
aNmTb.Put( nId, CLASSNAME, pClassTabPage );
pRoot->Insert( pClassTabPage );
- // Klasse anlegen
- nId = pHS->getID( "TabDialog" );
- pClassTabDialog =
- new RscClass( nId, RSC_TABDIALOG, pClassModalDialog );
- pClassTabDialog->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
- aNmTb.Put( nId, CLASSNAME, pClassTabDialog );
- pRoot->Insert( pClassTabDialog );
-
pClassTabControlItem = InitClassTabControlItem( pClassMgr );
pRoot->Insert( pClassTabControlItem );
@@ -691,15 +661,6 @@ void RscTypCont::Init()
aNmTb.Put( nId, CLASSNAME, pClassFixedLine );
pRoot->Insert( pClassFixedLine );
- // Klasse anlegen
- nId = pHS->getID( "ScrollBarBox" );
- pClassScrollBarBox =
- new RscClass( nId, RSC_SCROLLBARBOX, pClassWindow );
- pClassScrollBarBox->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
- aNmTb.Put( nId, CLASSNAME, pClassScrollBarBox );
- pRoot->Insert( pClassScrollBarBox );
- INS_WINBIT(pClassScrollBarBox,Sizeable)
-
pClassSfxStyleFamilyItem = InitClassSfxStyleFamilyItem( pClassMgr,
pClassBitmap,
pClassImage,
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index d315bc7..5d76d8d 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -1492,7 +1492,6 @@ OString ResMgr::GetAutoHelpId()
case RSC_COMBOBOX: aHID.append( "ComboBox" ); break;
case RSC_PUSHBUTTON: aHID.append( "PushButton" ); break;
case RSC_SPINFIELD: aHID.append( "SpinField" ); break;
- case RSC_PATTERNFIELD: aHID.append( "PatternField" ); break;
case RSC_NUMERICFIELD: aHID.append( "NumericField" ); break;
case RSC_METRICFIELD: aHID.append( "MetricField" ); break;
case RSC_DATEFIELD: aHID.append( "DateField" ); break;
commit c8d8bcf3fdf49aae6d8415c9c9a9f9418d87bd6b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jun 11 09:16:16 2014 +0100
callcatcher: update unused code
Change-Id: Iee19af81c648cb82074d8cabc13716b0d38c7ff6
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index e9ac3ed..f3f5321 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -1271,29 +1271,6 @@ FilterCache::EItemFlushState FilterCache::impl_specifyFlushOperation(const css::
return eState;
}
-
-
-void FilterCache::impl_resolveItem4TypeRegistration( CacheItemList* pList,
- const OUString& sItem,
- const OUString& sType)
- throw(css::uno::Exception)
-{
- CacheItem& rItem = (*pList)[sItem];
- // In case it's a new created entry (automatically done by the boost::unordered_map index operator!)
- // we must be sure, that this entry has its own name as property available.
- // Its needed later at our container interface!
- rItem[PROPNAME_NAME] <<= sItem;
-
- OUStringList lTypeRegs(rItem[PROPNAME_TYPES]);
- if (::std::find(lTypeRegs.begin(), lTypeRegs.end(), sType) == lTypeRegs.end())
- {
- lTypeRegs.push_back(sType);
- rItem[PROPNAME_TYPES] <<= lTypeRegs.getAsConstList();
- }
-}
-
-
-
void FilterCache::impl_load(EFillState eRequiredState)
throw(css::uno::Exception)
{
diff --git a/filter/source/config/cache/filtercache.hxx b/filter/source/config/cache/filtercache.hxx
index 33efef1..d405161 100644
--- a/filter/source/config/cache/filtercache.hxx
+++ b/filter/source/config/cache/filtercache.hxx
@@ -732,41 +732,6 @@ class FilterCache : public BaseLock
void impl_validateAndOptimize()
throw(css::uno::Exception);
-
-
- /** @short register the specified item for the given type.
-
- @descr Because detect services, frame loader or content handler
- are not listed inside the xml configuration as separated
- items (they are properties of any type entry!), this method update
- the internal lists of such items. Thats necessary to have
- it accessible for our container interfaces of detect, frame loader
- and content handler services.
-
- @param pList
- points to a CacheItemList of this filter cache, where
- this item registration should be updated or added.
-
- @param sItem
- specify the detect service, frame loader or content handler,
- which should be registered for the given type.
-
- @param sType
- contains the internal type name, where the item should be registered for.
-
- @throw [css::uno::Exception]
- If registration failed by any reason.
- That does not include double registrations!
- */
- static
- void impl_resolveItem4TypeRegistration( CacheItemList* pList,
- const OUString& sItem,
- const OUString& sType)
- throw(css::uno::Exception);
-
-
- // static helper
-
private:
diff --git a/include/vcl/tabdlg.hxx b/include/vcl/tabdlg.hxx
index c288a67..a990b8e 100644
--- a/include/vcl/tabdlg.hxx
+++ b/include/vcl/tabdlg.hxx
@@ -40,7 +40,6 @@ private:
public:
TabDialog( Window* pParent,
WinBits nStyle = WB_STDTABDIALOG );
- TabDialog( Window* pParent, const ResId& rResId );
TabDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription );
virtual ~TabDialog();
diff --git a/unusedcode.easy b/unusedcode.easy
index b9bb988..91a5f4b 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -14,9 +14,11 @@ MenuBar::AddMenuBarButton(Image const&, Link const&, rtl::OUString const&, unsig
MenuBar::GetMenuBarButtonRectPixel(unsigned short)
MenuBar::RemoveMenuBarButton(unsigned short)
MenuBar::SetMenuBarButtonHighlightHdl(unsigned short, Link const&)
+MetaAction::TypeName(unsigned short)
MetafileXmlDump::filterNoneActionTypes()
OpenGLContext::renderToFile()
OpenGLRender::CreateTextTexture(rtl::OUString const&, Font, long, com::sun::star::awt::Point, com::sun::star::awt::Size, long)
+OpenGLRender::GetAsBitmap()
OutputDevice::GetCanvas() const
OutputDevice::HasAlpha()
OutputDevice::LogicToLogic(basegfx::B2DPolyPolygon const&, MapMode const&, MapMode const&)
@@ -30,7 +32,6 @@ RenderPrimitive::copyVertexBufferData(char const*, unsigned int)
SalGraphics::drawTransformedBitmap(basegfx::B2DPoint const&, basegfx::B2DPoint const&, basegfx::B2DPoint const&, SalBitmap const&, SalBitmap const*)
ScDocument::AreaBroadcastInRange(ScRange const&, ScHint const&)
ScDocument::CreateFormatTable() const
-ScExtIButton::GetSelected() const
ScFormulaCellGroup::scheduleCompilation()
ScRawToken::Clone() const
ScRawToken::Delete()
@@ -53,9 +54,10 @@ StyleSettings::SetUseFlatBorders(bool)
StyleSettings::SetUseFlatMenus(bool)
SvpSalInstance::PostedEventsInQueue()
SvtListener::IsListening(SvtBroadcaster&) const
-SvxDummyShapeContainer::SvxDummyShapeContainer(com::sun::star::uno::Reference<com::sun::star::drawing::XShapes>)
SvxFontListBox::GetSelectEntry() const
SvxNumberFormatShell::IsAdded_Impl(unsigned long)
+SvxOpenGLObject::getRenderer()
+SvxOpenGLObject::setRenderer(IOpenGLRenderer*)
TextDoc::IsValidPaM(TextPaM const&)
Texture::setSamplerParameter(unsigned int, unsigned int)
UnoApiTest::closeDocument(com::sun::star::uno::Reference<com::sun::star::lang::XComponent>)
diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx
index 68bfa0d..3c36eae 100644
--- a/vcl/source/window/tabdlg.cxx
+++ b/vcl/source/window/tabdlg.cxx
@@ -213,14 +213,6 @@ TabDialog::TabDialog( Window* pParent, WinBits nStyle ) :
ImplInit( pParent, nStyle );
}
-TabDialog::TabDialog( Window* pParent, const ResId& rResId ) :
- Dialog( WINDOW_TABDIALOG )
-{
- ImplInitTabDialogData();
- rResId.SetRT( RSC_TABDIALOG );
- init(pParent, rResId);
-}
-
TabDialog::TabDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ) :
Dialog(pParent, rID, rUIXMLDescription, WINDOW_TABDIALOG)
{
More information about the Libreoffice-commits
mailing list