diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 18:04:51 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-26 06:07:48 -0600 |
commit | 4f31b902712e7816bbd8e0df7629462a17f9ad3f (patch) | |
tree | 1bab0652e24e3e97fbd8639bdd0fcfcef7526c2c /cui/source/dialogs | |
parent | 3c0a7cf4f67720f2cca2c4eb543f838d5b644e7f (diff) |
Remove visual noise from cui
Change-Id: I6cec1f747ce57c3153af92e9e0c317d34d5a245d
Reviewed-on: https://gerrit.libreoffice.org/8250
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui/source/dialogs')
-rw-r--r-- | cui/source/dialogs/SpellAttrib.hxx | 6 | ||||
-rw-r--r-- | cui/source/dialogs/colorpicker.src | 12 | ||||
-rw-r--r-- | cui/source/dialogs/commonlingui.cxx | 8 | ||||
-rw-r--r-- | cui/source/dialogs/commonlingui.hxx | 8 | ||||
-rw-r--r-- | cui/source/dialogs/cuihyperdlg.cxx | 8 | ||||
-rw-r--r-- | cui/source/dialogs/dlgname.cxx | 6 | ||||
-rw-r--r-- | cui/source/dialogs/hangulhanjadlg.cxx | 40 | ||||
-rw-r--r-- | cui/source/dialogs/hldocntp.cxx | 4 | ||||
-rw-r--r-- | cui/source/dialogs/hlinettp.cxx | 6 | ||||
-rw-r--r-- | cui/source/dialogs/hlmarkwn.cxx | 8 | ||||
-rw-r--r-- | cui/source/dialogs/hltpbase.cxx | 4 | ||||
-rw-r--r-- | cui/source/dialogs/hyphen.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/iconcdlg.cxx | 34 | ||||
-rw-r--r-- | cui/source/dialogs/passwdomdlg.cxx | 8 | ||||
-rw-r--r-- | cui/source/dialogs/plfilter.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/scriptdlg.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/showcols.cxx | 4 |
17 files changed, 81 insertions, 81 deletions
diff --git a/cui/source/dialogs/SpellAttrib.hxx b/cui/source/dialogs/SpellAttrib.hxx index 1605aaa52536..6d495abd5a34 100644 --- a/cui/source/dialogs/SpellAttrib.hxx +++ b/cui/source/dialogs/SpellAttrib.hxx @@ -94,7 +94,7 @@ struct SpellErrorDescription } }; -//------------------------------------------------- + class SpellErrorAttrib : public TextAttrib { public: @@ -117,7 +117,7 @@ public: virtual bool operator==( const TextAttrib& rAttr ) const; }; -//------------------------------------------------- + class SpellLanguageAttrib : public TextAttrib { LanguageType m_eLanguage; @@ -140,7 +140,7 @@ public: virtual bool operator==( const TextAttrib& rAttr ) const; }; -//------------------------------------------------- + class SpellBackgroundAttrib : public TextAttrib { Color m_aBackgroundColor; diff --git a/cui/source/dialogs/colorpicker.src b/cui/source/dialogs/colorpicker.src index 63ab6345fc5c..adbfbbc79ab0 100644 --- a/cui/source/dialogs/colorpicker.src +++ b/cui/source/dialogs/colorpicker.src @@ -270,9 +270,9 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER TabStop = TRUE ; }; -// ------------------------------------------------------------------------- + // HSB -// ------------------------------------------------------------------------- + FixedLine FL_HSB { @@ -345,9 +345,9 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER Unit = FUNIT_PERCENT ; }; -// ------------------------------------------------------------------------- + // CMYK -// ------------------------------------------------------------------------- + FixedLine FL_CMYK { @@ -440,9 +440,9 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER Unit = FUNIT_PERCENT ; }; - // ------------------------------------------------------ + // bottom buttons - // ------------------------------------------------------ + FixedLine FT_BOTTOMLINE { diff --git a/cui/source/dialogs/commonlingui.cxx b/cui/source/dialogs/commonlingui.cxx index a4b1ffab7dd5..d2b9cacb402b 100644 --- a/cui/source/dialogs/commonlingui.cxx +++ b/cui/source/dialogs/commonlingui.cxx @@ -26,9 +26,9 @@ #include "hangulhanjadlg.hrc" -//============================================================================= + // SvxClickInfoCtr -//============================================================================= + SvxClickInfoCtr::SvxClickInfoCtr( Window* pParent, const ResId& rResId ) : @@ -73,9 +73,9 @@ SvxClickInfoCtr::~SvxClickInfoCtr() { } -//============================================================================= + // SvxCommonLinguisticControl -//============================================================================= + SvxCommonLinguisticControl::SvxCommonLinguisticControl( ModalDialog* _pParent ) :Window( _pParent, CUI_RES( RID_SVX_WND_COMMON_LINGU ) ) diff --git a/cui/source/dialogs/commonlingui.hxx b/cui/source/dialogs/commonlingui.hxx index 1795f016956a..edb1cf65e0c7 100644 --- a/cui/source/dialogs/commonlingui.hxx +++ b/cui/source/dialogs/commonlingui.hxx @@ -27,9 +27,9 @@ #include <vcl/group.hxx> #include <vcl/dialog.hxx> -//============================================================================= + // SvxClickInfoCtr -//============================================================================= + class SvxClickInfoCtr: public Control { @@ -53,9 +53,9 @@ protected: }; -//============================================================================= + // SvxCommonLinguisticControl -//============================================================================= + class SvxCommonLinguisticControl : public Window { public: diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index 666863ce0537..e93ce96c5f4c 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -30,11 +30,11 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::frame::XFrame; -//######################################################################## + //# # //# Childwindow-Wrapper-Class # //# # -//######################################################################## + SvxHlinkCtrl::SvxHlinkCtrl( sal_uInt16 _nId, SfxBindings & rBindings, SvxHpLinkDlg* pDlg ) : SfxControllerItem ( _nId, rBindings ) @@ -70,11 +70,11 @@ void SvxHlinkCtrl::StateChanged( sal_uInt16 nSID, SfxItemState eState, -//######################################################################## + //# # //# Hyperlink - Dialog # //# # -//######################################################################## + /************************************************************************* |* diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx index 2be4c1847a78..add6bbe6c201 100644 --- a/cui/source/dialogs/dlgname.cxx +++ b/cui/source/dialogs/dlgname.cxx @@ -53,7 +53,7 @@ IMPL_LINK_NOARG(SvxNameDialog, ModifyHdl) return 0; } -/////////////////////////////////////////////////////////////////////////////////////////////// + // #i68101# // Dialog for editing Object Name // plus uniqueness-callback-linkHandler @@ -84,7 +84,7 @@ IMPL_LINK_NOARG(SvxObjectNameDialog, ModifyHdl) return 0; } -/////////////////////////////////////////////////////////////////////////////////////////////// + // #i68101# // Dialog for editing Object Title and Description @@ -106,7 +106,7 @@ SvxObjectTitleDescDialog::SvxObjectTitleDescDialog( pEdtTitle->SetSelection(Selection(SELECTION_MIN, SELECTION_MAX)); } -/////////////////////////////////////////////////////////////////////////////////////////////// + /************************************************************************* |* diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index d0bdd78a68e6..b3b2e0a30dcd 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -43,10 +43,10 @@ #define HHC editeng::HangulHanjaConversion #define LINE_CNT static_cast< sal_uInt16 >(2) -//............................................................................. + namespace svx { -//............................................................................. + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::linguistic2; @@ -75,9 +75,9 @@ namespace svx }; } - //========================================================================= + //= PseudoRubyText - //========================================================================= + /** a class which allows to draw two texts in a pseudo-ruby way (which basically means one text above or below the other, and a little bit smaller) */ @@ -201,9 +201,9 @@ namespace svx *_pSecondaryLocation = aSecondaryRect; } - //========================================================================= + //= RubyRadioButton - //========================================================================= + class RubyRadioButton :public RadioButton ,protected PseudoRubyText { @@ -297,9 +297,9 @@ namespace svx ShowFocus( aTextRect ); } - //========================================================================= + //= SuggestionSet - //========================================================================= + SuggestionSet::SuggestionSet( Window* pParent ) @@ -331,9 +331,9 @@ namespace svx Clear(); } - //========================================================================= + //= SuggestionDisplay - //========================================================================= + SuggestionDisplay::SuggestionDisplay( Window* pParent, const ResId& rResId ) @@ -495,9 +495,9 @@ namespace svx m_aListBox.SetHelpId( HID_HANGULDLG_SUGGESTIONS_LIST ); } - //========================================================================= + //= HangulHanjaConversionDialog - //========================================================================= + HangulHanjaConversionDialog::HangulHanjaConversionDialog( Window* _pParent, HHC::ConversionDirection _ePrimaryDirection ) :ModalDialog( _pParent, CUI_RES( RID_SVX_MDLG_HANGULHANJA ) ) @@ -921,9 +921,9 @@ namespace svx } - //========================================================================= + //= HangulHanjaOptionsDialog - //========================================================================= + void HangulHanjaOptionsDialog::Init( void ) @@ -1171,9 +1171,9 @@ namespace svx pEntry->SetUserData( new OUString( _rName ) ); } - //========================================================================= + //= HangulHanjaNewDictDialog - //========================================================================= + IMPL_LINK_NOARG(HangulHanjaNewDictDialog, OKHdl) @@ -1216,9 +1216,9 @@ namespace svx return m_bEntered; } - //========================================================================= + //= HangulHanjaEditDictDialog - //========================================================================= + class SuggestionList @@ -1802,8 +1802,8 @@ namespace svx SetEditText( m_aEdit4, nPos ); } -//............................................................................. + } // namespace svx -//............................................................................. + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index 10850f2d52fd..464454c7140e 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -289,14 +289,14 @@ void SvxHyperlinkNewDocTp::DoApply () if ( aStrNewName == aEmptyStr ) aStrNewName = maStrInitURL; - /////////////////////////////////////////////////////// + // create a real URL-String INetURLObject aURL; if ( ImplGetURLObject( aStrNewName, maCbbPath.GetBaseURL(), aURL ) ) { - /////////////////////////////////////////////////////// + // create Document aStrNewName = aURL.GetURLPath( INetURLObject::NO_DECODE ); diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index 379ba03a15db..d20f4c4891b3 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -66,7 +66,7 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window *pParent, SetExchangeSupport (); - /////////////////////////////////////// + // set defaults maRbtLinktypInternet.Check (); maFtLogin.Show( false ); @@ -76,7 +76,7 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window *pParent, maCbAnonymous.Show( false ); maBtBrowse.Enable( true ); - /////////////////////////////////////// + // overload handlers Link aLink( LINK ( this, SvxHyperlinkInternetTp, Click_SmartProtocol_Impl ) ); maRbtLinktypInternet.SetClickHdl( aLink ); @@ -402,7 +402,7 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, LostFocusTargetHdl_Impl) IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickBrowseHdl_Impl) { - ///////////////////////////////////////////////// + // Open URL if available SfxStringItem aName( SID_FILE_NAME, OUString("http://") ); diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index 12c76bcf4ca6..babcd575ed45 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -65,11 +65,11 @@ struct TargetData }; -//######################################################################## + //# # //# Tree-Window # //# # -//######################################################################## + SvxHlmarkTreeLBox::SvxHlmarkTreeLBox( Window* pParent, const ResId& rResId ) : SvTreeListBox ( pParent, rResId ), @@ -107,11 +107,11 @@ void SvxHlmarkTreeLBox::Paint( const Rectangle& rRect ) } -//######################################################################## + //# # //# Window-Class # //# # -//######################################################################## + /************************************************************************* |* diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index 12a45caf8f86..d62be75e31c5 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -462,7 +462,7 @@ void SvxHyperlinkTabPageBase::GetDataFromCommonFields( OUString& aStrName, // reset dialog-fields void SvxHyperlinkTabPageBase::Reset( const SfxItemSet& rItemSet) { - /////////////////////////////////////// + // Set dialog-fields from create-itemset maStrInitURL = aEmptyStr; @@ -533,7 +533,7 @@ OUString SvxHyperlinkTabPageBase::CreateUiNameFromURL( const OUString& aStrURL ) // Activate / Deactivate Tabpage void SvxHyperlinkTabPageBase::ActivatePage( const SfxItemSet& rItemSet ) { - /////////////////////////////////////// + // Set dialog-fields from input-itemset SvxHyperlinkItem *pHyperlinkItem = (SvxHyperlinkItem *) rItemSet.GetItem (SID_HYPERLINK_GETLINK); diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx index c051582387ad..c0dc970755d3 100644 --- a/cui/source/dialogs/hyphen.cxx +++ b/cui/source/dialogs/hyphen.cxx @@ -116,7 +116,7 @@ OUString SvxHyphenWordDialog::EraseUnusableHyphens_Impl( // 'multi-line-editor' is regarded as single word we also need to discard those // hyphenation positions to the left of the rightmost '-' that is still left of // the rightmost valid hyphenation position according to 1) - // + // Example: // If the possible hyphenation position in 'multi-line-editor' are to eb marked // by '=' then the text will look like this 'mul=ti-line-ed=it=or'. diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index a88ea1a55e43..447fefbccbdc 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -54,11 +54,11 @@ static inline OUString GetViewOptUserItem( const SvtViewOptions& rOpt ) } -//##################################################################### -// + + // Class IconChoicePage -// -//##################################################################### + + /********************************************************************** | @@ -179,11 +179,11 @@ void IconChoicePage::DataChanged( const DataChangedEvent& rDCEvt ) } } -//##################################################################### -// + + // Class IconChoiceDialog -// -//##################################################################### + + /********************************************************************** | @@ -288,7 +288,7 @@ IconChoiceDialog ::~IconChoiceDialog () delete pUserData; } - // + if ( pRanges ) delete pRanges; if ( pOutSet ) @@ -444,18 +444,18 @@ void IconChoiceDialog::SetPosSizeCtrls ( sal_Bool bInit ) const Point aCtrlOffset ( LogicToPixel( Point( CTRLS_OFFSET, CTRLS_OFFSET ), MAP_APPFONT ) ); Size aOutSize ( GetOutputSizePixel() ); - //////////////////////////////////////// + // Button-Defaults - // + Size aDefaultButtonSize = LogicToPixel( Size( 50, 14 ), MAP_APPFONT ); // Reset-Button Size aResetButtonSize ( bInit ? aDefaultButtonSize : aResetBtn.GetSizePixel () ); - //////////////////////////////////////// + // IconChoiceCtrl resizen & positionieren - // + SvtTabAppearanceCfg aCfg; const long nDefaultWidth = (aCfg.GetScaleFactor() * ICONCTRL_WIDTH_PIXEL) / 100; const long nDefaultHeight = (aCfg.GetScaleFactor() * ICONCTRL_HEIGHT_PIXEL) / 100; @@ -492,9 +492,9 @@ void IconChoiceDialog::SetPosSizeCtrls ( sal_Bool bInit ) maIconCtrl.SetPosSizePixel ( aIconCtrlPos, aNewIconCtrlSize ); maIconCtrl.ArrangeIcons(); - //////////////////////////////////////// + // resize & position the pages - // + for ( size_t i = 0; i < maPageList.size(); i++ ) { IconChoicePageData* pData = maPageList[ i ]; @@ -537,9 +537,9 @@ void IconChoiceDialog::SetPosSizeCtrls ( sal_Bool bInit ) pData->pPage->SetPosSizePixel ( aNewPagePos, aNewPageSize ); } - //////////////////////////////////////// + // position the buttons - // + sal_uLong nXOffset=0; if ( meChoicePos == PosRight ) nXOffset = aNewIconCtrlSize.Width()+(2*aCtrlOffset.X()); diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx index 30e330067264..fba34921ca79 100644 --- a/cui/source/dialogs/passwdomdlg.cxx +++ b/cui/source/dialogs/passwdomdlg.cxx @@ -32,7 +32,7 @@ #include <vcl/msgbox.hxx> -////////////////////////////////////////////////////////////////////// + class PasswordReenterEdit_Impl : public Edit { @@ -77,7 +77,7 @@ void PasswordReenterEdit_Impl::Paint( const Rectangle& rRect ) } -////////////////////////////////////////////////////////////////////// + struct PasswordToOpenModifyDialog_Impl { @@ -218,7 +218,7 @@ IMPL_LINK( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, OKButton *, EMPTYARG return 0; } -////////////////////////////////////////////////////////////////////// + PasswordToOpenModifyDialog::PasswordToOpenModifyDialog( @@ -264,6 +264,6 @@ bool PasswordToOpenModifyDialog::IsRecommendToOpenReadonly() const } -////////////////////////////////////////////////////////////////////// + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/plfilter.cxx b/cui/source/dialogs/plfilter.cxx index 034e67fb3909..4c0b7c323f2a 100644 --- a/cui/source/dialogs/plfilter.cxx +++ b/cui/source/dialogs/plfilter.cxx @@ -46,7 +46,7 @@ typedef set< OUString, ltstr > StrSet; typedef map< OUString, StrSet, ltstr > FilterMap; -//================================================================================================== + void fillNetscapePluginFilters( Sequence< OUString >& rPluginNames, Sequence< OUString >& rPluginTypes ) { Reference< XComponentContext > xContext = comphelper::getProcessComponentContext(); diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 5b22625109ab..73b60526b946 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -1467,7 +1467,7 @@ SvxScriptErrorDialog::~SvxScriptErrorDialog() short SvxScriptErrorDialog::Execute() { // Show Error dialog asynchronously - // + // Pass a copy of the message to the ShowDialog method as the // SvxScriptErrorDialog may be deleted before ShowDialog is called Application::PostUserEvent( diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx index b0339cb4a7b9..6e39feff39f2 100644 --- a/cui/source/dialogs/showcols.cxx +++ b/cui/source/dialogs/showcols.cxx @@ -29,9 +29,9 @@ #define CUIFM_PROP_HIDDEN "Hidden" #define CUIFM_PROP_LABEL "Label" -//========================================================================== + // FmShowColsDialog -//========================================================================== + DBG_NAME(FmShowColsDialog) FmShowColsDialog::FmShowColsDialog(Window* pParent) |