From 8c7f1e56dce9a2c08cf34dde1a88591adb78aead Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Thu, 15 Jul 2010 14:57:48 +0200 Subject: vcl113: #i90023# remove unused code (thanks cmc!) --- cui/source/customize/acccfg.cxx | 158 -------------------- cui/source/customize/cfg.cxx | 250 +------------------------------- cui/source/customize/cfgutil.cxx | 107 -------------- cui/source/customize/selector.cxx | 42 ------ cui/source/dialogs/commonlingui.cxx | 46 ------ cui/source/dialogs/commonlingui.hxx | 12 -- cui/source/dialogs/cuihyperdlg.cxx | 3 - cui/source/dialogs/hangulhanjadlg.cxx | 11 -- cui/source/dialogs/hldocntp.cxx | 31 ---- cui/source/dialogs/iconcdlg.cxx | 204 -------------------------- cui/source/dialogs/insdlg.cxx | 5 - cui/source/dialogs/scriptdlg.cxx | 67 --------- cui/source/dialogs/zoom.cxx | 44 ------ cui/source/factory/dlgfact.hxx | 18 --- cui/source/inc/acccfg.hxx | 49 ------- cui/source/inc/cfg.hxx | 14 -- cui/source/inc/cfgutil.hxx | 5 - cui/source/inc/chardlg.hxx | 1 - cui/source/inc/cuisrchdlg.hxx | 1 - cui/source/inc/dbregister.hxx | 7 - cui/source/inc/hangulhanjadlg.hxx | 3 - cui/source/inc/hldocntp.hxx | 2 - cui/source/inc/iconcdlg.hxx | 19 --- cui/source/inc/insdlg.hxx | 2 - cui/source/inc/macroass.hxx | 9 -- cui/source/inc/optimprove.hxx | 20 --- cui/source/inc/paragrph.hxx | 1 - cui/source/inc/scriptdlg.hxx | 11 -- cui/source/inc/selector.hxx | 6 - cui/source/inc/treeopt.hxx | 7 - cui/source/inc/zoom.hxx | 3 - cui/source/options/connpoolsettings.cxx | 7 - cui/source/options/connpoolsettings.hxx | 1 - cui/source/options/cuisrchdlg.cxx | 6 - cui/source/options/dbregister.cxx | 54 ------- cui/source/options/optgdlg.cxx | 45 ------ cui/source/options/optgenrl.cxx | 20 --- cui/source/options/optimprove.cxx | 28 ---- cui/source/options/optimprove2.cxx | 15 -- cui/source/options/optinet2.cxx | 200 ------------------------- cui/source/options/optjava.cxx | 50 ------- cui/source/options/optjava.hxx | 21 --- cui/source/options/optsave.cxx | 48 ------ cui/source/options/sdbcdriverenum.cxx | 7 - cui/source/options/sdbcdriverenum.hxx | 1 - cui/source/options/treeopt.cxx | 28 ---- cui/source/tabpages/border.cxx | 11 -- cui/source/tabpages/borderconn.cxx | 7 - cui/source/tabpages/borderconn.hxx | 7 - cui/source/tabpages/chardlg.cxx | 42 ------ cui/source/tabpages/macroass.cxx | 49 ------- cui/source/tabpages/numpages.cxx | 22 --- cui/source/tabpages/paragrph.cxx | 7 - 53 files changed, 4 insertions(+), 1830 deletions(-) mode change 100644 => 100755 cui/source/inc/macroass.hxx (limited to 'cui') diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index a75a7cf1f24d..ad5c8b1b3201 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -1366,133 +1366,6 @@ IMPL_LINK( SfxAcceleratorConfigPage, SaveHdl, sfx2::FileDialogHelper*, EMPTYARG return 0; } -::rtl::OUString RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL ) -{ - ::rtl::OUString aLabel; - if ( aCmdURL.getLength() ) - { - try - { - uno::Reference< container::XNameAccess > xNameAccess( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii("com.sun.star.frame.UICommandDescription") ), uno::UNO_QUERY ); - if ( xNameAccess.is() ) - { - uno::Reference< container::XNameAccess > xUICommandLabels; - const ::rtl::OUString aModule( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextDocument" ) ); - uno::Any a = xNameAccess->getByName( aModule ); - uno::Reference< container::XNameAccess > xUICommands; - a >>= xUICommandLabels; - rtl::OUString aStr; - uno::Sequence< beans::PropertyValue > aPropSeq; - a = xUICommandLabels->getByName( aCmdURL ); - if ( a >>= aPropSeq ) - { - for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ ) - { - if ( aPropSeq[i].Name.equalsAscii( "Name" )) - { - aPropSeq[i].Value >>= aStr; - break; - } - } - } - aLabel = aStr; - } - } - catch ( uno::Exception& ) - { - } - } - - return aLabel; -} - - -//----------------------------------------------- -String SfxAcceleratorConfigPage::GetFunctionName(KeyFuncType eType) const -{ - ::rtl::OUStringBuffer sName(256); - sName.appendAscii("\""); - switch(eType) - { - case KEYFUNC_NEW : - sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:NewDoc") ) ); - break; - - case KEYFUNC_OPEN : - sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Open") ) ); - break; - - case KEYFUNC_SAVE : - sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Save") ) ); - break; - - case KEYFUNC_SAVEAS : - sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:SaveAs") ) ); - break; - - case KEYFUNC_PRINT : - sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Print") ) ); - break; - - case KEYFUNC_CLOSE : - sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Close") ) ); - break; - - case KEYFUNC_QUIT : - sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Quit") ) ); - break; - - case KEYFUNC_CUT : - sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Cut") ) ); - break; - - case KEYFUNC_COPY : - sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Copy") ) ); - break; - - case KEYFUNC_PASTE : - sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Paste") ) ); - break; - - case KEYFUNC_UNDO : - sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Undo") ) ); - break; - - case KEYFUNC_REDO : - sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Redo") ) ); - break; - - case KEYFUNC_DELETE : - sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Delete") ) ); - break; - - case KEYFUNC_REPEAT : - sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Repeat") ) ); - break; - - case KEYFUNC_FIND : - sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Search") ) ); - break; - - case KEYFUNC_FINDBACKWARD : - sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:SearchBackwards") ) ); - break; - - case KEYFUNC_PROPERTIES : - sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Options") ) ); - break; - - case KEYFUNC_FRONT : - sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:ToFront") ) ); - break; - - default: - break; - } - sName.appendAscii("\""); - return String(sName.makeStringAndClear()); -} - //----------------------------------------------- void SfxAcceleratorConfigPage::StartFileDialog( WinBits nBits, const String& rTitle ) { @@ -1574,37 +1447,6 @@ void SfxAcceleratorConfigPage::Reset( const SfxItemSet& rSet ) } } -//----------------------------------------------- -void SfxAcceleratorConfigPage::SelectMacro(const SfxMacroInfoItem *pItem) -{ - m_pMacroInfoItem = pItem; - pGroupLBox->SelectMacro( pItem ); -} - -//----------------------------------------------- -void SfxAcceleratorConfigPage::CopySource2Target(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& xSourceAccMgr, - const css::uno::Reference< css::ui::XAcceleratorConfiguration >& xTargetAccMgr) -{ - const css::uno::Sequence< css::awt::KeyEvent > lKeys = xSourceAccMgr->getAllKeyEvents(); - sal_Int32 c = lKeys.getLength(); - sal_Int32 i = 0; - for (i=0; igetCommandByKeyEvent(rKey); - xTargetAccMgr->setKeyEvent(rKey, sCommand); - } -} - -//----------------------------------------------- -KeyCode SfxAcceleratorConfigPage::MapPosToKeyCode(USHORT nPos) const -{ - TAccInfo* pEntry = (TAccInfo*)aEntriesBox.GetEntry(0, nPos)->GetUserData(); - KeyCode aCode(KEYCODE_ARRAY[pEntry->m_nKeyPos] & 0xFFF , - KEYCODE_ARRAY[pEntry->m_nKeyPos] & (KEY_SHIFT | KEY_MOD2)); - return aCode; -} - //----------------------------------------------- USHORT SfxAcceleratorConfigPage::MapKeyCodeToPos(const KeyCode& aKey) const { diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index d9f730e0224f..c706e2f8a6a8 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -144,6 +144,8 @@ namespace container = com::sun::star::container; namespace beans = com::sun::star::beans; namespace graphic = com::sun::star::graphic; +#if OSL_DEBUG_LEVEL > 1 + void printPropertySet( const OUString& prefix, const uno::Reference< beans::XPropertySet >& xPropSet ) @@ -208,6 +210,8 @@ void printEntries(SvxEntries* entries) } } +#endif + OUString stripHotKey( const OUString& str ) { @@ -918,11 +922,6 @@ void SvxConfigDialog::PageCreated( USHORT nId, SfxTabPage& rPage ) } } -void SvxConfigDialog::ActivateTabPage( USHORT nSlotId ) -{ - (void)nSlotId; -} - /****************************************************************************** * * The SaveInData class is used to hold data for entries in the Save In @@ -3055,75 +3054,6 @@ SvxConfigEntry* SvxMainMenuOrganizerDialog::GetSelectedEntry() return (SvxConfigEntry*)aMenuListBox.FirstSelected()->GetUserData(); } -SvxConfigEntry::SvxConfigEntry( - const uno::Sequence< beans::PropertyValue >& rProperties, - const uno::Reference< container::XNameAccess >& rCommandToLabelMap ) - : - nId( 1 ), - bPopUp( FALSE ), - bStrEdited( FALSE ), - bIsUserDefined( FALSE ), - bIsMain( FALSE ), - bIsParentData( FALSE ), - bIsVisible( TRUE ), - nStyle( 0 ), - pEntries( 0 ) -{ - sal_uInt16 nType( css::ui::ItemType::DEFAULT ); - OUString aHelpURL_; - - for ( sal_Int32 i = 0; i < rProperties.getLength(); i++ ) - { - if ( rProperties[i].Name.equalsAscii( ITEM_DESCRIPTOR_COMMANDURL )) - { - rProperties[i].Value >>= aCommand; - } - else if ( rProperties[i].Name.equalsAscii( ITEM_DESCRIPTOR_HELPURL )) - { - rProperties[i].Value >>= aHelpURL_; - } - else if ( rProperties[i].Name.equalsAscii( ITEM_DESCRIPTOR_LABEL )) - { - rProperties[i].Value >>= aLabel; - } - else if ( rProperties[i].Name.equalsAscii( ITEM_DESCRIPTOR_TYPE )) - { - rProperties[i].Value >>= nType; - } - } - - if ( nType == css::ui::ItemType::DEFAULT ) - { - uno::Any a; - try - { - a = rCommandToLabelMap->getByName( aCommand ); - bIsUserDefined = FALSE; - } - catch ( container::NoSuchElementException& ) - { - bIsUserDefined = TRUE; - } - - // If custom label not set retrieve it from the command to info service - if ( aLabel.equals( OUString() ) ) - { - uno::Sequence< beans::PropertyValue > aPropSeq; - if ( a >>= aPropSeq ) - { - for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ ) - { - if ( aPropSeq[i].Name.equalsAscii( ITEM_DESCRIPTOR_LABEL ) ) - { - aPropSeq[i].Value >>= aLabel; - break; - } - } - } - } - } -} - const OUString& SvxConfigEntry::GetHelpText() { @@ -3150,133 +3080,6 @@ SvxConfigEntry::GetHelpText() return aHelpText; } -uno::Sequence< beans::PropertyValue > -SvxConfigEntry::GetProperties( - const uno::Reference< container::XNameAccess >& rCommandToLabelMap ) -{ - if ( IsSeparator() ) - { - uno::Sequence< beans::PropertyValue > aPropSeq( 1 ); - - aPropSeq[0].Name = OUString( - RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_TYPE ) ); - aPropSeq[0].Value <<= css::ui::ItemType::SEPARATOR_LINE; - - return aPropSeq; - } - - static const OUString aDescriptorCommandURL ( - RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_COMMANDURL ) ); - - static const OUString aDescriptorType( - RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_TYPE ) ); - - static const OUString aDescriptorLabel( - RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_LABEL ) ); - - static const OUString aDescriptorHelpURL( - RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_HELPURL ) ); - - uno::Sequence< beans::PropertyValue > aPropSeq( 4 ); - - aPropSeq[0].Name = aDescriptorCommandURL; - aPropSeq[0].Value <<= rtl::OUString( GetCommand() ); - - aPropSeq[1].Name = aDescriptorType; - aPropSeq[1].Value <<= css::ui::ItemType::DEFAULT; - - // If the name has not been changed and the name is the same as - // in the default command to label map then the label can be stored - // as an empty string. - // It will be initialised again later using the command to label map. - aPropSeq[2].Name = aDescriptorLabel; - if ( HasChangedName() == FALSE && GetCommand().getLength() ) - { - BOOL isDefaultName = FALSE; - try - { - uno::Any a( rCommandToLabelMap->getByName( GetCommand() ) ); - uno::Sequence< beans::PropertyValue > tmpPropSeq; - if ( a >>= tmpPropSeq ) - { - for ( sal_Int32 i = 0; i < tmpPropSeq.getLength(); i++ ) - { - if ( tmpPropSeq[i].Name.equals( aDescriptorLabel ) ) - { - OUString tmpLabel; - tmpPropSeq[i].Value >>= tmpLabel; - - if ( tmpLabel.equals( GetName() ) ) - { - isDefaultName = TRUE; - } - - break; - } - } - } - } - catch ( container::NoSuchElementException& ) - { - // isDefaultName is left as FALSE - } - - if ( isDefaultName ) - { - aPropSeq[2].Value <<= rtl::OUString(); - } - else - { - aPropSeq[2].Value <<= rtl::OUString( GetName() ); - } - } - else - { - aPropSeq[2].Value <<= rtl::OUString( GetName() ); - } - - aPropSeq[3].Name = aDescriptorHelpURL; - aPropSeq[3].Value <<= rtl::OUString( GetHelpURL() ); - - return aPropSeq; -} - -/* -SvxMenuConfigEntry::SvxMenuConfigEntry( - const uno::Sequence< beans::PropertyValue >& rProperties, - const uno::Reference< container::XNameAccess >& rCommandToLabelMap ) - : - SvxConfigEntry( rProperties, rCommandToLabelMap ) -{ - uno::Reference< container::XIndexAccess > aChildren; - - for ( sal_Int32 i = 0; i < rProperties.getLength(); i++ ) - { - if ( rProperties[i].Name.equalsAscii( ITEM_DESCRIPTOR_CONTAINER )) - { - rProperties[i].Value >>= aChildren; - } - } - - if ( aChildren.is() ) - { - SetPopup( TRUE ); - SetEntries( new SvxEntries() ); - - uno::Sequence< beans::PropertyValue > aProps; - for ( sal_Int32 i = 0; i < aChildren->getCount(); i++ ) - { - if ( aChildren->getByIndex( i ) >>= aProps ) - { - SvxConfigEntry* pEntry = - new SvxMenuConfigEntry( aProps, rCommandToLabelMap ); - GetEntries()->push_back( pEntry ); - } - } - } -} -*/ - SvxConfigEntry::SvxConfigEntry( const OUString& rDisplayName, const OUString& rCommandURL, bool bPopup, bool bParentData ) : nId( 1 ) @@ -4695,51 +4498,6 @@ void ToolbarSaveInData::RestoreToolbar( SvxConfigEntry* pToolbar ) } } -void ToolbarSaveInData::ReloadToolbar( const OUString& rResourceURL ) -{ - SvxEntries::const_iterator iter = GetEntries()->begin(); - SvxConfigEntry* pToolbar = NULL; - - for ( ; iter != GetEntries()->end(); iter++ ) - { - SvxConfigEntry* pEntry = *iter; - - if ( pEntry->GetCommand().equals( rResourceURL ) ) - { - pToolbar = pEntry; - break; - } - } - - if ( pToolbar != NULL ) - { - delete pToolbar->GetEntries(); - - try - { - uno::Reference< container::XIndexAccess > xToolbarSettings; - - if ( pToolbar->IsParentData() ) - { - xToolbarSettings = GetParentConfigManager()->getSettings( - pToolbar->GetCommand(), sal_False); - } - else - { - xToolbarSettings = GetConfigManager()->getSettings( - pToolbar->GetCommand(), sal_False); - } - - LoadToolbar( xToolbarSettings, pToolbar ); - } - catch ( container::NoSuchElementException& ) - { - // toolbar not found for some reason - // it will not appear in the toolbar list - } - } -} - bool ToolbarSaveInData::LoadToolbar( const uno::Reference< container::XIndexAccess >& xToolbarSettings, SvxConfigEntry* pParentData ) diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index 952de1f9275e..da294a4526b0 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -376,40 +376,6 @@ void SfxConfigFunctionListBox_Impl::ClearAll() Clear(); } -SvLBoxEntry* SfxConfigFunctionListBox_Impl::GetEntry_Impl( const String& rName ) -/* Beschreibung - Ermittelt den SvLBoxEntry zu einem "ubergebenen String. Das setzt voraus, da\s - die Namen eindeutig sind. -*/ -{ - SvLBoxEntry *pEntry = First(); - while ( pEntry ) - { - if ( GetEntryText( pEntry ) == rName ) - return pEntry; - pEntry = Next( pEntry ); - } - - return NULL; -} - -SvLBoxEntry* SfxConfigFunctionListBox_Impl::GetEntry_Impl( USHORT nId ) -/* Beschreibung - Ermittelt den SvLBoxEntry zu einer "ubergebenen Id. -*/ -{ - SvLBoxEntry *pEntry = First(); - while ( pEntry ) - { - SfxGroupInfo_Impl *pData = (SfxGroupInfo_Impl*) pEntry->GetUserData(); - if ( pData && pData->nOrd == nId ) - return pEntry; - pEntry = Next( pEntry ); - } - - return NULL; -} - SfxMacroInfo* SfxConfigFunctionListBox_Impl::GetMacroInfo() /* Beschreibung Gibt die MacroInfo des selektierten Entry zur"uck ( sofern vorhanden ). @@ -451,60 +417,6 @@ String SfxConfigFunctionListBox_Impl::GetCurLabel() return pData->sCommand; } -USHORT SfxConfigFunctionListBox_Impl::GetId( SvLBoxEntry *pEntry ) -/* Beschreibung - Gibt die Ordnungsnummer ( SlotId oder Macro-Nummer ) des Eintrags zur"uck. -*/ -{ - SfxGroupInfo_Impl *pData = pEntry ? - (SfxGroupInfo_Impl*) pEntry->GetUserData() : 0; - if ( pData ) - return pData->nOrd; - return 0; -} - -/* -String SfxConfigFunctionListBox_Impl::GetHelpText( SvLBoxEntry *pEntry ) -{ - // Information zum selektierten Entry aus den Userdaten holen - SfxGroupInfo_Impl *pInfo = pEntry ? (SfxGroupInfo_Impl*) pEntry->GetUserData(): 0; - if ( pInfo ) - { - switch ( pInfo->nKind ) - { - case SFX_CFGGROUP_FUNCTION : - case SFX_CFGFUNCTION_SLOT : - { - // Eintrag ist eine Funktion, Hilfe aus der Office-Hilfe - USHORT nId = pInfo->nOrd; - String aText = Application::GetHelp()->GetHelpText( nId, this ); - - if ( !aText.Len() ) - aText = SFX_SLOTPOOL().GetSlotHelpText_Impl( nId ); - return aText; - } - - case SFX_CFGGROUP_SCRIPTCONTAINER : - case SFX_CFGFUNCTION_SCRIPT : - case SFX_CFGGROUP_BASICMGR : - case SFX_CFGGROUP_DOCBASICMGR : - case SFX_CFGGROUP_BASICLIB : - case SFX_CFGGROUP_BASICMOD : - case SFX_CFGFUNCTION_MACRO : - { - // Eintrag ist ein Macro, Hilfe aus der MacroInfo - SfxMacroInfo *pMacInfo = (SfxMacroInfo*) pInfo->pObject; - return pMacInfo->GetHelpText(); - } - - case SFX_CFGGROUP_STYLES : - return String(); - } - } - - return String(); -}*/ - void SfxConfigFunctionListBox_Impl::FunctionSelected() /* Beschreibung Setzt die Balloonhelp zur"uck, da diese immer den Helptext des selektierten @@ -1247,25 +1159,6 @@ SfxConfigGroupListBox_Impl::getDocumentModel( Reference< XComponentContext >& xC return xModel; } -::rtl::OUString SfxConfigGroupListBox_Impl::parseLocationName( const ::rtl::OUString& location ) -{ - // strip out the last leaf of location name - // e.g. file://dir1/dir2/Blah.sxw - > Blah.sxw - ::rtl::OUString temp = location; - sal_Int32 lastSlashIndex = temp.lastIndexOf( ::rtl::OUString::createFromAscii( "/" ) ); - - if ( ( lastSlashIndex + 1 ) < temp.getLength() ) - { - temp = temp.copy( lastSlashIndex + 1 ); - } - // maybe we should throw here!!! - else - { - OSL_TRACE("Something wrong with name, perhaps we should throw an exception"); - } - return temp; -} - //----------------------------------------------- ::rtl::OUString SfxConfigGroupListBox_Impl::MapCommand2UIName(const ::rtl::OUString& sCommand) { diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index 3e99f3e95b5f..833dc0f32c82 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -154,42 +154,6 @@ void SvxConfigFunctionListBox_Impl::ClearAll() Clear(); } -SvLBoxEntry* SvxConfigFunctionListBox_Impl::GetEntry_Impl( const String& rName ) -{ - SvLBoxEntry *pEntry = First(); - while ( pEntry ) - { - if ( GetEntryText( pEntry ) == rName ) - return pEntry; - pEntry = Next( pEntry ); - } - - return NULL; -} - -SvLBoxEntry* SvxConfigFunctionListBox_Impl::GetEntry_Impl( USHORT nId ) -{ - SvLBoxEntry *pEntry = First(); - while ( pEntry ) - { - SvxGroupInfo_Impl *pData = (SvxGroupInfo_Impl*) pEntry->GetUserData(); - if ( pData && pData->nOrd == nId ) - return pEntry; - pEntry = Next( pEntry ); - } - - return NULL; -} - -USHORT SvxConfigFunctionListBox_Impl::GetId( SvLBoxEntry *pEntry ) -{ - SvxGroupInfo_Impl *pData = pEntry ? - (SvxGroupInfo_Impl*) pEntry->GetUserData() : 0; - if ( pData ) - return pData->nOrd; - return 0; -} - String SvxConfigFunctionListBox_Impl::GetHelpText( SvLBoxEntry *pEntry ) { // Information zum selektierten Entry aus den Userdaten holen @@ -1214,12 +1178,6 @@ SvxScriptSelectorDialog::SetDialogDescription( const String& rDescription ) aDialogDescription.SetText( rDescription ); } -USHORT -SvxScriptSelectorDialog::GetSelectedId() -{ - return aCommands.GetId( aCommands.GetLastSelectedEntry() ); -} - String SvxScriptSelectorDialog::GetScriptURL() const { diff --git a/cui/source/dialogs/commonlingui.cxx b/cui/source/dialogs/commonlingui.cxx index f1cc2a869d6a..327ffd4cbc17 100644 --- a/cui/source/dialogs/commonlingui.cxx +++ b/cui/source/dialogs/commonlingui.cxx @@ -183,52 +183,6 @@ void SvxCommonLinguisticControl::InsertControlGroup( Window& _rFirstGroupWindow, // (FirstWindow, LastWindow) was no valid control group } -// ----------------------------------------------------------------------- -String SvxCommonLinguisticControl::GetNewEditWord() -{ - return aNewWordED.GetText(); -} - -// ----------------------------------------------------------------------- -void SvxCommonLinguisticControl::SetNewEditWord( const String& _rNew ) -{ - aNewWordED.SetText( _rNew ); -} - -//----------------------------------------------------------------------------- -void SvxCommonLinguisticControl::UpdateIgnoreHelp( ) -{ - - String aInfoStr( RTL_CONSTASCII_USTRINGPARAM( ": " ) ); - aInfoStr.Append( GetCurrentText() ); - - String aString = GetNonMnemonicString( aIgnoreAllBtn.GetText() ); - aString.Append( aInfoStr ); - aIgnoreAllBtn.SetQuickHelpText( aString ); - - aString = GetNonMnemonicString( aIgnoreBtn.GetText() ); - aString.Append( aInfoStr ); - aIgnoreBtn.SetQuickHelpText( aString ); -} - -//----------------------------------------------------------------------------- -void SvxCommonLinguisticControl::UpdateChangesHelp( const String& _rNewText ) -{ - String aInfoStr( RTL_CONSTASCII_USTRINGPARAM( ": " ) ); - aInfoStr.Append( GetCurrentText() ); - aInfoStr.Append( String( RTL_CONSTASCII_USTRINGPARAM( " -> " ) ) ); - aInfoStr.Append( _rNewText ); - // TODO: shouldn't this be part of the resources, for proper localization? - - String aString = GetNonMnemonicString( aChangeAllBtn.GetText() ); - aString.Append( aInfoStr ); - aChangeAllBtn.SetQuickHelpText( aString ); - - aString = GetNonMnemonicString( aChangeBtn.GetText() ); - aString.Append( aInfoStr ); - aChangeBtn.SetQuickHelpText( aString ); -} - //----------------------------------------------------------------------------- void SvxCommonLinguisticControl::Paint( const Rectangle& rRect ) { diff --git a/cui/source/dialogs/commonlingui.hxx b/cui/source/dialogs/commonlingui.hxx index 04d9fbcc58e4..c6eb11b9a48c 100644 --- a/cui/source/dialogs/commonlingui.hxx +++ b/cui/source/dialogs/commonlingui.hxx @@ -152,18 +152,6 @@ public: // returns the location (upper-left corner) of the group of action buttons inline Point GetActionButtonsLocation( ) const { return aIgnoreBtn.GetPosPixel(); } - - // updates the help texts for the "change" and "change all" buttons according to the currently - // entered texts - void UpdateChangesHelp( const String& _rNewText ); - inline void UpdateChangesHelp( ) { UpdateChangesHelp( GetWordInputControl().GetText() ); } - - // updates the help texts for the "ignore" and "always ignore" buttons according to the currently - // entered texts - void UpdateIgnoreHelp( ); - - String GetNewEditWord(); - void SetNewEditWord( const String& _rNew ); }; diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index 297b1ad921c4..94477b6ef3dc 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -136,9 +136,6 @@ SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings) pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_NEWDOCUMENT, aStrTitle, aImage, aImageHC, SvxHyperlinkNewDocTp::Create ); pEntry->SetQuickHelpText( CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP ) ); - // all tab pages set -> create mnemonics - // CreateIconTextAutoMnemonics(); #99671# not useful, because this is not what user expects when using mnemonics on the pages - // create itemset for tabpages mpItemSet = new SfxItemSet( SFX_APP()->GetPool(), SID_HYPERLINK_GETLINK, SID_HYPERLINK_SETLINK ); diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 2198a42c3fcf..32e62d3e7f80 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -689,12 +689,6 @@ namespace svx m_pPlayground->SetButtonHandler( SvxCommonLinguisticControl::eChangeAll, _rHdl ); } - //------------------------------------------------------------------------- - void HangulHanjaConversionDialog::SetOptionsHdl( const Link& _rHdl ) - { - m_pPlayground->SetButtonHandler( SvxCommonLinguisticControl::eOptions, _rHdl ); - } - //------------------------------------------------------------------------- void HangulHanjaConversionDialog::SetFindHdl( const Link& _rHdl ) { @@ -865,11 +859,6 @@ namespace svx m_aSuggestions.DisplayListBox( !_bByCharacter ); } - //------------------------------------------------------------------------- - sal_Bool HangulHanjaConversionDialog::GetByCharacter( ) const - { - return m_aReplaceByChar.IsChecked(); - } //------------------------------------------------------------------------- void HangulHanjaConversionDialog::SetConversionDirectionState( sal_Bool _bTryBothDirections, diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index dc50bd8f205d..1015063b05e3 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -173,37 +173,6 @@ void SvxHyperlinkNewDocTp::FillDlgFields ( String& /*aStrURL*/ ) #define INTERNETSHORTCUT_URL_TAG "URL" #define INTERNETSHORTCUT_ICONID_TAG "IconIndex" -void SvxHyperlinkNewDocTp::ReadURLFile( const String& rFile, String& rTitle, String& rURL, sal_Int32& rIconId, BOOL* pShowAsFolder ) -{ - // Open file - Config aCfg( rFile ); - aCfg.SetGroup( INTERNETSHORTCUT_ID_TAG ); - - // read URL - rURL = aCfg.ReadKey( ByteString( RTL_CONSTASCII_STRINGPARAM( INTERNETSHORTCUT_URL_TAG) ), RTL_TEXTENCODING_ASCII_US ); - SvtPathOptions aPathOpt; - rURL = aPathOpt.SubstituteVariable( rURL ); - - // read target - if ( pShowAsFolder ) - { - String aTemp( aCfg.ReadKey( ByteString( RTL_CONSTASCII_STRINGPARAM( INTERNETSHORTCUT_TARGET_TAG ) ), RTL_TEXTENCODING_ASCII_US ) ); - *pShowAsFolder = aTemp == String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( INTERNETSHORTCUT_FOLDER_TAG ) ); - } - - // read image-ID - String aStrIconId( aCfg.ReadKey( ByteString( RTL_CONSTASCII_STRINGPARAM( INTERNETSHORTCUT_ICONID_TAG ) ), RTL_TEXTENCODING_ASCII_US ) ); - rIconId = aStrIconId.ToInt32(); - - // read title - String aLangStr = aPathOpt.SubstituteVariable( DEFINE_CONST_UNICODE("$(vlang)") ); - ByteString aLang( aLangStr, RTL_TEXTENCODING_UTF8 ); - ByteString aGroup = INTERNETSHORTCUT_ID_TAG; - ( ( aGroup += '-' ) += aLang ) += ".W"; - aCfg.SetGroup( aGroup ); - rTitle = String( aCfg.ReadKey( INTERNETSHORTCUT_TITLE_TAG ), RTL_TEXTENCODING_UTF7 ); -} - void SvxHyperlinkNewDocTp::FillDocumentList () { EnterWait(); diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index adea20068499..a9356704e503 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -147,56 +147,6 @@ sal_Bool IconChoicePage::QueryClose() return sal_True; } -/********************************************************************** -| -| handling itemsets -| -\**********************************************************************/ - -const SfxPoolItem* IconChoicePage::GetItem( const SfxItemSet& rSet, - USHORT nSlot ) -{ - const SfxItemPool* pPool = rSet.GetPool(); - USHORT nWh = pPool->GetWhich( nSlot ); - const SfxPoolItem* pItem = 0; - rSet.GetItemState( nWh, TRUE, &pItem ); - - if ( !pItem && nWh != nSlot ) - pItem = &pPool->GetDefaultItem( nWh ); - - return pItem; -} - -// ----------------------------------------------------------------------- - -const SfxPoolItem* IconChoicePage::GetOldItem( const SfxItemSet& rSet, - USHORT nSlot ) -{ - const SfxItemSet& rOldSet = GetItemSet(); - USHORT nWh = GetWhich( nSlot ); - const SfxPoolItem* pItem = 0; - - if ( bStandard && rOldSet.GetParent() ) - pItem = GetItem( *rOldSet.GetParent(), nSlot ); - else if ( rSet.GetParent() && SFX_ITEM_DONTCARE == rSet.GetItemState( nWh ) ) - pItem = GetItem( *rSet.GetParent(), nSlot ); - else - pItem = GetItem( rOldSet, nSlot ); - - return pItem; -} - -// ----------------------------------------------------------------------- - -const SfxPoolItem* IconChoicePage::GetExchangeItem( const SfxItemSet& rSet, - USHORT nSlot ) -{ - if ( pDialog && !pDialog->IsInOK() && pDialog->GetExampleSet() ) - return GetItem( *pDialog->GetExampleSet(), nSlot ); - else - return GetOldItem( rSet, nSlot ); -} - /********************************************************************** | | window-methods @@ -380,18 +330,6 @@ IconChoiceDialog ::~IconChoiceDialog () delete pData; } - // remove Pagelist -/* for ( i=0; ibOnDemand ) - delete ( SfxItemSet * )&( pData->pPage->GetItemSet() ); - - delete pData->pPage; - delete pData; - }*/ - // remove Userdata from Icons for ( i=0; ifnGetRanges = pRangesFunc; - pData->bOnDemand = bItemsOnDemand; - - USHORT *pId = new USHORT ( nId ); - SvxIconChoiceCtrlEntry* pEntry = maIconCtrl.InsertEntry( rIconText, rChoiceIcon ); - pEntry->SetUserData ( (void*) pId ); - return pEntry; -} - SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage( USHORT nId, const String& rIconText, const Image& rChoiceIcon, const Image& rChoiceIconHC, @@ -454,65 +372,6 @@ SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage( USHORT nId, const String& return pEntry; } -/********************************************************************** -| -| remove page -| -\**********************************************************************/ - -void IconChoiceDialog::RemoveTabPage( USHORT nId ) -{ - IconChoicePageData* pData = GetPageData ( nId ); - - // remove page from list - if ( pData ) - { - maPageList.Remove ( pData ); - - // save settings - if ( pData->pPage ) - { - pData->pPage->FillUserData(); - String aPageData(pData->pPage->GetUserData()); - if ( aPageData.Len() ) - { - SvtViewOptions aTabPageOpt( E_TABPAGE, String::CreateFromInt32( pData->nId ) ); - - SetViewOptUserItem( aTabPageOpt, aPageData ); - } - } - - if ( pData->bOnDemand ) - delete ( SfxItemSet * )&( pData->pPage->GetItemSet() ); - - delete pData->pPage; - delete pData; - } - - // remove Icon - BOOL bFound=FALSE; - for ( ULONG i=0; iGetUserData(); - - if ( *pUserData == nId ) - { - delete pUserData; - maIconCtrl.RemoveEntry ( pEntry ); - bFound = TRUE; - } - } - - // was it the current page ? - if ( nId == mnCurrentPageId ) - { - mnCurrentPageId = maPageList.First()->nId; - } - - Invalidate (); -} - /********************************************************************** | | Paint-method @@ -572,13 +431,6 @@ EIconChoicePos IconChoiceDialog::SetCtrlPos( const EIconChoicePos& rPos ) return eOldPos; } -void IconChoiceDialog::SetCtrlColor ( const Color& rColor ) -{ - Wallpaper aWallpaper ( rColor ); - maIconCtrl.SetBackground( aWallpaper ); - maIconCtrl.SetFontColorToBackground (); -} - /********************************************************************** | | Show / Hide page or button @@ -601,14 +453,6 @@ void IconChoiceDialog::HidePageImpl ( IconChoicePageData* pData ) // ----------------------------------------------------------------------- -void IconChoiceDialog::RemoveResetButton() -{ - aResetBtn.Hide(); - bHideResetBtn = TRUE; -} - -// ----------------------------------------------------------------------- - void IconChoiceDialog::ShowPage( USHORT nId ) { bool bInvalidate = GetCurPageId() != nId; @@ -1144,40 +988,6 @@ void IconChoiceDialog::SetInputSet( const SfxItemSet* pInSet ) // ----------------------------------------------------------------------- -// Liefert die Pages, die ihre Sets onDemand liefern, das OutputItemSet. -const SfxItemSet* IconChoiceDialog::GetOutputItemSet ( USHORT nId ) -{ - IconChoicePageData * pData = GetPageData ( nId ); - DBG_ASSERT( pData, "TabPage nicht gefunden" ); - - if ( pData ) - { - if ( !pData->pPage ) - return NULL; - - if ( pData->bOnDemand ) - return &pData->pPage->GetItemSet(); - - return pOutSet; - } - - return NULL; -} - -// ----------------------------------------------------------------------- - -int IconChoiceDialog::FillOutputItemSet() -{ - int nRet = IconChoicePage::LEAVE_PAGE; - if ( OK_Impl() ) - Ok(); - else - nRet = IconChoicePage::KEEP_PAGE; - return nRet; -} - -// ----------------------------------------------------------------------- - void IconChoiceDialog::PageCreated( USHORT /*nId*/, IconChoicePage& /*rPage*/ ) { // not interested in @@ -1404,13 +1214,6 @@ short IconChoiceDialog::Ok() // ----------------------------------------------------------------------- -BOOL IconChoiceDialog::IsInOK() const -{ - return bInOK; -} - -// ----------------------------------------------------------------------- - void IconChoiceDialog::FocusOnIcon( USHORT nId ) { // set focus to icon for the current visible page @@ -1426,10 +1229,3 @@ void IconChoiceDialog::FocusOnIcon( USHORT nId ) } } } - -// ----------------------------------------------------------------------- - -void IconChoiceDialog::CreateIconTextAutoMnemonics( void ) -{ - maIconCtrl.CreateAutoMnemonics(); -} diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index c45dfeb9dc06..8cf21129f52c 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -196,11 +196,6 @@ void SvInsertOleDlg::SelectDefault() aLbObjecttype.SelectEntryPos( 0 ); } -void SvInsertOleDlg::FillObjectServerList( SvObjectServerList* pList ) -{ - pList->FillInsertObjects(); -} - // ----------------------------------------------------------------------- SvInsertOleDlg::SvInsertOleDlg ( diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index e1763249479c..62ec77c3c26a 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -367,15 +367,6 @@ void SFTreeListBox:: RequestSubEntries( SvLBoxEntry* pRootEntry, Reference< ::co } } -void SFTreeListBox::UpdateEntries() -{ -} - -SvLBoxEntry* SFTreeListBox::FindEntry( SvLBoxEntry* , const String& , BYTE ) -{ - return 0; -} - long SFTreeListBox::ExpandingHdl() { return TRUE; @@ -626,10 +617,6 @@ short SvxScriptOrgDialog::Execute() return nRet; } -void SvxScriptOrgDialog::EnableButton( Button& , BOOL ) -{ -} - void SvxScriptOrgDialog::CheckButtons( Reference< browse::XBrowseNode >& node ) { if ( node.is() ) @@ -921,38 +908,6 @@ Reference< XModel > SvxScriptOrgDialog::getModel( SvLBoxEntry* pEntry ) return model; } -Reference< XInterface > -SvxScriptOrgDialog::getDocumentModel( Reference< XComponentContext >& xCtx, ::rtl::OUString& docName ) -{ - Reference< XInterface > xModel; - Reference< lang::XMultiComponentFactory > mcf = - xCtx->getServiceManager(); - Reference< frame::XDesktop > desktop ( - mcf->createInstanceWithContext( - ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"), xCtx ), - UNO_QUERY ); - - Reference< container::XEnumerationAccess > componentsAccess = - desktop->getComponents(); - Reference< container::XEnumeration > components = - componentsAccess->createEnumeration(); - while (components->hasMoreElements()) - { - Reference< frame::XModel > model( - components->nextElement(), UNO_QUERY ); - if ( model.is() ) - { - ::rtl::OUString sTdocUrl = ::comphelper::DocumentInfo::getDocumentTitle( model ); - if( sTdocUrl.equals( docName ) ) - { - xModel = model; - break; - } - } - } - return xModel; -} - void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry ) { @@ -1371,28 +1326,6 @@ void SvxScriptOrgDialog::RestorePreviousSelection() aScriptsBox.SetCurEntry( pEntry ); } -BOOL SFTreeListBox::dialogSort1( Reference< browse::XBrowseNode > node1, - Reference< browse::XBrowseNode > node2 ) -{ - ::rtl::OUString userStr = ::rtl::OUString::createFromAscii("user"); - ::rtl::OUString shareStr = ::rtl::OUString::createFromAscii("share"); - if( node1->getName().equals( userStr ) ) - return true; - if( node2->getName().equals( userStr ) ) - return false; - if( node1->getName().equals( shareStr ) ) - return true; - if( node2->getName().equals( shareStr ) ) - return false; - return dialogSort2( node1, node2 ); -} - -BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1, - Reference< browse::XBrowseNode > node2 ) -{ - return ( node1->getName().compareTo( node2->getName() ) < 0 ); -} - ::rtl::OUString ReplaceString( const ::rtl::OUString& source, const ::rtl::OUString& token, diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx index 1b6d1c37651e..55886b6b8032 100644 --- a/cui/source/dialogs/zoom.cxx +++ b/cui/source/dialogs/zoom.cxx @@ -58,13 +58,6 @@ // static ---------------------------------------------------------------- -static USHORT pRanges[] = -{ - SID_ATTR_ZOOM, - SID_ATTR_ZOOM, - 0 -}; - #define SPECIAL_FACTOR ((USHORT)0xFFFF) // class SvxZoomDialog --------------------------------------------------- @@ -124,29 +117,6 @@ void SvxZoomDialog::SetFactor( USHORT nNewFactor, USHORT nBtnId ) // ----------------------------------------------------------------------- -void SvxZoomDialog::SetButtonText( USHORT nBtnId, const String& rNewTxt ) -{ - switch ( nBtnId ) - { - case ZOOMBTN_OPTIMAL: // Optimal-Button - aOptimalBtn.SetText( rNewTxt ); - break; - - case ZOOMBTN_PAGEWIDTH: // Seitenbreite-Button - aPageWidthBtn.SetText( rNewTxt ); - break; - - case ZOOMBTN_WHOLEPAGE: // Ganze Seite-Button - aWholePageBtn.SetText( rNewTxt ); - break; - - default: - DBG_ERROR( "wrong button number" ); - } -} - -// ----------------------------------------------------------------------- - void SvxZoomDialog::HideButton( USHORT nBtnId ) { switch ( nBtnId ) @@ -181,13 +151,6 @@ void SvxZoomDialog::SetLimits( USHORT nMin, USHORT nMax ) // ----------------------------------------------------------------------- -void SvxZoomDialog::SetSpinSize( USHORT nNewSpin ) -{ - aUserEdit.SetSpinSize( nNewSpin ); -} - -// ----------------------------------------------------------------------- - SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) : SfxModalDialog( pParent, CUI_RES( RID_SVXDLG_ZOOM ) ), @@ -370,13 +333,6 @@ SvxZoomDialog::~SvxZoomDialog() // ----------------------------------------------------------------------- -USHORT* SvxZoomDialog::GetRanges() -{ - return pRanges; -} - -// ----------------------------------------------------------------------- - IMPL_LINK( SvxZoomDialog, UserHdl, RadioButton *, pBtn ) { bModified |= TRUE; diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index efe7c0763d9d..dd720bd0e4c5 100755 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -235,24 +235,6 @@ class AbstractSpellDialog_Impl : public AbstractSpellDialog virtual SfxBindings& GetBindings(); }; -//for SvxSpellCheckDialog begin -//STRIP001 class AbstractSvxSpellCheckDialog_Impl : public AbstractSvxSpellCheckDialog //add for FmShowColsDialog -//STRIP001 { -//STRIP001 SvxSpellCheckDialog * pDlg; -//STRIP001 public -//STRIP001 AbstractSvxSpellCheckDialog_Impl ( SvxSpellCheckDialog* p) -//STRIP001 : pDlg(p) -//STRIP001 {} -//STRIP001 virtual USHORT Execute() ; -//STRIP001 virtual void SetNewEditWord( const String& _rNew ) ; -//STRIP001 virtual void SetLanguage( sal_uInt16 nLang ) ; -//STRIP001 virtual void HideAutoCorrect() ; -//STRIP001 virtual String GetNewEditWord(); -//STRIP001 virtual void SetNewEditWord( const String& _rNew ); -//STRIP001 } -//for SvxSpellCheckDialog end - - //for SearchProgress begin class SearchProgress; class AbstractSearchProgress_Impl : public AbstractSearchProgress diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index 4b104c6739ff..aa8224654c65 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -184,9 +184,7 @@ private: String GetLabel4Command(const String& sCommand); void InitAccCfg(); - KeyCode MapPosToKeyCode( USHORT nPos ) const; USHORT MapKeyCodeToPos( const KeyCode &rCode ) const; - String GetFunctionName( KeyFuncType eType ) const; css::uno::Reference< css::frame::XModel > SearchForAlreadyLoadedDoc(const String& sName); void StartFileDialog( WinBits nBits, const String& rTitle ); @@ -202,10 +200,7 @@ public: virtual BOOL FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet& ); - void SelectMacro(const SfxMacroInfoItem*); void Apply(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& pAccMgr); - void CopySource2Target(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& xSourceAccMgr, - const css::uno::Reference< css::ui::XAcceleratorConfiguration >& xTargetAccMgr); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); }; @@ -223,50 +218,6 @@ public: void ExpandEntry ( USHORT nPos, const String &rStr ); }; -/* -// class USHORTArr ********************************************************** - -DECL_2BYTEARRAY(USHORTArr, USHORT, 10, 10) - -// class SfxAcceleratorConfigDialog ************************************************** - -class SfxAcceleratorConfigDialog : public ModalDialog -{ - OKButton aOKButton; - CancelButton aCancelButton; - PushButton aChangeButton; - PushButton aRemoveButton; - SfxAcceleratorConfigListBox aEntriesBox; - FixedText aDescriptionTextText; - FixedText aDescriptionInfoText; - FixedLine aKeyboardGroup; - FixedText aGroupText; - ListBox aGroupLBox; - FixedText aFunctionText; - ListBox aFunctionBox; - FixedText aKeyText; - ListBox aKeyBox; - FixedLine aFunctionsGroup; - - USHORTArr aAccelArr; - USHORTArr aFunctionArr; - USHORTArr aKeyArr; - - void OKHdl ( Button * ); - void ChangeHdl( Button * ); - void RemoveHdl( Button * ); - void SelectHdl( ListBox *pListBox ); - - KeyCode PosToKeyCode ( USHORT nPos ) const; - USHORT KeyCodeToPos ( const KeyCode &rCode ) const; - String GetFunctionName( KeyFuncType eType ) const; - -public: - - SfxAcceleratorConfigDialog( Window *pParent ); -}; -*/ - class SvxShortcutAssignDlg : public SfxSingleTabDialog { public: diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index ecf0f81dd754..683bb6ff5010 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -75,8 +75,6 @@ public: SvxConfigDialog( Window*, const SfxItemSet* ); ~SvxConfigDialog(); - void ActivateTabPage( USHORT ); - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); virtual short Ok(); @@ -258,12 +256,6 @@ private: public: - SvxConfigEntry( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& rProperties, - const ::com::sun::star::uno::Reference< - ::com::sun::star::container::XNameAccess >& rCommandToLabelMap ); - SvxConfigEntry( const ::rtl::OUString& rDisplayName, const ::rtl::OUString& rCommandURL, bool bPopup = FALSE, @@ -337,11 +329,6 @@ public: sal_Int32 GetStyle() { return nStyle; } void SetStyle( sal_Int32 style ) { nStyle = style; } - - com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > - GetProperties( - const ::com::sun::star::uno::Reference< - ::com::sun::star::container::XNameAccess >& rCommandToLabelMap ); }; class SvxMenuEntriesListBox : public SvTreeListBox @@ -694,7 +681,6 @@ public: void RestoreToolbar( SvxConfigEntry* pToolbar ); void RemoveToolbar( SvxConfigEntry* pToolbar ); void ApplyToolbar( SvxConfigEntry* pToolbar ); - void ReloadToolbar( const rtl::OUString& rURL ); rtl::OUString GetSystemUIName( const rtl::OUString& rResourceURL ); diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx index 5a5d9ee0473a..944fca908b8a 100644 --- a/cui/source/inc/cfgutil.hxx +++ b/cui/source/inc/cfgutil.hxx @@ -139,12 +139,8 @@ public: ~SfxConfigFunctionListBox_Impl(); void ClearAll(); - SvLBoxEntry* GetEntry_Impl( USHORT nId ); - SvLBoxEntry* GetEntry_Impl( const String& ); - USHORT GetId( SvLBoxEntry *pEntry ); using Window::GetHelpText; String GetHelpText( SvLBoxEntry *pEntry ); - USHORT GetCurId() { return GetId( FirstSelected() ); } String GetCurCommand(); String GetCurLabel(); SfxMacroInfo* GetMacroInfo(); @@ -173,7 +169,6 @@ class SfxConfigGroupListBox_Impl : public SvTreeListBox Image GetImage( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > node, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xCtx, bool bIsRootNode, bool bHighContrast ); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, ::rtl::OUString& docName ); - ::rtl::OUString parseLocationName( const ::rtl::OUString& location ); void InitModule(); void InitBasic(); diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index 0f09c8971e5d..315a78e70a03 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -155,7 +155,6 @@ private: void Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp ); BOOL FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp ); void ResetColor_Impl( const SfxItemSet& rSet ); - BOOL FillItemSetColor_Impl( SfxItemSet& rSet ); DECL_LINK( UpdateHdl_Impl, Timer* ); DECL_LINK( FontModifyHdl_Impl, void* ); diff --git a/cui/source/inc/cuisrchdlg.hxx b/cui/source/inc/cuisrchdlg.hxx index be4c4bc0cd7a..d1b835cd1966 100644 --- a/cui/source/inc/cuisrchdlg.hxx +++ b/cui/source/inc/cuisrchdlg.hxx @@ -67,7 +67,6 @@ public: virtual void Activate(); INT32 GetTransliterationFlags() const; - void SetTransliterationFlags( INT32 nSettings ); }; #endif diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index a2ef9da67553..b89ec4e779a0 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -95,13 +95,6 @@ namespace svx */ void openLinkDialog(const String& _sOldName,const String& _sOldLocation,SvLBoxEntry* _pEntry = NULL); - /** opens a file pciker to select a database file - @param _sLocation - If set, the file picker use it as default directory - @return - the location of the database file - */ - String getFileLocation(const String& _sLocation); #endif public: diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index 287fa206f148..6c344cec81c5 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -152,7 +152,6 @@ namespace svx void SetIgnoreAllHdl( const Link& _rHdl ); void SetChangeHdl( const Link& _rHdl ); void SetChangeAllHdl( const Link& _rHdl ); - void SetOptionsHdl( const Link& _rHdl ); void SetClickByCharacterHdl( const Link& _rHdl ); void SetConversionFormatChangedHdl( const Link& _rHdl ); @@ -174,8 +173,6 @@ namespace svx editeng::HangulHanjaConversion::ConversionFormat GetConversionFormat( ) const; void SetByCharacter( sal_Bool _bByCharacter ); - sal_Bool GetByCharacter( ) const; - void SetConversionDirectionState( sal_Bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ); // should text which does not match the primary conversion direction be ignored? diff --git a/cui/source/inc/hldocntp.hxx b/cui/source/inc/hldocntp.hxx index edfc790afc0d..9859fc9c0f80 100644 --- a/cui/source/inc/hldocntp.hxx +++ b/cui/source/inc/hldocntp.hxx @@ -53,8 +53,6 @@ private: DECL_LINK (ClickNewHdl_Impl , void * ); // Button : New Image GetImage( USHORT nId ); - void ReadURLFile( const String& rFile, String& rTitle, String& rURL, sal_Int32& rIconId, BOOL* pShowAsFolder);//, String* pFrame, String* pOpenAs, String* pDefTempl, String* pDefURL ); - //String ReadURL_Impl( Config& rURLFile, const DirEntry& rFile ); protected: void FillDlgFields ( String& aStrURL ); diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index f4646daf376e..35f010583fb9 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -116,8 +116,6 @@ protected : USHORT GetSlot( USHORT nWhich ) const { return pSet->GetPool()->GetSlotId( nWhich ); } USHORT GetWhich( USHORT nSlot ) const { return pSet->GetPool()->GetWhich( nSlot ); } - const SfxPoolItem* GetOldItem( const SfxItemSet& rSet, USHORT nSlot ); - const SfxPoolItem* GetExchangeItem( const SfxItemSet& rSet, USHORT nSlot ); public : virtual ~IconChoicePage(); @@ -148,8 +146,6 @@ public : virtual BOOL IsReadOnly() const; virtual sal_Bool QueryClose(); - static const SfxPoolItem* GetItem( const SfxItemSet& rSet, USHORT nSlot ); - void StateChanged( StateChangedType nType ); void DataChanged( const DataChangedEvent& rDCEvt ); }; @@ -221,7 +217,6 @@ protected : void ResetPageImpl (); short Ok(); - BOOL IsInOK() const; public : @@ -241,18 +236,11 @@ public : // Schnittstelle // - SvxIconChoiceCtrlEntry* AddTabPage( - USHORT nId, const String& rIconText, const Image& rChoiceIcon, - CreatePage pCreateFunc /* != NULL */, GetPageRanges pRangesFunc = NULL /* NULL allowed*/, - BOOL bItemsOnDemand = FALSE, ULONG nPos = LIST_APPEND ); - SvxIconChoiceCtrlEntry* AddTabPage( USHORT nId, const String& rIconText, const Image& rChoiceIcon, const Image& rChoiceIconHC, CreatePage pCreateFunc /* != NULL */, GetPageRanges pRangesFunc = NULL /* NULL allowed*/, BOOL bItemsOnDemand = FALSE, ULONG nPos = LIST_APPEND ); - void RemoveTabPage( USHORT nId ); - void SetCurPageId( USHORT nId ) { mnCurrentPageId = nId; FocusOnIcon( nId ); } USHORT GetCurPageId() const { return mnCurrentPageId; } void ShowPage( USHORT nId ); @@ -261,8 +249,6 @@ public : const USHORT* GetInputRanges( const SfxItemPool& ); void SetInputSet( const SfxItemSet* pInSet ); const SfxItemSet* GetOutputItemSet() const { return pOutSet; } - const SfxItemSet* GetOutputItemSet( USHORT nId ); - int FillOutputItemSet(); const OKButton& GetOKButton() const { return aOKBtn; } OKButton& GetOKButton() { return aOKBtn; } @@ -271,18 +257,13 @@ public : const HelpButton& GetHelpButton() const { return aHelpBtn; } HelpButton& GetHelpButton() { return aHelpBtn; } - void RemoveResetButton(); - short Execute(); void Start( BOOL bShow = TRUE ); sal_Bool QueryClose(); const SfxItemSet* GetExampleSet() const { return pExampleSet; } - void SetCtrlColor ( const Color& rColor ); EIconChoicePos SetCtrlPos ( const EIconChoicePos& rPos ); - - void CreateIconTextAutoMnemonics( void ); }; #endif //_ICCDLG_HXX diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx index 299e784ae191..a93b93498d37 100644 --- a/cui/source/inc/insdlg.hxx +++ b/cui/source/inc/insdlg.hxx @@ -89,8 +89,6 @@ class SvInsertOleDlg : public InsertObjectDialog_Impl BOOL IsCreateNew() const { return aRbNewObject.IsChecked(); } public: - static void FillObjectServerList( SvObjectServerList* ); - SvInsertOleDlg( Window* pParent, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage, const SvObjectServerList* pServers = NULL ); diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx old mode 100644 new mode 100755 index d6a2b607eac3..45cf2fdbf79e --- a/cui/source/inc/macroass.hxx +++ b/cui/source/inc/macroass.hxx @@ -60,7 +60,6 @@ class _SfxMacroTabPage : public SfxTabPage DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton * ); DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, ChangeScriptHdl_Impl, RadioButton * ); - DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, GetFocus_Impl, Edit* ); DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, TimeOut_Impl, Timer* ); protected: @@ -86,19 +85,11 @@ public: virtual void ScriptChanged( const String& rLanguage ); virtual void PageCreated (SfxAllItemSet aSet); - // zum setzen / abfragen der Links - void SetGetRangeLink( FNGetRangeHdl pFn ); - FNGetRangeHdl GetGetRangeLink() const; - void SetGetMacrosOfRangeLink( FNGetMacrosOfRangeHdl pFn ); - FNGetMacrosOfRangeHdl GetGetMacrosOfRangeLink() const; - // --------- Erben aus der Basis ------------- virtual BOOL FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); - void SetReadOnly( BOOL bSet ); BOOL IsReadOnly() const; - void SelectEvent( const String& rEventName, USHORT nEventId ); }; inline const SvxMacroTableDtor& _SfxMacroTabPage::GetMacroTbl() const diff --git a/cui/source/inc/optimprove.hxx b/cui/source/inc/optimprove.hxx index e7259f2a682c..266c51944b09 100644 --- a/cui/source/inc/optimprove.hxx +++ b/cui/source/inc/optimprove.hxx @@ -36,14 +36,6 @@ #include #include -// class SvxEmptyPage ---------------------------------------------------- - -class SvxEmptyPage : public TabPage -{ -public: - SvxEmptyPage( Window* pParent ); -}; - // class SvxImprovementPage ---------------------------------------------- class SvxImprovementPage : public TabPage @@ -105,7 +97,6 @@ public: virtual ~SvxImprovementOptionsPage(); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - static sal_uInt16* GetRanges(); virtual sal_Bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); @@ -123,16 +114,5 @@ public: SvxImprovementDialog( Window* pParent, const String& rInfoURL ); }; -class SvxInfoWindow : public Window -{ -private: - FixedText m_aInfoText; - -public: - SvxInfoWindow( Window* pParent, const ResId& rResId ); - - void SetInfoText( const String& rText ); -}; - #endif diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index 82752a7af01a..64a926f5ef89 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -135,7 +135,6 @@ public: void SetPageWidth( USHORT nPageWidth ); - void SetMaxDistance( USHORT nMaxDist ); void EnableRelativeMode(); void EnableRegisterMode(); void EnableAutoFirstLine(); diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index 0b8930c57827..8ecdd93a5d2e 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -97,13 +97,7 @@ protected: void ExpandTree( SvLBoxEntry* pRootEntry ); virtual void RequestingChilds( SvLBoxEntry* pParent ); virtual void ExpandedHdl(); - SvLBoxEntry* FindEntry( SvLBoxEntry* pParent, const String& rText, BYTE nType ); virtual long ExpandingHdl(); - static BOOL dialogSort1( com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node1, - com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node2 ); - static BOOL dialogSort2( com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node1, - com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node2 ); - public: void Init( const ::rtl::OUString& language ); void RequestSubEntries( SvLBoxEntry* pRootEntry, ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node, @@ -111,8 +105,6 @@ public: SFTreeListBox( Window* pParent, const ResId& rRes ); ~SFTreeListBox(); - void UpdateEntries(); - void ExpandAllTrees(); @@ -202,15 +194,12 @@ protected: BOOL getBoolProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xProps, ::rtl::OUString& propName ); void CheckButtons( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node ); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, ::rtl::OUString& docName ); - void createEntry( SvLBoxEntry* pEntry ); void renameEntry( SvLBoxEntry* pEntry ); void deleteEntry( SvLBoxEntry* pEntry ); ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > getBrowseNode( SvLBoxEntry* pEntry ); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getModel( SvLBoxEntry* pEntry ); - void EnableButton( Button& rButton, BOOL bEnable ); String getListOfChildren( ::com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node, int depth ); void StoreCurrentSelection(); void RestorePreviousSelection(); diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx index 104cc928071e..3c01b955a474 100644 --- a/cui/source/inc/selector.hxx +++ b/cui/source/inc/selector.hxx @@ -115,13 +115,8 @@ public: SvxConfigFunctionListBox_Impl( Window*, const ResId& ); ~SvxConfigFunctionListBox_Impl(); void ClearAll(); - SvLBoxEntry* GetEntry_Impl( USHORT nId ); - SvLBoxEntry* GetEntry_Impl( const String& ); - USHORT GetId( SvLBoxEntry *pEntry ); String GetHelpText( SvLBoxEntry *pEntry ); using Window::GetHelpText; - USHORT GetCurId() - { return GetId( FirstSelected() ); } SvLBoxEntry* GetLastSelectedEntry(); void FunctionSelected(); @@ -235,7 +230,6 @@ public: void SetImageProvider( ImageProvider* provider ) { aCategories.SetImageProvider( provider ); } - USHORT GetSelectedId(); String GetScriptURL() const; String GetSelectedDisplayName(); String GetSelectedHelpText(); diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index 72fb9d4d61f6..72859aa70945 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -335,12 +335,6 @@ private: sal_Bool DispatchAction( const rtl::OUString& rAction ); public: - ExtensionsTabPage( - Window* pParent, const ResId&, - const rtl::OUString& rPageURL, const rtl::OUString& rEvtHdl, - const com::sun::star::uno::Reference< - com::sun::star::awt::XContainerWindowProvider >& rProvider ); - ExtensionsTabPage( Window* pParent, WinBits nStyle, const rtl::OUString& rPageURL, const rtl::OUString& rEvtHdl, @@ -354,6 +348,5 @@ public: void ResetPage(); void SavePage(); - void HideWindow(); }; diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx index 5b494a0448b3..9a8c9b03da1c 100644 --- a/cui/source/inc/zoom.hxx +++ b/cui/source/inc/zoom.hxx @@ -99,16 +99,13 @@ public: SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ); ~SvxZoomDialog(); - static USHORT* GetRanges(); const SfxItemSet* GetOutputItemSet() const { return pOutSet; } USHORT GetFactor() const; void SetFactor( USHORT nNewFactor, USHORT nBtnId = 0 ); - void SetButtonText( USHORT nBtnId, const String& aNewTxt ); void HideButton( USHORT nBtnId ); void SetLimits( USHORT nMin, USHORT nMax ); - void SetSpinSize( USHORT nNewSpin ); }; #include 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 @@ -38,13 +38,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) 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 @@ -424,60 +424,6 @@ void DbRegistrationOptionsPage::insertNewEntry( const ::rtl::OUString& _sName,co pEntry->SetUserData( new DatabaseRegistration( _sLocation, _bReadOnly ) ); } -// ----------------------------------------------------------------------------- -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) { 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 aNames(1); - aNames.getArray()[0] = aPropertyName; - Sequence 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 aNames(1); - aNames.getArray()[0] = aPropertyName; - Sequence 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 @@ -68,26 +68,6 @@ struct GeneralTabPage_Impl mbUsZipEnabled ( FALSE ) {} }; -// ----------------------------------------------------------------------- - -// 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 ) : 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 --- 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 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 880f8d263c6b..cafb71c0d8b5 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -2708,22 +2708,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 ) : @@ -2862,15 +2846,3 @@ void ExtensionsTabPage::SavePage() { DispatchAction( C2U("ok") ); } - -// ----------------------------------------------------------------------- - -void ExtensionsTabPage::HideWindow() -{ - if ( !m_bIsWindowHidden && m_xPage.is() ) - { - m_xPage->setVisible( sal_False ); - m_bIsWindowHidden = true; - } -} - diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 2d554e3dca7b..0c1c1c7b269c 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -154,17 +154,6 @@ Color TpBorderRGBColor( ColorData aColorData ) return( aRGBColor ); } -// ----------------------------------------------------------------------- - -Color TpBorderRGBColor( const Color& rColor ) -{ - Color aRGBColor( rColor.GetRed(), - rColor.GetGreen(), - rColor.GetBlue() ); - - return( aRGBColor ); -} - // ----------------------------------------------------------------------- void lcl_SetDecimalDigitsTo1(MetricField& rField) { diff --git a/cui/source/tabpages/borderconn.cxx b/cui/source/tabpages/borderconn.cxx index 565ce58725ab..0e9039b0d5b1 100644 --- a/cui/source/tabpages/borderconn.cxx +++ b/cui/source/tabpages/borderconn.cxx @@ -283,13 +283,6 @@ sfx::ItemConnectionBase* CreateFrameLineConnection( USHORT nSlot, return new FrameLineConnection( nSlot, new FrameSelectorWrapper( rFrameSel, eBorder ), nFlags ); } -sfx::ItemConnectionBase* CreateFrameBoxConnection( USHORT /*nBoxSlot*/, USHORT /*nBoxInfoSlot*/, - FrameSelector& /*rFrameSel*/, FrameBorderType /*eBorder*/, sfx::ItemConnFlags /*nFlags*/ ) -{ - DBG_ERRORFILE( "svx::CreateFrameBoxConnection - not implemented" ); - return 0; -} - sfx::ItemConnectionBase* CreateMarginConnection( const SfxItemSet& rItemSet, MetricField& rMfLeft, MetricField& rMfRight, MetricField& rMfTop, MetricField& rMfBottom, diff --git a/cui/source/tabpages/borderconn.hxx b/cui/source/tabpages/borderconn.hxx index a3d253af8c77..873a56e4fd3b 100644 --- a/cui/source/tabpages/borderconn.hxx +++ b/cui/source/tabpages/borderconn.hxx @@ -48,13 +48,6 @@ sfx::ItemConnectionBase* CreateFrameLineConnection( USHORT nSlot, FrameSelector& rFrameSel, FrameBorderType eBorder, sfx::ItemConnFlags nFlags = sfx::ITEMCONN_DEFAULT ); -/** Creates an item connection object that connects an SvxBoxItem and an - SvxBoxInfoItem with an svx::FrameSelector control. */ -sfx::ItemConnectionBase* CreateFrameBoxConnection( - USHORT nBoxSlot, USHORT nBoxInfoSlot, - FrameSelector& rFrameSel, FrameBorderType eBorder, - sfx::ItemConnFlags nFlags = sfx::ITEMCONN_DEFAULT ); - /** Creates an item connection object that connects an SvxMarginItem with the controls of the SvxBorderTabPage. */ sfx::ItemConnectionBase* CreateMarginConnection( const SfxItemSet& rItemSet, diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 1f166b8f8d41..560074c4e80f 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -1523,47 +1523,6 @@ void SvxCharNamePage::ResetColor_Impl( const SfxItemSet& rSet ) // ----------------------------------------------------------------------- -BOOL SvxCharNamePage::FillItemSetColor_Impl( SfxItemSet& rSet ) -{ - USHORT nWhich = GetWhich( SID_ATTR_CHAR_COLOR ); - const SvxColorItem* pOld = (const SvxColorItem*)GetOldItem( rSet, SID_ATTR_CHAR_COLOR ); - const SvxColorItem* pItem = NULL; - BOOL bChanged = TRUE; - const SfxItemSet* pExampleSet = GetTabDialog() ? GetTabDialog()->GetExampleSet() : NULL; - const SfxItemSet& rOldSet = GetItemSet(); - - Color aSelectedColor; - if ( m_pColorLB->GetSelectEntry() == m_pImpl->m_aTransparentText ) - aSelectedColor = Color( COL_TRANSPARENT ); - else - aSelectedColor = m_pColorLB->GetSelectEntryColor(); - - if ( pOld && pOld->GetValue() == aSelectedColor ) - bChanged = FALSE; - - if ( !bChanged ) - bChanged = ( m_pColorLB->GetSavedValue() == LISTBOX_ENTRY_NOTFOUND ); - - if ( !bChanged && pExampleSet && - pExampleSet->GetItemState( nWhich, FALSE, (const SfxPoolItem**)&pItem ) == SFX_ITEM_SET && - ( (SvxColorItem*)pItem )->GetValue() != aSelectedColor ) - bChanged = TRUE; - - BOOL bModified = FALSE; - - if ( bChanged && m_pColorLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ) - { - rSet.Put( SvxColorItem( aSelectedColor, nWhich ) ); - bModified = TRUE; - } - else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, FALSE ) ) - CLEARTITEM; - - return bModified; -} - -// ----------------------------------------------------------------------- - IMPL_LINK( SvxCharNamePage, UpdateHdl_Impl, Timer*, EMPTYARG ) { UpdatePreview_Impl(); @@ -1656,7 +1615,6 @@ BOOL SvxCharNamePage::FillItemSet( SfxItemSet& rSet ) BOOL bModified = FillItemSet_Impl( rSet, Western ); bModified |= FillItemSet_Impl( rSet, Asian ); bModified |= FillItemSet_Impl( rSet, Ctl ); -//! bModified |= FillItemSetColor_Impl( rSet ); return bModified; } diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 5cfeb0f4c8be..c18ebf6f2a68 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -237,26 +237,6 @@ void _SfxMacroTabPage::ScriptChanged( const String& aLangName ) EnableButtons( aLangName ); } -void _SfxMacroTabPage::SetGetRangeLink( FNGetRangeHdl pFn ) -{ - mpImpl->fnGetRange = pFn; -} - -FNGetRangeHdl _SfxMacroTabPage::GetGetRangeLink() const -{ - return mpImpl->fnGetRange; -} - -void _SfxMacroTabPage::SetGetMacrosOfRangeLink( FNGetMacrosOfRangeHdl pFn ) -{ - mpImpl->fnGetMacroOfRange = pFn; -} - -FNGetMacrosOfRangeHdl _SfxMacroTabPage::GetGetMacrosOfRangeLink() const -{ - return mpImpl->fnGetMacroOfRange; -} - BOOL _SfxMacroTabPage::FillItemSet( SfxItemSet& rSet ) { SvxMacroItem aItem( GetWhich( aPageRg[0] ) ); @@ -313,11 +293,6 @@ void _SfxMacroTabPage::Reset( const SfxItemSet& rSet ) rListBox.SetCurEntry( pE ); } -void _SfxMacroTabPage::SetReadOnly( BOOL bSet ) -{ - mpImpl->bReadOnly = bSet; -} - BOOL _SfxMacroTabPage::IsReadOnly() const { return mpImpl->bReadOnly; @@ -392,12 +367,6 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, SelectMacro_Impl, ListBox*, EMPTYARG ) return 0; } -IMPL_STATIC_LINK( _SfxMacroTabPage, GetFocus_Impl, Edit*, EMPTYARG ) -{ - pThis->EnableButtons( DEFINE_CONST_UNICODE("JavaScript") ); - return 0; -} - IMPL_STATIC_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn ) { _SfxMacroTabPage_Impl* pImpl = pThis->mpImpl; @@ -580,24 +549,6 @@ void _SfxMacroTabPage::FillEvents() } } -void _SfxMacroTabPage::SelectEvent( const String & /*rEventName*/, USHORT nEventId ) -{ - SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox(); - ULONG nEntryCnt = rListBox.GetEntryCount(); - - for( ULONG n = 0 ; n < nEntryCnt ; ++n ) - { - SvLBoxEntry* pE = rListBox.GetEntry( n ); - if( pE && ( USHORT ) ( ULONG ) pE->GetUserData() == nEventId ) - { - rListBox.SetCurEntry( pE ); - rListBox.MakeVisible( pE ); - break; - } - } -} - - SvStringsDtor* __EXPORT _ImpGetRangeHdl( _SfxMacroTabPage* /*pTbPg*/, const String& rLanguage ) { SvStringsDtor* pNew = new SvStringsDtor; diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 9bf88e151770..ff1abbce42ed 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -939,28 +939,6 @@ void SvxNumPickTabPage::PageCreated(SfxAllItemSet aSet) SetCharFmtNames( pNumCharFmt->GetValue(),pBulletCharFmt->GetValue()); } //end of CHINA001 -/*-----------------07.02.97 15.59------------------- - ---------------------------------------------------*/ -void lcl_PaintLevel(OutputDevice* pVDev, sal_Int16 nNumberingType, - const OUString& rBulletChar, const OUString& rText, const OUString& rFontName, - Point& rLeft, Font& rRuleFont, const Font& rTextFont) -{ - - if(NumberingType::CHAR_SPECIAL == nNumberingType ) - { - rRuleFont.SetStyleName(rFontName); - pVDev->SetFont(rRuleFont); - pVDev->DrawText(rLeft, rBulletChar); - rLeft.X() += pVDev->GetTextWidth(rBulletChar); - } - else - { - pVDev->SetFont(rTextFont); - pVDev->DrawText(rLeft, rText); - rLeft.X() += pVDev->GetTextWidth(rText); - } -} /**************************************************************************/ /* */ diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 26eccfc0bb3e..0359ef595a87 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -957,13 +957,6 @@ void SvxStdParagraphTabPage::SetPageWidth( USHORT nPageWidth ) { nWidth = nPageWidth; } -/*-----------------16.01.97 18.01------------------- - ---------------------------------------------------*/ -void SvxStdParagraphTabPage::SetMaxDistance( USHORT nMaxDist ) -{ - nAbst = nMaxDist; -} /*-----------------17.01.97 08.11------------------- -- cgit v1.2.3