diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-11-10 23:22:47 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-11-12 12:01:39 +0000 |
commit | 040e022d06ecadc36d3ef5c52178095a4d2c828a (patch) | |
tree | d60733f77650b251276b3313ad802d7c007d1f36 /cui | |
parent | fix gb_SPACE in LIBPNG_CFLAGS (diff) | |
download | core-040e022d06ecadc36d3ef5c52178095a4d2c828a.tar.gz core-040e022d06ecadc36d3ef5c52178095a4d2c828a.zip |
move svtools's FixedHyper.hxx to vcl
merge with fixedhyperbase and map GtkLinkButton
to FixedHyper. Convert to String while I'm at it.
Change-Id: Ibc61fd29c01796561eeef952a159c82ff215a095
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/dialogs/SpellDialog.cxx | 4 | ||||
-rw-r--r-- | cui/source/inc/SpellDialog.hxx | 10 | ||||
-rw-r--r-- | cui/source/inc/about.hxx | 1 | ||||
-rw-r--r-- | cui/source/inc/optlingu.hxx | 6 |
4 files changed, 10 insertions, 11 deletions
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 54f94cfdfc64..b5ba38030d2e 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -420,7 +420,7 @@ void SpellDialog::UpdateBoxes_Impl() } else { - bool bHasExplainLink = aExplainLink.GetURL().Len() != 0; + bool bHasExplainLink = !aExplainLink.GetURL().isEmpty(); aExplainLink.Show( bHasExplainLink ); sal_Int32 nExplainWidth = aExplainLink.GetPosPixel().X() - aExplainFT.GetPosPixel().X(); @@ -2156,7 +2156,7 @@ void SentenceEditWindow_Impl::SetUndoEditMode(bool bSet) pSpellDialog->aChangePB.Enable(); } -IMPL_LINK( SpellDialog, HandleHyperlink, svt::FixedHyperlink*, pHyperlink ) +IMPL_LINK( SpellDialog, HandleHyperlink, FixedHyperlink*, pHyperlink ) { rtl::OUString sURL=pHyperlink->GetURL(); rtl::OUString sTitle=GetText(); diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index b2a9f94b17d7..4161407588fa 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -36,7 +36,7 @@ #include <memory> #include <svtools/svmedit.hxx> #include <svl/lstner.hxx> -#include <svtools/fixedhyper.hxx> +#include <vcl/fixedhyper.hxx> #include <vcl/xtextedt.hxx> #include <editeng/SpellPortions.hxx> @@ -137,10 +137,10 @@ private: FixedText aLanguageFT; SvxLanguageBox aLanguageLB; - HelpFixedText aExplainFT; - svt::FixedHyperlink aExplainLink; + HelpFixedText aExplainFT; + FixedHyperlink aExplainLink; - FixedText aNotInDictFT; + FixedText aNotInDictFT; SentenceEditWindow_Impl aSentenceED; FixedText aSuggestionFT; @@ -201,7 +201,7 @@ private: DECL_LINK( AddToDictClickHdl, PushButton* ); DECL_LINK( LanguageSelectHdl, SvxLanguageBox* ); DECL_LINK( DialogUndoHdl, SpellUndoAction_Impl* ); - DECL_LINK( HandleHyperlink, svt::FixedHyperlink * ); + DECL_LINK( HandleHyperlink, FixedHyperlink * ); DECL_STATIC_LINK( SpellDialog, InitHdl, SpellDialog * ); diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx index 28e2fa5e6d2a..4f824e314f84 100644 --- a/cui/source/inc/about.hxx +++ b/cui/source/inc/about.hxx @@ -23,7 +23,6 @@ #include <vcl/accel.hxx> #include <svtools/svmedit.hxx> #include <svtools/stdctrl.hxx> -#include "svtools/fixedhyper.hxx" #include <sfx2/basedlgs.hxx> ///< for SfxModalDialog #include <vector> diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx index 75e4b1214063..b870f618f17e 100644 --- a/cui/source/inc/optlingu.hxx +++ b/cui/source/inc/optlingu.hxx @@ -23,7 +23,7 @@ #include <vcl/fixed.hxx> #include <vcl/toolbox.hxx> #include <vcl/field.hxx> -#include <svtools/fixedhyper.hxx> +#include <vcl/fixedhyper.hxx> #include <sfx2/tabdlg.hxx> #include <svx/checklbx.hxx> #include <svx/langbox.hxx> @@ -59,7 +59,7 @@ class SvxEditModulesDlg : public ModalDialog PushButton aPrioUpPB; PushButton aPrioDownPB; PushButton aBackPB; - svt::FixedHyperlink aMoreDictsLink; + FixedHyperlink aMoreDictsLink; FixedLine aButtonsFL; HelpButton aHelpPB; @@ -110,7 +110,7 @@ private: FixedText aLinguOptionsFT; SvxCheckListBox aLinguOptionsCLB; PushButton aLinguOptionsEditPB; - svt::FixedHyperlink aMoreDictsLink; + FixedHyperlink aMoreDictsLink; String sCapitalWords; String sWordsWithDigits; |