diff options
author | obo <obo@openoffice.org> | 2010-07-29 11:05:21 +0200 |
---|---|---|
committer | obo <obo@openoffice.org> | 2010-07-29 11:05:21 +0200 |
commit | 5ad652d4bd2969082018f03ad80bf683611ab5b9 (patch) | |
tree | 0c34a9475a4f33adb684c9b80dfa269af0a1234b /cui/source/options | |
parent | 196865f40405e25b97006d43819e06f7876bf366 (diff) | |
parent | cb43723610dbead156cc520c54b3d19a027e3a2a (diff) |
CWS-TOOLING: integrate CWS vcl113
Diffstat (limited to 'cui/source/options')
-rw-r--r-- | cui/source/options/connpoolsettings.cxx | 7 | ||||
-rw-r--r-- | cui/source/options/connpoolsettings.hxx | 1 | ||||
-rw-r--r-- | cui/source/options/cuisrchdlg.cxx | 6 | ||||
-rw-r--r-- | cui/source/options/dbregister.cxx | 54 | ||||
-rw-r--r-- | cui/source/options/optgdlg.cxx | 45 | ||||
-rw-r--r-- | cui/source/options/optgenrl.cxx | 20 | ||||
-rw-r--r-- | cui/source/options/optimprove.cxx | 28 | ||||
-rw-r--r-- | cui/source/options/optimprove2.cxx | 15 | ||||
-rw-r--r--[-rwxr-xr-x] | cui/source/options/optinet2.cxx | 200 | ||||
-rw-r--r-- | cui/source/options/optjava.cxx | 50 | ||||
-rw-r--r-- | cui/source/options/optjava.hxx | 21 | ||||
-rw-r--r-- | cui/source/options/optsave.cxx | 48 | ||||
-rw-r--r-- | cui/source/options/sdbcdriverenum.cxx | 7 | ||||
-rw-r--r-- | cui/source/options/sdbcdriverenum.hxx | 1 | ||||
-rw-r--r-- | cui/source/options/treeopt.cxx | 28 |
15 files changed, 0 insertions, 531 deletions
diff --git a/cui/source/options/connpoolsettings.cxx b/cui/source/options/connpoolsettings.cxx index f17b805000f9..ae01a4f08f27 100644 --- a/cui/source/options/connpoolsettings.cxx +++ b/cui/source/options/connpoolsettings.cxx @@ -39,13 +39,6 @@ namespace offapp //= DriverPooling //==================================================================== //-------------------------------------------------------------------- - DriverPooling::DriverPooling() - :bEnabled(sal_False) - ,nTimeoutSeconds(0) - { - } - - //-------------------------------------------------------------------- DriverPooling::DriverPooling( const String& _rName, sal_Bool _bEnabled, const sal_Int32 _nTimeout ) :sName(_rName) ,bEnabled(_bEnabled) diff --git a/cui/source/options/connpoolsettings.hxx b/cui/source/options/connpoolsettings.hxx index 666b74742190..4a835d15a728 100644 --- a/cui/source/options/connpoolsettings.hxx +++ b/cui/source/options/connpoolsettings.hxx @@ -46,7 +46,6 @@ namespace offapp sal_Bool bEnabled; sal_Int32 nTimeoutSeconds; - DriverPooling(); DriverPooling( const String& _rName, sal_Bool _bEnabled, const sal_Int32 _nTimeout ); sal_Bool operator == (const DriverPooling& _rR) const; diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx index 7d488c263bad..ad34722ae246 100644 --- a/cui/source/options/cuisrchdlg.cxx +++ b/cui/source/options/cuisrchdlg.cxx @@ -92,9 +92,3 @@ INT32 SvxJSearchOptionsDialog::GetTransliterationFlags() const { return pPage->GetTransliterationFlags(); } - - -void SvxJSearchOptionsDialog::SetTransliterationFlags( INT32 nSettings ) -{ - pPage->SetTransliterationFlags( nSettings ); -} diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index c617a3e4c515..7bfc72d1181e 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -425,60 +425,6 @@ void DbRegistrationOptionsPage::insertNewEntry( const ::rtl::OUString& _sName,co } // ----------------------------------------------------------------------------- -String DbRegistrationOptionsPage::getFileLocation(const String& _sLocation) -{ - try - { - rtl::OUString aService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker" ) ); - Reference < XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); - Reference < XFilePicker > xFilePicker( xFactory->createInstance( aService ), UNO_QUERY ); - OSL_ENSURE(xFilePicker.is() ,"Could create file picker service!"); - Reference < XFilterManager> xFilterManager(xFilePicker,UNO_QUERY); - static const String s_sDatabaseType = String::CreateFromAscii("StarOffice XML (Base)"); - const SfxFilter* pFilter = SfxFilter::GetFilterByName( s_sDatabaseType); - if ( pFilter ) - { - xFilterManager->appendFilter( pFilter->GetUIName(),pFilter->GetDefaultExtension()); - xFilterManager->setCurrentFilter(pFilter->GetUIName()); - } - - INetURLObject aURL( _sLocation, INET_PROT_FILE ); - xFilePicker->setMultiSelectionMode(sal_False); - xFilePicker->setDisplayDirectory( aURL.GetMainURL( INetURLObject::NO_DECODE ) ); - short nRet = xFilePicker->execute(); - - if ( ExecutableDialogResults::OK == nRet ) - { - - // old path is an URL? - INetURLObject aObj( _sLocation ); - FASTBOOL bURL = ( aObj.GetProtocol() != INET_PROT_NOT_VALID ); - Sequence< ::rtl::OUString > aFiles = xFilePicker->getFiles(); - INetURLObject aNewObj( aFiles[0] ); - aNewObj.removeFinalSlash(); - - // then the new path also an URL else system path - String sNewLocation = bURL ? rtl::OUString(aFiles[0]) : aNewObj.getFSysPath( INetURLObject::FSYS_DETECT ); - - if ( -#ifdef UNX - // Unix is case sensitive - ( sNewLocation != _sLocation ) -#else - ( sNewLocation.CompareIgnoreCaseToAscii( _sLocation ) != COMPARE_EQUAL ) -#endif - ) - return sNewLocation; - } - } - catch( Exception& ) - { - DBG_ERRORFILE( "DbRegistrationOptionsPage::EditLocationHdl: exception from folder picker" ); - } - - return String(); -} -// ----------------------------------------------------------------------------- void DbRegistrationOptionsPage::openLinkDialog(const String& _sOldName,const String& _sOldLocation,SvLBoxEntry* _pEntry) { ODocumentLinkDialog aDlg(this,_pEntry == NULL); diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index b9a181a28438..06d1c46af3df 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -1159,51 +1159,6 @@ void OfaViewTabPage::Reset( const SfxItemSet& ) LINK( this, OfaViewTabPage, OnAntialiasingToggled ).Call( NULL ); #endif } -/* -----------------------------23.11.00 14:55-------------------------------- - - ---------------------------------------------------------------------------*/ -class LangConfigItem_Impl : public ConfigItem -{ - Any aValue; - OUString aPropertyName; -public: - LangConfigItem_Impl(const OUString& rTree, const OUString& rProperty); - ~LangConfigItem_Impl(); - - virtual void Commit(); - - const Any& GetValue() const {return aValue;} - void SetValue(Any& rValue) {aValue = rValue; SetModified();} -}; -/* -----------------------------23.11.00 15:06-------------------------------- - - ---------------------------------------------------------------------------*/ -LangConfigItem_Impl::LangConfigItem_Impl( - const OUString& rTree, const OUString& rProperty) : - ConfigItem(rTree), - aPropertyName(rProperty) -{ - Sequence<OUString> aNames(1); - aNames.getArray()[0] = aPropertyName; - Sequence<Any> aValues = GetProperties(aNames); - aValue = aValues.getConstArray()[0]; -} -/* -----------------------------23.11.00 15:06-------------------------------- - - ---------------------------------------------------------------------------*/ -LangConfigItem_Impl::~LangConfigItem_Impl() -{} -/* -----------------------------23.11.00 15:10-------------------------------- - - ---------------------------------------------------------------------------*/ -void LangConfigItem_Impl::Commit() -{ - Sequence<OUString> aNames(1); - aNames.getArray()[0] = aPropertyName; - Sequence<Any> aValues(1); - aValues.getArray()[0] = aValue; - PutProperties(aNames, aValues); -} /* -----------------22.07.2003 10:33----------------- --------------------------------------------------*/ diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index e42b825e9868..d6fa0ec1fdf3 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -70,26 +70,6 @@ struct GeneralTabPage_Impl // ----------------------------------------------------------------------- -// kommt aus adritem.cxx -//CHINA001 extern String ConvertToStore_Impl( const String& ); -//copy from adritem.cxx, since it will leave in svx. -String ConvertToStore_Impl( const String& rText ) -{ - String sRet; - USHORT i = 0; - - while ( i < rText.Len() ) - { - if ( rText.GetChar(i) == '\\' || rText.GetChar(i) == '#' ) - sRet += '\\'; - sRet += rText.GetChar(i++); - } - return sRet; -} - - -// ----------------------------------------------------------------------- - SvxGeneralTabPage::SvxGeneralTabPage( Window* pParent, const SfxItemSet& rCoreSet ) : SfxTabPage( pParent, CUI_RES(RID_SFXPAGE_GENERAL), rCoreSet ), diff --git a/cui/source/options/optimprove.cxx b/cui/source/options/optimprove.cxx index 32aa6a6a3280..b1eb055e9b1a 100644 --- a/cui/source/options/optimprove.cxx +++ b/cui/source/options/optimprove.cxx @@ -197,31 +197,3 @@ IMPL_LINK( SvxImprovementDialog, HandleOK, OKButton*, EMPTYARG ) EndDialog( RET_OK ); return 0; } - -// class SvxInfoWindow --------------------------------------------------- - -SvxInfoWindow::SvxInfoWindow( Window* pParent, const ResId& rResId ) : - Window( pParent, rResId ), - m_aInfoText( this ) -{ - m_aInfoText.SetPosSizePixel( Point( 10, 10 ), Size( 150, 10 ) ); - - const StyleSettings& rSettings = GetSettings().GetStyleSettings(); - Wallpaper aWall( rSettings.GetWindowColor() ); - SetBackground( aWall ); - Font aNewFont( m_aInfoText.GetFont() ); - aNewFont.SetTransparent( TRUE ); - m_aInfoText.SetFont( aNewFont ); - m_aInfoText.SetBackground( aWall ); - m_aInfoText.SetControlForeground( rSettings.GetWindowTextColor() ); -} - -void SvxInfoWindow::SetInfoText( const String& rText ) -{ - m_aInfoText.SetText( rText ); - Size aSize = m_aInfoText.CalcMinimumSize(); - Size aWinSize = GetSizePixel(); - Point aPos( ( aWinSize.Width() - aSize.Width() ) / 2, ( aWinSize.Height() - aSize.Height() ) / 2 ); - m_aInfoText.SetPosSizePixel( aPos, aSize ); -} - diff --git a/cui/source/options/optimprove2.cxx b/cui/source/options/optimprove2.cxx index 29ef718a6c74..0078c0e77551 100644 --- a/cui/source/options/optimprove2.cxx +++ b/cui/source/options/optimprove2.cxx @@ -61,16 +61,6 @@ namespace uno = ::com::sun::star::uno; namespace util = ::com::sun::star::util; using namespace com::sun::star::system; -// class SvxEmptyPage ---------------------------------------------------- - -SvxEmptyPage::SvxEmptyPage( Window* pParent ) : - - TabPage( pParent, CUI_RES( RID_SVXPAGE_IMPROVEMENT ) ) - -{ - FreeResource(); -} - // class SvxImprovementOptionsPage --------------------------------------- SvxImprovementOptionsPage::SvxImprovementOptionsPage( Window* pParent, const SfxItemSet& rSet ) : @@ -164,11 +154,6 @@ SfxTabPage* SvxImprovementOptionsPage::Create( Window* pParent, const SfxItemSet return new SvxImprovementOptionsPage( pParent, rSet ); } -sal_uInt16* SvxImprovementOptionsPage::GetRanges() -{ - return NULL; -} - sal_Bool SvxImprovementOptionsPage::FillItemSet( SfxItemSet& /*rSet*/ ) { uno::Reference< lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory(); diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index b360a5cedfde..c8fa0b9b5f48 100755..100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -136,47 +136,6 @@ const char* SEARCHENGINE_GROUP = "SearchEngines-$(vlang)"; // ----------------------------------------------------------------------- -String lcl_MakeTabEntry(const SfxFilter* pFilter) -{ - String sEntry(pFilter->GetMimeType()); - sEntry += '\t'; - sEntry += pFilter->GetWildcard().GetWildCard(); - sEntry += '\t'; - sEntry += pFilter->GetName(); -#if defined(OS2) - sEntry += '\t'; - sEntry += pFilter->GetTypeName(); -#endif - return sEntry; -} - -// ----------------------------------------------------------------------- - -BOOL IsJavaInstalled_Impl( /*!!!SfxIniManager* pIniMgr*/ ) -{ - BOOL bRet = FALSE; -/*!!! (pb) needs new implementation - String aIniEntry; - String aFullName = Config::GetConfigName( pIniMgr->Get( SFX_KEY_USERCONFIG_PATH ), - String::CreateFromAscii("java") ); - INetURLObject aIniFileObj( aFullName, INET_PROT_FILE ); - String aIniPath = aIniFileObj.getName(); - if ( pIniMgr->SearchFile( aIniPath ) ) - { - Config aJavaCfg( aIniPath ); - aJavaCfg.SetGroup( "Java" ); - ByteString sTemp = aJavaCfg.ReadKey( ByteString(::rtl::OUStringToOString(pIniMgr->GetKeyName( SFX_KEY_JAVA_SYSTEMCLASSPATH ),RTL_TEXTENCODING_UTF8)) ); - String aJavaSystemClassPath = ::rtl::OStringToOUString(sTemp,RTL_TEXTENCODING_UTF8); - String aJavaRuntimeLib = ::rtl::OStringToOUString(aJavaCfg.ReadKey( "RuntimeLib" ),RTL_TEXTENCODING_UTF8); - if ( aJavaSystemClassPath.Len() && aJavaRuntimeLib.Len() ) - bRet = TRUE; - } -*/ - return bRet; -} - -// ----------------------------------------------------------------------- - void SvxNoSpaceEdit::KeyInput( const KeyEvent& rKEvent ) { if ( bOnlyNumeric ) @@ -1130,146 +1089,6 @@ IMPL_LINK( SvxSearchTabPage, SearchPartHdl_Impl, RadioButton *, EMPTYARG ) return 0; } -// ----------------------------------------------------------------------- - -/********************************************************************/ -/********************************************************************/ -/* */ -/* SvxOtherTabPage */ -/* */ -/********************************************************************/ -/********************************************************************/ - -/*-----------------15.05.97 09:51------------------- - ---------------------------------------------------*/ -/* -SvxPatternField::SvxPatternField( Window* pParent, const ResId& rResId ) : - - PatternField( pParent, rResId ), - - sMsg233 ( ResId( ST_MSG_233 ) ), - sMsg255 ( ResId( ST_MSG_255 ) ) - -{ - FreeResource(); - SelectFixedFont(); -} */ - -/*-----------------15.05.97 09:51------------------- - ---------------------------------------------------*/ - -/*void SvxPatternField::KeyInput( const KeyEvent& rKEvt ) -{ - PatternField::KeyInput( rKEvt ); - BOOL bDelete = ( rKEvt.GetKeyCode().GetCode() == KEY_DELETE ); - String sEntry( GetText() ); - sEntry[(USHORT)3] = '.'; - sEntry[(USHORT)7] = '.'; - sEntry[(USHORT)11] = '.'; - Selection aSelection( GetSelection() ); - String sPart( sEntry.GetToken( 0, '.' ) ); - USHORT i, nPart( sPart.EraseLeadingChars() ); - BOOL bSet = FALSE; - - if ( sPart.Len() && ( !nPart || nPart > 255 ) ) - { - // der erste Part darf nicht 0 und nicht gr"osser 255 sein - String sMsg( sPart ); - sMsg += ' '; - sMsg += sMsg233; - InfoBox( this, sMsg ).Execute(); - - if ( nPart == 0 ) - sPart = " 1"; - else - sPart = "255"; - sEntry.SetToken( 0, '.', sPart ); - bSet = TRUE; - }; - - for ( i = 1; i < 4; i++ ) - { - // die anderen Parts d"urfen nicht gr"osser 255 sein - sPart = sEntry.GetToken( i, '.' ); - nPart = sPart.EraseLeadingChars(); - - if ( nPart > 255 ) - { - String sMsg( sPart ); - sMsg += ' '; - sMsg += sMsg255; - InfoBox( this, sMsg ).Execute(); - - if ( nPart == 0 ) - sPart = " 1"; - else - sPart = "255"; - sEntry.SetToken( i, '.', sPart ); - bSet = TRUE; - }; - } - - if ( bSet ) - { - SetText( sEntry ); - SetSelection( aSelection ); - } -} -*/ -// ----------------------------------------------------------------------- -#if 0 -long SvxPatternField::Notify( NotifyEvent& rNEvt ) -{ - return PatternField::Notify( rNEvt ); -/*! long nHandled = 0; - - if ( rNEvt.GetType() == EVENT_KEYUP ) - { - const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); - KeyInput( *pKEvt ); - nHandled = 1; - } - return nHandled;*/ -} -#endif - -// class JavaScriptDisableQueryBox_Impl -------------------------------------- - -class JavaScriptDisableQueryBox_Impl : public ModalDialog -{ -private: - FixedImage aImage; - FixedText aWarningFT; - CheckBox aDisableCB; - OKButton aYesBtn; - CancelButton aNoBtn; - -public: - JavaScriptDisableQueryBox_Impl( Window* pParent ); - - BOOL IsWarningDisabled() const { return aDisableCB.IsChecked(); } -}; - -JavaScriptDisableQueryBox_Impl::JavaScriptDisableQueryBox_Impl( Window* pParent ) : - - ModalDialog( pParent, CUI_RES( RID_SVXDLG_OPT_JAVASCRIPT_DISABLE ) ), - - aImage ( this, CUI_RES( IMG_JSCPT_WARNING ) ), - aWarningFT ( this, CUI_RES( FT_JSCPT_WARNING ) ), - aDisableCB ( this, CUI_RES( CB_JSCPT_DISABLE ) ), - aYesBtn ( this, CUI_RES( BTN_JSCPT_YES ) ), - aNoBtn ( this, CUI_RES( BTN_JSCPT_NO ) ) - -{ - FreeResource(); - - aYesBtn.SetText( Button::GetStandardText( BUTTON_YES ) ); - aNoBtn.SetText( Button::GetStandardText( BUTTON_NO ) ); - aImage.SetImage( WarningBox::GetStandardImage() ); -} - //#98647#---------------------------------------------- void SvxScriptExecListBox::RequestHelp( const HelpEvent& rHEvt ) { // try to show tips just like as on toolbars @@ -1645,25 +1464,6 @@ int SvxSecurityTabPage::DeactivatePage( SfxItemSet* _pSet ) namespace { -/* bool Enable( const SvtSecurityOptions& _rOpt, SvtSecurityOptions::EOption _eOpt, Control& _rCtrl, FixedImage& _rImg ) - { - bool b = _rOpt.IsOptionEnabled( _eOpt ); - _rCtrl.Enable( b ); - _Img.Show( !b ); - return b; - } -*/ - bool EnableAndSet( const SvtSecurityOptions& _rOpt, SvtSecurityOptions::EOption _eOpt, - CheckBox& _rCtrl, FixedImage& _rImg ) - { -// bool b = Enable( _rOpt, _eOpt, _rCtrl, _rImg ); - bool b = _rOpt.IsOptionEnabled( _eOpt ); - _rCtrl.Enable( b ); - _rImg.Show( !b ); - _rCtrl.Check( _rOpt.IsOptionSet( _eOpt ) ); - return b; - } - bool CheckAndSave( SvtSecurityOptions& _rOpt, SvtSecurityOptions::EOption _eOpt, const bool _bIsChecked, bool& _rModfied ) { bool bModified = false; diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 31a40f2cd221..2a043f6846a7 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -65,56 +65,6 @@ using namespace ::com::sun::star::ucb; using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::uno; -// class SvxJavaTable ---------------------------------------------------- - -SvxJavaTable::SvxJavaTable( Window* _pParent, const ResId& _rId ) : - - SvxSimpleTable( _pParent, _rId ) - -{ -} - -SvxJavaTable::~SvxJavaTable() -{ -} - -void SvxJavaTable::SetTabs() -{ - SvxSimpleTable::SetTabs(); -/* - USHORT nAdjust = SV_LBOXTAB_ADJUST_RIGHT | SV_LBOXTAB_ADJUST_LEFT | - SV_LBOXTAB_ADJUST_CENTER | SV_LBOXTAB_ADJUST_NUMERIC | SV_LBOXTAB_FORCE; - if ( aTabs.Count() > 0 ) - { - SvLBoxTab* pTab = (SvLBoxTab*)aTabs.GetObject(0); - pTab->nFlags &= ~nAdjust; - pTab->nFlags |= SV_LBOXTAB_PUSHABLE | SV_LBOXTAB_ADJUST_CENTER | SV_LBOXTAB_FORCE; - } -*/ -} - -void SvxJavaTable::MouseButtonUp( const MouseEvent& _rMEvt ) -{ - m_aCurMousePoint = _rMEvt.GetPosPixel(); - SvxSimpleTable::MouseButtonUp( _rMEvt ); -} - -void SvxJavaTable::KeyInput( const KeyEvent& rKEvt ) -{ - if ( !rKEvt.GetKeyCode().GetModifier() && KEY_SPACE == rKEvt.GetKeyCode().GetCode() ) - { - SvLBoxEntry* pEntry = FirstSelected(); - if ( GetCheckButtonState( pEntry ) == SV_BUTTON_UNCHECKED ) - { - SetCheckButtonState( pEntry, SV_BUTTON_CHECKED ); - GetCheckButtonHdl().Call( NULL ); - return ; - } - } - - SvxSimpleTable::KeyInput( rKEvt ); -} - // ----------------------------------------------------------------------- bool areListsEqual( const Sequence< ::rtl::OUString >& rListA, const Sequence< ::rtl::OUString >& rListB ) diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index 4bbd56906708..09eeb4ad9896 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -47,27 +47,6 @@ typedef struct _JavaInfo JavaInfo; class SvxJavaParameterDlg; class SvxJavaClassPathDlg; -// class SvxJavaTable ---------------------------------------------------- - -class SvxJavaTable : public SvxSimpleTable -{ - using SvxSimpleTable::SetTabs; -private: - Point m_aCurMousePoint; - -protected: - virtual void SetTabs(); - virtual void MouseButtonUp( const MouseEvent& _rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - -public: - SvxJavaTable( Window* _pParent, const ResId& _rId ); - ~SvxJavaTable(); - - - inline Point GetCurMousePoint() { return m_aCurMousePoint; } -}; - // class SvxJavaOptionsPage ---------------------------------------------- class SvxJavaOptionsPage : public SfxTabPage diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index 70ef2d682941..d9849050247e 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -78,37 +78,6 @@ using rtl::OUString; #define WININDEX_AUTOSAVE ((USHORT)6) #define WININDEX_SAVEURL_RELFSYS ((USHORT)9) -// -------------------- -------------------------------------------------- -class FilterWarningDialog_Impl : public ModalDialog -{ - OKButton aOk; - CancelButton aCancel; - FixedImage aImage; - FixedInfo aFilterWarningFT; - - public: - FilterWarningDialog_Impl(Window* pParent); - - void SetFilterName(const String& rFilterUIName); -}; -// ---------------------------------------------------------------------- -FilterWarningDialog_Impl::FilterWarningDialog_Impl(Window* pParent) : - ModalDialog(pParent, CUI_RES( RID_SVXDLG_FILTER_WARNING ) ), - aOk( this, CUI_RES(PB_OK )), - aCancel( this, CUI_RES(PB_CANCEL )), - aImage( this, CUI_RES(IMG_WARNING )), - aFilterWarningFT( this, CUI_RES(FT_FILTER_WARNING )) -{ - FreeResource(); - aImage.SetImage(WarningBox::GetStandardImage()); -} -// ---------------------------------------------------------------------- -void FilterWarningDialog_Impl::SetFilterName(const String& rFilterUIName) -{ - String sTmp(aFilterWarningFT.GetText()); - sTmp.SearchAndReplaceAscii("%1", rFilterUIName); - aFilterWarningFT.SetText(sTmp); -} // ---------------------------------------------------------------------- #ifdef FILTER_WARNING_ENABLED class SvxAlienFilterWarningConfig_Impl : public utl::ConfigItem @@ -324,23 +293,6 @@ SfxTabPage* SfxSaveTabPage::Create( Window* pParent, return ( new SfxSaveTabPage( pParent, rAttrSet ) ); } -/* -----------------------------05.04.01 13:10-------------------------------- - - ---------------------------------------------------------------------------*/ -OUString lcl_ExtractUIName(const Sequence<PropertyValue> rProperties) -{ - OUString sRet; - const PropertyValue* pProperties = rProperties.getConstArray(); - for(int nProp = 0; nProp < rProperties.getLength(); nProp++) - { - if(!pProperties[nProp].Name.compareToAscii("UIName")) - { - pProperties[nProp].Value >>= sRet; - break; - } - } - return sRet; -} // ----------------------------------------------------------------------- bool SfxSaveTabPage::AcceptFilter( USHORT nPos ) { diff --git a/cui/source/options/sdbcdriverenum.cxx b/cui/source/options/sdbcdriverenum.cxx index 7613978bee32..0408c5ecabe3 100644 --- a/cui/source/options/sdbcdriverenum.cxx +++ b/cui/source/options/sdbcdriverenum.cxx @@ -115,13 +115,6 @@ namespace offapp { return m_pImpl->getDriverImplNames().end(); } - - //-------------------------------------------------------------------- - sal_Int32 ODriverEnumeration::size() const throw() - { - return m_pImpl->getDriverImplNames().size(); - } - //........................................................................ } // namespace offapp //........................................................................ diff --git a/cui/source/options/sdbcdriverenum.hxx b/cui/source/options/sdbcdriverenum.hxx index b1dd5651cf35..4c5471f2280d 100644 --- a/cui/source/options/sdbcdriverenum.hxx +++ b/cui/source/options/sdbcdriverenum.hxx @@ -64,7 +64,6 @@ namespace offapp const_iterator begin() const throw(); const_iterator end() const throw(); - sal_Int32 size() const throw(); }; //........................................................................ diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 45925a4ca4fb..581ab33ad467 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -2710,22 +2710,6 @@ short OfaTreeOptionsDialog::Execute() // class ExtensionsTabPage ----------------------------------------------- ExtensionsTabPage::ExtensionsTabPage( - Window* pParent, const ResId& rResId, const rtl::OUString& rPageURL, - const rtl::OUString& rEvtHdl, const Reference< awt::XContainerWindowProvider >& rProvider ) : - - TabPage( pParent, rResId ), - - m_sPageURL ( rPageURL ), - m_sEventHdl ( rEvtHdl ), - m_xWinProvider ( rProvider ), - m_bIsWindowHidden ( false ) - -{ -} - -// ----------------------------------------------------------------------- - -ExtensionsTabPage::ExtensionsTabPage( Window* pParent, WinBits nStyle, const rtl::OUString& rPageURL, const rtl::OUString& rEvtHdl, const Reference< awt::XContainerWindowProvider >& rProvider ) : @@ -2863,15 +2847,3 @@ void ExtensionsTabPage::SavePage() { DispatchAction( C2U("ok") ); } - -// ----------------------------------------------------------------------- - -void ExtensionsTabPage::HideWindow() -{ - if ( !m_bIsWindowHidden && m_xPage.is() ) - { - m_xPage->setVisible( sal_False ); - m_bIsWindowHidden = true; - } -} - |