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 | |
| 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')
79 files changed, 344 insertions, 344 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 9991dcc8db7e..534dd1b89bb0 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -1598,7 +1598,7 @@ void SvxConfigPage::Reset( const SfxItemSet& ) { // If we haven't initialised our XMultiServiceFactory reference // then Reset is being called at the opening of the dialog. - // + // Load menu configuration data for the module of the currently // selected document, for the currently selected document, and for // all other open documents of the same module type diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index 1f52c537d8bb..33b213b46688 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -530,7 +530,7 @@ void SfxConfigGroupListBox::InitStyles() namespace { - //........................................... + /** examines a component whether it supports XEmbeddedScripts, or provides access to such a component by implementing XScriptInvocationContext. @return @@ -550,7 +550,7 @@ namespace return Reference< XModel >( xScripts, UNO_QUERY ); } - //........................................... + static Reference< XModel > lcl_getScriptableDocument_nothrow( const Reference< XFrame >& _rxFrame ) { Reference< XModel > xDocument; diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index e4536547cc15..9fad89c57cdf 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -300,7 +300,7 @@ void _SvxMacroTabPage::InitResources() aDisplayNames.push_back( EventDisplayName( "OnChange", RID_SVXSTR_EVENT_CONTENTCHANGED ) ); // the event name to UI string mappings for forms & dialogs - // + aDisplayNames.push_back( EventDisplayName( "approveAction", RID_SVXSTR_EVENT_APPROVEACTIONPERFORMED ) ); aDisplayNames.push_back( EventDisplayName( "actionPerformed", RID_SVXSTR_EVENT_ACTIONPERFORMED ) ); aDisplayNames.push_back( EventDisplayName( "changed", RID_SVXSTR_EVENT_CHANGED ) ); @@ -470,7 +470,7 @@ IconLBoxString::IconLBoxString( SvTreeListEntry* pEntry, sal_uInt16 nFlags, cons m_nxImageOffset = 20; } -//=============================================== + void IconLBoxString::Paint( const Point& aPos, SvTreeListBox& aDevice, const SvViewDataEntry* /*pView*/, const SvTreeListEntry* /*pEntry*/) @@ -867,7 +867,7 @@ SvxMacroAssignDlg::SvxMacroAssignDlg( Window* pParent, const Reference< frame::X SetTabPage(new SvxMacroTabPage(get_content_area(), _rxDocumentFrame, rSet, xNameReplace, nSelectedIndex)); } -//=============================================== + IMPL_LINK_NOARG(AssignComponentDialog, ButtonHandler) { diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index 18f0c0559644..74a6bbcfc7f6 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -239,7 +239,7 @@ void SvxConfigGroupListBox::ClearAll() namespace { - //........................................... + /** examines a component whether it supports XEmbeddedScripts, or provides access to such a component by implementing XScriptInvocationContext. @return @@ -259,7 +259,7 @@ namespace return Reference< XModel >( xScripts, UNO_QUERY ); } - //........................................... + static Reference< XModel > lcl_getScriptableDocument_nothrow( const Reference< XFrame >& _rxFrame ) { Reference< XModel > xDocument; 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) diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index a75e482d1142..b54cda05b284 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -148,9 +148,9 @@ IMPL_ABSTDLG_BASE(AbstractSpellDialog_Impl); IMPL_ABSTDLG_BASE(AbstractSvxPostItDialog_Impl); IMPL_ABSTDLG_BASE(AbstractPasswordToOpenModifyDialog_Impl); -////////////////////////////////////////////////////////////////////////// + // VclAbstractDialog2_Impl -////////////////////////////////////////////////////////////////////////// + // virtual VclAbstractDialog2_Impl::~VclAbstractDialog2_Impl() @@ -185,7 +185,7 @@ IMPL_LINK( VclAbstractDialog2_Impl, EndDialogHdl, Dialog*, pDlg ) return 0L; } -////////////////////////////////////////////////////////////////////////// + void CuiAbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId ) { @@ -628,12 +628,12 @@ const SfxItemSet* AbstractSvxTransformTabDialog_Impl::GetOutputItemSet() const { return pDlg->GetOutputItemSet(); } -// + const sal_uInt16* AbstractSvxTransformTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem ) { return pDlg->GetInputRanges( pItem ); } -// + void AbstractSvxTransformTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet ) { pDlg->SetInputSet( pInSet ); @@ -667,12 +667,12 @@ const SfxItemSet* AbstractSvxCaptionDialog_Impl::GetOutputItemSet() const { return pDlg->GetOutputItemSet(); } -// + const sal_uInt16* AbstractSvxCaptionDialog_Impl::GetInputRanges(const SfxItemPool& pItem ) { return pDlg->GetInputRanges( pItem ); } -// + void AbstractSvxCaptionDialog_Impl::SetInputSet( const SfxItemSet* pInSet ) { pDlg->SetInputSet( pInSet ); diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index fc65d37d9cc7..8755912ce469 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -55,7 +55,7 @@ namespace linguistic2{ namespace svx{ class SpellDialog; struct SpellErrorDescription; -// ------------------------------------------------------------------ + class SentenceEditWindow_Impl : public VclMultiLineEdit { using VclMultiLineEdit::SetText; diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx index d6b693720b73..37dd2f952a8d 100644 --- a/cui/source/inc/align.hxx +++ b/cui/source/inc/align.hxx @@ -50,7 +50,7 @@ namespace svx { -// ============================================================================ + class AlignmentTabPage : public SfxTabPage { @@ -110,7 +110,7 @@ private: VclContainer* m_pPropertiesFrame; }; -// ============================================================================ + } // namespace svx diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index 97d8c3c71db3..4b83a1784708 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -118,7 +118,7 @@ private: BackgroundPreviewImpl* m_pPreviewWin2; // DDListBox for Writer ------------------------------- - //------------------------------------------------------ + Color aBgdColor; sal_uInt16 nHtmlMode; sal_Bool bAllowShowSelector : 1; diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index 7a7aac50794e..fca123382142 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -32,7 +32,7 @@ class SvxFontListItem; class FontList; -// ----------------------------------------------------------------------- + #define DISABLE_CASEMAP ((sal_uInt16)0x0001) #define DISABLE_WORDLINE ((sal_uInt16)0x0002) diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx index 60912c0c5e7e..f4d6b4f3fecb 100644 --- a/cui/source/inc/cuigrfflt.hxx +++ b/cui/source/inc/cuigrfflt.hxx @@ -90,9 +90,9 @@ public: }; -// ------------------------- + // - GraphicFilterSmooth - -// ------------------------- + class GraphicFilterSmooth : public GraphicFilterDialog { @@ -107,9 +107,9 @@ public: double GetRadius() const { return mpMtrRadius->GetValue() / 10.0; } }; -// ----------------------- + // - GraphicFilterMosaic - -// ----------------------- + class GraphicFilterMosaic : public GraphicFilterDialog { @@ -129,9 +129,9 @@ public: sal_Bool IsEnhanceEdges() const { return mpCbxEdges->IsChecked(); } }; -// ------------------------- + // - GraphicFilterSolarize - -// ------------------------- + class GraphicFilterSolarize : public GraphicFilterDialog { @@ -149,9 +149,9 @@ public: sal_Bool IsInvert() const { return mpCbxInvert->IsChecked(); } }; -// ---------------------- + // - GraphicFilterSepia - -// ---------------------- + class GraphicFilterSepia : public GraphicFilterDialog { @@ -167,9 +167,9 @@ public: } }; -// ----------------------- + // - GraphicFilterPoster - -// ----------------------- + class GraphicFilterPoster : public GraphicFilterDialog { @@ -183,9 +183,9 @@ public: sal_uInt16 GetPosterColorCount() const { return( (sal_uInt16) mpNumPoster->GetValue() ); } }; -// ----------------------- + // - GraphicFilterEmboss - -// ----------------------- + class EmbossControl : public SvxRectCtl { diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index 51535a2f43f8..7bb862d55f5b 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -698,7 +698,7 @@ private: void ImpColorCountChanged(); - //----------------------------------------------------------------------------------------------------- + DECL_LINK( ClickAddHdl_Impl, void * ); DECL_LINK( ClickModifyHdl_Impl, void * ); DECL_LINK( ClickDeleteHdl_Impl, void * ); diff --git a/cui/source/inc/cuitbxform.hxx b/cui/source/inc/cuitbxform.hxx index 389690df409d..42e905ee73f3 100644 --- a/cui/source/inc/cuitbxform.hxx +++ b/cui/source/inc/cuitbxform.hxx @@ -24,7 +24,7 @@ #include <vcl/dialog.hxx> #include <vcl/field.hxx> -//======================================================================== + class FmInputRecordNoDialog : public ModalDialog { diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index b47b784c09ec..2b51befcaf42 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -32,14 +32,14 @@ namespace svx { class OptHeaderTabListBox; } -//........................................................................ + namespace svx { -//........................................................................ - //==================================================================== + + //= DbRegistrationOptionsPage - //==================================================================== + class DbRegistrationOptionsPage : public SfxTabPage { private: @@ -100,9 +100,9 @@ namespace svx virtual void FillUserData(); }; - //==================================================================== + //= RegistrationItemSetHolder - //==================================================================== + /** helper for DatabaseRegistrationDialog Necessary so that DatabaseRegistrationDialog is self-contained, i.e. always reflects @@ -121,9 +121,9 @@ namespace svx const SfxItemSet& getRegistrationItems() const { return m_aRegistrationItems; } }; - //==================================================================== + //= DatabaseRegistrationDialog - //==================================================================== + class DatabaseRegistrationDialog :public RegistrationItemSetHolder ,public SfxSingleTabDialog { @@ -134,9 +134,9 @@ namespace svx virtual short Execute(); }; -//........................................................................ + } // namespace svx -//........................................................................ + #endif // INCLUDED_CUI_SOURCE_INC_DBREGISTER_HXX diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index 8bde65e13234..933b67935e8f 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -36,14 +36,14 @@ #include <memory> class SvxCommonLinguisticControl; -//............................................................................. + namespace svx { -//............................................................................. - //========================================================================= + + //= HangulHanjaConversionDialog - //========================================================================= + class SuggestionSet : public ValueSet { @@ -326,9 +326,9 @@ namespace svx void UpdateScrollbar( void ); }; -//............................................................................. + } // namespace svx -//............................................................................. + #endif // SVX_HANGUL_HANJA_HXX diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx index a28129553a0a..413baf06635e 100644 --- a/cui/source/inc/hlmarkwn.hxx +++ b/cui/source/inc/hlmarkwn.hxx @@ -28,11 +28,11 @@ #include "hlmarkwn_def.hxx" class SvxHyperlinkTabPageBase; -//######################################################################## + //# # //# Tree-Window # //# # -//######################################################################## + class SvxHlinkDlgMarkWnd; @@ -47,11 +47,11 @@ public: virtual void Paint( const Rectangle& rRect ); }; -//######################################################################## + //# # //# Window-Class # //# # -//######################################################################## + class SvxHlinkDlgMarkWnd : public ModalDialog //FloatingWindow { diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index 33f4381b6e8d..55389f140d2f 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_CUI_SOURCE_INC_NUMFMT_HXX #define INCLUDED_CUI_SOURCE_INC_NUMFMT_HXX -//------------------------------------------------------------------------ + #include <rtl/ustring.hxx> #include <sfx2/tabdlg.hxx> @@ -33,13 +33,13 @@ #include <vcl/field.hxx> #include <vcl/window.hxx> -//------------------------------------------------------------------------ + class SvxNumberFormatShell; class SvxNumberInfoItem; class vector; -//------------------------------------------------------------------------ + class SvxNumberPreview : public Window { @@ -61,7 +61,7 @@ public: void NotifyChange( const OUString& rPrevStr, const Color* pColor = NULL ); }; -// ----------------------------------------------------------------------- + class SvxNumberFormatTabPage : public SfxTabPage { diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index fdadc191bd9b..d5d07c44ba2f 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -32,7 +32,7 @@ #include <editeng/numdef.hxx> #include <svtools/ctrlbox.hxx> -// ----------------------------------------------------------------------- + class SvxNumRule; class SvxBmpNumValueSet; class SvxNumValueSet; @@ -65,7 +65,7 @@ class SvxNumberingPreview : public Window }; -//------------------------------------------------ + struct SvxNumSettings_Impl { @@ -84,7 +84,7 @@ struct SvxNumSettings_Impl typedef boost::ptr_vector<SvxNumSettings_Impl> SvxNumSettingsArr_Impl; -//------------------------------------------------ + class SvxSingleNumPickTabPage : public SfxTabPage { using TabPage::ActivatePage; @@ -122,7 +122,7 @@ class SvxSingleNumPickTabPage : public SfxTabPage }; -//------------------------------------------------ + class SvxBulletPickTabPage : public SfxTabPage { @@ -204,7 +204,7 @@ class SvxNumPickTabPage : public SfxTabPage }; -//------------------------------------------------ + class SvxBitmapPickTabPage : public SfxTabPage { using TabPage::ActivatePage; @@ -245,7 +245,7 @@ class SvxBitmapPickTabPage : public SfxTabPage void SetNumCharFmtName(const OUString& rName){sNumCharFmtName = rName;} }; -//------------------------------------------------ + class SvxNumOptionsTabPage : public SfxTabPage { using TabPage::ActivatePage; @@ -379,7 +379,7 @@ class SvxNumOptionsTabPage : public SfxTabPage static void GetI18nNumbering( ListBox& rFmtLB, sal_uInt16 nDoNotRemove ); }; -//------------------------------------------------ + class SvxNumPositionTabPage : public SfxTabPage { using TabPage::ActivatePage; diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index 6f0feff2bf94..299b6e4ac9b2 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -255,7 +255,7 @@ private: virtual void PageCreated(SfxAllItemSet aSet); }; -//-------------------------------------------------------------------------- + class SvxAsianTabPage : public SfxTabPage { diff --git a/cui/source/inc/passwdomdlg.hxx b/cui/source/inc/passwdomdlg.hxx index 83f6e54065aa..c201c5f8f55a 100644 --- a/cui/source/inc/passwdomdlg.hxx +++ b/cui/source/inc/passwdomdlg.hxx @@ -24,7 +24,7 @@ #include <memory> -////////////////////////////////////////////////////////////////////// + struct PasswordToOpenModifyDialog_Impl; @@ -48,7 +48,7 @@ public: virtual bool IsRecommendToOpenReadonly() const; }; -////////////////////////////////////////////////////////////////////// + #endif diff --git a/cui/source/inc/showcols.hxx b/cui/source/inc/showcols.hxx index 65ee78511695..d43868a4f5da 100644 --- a/cui/source/inc/showcols.hxx +++ b/cui/source/inc/showcols.hxx @@ -29,9 +29,9 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XIndexContainer.hpp> -//========================================================================== + // FmShowColsDialog -//========================================================================== + class FmShowColsDialog : public ModalDialog { diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index 8e483a8b9de2..79e6b8e8dbe2 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.hxx @@ -131,7 +131,7 @@ private: double mfOldHeight; RECT_POINT meRP; - //------------------------------------ + DECL_LINK( ChangePosProtectHdl, void * ); DECL_LINK( ChangeSizeProtectHdl, void * ); @@ -243,7 +243,7 @@ private: SfxMapUnit ePoolUnit; FieldUnit eDlgUnit; - //------------------------------------ + public: SvxSlantTabPage( Window* pParent, const SfxItemSet& rInAttrs ); diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx index 90122e166be4..fe2fbd04c9b4 100644 --- a/cui/source/options/cfgchart.cxx +++ b/cui/source/options/cfgchart.cxx @@ -171,9 +171,9 @@ bool SvxChartColorTable::operator==( const SvxChartColorTable & _rOther ) const return bEqual; } -// ==================== + // class SvxChartOptions -// ==================== + SvxChartOptions::SvxChartOptions() : ::utl::ConfigItem( OUString("Office.Chart") ), diff --git a/cui/source/options/cfgchart.hxx b/cui/source/options/cfgchart.hxx index b656d95b4b3c..2cfd5f3b1da9 100644 --- a/cui/source/options/cfgchart.hxx +++ b/cui/source/options/cfgchart.hxx @@ -60,9 +60,9 @@ public: bool operator==( const SvxChartColorTable & _rOther ) const; }; -// ==================== + // all options -// ==================== + class SvxChartOptions : public ::utl::ConfigItem { private: @@ -87,9 +87,9 @@ public: virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames); }; -// ==================== + // items -// ==================== + class SvxChartColorTableItem : public SfxPoolItem { public: diff --git a/cui/source/options/connpoolconfig.cxx b/cui/source/options/connpoolconfig.cxx index 254fd12cee4f..f9b9fc17c52f 100644 --- a/cui/source/options/connpoolconfig.cxx +++ b/cui/source/options/connpoolconfig.cxx @@ -28,10 +28,10 @@ #include <comphelper/processfactory.hxx> #include "sdbcdriverenum.hxx" -//........................................................................ + namespace offapp { -//........................................................................ + using namespace ::utl; using namespace ::com::sun::star::uno; @@ -78,9 +78,9 @@ namespace offapp return s_sNodeName; } - //==================================================================== + //= ConnectionPoolConfig - //==================================================================== + void ConnectionPoolConfig::GetOptions(SfxItemSet& _rFillItems) { @@ -205,9 +205,9 @@ namespace offapp aConnectionPoolRoot.commit(); } -//........................................................................ + } // namespace offapp -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/connpoolconfig.hxx b/cui/source/options/connpoolconfig.hxx index 0c6440177521..fdaa129d223d 100644 --- a/cui/source/options/connpoolconfig.hxx +++ b/cui/source/options/connpoolconfig.hxx @@ -21,14 +21,14 @@ #define INCLUDED_CUI_SOURCE_OPTIONS_CONNPOOLCONFIG_HXX class SfxItemSet; -//........................................................................ + namespace offapp { -//........................................................................ - //==================================================================== + + //= ConnectionPoolConfig - //==================================================================== + class ConnectionPoolConfig { @@ -37,9 +37,9 @@ namespace offapp static void SetOptions(const SfxItemSet& _rSourceItems); }; -//........................................................................ + } // namespace offapp -//........................................................................ + #endif // INCLUDED_CUI_SOURCE_OPTIONS_CONNPOOLCONFIG_HXX diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index 4c6adee5dc31..874b8c7f7fe9 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -311,9 +311,9 @@ namespace offapp } } - //==================================================================== + //= ConnectionPoolOptionsPage - //==================================================================== + ConnectionPoolOptionsPage::ConnectionPoolOptionsPage(Window* _pParent, const SfxItemSet& _rAttrSet) : SfxTabPage(_pParent, "ConnPoolPage", "cui/ui/connpooloptions.ui", _rAttrSet) diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx index 27397c0a462e..535c8d5f6c93 100644 --- a/cui/source/options/connpooloptions.hxx +++ b/cui/source/options/connpooloptions.hxx @@ -29,9 +29,9 @@ namespace offapp { - //==================================================================== + //= ConnectionPoolOptionsPage - //==================================================================== + class DriverListControl; class ConnectionPoolOptionsPage : public SfxTabPage { diff --git a/cui/source/options/connpoolsettings.cxx b/cui/source/options/connpoolsettings.cxx index 59a86c74f8cb..623906daf4f4 100644 --- a/cui/source/options/connpoolsettings.cxx +++ b/cui/source/options/connpoolsettings.cxx @@ -19,14 +19,14 @@ #include "connpoolsettings.hxx" -//........................................................................ + namespace offapp { -//........................................................................ - //==================================================================== + + //= DriverPooling - //==================================================================== + DriverPooling::DriverPooling( const OUString& _rName, sal_Bool _bEnabled, const sal_Int32 _nTimeout ) :sName(_rName) @@ -43,17 +43,17 @@ namespace offapp && (nTimeoutSeconds == _rR.nTimeoutSeconds); } - //==================================================================== + //= DriverPoolingSettings - //==================================================================== + DriverPoolingSettings::DriverPoolingSettings() { } - //==================================================================== + //= DriverPoolingSettingsItem - //==================================================================== + TYPEINIT1( DriverPoolingSettingsItem, SfxPoolItem ) DriverPoolingSettingsItem::DriverPoolingSettingsItem( sal_uInt16 _nId, const DriverPoolingSettings &_rSettings ) @@ -95,9 +95,9 @@ namespace offapp -//........................................................................ + } // namespace offapp -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/connpoolsettings.hxx b/cui/source/options/connpoolsettings.hxx index f1ddfbb51bf9..d3f6c5158809 100644 --- a/cui/source/options/connpoolsettings.hxx +++ b/cui/source/options/connpoolsettings.hxx @@ -27,14 +27,14 @@ #include <rtl/ustring.hxx> #include <svl/poolitem.hxx> -//........................................................................ + namespace offapp { -//........................................................................ - //==================================================================== + + //= DriverPooling - //==================================================================== + struct DriverPooling { OUString sName; @@ -47,9 +47,9 @@ namespace offapp sal_Bool operator != (const DriverPooling& _rR) const { return !operator ==(_rR); } }; - //==================================================================== + //= DriverPoolingSettings - //==================================================================== + class DriverPoolingSettings { protected: @@ -74,9 +74,9 @@ namespace offapp void push_back(const DriverPooling& _rElement) { m_aDrivers.push_back(_rElement); } }; - //==================================================================== + //= DriverPoolingSettingsItem - //==================================================================== + class DriverPoolingSettingsItem : public SfxPoolItem { protected: @@ -93,9 +93,9 @@ namespace offapp const DriverPoolingSettings& getSettings() const { return m_aSettings; } }; -//........................................................................ + } // namespace offapp -//........................................................................ + #endif // INCLUDED_CUI_SOURCE_OPTIONS_CONNPOOLSETTINGS_HXX diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index 5bdca4c442b2..aefa5896f8e1 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -50,10 +50,10 @@ #define TAB_WIDTH2 1000 #define ITEMID_TYPE 1 #define ITEMID_PATH 2 -//........................................................................ + namespace svx { -//........................................................................ + using namespace ::com::sun::star::lang; using namespace ::com::sun::star::ui::dialogs; @@ -449,9 +449,9 @@ IMPL_LINK( DbRegistrationOptionsPage, NameValidator, OUString*, _pName ) } return 1L; } -//........................................................................ + } // namespace svx -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/dbregisterednamesconfig.cxx b/cui/source/options/dbregisterednamesconfig.cxx index 5f03c7339877..0d06346586d4 100644 --- a/cui/source/options/dbregisterednamesconfig.cxx +++ b/cui/source/options/dbregisterednamesconfig.cxx @@ -31,19 +31,19 @@ #include <unotools/confignode.hxx> #include <tools/diagnose_ex.h> -//........................................................................ + namespace svx { -//........................................................................ + using namespace ::utl; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::container; - //==================================================================== + //= DbRegisteredNamesConfig - //==================================================================== + void DbRegisteredNamesConfig::GetOptions( SfxItemSet& _rFillItems ) { @@ -126,8 +126,8 @@ namespace svx } } -//........................................................................ + } // namespace svx -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/dbregisterednamesconfig.hxx b/cui/source/options/dbregisterednamesconfig.hxx index fdb21ce42449..a140ae40cfb1 100644 --- a/cui/source/options/dbregisterednamesconfig.hxx +++ b/cui/source/options/dbregisterednamesconfig.hxx @@ -21,14 +21,14 @@ #define INCLUDED_CUI_SOURCE_OPTIONS_DBREGISTEREDNAMESCONFIG_HXX class SfxItemSet; -//........................................................................ + namespace svx { -//........................................................................ - //==================================================================== + + //= DbRegisteredNamesConfig - //==================================================================== + class DbRegisteredNamesConfig { @@ -37,9 +37,9 @@ namespace svx static void SetOptions(const SfxItemSet& _rSourceItems); }; -//........................................................................ + } // namespace svx -//........................................................................ + #endif // INCLUDED_CUI_SOURCE_OPTIONS_DBREGISTEREDNAMESCONFIG_HXX diff --git a/cui/source/options/dbregistersettings.cxx b/cui/source/options/dbregistersettings.cxx index 1b6b5b581ad0..f3bc7169cef2 100644 --- a/cui/source/options/dbregistersettings.cxx +++ b/cui/source/options/dbregistersettings.cxx @@ -21,14 +21,14 @@ #include <rtl/ustring.hxx> -//........................................................................ + namespace svx { -//........................................................................ - //==================================================================== + + //= DatabaseMapItem - //==================================================================== + TYPEINIT1( DatabaseMapItem, SfxPoolItem ) DatabaseMapItem::DatabaseMapItem( sal_uInt16 _nId, const DatabaseRegistrations& _rRegistrations ) @@ -58,9 +58,9 @@ namespace svx -//........................................................................ + } // namespace svx -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/dbregistersettings.hxx b/cui/source/options/dbregistersettings.hxx index f3a0fb33f415..444aabfdb86a 100644 --- a/cui/source/options/dbregistersettings.hxx +++ b/cui/source/options/dbregistersettings.hxx @@ -26,10 +26,10 @@ #include <svl/poolitem.hxx> -//........................................................................ + namespace svx { -//........................................................................ + struct DatabaseRegistration { @@ -63,9 +63,9 @@ namespace svx typedef ::std::map< OUString, DatabaseRegistration > DatabaseRegistrations; - //==================================================================== + //= DatabaseMapItem - //==================================================================== + class DatabaseMapItem : public SfxPoolItem { protected: @@ -83,9 +83,9 @@ namespace svx getRegistrations() const { return m_aRegistrations; } }; -//........................................................................ + } // namespace svx -//........................................................................ + #endif // INCLUDED_CUI_SOURCE_OPTIONS_DBREGISTERSETTINGS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx index 78e8901df9ee..d6fb3e528e45 100644 --- a/cui/source/options/doclinkdialog.cxx +++ b/cui/source/options/doclinkdialog.cxx @@ -29,19 +29,19 @@ #include <tools/urlobj.hxx> #include <sfx2/filedlghelper.hxx> #include <sfx2/docfilt.hxx> -//...................................................................... + namespace svx { -//...................................................................... + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; using namespace ::svt; - //================================================================== + //= ODocumentLinkDialog - //================================================================== + ODocumentLinkDialog::ODocumentLinkDialog( Window* _pParent, sal_Bool _bCreateNew ) : ModalDialog(_pParent, "DatabaseLinkDialog", @@ -202,8 +202,8 @@ namespace svx return 0L; } -//...................................................................... + } // namespace svx -//...................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx index a2e6559d0030..8113da3347a3 100644 --- a/cui/source/options/doclinkdialog.hxx +++ b/cui/source/options/doclinkdialog.hxx @@ -27,14 +27,14 @@ #include <svtools/inettbc.hxx> #include <svtools/urlcontrol.hxx> -//...................................................................... + namespace svx { -//...................................................................... - //================================================================== + + //= ODocumentLinkDialog - //================================================================== + /** dialog for editing document links associated with data sources */ class ODocumentLinkDialog : public ModalDialog @@ -69,9 +69,9 @@ namespace svx void validate( ); }; -//...................................................................... + } // namespace svx -//...................................................................... + #endif // INCLUDED_CUI_SOURCE_OPTIONS_DOCLINKDIALOG_HXX diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 16f3655526e4..6b97a1aaa182 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -163,9 +163,9 @@ const vEntryInfo[] = } // namespace -// + // ColorConfigWindow_Impl -// + class ColorConfigWindow_Impl : public VclContainer @@ -275,9 +275,9 @@ private: bool IsGroupVisible (Group) const; }; -// + // ColorConfigWindow_Impl::Chapter -// + // ctor for default groups // rParent: parent window (ColorConfigWindow_Impl) @@ -322,9 +322,9 @@ void ColorConfigWindow_Impl::Chapter::Hide () m_pText->Hide(); } -// + // ColorConfigWindow_Impl::Entry -// + ColorConfigWindow_Impl::Entry::Entry(ColorConfigWindow_Impl& rParent, unsigned iEntry, long nCheckBoxLabelOffset, bool bShow) @@ -498,9 +498,9 @@ void ColorConfigWindow_Impl::Entry::SetColor (Color aColor) } -// + // ColorConfigWindow_Impl -// + ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent) : VclContainer(pParent) @@ -1027,9 +1027,9 @@ IMPL_LINK(ColorConfigCtrl_Impl, ControlFocusHdl, Control*, pCtrl) }; -// + // SvxColorOptionsTabPage -// + SvxColorOptionsTabPage::SvxColorOptionsTabPage( Window* pParent, const SfxItemSet& rCoreSet) diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index afd4b6386fd1..2079d2081947 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -203,11 +203,11 @@ IMPL_LINK_NOARG_INLINE_START(SvxNewDictionaryDialog, ModifyHdl_Impl) } IMPL_LINK_NOARG_INLINE_END(SvxNewDictionaryDialog, ModifyHdl_Impl) -//========================================================================== -// + + // class SvxEditDictionaryDialog ------------------------------------------- -// -//========================================================================== + + extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxDictEdit(Window *pParent, VclBuilder::stringmap&) { @@ -774,9 +774,9 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt) return 0; } -//========================================================= + //SvxDictEdit -//========================================================= + void SvxDictEdit::KeyInput( const KeyEvent& rKEvt ) { const KeyCode aKeyCode = rKEvt.GetKeyCode(); diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx index 1976d66cfbd3..da6459fc41be 100644 --- a/cui/source/options/optfltr.hxx +++ b/cui/source/options/optfltr.hxx @@ -100,7 +100,7 @@ public: }; -#endif // +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index dc1ebbe552d4..83a7935eab74 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -1428,7 +1428,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) m_pLocaleSettingLB->Enable(!bReadonly); m_pLocaleSettingFT->Enable(!bReadonly); - // + m_pDecimalSeparatorCB->Check( pLangConfig->aSysLocaleOptions.IsDecimalSeparatorAsLocale()); m_pDecimalSeparatorCB->SaveValue(); @@ -1477,7 +1477,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) SfxObjectShell* pCurrentDocShell = SfxObjectShell::Current(); //collect the configuration values first m_pCurrentDocCB->Enable(false); - // + Any aWestLang; Any aCJKLang; Any aCTLLang; diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index 1894b14a4555..b9e639708bff 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -69,10 +69,10 @@ namespace Lang unsigned const All = -1; } -// + // vRowInfo[] -- rows (text + one or more edit boxes) // The order is the same as in RowType above, which is up to down. -// + struct { // id of the text @@ -97,10 +97,10 @@ const vRowInfo[] = { "faxft", Lang::All }, }; -// + // vFieldInfo[] -- edit boxes // The order is up to down, and then left to right. -// + struct { // in which row? @@ -159,9 +159,9 @@ const vFieldInfo[] = -// + // Row -// + struct SvxGeneralTabPage::Row { // which row is it? @@ -184,9 +184,9 @@ public: -// + // Field -// + struct SvxGeneralTabPage::Field { // which field is this? (in vFieldInfo[] above) diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx index 957afc8f48b2..6469f8f75def 100644 --- a/cui/source/options/opthtml.hxx +++ b/cui/source/options/opthtml.hxx @@ -65,7 +65,7 @@ public: }; -#endif // +#endif diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx index fa183e7e79a4..a3828d9e4717 100644 --- a/cui/source/options/optjsearch.cxx +++ b/cui/source/options/optjsearch.cxx @@ -26,7 +26,7 @@ using namespace com::sun::star::i18n; -////////////////////////////////////////////////////////////////////// + SvxJSearchOptionsPage::SvxJSearchOptionsPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent, "OptJSearchPage", "cui/ui/optjsearchpage.ui", rSet ) @@ -362,6 +362,6 @@ sal_Bool SvxJSearchOptionsPage::FillItemSet( SfxItemSet& ) } -////////////////////////////////////////////////////////////////////// + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx index 739ad78b2dbf..f1231fccda9e 100644 --- a/cui/source/options/optjsearch.hxx +++ b/cui/source/options/optjsearch.hxx @@ -27,7 +27,7 @@ class Window; class SfxItemSet; -////////////////////////////////////////////////////////////////////// + class SvxJSearchOptionsPage : public SfxTabPage { @@ -76,7 +76,7 @@ public: void SetTransliterationFlags( sal_Int32 nSettings ); }; -////////////////////////////////////////////////////////////////////// + #endif diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index c4037bee0e7c..5aefdcab5309 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -217,9 +217,9 @@ public: }; -// + // User for user-dictionaries (XDictionary interface) -// + class DicUserData { sal_uLong nVal; @@ -1253,9 +1253,9 @@ sal_Bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet ) } - // + // activate dictionaries according to checkbox state - // + Sequence< OUString > aActiveDics; sal_Int32 nActiveDics = 0; sal_uLong nEntries = m_pLinguDicsCLB->GetEntryCount(); @@ -1451,9 +1451,9 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) } - // + // get data from configuration - // + SvtLinguConfig aLngCfg; @@ -2105,18 +2105,18 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) for(sal_uLong i = 0; i < m_pModulesCLB->GetEntryCount(); i++) delete (ModuleUserData_Impl*)m_pModulesCLB->GetEntry(i)->GetUserData(); - // + // display entries for new selected language - // + m_pModulesCLB->Clear(); if(LANGUAGE_DONTKNOW != eCurLanguage) { sal_uLong n; ServiceInfo_Impl* pInfo; - // + // spellchecker entries - // + SvTreeListEntry* pEntry = CreateEntry( sSpell, CBCOL_SECOND ); ModuleUserData_Impl* pUserData = new ModuleUserData_Impl( OUString(), sal_True, sal_False, TYPE_SPELL, 0 ); @@ -2159,9 +2159,9 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) } } - // + // grammar checker entries - // + pEntry = CreateEntry( sGrammar, CBCOL_SECOND ); pUserData = new ModuleUserData_Impl( OUString(), sal_True, sal_False, TYPE_GRAMMAR, 0 ); pEntry->SetUserData( (void *)pUserData ); @@ -2203,9 +2203,9 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) } } - // + // hyphenator entries - // + pEntry = CreateEntry( sHyph, CBCOL_SECOND ); pUserData = new ModuleUserData_Impl( OUString(), sal_True, sal_False, TYPE_HYPH, 0 ); pEntry->SetUserData( (void *)pUserData ); @@ -2247,9 +2247,9 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) } } - // + // thesaurus entries - // + pEntry = CreateEntry( sThes, CBCOL_SECOND ); pUserData = new ModuleUserData_Impl( OUString(), sal_True, sal_False, TYPE_THES, 0 ); pEntry->SetUserData( (void *)pUserData ); diff --git a/cui/source/options/sdbcdriverenum.cxx b/cui/source/options/sdbcdriverenum.cxx index e15be1bcdc90..cac802cbfe44 100644 --- a/cui/source/options/sdbcdriverenum.cxx +++ b/cui/source/options/sdbcdriverenum.cxx @@ -23,19 +23,19 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/sdbc/DriverManager.hpp> -//........................................................................ + namespace offapp { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; using namespace ::com::sun::star::sdbc; - //==================================================================== + //= ODriverEnumerationImpl - //==================================================================== + class ODriverEnumerationImpl { protected: @@ -73,9 +73,9 @@ namespace offapp } } - //==================================================================== + //= ODriverEnumeration - //==================================================================== + ODriverEnumeration::ODriverEnumeration() throw() :m_pImpl(new ODriverEnumerationImpl) @@ -99,9 +99,9 @@ namespace offapp { return m_pImpl->getDriverImplNames().end(); } -//........................................................................ + } // namespace offapp -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/sdbcdriverenum.hxx b/cui/source/options/sdbcdriverenum.hxx index afe40c02907a..360aa2c3f162 100644 --- a/cui/source/options/sdbcdriverenum.hxx +++ b/cui/source/options/sdbcdriverenum.hxx @@ -26,14 +26,14 @@ #include <vector> -//........................................................................ + namespace offapp { -//........................................................................ - //==================================================================== + + //= ODriverEnumeration - //==================================================================== + class ODriverEnumerationImpl; /** simple class for accessing SDBC drivers registered within the office <p>Rather small, introduced to not contaminate other instances with the @@ -54,9 +54,9 @@ namespace offapp const_iterator end() const throw(); }; -//........................................................................ + } // namespace offapp -//........................................................................ + #endif // INCLUDED_CUI_SOURCE_OPTIONS_SDBCDRIVERENUM_HXX diff --git a/cui/source/options/securityoptions.cxx b/cui/source/options/securityoptions.cxx index 2a2810a61c1a..e779aa17a966 100644 --- a/cui/source/options/securityoptions.cxx +++ b/cui/source/options/securityoptions.cxx @@ -37,10 +37,10 @@ namespace } } -//........................................................................ + namespace svx { -//........................................................................ + SecurityOptionsDialog::SecurityOptionsDialog(Window* pParent, SvtSecurityOptions* pOptions) : ModalDialog(pParent, "SecurityOptionsDialog", "cui/ui/securityoptionsdialog.ui") @@ -76,8 +76,8 @@ SecurityOptionsDialog::~SecurityOptionsDialog() { } -//........................................................................ + } // namespace svx -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/securityoptions.hxx b/cui/source/options/securityoptions.hxx index ba2f3798ca92..33918c52927a 100644 --- a/cui/source/options/securityoptions.hxx +++ b/cui/source/options/securityoptions.hxx @@ -26,14 +26,14 @@ class SvtSecurityOptions; -//........................................................................ + namespace svx { -//........................................................................ - //==================================================================== + + //= class SecurityOptionsDialog - //==================================================================== + class SecurityOptionsDialog : public ModalDialog { private: @@ -61,9 +61,9 @@ namespace svx bool IsBlockUntrustedRefererLinksChecked() const { return m_pBlockUntrustedRefererLinksCB->IsChecked(); } }; -//........................................................................ + } // namespace svx -//........................................................................ + #endif // INCLUDED_CUI_SOURCE_OPTIONS_SECURITYOPTIONS_HXX diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx index 8fe16ad97964..b09a1ec302cc 100644 --- a/cui/source/options/webconninfo.cxx +++ b/cui/source/options/webconninfo.cxx @@ -32,10 +32,10 @@ using namespace ::com::sun::star; -//........................................................................ + namespace svx { -//........................................................................ + // class PasswordTable --------------------------------------------------- @@ -317,8 +317,8 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, EntrySelectedHdl) return 0; } -//........................................................................ + } // namespace svx -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/webconninfo.hxx b/cui/source/options/webconninfo.hxx index 278da8fe996e..38c06a51110a 100644 --- a/cui/source/options/webconninfo.hxx +++ b/cui/source/options/webconninfo.hxx @@ -25,10 +25,10 @@ #include <svtools/simptabl.hxx> #include <svtools/stdctrl.hxx> -//........................................................................ + namespace svx { -//........................................................................ + class PasswordTable : public SvSimpleTable { @@ -41,9 +41,9 @@ namespace svx virtual void Resize(); }; - //==================================================================== + //= class WebConnectionIfoDialog - //==================================================================== + class WebConnectionInfoDialog : public ModalDialog { private: @@ -66,9 +66,9 @@ namespace svx ~WebConnectionInfoDialog(); }; -//........................................................................ + } // namespace svx -//........................................................................ + #endif // INCLUDED_CUI_SOURCE_OPTIONS_WEBCONNINFO_HXX diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index e9fe995606b9..a1895b115901 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -92,7 +92,7 @@ static const RotateModeConnection::MapEntryType s_pRotateModeMap[] = { VALUESET_ITEM_NOTFOUND, SVX_ROTATE_MODE_STANDARD } }; -// ============================================================================ + static sal_uInt16 s_pRanges[] = { @@ -108,7 +108,7 @@ static sal_uInt16 s_pRanges[] = 0 }; -// ============================================================================ + namespace { @@ -150,7 +150,7 @@ void lcl_SetJustifyMethodToItemSet(SfxItemSet& rSet, sal_uInt16 nWhichJM, const }//namespace -// ============================================================================ + AlignmentTabPage::AlignmentTabPage( Window* pParent, const SfxItemSet& rCoreAttrs ) : @@ -413,7 +413,7 @@ IMPL_LINK_NOARG(AlignmentTabPage, UpdateEnableHdl) return 0; } -// ============================================================================ + } // namespace svx diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 6f4b1d6e8bf8..a2d19a531e25 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -693,9 +693,9 @@ sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) aBoxInfoItem.SetValid( VALID_HORI, m_pFrameSel->GetFrameBorderState( svx::FRAMEBORDER_HOR ) != svx::FRAMESTATE_DONTCARE ); aBoxInfoItem.SetValid( VALID_VERT, m_pFrameSel->GetFrameBorderState( svx::FRAMEBORDER_VER ) != svx::FRAMESTATE_DONTCARE ); - // + // Put or Clear of the border? - // + bPut = true; if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nBoxWhich, false )) @@ -873,9 +873,9 @@ IMPL_LINK( SvxBorderTabPage, SelStyleHdl_Impl, ListBox *, pLb ) return 0; } -// ============================================================================ + // ValueSet handling -// ============================================================================ + // number of preset images to show const sal_uInt16 SVX_BORDER_PRESET_COUNT = 5; @@ -1012,7 +1012,7 @@ void SvxBorderTabPage::FillValueSets() FillShadowVS(); } -// ============================================================================ + static Color lcl_mediumColor( Color aMain, Color /*aDefault*/ ) { return SvxBorderLine::threeDMediumColor( aMain ); @@ -1208,6 +1208,6 @@ void SvxBorderTabPage::PageCreated (SfxAllItemSet aSet) HideShadowControls(); } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/borderconn.cxx b/cui/source/tabpages/borderconn.cxx index 8fd5dae6cdd9..eafa40843a86 100644 --- a/cui/source/tabpages/borderconn.cxx +++ b/cui/source/tabpages/borderconn.cxx @@ -265,8 +265,8 @@ ShadowConnection::ShadowConnection( const SfxItemSet& rItemSet, mxCtrlWrp->SetDefaultValue( maItemWrp.GetDefaultItem( rItemSet ) ); } -// ============================================================================ -// ============================================================================ + + sfx::ItemConnectionBase* CreateFrameLineConnection( sal_uInt16 nSlot, FrameSelector& rFrameSel, FrameBorderType eBorder, sfx::ItemConnFlags nFlags ) @@ -289,7 +289,7 @@ sfx::ItemConnectionBase* CreateShadowConnection( const SfxItemSet& rItemSet, return new ShadowConnection( rItemSet, rVsPos, rMfSize, rLbColor, nFlags ); } -// ============================================================================ + } // namespace svx diff --git a/cui/source/tabpages/borderconn.hxx b/cui/source/tabpages/borderconn.hxx index a4b4aff69212..0cc65a0152f1 100644 --- a/cui/source/tabpages/borderconn.hxx +++ b/cui/source/tabpages/borderconn.hxx @@ -32,7 +32,7 @@ namespace svx { class FrameSelector; -// ============================================================================ + /** Creates an item connection object that connects an SvxLineItem with an svx::FrameSelector control. */ @@ -53,7 +53,7 @@ sfx::ItemConnectionBase* CreateShadowConnection( const SfxItemSet& rItemSet, ValueSet& rVsPos, MetricField& rMfSize, ColorListBox& rLbColor, sfx::ItemConnFlags nFlags = sfx::ITEMCONN_DEFAULT ); -// ============================================================================ + } // namespace svx diff --git a/cui/source/tabpages/frmdirlbox.src b/cui/source/tabpages/frmdirlbox.src index def573b681e5..388a6f290b51 100644 --- a/cui/source/tabpages/frmdirlbox.src +++ b/cui/source/tabpages/frmdirlbox.src @@ -58,6 +58,6 @@ String RID_SVXSTR_PAGEDIR_LTR_VERT Text [ en-US ] = "Left-to-right (vertical)"; }; -// ---------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index dac480293290..daaad329d804 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -505,7 +505,7 @@ void SvxCaptionTabPage::FillValueSet() m_pCT_CAPTTYPE->SetItemImage(BMP_CAPTTYPE_3, m_aBmpCapTypes[2] ); } -//======================================================================== + SvxCaptionTabDialog::SvxCaptionTabDialog(Window* pParent, const SdrView* pSdrView, diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index fa3917bdf13d..99c18f13002f 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -1163,7 +1163,7 @@ void SvxNumOptionsTabPage::ActivatePage(const SfxItemSet& rSet) delete pSaveNum; pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule()); } - // + bModified = (!pActNum->Get( 0 ) || bPreset); if(*pActNum != *pSaveNum || nActNumLvl != nTmpNumLvl) diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 0b20ad2266dc..c6d944498419 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -716,7 +716,7 @@ sal_Bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) } // set top and bottom margins - // + if ( bMod ) { pOld = GetOldItem( rSet, SID_ATTR_ULSPACE ); @@ -1472,7 +1472,7 @@ IMPL_LINK_NOARG(SvxPageDescPage, RangeHdl_Impl) // limits paper // maximum is 54 cm - // + long nMin = nHHeight + nHDist + nFDist + nFHeight + nBT + nBB + MINBODY + aBorder.Height(); m_pPaperHeightEdit->SetMin(m_pPaperHeightEdit->Normalize(nMin), FUNIT_TWIP); diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 1351bf3f3805..0789d85ab551 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -485,9 +485,9 @@ void SvxTransparenceTabPage::PointChanged(Window* , RECT_POINT eRcPt) eRP = eRcPt; } -// + // Preview-Methods -// + sal_Bool SvxTransparenceTabPage::InitPreview ( const SfxItemSet& rSet ) { // set transparencetyp for preview diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 991d663916f9..daf46ac8847c 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -359,7 +359,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ChangeBitmapHdl_Impl) // as foreground color when the 1st bitmap in the bitmap // list is selected. I see no reason why this is done, // thus I will take it out - // + //if( 0 == m_pLbBitmaps->GetSelectEntryPos() ) //{ // m_pLbColor->SelectEntry( Color( COL_BLACK ) ); diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 3ec439a461dd..d4dfbdc3cd6f 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -627,9 +627,9 @@ SfxTabPage* SvxColorTabPage::Create( Window* pWindow, -// + // is called when the content of the MtrFields is changed for color values -// + IMPL_LINK_NOARG(SvxColorTabPage, ModifiedHdl_Impl) { if (eCM == CM_RGB) @@ -1052,10 +1052,10 @@ long SvxColorTabPage::ChangeColorHdl_Impl( void* ) //{ // long nCount = pColorList->Count(); // XColorEntry* pColorEntry; -// + // if( nCount > 104 ) // rVs.SetStyle( rVs.GetStyle() | WB_VSCROLL ); -// + // for( long i = 0; i < nCount; i++ ) // { // pColorEntry = pColorList->GetColor( i ); |