summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chart2/source/controller/dialogs/res_Trendline.cxx54
-rw-r--r--chart2/source/controller/dialogs/res_Trendline.hxx2
-rw-r--r--chart2/source/controller/dialogs/tp_SeriesToAxis.cxx11
-rw-r--r--include/svtools/ctrlbox.hxx1
-rw-r--r--include/svx/sidebar/SidebarDialControl.hxx1
-rw-r--r--include/vcl/field.hxx1
-rw-r--r--sc/source/ui/dbgui/filtdlg.cxx22
-rw-r--r--sc/source/ui/dbgui/foptmgr.cxx318
-rw-r--r--sc/source/ui/dbgui/sfiltdlg.cxx4
-rw-r--r--sc/source/ui/inc/filtdlg.hxx11
-rw-r--r--sc/source/ui/inc/foptmgr.hxx119
-rw-r--r--svtools/source/control/ctrlbox.cxx8
-rw-r--r--svx/source/sidebar/possize/SidebarDialControl.cxx8
-rw-r--r--unusedcode.easy11
-rw-r--r--vcl/source/control/field.cxx15
15 files changed, 41 insertions, 545 deletions
diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx
index 62c61aea5be3..f3dde064dcd1 100644
--- a/chart2/source/controller/dialogs/res_Trendline.cxx
+++ b/chart2/source/controller/dialogs/res_Trendline.cxx
@@ -113,60 +113,6 @@ TrendlineResources::TrendlineResources( Window * pParent, const SfxItemSet& rInA
TrendlineResources::~TrendlineResources()
{}
-long TrendlineResources::adjustControlSizes()
-{
- // calculate right edge
- std::vector< long > aControlRightEdges;
- aControlRightEdges.push_back( lcl_getRightEdge( m_aRBLinear ));
- aControlRightEdges.push_back( lcl_getRightEdge( m_aRBLogarithmic ));
- aControlRightEdges.push_back( lcl_getRightEdge( m_aRBExponential ));
- aControlRightEdges.push_back( lcl_getRightEdge( m_aRBPower ));
- aControlRightEdges.push_back( lcl_getRightEdge( m_aRBPolynomial ));
- aControlRightEdges.push_back( lcl_getRightEdge( m_aRBMovingAverage ));
-
- aControlRightEdges.push_back( lcl_getRightEdge( m_aNF_Degree ));
- aControlRightEdges.push_back( lcl_getRightEdge( m_aNF_Period ));
- aControlRightEdges.push_back( lcl_getRightEdge( m_aNF_ExtrapolateForward ));
- aControlRightEdges.push_back( lcl_getRightEdge( m_aNF_ExtrapolateBackward ));
- aControlRightEdges.push_back( lcl_getRightEdge( m_aNF_InterceptValue ));
- aControlRightEdges.push_back( lcl_getRightEdge( m_aCB_SetIntercept ));
-
- aControlRightEdges.push_back( lcl_getRightEdge( m_aCBShowEquation ));
- aControlRightEdges.push_back( lcl_getRightEdge( m_aCBShowCorrelationCoeff ));
-
- lcl_AdjustControlSize( m_aRBLinear );
- lcl_AdjustControlSize( m_aRBLogarithmic );
- lcl_AdjustControlSize( m_aRBExponential );
- lcl_AdjustControlSize( m_aRBPower );
- lcl_AdjustControlSize( m_aRBPolynomial );
- lcl_AdjustControlSize( m_aRBMovingAverage );
-
- lcl_AdjustControlSize( m_aNF_Degree );
- lcl_AdjustControlSize( m_aNF_Period );
- lcl_AdjustControlSize( m_aNF_ExtrapolateForward );
- lcl_AdjustControlSize( m_aNF_ExtrapolateBackward );
- lcl_AdjustControlSize( m_aNF_InterceptValue );
- lcl_AdjustControlSize( m_aCB_SetIntercept );
-
- lcl_AdjustControlSize( m_aCBShowEquation );
- lcl_AdjustControlSize( m_aCBShowCorrelationCoeff );
-
- // Note: FixedLine has no CalcMinimumSize, workaround: use a FixedText
- FixedText aDummyTextCtrl( m_aFLType.GetParent());
- aDummyTextCtrl.SetText( m_aFLType.GetText());
- aControlRightEdges.push_back( lcl_getRightEdge( aDummyTextCtrl ));
- aDummyTextCtrl.SetText( m_aFLEquation.GetText());
- aControlRightEdges.push_back( lcl_getRightEdge( aDummyTextCtrl ));
-
- long nRightEdgeOfControls = *(::std::max_element( aControlRightEdges.begin(), aControlRightEdges.end()));
- // leave some more space after the longest text
- nRightEdgeOfControls += m_aFLType.LogicToPixel( Size( 6, 0 ), MapMode( MAP_APPFONT )).getWidth();
-
- lcl_AdjustControlSize( m_aFLType, nRightEdgeOfControls );
- lcl_AdjustControlSize( m_aFLEquation, nRightEdgeOfControls );
-
- return nRightEdgeOfControls;
-}
IMPL_LINK( TrendlineResources, SelectTrendLine, RadioButton *, pRadioButton )
{
diff --git a/chart2/source/controller/dialogs/res_Trendline.hxx b/chart2/source/controller/dialogs/res_Trendline.hxx
index 359286284253..669b804bad2d 100644
--- a/chart2/source/controller/dialogs/res_Trendline.hxx
+++ b/chart2/source/controller/dialogs/res_Trendline.hxx
@@ -40,8 +40,6 @@ public:
void FillValueSets();
- long adjustControlSizes();
-
private:
FixedLine m_aFLType;
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
index fab77a2a41cc..64596c6a4f82 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -233,17 +233,6 @@ void SchOptionTabPage::Init( bool bProvidesSecondaryYAxis, bool bProvidesOverlap
AdaptControlPositionsAndVisibility();
}
-void lcl_offsetControl(Control& rCtrl, long nXOffset, long nYOffset )
-{
- Point aPos = rCtrl.GetPosPixel();
- rCtrl.SetPosPixel( Point(aPos.getX() + nXOffset, aPos.getY() + nYOffset) );
-}
-
-void lcl_optimzeRadioButtonSize( RadioButton& rCtrl )
-{
- rCtrl.SetSizePixel( rCtrl.CalcMinimumSize() );
-}
-
void SchOptionTabPage::AdaptControlPositionsAndVisibility()
{
m_pGrpAxis->Show(m_bProvidesSecondaryYAxis);
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index 72d810c86c76..79c976bb12fb 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -428,7 +428,6 @@ protected:
public:
FontNameBox( Window* pParent,
WinBits nWinStyle = WB_SORT );
- FontNameBox( Window* pParent, const ResId& rResId );
virtual ~FontNameBox();
virtual void UserDraw( const UserDrawEvent& rUDEvt );
diff --git a/include/svx/sidebar/SidebarDialControl.hxx b/include/svx/sidebar/SidebarDialControl.hxx
index a3e53d306c53..a11257e35768 100644
--- a/include/svx/sidebar/SidebarDialControl.hxx
+++ b/include/svx/sidebar/SidebarDialControl.hxx
@@ -28,7 +28,6 @@ class SVX_DLLPUBLIC SidebarDialControl : public svx::DialControl
{
public:
SidebarDialControl (Window* pParent, WinBits nBits = 0);
- SidebarDialControl (Window* pParent, const ResId& rResId);
virtual ~SidebarDialControl (void);
virtual Size GetOptimalSize() const;
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index 13cec22d2cf1..4d7a5a9b1fc6 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -744,7 +744,6 @@ class VCL_DLLPUBLIC MetricBox : public ComboBox, public MetricFormatter
{
public:
explicit MetricBox( Window* pParent, WinBits nWinStyle );
- explicit MetricBox( Window* pParent, const ResId& );
virtual ~MetricBox();
virtual long PreNotify( NotifyEvent& rNEvt );
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index ba88eea33d1a..7c3e929004c1 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -35,9 +35,7 @@
#include "globstr.hrc"
#include "filter.hrc"
-#define _FILTDLG_CXX
#include "filtdlg.hxx"
-#undef _FILTDLG_CXX
#include <vcl/msgbox.hxx>
#include <limits>
@@ -232,7 +230,7 @@ void ScFilterDlg::Init( const SfxItemSet& rArgSet )
maConnLbArr.push_back(pLbConnect4);
// Option initialization:
- pOptionsMgr = new ScNewFilterOptionsMgr(
+ pOptionsMgr = new ScFilterOptionsMgr(
pViewData,
theQueryData,
pBtnCase,
@@ -738,24 +736,6 @@ IMPL_LINK( ScFilterDlg, EndDlgHdl, Button*, pBtn )
return 0;
}
-
-//----------------------------------------------------------------------------
-
-IMPL_LINK_NOARG(ScFilterDlg, MoreClickHdl)
-{
- if ( pExpander->get_expanded() )
- pTimer->Start();
- else
- {
- pTimer->Stop();
- bRefInputMode = false;
- //@BugID 54702 Enable/disable only in Basic class
- //SFX_APPWINDOW->Disable(FALSE); //! general method in ScAnyRefDlg
- }
- return 0;
-}
-
-
//----------------------------------------------------------------------------
IMPL_LINK( ScFilterDlg, TimeOutHdl, Timer*, _pTimer )
diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx
index 895103101377..abf1faacd4f2 100644
--- a/sc/source/ui/dbgui/foptmgr.cxx
+++ b/sc/source/ui/dbgui/foptmgr.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <vcl/morebtn.hxx>
#include <svtools/stdctrl.hxx>
#include "anyrefdg.hxx"
@@ -28,308 +27,13 @@
#include "queryparam.hxx"
#include "globalnames.hxx"
-#define _FOPTMGR_CXX
-#define _NEWFOPTMGR_CXX
#include "foptmgr.hxx"
-#undef _NEWFOPTMGR_CXX
-#undef _FOPTMGR_CXX
//----------------------------------------------------------------------------
-
-ScFilterOptionsMgr::ScFilterOptionsMgr(
- ScViewData* ptrViewData,
- const ScQueryParam& refQueryData,
- MoreButton& refBtnMore,
- CheckBox& refBtnCase,
- CheckBox& refBtnRegExp,
- CheckBox& refBtnHeader,
- CheckBox& refBtnUnique,
- CheckBox& refBtnCopyResult,
- CheckBox& refBtnDestPers,
- ListBox& refLbCopyArea,
- Edit& refEdCopyArea,
- formula::RefButton& refRbCopyArea,
- FixedText& refFtDbAreaLabel,
- FixedInfo& refFtDbArea,
- FixedLine& refFlOptions,
- const String& refStrUndefined )
-
- : pViewData ( ptrViewData ),
- pDoc ( ptrViewData ? ptrViewData->GetDocument() : NULL ),
- rBtnMore ( refBtnMore ),
- rBtnCase ( refBtnCase ),
- rBtnRegExp ( refBtnRegExp ),
- rBtnHeader ( refBtnHeader ),
- rBtnUnique ( refBtnUnique ),
- rBtnCopyResult ( refBtnCopyResult ),
- rBtnDestPers ( refBtnDestPers ),
- rLbCopyPos ( refLbCopyArea ),
- rEdCopyPos ( refEdCopyArea ),
- rRbCopyPos ( refRbCopyArea ),
- rFtDbAreaLabel ( refFtDbAreaLabel ),
- rFtDbArea ( refFtDbArea ),
- rFlOptions ( refFlOptions ),
- rStrUndefined ( refStrUndefined ),
- rQueryData ( refQueryData )
-{
- Init();
-}
-
-
-//----------------------------------------------------------------------------
-
-ScFilterOptionsMgr::~ScFilterOptionsMgr()
-{
- sal_uInt16 nEntries = rLbCopyPos.GetEntryCount();
- sal_uInt16 i;
-
- for ( i=2; i<nEntries; i++ )
- delete (String*)rLbCopyPos.GetEntryData( i );
-}
-
-
-//----------------------------------------------------------------------------
-
-void ScFilterOptionsMgr::Init()
-{
-//moggi:TODO
- OSL_ENSURE( pViewData && pDoc, "Init failed :-/" );
-
- rLbCopyPos.SetSelectHdl ( LINK( this, ScFilterOptionsMgr, LbPosSelHdl ) );
- rEdCopyPos.SetModifyHdl ( LINK( this, ScFilterOptionsMgr, EdPosModifyHdl ) );
- rBtnCopyResult.SetClickHdl( LINK( this, ScFilterOptionsMgr, BtnCopyResultHdl ) );
-
- rBtnMore.AddWindow( &rBtnCase );
- rBtnMore.AddWindow( &rBtnRegExp );
- rBtnMore.AddWindow( &rBtnHeader );
- rBtnMore.AddWindow( &rBtnUnique );
- rBtnMore.AddWindow( &rBtnCopyResult );
- rBtnMore.AddWindow( &rBtnDestPers );
- rBtnMore.AddWindow( &rLbCopyPos );
- rBtnMore.AddWindow( &rEdCopyPos );
- rBtnMore.AddWindow( &rRbCopyPos );
- rBtnMore.AddWindow( &rFtDbAreaLabel );
- rBtnMore.AddWindow( &rFtDbArea );
- rBtnMore.AddWindow( &rFlOptions );
-
- rBtnCase .Check( rQueryData.bCaseSens );
- rBtnHeader .Check( rQueryData.bHasHeader );
- rBtnRegExp .Check( rQueryData.bRegExp );
- rBtnUnique .Check( !rQueryData.bDuplicate );
-
- if ( pViewData && pDoc )
- {
- OUString theAreaStr;
- ScRange theCurArea ( ScAddress( rQueryData.nCol1,
- rQueryData.nRow1,
- pViewData->GetTabNo() ),
- ScAddress( rQueryData.nCol2,
- rQueryData.nRow2,
- pViewData->GetTabNo() ) );
- ScDBCollection* pDBColl = pDoc->GetDBCollection();
- OUStringBuffer theDbArea;
- OUString theDbName(STR_DB_LOCAL_NONAME);
- const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
-
- theCurArea.Format( theAreaStr, SCR_ABS_3D, pDoc, eConv );
-
- // Zielbereichsliste fuellen
-
- rLbCopyPos.Clear();
- rLbCopyPos.InsertEntry( rStrUndefined, 0 );
-
- ScAreaNameIterator aIter( pDoc );
- String aName;
- ScRange aRange;
- String aRefStr;
- while ( aIter.Next( aName, aRange ) )
- {
- sal_uInt16 nInsert = rLbCopyPos.InsertEntry( aName );
-
- aRange.aStart.Format( aRefStr, SCA_ABS_3D, pDoc, eConv );
- rLbCopyPos.SetEntryData( nInsert, new String( aRefStr ) );
- }
-
- rBtnDestPers.Check( sal_True ); // beim Aufruf immer an
- rLbCopyPos.SelectEntryPos( 0 );
- rEdCopyPos.SetText( EMPTY_STRING );
-
- /*
- * Ueberpruefen, ob es sich bei dem uebergebenen
- * Bereich um einen Datenbankbereich handelt:
- */
-
- theDbArea = theAreaStr;
-
- if ( pDBColl )
- {
- ScAddress& rStart = theCurArea.aStart;
- ScAddress& rEnd = theCurArea.aEnd;
- const ScDBData* pDBData = pDBColl->GetDBAtArea(
- rStart.Tab(), rStart.Col(), rStart.Row(), rEnd.Col(), rEnd.Row());
-
- if ( pDBData )
- {
- rBtnHeader.Check( pDBData->HasHeader() );
- theDbName = pDBData->GetName();
-
- if ( theDbName == STR_DB_LOCAL_NONAME )
- rBtnHeader.Enable();
- else
- rBtnHeader.Disable();
- }
- }
-
- if ( !theDbName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(STR_DB_LOCAL_NONAME)) )
- {
- theDbArea.appendAscii(RTL_CONSTASCII_STRINGPARAM(" ("));
- theDbArea.append(theDbName).append(')');
- rFtDbArea.SetText( theDbArea.makeStringAndClear() );
- }
- else
- {
- rFtDbAreaLabel.SetText( OUString() );
- rFtDbArea.SetText( OUString() );
- }
-
- //------------------------------------------------------
- // Kopierposition:
-
- if ( !rQueryData.bInplace )
- {
- String aString;
-
- ScAddress( rQueryData.nDestCol,
- rQueryData.nDestRow,
- rQueryData.nDestTab
- ).Format( aString, SCA_ABS_3D, pDoc, eConv );
-
- rBtnCopyResult.Check( sal_True );
- rEdCopyPos.SetText( aString );
- EdPosModifyHdl( &rEdCopyPos );
- rLbCopyPos.Enable();
- rEdCopyPos.Enable();
- rRbCopyPos.Enable();
- rBtnDestPers.Enable();
- }
- else
- {
- rBtnCopyResult.Check( false );
- rEdCopyPos.SetText( EMPTY_STRING );
- rLbCopyPos.Disable();
- rEdCopyPos.Disable();
- rRbCopyPos.Disable();
- rBtnDestPers.Disable();
- }
- }
- else
- rEdCopyPos.SetText( EMPTY_STRING );
-}
-
-
-//----------------------------------------------------------------------------
-
-sal_Bool ScFilterOptionsMgr::VerifyPosStr( const String& rPosStr ) const
-{
- String aPosStr( rPosStr );
- xub_StrLen nColonPos = aPosStr.Search( ':' );
-
- if ( STRING_NOTFOUND != nColonPos )
- aPosStr.Erase( nColonPos );
-
- sal_uInt16 nResult = ScAddress().Parse( aPosStr, pDoc, pDoc->GetAddressConvention() );
-
- return ( SCA_VALID == (nResult & SCA_VALID) );
-}
-
-
-//----------------------------------------------------------------------------
-// Handler:
-
-//----------------------------------------------------------------------------
-
-IMPL_LINK( ScFilterOptionsMgr, LbPosSelHdl, ListBox*, pLb )
-{
- if ( pLb == &rLbCopyPos )
- {
- String aString;
- sal_uInt16 nSelPos = rLbCopyPos.GetSelectEntryPos();
-
- if ( nSelPos > 0 )
- aString = *(String*)rLbCopyPos.GetEntryData( nSelPos );
-
- rEdCopyPos.SetText( aString );
- }
-
- return 0;
-}
-
-
+// ScFilterOptionsMgr (.ui's option helper)
//----------------------------------------------------------------------------
-IMPL_LINK( ScFilterOptionsMgr, EdPosModifyHdl, Edit*, pEd )
-{
- if ( pEd == &rEdCopyPos )
- {
- String theCurPosStr = pEd->GetText();
- sal_uInt16 nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() );
-
- if ( SCA_VALID == (nResult & SCA_VALID) )
- {
- String* pStr = NULL;
- sal_Bool bFound = false;
- sal_uInt16 i = 0;
- sal_uInt16 nCount = rLbCopyPos.GetEntryCount();
-
- for ( i=2; i<nCount && !bFound; i++ )
- {
- pStr = (String*)rLbCopyPos.GetEntryData( i );
- bFound = (theCurPosStr == *pStr);
- }
-
- if ( bFound )
- rLbCopyPos.SelectEntryPos( --i );
- else
- rLbCopyPos.SelectEntryPos( 0 );
- }
- else
- rLbCopyPos.SelectEntryPos( 0 );
- }
-
- return 0;
-}
-
-
-//----------------------------------------------------------------------------
-
-IMPL_LINK( ScFilterOptionsMgr, BtnCopyResultHdl, CheckBox*, pBox )
-{
- if ( pBox == &rBtnCopyResult )
- {
- if ( pBox->IsChecked() )
- {
- rBtnDestPers.Enable();
- rLbCopyPos.Enable();
- rEdCopyPos.Enable();
- rRbCopyPos.Enable();
- rEdCopyPos.GrabFocus();
- }
- else
- {
- rBtnDestPers.Disable();
- rLbCopyPos.Disable();
- rEdCopyPos.Disable();
- rRbCopyPos.Disable();
- }
- }
-
- return 0;
-}
-//----------------------------------------------------------------------------
-// ScNewFilterOptionsMgr (.ui's option helper)
-//----------------------------------------------------------------------------
-
-ScNewFilterOptionsMgr::ScNewFilterOptionsMgr(
+ScFilterOptionsMgr::ScFilterOptionsMgr(
ScViewData* ptrViewData,
const ScQueryParam& refQueryData,
CheckBox* refBtnCase,
@@ -367,7 +71,7 @@ ScNewFilterOptionsMgr::ScNewFilterOptionsMgr(
//----------------------------------------------------------------------------
-ScNewFilterOptionsMgr::~ScNewFilterOptionsMgr()
+ScFilterOptionsMgr::~ScFilterOptionsMgr()
{
sal_uInt16 nEntries = pLbCopyArea->GetEntryCount();
sal_uInt16 i;
@@ -379,14 +83,14 @@ ScNewFilterOptionsMgr::~ScNewFilterOptionsMgr()
//----------------------------------------------------------------------------
-void ScNewFilterOptionsMgr::Init()
+void ScFilterOptionsMgr::Init()
{
//moggi:TODO
OSL_ENSURE( pViewData && pDoc, "Init failed :-/" );
- pLbCopyArea->SetSelectHdl ( LINK( this, ScNewFilterOptionsMgr, LbAreaSelHdl ) );
- pEdCopyArea->SetModifyHdl ( LINK( this, ScNewFilterOptionsMgr, EdAreaModifyHdl ) );
- pBtnCopyResult->SetToggleHdl ( LINK( this, ScNewFilterOptionsMgr, BtnCopyResultHdl ) );
+ pLbCopyArea->SetSelectHdl ( LINK( this, ScFilterOptionsMgr, LbAreaSelHdl ) );
+ pEdCopyArea->SetModifyHdl ( LINK( this, ScFilterOptionsMgr, EdAreaModifyHdl ) );
+ pBtnCopyResult->SetToggleHdl ( LINK( this, ScFilterOptionsMgr, BtnCopyResultHdl ) );
pBtnCase ->Check( rQueryData.bCaseSens );
pBtnHeader ->Check( rQueryData.bHasHeader );
@@ -504,7 +208,7 @@ void ScNewFilterOptionsMgr::Init()
//----------------------------------------------------------------------------
-sal_Bool ScNewFilterOptionsMgr::VerifyPosStr( const String& rPosStr ) const
+sal_Bool ScFilterOptionsMgr::VerifyPosStr( const String& rPosStr ) const
{
String aPosStr( rPosStr );
xub_StrLen nColonPos = aPosStr.Search( ':' );
@@ -522,7 +226,7 @@ sal_Bool ScNewFilterOptionsMgr::VerifyPosStr( const String& rPosStr ) const
//----------------------------------------------------------------------------
-IMPL_LINK( ScNewFilterOptionsMgr, LbAreaSelHdl, ListBox*, pLb )
+IMPL_LINK( ScFilterOptionsMgr, LbAreaSelHdl, ListBox*, pLb )
{
if ( pLb == pLbCopyArea )
{
@@ -541,7 +245,7 @@ IMPL_LINK( ScNewFilterOptionsMgr, LbAreaSelHdl, ListBox*, pLb )
//----------------------------------------------------------------------------
-IMPL_LINK( ScNewFilterOptionsMgr, EdAreaModifyHdl, Edit*, pEd )
+IMPL_LINK( ScFilterOptionsMgr, EdAreaModifyHdl, Edit*, pEd )
{
if ( pEd == pEdCopyArea )
{
@@ -576,7 +280,7 @@ IMPL_LINK( ScNewFilterOptionsMgr, EdAreaModifyHdl, Edit*, pEd )
//----------------------------------------------------------------------------
-IMPL_LINK( ScNewFilterOptionsMgr, BtnCopyResultHdl, CheckBox*, pBox )
+IMPL_LINK( ScFilterOptionsMgr, BtnCopyResultHdl, CheckBox*, pBox )
{
if ( pBox == pBtnCopyResult )
{
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index acd2d51e1e00..a8904cbe840e 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -33,9 +33,7 @@
#include "globstr.hrc"
#include "filter.hrc"
-#define _SFILTDLG_CXX
#include "filtdlg.hxx"
-#undef _SFILTDLG_CXX
#include <vcl/msgbox.hxx>
// DEFINE --------------------------------------------------------------------
@@ -180,7 +178,7 @@ void ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet )
// Optionen initialisieren lassen:
- pOptionsMgr = new ScNewFilterOptionsMgr(
+ pOptionsMgr = new ScFilterOptionsMgr(
pViewData,
theQueryData,
pBtnCase,
diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx
index 2a789bd884b9..3dc88e9f0167 100644
--- a/sc/source/ui/inc/filtdlg.hxx
+++ b/sc/source/ui/inc/filtdlg.hxx
@@ -40,7 +40,7 @@
//----------------------------------------------------------------------------
-class ScNewFilterOptionsMgr;
+class ScFilterOptionsMgr;
class ScViewData;
class ScDocument;
class ScQueryItem;
@@ -116,7 +116,7 @@ private:
const OUString aStrRow;
const OUString aStrColumn;
- ScNewFilterOptionsMgr* pOptionsMgr;
+ ScFilterOptionsMgr* pOptionsMgr;
const sal_uInt16 nWhichQuery;
ScQueryParam theQueryData;
@@ -139,7 +139,6 @@ private:
// Hack: RefInput control
Timer* pTimer;
-#ifdef _FILTDLG_CXX
private:
void Init ( const SfxItemSet& rArgSet );
void FillFieldLists ();
@@ -155,12 +154,10 @@ private:
DECL_LINK( ValModifyHdl, ComboBox* );
DECL_LINK( CheckBoxHdl, CheckBox* );
DECL_LINK( EndDlgHdl, Button* );
- DECL_LINK( MoreClickHdl, void* );
DECL_LINK( ScrollHdl, void* );
// Hack: RefInput control
DECL_LINK( TimeOutHdl, Timer* );
-#endif
};
class ScSpecialFilterDlg : public ScAnyRefDlg
@@ -201,7 +198,7 @@ private:
CancelButton* pBtnCancel;
HelpButton* pBtnHelp;
- ScNewFilterOptionsMgr* pOptionsMgr;
+ ScFilterOptionsMgr* pOptionsMgr;
const sal_uInt16 nWhichQuery;
const ScQueryParam theQueryData;
@@ -215,7 +212,6 @@ private:
// Hack: RefInput control
Timer* pTimer;
-#ifdef _SFILTDLG_CXX
private:
void Init( const SfxItemSet& rArgSet );
ScQueryItem* GetOutputItem( const ScQueryParam& rParam,
@@ -229,7 +225,6 @@ private:
// Hack: RefInput control
DECL_LINK( TimeOutHdl, Timer* );
-#endif
};
diff --git a/sc/source/ui/inc/foptmgr.hxx b/sc/source/ui/inc/foptmgr.hxx
index f138d360ddfe..eb2ca01d43e1 100644
--- a/sc/source/ui/inc/foptmgr.hxx
+++ b/sc/source/ui/inc/foptmgr.hxx
@@ -17,89 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_FOPTMGR_HXX
-#define SC_FOPTMGR_HXX
-
-#include <vcl/fixed.hxx>
-#include <vcl/edit.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/button.hxx>
-
-//----------------------------------------------------------------------------
-
-class FixedInfo;
-namespace formula
-{
- class RefButton;
-}
-class MoreButton;
-struct ScQueryParam;
-class ScDocument;
-class ScViewData;
-
-//----------------------------------------------------------------------------
-
-class ScFilterOptionsMgr
-{
-public:
- ScFilterOptionsMgr( ScViewData* ptrViewData,
- const ScQueryParam& refQueryData,
- MoreButton& refBtnMore,
- CheckBox& refBtnCase,
- CheckBox& refBtnRegExp,
- CheckBox& refBtnHeader,
- CheckBox& refBtnUnique,
- CheckBox& refBtnCopyResult,
- CheckBox& refBtnDestPers,
- ListBox& refLbCopyArea,
- Edit& refEdCopyArea,
- formula::RefButton& refRbCopyArea,
- FixedText& refFtDbAreaLabel,
- FixedInfo& refFtDbArea,
- FixedLine& refFlOptions,
- const String& refStrUndefined );
- ~ScFilterOptionsMgr();
-
- sal_Bool VerifyPosStr ( const String& rPosStr ) const;
-
-private:
- ScViewData* pViewData;
- ScDocument* pDoc;
-
- MoreButton& rBtnMore;
- CheckBox& rBtnCase;
- CheckBox& rBtnRegExp;
- CheckBox& rBtnHeader;
- CheckBox& rBtnUnique;
- CheckBox& rBtnCopyResult;
- CheckBox& rBtnDestPers;
- ListBox& rLbCopyPos;
- Edit& rEdCopyPos;
- formula::RefButton& rRbCopyPos;
- FixedText& rFtDbAreaLabel;
- FixedInfo& rFtDbArea;
- FixedLine& rFlOptions;
-
- const String& rStrUndefined;
-
- const ScQueryParam& rQueryData;
-
-#ifdef _FOPTMGR_CXX
-private:
- void Init();
-
- // Handler:
- DECL_LINK( EdPosModifyHdl, Edit* );
- DECL_LINK( LbPosSelHdl, ListBox* );
- DECL_LINK( BtnCopyResultHdl, CheckBox* );
-#endif
-};
-
-
-
-#endif // SC_FOPTMGR_HXX
-
-
#ifndef SC_NEWFOPTMGR_HXX
#define SC_NEWFOPTMGR_HXX
@@ -107,7 +24,6 @@ private:
#include <vcl/edit.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/button.hxx>
-//#include <vcl/layout.hxx>
//----------------------------------------------------------------------------
@@ -121,24 +37,24 @@ class ScViewData;
//----------------------------------------------------------------------------
-class ScNewFilterOptionsMgr
+class ScFilterOptionsMgr
{
public:
- ScNewFilterOptionsMgr( ScViewData* ptrViewData,
- const ScQueryParam& refQueryData,
- CheckBox* refBtnCase,
- CheckBox* refBtnRegExp,
- CheckBox* refBtnHeader,
- CheckBox* refBtnUnique,
- CheckBox* refBtnCopyResult,
- CheckBox* refBtnDestPers,
- ListBox* refLbCopyArea,
- Edit* refEdCopyArea,
- formula::RefButton* refRbCopyArea,
- FixedText* refFtDbAreaLabel,
- FixedText* refFtDbArea,
- const String& refStrUndefined );
- ~ScNewFilterOptionsMgr();
+ ScFilterOptionsMgr( ScViewData* ptrViewData,
+ const ScQueryParam& refQueryData,
+ CheckBox* refBtnCase,
+ CheckBox* refBtnRegExp,
+ CheckBox* refBtnHeader,
+ CheckBox* refBtnUnique,
+ CheckBox* refBtnCopyResult,
+ CheckBox* refBtnDestPers,
+ ListBox* refLbCopyArea,
+ Edit* refEdCopyArea,
+ formula::RefButton* refRbCopyArea,
+ FixedText* refFtDbAreaLabel,
+ FixedText* refFtDbArea,
+ const String& refStrUndefined );
+ ~ScFilterOptionsMgr();
sal_Bool VerifyPosStr ( const String& rPosStr ) const;
private:
@@ -161,7 +77,6 @@ private:
const ScQueryParam& rQueryData;
-#ifdef _NEWFOPTMGR_CXX
private:
void Init();
@@ -169,11 +84,9 @@ private:
DECL_LINK( EdAreaModifyHdl, Edit* );
DECL_LINK( LbAreaSelHdl, ListBox* );
DECL_LINK( BtnCopyResultHdl, CheckBox* );
-#endif
};
#endif // SC_NEWFOPTMGR_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index af1a15fe342b..ea04ac87c73c 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -1048,14 +1048,6 @@ FontNameBox::FontNameBox( Window* pParent, WinBits nWinStyle ) :
// -------------------------------------------------------------------
-FontNameBox::FontNameBox( Window* pParent, const ResId& rResId ) :
- ComboBox( pParent, rResId )
-{
- mpFontList = NULL;
- mbWYSIWYG = sal_False;
- InitFontMRUEntriesFile();
-}
-
extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFontNameBox(Window *pParent, VclBuilder::stringmap &rMap)
{
bool bDropdown = VclBuilder::extractDropdown(rMap);
diff --git a/svx/source/sidebar/possize/SidebarDialControl.cxx b/svx/source/sidebar/possize/SidebarDialControl.cxx
index aacdbe92e9aa..e67006cecd35 100644
--- a/svx/source/sidebar/possize/SidebarDialControl.cxx
+++ b/svx/source/sidebar/possize/SidebarDialControl.cxx
@@ -34,14 +34,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSidebarDialControl(Window *
return new SidebarDialControl(pParent, WB_TABSTOP);
}
-SidebarDialControl::SidebarDialControl (
- Window* pParent,
- const ResId& rResId)
- : svx::DialControl(pParent, rResId)
-{
- Init(GetOutputSizePixel());
-}
-
SidebarDialControl::~SidebarDialControl (void)
{
}
diff --git a/unusedcode.easy b/unusedcode.easy
index e93f38cfb416..9dfa7a33b1ae 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -49,7 +49,7 @@ ScDocument::GetFormulaTokens(ScAddress const&) const
ScDocument::GetStringCell(ScAddress const&) const
ScDocument::IsEmptyData(short, short) const
ScExtIButton::GetSelected() const
-ScFormulaCell::GetResultDouble() const
+ScFilterDlg::LinkStubMoreClickHdl(void*, void*)
ScFormulaCell::HasColRowName() const
ScFormulaCell::IsSharedInvariant() const
ScFormulaCell::SetResultToken(formula::FormulaToken const*)
@@ -120,7 +120,6 @@ basegfx::snapToNearestMultiple(double, double)
basegfx::snapToRange(double, double, double)
basegfx::unotools::homMatrixFromMatrix(basegfx::B2DHomMatrix&, com::sun::star::geometry::Matrix2D const&)
canvas::createSurfaceProxyManager(boost::shared_ptr<canvas::IRenderModule> const&)
-chart::TrendlineResources::adjustControlSizes()
comphelper::ComponentContext::ComponentContext(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
comphelper::ComponentContext::createComponentWithArguments(rtl::OUString const&, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&) const
comphelper::ComponentContext::getLegacyServiceFactory() const
@@ -130,6 +129,8 @@ comphelper::detail::ConfigurationWrapper::getGroupReadWrite(boost::shared_ptr<co
comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue(rtl::OUString const&) const
comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue(boost::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&, com::sun::star::uno::Any const&) const
connectivity::file::OStatement_Base::reset()
+connectivity::firebird::OPreparedStatement::checkParameterIndex(int)
+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)
dbtools::DBTypeConversion::getMsFromTime(com::sun::star::util::Time const&)
@@ -152,6 +153,8 @@ oox::xls::SheetDataBuffer::writeXfIdRangeListProperties(int, int, oox::xls::ApiC
oox::xls::StylesBuffer::writeStyleXfToPropertySet(oox::PropertySet&, int) const
oox::xls::WorksheetGlobals::getColumns(oox::ValueRange const&) const
oox::xls::WorksheetGlobals::getRows(oox::ValueRange const&) const
+sax::Converter::convertDateTZ(rtl::OUStringBuffer&, com::sun::star::util::DateWithTimezone const&)
+sax::Converter::convertDateTimeTZ(rtl::OUStringBuffer&, com::sun::star::util::DateTimeWithTimezone const&)
sc::CellTextAttr::CellTextAttr(unsigned short, unsigned char)
sc::sidebar::CellLineStyleValueSet::GetSelItem()
sc::sidebar::CellLineStyleValueSet::SetCusEnable(bool)
@@ -176,6 +179,9 @@ sdr::table::SdrTableObj::getRowCount() const
sfx2::sidebar::AsynchronousCall::RequestCall(boost::function<void ()> const&)
sfx2::sidebar::Context::EvaluateMatch(std::__debug::vector<sfx2::sidebar::Context, std::allocator<sfx2::sidebar::Context> > const&) const
sfx2::sidebar::ContextList::IsEmpty()
+sfx2::sidebar::ControlFactory::CreateToolBox(Window*, ResId const&)
+sfx2::sidebar::ControlFactory::CreateToolBox(Window*, ResId const&, com::sun::star::uno::Reference<com::sun::star::frame::XFrame> const&)
+sfx2::sidebar::ControlFactory::CreateToolBoxBackground(Window*, bool)
sfx2::sidebar::Deck::GetIconURL(bool) const
sfx2::sidebar::Deck::PrintWindowTree(std::__debug::vector<sfx2::sidebar::Panel*, std::allocator<sfx2::sidebar::Panel*> > const&)
sfx2::sidebar::EnumContext::EvaluateMatch(std::__debug::vector<sfx2::sidebar::EnumContext, std::allocator<sfx2::sidebar::EnumContext> > const&) const
@@ -217,3 +223,4 @@ unoidl::UnoidlProvider::getConstant(unsigned int) const
utl::ConfigItem::getUniqueSetElementName(rtl::OUString const&, rtl::OUString&)
utl::toISO8601(com::sun::star::util::Time const&)
vclmain::createApplication()
+writerfilter::ooxml::OOXMLFastContextHandler::mark(unsigned int const&, boost::shared_ptr<writerfilter::ooxml::OOXMLValue>)
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 2a4a30ac0fe2..32fda191be43 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -1940,21 +1940,6 @@ MetricBox::MetricBox( Window* pParent, WinBits nWinStyle ) :
// -----------------------------------------------------------------------
-MetricBox::MetricBox( Window* pParent, const ResId& rResId ) :
- ComboBox( WINDOW_METRICBOX )
-{
- rResId.SetRT( RSC_METRICBOX );
- WinBits nStyle = ImplInitRes( rResId );
- ComboBox::ImplInit( pParent, nStyle );
- SetField( this );
- Reformat();
- ComboBox::ImplLoadRes( rResId );
- MetricFormatter::ImplLoadRes( ResId( (RSHEADER_TYPE *)GetClassRes(), *rResId.GetResMgr() ) );
-
- if ( !(nStyle & WB_HIDE ) )
- Show();
-}
-
Size MetricBox::CalcMinimumSize() const
{
Size aRet(calcMinimumSize(*this, *this));
generated by cgit (git 2.34.1) at 2025-01-01 10:49:15 +0000