diff options
Diffstat (limited to 'cui')
71 files changed, 1036 insertions, 1036 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 4199a7580ada..b25ec7b1fdb9 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//----------------------------------------------- + // include own files #include "acccfg.hxx" @@ -39,7 +39,7 @@ #include <svx/svxids.hrc> -//----------------------------------------------- + // include interface declarations #include <com/sun/star/awt/KeyModifier.hpp> #include <com/sun/star/embed/StorageFactory.hpp> @@ -60,7 +60,7 @@ #include <com/sun/star/ui/XUIConfigurationManager.hpp> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> -//----------------------------------------------- + // include other projects #include <comphelper/processfactory.hxx> #include <svtools/acceleratorexecute.hxx> @@ -70,13 +70,13 @@ #include <rtl/ustrbuf.hxx> #include <comphelper/sequenceashashmap.hxx> -//----------------------------------------------- + // namespaces using namespace com::sun::star; -//----------------------------------------------- + static OUString MODULEPROP_SHORTNAME ("ooSetupFactoryShortName" ); static OUString MODULEPROP_UINAME ("ooSetupFactoryUIName" ); @@ -87,7 +87,7 @@ static OUString FOLDERNAME_UICONFIG ("Configurations2" static OUString MEDIATYPE_PROPNAME ("MediaType" ); static OUString MEDIATYPE_UICONFIG ("application/vnd.sun.xml.ui.configuration"); -//----------------------------------------------- + static const sal_uInt16 KEYCODE_ARRAY[] = { KEY_F1 , @@ -602,7 +602,7 @@ static const sal_uInt16 KEYCODE_ARRAY[] = static const sal_uInt16 KEYCODE_ARRAY_SIZE = SAL_N_ELEMENTS(KEYCODE_ARRAY); -//----------------------------------------------- + // seems to be needed to layout the list box, which shows all // assignable shortcuts static long AccCfgTabs[] = @@ -612,7 +612,7 @@ static long AccCfgTabs[] = 120 // Function }; -//----------------------------------------------- + class SfxAccCfgLBoxString_Impl : public SvLBoxString { public: @@ -626,7 +626,7 @@ class SfxAccCfgLBoxString_Impl : public SvLBoxString const Point& aPos, SvTreeListBox& rDevice, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry); }; -//----------------------------------------------- + SfxAccCfgLBoxString_Impl::SfxAccCfgLBoxString_Impl( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString& sText ) @@ -634,7 +634,7 @@ SfxAccCfgLBoxString_Impl::SfxAccCfgLBoxString_Impl( SvTreeListEntry* pEntry { } -//----------------------------------------------- + SfxAccCfgLBoxString_Impl::~SfxAccCfgLBoxString_Impl() { } @@ -656,7 +656,7 @@ void SfxAccCfgLBoxString_Impl::Paint( } -//----------------------------------------------- + void SfxAccCfgTabListBox_Impl::InitEntry(SvTreeListEntry* pEntry, const OUString& rText, const Image& rImage1, @@ -666,7 +666,7 @@ void SfxAccCfgTabListBox_Impl::InitEntry(SvTreeListEntry* pEntry, SvTabListBox::InitEntry(pEntry, rText, rImage1, rImage2, eButtonKind); } -//----------------------------------------------- + /** select the entry, which match the current key input ... excepting keys, which are used for the dialog itself. */ @@ -712,7 +712,7 @@ void SfxAccCfgTabListBox_Impl::KeyInput(const KeyEvent& aKey) SvTabListBox::KeyInput(aKey); } -//----------------------------------------------- + SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( Window* pParent, const SfxItemSet& aSet ) : SfxTabPage (pParent, CUI_RES(RID_SVXPAGE_KEYBOARD), aSet) , m_pMacroInfoItem () @@ -788,7 +788,7 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( Window* pParent, const SfxIt aKeyBox.SetStyle(aKeyBox.GetStyle()|WB_CLIPCHILDREN|WB_HSCROLL|WB_SORT); } -//----------------------------------------------- + SfxAcceleratorConfigPage::~SfxAcceleratorConfigPage() { // free memory - remove all dynamic user data @@ -818,7 +818,7 @@ SfxAcceleratorConfigPage::~SfxAcceleratorConfigPage() delete pFunctionBox; } -//----------------------------------------------- + void SfxAcceleratorConfigPage::InitAccCfg() { // already initialized ? @@ -864,7 +864,7 @@ void SfxAcceleratorConfigPage::InitAccCfg() { m_xContext.clear(); } } -//----------------------------------------------- + /** Initialize text columns with own class to enable custom painting This is needed as we have to paint disabled entries by ourself. No support for that in the original SvTabListBox! @@ -880,7 +880,7 @@ void SfxAcceleratorConfigPage::CreateCustomItems( SvTreeListEntry* pEntry, pEntry->ReplaceItem(pStringItem, 2); } -//----------------------------------------------- + void SfxAcceleratorConfigPage::Init(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& xAccMgr) { if (!xAccMgr.is()) @@ -965,7 +965,7 @@ void SfxAcceleratorConfigPage::Init(const css::uno::Reference< css::ui::XAcceler } } -//----------------------------------------------- + void SfxAcceleratorConfigPage::Apply(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& xAccMgr) { if (!xAccMgr.is()) @@ -1003,13 +1003,13 @@ void SfxAcceleratorConfigPage::Apply(const css::uno::Reference< css::ui::XAccele } } -//----------------------------------------------- + void SfxAcceleratorConfigPage::ResetConfig() { aEntriesBox.Clear(); } -//----------------------------------------------- + IMPL_LINK_NOARG(SfxAcceleratorConfigPage, Load) { // ask for filename, where we should load the new config data from @@ -1017,14 +1017,14 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, Load) return 0; } -//----------------------------------------------- + IMPL_LINK_NOARG(SfxAcceleratorConfigPage, Save) { StartFileDialog( WB_SAVEAS, aSaveAccelConfigStr ); return 0; } -//----------------------------------------------- + IMPL_LINK_NOARG(SfxAcceleratorConfigPage, Default) { css::uno::Reference< css::form::XReset > xReset(m_xAct, css::uno::UNO_QUERY); @@ -1041,7 +1041,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, Default) return 0; } -//----------------------------------------------- + IMPL_LINK_NOARG(SfxAcceleratorConfigPage, ChangeHdl) { sal_uInt16 nPos = (sal_uInt16) aEntriesBox.GetModel()->GetRelPos( aEntriesBox.FirstSelected() ); @@ -1059,7 +1059,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, ChangeHdl) return 0; } -//----------------------------------------------- + IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RemoveHdl) { // get selected entry @@ -1075,7 +1075,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RemoveHdl) return 0; } -//----------------------------------------------- + IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox ) { // disable help @@ -1164,7 +1164,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox ) return 0; } -//----------------------------------------------- + IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RadioHdl) { css::uno::Reference< css::ui::XAcceleratorConfiguration > xOld = m_xAct; @@ -1198,7 +1198,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RadioHdl) return 1L; } -//----------------------------------------------- + IMPL_LINK_NOARG(SfxAcceleratorConfigPage, LoadHdl) { assert(m_pFileDlg); @@ -1282,7 +1282,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, LoadHdl) return 0; } -//----------------------------------------------- + IMPL_LINK_NOARG(SfxAcceleratorConfigPage, SaveHdl) { assert(m_pFileDlg); @@ -1383,7 +1383,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, SaveHdl) return 0; } -//----------------------------------------------- + void SfxAcceleratorConfigPage::StartFileDialog( WinBits nBits, const OUString& rTitle ) { bool bSave = ( ( nBits & WB_SAVEAS ) == WB_SAVEAS ); @@ -1403,7 +1403,7 @@ void SfxAcceleratorConfigPage::StartFileDialog( WinBits nBits, const OUString& r m_pFileDlg->StartExecuteModal( aDlgClosedLink ); } -//----------------------------------------------- + sal_Bool SfxAcceleratorConfigPage::FillItemSet( SfxItemSet& ) { Apply(m_xAct); @@ -1419,7 +1419,7 @@ sal_Bool SfxAcceleratorConfigPage::FillItemSet( SfxItemSet& ) return sal_True; } -//----------------------------------------------- + void SfxAcceleratorConfigPage::Reset( const SfxItemSet& rSet ) { // open accelerator configs @@ -1461,7 +1461,7 @@ void SfxAcceleratorConfigPage::Reset( const SfxItemSet& rSet ) } } -//----------------------------------------------- + sal_uInt16 SfxAcceleratorConfigPage::MapKeyCodeToPos(const KeyCode& aKey) const { sal_uInt16 nCode1 = aKey.GetCode()+aKey.GetModifier(); @@ -1484,7 +1484,7 @@ sal_uInt16 SfxAcceleratorConfigPage::MapKeyCodeToPos(const KeyCode& aKey) const return LISTBOX_ENTRY_NOTFOUND; } -//----------------------------------------------- + OUString SfxAcceleratorConfigPage::GetLabel4Command(const OUString& sCommand) { try @@ -1522,7 +1522,7 @@ SfxTabPage* SfxAcceleratorConfigPage::Create( Window* pParent, const SfxItemSet& return new SfxAcceleratorConfigPage( pParent, rAttrSet ); } -//----------------------------------------------- + css::uno::Reference< css::frame::XModel > SfxAcceleratorConfigPage::SearchForAlreadyLoadedDoc(const OUString& /*sName*/) { return css::uno::Reference< css::frame::XModel >(); diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index dd768be7da09..d42203fd5af7 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -1525,7 +1525,7 @@ SvxDescriptionEdit::SvxDescriptionEdit( Window* pParent, const ResId& _rId ) : SetBorderStyle( WINDOW_BORDER_MONO ); } -// ----------------------------------------------------------------------- + void SvxDescriptionEdit::SetNewText( const OUString& _rText ) { @@ -4663,7 +4663,7 @@ SvTreeListEntry* SvxToolbarConfigPage::AddFunction( return pNewLBEntry; } -// ----------------------------------------------------------------------- + SvxToolbarEntriesListBox::SvxToolbarEntriesListBox( Window* pParent, const ResId& aResId ) @@ -4676,14 +4676,14 @@ SvxToolbarEntriesListBox::SvxToolbarEntriesListBox( EnableCheckButton( m_pButtonData ); } -// -------------------------------------------------------- + SvxToolbarEntriesListBox::~SvxToolbarEntriesListBox() { delete m_pButtonData; } -// -------------------------------------------------------- + void SvxToolbarEntriesListBox::BuildCheckBoxButtonImages( SvLBoxButtonData* pData ) { @@ -4753,7 +4753,7 @@ void SvxToolbarEntriesListBox::DataChanged( const DataChangedEvent& rDCEvt ) } } -// -------------------------------------------------------- + void SvxToolbarEntriesListBox::ChangeVisibility( SvTreeListEntry* pEntry ) { diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index a6e468e532f3..1f52c537d8bb 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -481,7 +481,7 @@ void SfxConfigGroupListBox::SetStylesInfo(SfxStylesInfo_Impl* pStyles) pStylesInfo = pStyles; } -//----------------------------------------------- + void SfxConfigGroupListBox::InitModule() { try @@ -517,17 +517,17 @@ void SfxConfigGroupListBox::InitModule() {} } -//----------------------------------------------- + void SfxConfigGroupListBox::InitBasic() { } -//----------------------------------------------- + void SfxConfigGroupListBox::InitStyles() { } -//----------------------------------------------- + namespace { //........................................... @@ -580,7 +580,7 @@ namespace } } -//----------------------------------------------- + void SfxConfigGroupListBox::Init(const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::frame::XFrame >& xFrame, const OUString& sModuleLongName, @@ -845,7 +845,7 @@ SfxConfigGroupListBox::getDocumentModel( Reference< XComponentContext >& xCtx, O return xModel; } -//----------------------------------------------- + OUString SfxConfigGroupListBox::MapCommand2UIName(const OUString& sCommand) { OUString sUIName; @@ -873,7 +873,7 @@ OUString SfxConfigGroupListBox::MapCommand2UIName(const OUString& sCommand) return sUIName; } -//----------------------------------------------- + void SfxConfigGroupListBox::GroupSelected() /* Description A function group or a basic module has been selected. diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx index 397a493bfe1e..ea10378a8594 100644 --- a/cui/source/customize/eventdlg.cxx +++ b/cui/source/customize/eventdlg.cxx @@ -53,7 +53,7 @@ using namespace ::com::sun::star; -// ----------------------------------------------------------------------- + SvxEventConfigPage::SvxEventConfigPage( Window *pParent, const SfxItemSet& rSet, SvxEventConfigPage::EarlyInit ) : @@ -94,7 +94,7 @@ SvxEventConfigPage::SvxEventConfigPage( Window *pParent, const SfxItemSet& rSet, aSaveInListBox.SelectEntryPos( nPos, true ); } -// ----------------------------------------------------------------------- + void SvxEventConfigPage::LateInit( const uno::Reference< frame::XFrame >& _rxFrame ) { SetFrame( _rxFrame ); @@ -105,7 +105,7 @@ void SvxEventConfigPage::LateInit( const uno::Reference< frame::XFrame >& _rxFra SelectHdl_Impl( NULL ); } -// ----------------------------------------------------------------------- + SvxEventConfigPage::~SvxEventConfigPage() { @@ -126,7 +126,7 @@ SvxEventConfigPage::~SvxEventConfigPage() delete mpImpl->pDeletePB; } -// ----------------------------------------------------------------------- + void SvxEventConfigPage::ImplInitDocument() { @@ -174,7 +174,7 @@ void SvxEventConfigPage::ImplInitDocument() } } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxEventConfigPage, SelectHdl_Impl, ListBox *, pBox ) { @@ -221,7 +221,7 @@ IMPL_LINK( SvxEventConfigPage, SelectHdl_Impl, ListBox *, pBox ) return sal_True; } -// ----------------------------------------------------------------------- + sal_Bool SvxEventConfigPage::FillItemSet( SfxItemSet& rSet ) { diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index e3fcb2b1ca64..e4536547cc15 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -253,7 +253,7 @@ _SvxMacroTabPage::~_SvxMacroTabPage() { DELETEZ( mpImpl ); } -// ----------------------------------------------------------------------------- + void _SvxMacroTabPage::InitResources() { // Note: the order here controls the order in which the events are displayed in the UI! @@ -907,7 +907,7 @@ AssignComponentDialog::~AssignComponentDialog() { } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxMacroAssignSingleTabDialog, OKHdl_Impl, Button *, pButton ) { @@ -917,7 +917,7 @@ IMPL_LINK( SvxMacroAssignSingleTabDialog, OKHdl_Impl, Button *, pButton ) return 0; } -// ----------------------------------------------------------------------- + SvxMacroAssignSingleTabDialog::SvxMacroAssignSingleTabDialog(Window *pParent, const SfxItemSet& rSet) diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index 46565fc5f6a7..18f0c0559644 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -236,7 +236,7 @@ void SvxConfigGroupListBox::ClearAll() Clear(); } -//----------------------------------------------- + namespace { //........................................... diff --git a/cui/source/dialogs/SpellAttrib.cxx b/cui/source/dialogs/SpellAttrib.cxx index 5a6894126cce..be09cce60c51 100644 --- a/cui/source/dialogs/SpellAttrib.cxx +++ b/cui/source/dialogs/SpellAttrib.cxx @@ -26,7 +26,7 @@ using namespace com::sun::star::linguistic2; using namespace com::sun::star::uno; -//----------------------------------------------------------------------- + SpellErrorAttrib::SpellErrorAttrib( const SpellErrorDescription& rDesc ) : TextAttrib(TEXTATTR_SPELL_ERROR), m_aSpellErrorDescription( rDesc ) @@ -34,107 +34,107 @@ SpellErrorAttrib::SpellErrorAttrib( const SpellErrorDescription& rDesc ) : } -//----------------------------------------------------------------------- + SpellErrorAttrib::SpellErrorAttrib( const SpellErrorAttrib& rAttr ) : TextAttrib(TEXTATTR_SPELL_ERROR), m_aSpellErrorDescription( rAttr.m_aSpellErrorDescription ) { } -//----------------------------------------------------------------------- + SpellErrorAttrib::~SpellErrorAttrib() { } -//----------------------------------------------------------------------- + void SpellErrorAttrib::SetFont( Font& ) const { //this attribute doesn't have a visual effect } -//----------------------------------------------------------------------- + TextAttrib* SpellErrorAttrib::Clone() const { return new SpellErrorAttrib(*this); } -//----------------------------------------------------------------------- + bool SpellErrorAttrib::operator==( const TextAttrib& rAttr ) const { return Which() == rAttr.Which() && m_aSpellErrorDescription == static_cast<const SpellErrorAttrib&>(rAttr).m_aSpellErrorDescription; } -//----------------------------------------------------------------------- + SpellLanguageAttrib::SpellLanguageAttrib(LanguageType eLang) : TextAttrib(TEXTATTR_SPELL_LANGUAGE), m_eLanguage(eLang) { } -//----------------------------------------------------------------------- + SpellLanguageAttrib::SpellLanguageAttrib( const SpellLanguageAttrib& rAttr ) : TextAttrib(TEXTATTR_SPELL_LANGUAGE), m_eLanguage(rAttr.m_eLanguage) { } -//----------------------------------------------------------------------- + SpellLanguageAttrib::~SpellLanguageAttrib() { } -//----------------------------------------------------------------------- + void SpellLanguageAttrib::SetFont( Font& ) const { //no visual effect } -//----------------------------------------------------------------------- + TextAttrib* SpellLanguageAttrib::Clone() const { return new SpellLanguageAttrib(*this); } -//----------------------------------------------------------------------- + bool SpellLanguageAttrib::operator==( const TextAttrib& rAttr ) const { return Which() == rAttr.Which() && m_eLanguage == static_cast<const SpellLanguageAttrib&>(rAttr).m_eLanguage; } -//----------------------------------------------------------------------- + SpellBackgroundAttrib::SpellBackgroundAttrib(const Color& rCol) : TextAttrib(TEXTATTR_SPELL_BACKGROUND), m_aBackgroundColor(rCol) { } -//----------------------------------------------------------------------- + SpellBackgroundAttrib::SpellBackgroundAttrib( const SpellBackgroundAttrib& rAttr ) : TextAttrib(TEXTATTR_SPELL_BACKGROUND), m_aBackgroundColor(rAttr.m_aBackgroundColor) { } -//----------------------------------------------------------------------- + SpellBackgroundAttrib::~SpellBackgroundAttrib() { } -//----------------------------------------------------------------------- + void SpellBackgroundAttrib::SetFont( Font& rFont ) const { rFont.SetFillColor(m_aBackgroundColor); } -//----------------------------------------------------------------------- + TextAttrib* SpellBackgroundAttrib::Clone() const { return new SpellBackgroundAttrib(*this); } -//----------------------------------------------------------------------- + bool SpellBackgroundAttrib::operator==( const TextAttrib& rAttr ) const { return Which() == rAttr.Which() && diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index c28f120ef5de..aeae64d3c98d 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -72,7 +72,7 @@ struct SpellDialog_Impl { Sequence< Reference< XDictionary > > aDics; }; -// ----------------------------------------------------------------------- + #define SPELLUNDO_START 200 @@ -161,18 +161,18 @@ public: }//namespace svx using namespace ::svx; -//----------------------------------------------------------------------- + SpellUndoAction_Impl::~SpellUndoAction_Impl() { } -//----------------------------------------------------------------------- + void SpellUndoAction_Impl::Undo() { m_rActionLink.Call(this); } -//----------------------------------------------------------------------- + sal_uInt16 SpellUndoAction_Impl::GetId()const { return m_nId; @@ -248,7 +248,7 @@ SpellDialog::SpellDialog(SpellDialogChildWindow* pChildWindow, this, SpellDialog, InitHdl ) ); } -// ----------------------------------------------------------------------- + SpellDialog::~SpellDialog() { @@ -262,7 +262,7 @@ SpellDialog::~SpellDialog() delete pImpl; } -// ----------------------------------------------------------------------- + void SpellDialog::Init_Impl() { @@ -297,7 +297,7 @@ void SpellDialog::Init_Impl() SvxGetChangeAllList()->clear(); } -// ----------------------------------------------------------------------- + void SpellDialog::UpdateBoxes_Impl() { @@ -379,7 +379,7 @@ void SpellDialog::UpdateBoxes_Impl() if (bOldShowExplain != (bool) m_pExplainLink->IsVisible() || bOldShowGrammar != (bool) m_pCheckGrammarCB->IsVisible()) setOptimalLayoutSize(); } -// ----------------------------------------------------------------------- + void SpellDialog::SpellContinue_Impl(bool bUseSavedSentence, bool bIgnoreCurrentError ) { @@ -450,7 +450,7 @@ IMPL_STATIC_LINK( SpellDialog, InitHdl, SpellDialog *, EMPTYARG ) return 0; }; -// ----------------------------------------------------------------------- + IMPL_LINK( SpellDialog, ExtClickHdl, Button *, pBtn ) { @@ -484,7 +484,7 @@ IMPL_LINK( SpellDialog, ExtClickHdl, Button *, pBtn ) } return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( SpellDialog, CheckGrammarHdl, CheckBox*, pBox ) { rParent.SetGrammarChecking( pBox->IsChecked() ); @@ -551,7 +551,7 @@ OUString SpellDialog::getReplacementString() const return getDotReplacementString(sOrigString, sReplacement); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SpellDialog, ChangeHdl) { @@ -573,7 +573,7 @@ IMPL_LINK_NOARG(SpellDialog, ChangeHdl) return 1; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SpellDialog, ChangeAllHdl) { @@ -604,7 +604,7 @@ IMPL_LINK_NOARG(SpellDialog, ChangeAllHdl) m_pSentenceED->UndoActionEnd(); return 1; } -// ----------------------------------------------------------------------- + IMPL_LINK( SpellDialog, IgnoreAllHdl, Button *, pButton ) { @@ -653,7 +653,7 @@ IMPL_LINK( SpellDialog, IgnoreAllHdl, Button *, pButton ) return 1; } -//----------------------------------------------------------------------- + IMPL_LINK_NOARG(SpellDialog, UndoHdl) { m_pSentenceED->Undo(); @@ -662,7 +662,7 @@ IMPL_LINK_NOARG(SpellDialog, UndoHdl) return 0; } -//----------------------------------------------------------------------- + IMPL_LINK( SpellDialog, DialogUndoHdl, SpellUndoAction_Impl*, pAction ) { switch(pAction->GetId()) @@ -709,7 +709,7 @@ IMPL_LINK( SpellDialog, DialogUndoHdl, SpellUndoAction_Impl*, pAction ) return 0; } -// ----------------------------------------------------------------------- + void SpellDialog::Impl_Restore() { //clear the "ChangeAllList" @@ -740,7 +740,7 @@ IMPL_LINK_NOARG(SpellDialog, IgnoreHdl) return 1; } -// ----------------------------------------------------------------------- + bool SpellDialog::Close() { @@ -749,14 +749,14 @@ bool SpellDialog::Close() SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD); return true; } -// ----------------------------------------------------------------------- + void SpellDialog::SetSelectedLang_Impl( LanguageType nLang ) { m_pLanguageLB->SelectLanguage( nLang ); } -// ----------------------------------------------------------------------- + LanguageType SpellDialog::GetSelectedLang_Impl() const { @@ -764,7 +764,7 @@ LanguageType SpellDialog::GetSelectedLang_Impl() const return nLang; } -//------------------------------------------------- + IMPL_LINK(SpellDialog, LanguageSelectHdl, SvxLanguageBox*, pBox) { //If selected language changes, then add->list should be regenerated to @@ -793,7 +793,7 @@ IMPL_LINK(SpellDialog, LanguageSelectHdl, SvxLanguageBox*, pBox) SpellDialog::UpdateBoxes_Impl(); return 0; } -// ----------------------------------------------------------------------- + void SpellDialog::SetLanguage( sal_uInt16 nLang ) /* @@ -886,19 +886,19 @@ int SpellDialog::InitUserDicts() return nDicts; } -//----------------------------------------------------------------------- + IMPL_LINK(SpellDialog, AddToDictClickHdl, PushButton*, EMPTYARG ) { return AddToDictionaryExecute(1, m_pAddToDictMB->GetPopupMenu()); } -//----------------------------------------------------------------------- + IMPL_LINK(SpellDialog, AddToDictSelectHdl, MenuButton*, pButton ) { return AddToDictionaryExecute(pButton->GetCurItemId(), pButton->GetPopupMenu()); } -//----------------------------------------------------------------------- + int SpellDialog::AddToDictionaryExecute( sal_uInt16 nItemId, PopupMenu *pMenu ) { m_pSentenceED->UndoActionStart( SPELLUNDO_CHANGE_GROUP ); @@ -947,7 +947,7 @@ int SpellDialog::AddToDictionaryExecute( sal_uInt16 nItemId, PopupMenu *pMenu ) return 0; } -//----------------------------------------------------------------------- + IMPL_LINK(SpellDialog, ModifyHdl, SentenceEditWindow_Impl*, pEd) { if (m_pSentenceED == pEd) @@ -973,7 +973,7 @@ IMPL_LINK(SpellDialog, ModifyHdl, SentenceEditWindow_Impl*, pEd) return 0; }; -//----------------------------------------------------------------------- + IMPL_LINK_NOARG(SpellDialog, CancelHdl) { //apply changes and ignored text parts first - if there are any @@ -982,7 +982,7 @@ IMPL_LINK_NOARG(SpellDialog, CancelHdl) return 0; } -//----------------------------------------------------------------------- + bool SpellDialog::Notify( NotifyEvent& rNEvt ) { /* #i38338# @@ -1010,7 +1010,7 @@ bool SpellDialog::Notify( NotifyEvent& rNEvt ) return SfxModelessDialog::Notify(rNEvt); } -//------------------------------------------------- + void SpellDialog::InvalidateDialog() { if( bFocusLocked ) @@ -1043,7 +1043,7 @@ void SpellDialog::InvalidateDialog() SfxModelessDialog::Deactivate(); } -//----------------------------------------------------------------------- + bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck) { bool bRet = false; @@ -1185,7 +1185,7 @@ bool SpellDialog::ApplyChangeAllList_Impl(SpellPortions& rSentence, bool &bHasRe return bRet; } -//----------------------------------------------------------------------- + SentenceEditWindow_Impl::SentenceEditWindow_Impl(Window * pParent, WinBits nBits) : VclMultiLineEdit(pParent, nBits) , m_nErrorStart(0) @@ -1201,7 +1201,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSentenceEditWindow(Window * return new SentenceEditWindow_Impl(pParent, WB_BORDER|WB_VSCROLL|WB_IGNORETAB); } -//----------------------------------------------------------------------- + SentenceEditWindow_Impl::~SentenceEditWindow_Impl() { } @@ -1545,7 +1545,7 @@ bool SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt ) return bChange || VclMultiLineEdit::PreNotify(rNEvt); } -//----------------------------------------------------------------------- + bool SentenceEditWindow_Impl::MarkNextError( bool bIgnoreCurrentError, com::sun::star::uno::Reference<com::sun::star::linguistic2::XSpellChecker1> xSpell ) { if (bIgnoreCurrentError) @@ -1637,7 +1637,7 @@ bool SentenceEditWindow_Impl::MarkNextError( bool bIgnoreCurrentError, com::sun: return bRet; } -//----------------------------------------------------------------------- + void SentenceEditWindow_Impl::MoveErrorMarkTo(sal_uInt16 nStart, sal_uInt16 nEnd, bool bGrammarError) { TextEngine* pTextEngine = GetTextEngine(); @@ -1649,7 +1649,7 @@ void SentenceEditWindow_Impl::MoveErrorMarkTo(sal_uInt16 nStart, sal_uInt16 nEnd m_nErrorEnd = nEnd; } -//----------------------------------------------------------------------- + void SentenceEditWindow_Impl::ChangeMarkedWord(const OUString& rNewWord, LanguageType eLanguage) { //calculate length changes @@ -1712,13 +1712,13 @@ void SentenceEditWindow_Impl::ChangeMarkedWord(const OUString& rNewWord, Languag pTextEngine->UndoActionEnd(); } -//------------------------------------------------- + OUString SentenceEditWindow_Impl::GetErrorText() const { return GetTextEngine()->GetText(TextSelection(TextPaM(0, m_nErrorStart), TextPaM(0, m_nErrorEnd) )); } -//----------------------------------------------------------------------- + const SpellErrorDescription* SentenceEditWindow_Impl::GetAlternatives() { TextPaM aCursor(0, m_nErrorStart); @@ -1727,7 +1727,7 @@ const SpellErrorDescription* SentenceEditWindow_Impl::GetAlternatives() return pAttrib ? &pAttrib->GetErrorDescription() : 0; } -//----------------------------------------------------------------------- + void SentenceEditWindow_Impl::RestoreCurrentError() { TextPaM aCursor(0, m_nErrorStart); @@ -1741,7 +1741,7 @@ void SentenceEditWindow_Impl::RestoreCurrentError() } } -//----------------------------------------------------------------------- + void SentenceEditWindow_Impl::SetAlternatives( Reference< XSpellAlternatives> xAlt ) { TextPaM aCursor(0, m_nErrorStart); @@ -1765,20 +1765,20 @@ void SentenceEditWindow_Impl::SetAlternatives( Reference< XSpellAlternatives> xA GetTextEngine()->SetAttrib( SpellErrorAttrib(aDesc), 0, m_nErrorStart, m_nErrorEnd ); } -//----------------------------------------------------------------------- + void SentenceEditWindow_Impl::SetAttrib( const TextAttrib& rAttr, sal_uLong nPara, sal_uInt16 nStart, sal_uInt16 nEnd ) { GetTextEngine()->SetAttrib(rAttr, nPara, nStart, nEnd); } -//----------------------------------------------------------------------- + void SentenceEditWindow_Impl::SetText( const OUString& rStr ) { m_nErrorStart = m_nErrorEnd = 0; GetTextEngine()->SetText(rStr); } -//----------------------------------------------------------------------- + struct LanguagePosition_Impl { sal_uInt16 nPosition; @@ -1919,7 +1919,7 @@ svx::SpellPortions SentenceEditWindow_Impl::CreateSpellPortions( bool bSetIgnore return aRet; } -//----------------------------------------------------------------------- + void SentenceEditWindow_Impl::Undo() { ::svl::IUndoManager& rUndoMgr = GetTextEngine()->GetUndoManager(); @@ -1939,13 +1939,13 @@ void SentenceEditWindow_Impl::Undo() GetSpellDialog()->UpdateBoxes_Impl(); } -//----------------------------------------------------------------------- + void SentenceEditWindow_Impl::ResetUndo() { GetTextEngine()->ResetUndo(); } -//----------------------------------------------------------------------- + void SentenceEditWindow_Impl::AddUndoAction( SfxUndoAction *pAction, sal_Bool bTryMerg ) { ::svl::IUndoManager& rUndoMgr = GetTextEngine()->GetUndoManager(); @@ -1953,25 +1953,25 @@ void SentenceEditWindow_Impl::AddUndoAction( SfxUndoAction *pAction, sal_Bool bT GetSpellDialog()->m_pUndoPB->Enable(); } -//----------------------------------------------------------------------- + sal_uInt16 SentenceEditWindow_Impl::GetUndoActionCount() { return GetTextEngine()->GetUndoManager().GetUndoActionCount(); } -//----------------------------------------------------------------------- + void SentenceEditWindow_Impl::UndoActionStart( sal_uInt16 nId ) { GetTextEngine()->UndoActionStart(nId); } -//----------------------------------------------------------------------- + void SentenceEditWindow_Impl::UndoActionEnd() { GetTextEngine()->UndoActionEnd(); } -//----------------------------------------------------------------------- + void SentenceEditWindow_Impl::MoveErrorEnd(long nOffset) { if(nOffset > 0) @@ -1980,7 +1980,7 @@ void SentenceEditWindow_Impl::MoveErrorEnd(long nOffset) m_nErrorEnd = m_nErrorEnd -(sal_uInt16)- nOffset; } -//----------------------------------------------------------------------- + void SentenceEditWindow_Impl::SetUndoEditMode(bool bSet) { DBG_ASSERT(!bSet || m_bIsUndoEditMode != bSet, "SetUndoEditMode with equal values?"); diff --git a/cui/source/dialogs/commonlingui.cxx b/cui/source/dialogs/commonlingui.cxx index 012895d388cf..a4b1ffab7dd5 100644 --- a/cui/source/dialogs/commonlingui.cxx +++ b/cui/source/dialogs/commonlingui.cxx @@ -30,7 +30,7 @@ // SvxClickInfoCtr //============================================================================= -//----------------------------------------------------------------------------- + SvxClickInfoCtr::SvxClickInfoCtr( Window* pParent, const ResId& rResId ) : Control( pParent, rResId ), aFixedInfo( this) @@ -39,13 +39,13 @@ SvxClickInfoCtr::SvxClickInfoCtr( Window* pParent, const ResId& rResId ) : aFixedInfo.Show(); } -//----------------------------------------------------------------------------- + void SvxClickInfoCtr::MouseButtonDown( const MouseEvent& ) { aActivateLink.Call(this); } -//----------------------------------------------------------------------------- + bool SvxClickInfoCtr::PreNotify( NotifyEvent& rNEvt ) { if(rNEvt.GetType()==EVENT_GETFOCUS || rNEvt.GetType()==EVENT_MOUSEBUTTONDOWN) @@ -56,19 +56,19 @@ bool SvxClickInfoCtr::PreNotify( NotifyEvent& rNEvt ) return Control::PreNotify(rNEvt); } -//----------------------------------------------------------------------------- + void SvxClickInfoCtr::SetText( const OUString& rStr ) { aFixedInfo.SetText(rStr ); } -//----------------------------------------------------------------------------- + OUString SvxClickInfoCtr::GetText() const { return aFixedInfo.GetText(); } -//----------------------------------------------------------------------------- + SvxClickInfoCtr::~SvxClickInfoCtr() { } @@ -76,7 +76,7 @@ SvxClickInfoCtr::~SvxClickInfoCtr() //============================================================================= // SvxCommonLinguisticControl //============================================================================= -//----------------------------------------------------------------------------- + SvxCommonLinguisticControl::SvxCommonLinguisticControl( ModalDialog* _pParent ) :Window( _pParent, CUI_RES( RID_SVX_WND_COMMON_LINGU ) ) ,aWordText ( this, CUI_RES( FT_WORD ) ) @@ -100,7 +100,7 @@ SvxCommonLinguisticControl::SvxCommonLinguisticControl( ModalDialog* _pParent ) Show(); } -// ----------------------------------------------------------------------- + PushButton* SvxCommonLinguisticControl::implGetButton( ButtonType _eType ) const { const PushButton* pButton = NULL; @@ -116,7 +116,7 @@ PushButton* SvxCommonLinguisticControl::implGetButton( ButtonType _eType ) cons return const_cast< PushButton* >( pButton ); } -// ----------------------------------------------------------------------- + void SvxCommonLinguisticControl::SetButtonHandler( ButtonType _eType, const Link& _rHandler ) { Button* pButton = GetButton( _eType ); @@ -124,7 +124,7 @@ void SvxCommonLinguisticControl::SetButtonHandler( ButtonType _eType, const Link pButton->SetClickHdl( _rHandler ); } -// ----------------------------------------------------------------------- + void SvxCommonLinguisticControl::EnableButton( ButtonType _eType, sal_Bool _bEnable ) { Button* pButton = GetButton( _eType ); @@ -132,7 +132,7 @@ void SvxCommonLinguisticControl::EnableButton( ButtonType _eType, sal_Bool _bEna pButton->Enable( _bEnable ); } -// ----------------------------------------------------------------------- + void SvxCommonLinguisticControl::InsertControlGroup( Window& _rFirstGroupWindow, Window& _rLastGroupWindow, ControlGroup _eInsertAfter ) { Window* pInsertAfter = NULL; // will be the last window of our own "undividable" group, after which we insert the foreign group @@ -170,7 +170,7 @@ void SvxCommonLinguisticControl::InsertControlGroup( Window& _rFirstGroupWindow, // (FirstWindow, LastWindow) was no valid control group } -//----------------------------------------------------------------------------- + void SvxCommonLinguisticControl::Paint( const Rectangle& rRect ) { Window::Paint(rRect ); @@ -181,7 +181,7 @@ void SvxCommonLinguisticControl::Paint( const Rectangle& rRect ) aDecoView.DrawButton( aRect, BUTTON_DRAW_NOFILL ); } -//----------------------------------------------------------------------------- + void SvxCommonLinguisticControl::Enlarge( sal_Int32 _nX, sal_Int32 _nY ) { Size aSize; diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 4159a31eaa33..207bef33cb98 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -104,34 +104,34 @@ SvxCharacterMap::SvxCharacterMap( Window* pParent, sal_Bool bOne_, const SfxItem CreateOutputItemSet( pSet ? *pSet->GetPool() : SFX_APP()->GetPool() ); } -// ----------------------------------------------------------------------- + SvxCharacterMap::~SvxCharacterMap() { } -// ----------------------------------------------------------------------- + const Font& SvxCharacterMap::GetCharFont() const { return aFont; } -// ----------------------------------------------------------------------- + void SvxCharacterMap::SetChar( sal_UCS4 c ) { m_pShowSet->SelectCharacter( c ); } -// ----------------------------------------------------------------------- + sal_UCS4 SvxCharacterMap::GetChar() const { return m_pShowSet->GetSelectCharacter(); } -// ----------------------------------------------------------------------- + OUString SvxCharacterMap::GetCharacters() const { @@ -139,7 +139,7 @@ OUString SvxCharacterMap::GetCharacters() const } -// ----------------------------------------------------------------------- + void SvxCharacterMap::DisableFontSelection() { @@ -182,7 +182,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxShowText(Window *pParent return new SvxShowText(pParent); } -// ----------------------------------------------------------------------- + void SvxShowText::Paint( const Rectangle& ) { @@ -266,7 +266,7 @@ void SvxShowText::Paint( const Rectangle& ) Control::SetFont(aOrigFont); } -// ----------------------------------------------------------------------- + void SvxShowText::SetFont( const Font& rFont ) { @@ -296,7 +296,7 @@ void SvxShowText::Resize() SetFont(GetFont()); //force recalculation of size } -// ----------------------------------------------------------------------- + void SvxShowText::SetText( const OUString& rText ) { @@ -304,7 +304,7 @@ void SvxShowText::SetText( const OUString& rText ) Invalidate(); } -// ----------------------------------------------------------------------- + SvxShowText::~SvxShowText() {} @@ -382,7 +382,7 @@ void SvxCharacterMap::init() m_pOKBtn->Enable(); } -// ----------------------------------------------------------------------- + void SvxCharacterMap::SetCharFont( const Font& rFont ) { @@ -401,7 +401,7 @@ void SvxCharacterMap::SetCharFont( const Font& rFont ) ModalDialog::SetFont( aFont ); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxCharacterMap, OKHdl) { @@ -430,7 +430,7 @@ void SvxCharacterMap::fillAllSubsets(ListBox &rListBox) } } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxCharacterMap, FontSelectHdl) { @@ -485,7 +485,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, FontSelectHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxCharacterMap, SubsetSelectHdl) { @@ -500,7 +500,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, SubsetSelectHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxCharacterMap, CharDoubleClickHdl) { @@ -513,7 +513,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharDoubleClickHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxCharacterMap, CharSelectHdl) { @@ -535,7 +535,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharSelectHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxCharacterMap, CharHighlightHdl) { @@ -574,7 +574,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharHighlightHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxCharacterMap, CharPreSelectHdl) { @@ -591,7 +591,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharPreSelectHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxCharacterMap, DeleteLastHdl) { diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index dcd508d4f82d..b176f40b9568 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -52,9 +52,9 @@ #include <svx/dialmgr.hxx> -// -------------- + // - Namespaces - -// -------------- + using namespace ::ucbhelper; using namespace ::rtl; @@ -65,9 +65,9 @@ using namespace ::com::sun::star::ucb; using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::uno; -// ---------------- + // - SearchThread - -// ---------------- + SearchThread::SearchThread( SearchProgress* pProgess, TPGalleryThemeProperties* pBrowser, @@ -79,13 +79,13 @@ SearchThread::SearchThread( SearchProgress* pProgess, { } -// ------------------------------------------------------------------------ + SearchThread::~SearchThread() { } -// ------------------------------------------------------------------------ + void SearchThread::execute() { @@ -114,7 +114,7 @@ void SearchThread::execute() Application::PostUserEvent( LINK( mpProgress, SearchProgress, CleanUpHdl ) ); } -// ------------------------------------------------------------------------ + void SearchThread::ImplSearch( const INetURLObject& rStartURL, const ::std::vector< OUString >& rFormats, @@ -200,9 +200,9 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL, } } -// ------------------ + // - SearchProgress - -// ------------------ + SearchProgress::SearchProgress( Window* pParent, const INetURLObject& rStartURL ) : ModalDialog(pParent, "GallerySearchProgress", "cui/ui/gallerysearchprogress.ui") @@ -216,7 +216,7 @@ SearchProgress::SearchProgress( Window* pParent, const INetURLObject& rStartURL m_pBtnCancel->SetClickHdl( LINK( this, SearchProgress, ClickCancelBtn ) ); } -// ------------------------------------------------------------------------ + void SearchProgress::Terminate() { @@ -224,7 +224,7 @@ void SearchProgress::Terminate() maSearchThread->terminate(); } -// ------------------------------------------------------------------------ + IMPL_LINK_NOARG(SearchProgress, ClickCancelBtn) { @@ -232,7 +232,7 @@ IMPL_LINK_NOARG(SearchProgress, ClickCancelBtn) return 0L; } -// ------------------------------------------------------------------------ + IMPL_LINK_NOARG(SearchProgress, CleanUpHdl) { @@ -245,7 +245,7 @@ IMPL_LINK_NOARG(SearchProgress, CleanUpHdl) return 0L; } -// ------------------------------------------------------------------------ + short SearchProgress::Execute() { @@ -255,7 +255,7 @@ short SearchProgress::Execute() return RET_CANCEL; } -// ------------------------------------------------------------------------ + void SearchProgress::StartExecuteModal( const Link& rEndDialogHdl ) { @@ -266,9 +266,9 @@ void SearchProgress::StartExecuteModal( const Link& rEndDialogHdl ) ModalDialog::StartExecuteModal( rEndDialogHdl ); } -// -------------- + // - TakeThread - -// -------------- + TakeThread::TakeThread( TakeProgress* pProgess, @@ -282,13 +282,13 @@ TakeThread::TakeThread( { } -// ------------------------------------------------------------------------ + TakeThread::~TakeThread() { } -// ------------------------------------------------------------------------ + void TakeThread::execute() { @@ -334,9 +334,9 @@ void TakeThread::execute() Application::PostUserEvent( LINK( mpProgress, TakeProgress, CleanUpHdl ) ); } -// ---------------- + // - TakeProgress - -// ---------------- + TakeProgress::TakeProgress( Window* pWindow ) : ModalDialog ( pWindow, CUI_RES( RID_SVXDLG_GALLERY_TAKE_PROGRESS ) ), @@ -349,7 +349,7 @@ TakeProgress::TakeProgress( Window* pWindow ) : aBtnCancel.SetClickHdl( LINK( this, TakeProgress, ClickCancelBtn ) ); } -// ------------------------------------------------------------------------ + void TakeProgress::Terminate() @@ -358,7 +358,7 @@ void TakeProgress::Terminate() maTakeThread->terminate(); } -// ------------------------------------------------------------------------ + IMPL_LINK_NOARG(TakeProgress, ClickCancelBtn) { @@ -366,7 +366,7 @@ IMPL_LINK_NOARG(TakeProgress, ClickCancelBtn) return 0L; } -// ------------------------------------------------------------------------ + IMPL_LINK_NOARG(TakeProgress, CleanUpHdl) { @@ -420,7 +420,7 @@ IMPL_LINK_NOARG(TakeProgress, CleanUpHdl) return 0L; } -// ------------------------------------------------------------------------ + short TakeProgress::Execute() { @@ -430,7 +430,7 @@ short TakeProgress::Execute() return RET_CANCEL; } -// ------------------------------------------------------------------------ + void TakeProgress::StartExecuteModal( const Link& rEndDialogHdl ) { @@ -441,9 +441,9 @@ void TakeProgress::StartExecuteModal( const Link& rEndDialogHdl ) ModalDialog::StartExecuteModal( rEndDialogHdl ); } -// --------------------- + // - ActualizeProgress - -// --------------------- + ActualizeProgress::ActualizeProgress( Window* pWindow, GalleryTheme* pThm ) : ModalDialog ( pWindow, CUI_RES( RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS ) ), @@ -457,7 +457,7 @@ ActualizeProgress::ActualizeProgress( Window* pWindow, GalleryTheme* pThm ) : aBtnCancel.SetClickHdl( LINK( this, ActualizeProgress, ClickCancelBtn ) ); } -// ------------------------------------------------------------------------ + short ActualizeProgress::Execute() { @@ -477,7 +477,7 @@ short ActualizeProgress::Execute() return nRet; } -// ------------------------------------------------------------------------ + IMPL_LINK_NOARG(ActualizeProgress, ClickCancelBtn) { @@ -487,7 +487,7 @@ IMPL_LINK_NOARG(ActualizeProgress, ClickCancelBtn) return 0L; } -// ------------------------------------------------------------------------ + IMPL_LINK( ActualizeProgress, TimeoutHdl, Timer*, _pTimer ) { @@ -503,7 +503,7 @@ IMPL_LINK( ActualizeProgress, TimeoutHdl, Timer*, _pTimer ) return 0; } -// ------------------------------------------------------------------------ + IMPL_LINK( ActualizeProgress, ActualizeHdl, INetURLObject*, pURL ) { @@ -531,9 +531,9 @@ TitleDialog::TitleDialog(Window* pParent, const OUString& rOldTitle) m_pEdit->GrabFocus(); } -// ------------------- + // - GalleryIdDialog - -// ------------------- + GalleryIdDialog::GalleryIdDialog( Window* pParent, GalleryTheme* _pThm ) : ModalDialog(pParent, "GalleryThemeIDDialog", "cui/ui/gallerythemeiddialog.ui") @@ -552,7 +552,7 @@ GalleryIdDialog::GalleryIdDialog( Window* pParent, GalleryTheme* _pThm ) m_pBtnOk->SetClickHdl( LINK( this, GalleryIdDialog, ClickOkHdl ) ); } -// ----------------------------------------------------------------------------- + IMPL_LINK_NOARG(GalleryIdDialog, ClickOkHdl) { @@ -586,9 +586,9 @@ IMPL_LINK_NOARG(GalleryIdDialog, ClickOkHdl) } -// -------------------------- + // - GalleryThemeProperties - -// -------------------------- + GalleryThemeProperties::GalleryThemeProperties(Window* pParent, ExchangeData* _pData, SfxItemSet* pItemSet) @@ -614,7 +614,7 @@ GalleryThemeProperties::GalleryThemeProperties(Window* pParent, SetText( aText ); } -// ------------------------------------------------------------------------ + void GalleryThemeProperties::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { @@ -624,9 +624,9 @@ void GalleryThemeProperties::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) ( (TPGalleryThemeProperties&) rPage ).SetXChgData( pData ); } -// ------------------------- + // - TPGalleryThemeGeneral - -// ------------------------- + TPGalleryThemeGeneral::TPGalleryThemeGeneral( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage ( pParent, CUI_RES( RID_SVXTABPAGE_GALLERY_GENERAL ), rSet ), @@ -652,7 +652,7 @@ TPGalleryThemeGeneral::TPGalleryThemeGeneral( Window* pParent, const SfxItemSet& aEdtMSName.SetAccessibleRelationLabeledBy( &aFiMSImage ); } -// ------------------------------------------------------------------------ + void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData ) { @@ -711,7 +711,7 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData ) aFiMSImage.SetImage( Image( Bitmap( CUI_RES( nId ) ), COL_LIGHTMAGENTA ) ); } -// ------------------------------------------------------------------------ + sal_Bool TPGalleryThemeGeneral::FillItemSet( SfxItemSet& /*rSet*/ ) { @@ -719,16 +719,16 @@ sal_Bool TPGalleryThemeGeneral::FillItemSet( SfxItemSet& /*rSet*/ ) return sal_True; } -// ------------------------------------------------------------------------ + SfxTabPage* TPGalleryThemeGeneral::Create( Window* pParent, const SfxItemSet& rSet ) { return new TPGalleryThemeGeneral( pParent, rSet ); } -// ---------------------------- + // - TPGalleryThemeProperties - -// ---------------------------- + TPGalleryThemeProperties::TPGalleryThemeProperties( Window* pWindow, const SfxItemSet& rSet ) : SfxTabPage ( pWindow, CUI_RES( RID_SVXTABPAGE_GALLERYTHEME_FILES ), rSet ), @@ -755,7 +755,7 @@ TPGalleryThemeProperties::TPGalleryThemeProperties( Window* pWindow, const SfxIt aLbxFound.SetAccessibleRelationLabeledBy(&aLbxFound); } -// ------------------------------------------------------------------------ + void TPGalleryThemeProperties::SetXChgData( ExchangeData* _pData ) { @@ -781,7 +781,7 @@ void TPGalleryThemeProperties::SetXChgData( ExchangeData* _pData ) aCbxPreview.Disable(); } -// ------------------------------------------------------------------------ + void TPGalleryThemeProperties::StartSearchFiles( const OUString& _rFolderURL, short _nDlgResult ) { @@ -795,7 +795,7 @@ void TPGalleryThemeProperties::StartSearchFiles( const OUString& _rFolderURL, sh nCurFilterPos = aCbbFileType.GetEntryPos( aCbbFileType.GetText() ); } -// ------------------------------------------------------------------------ + TPGalleryThemeProperties::~TPGalleryThemeProperties() { @@ -807,14 +807,14 @@ TPGalleryThemeProperties::~TPGalleryThemeProperties() } } -// ------------------------------------------------------------------------ + SfxTabPage* TPGalleryThemeProperties::Create( Window* pParent, const SfxItemSet& rSet ) { return new TPGalleryThemeProperties( pParent, rSet ); } -// ------------------------------------------------------------------------ + OUString TPGalleryThemeProperties::addExtension( const OUString& _rDisplayText, const OUString& _rExtension ) { @@ -833,7 +833,7 @@ OUString TPGalleryThemeProperties::addExtension( const OUString& _rDisplayText, return sRet; } -// ------------------------------------------------------------------------ + void TPGalleryThemeProperties::FillFilterList() { @@ -975,7 +975,7 @@ void TPGalleryThemeProperties::FillFilterList() aCbbFileType.SetText( pFilterEntry->aFilterName ); } -// ------------------------------------------------------------------------ + IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFileTypeHdl) { @@ -992,7 +992,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFileTypeHdl) return 0L; } -// ------------------------------------------------------------------------ + void TPGalleryThemeProperties::SearchFiles() { @@ -1008,7 +1008,7 @@ void TPGalleryThemeProperties::SearchFiles() pProgress->StartExecuteModal( LINK( this, TPGalleryThemeProperties, EndSearchProgressHdl ) ); } -// ------------------------------------------------------------------------ + IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickSearchHdl) { @@ -1049,7 +1049,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickSearchHdl) return 0L; } -// ------------------------------------------------------------------------ + void TPGalleryThemeProperties::TakeFiles() { @@ -1064,7 +1064,7 @@ void TPGalleryThemeProperties::TakeFiles() } } -// ------------------------------------------------------------------------ + IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickPreviewHdl) { @@ -1086,7 +1086,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickPreviewHdl) return 0; } -// ------------------------------------------------------------------------ + void TPGalleryThemeProperties::DoPreview() { @@ -1115,7 +1115,7 @@ void TPGalleryThemeProperties::DoPreview() } } -// ------------------------------------------------------------------------ + IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickTakeHdl) { @@ -1142,7 +1142,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickTakeHdl) return 0L; } -// ------------------------------------------------------------------------ + IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickTakeAllHdl) { @@ -1156,7 +1156,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickTakeAllHdl) return 0L; } -// ------------------------------------------------------------------------ + IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFoundHdl) { @@ -1189,7 +1189,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFoundHdl) return 0; } -// ------------------------------------------------------------------------ + IMPL_LINK_NOARG(TPGalleryThemeProperties, DClickFoundHdl) { @@ -1204,7 +1204,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, DClickFoundHdl) return 0; } -// ------------------------------------------------------------------------ + IMPL_LINK_NOARG(TPGalleryThemeProperties, PreviewTimerHdl) { @@ -1213,7 +1213,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, PreviewTimerHdl) return 0L; } -// ------------------------------------------------------------------------ + IMPL_LINK_NOARG(TPGalleryThemeProperties, EndSearchProgressHdl) { @@ -1234,7 +1234,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, EndSearchProgressHdl) return 0L; } -// ------------------------------------------------------------------------ + IMPL_LINK( TPGalleryThemeProperties, DialogClosedHdl, ::com::sun::star::ui::dialogs::DialogClosedEvent*, pEvt ) { diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index c67d06439f47..ae2ada60750b 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -54,7 +54,7 @@ Size GraphicPreviewWindow::GetOptimalSize() const return LogicToPixel(Size(81, 73), MAP_APPFONT); } -// ----------------------------------------------------------------------------- + void GraphicPreviewWindow::Paint( const Rectangle& rRect ) { @@ -78,7 +78,7 @@ void GraphicPreviewWindow::Paint( const Rectangle& rRect ) } } -// ----------------------------------------------------------------------------- + void GraphicPreviewWindow::SetPreview( const Graphic& rGraphic ) { @@ -154,7 +154,7 @@ GraphicFilterDialog::GraphicFilterDialog(Window* pParent, mpPreview->init(&rGraphic, maModifyHdl); } -// ----------------------------------------------------------------------------- + IMPL_LINK_NOARG(GraphicFilterDialog, ImplPreviewTimeoutHdl) { @@ -165,7 +165,7 @@ IMPL_LINK_NOARG(GraphicFilterDialog, ImplPreviewTimeoutHdl) return 0; } -// ----------------------------------------------------------------------------- + IMPL_LINK_NOARG(GraphicFilterDialog, ImplModifyHdl) { @@ -178,9 +178,9 @@ IMPL_LINK_NOARG(GraphicFilterDialog, ImplModifyHdl) return 0; } -// ---------------- + // - FilterMosaic - -// ---------------- + GraphicFilterMosaic::GraphicFilterMosaic( Window* pParent, const Graphic& rGraphic, sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, sal_Bool bEnhanceEdges ) @@ -205,7 +205,7 @@ GraphicFilterMosaic::GraphicFilterMosaic( Window* pParent, const Graphic& rGraph mpMtrWidth->GrabFocus(); } -// ----------------------------------------------------------------------------- + Graphic GraphicFilterMosaic::GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) @@ -243,9 +243,9 @@ Graphic GraphicFilterMosaic::GetFilteredGraphic( const Graphic& rGraphic, return aRet; } -// ------------------ + // - GraphicFilterSmooth - -// ------------------ + GraphicFilterSmooth::GraphicFilterSmooth( Window* pParent, const Graphic& rGraphic, double nRadius) : GraphicFilterDialog(pParent, "SmoothDialog", @@ -258,7 +258,7 @@ GraphicFilterSmooth::GraphicFilterSmooth( Window* pParent, const Graphic& rGraph mpMtrRadius->GrabFocus(); } -// ----------------------------------------------------------------------------- + Graphic GraphicFilterSmooth::GetFilteredGraphic( const Graphic& rGraphic, double /*fScaleX*/, double /*fScaleY*/ ) { @@ -287,9 +287,9 @@ Graphic GraphicFilterSmooth::GetFilteredGraphic( const Graphic& rGraphic, double return aRet; } -// ------------------ + // - GraphicFilterSolarize - -// ------------------ + GraphicFilterSolarize::GraphicFilterSolarize( Window* pParent, const Graphic& rGraphic, sal_uInt8 cGreyThreshold, sal_Bool bInvert ) @@ -306,7 +306,7 @@ GraphicFilterSolarize::GraphicFilterSolarize( Window* pParent, const Graphic& rG mpCbxInvert->SetToggleHdl( GetModifyHdl() ); } -// ----------------------------------------------------------------------------- + Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic, double /*fScaleX*/, double /*fScaleY*/ ) @@ -342,9 +342,9 @@ Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic, return aRet; } -// ---------------------- + // - GraphicFilterSepia - -// ---------------------- + GraphicFilterSepia::GraphicFilterSepia( Window* pParent, const Graphic& rGraphic, sal_uInt16 nSepiaPercent ) @@ -357,7 +357,7 @@ GraphicFilterSepia::GraphicFilterSepia( Window* pParent, const Graphic& rGraphic mpMtrSepia->SetModifyHdl( GetModifyHdl() ); } -// ----------------------------------------------------------------------------- + Graphic GraphicFilterSepia::GetFilteredGraphic( const Graphic& rGraphic, double /*fScaleX*/, double /*fScaleY*/ ) @@ -383,9 +383,9 @@ Graphic GraphicFilterSepia::GetFilteredGraphic( const Graphic& rGraphic, return aRet; } -// ----------------------- + // - GraphicFilterPoster - -// ----------------------- + GraphicFilterPoster::GraphicFilterPoster(Window* pParent, const Graphic& rGraphic, sal_uInt16 nPosterCount) @@ -400,7 +400,7 @@ GraphicFilterPoster::GraphicFilterPoster(Window* pParent, const Graphic& rGraphi mpNumPoster->SetModifyHdl( GetModifyHdl() ); } -// ----------------------------------------------------------------------------- + Graphic GraphicFilterPoster::GetFilteredGraphic( const Graphic& rGraphic, double /*fScaleX*/, double /*fScaleY*/ ) @@ -426,9 +426,9 @@ Graphic GraphicFilterPoster::GetFilteredGraphic( const Graphic& rGraphic, return aRet; } -// ----------------------- + // - GraphicFilterEmboss - -// ----------------------- + void EmbossControl::MouseButtonDown( const MouseEvent& rEvt ) { @@ -450,7 +450,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeEmbossControl(Window *pPare return new EmbossControl(pParent); } -// ----------------------------------------------------------------------------- + GraphicFilterEmboss::GraphicFilterEmboss(Window* pParent, const Graphic& rGraphic, RECT_POINT eLightSource) @@ -463,7 +463,7 @@ GraphicFilterEmboss::GraphicFilterEmboss(Window* pParent, mpCtlLight->GrabFocus(); } -// ----------------------------------------------------------------------------- + Graphic GraphicFilterEmboss::GetFilteredGraphic( const Graphic& rGraphic, double /*fScaleX*/, double /*fScaleY*/ ) diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index 0f1efdaf8b50..666863ce0537 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -66,7 +66,7 @@ void SvxHlinkCtrl::StateChanged( sal_uInt16 nSID, SfxItemState eState, -// ----------------------------------------------------------------------- + diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index ededbf44c363..d0bdd78a68e6 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -53,7 +53,7 @@ namespace svx using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; - //------------------------------------------------------------------------- + namespace { class FontSwitch @@ -103,7 +103,7 @@ namespace svx ::vcl::ControlLayoutData* _pLayoutData = NULL ); }; - //------------------------------------------------------------------------- + PseudoRubyText::PseudoRubyText( const OUString& _rPrimary, const OUString& _rSecondary, const RubyPosition _ePosition ) :m_sPrimaryText( _rPrimary ) ,m_sSecondaryText( _rSecondary ) @@ -111,7 +111,7 @@ namespace svx { } - //------------------------------------------------------------------------- + void PseudoRubyText::Paint( OutputDevice& _rDevice, const Rectangle& _rRect, sal_uInt16 _nTextStyle, Rectangle* _pPrimaryLocation, Rectangle* _pSecondaryLocation, ::vcl::ControlLayoutData* _pLayoutData ) { @@ -220,7 +220,7 @@ namespace svx virtual void Paint( const Rectangle& _rRect ); }; - //------------------------------------------------------------------------- + RubyRadioButton::RubyRadioButton( Window* _pParent, const ResId& _rId, const OUString& _rSecondary, const PseudoRubyText::RubyPosition _ePosition ) :RadioButton( _pParent, _rId ) @@ -228,7 +228,7 @@ namespace svx { } - //------------------------------------------------------------------------- + void RubyRadioButton::Paint( const Rectangle& ) { HideFocus(); @@ -300,7 +300,7 @@ namespace svx //========================================================================= //= SuggestionSet //========================================================================= - //------------------------------------------------------------------------- + SuggestionSet::SuggestionSet( Window* pParent ) : ValueSet( pParent, pParent->GetStyle() | WB_BORDER ) @@ -334,7 +334,7 @@ namespace svx //========================================================================= //= SuggestionDisplay //========================================================================= - //------------------------------------------------------------------------- + SuggestionDisplay::SuggestionDisplay( Window* pParent, const ResId& rResId ) : Control( pParent, rResId ) @@ -498,7 +498,7 @@ namespace svx //========================================================================= //= HangulHanjaConversionDialog //========================================================================= - //------------------------------------------------------------------------- + HangulHanjaConversionDialog::HangulHanjaConversionDialog( Window* _pParent, HHC::ConversionDirection _ePrimaryDirection ) :ModalDialog( _pParent, CUI_RES( RID_SVX_MDLG_HANGULHANJA ) ) ,m_pPlayground( new SvxCommonLinguisticControl( this ) ) @@ -607,12 +607,12 @@ namespace svx m_aSuggestions.SetHelpIds(); } - //------------------------------------------------------------------------- + HangulHanjaConversionDialog::~HangulHanjaConversionDialog( ) { } - //------------------------------------------------------------------------- + void HangulHanjaConversionDialog::FillSuggestions( const ::com::sun::star::uno::Sequence< OUString >& _rSuggestions ) { m_aSuggestions.Clear(); @@ -634,43 +634,43 @@ namespace svx OnSuggestionModified( &m_pPlayground->GetWordInputControl() ); } - //------------------------------------------------------------------------- + void HangulHanjaConversionDialog::SetOptionsChangedHdl( const Link& _rHdl ) { m_aOptionsChangedLink = _rHdl; } - //------------------------------------------------------------------------- + void HangulHanjaConversionDialog::SetIgnoreHdl( const Link& _rHdl ) { m_pPlayground->SetButtonHandler( SvxCommonLinguisticControl::eIgnore, _rHdl ); } - //------------------------------------------------------------------------- + void HangulHanjaConversionDialog::SetIgnoreAllHdl( const Link& _rHdl ) { m_pPlayground->SetButtonHandler( SvxCommonLinguisticControl::eIgnoreAll, _rHdl ); } - //------------------------------------------------------------------------- + void HangulHanjaConversionDialog::SetChangeHdl( const Link& _rHdl ) { m_pPlayground->SetButtonHandler( SvxCommonLinguisticControl::eChange, _rHdl ); } - //------------------------------------------------------------------------- + void HangulHanjaConversionDialog::SetChangeAllHdl( const Link& _rHdl ) { m_pPlayground->SetButtonHandler( SvxCommonLinguisticControl::eChangeAll, _rHdl ); } - //------------------------------------------------------------------------- + void HangulHanjaConversionDialog::SetFindHdl( const Link& _rHdl ) { m_aFind.SetClickHdl( _rHdl ); } - //------------------------------------------------------------------------- + void HangulHanjaConversionDialog::SetConversionFormatChangedHdl( const Link& _rHdl ) { m_aSimpleConversion.SetClickHdl( _rHdl ); @@ -682,13 +682,13 @@ namespace svx m_pHangulBelow->SetClickHdl( _rHdl ); } - //------------------------------------------------------------------------- + void HangulHanjaConversionDialog::SetClickByCharacterHdl( const Link& _rHdl ) { m_aClickByCharacterLink = _rHdl; } - //------------------------------------------------------------------------- + IMPL_LINK_NOARG(HangulHanjaConversionDialog, OnSuggestionSelected) { m_pPlayground->GetWordInputControl().SetText( m_aSuggestions.GetSelectEntry() ); @@ -696,7 +696,7 @@ namespace svx return 0L; } - //------------------------------------------------------------------------- + IMPL_LINK_NOARG(HangulHanjaConversionDialog, OnSuggestionModified) { m_aFind.Enable( m_pPlayground->GetWordInputControl().GetSavedValue() != m_pPlayground->GetWordInputControl().GetText() ); @@ -708,7 +708,7 @@ namespace svx return 0L; } - //------------------------------------------------------------------------- + IMPL_LINK( HangulHanjaConversionDialog, ClickByCharacterHdl, CheckBox *, pBox ) { m_aClickByCharacterLink.Call(pBox); @@ -719,7 +719,7 @@ namespace svx return 0L; } - //------------------------------------------------------------------------- + IMPL_LINK( HangulHanjaConversionDialog, OnConversionDirectionClicked, CheckBox *, pBox ) { CheckBox *pOtherBox = 0; @@ -738,7 +738,7 @@ namespace svx return 0L; } - //------------------------------------------------------------------------- + IMPL_LINK_NOARG(HangulHanjaConversionDialog, OnClose) { Close(); @@ -753,19 +753,19 @@ namespace svx return 0L; } - //------------------------------------------------------------------------- + OUString HangulHanjaConversionDialog::GetCurrentString( ) const { return m_pPlayground->GetCurrentText( ); } - //------------------------------------------------------------------------- + void HangulHanjaConversionDialog::FocusSuggestion( ) { m_pPlayground->GetWordInputControl().GrabFocus(); } - //------------------------------------------------------------------------- + namespace { void lcl_modifyWindowStyle( Window* _pWin, WinBits _nSet, WinBits _nReset ) @@ -776,7 +776,7 @@ namespace svx } } - //------------------------------------------------------------------------- + void HangulHanjaConversionDialog::SetCurrentString( const OUString& _rNewString, const Sequence< OUString >& _rSuggestions, bool _bOriginatesFromDocument ) { @@ -821,20 +821,20 @@ namespace svx } } - //------------------------------------------------------------------------- + OUString HangulHanjaConversionDialog::GetCurrentSuggestion( ) const { return m_pPlayground->GetWordInputControl().GetText(); } - //------------------------------------------------------------------------- + void HangulHanjaConversionDialog::SetByCharacter( bool _bByCharacter ) { m_aReplaceByChar.Check( _bByCharacter ); m_aSuggestions.DisplayListBox( !_bByCharacter ); } - //------------------------------------------------------------------------- + void HangulHanjaConversionDialog::SetConversionDirectionState( bool _bTryBothDirections, HHC::ConversionDirection _ePrimaryConversionDirection ) @@ -854,13 +854,13 @@ namespace svx } } - //------------------------------------------------------------------------- + bool HangulHanjaConversionDialog::GetUseBothDirections( ) const { return !m_aHangulOnly.IsChecked() && !m_aHanjaOnly.IsChecked(); } - //------------------------------------------------------------------------- + HHC::ConversionDirection HangulHanjaConversionDialog::GetDirection( HHC::ConversionDirection eDefaultDirection ) const { @@ -872,7 +872,7 @@ namespace svx return eDirection; } - //------------------------------------------------------------------------- + void HangulHanjaConversionDialog::SetConversionFormat( HHC::ConversionFormat _eType ) { switch ( _eType ) @@ -889,7 +889,7 @@ namespace svx } } - //------------------------------------------------------------------------- + HHC::ConversionFormat HangulHanjaConversionDialog::GetConversionFormat( ) const { if ( m_aSimpleConversion.IsChecked() ) @@ -911,7 +911,7 @@ namespace svx return HHC::eSimpleConversion; } - //------------------------------------------------------------------------- + void HangulHanjaConversionDialog::EnableRubySupport( bool bVal ) { m_pHanjaAbove->Enable( bVal ); @@ -924,7 +924,7 @@ namespace svx //========================================================================= //= HangulHanjaOptionsDialog //========================================================================= - //------------------------------------------------------------------------- + void HangulHanjaOptionsDialog::Init( void ) { @@ -1174,7 +1174,7 @@ namespace svx //========================================================================= //= HangulHanjaNewDictDialog //========================================================================= - //------------------------------------------------------------------------- + IMPL_LINK_NOARG(HangulHanjaNewDictDialog, OKHdl) { @@ -1219,7 +1219,7 @@ namespace svx //========================================================================= //= HangulHanjaEditDictDialog //========================================================================= - //------------------------------------------------------------------------- + class SuggestionList { diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 9b812960cfbe..a88ea1a55e43 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -76,7 +76,7 @@ IconChoicePage::IconChoicePage( Window *pParent, const ResId &rResId, SetStyle ( GetStyle() | WB_DIALOGCONTROL | WB_HIDE ); } -// ----------------------------------------------------------------------- + IconChoicePage::~IconChoicePage() { @@ -92,7 +92,7 @@ void IconChoicePage::ActivatePage( const SfxItemSet& ) { } -// ----------------------------------------------------------------------- + int IconChoicePage::DeactivatePage( SfxItemSet* ) { @@ -109,14 +109,14 @@ void IconChoicePage::FillUserData() { } -// ----------------------------------------------------------------------- + sal_Bool IconChoicePage::IsReadOnly() const { return sal_False; } -// ----------------------------------------------------------------------- + sal_Bool IconChoicePage::QueryClose() { @@ -152,7 +152,7 @@ void IconChoicePage::ImplInitSettings() } } -// ----------------------------------------------------------------------- + void IconChoicePage::StateChanged( StateChangedType nType ) { @@ -165,7 +165,7 @@ void IconChoicePage::StateChanged( StateChangedType nType ) } } -// ----------------------------------------------------------------------- + void IconChoicePage::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -248,7 +248,7 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId, SetPosSizeCtrls ( sal_True ); } -// ----------------------------------------------------------------------- + IconChoiceDialog ::~IconChoiceDialog () { @@ -396,7 +396,7 @@ void IconChoiceDialog::ShowPageImpl ( IconChoicePageData* pData ) pData->pPage->Show(); } -// ----------------------------------------------------------------------- + void IconChoiceDialog::HidePageImpl ( IconChoicePageData* pData ) { @@ -404,7 +404,7 @@ void IconChoiceDialog::HidePageImpl ( IconChoicePageData* pData ) pData->pPage->Hide(); } -// ----------------------------------------------------------------------- + void IconChoiceDialog::ShowPage( sal_uInt16 nId ) { @@ -680,7 +680,7 @@ IMPL_LINK_NOARG(IconChoiceDialog, OkHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(IconChoiceDialog, ResetHdl) { @@ -702,7 +702,7 @@ IMPL_LINK_NOARG(IconChoiceDialog, ResetHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(IconChoiceDialog, CancelHdl) { @@ -774,7 +774,7 @@ void IconChoiceDialog::ActivatePageImpl () } -// ----------------------------------------------------------------------- + sal_Bool IconChoiceDialog::DeActivatePageImpl () { @@ -841,7 +841,7 @@ sal_Bool IconChoiceDialog::DeActivatePageImpl () return sal_False; } -// ----------------------------------------------------------------------- + void IconChoiceDialog::ResetPageImpl () { @@ -912,7 +912,7 @@ const sal_uInt16* IconChoiceDialog::GetInputRanges( const SfxItemPool& rPool ) return pRanges; } -// ----------------------------------------------------------------------- + void IconChoiceDialog::SetInputSet( const SfxItemSet* pInSet ) { @@ -927,14 +927,14 @@ void IconChoiceDialog::SetInputSet( const SfxItemSet* pInSet ) } } -// ----------------------------------------------------------------------- + void IconChoiceDialog::PageCreated( sal_uInt16 /*nId*/, IconChoicePage& /*rPage*/ ) { // not interested in } -// ----------------------------------------------------------------------- + SfxItemSet* IconChoiceDialog::CreateInputItemSet( sal_uInt16 ) { @@ -959,7 +959,7 @@ short IconChoiceDialog::Execute() return Dialog::Execute(); } -// ----------------------------------------------------------------------- + void IconChoiceDialog::Start( sal_Bool bShow ) { @@ -974,7 +974,7 @@ void IconChoiceDialog::Start( sal_Bool bShow ) } -// ----------------------------------------------------------------------- + sal_Bool IconChoiceDialog::QueryClose() { @@ -991,7 +991,7 @@ sal_Bool IconChoiceDialog::QueryClose() return bRet; } -// ----------------------------------------------------------------------- + void IconChoiceDialog::Start_Impl() { @@ -1029,7 +1029,7 @@ void IconChoiceDialog::Start_Impl() ActivatePageImpl(); } -// ----------------------------------------------------------------------- + const SfxItemSet* IconChoiceDialog::GetRefreshedSet() { @@ -1097,7 +1097,7 @@ sal_Bool IconChoiceDialog::OK_Impl() return bEnd; } -// ----------------------------------------------------------------------- + short IconChoiceDialog::Ok() { @@ -1146,7 +1146,7 @@ short IconChoiceDialog::Ok() return _bModified ? RET_OK : RET_CANCEL; } -// ----------------------------------------------------------------------- + void IconChoiceDialog::FocusOnIcon( sal_uInt16 nId ) { diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index 98df52dadfde..b18821088f1f 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -100,7 +100,7 @@ InsertObjectDialog_Impl::InsertObjectDialog_Impl(Window * pParent, const OString { } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG_INLINE_START(SvInsertOleDlg, DoubleClickHdl) { @@ -109,7 +109,7 @@ IMPL_LINK_NOARG_INLINE_START(SvInsertOleDlg, DoubleClickHdl) } IMPL_LINK_INLINE_END( SvInsertOleDlg, DoubleClickHdl, ListBox *, pListBox ) -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvInsertOleDlg, BrowseHdl) { @@ -140,7 +140,7 @@ IMPL_LINK_NOARG(SvInsertOleDlg, BrowseHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvInsertOleDlg, RadioHdl) { @@ -157,14 +157,14 @@ IMPL_LINK_NOARG(SvInsertOleDlg, RadioHdl) return 0; } -// ----------------------------------------------------------------------- + void SvInsertOleDlg::SelectDefault() { m_pLbObjecttype->SelectEntryPos(0); } -// ----------------------------------------------------------------------- + SvInsertOleDlg::SvInsertOleDlg ( Window* pParent, @@ -382,7 +382,7 @@ IMPL_LINK_NOARG(SvInsertPlugInDialog, BrowseHdl) return 0; } -// ----------------------------------------------------------------------- + SvInsertPlugInDialog::SvInsertPlugInDialog(Window* pParent, const uno::Reference < embed::XStorage >& xStorage) @@ -400,7 +400,7 @@ SvInsertPlugInDialog::~SvInsertPlugInDialog() delete m_pURL; } -// ----------------------------------------------------------------------- + static void Plugin_ImplFillCommandSequence( const OUString& aCommands, uno::Sequence< beans::PropertyValue >& aCommandSequence ) { @@ -692,7 +692,7 @@ short SfxInsertFloatingFrameDialog::Execute() return nRet; } -//------------------------------------------------------------------------------ + IMPL_STATIC_LINK( SfxInsertFloatingFrameDialog, CheckHdl, CheckBox*, pCB ) { @@ -715,7 +715,7 @@ IMPL_STATIC_LINK( SfxInsertFloatingFrameDialog, CheckHdl, CheckBox*, pCB ) return 0L; } -//------------------------------------------------------------------------------ + IMPL_STATIC_LINK( SfxInsertFloatingFrameDialog, OpenHdl, PushButton*, EMPTYARG ) { diff --git a/cui/source/dialogs/multifil.cxx b/cui/source/dialogs/multifil.cxx index 0eca236620c3..a0b10a2f973b 100644 --- a/cui/source/dialogs/multifil.cxx +++ b/cui/source/dialogs/multifil.cxx @@ -124,7 +124,7 @@ IMPL_LINK( SvxMultiFileDialog, AddHdl_Impl, PushButton *, pBtn ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxMultiFileDialog, DelHdl_Impl) { @@ -143,7 +143,7 @@ IMPL_LINK_NOARG(SvxMultiFileDialog, DelHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + SvxMultiFileDialog::SvxMultiFileDialog( Window* pParent, sal_Bool bEmptyAllowed ) : @@ -157,7 +157,7 @@ SvxMultiFileDialog::SvxMultiFileDialog( Window* pParent, sal_Bool bEmptyAllowed aDelBtn.Enable(); } -// ----------------------------------------------------------------------- + SvxMultiFileDialog::~SvxMultiFileDialog() { diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx index 1fa83cb323d4..21233dd573d9 100644 --- a/cui/source/dialogs/multipat.cxx +++ b/cui/source/dialogs/multipat.cxx @@ -65,7 +65,7 @@ IMPL_LINK_NOARG(SvxMultiPathDialog, SelectHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxMultiPathDialog, CheckHdl_Impl, svx::SvxRadioButtonListBox *, pBox ) { @@ -76,7 +76,7 @@ IMPL_LINK( SvxMultiPathDialog, CheckHdl_Impl, svx::SvxRadioButtonListBox *, pBox return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxMultiPathDialog, AddHdl_Impl) { @@ -128,7 +128,7 @@ IMPL_LINK_NOARG(SvxMultiPathDialog, AddHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxMultiPathDialog, DelHdl_Impl) { @@ -174,7 +174,7 @@ IMPL_LINK_NOARG(SvxMultiPathDialog, DelHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + SvxMultiPathDialog::SvxMultiPathDialog( Window* pParent, sal_Bool bEmptyAllowed ) : @@ -214,7 +214,7 @@ SvxMultiPathDialog::SvxMultiPathDialog( Window* pParent, sal_Bool bEmptyAllowed aDelBtn.SetAccessibleRelationMemberOf(&aPathLB); } -// ----------------------------------------------------------------------- + SvxMultiPathDialog::~SvxMultiPathDialog() { @@ -230,7 +230,7 @@ SvxMultiPathDialog::~SvxMultiPathDialog() delete pImpl; } -// ----------------------------------------------------------------------- + OUString SvxMultiPathDialog::GetPath() const { @@ -268,7 +268,7 @@ OUString SvxMultiPathDialog::GetPath() const return sNewPath; } -// ----------------------------------------------------------------------- + void SvxMultiPathDialog::SetPath( const OUString& rPath ) { @@ -313,7 +313,7 @@ void SvxMultiPathDialog::SetPath( const OUString& rPath ) SelectHdl_Impl( NULL ); } -// ----------------------------------------------------------------------- + void SvxMultiPathDialog::SetClassPathMode() { @@ -322,14 +322,14 @@ void SvxMultiPathDialog::SetClassPathMode() aPathFL.SetText( CUI_RES( RID_SVXSTR_ARCHIVE_HEADLINE ) ); } -// ----------------------------------------------------------------------- + sal_Bool SvxMultiPathDialog::IsClassPathMode() const { return pImpl->bIsClassPathMode; } -// ----------------------------------------------------------------------- + void SvxMultiPathDialog::EnableRadioButtonMode() { diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx index e4ba4c047b6a..d430bdb75c45 100644 --- a/cui/source/dialogs/postdlg.cxx +++ b/cui/source/dialogs/postdlg.cxx @@ -121,7 +121,7 @@ SvxPostItDialog::SvxPostItDialog(Window* pParent, const SfxItemSet& rCoreSet, SetText( get<FixedText>("alttitle")->GetText() ); } -// ----------------------------------------------------------------------- + SvxPostItDialog::~SvxPostItDialog() { @@ -129,7 +129,7 @@ SvxPostItDialog::~SvxPostItDialog() pOutSet = 0; } -// ----------------------------------------------------------------------- + void SvxPostItDialog::ShowLastAuthor(const OUString& rAuthor, const OUString& rDate) { @@ -139,7 +139,7 @@ void SvxPostItDialog::ShowLastAuthor(const OUString& rAuthor, const OUString& rD m_pLastEditFT->SetText( sTxt ); } -// ----------------------------------------------------------------------- + sal_uInt16* SvxPostItDialog::GetRanges() { @@ -152,7 +152,7 @@ sal_uInt16* SvxPostItDialog::GetRanges() return pRanges; } -// ----------------------------------------------------------------------- + void SvxPostItDialog::EnableTravel(sal_Bool bNext, sal_Bool bPrev) { @@ -160,7 +160,7 @@ void SvxPostItDialog::EnableTravel(sal_Bool bNext, sal_Bool bPrev) m_pNextBtn->Enable(bNext); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG_INLINE_START(SvxPostItDialog, PrevHdl) { @@ -169,7 +169,7 @@ IMPL_LINK_NOARG_INLINE_START(SvxPostItDialog, PrevHdl) } IMPL_LINK_NOARG_INLINE_END(SvxPostItDialog, PrevHdl) -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG_INLINE_START(SvxPostItDialog, NextHdl) { @@ -178,7 +178,7 @@ IMPL_LINK_NOARG_INLINE_START(SvxPostItDialog, NextHdl) } IMPL_LINK_NOARG_INLINE_END(SvxPostItDialog, NextHdl) -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxPostItDialog, Stamp) { @@ -208,7 +208,7 @@ IMPL_LINK_NOARG(SvxPostItDialog, Stamp) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxPostItDialog, OKHdl) { diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index b47fa2e4fa51..5b22625109ab 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -423,9 +423,9 @@ void SFTreeListBox::ExpandedHdl() { } -// ---------------------------------------------------------------------------- + // CuiInputDialog ------------------------------------------------------------ -// ---------------------------------------------------------------------------- + CuiInputDialog::CuiInputDialog(Window * pParent, sal_uInt16 nMode ) : ModalDialog(pParent, "NewLibDialog", "cui/ui/newlibdialog.ui") @@ -451,9 +451,9 @@ CuiInputDialog::CuiInputDialog(Window * pParent, sal_uInt16 nMode ) } } -// ---------------------------------------------------------------------------- + // ScriptOrgDialog ------------------------------------------------------------ -// ---------------------------------------------------------------------------- + SvxScriptOrgDialog::SvxScriptOrgDialog( Window* pParent, OUString language ) : SfxModalDialog(pParent, "ScriptOrganizerDialog", "cui/ui/scriptorganizer.ui") diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx index d6d1ab001413..b16642e7b72f 100644 --- a/cui/source/dialogs/showcols.cxx +++ b/cui/source/dialogs/showcols.cxx @@ -34,7 +34,7 @@ // FmShowColsDialog //========================================================================== DBG_NAME(FmShowColsDialog) -//-------------------------------------------------------------------------- + FmShowColsDialog::FmShowColsDialog(Window* pParent) : ModalDialog(pParent, "ShowColDialog", "cui/ui/showcoldialog.ui") { @@ -46,7 +46,7 @@ FmShowColsDialog::FmShowColsDialog(Window* pParent) m_pOK->SetClickHdl( LINK( this, FmShowColsDialog, OnClickedOk ) ); } -//-------------------------------------------------------------------------- + IMPL_LINK_NOARG(FmShowColsDialog, OnClickedOk) { DBG_ASSERT(m_xColumns.is(), "FmShowColsDialog::OnClickedOk : you should call SetColumns before executing the dialog !"); @@ -74,7 +74,7 @@ IMPL_LINK_NOARG(FmShowColsDialog, OnClickedOk) return 0L; } -//-------------------------------------------------------------------------- + void FmShowColsDialog::SetColumns(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer>& xCols) { DBG_ASSERT(xCols.is(), "FmShowColsDialog::SetColumns : invalid columns !"); diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx index 16a043428910..d13ce270845e 100644 --- a/cui/source/dialogs/srchxtra.cxx +++ b/cui/source/dialogs/srchxtra.cxx @@ -171,7 +171,7 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog(Window* pParent, m_pAttrLB->SelectEntryPos( 0 ); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxSearchAttributeDialog, OKHdl) { diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx index 019e43c0b46b..e369d03ef2fa 100644 --- a/cui/source/dialogs/zoom.cxx +++ b/cui/source/dialogs/zoom.cxx @@ -48,7 +48,7 @@ sal_uInt16 SvxZoomDialog::GetFactor() const return SPECIAL_FACTOR; } -// ----------------------------------------------------------------------- + void SvxZoomDialog::SetFactor( sal_uInt16 nNewFactor, sal_uInt16 nBtnId ) { @@ -91,7 +91,7 @@ void SvxZoomDialog::SetFactor( sal_uInt16 nNewFactor, sal_uInt16 nBtnId ) } } -// ----------------------------------------------------------------------- + void SvxZoomDialog::HideButton( sal_uInt16 nBtnId ) { @@ -114,7 +114,7 @@ void SvxZoomDialog::HideButton( sal_uInt16 nBtnId ) } } -// ----------------------------------------------------------------------- + void SvxZoomDialog::SetLimits( sal_uInt16 nMin, sal_uInt16 nMax ) { @@ -125,7 +125,7 @@ void SvxZoomDialog::SetLimits( sal_uInt16 nMin, sal_uInt16 nMax ) m_pUserEdit->SetLast( nMax ); } -// ----------------------------------------------------------------------- + SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) : SfxModalDialog(pParent, "ZoomDialog", "cui/ui/zoomdialog.ui") @@ -285,7 +285,7 @@ SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) } } -// ----------------------------------------------------------------------- + SvxZoomDialog::~SvxZoomDialog() { @@ -293,7 +293,7 @@ SvxZoomDialog::~SvxZoomDialog() pOutSet = 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxZoomDialog, UserHdl, RadioButton *, pBtn ) { @@ -309,7 +309,7 @@ IMPL_LINK( SvxZoomDialog, UserHdl, RadioButton *, pBtn ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxZoomDialog, SpinHdl) { @@ -319,7 +319,7 @@ IMPL_LINK_NOARG(SvxZoomDialog, SpinHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxZoomDialog, ViewLayoutUserHdl, RadioButton *, pBtn ) { @@ -351,7 +351,7 @@ IMPL_LINK( SvxZoomDialog, ViewLayoutUserHdl, RadioButton *, pBtn ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxZoomDialog, ViewLayoutSpinHdl, NumericField *, pEdt ) { @@ -371,7 +371,7 @@ IMPL_LINK( SvxZoomDialog, ViewLayoutSpinHdl, NumericField *, pEdt ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxZoomDialog, ViewLayoutCheckHdl, CheckBox *, pChk ) { @@ -383,7 +383,7 @@ IMPL_LINK( SvxZoomDialog, ViewLayoutCheckHdl, CheckBox *, pChk ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxZoomDialog, OKHdl, Button *, pBtn ) { diff --git a/cui/source/factory/init.cxx b/cui/source/factory/init.cxx index a903d19269c8..12d1316f57cc 100644 --- a/cui/source/factory/init.cxx +++ b/cui/source/factory/init.cxx @@ -20,7 +20,7 @@ #include <vcl/msgbox.hxx> #include "cuicharmap.hxx" -// ------------------------------------------------------------------------ + // hook to call special character dialog for edits // caution: needs C-Linkage since dynamically loaded via symbol name extern "C" diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx index b128312c182c..90122e166be4 100644 --- a/cui/source/options/cfgchart.cxx +++ b/cui/source/options/cfgchart.cxx @@ -272,9 +272,9 @@ void SvxChartOptions::Notify( const com::sun::star::uno::Sequence< OUString >& ) { } -// -------------------- + // class SvxChartColorTableItem -// -------------------- + SvxChartColorTableItem::SvxChartColorTableItem( sal_uInt16 nWhich_, const SvxChartColorTable& aTable ) : SfxPoolItem( nWhich_ ), diff --git a/cui/source/options/connpoolconfig.cxx b/cui/source/options/connpoolconfig.cxx index 1f4a2b29cfdb..254fd12cee4f 100644 --- a/cui/source/options/connpoolconfig.cxx +++ b/cui/source/options/connpoolconfig.cxx @@ -36,42 +36,42 @@ namespace offapp using namespace ::utl; using namespace ::com::sun::star::uno; - //-------------------------------------------------------------------- + static const OUString& getConnectionPoolNodeName() { static OUString s_sNodeName("org.openoffice.Office.DataAccess/ConnectionPool" ); return s_sNodeName; } - //-------------------------------------------------------------------- + static const OUString& getEnablePoolingNodeName() { static OUString s_sNodeName("EnablePooling"); return s_sNodeName; } - //-------------------------------------------------------------------- + static const OUString& getDriverSettingsNodeName() { static OUString s_sNodeName("DriverSettings"); return s_sNodeName; } - //-------------------------------------------------------------------- + static const OUString& getDriverNameNodeName() { static OUString s_sNodeName("DriverName"); return s_sNodeName; } - //-------------------------------------------------------------------- + static const OUString& getEnableNodeName() { static OUString s_sNodeName("Enable"); return s_sNodeName; } - //-------------------------------------------------------------------- + static const OUString& getTimeoutNodeName() { static OUString s_sNodeName("Timeout"); @@ -81,7 +81,7 @@ namespace offapp //==================================================================== //= ConnectionPoolConfig //==================================================================== - //-------------------------------------------------------------------- + void ConnectionPoolConfig::GetOptions(SfxItemSet& _rFillItems) { // the config node where all pooling relevant info are stored under @@ -146,7 +146,7 @@ namespace offapp _rFillItems.Put(DriverPoolingSettingsItem(SID_SB_DRIVER_TIMEOUTS, aSettings)); } - //-------------------------------------------------------------------- + void ConnectionPoolConfig::SetOptions(const SfxItemSet& _rSourceItems) { // the config node where all pooling relevant info are stored under diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index d58d38de284c..4c6adee5dc31 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -88,7 +88,7 @@ namespace offapp OUString implGetCellText(DriverPoolingSettings::const_iterator _rPos, sal_uInt16 _nColId) const; }; - //-------------------------------------------------------------------- + DriverListControl::DriverListControl(Window* _pParent) :EditBrowseBox(_pParent, EBBF_NOROWPICTURE, BROWSER_AUTO_VSCROLL | BROWSER_AUTO_HSCROLL | BROWSER_HIDECURSOR | BROWSER_AUTOSIZE_LASTCOL | WB_BORDER) ,m_aSeekRow(m_aSettings.end()) @@ -105,14 +105,14 @@ namespace offapp return new DriverListControl(pParent); } - //-------------------------------------------------------------------- + sal_Bool DriverListControl::IsTabAllowed(sal_Bool /*_bForward*/) const { // no travinling within the fields via RETURN and TAB return sal_False; } - //-------------------------------------------------------------------- + sal_Bool DriverListControl::isModified() const { if (m_aSettings.size() != m_aSavedSettings.size()) @@ -130,7 +130,7 @@ namespace offapp return sal_False; } - //-------------------------------------------------------------------- + void DriverListControl::Init() { EditBrowseBox::Init(); @@ -144,7 +144,7 @@ namespace offapp // Attention: the resource of the string is local to the resource of the enclosing dialog! } - //-------------------------------------------------------------------- + void DriverListControl::CursorMoved() { EditBrowseBox::CursorMoved(); @@ -159,7 +159,7 @@ namespace offapp } } - //-------------------------------------------------------------------- + const DriverPooling* DriverListControl::getCurrentRow() const { OSL_ENSURE( ( GetCurRow() < m_aSettings.size() ) && ( GetCurRow() >= 0 ), @@ -171,7 +171,7 @@ namespace offapp return NULL; } - //-------------------------------------------------------------------- + DriverPooling* DriverListControl::getCurrentRow() { OSL_ENSURE( ( GetCurRow() < m_aSettings.size() ) && ( GetCurRow() >= 0 ), @@ -183,13 +183,13 @@ namespace offapp return NULL; } - //-------------------------------------------------------------------- + void DriverListControl::updateCurrentRow() { Window::Invalidate( GetRowRectPixel( GetCurRow() ), INVALIDATE_UPDATE ); } - //-------------------------------------------------------------------- + void DriverListControl::Update(const DriverPoolingSettings& _rSettings) { m_aSettings = _rSettings; @@ -202,13 +202,13 @@ namespace offapp ActivateCell(1, 0); } - //-------------------------------------------------------------------- + sal_uInt32 DriverListControl::GetTotalCellWidth(long nRow, sal_uInt16 nColId) { return GetDataWindow().GetTextWidth(GetCellText(nRow, nColId)); } - //-------------------------------------------------------------------- + OUString DriverListControl::implGetCellText(DriverPoolingSettings::const_iterator _rPos, sal_uInt16 _nColId) const { OSL_ENSURE(_rPos < m_aSettings.end(), "DriverListControl::implGetCellText: invalid position!"); @@ -232,7 +232,7 @@ namespace offapp return sReturn; } - //-------------------------------------------------------------------- + void DriverListControl::StateChanged( StateChangedType nStateChange ) { if (STATE_CHANGE_ENABLE == nStateChange) @@ -240,7 +240,7 @@ namespace offapp EditBrowseBox::StateChanged( nStateChange ); } - //-------------------------------------------------------------------- + OUString DriverListControl::GetCellText( long nRow, sal_uInt16 nColId ) const { OUString sReturn; @@ -255,25 +255,25 @@ namespace offapp return sReturn; } - //-------------------------------------------------------------------- + void DriverListControl::InitController( ::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol ) { rController->GetWindow().SetText(GetCellText(nRow, nCol)); } - //-------------------------------------------------------------------- + ::svt::CellController* DriverListControl::GetController( long /*nRow*/, sal_uInt16 /*nCol*/ ) { return NULL; } - //-------------------------------------------------------------------- + sal_Bool DriverListControl::SaveModified() { return sal_True; } - //-------------------------------------------------------------------- + sal_Bool DriverListControl::SeekRow( long _nRow ) { EditBrowseBox::SeekRow(_nRow); @@ -286,7 +286,7 @@ namespace offapp return m_aSeekRow != m_aSettings.end(); } - //-------------------------------------------------------------------- + void DriverListControl::PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId ) const { OSL_ENSURE(m_aSeekRow != m_aSettings.end(), "DriverListControl::PaintCell: invalid row!"); @@ -314,7 +314,7 @@ namespace offapp //==================================================================== //= ConnectionPoolOptionsPage //==================================================================== - //-------------------------------------------------------------------- + ConnectionPoolOptionsPage::ConnectionPoolOptionsPage(Window* _pParent, const SfxItemSet& _rAttrSet) : SfxTabPage(_pParent, "ConnPoolPage", "cui/ui/connpooloptions.ui", _rAttrSet) { @@ -340,13 +340,13 @@ namespace offapp m_pDriverList->SetRowChangeHandler( LINK(this, ConnectionPoolOptionsPage, OnDriverRowChanged) ); } - //-------------------------------------------------------------------- + SfxTabPage* ConnectionPoolOptionsPage::Create(Window* _pParent, const SfxItemSet& _rAttrSet) { return new ConnectionPoolOptionsPage(_pParent, _rAttrSet); } - //-------------------------------------------------------------------- + void ConnectionPoolOptionsPage::implInitControls(const SfxItemSet& _rSet, sal_Bool /*_bFromReset*/) { // the enabled flag @@ -371,7 +371,7 @@ namespace offapp OnEnabledDisabled(m_pEnablePooling); } - //-------------------------------------------------------------------- + bool ConnectionPoolOptionsPage::Notify( NotifyEvent& _rNEvt ) { if (EVENT_LOSEFOCUS == _rNEvt.GetType()) @@ -381,7 +381,7 @@ namespace offapp return SfxTabPage::Notify(_rNEvt); } - //-------------------------------------------------------------------- + sal_Bool ConnectionPoolOptionsPage::FillItemSet(SfxItemSet& _rSet) { commitTimeoutField(); @@ -404,20 +404,20 @@ namespace offapp return bModified; } - //-------------------------------------------------------------------- + void ConnectionPoolOptionsPage::ActivatePage( const SfxItemSet& _rSet) { SfxTabPage::ActivatePage(_rSet); implInitControls(_rSet, sal_False); } - //-------------------------------------------------------------------- + void ConnectionPoolOptionsPage::Reset(const SfxItemSet& _rSet) { implInitControls(_rSet, sal_True); } - //-------------------------------------------------------------------- + IMPL_LINK( ConnectionPoolOptionsPage, OnDriverRowChanged, const void*, _pRowIterator ) { sal_Bool bValidRow = (NULL != _pRowIterator); @@ -443,7 +443,7 @@ namespace offapp return 0L; } - //-------------------------------------------------------------------- + void ConnectionPoolOptionsPage::commitTimeoutField() { if (DriverPooling* pCurrentDriver = m_pDriverList->getCurrentRow()) @@ -453,7 +453,7 @@ namespace offapp } } - //-------------------------------------------------------------------- + IMPL_LINK( ConnectionPoolOptionsPage, OnEnabledDisabled, const CheckBox*, _pCheckBox ) { sal_Bool bGloballyEnabled = m_pEnablePooling->IsChecked(); diff --git a/cui/source/options/connpoolsettings.cxx b/cui/source/options/connpoolsettings.cxx index 63a75b2f4f26..59a86c74f8cb 100644 --- a/cui/source/options/connpoolsettings.cxx +++ b/cui/source/options/connpoolsettings.cxx @@ -27,7 +27,7 @@ namespace offapp //==================================================================== //= DriverPooling //==================================================================== - //-------------------------------------------------------------------- + DriverPooling::DriverPooling( const OUString& _rName, sal_Bool _bEnabled, const sal_Int32 _nTimeout ) :sName(_rName) ,bEnabled(_bEnabled) @@ -35,7 +35,7 @@ namespace offapp { } - //-------------------------------------------------------------------- + sal_Bool DriverPooling::operator == (const DriverPooling& _rR) const { return (sName == _rR.sName) @@ -46,7 +46,7 @@ namespace offapp //==================================================================== //= DriverPoolingSettings //==================================================================== - //-------------------------------------------------------------------- + DriverPoolingSettings::DriverPoolingSettings() { } @@ -55,14 +55,14 @@ namespace offapp //= DriverPoolingSettingsItem //==================================================================== TYPEINIT1( DriverPoolingSettingsItem, SfxPoolItem ) - //-------------------------------------------------------------------- + DriverPoolingSettingsItem::DriverPoolingSettingsItem( sal_uInt16 _nId, const DriverPoolingSettings &_rSettings ) :SfxPoolItem(_nId) ,m_aSettings(_rSettings) { } - //-------------------------------------------------------------------- + bool DriverPoolingSettingsItem::operator==( const SfxPoolItem& _rCompare ) const { const DriverPoolingSettingsItem* pItem = PTR_CAST(DriverPoolingSettingsItem, &_rCompare); @@ -87,13 +87,13 @@ namespace offapp return true; } - //-------------------------------------------------------------------- + SfxPoolItem* DriverPoolingSettingsItem::Clone( SfxItemPool * ) const { return new DriverPoolingSettingsItem(Which(), m_aSettings); } - //-------------------------------------------------------------------- + //........................................................................ } // namespace offapp diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index 4ec978d07a05..5bdca4c442b2 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -163,7 +163,7 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( Window* pParent, const Sfx pPathBox->ShowTable(); } -// ----------------------------------------------------------------------- + DbRegistrationOptionsPage::~DbRegistrationOptionsPage() { @@ -172,7 +172,7 @@ DbRegistrationOptionsPage::~DbRegistrationOptionsPage() delete pPathBox; } -// ----------------------------------------------------------------------- + SfxTabPage* DbRegistrationOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) @@ -180,7 +180,7 @@ SfxTabPage* DbRegistrationOptionsPage::Create( Window* pParent, return ( new DbRegistrationOptionsPage( pParent, rAttrSet ) ); } -// ----------------------------------------------------------------------- + sal_Bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet& rCoreSet ) { @@ -208,7 +208,7 @@ sal_Bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet& rCoreSet ) return bModified; } -// ----------------------------------------------------------------------- + void DbRegistrationOptionsPage::Reset( const SfxItemSet& rSet ) { @@ -256,7 +256,7 @@ void DbRegistrationOptionsPage::Reset( const SfxItemSet& rSet ) } } -// ----------------------------------------------------------------------- + void DbRegistrationOptionsPage::FillUserData() { @@ -268,7 +268,7 @@ void DbRegistrationOptionsPage::FillUserData() aUserData += (bUp ? OUString("1") : OUString("0")); SetUserData( aUserData ); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(DbRegistrationOptionsPage, DeleteHdl) { @@ -281,7 +281,7 @@ IMPL_LINK_NOARG(DbRegistrationOptionsPage, DeleteHdl) } return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(DbRegistrationOptionsPage, NewHdl) { OUString sNewName,sNewLocation; @@ -289,7 +289,7 @@ IMPL_LINK_NOARG(DbRegistrationOptionsPage, NewHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(DbRegistrationOptionsPage, EditHdl) { @@ -309,7 +309,7 @@ IMPL_LINK_NOARG(DbRegistrationOptionsPage, EditHdl) return 1L; } -// ----------------------------------------------------------------------- + IMPL_LINK( DbRegistrationOptionsPage, HeaderSelect_Impl, HeaderBar*, pBar ) { @@ -340,7 +340,7 @@ IMPL_LINK( DbRegistrationOptionsPage, HeaderSelect_Impl, HeaderBar*, pBar ) return 1; } -// ----------------------------------------------------------------------- + IMPL_LINK( DbRegistrationOptionsPage, HeaderEndDrag_Impl, HeaderBar*, pBar ) { @@ -372,7 +372,7 @@ IMPL_LINK( DbRegistrationOptionsPage, HeaderEndDrag_Impl, HeaderBar*, pBar ) } return 1; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(DbRegistrationOptionsPage, PathSelect_Impl) { @@ -389,7 +389,7 @@ IMPL_LINK_NOARG(DbRegistrationOptionsPage, PathSelect_Impl) m_pDelete->Enable( !bReadOnly ); return 0; } -// ----------------------------------------------------------------------------- + void DbRegistrationOptionsPage::insertNewEntry( const OUString& _sName,const OUString& _sLocation, const bool _bReadOnly ) { OUString aStr( _sName ); @@ -410,7 +410,7 @@ void DbRegistrationOptionsPage::insertNewEntry( const OUString& _sName,const OUS pEntry->SetUserData( new DatabaseRegistration( _sLocation, _bReadOnly ) ); } -// ----------------------------------------------------------------------------- + void DbRegistrationOptionsPage::openLinkDialog(const OUString& _sOldName,const OUString& _sOldLocation,SvTreeListEntry* _pEntry) { ODocumentLinkDialog aDlg(this,_pEntry == NULL); @@ -434,7 +434,7 @@ void DbRegistrationOptionsPage::openLinkDialog(const OUString& _sOldName,const O } } } -// ----------------------------------------------------------------------------- + IMPL_LINK( DbRegistrationOptionsPage, NameValidator, OUString*, _pName ) { if ( _pName ) diff --git a/cui/source/options/dbregisterednamesconfig.cxx b/cui/source/options/dbregisterednamesconfig.cxx index b802ad981214..5f03c7339877 100644 --- a/cui/source/options/dbregisterednamesconfig.cxx +++ b/cui/source/options/dbregisterednamesconfig.cxx @@ -44,7 +44,7 @@ namespace svx //==================================================================== //= DbRegisteredNamesConfig //==================================================================== - //-------------------------------------------------------------------- + void DbRegisteredNamesConfig::GetOptions( SfxItemSet& _rFillItems ) { DatabaseRegistrations aSettings; @@ -73,7 +73,7 @@ namespace svx _rFillItems.Put( DatabaseMapItem( SID_SB_DB_REGISTER, aSettings ) ); } - //-------------------------------------------------------------------- + void DbRegisteredNamesConfig::SetOptions(const SfxItemSet& _rSourceItems) { // the settings for the single drivers diff --git a/cui/source/options/dbregistersettings.cxx b/cui/source/options/dbregistersettings.cxx index 6dac6e67c836..1b6b5b581ad0 100644 --- a/cui/source/options/dbregistersettings.cxx +++ b/cui/source/options/dbregistersettings.cxx @@ -30,14 +30,14 @@ namespace svx //= DatabaseMapItem //==================================================================== TYPEINIT1( DatabaseMapItem, SfxPoolItem ) - //-------------------------------------------------------------------- + DatabaseMapItem::DatabaseMapItem( sal_uInt16 _nId, const DatabaseRegistrations& _rRegistrations ) :SfxPoolItem( _nId ) ,m_aRegistrations( _rRegistrations ) { } - //-------------------------------------------------------------------- + bool DatabaseMapItem::operator==( const SfxPoolItem& _rCompare ) const { const DatabaseMapItem* pItem = PTR_CAST(DatabaseMapItem, &_rCompare); @@ -50,13 +50,13 @@ namespace svx return m_aRegistrations == pItem->m_aRegistrations; } - //-------------------------------------------------------------------- + SfxPoolItem* DatabaseMapItem::Clone( SfxItemPool* ) const { return new DatabaseMapItem( Which(), m_aRegistrations ); } - //-------------------------------------------------------------------- + //........................................................................ } // namespace svx diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx index 3e9d2f6f136b..78e8901df9ee 100644 --- a/cui/source/options/doclinkdialog.cxx +++ b/cui/source/options/doclinkdialog.cxx @@ -42,7 +42,7 @@ namespace svx //================================================================== //= ODocumentLinkDialog //================================================================== - //------------------------------------------------------------------ + ODocumentLinkDialog::ODocumentLinkDialog( Window* _pParent, sal_Bool _bCreateNew ) : ModalDialog(_pParent, "DatabaseLinkDialog", "cui/ui/databaselinkdialog.ui") @@ -70,7 +70,7 @@ namespace svx m_pURL->SetDropDownLineCount( 5 ); } - //------------------------------------------------------------------ + void ODocumentLinkDialog::setLink( const OUString& _rName, const OUString& _rURL ) { m_pName->SetText(_rName); @@ -78,21 +78,21 @@ namespace svx validate(); } - //------------------------------------------------------------------ + void ODocumentLinkDialog::getLink( OUString& _rName, OUString& _rURL ) const { _rName = m_pName->GetText(); _rURL = m_pURL->GetText(); } - //------------------------------------------------------------------ + void ODocumentLinkDialog::validate( ) { m_pOK->Enable( ( !m_pName->GetText().isEmpty()) && ( !m_pURL->GetText().isEmpty() ) ); } - //------------------------------------------------------------------ + IMPL_LINK_NOARG(ODocumentLinkDialog, OnOk) { // get the current URL @@ -150,7 +150,7 @@ namespace svx return 0L; } - //------------------------------------------------------------------ + IMPL_LINK_NOARG(ODocumentLinkDialog, OnBrowseFile) { ::sfx2::FileDialogHelper aFileDlg( @@ -195,7 +195,7 @@ namespace svx return 0L; } - //------------------------------------------------------------------ + IMPL_LINK_NOARG(ODocumentLinkDialog, OnTextModified) { validate( ); diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index eb66e8bcf3bd..b0aef7426558 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -315,7 +315,7 @@ IMPL_LINK(SvxFontSubstTabPage, SelectHdl, Window*, pWin) return 0; } -//-------------------------------------------------------------------------- + IMPL_LINK(SvxFontSubstTabPage, NonPropFontsHdl, CheckBox*, pBox) { OUString sFontName = m_pFontNameLB->GetSelectEntry(); diff --git a/cui/source/options/optHeaderTabListbox.cxx b/cui/source/options/optHeaderTabListbox.cxx index 13255efa306f..2fb211d0c5eb 100644 --- a/cui/source/options/optHeaderTabListbox.cxx +++ b/cui/source/options/optHeaderTabListbox.cxx @@ -38,7 +38,7 @@ public: const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry); }; -// ----------------------------------------------------------------------- + void OptLBoxString_Impl::Paint( const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* /*pView*/, const SvTreeListEntry* pEntry) @@ -52,14 +52,14 @@ void OptLBoxString_Impl::Paint( rDev.DrawText( rPos, GetText() ); rDev.SetFont( aOldFont ); } -// ----------------------------------------------------------------------------- + OptHeaderTabListBox::OptHeaderTabListBox(SvSimpleTableContainer& rParent, WinBits nWinStyle) : SvSimpleTable(rParent, nWinStyle) { } -// ----------------------------------------------------------------------- + void OptHeaderTabListBox::InitEntry( SvTreeListEntry* pEntry, const OUString& rTxt, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind ) diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index a9f5ff8af34f..3348c38f7a27 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -159,12 +159,12 @@ long SvxDefaultColorOptPage::GetColorIndex( const Color& rCol ) -// -------------------- + // event handlers -// -------------------- + // ResetToDefaults -// --------------- + IMPL_LINK_NOARG(SvxDefaultColorOptPage, ResetToDefaults) { @@ -183,7 +183,7 @@ IMPL_LINK_NOARG(SvxDefaultColorOptPage, ResetToDefaults) } // AddChartColor -// ------------ + IMPL_LINK_NOARG(SvxDefaultColorOptPage, AddChartColor) { @@ -204,7 +204,7 @@ IMPL_LINK_NOARG(SvxDefaultColorOptPage, AddChartColor) } // RemoveChartColor -// ---------------- + IMPL_LINK( SvxDefaultColorOptPage, RemoveChartColor, PushButton*, pButton ) { diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx index 7223e3972663..ebd2e495c813 100644 --- a/cui/source/options/optctl.cxx +++ b/cui/source/options/optctl.cxx @@ -56,16 +56,16 @@ SvxCTLOptionsPage::SvxCTLOptionsPage( Window* pParent, const SfxItemSet& rSet ) m_pNumeralsLB->SetDropDownLineCount( m_pNumeralsLB->GetEntryCount() ); } -// ----------------------------------------------------------------------------- + SvxCTLOptionsPage::~SvxCTLOptionsPage() { } -// ----------------------------------------------------------------------------- + SfxTabPage* SvxCTLOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new SvxCTLOptionsPage( pParent, rAttrSet ); } -// ----------------------------------------------------------------------------- + sal_Bool SvxCTLOptionsPage::FillItemSet( SfxItemSet& ) { sal_Bool bModified = sal_False; @@ -112,7 +112,7 @@ sal_Bool SvxCTLOptionsPage::FillItemSet( SfxItemSet& ) return bModified; } -// ----------------------------------------------------------------------------- + void SvxCTLOptionsPage::Reset( const SfxItemSet& ) { SvtCTLOptions aCTLOptions; diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index 5476f8d8d8c9..afd4b6386fd1 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -117,7 +117,7 @@ SvxNewDictionaryDialog::SvxNewDictionaryDialog( Window* pParent, pLanguageLB->SelectEntryPos(0); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl) { @@ -191,7 +191,7 @@ IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG_INLINE_START(SvxNewDictionaryDialog, ModifyHdl_Impl) { @@ -330,13 +330,13 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog( } } -// ----------------------------------------------------------------------- + SvxEditDictionaryDialog::~SvxEditDictionaryDialog() { } -// ----------------------------------------------------------------------- + /* void SvxEditDictionaryDialog::Paint( const Rectangle& rRect ) { @@ -348,7 +348,7 @@ void SvxEditDictionaryDialog::Paint( const Rectangle& rRect ) // aDecoView.DrawButton( aRect, nStyle); } */ -// ----------------------------------------------------------------------- + void SvxEditDictionaryDialog::SetDicReadonly_Impl( Reference< XDictionary > &xDic ) @@ -367,7 +367,7 @@ void SvxEditDictionaryDialog::SetDicReadonly_Impl( } } -// ----------------------------------------------------------------------- + void SvxEditDictionaryDialog::SetLanguage_Impl( util::Language nLanguage ) { @@ -414,7 +414,7 @@ void SvxEditDictionaryDialog::RemoveDictEntry(SvTreeListEntry* pEntry) } } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectBookHdl_Impl) { @@ -439,7 +439,7 @@ IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectBookHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectLangHdl_Impl) { @@ -474,7 +474,7 @@ IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectLangHdl_Impl) return 1; } -// ----------------------------------------------------------------------- + void SvxEditDictionaryDialog::ShowWords_Impl( sal_uInt16 nId ) { @@ -546,7 +546,7 @@ void SvxEditDictionaryDialog::ShowWords_Impl( sal_uInt16 nId ) LeaveWait(); } -// ----------------------------------------------------------------------- + IMPL_LINK(SvxEditDictionaryDialog, SelectHdl, SvTabListBox*, pBox) { @@ -573,7 +573,7 @@ IMPL_LINK(SvxEditDictionaryDialog, SelectHdl, SvTabListBox*, pBox) return 0; }; -// ----------------------------------------------------------------------- + IMPL_LINK(SvxEditDictionaryDialog, NewDelHdl, PushButton*, pBtn) { @@ -671,7 +671,7 @@ IMPL_LINK(SvxEditDictionaryDialog, NewDelHdl, PushButton*, pBtn) return 1; } -// ----------------------------------------------------------------------- + IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt) { diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index 951ac053f5dd..a1c10e088d61 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -36,7 +36,7 @@ enum MSFltrPg2_CheckBoxEntries { InvalidCBEntry }; -// ----------------------------------------------------------------------- + OfaMSFilterTabPage::OfaMSFilterTabPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage( pParent, "OptFltrPage", "cui/ui/optfltrpage.ui", rSet ) diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 3e4cdf57c5bd..83bb0eeb8436 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -181,7 +181,7 @@ namespace } } -// ----------------------------------------------------------------------- + OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OptGeneralPage", "cui/ui/optgeneralpage.ui", rSet) @@ -227,20 +227,20 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet) m_pToolTipsCB->SetClickHdl( aLink ); } -// ----------------------------------------------------------------------- + OfaMiscTabPage::~OfaMiscTabPage() { } -// ----------------------------------------------------------------------- + SfxTabPage* OfaMiscTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new OfaMiscTabPage( pParent, rAttrSet ); } -// ----------------------------------------------------------------------- + sal_Bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet ) { @@ -294,7 +294,7 @@ sal_Bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet ) return bModified; } -// ----------------------------------------------------------------------- + void OfaMiscTabPage::Reset( const SfxItemSet& rSet ) { @@ -329,7 +329,7 @@ void OfaMiscTabPage::Reset( const SfxItemSet& rSet ) } } -// ----------------------------------------------------------------------- + IMPL_LINK( OfaMiscTabPage, TwoFigureHdl, NumericField*, pEd ) { @@ -353,7 +353,7 @@ IMPL_LINK( OfaMiscTabPage, TwoFigureHdl, NumericField*, pEd ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( OfaMiscTabPage, TwoFigureConfigHdl, NumericField*, pEd ) { @@ -365,7 +365,7 @@ IMPL_LINK( OfaMiscTabPage, TwoFigureConfigHdl, NumericField*, pEd ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(OfaMiscTabPage, HelpCheckHdl_Impl) { @@ -373,7 +373,7 @@ IMPL_LINK_NOARG(OfaMiscTabPage, HelpCheckHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + class CanvasSettings { @@ -393,7 +393,7 @@ private: mutable sal_Bool mbHWAccelChecked; }; -// ------------------------------------------------------------------- + CanvasSettings::CanvasSettings() : mxForceFlagNameAccess(), mbHWAccelAvailable(sal_False), @@ -452,7 +452,7 @@ CanvasSettings::CanvasSettings() : } } -// ------------------------------------------------------------------- + sal_Bool CanvasSettings::IsHardwareAccelerationAvailable() const { if( !mbHWAccelChecked ) @@ -499,7 +499,7 @@ sal_Bool CanvasSettings::IsHardwareAccelerationAvailable() const return mbHWAccelAvailable; } -// ------------------------------------------------------------------- + sal_Bool CanvasSettings::IsHardwareAccelerationEnabled() const { bool bForceLastEntry(false); @@ -512,7 +512,7 @@ sal_Bool CanvasSettings::IsHardwareAccelerationEnabled() const return !bForceLastEntry; } -// ------------------------------------------------------------------- + void CanvasSettings::EnabledHardwareAcceleration( sal_Bool _bEnabled ) const { Reference< XNameReplace > xNameReplace( @@ -1414,7 +1414,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) return sal_False; } -//----------------------------------------------------------------------------- + void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) { OUString sLang = pLangConfig->aSysLocaleOptions.GetLocaleConfigString(); diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index 0ff50b94a03e..1894b14a4555 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -157,7 +157,7 @@ const vFieldInfo[] = } // namespace -// ----------------------------------------------------------------------- + // // Row @@ -182,7 +182,7 @@ public: } }; -// ----------------------------------------------------------------------- + // // Field @@ -208,7 +208,7 @@ public: } }; -// ----------------------------------------------------------------------- + SvxGeneralTabPage::SvxGeneralTabPage(Window* pParent, const SfxItemSet& rCoreSet) @@ -220,12 +220,12 @@ SvxGeneralTabPage::SvxGeneralTabPage(Window* pParent, const SfxItemSet& rCoreSet SetLinks(); } -//------------------------------------------------------------------------ + SvxGeneralTabPage::~SvxGeneralTabPage () { } -//------------------------------------------------------------------------ + // Initializes the titles and the edit boxes, // according to vRowInfo[] and vFieldInfo[] above. @@ -284,7 +284,7 @@ void SvxGeneralTabPage::InitControls () } } -//------------------------------------------------------------------------ + void SvxGeneralTabPage::SetLinks () { @@ -295,14 +295,14 @@ void SvxGeneralTabPage::SetLinks () vFields[i]->pEdit->SetModifyHdl(aLink); } -//------------------------------------------------------------------------ + SfxTabPage* SvxGeneralTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SvxGeneralTabPage( pParent, rAttrSet ) ); } -//------------------------------------------------------------------------ + sal_Bool SvxGeneralTabPage::FillItemSet( SfxItemSet& ) { @@ -321,7 +321,7 @@ sal_Bool SvxGeneralTabPage::FillItemSet( SfxItemSet& ) return bModified; } -//------------------------------------------------------------------------ + void SvxGeneralTabPage::Reset( const SfxItemSet& rSet ) { @@ -344,7 +344,7 @@ void SvxGeneralTabPage::Reset( const SfxItemSet& rSet ) m_pUseDataCB->Check( SvtSaveOptions().IsUseUserData() ); } -//------------------------------------------------------------------------ + // ModifyHdl_Impl() // This handler updates the initials (short name) @@ -381,7 +381,7 @@ IMPL_LINK( SvxGeneralTabPage, ModifyHdl_Impl, Edit *, pEdit ) return 0; } -//------------------------------------------------------------------------ + sal_Bool SvxGeneralTabPage::GetAddress_Impl() { @@ -400,7 +400,7 @@ sal_Bool SvxGeneralTabPage::GetAddress_Impl() return false; } -//------------------------------------------------------------------------ + void SvxGeneralTabPage::SetAddress_Impl() { @@ -430,7 +430,7 @@ void SvxGeneralTabPage::SetAddress_Impl() vFields[i]->pEdit->SaveValue(); } -// ----------------------------------------------------------------------- + int SvxGeneralTabPage::DeactivatePage( SfxItemSet* pSet_ ) { diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx index 1ae7df384f98..9b5ecba3a71b 100644 --- a/cui/source/options/opthtml.cxx +++ b/cui/source/options/opthtml.cxx @@ -40,7 +40,7 @@ const sal_uInt16 aExportToPosArr[] = 2, //StarWriter 1 //Netscape Navigator 4.0 }; -// ----------------------------------------------------------------------- + OfaHtmlTabPage::OfaHtmlTabPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage( pParent, "OptHtmlPage" , "cui/ui/opthtmlpage.ui", rSet ) diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index 382d902f5c88..ebe2cfc487dc 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -96,7 +96,7 @@ using namespace ::sfx2; #include <sal/config.h> -// ----------------------------------------------------------------------- + extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxNoSpaceEdit(Window *pParent, VclBuilder::stringmap &) { @@ -122,7 +122,7 @@ void SvxNoSpaceEdit::KeyInput( const KeyEvent& rKEvent ) Edit::KeyInput(rKEvent); } -// ----------------------------------------------------------------------- + void SvxNoSpaceEdit::Modify() { @@ -505,7 +505,7 @@ void SvxProxyTabPage::EnableControls_Impl(sal_Bool bEnable) m_pNoProxyDescFT->Enable(bEnable); } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxProxyTabPage, ProxyHdl_Impl, ListBox *, pBox ) { @@ -521,7 +521,7 @@ IMPL_LINK( SvxProxyTabPage, ProxyHdl_Impl, ListBox *, pBox ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxProxyTabPage, LoseFocusHdl_Impl, Edit *, pEdit ) { @@ -1290,6 +1290,6 @@ IMPL_LINK( SvxEMailTabPage, FileDialogHdl_Impl, PushButton*, pButton ) return 0; } -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index e5ec7b8d6334..4fa9192bae4e 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -60,7 +60,7 @@ using namespace ::com::sun::star::ucb; using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::uno; -// ----------------------------------------------------------------------- + bool areListsEqual( const Sequence< OUString >& rListA, const Sequence< OUString >& rListB ) { @@ -197,7 +197,7 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet #endif } -// ----------------------------------------------------------------------- + SvxJavaOptionsPage::~SvxJavaOptionsPage() { @@ -217,7 +217,7 @@ SvxJavaOptionsPage::~SvxJavaOptionsPage() #endif } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxJavaOptionsPage, EnableHdl_Impl) { @@ -227,7 +227,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, EnableHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxJavaOptionsPage, CheckHdl_Impl, SvSimpleTable *, pList ) { @@ -238,7 +238,7 @@ IMPL_LINK( SvxJavaOptionsPage, CheckHdl_Impl, SvSimpleTable *, pList ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxJavaOptionsPage, SelectHdl_Impl) { @@ -254,7 +254,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, SelectHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxJavaOptionsPage, AddHdl_Impl) { @@ -281,7 +281,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, AddHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxJavaOptionsPage, ParameterHdl_Impl) { @@ -330,7 +330,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, ParameterHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxJavaOptionsPage, ClassPathHdl_Impl) { @@ -375,7 +375,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, ClassPathHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxJavaOptionsPage, ResetHdl_Impl) { @@ -383,7 +383,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, ResetHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxJavaOptionsPage, StartFolderPickerHdl) { @@ -403,7 +403,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, StartFolderPickerHdl) return 0L; } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxJavaOptionsPage, DialogClosedHdl, DialogClosedEvent*, pEvt ) { @@ -416,7 +416,7 @@ IMPL_LINK( SvxJavaOptionsPage, DialogClosedHdl, DialogClosedEvent*, pEvt ) return 0L; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG( SvxJavaOptionsPage, ExpertConfigHdl_Impl ) { @@ -431,7 +431,7 @@ IMPL_LINK_NOARG( SvxJavaOptionsPage, ExpertConfigHdl_Impl ) return 0; } -// ----------------------------------------------------------------------- + void SvxJavaOptionsPage::ClearJavaInfo() { @@ -452,7 +452,7 @@ void SvxJavaOptionsPage::ClearJavaInfo() #endif } -// ----------------------------------------------------------------------- + void SvxJavaOptionsPage::ClearJavaList() { @@ -466,7 +466,7 @@ void SvxJavaOptionsPage::ClearJavaList() m_pJavaList->Clear(); } -// ----------------------------------------------------------------------- + void SvxJavaOptionsPage::LoadJREs() { @@ -512,7 +512,7 @@ void SvxJavaOptionsPage::LoadJREs() #endif } -// ----------------------------------------------------------------------- + void SvxJavaOptionsPage::AddJRE( JavaInfo* _pInfo ) { @@ -534,7 +534,7 @@ void SvxJavaOptionsPage::AddJRE( JavaInfo* _pInfo ) #endif } -// ----------------------------------------------------------------------- + void SvxJavaOptionsPage::HandleCheckEntry( SvTreeListEntry* _pEntry ) { @@ -556,7 +556,7 @@ void SvxJavaOptionsPage::HandleCheckEntry( SvTreeListEntry* _pEntry ) m_pJavaList->SetCheckButtonState( _pEntry, SV_BUTTON_CHECKED ); } -// ----------------------------------------------------------------------- + void SvxJavaOptionsPage::AddFolder( const OUString& _rFolder ) { @@ -631,14 +631,14 @@ void SvxJavaOptionsPage::AddFolder( const OUString& _rFolder ) #endif } -// ----------------------------------------------------------------------- + SfxTabPage* SvxJavaOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SvxJavaOptionsPage( pParent, rAttrSet ) ); } -// ----------------------------------------------------------------------- + sal_Bool SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ ) { @@ -745,7 +745,7 @@ sal_Bool SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ ) return bModified; } -// ----------------------------------------------------------------------- + void SvxJavaOptionsPage::Reset( const SfxItemSet& /*rSet*/ ) { @@ -774,7 +774,7 @@ void SvxJavaOptionsPage::Reset( const SfxItemSet& /*rSet*/ ) m_aResetTimer.Start(); } -// ----------------------------------------------------------------------- + void SvxJavaOptionsPage::FillUserData() { @@ -806,13 +806,13 @@ SvxJavaParameterDlg::SvxJavaParameterDlg( Window* pParent ) : EnableRemoveButton(); } -// ----------------------------------------------------------------------- + SvxJavaParameterDlg::~SvxJavaParameterDlg() { } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxJavaParameterDlg, ModifyHdl_Impl) { @@ -822,7 +822,7 @@ IMPL_LINK_NOARG(SvxJavaParameterDlg, ModifyHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxJavaParameterDlg, AssignHdl_Impl) { @@ -841,7 +841,7 @@ IMPL_LINK_NOARG(SvxJavaParameterDlg, AssignHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxJavaParameterDlg, SelectHdl_Impl) { @@ -849,7 +849,7 @@ IMPL_LINK_NOARG(SvxJavaParameterDlg, SelectHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxJavaParameterDlg, DblClickHdl_Impl) { @@ -859,7 +859,7 @@ IMPL_LINK_NOARG(SvxJavaParameterDlg, DblClickHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxJavaParameterDlg, RemoveHdl_Impl) { @@ -880,7 +880,7 @@ IMPL_LINK_NOARG(SvxJavaParameterDlg, RemoveHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + short SvxJavaParameterDlg::Execute() { @@ -889,7 +889,7 @@ short SvxJavaParameterDlg::Execute() return ModalDialog::Execute(); } -// ----------------------------------------------------------------------- + Sequence< OUString > SvxJavaParameterDlg::GetParameters() const { @@ -901,7 +901,7 @@ Sequence< OUString > SvxJavaParameterDlg::GetParameters() const return aParamList; } -// ----------------------------------------------------------------------- + void SvxJavaParameterDlg::SetParameters( Sequence< OUString >& rParams ) { @@ -936,7 +936,7 @@ SvxJavaClassPathDlg::SvxJavaClassPathDlg(Window* pParent) m_pPathList->GrabFocus(); } -// ----------------------------------------------------------------------- + SvxJavaClassPathDlg::~SvxJavaClassPathDlg() { @@ -945,7 +945,7 @@ SvxJavaClassPathDlg::~SvxJavaClassPathDlg() delete static_cast< OUString* >( m_pPathList->GetEntryData(i) ); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddArchiveHdl_Impl) { @@ -982,7 +982,7 @@ IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddArchiveHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddPathHdl_Impl) { @@ -1019,7 +1019,7 @@ IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddPathHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxJavaClassPathDlg, RemoveHdl_Impl) { @@ -1040,7 +1040,7 @@ IMPL_LINK_NOARG(SvxJavaClassPathDlg, RemoveHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxJavaClassPathDlg, SelectHdl_Impl) { @@ -1048,7 +1048,7 @@ IMPL_LINK_NOARG(SvxJavaClassPathDlg, SelectHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + bool SvxJavaClassPathDlg::IsPathDuplicate( const OUString& _rPath ) { @@ -1068,7 +1068,7 @@ bool SvxJavaClassPathDlg::IsPathDuplicate( const OUString& _rPath ) return bRet; } -// ----------------------------------------------------------------------- + OUString SvxJavaClassPathDlg::GetClassPath() const { @@ -1087,7 +1087,7 @@ OUString SvxJavaClassPathDlg::GetClassPath() const return sPath; } -// ----------------------------------------------------------------------- + void SvxJavaClassPathDlg::SetClassPath( const OUString& _rPath ) { diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 8b6a21c2377e..c4037bee0e7c 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -654,7 +654,7 @@ ServiceInfo_Impl * SvxLinguData_Impl::GetInfoByImplName( const OUString &rSvcImp } -//----------------------------------------------------------------------------- + static void lcl_MergeLocales(Sequence< Locale >& aAllLocales, const Sequence< Locale >& rAdd) { @@ -1163,7 +1163,7 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent, const SfxItemSet& rSet ) : pItem = NULL; } -// ----------------------------------------------------------------------- + SvxLinguTabPage::~SvxLinguTabPage() { @@ -1171,7 +1171,7 @@ SvxLinguTabPage::~SvxLinguTabPage() delete pLinguData; } -//------------------------------------------------------------------------ + // don't throw away overloaded sal_uInt16* SvxLinguTabPage::GetRanges() @@ -1180,7 +1180,7 @@ sal_uInt16* SvxLinguTabPage::GetRanges() return pRanges; } -//------------------------------------------------------------------------ + SfxTabPage* SvxLinguTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) @@ -1188,7 +1188,7 @@ SfxTabPage* SvxLinguTabPage::Create( Window* pParent, return ( new SvxLinguTabPage( pParent, rAttrSet ) ); } -//------------------------------------------------------------------------ + sal_Bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet ) { @@ -1353,7 +1353,7 @@ sal_Bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet ) return bModified; } -// ---------------------------------------------------------------------- + sal_uLong SvxLinguTabPage::GetDicUserData( const uno::Reference< XDictionary > &rxDic, sal_uInt16 nIdx ) { @@ -1396,7 +1396,7 @@ void SvxLinguTabPage::AddDicBoxEntry( m_pLinguDicsCLB->SetUpdateMode(sal_True); } -// ---------------------------------------------------------------------- + void SvxLinguTabPage::UpdateDicBox_Impl() { @@ -1415,7 +1415,7 @@ void SvxLinguTabPage::UpdateDicBox_Impl() m_pLinguDicsCLB->SetUpdateMode(sal_True); } -// ---------------------------------------------------------------------- + void SvxLinguTabPage::UpdateModulesBox_Impl() { @@ -1438,7 +1438,7 @@ void SvxLinguTabPage::UpdateModulesBox_Impl() } } -//------------------------------------------------------------------------ + void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) { @@ -1549,7 +1549,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) m_pLinguOptionsCLB->SetUpdateMode(sal_True); } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxLinguTabPage, BoxDoubleClickHdl_Impl, SvTreeListBox *, pBox ) { @@ -1568,7 +1568,7 @@ IMPL_LINK( SvxLinguTabPage, BoxDoubleClickHdl_Impl, SvTreeListBox *, pBox ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxLinguTabPage, PostDblClickHdl_Impl) { @@ -1576,7 +1576,7 @@ IMPL_LINK_NOARG(SvxLinguTabPage, PostDblClickHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxLinguTabPage, OpenURLHdl_Impl) { @@ -1585,7 +1585,7 @@ IMPL_LINK_NOARG(SvxLinguTabPage, OpenURLHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxLinguTabPage, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox ) { @@ -1616,7 +1616,7 @@ IMPL_LINK( SvxLinguTabPage, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn ) { @@ -1800,7 +1800,7 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxLinguTabPage, SelectHdl_Impl, SvxCheckListBox *, pBox ) { @@ -1836,7 +1836,7 @@ IMPL_LINK( SvxLinguTabPage, SelectHdl_Impl, SvxCheckListBox *, pBox ) return 0; } -// ----------------------------------------------------------------------- + SvTreeListEntry* SvxLinguTabPage::CreateEntry( OUString& rTxt, sal_uInt16 nCol ) { @@ -1856,7 +1856,7 @@ SvTreeListEntry* SvxLinguTabPage::CreateEntry( OUString& rTxt, sal_uInt16 nCol ) return pEntry; } -// ----------------------------------------------------------------------- + void SvxLinguTabPage::HideGroups( sal_uInt16 nGrp ) { @@ -2339,7 +2339,7 @@ IMPL_LINK_NOARG(SvxEditModulesDlg, BackHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxEditModulesDlg, OpenURLHdl_Impl) { diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index e912183e3f3e..80249e37e940 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -109,7 +109,7 @@ int OfaMemoryOptionsPage::DeactivatePage( SfxItemSet* _pSet ) return LEAVE_PAGE; } -// ----------------------------------------------------------------------- + OfaMemoryOptionsPage::OfaMemoryOptionsPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OptMemoryPage", "cui/ui/optmemorypage.ui", rSet) @@ -140,20 +140,20 @@ OfaMemoryOptionsPage::OfaMemoryOptionsPage(Window* pParent, const SfxItemSet& rS m_pNfGraphicCache->SetModifyHdl( LINK( this, OfaMemoryOptionsPage, GraphicCacheConfigHdl ) ); } -// ----------------------------------------------------------------------- + OfaMemoryOptionsPage::~OfaMemoryOptionsPage() { } -// ----------------------------------------------------------------------- + SfxTabPage* OfaMemoryOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new OfaMemoryOptionsPage( pParent, rAttrSet ); } -// ----------------------------------------------------------------------- + sal_Bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet& rSet ) { @@ -205,7 +205,7 @@ sal_Bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet& rSet ) return bModified; } -// ----------------------------------------------------------------------- + void OfaMemoryOptionsPage::Reset( const SfxItemSet& rSet ) { @@ -251,7 +251,7 @@ void OfaMemoryOptionsPage::Reset( const SfxItemSet& rSet ) m_pQuickLaunchCB->SaveValue(); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(OfaMemoryOptionsPage, GraphicCacheConfigHdl) { diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 5aa07b462a18..8e8758d4e93c 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -244,7 +244,7 @@ SvxPathTabPage::SvxPathTabPage(Window* pParent, const SfxItemSet& rSet) xDialogListener->SetDialogClosedLink( LINK( this, SvxPathTabPage, DialogClosedHdl ) ); } -// ----------------------------------------------------------------------- + SvxPathTabPage::~SvxPathTabPage() { @@ -254,7 +254,7 @@ SvxPathTabPage::~SvxPathTabPage() delete pImpl; } -// ----------------------------------------------------------------------- + SfxTabPage* SvxPathTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) @@ -262,7 +262,7 @@ SfxTabPage* SvxPathTabPage::Create( Window* pParent, return ( new SvxPathTabPage( pParent, rAttrSet ) ); } -// ----------------------------------------------------------------------- + sal_Bool SvxPathTabPage::FillItemSet( SfxItemSet& ) { @@ -276,7 +276,7 @@ sal_Bool SvxPathTabPage::FillItemSet( SfxItemSet& ) return sal_True; } -// ----------------------------------------------------------------------- + void SvxPathTabPage::Reset( const SfxItemSet& ) { @@ -370,7 +370,7 @@ void SvxPathTabPage::Reset( const SfxItemSet& ) PathSelect_Impl( NULL ); } -// ----------------------------------------------------------------------- + void SvxPathTabPage::FillUserData() { @@ -383,7 +383,7 @@ void SvxPathTabPage::FillUserData() SetUserData( aUserData ); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxPathTabPage, PathSelect_Impl) { @@ -406,7 +406,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathSelect_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxPathTabPage, StandardHdl_Impl) { @@ -462,7 +462,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, StandardHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + void SvxPathTabPage::ChangeCurrentEntry( const OUString& _rFolder ) { @@ -527,7 +527,7 @@ void SvxPathTabPage::ChangeCurrentEntry( const OUString& _rFolder ) } } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl) { @@ -634,7 +634,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxPathTabPage, HeaderSelect_Impl, HeaderBar*, pBar ) { @@ -663,7 +663,7 @@ IMPL_LINK( SvxPathTabPage, HeaderSelect_Impl, HeaderBar*, pBar ) return 1; } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxPathTabPage, HeaderEndDrag_Impl, HeaderBar*, pBar ) { @@ -694,7 +694,7 @@ IMPL_LINK( SvxPathTabPage, HeaderEndDrag_Impl, HeaderBar*, pBar ) return 1; } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxPathTabPage, DialogClosedHdl, DialogClosedEvent*, pEvt ) { @@ -708,7 +708,7 @@ IMPL_LINK( SvxPathTabPage, DialogClosedHdl, DialogClosedEvent*, pEvt ) return 0L; } -// ----------------------------------------------------------------------- + void SvxPathTabPage::GetPathList( sal_uInt16 _nPathHandle, OUString& _rInternalPath, @@ -778,7 +778,7 @@ void SvxPathTabPage::GetPathList( } } -// ----------------------------------------------------------------------- + void SvxPathTabPage::SetPathList( sal_uInt16 _nPathHandle, const OUString& _rUserPath, const OUString& _rWritablePath ) diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index 27d8da1de675..e4b6e58a6706 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -54,7 +54,7 @@ using namespace comphelper; #define CFG_PAGE_AND_GROUP OUString("General"), OUString("LoadSave") -// ---------------------------------------------------------------------- + struct SvxSaveTabPage_Impl { @@ -196,14 +196,14 @@ SfxSaveTabPage::SfxSaveTabPage( Window* pParent, const SfxItemSet& rCoreSet ) : DetectHiddenControls(); } -// ----------------------------------------------------------------------- + SfxSaveTabPage::~SfxSaveTabPage() { delete pImpl; } -// ----------------------------------------------------------------------- + SfxTabPage* SfxSaveTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) @@ -211,7 +211,7 @@ SfxTabPage* SfxSaveTabPage::Create( Window* pParent, return ( new SfxSaveTabPage( pParent, rAttrSet ) ); } -// ----------------------------------------------------------------------- + void SfxSaveTabPage::DetectHiddenControls() { SvtOptionsDialogOptions aOptionsDlgOpt; @@ -237,7 +237,7 @@ void SfxSaveTabPage::DetectHiddenControls() } } -// ----------------------------------------------------------------------- + sal_Bool SfxSaveTabPage::FillItemSet( SfxItemSet& rSet ) { sal_Bool bModified = sal_False; @@ -343,7 +343,7 @@ sal_Bool SfxSaveTabPage::FillItemSet( SfxItemSet& rSet ) return bModified; } -// ----------------------------------------------------------------------- + sal_Bool isODFFormat( OUString sFilter ) { @@ -497,7 +497,7 @@ void SfxSaveTabPage::Reset( const SfxItemSet& ) aODFVersionLB->SaveValue(); } -// ----------------------------------------------------------------------- + IMPL_LINK( SfxSaveTabPage, AutoClickHdl_Impl, CheckBox *, pBox ) { diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index 01a14d330f5c..41f875cccca7 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -82,13 +82,13 @@ SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage(Window* pParent, const SfxItemSet UpdateLastCheckedText(); } -// ----------------------------------------------------------------------- + SvxOnlineUpdateTabPage::~SvxOnlineUpdateTabPage() { } -// ----------------------------------------------------------------------- + void SvxOnlineUpdateTabPage::UpdateLastCheckedText() { OUString aDateStr; @@ -146,7 +146,7 @@ void SvxOnlineUpdateTabPage::UpdateLastCheckedText() m_pLastChecked->SetText( aText ); } -// ----------------------------------------------------------------------- + SfxTabPage* SvxOnlineUpdateTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) @@ -154,7 +154,7 @@ SvxOnlineUpdateTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) return new SvxOnlineUpdateTabPage( pParent, rAttrSet ); } -// ----------------------------------------------------------------------- + sal_Bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet& ) @@ -218,7 +218,7 @@ sal_Bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet& ) return bModified; } -// ----------------------------------------------------------------------- + void SvxOnlineUpdateTabPage::Reset( const SfxItemSet& ) { @@ -260,13 +260,13 @@ void SvxOnlineUpdateTabPage::Reset( const SfxItemSet& ) m_pAutoDownloadCheckBox->SaveValue(); } -// ----------------------------------------------------------------------- + void SvxOnlineUpdateTabPage::FillUserData() { } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxOnlineUpdateTabPage, AutoCheckHdl_Impl, CheckBox *, pBox ) { @@ -279,7 +279,7 @@ IMPL_LINK( SvxOnlineUpdateTabPage, AutoCheckHdl_Impl, CheckBox *, pBox ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, FileDialogHdl_Impl) { @@ -303,7 +303,7 @@ IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, FileDialogHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, CheckNowHdl_Impl) { diff --git a/cui/source/options/sdbcdriverenum.cxx b/cui/source/options/sdbcdriverenum.cxx index 3a0bc110ce9a..e15be1bcdc90 100644 --- a/cui/source/options/sdbcdriverenum.cxx +++ b/cui/source/options/sdbcdriverenum.cxx @@ -47,7 +47,7 @@ namespace offapp const ::std::vector< OUString >& getDriverImplNames() const { return m_aImplNames; } }; - //-------------------------------------------------------------------- + ODriverEnumerationImpl::ODriverEnumerationImpl() { try @@ -76,25 +76,25 @@ namespace offapp //==================================================================== //= ODriverEnumeration //==================================================================== - //-------------------------------------------------------------------- + ODriverEnumeration::ODriverEnumeration() throw() :m_pImpl(new ODriverEnumerationImpl) { } - //-------------------------------------------------------------------- + ODriverEnumeration::~ODriverEnumeration() throw() { delete m_pImpl; } - //-------------------------------------------------------------------- + ODriverEnumeration::const_iterator ODriverEnumeration::begin() const throw() { return m_pImpl->getDriverImplNames().begin(); } - //-------------------------------------------------------------------- + ODriverEnumeration::const_iterator ODriverEnumeration::end() const throw() { return m_pImpl->getDriverImplNames().end(); diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index d0f10f9cbad7..057f014689b9 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -488,7 +488,7 @@ struct OptionsGroupInfo ~OptionsGroupInfo() { delete m_pInItemSet; delete m_pOutItemSet; } }; -// ----------------------------------------------------------------------- + #define INI_LIST() \ pCurrentPageEntry ( NULL ),\ @@ -951,7 +951,7 @@ IMPL_LINK( OfaTreeOptionsDialog, ImplHandleTreeLayoutTimerHdl, void*, EMPTYARG ) return 0; } -// -------------------------------------------------------------------- + void OfaTreeOptionsDialog::SetPaneSize(Window *pPane) { //The OfaTreeOptionsDialog is not fully widget layout enabled @@ -1369,9 +1369,9 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet SFX_APP()->SetOptions( aOptSet ); // get dispatcher anew, because SetOptions() might have destroyed the dispatcher SfxViewFrame *pViewFrame = SfxViewFrame::Current(); -// ------------------------------------------------------------------------- + // evaluate Year2000 -// ------------------------------------------------------------------------- + sal_uInt16 nY2K = USHRT_MAX; if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_YEAR2000, false, &pItem ) ) nY2K = ((const SfxUInt16Item*)pItem)->GetValue(); @@ -1385,9 +1385,9 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet aMisc.SetYear2000(nY2K); } -// ------------------------------------------------------------------------- + // evaluate print -// ------------------------------------------------------------------------- + if(SFX_ITEM_SET == rSet.GetItemState(SID_PRINTER_NOTFOUND_WARN, false, &pItem)) aMisc.SetNotFoundWarning(((const SfxBoolItem*)pItem)->GetValue()); @@ -1397,9 +1397,9 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet aMisc.SetPaperSizeWarning(0 != (pFlag->GetValue() & SFX_PRINTER_CHG_SIZE )); aMisc.SetPaperOrientationWarning(0 != (pFlag->GetValue() & SFX_PRINTER_CHG_ORIENTATION )); } -// ------------------------------------------------------------------------- + // evaluate help options -// ------------------------------------------------------------------------- + if ( SvtHelpOptions().IsHelpTips() != Help::IsQuickHelpEnabled() ) SvtHelpOptions().IsHelpTips() ? Help::EnableQuickHelp() : Help::DisableQuickHelp(); if ( SvtHelpOptions().IsExtendedHelp() != Help::IsBalloonHelpEnabled() ) @@ -2289,7 +2289,7 @@ ExtensionsTabPage::ExtensionsTabPage( { } -// ----------------------------------------------------------------------- + ExtensionsTabPage::~ExtensionsTabPage() { @@ -2297,7 +2297,7 @@ ExtensionsTabPage::~ExtensionsTabPage() DeactivatePage(); } -// ----------------------------------------------------------------------- + void ExtensionsTabPage::CreateDialogWithHandler() { @@ -2342,7 +2342,7 @@ void ExtensionsTabPage::CreateDialogWithHandler() } } -// ----------------------------------------------------------------------- + sal_Bool ExtensionsTabPage::DispatchAction( const OUString& rAction ) { @@ -2361,7 +2361,7 @@ sal_Bool ExtensionsTabPage::DispatchAction( const OUString& rAction ) return bRet; } -// ----------------------------------------------------------------------- + void ExtensionsTabPage::ActivatePage() { @@ -2389,7 +2389,7 @@ void ExtensionsTabPage::ActivatePage() } } -// ----------------------------------------------------------------------- + void ExtensionsTabPage::DeactivatePage() { @@ -2399,7 +2399,7 @@ void ExtensionsTabPage::DeactivatePage() m_xPage->setVisible( sal_False ); } -// ----------------------------------------------------------------------- + void ExtensionsTabPage::ResetPage() { @@ -2407,7 +2407,7 @@ void ExtensionsTabPage::ResetPage() ActivatePage(); } -// ----------------------------------------------------------------------- + void ExtensionsTabPage::SavePage() { diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx index 27b4cc9acac0..8fe16ad97964 100644 --- a/cui/source/options/webconninfo.cxx +++ b/cui/source/options/webconninfo.cxx @@ -101,7 +101,7 @@ void PasswordTable::setColWidths() // class WebConnectionInfoDialog ----------------------------------------- -// ----------------------------------------------------------------------- + WebConnectionInfoDialog::WebConnectionInfoDialog(Window* pParent) : ModalDialog(pParent, "StoredWebConnectionDialog", "cui/ui/storedwebconnectiondialog.ui") , m_nPos( -1 ) @@ -145,14 +145,14 @@ WebConnectionInfoDialog::~WebConnectionInfoDialog() delete m_pPasswordsLB; } -// ----------------------------------------------------------------------- + IMPL_LINK( WebConnectionInfoDialog, HeaderBarClickedHdl, SvSimpleTable*, pTable ) { m_pPasswordsLB->Resort( NULL == pTable ); return 0; } -// ----------------------------------------------------------------------- + void WebConnectionInfoDialog::FillPasswordList() { try @@ -200,7 +200,7 @@ void WebConnectionInfoDialog::FillPasswordList() {} } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(WebConnectionInfoDialog, RemovePasswordHdl) { try @@ -232,7 +232,7 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, RemovePasswordHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(WebConnectionInfoDialog, RemoveAllPasswordsHdl) { try @@ -256,7 +256,7 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, RemoveAllPasswordsHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(WebConnectionInfoDialog, ChangePasswordHdl) { try @@ -295,7 +295,7 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, ChangePasswordHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(WebConnectionInfoDialog, EntrySelectedHdl) { SvTreeListEntry* pEntry = m_pPasswordsLB->GetCurEntry(); diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 9e6492aa1215..9e0d8b0cbc0e 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -2055,7 +2055,7 @@ IMPL_LINK( OfaQuoteTabPage, StdQuoteHdl, PushButton*, pBtn ) return 0; } -// -------------------------------------------------- + OUString OfaQuoteTabPage::ChangeStringExt_Impl( sal_UCS4 cChar ) { diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 842ddf042f98..5b0717ccdd2f 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -147,7 +147,7 @@ static void lcl_setFillStyle(ListBox* pLbSelect, XFillStyle eStyle) return; } } -//------------------------------------------------------------------------- + sal_uInt16 GetItemId_Impl( ValueSet& rValueSet, const Color& rCol ) { @@ -225,14 +225,14 @@ void BackgroundPreviewImpl::setBmp(bool bBmp) Invalidate(); } -//----------------------------------------------------------------------- + BackgroundPreviewImpl::~BackgroundPreviewImpl() { delete pBitmap; } -//----------------------------------------------------------------------- + void BackgroundPreviewImpl::NotifyChange( const Color& rColor ) { if ( !bIsBmp ) @@ -246,7 +246,7 @@ void BackgroundPreviewImpl::NotifyChange( const Color& rColor ) } } -//----------------------------------------------------------------------- + void BackgroundPreviewImpl::NotifyChange( const Bitmap* pNewBitmap ) { @@ -313,7 +313,7 @@ void BackgroundPreviewImpl::Resize() recalcDrawPos(); } -//----------------------------------------------------------------------- + void BackgroundPreviewImpl::Paint( const Rectangle& ) { @@ -431,7 +431,7 @@ SvxBackgroundTabPage::SvxBackgroundTabPage(Window* pParent, const SfxItemSet& rC m_pBackgroundColorSet->SetText(SVX_RESSTR(RID_SVXSTR_TRANSPARENT)); } -//------------------------------------------------------------------------ + SvxBackgroundTabPage::~SvxBackgroundTabPage() { @@ -455,7 +455,7 @@ SvxBackgroundTabPage::~SvxBackgroundTabPage() } } -//------------------------------------------------------------------------ + sal_uInt16* SvxBackgroundTabPage::GetRanges() @@ -468,7 +468,7 @@ sal_uInt16* SvxBackgroundTabPage::GetRanges() return pRanges; } -//------------------------------------------------------------------------ + SfxTabPage* SvxBackgroundTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) @@ -482,7 +482,7 @@ SfxTabPage* SvxBackgroundTabPage::Create( Window* pParent, return ( new SvxBackgroundTabPage( pParent, rAttrSet ) ); } -//------------------------------------------------------------------------ + void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet ) { @@ -715,7 +715,7 @@ void SvxBackgroundTabPage::ResetFromWallpaperItem( const SfxItemSet& rSet ) -//------------------------------------------------------------------------ + void SvxBackgroundTabPage::FillUserData() @@ -731,7 +731,7 @@ void SvxBackgroundTabPage::FillUserData() SetUserData( m_pBtnPreview->IsChecked() ? OUString('1') : OUString('0') ); } -//------------------------------------------------------------------------ + sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) { @@ -1088,7 +1088,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSetWithWallpaperItem( SfxItemSet& rCoreSe return bModified; } -//----------------------------------------------------------------------- + int SvxBackgroundTabPage::DeactivatePage( SfxItemSet* _pSet ) @@ -1107,14 +1107,14 @@ int SvxBackgroundTabPage::DeactivatePage( SfxItemSet* _pSet ) return LEAVE_PAGE; } -//----------------------------------------------------------------------- + void SvxBackgroundTabPage::PointChanged( Window* , RECT_POINT ) { // has to be implemented so that position control can work } -//----------------------------------------------------------------------- + void SvxBackgroundTabPage::ShowSelector() { @@ -1147,7 +1147,7 @@ void SvxBackgroundTabPage::ShowSelector() } } -//------------------------------------------------------------------------ + void SvxBackgroundTabPage::RaiseLoadError_Impl() @@ -1163,7 +1163,7 @@ void SvxBackgroundTabPage::RaiseLoadError_Impl() aBgdGraphicPath ) ); } -//------------------------------------------------------------------------ + sal_Bool SvxBackgroundTabPage::LoadLinkedGraphic_Impl() { @@ -1174,7 +1174,7 @@ sal_Bool SvxBackgroundTabPage::LoadLinkedGraphic_Impl() return bResult; } -//------------------------------------------------------------------------ + void SvxBackgroundTabPage::FillColorValueSets_Impl() @@ -1201,11 +1201,11 @@ void SvxBackgroundTabPage::FillColorValueSets_Impl() m_pBackgroundColorSet->SetColCount(m_pBackgroundColorSet->getColumnCount()); } -//------------------------------------------------------------------------ -//------------------------------------------------------------------------ + + void SvxBackgroundTabPage::ShowColorUI_Impl() @@ -1235,7 +1235,7 @@ void SvxBackgroundTabPage::HideColorUI_Impl() m_pBackGroundColorFrame->Hide(); } -//------------------------------------------------------------------------ + void SvxBackgroundTabPage::ShowBitmapUI_Impl() @@ -1307,7 +1307,7 @@ void SvxBackgroundTabPage::HideGradientUI_Impl() m_pBackGroundGradientFrame->Hide(); } -//------------------------------------------------------------------------ + void SvxBackgroundTabPage::SetGraphicPosition_Impl( SvxGraphicPosition ePos ) { @@ -1353,7 +1353,7 @@ void SvxBackgroundTabPage::SetGraphicPosition_Impl( SvxGraphicPosition ePos ) m_pWndPosition->Invalidate(); } -//------------------------------------------------------------------------ + SvxGraphicPosition SvxBackgroundTabPage::GetGraphicPosition_Impl() { @@ -1379,9 +1379,9 @@ SvxGraphicPosition SvxBackgroundTabPage::GetGraphicPosition_Impl() return GPOS_MM; } -//----------------------------------------------------------------------- + // Handler -//----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxBackgroundTabPage, BackgroundColorHdl_Impl) /* @@ -1398,7 +1398,7 @@ IMPL_LINK_NOARG(SvxBackgroundTabPage, BackgroundColorHdl_Impl) return 0; } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxBackgroundTabPage, SelectHdl_Impl) { @@ -1419,7 +1419,7 @@ IMPL_LINK_NOARG(SvxBackgroundTabPage, SelectHdl_Impl) return 0; } -//------------------------------------------------------------------------ + IMPL_LINK( SvxBackgroundTabPage, FileClickHdl_Impl, CheckBox*, pBox ) { @@ -1468,7 +1468,7 @@ IMPL_LINK( SvxBackgroundTabPage, FileClickHdl_Impl, CheckBox*, pBox ) return 0; } -//------------------------------------------------------------------------ + IMPL_LINK( SvxBackgroundTabPage, RadioClickHdl_Impl, RadioButton*, pBtn ) { @@ -1503,7 +1503,7 @@ IMPL_LINK_NOARG(SvxBackgroundTabPage, ModifyGradientHdl_Impl) return 0; } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxBackgroundTabPage, BrowseHdl_Impl) @@ -1545,7 +1545,7 @@ IMPL_LINK_NOARG(SvxBackgroundTabPage, BrowseHdl_Impl) return 0; } -//----------------------------------------------------------------------- + IMPL_LINK( SvxBackgroundTabPage, LoadTimerHdl_Impl, Timer* , pTimer ) @@ -1606,7 +1606,7 @@ IMPL_LINK( SvxBackgroundTabPage, LoadTimerHdl_Impl, Timer* , pTimer ) return 0; } -//----------------------------------------------------------------------- + void SvxBackgroundTabPage::ShowTblControl() { @@ -1617,7 +1617,7 @@ void SvxBackgroundTabPage::ShowTblControl() m_pAsGrid->Show(); } -//----------------------------------------------------------------------- + void SvxBackgroundTabPage::ShowParaControl(sal_Bool bCharOnly) { @@ -1631,7 +1631,7 @@ void SvxBackgroundTabPage::ShowParaControl(sal_Bool bCharOnly) } m_pParaLBox->SetData(m_pParaLBox); // here it can be recognized that this mode is turned on } -//----------------------------------------------------------------------- + IMPL_LINK( SvxBackgroundTabPage, TblDestinationHdl_Impl, ListBox*, pBox ) { @@ -1723,7 +1723,7 @@ IMPL_LINK( SvxBackgroundTabPage, TblDestinationHdl_Impl, ListBox*, pBox ) return 0; } -//----------------------------------------------------------------------- + IMPL_LINK( SvxBackgroundTabPage, ParaDestinationHdl_Impl, ListBox*, pBox ) { @@ -1787,7 +1787,7 @@ IMPL_LINK( SvxBackgroundTabPage, ParaDestinationHdl_Impl, ListBox*, pBox ) return 0; } -//----------------------------------------------------------------------- + void SvxBackgroundTabPage::FillControls_Impl( const SvxBrushItem& rBgdAttr, const OUString& rUserData ) diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 10462b3f7617..6f4b1d6e8bf8 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -47,7 +47,7 @@ using namespace ::editeng; -// ----------------------------------------------------------------------- + /* * [Description:] @@ -75,14 +75,14 @@ static sal_uInt16 pRanges[] = 0 }; -// ----------------------------------------------------------------------- + static void lcl_SetDecimalDigitsTo1(MetricField& rField) { sal_Int64 nMin = rField.Denormalize( rField.GetMin( FUNIT_TWIP ) ); rField.SetDecimalDigits(1); rField.SetMin( rField.Normalize( nMin ), FUNIT_TWIP ); } -// ----------------------------------------------------------------------- + SvxBorderTabPage::SvxBorderTabPage(Window* pParent, const SfxItemSet& rCoreAttrs) : SfxTabPage(pParent, "BorderPage", "cui/ui/borderpage.ui", rCoreAttrs) @@ -326,20 +326,20 @@ SvxBorderTabPage::SvxBorderTabPage(Window* pParent, const SfxItemSet& rCoreAttrs m_pMergeAdjacentBordersCB->Hide(); } -// ----------------------------------------------------------------------- + SvxBorderTabPage::~SvxBorderTabPage() { } -// ----------------------------------------------------------------------- + sal_uInt16* SvxBorderTabPage::GetRanges() { return pRanges; } -// ----------------------------------------------------------------------- + SfxTabPage* SvxBorderTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) @@ -347,7 +347,7 @@ SfxTabPage* SvxBorderTabPage::Create( Window* pParent, return ( new SvxBorderTabPage( pParent, rAttrSet ) ); } -// ----------------------------------------------------------------------- + void SvxBorderTabPage::ResetFrameLine_Impl( svx::FrameBorderType eBorder, const SvxBorderLine* pCoreLine, bool bValid ) { @@ -369,7 +369,7 @@ bool SvxBorderTabPage::IsBorderLineStyleAllowed( sal_Int16 nStyle ) const return maUsedBorderStyles.count(nStyle) > 0; } -// ----------------------------------------------------------------------- + void SvxBorderTabPage::Reset( const SfxItemSet& rSet ) { @@ -395,9 +395,9 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet ) ResetFrameLine_Impl( svx::FRAMEBORDER_VER, pBoxInfoItem->GetVert(), pBoxInfoItem->IsValid( VALID_VERT ) ); ResetFrameLine_Impl( svx::FRAMEBORDER_HOR, pBoxInfoItem->GetHori(), pBoxInfoItem->IsValid( VALID_HORI ) ); - //------------------- + // distance inside - //------------------- + if( !mbUseMarginItem ) { if ( m_pLeftMF->IsVisible() ) @@ -481,9 +481,9 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet ) m_pFrameSel->HideAllBorders(); } - //------------------------------------------------------------- + // depict line (color) in controllers if unambiguous: - //------------------------------------------------------------- + { // Do all visible lines show the same line widths? long nWidth; @@ -573,7 +573,7 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet ) m_pSynchronizeCB->Check(mbSync); } -// ----------------------------------------------------------------------- + int SvxBorderTabPage::DeactivatePage( SfxItemSet* _pSet ) { @@ -583,7 +583,7 @@ int SvxBorderTabPage::DeactivatePage( SfxItemSet* _pSet ) return LEAVE_PAGE; } -// ----------------------------------------------------------------------- + sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) { @@ -599,9 +599,9 @@ sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) SfxMapUnit eCoreUnit = rOldSet.GetPool()->GetMetric( nBoxWhich ); - //------------------ + // outer border: - //------------------ + typedef ::std::pair<svx::FrameBorderType,sal_uInt16> TBorderPair; TBorderPair eTypes1[] = { TBorderPair(svx::FRAMEBORDER_TOP,BOX_LINE_TOP), @@ -613,9 +613,9 @@ sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) for (sal_uInt32 i=0; i < SAL_N_ELEMENTS(eTypes1); ++i) aBoxItem.SetLine( m_pFrameSel->GetFrameBorderStyle( eTypes1[i].first ), eTypes1[i].second ); - //-------------------------------- + // border hor/ver and TableFlag - //-------------------------------- + TBorderPair eTypes2[] = { TBorderPair(svx::FRAMEBORDER_HOR,BOXINFO_LINE_HORI), TBorderPair(svx::FRAMEBORDER_VER,BOXINFO_LINE_VERT) @@ -626,9 +626,9 @@ sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) aBoxInfoItem.EnableHor( mbHorEnabled ); aBoxInfoItem.EnableVer( mbVerEnabled ); - //------------------- + // inner distance - //------------------- + if( m_pLeftMF->IsVisible() ) { // #i40405# enable distance controls for next dialog call @@ -683,9 +683,9 @@ sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) } } - //------------------------------------------ + // note Don't Care Status in the Info-Item: - //------------------------------------------ + aBoxInfoItem.SetValid( VALID_TOP, m_pFrameSel->GetFrameBorderState( svx::FRAMEBORDER_TOP ) != svx::FRAMESTATE_DONTCARE ); aBoxInfoItem.SetValid( VALID_BOTTOM, m_pFrameSel->GetFrameBorderState( svx::FRAMEBORDER_BOTTOM ) != svx::FRAMESTATE_DONTCARE ); aBoxInfoItem.SetValid( VALID_LEFT, m_pFrameSel->GetFrameBorderState( svx::FRAMEBORDER_LEFT ) != svx::FRAMESTATE_DONTCARE ); @@ -736,14 +736,14 @@ sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) return bAttrsChanged; } -// ----------------------------------------------------------------------- + void SvxBorderTabPage::HideShadowControls() { m_pShadowFrame->Hide(); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxBorderTabPage, SelPreHdl_Impl) { @@ -815,7 +815,7 @@ IMPL_LINK_NOARG(SvxBorderTabPage, SelPreHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxBorderTabPage, SelSdwHdl_Impl) { @@ -827,7 +827,7 @@ IMPL_LINK_NOARG(SvxBorderTabPage, SelSdwHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxBorderTabPage, SelColHdl_Impl, ListBox *, pLb ) { @@ -856,7 +856,7 @@ IMPL_LINK_NOARG(SvxBorderTabPage, ModifyWidthHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxBorderTabPage, SelStyleHdl_Impl, ListBox *, pLb ) { @@ -883,7 +883,7 @@ const sal_uInt16 SVX_BORDER_PRESET_COUNT = 5; // number of shadow images to show const sal_uInt16 SVX_BORDER_SHADOW_COUNT = 5; -// ---------------------------------------------------------------------------- + sal_uInt16 SvxBorderTabPage::GetPresetImageId( sal_uInt16 nValueSetIdx ) const { @@ -951,7 +951,7 @@ sal_uInt16 SvxBorderTabPage::GetPresetStringId( sal_uInt16 nValueSetIdx ) const return pnStrIds[ GetPresetImageId( nValueSetIdx ) - 1 ]; } -// ---------------------------------------------------------------------------- + void SvxBorderTabPage::FillPresetVS() { @@ -974,7 +974,7 @@ void SvxBorderTabPage::FillPresetVS() m_pWndPresets->Show(); } -// ---------------------------------------------------------------------------- + void SvxBorderTabPage::FillShadowVS() { @@ -1004,7 +1004,7 @@ void SvxBorderTabPage::FillShadowVS() m_pWndShadows->Show(); } -// ---------------------------------------------------------------------------- + void SvxBorderTabPage::FillValueSets() { @@ -1072,7 +1072,7 @@ void SvxBorderTabPage::FillLineListBox_Impl() m_pLbLineStyle->SetWidth( nVal ); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxBorderTabPage, LinesChanged_Impl) { if(!mbUseMarginItem && m_pLeftMF->IsVisible()) @@ -1149,7 +1149,7 @@ IMPL_LINK_NOARG(SvxBorderTabPage, LinesChanged_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxBorderTabPage, ModifyDistanceHdl_Impl, MetricField*, pField) { diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 011765ef774a..b5b05ae0a7b3 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -159,20 +159,20 @@ inline SvxFont& SvxCharBasePage::GetPreviewFont() return m_pPreviewWin->GetFont(); } -// ----------------------------------------------------------------------- + inline SvxFont& SvxCharBasePage::GetPreviewCJKFont() { return m_pPreviewWin->GetCJKFont(); } -// ----------------------------------------------------------------------- + inline SvxFont& SvxCharBasePage::GetPreviewCTLFont() { return m_pPreviewWin->GetCTLFont(); } -// ----------------------------------------------------------------------- + SvxCharBasePage::SvxCharBasePage(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemset) : SfxTabPage( pParent, rID, rUIXMLDescription, rItemset ) @@ -181,13 +181,13 @@ SvxCharBasePage::SvxCharBasePage(Window* pParent, const OString& rID, const OUSt { } -// ----------------------------------------------------------------------- + SvxCharBasePage::~SvxCharBasePage() { } -// ----------------------------------------------------------------------- + void SvxCharBasePage::ActivatePage( const SfxItemSet& rSet ) { @@ -195,7 +195,7 @@ void SvxCharBasePage::ActivatePage( const SfxItemSet& rSet ) } -// ----------------------------------------------------------------------- + void SvxCharBasePage::SetPrevFontWidthScale( const SfxItemSet& rSet ) { @@ -207,20 +207,20 @@ void SvxCharBasePage::SetPrevFontWidthScale( const SfxItemSet& rSet ) } } -// ----------------------------------------------------------------------- + namespace { - // ----------------------------------------------------------------------- + void setPrevFontEscapement(SvxFont& _rFont,sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc ) { _rFont.SetPropr( nProp ); _rFont.SetProprRel( nEscProp ); _rFont.SetEscapement( nEsc ); } - // ----------------------------------------------------------------------- - // ----------------------------------------------------------------------- + + } -// ----------------------------------------------------------------------- + void SvxCharBasePage::SetPrevFontEscapement( sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc ) { @@ -369,14 +369,14 @@ SvxCharNamePage::SvxCharNamePage( Window* pParent, const SfxItemSet& rInSet ) Initialize(); } -// ----------------------------------------------------------------------- + SvxCharNamePage::~SvxCharNamePage() { delete m_pImpl; } -// ----------------------------------------------------------------------- + void SvxCharNamePage::Initialize() { @@ -400,7 +400,7 @@ void SvxCharNamePage::Initialize() m_pImpl->m_aUpdateTimer.SetTimeoutHdl( LINK( this, SvxCharNamePage, UpdateHdl_Impl ) ); } -// ----------------------------------------------------------------------- + const FontList* SvxCharNamePage::GetFontList() const { @@ -432,7 +432,7 @@ const FontList* SvxCharNamePage::GetFontList() const return m_pImpl->m_pFontList; } -// ----------------------------------------------------------------------------- + namespace { FontInfo calcFontInfo( SvxFont& _rFont, @@ -503,7 +503,7 @@ namespace } } -// ----------------------------------------------------------------------- + void SvxCharNamePage::UpdatePreview_Impl() { @@ -541,7 +541,7 @@ void SvxCharNamePage::UpdatePreview_Impl() m_pPreviewWin->Invalidate(); } -// ----------------------------------------------------------------------- + void SvxCharNamePage::FillStyleBox_Impl( const FontNameBox* pNameBox ) { @@ -578,7 +578,7 @@ void SvxCharNamePage::FillStyleBox_Impl( const FontNameBox* pNameBox ) } } -// ----------------------------------------------------------------------- + void SvxCharNamePage::FillSizeBox_Impl( const FontNameBox* pNameBox ) { @@ -613,7 +613,7 @@ void SvxCharNamePage::FillSizeBox_Impl( const FontNameBox* pNameBox ) pSizeBox->Fill( &_aFontInfo, pFontList ); } -// ----------------------------------------------------------------------- + void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp ) { @@ -837,7 +837,7 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp pLangBox->SaveValue(); } -// ----------------------------------------------------------------------- + sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp ) { @@ -1111,7 +1111,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan return bModified; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxCharNamePage, UpdateHdl_Impl) { @@ -1119,7 +1119,7 @@ IMPL_LINK_NOARG(SvxCharNamePage, UpdateHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxCharNamePage, FontModifyHdl_Impl, void*, pNameBox ) { @@ -1133,7 +1133,7 @@ IMPL_LINK( SvxCharNamePage, FontModifyHdl_Impl, void*, pNameBox ) return 0; } -// ----------------------------------------------------------------------- + void SvxCharNamePage::ActivatePage( const SfxItemSet& rSet ) { @@ -1142,7 +1142,7 @@ void SvxCharNamePage::ActivatePage( const SfxItemSet& rSet ) UpdatePreview_Impl(); // instead of asynchronous calling in ctor } -// ----------------------------------------------------------------------- + int SvxCharNamePage::DeactivatePage( SfxItemSet* _pSet ) { @@ -1151,21 +1151,21 @@ int SvxCharNamePage::DeactivatePage( SfxItemSet* _pSet ) return LEAVE_PAGE; } -// ----------------------------------------------------------------------- + SfxTabPage* SvxCharNamePage::Create( Window* pParent, const SfxItemSet& rSet ) { return new SvxCharNamePage( pParent, rSet ); } -// ----------------------------------------------------------------------- + sal_uInt16* SvxCharNamePage::GetRanges() { return pNameRanges; } -// ----------------------------------------------------------------------- + void SvxCharNamePage::Reset( const SfxItemSet& rSet ) { @@ -1177,7 +1177,7 @@ void SvxCharNamePage::Reset( const SfxItemSet& rSet ) UpdatePreview_Impl(); } -// ----------------------------------------------------------------------- + sal_Bool SvxCharNamePage::FillItemSet( SfxItemSet& rSet ) { @@ -1187,7 +1187,7 @@ sal_Bool SvxCharNamePage::FillItemSet( SfxItemSet& rSet ) return bModified; } -// ----------------------------------------------------------------------- + void SvxCharNamePage::SetFontList( const SvxFontListItem& rItem ) { @@ -1199,7 +1199,7 @@ void SvxCharNamePage::SetFontList( const SvxFontListItem& rItem ) m_pImpl->m_bMustDelete = sal_True; } -// ----------------------------------------------------------------------- + namespace { void enableRelativeMode( SvxCharNamePage* _pPage, FontSizeBox* _pFontSizeLB, sal_uInt16 _nHeightWhich ) @@ -1218,7 +1218,7 @@ namespace _pFontSizeLB->EnablePtRelativeMode( sal::static_int_cast< short >(-(nCurHeight - 20)), (9999 - nCurHeight), 10 ); } } -// ----------------------------------------------------------------------------- + void SvxCharNamePage::EnableRelativeMode() { @@ -1228,13 +1228,13 @@ void SvxCharNamePage::EnableRelativeMode() enableRelativeMode(this,m_pCTLFontSizeLB,GetWhich( SID_ATTR_CHAR_CTL_FONTHEIGHT )); } -// ----------------------------------------------------------------------- + void SvxCharNamePage::EnableSearchMode() { m_pImpl->m_bInSearchMode = sal_True; } -// ----------------------------------------------------------------------- + void SvxCharNamePage::DisableControls( sal_uInt16 nDisable ) { if ( DISABLE_LANGUAGE & nDisable ) @@ -1258,13 +1258,13 @@ void SvxCharNamePage::DisableControls( sal_uInt16 nDisable ) } } -// ----------------------------------------------------------------------- + void SvxCharNamePage::SetPreviewBackgroundToCharacter() { m_bPreviewBackgroundToCharacter = sal_True; } -// ----------------------------------------------------------------------- + void SvxCharNamePage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pFontListItem,SvxFontListItem,SID_ATTR_CHAR_FONTLIST,false); @@ -1317,7 +1317,7 @@ SvxCharEffectsPage::SvxCharEffectsPage( Window* pParent, const SfxItemSet& rInSe Initialize(); } -// ----------------------------------------------------------------------- + void SvxCharEffectsPage::Initialize() { @@ -1424,7 +1424,7 @@ SvxCharEffectsPage::~SvxCharEffectsPage() { } -// ----------------------------------------------------------------------- + void SvxCharEffectsPage::UpdatePreview_Impl() { @@ -1491,7 +1491,7 @@ void SvxCharEffectsPage::UpdatePreview_Impl() m_pPreviewWin->Invalidate(); } -// ----------------------------------------------------------------------- + void SvxCharEffectsPage::SetCaseMap_Impl( SvxCaseMap eCaseMap ) { @@ -1507,7 +1507,7 @@ void SvxCharEffectsPage::SetCaseMap_Impl( SvxCaseMap eCaseMap ) UpdatePreview_Impl(); } -// ----------------------------------------------------------------------- + void SvxCharEffectsPage::ResetColor_Impl( const SfxItemSet& rSet ) { @@ -1565,7 +1565,7 @@ void SvxCharEffectsPage::ResetColor_Impl( const SfxItemSet& rSet ) } } -// ----------------------------------------------------------------------- + sal_Bool SvxCharEffectsPage::FillItemSetColor_Impl( SfxItemSet& rSet ) { @@ -1606,7 +1606,7 @@ sal_Bool SvxCharEffectsPage::FillItemSetColor_Impl( SfxItemSet& rSet ) return bModified; } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxCharEffectsPage, SelectHdl_Impl, ListBox*, pBox ) { @@ -1640,7 +1640,7 @@ IMPL_LINK( SvxCharEffectsPage, SelectHdl_Impl, ListBox*, pBox ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxCharEffectsPage, UpdatePreview_Impl) { @@ -1653,7 +1653,7 @@ IMPL_LINK_NOARG(SvxCharEffectsPage, UpdatePreview_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxCharEffectsPage, CbClickHdl_Impl) { @@ -1661,7 +1661,7 @@ IMPL_LINK_NOARG(SvxCharEffectsPage, CbClickHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxCharEffectsPage, TristClickHdl_Impl) { @@ -1669,7 +1669,7 @@ IMPL_LINK_NOARG(SvxCharEffectsPage, TristClickHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxCharEffectsPage, ColorBoxSelectHdl_Impl, ColorListBox*, pBox ) { @@ -1689,7 +1689,7 @@ IMPL_LINK( SvxCharEffectsPage, ColorBoxSelectHdl_Impl, ColorListBox*, pBox ) m_pPreviewWin->Invalidate(); return 0; } -// ----------------------------------------------------------------------- + int SvxCharEffectsPage::DeactivatePage( SfxItemSet* _pSet ) { @@ -1698,21 +1698,21 @@ int SvxCharEffectsPage::DeactivatePage( SfxItemSet* _pSet ) return LEAVE_PAGE; } -// ----------------------------------------------------------------------- + SfxTabPage* SvxCharEffectsPage::Create( Window* pParent, const SfxItemSet& rSet ) { return new SvxCharEffectsPage( pParent, rSet ); } -// ----------------------------------------------------------------------- + sal_uInt16* SvxCharEffectsPage::GetRanges() { return pEffectsRanges; } -// ----------------------------------------------------------------------- + void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) { @@ -2159,7 +2159,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) m_pFontColorLB->SaveValue(); } -// ----------------------------------------------------------------------- + sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) { @@ -2511,13 +2511,13 @@ void SvxCharEffectsPage::EnableFlash() m_pBlinkingBtn->Show(); } -// ----------------------------------------------------------------------- + void SvxCharEffectsPage::SetPreviewBackgroundToCharacter() { m_bPreviewBackgroundToCharacter = sal_True; } -// ----------------------------------------------------------------------- + void SvxCharEffectsPage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pDisableCtlItem,SfxUInt16Item,SID_DISABLE_CTL,false); @@ -2572,7 +2572,7 @@ SvxCharPositionPage::SvxCharPositionPage( Window* pParent, const SfxItemSet& rIn Initialize(); } -// ----------------------------------------------------------------------- + void SvxCharPositionPage::Initialize() { @@ -2618,14 +2618,14 @@ SvxCharPositionPage::~SvxCharPositionPage() { } -// ----------------------------------------------------------------------- + void SvxCharPositionPage::UpdatePreview_Impl( sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc ) { SetPrevFontEscapement( nProp, nEscProp, nEsc ); } -// ----------------------------------------------------------------------- + void SvxCharPositionPage::SetEscapement_Impl( sal_uInt16 nEsc ) { @@ -2673,7 +2673,7 @@ void SvxCharPositionPage::SetEscapement_Impl( sal_uInt16 nEsc ) UpdatePreview_Impl( 100, aEscItm.GetProp(), aEscItm.GetEsc() ); } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxCharPositionPage, PositionHdl_Impl, RadioButton*, pBtn ) { @@ -2688,7 +2688,7 @@ IMPL_LINK( SvxCharPositionPage, PositionHdl_Impl, RadioButton*, pBtn ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxCharPositionPage, RotationHdl_Impl, RadioButton*, pBtn ) { @@ -2701,7 +2701,7 @@ IMPL_LINK( SvxCharPositionPage, RotationHdl_Impl, RadioButton*, pBtn ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxCharPositionPage, FontModifyHdl_Impl) { @@ -2712,7 +2712,7 @@ IMPL_LINK_NOARG(SvxCharPositionPage, FontModifyHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxCharPositionPage, AutoPositionHdl_Impl, CheckBox*, pBox ) { @@ -2728,7 +2728,7 @@ IMPL_LINK( SvxCharPositionPage, AutoPositionHdl_Impl, CheckBox*, pBox ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxCharPositionPage, FitToLineHdl_Impl, CheckBox*, pBox ) { @@ -2744,7 +2744,7 @@ IMPL_LINK( SvxCharPositionPage, FitToLineHdl_Impl, CheckBox*, pBox ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxCharPositionPage, KerningSelectHdl_Impl) { @@ -2779,7 +2779,7 @@ IMPL_LINK_NOARG(SvxCharPositionPage, KerningSelectHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxCharPositionPage, KerningModifyHdl_Impl) { @@ -2802,14 +2802,14 @@ IMPL_LINK_NOARG(SvxCharPositionPage, KerningModifyHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxCharPositionPage, PairKerningHdl_Impl) { return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxCharPositionPage, LoseFocusHdl_Impl, MetricField*, pField ) { @@ -2836,7 +2836,7 @@ IMPL_LINK( SvxCharPositionPage, LoseFocusHdl_Impl, MetricField*, pField ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxCharPositionPage, ScaleWidthModifyHdl_Impl) { @@ -2863,7 +2863,7 @@ void SvxCharPositionPage::ActivatePage( const SfxItemSet& rSet ) } } -// ----------------------------------------------------------------------- + int SvxCharPositionPage::DeactivatePage( SfxItemSet* _pSet ) { @@ -2872,21 +2872,21 @@ int SvxCharPositionPage::DeactivatePage( SfxItemSet* _pSet ) return LEAVE_PAGE; } -// ----------------------------------------------------------------------- + SfxTabPage* SvxCharPositionPage::Create( Window* pParent, const SfxItemSet& rSet ) { return new SvxCharPositionPage( pParent, rSet ); } -// ----------------------------------------------------------------------- + sal_uInt16* SvxCharPositionPage::GetRanges() { return pPositionRanges; } -// ----------------------------------------------------------------------- + void SvxCharPositionPage::Reset( const SfxItemSet& rSet ) { OUString sUser = GetUserData(); @@ -3117,7 +3117,7 @@ void SvxCharPositionPage::Reset( const SfxItemSet& rSet ) m_pPairKerningBtn->SaveValue(); } -// ----------------------------------------------------------------------- + sal_Bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) { @@ -3250,7 +3250,7 @@ sal_Bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) return bModified; } -// ----------------------------------------------------------------------- + void SvxCharPositionPage::FillUserData() { @@ -3263,12 +3263,12 @@ void SvxCharPositionPage::FillUserData() SetUserData( sUser ); } -// ----------------------------------------------------------------------- + void SvxCharPositionPage::SetPreviewBackgroundToCharacter() { m_bPreviewBackgroundToCharacter = sal_True; } -// ----------------------------------------------------------------------- + void SvxCharPositionPage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE,false); @@ -3300,7 +3300,7 @@ SvxCharTwoLinesPage::~SvxCharTwoLinesPage() { } -// ----------------------------------------------------------------------- + void SvxCharTwoLinesPage::Initialize() { @@ -3321,7 +3321,7 @@ void SvxCharTwoLinesPage::Initialize() rCTLFont.SetSize( Size( 0, 220 ) ); } -// ----------------------------------------------------------------------- + void SvxCharTwoLinesPage::SelectCharacter( ListBox* pBox ) { @@ -3341,7 +3341,7 @@ void SvxCharTwoLinesPage::SelectCharacter( ListBox* pBox ) delete aDlg; } -// ----------------------------------------------------------------------- + void SvxCharTwoLinesPage::SetBracket( sal_Unicode cBracket, sal_Bool bStart ) { @@ -3379,7 +3379,7 @@ void SvxCharTwoLinesPage::SetBracket( sal_Unicode cBracket, sal_Bool bStart ) m_nEndBracketPosition = nEntryPos; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxCharTwoLinesPage, TwoLinesHdl_Impl) { @@ -3390,7 +3390,7 @@ IMPL_LINK_NOARG(SvxCharTwoLinesPage, TwoLinesHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxCharTwoLinesPage, CharacterMapHdl_Impl, ListBox*, pBox ) { @@ -3409,14 +3409,14 @@ IMPL_LINK( SvxCharTwoLinesPage, CharacterMapHdl_Impl, ListBox*, pBox ) return 0; } -// ----------------------------------------------------------------------- + void SvxCharTwoLinesPage::ActivatePage( const SfxItemSet& rSet ) { SvxCharBasePage::ActivatePage( rSet ); } -// ----------------------------------------------------------------------- + int SvxCharTwoLinesPage::DeactivatePage( SfxItemSet* _pSet ) { @@ -3425,21 +3425,21 @@ int SvxCharTwoLinesPage::DeactivatePage( SfxItemSet* _pSet ) return LEAVE_PAGE; } -// ----------------------------------------------------------------------- + SfxTabPage* SvxCharTwoLinesPage::Create( Window* pParent, const SfxItemSet& rSet ) { return new SvxCharTwoLinesPage( pParent, rSet ); } -// ----------------------------------------------------------------------- + sal_uInt16* SvxCharTwoLinesPage::GetRanges() { return pTwoLinesRanges; } -// ----------------------------------------------------------------------- + void SvxCharTwoLinesPage::Reset( const SfxItemSet& rSet ) { @@ -3463,7 +3463,7 @@ void SvxCharTwoLinesPage::Reset( const SfxItemSet& rSet ) SetPrevFontWidthScale( rSet ); } -// ----------------------------------------------------------------------- + sal_Bool SvxCharTwoLinesPage::FillItemSet( SfxItemSet& rSet ) { @@ -3506,13 +3506,13 @@ void SvxCharTwoLinesPage::UpdatePreview_Impl() m_pPreviewWin->SetTwoLines(m_pTwoLinesBtn->IsChecked()); m_pPreviewWin->Invalidate(); } -// ----------------------------------------------------------------------- + void SvxCharTwoLinesPage::SetPreviewBackgroundToCharacter() { m_bPreviewBackgroundToCharacter = sal_True; } -// ----------------------------------------------------------------------- + void SvxCharTwoLinesPage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE,false); diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index 4795f177e742..dac480293290 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -71,7 +71,7 @@ static sal_uInt16 pCaptionRanges[] = 0 }; -// ----------------------------------------------------------------------- + SvxCaptionTabPage::SvxCaptionTabPage(Window* pParent, const SfxItemSet& rInAttrs) : SfxTabPage(pParent, "CalloutPage", "cui/ui/calloutpage.ui", rInAttrs) @@ -130,7 +130,7 @@ SvxCaptionTabPage::SvxCaptionTabPage(Window* pParent, const SfxItemSet& rInAttrs m_pCB_LAENGE->SetClickHdl(LINK(this,SvxCaptionTabPage,LineOptHdl_Impl)); } -// ----------------------------------------------------------------------- + void SvxCaptionTabPage::Construct() { @@ -138,7 +138,7 @@ void SvxCaptionTabPage::Construct() DBG_ASSERT( pView, "Keine gueltige View Uebergeben!" ); } -// ----------------------------------------------------------------------- + sal_Bool SvxCaptionTabPage::FillItemSet( SfxItemSet& _rOutAttrs) { @@ -210,7 +210,7 @@ sal_Bool SvxCaptionTabPage::FillItemSet( SfxItemSet& _rOutAttrs) return( sal_True ); } -// ----------------------------------------------------------------------- + void SvxCaptionTabPage::Reset( const SfxItemSet& ) { @@ -328,7 +328,7 @@ void SvxCaptionTabPage::Reset( const SfxItemSet& ) SetupType_Impl( nCaptionType+1 ); } -// ----------------------------------------------------------------------- + SfxTabPage* SvxCaptionTabPage::Create( Window* pWindow, const SfxItemSet& rOutAttrs ) @@ -336,14 +336,14 @@ SfxTabPage* SvxCaptionTabPage::Create( Window* pWindow, return( new SvxCaptionTabPage( pWindow, rOutAttrs ) ); } -//------------------------------------------------------------------------ + sal_uInt16* SvxCaptionTabPage::GetRanges() { return( pCaptionRanges ); } -//------------------------------------------------------------------------ + void SvxCaptionTabPage::SetupAnsatz_Impl( sal_uInt16 nType ) { @@ -401,7 +401,7 @@ void SvxCaptionTabPage::SetupAnsatz_Impl( sal_uInt16 nType ) } } -//------------------------------------------------------------------------ + IMPL_LINK_INLINE_START( SvxCaptionTabPage, AnsatzSelectHdl_Impl, ListBox *, pListBox ) { @@ -413,7 +413,7 @@ IMPL_LINK_INLINE_START( SvxCaptionTabPage, AnsatzSelectHdl_Impl, ListBox *, pLis } IMPL_LINK_INLINE_END( SvxCaptionTabPage, AnsatzSelectHdl_Impl, ListBox *, pListBox ) -//------------------------------------------------------------------------ + IMPL_LINK_INLINE_START( SvxCaptionTabPage, AnsatzRelSelectHdl_Impl, ListBox *, pListBox ) { @@ -425,7 +425,7 @@ IMPL_LINK_INLINE_START( SvxCaptionTabPage, AnsatzRelSelectHdl_Impl, ListBox *, p } IMPL_LINK_INLINE_END( SvxCaptionTabPage, AnsatzRelSelectHdl_Impl, ListBox *, pListBox ) -//------------------------------------------------------------------------ + IMPL_LINK( SvxCaptionTabPage, LineOptHdl_Impl, Button *, pButton ) { @@ -445,7 +445,7 @@ IMPL_LINK( SvxCaptionTabPage, LineOptHdl_Impl, Button *, pButton ) return 0; } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG_INLINE_START(SvxCaptionTabPage, SelectCaptTypeHdl_Impl) { @@ -454,7 +454,7 @@ IMPL_LINK_NOARG_INLINE_START(SvxCaptionTabPage, SelectCaptTypeHdl_Impl) } IMPL_LINK_NOARG_INLINE_END(SvxCaptionTabPage, SelectCaptTypeHdl_Impl) -//------------------------------------------------------------------------ + void SvxCaptionTabPage::SetupType_Impl( sal_uInt16 nType ) { @@ -486,7 +486,7 @@ void SvxCaptionTabPage::SetupType_Impl( sal_uInt16 nType ) } } -// ----------------------------------------------------------------------- + void SvxCaptionTabPage::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -496,7 +496,7 @@ void SvxCaptionTabPage::DataChanged( const DataChangedEvent& rDCEvt ) FillValueSet(); } -// ----------------------------------------------------------------------- + void SvxCaptionTabPage::FillValueSet() { diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 09fb9cd22953..f66104725ec9 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -161,7 +161,7 @@ void SvxNumberPreview::Paint( const Rectangle& ) DrawText( aPosText, aTmpStr ); } -// ----------------------------------------------------------------------- + void SvxNumberPreview::InitSettings( sal_Bool bForeground, sal_Bool bBackground ) { @@ -187,7 +187,7 @@ void SvxNumberPreview::InitSettings( sal_Bool bForeground, sal_Bool bBackground Invalidate(); } -// ----------------------------------------------------------------------- + void SvxNumberPreview::StateChanged( StateChangedType nType ) { @@ -199,7 +199,7 @@ void SvxNumberPreview::StateChanged( StateChangedType nType ) Window::StateChanged( nType ); } -// ----------------------------------------------------------------------- + void SvxNumberPreview::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -712,9 +712,9 @@ sal_Bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) pNumFmtShell->FindEntry(aFormat, &nCurKey); } - //--------------------------------------------------------------- + // Chosen format: - // -------------- + if ( bDataChanged ) { bDataChanged = ( nInitFormat != nCurKey ); @@ -729,9 +729,9 @@ sal_Bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) } } - // -------------------------------------------------------------- + // List of changed user defined formats: - // ------------------------------------- + const size_t nDelCount = pNumFmtShell->GetUpdateDataCount(); if ( nDelCount > 0 ) @@ -758,9 +758,9 @@ sal_Bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) delete [] pDelArr; } - //--------------------------------------------------------------- + // Whether source format is to be taken or not: - // -------------------------------------------- + if ( m_pCbSourceFormat->IsEnabled() ) { sal_uInt16 _nWhich = GetWhich( SID_ATTR_NUMBERFORMAT_SOURCE ); @@ -1170,7 +1170,7 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb ) pNumFmtShell->SetCurrencySymbol(nCurrencyPos); } - //-------------------------------------------------------------------- + // Format-ListBox ---------------------------------------------------- if (pLb == m_pLbFormat) { @@ -1220,7 +1220,7 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb ) return 0; } - //-------------------------------------------------------------------- + // category-ListBox ------------------------------------------------- if (pLb == m_pLbCategory || pLb == m_pLbCurrency) { @@ -1231,7 +1231,7 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb ) return 0; } - //-------------------------------------------------------------------- + // language/country-ListBox ---------------------------------------------- if (pLb == m_pLbLanguage) { diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index df72d04516b8..0b20ad2266dc 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -85,7 +85,7 @@ sal_uInt16 aArr[] = SVX_PAGE_LEFT }; -// ----------------------------------------------------------------------- + sal_uInt16 PageUsageToPos_Impl( sal_uInt16 nUsage ) { @@ -95,7 +95,7 @@ sal_uInt16 PageUsageToPos_Impl( sal_uInt16 nUsage ) return SVX_PAGE_ALL; } -// ----------------------------------------------------------------------- + sal_uInt16 PosToPageUsage_Impl( sal_uInt16 nPos ) { @@ -104,7 +104,7 @@ sal_uInt16 PosToPageUsage_Impl( sal_uInt16 nPos ) return aArr[nPos]; } -// ----------------------------------------------------------------------- + Size GetMinBorderSpace_Impl( const SvxShadowItem& rShadow, const SvxBoxItem& rBox ) { @@ -116,7 +116,7 @@ Size GetMinBorderSpace_Impl( const SvxShadowItem& rShadow, const SvxBoxItem& rBo return aSz; } -// ----------------------------------------------------------------------- + long ConvertLong_Impl( const long nIn, SfxMapUnit eUnit ) { @@ -136,7 +136,7 @@ sal_Bool IsEqualSize_Impl( const SvxSizeItem* pSize, const Size& rSize ) return sal_False; } -// ----------------------------------------------------------------------- + #define MARGIN_LEFT ( (MarginPosition)0x0001 ) #define MARGIN_RIGHT ( (MarginPosition)0x0002 ) @@ -165,14 +165,14 @@ sal_uInt16* SvxPageDescPage::GetRanges() return pRanges; } -// ----------------------------------------------------------------------- + SfxTabPage* SvxPageDescPage::Create( Window* pParent, const SfxItemSet& rSet ) { return new SvxPageDescPage( pParent, rSet ); } -// ----------------------------------------------------------------------- + SvxPageDescPage::SvxPageDescPage( Window* pParent, const SfxItemSet& rAttr ) : @@ -357,14 +357,14 @@ SvxPageDescPage::SvxPageDescPage( Window* pParent, const SfxItemSet& rAttr ) : SvxNumOptionsTabPage::GetI18nNumbering( *m_pNumberFormatBox, ::std::numeric_limits<sal_uInt16>::max()); } -// ----------------------------------------------------------------------- + SvxPageDescPage::~SvxPageDescPage() { delete pImpl; } -// ----------------------------------------------------------------------- + void SvxPageDescPage::Init_Impl() { @@ -398,7 +398,7 @@ void SvxPageDescPage::Init_Impl() } -// ----------------------------------------------------------------------- + void SvxPageDescPage::Reset( const SfxItemSet& rSet ) { @@ -650,7 +650,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet ) } } -// ----------------------------------------------------------------------- + void SvxPageDescPage::FillUserData() { @@ -659,7 +659,7 @@ void SvxPageDescPage::FillUserData() } -// ----------------------------------------------------------------------- + sal_Bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) { @@ -884,7 +884,7 @@ sal_Bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) return bModified; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxPageDescPage, LayoutHdl_Impl) { @@ -909,7 +909,7 @@ IMPL_LINK_NOARG(SvxPageDescPage, LayoutHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxPageDescPage, PaperBinHdl_Impl) { @@ -946,7 +946,7 @@ IMPL_LINK_NOARG(SvxPageDescPage, PaperBinHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxPageDescPage, PaperSizeSelect_Impl, ListBox *, pBox ) { @@ -1018,7 +1018,7 @@ IMPL_LINK( SvxPageDescPage, PaperSizeSelect_Impl, ListBox *, pBox ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxPageDescPage, PaperSizeModify_Impl) { @@ -1043,7 +1043,7 @@ IMPL_LINK_NOARG(SvxPageDescPage, PaperSizeModify_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxPageDescPage, SwapOrientation_Impl, RadioButton *, pBtn ) { @@ -1072,7 +1072,7 @@ IMPL_LINK( SvxPageDescPage, SwapOrientation_Impl, RadioButton *, pBtn ) return 0; } -// ----------------------------------------------------------------------- + void SvxPageDescPage::SwapFirstValues_Impl( bool bSet ) { @@ -1141,7 +1141,7 @@ void SvxPageDescPage::SwapFirstValues_Impl( bool bSet ) } } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG_INLINE_START(SvxPageDescPage, BorderModify_Impl) { @@ -1152,7 +1152,7 @@ IMPL_LINK_NOARG_INLINE_START(SvxPageDescPage, BorderModify_Impl) } IMPL_LINK_NOARG_INLINE_END(SvxPageDescPage, BorderModify_Impl) -// ----------------------------------------------------------------------- + void SvxPageDescPage::UpdateExample_Impl( bool bResetbackground ) { @@ -1175,7 +1175,7 @@ void SvxPageDescPage::UpdateExample_Impl( bool bResetbackground ) m_pBspWin->Invalidate(); } -// ----------------------------------------------------------------------- + void SvxPageDescPage::ResetBackground_Impl( const SfxItemSet& rSet ) { @@ -1263,7 +1263,7 @@ void SvxPageDescPage::ResetBackground_Impl( const SfxItemSet& rSet ) m_pBspWin->SetBorder( (SvxBoxItem&)*pItem ); } -// ----------------------------------------------------------------------- + void SvxPageDescPage::InitHeadFoot_Impl( const SfxItemSet& rSet ) { @@ -1370,7 +1370,7 @@ void SvxPageDescPage::InitHeadFoot_Impl( const SfxItemSet& rSet ) } } -// ----------------------------------------------------------------------- + void SvxPageDescPage::ActivatePage( const SfxItemSet& rSet ) { @@ -1379,7 +1379,7 @@ void SvxPageDescPage::ActivatePage( const SfxItemSet& rSet ) RangeHdl_Impl( 0 ); } -// ----------------------------------------------------------------------- + int SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet ) { @@ -1433,7 +1433,7 @@ int SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet ) return LEAVE_PAGE; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxPageDescPage, RangeHdl_Impl) { @@ -1506,7 +1506,7 @@ IMPL_LINK_NOARG(SvxPageDescPage, RangeHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + void SvxPageDescPage::CalcMargin_Impl() { @@ -1549,7 +1549,7 @@ void SvxPageDescPage::CalcMargin_Impl() } } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG_INLINE_START(SvxPageDescPage, CenterHdl_Impl) { @@ -1560,7 +1560,7 @@ IMPL_LINK_NOARG_INLINE_START(SvxPageDescPage, CenterHdl_Impl) } IMPL_LINK_NOARG_INLINE_END(SvxPageDescPage, CenterHdl_Impl) -// ----------------------------------------------------------------------- + void SvxPageDescPage::SetCollectionList(const std::vector<OUString> &aList) { @@ -1576,7 +1576,7 @@ void SvxPageDescPage::SetCollectionList(const std::vector<OUString> &aList) m_pRegisterCB->SetClickHdl(LINK(this, SvxPageDescPage, RegisterModify)); } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxPageDescPage, RegisterModify, CheckBox*, pBox ) { @@ -1592,7 +1592,7 @@ IMPL_LINK( SvxPageDescPage, RegisterModify, CheckBox*, pBox ) return 0; } -// ---------------------------------------------------------------------------- + void SvxPageDescPage::DisableVerticalPageDir() { diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx index 34a1687935e6..2a764fa0f87e 100644 --- a/cui/source/tabpages/tabarea.cxx +++ b/cui/source/tabpages/tabarea.cxx @@ -86,14 +86,14 @@ SvxAreaTabDialog::SvxAreaTabDialog rBtnCancel.SetClickHdl( LINK( this, SvxAreaTabDialog, CancelHdlImpl ) ); } -// ----------------------------------------------------------------------- + SvxAreaTabDialog::~SvxAreaTabDialog() { } -// ----------------------------------------------------------------------- + void SvxAreaTabDialog::SavePalettes() { @@ -201,7 +201,7 @@ void SvxAreaTabDialog::SavePalettes() } } } -// ----------------------------------------------------------------------- + short SvxAreaTabDialog::Ok() { @@ -213,7 +213,7 @@ short SvxAreaTabDialog::Ok() return( SfxTabDialog::Ok() ); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG_INLINE_START(SvxAreaTabDialog, CancelHdlImpl) { @@ -224,7 +224,7 @@ IMPL_LINK_NOARG_INLINE_START(SvxAreaTabDialog, CancelHdlImpl) } IMPL_LINK_INLINE_END( SvxAreaTabDialog, CancelHdlImpl, void *, p ) -// ----------------------------------------------------------------------- + void SvxAreaTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx index 8c640fe51cc8..d5ccddf8fcb8 100644 --- a/cui/source/tabpages/tabline.cxx +++ b/cui/source/tabpages/tabline.cxx @@ -103,13 +103,13 @@ SvxLineTabDialog::SvxLineTabDialog rBtnCancel.SetClickHdl( LINK( this, SvxLineTabDialog, CancelHdlImpl ) ); } -// ----------------------------------------------------------------------- + SvxLineTabDialog::~SvxLineTabDialog() { } -// ----------------------------------------------------------------------- + void SvxLineTabDialog::SavePalettes() { @@ -171,7 +171,7 @@ void SvxLineTabDialog::SavePalettes() } } -// ----------------------------------------------------------------------- + short SvxLineTabDialog::Ok() { @@ -182,7 +182,7 @@ short SvxLineTabDialog::Ok() return( SfxTabDialog::Ok() ); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG_INLINE_START(SvxLineTabDialog, CancelHdlImpl) { @@ -193,7 +193,7 @@ IMPL_LINK_NOARG_INLINE_START(SvxLineTabDialog, CancelHdlImpl) } IMPL_LINK_NOARG_INLINE_END(SvxLineTabDialog, CancelHdlImpl) -// ----------------------------------------------------------------------- + void SvxLineTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index 0b487060437b..6ce623593122 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -186,20 +186,20 @@ SvxTabulatorTabPage::SvxTabulatorTabPage( Window* pParent, const SfxItemSet& rAt aAktTab.GetDecimal() = rLocaleWrapper.getNumDecimalSep()[0]; } -// ----------------------------------------------------------------------- + SvxTabulatorTabPage::~SvxTabulatorTabPage() { } -// ----------------------------------------------------------------------- + sal_uInt16* SvxTabulatorTabPage::GetRanges() { return pRanges; } -// ----------------------------------------------------------------------- + sal_Bool SvxTabulatorTabPage::FillItemSet( SfxItemSet& rSet ) { @@ -258,7 +258,7 @@ sal_Bool SvxTabulatorTabPage::FillItemSet( SfxItemSet& rSet ) return bModified; } -// ----------------------------------------------------------------------- + SfxTabPage* SvxTabulatorTabPage::Create( Window* pParent, const SfxItemSet& rSet) @@ -266,7 +266,7 @@ SfxTabPage* SvxTabulatorTabPage::Create( Window* pParent, return ( new SvxTabulatorTabPage( pParent, rSet ) ); } -// ----------------------------------------------------------------------- + void SvxTabulatorTabPage::Reset( const SfxItemSet& rSet ) { @@ -314,7 +314,7 @@ void SvxTabulatorTabPage::Reset( const SfxItemSet& rSet ) InitTabPos_Impl( nTabPos ); } -// ----------------------------------------------------------------------- + void SvxTabulatorTabPage::DisableControls( const sal_uInt16 nFlag ) { @@ -359,7 +359,7 @@ void SvxTabulatorTabPage::DisableControls( const sal_uInt16 nFlag ) m_pFillFrame->Disable(); } -// ----------------------------------------------------------------------- + int SvxTabulatorTabPage::DeactivatePage( SfxItemSet* _pSet ) { @@ -368,7 +368,7 @@ int SvxTabulatorTabPage::DeactivatePage( SfxItemSet* _pSet ) return LEAVE_PAGE; } -// ----------------------------------------------------------------------- + void SvxTabulatorTabPage::InitTabPos_Impl( sal_uInt16 nTabPos ) { @@ -424,7 +424,7 @@ void SvxTabulatorTabPage::InitTabPos_Impl( sal_uInt16 nTabPos ) } } -// ----------------------------------------------------------------------- + void SvxTabulatorTabPage::SetFillAndTabType_Impl() { @@ -471,7 +471,7 @@ void SvxTabulatorTabPage::SetFillAndTabType_Impl() pFillBtn->Check(); } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxTabulatorTabPage, NewHdl_Impl, Button *, pBtn ) { @@ -529,7 +529,7 @@ IMPL_LINK( SvxTabulatorTabPage, NewHdl_Impl, Button *, pBtn ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxTabulatorTabPage, DelHdl_Impl) { @@ -572,7 +572,7 @@ IMPL_LINK_NOARG(SvxTabulatorTabPage, DelHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxTabulatorTabPage, DelAllHdl_Impl) { @@ -587,7 +587,7 @@ IMPL_LINK_NOARG(SvxTabulatorTabPage, DelAllHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxTabulatorTabPage, TabTypeCheckHdl_Impl, RadioButton *, pBox ) { @@ -622,7 +622,7 @@ IMPL_LINK( SvxTabulatorTabPage, TabTypeCheckHdl_Impl, RadioButton *, pBox ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxTabulatorTabPage, FillTypeCheckHdl_Impl, RadioButton *, pBox ) { @@ -653,7 +653,7 @@ IMPL_LINK( SvxTabulatorTabPage, FillTypeCheckHdl_Impl, RadioButton *, pBox ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxTabulatorTabPage, GetFillCharHdl_Impl, Edit *, pEdit ) { @@ -671,7 +671,7 @@ IMPL_LINK( SvxTabulatorTabPage, GetFillCharHdl_Impl, Edit *, pEdit ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxTabulatorTabPage, GetDezCharHdl_Impl, Edit *, pEdit ) { @@ -688,7 +688,7 @@ IMPL_LINK( SvxTabulatorTabPage, GetDezCharHdl_Impl, Edit *, pEdit ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxTabulatorTabPage, SelectHdl_Impl) { @@ -702,7 +702,7 @@ IMPL_LINK_NOARG(SvxTabulatorTabPage, SelectHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxTabulatorTabPage, ModifyHdl_Impl) { diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 8f6f3ad8335f..49beef783e04 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -752,7 +752,7 @@ SvxAreaTabPage::SvxAreaTabPage( Window* pParent, const SfxItemSet& rInAttrs ) : m_pCtlXRectPreview->set_height_request(aSize2.Height()); } -// ----------------------------------------------------------------------- + void SvxAreaTabPage::Construct() { @@ -765,7 +765,7 @@ void SvxAreaTabPage::Construct() m_pLbBitmap->Fill( pBitmapList ); } -// ----------------------------------------------------------------------- + void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet ) { @@ -912,7 +912,7 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet ) } } -// ----------------------------------------------------------------------- + int SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet ) { @@ -964,7 +964,7 @@ int SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet ) return( LEAVE_PAGE ); } -// ----------------------------------------------------------------------- + sal_Bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) { @@ -1401,7 +1401,7 @@ sal_Bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) return( bModified ); } -// ----------------------------------------------------------------------- + void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) { @@ -1720,7 +1720,7 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) m_pMtrFldYOffset->SaveValue(); } -// ----------------------------------------------------------------------- + SfxTabPage* SvxAreaTabPage::Create( Window* pWindow, const SfxItemSet& rAttrs ) @@ -1728,14 +1728,14 @@ SfxTabPage* SvxAreaTabPage::Create( Window* pWindow, return( new SvxAreaTabPage( pWindow, rAttrs ) ); } -//------------------------------------------------------------------------ + sal_uInt16* SvxAreaTabPage::GetRanges() { return( pAreaRanges ); } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxAreaTabPage, SelectDialogTypeHdl_Impl) { switch( (XFillStyle)m_pTypeLB->GetSelectEntryPos() ) @@ -1772,7 +1772,7 @@ void SvxAreaTabPage::ClickInvisibleHdl_Impl() m_pCtlBitmapPreview->Invalidate(); } -//------------------------------------------------------------------------ + void SvxAreaTabPage::ClickColorHdl_Impl() { @@ -1811,7 +1811,7 @@ void SvxAreaTabPage::ClickColorHdl_Impl() ModifyColorHdl_Impl( this ); } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxAreaTabPage, ModifyColorHdl_Impl) { @@ -1838,7 +1838,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyColorHdl_Impl) return( 0L ); } -//------------------------------------------------------------------------ + void SvxAreaTabPage::ClickGradientHdl_Impl() { @@ -1882,7 +1882,7 @@ void SvxAreaTabPage::ClickGradientHdl_Impl() ModifyStepCountHdl_Impl( m_pTsbStepCount ); } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxAreaTabPage, ModifyGradientHdl_Impl) { @@ -1910,7 +1910,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyGradientHdl_Impl) return( 0L ); } -//------------------------------------------------------------------------ + void SvxAreaTabPage::ClickHatchingHdl_Impl() { @@ -1953,7 +1953,7 @@ void SvxAreaTabPage::ClickHatchingHdl_Impl() ToggleHatchBckgrdColorHdl_Impl( this ); } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxAreaTabPage, ModifyHatchingHdl_Impl) { @@ -1981,7 +1981,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyHatchingHdl_Impl) return( 0L ); } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxAreaTabPage, ModifyHatchBckgrdColorHdl_Impl) { @@ -2006,7 +2006,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyHatchBckgrdColorHdl_Impl) return( 0L ); } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxAreaTabPage, ToggleHatchBckgrdColorHdl_Impl) { @@ -2031,7 +2031,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ToggleHatchBckgrdColorHdl_Impl) return( 0L ); } -//------------------------------------------------------------------------ + void SvxAreaTabPage::ClickBitmapHdl_Impl() { @@ -2080,7 +2080,7 @@ void SvxAreaTabPage::ClickBitmapHdl_Impl() ModifyTileHdl_Impl( m_pTsbOriginal ); } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxAreaTabPage, ModifyBitmapHdl_Impl) { @@ -2108,7 +2108,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyBitmapHdl_Impl) return( 0L ); } -//------------------------------------------------------------------------ + IMPL_LINK( SvxAreaTabPage, ModifyStepCountHdl_Impl, void *, p ) { @@ -2139,7 +2139,7 @@ IMPL_LINK( SvxAreaTabPage, ModifyStepCountHdl_Impl, void *, p ) return( 0L ); } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxAreaTabPage, ModifyTileHdl_Impl) { @@ -2278,7 +2278,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyTileHdl_Impl) return( 0L ); } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxAreaTabPage, ClickScaleHdl_Impl) { @@ -2316,7 +2316,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ClickScaleHdl_Impl) return( 0L ); } -//------------------------------------------------------------------------ + void SvxAreaTabPage::PointChanged( Window* pWindow, RECT_POINT eRcPt ) { diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index fff7dcf1756a..991d663916f9 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -122,7 +122,7 @@ SvxBitmapTabPage::~SvxBitmapTabPage() delete m_pBitmapCtl; } -// ----------------------------------------------------------------------- + void SvxBitmapTabPage::Construct() { @@ -132,7 +132,7 @@ void SvxBitmapTabPage::Construct() m_pLbBitmaps->Fill( pBitmapList ); } -// ----------------------------------------------------------------------- + void SvxBitmapTabPage::ActivatePage( const SfxItemSet& ) { @@ -210,7 +210,7 @@ void SvxBitmapTabPage::ActivatePage( const SfxItemSet& ) } } -// ----------------------------------------------------------------------- + int SvxBitmapTabPage::DeactivatePage( SfxItemSet* _pSet) { @@ -223,7 +223,7 @@ int SvxBitmapTabPage::DeactivatePage( SfxItemSet* _pSet) return LEAVE_PAGE; } -// ----------------------------------------------------------------------- + sal_Bool SvxBitmapTabPage::FillItemSet( SfxItemSet& _rOutAttrs ) { @@ -252,7 +252,7 @@ sal_Bool SvxBitmapTabPage::FillItemSet( SfxItemSet& _rOutAttrs ) return sal_True; } -// ----------------------------------------------------------------------- + void SvxBitmapTabPage::Reset( const SfxItemSet& ) { @@ -287,7 +287,7 @@ void SvxBitmapTabPage::Reset( const SfxItemSet& ) } } -// ----------------------------------------------------------------------- + SfxTabPage* SvxBitmapTabPage::Create( Window* pWindow, const SfxItemSet& rSet ) @@ -295,7 +295,7 @@ SfxTabPage* SvxBitmapTabPage::Create( Window* pWindow, return new SvxBitmapTabPage( pWindow, rSet ); } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxBitmapTabPage, ChangeBitmapHdl_Impl) { @@ -415,7 +415,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ChangeBitmapHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + long SvxBitmapTabPage::CheckChanges_Impl() { @@ -463,7 +463,7 @@ long SvxBitmapTabPage::CheckChanges_Impl() return 0L; } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxBitmapTabPage, ClickAddHdl_Impl) { @@ -573,7 +573,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickAddHdl_Impl) /******************************************************************************/ -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl_Impl) { @@ -657,7 +657,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl_Impl) return 0L; } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxBitmapTabPage, ClickModifyHdl_Impl) { @@ -722,7 +722,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickModifyHdl_Impl) return 0L; } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxBitmapTabPage, ClickDeleteHdl_Impl) { @@ -756,7 +756,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickDeleteHdl_Impl) return 0L; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxBitmapTabPage, ClickLoadHdl_Impl) { @@ -848,7 +848,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickLoadHdl_Impl) return 0L; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxBitmapTabPage, ClickSaveHdl_Impl) { @@ -908,7 +908,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickSaveHdl_Impl) return 0L; } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxBitmapTabPage, ChangePixelColorHdl_Impl) { @@ -927,7 +927,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ChangePixelColorHdl_Impl) return 0L; } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxBitmapTabPage, ChangeBackgrndColorHdl_Impl) { @@ -946,7 +946,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ChangeBackgrndColorHdl_Impl) return 0L; } -//------------------------------------------------------------------------ + void SvxBitmapTabPage::PointChanged( Window* pWindow, RECT_POINT ) { diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index b5b3aff04649..3ec439a461dd 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -127,7 +127,7 @@ void SvxColorTabPage::UpdateTableName() m_pTableName->SetText( aString ); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxColorTabPage, ClickLoadHdl_Impl) { @@ -197,7 +197,7 @@ void SvxColorTabPage::EnableSave( bool bCanSave ) m_pBtnSave->Disable(); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxColorTabPage, ClickSaveHdl_Impl) { @@ -291,7 +291,7 @@ struct SvxColorTabPageShadow } }; -// ----------------------------------------------------------------------- + SvxColorTabPage::SvxColorTabPage(Window* pParent, const SfxItemSet& rInAttrs) : SfxTabPage(pParent, "ColorPage", "cui/ui/colorpage.ui", rInAttrs) @@ -394,7 +394,7 @@ SvxColorTabPage::~SvxColorTabPage() delete pShadow; } -// ----------------------------------------------------------------------- + void SvxColorTabPage::ImpColorCountChanged() { @@ -403,7 +403,7 @@ void SvxColorTabPage::ImpColorCountChanged() m_pValSetColorList->SetColCount(m_pValSetColorList->getColumnCount()); } -// ----------------------------------------------------------------------- + void SvxColorTabPage::Construct() { @@ -416,7 +416,7 @@ void SvxColorTabPage::Construct() } } -// ----------------------------------------------------------------------- + void SvxColorTabPage::ActivatePage( const SfxItemSet& ) { @@ -470,7 +470,7 @@ void SvxColorTabPage::ActivatePage( const SfxItemSet& ) HideLoadSaveEmbed(); } -// ----------------------------------------------------------------------- + int SvxColorTabPage::DeactivatePage( SfxItemSet* _pSet ) { @@ -483,7 +483,7 @@ int SvxColorTabPage::DeactivatePage( SfxItemSet* _pSet ) return( LEAVE_PAGE ); } -// ----------------------------------------------------------------------- + long SvxColorTabPage::CheckChanges_Impl() { @@ -554,7 +554,7 @@ long SvxColorTabPage::CheckChanges_Impl() return 0; } -// ----------------------------------------------------------------------- + sal_Bool SvxColorTabPage::FillItemSet( SfxItemSet& rSet ) { @@ -592,7 +592,7 @@ void SvxColorTabPage::UpdateModified() EnableSave( bEnable ); } -// ----------------------------------------------------------------------- + void SvxColorTabPage::Reset( const SfxItemSet& rSet ) { @@ -617,7 +617,7 @@ void SvxColorTabPage::Reset( const SfxItemSet& rSet ) UpdateModified(); } -// ----------------------------------------------------------------------- + SfxTabPage* SvxColorTabPage::Create( Window* pWindow, const SfxItemSet& rOutAttrs ) @@ -625,7 +625,7 @@ SfxTabPage* SvxColorTabPage::Create( Window* pWindow, return( new SvxColorTabPage( pWindow, rOutAttrs ) ); } -//------------------------------------------------------------------------ + // // is called when the content of the MtrFields is changed for color values @@ -661,7 +661,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ModifiedHdl_Impl) return 0; } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl) { @@ -738,7 +738,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl) return 0; } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxColorTabPage, ClickModifyHdl_Impl) { @@ -813,7 +813,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickModifyHdl_Impl) return 0; } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxColorTabPage, ClickWorkOnHdl_Impl) { @@ -858,7 +858,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickWorkOnHdl_Impl) return 0; } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxColorTabPage, ClickDeleteHdl_Impl) { @@ -895,7 +895,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickDeleteHdl_Impl) return 0; } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxColorTabPage, SelectColorLBHdl_Impl) { @@ -918,7 +918,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, SelectColorLBHdl_Impl) return 0; } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxColorTabPage, SelectValSetHdl_Impl) { @@ -941,7 +941,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, SelectValSetHdl_Impl) return 0; } -//------------------------------------------------------------------------ + void SvxColorTabPage::ConvertColorValues (Color& rColor, ColorModel eModell) { @@ -1011,7 +1011,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, SelectColorModelHdl_Impl) return 0; } -//------------------------------------------------------------------------ + long SvxColorTabPage::ChangeColorHdl_Impl( void* ) { @@ -1046,7 +1046,7 @@ long SvxColorTabPage::ChangeColorHdl_Impl( void* ) return 0; } -//------------------------------------------------------------------------ + //void SvxColorTabPage::FillValueSet_Impl( ValueSet& rVs ) //{ @@ -1063,7 +1063,7 @@ long SvxColorTabPage::ChangeColorHdl_Impl( void* ) // } //} -//------------------------------------------------------------------------ + // A RGB value is converted to a CMYK value - not in an ideal way as // R is converted into C, G into M and B into Y. The K value is held in an @@ -1083,7 +1083,7 @@ void SvxColorTabPage::RgbToCmyk_Impl( Color& rColor, sal_uInt16& rK ) rColor.SetBlue( sal::static_int_cast< sal_uInt8 >( nColor3 - rK ) ); } -//------------------------------------------------------------------------ + // reverse case to RgbToCmyk_Impl (see above) @@ -1110,7 +1110,7 @@ void SvxColorTabPage::CmykToRgb_Impl( Color& rColor, const sal_uInt16 nK ) rColor.SetBlue( (sal_uInt8)lTemp ); } -//------------------------------------------------------------------------ + sal_uInt16 SvxColorTabPage::ColorToPercent_Impl( sal_uInt16 nColor ) { @@ -1130,7 +1130,7 @@ sal_uInt16 SvxColorTabPage::ColorToPercent_Impl( sal_uInt16 nColor ) return ( nWert ); } -//------------------------------------------------------------------------ + sal_uInt16 SvxColorTabPage::PercentToColor_Impl( sal_uInt16 nPercent ) { @@ -1150,7 +1150,7 @@ sal_uInt16 SvxColorTabPage::PercentToColor_Impl( sal_uInt16 nPercent ) return ( nWert ); } -//------------------------------------------------------------------------ + void SvxColorTabPage::FillUserData() { @@ -1158,7 +1158,7 @@ void SvxColorTabPage::FillUserData() SetUserData( OUString::number( eCM ) ); } -//------------------------------------------------------------------------ + void SvxColorTabPage::SetupForViewFrame( SfxViewFrame *pViewFrame ) { diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 8eaf6b698234..3fd8650c558c 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -137,7 +137,7 @@ SvxGradientTabPage::SvxGradientTabPage setPreviewsToSamePlace(pParent, this); } -// ----------------------------------------------------------------------- + void SvxGradientTabPage::Construct() { @@ -147,7 +147,7 @@ void SvxGradientTabPage::Construct() m_pLbGradients->Fill( pGradientList ); } -// ----------------------------------------------------------------------- + void SvxGradientTabPage::ActivatePage( const SfxItemSet& ) { @@ -224,7 +224,7 @@ void SvxGradientTabPage::ActivatePage( const SfxItemSet& ) } } -// ----------------------------------------------------------------------- + int SvxGradientTabPage::DeactivatePage( SfxItemSet* _pSet ) { @@ -237,7 +237,7 @@ int SvxGradientTabPage::DeactivatePage( SfxItemSet* _pSet ) return LEAVE_PAGE; } -// ----------------------------------------------------------------------- + long SvxGradientTabPage::CheckChanges_Impl() { @@ -304,7 +304,7 @@ long SvxGradientTabPage::CheckChanges_Impl() return 0L; } -// ----------------------------------------------------------------------- + sal_Bool SvxGradientTabPage::FillItemSet( SfxItemSet& rSet ) { @@ -343,7 +343,7 @@ sal_Bool SvxGradientTabPage::FillItemSet( SfxItemSet& rSet ) return sal_True; } -// ----------------------------------------------------------------------- + void SvxGradientTabPage::Reset( const SfxItemSet& ) { @@ -365,7 +365,7 @@ void SvxGradientTabPage::Reset( const SfxItemSet& ) } } -// ----------------------------------------------------------------------- + SfxTabPage* SvxGradientTabPage::Create( Window* pWindow, const SfxItemSet& rOutAttrs ) @@ -373,7 +373,7 @@ SfxTabPage* SvxGradientTabPage::Create( Window* pWindow, return new SvxGradientTabPage( pWindow, rOutAttrs ); } -//------------------------------------------------------------------------ + IMPL_LINK( SvxGradientTabPage, ModifiedHdl_Impl, void *, pControl ) { @@ -402,7 +402,7 @@ IMPL_LINK( SvxGradientTabPage, ModifiedHdl_Impl, void *, pControl ) return 0L; } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl) { @@ -505,7 +505,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl) return 0L; } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxGradientTabPage, ClickModifyHdl_Impl) { @@ -575,7 +575,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickModifyHdl_Impl) return 0L; } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxGradientTabPage, ClickDeleteHdl_Impl) { @@ -608,7 +608,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickDeleteHdl_Impl) return 0L; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxGradientTabPage, ClickLoadHdl_Impl) { @@ -703,7 +703,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickLoadHdl_Impl) return 0L; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxGradientTabPage, ClickSaveHdl_Impl) { @@ -764,7 +764,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickSaveHdl_Impl) return 0L; } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxGradientTabPage, ChangeGradientHdl_Impl) { @@ -839,7 +839,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ChangeGradientHdl_Impl) return 0L; } -//------------------------------------------------------------------------ + void SvxGradientTabPage::SetControlState_Impl( XGradientStyle eXGS ) { diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 327d58203d42..711a782cc3af 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -135,7 +135,7 @@ SvxHatchTabPage::SvxHatchTabPage setPreviewsToSamePlace(pParent, this); } -// ----------------------------------------------------------------------- + void SvxHatchTabPage::Construct() { @@ -143,7 +143,7 @@ void SvxHatchTabPage::Construct() m_pLbHatchings->Fill( pHatchingList ); } -// ----------------------------------------------------------------------- + void SvxHatchTabPage::ActivatePage( const SfxItemSet& rSet ) { @@ -213,7 +213,7 @@ void SvxHatchTabPage::ActivatePage( const SfxItemSet& rSet ) m_pCtlPreview->Invalidate(); } -// ----------------------------------------------------------------------- + int SvxHatchTabPage::DeactivatePage( SfxItemSet* _pSet ) { @@ -226,7 +226,7 @@ int SvxHatchTabPage::DeactivatePage( SfxItemSet* _pSet ) return LEAVE_PAGE; } -// ----------------------------------------------------------------------- + long SvxHatchTabPage::CheckChanges_Impl() { @@ -276,7 +276,7 @@ long SvxHatchTabPage::CheckChanges_Impl() return 0L; } -// ----------------------------------------------------------------------- + sal_Bool SvxHatchTabPage::FillItemSet( SfxItemSet& rSet ) { @@ -312,7 +312,7 @@ sal_Bool SvxHatchTabPage::FillItemSet( SfxItemSet& rSet ) return sal_True; } -// ----------------------------------------------------------------------- + void SvxHatchTabPage::Reset( const SfxItemSet& rSet ) { @@ -338,7 +338,7 @@ void SvxHatchTabPage::Reset( const SfxItemSet& rSet ) m_pCtlPreview->Invalidate(); } -// ----------------------------------------------------------------------- + SfxTabPage* SvxHatchTabPage::Create( Window* pWindow, const SfxItemSet& rSet ) @@ -346,7 +346,7 @@ SfxTabPage* SvxHatchTabPage::Create( Window* pWindow, return new SvxHatchTabPage( pWindow, rSet ); } -//------------------------------------------------------------------------ + IMPL_LINK( SvxHatchTabPage, ModifiedHdl_Impl, void *, p ) { @@ -379,7 +379,7 @@ IMPL_LINK( SvxHatchTabPage, ModifiedHdl_Impl, void *, p ) return 0L; } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxHatchTabPage, ChangeHatchHdl_Impl) { @@ -452,7 +452,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ChangeHatchHdl_Impl) return 0L; } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl) { @@ -549,7 +549,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl) return 0L; } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxHatchTabPage, ClickModifyHdl_Impl) { @@ -619,7 +619,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickModifyHdl_Impl) return 0L; } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxHatchTabPage, ClickDeleteHdl_Impl) { @@ -652,7 +652,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickDeleteHdl_Impl) return 0L; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxHatchTabPage, ClickLoadHdl_Impl) { @@ -738,7 +738,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickLoadHdl_Impl) return 0L; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxHatchTabPage, ClickSaveHdl_Impl) { @@ -798,7 +798,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickSaveHdl_Impl) return 0L; } -//------------------------------------------------------------------------ + void SvxHatchTabPage::PointChanged( Window* pWindow, RECT_POINT eRcPt ) { diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index a17a774884fb..238919cd3108 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -513,7 +513,7 @@ void SvxLineTabPage::FillListboxes() m_pLbEndStyle->SelectEntryPos( nOldSelect ); } -// ----------------------------------------------------------------------- + void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) { @@ -644,7 +644,7 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) } } -// ----------------------------------------------------------------------- + int SvxLineTabPage::DeactivatePage( SfxItemSet* _pSet ) { @@ -664,7 +664,7 @@ int SvxLineTabPage::DeactivatePage( SfxItemSet* _pSet ) return( LEAVE_PAGE ); } -// ----------------------------------------------------------------------- + sal_Bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) { @@ -957,7 +957,7 @@ sal_Bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) return( bModified ); } -// ----------------------------------------------------------------------- + sal_Bool SvxLineTabPage::FillXLSet_Impl() { @@ -1082,7 +1082,7 @@ sal_Bool SvxLineTabPage::FillXLSet_Impl() return( sal_True ); } -// ----------------------------------------------------------------------- + void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) { @@ -1486,7 +1486,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) ChangePreviewHdl_Impl( NULL ); } -// ----------------------------------------------------------------------- + SfxTabPage* SvxLineTabPage::Create( Window* pWindow, const SfxItemSet& rAttrs ) @@ -1494,14 +1494,14 @@ SfxTabPage* SvxLineTabPage::Create( Window* pWindow, return( new SvxLineTabPage( pWindow, rAttrs ) ); } -//------------------------------------------------------------------------ + sal_uInt16* SvxLineTabPage::GetRanges() { return pLineRanges; } -//------------------------------------------------------------------------ + IMPL_LINK( SvxLineTabPage, ChangePreviewHdl_Impl, void *, pCntrl ) { @@ -1566,7 +1566,7 @@ IMPL_LINK( SvxLineTabPage, ChangePreviewHdl_Impl, void *, pCntrl ) return( 0L ); } -//------------------------------------------------------------------------ + IMPL_LINK( SvxLineTabPage, ChangeStartHdl_Impl, void *, p ) { @@ -1585,7 +1585,7 @@ IMPL_LINK( SvxLineTabPage, ChangeStartHdl_Impl, void *, p ) return( 0L ); } -//------------------------------------------------------------------------ + // #116827# IMPL_LINK_NOARG(SvxLineTabPage, ChangeEdgeStyleHdl_Impl) @@ -1595,7 +1595,7 @@ IMPL_LINK_NOARG(SvxLineTabPage, ChangeEdgeStyleHdl_Impl) return( 0L ); } -//------------------------------------------------------------------------ + // fdo#43209 IMPL_LINK( SvxLineTabPage, ChangeCapStyleHdl_Impl, void *, EMPTYARG ) @@ -1604,7 +1604,7 @@ IMPL_LINK( SvxLineTabPage, ChangeCapStyleHdl_Impl, void *, EMPTYARG ) return( 0L ); } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxLineTabPage, ClickInvisibleHdl_Impl) { @@ -1641,7 +1641,7 @@ IMPL_LINK_NOARG(SvxLineTabPage, ClickInvisibleHdl_Impl) return( 0L ); } -//------------------------------------------------------------------------ + IMPL_LINK( SvxLineTabPage, ChangeEndHdl_Impl, void *, p ) { @@ -1660,7 +1660,7 @@ IMPL_LINK( SvxLineTabPage, ChangeEndHdl_Impl, void *, p ) return( 0L ); } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxLineTabPage, ChangeTransparentHdl_Impl) { @@ -1677,14 +1677,14 @@ IMPL_LINK_NOARG(SvxLineTabPage, ChangeTransparentHdl_Impl) return( 0L ); } -//------------------------------------------------------------------------ + void SvxLineTabPage::PointChanged( Window*, RECT_POINT eRcPt ) { eRP = eRcPt; } -//------------------------------------------------------------------------ + void SvxLineTabPage::FillUserData() { diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index e3b3de8f0b0f..f2d9ab92b182 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -147,7 +147,7 @@ SvxLineDefTabPage::SvxLineDefTabPage } -// ----------------------------------------------------------------------- + void SvxLineDefTabPage::Construct() { @@ -155,7 +155,7 @@ void SvxLineDefTabPage::Construct() m_pLbLineStyles->Fill( pDashList ); } -// ----------------------------------------------------------------------- + void SvxLineDefTabPage::ActivatePage( const SfxItemSet& ) { @@ -187,7 +187,7 @@ void SvxLineDefTabPage::ActivatePage( const SfxItemSet& ) } } -// ----------------------------------------------------------------------- + int SvxLineDefTabPage::DeactivatePage( SfxItemSet* _pSet ) { @@ -199,7 +199,7 @@ int SvxLineDefTabPage::DeactivatePage( SfxItemSet* _pSet ) return( LEAVE_PAGE ); } -// ----------------------------------------------------------------------- + void SvxLineDefTabPage::CheckChanges_Impl() { @@ -255,7 +255,7 @@ void SvxLineDefTabPage::CheckChanges_Impl() } } -// ----------------------------------------------------------------------- + sal_Bool SvxLineDefTabPage::FillItemSet( SfxItemSet& rAttrs ) { @@ -273,7 +273,7 @@ sal_Bool SvxLineDefTabPage::FillItemSet( SfxItemSet& rAttrs ) return( sal_True ); } -// ----------------------------------------------------------------------- + void SvxLineDefTabPage::Reset( const SfxItemSet& rAttrs ) { @@ -319,14 +319,14 @@ void SvxLineDefTabPage::Reset( const SfxItemSet& rAttrs ) } } -// ----------------------------------------------------------------------- + SfxTabPage* SvxLineDefTabPage::Create( Window* pWindow, const SfxItemSet& rOutAttrs ) { return( new SvxLineDefTabPage( pWindow, rOutAttrs ) ); } -//------------------------------------------------------------------------ + IMPL_LINK( SvxLineDefTabPage, SelectLinestyleHdl_Impl, void *, p ) { @@ -360,7 +360,7 @@ IMPL_LINK( SvxLineDefTabPage, SelectLinestyleHdl_Impl, void *, p ) return( 0L ); } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG_INLINE_START(SvxLineDefTabPage, ChangePreviewHdl_Impl) { @@ -371,7 +371,7 @@ IMPL_LINK_NOARG_INLINE_START(SvxLineDefTabPage, ChangePreviewHdl_Impl) } IMPL_LINK_NOARG_INLINE_END(SvxLineDefTabPage, ChangePreviewHdl_Impl) -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxLineDefTabPage, ChangeNumber1Hdl_Impl) { @@ -391,7 +391,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ChangeNumber1Hdl_Impl) return( 0L ); } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxLineDefTabPage, ChangeNumber2Hdl_Impl) { @@ -412,7 +412,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ChangeNumber2Hdl_Impl) } -//------------------------------------------------------------------------ + IMPL_LINK( SvxLineDefTabPage, ChangeMetricHdl_Impl, void *, p ) { @@ -482,7 +482,7 @@ IMPL_LINK( SvxLineDefTabPage, ChangeMetricHdl_Impl, void *, p ) return( 0L ); } -//------------------------------------------------------------------------ + IMPL_LINK( SvxLineDefTabPage, SelectTypeHdl_Impl, void *, p ) { @@ -517,7 +517,7 @@ IMPL_LINK( SvxLineDefTabPage, SelectTypeHdl_Impl, void *, p ) return( 0L ); } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl) { @@ -608,7 +608,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl) return( 0L ); } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl) { @@ -680,7 +680,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl) return( 0L ); } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxLineDefTabPage, ClickDeleteHdl_Impl) { @@ -717,7 +717,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickDeleteHdl_Impl) return( 0L ); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl) { @@ -790,7 +790,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl) return( 0L ); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxLineDefTabPage, ClickSaveHdl_Impl) { @@ -837,7 +837,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickSaveHdl_Impl) return( 0L ); } -//------------------------------------------------------------------------ + void SvxLineDefTabPage::FillDash_Impl() { @@ -861,7 +861,7 @@ void SvxLineDefTabPage::FillDash_Impl() m_pCtlPreview->SetLineAttributes(aXLineAttr.GetItemSet()); } -//------------------------------------------------------------------------ + void SvxLineDefTabPage::FillDialog_Impl() { diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index e12ded378d06..946ef7635f1f 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -107,13 +107,13 @@ void SvxLineEndDefTabPage::Resize() SfxTabPage::Resize(); } -//------------------------------------------------------------------------ + SvxLineEndDefTabPage::~SvxLineEndDefTabPage() { } -// ----------------------------------------------------------------------- + void SvxLineEndDefTabPage::Construct() { @@ -141,7 +141,7 @@ void SvxLineEndDefTabPage::Construct() m_pBtnAdd->Disable(); } -// ----------------------------------------------------------------------- + void SvxLineEndDefTabPage::ActivatePage( const SfxItemSet& ) { @@ -165,7 +165,7 @@ void SvxLineEndDefTabPage::ActivatePage( const SfxItemSet& ) } } -// ----------------------------------------------------------------------- + int SvxLineEndDefTabPage::DeactivatePage( SfxItemSet* _pSet ) { @@ -177,7 +177,7 @@ int SvxLineEndDefTabPage::DeactivatePage( SfxItemSet* _pSet ) return( LEAVE_PAGE ); } -// ----------------------------------------------------------------------- + void SvxLineEndDefTabPage::CheckChanges_Impl() { @@ -203,7 +203,7 @@ void SvxLineEndDefTabPage::CheckChanges_Impl() *pPosLineEndLb = nPos; } -// ----------------------------------------------------------------------- + sal_Bool SvxLineEndDefTabPage::FillItemSet( SfxItemSet& rSet ) { @@ -223,7 +223,7 @@ sal_Bool SvxLineEndDefTabPage::FillItemSet( SfxItemSet& rSet ) return( sal_True ); } -// ----------------------------------------------------------------------- + void SvxLineEndDefTabPage::Reset( const SfxItemSet& ) { @@ -262,14 +262,14 @@ void SvxLineEndDefTabPage::Reset( const SfxItemSet& ) } } -// ----------------------------------------------------------------------- + SfxTabPage* SvxLineEndDefTabPage::Create( Window* pWindow, const SfxItemSet& rSet ) { return( new SvxLineEndDefTabPage( pWindow, rSet ) ); } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxLineEndDefTabPage, SelectLineEndHdl_Impl) { @@ -296,7 +296,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, SelectLineEndHdl_Impl) return( 0L ); } -//------------------------------------------------------------------------ + long SvxLineEndDefTabPage::ChangePreviewHdl_Impl( void* ) { @@ -304,7 +304,7 @@ long SvxLineEndDefTabPage::ChangePreviewHdl_Impl( void* ) return( 0L ); } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickModifyHdl_Impl) { @@ -386,7 +386,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickModifyHdl_Impl) return( 0L ); } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl) { @@ -502,7 +502,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl) return( 0L ); } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickDeleteHdl_Impl) { @@ -538,7 +538,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickDeleteHdl_Impl) return( 0L ); } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickLoadHdl_Impl) { @@ -608,7 +608,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickLoadHdl_Impl) return( 0L ); } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickSaveHdl_Impl) { diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index 22c2d4fda335..1da2af8ddbf5 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -165,7 +165,7 @@ SvxShadowTabPage::SvxShadowTabPage( Window* pParent, const SfxItemSet& rInAttrs } -// ----------------------------------------------------------------------- + void SvxShadowTabPage::Construct() { @@ -178,7 +178,7 @@ void SvxShadowTabPage::Construct() } } -// ----------------------------------------------------------------------- + void SvxShadowTabPage::ActivatePage( const SfxItemSet& rSet ) { @@ -232,7 +232,7 @@ void SvxShadowTabPage::ActivatePage( const SfxItemSet& rSet ) } } -// ----------------------------------------------------------------------- + int SvxShadowTabPage::DeactivatePage( SfxItemSet* _pSet ) { @@ -242,7 +242,7 @@ int SvxShadowTabPage::DeactivatePage( SfxItemSet* _pSet ) return( LEAVE_PAGE ); } -// ----------------------------------------------------------------------- + sal_Bool SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs ) { @@ -351,7 +351,7 @@ sal_Bool SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs ) return( bModified ); } -// ----------------------------------------------------------------------- + void SvxShadowTabPage::Reset( const SfxItemSet& rAttrs ) { @@ -454,7 +454,7 @@ void SvxShadowTabPage::Reset( const SfxItemSet& rAttrs ) } } -// ----------------------------------------------------------------------- + SfxTabPage* SvxShadowTabPage::Create( Window* pWindow, const SfxItemSet& rAttrs ) @@ -462,14 +462,14 @@ SfxTabPage* SvxShadowTabPage::Create( Window* pWindow, return( new SvxShadowTabPage( pWindow, rAttrs ) ); } -//------------------------------------------------------------------------ + sal_uInt16* SvxShadowTabPage::GetRanges() { return( pShadowRanges ); } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxShadowTabPage, ClickShadowHdl_Impl) { @@ -488,7 +488,7 @@ IMPL_LINK_NOARG(SvxShadowTabPage, ClickShadowHdl_Impl) return( 0L ); } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxShadowTabPage, ModifyShadowHdl_Impl) { @@ -531,7 +531,7 @@ IMPL_LINK_NOARG(SvxShadowTabPage, ModifyShadowHdl_Impl) return( 0L ); } -//------------------------------------------------------------------------ + void SvxShadowTabPage::PointChanged( Window* pWindow, RECT_POINT eRcPt ) { diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 3a0b0ec7c73e..7fd60dc65b6c 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -132,13 +132,13 @@ SvxTransformTabDialog::SvxTransformTabDialog( Window* pParent, const SfxItemSet* nSlant = AddTabPage("RID_SVXPAGE_SLANT", SvxSlantTabPage::Create, SvxSlantTabPage::GetRanges); } -// ----------------------------------------------------------------------- + SvxTransformTabDialog::~SvxTransformTabDialog() { } -// ----------------------------------------------------------------------- + void SvxTransformTabDialog::PageCreated(sal_uInt16 nId, SfxTabPage &rPage) { @@ -185,7 +185,7 @@ void SvxTransformTabDialog::PageCreated(sal_uInt16 nId, SfxTabPage &rPage) } } -// ----------------------------------------------------------------------- + void SvxTransformTabDialog::SetValidateFramePosLink(const Link& rLink) { @@ -223,7 +223,7 @@ SvxAngleTabPage::SvxAngleTabPage( Window* pParent, const SfxItemSet& rInAttrs ) m_pCtlAngle->SetLinkedField( m_pNfAngle, 2 ); } -// ----------------------------------------------------------------------- + void SvxAngleTabPage::Construct() { @@ -293,7 +293,7 @@ sal_Bool SvxAngleTabPage::FillItemSet(SfxItemSet& rSet) return bModified; } -// ----------------------------------------------------------------------- + void SvxAngleTabPage::Reset(const SfxItemSet& rAttrs) { @@ -333,27 +333,27 @@ void SvxAngleTabPage::Reset(const SfxItemSet& rAttrs) m_pCtlAngle->SaveValue(); } -// ----------------------------------------------------------------------- + SfxTabPage* SvxAngleTabPage::Create( Window* pWindow, const SfxItemSet& rSet) { return(new SvxAngleTabPage(pWindow, rSet)); } -//------------------------------------------------------------------------ + sal_uInt16* SvxAngleTabPage::GetRanges() { return(pAngleRanges); } -// ----------------------------------------------------------------------- + void SvxAngleTabPage::ActivatePage(const SfxItemSet& /*rSet*/) { } -// ----------------------------------------------------------------------- + int SvxAngleTabPage::DeactivatePage( SfxItemSet* _pSet ) { @@ -365,7 +365,7 @@ int SvxAngleTabPage::DeactivatePage( SfxItemSet* _pSet ) return LEAVE_PAGE; } -//------------------------------------------------------------------------ + void SvxAngleTabPage::PointChanged(Window* pWindow, RECT_POINT eRP) { @@ -458,7 +458,7 @@ SvxSlantTabPage::SvxSlantTabPage( Window* pParent, const SfxItemSet& rInAttrs ) ePoolUnit = pPool->GetMetric( SID_ATTR_TRANSFORM_POS_X ); } -// ----------------------------------------------------------------------- + void SvxSlantTabPage::Construct() { @@ -474,7 +474,7 @@ void SvxSlantTabPage::Construct() } } -// ----------------------------------------------------------------------- + sal_Bool SvxSlantTabPage::FillItemSet(SfxItemSet& rAttrs) { @@ -516,7 +516,7 @@ sal_Bool SvxSlantTabPage::FillItemSet(SfxItemSet& rAttrs) return( bModified ); } -// ----------------------------------------------------------------------- + void SvxSlantTabPage::Reset(const SfxItemSet& rAttrs) { @@ -570,21 +570,21 @@ void SvxSlantTabPage::Reset(const SfxItemSet& rAttrs) m_pMtrAngle->SaveValue(); } -// ----------------------------------------------------------------------- + SfxTabPage* SvxSlantTabPage::Create( Window* pWindow, const SfxItemSet& rOutAttrs ) { return( new SvxSlantTabPage( pWindow, rOutAttrs ) ); } -//------------------------------------------------------------------------ + sal_uInt16* SvxSlantTabPage::GetRanges() { return( pSlantRanges ); } -// ----------------------------------------------------------------------- + void SvxSlantTabPage::ActivatePage( const SfxItemSet& rSet ) { @@ -597,7 +597,7 @@ void SvxSlantTabPage::ActivatePage( const SfxItemSet& rSet ) } } -// ----------------------------------------------------------------------- + int SvxSlantTabPage::DeactivatePage( SfxItemSet* _pSet ) { @@ -609,7 +609,7 @@ int SvxSlantTabPage::DeactivatePage( SfxItemSet* _pSet ) return LEAVE_PAGE; } -//------------------------------------------------------------------------ + void SvxSlantTabPage::PointChanged( Window* , RECT_POINT ) { @@ -682,7 +682,7 @@ SvxPositionSizeTabPage::SvxPositionSizeTabPage( Window* pParent, const SfxItemSe } -// ----------------------------------------------------------------------- + void SvxPositionSizeTabPage::Construct() { @@ -780,7 +780,7 @@ void SvxPositionSizeTabPage::Construct() SetMinMaxPosition(); } -// ----------------------------------------------------------------------- + sal_Bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet& rOutAttrs ) { @@ -904,7 +904,7 @@ sal_Bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet& rOutAttrs ) return bModified; } -// ----------------------------------------------------------------------- + void SvxPositionSizeTabPage::Reset( const SfxItemSet& ) { @@ -1011,21 +1011,21 @@ void SvxPositionSizeTabPage::Reset( const SfxItemSet& ) ChangeSizeProtectHdl( this ); } -// ----------------------------------------------------------------------- + SfxTabPage* SvxPositionSizeTabPage::Create( Window* pWindow, const SfxItemSet& rOutAttrs ) { return( new SvxPositionSizeTabPage( pWindow, rOutAttrs ) ); } -//------------------------------------------------------------------------ + sal_uInt16* SvxPositionSizeTabPage::GetRanges() { return( pPosSizeRanges ); } -// ----------------------------------------------------------------------- + void SvxPositionSizeTabPage::ActivatePage( const SfxItemSet& rSet ) { @@ -1042,7 +1042,7 @@ void SvxPositionSizeTabPage::ActivatePage( const SfxItemSet& rSet ) } } -// ----------------------------------------------------------------------- + int SvxPositionSizeTabPage::DeactivatePage( SfxItemSet* _pSet ) { @@ -1063,7 +1063,7 @@ int SvxPositionSizeTabPage::DeactivatePage( SfxItemSet* _pSet ) return LEAVE_PAGE; } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangePosProtectHdl) { @@ -1073,7 +1073,7 @@ IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangePosProtectHdl) return( 0L ); } -//------------------------------------------------------------------------ + void SvxPositionSizeTabPage::UpdateControlStates() { @@ -1107,7 +1107,7 @@ void SvxPositionSizeTabPage::UpdateControlStates() } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeSizeProtectHdl) { @@ -1129,7 +1129,7 @@ IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeSizeProtectHdl) return( 0L ); } -//------------------------------------------------------------------------ + void SvxPositionSizeTabPage::SetMinMaxPosition() { @@ -1300,7 +1300,7 @@ void SvxPositionSizeTabPage::SetMinMaxPosition() m_pMtrHeight->SetLast(basegfx::fround64(fNewY)); } -//------------------------------------------------------------------------ + void SvxPositionSizeTabPage::GetTopLeftPosition(double& rfX, double& rfY, const basegfx::B2DRange& rRange) { @@ -1357,7 +1357,7 @@ void SvxPositionSizeTabPage::GetTopLeftPosition(double& rfX, double& rfY, const } } -//------------------------------------------------------------------------ + void SvxPositionSizeTabPage::PointChanged( Window* pWindow, RECT_POINT eRP ) { @@ -1429,21 +1429,21 @@ void SvxPositionSizeTabPage::PointChanged( Window* pWindow, RECT_POINT eRP ) } } -//------------------------------------------------------------------------ + void SvxPositionSizeTabPage::DisableResize() { mbSizeDisabled = true; } -//------------------------------------------------------------------------ + void SvxPositionSizeTabPage::DisableProtect() { mbProtectDisabled = true; } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeWidthHdl) { @@ -1468,7 +1468,7 @@ IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeWidthHdl) return( 0L ); } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeHeightHdl) { @@ -1493,7 +1493,7 @@ IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeHeightHdl) return( 0L ); } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxPositionSizeTabPage, ClickSizeProtectHdl) { @@ -1501,7 +1501,7 @@ IMPL_LINK_NOARG(SvxPositionSizeTabPage, ClickSizeProtectHdl) return( 0L ); } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxPositionSizeTabPage, ClickAutoHdl) { @@ -1514,7 +1514,7 @@ IMPL_LINK_NOARG(SvxPositionSizeTabPage, ClickAutoHdl) return( 0L ); } -//------------------------------------------------------------------------ + void SvxPositionSizeTabPage::FillUserData() { |