diff options
Diffstat (limited to 'svtools/source/dialogs')
29 files changed, 469 insertions, 469 deletions
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 3a0e8a4b8289..1384c3f6d219 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.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 @@ -119,20 +119,20 @@ namespace svt @return a <type scope="com.sun.star.sdb">CommandType</type> value */ - virtual sal_Int32 getCommandType() const = 0; + virtual sal_Int32 getCommandType() const = 0; /// checks whether or not there is an assignment for a given logical field - virtual sal_Bool hasFieldAssignment(const ::rtl::OUString& _rLogicalName) = 0; + virtual sal_Bool hasFieldAssignment(const ::rtl::OUString& _rLogicalName) = 0; /// retrieves the assignment for a given logical field virtual ::rtl::OUString getFieldAssignment(const ::rtl::OUString& _rLogicalName) = 0; /// set the assignment for a given logical field - virtual void setFieldAssignment(const ::rtl::OUString& _rLogicalName, const ::rtl::OUString& _rAssignment) = 0; + virtual void setFieldAssignment(const ::rtl::OUString& _rLogicalName, const ::rtl::OUString& _rAssignment) = 0; /// clear the assignment for a given logical field - virtual void clearFieldAssignment(const ::rtl::OUString& _rLogicalName) = 0; + virtual void clearFieldAssignment(const ::rtl::OUString& _rLogicalName) = 0; - virtual void setDatasourceName(const ::rtl::OUString& _rName) = 0; - virtual void setCommand(const ::rtl::OUString& _rCommand) = 0; + virtual void setDatasourceName(const ::rtl::OUString& _rName) = 0; + virtual void setCommand(const ::rtl::OUString& _rCommand) = 0; }; // ------------------------------------------------------------------- @@ -147,9 +147,9 @@ namespace svt { protected: Reference< XDataSource > m_xDataSource; - ::rtl::OUString m_sDSName; - ::rtl::OUString m_sTableName; - MapString2String m_aAliases; + ::rtl::OUString m_sDSName; + ::rtl::OUString m_sTableName; + MapString2String m_aAliases; public: AssigmentTransientData( @@ -162,15 +162,15 @@ public: // IAssigmentData overridables virtual ::rtl::OUString getDatasourceName() const; virtual ::rtl::OUString getCommand() const; - virtual sal_Int32 getCommandType() const; + virtual sal_Int32 getCommandType() const; - virtual sal_Bool hasFieldAssignment(const ::rtl::OUString& _rLogicalName); + virtual sal_Bool hasFieldAssignment(const ::rtl::OUString& _rLogicalName); virtual ::rtl::OUString getFieldAssignment(const ::rtl::OUString& _rLogicalName); - virtual void setFieldAssignment(const ::rtl::OUString& _rLogicalName, const ::rtl::OUString& _rAssignment); - virtual void clearFieldAssignment(const ::rtl::OUString& _rLogicalName); + virtual void setFieldAssignment(const ::rtl::OUString& _rLogicalName, const ::rtl::OUString& _rAssignment); + virtual void clearFieldAssignment(const ::rtl::OUString& _rLogicalName); - virtual void setDatasourceName(const ::rtl::OUString& _rName); - virtual void setCommand(const ::rtl::OUString& _rCommand); + virtual void setDatasourceName(const ::rtl::OUString& _rName); + virtual void setCommand(const ::rtl::OUString& _rCommand); }; // ------------------------------------------------------------------- @@ -201,9 +201,9 @@ public: } else { - DBG_ERROR ( ( ::rtl::OString("AssigmentTransientData::AssigmentTransientData: unknown programmatic name (") - += ::rtl::OString(pFields->ProgrammaticName.getStr(), pFields->ProgrammaticName.getLength(), RTL_TEXTENCODING_ASCII_US) - += ::rtl::OString(")!") + DBG_ERROR ( ( ::rtl::OString("AssigmentTransientData::AssigmentTransientData: unknown programmatic name (") + += ::rtl::OString(pFields->ProgrammaticName.getStr(), pFields->ProgrammaticName.getLength(), RTL_TEXTENCODING_ASCII_US) + += ::rtl::OString(")!") ).getStr() ); } @@ -232,8 +232,8 @@ public: sal_Bool AssigmentTransientData::hasFieldAssignment(const ::rtl::OUString& _rLogicalName) { ConstMapString2StringIterator aPos = m_aAliases.find( _rLogicalName ); - return ( m_aAliases.end() != aPos ) - && ( aPos->second.getLength() ); + return ( m_aAliases.end() != aPos ) + && ( aPos->second.getLength() ); } // ------------------------------------------------------------------- @@ -281,7 +281,7 @@ public: ,public IAssigmentData { protected: - StringBag m_aStoredFields; + StringBag m_aStoredFields; protected: ::com::sun::star::uno::Any @@ -289,12 +289,12 @@ public: ::com::sun::star::uno::Any getProperty(const sal_Char* _pLocalName) const; - ::rtl::OUString getStringProperty(const sal_Char* _pLocalName) const; - sal_Int32 getInt32Property(const sal_Char* _pLocalName) const; + ::rtl::OUString getStringProperty(const sal_Char* _pLocalName) const; + sal_Int32 getInt32Property(const sal_Char* _pLocalName) const; - ::rtl::OUString getStringProperty(const ::rtl::OUString& _rLocalName) const; + ::rtl::OUString getStringProperty(const ::rtl::OUString& _rLocalName) const; - void setStringProperty(const sal_Char* _pLocalName, const ::rtl::OUString& _rValue); + void setStringProperty(const sal_Char* _pLocalName, const ::rtl::OUString& _rValue); public: AssignmentPersistentData(); @@ -303,18 +303,18 @@ public: // IAssigmentData overridables virtual ::rtl::OUString getDatasourceName() const; virtual ::rtl::OUString getCommand() const; - virtual sal_Int32 getCommandType() const; + virtual sal_Int32 getCommandType() const; - virtual sal_Bool hasFieldAssignment(const ::rtl::OUString& _rLogicalName); + virtual sal_Bool hasFieldAssignment(const ::rtl::OUString& _rLogicalName); virtual ::rtl::OUString getFieldAssignment(const ::rtl::OUString& _rLogicalName); - virtual void setFieldAssignment(const ::rtl::OUString& _rLogicalName, const ::rtl::OUString& _rAssignment); - virtual void clearFieldAssignment(const ::rtl::OUString& _rLogicalName); + virtual void setFieldAssignment(const ::rtl::OUString& _rLogicalName, const ::rtl::OUString& _rAssignment); + virtual void clearFieldAssignment(const ::rtl::OUString& _rLogicalName); - virtual void setDatasourceName(const ::rtl::OUString& _rName); - virtual void setCommand(const ::rtl::OUString& _rCommand); + virtual void setDatasourceName(const ::rtl::OUString& _rName); + virtual void setCommand(const ::rtl::OUString& _rCommand); virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames); - virtual void Commit(); + virtual void Commit(); }; @@ -377,7 +377,7 @@ void AssignmentPersistentData::Commit() } // ------------------------------------------------------------------- - ::rtl::OUString AssignmentPersistentData::getStringProperty(const ::rtl::OUString& _rLocalName) const + ::rtl::OUString AssignmentPersistentData::getStringProperty(const ::rtl::OUString& _rLocalName) const { ::rtl::OUString sReturn; getProperty( _rLocalName ) >>= sReturn; @@ -385,7 +385,7 @@ void AssignmentPersistentData::Commit() } // ------------------------------------------------------------------- - ::rtl::OUString AssignmentPersistentData::getStringProperty(const sal_Char* _pLocalName) const + ::rtl::OUString AssignmentPersistentData::getStringProperty(const sal_Char* _pLocalName) const { ::rtl::OUString sReturn; getProperty( _pLocalName ) >>= sReturn; @@ -494,29 +494,29 @@ void AssignmentPersistentData::Commit() // =================================================================== struct AddressBookSourceDialogData { - FixedText* pFieldLabels[FIELD_PAIRS_VISIBLE * 2]; - ListBox* pFields[FIELD_PAIRS_VISIBLE * 2]; + FixedText* pFieldLabels[FIELD_PAIRS_VISIBLE * 2]; + ListBox* pFields[FIELD_PAIRS_VISIBLE * 2]; /// when working transient, we need the data source Reference< XDataSource > m_xTransientDataSource; /// current scroll pos in the field list - sal_Int32 nFieldScrollPos; + sal_Int32 nFieldScrollPos; /// the index within m_pFields of the last visible list box. This is redundant, it could be extracted from other members - sal_Int32 nLastVisibleListIndex; + sal_Int32 nLastVisibleListIndex; /// indicates that we've an odd field number. This member is for efficiency only, it's redundant. - sal_Bool bOddFieldNumber : 1; + sal_Bool bOddFieldNumber : 1; /// indicates that we're working with the real persistent configuration - sal_Bool bWorkingPersistent : 1; + sal_Bool bWorkingPersistent : 1; /// the strings to use as labels for the field selection listboxes - StringArray aFieldLabels; + StringArray aFieldLabels; // the current field assignment - StringArray aFieldAssignments; + StringArray aFieldAssignments; /// the logical field names - StringArray aLogicalFieldNames; + StringArray aLogicalFieldNames; - IAssigmentData* pConfigData; + IAssigmentData* pConfigData; // ................................................................ AddressBookSourceDialogData( ) @@ -550,20 +550,20 @@ void AssignmentPersistentData::Commit() // =================================================================== // = AddressBookSourceDialog // =================================================================== -#define INIT_FIELDS() \ +#define INIT_FIELDS() \ ModalDialog(_pParent, SvtResId( DLG_ADDRESSBOOKSOURCE ))\ - ,m_aDatasourceFrame (this, SvtResId(FL_DATASOURCEFRAME))\ - ,m_aDatasourceLabel (this, SvtResId(FT_DATASOURCE))\ - ,m_aDatasource (this, SvtResId(CB_DATASOURCE))\ - ,m_aAdministrateDatasources (this, SvtResId(PB_ADMINISTATE_DATASOURCES))\ - ,m_aTableLabel (this, SvtResId(FT_TABLE))\ - ,m_aTable (this, SvtResId(CB_TABLE))\ - ,m_aFieldsTitle (this, SvtResId(FT_FIELDS))\ - ,m_aFieldsFrame (this, SvtResId(CT_BORDER))\ - ,m_aFieldScroller (&m_aFieldsFrame, SvtResId(SB_FIELDSCROLLER))\ - ,m_aOK (this, SvtResId(PB_OK))\ - ,m_aCancel (this, SvtResId(PB_CANCEL))\ - ,m_aHelp (this, SvtResId(PB_HELP))\ + ,m_aDatasourceFrame (this, SvtResId(FL_DATASOURCEFRAME))\ + ,m_aDatasourceLabel (this, SvtResId(FT_DATASOURCE))\ + ,m_aDatasource (this, SvtResId(CB_DATASOURCE))\ + ,m_aAdministrateDatasources (this, SvtResId(PB_ADMINISTATE_DATASOURCES))\ + ,m_aTableLabel (this, SvtResId(FT_TABLE))\ + ,m_aTable (this, SvtResId(CB_TABLE))\ + ,m_aFieldsTitle (this, SvtResId(FT_FIELDS))\ + ,m_aFieldsFrame (this, SvtResId(CT_BORDER))\ + ,m_aFieldScroller (&m_aFieldsFrame, SvtResId(SB_FIELDSCROLLER))\ + ,m_aOK (this, SvtResId(PB_OK))\ + ,m_aCancel (this, SvtResId(PB_CANCEL))\ + ,m_aHelp (this, SvtResId(PB_HELP))\ ,m_sNoFieldSelection(SvtResId(STR_NO_FIELD_SELECTION))\ ,m_xORB(_rxORB) @@ -728,7 +728,7 @@ void AssignmentPersistentData::Commit() AliasProgrammaticPair* pPair = _rMapping.getArray(); ::rtl::OUString sCurrent; - for ( ConstStringArrayIterator aProgrammatic = m_pImpl->aLogicalFieldNames.begin(); + for ( ConstStringArrayIterator aProgrammatic = m_pImpl->aLogicalFieldNames.begin(); aProgrammatic != m_pImpl->aLogicalFieldNames.end(); ++aProgrammatic ) @@ -756,7 +756,7 @@ void AssignmentPersistentData::Commit() OFileNotation aFileNotation( aURL.GetMainURL( INetURLObject::NO_DECODE ) ); sName = aFileNotation.get(OFileNotation::N_SYSTEM); } - + m_aDatasource.SetText(sName); m_aTable.SetText(m_pImpl->pConfigData->getCommand()); // we ignore the CommandType: only tables are supported @@ -767,7 +767,7 @@ void AssignmentPersistentData::Commit() ConstStringArrayIterator aLogical = m_pImpl->aLogicalFieldNames.begin(); StringArrayIterator aAssignment = m_pImpl->aFieldAssignments.begin(); - for ( ; + for ( ; aLogical < m_pImpl->aLogicalFieldNames.end(); ++aLogical, ++aAssignment ) @@ -874,7 +874,7 @@ void AssignmentPersistentData::Commit() if ( m_pImpl->bWorkingPersistent ) { String sSelectedDS = lcl_getSelectedDataSource( m_aDatasource ); - + // get the data source the user has chosen and let it build a connection INetURLObject aURL( sSelectedDS ); if ( aURL.GetProtocol() != INET_PROT_NOT_VALID || m_xDatabaseContext->hasByName(sSelectedDS) ) @@ -966,7 +966,7 @@ void AssignmentPersistentData::Commit() { DBG_ERROR("AddressBookSourceDialog::resetFields: could not retrieve the table columns!"); } - + const ::rtl::OUString* pColumnNames = aColumnNames.getConstArray(); const ::rtl::OUString* pEnd = pColumnNames + aColumnNames.getLength(); @@ -1009,7 +1009,7 @@ void AssignmentPersistentData::Commit() } // adjust m_pImpl->aFieldAssignments - for ( StringArrayIterator aAdjust = m_pImpl->aFieldAssignments.begin(); + for ( StringArrayIterator aAdjust = m_pImpl->aFieldAssignments.begin(); aAdjust != m_pImpl->aFieldAssignments.end(); ++aAdjust ) @@ -1096,7 +1096,7 @@ void AssignmentPersistentData::Commit() implSelectField(*pRightListControl, *pRightAssignment); // the index of the last visible list box - ++m_pImpl->nLastVisibleListIndex; // the left hand side box is always visible + ++m_pImpl->nLastVisibleListIndex; // the left hand side box is always visible if (!bHideRightColumn) ++m_pImpl->nLastVisibleListIndex; @@ -1117,7 +1117,7 @@ void AssignmentPersistentData::Commit() } if (_bAdjustFocus && (nOldFocusRow >= 0)) - { // we have to adjust the focus and one of the list boxes has the focus + { // we have to adjust the focus and one of the list boxes has the focus sal_Int32 nDelta = m_pImpl->nFieldScrollPos - _nPos; // the new row for the focus sal_Int32 nNewFocusRow = nOldFocusRow + nDelta; @@ -1203,12 +1203,12 @@ void AssignmentPersistentData::Commit() // set the field assignments ConstStringArrayIterator aLogical = m_pImpl->aLogicalFieldNames.begin(); ConstStringArrayIterator aAssignment = m_pImpl->aFieldAssignments.begin(); - for ( ; + for ( ; aLogical < m_pImpl->aLogicalFieldNames.end(); ++aLogical, ++aAssignment ) m_pImpl->pConfigData->setFieldAssignment(*aLogical, *aAssignment); - + EndDialog(RET_OK); return 0L; @@ -1245,7 +1245,7 @@ void AssignmentPersistentData::Commit() { ::rtl::OUString sName; xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataSourceName"))) >>= sName; - + INetURLObject aURL( sName ); if( aURL.GetProtocol() != INET_PROT_NOT_VALID ) { @@ -1268,8 +1268,8 @@ void AssignmentPersistentData::Commit() // re-fill the data source list // try to preserve the current selection - -// initializeDatasources(); + +// initializeDatasources(); return 0L; } @@ -1281,20 +1281,20 @@ void AssignmentPersistentData::Commit() { case EVENT_KEYINPUT: { - const KeyEvent* pKeyEvent = _rNEvt.GetKeyEvent(); + const KeyEvent* pKeyEvent = _rNEvt.GetKeyEvent(); sal_uInt16 nCode = pKeyEvent->GetKeyCode().GetCode(); sal_Bool bShift = pKeyEvent->GetKeyCode().IsShift(); sal_Bool bCtrl = pKeyEvent->GetKeyCode().IsMod1(); - sal_Bool bAlt = pKeyEvent->GetKeyCode().IsMod2(); + sal_Bool bAlt = pKeyEvent->GetKeyCode().IsMod2(); if (KEY_TAB == nCode) - { // somebody pressed the tab key + { // somebody pressed the tab key if (!bAlt && !bCtrl && !bShift) - { // it's really the only the key (no modifiers) + { // it's really the only the key (no modifiers) if (m_pImpl->pFields[m_pImpl->nLastVisibleListIndex]->HasChildPathFocus()) // the last of our visible list boxes has the focus if (m_pImpl->nFieldScrollPos < m_aFieldScroller.GetRangeMax()) - { // we can still scroll down + { // we can still scroll down sal_Int32 nNextFocusList = m_pImpl->nLastVisibleListIndex + 1 - 2; // -> scroll down implScrollFields(m_pImpl->nFieldScrollPos + 1, sal_False, sal_True); @@ -1305,11 +1305,11 @@ void AssignmentPersistentData::Commit() } } else if (!bAlt && !bCtrl && bShift) - { // it's shift-tab + { // it's shift-tab if (m_pImpl->pFields[0]->HasChildPathFocus()) // our first list box has the focus if (m_pImpl->nFieldScrollPos > 0) - { // we can still scroll up + { // we can still scroll up // -> scroll up implScrollFields(m_pImpl->nFieldScrollPos - 1, sal_False, sal_True); // give the right control in the "prebious" line the focus @@ -1326,7 +1326,7 @@ void AssignmentPersistentData::Commit() } // ....................................................................... -} // namespace svt +} // namespace svt // ....................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/dialogs/addresstemplate.hrc b/svtools/source/dialogs/addresstemplate.hrc index 5fb89cd567fc..45e3f1b06a18 100644 --- a/svtools/source/dialogs/addresstemplate.hrc +++ b/svtools/source/dialogs/addresstemplate.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 @@ -29,59 +29,59 @@ #define _SVT_ADDRESSTEMPLATE_HRC_ -#define FIELD_PAIRS_VISIBLE 5 -#define FIELD_CONTROLS_VISIBLE 2 * FIELD_PAIRS_VISIBLE +#define FIELD_PAIRS_VISIBLE 5 +#define FIELD_CONTROLS_VISIBLE 2 * FIELD_PAIRS_VISIBLE -#define FL_DATASOURCEFRAME 1 -#define FT_DATASOURCE 2 -#define CB_DATASOURCE 3 -#define CT_BORDER 1 -#define PB_ADMINISTATE_DATASOURCES 4 -#define FT_TABLE 5 -#define CB_TABLE 6 -#define FT_FIELDS 7 -#define SB_FIELDSCROLLER 8 -#define PB_OK 9 -#define PB_CANCEL 10 -#define PB_HELP 11 +#define FL_DATASOURCEFRAME 1 +#define FT_DATASOURCE 2 +#define CB_DATASOURCE 3 +#define CT_BORDER 1 +#define PB_ADMINISTATE_DATASOURCES 4 +#define FT_TABLE 5 +#define CB_TABLE 6 +#define FT_FIELDS 7 +#define SB_FIELDSCROLLER 8 +#define PB_OK 9 +#define PB_CANCEL 10 +#define PB_HELP 11 -#define FT_FIELD_BASE 50 -#define LB_FIELD_BASE 50 +#define FT_FIELD_BASE 50 +#define LB_FIELD_BASE 50 -#define STR_NO_FIELD_SELECTION 1 -#define STR_FIELD_COMPANY 2 -#define STR_FIELD_DEPARTMENT 3 -#define STR_FIELD_FIRSTNAME 4 -#define STR_FIELD_LASTNAME 5 -#define STR_FIELD_STREET 6 -#define STR_FIELD_COUNTRY 7 -#define STR_FIELD_ZIPCODE 8 -#define STR_FIELD_CITY 9 -#define STR_FIELD_TITLE 10 -#define STR_FIELD_POSITION 11 -#define STR_FIELD_ADDRFORM 12 -#define STR_FIELD_INITIALS 13 -#define STR_FIELD_SALUTATION 14 -#define STR_FIELD_HOMETEL 15 -#define STR_FIELD_WORKTEL 16 -#define STR_FIELD_FAX 17 -#define STR_FIELD_EMAIL 18 -#define STR_FIELD_URL 19 -#define STR_FIELD_NOTE 20 -#define STR_FIELD_USER1 21 -#define STR_FIELD_USER2 22 -#define STR_FIELD_USER3 23 -#define STR_FIELD_USER4 24 -#define STR_FIELD_ID 25 -#define STR_FIELD_STATE 26 -#define STR_FIELD_OFFICETEL 27 -#define STR_FIELD_PAGER 28 -#define STR_FIELD_MOBILE 29 -#define STR_FIELD_TELOTHER 30 -#define STR_FIELD_CALENDAR 31 -#define STR_FIELD_INVITE 32 +#define STR_NO_FIELD_SELECTION 1 +#define STR_FIELD_COMPANY 2 +#define STR_FIELD_DEPARTMENT 3 +#define STR_FIELD_FIRSTNAME 4 +#define STR_FIELD_LASTNAME 5 +#define STR_FIELD_STREET 6 +#define STR_FIELD_COUNTRY 7 +#define STR_FIELD_ZIPCODE 8 +#define STR_FIELD_CITY 9 +#define STR_FIELD_TITLE 10 +#define STR_FIELD_POSITION 11 +#define STR_FIELD_ADDRFORM 12 +#define STR_FIELD_INITIALS 13 +#define STR_FIELD_SALUTATION 14 +#define STR_FIELD_HOMETEL 15 +#define STR_FIELD_WORKTEL 16 +#define STR_FIELD_FAX 17 +#define STR_FIELD_EMAIL 18 +#define STR_FIELD_URL 19 +#define STR_FIELD_NOTE 20 +#define STR_FIELD_USER1 21 +#define STR_FIELD_USER2 22 +#define STR_FIELD_USER3 23 +#define STR_FIELD_USER4 24 +#define STR_FIELD_ID 25 +#define STR_FIELD_STATE 26 +#define STR_FIELD_OFFICETEL 27 +#define STR_FIELD_PAGER 28 +#define STR_FIELD_MOBILE 29 +#define STR_FIELD_TELOTHER 30 +#define STR_FIELD_CALENDAR 31 +#define STR_FIELD_INVITE 32 -#define STR_LOCAGICAL_FIELD_NAMES 33 +#define STR_LOCAGICAL_FIELD_NAMES 33 #endif // _SVT_ADDRESSTEMPLATE_HRC_ diff --git a/svtools/source/dialogs/addresstemplate.src b/svtools/source/dialogs/addresstemplate.src index 0652dfb9d0f5..d038e83a773f 100644 --- a/svtools/source/dialogs/addresstemplate.src +++ b/svtools/source/dialogs/addresstemplate.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,7 +35,7 @@ #include "controldims.hrc" #endif -#define FIELD_ROW_HEIGHT 17 +#define FIELD_ROW_HEIGHT 17 ModalDialog DLG_ADDRESSBOOKSOURCE { @@ -111,22 +111,22 @@ ModalDialog DLG_ADDRESSBOOKSOURCE Size = MAP_APPFONT ( 288 , 5 + FIELD_ROW_HEIGHT * FIELD_PAIRS_VISIBLE ) ; }; -#define DECLARE_FIELD( row, column ) \ - FixedText FT_FIELD_BASE + row * 2 + column \ - { \ - SVLook = TRUE ; \ +#define DECLARE_FIELD( row, column ) \ + FixedText FT_FIELD_BASE + row * 2 + column \ + { \ + SVLook = TRUE ; \ Pos = MAP_APPFONT ( 3 + column * 134, RSC_SP_CTRL_GROUP_Y + 2 + row * FIELD_ROW_HEIGHT ) ; \ Size = MAP_APPFONT ( 79 , 10 ) ; \ - Group = TRUE; \ - }; \ - ListBox LB_FIELD_BASE + row * 2 + column \ - { \ - SVLook = TRUE; \ + Group = TRUE; \ + }; \ + ListBox LB_FIELD_BASE + row * 2 + column \ + { \ + SVLook = TRUE; \ Pos = MAP_APPFONT ( 89 + column * 134, RSC_SP_CTRL_GROUP_Y + row * FIELD_ROW_HEIGHT ) ; \ - Size = MAP_APPFONT ( 42 , 14 ) ; \ - Border = TRUE; \ - DropDown = TRUE; \ - TabStop = TRUE; \ + Size = MAP_APPFONT ( 42 , 14 ) ; \ + Border = TRUE; \ + DropDown = TRUE; \ + TabStop = TRUE; \ } #if FIELD_PAIRS_VISIBLE > 0 diff --git a/svtools/source/dialogs/colctrl.cxx b/svtools/source/dialogs/colctrl.cxx index 1c63af7a96a2..4a988ea8ca9a 100644 --- a/svtools/source/dialogs/colctrl.cxx +++ b/svtools/source/dialogs/colctrl.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 @@ -40,20 +40,20 @@ // ---------------- SvColorControl::SvColorControl( Window* pParent, WinBits nStyle ) : - Control ( pParent, nStyle ), - mpBitmap ( NULL ), - mpReadAccess ( NULL ), - mnLuminance ( 50 ) + Control ( pParent, nStyle ), + mpBitmap ( NULL ), + mpReadAccess ( NULL ), + mnLuminance ( 50 ) { Initialize(); } // ----------------------------------------------------------------------- SvColorControl::SvColorControl( Window* pParent, const ResId& rResId ) : - Control ( pParent, rResId ), - mpBitmap ( NULL ), - mpReadAccess ( NULL ), - mnLuminance ( 50 ) + Control ( pParent, rResId ), + mpBitmap ( NULL ), + mpReadAccess ( NULL ), + mnLuminance ( 50 ) { Initialize(); } @@ -75,7 +75,7 @@ void SvColorControl::Initialize() void SvColorControl::CreateBitmap() { const Size aSize( GetOutputSizePixel() ); - + if( mpBitmap && mpBitmap->GetSizePixel() != aSize ) delete mpBitmap, mpBitmap = NULL; @@ -102,7 +102,7 @@ void SvColorControl::CreateBitmap() aColHSB.SetHue( nHue ); aColHSB.SetSat( nSat ); - + // mpBitmap always has a bit count of 24 => use of SetPixel(...) is safe pWriteAccess->SetPixel( i, j, BitmapColor( aColHSB.GetRGB() ) ); } @@ -230,7 +230,7 @@ void SvColorControl::SetColor( const ColorHSB& rCol, BOOL bSetColor ) USHORT nX = (USHORT) mpBitmap->GetSizePixel().Width(); USHORT nY = (USHORT) mpBitmap->GetSizePixel().Height(); INT16 nZ = rCol.GetBri(); - + SetLuminance( nZ ); nX = rCol.GetHue() * nX / 360; // Farbe nY = nY - rCol.GetSat() * nY / 100; // Saettigung @@ -287,7 +287,7 @@ void SvColorControl::SetLuminance( short nLum ) // ----------------------------------------------------------------------- ColorPreviewControl::ColorPreviewControl( Window* pParent, WinBits nStyle ) : - Control ( pParent, nStyle ) + Control ( pParent, nStyle ) { SetFillColor( maColor ); SetLineColor( maColor ); @@ -295,7 +295,7 @@ ColorPreviewControl::ColorPreviewControl( Window* pParent, WinBits nStyle ) : // ----------------------------------------------------------------------- ColorPreviewControl::ColorPreviewControl( Window* pParent, const ResId& rResId ) : - Control ( pParent, rResId ) + Control ( pParent, rResId ) { SetFillColor( maColor ); SetLineColor( maColor ); @@ -334,9 +334,9 @@ void ColorPreviewControl::SetColor( const Color& rCol ) // ----------------------------------------------------------------------- ColorMixingControl::ColorMixingControl( Window* pParent, WinBits nStyle, USHORT nRows, USHORT nColumns ) : - ValueSet ( pParent, nStyle ), - mnRows ( nRows ), - mnColumns ( nColumns ) + ValueSet ( pParent, nStyle ), + mnRows ( nRows ), + mnColumns ( nColumns ) { Initialize(); } @@ -344,9 +344,9 @@ ColorMixingControl::ColorMixingControl( Window* pParent, WinBits nStyle, // ----------------------------------------------------------------------- ColorMixingControl::ColorMixingControl( Window* pParent, const ResId& rResId, USHORT nRows, USHORT nColumns ) : - ValueSet ( pParent, rResId ), - mnRows ( nRows ), - mnColumns ( nColumns ) + ValueSet ( pParent, rResId ), + mnRows ( nRows ), + mnColumns ( nColumns ) { Initialize(); } @@ -498,7 +498,7 @@ void ColorMixingControl::SetColor( CMCPosition ePos, const Color& rCol ) // ----------------------------------------------------------------------- String ColorMixingControl::GetRGBString( const Color& rColor ) { - String aStr( String::CreateFromInt32(rColor.GetRed()) ); + String aStr( String::CreateFromInt32(rColor.GetRed()) ); aStr += ' '; aStr += String::CreateFromInt32(rColor.GetGreen()); aStr += ' '; @@ -507,7 +507,7 @@ String ColorMixingControl::GetRGBString( const Color& rColor ) return aStr; } // ----------------------------------------------------------------------- -CMCPosition ColorMixingControl::GetCMCPosition() const +CMCPosition ColorMixingControl::GetCMCPosition() const { CMCPosition ePos = CMC_OTHER; USHORT nPos = GetSelectItemId(); @@ -643,13 +643,13 @@ Color ColorHSB::GetRGB() const switch( n ) { - case 0: cR = nB; cG = c; cB = a; break; - case 1: cR = b; cG = nB; cB = a; break; - case 2: cR = a; cG = nB; cB = c; break; - case 3: cR = a; cG = b; cB = nB; break; - case 4: cR = c; cG = a; cB = nB; break; - case 5: cR = nB; cG = a; cB = b; break; - default: cR = 0; cG = 0; cB = 0; break; // -Wall ???? + case 0: cR = nB; cG = c; cB = a; break; + case 1: cR = b; cG = nB; cB = a; break; + case 2: cR = a; cG = nB; cB = c; break; + case 3: cR = a; cG = b; cB = nB; break; + case 4: cR = c; cG = a; cB = nB; break; + case 5: cR = nB; cG = a; cB = b; break; + default: cR = 0; cG = 0; cB = 0; break; // -Wall ???? } } diff --git a/svtools/source/dialogs/colrdlg.cxx b/svtools/source/dialogs/colrdlg.cxx index de973dcbcd4a..1a2a31e5e828 100644 --- a/svtools/source/dialogs/colrdlg.cxx +++ b/svtools/source/dialogs/colrdlg.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 @@ -38,16 +38,16 @@ // --------------- SvColorDialog::SvColorDialog( Window* pWindow ) : - ModalDialog ( pWindow, SvtResId( DLG_COLOR ) ), - maColMixCtrl ( this, SvtResId( VAL_SET_COLOR ), 8, 8 ), - maBtn1 ( this, SvtResId( BTN_1 ) ), - maBtn2 ( this, SvtResId( BTN_2 ) ), - //maBtn3 ( this, SvtResId( BTN_3 ) ), - //maBtn4 ( this, SvtResId( BTN_4 ) ), - //maFtRGB ( this, SvtResId( FT_RGB ) ), - maCtlColor ( this, SvtResId( CTL_COLOR ) ), - - maFtCyan ( this, SvtResId( FT_CYAN ) ), + ModalDialog ( pWindow, SvtResId( DLG_COLOR ) ), + maColMixCtrl ( this, SvtResId( VAL_SET_COLOR ), 8, 8 ), + maBtn1 ( this, SvtResId( BTN_1 ) ), + maBtn2 ( this, SvtResId( BTN_2 ) ), + //maBtn3 ( this, SvtResId( BTN_3 ) ), + //maBtn4 ( this, SvtResId( BTN_4 ) ), + //maFtRGB ( this, SvtResId( FT_RGB ) ), + maCtlColor ( this, SvtResId( CTL_COLOR ) ), + + maFtCyan ( this, SvtResId( FT_CYAN ) ), maNumCyan ( this, SvtResId( NUM_CYAN ) ), maFtMagenta ( this, SvtResId( FT_MAGENTA ) ), maNumMagenta ( this, SvtResId( NUM_MAGENTA ) ), @@ -56,26 +56,26 @@ SvColorDialog::SvColorDialog( Window* pWindow ) : maFtKey ( this, SvtResId( FT_KEY ) ), maNumKey ( this, SvtResId( NUM_KEY ) ), - maFtRed ( this, SvtResId( FT_RED ) ), - maNumRed ( this, SvtResId( NUM_RED ) ), - maFtGreen ( this, SvtResId( FT_GREEN ) ), - maNumGreen ( this, SvtResId( NUM_GREEN ) ), - maFtBlue ( this, SvtResId( FT_BLUE ) ), - maNumBlue ( this, SvtResId( NUM_BLUE ) ), - - maFtHue ( this, SvtResId( FT_HUE ) ), - maNumHue ( this, SvtResId( NUM_HUE ) ), - maFtSaturation ( this, SvtResId( FT_SATURATION ) ), - maNumSaturation ( this, SvtResId( NUM_SATURATION ) ), - maFtLuminance ( this, SvtResId( FT_LUMINANCE ) ), - maNumLuminance ( this, SvtResId( NUM_LUMINANCE ) ), - - maCtlPreview ( this, SvtResId( CTL_PREVIEW ) ), + maFtRed ( this, SvtResId( FT_RED ) ), + maNumRed ( this, SvtResId( NUM_RED ) ), + maFtGreen ( this, SvtResId( FT_GREEN ) ), + maNumGreen ( this, SvtResId( NUM_GREEN ) ), + maFtBlue ( this, SvtResId( FT_BLUE ) ), + maNumBlue ( this, SvtResId( NUM_BLUE ) ), + + maFtHue ( this, SvtResId( FT_HUE ) ), + maNumHue ( this, SvtResId( NUM_HUE ) ), + maFtSaturation ( this, SvtResId( FT_SATURATION ) ), + maNumSaturation ( this, SvtResId( NUM_SATURATION ) ), + maFtLuminance ( this, SvtResId( FT_LUMINANCE ) ), + maNumLuminance ( this, SvtResId( NUM_LUMINANCE ) ), + + maCtlPreview ( this, SvtResId( CTL_PREVIEW ) ), maCtlPreviewOld ( this, SvtResId( CTL_PREVIEW_OLD ) ), - maBtnOK ( this, SvtResId( BTN_OK ) ), - maBtnCancel ( this, SvtResId( BTN_CANCEL ) ), - maBtnHelp ( this, SvtResId( BTN_HELP ) ) + maBtnOK ( this, SvtResId( BTN_OK ) ), + maBtnCancel ( this, SvtResId( BTN_CANCEL ) ), + maBtnHelp ( this, SvtResId( BTN_HELP ) ) { FreeResource(); diff --git a/svtools/source/dialogs/colrdlg.hrc b/svtools/source/dialogs/colrdlg.hrc index 41329df6e366..7734866da2ca 100644 --- a/svtools/source/dialogs/colrdlg.hrc +++ b/svtools/source/dialogs/colrdlg.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 diff --git a/svtools/source/dialogs/colrdlg.src b/svtools/source/dialogs/colrdlg.src index 55517299c057..d7486d2e3865 100644 --- a/svtools/source/dialogs/colrdlg.src +++ b/svtools/source/dialogs/colrdlg.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 diff --git a/svtools/source/dialogs/filedlg.cxx b/svtools/source/dialogs/filedlg.cxx index bbcd2964773d..63a68e55567f 100644 --- a/svtools/source/dialogs/filedlg.cxx +++ b/svtools/source/dialogs/filedlg.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/svtools/source/dialogs/filedlg2.cxx b/svtools/source/dialogs/filedlg2.cxx index a4502631595e..ab7b3dada20c 100644 --- a/svtools/source/dialogs/filedlg2.cxx +++ b/svtools/source/dialogs/filedlg2.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 @@ -56,16 +56,16 @@ using namespace com::sun::star::uno; DECLARE_LIST( UniStringList, UniString* ) -#define STD_BTN_WIDTH 80 -#define STD_BTN_HEIGHT 26 +#define STD_BTN_WIDTH 80 +#define STD_BTN_HEIGHT 26 #ifndef UNX - #define ALLFILES "*.*" + #define ALLFILES "*.*" #else - #define ALLFILES "*" + #define ALLFILES "*" #endif -// #define STD_BTN_WIDTH 90 -// #define STD_BTN_HEIGHT 35 +// #define STD_BTN_WIDTH 90 +// #define STD_BTN_HEIGHT 35 #define INITCONTROL( p, ControlClass, nBits, aPos, aSize, aTitel, nHelpId ) \ p = new ControlClass( GetPathDialog(), WinBits( nBits ) ); \ @@ -85,8 +85,8 @@ KbdListBox::PreNotify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_KEYINPUT ) { - KeyEvent aKeyEvt = *rNEvt.GetKeyEvent(); - sal_Unicode cCharCode = aKeyEvt.GetCharCode(); + KeyEvent aKeyEvt = *rNEvt.GetKeyEvent(); + sal_Unicode cCharCode = aKeyEvt.GetCharCode(); if ( IsPrintable ( cCharCode ) ) { @@ -133,7 +133,7 @@ ImpPathDialog::ImpPathDialog( PathDialog* pDlg, RESOURCE_TYPE nType, BOOL bCreat pDlg->SetHelpId( HID_FILEDLG_PATHDLG ); - lang::Locale aLocale = Application::GetSettings().GetLocale(); + lang::Locale aLocale = Application::GetSettings().GetLocale(); xCollator = ::vcl::unohelper::CreateCollator(); if( xCollator.is() ) xCollator->loadDefaultCollator( aLocale, 1 ); @@ -152,9 +152,9 @@ ImpPathDialog::~ImpPathDialog() delete pOkBtn; delete pCancelBtn; delete pNewDirBtn; -# if defined(UNX) || defined(OS2) +# if defined(UNX) || defined(OS2) delete pHomeBtn; -# endif +# endif } void ImpPathDialog::InitControls() @@ -517,7 +517,7 @@ BOOL ImpPathDialog::IsFileOk( const DirEntry& rDirEntry ) aQueryTxt.SearchAndReplaceAscii( "%s", rDirEntry.GetFull() ); QueryBox aQuery( GetPathDialog(), WB_YES_NO | WB_DEF_YES, - aQueryTxt ); + aQueryTxt ); if( aQuery.Execute() == RET_YES ) rDirEntry.MakeDir(); else @@ -545,9 +545,9 @@ void ImpPathDialog::PreExecute() UpdateEntries( TRUE ); // Zusaetzliche Buttons anordnen - Point aPos; - Size aSize; - long nDY; + Point aPos; + Size aSize; + long nDY; if( pLoadBtn ) { aPos = pLoadBtn->GetPosPixel(); @@ -630,7 +630,7 @@ void ImpPathDialog::PreExecute() for( i = 0; i < nCount; ++i ) { DirEntry& rEntry = aDir[i]; - UniString aStr = rEntry.GetFull( FSYS_STYLE_HOST, FALSE ); + UniString aStr = rEntry.GetFull( FSYS_STYLE_HOST, FALSE ); UniString aVolume = rEntry.GetVolume() ; aStr.ToUpperAscii(); @@ -913,9 +913,9 @@ IMPL_LINK( ImpFileDialog, DblClickHdl, ListBox *, pBox ) else { UniString aFilterListMask = aFilterList.GetObject( nCurPos )->aMask; -// if( aFilterListMask.Search( ';' ) == STRING_NOTFOUND ) // kein ; in der Maske -// aMask = WildCard( aFilterListMask, '\0' ); -// else // ; muss beruecksichtigt werden +// if( aFilterListMask.Search( ';' ) == STRING_NOTFOUND ) // kein ; in der Maske +// aMask = WildCard( aFilterListMask, '\0' ); +// else // ; muss beruecksichtigt werden aMask = WildCard( aFilterListMask, ';' ); } @@ -1017,7 +1017,7 @@ void ImpFileDialog::UpdateEntries( const BOOL bWithDirs ) WildCard aTmpMask( aWildCard, ';' ); if ( nEntries ) { - UniStringList aSortDirList; + UniStringList aSortDirList; for ( USHORT n = 0; n < nEntries; n++ ) { DirEntry& rEntry = aDir[n]; @@ -1148,7 +1148,7 @@ void ImpFileDialog::SetPath( UniString const & rPath ) // Falls der Pfad eine Wildcard oder einen Filenamen enthaelt // -> abschneiden und merken - if( FileStat( aFile ).GetKind() & (FSYS_KIND_FILE | FSYS_KIND_WILD) || !aFile.Exists() ) + if( FileStat( aFile ).GetKind() & (FSYS_KIND_FILE | FSYS_KIND_WILD) || !aFile.Exists() ) { aMask = aFile.CutName(); @@ -1242,7 +1242,7 @@ void ImpFileDialog::PreExecute() { // ListBoxen erst unmittelbar vor Execute fuellen // (damit vor Execute der Pfad umgesetzt werden kann, ohne das immer die - // Listboxen sofort upgedatet werden) + // Listboxen sofort upgedatet werden) GetFileDialog()->EnterWait(); diff --git a/svtools/source/dialogs/filedlg2.hxx b/svtools/source/dialogs/filedlg2.hxx index c562840d53ef..9a5874a7fd15 100644 --- a/svtools/source/dialogs/filedlg2.hxx +++ b/svtools/source/dialogs/filedlg2.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 @@ -77,20 +77,20 @@ class ImpPathDialog friend class ImpFileDialog; private: - PathDialog* pSvPathDialog; - Edit* pEdit; + PathDialog* pSvPathDialog; + Edit* pEdit; FixedText* pDirTitel; KbdListBox* pDirList; FixedText* pDirPath; - ListBox* pDriveList; - FixedText* pDriveTitle; + ListBox* pDriveList; + FixedText* pDriveTitle; PushButton* pLoadBtn; PushButton* pOkBtn; PushButton* pCancelBtn; PushButton* pHomeBtn; PushButton* pNewDirBtn; - USHORT nOwnChilds; + USHORT nOwnChilds; DirEntry aPath; // aktuell angewaehlter Pfad USHORT nDirCount; // Anzahl der Verzeichnis- @@ -101,31 +101,31 @@ private: protected: - virtual void UpdateEntries( const BOOL bWithDirs ); - void UpdateDirs( const DirEntry& rTmpPath ); + virtual void UpdateEntries( const BOOL bWithDirs ); + void UpdateDirs( const DirEntry& rTmpPath ); - BOOL IsFileOk( const DirEntry& rDirEntry ); - void InitControls(); + BOOL IsFileOk( const DirEntry& rDirEntry ); + void InitControls(); - DECL_LINK( SelectHdl, ListBox * ); - DECL_LINK( DblClickHdl, ListBox * ); - DECL_LINK( ClickHdl, Button * ); + DECL_LINK( SelectHdl, ListBox * ); + DECL_LINK( DblClickHdl, ListBox * ); + DECL_LINK( ClickHdl, Button * ); public: ImpPathDialog( PathDialog* pDlg, RESOURCE_TYPE nType, BOOL bCreateDir ); - virtual ~ImpPathDialog(); + virtual ~ImpPathDialog(); - virtual void SetPath( const String& rPath ); - virtual void SetPath( const Edit& rEdit ); - virtual String GetPath() const; + virtual void SetPath( const String& rPath ); + virtual void SetPath( const Edit& rEdit ); + virtual String GetPath() const; - virtual void PreExecute(); - virtual void PostExecute(); + virtual void PreExecute(); + virtual void PostExecute(); - PathDialog* GetPathDialog() const { return pSvPathDialog; } + PathDialog* GetPathDialog() const { return pSvPathDialog; } - void SetOkButtonText( const String& rText ) { pOkBtn->SetText( rText ); } - void SetCancelButtonText( const String& rText ) { pCancelBtn->SetText( rText ); } + void SetOkButtonText( const String& rText ) { pOkBtn->SetText( rText ); } + void SetCancelButtonText( const String& rText ) { pCancelBtn->SetText( rText ); } }; @@ -136,48 +136,48 @@ private: FixedText* pFileTitel; ListBox* pFileList; FixedText* pTypeTitel; - ListBox* pTypeList; + ListBox* pTypeList; WildCard aMask; // aktuelle Maske - ImpFilterList aFilterList; // Filterliste + ImpFilterList aFilterList; // Filterliste USHORT nCurFilter; // aktueller Filter BOOL bOpen; // TRUE = Open; FALSE = SAVEAS protected: - void InitControls(); + void InitControls(); - String ExtendFileName( DirEntry aEntry ) const; + String ExtendFileName( DirEntry aEntry ) const; - DECL_LINK( SelectHdl, ListBox * ); - DECL_LINK( DblClickHdl, ListBox * ); - DECL_LINK( ClickHdl, Button * ); + DECL_LINK( SelectHdl, ListBox * ); + DECL_LINK( DblClickHdl, ListBox * ); + DECL_LINK( ClickHdl, Button * ); - virtual void UpdateEntries( const BOOL bWithDirs ); - BOOL IsFileOk( const DirEntry& rDirEntry ); + virtual void UpdateEntries( const BOOL bWithDirs ); + BOOL IsFileOk( const DirEntry& rDirEntry ); public: ImpFileDialog( PathDialog* pDlg, WinBits nStyle, RESOURCE_TYPE nType ); - virtual ~ImpFileDialog(); + virtual ~ImpFileDialog(); - void AddFilter( const String& rFilter, const String& rMask ); - void RemoveFilter( const String& rFilter ); - void RemoveAllFilter(); - void SetCurFilter( const String& rFilter ); - String GetCurFilter() const; + void AddFilter( const String& rFilter, const String& rMask ); + void RemoveFilter( const String& rFilter ); + void RemoveAllFilter(); + void SetCurFilter( const String& rFilter ); + String GetCurFilter() const; - USHORT GetFilterCount() const { return (USHORT)aFilterList.Count(); } - inline String GetFilterName( USHORT nPos ) const; - inline String GetFilterType( USHORT nPos ) const; + USHORT GetFilterCount() const { return (USHORT)aFilterList.Count(); } + inline String GetFilterName( USHORT nPos ) const; + inline String GetFilterType( USHORT nPos ) const; - virtual void SetPath( const String& rPath ); - virtual void SetPath( const Edit& rEdit ); - virtual String GetPath() const; + virtual void SetPath( const String& rPath ); + virtual void SetPath( const Edit& rEdit ); + virtual String GetPath() const; - virtual void PreExecute(); + virtual void PreExecute(); - FileDialog* GetFileDialog() const { return (FileDialog*)GetPathDialog(); } + FileDialog* GetFileDialog() const { return (FileDialog*)GetPathDialog(); } }; inline String ImpFileDialog::GetFilterName( USHORT nPos ) const @@ -201,17 +201,17 @@ inline String ImpFileDialog::GetFilterType( USHORT nPos ) const class ImpSvFileDlg { private: - ImpPathDialog* pDlg; + ImpPathDialog* pDlg; public: - ImpSvFileDlg() { pDlg = 0; } - ~ImpSvFileDlg() { delete pDlg; } + ImpSvFileDlg() { pDlg = 0; } + ~ImpSvFileDlg() { delete pDlg; } - ImpPathDialog* GetDialog() const { return pDlg; } - void CreateDialog( PathDialog* pCreateFrom, WinBits nStyle, RESOURCE_TYPE nType, BOOL bCreate ); + ImpPathDialog* GetDialog() const { return pDlg; } + void CreateDialog( PathDialog* pCreateFrom, WinBits nStyle, RESOURCE_TYPE nType, BOOL bCreate ); - void SetOkButtonText( const String& rText ) { pDlg->SetOkButtonText( rText ); } // ihr habts ja nicht anders gewollt - void SetCancelButtonText( const String& rText ) { pDlg->SetCancelButtonText( rText ); } + void SetOkButtonText( const String& rText ) { pDlg->SetOkButtonText( rText ); } // ihr habts ja nicht anders gewollt + void SetCancelButtonText( const String& rText ) { pDlg->SetCancelButtonText( rText ); } }; diff --git a/svtools/source/dialogs/filedlg2.src b/svtools/source/dialogs/filedlg2.src index 977a0d6f430b..6a707a9ad4a4 100644 --- a/svtools/source/dialogs/filedlg2.src +++ b/svtools/source/dialogs/filedlg2.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 diff --git a/svtools/source/dialogs/formats.src b/svtools/source/dialogs/formats.src index f8ce80f62f2f..ccd806a275b4 100644 --- a/svtools/source/dialogs/formats.src +++ b/svtools/source/dialogs/formats.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 diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx index fba9d66cdf73..b6d01b1e6c75 100644 --- a/svtools/source/dialogs/insdlg.cxx +++ b/svtools/source/dialogs/insdlg.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 @@ -58,14 +58,14 @@ using namespace ::com::sun::star; struct OleObjectDescriptor { - sal_uInt32 cbSize; - ClsId clsid; - sal_uInt32 dwDrawAspect; - Size sizel; - Point pointl; - sal_uInt32 dwStatus; - sal_uInt32 dwFullUserTypeName; - sal_uInt32 dwSrcOfCopy; + sal_uInt32 cbSize; + ClsId clsid; + sal_uInt32 dwDrawAspect; + Size sizel; + Point pointl; + sal_uInt32 dwStatus; + sal_uInt32 dwFullUserTypeName; + sal_uInt32 dwSrcOfCopy; }; /********************** SvObjectServerList ******************************** diff --git a/svtools/source/dialogs/mcvmath.cxx b/svtools/source/dialogs/mcvmath.cxx index ec3abbc88418..51ed8be19507 100644 --- a/svtools/source/dialogs/mcvmath.cxx +++ b/svtools/source/dialogs/mcvmath.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/svtools/source/dialogs/mcvmath.hxx b/svtools/source/dialogs/mcvmath.hxx index bad63f33093f..dffdea7a3d72 100644 --- a/svtools/source/dialogs/mcvmath.hxx +++ b/svtools/source/dialogs/mcvmath.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 @@ -72,10 +72,10 @@ class ColWheel; class Fix { private: - friend class FixCpx; - friend class ColWheel; + friend class FixCpx; + friend class ColWheel; -// friend Fix ImpMultBig2( const Fix& a, const Fix& b ); +// friend Fix ImpMultBig2( const Fix& a, const Fix& b ); public: long x; @@ -122,7 +122,7 @@ public: class FixCpx { -// friend FixCpx ImpMultBig2( const FixCpx& ra, const FixCpx& rb ); +// friend FixCpx ImpMultBig2( const FixCpx& ra, const FixCpx& rb ); public: Fix r; diff --git a/svtools/source/dialogs/printdlg.cxx b/svtools/source/dialogs/printdlg.cxx index 66105d262559..36c69f8451ae 100644 --- a/svtools/source/dialogs/printdlg.cxx +++ b/svtools/source/dialogs/printdlg.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,28 +65,28 @@ struct SvtPrinterImpl ~SvtPrinterImpl() { delete m_pTempPrinter; } }; -#define TEMPPRINTER() mpPrinterImpl->m_pTempPrinter +#define TEMPPRINTER() mpPrinterImpl->m_pTempPrinter // ======================================================================= PrintDialog::PrintDialog( Window* pWindow, bool bWithSheetsAndCells ) : - ModalDialog ( pWindow, SvtResId( DLG_SVT_PRNDLG_PRINTDLG ) ), - maFlPrinter ( this, SvtResId( FL_PRINTER ) ), - maFtName ( this, SvtResId( FT_NAME ) ), - maLbName ( this, SvtResId( LB_NAMES ) ), + ModalDialog ( pWindow, SvtResId( DLG_SVT_PRNDLG_PRINTDLG ) ), + maFlPrinter ( this, SvtResId( FL_PRINTER ) ), + maFtName ( this, SvtResId( FT_NAME ) ), + maLbName ( this, SvtResId( LB_NAMES ) ), maBtnProperties ( this, SvtResId( BTN_PROPERTIES ) ), - maFtStatus ( this, SvtResId( FT_STATUS ) ), - maFiStatus ( this, SvtResId( FI_STATUS ) ), - maFtType ( this, SvtResId( FT_TYPE ) ), - maFiType ( this, SvtResId( FI_TYPE ) ), - maFtLocation ( this, SvtResId( FT_LOCATION ) ), - maFiLocation ( this, SvtResId( FI_LOCATION ) ), - maFtComment ( this, SvtResId( FT_COMMENT ) ), - maFiComment ( this, SvtResId( FI_COMMENT ) ), - maCbxFilePrint ( this, SvtResId( CBX_FILEPRINT ) ), - maFiPrintFile ( this, SvtResId( FI_PRINTFILE ) ), - maFiFaxNo ( this, SvtResId( FI_FAXNO ) ), - maEdtFaxNo ( this, SvtResId( EDT_FAXNO ) ), + maFtStatus ( this, SvtResId( FT_STATUS ) ), + maFiStatus ( this, SvtResId( FI_STATUS ) ), + maFtType ( this, SvtResId( FT_TYPE ) ), + maFiType ( this, SvtResId( FI_TYPE ) ), + maFtLocation ( this, SvtResId( FT_LOCATION ) ), + maFiLocation ( this, SvtResId( FI_LOCATION ) ), + maFtComment ( this, SvtResId( FT_COMMENT ) ), + maFiComment ( this, SvtResId( FI_COMMENT ) ), + maCbxFilePrint ( this, SvtResId( CBX_FILEPRINT ) ), + maFiPrintFile ( this, SvtResId( FI_PRINTFILE ) ), + maFiFaxNo ( this, SvtResId( FI_FAXNO ) ), + maEdtFaxNo ( this, SvtResId( EDT_FAXNO ) ), maFlPrint ( this, SvtResId( FL_PRINT ) ), maRbtAllSheets ( this, SvtResId( RBT_ALL_SHEETS ) ), maRbtSelectedSheets ( this, SvtResId( RBT_SELECTED_SHEETS ) ), @@ -114,21 +114,21 @@ PrintDialog::PrintDialog( Window* pWindow, bool bWithSheetsAndCells ) : { FreeResource(); - mpPrinter = NULL; - mpPrinterImpl = new SvtPrinterImpl; - mnCopyCount = 1; - mnFirstPage = 0; - mnLastPage = 0; - mnMinPage = 1; - mnMaxPage = 65535; - meCheckRange = PRINTDIALOG_ALL; - mbAll = TRUE; - mbSelection = FALSE; - mbFromTo = FALSE; - mbRange = FALSE; + mpPrinter = NULL; + mpPrinterImpl = new SvtPrinterImpl; + mnCopyCount = 1; + mnFirstPage = 0; + mnLastPage = 0; + mnMinPage = 1; + mnMaxPage = 65535; + meCheckRange = PRINTDIALOG_ALL; + mbAll = TRUE; + mbSelection = FALSE; + mbFromTo = FALSE; + mbRange = FALSE; mbCollate = TRUE; mbCollateCheck = TRUE; - mbOptions = FALSE; + mbOptions = FALSE; maStatusTimer.SetTimeout( IMPL_PRINTDLG_STATUS_UPDATE ); maStatusTimer.SetTimeoutHdl( LINK( this, PrintDialog, ImplStatusHdl ) ); @@ -751,7 +751,7 @@ short PrintDialog::Execute() DBG_ERRORFILE( "PrinterSetupDialog::Execute() - No Printer or printer is printing" ); return FALSE; } - + // check if the printer brings up its own dialog // in that case leave the work to that dialog if( mpPrinter->GetCapabilities( PRINTER_CAPABILITIES_EXTERNALDIALOG ) ) diff --git a/svtools/source/dialogs/printdlg.hrc b/svtools/source/dialogs/printdlg.hrc index 83b7b0b28c82..7c7c283887e0 100644 --- a/svtools/source/dialogs/printdlg.hrc +++ b/svtools/source/dialogs/printdlg.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,19 +28,19 @@ #include <svtools/svtools.hrc> #define FL_PRINTER 1 -#define LB_NAMES 2 -#define BTN_PROPERTIES 3 -#define FT_NAME 4 -#define FT_STATUS 5 -#define FI_STATUS 6 -#define FT_TYPE 7 -#define FI_TYPE 8 -#define FT_LOCATION 9 -#define FI_LOCATION 10 -#define FT_COMMENT 11 -#define FI_COMMENT 12 -#define CBX_FILEPRINT 13 -#define FI_PRINTFILE 14 +#define LB_NAMES 2 +#define BTN_PROPERTIES 3 +#define FT_NAME 4 +#define FT_STATUS 5 +#define FI_STATUS 6 +#define FT_TYPE 7 +#define FI_TYPE 8 +#define FT_LOCATION 9 +#define FI_LOCATION 10 +#define FT_COMMENT 11 +#define FI_COMMENT 12 +#define CBX_FILEPRINT 13 +#define FI_PRINTFILE 14 #define FI_FAXNO 15 #define EDT_FAXNO 16 diff --git a/svtools/source/dialogs/printdlg.src b/svtools/source/dialogs/printdlg.src index 405accc63344..d110c102ebd1 100644 --- a/svtools/source/dialogs/printdlg.src +++ b/svtools/source/dialogs/printdlg.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 diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx index 3abad8dd8505..a44d5a1de2ae 100644 --- a/svtools/source/dialogs/prnsetup.cxx +++ b/svtools/source/dialogs/prnsetup.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 @@ -90,7 +90,7 @@ Printer* ImplPrnDlgListBoxSelect( ListBox* pBox, PushButton* pPropBtn, pTempPrinter = new Printer( *pInfo ); } } - + pPropBtn->Enable( pTempPrinter->HasSupport( SUPPORT_SETUPDIALOG ) ); } else @@ -156,8 +156,8 @@ static void ImplPrnDlgAddResString( XubString& rStr, USHORT nResId ) XubString ImplPrnDlgGetStatusText( const QueueInfo& rInfo ) { - XubString aStr; - ULONG nStatus = rInfo.GetStatus(); + XubString aStr; + ULONG nStatus = rInfo.GetStatus(); // Default-Printer if ( rInfo.GetPrinterName().Len() && @@ -232,32 +232,32 @@ XubString ImplPrnDlgGetStatusText( const QueueInfo& rInfo ) // ======================================================================= PrinterSetupDialog::PrinterSetupDialog( Window* pWindow ) : - ModalDialog ( pWindow, SvtResId( DLG_SVT_PRNDLG_PRNSETUPDLG ) ), - maFlPrinter ( this, SvtResId( FL_PRINTER ) ), - maFtName ( this, SvtResId( FT_NAME ) ), - maLbName ( this, SvtResId( LB_NAMES ) ), + ModalDialog ( pWindow, SvtResId( DLG_SVT_PRNDLG_PRNSETUPDLG ) ), + maFlPrinter ( this, SvtResId( FL_PRINTER ) ), + maFtName ( this, SvtResId( FT_NAME ) ), + maLbName ( this, SvtResId( LB_NAMES ) ), maBtnProperties ( this, SvtResId( BTN_PROPERTIES ) ), maBtnOptions ( this, SvtResId( BTN_OPTIONS ) ), - maFtStatus ( this, SvtResId( FT_STATUS ) ), - maFiStatus ( this, SvtResId( FI_STATUS ) ), - maFtType ( this, SvtResId( FT_TYPE ) ), - maFiType ( this, SvtResId( FI_TYPE ) ), - maFtLocation ( this, SvtResId( FT_LOCATION ) ), - maFiLocation ( this, SvtResId( FI_LOCATION ) ), - maFtComment ( this, SvtResId( FT_COMMENT ) ), - maFiComment ( this, SvtResId( FI_COMMENT ) ), - maFlSepButton ( this, SvtResId( FL_SEPBUTTON ) ), - maBtnOK ( this, SvtResId( BTN_OK ) ), - maBtnCancel ( this, SvtResId( BTN_CANCEL ) ), - maBtnHelp ( this, SvtResId( BTN_HELP ) ) + maFtStatus ( this, SvtResId( FT_STATUS ) ), + maFiStatus ( this, SvtResId( FI_STATUS ) ), + maFtType ( this, SvtResId( FT_TYPE ) ), + maFiType ( this, SvtResId( FI_TYPE ) ), + maFtLocation ( this, SvtResId( FT_LOCATION ) ), + maFiLocation ( this, SvtResId( FI_LOCATION ) ), + maFtComment ( this, SvtResId( FT_COMMENT ) ), + maFiComment ( this, SvtResId( FI_COMMENT ) ), + maFlSepButton ( this, SvtResId( FL_SEPBUTTON ) ), + maBtnOK ( this, SvtResId( BTN_OK ) ), + maBtnCancel ( this, SvtResId( BTN_CANCEL ) ), + maBtnHelp ( this, SvtResId( BTN_HELP ) ) { FreeResource(); - + // show options button only if link is set maBtnOptions.Hide(); - mpPrinter = NULL; - mpTempPrinter = NULL; + mpPrinter = NULL; + mpTempPrinter = NULL; maStatusTimer.SetTimeout( IMPL_PRINTDLG_STATUS_UPDATE ); maStatusTimer.SetTimeoutHdl( LINK( this, PrinterSetupDialog, ImplStatusHdl ) ); diff --git a/svtools/source/dialogs/prnsetup.hrc b/svtools/source/dialogs/prnsetup.hrc index 4a06c3cf0e63..164844d8dd15 100644 --- a/svtools/source/dialogs/prnsetup.hrc +++ b/svtools/source/dialogs/prnsetup.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 @@ -26,23 +26,23 @@ ************************************************************************/ #include <svtools/svtools.hrc> -#define FL_PRINTER 1 -#define LB_NAMES 2 -#define BTN_PROPERTIES 3 -#define FT_NAME 4 -#define FT_STATUS 5 -#define FI_STATUS 6 -#define FT_TYPE 7 -#define FI_TYPE 8 -#define FT_LOCATION 9 -#define FI_LOCATION 10 -#define FT_COMMENT 11 -#define FI_COMMENT 12 +#define FL_PRINTER 1 +#define LB_NAMES 2 +#define BTN_PROPERTIES 3 +#define FT_NAME 4 +#define FT_STATUS 5 +#define FI_STATUS 6 +#define FT_TYPE 7 +#define FI_TYPE 8 +#define FT_LOCATION 9 +#define FI_LOCATION 10 +#define FT_COMMENT 11 +#define FI_COMMENT 12 -#define BTN_OK 13 -#define BTN_CANCEL 14 -#define BTN_HELP 15 +#define BTN_OK 13 +#define BTN_CANCEL 14 +#define BTN_HELP 15 -#define FL_SEPBUTTON 16 +#define FL_SEPBUTTON 16 #define BTN_OPTIONS 17 diff --git a/svtools/source/dialogs/prnsetup.src b/svtools/source/dialogs/prnsetup.src index 1443a35e0f39..11b6d853c7fe 100644 --- a/svtools/source/dialogs/prnsetup.src +++ b/svtools/source/dialogs/prnsetup.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 diff --git a/svtools/source/dialogs/propctrl.cxx b/svtools/source/dialogs/propctrl.cxx index 3d0df16fe056..c69a2dc078b7 100644 --- a/svtools/source/dialogs/propctrl.cxx +++ b/svtools/source/dialogs/propctrl.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 @@ -61,32 +61,32 @@ public: SMART_UNO_DECLARATION(ImplIntrospection,UsrObject); // Methoden von XInterface - XInterface * queryInterface( Uik aUik ); - XIdlClassRef getIdlClass(); + XInterface * queryInterface( Uik aUik ); + XIdlClassRef getIdlClass(); */ // Methoden von SvPropertyDataControl - virtual void Modified( const String& aName, + virtual void Modified( const String& aName, const String& aVal, void* pData); - virtual void Clicked( const String& aName, + virtual void Clicked( const String& aName, const String& aVal, void* pData); - virtual void Commit( const String& aName, + virtual void Commit( const String& aName, const String& aVal, void* pData); - virtual void Select( const String& aName, + virtual void Select( const String& aName, void* pData); - virtual void LinkClicked(const String& aName, + virtual void LinkClicked(const String& aName, void* pData); // TODO: Das muss raus, sehr unglueckliche Schnittstelle // PropertyBox erzwingt Zustand des Controllers - virtual String GetTheCorrectProperty() const; + virtual String GetTheCorrectProperty() const; }; // Methoden von XPropertyEditor diff --git a/svtools/source/dialogs/propctrl.hxx b/svtools/source/dialogs/propctrl.hxx index bc93914af014..0e449d62ab43 100644 --- a/svtools/source/dialogs/propctrl.hxx +++ b/svtools/source/dialogs/propctrl.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 @@ -91,8 +91,8 @@ public: SMART_UNO_DECLARATION(ImplIntrospection,UsrObject); // Methoden von XInterface - XInterface * queryInterface( Uik aUik ); - XIdlClassRef getIdlClass(); + XInterface * queryInterface( Uik aUik ); + XIdlClassRef getIdlClass(); // Methoden von XPropertyEditor virtual void setObject(const UsrAny& aToInspectObj, const XubString& aObjName); diff --git a/svtools/source/dialogs/property.cxx b/svtools/source/dialogs/property.cxx index 6d93a885ec86..6a5c791aa176 100644 --- a/svtools/source/dialogs/property.cxx +++ b/svtools/source/dialogs/property.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 @@ -35,19 +35,19 @@ SvXPropertyControl::SvXPropertyControl( Window* pParent, WinBits nWinStyle) - : Control(pParent,nWinStyle) + : Control(pParent,nWinStyle) { } SvXPropertyControl::SvXPropertyControl( Window* pParent, const ResId& rResId ) - : Control(pParent,rResId ) + : Control(pParent,rResId ) { } //------------------------------------------------------------------ SvXPropertyEdit::SvXPropertyEdit( Window* pParent, WinBits nWinStyle) - : SvXPropertyControl(pParent,nWinStyle), + : SvXPropertyControl(pParent,nWinStyle), aEdit(this,WB_BORDER | WB_TABSTOP) { pListener=NULL; @@ -62,7 +62,7 @@ SvXPropertyEdit::SvXPropertyEdit( Window* pParent, WinBits nWinStyle) } SvXPropertyEdit::SvXPropertyEdit( Window* pParent, const ResId& rResId) - : SvXPropertyControl(pParent,rResId), + : SvXPropertyControl(pParent,rResId), aEdit(this,WB_BORDER | WB_TABSTOP) { pListener=NULL; @@ -176,7 +176,7 @@ IMPL_LINK( SvXPropertyEdit, LoseFocusHdl, Edit*, EMPTYARG ) //------------------------------------------------------------------ SvXPropertyListBox::SvXPropertyListBox( Window* pParent, WinBits nWinStyle) - : SvXPropertyControl(pParent,nWinStyle), + : SvXPropertyControl(pParent,nWinStyle), aListBox(this,WB_BORDER | WB_DROPDOWN | WB_TABSTOP) { pListener=NULL; @@ -190,7 +190,7 @@ SvXPropertyListBox::SvXPropertyListBox( Window* pParent, WinBits nWinStyle) } SvXPropertyListBox::SvXPropertyListBox( Window* pParent, const ResId& rResId) - : SvXPropertyControl(pParent,rResId), + : SvXPropertyControl(pParent,rResId), aListBox(this,WB_BORDER | WB_DROPDOWN | WB_TABSTOP) { pListener=NULL; @@ -305,7 +305,7 @@ IMPL_LINK( SvXPropertyListBox, LoseFocusHdl, ListBox*, EMPTYARG ) SvXPropertyComboBox::SvXPropertyComboBox( Window* pParent, WinBits nWinStyle) - : SvXPropertyControl(pParent,nWinStyle), + : SvXPropertyControl(pParent,nWinStyle), aComboBox(this,WB_BORDER | WB_DROPDOWN | WB_TABSTOP) { pListener=NULL; @@ -319,7 +319,7 @@ SvXPropertyComboBox::SvXPropertyComboBox( Window* pParent, WinBits nWinStyle) } SvXPropertyComboBox::SvXPropertyComboBox( Window* pParent, const ResId& rResId) - : SvXPropertyControl(pParent,rResId), + : SvXPropertyControl(pParent,rResId), aComboBox(this,WB_BORDER | WB_DROPDOWN | WB_TABSTOP) { pListener=NULL; @@ -369,7 +369,7 @@ void SvXPropertyComboBox::SetProperty(const String &rString) aComboBox.SetText(rString); } -String SvXPropertyComboBox::GetProperty() const +String SvXPropertyComboBox::GetProperty() const { return aComboBox.GetText(); } @@ -432,7 +432,7 @@ IMPL_LINK( SvXPropertyComboBox, LoseFocusHdl, ComboBox*, EMPTYARG ) //------------------------------------------------------------------ SvPropertyLine::SvPropertyLine( Window* pParent,WinBits nWinStyle) - : Control(pParent,nWinStyle), + : Control(pParent,nWinStyle), aName(this,WB_BORDER), pSvXPropertyControl(NULL), aXButton(this,WB_BORDER), @@ -451,10 +451,10 @@ SvPropertyLine::SvPropertyLine( Window* pParent,WinBits nWinStyle) } SvPropertyLine::SvPropertyLine( Window* pParent,const ResId& rResId ) - : Control(pParent,rResId), - aName (this,WB_BORDER), + : Control(pParent,rResId), + aName (this,WB_BORDER), pSvXPropertyControl(NULL), - aXButton (this,WB_BORDER), + aXButton (this,WB_BORDER), bIsLocked(FALSE), bIsHyperlink(FALSE) { @@ -515,8 +515,8 @@ void SvPropertyLine::Resize() aPos.X()=GetOutputSizePixel().Width() -nXButtonWidth; aSize.Width()=nXButtonWidth; - aXButton .SetSizePixel(aSize); - aXButton .SetPosPixel(aPos); + aXButton .SetSizePixel(aSize); + aXButton .SetPosPixel(aPos); } } @@ -649,7 +649,7 @@ void SvXPropEvListener::KeyInput (SvXPropertyControl *pSvXPCtr,const KeyCode& th aKeyInputLink.Call(this); } -SvXPropertyControl * SvXPropEvListener::GetPropertyControl() +SvXPropertyControl * SvXPropEvListener::GetPropertyControl() { return pTheActiveControl; } @@ -662,13 +662,13 @@ KeyCode SvXPropEvListener::GetKeyCode() const //------------------------------------------------------------------ SvListBoxForProperties::SvListBoxForProperties( Window* pParent, WinBits nWinStyle) - : Control(pParent,nWinStyle), + : Control(pParent,nWinStyle), aPlayGround(this,WB_DIALOGCONTROL), aVScroll(this,WB_VSCROLL|WB_REPEAT|WB_DRAG), pPropDataControl(NULL) { - aListener.SetModifyHdl (LINK( this, SvListBoxForProperties, ModifyHdl)); + aListener.SetModifyHdl (LINK( this, SvListBoxForProperties, ModifyHdl)); aListener.SetGetFocusHdl (LINK( this, SvListBoxForProperties, GetFocusHdl)); aListener.SetLoseFocusHdl(LINK( this, SvListBoxForProperties,LoseFocusHdl)); aListener.SetKeyInputHdl (LINK( this, SvListBoxForProperties, KeyInputHdl)); @@ -690,7 +690,7 @@ SvListBoxForProperties::SvListBoxForProperties( Window* pParent, WinBits nWinSty SvListBoxForProperties::SvListBoxForProperties( Window* pParent, const ResId& rResId ) - : Control(pParent,rResId), + : Control(pParent,rResId), aPlayGround(this,0), aVScroll(this,WB_VSCROLL|WB_REPEAT|WB_DRAG), pPropDataControl(NULL) @@ -723,9 +723,9 @@ void SvListBoxForProperties::Clear() switch(pPropLine->GetKindOfControl()) { - case KOC_LISTBOX: - case KOC_COMBOBOX: - case KOC_EDIT: delete pPropLine->GetSvXPropertyControl(); + case KOC_LISTBOX: + case KOC_COMBOBOX: + case KOC_EDIT: delete pPropLine->GetSvXPropertyControl(); break; default: break; @@ -936,9 +936,9 @@ void SvListBoxForProperties::ChangeEntry( const SvPropertyData& aPropData, USHOR switch(pPropLine->GetKindOfControl()) { - case KOC_LISTBOX: - case KOC_COMBOBOX: - case KOC_EDIT: delete pPropLine->GetSvXPropertyControl(); + case KOC_LISTBOX: + case KOC_COMBOBOX: + case KOC_EDIT: delete pPropLine->GetSvXPropertyControl(); break; default: break; @@ -946,22 +946,22 @@ void SvListBoxForProperties::ChangeEntry( const SvPropertyData& aPropData, USHOR switch(aPropData.eKind) { - case KOC_LISTBOX: + case KOC_LISTBOX: pPropLine->SetSvXPropertyControl( new SvXPropertyComboBox(pPropLine,WB_TABSTOP)); pPropLine->SetKindOfControl(aPropData.eKind); break; - case KOC_COMBOBOX: + case KOC_COMBOBOX: pPropLine->SetSvXPropertyControl( new SvXPropertyComboBox(pPropLine,WB_TABSTOP)); pPropLine->SetKindOfControl(aPropData.eKind); break; - case KOC_EDIT: + case KOC_EDIT: pPropLine->SetSvXPropertyControl( new SvXPropertyEdit(pPropLine,WB_TABSTOP)); pPropLine->SetKindOfControl(aPropData.eKind); break; - case KOC_USERDEFINED: + case KOC_USERDEFINED: pPropLine->SetSvXPropertyControl(aPropData.pControl); aPropData.pControl->SetParent(pPropLine); pPropLine->SetKindOfControl(aPropData.eKind); @@ -1131,7 +1131,7 @@ IMPL_LINK( SvListBoxForProperties, KeyInputHdl,SvXPropEvListener*, pSvXPEvL) SvTabPageForProperties::SvTabPageForProperties(Window* pParent,WinBits nWinStyle) - : TabPage(pParent,nWinStyle), + : TabPage(pParent,nWinStyle), aLbProp(this) { aLbProp.Show(); @@ -1341,9 +1341,9 @@ void SvBasicPropertyDataControl::Modified(const String& aName, aModifyLink.Call(this); } -void SvBasicPropertyDataControl::Clicked( const String& aName, +void SvBasicPropertyDataControl::Clicked( const String& aName, const String& aVal, - void* pData) //Xtension-Button pressed + void* pData) //Xtension-Button pressed { aEntryName=aName; aEntryProperty=aVal; @@ -1351,9 +1351,9 @@ void SvBasicPropertyDataControl::Clicked( const String& aName, aClickedLink.Call(this); } -void SvBasicPropertyDataControl::Commit( const String& aName, +void SvBasicPropertyDataControl::Commit( const String& aName, const String& aVal, - void* pData) //User accept changes + void* pData) //User accept changes { aEntryName=aName; aEntryProperty=aVal; @@ -1361,8 +1361,8 @@ void SvBasicPropertyDataControl::Commit( const String& aName, aCommitLink.Call(this); } -void SvBasicPropertyDataControl::Select( const String& aName, - void* pData) //User select new Row +void SvBasicPropertyDataControl::Select( const String& aName, + void* pData) //User select new Row { aEntryName=aName; pTheData=pData; @@ -1374,17 +1374,17 @@ void SvBasicPropertyDataControl::LinkClicked(const String&, void*) } -String SvBasicPropertyDataControl::GetName() const //Tell's the name of the Property +String SvBasicPropertyDataControl::GetName() const //Tell's the name of the Property { return aEntryName; } -String SvBasicPropertyDataControl::GetProperty() const //Tell's the content of the Property +String SvBasicPropertyDataControl::GetProperty() const //Tell's the content of the Property { return aEntryProperty; } -void* SvBasicPropertyDataControl::GetData() //Tell's the storage +void* SvBasicPropertyDataControl::GetData() //Tell's the storage { return pTheData; } @@ -1414,13 +1414,13 @@ void SvBasicPropertyDataControl::SetIsCorrect(BOOL nFlag) //======================================================================== /* ScPropertyDlg::ScPropertyDlg( Window* pParent) : - ModalDialog ( pParent, ScResId( RID_SCDLG_PROPERTIES) ), - aPropListBox ( this, ResId( CTR_PROPLINE) ), - aKindOfListBox (this,ResId( LB_KIND_OF_PROP)), - aModAnswer (this,ResId(FT_ANSMOD )), - aClickAnswer (this,ResId(FT_ANSCLICK )), - aCommitAnswer (this,ResId(FT_ANSCOMMIT)), - aSelectAnswer (this,ResId(FT_ANSSELECT)), + ModalDialog ( pParent, ScResId( RID_SCDLG_PROPERTIES) ), + aPropListBox ( this, ResId( CTR_PROPLINE) ), + aKindOfListBox (this,ResId( LB_KIND_OF_PROP)), + aModAnswer (this,ResId(FT_ANSMOD )), + aClickAnswer (this,ResId(FT_ANSCLICK )), + aCommitAnswer (this,ResId(FT_ANSCOMMIT)), + aSelectAnswer (this,ResId(FT_ANSSELECT)), anOk(this,ResId( BTN_OK)), aCancel(this,ResId( BTN_CANCEL)) { @@ -1435,9 +1435,9 @@ ScPropertyDlg::ScPropertyDlg( Window* pParent) : String aString("Don't know "); aBaProDatCtr.SetModifyHdl (LINK( this, ScPropertyDlg, RowModifiedHdl )); - aBaProDatCtr.SetClickedHdl(LINK( this, ScPropertyDlg, ClickHdl )); - aBaProDatCtr.SetCommitHdl (LINK( this, ScPropertyDlg, SelectHdl )); - aBaProDatCtr.SetSelectHdl (LINK( this, ScPropertyDlg, CommitHdl )); + aBaProDatCtr.SetClickedHdl(LINK( this, ScPropertyDlg, ClickHdl )); + aBaProDatCtr.SetCommitHdl (LINK( this, ScPropertyDlg, SelectHdl )); + aBaProDatCtr.SetSelectHdl (LINK( this, ScPropertyDlg, CommitHdl )); aPropListBox.SetController(&aBaProDatCtr); diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx index c700e896dce8..4f3235058ec2 100644 --- a/svtools/source/dialogs/roadmapwizard.cxx +++ b/svtools/source/dialogs/roadmapwizard.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 @@ -72,7 +72,7 @@ namespace svt StateDescriptions aStateDescriptors; StateSet aDisabledStates; bool bActivePathIsDefinite; - FixedLine* pFixedLine; + FixedLine* pFixedLine; RoadmapWizardImpl() :pRoadmap( NULL ) @@ -234,7 +234,7 @@ namespace svt } //-------------------------------------------------------------------- - const BitmapEx& RoadmapWizard::GetRoadmapBitmap( ) const + const BitmapEx& RoadmapWizard::GetRoadmapBitmap( ) const { return m_pImpl->pRoadmap->GetRoadmapBitmap(); } diff --git a/svtools/source/dialogs/so3res.src b/svtools/source/dialogs/so3res.src index 524b58e0a5df..7373f6278ebf 100644 --- a/svtools/source/dialogs/so3res.src +++ b/svtools/source/dialogs/so3res.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 @@ -28,7 +28,7 @@ #include "sores.hxx" #define __RSC #include "soerr.hxx" -#define S_MAX 0x7fff +#define S_MAX 0x7fff Resource RID_SO_ERROR_HANDLER { String ERRCODE_SO_GENERALERROR&S_MAX @@ -178,9 +178,9 @@ Resource RID_SO_ERROR_HANDLER Text [ en-US ] = "The specified file could not be opened." ; }; /* - String & S_MAX + String & S_MAX { - Text = ""; + Text = ""; }; */ }; diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx index 9068b493df9d..b66931190515 100644 --- a/svtools/source/dialogs/wizardmachine.cxx +++ b/svtools/source/dialogs/wizardmachine.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 @@ -118,7 +118,7 @@ namespace svt // the WizardDialog does not allow non-linear transitions (e.g. it's // not possible to add pages in a non-linear order), so we need some own maintainance data - sal_Bool m_bAutoNextButtonState; + sal_Bool m_bAutoNextButtonState; bool m_bTravelingSuspended; @@ -202,7 +202,7 @@ namespace svt m_pPrevPage->Show(); if (_nButtonFlags & WZB_NEXT) - AddButton( m_pPrevPage, ( WIZARDDIALOG_BUTTON_SMALLSTDOFFSET_X) ); // half x-offset to the next button + AddButton( m_pPrevPage, ( WIZARDDIALOG_BUTTON_SMALLSTDOFFSET_X) ); // half x-offset to the next button else AddButton( m_pPrevPage, WIZARDDIALOG_BUTTON_STDOFFSET_X ); SetPrevButton( m_pPrevPage ); @@ -372,14 +372,14 @@ namespace svt // is it a button? WindowType eType = pChildLoop->GetType(); - if ( (WINDOW_BUTTON == eType) - || (WINDOW_PUSHBUTTON == eType) - || (WINDOW_OKBUTTON == eType) - || (WINDOW_CANCELBUTTON == eType) - || (WINDOW_HELPBUTTON == eType) - || (WINDOW_IMAGEBUTTON == eType) - || (WINDOW_MENUBUTTON == eType) - || (WINDOW_MOREBUTTON == eType) + if ( (WINDOW_BUTTON == eType) + || (WINDOW_PUSHBUTTON == eType) + || (WINDOW_OKBUTTON == eType) + || (WINDOW_CANCELBUTTON == eType) + || (WINDOW_HELPBUTTON == eType) + || (WINDOW_IMAGEBUTTON == eType) + || (WINDOW_MENUBUTTON == eType) + || (WINDOW_MOREBUTTON == eType) ) { pChildLoop->SetStyle(pChildLoop->GetStyle() & ~WB_DEFBUTTON); @@ -745,7 +745,7 @@ namespace svt } //......................................................................... -} // namespace svt +} // namespace svt //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/dialogs/wizardmachine.src b/svtools/source/dialogs/wizardmachine.src index 9c82ea30071f..b3c7e5e1a515 100644 --- a/svtools/source/dialogs/wizardmachine.src +++ b/svtools/source/dialogs/wizardmachine.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 diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx index 6197ccb81949..e8d3c789c3cd 100644 --- a/svtools/source/dialogs/wizdlg.cxx +++ b/svtools/source/dialogs/wizdlg.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 @@ -244,7 +244,7 @@ void WizardDialog::ImplPosCtrls() long WizardDialog::LogicalCoordinateToPixel(int iCoordinate){ - Size aLocSize = LogicToPixel(Size( iCoordinate, 0 ), MAP_APPFONT ); + Size aLocSize = LogicToPixel(Size( iCoordinate, 0 ), MAP_APPFONT ); int iPixelCoordinate = aLocSize.Width(); return iPixelCoordinate; } |