summaryrefslogtreecommitdiff
path: root/sc/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui')
-rw-r--r--sc/source/ui/inc/anyrefdg.hxx3
-rw-r--r--sc/source/ui/inc/viewdata.hxx12
-rw-r--r--sc/source/ui/miscdlgs/anyrefdg.cxx33
-rw-r--r--sc/source/ui/vba/vbacondition.cxx11
-rw-r--r--sc/source/ui/vba/vbacondition.hxx7
-rw-r--r--sc/source/ui/vba/vbaformatcondition.cxx6
-rw-r--r--sc/source/ui/vba/vbaformatcondition.hxx1
-rw-r--r--sc/source/ui/vba/vbapagebreak.hxx8
-rw-r--r--sc/source/ui/vba/vbatitle.hxx32
9 files changed, 19 insertions, 94 deletions
diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index 480499a27fce..7889664ca3f7 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -135,9 +135,6 @@ protected:
bool ParseWithNames( ScRangeList& rRanges, const OUString& rStr, ScDocument* pDoc );
- void preNotify(const NotifyEvent& rEvent, const bool bBindRef);
- void stateChanged(const StateChangedType nStateChange, const bool bBindRef);
-
public:
ScRefHandler( vcl::Window &rWindow, SfxBindings* pB, bool bBindRef );
virtual ~ScRefHandler();
diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx
index 78c534264614..630693cd79fe 100644
--- a/sc/source/ui/inc/viewdata.hxx
+++ b/sc/source/ui/inc/viewdata.hxx
@@ -525,18 +525,6 @@ inline ScVSplitPos WhichV( ScSplitPos ePos )
SC_SPLIT_TOP : SC_SPLIT_BOTTOM;
}
-inline ScSplitPos Which( ScHSplitPos eHPos )
-{
- return (eHPos==SC_SPLIT_LEFT) ?
- SC_SPLIT_BOTTOMLEFT : SC_SPLIT_BOTTOMRIGHT;
-}
-
-inline ScSplitPos Which( ScVSplitPos eVPos )
-{
- return (eVPos==SC_SPLIT_TOP) ?
- SC_SPLIT_TOPLEFT : SC_SPLIT_BOTTOMLEFT;
-}
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx
index 385537a20f26..dfce667e6912 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -941,39 +941,6 @@ void ScRefHandler::ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton*
m_aHelper.ToggleCollapsed( pEdit, pButton );
}
-void ScRefHandler::preNotify(const NotifyEvent& rNEvt, const bool bBindRef)
-{
- if( bBindRef || m_bInRefMode )
- {
- MouseNotifyEvent nSwitch=rNEvt.GetType();
- if(nSwitch==MouseNotifyEvent::GETFOCUS)
- {
- pActiveWin=rNEvt.GetWindow();
- }
- }
-}
-
-void ScRefHandler::stateChanged(const StateChangedType nStateChange, const bool bBindRef)
-{
- if( !bBindRef && !m_bInRefMode ) return;
-
- if(nStateChange == StateChangedType::Visible)
- {
- if(m_rWindow->IsVisible())
- {
- ScFormulaReferenceHelper::enableInput( false );
- ScFormulaReferenceHelper::EnableSpreadsheets();
- ScFormulaReferenceHelper::SetDispatcherLock( true );
- aIdle.Start();
- }
- else
- {
- ScFormulaReferenceHelper::enableInput( true );
- ScFormulaReferenceHelper::SetDispatcherLock( false ); /*//! here and in DoClose ?*/
- }
- }
-}
-
IMPL_LINK_NOARG_TYPED(ScRefHandler, UpdateFocusHdl, Idle *, void)
{
if (pActiveWin)
diff --git a/sc/source/ui/vba/vbacondition.cxx b/sc/source/ui/vba/vbacondition.cxx
index 32ebb1cea1e0..7d73d2702d04 100644
--- a/sc/source/ui/vba/vbacondition.cxx
+++ b/sc/source/ui/vba/vbacondition.cxx
@@ -105,17 +105,6 @@ ScVbaCondition< Ifc... >::setFormula1( const uno::Any& _aFormula1) throw ( scrip
}
template< typename... Ifc >
-void
-ScVbaCondition< Ifc... >::setFormula2( const uno::Any& _aFormula2) throw ( script::BasicErrorException )
-{
- OUString sFormula2;
- // #TODO surely this can't be right?
- // ( from helperapi/impl/.../calc/ConditionImpl.java
- if ( (_aFormula2 >>= sFormula2 ))
- mxSheetCondition->setFormula1(sFormula2);
-}
-
-template< typename... Ifc >
sal_Int32
ScVbaCondition< Ifc... >::Operator(bool _bIncludeFormulaValue) throw ( script::BasicErrorException )
{
diff --git a/sc/source/ui/vba/vbacondition.hxx b/sc/source/ui/vba/vbacondition.hxx
index 3c96a5d646af..2dcda6ce2df6 100644
--- a/sc/source/ui/vba/vbacondition.hxx
+++ b/sc/source/ui/vba/vbacondition.hxx
@@ -35,12 +35,11 @@ public:
static css::sheet::ConditionOperator retrieveAPIOperator( const css::uno::Any& _aOperator) throw ( css::script::BasicErrorException );
- virtual OUString SAL_CALL Formula1( ) throw ( css::script::BasicErrorException, css::uno::RuntimeException );
- virtual OUString SAL_CALL Formula2( ) throw ( css::script::BasicErrorException, css::uno::RuntimeException );
+ virtual OUString SAL_CALL Formula1( ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ) SAL_OVERRIDE;
+ virtual OUString SAL_CALL Formula2( ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ) SAL_OVERRIDE;
virtual void setFormula1( const css::uno::Any& _aFormula1) throw ( css::script::BasicErrorException );
- virtual void setFormula2( const css::uno::Any& _aFormula2) throw ( css::script::BasicErrorException );
virtual sal_Int32 Operator(bool _bIncludeFormulaValue) throw ( css::script::BasicErrorException );
- virtual sal_Int32 SAL_CALL Operator() throw ( css::script::BasicErrorException, css::uno::RuntimeException ) = 0;
+ virtual sal_Int32 SAL_CALL Operator() throw ( css::script::BasicErrorException, css::uno::RuntimeException ) SAL_OVERRIDE = 0;
};
#endif
diff --git a/sc/source/ui/vba/vbaformatcondition.cxx b/sc/source/ui/vba/vbaformatcondition.cxx
index c502226782fd..792818c97c66 100644
--- a/sc/source/ui/vba/vbaformatcondition.cxx
+++ b/sc/source/ui/vba/vbaformatcondition.cxx
@@ -115,12 +115,6 @@ ScVbaFormatCondition::setFormula1( const uno::Any& _aFormula1) throw ( script::B
ScVbaFormatCondition_BASE::setFormula1( uno::makeAny( ScVbaFormatConditions::getA1Formula(_aFormula1) ) );
}
-void
-ScVbaFormatCondition::setFormula2( const uno::Any& _aFormula2) throw ( script::BasicErrorException )
-{
- ScVbaFormatCondition_BASE::setFormula1( uno::makeAny( ScVbaFormatConditions::getA1Formula(_aFormula2)) );
-}
-
::sal_Int32 SAL_CALL
ScVbaFormatCondition::Type( ) throw ( script::BasicErrorException, uno::RuntimeException, std::exception )
{
diff --git a/sc/source/ui/vba/vbaformatcondition.hxx b/sc/source/ui/vba/vbaformatcondition.hxx
index 70003e883379..4911656843ac 100644
--- a/sc/source/ui/vba/vbaformatcondition.hxx
+++ b/sc/source/ui/vba/vbaformatcondition.hxx
@@ -56,7 +56,6 @@ public:
virtual ::sal_Int32 Operator( bool ) throw (css::script::BasicErrorException) override;
virtual ::sal_Int32 SAL_CALL Operator( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) override;
virtual void setFormula1( const css::uno::Any& _aFormula1) throw ( css::script::BasicErrorException ) override;
- virtual void setFormula2( const css::uno::Any& _aFormula2) throw ( css::script::BasicErrorException ) override;
virtual css::uno::Reference< ::ooo::vba::excel::XInterior > SAL_CALL Interior( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& Index ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
virtual css::uno::Reference< ::ooo::vba::excel::XFont > SAL_CALL Font( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
diff --git a/sc/source/ui/vba/vbapagebreak.hxx b/sc/source/ui/vba/vbapagebreak.hxx
index 611dc54c4903..01a12cbf9272 100644
--- a/sc/source/ui/vba/vbapagebreak.hxx
+++ b/sc/source/ui/vba/vbapagebreak.hxx
@@ -43,11 +43,11 @@ public:
css::sheet::TablePageBreakData aTablePageBreakData) throw (css::uno::RuntimeException);
virtual ~ScVbaPageBreak(){}
- virtual sal_Int32 SAL_CALL getType( ) throw (css::uno::RuntimeException);
- virtual void SAL_CALL setType(sal_Int32 type) throw (css::uno::RuntimeException);
+ virtual sal_Int32 SAL_CALL getType( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL setType(sal_Int32 type) throw (css::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL Delete() throw ( css::script::BasicErrorException, css::uno::RuntimeException);
- virtual css::uno::Reference< ov::excel::XRange> SAL_CALL Location() throw ( css::script::BasicErrorException, css::uno::RuntimeException);
+ virtual void SAL_CALL Delete() throw ( css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual css::uno::Reference< ov::excel::XRange> SAL_CALL Location() throw ( css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE;
};
typedef ScVbaPageBreak < ov::excel::XHPageBreak > ScVbaHPageBreak_BASE;
diff --git a/sc/source/ui/vba/vbatitle.hxx b/sc/source/ui/vba/vbatitle.hxx
index 53d7db4494f9..fa85c2de0712 100644
--- a/sc/source/ui/vba/vbatitle.hxx
+++ b/sc/source/ui/vba/vbatitle.hxx
@@ -47,7 +47,7 @@ public:
xShapePropertySet.set( xTitleShape, css::uno::UNO_QUERY_THROW );
oShapeHelper.reset( new ov::ShapeHelper(xTitleShape) );
}
- css::uno::Reference< ov::excel::XInterior > SAL_CALL Interior( ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
+ css::uno::Reference< ov::excel::XInterior > SAL_CALL Interior( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE
{
// #TODO find out what the proper parent should be
// leaving as set by the helperapi for the moment
@@ -55,14 +55,14 @@ public:
// otherwise attempts to access the palette will fail
return new ScVbaInterior( BaseClass::mxParent, BaseClass::mxContext, xShapePropertySet );
}
- css::uno::Reference< ov::excel::XFont > SAL_CALL Font( ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
+ css::uno::Reference< ov::excel::XFont > SAL_CALL Font( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE
{
// #TODO find out what the proper parent should be
// leaving as set by the helperapi for the moment
return new ScVbaFont( BaseClass::mxParent, BaseClass::mxContext, m_Palette, xShapePropertySet );
}
- void SAL_CALL setText( const OUString& Text ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
+ void SAL_CALL setText( const OUString& Text ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE
{
try
{
@@ -73,7 +73,7 @@ public:
throw css::script::BasicErrorException( OUString(), css::uno::Reference< css::uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, OUString() );
}
}
- OUString SAL_CALL getText( ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
+ OUString SAL_CALL getText( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE
{
OUString sText;
try
@@ -87,31 +87,23 @@ public:
return sText;
}
- css::uno::Reference< ov::excel::XCharacters > SAL_CALL Characters( ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
- {
- // #FIXME #TODO the helperapi Characters implementation doesn't
- // seem to do very much, need to know how the existing Characters
- // impl ( that we use for Range ) can be reused
- return css::uno::Reference< ov::excel::XCharacters > ();
- }
-
- void SAL_CALL setTop( double Top ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
+ void SAL_CALL setTop( double Top ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE
{
oShapeHelper->setTop( Top );
}
- double SAL_CALL getTop( ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
+ double SAL_CALL getTop( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE
{
return oShapeHelper->getTop();
}
- void SAL_CALL setLeft( double Left ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
+ void SAL_CALL setLeft( double Left ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE
{
oShapeHelper->setLeft( Left );
}
- double SAL_CALL getLeft( ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
+ double SAL_CALL getLeft( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE
{
return oShapeHelper->getLeft();
}
- void SAL_CALL setOrientation( ::sal_Int32 _nOrientation ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
+ void SAL_CALL setOrientation( ::sal_Int32 _nOrientation ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE
{
try
{
@@ -122,7 +114,7 @@ public:
throw css::script::BasicErrorException( OUString(), css::uno::Reference< css::uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, OUString() );
}
}
- ::sal_Int32 SAL_CALL getOrientation( ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
+ ::sal_Int32 SAL_CALL getOrientation( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE
{
sal_Int32 nSOOrientation = 0;
try
@@ -136,11 +128,11 @@ public:
return static_cast< sal_Int32 >(nSOOrientation / 100) ;
}
// XHelperInterface
- OUString getServiceImplName()
+ OUString getServiceImplName() SAL_OVERRIDE
{
return OUString("TitleImpl");
}
- css::uno::Sequence< OUString > getServiceNames()
+ css::uno::Sequence< OUString > getServiceNames() SAL_OVERRIDE
{
static css::uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
generated by cgit (git 2.34.1) at 2025-01-14 07:46:40 +0000