[Libreoffice-commits] core.git: 8 commits - include/sfx2 include/svx include/tools include/vcl rsc/inc rsc/source sc/source svl/source sw/source tools/source unusedcode.easy vcl/source
Caolán McNamara
caolanm at redhat.com
Thu Mar 13 04:19:02 PDT 2014
include/sfx2/new.hxx | 1
include/svx/srchdlg.hxx | 1
include/tools/rc.h | 5 -
include/tools/rcid.h | 16 ++---
include/vcl/field.hxx | 6 -
include/vcl/morebtn.hxx | 6 -
rsc/inc/rscdb.hxx | 8 --
rsc/source/parser/rscicpx.cxx | 129 -----------------------------------------
rsc/source/parser/rscinit.cxx | 60 -------------------
sc/source/ui/inc/pvlaydlg.hxx | 2
svl/source/items/style.cxx | 1
sw/source/ui/frmdlg/column.cxx | 1
tools/source/rc/resmgr.cxx | 6 -
unusedcode.easy | 13 ----
vcl/source/control/morebtn.cxx | 48 ---------------
15 files changed, 13 insertions(+), 290 deletions(-)
New commits:
commit eee4c914aee9794125077d4ae7c6dd171b8fb223
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 10:25:37 2014 +0000
Related: fdo#30770 fix rtf cut/paste crash
regression since 0c17ccc493d0c7a80f37600dae76a09a119bef78
Change-Id: I15396ad4d0906c7c3b27c318d73455ac494ae754
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index 406e5c2..b83e773 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -437,6 +437,7 @@ SfxStyleSheetBase* SfxStyleSheetIterator::operator[](sal_uInt16 nIdx)
if( IsTrivialSearch())
{
retval = pBasePool->mIndexedStyleSheets->GetStyleSheetByPosition(nIdx).get();
+ nAktPosition = nIdx;
}
else
{
commit 1eeb20f3958666ec6ba6e0fcf52e92e5eb447a14
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 10:02:45 2014 +0000
CurrencyFields cannot be loaded from .src anymore
Change-Id: I3ccdb71e39a13dc8c697d3a52dc693cff10c614d
diff --git a/include/tools/rcid.h b/include/tools/rcid.h
index 17b81cd..0b2ac17 100644
--- a/include/tools/rcid.h
+++ b/include/tools/rcid.h
@@ -92,7 +92,7 @@
#define RSC_PATTERNFIELD (RSC_NOTYPE + 0x62)
#define RSC_NUMERICFIELD (RSC_NOTYPE + 0x63)
#define RSC_METRICFIELD (RSC_NOTYPE + 0x64)
-#define RSC_CURRENCYFIELD (RSC_NOTYPE + 0x65)
+
#define RSC_DATEFIELD (RSC_NOTYPE + 0x66)
#define RSC_TIMEFIELD (RSC_NOTYPE + 0x67)
#define RSC_PATTERNBOX (RSC_NOTYPE + 0x68)
@@ -101,7 +101,7 @@
-#define RSC_LONGCURRENCYFIELD (RSC_NOTYPE + 0x6e)
+
#define RSC_TOOLBOXITEM (RSC_NOTYPE + 0x70)
#define RSC_TOOLBOX (RSC_NOTYPE + 0x71)
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index 6e037fb..435bed6 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -600,9 +600,8 @@ public:
class VCL_DLLPUBLIC CurrencyField : public SpinField, public CurrencyFormatter
{
public:
- CurrencyField( Window* pParent, WinBits nWinStyle );
-
- ~CurrencyField();
+ CurrencyField( Window* pParent, WinBits nWinStyle );
+ ~CurrencyField();
virtual bool PreNotify( NotifyEvent& rNEvt );
virtual bool Notify( NotifyEvent& rNEvt );
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index b71e094..e36e296 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -218,8 +218,6 @@ class RscTypCont
RscTop * InitClassPatternField( RscTop * pSuper );
RscTop * InitClassNumericField( RscTop * pSuper );
RscTop * InitClassMetricField( RscTop * pSuper );
- RscTop * InitClassCurrencyField( const char * pClassName, sal_uInt32 nRT,
- RscTop * pSuper );
RscTop * InitClassDateField( RscTop * pSuper, RscTop * pClassDate );
RscTop * InitClassTimeField( RscTop * pSuper, RscTop * pClassTime );
RscTop * InitClassPatternBox( RscTop * pSuper );
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index 5bd3dcd..432cc80 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -1455,37 +1455,6 @@ RscTop * RscTypCont::InitClassMetricField( RscTop * pSuper )
return pClassMetricField;
}
-RscTop * RscTypCont::InitClassCurrencyField
-(
- const char * pClassName,
- sal_uInt32 nRT,
- RscTop * pSuper
-)
-{
- Atom nId;
- RscTop * pClassCurrencyField;
-
- // Klasse anlegen
- nId = pHS->getID( pClassName );
- pClassCurrencyField = new RscClass( nId, nRT, pSuper );
- pClassCurrencyField->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
-
- aNmTb.Put( nId, CLASSNAME, pClassCurrencyField );
-
- // Variablen anlegen
- nId = aNmTb.Put( "First", VARNAME );
- pClassCurrencyField->SetVariable( nId, &aIdLong, NULL,
- 0, CURRENCYFIELD_FIRST );
- nId = aNmTb.Put( "Last", VARNAME );
- pClassCurrencyField->SetVariable( nId, &aIdLong, NULL,
- 0, CURRENCYFIELD_LAST );
- nId = aNmTb.Put( "SpinSize", VARNAME );
- pClassCurrencyField->SetVariable( nId, &aIdLong, NULL,
- 0, CURRENCYFIELD_SPINSIZE );
-
- return pClassCurrencyField;
-}
-
RscTop * RscTypCont::InitClassDateField( RscTop * pSuper, RscTop * pClassDate )
{
Atom nId;
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index 1d73ffaf..abcc594 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -116,8 +116,6 @@ void RscTypCont::Init()
RscTop * pClassPatternField;
RscTop * pClassNumericField;
RscTop * pClassMetricField;
- RscTop * pClassCurrencyField;
- RscTop * pClassLongCurrencyField;
RscTop * pClassDateField;
RscTop * pClassTimeField;
RscTop * pClassPatternBox;
@@ -612,19 +610,6 @@ void RscTypCont::Init()
pRoot->Insert( pClassMetricField );
}
{ // Mehrfachvererbung von Hand
- RscTop * pClassTmp = InitClassNumericFormatter( pClassSpinField );
- aBaseLst.push_back( pClassTmp );
- pClassTmp = InitClassCurrencyFormatter( pClassTmp );
- aBaseLst.push_back( pClassTmp );
-
- pClassCurrencyField = InitClassCurrencyField( "CurrencyField", RSC_CURRENCYFIELD, pClassTmp );
- pRoot->Insert( pClassCurrencyField );
-
- pClassLongCurrencyField = InitClassCurrencyField( "LongCurrencyField", RSC_LONGCURRENCYFIELD, pClassTmp );
- pRoot->Insert( pClassLongCurrencyField );
-
- }
- { // Mehrfachvererbung von Hand
RscTop * pClassTmp = InitClassDateFormatter( pClassSpinField, pClassDate );
aBaseLst.push_back( pClassTmp );
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index a8c123f..e8bd447 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -1494,7 +1494,6 @@ OString ResMgr::GetAutoHelpId()
case RSC_PATTERNFIELD: aHID.append( "PatternField" ); break;
case RSC_NUMERICFIELD: aHID.append( "NumericField" ); break;
case RSC_METRICFIELD: aHID.append( "MetricField" ); break;
- case RSC_CURRENCYFIELD: aHID.append( "CurrencyField" ); break;
case RSC_DATEFIELD: aHID.append( "DateField" ); break;
case RSC_TIMEFIELD: aHID.append( "TimeField" ); break;
case RSC_NUMERICBOX: aHID.append( "NumericBox" ); break;
commit feff54d8ceeb42d5c9d7fec9b7ec1b99236c6dcb
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 09:48:37 2014 +0000
MetricBoxes cannot be loaded from .src anymore
Change-Id: Id7b44402975ed75171f4475aa64ebd2a3d6bd687
diff --git a/include/tools/rcid.h b/include/tools/rcid.h
index cdc8107..17b81cd 100644
--- a/include/tools/rcid.h
+++ b/include/tools/rcid.h
@@ -97,7 +97,7 @@
#define RSC_TIMEFIELD (RSC_NOTYPE + 0x67)
#define RSC_PATTERNBOX (RSC_NOTYPE + 0x68)
#define RSC_NUMERICBOX (RSC_NOTYPE + 0x69)
-#define RSC_METRICBOX (RSC_NOTYPE + 0x6a)
+
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 8e6df88..b71e094 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -224,7 +224,6 @@ class RscTypCont
RscTop * InitClassTimeField( RscTop * pSuper, RscTop * pClassTime );
RscTop * InitClassPatternBox( RscTop * pSuper );
RscTop * InitClassNumericBox( RscTop * pSuper );
- RscTop * InitClassMetricBox( RscTop * pSuper );
RscTop * InitClassDockingWindow( RscTop * pSuper,
RscEnum * pMapUnit );
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index 18a29f6..5bd3dcd 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -1560,23 +1560,6 @@ RscTop * RscTypCont::InitClassNumericBox( RscTop * pSuper )
return pClassNumericBox;
}
-RscTop * RscTypCont::InitClassMetricBox( RscTop * pSuper )
-{
- Atom nId;
- RscTop * pClassMetricBox;
-
- // Klasse anlegen
- nId = pHS->getID( "MetricBox" );
- pClassMetricBox = new RscClass( nId, RSC_METRICBOX, pSuper );
- pClassMetricBox->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
-
- aNmTb.Put( nId, CLASSNAME, pClassMetricBox );
-
- // Variablen anlegen
-
- return pClassMetricBox;
-}
-
RscTop * RscTypCont::InitClassDockingWindow( RscTop * pSuper,
RscEnum * pMapUnit )
{
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index 5928f97..1d73ffaf 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -122,7 +122,6 @@ void RscTypCont::Init()
RscTop * pClassTimeField;
RscTop * pClassPatternBox;
RscTop * pClassNumericBox;
- RscTop * pClassMetricBox;
RscTop * pClassDockingWindow;
RscTop * pClassToolBoxItem;
RscTop * pClassToolBox;
@@ -656,16 +655,6 @@ void RscTypCont::Init()
}
}
{
- { // Mehrfachvererbung von Hand
- RscTop * pClassTmp = InitClassNumericFormatter( pClassComboBox );
- aBaseLst.push_back( pClassTmp );
- pClassTmp = InitClassMetricFormatter( pClassTmp, pFieldUnits );
- aBaseLst.push_back( pClassTmp );
-
- pClassMetricBox = InitClassMetricBox( pClassTmp );
- pRoot->Insert( pClassMetricBox );
- }
-
pClassDockingWindow = InitClassDockingWindow( pClassWindow, pMapUnit );
pRoot->Insert( pClassDockingWindow );
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index 9523922..a8c123f 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -1498,7 +1498,6 @@ OString ResMgr::GetAutoHelpId()
case RSC_DATEFIELD: aHID.append( "DateField" ); break;
case RSC_TIMEFIELD: aHID.append( "TimeField" ); break;
case RSC_NUMERICBOX: aHID.append( "NumericBox" ); break;
- case RSC_METRICBOX: aHID.append( "MetricBox" ); break;
case RSC_IMAGEBUTTON: aHID.append( "ImageButton" ); break;
case RSC_MENUBUTTON: aHID.append( "MenuButton" ); break;
default:
commit 1de7c36a94a65cd3906f79066b33381df929b71b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 09:46:07 2014 +0000
CurrencyBoxes cannot be loaded from .src anymore
Change-Id: I662aab01ecf5f78c4406838118ccea3988060521
diff --git a/include/tools/rcid.h b/include/tools/rcid.h
index 2fbeb21..cdc8107 100644
--- a/include/tools/rcid.h
+++ b/include/tools/rcid.h
@@ -98,11 +98,11 @@
#define RSC_PATTERNBOX (RSC_NOTYPE + 0x68)
#define RSC_NUMERICBOX (RSC_NOTYPE + 0x69)
#define RSC_METRICBOX (RSC_NOTYPE + 0x6a)
-#define RSC_CURRENCYBOX (RSC_NOTYPE + 0x6b)
+
#define RSC_LONGCURRENCYFIELD (RSC_NOTYPE + 0x6e)
-#define RSC_LONGCURRENCYBOX (RSC_NOTYPE + 0x6f)
+
#define RSC_TOOLBOXITEM (RSC_NOTYPE + 0x70)
#define RSC_TOOLBOX (RSC_NOTYPE + 0x71)
#define RSC_DOCKINGWINDOW (RSC_NOTYPE + 0x72)
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index e9bd9e5..6e037fb 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -777,7 +777,6 @@ class VCL_DLLPUBLIC CurrencyBox : public ComboBox, public CurrencyFormatter
{
public:
explicit CurrencyBox( Window* pParent, WinBits nWinStyle );
- explicit CurrencyBox( Window* pParent, const ResId& );
virtual ~CurrencyBox();
virtual bool PreNotify( NotifyEvent& rNEvt );
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 9101f63..8e6df88 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -225,8 +225,6 @@ class RscTypCont
RscTop * InitClassPatternBox( RscTop * pSuper );
RscTop * InitClassNumericBox( RscTop * pSuper );
RscTop * InitClassMetricBox( RscTop * pSuper );
- RscTop * InitClassCurrencyBox( const char * pClassName, sal_uInt32 nRT,
- RscTop * pSuper );
RscTop * InitClassDockingWindow( RscTop * pSuper,
RscEnum * pMapUnit );
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index 679cd4c..18a29f6 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -1577,28 +1577,6 @@ RscTop * RscTypCont::InitClassMetricBox( RscTop * pSuper )
return pClassMetricBox;
}
-RscTop * RscTypCont::InitClassCurrencyBox
-(
- const char * pClassName,
- sal_uInt32 nRT,
- RscTop * pSuper
-)
-{
- Atom nId;
- RscTop * pClassCurrencyBox;
-
- // Klasse anlegen
- nId = pHS->getID( pClassName );
- pClassCurrencyBox = new RscClass( nId, nRT, pSuper );
- pClassCurrencyBox->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
-
- aNmTb.Put( nId, CLASSNAME, pClassCurrencyBox );
-
- // Variablen anlegen
-
- return pClassCurrencyBox;
-}
-
RscTop * RscTypCont::InitClassDockingWindow( RscTop * pSuper,
RscEnum * pMapUnit )
{
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index cd0003d..5928f97 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -123,8 +123,6 @@ void RscTypCont::Init()
RscTop * pClassPatternBox;
RscTop * pClassNumericBox;
RscTop * pClassMetricBox;
- RscTop * pClassCurrencyBox;
- RscTop * pClassLongCurrencyBox;
RscTop * pClassDockingWindow;
RscTop * pClassToolBoxItem;
RscTop * pClassToolBox;
@@ -667,18 +665,7 @@ void RscTypCont::Init()
pClassMetricBox = InitClassMetricBox( pClassTmp );
pRoot->Insert( pClassMetricBox );
}
- { // Mehrfachvererbung von Hand
- RscTop * pClassTmp = InitClassNumericFormatter( pClassComboBox );
- aBaseLst.push_back( pClassTmp );
- pClassTmp = InitClassCurrencyFormatter( pClassTmp );
- aBaseLst.push_back( pClassTmp );
-
- pClassCurrencyBox = InitClassCurrencyBox( "CurrencyBox", RSC_CURRENCYBOX, pClassTmp );
- pRoot->Insert( pClassCurrencyBox );
- pClassLongCurrencyBox = InitClassCurrencyBox( "LongCurrencyBox", RSC_LONGCURRENCYBOX, pClassTmp );
- pRoot->Insert( pClassLongCurrencyBox );
- }
pClassDockingWindow = InitClassDockingWindow( pClassWindow, pMapUnit );
pRoot->Insert( pClassDockingWindow );
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index 75cff3e..9523922 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -1499,7 +1499,6 @@ OString ResMgr::GetAutoHelpId()
case RSC_TIMEFIELD: aHID.append( "TimeField" ); break;
case RSC_NUMERICBOX: aHID.append( "NumericBox" ); break;
case RSC_METRICBOX: aHID.append( "MetricBox" ); break;
- case RSC_CURRENCYBOX: aHID.append( "CurrencyBox" ); break;
case RSC_IMAGEBUTTON: aHID.append( "ImageButton" ); break;
case RSC_MENUBUTTON: aHID.append( "MenuButton" ); break;
default:
commit 4737ed363a93d1c1743fd38251a91a988fde5ce7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 09:40:54 2014 +0000
DateBoxes cannot be loaded from .src anymore
Change-Id: Ic9d3c73cf67e855dc5931e96bc03014998cce9e0
diff --git a/include/tools/rcid.h b/include/tools/rcid.h
index 8d78ae5..2fbeb21 100644
--- a/include/tools/rcid.h
+++ b/include/tools/rcid.h
@@ -99,7 +99,7 @@
#define RSC_NUMERICBOX (RSC_NOTYPE + 0x69)
#define RSC_METRICBOX (RSC_NOTYPE + 0x6a)
#define RSC_CURRENCYBOX (RSC_NOTYPE + 0x6b)
-#define RSC_DATEBOX (RSC_NOTYPE + 0x6c)
+
#define RSC_LONGCURRENCYFIELD (RSC_NOTYPE + 0x6e)
#define RSC_LONGCURRENCYBOX (RSC_NOTYPE + 0x6f)
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 6545499..9101f63 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -227,7 +227,6 @@ class RscTypCont
RscTop * InitClassMetricBox( RscTop * pSuper );
RscTop * InitClassCurrencyBox( const char * pClassName, sal_uInt32 nRT,
RscTop * pSuper );
- RscTop * InitClassDateBox( RscTop * pSuper );
RscTop * InitClassDockingWindow( RscTop * pSuper,
RscEnum * pMapUnit );
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index b3b26b1..679cd4c 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -1599,23 +1599,6 @@ RscTop * RscTypCont::InitClassCurrencyBox
return pClassCurrencyBox;
}
-RscTop * RscTypCont::InitClassDateBox( RscTop * pSuper )
-{
- Atom nId;
- RscTop * pClassDateBox;
-
- // Klasse anlegen
- nId = pHS->getID( "DateBox" );
- pClassDateBox = new RscClass( nId, RSC_DATEBOX, pSuper );
- pClassDateBox->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
-
- aNmTb.Put( nId, CLASSNAME, pClassDateBox );
-
- // Variablen anlegen
-
- return pClassDateBox;
-}
-
RscTop * RscTypCont::InitClassDockingWindow( RscTop * pSuper,
RscEnum * pMapUnit )
{
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index ddf6862..cd0003d 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -125,7 +125,6 @@ void RscTypCont::Init()
RscTop * pClassMetricBox;
RscTop * pClassCurrencyBox;
RscTop * pClassLongCurrencyBox;
- RscTop * pClassDateBox;
RscTop * pClassDockingWindow;
RscTop * pClassToolBoxItem;
RscTop * pClassToolBox;
@@ -680,13 +679,6 @@ void RscTypCont::Init()
pClassLongCurrencyBox = InitClassCurrencyBox( "LongCurrencyBox", RSC_LONGCURRENCYBOX, pClassTmp );
pRoot->Insert( pClassLongCurrencyBox );
}
- { // Mehrfachvererbung von Hand
- RscTop * pClassTmp = InitClassDateFormatter( pClassComboBox, pClassDate );
- aBaseLst.push_back( pClassTmp );
-
- pClassDateBox = InitClassDateBox( pClassTmp );
- pRoot->Insert( pClassDateBox );
- }
pClassDockingWindow = InitClassDockingWindow( pClassWindow, pMapUnit );
pRoot->Insert( pClassDockingWindow );
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index 8827416..75cff3e 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -1500,7 +1500,6 @@ OString ResMgr::GetAutoHelpId()
case RSC_NUMERICBOX: aHID.append( "NumericBox" ); break;
case RSC_METRICBOX: aHID.append( "MetricBox" ); break;
case RSC_CURRENCYBOX: aHID.append( "CurrencyBox" ); break;
- case RSC_DATEBOX: aHID.append( "DateBox" ); break;
case RSC_IMAGEBUTTON: aHID.append( "ImageButton" ); break;
case RSC_MENUBUTTON: aHID.append( "MenuButton" ); break;
default:
commit 24cfa40779b443034f3698134adaef6dbb4d2f29
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 09:34:12 2014 +0000
TimeBoxes cannot be loaded from .src anymore
Change-Id: I1fa101656538c40c402fc8608f33961f293bd58d
diff --git a/include/tools/rcid.h b/include/tools/rcid.h
index 472bd5b..8d78ae5 100644
--- a/include/tools/rcid.h
+++ b/include/tools/rcid.h
@@ -100,7 +100,7 @@
#define RSC_METRICBOX (RSC_NOTYPE + 0x6a)
#define RSC_CURRENCYBOX (RSC_NOTYPE + 0x6b)
#define RSC_DATEBOX (RSC_NOTYPE + 0x6c)
-#define RSC_TIMEBOX (RSC_NOTYPE + 0x6d)
+
#define RSC_LONGCURRENCYFIELD (RSC_NOTYPE + 0x6e)
#define RSC_LONGCURRENCYBOX (RSC_NOTYPE + 0x6f)
#define RSC_TOOLBOXITEM (RSC_NOTYPE + 0x70)
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 4582e4c..6545499 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -228,7 +228,6 @@ class RscTypCont
RscTop * InitClassCurrencyBox( const char * pClassName, sal_uInt32 nRT,
RscTop * pSuper );
RscTop * InitClassDateBox( RscTop * pSuper );
- RscTop * InitClassTimeBox( RscTop * pSuper );
RscTop * InitClassDockingWindow( RscTop * pSuper,
RscEnum * pMapUnit );
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index 071ee2e..b3b26b1 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -1616,23 +1616,6 @@ RscTop * RscTypCont::InitClassDateBox( RscTop * pSuper )
return pClassDateBox;
}
-RscTop * RscTypCont::InitClassTimeBox( RscTop * pSuper )
-{
- Atom nId;
- RscTop * pClassTimeBox;
-
- // Klasse anlegen
- nId = pHS->getID( "TimeBox" );
- pClassTimeBox = new RscClass( nId, RSC_TIMEBOX, pSuper );
- pClassTimeBox->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
-
- aNmTb.Put( nId, CLASSNAME, pClassTimeBox );
-
- // Variablen anlegen
-
- return pClassTimeBox;
-}
-
RscTop * RscTypCont::InitClassDockingWindow( RscTop * pSuper,
RscEnum * pMapUnit )
{
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index 4c00845..ddf6862 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -126,7 +126,6 @@ void RscTypCont::Init()
RscTop * pClassCurrencyBox;
RscTop * pClassLongCurrencyBox;
RscTop * pClassDateBox;
- RscTop * pClassTimeBox;
RscTop * pClassDockingWindow;
RscTop * pClassToolBoxItem;
RscTop * pClassToolBox;
@@ -688,14 +687,6 @@ void RscTypCont::Init()
pClassDateBox = InitClassDateBox( pClassTmp );
pRoot->Insert( pClassDateBox );
}
- { // Mehrfachvererbung von Hand
- RscTop * pClassTmp = InitClassTimeFormatter( pClassComboBox, pClassTime,
- pTimeFieldFormat );
- aBaseLst.push_back( pClassTmp );
-
- pClassTimeBox = InitClassTimeBox( pClassTmp );
- pRoot->Insert( pClassTimeBox );
- }
pClassDockingWindow = InitClassDockingWindow( pClassWindow, pMapUnit );
pRoot->Insert( pClassDockingWindow );
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index ff22b10..8827416 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -1501,7 +1501,6 @@ OString ResMgr::GetAutoHelpId()
case RSC_METRICBOX: aHID.append( "MetricBox" ); break;
case RSC_CURRENCYBOX: aHID.append( "CurrencyBox" ); break;
case RSC_DATEBOX: aHID.append( "DateBox" ); break;
- case RSC_TIMEBOX: aHID.append( "TimeBox" ); break;
case RSC_IMAGEBUTTON: aHID.append( "ImageButton" ); break;
case RSC_MENUBUTTON: aHID.append( "MenuButton" ); break;
default:
commit d40971a47838afd007b8563d16bc8176b7f43176
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 09:29:07 2014 +0000
MoreButtons cannot be loaded from .src anymore
Change-Id: Ib831895b33323dd478cc125b3bf93c43826ef59d
diff --git a/include/sfx2/new.hxx b/include/sfx2/new.hxx
index 3b0a916..e567a2d 100644
--- a/include/sfx2/new.hxx
+++ b/include/sfx2/new.hxx
@@ -32,7 +32,6 @@
class SfxObjectShellLock;
class SfxObjectShell;
-class MoreButton;
diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx
index e4fb11f..b257bc3 100644
--- a/include/svx/srchdlg.hxx
+++ b/include/svx/srchdlg.hxx
@@ -36,7 +36,6 @@
#include <vector>
class SvxSearchItem;
-class MoreButton;
class SfxStyleSheetBasePool;
class SvxJSearchOptionsPage;
class SvxSearchController;
diff --git a/include/tools/rc.h b/include/tools/rc.h
index 022bd14..834b8b3 100644
--- a/include/tools/rc.h
+++ b/include/tools/rc.h
@@ -156,11 +156,6 @@ typedef short RSWND_STYLE;
#define RSC_TOOLBOX_ITEMIMAGELIST 0x40
#define RSC_TOOLBOX_ITEMLIST 0x80
-// For "MoreButton" resources:
-#define RSC_MOREBUTTON_STATE 0x01
-#define RSC_MOREBUTTON_MAPUNIT 0x02
-#define RSC_MOREBUTTON_DELTA 0x04
-
// For "FloatingWindow" resources:
#define RSC_FLOATINGWINDOW_WHMAPMODE 0x01
#define RSC_FLOATINGWINDOW_WIDTH 0x02
diff --git a/include/tools/rcid.h b/include/tools/rcid.h
index d3f9005..472bd5b 100644
--- a/include/tools/rcid.h
+++ b/include/tools/rcid.h
@@ -68,7 +68,7 @@
#define RSC_HELPBUTTON (RSC_NOTYPE + 0x49)
#define RSC_IMAGEBUTTON (RSC_NOTYPE + 0x4a)
#define RSC_MENUBUTTON (RSC_NOTYPE + 0x4b)
-#define RSC_MOREBUTTON (RSC_NOTYPE + 0x4c)
+
#define RSC_SPINBUTTON (RSC_NOTYPE + 0x4d)
#define RSC_RADIOBUTTON (RSC_NOTYPE + 0x4e)
diff --git a/include/vcl/morebtn.hxx b/include/vcl/morebtn.hxx
index 3ccec30..ae24828 100644
--- a/include/vcl/morebtn.hxx
+++ b/include/vcl/morebtn.hxx
@@ -47,7 +47,6 @@ private:
protected:
using Window::ImplInit;
SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle );
- SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
public:
explicit MoreButton( Window* pParent, WinBits nStyle = 0 );
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 545f328..4582e4c 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -238,7 +238,6 @@ class RscTypCont
RscTop * InitClassToolBox( RscTop * pSuper, RscTop * pClassToolBoxItem,
RscTop * pClassImageList );
RscTop * InitClassStatusBar( RscTop * pSuper );
- RscTop * InitClassMoreButton( RscTop * pSuper, RscEnum * pMapUnit );
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 c808488..071ee2e 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -1899,31 +1899,6 @@ RscTop * RscTypCont::InitClassStatusBar( RscTop * pSuper )
return pClassStatusBar;
}
-RscTop * RscTypCont::InitClassMoreButton( RscTop * pSuper, RscEnum * pMapUnit )
-{
- Atom nId;
- RscTop * pClassMoreButton;
-
- // Klasse anlegen
- nId = pHS->getID( "MoreButton" );
- pClassMoreButton = new RscClass( nId, RSC_MOREBUTTON, pSuper );
- pClassMoreButton->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
- aNmTb.Put( nId, CLASSNAME, pClassMoreButton );
-
- // Variablen anlegen
- nId = aNmTb.Put( "State", VARNAME );
- pClassMoreButton->SetVariable( nId, &aBool, NULL, 0,
- RSC_MOREBUTTON_STATE );
- nId = aNmTb.Put( "MapUnit", VARNAME );
- pClassMoreButton->SetVariable( nId, pMapUnit, NULL, 0,
- RSC_MOREBUTTON_MAPUNIT );
- nId = aNmTb.Put( "Delta", VARNAME );
- pClassMoreButton->SetVariable( nId, &aUShort, NULL, 0,
- RSC_MOREBUTTON_DELTA );
-
- return pClassMoreButton;
-}
-
RscTop * RscTypCont::InitClassFloatingWindow( RscTop * pSuper,
RscEnum * pMapUnit )
{
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index 015a882..4c00845 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -131,7 +131,6 @@ void RscTypCont::Init()
RscTop * pClassToolBoxItem;
RscTop * pClassToolBox;
RscTop * pClassStatusBar;
- RscTop * pClassMoreButton;
RscTop * pClassFloatingWindow;
RscTop * pClassTabPage;
RscTop * pClassTabDialog;
@@ -711,9 +710,6 @@ void RscTypCont::Init()
pClassStatusBar = InitClassStatusBar( pClassWindow );
pRoot->Insert( pClassStatusBar );
- pClassMoreButton = InitClassMoreButton( pClassPushButton, pMapUnit );
- pRoot->Insert( pClassMoreButton );
-
pClassFloatingWindow = InitClassFloatingWindow( pClassSystemWindow,
pMapUnit );
pRoot->Insert( pClassFloatingWindow );
diff --git a/sc/source/ui/inc/pvlaydlg.hxx b/sc/source/ui/inc/pvlaydlg.hxx
index a39f62c..3ecbeac 100644
--- a/sc/source/ui/inc/pvlaydlg.hxx
+++ b/sc/source/ui/inc/pvlaydlg.hxx
@@ -240,8 +240,6 @@ private:
CancelButton* mpBtnCancel;
PushButton* mpBtnRemove;
PushButton* mpBtnOptions;
- //FIXME: replace with expander
- //MoreButton* mpBtnMore;
VclExpander* mpExpander;
std::vector<OUString> maFuncNames; /// Localized function names from resource.
boost::ptr_vector<OUString> maRefStrs; /// Reference strings stored with the output list box.
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index c11df67..2ffe526 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -478,7 +478,6 @@ SwColumnPage::SwColumnPage(Window *pParent, const SfxItemSet &rSet)
m_pDefaultVS->SetSelectHdl(LINK(this, SwColumnPage, SetDefaultsHdl));
- // announce Controls for additional region at the MoreButton
Link aCLNrLk = LINK(this, SwColumnPage, ColModify);
m_pCLNrEdt->SetModifyHdl(aCLNrLk);
Link aLk = LINK(this, SwColumnPage, GapModify);
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index e56a5d9..ff22b10 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -1504,7 +1504,6 @@ OString ResMgr::GetAutoHelpId()
case RSC_TIMEBOX: aHID.append( "TimeBox" ); break;
case RSC_IMAGEBUTTON: aHID.append( "ImageButton" ); break;
case RSC_MENUBUTTON: aHID.append( "MenuButton" ); break;
- case RSC_MOREBUTTON: aHID.append( "MoreButton" ); break;
default:
// no type, no auto HID
return OString();
diff --git a/vcl/source/control/morebtn.cxx b/vcl/source/control/morebtn.cxx
index fea5a81..0146cef 100644
--- a/vcl/source/control/morebtn.cxx
+++ b/vcl/source/control/morebtn.cxx
@@ -78,26 +78,6 @@ MoreButton::MoreButton( Window* pParent, WinBits nStyle ) :
ImplInit( pParent, nStyle );
}
-void MoreButton::ImplLoadRes( const ResId& rResId )
-{
- PushButton::ImplLoadRes( rResId );
-
- sal_uLong nObjMask = ReadLongRes();
-
- if ( nObjMask & RSC_MOREBUTTON_STATE )
- {
- // Don't call method as Dialog should not be switched over
- mbState = ReadShortRes() != 0;
- // SetText( GetText() );
- ShowState();
- }
- if ( nObjMask & RSC_MOREBUTTON_MAPUNIT )
- meUnit = (MapUnit)ReadLongRes();
- if ( nObjMask & RSC_MOREBUTTON_DELTA )
- // Size for resizing the Dialog
- mnDelta = ReadShortRes();
-}
-
MoreButton::~MoreButton()
{
delete mpMBData->mpItemList;
commit 82380478483e785fca73bc67dbc181c15812566b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 09:17:59 2014 +0000
callcatcher: update unused code
Change-Id: I0cfdeefea35d3cb9f00ec4351a1f0f8c58ba5843
diff --git a/include/vcl/morebtn.hxx b/include/vcl/morebtn.hxx
index bb1b1b9..3ccec30 100644
--- a/include/vcl/morebtn.hxx
+++ b/include/vcl/morebtn.hxx
@@ -51,15 +51,12 @@ protected:
public:
explicit MoreButton( Window* pParent, WinBits nStyle = 0 );
- explicit MoreButton( Window* pParent, const ResId& );
virtual ~MoreButton();
void Click();
- void AddWindow( Window* pWindow );
-
void SetDelta( sal_uLong nNewDelta ) { mnDelta = nNewDelta; }
- sal_uLong GetDelta() const { return mnDelta; }
+ sal_uLong GetDelta() const { return mnDelta; }
void SetMapUnit( MapUnit eNewUnit = MAP_PIXEL ) { meUnit = eNewUnit; }
MapUnit GetMapUnit() const { return meUnit; }
diff --git a/unusedcode.easy b/unusedcode.easy
index e62cbc8..d7b52c4 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -177,19 +177,6 @@ connectivity::file::OStatement_Base::reset()
connectivity::firebird::release(int&, cppu::OBroadcastHelperVar<cppu::OMultiTypeInterfaceContainerHelper, com::sun::star::uno::Type>&, com::sun::star::uno::Reference<com::sun::star::uno::XInterface>&, com::sun::star::lang::XComponent*)
connectivity::sdbcx::OGroup::OGroup(rtl::OUString const&, unsigned char)
connectivity::sdbcx::OGroup::OGroup(unsigned char)
-dbaccess::OCommandContainer::getUnoTunnelImplementationId()
-dbaccess::OCommandDefinition::getUnoTunnelImplementationId()
-dbaccess::OComponentDefinition::getUnoTunnelImplementationId()
-dbaccess::ODefinitionContainer::getUnoTunnelImplementationId()
-dbaccess::ODocumentContainer::getUnoTunnelImplementationId()
-dbaccess::ODocumentDefinition::getUnoTunnelImplementationId()
-dbaccess::OQuery::getUnoTunnelImplementationId()
-dbaccess::OQueryDescriptor::getUnoTunnelImplementationId()
-dbaccess::OSingleSelectQueryComposer::getUnoTunnelImplementationId()
-dbaui::ComposerDialog::getUnoTunnelImplementationId()
-dbaui::OColumnControlModel::getUnoTunnelImplementationId()
-dbaui::ODirectSQLDialog::getUnoTunnelImplementationId()
-dbaui::OTextConnectionSettingsDialog::getUnoTunnelImplementationId()
oglcanvas::CanvasHelper::flush() const
oglcanvas::TextLayout::draw(com::sun::star::rendering::ViewState const&, com::sun::star::rendering::RenderState const&, com::sun::star::uno::Reference<com::sun::star::rendering::XGraphicDevice> const&) const
oox::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper const&)
diff --git a/vcl/source/control/morebtn.cxx b/vcl/source/control/morebtn.cxx
index cca8ee4..fea5a81 100644
--- a/vcl/source/control/morebtn.cxx
+++ b/vcl/source/control/morebtn.cxx
@@ -78,18 +78,6 @@ MoreButton::MoreButton( Window* pParent, WinBits nStyle ) :
ImplInit( pParent, nStyle );
}
-MoreButton::MoreButton( Window* pParent, const ResId& rResId ) :
- PushButton( WINDOW_MOREBUTTON )
-{
- rResId.SetRT( RSC_MOREBUTTON );
- WinBits nStyle = ImplInitRes( rResId );
- ImplInit( pParent, nStyle );
- ImplLoadRes( rResId );
-
- if ( !(nStyle & WB_HIDE) )
- Show();
-}
-
void MoreButton::ImplLoadRes( const ResId& rResId )
{
PushButton::ImplLoadRes( rResId );
@@ -112,8 +100,7 @@ void MoreButton::ImplLoadRes( const ResId& rResId )
MoreButton::~MoreButton()
{
- if ( mpMBData->mpItemList )
- delete mpMBData->mpItemList;
+ delete mpMBData->mpItemList;
delete mpMBData;
}
@@ -171,19 +158,6 @@ void MoreButton::Click()
PushButton::Click();
}
-void MoreButton::AddWindow( Window* pWindow )
-{
- if ( !mpMBData->mpItemList )
- mpMBData->mpItemList = new ImplMoreWindowList();
-
- mpMBData->mpItemList->push_back( pWindow );
-
- if ( mbState )
- pWindow->Show();
- else
- pWindow->Hide();
-}
-
void MoreButton::SetText( const OUString& rText )
{
PushButton::SetText( rText );
More information about the Libreoffice-commits
mailing list