diff options
Diffstat (limited to 'reportdesign/source/ui/dlg')
22 files changed, 316 insertions, 316 deletions
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index 43ad175d827d..555243316ab1 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,14 +70,14 @@ using namespace lang; using namespace container; using namespace ::svx; -class OAddFieldWindowListBox : public SvTreeListBox +class OAddFieldWindowListBox : public SvTreeListBox { OAddFieldWindow* m_pTabWin; OAddFieldWindowListBox(const OAddFieldWindowListBox&); void operator =(const OAddFieldWindowListBox&); protected: -// virtual void Command( const CommandEvent& rEvt ); +// virtual void Command( const CommandEvent& rEvt ); public: OAddFieldWindowListBox( OAddFieldWindow* _pParent ); @@ -172,8 +172,8 @@ OAddFieldWindow::OAddFieldWindow(Window* pParent ,m_xRowSet(_xRowSet) ,m_aActions(this,ModuleRes(RID_TB_SORTING)) ,m_pListBox(new OAddFieldWindowListBox( this )) - ,m_aFixedLine(this, ModuleRes(ADDFIELD_FL_HELP_SEPARATOR) ) - ,m_aHelpText(this, ModuleRes(ADDFIELD_HELP_FIELD) ) + ,m_aFixedLine(this, ModuleRes(ADDFIELD_FL_HELP_SEPARATOR) ) + ,m_aHelpText(this, ModuleRes(ADDFIELD_HELP_FIELD) ) ,m_aInsertButton(this, WB_TABSTOP|WB_CENTER) ,m_nCommandType(0) ,m_bEscapeProcessing(sal_False) @@ -192,7 +192,7 @@ OAddFieldWindow::OAddFieldWindow(Window* pParent setToolBox(&m_aActions); m_aActions.CheckItem(SID_FM_SORTUP); m_aActions.EnableItem(SID_ADD_CONTROL_PAIR, FALSE); - + m_pListBox->SetDoubleClickHdl(LINK( this, OAddFieldWindow, OnDoubleClickHdl ) ); m_pListBox->SetSelectHdl(LINK( this, OAddFieldWindow, OnSelectHdl ) ); m_pListBox->SetDeselectHdl(LINK( this, OAddFieldWindow, OnSelectHdl ) ); @@ -232,7 +232,7 @@ OAddFieldWindow::~OAddFieldWindow() { if ( m_pListBox.get() ) { - SvLBoxTreeList* pModel = m_pListBox->GetModel(); + SvLBoxTreeList* pModel = m_pListBox->GetModel(); ULONG nCount = pModel->GetEntryCount(); for(ULONG i = 0; i< nCount;++i) { @@ -332,7 +332,7 @@ void OAddFieldWindow::Update() { m_aActions.EnableItem(m_aActions.GetItemId(j),FALSE); } - + String aTitle(ModuleRes(RID_STR_FIELDSELECTION)); SetText(aTitle); if ( m_xRowSet.is() ) @@ -347,8 +347,8 @@ void OAddFieldWindow::Update() OSL_VERIFY( m_xRowSet->getPropertyValue( PROPERTY_ESCAPEPROCESSING ) >>= bEscapeProcessing ); OSL_VERIFY( m_xRowSet->getPropertyValue( PROPERTY_FILTER ) >>= sFilter ); - m_aCommandName = sCommand; - m_nCommandType = nCommandType; + m_aCommandName = sCommand; + m_nCommandType = nCommandType; m_bEscapeProcessing = bEscapeProcessing; m_sFilter = sFilter; @@ -558,11 +558,11 @@ IMPL_LINK( OAddFieldWindow, OnSortAction, ToolBox*, /*NOTINTERESTEDIN*/ ) else if ( m_aActions.IsItemChecked(SID_FM_SORTDOWN) ) eSortMode = SortDescending; } // if ( SID_FM_REMOVE_FILTER_SORT != nCurItem ) - + m_pListBox->GetModel()->SetSortMode(eSortMode); if ( SID_FM_REMOVE_FILTER_SORT == nCurItem ) Update(); - + m_pListBox->GetModel()->Resort(); } } diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx index 898779094953..a505e111bf39 100644 --- a/reportdesign/source/ui/dlg/CondFormat.cxx +++ b/reportdesign/source/ui/dlg/CondFormat.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -99,7 +99,7 @@ namespace rptui //======================================================================== // class ConditionalFormattingDialog //======================================================================== - DBG_NAME(rpt_ConditionalFormattingDialog) + DBG_NAME(rpt_ConditionalFormattingDialog) ConditionalFormattingDialog::ConditionalFormattingDialog( Window* _pParent, const Reference< XReportControlModel >& _rxFormatConditions, ::rptui::OReportController& _rController ) :ModalDialog( _pParent, ModuleRes(RID_CONDFORMAT) ) @@ -110,10 +110,10 @@ namespace rptui ,m_aPB_Help(this, ModuleRes(PB_HELP)) ,m_aCondScroll( this, ModuleRes( SB_ALL_CONDITIONS ) ) ,m_rController( _rController ) - ,m_xFormatConditions( _rxFormatConditions ) + ,m_xFormatConditions( _rxFormatConditions ) ,m_bDeletingCondition( false ) { - DBG_CTOR(rpt_ConditionalFormattingDialog,NULL); + DBG_CTOR(rpt_ConditionalFormattingDialog,NULL); OSL_ENSURE( m_xFormatConditions.is(), "ConditionalFormattingDialog::ConditionalFormattingDialog: ReportControlModel is NULL -> Prepare for GPF!" ); m_xCopy.set( m_xFormatConditions->createClone(), UNO_QUERY_THROW ); @@ -129,7 +129,7 @@ namespace rptui ConditionalFormattingDialog::~ConditionalFormattingDialog() { m_aConditions.clear(); - DBG_DTOR(rpt_ConditionalFormattingDialog,NULL); + DBG_DTOR(rpt_ConditionalFormattingDialog,NULL); } // ----------------------------------------------------------------------------- @@ -188,7 +188,7 @@ namespace rptui m_aConditions.insert( m_aConditions.begin() + _nNewCondIndex, pCon ); pCon->SetPosSizePixel( 0, 0, impl_getConditionWidth(), 0, WINDOW_POSSIZE_WIDTH ); - } + } catch( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); @@ -246,7 +246,7 @@ namespace rptui if ( nNewFocusIndex >= impl_getConditionCount() ) nNewFocusIndex = impl_getConditionCount() - 1; } - } + } catch( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); @@ -391,7 +391,7 @@ namespace rptui pCon->updateToolbar( xCond.get() ); m_aConditions.push_back( pCon ); } - } + } catch(Exception&) { OSL_ENSURE(0,"Can not access format condition!"); @@ -418,11 +418,11 @@ namespace rptui aArgs[2].Name = PROPERTY_FONTCOLOR; aArgs[2].Value <<= (sal_uInt32)_aColor.GetColor(); - + // we use this way to create undo actions m_rController.executeUnChecked(_nCommandId,aArgs); m_aConditions[ _nCondIndex ]->updateToolbar(xReportControlFormat); - } + } catch( Exception& ) { DBG_UNHANDLED_EXCEPTION(); @@ -500,7 +500,7 @@ namespace rptui m_xFormatConditions->removeByIndex(k); ::comphelper::copyProperties( m_xCopy.get(), m_xFormatConditions.get() ); - } + } catch ( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); diff --git a/reportdesign/source/ui/dlg/CondFormat.hrc b/reportdesign/source/ui/dlg/CondFormat.hrc index 89e0e1b88246..3c3b2ad8de78 100644 --- a/reportdesign/source/ui/dlg/CondFormat.hrc +++ b/reportdesign/source/ui/dlg/CondFormat.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,7 +28,7 @@ #define RPTUI_CONDFORMAT_HRC #define CHECKBOX_HEIGHT 8 -#define FIXEDTEXT_WIDTH 60 +#define FIXEDTEXT_WIDTH 60 #define FIXEDTEXT_HEIGHT 8 #define EDIT_WIDTH 75 #define RELATED_CONTROLS 4 diff --git a/reportdesign/source/ui/dlg/CondFormat.src b/reportdesign/source/ui/dlg/CondFormat.src index 14fe6649aff1..58af87f8cc21 100644 --- a/reportdesign/source/ui/dlg/CondFormat.src +++ b/reportdesign/source/ui/dlg/CondFormat.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -110,7 +110,7 @@ Control WIN_CONDITION { Pos = MAP_APPFONT ( CONDITION_WIDTH - UNRELATED_CONTROLS - IMAGE_BUTTON_WIDTH, ROW_1_POS ) ; Size = MAP_APPFONT ( IMAGE_BUTTON_WIDTH, IMAGE_BUTTON_HEIGHT ) ; - TabStop = TRUE ; + TabStop = TRUE ; Symbol = IMAGEBUTTON_ARROW_UP ; }; @@ -118,7 +118,7 @@ Control WIN_CONDITION { Pos = MAP_APPFONT ( CONDITION_WIDTH - UNRELATED_CONTROLS - IMAGE_BUTTON_WIDTH, ROW_1_POS + IMAGE_BUTTON_HEIGHT + RELATED_CONTROLS ) ; Size = MAP_APPFONT ( IMAGE_BUTTON_WIDTH, IMAGE_BUTTON_HEIGHT ) ; - TabStop = TRUE ; + TabStop = TRUE ; Symbol = IMAGEBUTTON_ARROW_DOWN ; }; @@ -243,7 +243,7 @@ ModalDialog RID_CONDFORMAT HelpButton PB_HELP { - TabStop = TRUE ; + TabStop = TRUE ; Pos = MAP_APPFONT ( CONDITION_WIDTH - BUTTON_WIDTH - UNRELATED_CONTROLS, CONDITION_HEIGHT + 2*RELATED_CONTROLS + 1) ; Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; Text [ en-US ] = "~Help"; @@ -434,7 +434,7 @@ FixedLine ADDFIELD_FL_HELP_SEPARATOR Size = MAP_APPFONT ( RELATED_CONTROLS , RELATED_CONTROLS ) ; Text [ en-US ] = "Help"; }; - + FixedText ADDFIELD_HELP_FIELD { SVLook = TRUE ; diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index a61b2fdb08cb..e56351ccb4e2 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx index d382722ba818..d1b77c83f71c 100644 --- a/reportdesign/source/ui/dlg/Condition.hxx +++ b/reportdesign/source/ui/dlg/Condition.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -94,8 +94,8 @@ namespace rptui ::svx::ToolboxButtonColorUpdater* m_pBtnUpdaterFontColor; // updates the color below the toolbar icon ::svx::ToolboxButtonColorUpdater* m_pBtnUpdaterBackgroundColor; - - + + size_t m_nCondIndex; long m_nLastKnownWindowWidth; bool m_bInDestruction; diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx index b70e49140d2e..f6d24cc70590 100644 --- a/reportdesign/source/ui/dlg/DateTime.cxx +++ b/reportdesign/source/ui/dlg/DateTime.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,17 +65,17 @@ ODateTimeDialog::ODateTimeDialog( Window* _pParent ,const uno::Reference< report::XSection >& _xHoldAlive ,OReportController* _pController) : ModalDialog( _pParent, ModuleRes(RID_DATETIME_DLG) ) - ,m_aDate(this, ModuleRes(CB_DATE ) ) - ,m_aFTDateFormat(this, ModuleRes(FT_DATE_FORMAT ) ) - ,m_aDateListBox(this, ModuleRes(LB_DATE_TYPE ) ) - ,m_aFL0(this, ModuleRes(FL_SEPARATOR0 ) ) - ,m_aTime(this, ModuleRes(CB_TIME ) ) - ,m_aFTTimeFormat(this, ModuleRes(FT_TIME_FORMAT ) ) - ,m_aTimeListBox(this, ModuleRes(LB_TIME_TYPE ) ) + ,m_aDate(this, ModuleRes(CB_DATE ) ) + ,m_aFTDateFormat(this, ModuleRes(FT_DATE_FORMAT ) ) + ,m_aDateListBox(this, ModuleRes(LB_DATE_TYPE ) ) + ,m_aFL0(this, ModuleRes(FL_SEPARATOR0 ) ) + ,m_aTime(this, ModuleRes(CB_TIME ) ) + ,m_aFTTimeFormat(this, ModuleRes(FT_TIME_FORMAT ) ) + ,m_aTimeListBox(this, ModuleRes(LB_TIME_TYPE ) ) ,m_aFL1(this, ModuleRes(FL_SEPARATOR1) ) - ,m_aPB_OK(this, ModuleRes(PB_OK)) - ,m_aPB_CANCEL(this, ModuleRes(PB_CANCEL)) - ,m_aPB_Help(this, ModuleRes(PB_HELP)) + ,m_aPB_OK(this, ModuleRes(PB_OK)) + ,m_aPB_CANCEL(this, ModuleRes(PB_CANCEL)) + ,m_aPB_Help(this, ModuleRes(PB_HELP)) ,m_aDateControlling() ,m_aTimeControlling() ,m_pController(_pController) @@ -118,7 +118,7 @@ ODateTimeDialog::ODateTimeDialog( Window* _pParent ListBox* pListBox = &m_aDateListBox; if ( bTime ) pListBox = &m_aTimeListBox; - + const uno::Reference< util::XNumberFormatter> xNumberFormatter = m_pController->getReportNumberFormatter(); const uno::Reference< util::XNumberFormats> xFormats = xNumberFormatter->getNumberFormatsSupplier()->getNumberFormats(); const uno::Sequence<sal_Int32> aFormatKeys = xFormats->queryKeys(_nNumberFormatId,m_nLocale,sal_True); @@ -133,7 +133,7 @@ ODateTimeDialog::ODateTimeDialog( Window* _pParent //------------------------------------------------------------------------ ODateTimeDialog::~ODateTimeDialog() { - DBG_DTOR( rpt_ODateTimeDialog,NULL); + DBG_DTOR( rpt_ODateTimeDialog,NULL); } // ----------------------------------------------------------------------------- short ODateTimeDialog::Execute() @@ -241,12 +241,12 @@ sal_Int32 ODateTimeDialog::getFormatKey(sal_Bool _bDate) const sal_Int32 nFormatKey; if ( _bDate ) { - // nFormat = m_aDateF1.IsChecked() ? i18n::NumberFormatIndex::DATE_SYSTEM_LONG : (m_aDateF2.IsChecked() ? i18n::NumberFormatIndex::DATE_SYS_DMMMYYYY : i18n::NumberFormatIndex::DATE_SYSTEM_SHORT); + // nFormat = m_aDateF1.IsChecked() ? i18n::NumberFormatIndex::DATE_SYSTEM_LONG : (m_aDateF2.IsChecked() ? i18n::NumberFormatIndex::DATE_SYS_DMMMYYYY : i18n::NumberFormatIndex::DATE_SYSTEM_SHORT); nFormatKey = static_cast<sal_Int32>(reinterpret_cast<sal_IntPtr>(m_aDateListBox.GetEntryData( m_aDateListBox.GetSelectEntryPos() ))); } else { - // nFormat = m_aTimeF1.IsChecked() ? i18n::NumberFormatIndex::TIME_HHMMSS : (m_aTimeF2.IsChecked() ? i18n::NumberFormatIndex::TIME_HHMMSSAMPM : i18n::NumberFormatIndex::TIME_HHMM); + // nFormat = m_aTimeF1.IsChecked() ? i18n::NumberFormatIndex::TIME_HHMMSS : (m_aTimeF2.IsChecked() ? i18n::NumberFormatIndex::TIME_HHMMSSAMPM : i18n::NumberFormatIndex::TIME_HHMM); nFormatKey = static_cast<sal_Int32>(reinterpret_cast<sal_IntPtr>(m_aTimeListBox.GetEntryData( m_aTimeListBox.GetSelectEntryPos() ))); } return nFormatKey; diff --git a/reportdesign/source/ui/dlg/DateTime.hrc b/reportdesign/source/ui/dlg/DateTime.hrc index 02a421f10c18..44d6eb6fe0ed 100644 --- a/reportdesign/source/ui/dlg/DateTime.hrc +++ b/reportdesign/source/ui/dlg/DateTime.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,29 +27,29 @@ #ifndef RPTUI_DATETIME_HRC #define RPTUI_DATETIME_HRC -#define CB_DATE (1) +#define CB_DATE (1) #define FT_DATE_FORMAT (2) -#define LB_DATE_TYPE (3) -#define FL_SEPARATOR0 (4) -#define CB_TIME (5) +#define LB_DATE_TYPE (3) +#define FL_SEPARATOR0 (4) +#define CB_TIME (5) #define FT_TIME_FORMAT (6) -#define LB_TIME_TYPE (7) -#define FL_SEPARATOR1 (8) -#define PB_OK (9) -#define PB_CANCEL (10) -#define PB_HELP (11) +#define LB_TIME_TYPE (7) +#define FL_SEPARATOR1 (8) +#define PB_OK (9) +#define PB_CANCEL (10) +#define PB_HELP (11) -#define CHECKBOX_HEIGHT 8 -#define FIXEDTEXT_HEIGHT 8 -#define RELATED_CONTROLS 4 -#define UNRELATED_CONTROLS 7 -#define EDIT_HEIGHT 12 +#define CHECKBOX_HEIGHT 8 +#define FIXEDTEXT_HEIGHT 8 +#define RELATED_CONTROLS 4 +#define UNRELATED_CONTROLS 7 +#define EDIT_HEIGHT 12 #define LISTBOX_HEIGHT 12 -#define BUTTON_HEIGHT 14 -#define BUTTON_WIDTH 50 -#define BROWSER_HEIGHT 75 -#define PAGE_WIDTH (RELATED_CONTROLS + 3*UNRELATED_CONTROLS + 3*BUTTON_WIDTH) -#define PAGE_HEIGHT (2*RELATED_CONTROLS + 6*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + 2*LISTBOX_HEIGHT + BUTTON_HEIGHT) -#define LISTBOX_WIDTH PAGE_WIDTH - 3*UNRELATED_CONTROLS - FIXEDTEXT_WIDTH +#define BUTTON_HEIGHT 14 +#define BUTTON_WIDTH 50 +#define BROWSER_HEIGHT 75 +#define PAGE_WIDTH (RELATED_CONTROLS + 3*UNRELATED_CONTROLS + 3*BUTTON_WIDTH) +#define PAGE_HEIGHT (2*RELATED_CONTROLS + 6*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + 2*LISTBOX_HEIGHT + BUTTON_HEIGHT) +#define LISTBOX_WIDTH PAGE_WIDTH - 3*UNRELATED_CONTROLS - FIXEDTEXT_WIDTH #endif // RPTUI_DATETIME_HRC diff --git a/reportdesign/source/ui/dlg/DateTime.src b/reportdesign/source/ui/dlg/DateTime.src index 0e30747fb78c..2c391d666572 100644 --- a/reportdesign/source/ui/dlg/DateTime.src +++ b/reportdesign/source/ui/dlg/DateTime.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ ModalDialog RID_DATETIME_DLG HelpId = HID_RPT_DATETIME_DLG; Moveable = TRUE ; Closeable = TRUE ; - + CheckBox CB_DATE { Pos = MAP_APPFONT ( UNRELATED_CONTROLS , RELATED_CONTROLS /* + UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT */) ; @@ -52,7 +52,7 @@ ModalDialog RID_DATETIME_DLG Check = TRUE; Text [ en-US ] = "Include Date"; }; - + FixedText FT_DATE_FORMAT { Pos = MAP_APPFONT ( RELATED_CONTROLS + 2*UNRELATED_CONTROLS, RELATED_CONTROLS + UNRELATED_CONTROLS + CHECKBOX_HEIGHT ); @@ -74,7 +74,7 @@ ModalDialog RID_DATETIME_DLG { Pos = MAP_APPFONT ( RELATED_CONTROLS , RELATED_CONTROLS + 2*UNRELATED_CONTROLS + CHECKBOX_HEIGHT + LISTBOX_HEIGHT) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , 1 ) ; - // Text [ en-US ] = "Time"; + // Text [ en-US ] = "Time"; }; CheckBox CB_TIME { @@ -83,7 +83,7 @@ ModalDialog RID_DATETIME_DLG Check = TRUE; Text [ en-US ] = "Include Time"; }; - + FixedText FT_TIME_FORMAT { Pos = MAP_APPFONT ( RELATED_CONTROLS + 2*UNRELATED_CONTROLS, RELATED_CONTROLS + 4*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + LISTBOX_HEIGHT); @@ -120,7 +120,7 @@ ModalDialog RID_DATETIME_DLG }; HelpButton PB_HELP { - TabStop = TRUE ; + TabStop = TRUE ; Pos = MAP_APPFONT ( RELATED_CONTROLS + 2*UNRELATED_CONTROLS + 2*BUTTON_WIDTH , RELATED_CONTROLS + 6*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + 2*LISTBOX_HEIGHT +1) ; Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; Text [ en-US ] = "~Help"; diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index c199f8c3f7c3..d18105d9422f 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,9 +52,9 @@ namespace rptui using namespace formula; using namespace ::com::sun::star; -// -------------------------------------------------------------------------- -// Initialisierung / gemeinsame Funktionen fuer Dialog -// -------------------------------------------------------------------------- +// -------------------------------------------------------------------------- +// Initialisierung / gemeinsame Funktionen fuer Dialog +// -------------------------------------------------------------------------- FormulaDialog::FormulaDialog(Window* pParent , const uno::Reference<lang::XMultiServiceFactory>& _xServiceFactory @@ -108,9 +108,9 @@ FormulaDialog::~FormulaDialog() } } -// -------------------------------------------------------------------------- -// Funktionen fuer rechte Seite -// -------------------------------------------------------------------------- +// -------------------------------------------------------------------------- +// Funktionen fuer rechte Seite +// -------------------------------------------------------------------------- bool FormulaDialog::calculateValue( const String& rStrExp, String& rStrResult ) { rStrResult = rStrExp; @@ -120,7 +120,7 @@ void FormulaDialog::doClose(BOOL _bOk) { EndDialog(_bOk ? RET_OK : RET_CANCEL); } -void FormulaDialog::insertEntryToLRUList(const IFunctionDescription* /*_pDesc*/) +void FormulaDialog::insertEntryToLRUList(const IFunctionDescription* /*_pDesc*/) { } void FormulaDialog::showReference(const String& /*_sFormula*/) diff --git a/reportdesign/source/ui/dlg/GroupExchange.cxx b/reportdesign/source/ui/dlg/GroupExchange.cxx index efa70b6b7e61..0cb97b5bd365 100644 --- a/reportdesign/source/ui/dlg/GroupExchange.cxx +++ b/reportdesign/source/ui/dlg/GroupExchange.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/ui/dlg/GroupExchange.hxx b/reportdesign/source/ui/dlg/GroupExchange.hxx index f46304d897ba..5b08638227bb 100644 --- a/reportdesign/source/ui/dlg/GroupExchange.hxx +++ b/reportdesign/source/ui/dlg/GroupExchange.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,9 +45,9 @@ namespace rptui static sal_uInt32 getReportGroupId(); protected: - virtual void AddSupportedFormats(); - virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual void ObjectReleased(); + virtual void AddSupportedFormats(); + virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual void ObjectReleased(); }; } #endif // RPTUI_GROUP_EXCHANGE_HXX diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index f2334687e4f3..8996e0f62f0c 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -62,9 +62,9 @@ #include <cppuhelper/bootstrap.hxx> -#define HANDLE_ID 0 -#define FIELD_EXPRESSION 1 -#define GROUPS_START_LEN 5 +#define HANDLE_ID 0 +#define FIELD_EXPRESSION 1 +#define GROUPS_START_LEN 5 #define NO_GROUP -1 namespace rptui @@ -100,12 +100,12 @@ class OFieldExpressionControl : public TContainerListenerBase ::osl::Mutex m_aMutex; ::std::vector<sal_Int32> m_aGroupPositions; ::std::vector<ColumnInfo> m_aColumnInfo; - ::svt::ComboBoxControl* m_pComboCell; - sal_Int32 m_nDataPos; - sal_Int32 m_nCurrentPos; - ULONG m_nPasteEvent; - ULONG m_nDeleteEvent; - OGroupsSortingDialog* m_pParent; + ::svt::ComboBoxControl* m_pComboCell; + sal_Int32 m_nDataPos; + sal_Int32 m_nCurrentPos; + ULONG m_nPasteEvent; + ULONG m_nDeleteEvent; + OGroupsSortingDialog* m_pParent; bool m_bIgnoreEvent; @@ -125,17 +125,17 @@ public: virtual void SAL_CALL elementReplaced(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL elementRemoved(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException); - void fillColumns(const uno::Reference< container::XNameAccess>& _xColumns); - void lateInit(); - sal_Bool IsDeleteAllowed( ); - void DeleteRows(); - void cut(); - void copy(); - void paste(); + void fillColumns(const uno::Reference< container::XNameAccess>& _xColumns); + void lateInit(); + sal_Bool IsDeleteAllowed( ); + void DeleteRows(); + void cut(); + void copy(); + void paste(); inline sal_Int32 getGroupPosition(sal_Int32 _nRow) const { return _nRow != BROWSER_ENDOFSELECTION ? m_aGroupPositions[_nRow] : sal_Int32(NO_GROUP); } - inline ::svt::ComboBoxControl* getExpressionControl() const { return m_pComboCell; } + inline ::svt::ComboBoxControl* getExpressionControl() const { return m_pComboCell; } /** returns the sequence with the selected groups @@ -164,7 +164,7 @@ protected: virtual void Command( const CommandEvent& rEvt ); // D&D - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); virtual sal_Int8 AcceptDrop( const BrowserAcceptDropEvent& rEvt ); virtual sal_Int8 ExecuteDrop( const BrowserExecuteDropEvent& rEvt ); @@ -295,7 +295,7 @@ sal_Int8 OFieldExpressionControl::ExecuteDrop( const BrowserExecuteDropEvent& rE sal_Int8 nAction = DND_ACTION_NONE; if ( IsDropFormatSupported( OGroupExchange::getReportGroupId() ) ) { - sal_Int32 nRow = GetRowAtYPosPixel(rEvt.maPosPixel.Y(), sal_False); + sal_Int32 nRow = GetRowAtYPosPixel(rEvt.maPosPixel.Y(), sal_False); SetNoSelection(); TransferableDataHelper aDropped( rEvt.maDropEvent.Transferable ); @@ -394,8 +394,8 @@ void OFieldExpressionControl::lateInit() ////////////////////////////////////////////////////////////////////// // set browse mode - BrowserMode nMode(BROWSER_COLUMNSELECTION | BROWSER_MULTISELECTION | BROWSER_KEEPSELECTION | - BROWSER_HLINESFULL | BROWSER_VLINESFULL | BROWSER_AUTOSIZE_LASTCOL | BROWSER_AUTO_VSCROLL | BROWSER_AUTO_HSCROLL); + BrowserMode nMode(BROWSER_COLUMNSELECTION | BROWSER_MULTISELECTION | BROWSER_KEEPSELECTION | + BROWSER_HLINESFULL | BROWSER_VLINESFULL | BROWSER_AUTOSIZE_LASTCOL | BROWSER_AUTO_VSCROLL | BROWSER_AUTO_HSCROLL); if( m_pParent->isReadOnly() ) nMode |= BROWSER_HIDECURSOR; SetMode(nMode); @@ -634,7 +634,7 @@ EditBrowseBox::RowStatus OFieldExpressionControl::GetRowStatus(long nRow) const } return EditBrowseBox::CLEAN; } -// XEventListener +// XEventListener //------------------------------------------------------------------------------ void SAL_CALL OFieldExpressionControl::disposing(const lang::EventObject& /*e*/) throw( uno::RuntimeException ) { @@ -727,7 +727,7 @@ void OFieldExpressionControl::KeyInput( const KeyEvent& rEvt ) { if (IsDeleteAllowed()) { - if (rEvt.GetKeyCode().GetCode() == KEY_DELETE && // Delete rows + if (rEvt.GetKeyCode().GetCode() == KEY_DELETE && // Delete rows !rEvt.GetKeyCode().IsShift() && !rEvt.GetKeyCode().IsMod1()) { @@ -1027,7 +1027,7 @@ OGroupsSortingDialog::OGroupsSortingDialog( Window* _pParent for (size_t i = 0; i < (SAL_N_ELEMENTS(pControlsLst))-1; ++i) static_cast<ListBox*>(pControlsLst[i])->SetSelectHdl(LINK(this,OGroupsSortingDialog,LBChangeHdl)); - Control* pControls[] = { &m_aHeader, &m_aFooter, &m_aGroupOn, &m_aGroupInterval, &m_aKeepTogether, &m_aOrder + Control* pControls[] = { &m_aHeader, &m_aFooter, &m_aGroupOn, &m_aGroupInterval, &m_aKeepTogether, &m_aOrder , &m_aMove,&m_aFL2}; sal_Int32 nMaxTextWidth = 0; MnemonicGenerator aMnemonicGenerator; @@ -1049,7 +1049,7 @@ OGroupsSortingDialog::OGroupsSortingDialog( Window* _pParent Size aOutSize(nMaxTextWidth + m_aHeader.GetSizePixel().Width() + 3*aSpace.Width(),aSpace.Height()); SetMinOutputSizePixel(aOutSize); SetOutputSizePixel(aOutSize); -// Resize(); +// Resize(); m_pReportListener = new OPropertyChangeMultiplexer(this,m_pController->getReportDefinition().get()); m_pReportListener->addProperty(PROPERTY_COMMAND); @@ -1071,8 +1071,8 @@ OGroupsSortingDialog::OGroupsSortingDialog( Window* _pParent //BTN m_aPB_Up.SetZOrder(&m_aMove, WINDOW_ZORDER_BEHIND); //BTN m_aPB_Down.SetZOrder(&m_aPB_Up, WINDOW_ZORDER_BEHIND); // set Hi contrast bitmaps - //BTN m_aPB_Up.SetModeImage( ModuleRes(IMG_UP_H),BMP_COLOR_HIGHCONTRAST); - //BTN m_aPB_Down.SetModeImage( ModuleRes(IMG_DOWN_H),BMP_COLOR_HIGHCONTRAST); + //BTN m_aPB_Up.SetModeImage( ModuleRes(IMG_UP_H),BMP_COLOR_HIGHCONTRAST); + //BTN m_aPB_Down.SetModeImage( ModuleRes(IMG_DOWN_H),BMP_COLOR_HIGHCONTRAST); m_aToolBox.SetStyle(m_aToolBox.GetStyle()|WB_LINESPACING); m_aToolBox.SetSelectHdl(LINK(this, OGroupsSortingDialog, OnFormatAction)); m_aToolBox.SetImageListProvider(this); @@ -1424,7 +1424,7 @@ void OGroupsSortingDialog::displayGroup(const uno::Reference<report::XGroup>& _x for (size_t i = 0; i < SAL_N_ELEMENTS(pControls); ++i) pControls[i]->SaveValue(); - ListBox* pControlsLst2[] = { &m_aHeaderLst, &m_aFooterLst, &m_aGroupOnLst, &m_aKeepTogetherLst,&m_aOrderLst}; + ListBox* pControlsLst2[] = { &m_aHeaderLst, &m_aFooterLst, &m_aGroupOnLst, &m_aKeepTogetherLst,&m_aOrderLst}; sal_Bool bReadOnly = !m_pController->isEditable(); for (size_t i = 0; i < SAL_N_ELEMENTS(pControlsLst2); ++i) pControlsLst2[i]->SetReadOnly(bReadOnly); @@ -1438,8 +1438,8 @@ void OGroupsSortingDialog::Resize() Size aSpace = LogicToPixel( Size( UNRELATED_CONTROLS, UNRELATED_CONTROLS ), MAP_APPFONT ); m_pFieldExpression->SetSizePixel(Size(aTotalOutputSize.Width() - 2*aSpace.Width(),m_pFieldExpression->GetSizePixel().Height())); - Control* pControlsLst[] = { &m_aHeaderLst, &m_aFooterLst, &m_aGroupOnLst, &m_aGroupIntervalEd,&m_aKeepTogetherLst,&m_aOrderLst}; - Control* pControls[] = { &m_aHeader, &m_aFooter, &m_aGroupOn, &m_aGroupInterval, &m_aKeepTogether, &m_aOrder}; + Control* pControlsLst[] = { &m_aHeaderLst, &m_aFooterLst, &m_aGroupOnLst, &m_aGroupIntervalEd,&m_aKeepTogetherLst,&m_aOrderLst}; + Control* pControls[] = { &m_aHeader, &m_aFooter, &m_aGroupOn, &m_aGroupInterval, &m_aKeepTogether, &m_aOrder}; sal_Int32 nMaxTextWidth = 0; for (size_t i = 0; i < SAL_N_ELEMENTS(pControls); ++i) { @@ -1461,14 +1461,14 @@ void OGroupsSortingDialog::Resize() m_aFL2.SetSizePixel(Size(aTotalOutputSize.Width() - aSpace.Width(),m_aFL2.GetSizePixel().Height())); m_aFL3.SetSizePixel(Size(aTotalOutputSize.Width() - aSpace.Width(),m_aFL3.GetSizePixel().Height())); -//BTN sal_Int32 nPos = aTotalOutputSize.Width() - aSpace.Width() - m_aPB_Up.GetSizePixel().Width(); -//BTN m_aPB_Delete.SetPosPixel(Point(nPos,m_aPB_Delete.GetPosPixel().Y())); +//BTN sal_Int32 nPos = aTotalOutputSize.Width() - aSpace.Width() - m_aPB_Up.GetSizePixel().Width(); +//BTN m_aPB_Delete.SetPosPixel(Point(nPos,m_aPB_Delete.GetPosPixel().Y())); //BTN -//BTN nPos -= (m_aPB_Up.GetSizePixel().Width() + LogicToPixel( Size( UNRELATED_CONTROLS, 0 ), MAP_APPFONT ).Width()); -//BTN m_aPB_Down.SetPosPixel(Point(nPos,m_aPB_Down.GetPosPixel().Y())); +//BTN nPos -= (m_aPB_Up.GetSizePixel().Width() + LogicToPixel( Size( UNRELATED_CONTROLS, 0 ), MAP_APPFONT ).Width()); +//BTN m_aPB_Down.SetPosPixel(Point(nPos,m_aPB_Down.GetPosPixel().Y())); //BTN -//BTN nPos -= (m_aPB_Up.GetSizePixel().Width() + LogicToPixel( Size( RELATED_CONTROLS, 0 ), MAP_APPFONT ).Width()); -//BTN m_aPB_Up.SetPosPixel(Point(nPos,m_aPB_Up.GetPosPixel().Y())); +//BTN nPos -= (m_aPB_Up.GetSizePixel().Width() + LogicToPixel( Size( RELATED_CONTROLS, 0 ), MAP_APPFONT ).Width()); +//BTN m_aPB_Up.SetPosPixel(Point(nPos,m_aPB_Up.GetPosPixel().Y())); sal_Int32 nPos = aTotalOutputSize.Width() - aSpace.Width() - m_aToolBox.GetSizePixel().Width(); m_aToolBox.SetPosPixel(Point(nPos,m_aToolBox.GetPosPixel().Y())); diff --git a/reportdesign/source/ui/dlg/GroupsSorting.hrc b/reportdesign/source/ui/dlg/GroupsSorting.hrc index 8dfbfd3224a4..d717562cf14f 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.hrc +++ b/reportdesign/source/ui/dlg/GroupsSorting.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,32 +27,32 @@ #ifndef RPTUI_GROUPSSORTING_HRC #define RPTUI_GROUPSSORTING_HRC -#define FT_HEADER (1) -#define LST_HEADERLST (2) -#define FT_FOOTER (3) -#define LST_FOOTERLST (4) -#define FT_GROUPON (5) -#define LST_GROUPONLST (6) -#define FT_GROUPINTERVAL (7) +#define FT_HEADER (1) +#define LST_HEADERLST (2) +#define FT_FOOTER (3) +#define LST_FOOTERLST (4) +#define FT_GROUPON (5) +#define LST_GROUPONLST (6) +#define FT_GROUPINTERVAL (7) #define ED_GROUPINTERVALLST (8) -#define FT_KEEPTOGETHER (9) -#define LST_KEEPTOGETHERLST (10) -#define PB_OK (11) -#define PB_CANCEL (12) -#define PB_HELP (13) -#define WND_CONTROL (14) -#define HELP_FIELD (15) -#define FT_ORDER (16) -#define LST_ORDER (17) -#define FL_SEPARATOR1 (18) -#define FT_MOVELABEL (19) -#define PB_UP (20) -#define PB_DOWN (21) -#define FL_SEPARATOR2 (22) -#define FL_SEPARATOR3 (23) -//BTN #define IMG_UP_H (24) -//BTN #define IMG_DOWN_H (25) -//BTN #define PB_DELETE (26) +#define FT_KEEPTOGETHER (9) +#define LST_KEEPTOGETHERLST (10) +#define PB_OK (11) +#define PB_CANCEL (12) +#define PB_HELP (13) +#define WND_CONTROL (14) +#define HELP_FIELD (15) +#define FT_ORDER (16) +#define LST_ORDER (17) +#define FL_SEPARATOR1 (18) +#define FT_MOVELABEL (19) +#define PB_UP (20) +#define PB_DOWN (21) +#define FL_SEPARATOR2 (22) +#define FL_SEPARATOR3 (23) +//BTN #define IMG_UP_H (24) +//BTN #define IMG_DOWN_H (25) +//BTN #define PB_DELETE (26) #define TB_TOOLBOX (27) // #define IMG_GROUPSORT_MOVE_DOWN (28) @@ -63,17 +63,17 @@ // #define IMG_GROUPSORT_DELETE_H (33) -#define CHECKBOX_HEIGHT 8 -#define FIXEDTEXT_HEIGHT 8 -#define FIXEDTEXT_WIDTH 60 -#define RELATED_CONTROLS 4 -#define UNRELATED_CONTROLS 7 -#define EDIT_HEIGHT 12 -#define BUTTON_HEIGHT 14 -#define BUTTON_WIDTH 50 -#define BROWSER_HEIGHT 75 -#define PAGE_WIDTH 120 -#define PAGE_HEIGHT ( 13*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 11*FIXEDTEXT_HEIGHT ) -#define LISTBOX_WIDTH PAGE_WIDTH - 4*UNRELATED_CONTROLS - FIXEDTEXT_WIDTH +#define CHECKBOX_HEIGHT 8 +#define FIXEDTEXT_HEIGHT 8 +#define FIXEDTEXT_WIDTH 60 +#define RELATED_CONTROLS 4 +#define UNRELATED_CONTROLS 7 +#define EDIT_HEIGHT 12 +#define BUTTON_HEIGHT 14 +#define BUTTON_WIDTH 50 +#define BROWSER_HEIGHT 75 +#define PAGE_WIDTH 120 +#define PAGE_HEIGHT ( 13*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 11*FIXEDTEXT_HEIGHT ) +#define LISTBOX_WIDTH PAGE_WIDTH - 4*UNRELATED_CONTROLS - FIXEDTEXT_WIDTH #endif // RPTUI_GROUPSSORTING_HRC diff --git a/reportdesign/source/ui/dlg/GroupsSorting.src b/reportdesign/source/ui/dlg/GroupsSorting.src index 2c73fff07de4..af78f65dee8d 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.src +++ b/reportdesign/source/ui/dlg/GroupsSorting.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,14 +45,14 @@ FloatingWindow RID_GROUPS_SORTING Moveable = TRUE ; Closeable = TRUE ; Sizeable = TRUE; - + FixedLine FL_SEPARATOR2 { Pos = MAP_APPFONT ( RELATED_CONTROLS , RELATED_CONTROLS ) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; Text [ en-US ] = "Groups"; }; - + Control WND_CONTROL { Pos = MAP_APPFONT( UNRELATED_CONTROLS, 2*UNRELATED_CONTROLS ); @@ -61,62 +61,62 @@ FloatingWindow RID_GROUPS_SORTING Border = TRUE; TabStop = TRUE; }; - + FixedText FT_MOVELABEL { Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 3*UNRELATED_CONTROLS + BROWSER_HEIGHT ) ; Size = MAP_APPFONT ( FIXEDTEXT_WIDTH , FIXEDTEXT_HEIGHT ) ; -// Text [ en-US ] = "Move group" ; +// Text [ en-US ] = "Move group" ; Text [ en-US ] = "Group actions" ; }; - + // /* // | PAGE_WIDTH | // | /-----\ {-------\ /---------\ | // | unreleated FT_MOVELABEL |PB_UP| unreleated |PB_DOWN| unreleated |PD_DELETE| unreleated | -// | \_____/ \_______/ \_________/ | -// +// | \_____/ \_______/ \_________/ | +// // Don't set any position here, it will be done in OGroupsSortingDialog::Resize() -// +// // Find possible IMAGEBUTTON_* in rscicpx.cxx // Symbol is vclrsc.hxx // */ -// ImageButton PB_UP -// { -// Pos = MAP_APPFONT ( PAGE_WIDTH - 3*UNRELATED_CONTROLS - 3*14 - 2*RELATED_CONTROLS, 3*UNRELATED_CONTROLS + BROWSER_HEIGHT -1 ) ; -// Size = MAP_APPFONT ( 14 , 14 ) ; -// TabStop = TRUE; +// ImageButton PB_UP +// { +// Pos = MAP_APPFONT ( PAGE_WIDTH - 3*UNRELATED_CONTROLS - 3*14 - 2*RELATED_CONTROLS, 3*UNRELATED_CONTROLS + BROWSER_HEIGHT -1 ) ; +// Size = MAP_APPFONT ( 14 , 14 ) ; +// TabStop = TRUE; // // Symbol = IMAGEBUTTON_ARROW_UP ; // arrow up // Symbol = IMAGEBUTTON_SPIN_UP ; // triangle up // // Symbol = IMAGEBUTTON_FLOAT; -// }; -// -// ImageButton PB_DOWN -// { -// Pos = MAP_APPFONT ( PAGE_WIDTH - 2*UNRELATED_CONTROLS - 2*14 - 2*RELATED_CONTROLS, 3*UNRELATED_CONTROLS + BROWSER_HEIGHT - 1 ) ; -// Size = MAP_APPFONT ( 14 , 14 ) ; -// TabStop = TRUE; +// }; +// +// ImageButton PB_DOWN +// { +// Pos = MAP_APPFONT ( PAGE_WIDTH - 2*UNRELATED_CONTROLS - 2*14 - 2*RELATED_CONTROLS, 3*UNRELATED_CONTROLS + BROWSER_HEIGHT - 1 ) ; +// Size = MAP_APPFONT ( 14 , 14 ) ; +// TabStop = TRUE; // // Symbol = IMAGEBUTTON_ARROW_DOWN ; // arrow down // // Symbol = IMAGEBUTTON_FIRST ; // Symbol = IMAGEBUTTON_SPIN_DOWN; -// -// }; -// -// ImageButton PB_DELETE -// { -// Pos = MAP_APPFONT ( PAGE_WIDTH - UNRELATED_CONTROLS - 14, 3*UNRELATED_CONTROLS + BROWSER_HEIGHT - 1 ) ; -// Size = MAP_APPFONT ( 14 , 14 ) ; -// TabStop = TRUE; +// +// }; +// +// ImageButton PB_DELETE +// { +// Pos = MAP_APPFONT ( PAGE_WIDTH - UNRELATED_CONTROLS - 14, 3*UNRELATED_CONTROLS + BROWSER_HEIGHT - 1 ) ; +// Size = MAP_APPFONT ( 14 , 14 ) ; +// TabStop = TRUE; // Symbol = IMAGEBUTTON_CLOSE ; -// }; +// }; ToolBox TB_TOOLBOX { Pos = MAP_APPFONT ( PAGE_WIDTH - 4*14 - UNRELATED_CONTROLS, 3*UNRELATED_CONTROLS + BROWSER_HEIGHT - 1 ) ; ButtonType = BUTTON_SYMBOL; -// Align = BOXALIGN_TOP; -// HelpId = HID_RPT_CONDFORMAT_TB; +// Align = BOXALIGN_TOP; +// HelpId = HID_RPT_CONDFORMAT_TB; Customize = FALSE; ItemList = { @@ -124,7 +124,7 @@ FloatingWindow RID_GROUPS_SORTING { Identifier = SID_RPT_GROUPSORT_MOVE_UP ; // Command = ".uno:ReportGroupMoveUp" ; // default_images/res/commandimages/sc_reportgroupmoveup.png - HelpID = HID_RPT_GROUPSORT_MOVE_UP ; + HelpID = HID_RPT_GROUPSORT_MOVE_UP ; Text [ en-US ] = "Move up" ; Checkable = TRUE; // Disable = TRUE; @@ -132,7 +132,7 @@ FloatingWindow RID_GROUPS_SORTING ToolBoxItem { Identifier = SID_RPT_GROUPSORT_MOVE_DOWN ; - // Command = ".uno:ReportGroupMoveDown" ; + // Command = ".uno:ReportGroupMoveDown" ; HelpID = HID_RPT_GROUPSORT_MOVE_DOWN ; Text [ en-US ] = "Move down" ; Checkable = TRUE; @@ -156,7 +156,7 @@ FloatingWindow RID_GROUPS_SORTING Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; Text [ en-US ] = "Properties"; }; - + FixedText FT_ORDER { Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 4*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + FIXEDTEXT_HEIGHT ) ; @@ -178,7 +178,7 @@ FloatingWindow RID_GROUPS_SORTING < "Ascending" ; 0 ; > ; < "Descending" ; 1 ; > ; }; - + }; FixedText FT_HEADER { @@ -186,7 +186,7 @@ FloatingWindow RID_GROUPS_SORTING Size = MAP_APPFONT ( FIXEDTEXT_WIDTH , FIXEDTEXT_HEIGHT ) ; Hide = TRUE; Text [ en-US ] = "Group Header" ; - + }; ListBox LST_HEADERLST { @@ -209,7 +209,7 @@ FloatingWindow RID_GROUPS_SORTING Size = MAP_APPFONT ( FIXEDTEXT_WIDTH , FIXEDTEXT_HEIGHT ) ; Hide = TRUE; Text [ en-US ] = "Group Footer" ; - + }; ListBox LST_FOOTERLST { @@ -232,7 +232,7 @@ FloatingWindow RID_GROUPS_SORTING Size = MAP_APPFONT ( FIXEDTEXT_WIDTH , FIXEDTEXT_HEIGHT ) ; Hide = TRUE; Text [ en-US ] = "Group On" ; - + }; ListBox LST_GROUPONLST { @@ -263,7 +263,7 @@ FloatingWindow RID_GROUPS_SORTING Size = MAP_APPFONT( LISTBOX_WIDTH, EDIT_HEIGHT ); TabStop = TRUE; }; - + FixedText FT_KEEPTOGETHER { Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 9*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 6*FIXEDTEXT_HEIGHT) ; @@ -287,29 +287,29 @@ FloatingWindow RID_GROUPS_SORTING < "With First Detail" ; 2 ; > ; }; }; - + FixedLine FL_SEPARATOR1 { Pos = MAP_APPFONT ( RELATED_CONTROLS , 10*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 7*FIXEDTEXT_HEIGHT) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; Text [ en-US ] = "Help"; }; - + FixedText HELP_FIELD { Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 12*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 7*FIXEDTEXT_HEIGHT) ; Size = MAP_APPFONT( PAGE_WIDTH - 2*UNRELATED_CONTROLS, 4*FIXEDTEXT_HEIGHT); WordBreak = TRUE; }; - -//BTN Image IMG_UP_H -//BTN { -//BTN ImageBitmap = Bitmap { File = "arrow_move_up_hc" ; }; -//BTN }; -//BTN Image IMG_DOWN_H -//BTN { -//BTN ImageBitmap = Bitmap { File = "arrow_move_down_hc" ; }; -//BTN }; + +//BTN Image IMG_UP_H +//BTN { +//BTN ImageBitmap = Bitmap { File = "arrow_move_up_hc" ; }; +//BTN }; +//BTN Image IMG_DOWN_H +//BTN { +//BTN ImageBitmap = Bitmap { File = "arrow_move_down_hc" ; }; +//BTN }; }; @@ -395,7 +395,7 @@ Menu RID_GROUPSROWPOPUPMENU { ItemList = { -/* +/* MenuItem { ITEM_EDIT_CUT @@ -469,7 +469,7 @@ ImageList IMGLST_GROUPSORT_DLG_SCH // }; // DEF_MASKCOLOR; // }; -// +// // Image IMG_GROUPSORT_MOVEUP_H // { // ImageBitmap = Bitmap diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index cca1a5a2fbdb..0c1760b8e48a 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,8 +62,8 @@ #include <memory> #include <algorithm> -#define RID_SVXIMG_COLLAPSEDNODE (RID_FORMS_START + 2) -#define RID_SVXIMG_EXPANDEDNODE (RID_FORMS_START + 3) +#define RID_SVXIMG_COLLAPSEDNODE (RID_FORMS_START + 2) +#define RID_SVXIMG_EXPANDEDNODE (RID_FORMS_START + 3) #define DROP_ACTION_TIMER_INITIAL_TICKS 10 #define DROP_ACTION_TIMER_SCROLL_TICKS 3 #define DROP_ACTION_TIMER_TICK_BASE 10 @@ -121,7 +121,7 @@ class NavigatorTree : public ::cppu::BaseMutex , public SvTreeListBox , public reportdesign::ITraverseReport , public comphelper::OSelectionChangeListener - , public ::comphelper::OPropertyChangeListener + , public ::comphelper::OPropertyChangeListener { class UserData; friend class UserData; @@ -159,8 +159,8 @@ class NavigatorTree : public ::cppu::BaseMutex DROP_ACTION m_aDropActionType; OReportController& m_rController; SvLBoxEntry* m_pMasterReport; - SvLBoxEntry* m_pDragedEntry; - ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pReportListener; + SvLBoxEntry* m_pDragedEntry; + ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pReportListener; ::rtl::Reference< comphelper::OSelectionChangeMultiplexer> m_pSelectionListener; unsigned short m_nTimerCounter; @@ -171,12 +171,12 @@ class NavigatorTree : public ::cppu::BaseMutex NavigatorTree(const NavigatorTree&); void operator =(const NavigatorTree&); protected: - virtual void Command( const CommandEvent& rEvt ); + virtual void Command( const CommandEvent& rEvt ); // DragSourceHelper overridables - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); // DropTargetHelper overridables - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& _rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& _rEvt ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& _rEvt ); + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& _rEvt ); // OSelectionChangeListener virtual void _disposing(const lang::EventObject& _rSource) throw( uno::RuntimeException); @@ -205,7 +205,7 @@ public: virtual void traverseReportFooter(const uno::Reference< report::XSection>& _xSection); virtual void traversePageHeader(const uno::Reference< report::XSection>& _xSection); virtual void traversePageFooter(const uno::Reference< report::XSection>& _xSection); - + virtual void traverseGroups(const uno::Reference< report::XGroups>& _xGroups); virtual void traverseGroup(const uno::Reference< report::XGroup>& _xGroup); virtual void traverseGroupFunctions(const uno::Reference< report::XFunctions>& _xFunctions); @@ -232,7 +232,7 @@ NavigatorTree::NavigatorTree( Window* pParent,OReportController& _rController ) ,m_pDragedEntry(NULL) ,m_nTimerCounter( DROP_ACTION_TIMER_INITIAL_TICKS ) { - DBG_CTOR(rpt_NavigatorTree,NULL); + DBG_CTOR(rpt_NavigatorTree,NULL); m_pReportListener = new OPropertyChangeMultiplexer(this,m_rController.getReportDefinition().get()); m_pReportListener->addProperty(PROPERTY_PAGEHEADERON); m_pReportListener->addProperty(PROPERTY_PAGEFOOTERON); @@ -277,7 +277,7 @@ NavigatorTree::~NavigatorTree() } m_pReportListener->dispose(); m_pSelectionListener->dispose(); - DBG_DTOR(rpt_NavigatorTree,NULL); + DBG_DTOR(rpt_NavigatorTree,NULL); } //------------------------------------------------------------------------------ void NavigatorTree::Command( const CommandEvent& rEvt ) @@ -317,14 +317,14 @@ void NavigatorTree::Command( const CommandEvent& rEvt ) sal_Bool bDeleteAllowed = m_rController.isEditable() && (xGroup.is() || uno::Reference< report::XFunction>(pData->getContent(),uno::UNO_QUERY).is()); PopupMenu aContextMenu( ModuleRes( RID_MENU_NAVIGATOR ) ); - + USHORT nCount = aContextMenu.GetItemCount(); for (USHORT i = 0; i < nCount; ++i) { if ( MENUITEM_SEPARATOR != aContextMenu.GetItemType(i)) { USHORT nId = aContextMenu.GetItemId(i); - + aContextMenu.CheckItem(nId,m_rController.isCommandChecked(nId)); sal_Bool bEnabled = m_rController.isCommandEnabled(nId); if ( nId == SID_RPT_NEW_FUNCTION ) @@ -372,7 +372,7 @@ sal_Int8 NavigatorTree::AcceptDrop( const AcceptDropEvent& _rEvt ) { if (m_aDropActionTimer.IsActive()) m_aDropActionTimer.Stop(); - } + } else { bool bNeedTrigger = false; @@ -381,14 +381,14 @@ sal_Int8 NavigatorTree::AcceptDrop( const AcceptDropEvent& _rEvt ) { m_aDropActionType = DA_SCROLLUP; bNeedTrigger = true; - } + } else if ((aDropPos.Y() < GetSizePixel().Height()) && (aDropPos.Y() >= GetSizePixel().Height() - GetEntryHeight())) { m_aDropActionType = DA_SCROLLDOWN; bNeedTrigger = true; - } + } else - { + { SvLBoxEntry* pDropppedOn = GetEntry(aDropPos); if (pDropppedOn && (GetChildCount(pDropppedOn) > 0) && !IsExpanded(pDropppedOn)) { @@ -409,7 +409,7 @@ sal_Int8 NavigatorTree::AcceptDrop( const AcceptDropEvent& _rEvt ) m_aDropActionTimer.SetTimeout(DROP_ACTION_TIMER_TICK_BASE); m_aDropActionTimer.Start(); } - } + } else if (!bNeedTrigger) m_aDropActionTimer.Stop(); } @@ -480,8 +480,8 @@ IMPL_LINK(NavigatorTree, OnEntrySelDesel, NavigatorTree*, /*pThis*/) aSelection <<= static_cast<UserData*>(pEntry->GetUserData())->getContent(); m_rController.select(aSelection); m_pSelectionListener->unlock(); - } - + } + return 0L; } // ----------------------------------------------------------------------------- @@ -699,7 +699,7 @@ void NavigatorTree::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) } } // ----------------------------------------------------------------------------- -void NavigatorTree::_elementInserted( const container::ContainerEvent& _rEvent ) +void NavigatorTree::_elementInserted( const container::ContainerEvent& _rEvent ) { SvLBoxEntry* pEntry = find(_rEvent.Source); uno::Reference<beans::XPropertySet> xProp(_rEvent.Element,uno::UNO_QUERY_THROW); @@ -780,13 +780,13 @@ void NavigatorTree::removeEntry(SvLBoxEntry* _pEntry,bool _bRemove) } DBG_NAME(rpt_NavigatorTree_UserData) // ----------------------------------------------------------------------------- -NavigatorTree::UserData::UserData(NavigatorTree* _pTree,const uno::Reference<uno::XInterface>& _xContent) +NavigatorTree::UserData::UserData(NavigatorTree* _pTree,const uno::Reference<uno::XInterface>& _xContent) : OPropertyChangeListener(m_aMutex) , OContainerListener(m_aMutex) , m_xContent(_xContent) , m_pTree(_pTree) { - DBG_CTOR(rpt_NavigatorTree_UserData,NULL); + DBG_CTOR(rpt_NavigatorTree_UserData,NULL); uno::Reference<beans::XPropertySet> xProp(m_xContent,uno::UNO_QUERY); if ( xProp.is() ) { @@ -817,7 +817,7 @@ NavigatorTree::UserData::UserData(NavigatorTree* _pTree,const uno::Reference<uno // ----------------------------------------------------------------------------- NavigatorTree::UserData::~UserData() { - DBG_DTOR(rpt_NavigatorTree_UserData,NULL); + DBG_DTOR(rpt_NavigatorTree_UserData,NULL); if ( m_pContainerListener.is() ) m_pContainerListener->dispose(); if ( m_pListener.is() ) @@ -844,7 +844,7 @@ void NavigatorTree::UserData::_propertyChanged(const beans::PropertyChangeEvent& pMemFunSection = ::std::mem_fun(&OGroupHelper::getFooter); nPos = m_pTree->GetChildCount(pEntry) - 1; } - + OGroupHelper aGroupHelper(xGroup); if ( pIsOn(&aGroupHelper) ) { @@ -902,11 +902,11 @@ public: virtual ~ONavigatorImpl(); uno::Reference< report::XReportDefinition> m_xReport; - ::rptui::OReportController& m_rController; + ::rptui::OReportController& m_rController; ::std::auto_ptr<NavigatorTree> m_pNavigatorTree; }; -ONavigatorImpl::ONavigatorImpl(OReportController& _rController,ONavigator* _pParent) +ONavigatorImpl::ONavigatorImpl(OReportController& _rController,ONavigator* _pParent) :m_xReport(_rController.getReportDefinition()) ,m_rController(_rController) ,m_pNavigatorTree(new NavigatorTree(_pParent,_rController)) @@ -936,7 +936,7 @@ ONavigator::ONavigator( Window* _pParent DBG_CTOR( rpt_ONavigator,NULL); m_pImpl.reset(new ONavigatorImpl(_rController,this)); - + //Size aSpace = LogicToPixel( Size( 7, 120), MAP_APPFONT ); //Size aOutSize(nMaxTextWidth + m_aHeader.GetSizePixel().Width() + 3*aSpace.Width(),aSpace.Height()); //SetMinOutputSizePixel(aOutSize); @@ -946,14 +946,14 @@ ONavigator::ONavigator( Window* _pParent m_pImpl->m_pNavigatorTree->GrabFocus(); SetSizePixel(Size(STD_WIN_SIZE_X,STD_WIN_SIZE_Y)); Show(); - + } // ----------------------------------------------------------------------------- //------------------------------------------------------------------------ ONavigator::~ONavigator() { - DBG_DTOR( rpt_ONavigator,NULL); + DBG_DTOR( rpt_ONavigator,NULL); } //------------------------------------------------------------------------------ void ONavigator::Resize() diff --git a/reportdesign/source/ui/dlg/Navigator.src b/reportdesign/source/ui/dlg/Navigator.src index 496bae3b0ab7..5cac973dc0ef 100644 --- a/reportdesign/source/ui/dlg/Navigator.src +++ b/reportdesign/source/ui/dlg/Navigator.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,9 +35,9 @@ #endif #include <svl/solar.hrc> -#define RID_SVXIMG_COLLAPSEDNODE (RID_FORMS_START + 2) -#define RID_SVXIMG_EXPANDEDNODE (RID_FORMS_START + 3) -#define RID_SVXIMG_FORMS (RID_FORMS_START +13) +#define RID_SVXIMG_COLLAPSEDNODE (RID_FORMS_START + 2) +#define RID_SVXIMG_EXPANDEDNODE (RID_FORMS_START + 3) +#define RID_SVXIMG_FORMS (RID_FORMS_START +13) FloatingWindow RID_NAVIGATOR { @@ -49,7 +49,7 @@ FloatingWindow RID_NAVIGATOR Moveable = TRUE ; Closeable = TRUE ; Sizeable = TRUE; - + Control 1 { Pos = MAP_APPFONT( 0, 0 ); @@ -181,7 +181,7 @@ Menu RID_MENU_NAVIGATOR { ITEM_EDIT_PASTE }; -*/ +*/ }; }; diff --git a/reportdesign/source/ui/dlg/PageNumber.cxx b/reportdesign/source/ui/dlg/PageNumber.cxx index 10e9f64b852c..8ea8aef3e8b0 100644 --- a/reportdesign/source/ui/dlg/PageNumber.cxx +++ b/reportdesign/source/ui/dlg/PageNumber.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,14 +67,14 @@ OPageNumberDialog::OPageNumberDialog( Window* _pParent ,m_aAlignment(this, ModuleRes(FL_ALIGNMENT) ) ,m_aAlignmentLst(this, ModuleRes(LST_ALIGNMENT) ) ,m_aShowNumberOnFirstPage(this, ModuleRes(CB_SHOWNUMBERONFIRSTPAGE) ) - ,m_aFl1(this, ModuleRes(FL_SEPARATOR1)) - ,m_aPB_OK(this, ModuleRes(PB_OK)) - ,m_aPB_CANCEL(this, ModuleRes(PB_CANCEL)) - ,m_aPB_Help(this, ModuleRes(PB_HELP)) + ,m_aFl1(this, ModuleRes(FL_SEPARATOR1)) + ,m_aPB_OK(this, ModuleRes(PB_OK)) + ,m_aPB_CANCEL(this, ModuleRes(PB_CANCEL)) + ,m_aPB_Help(this, ModuleRes(PB_HELP)) ,m_pController(_pController) ,m_xHoldAlive(_xHoldAlive) { - DBG_CTOR( rpt_OPageNumberDialog,NULL); + DBG_CTOR( rpt_OPageNumberDialog,NULL); m_aShowNumberOnFirstPage.Hide(); @@ -84,7 +84,7 @@ OPageNumberDialog::OPageNumberDialog( Window* _pParent //------------------------------------------------------------------------ OPageNumberDialog::~OPageNumberDialog() { - DBG_DTOR( rpt_OPageNumberDialog,NULL); + DBG_DTOR( rpt_OPageNumberDialog,NULL); } // ----------------------------------------------------------------------------- short OPageNumberDialog::Execute() diff --git a/reportdesign/source/ui/dlg/PageNumber.hrc b/reportdesign/source/ui/dlg/PageNumber.hrc index a6087c50b00f..65318a500a26 100644 --- a/reportdesign/source/ui/dlg/PageNumber.hrc +++ b/reportdesign/source/ui/dlg/PageNumber.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,33 +27,33 @@ #ifndef RPTUI_PAGENUMBER_HRC #define RPTUI_PAGENUMBER_HRC -#define FL_FORMAT (1) -#define RB_PAGE_N (2) -#define RB_PAGE_N_OF_M (3) -#define FL_POSITION (4) -#define RB_PAGE_TOPPAGE (5) -#define RB_PAGE_BOTTOMPAGE (6) -#define FL_ALIGNMENT (7) -#define LST_ALIGNMENT (8) -#define CB_SHOWNUMBERONFIRSTPAGE (9) -#define PB_OK (10) -#define PB_CANCEL (11) -#define PB_HELP (12) -#define FL_SEPARATOR1 (13) -#define FL_MISC (14) +#define FL_FORMAT (1) +#define RB_PAGE_N (2) +#define RB_PAGE_N_OF_M (3) +#define FL_POSITION (4) +#define RB_PAGE_TOPPAGE (5) +#define RB_PAGE_BOTTOMPAGE (6) +#define FL_ALIGNMENT (7) +#define LST_ALIGNMENT (8) +#define CB_SHOWNUMBERONFIRSTPAGE (9) +#define PB_OK (10) +#define PB_CANCEL (11) +#define PB_HELP (12) +#define FL_SEPARATOR1 (13) +#define FL_MISC (14) -#define CHECKBOX_HEIGHT 8 -#define FIXEDTEXT_HEIGHT 8 -#define FIXEDTEXT_WIDTH 60 -#define RELATED_CONTROLS 4 -#define UNRELATED_CONTROLS 7 -#define EDIT_HEIGHT 12 -#define BUTTON_HEIGHT 14 -#define BUTTON_WIDTH 50 -#define BROWSER_HEIGHT 75 -#define PAGE_WIDTH (RELATED_CONTROLS + 3*UNRELATED_CONTROLS + 3*BUTTON_WIDTH) -#define PAGE_HEIGHT ( 8*RELATED_CONTROLS + 4*UNRELATED_CONTROLS + 9*FIXEDTEXT_HEIGHT + BUTTON_HEIGHT +1 ) -#define LISTBOX_WIDTH PAGE_WIDTH - 3*UNRELATED_CONTROLS - FIXEDTEXT_WIDTH +#define CHECKBOX_HEIGHT 8 +#define FIXEDTEXT_HEIGHT 8 +#define FIXEDTEXT_WIDTH 60 +#define RELATED_CONTROLS 4 +#define UNRELATED_CONTROLS 7 +#define EDIT_HEIGHT 12 +#define BUTTON_HEIGHT 14 +#define BUTTON_WIDTH 50 +#define BROWSER_HEIGHT 75 +#define PAGE_WIDTH (RELATED_CONTROLS + 3*UNRELATED_CONTROLS + 3*BUTTON_WIDTH) +#define PAGE_HEIGHT ( 8*RELATED_CONTROLS + 4*UNRELATED_CONTROLS + 9*FIXEDTEXT_HEIGHT + BUTTON_HEIGHT +1 ) +#define LISTBOX_WIDTH PAGE_WIDTH - 3*UNRELATED_CONTROLS - FIXEDTEXT_WIDTH #endif // RPTUI_PAGENUMBER_HRC diff --git a/reportdesign/source/ui/dlg/PageNumber.src b/reportdesign/source/ui/dlg/PageNumber.src index 31c5bdb4026c..751bb7c547e0 100644 --- a/reportdesign/source/ui/dlg/PageNumber.src +++ b/reportdesign/source/ui/dlg/PageNumber.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,14 +44,14 @@ ModalDialog RID_PAGENUMBERS HelpId = HID_RPT_PAGENUMBERS_DLG; Moveable = TRUE ; Closeable = TRUE ; - + FixedLine FL_FORMAT { Pos = MAP_APPFONT ( RELATED_CONTROLS , RELATED_CONTROLS ) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS, FIXEDTEXT_HEIGHT ) ; Text [ en-US ] = "Format"; }; - + RadioButton RB_PAGE_N { Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 2*RELATED_CONTROLS + FIXEDTEXT_HEIGHT) ; @@ -66,14 +66,14 @@ ModalDialog RID_PAGENUMBERS Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; Text [ en-US ] = "Page N of M"; }; - + FixedLine FL_POSITION { Pos = MAP_APPFONT ( RELATED_CONTROLS , 3*RELATED_CONTROLS + UNRELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; Text [ en-US ] = "Position"; }; - + RadioButton RB_PAGE_TOPPAGE { Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 4*RELATED_CONTROLS + UNRELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT) ; @@ -85,17 +85,17 @@ ModalDialog RID_PAGENUMBERS RadioButton RB_PAGE_BOTTOMPAGE { Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 5*RELATED_CONTROLS + UNRELATED_CONTROLS + 5*FIXEDTEXT_HEIGHT) ; - Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; + Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; Text [ en-US ] = "Bottom of Page (Footer)"; }; - + FixedLine FL_MISC { Pos = MAP_APPFONT ( RELATED_CONTROLS , 5*RELATED_CONTROLS + 2*UNRELATED_CONTROLS + 6*FIXEDTEXT_HEIGHT) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; Text [ en-US ] = "General"; }; - + FixedText FL_ALIGNMENT { Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 6*RELATED_CONTROLS + 2*UNRELATED_CONTROLS + 7*FIXEDTEXT_HEIGHT) ; @@ -146,7 +146,7 @@ ModalDialog RID_PAGENUMBERS }; HelpButton PB_HELP { - TabStop = TRUE ; + TabStop = TRUE ; Pos = MAP_APPFONT ( RELATED_CONTROLS + 2*UNRELATED_CONTROLS + 2*BUTTON_WIDTH , 7*RELATED_CONTROLS + 4*UNRELATED_CONTROLS + 9*FIXEDTEXT_HEIGHT +1) ; Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; Text [ en-US ] = "~Help"; diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx index 383078a377f5..bdea855c9e77 100644 --- a/reportdesign/source/ui/dlg/dlgpage.cxx +++ b/reportdesign/source/ui/dlg/dlgpage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,15 +30,15 @@ #include <svx/dialogs.hrc> #include <svx/tabarea.hxx> -#include <svx/flagsdef.hxx> -#include <svx/svxdlg.hxx> -#include <editeng/svxenum.hxx> +#include <svx/flagsdef.hxx> +#include <svx/svxdlg.hxx> +#include <editeng/svxenum.hxx> #include "dlgpage.hxx" #include "ModuleHelper.hxx" #include "RptResId.hrc" -#include <svl/intitem.hxx> //add CHINA001 +#include <svl/intitem.hxx> //add CHINA001 #include <svl/cjkoptions.hxx> -#include <svl/aeitem.hxx> +#include <svl/aeitem.hxx> namespace rptui { @@ -50,9 +50,9 @@ namespace rptui ORptPageDialog::ORptPageDialog( Window* pParent, const SfxItemSet* pAttr,USHORT _nPageId) : SfxTabDialog ( pParent, ModuleRes( _nPageId ), pAttr ), - rOutAttrs ( *pAttr ) -{ - SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); + rOutAttrs ( *pAttr ) +{ + SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "Dialogdiet fail!"); switch( _nPageId ) { @@ -63,16 +63,16 @@ SfxTabDialog ( pParent, ModuleRes( _nPageId ), pAttr ), //AddTabPage( RID_SVXPAGE_PAGE,String(ModuleRes(1))); // AddTabPage( RID_SVXPAGE_BACKGROUND,String(ModuleRes(1))); AddTabPage(RID_SVXPAGE_PAGE, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), 0 ); - AddTabPage(RID_SVXPAGE_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0 ); + AddTabPage(RID_SVXPAGE_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0 ); break; case RID_PAGEDIALOG_CHAR: AddTabPage(RID_PAGE_CHAR, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), 0 ); - AddTabPage(RID_PAGE_EFFECTS, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), 0 ); - AddTabPage(RID_PAGE_POSITION, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), 0 ); - AddTabPage(RID_PAGE_TWOLN, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), 0 ); + AddTabPage(RID_PAGE_EFFECTS, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), 0 ); + AddTabPage(RID_PAGE_POSITION, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), 0 ); + AddTabPage(RID_PAGE_TWOLN, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), 0 ); AddTabPage(RID_PAGE_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0 ); AddTabPage(RID_PAGE_ALIGNMENT, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), 0 ); - + break; case RID_PAGEDIALOG_LINE: AddTabPage( RID_SVXPAGE_LINE,pFact->GetTabPageCreatorFunc( RID_SVXPAGE_LINE ), 0 ); diff --git a/reportdesign/source/ui/dlg/dlgpage.src b/reportdesign/source/ui/dlg/dlgpage.src index b8dfcd377994..78873f1b1238 100644 --- a/reportdesign/source/ui/dlg/dlgpage.src +++ b/reportdesign/source/ui/dlg/dlgpage.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -84,7 +84,7 @@ TabDialog RID_PAGEDIALOG_PAGE TabStop = TRUE ; }; Text [ x-comment ] = " "; - + String 1 { Text [ en-US ] = "Page" ; @@ -135,7 +135,7 @@ TabDialog RID_PAGEDIALOG_BACKGROUND Text [ x-comment ] = " "; }; Text [ x-comment ] = " "; - + String 1 { Text [ en-US ] = "Background" ; @@ -224,7 +224,7 @@ TabDialog RID_PAGEDIALOG_CHAR Text [ x-comment ] = " "; }; Text [ x-comment ] = " "; - + String 1 { Text [ en-US ] = "Character" ; @@ -296,7 +296,7 @@ TabDialog RID_PAGEDIALOG_LINE Text [ x-comment ] = " "; }; Text [ x-comment ] = " "; - + String 1 { Text [ en-US ] = "Line" ; |