diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 19:49:46 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-26 08:57:59 -0600 |
commit | 2196955b00071dce0d89e6dd13c50284d066e1f2 (patch) | |
tree | aba1653fc3b7817db0eb6819d7cf9059538169b9 /reportdesign/source/ui/dlg | |
parent | CppunitTest_sw_ooxmlexport: factor out drawing-related testcases (diff) | |
download | core-2196955b00071dce0d89e6dd13c50284d066e1f2.tar.gz core-2196955b00071dce0d89e6dd13c50284d066e1f2.zip |
Remove visual noise from reportdesign
Change-Id: I2fea3ecefa24cfc0f3cc2a2f4de7c934eba5d6f7
Reviewed-on: https://gerrit.libreoffice.org/8295
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'reportdesign/source/ui/dlg')
-rw-r--r-- | reportdesign/source/ui/dlg/AddField.cxx | 12 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/CondFormat.cxx | 16 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/CondFormat.src | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/Condition.cxx | 12 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/Condition.hxx | 12 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/DateTime.cxx | 8 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/Formula.cxx | 10 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/GroupsSorting.cxx | 20 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/Navigator.cxx | 10 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/PageNumber.cxx | 8 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/dlgpage.cxx | 4 |
11 files changed, 57 insertions, 57 deletions
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index 2a04a82fc5d2..38ca2496a0fe 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -98,9 +98,9 @@ uno::Sequence< beans::PropertyValue > OAddFieldWindowListBox::getSelectedFieldDe } return aArgs; } -//================================================================== + // class OAddFieldWindowListBox -//================================================================== + OAddFieldWindowListBox::OAddFieldWindowListBox( OAddFieldWindow* _pParent ) :SvTreeListBox( _pParent, WB_TABSTOP|WB_BORDER|WB_SORT ) @@ -142,9 +142,9 @@ void OAddFieldWindowListBox::StartDrag( sal_Int8 /*_nAction*/, const Point& /*_r EndSelection(); pDataContainer->StartDrag( this, DND_ACTION_COPYMOVE | DND_ACTION_LINK ); } -//======================================================================== + // class OAddFieldWindow -//======================================================================== + OAddFieldWindow::OAddFieldWindow(Window* pParent ,const uno::Reference< beans::XPropertySet >& _xRowSet @@ -545,8 +545,8 @@ IMPL_LINK( OAddFieldWindow, OnSortAction, ToolBox*, /*NOTINTERESTEDIN*/ ) return 0L; } -// ============================================================================= + } // namespace rptui -// ============================================================================= + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx index 8c7dabb6fd76..d16d802ea782 100644 --- a/reportdesign/source/ui/dlg/CondFormat.cxx +++ b/reportdesign/source/ui/dlg/CondFormat.cxx @@ -45,10 +45,10 @@ #include <algorithm> #include "UndoActions.hxx" -// ............................................................................. + namespace rptui { -// ............................................................................. + using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY_THROW; @@ -61,9 +61,9 @@ namespace rptui using namespace ::com::sun::star::report; - //======================================================================== + // UpdateLocker - //======================================================================== + class UpdateLocker { Window& m_rWindow; @@ -80,9 +80,9 @@ namespace rptui } }; - //======================================================================== + // class ConditionalFormattingDialog - //======================================================================== + ConditionalFormattingDialog::ConditionalFormattingDialog( Window* _pParent, const Reference< XReportControlModel >& _rxFormatConditions, ::rptui::OReportController& _rController ) :ModalDialog( _pParent, ModuleRes(RID_CONDFORMAT) ) @@ -602,8 +602,8 @@ namespace rptui impl_scrollTo( _nCondIndex - MAX_CONDITIONS + 1 ); } -// ............................................................................. + } // rptui -// ............................................................................. + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/dlg/CondFormat.src b/reportdesign/source/ui/dlg/CondFormat.src index 11fff9b74fd4..6b756580dbad 100644 --- a/reportdesign/source/ui/dlg/CondFormat.src +++ b/reportdesign/source/ui/dlg/CondFormat.src @@ -260,7 +260,7 @@ String STR_TRANSPARENT #define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; } -//------------------------------------------------------------------------- + ImageList IMG_CONDFORMAT_DLG_SC { MASKCOLOR; diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index c1dcb3891412..274a7675ccb4 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -106,9 +106,9 @@ IMPL_LINK( ConditionField, OnFormula, Button*, /*_pClickedButton*/ ) } return 0L; } -//======================================================================== + // class SvxColorWindow_Impl -------------------------------------------------- -//======================================================================== + #ifndef WB_NO_DIRECTSELECT #define WB_NO_DIRECTSELECT ((WinBits)0x04000000) #endif @@ -222,9 +222,9 @@ IMPL_LINK_NOARG(OColorPopup, SelectHdl) return 0; } -// ============================================================================= + // = Condition -// ============================================================================= + Condition::Condition( Window* _pParent, IConditionalFormatAction& _rAction, ::rptui::OReportController& _rController ) :Control(_pParent, ModuleRes(WIN_CONDITION)) @@ -716,8 +716,8 @@ bool Condition::isEmpty() const return m_aCondLHS.GetText().isEmpty(); } -// ============================================================================= + } // rptui -// ============================================================================= + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx index 321baefd8089..e7a62ee0430c 100644 --- a/reportdesign/source/ui/dlg/Condition.hxx +++ b/reportdesign/source/ui/dlg/Condition.hxx @@ -58,9 +58,9 @@ namespace rptui virtual void Resize(); }; - //======================================================================== + //= Condition - //======================================================================== + class Condition :public Control ,public dbaui::OToolBoxHelper { @@ -166,21 +166,21 @@ namespace rptui DECL_LINK( OnOperationSelected, ListBox* ); }; - // ------------------------------------------------------------------------- + inline ConditionType Condition::impl_getCurrentConditionType() const { return sal::static_int_cast< ConditionType >( m_aConditionType.GetSelectEntryPos() ); } - // ------------------------------------------------------------------------- + inline ComparisonOperation Condition::impl_getCurrentComparisonOperation() const { return sal::static_int_cast< ComparisonOperation >( m_aOperationList.GetSelectEntryPos() ); } -// ============================================================================= + } // namespace rptui -// ============================================================================= + #endif // RPTUI_CONDITION_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx index 42ecde726f94..7e66030c1b4c 100644 --- a/reportdesign/source/ui/dlg/DateTime.cxx +++ b/reportdesign/source/ui/dlg/DateTime.cxx @@ -44,9 +44,9 @@ namespace rptui using namespace ::com::sun::star; using namespace ::comphelper; -//======================================================================== + // class ODateTimeDialog -//======================================================================== + ODateTimeDialog::ODateTimeDialog( Window* _pParent ,const uno::Reference< report::XSection >& _xHoldAlive ,OReportController* _pController) @@ -225,8 +225,8 @@ sal_Int32 ODateTimeDialog::getFormatKey(sal_Bool _bDate) const } return nFormatKey; } -// ============================================================================= + } // rptui -// ============================================================================= + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index 33a3a50c2147..75ddb03fc616 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -32,15 +32,15 @@ #include "AddField.hxx" #include "helpids.hrc" -//============================================================================ + namespace rptui { using namespace formula; using namespace ::com::sun::star; -// -------------------------------------------------------------------------- + // Initialisierung / gemeinsame Funktionen fuer Dialog -// -------------------------------------------------------------------------- + FormulaDialog::FormulaDialog(Window* pParent , const uno::Reference<lang::XMultiServiceFactory>& _xServiceFactory @@ -96,9 +96,9 @@ FormulaDialog::~FormulaDialog() StoreFormEditData( m_pFormulaData ); } -// -------------------------------------------------------------------------- + // Funktionen fuer rechte Seite -// -------------------------------------------------------------------------- + bool FormulaDialog::calculateValue( const OUString& rStrExp, OUString& rStrResult ) { rStrResult = rStrExp; diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 34fd85035dbe..b88801542b6b 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -165,9 +165,9 @@ public: DECL_LINK( DelayedDelete, void* ); }; -//======================================================================== + // class OFieldExpressionControl -//======================================================================== + OFieldExpressionControl::OFieldExpressionControl( OGroupsSortingDialog* _pParent,const ResId& _rResId ) :EditBrowseBox( _pParent, _rResId,EBBF_NONE, WB_TABSTOP | BROWSER_COLUMNSELECTION | BROWSER_MULTISELECTION | BROWSER_AUTOSIZE_LASTCOL | @@ -190,7 +190,7 @@ OFieldExpressionControl::~OFieldExpressionControl() acquire(); uno::Reference< report::XGroups > xGroups = m_pParent->getGroups(); xGroups->removeContainerListener(this); - ////////////////////////////////////////////////////////////////////// + // delete events from queue if( m_nPasteEvent ) Application::RemoveUserEvent( m_nPasteEvent ); @@ -367,7 +367,7 @@ void OFieldExpressionControl::lateInit() pControls[i]->SetLoseFocusHdl(LINK(m_pParent, OGroupsSortingDialog, OnControlFocusLost)); } - ////////////////////////////////////////////////////////////////////// + // set browse mode BrowserMode nMode(BROWSER_COLUMNSELECTION | BROWSER_MULTISELECTION | BROWSER_KEEPSELECTION | BROWSER_HLINESFULL | BROWSER_VLINESFULL | BROWSER_AUTOSIZE_LASTCOL | BROWSER_AUTO_VSCROLL | BROWSER_AUTO_HSCROLL); @@ -808,7 +808,7 @@ void OFieldExpressionControl::cut() void OFieldExpressionControl::copy() { - ////////////////////////////////////////////////////////////////////// + // set to the right row and save it m_pParent->SaveData( m_nDataPos ); @@ -858,7 +858,7 @@ void OFieldExpressionControl::InsertRows( long nRow ) { sal_Int32 nSize = 0; - ////////////////////////////////////////////////////////////////////// + // get rows from clipboard TransferableDataHelper aTransferData(TransferableDataHelper::CreateFromSystemClipboard(GetParent())); if(aTransferData.HasFormat(OGroupExchange::getReportGroupId())) @@ -913,9 +913,9 @@ void OFieldExpressionControl::InsertRows( long nRow ) } -//======================================================================== + // class OGroupsSortingDialog -//======================================================================== + OGroupsSortingDialog::OGroupsSortingDialog( Window* _pParent ,sal_Bool _bReadOnly ,OReportController* _pController) @@ -1436,8 +1436,8 @@ ImageList OGroupsSortingDialog::getImageList(vcl::ImageListType) SAL_THROW (( co return ImageList(ModuleRes(IMGLST_GROUPSORT_DLG_SC)); } -// ============================================================================= + } // rptui -// ============================================================================= + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index 47e53714929f..d579318d98c3 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -896,9 +896,9 @@ ONavigatorImpl::~ONavigatorImpl() const long STD_WIN_SIZE_X = 210; const long STD_WIN_SIZE_Y = 280; const long LISTBOX_BORDER = 2; -//======================================================================== + // class ONavigator -//======================================================================== + ONavigator::ONavigator( Window* _pParent ,OReportController& _rController) : FloatingWindow( _pParent, ModuleRes(RID_NAVIGATOR) ) @@ -926,7 +926,7 @@ void ONavigator::Resize() Size aSize( GetOutputSizePixel() ); - ////////////////////////////////////////////////////////////////////// + // Groesse der form::ListBox anpassen Point aLBPos( LISTBOX_BORDER, LISTBOX_BORDER ); @@ -944,8 +944,8 @@ void ONavigator::GetFocus() if ( m_pImpl->m_pNavigatorTree.get() ) m_pImpl->m_pNavigatorTree->GrabFocus(); } -// ============================================================================= + } // rptui -// ============================================================================= + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/dlg/PageNumber.cxx b/reportdesign/source/ui/dlg/PageNumber.cxx index c5aa2e5a958c..d1d17c1d835b 100644 --- a/reportdesign/source/ui/dlg/PageNumber.cxx +++ b/reportdesign/source/ui/dlg/PageNumber.cxx @@ -38,9 +38,9 @@ namespace rptui using namespace ::com::sun::star; using namespace ::comphelper; -//======================================================================== + // class OPageNumberDialog -//======================================================================== + OPageNumberDialog::OPageNumberDialog( Window* _pParent ,const uno::Reference< report::XReportDefinition >& _xHoldAlive ,OReportController* _pController) @@ -118,8 +118,8 @@ short OPageNumberDialog::Execute() } return nRet; } -// ============================================================================= + } // rptui -// ============================================================================= + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx index 1f5045cde515..eac3bc1bf80b 100644 --- a/reportdesign/source/ui/dlg/dlgpage.cxx +++ b/reportdesign/source/ui/dlg/dlgpage.cxx @@ -71,8 +71,8 @@ ORptPageDialog::ORptPageDialog( Window* pParent, const SfxItemSet* pAttr, const if ( !aCJKOptions.IsDoubleLinesEnabled() ) RemoveTabPage("asianlayout"); } -// ============================================================================= + } // namespace rptui -// ============================================================================= + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |