summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--svtools/inc/svtools/ctrlbox.hxx1
-rw-r--r--svtools/source/control/ctrlbox.cxx21
-rw-r--r--svx/source/form/fmshimp.cxx65
-rw-r--r--svx/source/inc/fmshimp.hxx1
-rw-r--r--unotools/inc/unotools/intlwrapper.hxx16
-rw-r--r--unotools/source/i18n/intlwrapper.cxx20
-rw-r--r--unusedcode.easy6
7 files changed, 1 insertions, 129 deletions
diff --git a/svtools/inc/svtools/ctrlbox.hxx b/svtools/inc/svtools/ctrlbox.hxx
index d346b3b6af85..3ab9e31a901d 100644
--- a/svtools/inc/svtools/ctrlbox.hxx
+++ b/svtools/inc/svtools/ctrlbox.hxx
@@ -589,7 +589,6 @@ public:
virtual void SetValue( sal_Int64 nNewValue );
virtual sal_Int64 GetValue( FieldUnit eOutUnit ) const;
virtual sal_Int64 GetValue() const;
- sal_Int64 GetValue( sal_uInt16 nPos, FieldUnit eOutUnit ) const;
void SetUserValue( sal_Int64 nNewValue, FieldUnit eInUnit );
void SetUserValue( sal_Int64 nNewValue ) { SetUserValue( nNewValue, FUNIT_NONE ); }
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index e602cefe9c5c..4387aeef5577 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -2010,27 +2010,6 @@ void FontSizeBox::SetValue( sal_Int64 nNewValue )
SetValue( nNewValue, FUNIT_NONE );
}
-// -----------------------------------------------------------------------
-
-sal_Int64 FontSizeBox::GetValue( sal_uInt16 nPos, FieldUnit eOutUnit ) const
-{
- if ( !bRelative )
- {
- sal_Int64 nComboVal = static_cast<sal_Int64>(reinterpret_cast<long>(ComboBox::GetEntryData( nPos )));
- if ( nComboVal < 0 ) // marked as special?
- {
- return MetricField::ConvertValue( -nComboVal, mnBaseValue, GetDecimalDigits(),
- meUnit, eOutUnit );
- }
- }
-
- // do normal font size processing
- sal_Int64 nRetValue = MetricBox::GetValue( nPos, eOutUnit );
- return nRetValue;
-}
-
-// -----------------------------------------------------------------------
-
sal_Int64 FontSizeBox::GetValue( FieldUnit eOutUnit ) const
{
if ( !bRelative )
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 972efd6fc3ef..71faf9e85669 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -3199,71 +3199,6 @@ void FmXFormShell::stopFiltering(sal_Bool bSave)
}
//------------------------------------------------------------------------------
-void clearFilter(const Reference< runtime::XFormController >& _rxController)
-{
- Reference< XPropertySet> xControllerAsSet(_rxController, UNO_QUERY);
- Reference< XIndexAccess> xControllerAsIndex(_rxController, UNO_QUERY);
-
- // call the subcontroller
- Reference< runtime::XFormController > xController;
- for (sal_Int32 i = 0, nCount = xControllerAsIndex->getCount();
- i < nCount; i++)
- {
- xControllerAsIndex->getByIndex(i) >>= xController;
- clearFilter(xController);
- }
-
- // clear the filter
- Reference< XIndexContainer> xContainer;
- xControllerAsSet->getPropertyValue(FM_PROP_FILTERSUPPLIER) >>= xContainer;
- if (xContainer.is())
- {
- // clear the current filter
- Sequence< PropertyValue> aCondition;
-
- // as there is always an empty row, if we have a filter:
- if (xContainer->getCount())
- {
- xControllerAsSet->setPropertyValue(FM_PROP_CURRENTFILTER, makeAny(sal_Int32(xContainer->getCount() - 1)));
- while (xContainer->getCount() > 1)
- xContainer->removeByIndex(0);
- }
- }
-}
-
-//------------------------------------------------------------------------------
-void FmXFormShell::clearFilter()
-{
- if ( impl_checkDisposed() )
- return;
-
- FmXFormView* pXView = m_pShell->GetFormView()->GetImpl();
-
- // if the active controller is our external one we have to use the trigger controller
- Reference< XControlContainer> xContainer;
- if (getActiveController() == m_xExternalViewController)
- {
- DBG_ASSERT(m_xExtViewTriggerController.is(), "FmXFormShell::clearFilter : inconsistent : active external controller, but noone triggered this !");
- xContainer = m_xExtViewTriggerController->getContainer();
- }
- else
- xContainer = getActiveController()->getContainer();
-
- PFormViewPageWindowAdapter pAdapter = pXView->findWindow(xContainer);
- if ( pAdapter.is() )
- {
- const ::std::vector< Reference< runtime::XFormController > > & rControllerList = pAdapter->GetList();
- for ( ::std::vector< Reference< runtime::XFormController > > ::const_iterator j = rControllerList.begin();
- j != rControllerList.end();
- ++j
- )
- {
- ::clearFilter(*j);
- }
- }
-}
-
-//------------------------------------------------------------------------------
void FmXFormShell::CreateExternalView()
{
if ( impl_checkDisposed() )
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 7e1b75c0d183..b9f42caea07e 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -437,7 +437,6 @@ public:
sal_Bool isInFilterMode() const {return m_bFilterMode;}
void startFiltering();
void stopFiltering(sal_Bool bSave);
- void clearFilter();
static PopupMenu* GetConversionMenu();
// ein Menue, das alle ControlConversion-Eintraege enthaelt
diff --git a/unotools/inc/unotools/intlwrapper.hxx b/unotools/inc/unotools/intlwrapper.hxx
index d614a2088e4e..92aef9d099bc 100644
--- a/unotools/inc/unotools/intlwrapper.hxx
+++ b/unotools/inc/unotools/intlwrapper.hxx
@@ -59,17 +59,13 @@ private:
::com::sun::star::lang::Locale aLocale;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xSMgr;
- CharClass* pCharClass;
LocaleDataWrapper* pLocaleData;
- CalendarWrapper* pCalendar;
CollatorWrapper* pCollator;
CollatorWrapper* pCaseCollator;
LanguageType eLanguage;
- void ImplNewCharClass() const;
void ImplNewLocaleData() const;
- void ImplNewCalendar() const;
void ImplNewCollator( sal_Bool bCaseSensitive ) const;
@@ -87,24 +83,12 @@ public:
LanguageType getLanguage() const { return eLanguage; }
const ::com::sun::star::lang::Locale& getLocale() const { return aLocale; }
- const CharClass* getCharClass() const
- {
- if ( !pCharClass )
- ImplNewCharClass();
- return pCharClass;
- }
const LocaleDataWrapper* getLocaleData() const
{
if ( !pLocaleData )
ImplNewLocaleData();
return pLocaleData;
}
- CalendarWrapper* getCalendar() const
- {
- if ( !pCalendar )
- ImplNewCalendar();
- return pCalendar;
- }
/// case insensitive collator, simple IGNORE_CASE
const CollatorWrapper* getCollator() const
{
diff --git a/unotools/source/i18n/intlwrapper.cxx b/unotools/source/i18n/intlwrapper.cxx
index f98d6828efb3..61f86d847b42 100644
--- a/unotools/source/i18n/intlwrapper.cxx
+++ b/unotools/source/i18n/intlwrapper.cxx
@@ -39,9 +39,7 @@ IntlWrapper::IntlWrapper(
:
aLocale( rLocale ),
xSMgr( xSF ),
- pCharClass( NULL ),
pLocaleData( NULL ),
- pCalendar( NULL ),
pCollator( NULL ),
pCaseCollator( NULL )
{
@@ -54,9 +52,7 @@ IntlWrapper::IntlWrapper(
LanguageType eLang )
:
xSMgr( xSF ),
- pCharClass( NULL ),
pLocaleData( NULL ),
- pCalendar( NULL ),
pCollator( NULL ),
pCaseCollator( NULL ),
eLanguage( eLang )
@@ -67,34 +63,18 @@ IntlWrapper::IntlWrapper(
IntlWrapper::~IntlWrapper()
{
- delete pCharClass;
delete pLocaleData;
- delete pCalendar;
delete pCollator;
delete pCaseCollator;
}
-void IntlWrapper::ImplNewCharClass() const
-{
- ((IntlWrapper*)this)->pCharClass = new CharClass( xSMgr, aLocale );
-}
-
-
void IntlWrapper::ImplNewLocaleData() const
{
((IntlWrapper*)this)->pLocaleData = new LocaleDataWrapper( xSMgr, aLocale );
}
-void IntlWrapper::ImplNewCalendar() const
-{
- CalendarWrapper* p = new CalendarWrapper( xSMgr );
- p->loadDefaultCalendar( aLocale );
- ((IntlWrapper*)this)->pCalendar = p;
-}
-
-
void IntlWrapper::ImplNewCollator( sal_Bool bCaseSensitive ) const
{
CollatorWrapper* p = new CollatorWrapper( xSMgr );
diff --git a/unusedcode.easy b/unusedcode.easy
index e5b7d3c81356..058c9ce61e95 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -129,10 +129,8 @@ FmFieldWinMgr::GetChildWindowId()
FmFormObj::getType() const
FmPropBrwMgr::GetChildWindowId()
FmXFilterCell::getImplementation(com::sun::star::uno::Reference<com::sun::star::awt::XControl> const&)
-FmXFormShell::clearFilter()
FontCharMap::GetLastChar() const
FontSelectPattern::FontSelectPattern(ImplFontData const&, Size const&, float, int, bool)
-FontSizeBox::GetValue(unsigned short, FieldUnit) const
FontSizeBox::SetUserValue(long, FieldUnit)
FontStyleBox::FontStyleBox(Window*, long)
FontStyleMenu::Fill(String const&, FontList const*)
@@ -198,8 +196,6 @@ InsCapOptArr::Insert(InsCaptionOpt* const&, unsigned short&)
InsCapOptArr::Insert(InsCaptionOpt* const*, unsigned short)
InsCapOptArr::Remove(InsCaptionOpt* const&, unsigned short)
InsCapOptArr::Remove(unsigned short, unsigned short)
-IntlWrapper::ImplNewCalendar() const
-IntlWrapper::ImplNewCharClass() const
IntroWindow::SetBackgroundBitmap(Bitmap const&)
ItemList::FindAttrib(unsigned short)
KeyCode::GetSymbolName(String const&, Window*) const
@@ -429,7 +425,7 @@ ScDPItemData::GetNumFormat() const
ScDPSaveData::Refresh(com::sun::star::uno::Reference<com::sun::star::sheet::XDimensionsSupplier> const&)
ScDdeLink::ResetValue()
ScDocRowHeightUpdater::TabRanges::TabRanges()
-ScDocument::ValidNewTabName(std::__debug::vector<String, std::allocator<String> > const&) const
+ScDocument::ValidNewTabName(std::__debug::vector<rtl::OUString, std::allocator<rtl::OUString> > const&) const
ScFilterDetect::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
ScFiltersTest::testPassword()
ScFormulaCell::IsRangeNameInUse(unsigned short) const
generated by cgit (git 2.34.1) at 2025-03-12 05:25:56 +0000