diff options
Diffstat (limited to 'cui/source/inc')
80 files changed, 3039 insertions, 3039 deletions
diff --git a/cui/source/inc/ControlFocusHelper.hxx b/cui/source/inc/ControlFocusHelper.hxx index 882a80318b8a..70789226a9b1 100644 --- a/cui/source/inc/ControlFocusHelper.hxx +++ b/cui/source/inc/ControlFocusHelper.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 @@ -35,17 +35,17 @@ class SvxControlFocusHelper : public Control { private: - Control* m_pFocusCtrl; + Control* m_pFocusCtrl; public: SvxControlFocusHelper( Window* pParent, const ResId& rId ) : Control( pParent, rId ), m_pFocusCtrl( NULL ) {} - void SetFocusControl( Control* pCtrl ) { m_pFocusCtrl = pCtrl; } + void SetFocusControl( Control* pCtrl ) { m_pFocusCtrl = pCtrl; } - virtual long Notify( NotifyEvent& rNEvt ); + virtual long Notify( NotifyEvent& rNEvt ); }; -#endif // SVX_CONTROLL_FUCUS_HELPER_HXX +#endif // SVX_CONTROLL_FUCUS_HELPER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index cd7fa148462d..f10b52e065a3 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.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 @@ -81,7 +81,7 @@ private: bool m_bIsUndoEditMode; Link m_aModifyLink; - + void CallModifyLink() {m_aModifyLink.Call(this);} SpellDialog* GetSpellDialog() const {return (SpellDialog*)GetParent();} @@ -93,28 +93,28 @@ public: ~SentenceEditWindow_Impl(); void SetModifyHdl(const Link& rLink) { m_aModifyLink = rLink;} - + void SetAttrib( const TextAttrib& rAttr, ULONG nPara, USHORT nStart, USHORT nEnd ); void SetText( const String& rStr ); - - bool MarkNextError( bool bIgnoreCurrentError ); + + bool MarkNextError( bool bIgnoreCurrentError ); void ChangeMarkedWord(const String& rNewWord, LanguageType eLanguage); void MoveErrorMarkTo(USHORT nErrorStart, USHORT nErrorEnd, bool bGrammar); String GetErrorText() const; void RestoreCurrentError(); - + void SetAlternatives( com::sun::star::uno::Reference<com::sun::star::linguistic2::XSpellAlternatives> ); - + const SpellErrorDescription* GetAlternatives(); void ResetModified() { GetTextEngine()->SetModified(FALSE); m_bIsUndoEditMode = false;} BOOL IsModified() const { return GetTextEngine()->IsModified(); } - + bool IsUndoEditMode() const { return m_bIsUndoEditMode;} void SetUndoEditMode(bool bSet); - + svx::SpellPortions CreateSpellPortions( bool bSetIgnoreFlag ) const; void ResetUndo(); @@ -135,15 +135,15 @@ class SpellDialogChildWindow; class ExplainButton : public PushButton { String m_sExplanation; - + virtual void RequestHelp( const HelpEvent& rHEvt ); virtual void Click(); -public: +public: ExplainButton( Window* pParent, const ResId& rResId ) : PushButton( pParent, rResId ){} - ~ExplainButton(); + ~ExplainButton(); void SetExplanation( const String& rText ) {m_sExplanation = rText;} bool HasExplanation() { return m_sExplanation.Len() > 0;} - + }; class SpellDialog : public SfxModelessDialog @@ -152,23 +152,23 @@ class SpellDialog : public SfxModelessDialog friend class SentenceEditWindow_Impl; private: - + FixedImage aVendorImageFI; - + FixedText aLanguageFT; SvxLanguageBox aLanguageLB; - + FixedText aNotInDictFT; - SentenceEditWindow_Impl aSentenceED; - + SentenceEditWindow_Impl aSentenceED; + FixedText aSuggestionFT; ListBox aSuggestionLB; - + PushButton aIgnorePB; PushButton aIgnoreAllPB; PushButton aIgnoreRulePB; MenuButton aAddToDictMB; - + PushButton aChangePB; PushButton aChangeAllPB; ExplainButton aExplainPB; @@ -193,20 +193,20 @@ private: const String m_sTitleSpelling; const String m_sTitleSpellingGrammar; const String m_sTitleSpellingGrammarVendor; - + Size aOldWordEDSize; Link aDialogUndoLink; - + bool bModified; bool bFocusLocked; - + svx::SpellDialogChildWindow& rParent; svx::SpellPortions m_aSavedSentence; SpellDialog_Impl* pImpl; ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellChecker1 > xSpell; - LanguageType nOldLang; + ::com::sun::star::linguistic2::XSpellChecker1 > xSpell; + LanguageType nOldLang; DECL_LINK( ChangeHdl, Button * ); DECL_LINK( ChangeAllHdl, Button * ); @@ -222,7 +222,7 @@ private: DECL_LINK( DialogUndoHdl, SpellUndoAction_Impl* ); DECL_STATIC_LINK( SpellDialog, InitHdl, SpellDialog * ); - + void StartSpellOptDlg_Impl(); void InitUserDicts(); void UpdateBoxes_Impl(); @@ -231,30 +231,30 @@ private: void LockFocusChanges( bool bLock ) {bFocusLocked = bLock;} void Impl_Restore(); - void SetSelectedLang_Impl( LanguageType nLang ); - LanguageType GetSelectedLang_Impl() const; + void SetSelectedLang_Impl( LanguageType nLang ); + LanguageType GetSelectedLang_Impl() const; /** Retrieves the next sentence. */ bool GetNextSentence_Impl(bool bUseSavedSentence, bool bRechek /*for rechecking the curretn sentence*/); - /** Corrects all errors that have been selected to be changed always + /** Corrects all errors that have been selected to be changed always */ bool ApplyChangeAllList_Impl(SpellPortions& rSentence, bool& bHasReplaced); - void SetTitle_Impl(LanguageType nLang); + void SetTitle_Impl(LanguageType nLang); -protected: +protected: virtual void Paint( const Rectangle& rRect ); virtual long Notify( NotifyEvent& rNEvt ); public: - SpellDialog( + SpellDialog( svx::SpellDialogChildWindow* pChildWindow, Window * pParent, SfxBindings* pBindings); ~SpellDialog(); - void SetLanguage( sal_uInt16 nLang ); - virtual sal_Bool Close(); + void SetLanguage( sal_uInt16 nLang ); + virtual sal_Bool Close(); void InvalidateDialog(); }; diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index 85b51cefaf28..55b35cd652af 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.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 @@ -73,12 +73,12 @@ class SfxAcceleratorConfigPage; class SfxAccCfgTabListBox_Impl : public SvTabListBox { - SfxAcceleratorConfigPage* m_pAccelConfigPage; + SfxAcceleratorConfigPage* m_pAccelConfigPage; - void KeyInput( const KeyEvent &rKEvt ); + void KeyInput( const KeyEvent &rKEvt ); protected: - virtual void InitEntry( SvLBoxEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind eButtonKind ); + virtual void InitEntry( SvLBoxEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind eButtonKind ); public: SfxAccCfgTabListBox_Impl( @@ -89,7 +89,7 @@ public: m_pAccelConfigPage( pAccelConfigPage ) {} - void ReplaceEntry( USHORT nPos, const String &rStr ); + void ReplaceEntry( USHORT nPos, const String &rStr ); }; // class SfxAcceleratorConfigPage ---------------------------------------- @@ -131,31 +131,31 @@ class SfxAcceleratorConfigPage : public SfxTabPage { friend class SfxAccCfgTabListBox_Impl; private: - const SfxMacroInfoItem* m_pMacroInfoItem; - const SfxStringItem* m_pStringItem; - const SfxStringItem* m_pFontItem; + const SfxMacroInfoItem* m_pMacroInfoItem; + const SfxStringItem* m_pStringItem; + const SfxStringItem* m_pFontItem; sfx2::FileDialogHelper* m_pFileDlg; - SfxAccCfgTabListBox_Impl aEntriesBox; + SfxAccCfgTabListBox_Impl aEntriesBox; FixedLine aKeyboardGroup; - RadioButton aOfficeButton; - RadioButton aModuleButton; - PushButton aChangeButton; - PushButton aRemoveButton; - FixedText aGroupText; + RadioButton aOfficeButton; + RadioButton aModuleButton; + PushButton aChangeButton; + PushButton aRemoveButton; + FixedText aGroupText; SfxConfigGroupListBox_Impl* pGroupLBox; - FixedText aFunctionText; - SfxConfigFunctionListBox_Impl* pFunctionBox; - FixedText aKeyText; - SvTreeListBox aKeyBox; + FixedText aFunctionText; + SfxConfigFunctionListBox_Impl* pFunctionBox; + FixedText aKeyText; + SvTreeListBox aKeyBox; FixedLine aFunctionsGroup; - PushButton aLoadButton; - PushButton aSaveButton; - PushButton aResetButton; - String aLoadAccelConfigStr; - String aSaveAccelConfigStr; - String aFilterAllStr; - String aFilterCfgStr; + PushButton aLoadButton; + PushButton aSaveButton; + PushButton aResetButton; + String aLoadAccelConfigStr; + String aSaveAccelConfigStr; + String aFilterAllStr; + String aFilterCfgStr; SfxStylesInfo_Impl m_aStylesInfo; sal_Bool m_bStylesInfoInitialized; @@ -170,42 +170,42 @@ private: ::rtl::OUString m_sModuleShortName; ::rtl::OUString m_sModuleUIName; - DECL_LINK( ChangeHdl, Button * ); - DECL_LINK( RemoveHdl, Button * ); - DECL_LINK( SelectHdl, Control * ); - DECL_LINK( Save, Button * ); - DECL_LINK( Load, Button * ); - DECL_LINK( Default, PushButton * ); - DECL_LINK( RadioHdl, RadioButton* ); + DECL_LINK( ChangeHdl, Button * ); + DECL_LINK( RemoveHdl, Button * ); + DECL_LINK( SelectHdl, Control * ); + DECL_LINK( Save, Button * ); + DECL_LINK( Load, Button * ); + DECL_LINK( Default, PushButton * ); + DECL_LINK( RadioHdl, RadioButton* ); DECL_LINK( LoadHdl, sfx2::FileDialogHelper* ); DECL_LINK( SaveHdl, sfx2::FileDialogHelper* ); String GetLabel4Command(const String& sCommand); void InitAccCfg(); - KeyCode MapPosToKeyCode( USHORT nPos ) const; - USHORT MapKeyCodeToPos( const KeyCode &rCode ) const; - String GetFunctionName( KeyFuncType eType ) const; + KeyCode MapPosToKeyCode( USHORT nPos ) const; + USHORT MapKeyCodeToPos( const KeyCode &rCode ) const; + String GetFunctionName( KeyFuncType eType ) const; css::uno::Reference< css::frame::XModel > SearchForAlreadyLoadedDoc(const String& sName); void StartFileDialog( WinBits nBits, const String& rTitle ); - void Init(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& pAccMgr); - void ResetConfig(); + void Init(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& pAccMgr); + void ResetConfig(); - void CreateCustomItems( SvLBoxEntry* pEntry, const String& aCol1, const String& aCol2 ); + void CreateCustomItems( SvLBoxEntry* pEntry, const String& aCol1, const String& aCol2 ); public: SfxAcceleratorConfigPage( Window *pParent, const SfxItemSet& rItemSet ); - virtual ~SfxAcceleratorConfigPage(); + virtual ~SfxAcceleratorConfigPage(); - virtual BOOL FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet& ); + virtual BOOL FillItemSet( SfxItemSet& ); + virtual void Reset( const SfxItemSet& ); - void SelectMacro(const SfxMacroInfoItem*); + void SelectMacro(const SfxMacroInfoItem*); void Apply(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& pAccMgr); void CopySource2Target(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& xSourceAccMgr, const css::uno::Reference< css::ui::XAcceleratorConfiguration >& xTargetAccMgr); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); }; @@ -237,7 +237,7 @@ class SfxAcceleratorConfigDialog : public ModalDialog PushButton aRemoveButton; SfxAcceleratorConfigListBox aEntriesBox; FixedText aDescriptionTextText; - FixedText aDescriptionInfoText; + FixedText aDescriptionInfoText; FixedLine aKeyboardGroup; FixedText aGroupText; ListBox aGroupLBox; @@ -273,7 +273,7 @@ public: Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame, const SfxItemSet& rSet ); - virtual ~SvxShortcutAssignDlg(); + virtual ~SvxShortcutAssignDlg(); }; diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx index 6d005eba6774..0d0ce6aa8b04 100644 --- a/cui/source/inc/align.hxx +++ b/cui/source/inc/align.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 diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index d11df2b971cf..b93998a2a9f9 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.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 @@ -46,16 +46,16 @@ class SmartTagMgr; class OfaAutoCorrDlg : public SfxTabDialog { - FixedText aLanguageFT; - SvxLanguageBox aLanguageLB; + FixedText aLanguageFT; + SvxLanguageBox aLanguageLB; DECL_LINK(SelectLanguageHdl, ListBox*); public: OfaAutoCorrDlg(Window* pParent, const SfxItemSet *pSet ); - void EnableLanguage(BOOL bEnable) - { aLanguageFT.Enable(bEnable); + void EnableLanguage(BOOL bEnable) + { aLanguageFT.Enable(bEnable); aLanguageLB.Enable(bEnable);} }; @@ -78,8 +78,8 @@ class OfaACorrCheckListBox : public SvxSimpleTable using SvTreeListBox::SetCheckButtonState; protected: - virtual void SetTabs(); - virtual void HBarClick(); + virtual void SetTabs(); + virtual void HBarClick(); virtual void KeyInput( const KeyEvent& rKEvt ); public: @@ -90,10 +90,10 @@ class OfaACorrCheckListBox : public SvxSimpleTable inline void SetUserData(ULONG nPos, void *pData ) { GetEntry(nPos)->SetUserData(pData); } inline ULONG GetSelectEntryPos() { return GetModel()->GetAbsPos(FirstSelected()); } - BOOL IsChecked(ULONG nPos, USHORT nCol = 0); - void CheckEntryPos(ULONG nPos, USHORT nCol, BOOL bChecked); - SvButtonState GetCheckButtonState( SvLBoxEntry*, USHORT nCol ) const; - void SetCheckButtonState( SvLBoxEntry*, USHORT nCol, SvButtonState ); + BOOL IsChecked(ULONG nPos, USHORT nCol = 0); + void CheckEntryPos(ULONG nPos, USHORT nCol, BOOL bChecked); + SvButtonState GetCheckButtonState( SvLBoxEntry*, USHORT nCol ) const; + void SetCheckButtonState( SvLBoxEntry*, USHORT nCol, SvButtonState ); }; // class OfaAutocorrOptionsPage ------------------------------------------ @@ -104,29 +104,29 @@ class OfaAutocorrOptionsPage : public SfxTabPage using TabPage::ActivatePage; private: - SvxCheckListBox aCheckLB; - - String sInput; - String sDoubleCaps; - String sStartCap; - String sBoldUnderline; - String sURL; - String sNoDblSpaces; - String sDash; + SvxCheckListBox aCheckLB; + + String sInput; + String sDoubleCaps; + String sStartCap; + String sBoldUnderline; + String sURL; + String sNoDblSpaces; + String sDash; String sNonBrkSpace; - String sFirst; + String sFirst; String sAccidentalCaps; public: OfaAutocorrOptionsPage( Window* pParent, const SfxItemSet& rSet ); ~OfaAutocorrOptionsPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - virtual void ActivatePage( const SfxItemSet& ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); + virtual void ActivatePage( const SfxItemSet& ); }; @@ -136,45 +136,45 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage { using TabPage::ActivatePage; - OfaACorrCheckListBox aCheckLB; - PushButton aEditPB; - FixedText aHeader1Expl; - FixedText aHeader2Expl; - - String sHeader1; - String sHeader2; - - String sDeleteEmptyPara; - String sUseReplaceTbl; - String sCptlSttWord; - String sCptlSttSent; - String sUserStyle; - String sBullet; - String sByInputBullet; - String sBoldUnder; - String sNoDblSpaces; + OfaACorrCheckListBox aCheckLB; + PushButton aEditPB; + FixedText aHeader1Expl; + FixedText aHeader2Expl; + + String sHeader1; + String sHeader2; + + String sDeleteEmptyPara; + String sUseReplaceTbl; + String sCptlSttWord; + String sCptlSttSent; + String sUserStyle; + String sBullet; + String sByInputBullet; + String sBoldUnder; + String sNoDblSpaces; String sCorrectCapsLock; - String sDetectURL; + String sDetectURL; String sDash; String sNonBrkSpace; - String sOrdinal; - String sRightMargin; - String sNum; - String sBorder; - String sTable; - String sReplaceTemplates; - String sDelSpaceAtSttEnd; - String sDelSpaceBetweenLines; + String sOrdinal; + String sRightMargin; + String sNum; + String sBorder; + String sTable; + String sReplaceTemplates; + String sDelSpaceAtSttEnd; + String sDelSpaceBetweenLines; - String sMargin; - String sBulletChar; - String sByInputBulletChar; + String sMargin; + String sBulletChar; + String sByInputBulletChar; - Font aBulletFont; - Font aByInputBulletFont; - USHORT nPercent; + Font aBulletFont; + Font aByInputBulletFont; + USHORT nPercent; - SvLBoxButtonData* pCheckButtonData; + SvLBoxButtonData* pCheckButtonData; DECL_LINK(SelectHdl, OfaACorrCheckListBox*); DECL_LINK(EditHdl, PushButton*); @@ -190,27 +190,27 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage const SfxItemSet& rAttrSet); virtual BOOL FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); - virtual void ActivatePage( const SfxItemSet& ); + virtual void ActivatePage( const SfxItemSet& ); }; // class AutoCorrEdit ---------------------------------------------------- class AutoCorrEdit : public Edit { - Link aActionLink; - BOOL bSpaces; + Link aActionLink; + BOOL bSpaces; public: AutoCorrEdit(Window* pParent, const ResId& rResId) : Edit(pParent, rResId), bSpaces(FALSE){} - void SetActionHdl( const Link& rLink ) + void SetActionHdl( const Link& rLink ) { aActionLink = rLink;} - void SetSpaces(BOOL bSet) + void SetSpaces(BOOL bSet) {bSpaces = bSet;} - virtual void KeyInput( const KeyEvent& rKEvent ); + virtual void KeyInput( const KeyEvent& rKEvent ); }; // class OfaAutocorrReplacePage ------------------------------------------ @@ -225,34 +225,34 @@ class OfaAutocorrReplacePage : public SfxTabPage using TabPage::DeactivatePage; private: - CheckBox aTextOnlyCB; + CheckBox aTextOnlyCB; FixedText aShortFT; - AutoCorrEdit aShortED; + AutoCorrEdit aShortED; FixedText aReplaceFT; - AutoCorrEdit aReplaceED; - SvTabListBox aReplaceTLB; - PushButton aNewReplacePB; - PushButton aDeleteReplacePB; + AutoCorrEdit aReplaceED; + SvTabListBox aReplaceTLB; + PushButton aNewReplacePB; + PushButton aDeleteReplacePB; - String sModify; - String sNew; + String sModify; + String sNew; - SvStringsISortDtor* pFormatText; - DoubleStringTable aDoubleStringTable; - CollatorWrapper* pCompareClass; + SvStringsISortDtor* pFormatText; + DoubleStringTable aDoubleStringTable; + CollatorWrapper* pCompareClass; CharClass* pCharClass; - LanguageType eLang; + LanguageType eLang; - BOOL bHasSelectionText; - BOOL bFirstSelect:1; - BOOL bReplaceEditChanged:1; - BOOL bSWriter:1; + BOOL bHasSelectionText; + BOOL bFirstSelect:1; + BOOL bReplaceEditChanged:1; + BOOL bSWriter:1; DECL_LINK(SelectHdl, SvTabListBox*); DECL_LINK(NewDelHdl, PushButton*); DECL_LINK(ModifyHdl, Edit*); - void RefillReplaceBox(BOOL bFromReset, //Box mit neuer Sprache fuellen + void RefillReplaceBox(BOOL bFromReset, //Box mit neuer Sprache fuellen LanguageType eOldLanguage, LanguageType eNewLanguage); @@ -260,15 +260,15 @@ public: OfaAutocorrReplacePage( Window* pParent, const SfxItemSet& rSet ); ~OfaAutocorrReplacePage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - virtual void ActivatePage( const SfxItemSet& ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); + virtual void ActivatePage( const SfxItemSet& ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ); - void SetLanguage(LanguageType eSet); + void SetLanguage(LanguageType eSet); }; // class OfaAutocorrExceptPage --------------------------------------------- @@ -283,43 +283,43 @@ class OfaAutocorrExceptPage : public SfxTabPage using TabPage::DeactivatePage; private: - FixedLine aAbbrevFL; - AutoCorrEdit aAbbrevED; - ListBox aAbbrevLB; - PushButton aNewAbbrevPB; - PushButton aDelAbbrevPB; + FixedLine aAbbrevFL; + AutoCorrEdit aAbbrevED; + ListBox aAbbrevLB; + PushButton aNewAbbrevPB; + PushButton aDelAbbrevPB; CheckBox aAutoAbbrevCB; - FixedLine aDoubleCapsFL; - AutoCorrEdit aDoubleCapsED; - ListBox aDoubleCapsLB; - PushButton aNewDoublePB; - PushButton aDelDoublePB; + FixedLine aDoubleCapsFL; + AutoCorrEdit aDoubleCapsED; + ListBox aDoubleCapsLB; + PushButton aNewDoublePB; + PushButton aDelDoublePB; CheckBox aAutoCapsCB; - StringsTable aStringsTable; + StringsTable aStringsTable; CollatorWrapper* pCompareClass; - LanguageType eLang; + LanguageType eLang; DECL_LINK(NewDelHdl, PushButton*); DECL_LINK(SelectHdl, ListBox*); DECL_LINK(ModifyHdl, Edit*); - void RefillReplaceBoxes(BOOL bFromReset, //Box mit neuer Sprache fuellen + void RefillReplaceBoxes(BOOL bFromReset, //Box mit neuer Sprache fuellen LanguageType eOldLanguage, LanguageType eNewLanguage); public: OfaAutocorrExceptPage( Window* pParent, const SfxItemSet& rSet ); ~OfaAutocorrExceptPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - virtual void ActivatePage( const SfxItemSet& ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); - void SetLanguage(LanguageType eSet); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); + virtual void ActivatePage( const SfxItemSet& ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + void SetLanguage(LanguageType eSet); }; @@ -331,54 +331,54 @@ class OfaQuoteTabPage : public SfxTabPage private: // For anything but writer - SvxCheckListBox aCheckLB; + SvxCheckListBox aCheckLB; // Just for writer - OfaACorrCheckListBox aSwCheckLB; - String sHeader1; - String sHeader2; - + OfaACorrCheckListBox aSwCheckLB; + String sHeader1; + String sHeader2; + String sNonBrkSpace; String sOrdinal; + + SvLBoxButtonData* pCheckButtonData; - SvLBoxButtonData* pCheckButtonData; - - FixedLine aSingleFL; + FixedLine aSingleFL; CheckBox aSingleTypoCB; - FixedText aSglStartQuoteFT; + FixedText aSglStartQuoteFT; PushButton aSglStartQuotePB; - FixedText aSglStartExFT; - FixedText aSglEndQuoteFT; - PushButton aSglEndQuotePB; - FixedText aSglEndExFT; - PushButton aSglStandardPB; + FixedText aSglStartExFT; + FixedText aSglEndQuoteFT; + PushButton aSglEndQuotePB; + FixedText aSglEndExFT; + PushButton aSglStandardPB; - FixedLine aDoubleFL; + FixedLine aDoubleFL; CheckBox aTypoCB; - FixedText aStartQuoteFT; + FixedText aStartQuoteFT; PushButton aStartQuotePB; - FixedText aDblStartExFT; - FixedText aEndQuoteFT; - PushButton aEndQuotePB; - FixedText aDblEndExFT; - PushButton aDblStandardPB; + FixedText aDblStartExFT; + FixedText aEndQuoteFT; + PushButton aEndQuotePB; + FixedText aDblEndExFT; + PushButton aDblStandardPB; - String sStartQuoteDlg; - String sEndQuoteDlg; + String sStartQuoteDlg; + String sEndQuoteDlg; - String sStandard; + String sStandard; - sal_UCS4 cSglStartQuote; - sal_UCS4 cSglEndQuote; + sal_UCS4 cSglStartQuote; + sal_UCS4 cSglEndQuote; - sal_UCS4 cStartQuote; - sal_UCS4 cEndQuote; + sal_UCS4 cStartQuote; + sal_UCS4 cEndQuote; DECL_LINK( QuoteHdl, PushButton* ); DECL_LINK( StdQuoteHdl, PushButton* ); - String ChangeStringExt_Impl( sal_UCS4 ); + String ChangeStringExt_Impl( sal_UCS4 ); SvLBoxEntry* CreateEntry(String& rTxt, USHORT nCol); @@ -386,12 +386,12 @@ private: public: ~OfaQuoteTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - virtual void ActivatePage( const SfxItemSet& ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); + virtual void ActivatePage( const SfxItemSet& ); }; // class OfaAutoCompleteTabPage --------------------------------------------- @@ -420,15 +420,15 @@ class OfaAutoCompleteTabPage : public SfxTabPage //--removed--CheckBox aCBEndless;// FixedText aFTExpandKey; - ListBox aDCBExpandKey; + ListBox aDCBExpandKey; FixedText aFTMinWordlen; NumericField aNFMinWordlen; FixedText aFTMaxEntries; NumericField aNFMaxEntries; AutoCompleteMultiListBox aLBEntries; - PushButton aPBEntries; - SvStringsISortDtor* pAutoCmpltList; - USHORT nAutoCmpltListCnt; + PushButton aPBEntries; + SvStringsISortDtor* pAutoCmpltList; + USHORT nAutoCmpltListCnt; DECL_LINK( CheckHdl, CheckBox* ); @@ -437,12 +437,12 @@ class OfaAutoCompleteTabPage : public SfxTabPage public: virtual ~OfaAutoCompleteTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - virtual void ActivatePage( const SfxItemSet& ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); + virtual void ActivatePage( const SfxItemSet& ); void CopyToClipboard() const; DECL_LINK( DeleteHdl, PushButton* ); @@ -459,23 +459,23 @@ class OfaSmartTagOptionsTabPage : public SfxTabPage using TabPage::ActivatePage; private: - + // controls - CheckBox m_aMainCB; - SvxCheckListBox m_aSmartTagTypesLB; - PushButton m_aPropertiesPB; - FixedText m_aTitleFT; + CheckBox m_aMainCB; + SvxCheckListBox m_aSmartTagTypesLB; + PushButton m_aPropertiesPB; + FixedText m_aTitleFT; // construction via Create() - OfaSmartTagOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); - + OfaSmartTagOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); + /** Inserts items into m_aSmartTagTypesLB - + Reads out the smart tag types supported by the SmartTagMgr and inserts the associated strings into the list box. */ void FillListBox( const SmartTagMgr& rSmartTagMgr ); - + /** Clears the m_aSmartTagTypesLB */ void ClearListBox(); @@ -486,7 +486,7 @@ private: check box. */ DECL_LINK( CheckHdl, CheckBox* ); - + /** Handler for the push button Calls the displayPropertyPage function of the smart tag recognizer @@ -500,16 +500,16 @@ private: smart tag types list box changes. */ DECL_LINK( SelectHdl, SvxCheckListBox* ); - + public: virtual ~OfaSmartTagOptionsTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - virtual void ActivatePage( const SfxItemSet& ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); + virtual void ActivatePage( const SfxItemSet& ); }; #endif // _OFA_AUTOCDLG_CXX diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index ce6eccbfa78f..9ec0548b8e30 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.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 @@ -73,7 +73,7 @@ public: void ShowTblControl(); // fuer den Writer (Zellen/Zeilen/Tabelle) void ShowParaControl(BOOL bCharOnly = FALSE); // fuer den Writer (Absatz/Zeichen) void EnableTransparency(BOOL bColor, BOOL bGraphic); - virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 + virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 protected: virtual int DeactivatePage( SfxItemSet* pSet = 0 ); @@ -82,7 +82,7 @@ private: ~SvxBackgroundTabPage(); // Hintergrundfarbe ------------------------------------ - Control aBorderWin; + Control aBorderWin; ValueSet aBackgroundColorSet; FixedLine aBackgroundColorBox; BackgroundPreviewImpl* pPreviewWin1; @@ -115,14 +115,14 @@ private: FixedText aTblDesc; ListBox aTblLBox; - ListBox aParaLBox; + ListBox aParaLBox; //------------------------------------------------------ - Color aBgdColor; - USHORT nHtmlMode; - BOOL bAllowShowSelector : 1; - BOOL bIsGraphicValid : 1; - BOOL bLinkOnly : 1; + Color aBgdColor; + USHORT nHtmlMode; + BOOL bAllowShowSelector : 1; + BOOL bIsGraphicValid : 1; + BOOL bLinkOnly : 1; BOOL bResized : 1; BOOL bColTransparency : 1; BOOL bGraphTransparency : 1; @@ -134,9 +134,9 @@ private: SvxOpenGraphicDialog* pImportDlg; // Items fuer Sw-Tabelle muessen gesammelt werden - SvxBackgroundTable_Impl* pTableBck_Impl; + SvxBackgroundTable_Impl* pTableBck_Impl; // auch fuer die Absatzvorlage - SvxBackgroundPara_Impl* pParaBck_Impl; + SvxBackgroundPara_Impl* pParaBck_Impl; #ifdef _SVX_BACKGRND_CXX void FillColorValueSets_Impl(); @@ -146,10 +146,10 @@ private: void RaiseLoadError_Impl(); void SetGraphicPosition_Impl( SvxGraphicPosition ePos ); SvxGraphicPosition GetGraphicPosition_Impl(); - void FillControls_Impl(const SvxBrushItem& rBgdAttr, + void FillControls_Impl(const SvxBrushItem& rBgdAttr, const String& rUserData); - BOOL FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, USHORT nSlot); - void ResetFromWallpaperItem( const SfxItemSet& rSet ); + BOOL FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, USHORT nSlot); + void ResetFromWallpaperItem( const SfxItemSet& rSet ); DECL_LINK( LoadTimerHdl_Impl, Timer* ); DECL_LINK( SelectHdl_Impl, ListBox* ); diff --git a/cui/source/inc/bbdlg.hxx b/cui/source/inc/bbdlg.hxx index 73f3bc66a122..08bb80b17d2e 100644 --- a/cui/source/inc/bbdlg.hxx +++ b/cui/source/inc/bbdlg.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 @@ -33,23 +33,23 @@ #include <sfx2/tabdlg.hxx> /*-------------------------------------------------------------------- - Beschreibung: Border Background Pages buendeln + Beschreibung: Border Background Pages buendeln --------------------------------------------------------------------*/ class SvxBorderBackgroundDlg: public SfxTabDialog { public: - SvxBorderBackgroundDlg( Window *pParent, + SvxBorderBackgroundDlg( Window *pParent, const SfxItemSet& rCoreSet, BOOL bEnableSelector = FALSE ); ~SvxBorderBackgroundDlg(); protected: - virtual void PageCreated( USHORT nPageId, SfxTabPage& rTabPage ); + virtual void PageCreated( USHORT nPageId, SfxTabPage& rTabPage ); private: - BOOL bEnableBackgroundSelector; // fuer Border/Background-Dlg + BOOL bEnableBackgroundSelector; // fuer Border/Background-Dlg }; diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index 7b4e7fab3b62..48ef3eef690f 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.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 @@ -51,17 +51,17 @@ class SvxBorderTabPage : public SfxTabPage using TabPage::DeactivatePage; public: - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - static USHORT* GetRanges(); + static USHORT* GetRanges(); - virtual BOOL FillItemSet( SfxItemSet& rCoreAttrs ); - virtual void Reset( const SfxItemSet& ); + virtual BOOL FillItemSet( SfxItemSet& rCoreAttrs ); + virtual void Reset( const SfxItemSet& ); - void HideShadowControls(); - virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 + void HideShadowControls(); + virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 protected: - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); private: @@ -69,38 +69,38 @@ private: ~SvxBorderTabPage(); // Controls - FixedLine aFlBorder; + FixedLine aFlBorder; FixedText aDefaultFT; ValueSet aWndPresets; FixedText aUserDefFT; svx::FrameSelector aFrameSel; FixedLine aFlSep1; - FixedLine aFlLine; + FixedLine aFlLine; FixedText aStyleFT; LineListBox aLbLineStyle; FixedText aColorFT; - ColorListBox aLbLineColor; + ColorListBox aLbLineColor; FixedLine aFlSep2; - FixedLine aDistanceFL; - FixedText aLeftFT; - MetricField aLeftMF; - FixedText aRightFT; - MetricField aRightMF; - FixedText aTopFT; - MetricField aTopMF; - FixedText aBottomFT; - MetricField aBottomMF; - CheckBox aSynchronizeCB; - - FixedLine aFlShadow; - FixedText aFtShadowPos; - ValueSet aWndShadows; - FixedText aFtShadowSize; - MetricField aEdShadowSize; - FixedText aFtShadowColor; - ColorListBox aLbShadowColor; + FixedLine aDistanceFL; + FixedText aLeftFT; + MetricField aLeftMF; + FixedText aRightFT; + MetricField aRightMF; + FixedText aTopFT; + MetricField aTopMF; + FixedText aBottomFT; + MetricField aBottomMF; + CheckBox aSynchronizeCB; + + FixedLine aFlShadow; + FixedText aFtShadowPos; + ValueSet aWndShadows; + FixedText aFtShadowSize; + MetricField aEdShadowSize; + FixedText aFtShadowColor; + ColorListBox aLbShadowColor; //properties - "Merge with next paragraph" in Writer FixedLine aPropertiesFL; @@ -114,8 +114,8 @@ private: ImageList aBorderImgLstH; ImageList aBorderImgLst; - long nMinValue; // minimum distance - int nSWMode; // table, textframe, paragraph + long nMinValue; // minimum distance + int nSWMode; // table, textframe, paragraph bool mbHorEnabled; /// true = Inner horizontal border enabled. bool mbVerEnabled; /// true = Inner vertical border enabled. @@ -123,7 +123,7 @@ private: bool mbBLTREnabled; /// true = Bottom-left to top-right border enabled. bool mbUseMarginItem; - static BOOL bSync; + static BOOL bSync; #ifdef _SVX_BORDER_CXX // Handler @@ -143,7 +143,7 @@ private: void FillValueSets(); // Filler - void FillLineListBox_Impl(); + void FillLineListBox_Impl(); // Setzen von einzelnen Frame-/Core-Linien void ResetFrameLine_Impl( svx::FrameBorderType eBorder, diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 5a84b2a98c14..ccc45bba70d0 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.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 @@ -52,7 +52,7 @@ #define _SVSTDARR_USHORTS #define _SVSTDARR_STRINGSDTOR -#include <svl/svstdarr.hxx> // SvUShorts +#include <svl/svstdarr.hxx> // SvUShorts #include <sfx2/minarray.hxx> #include <sfx2/tabdlg.hxx> #include <vector> @@ -78,8 +78,8 @@ public: void ActivateTabPage( USHORT ); - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); - virtual short Ok(); + virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual short Ok(); void SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame); }; @@ -88,10 +88,10 @@ class SaveInData : public ImageProvider { private: - bool bModified; + bool bModified; - bool bDocConfig; - bool bReadOnly; + bool bDocConfig; + bool bReadOnly; ::com::sun::star::uno::Reference < com::sun::star::ui::XUIConfigurationManager > m_xCfgMgr; @@ -137,7 +137,7 @@ public: ::com::sun::star::uno::Reference < ::com::sun::star::ui::XUIConfigurationManager > GetParentConfigManager() { return m_xParentCfgMgr; }; - + ::com::sun::star::uno::Reference < ::com::sun::star::ui::XImageManager > GetImageManager() { return m_xImgMgr; }; @@ -172,13 +172,13 @@ class MenuSaveInData : public SaveInData { private: - rtl::OUString m_aMenuResourceURL; - rtl::OUString m_aDescriptorContainer; + rtl::OUString m_aMenuResourceURL; + rtl::OUString m_aDescriptorContainer; ::com::sun::star::uno::Reference < com::sun::star::container::XIndexAccess > m_xMenuSettings; - SvxConfigEntry* pRootEntry; + SvxConfigEntry* pRootEntry; // static holder of the default menu data static MenuSaveInData* pDefaultData; @@ -186,9 +186,9 @@ private: static void SetDefaultData( MenuSaveInData* pData ) {pDefaultData = pData;} static MenuSaveInData* GetDefaultData() { return pDefaultData; } - void Apply( bool bDefault ); + void Apply( bool bDefault ); - void Apply( + void Apply( SvxConfigEntry* pRootEntry, com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer >& rNewMenuBar, @@ -196,14 +196,14 @@ private: com::sun::star::lang::XSingleComponentFactory >& rFactory, SvLBoxEntry *pParent = NULL ); - void ApplyMenu( + void ApplyMenu( com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer >& rNewMenuBar, com::sun::star::uno::Reference< com::sun::star::lang::XSingleComponentFactory >& rFactory, SvxConfigEntry *pMenuData = NULL ); - bool LoadSubMenus( + bool LoadSubMenus( const ::com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& xMenuBarSettings, const rtl::OUString& rBaseTitle, SvxConfigEntry* pParentData ); @@ -221,12 +221,12 @@ public: ~MenuSaveInData(); // methods inherited from SaveInData - SvxEntries* GetEntries(); - void SetEntries( SvxEntries* ); - bool HasURL( const rtl::OUString& URL ) { (void)URL; return FALSE; } - bool HasSettings() { return m_xMenuSettings.is(); } - void Reset(); - bool Apply(); + SvxEntries* GetEntries(); + void SetEntries( SvxEntries* ); + bool HasURL( const rtl::OUString& URL ) { (void)URL; return FALSE; } + bool HasSettings() { return m_xMenuSettings.is(); } + void Reset(); + bool Apply(); }; class SvxConfigEntry @@ -234,28 +234,28 @@ class SvxConfigEntry private: // common properties - USHORT nId; - ::rtl::OUString aHelpText; - ::rtl::OUString aLabel; - ::rtl::OUString aCommand; - ::rtl::OUString aHelpURL; + USHORT nId; + ::rtl::OUString aHelpText; + ::rtl::OUString aLabel; + ::rtl::OUString aCommand; + ::rtl::OUString aHelpURL; bool bPopUp; bool bStrEdited; - bool bIsUserDefined; - bool bIsMain; - bool bIsDeletable; - bool bIsMovable; + bool bIsUserDefined; + bool bIsMain; + bool bIsDeletable; + bool bIsMovable; bool bIsParentData; // toolbar specific properties - bool bIsVisible; - sal_Int32 nStyle; + bool bIsVisible; + sal_Int32 nStyle; ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > xBackupGraphic; - SvxEntries *pEntries; + SvxEntries *pEntries; public: @@ -271,7 +271,7 @@ public: bool bParentData = FALSE ); SvxConfigEntry() - : + : nId( 0 ), bPopUp( FALSE ), bStrEdited( FALSE ), @@ -285,46 +285,46 @@ public: ~SvxConfigEntry(); - const ::rtl::OUString& GetCommand() const { return aCommand; } - void SetCommand( const String& rCmd ) { aCommand = rCmd; } + const ::rtl::OUString& GetCommand() const { return aCommand; } + void SetCommand( const String& rCmd ) { aCommand = rCmd; } - const ::rtl::OUString& GetName() const { return aLabel; } - void SetName( const String& rStr ) { aLabel = rStr; bStrEdited = TRUE; } - bool HasChangedName() const { return bStrEdited; } + const ::rtl::OUString& GetName() const { return aLabel; } + void SetName( const String& rStr ) { aLabel = rStr; bStrEdited = TRUE; } + bool HasChangedName() const { return bStrEdited; } - const ::rtl::OUString& GetHelpText() ; - void SetHelpText( const String& rStr ) { aHelpText = rStr; } + const ::rtl::OUString& GetHelpText() ; + void SetHelpText( const String& rStr ) { aHelpText = rStr; } - const ::rtl::OUString& GetHelpURL() const { return aHelpURL; } - void SetHelpURL( const String& rStr ) { aHelpURL = rStr; } + const ::rtl::OUString& GetHelpURL() const { return aHelpURL; } + void SetHelpURL( const String& rStr ) { aHelpURL = rStr; } - void SetPopup( bool bOn = TRUE ) { bPopUp = bOn; } - bool IsPopup() const { return bPopUp; } + void SetPopup( bool bOn = TRUE ) { bPopUp = bOn; } + bool IsPopup() const { return bPopUp; } - void SetUserDefined( bool bOn = TRUE ) { bIsUserDefined = bOn; } - bool IsUserDefined() const { return bIsUserDefined; } + void SetUserDefined( bool bOn = TRUE ) { bIsUserDefined = bOn; } + bool IsUserDefined() const { return bIsUserDefined; } - bool IsBinding() const { return !bPopUp; } - bool IsSeparator() const { return nId == 0; } + bool IsBinding() const { return !bPopUp; } + bool IsSeparator() const { return nId == 0; } - SvxEntries* GetEntries() const { return pEntries; } - void SetEntries( SvxEntries* entries ) { pEntries = entries; } - bool HasEntries() const { return pEntries != NULL; } + SvxEntries* GetEntries() const { return pEntries; } + void SetEntries( SvxEntries* entries ) { pEntries = entries; } + bool HasEntries() const { return pEntries != NULL; } - void SetMain( bool bValue = TRUE ) { bIsMain = bValue; } - bool IsMain() { return bIsMain; } + void SetMain( bool bValue = TRUE ) { bIsMain = bValue; } + bool IsMain() { return bIsMain; } void SetParentData( bool bValue = TRUE ) { bIsParentData = bValue; } bool IsParentData() { return bIsParentData; } - bool IsMovable(); - bool IsDeletable(); - bool IsRenamable(); + bool IsMovable(); + bool IsDeletable(); + bool IsRenamable(); - void SetVisible( bool b ) { bIsVisible = b; } - bool IsVisible() const { return bIsVisible; } + void SetVisible( bool b ) { bIsVisible = b; } + bool IsVisible() const { return bIsVisible; } - void SetBackupGraphic( + void SetBackupGraphic( ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > graphic ) { xBackupGraphic = graphic; } @@ -334,10 +334,10 @@ public: GetBackupGraphic() { return xBackupGraphic; } - bool IsIconModified() { return xBackupGraphic.is(); } + bool IsIconModified() { return xBackupGraphic.is(); } - sal_Int32 GetStyle() { return nStyle; } - void SetStyle( sal_Int32 style ) { nStyle = style; } + sal_Int32 GetStyle() { return nStyle; } + void SetStyle( sal_Int32 style ) { nStyle = style; } com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > GetProperties( @@ -348,38 +348,38 @@ public: class SvxMenuEntriesListBox : public SvTreeListBox { private: - SvxConfigPage* pPage; + SvxConfigPage* pPage; protected: - bool m_bIsInternalDrag; + bool m_bIsInternalDrag; public: SvxMenuEntriesListBox( Window*, const ResId& ); ~SvxMenuEntriesListBox(); - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual BOOL NotifyAcceptDrop( SvLBoxEntry* pEntry ); + virtual BOOL NotifyAcceptDrop( SvLBoxEntry* pEntry ); - virtual BOOL NotifyMoving( SvLBoxEntry*, SvLBoxEntry*, + virtual BOOL NotifyMoving( SvLBoxEntry*, SvLBoxEntry*, SvLBoxEntry*&, ULONG& ); - virtual BOOL NotifyCopying( SvLBoxEntry*, SvLBoxEntry*, + virtual BOOL NotifyCopying( SvLBoxEntry*, SvLBoxEntry*, SvLBoxEntry*&, ULONG&); - virtual DragDropMode NotifyStartDrag( + virtual DragDropMode NotifyStartDrag( TransferDataContainer&, SvLBoxEntry* ); - virtual void DragFinished( sal_Int8 ); + virtual void DragFinished( sal_Int8 ); - void KeyInput( const KeyEvent& rKeyEvent ); + void KeyInput( const KeyEvent& rKeyEvent ); }; class SvxDescriptionEdit : public ExtMultiLineEdit { private: Rectangle m_aRealRect; - + public: SvxDescriptionEdit( Window* pParent, const ResId& _rId ); inline ~SvxDescriptionEdit() {} @@ -392,8 +392,8 @@ class SvxConfigPage : public SfxTabPage { private: - bool bInitialised; - SaveInData* pCurrentSaveInData; + bool bInitialised; + SaveInData* pCurrentSaveInData; DECL_LINK( SelectSaveInLocation, ListBox * ); DECL_LINK( AsyncInfoMsg, String* ); @@ -405,34 +405,34 @@ protected: // the top section of the tab page where top level menus and toolbars // are displayed in a listbox - FixedLine aTopLevelSeparator; - FixedText aTopLevelLabel; - ListBox aTopLevelListBox; - PushButton aNewTopLevelButton; - MenuButton aModifyTopLevelButton; + FixedLine aTopLevelSeparator; + FixedText aTopLevelLabel; + ListBox aTopLevelListBox; + PushButton aNewTopLevelButton; + MenuButton aModifyTopLevelButton; // the contents section where the contents of the selected // menu or toolbar are displayed - FixedLine aContentsSeparator; - FixedText aContentsLabel; - SvTreeListBox* aContentsListBox; + FixedLine aContentsSeparator; + FixedText aContentsLabel; + SvTreeListBox* aContentsListBox; - PushButton aAddCommandsButton; - MenuButton aModifyCommandButton; + PushButton aAddCommandsButton; + MenuButton aModifyCommandButton; - ImageButton aMoveUpButton; - ImageButton aMoveDownButton; + ImageButton aMoveUpButton; + ImageButton aMoveDownButton; - FixedText aSaveInText; - ListBox aSaveInListBox; + FixedText aSaveInText; + ListBox aSaveInListBox; FixedText aDescriptionLabel; SvxDescriptionEdit aDescriptionField; - SvxScriptSelectorDialog* pSelectorDlg; + SvxScriptSelectorDialog* pSelectorDlg; // the ResourceURL to select when opening the dialog - rtl::OUString m_aURLToSelect; + rtl::OUString m_aURLToSelect; ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame > m_xFrame; @@ -450,49 +450,49 @@ protected: const rtl::OUString& aModuleId, bool docConfig ) = 0; - virtual void Init() = 0; - virtual void UpdateButtonStates() = 0; - virtual short QueryReset() = 0; + virtual void Init() = 0; + virtual void UpdateButtonStates() = 0; + virtual short QueryReset() = 0; - void PositionContentsListBox(); + void PositionContentsListBox(); - SvLBoxEntry* InsertEntry( SvxConfigEntry* pNewEntryData, + SvLBoxEntry* InsertEntry( SvxConfigEntry* pNewEntryData, SvLBoxEntry* pTarget = NULL, bool bFront = FALSE ); - void AddSubMenusToUI( const String& rBaseTitle, + void AddSubMenusToUI( const String& rBaseTitle, SvxConfigEntry* pParentData ); - SvLBoxEntry* InsertEntryIntoUI ( SvxConfigEntry* pNewEntryData, + SvLBoxEntry* InsertEntryIntoUI ( SvxConfigEntry* pNewEntryData, ULONG nPos = LIST_APPEND ); - SvxEntries* FindParentForChild( SvxEntries* pParentEntries, + SvxEntries* FindParentForChild( SvxEntries* pParentEntries, SvxConfigEntry* pChildData ); - void ReloadTopLevelListBox( SvxConfigEntry* pSelection = NULL ); + void ReloadTopLevelListBox( SvxConfigEntry* pSelection = NULL ); public: - static bool CanConfig( const ::rtl::OUString& rModuleId ); + static bool CanConfig( const ::rtl::OUString& rModuleId ); - SaveInData* GetSaveInData() { return pCurrentSaveInData; } + SaveInData* GetSaveInData() { return pCurrentSaveInData; } - SvLBoxEntry* AddFunction( SvLBoxEntry* pTarget = NULL, + SvLBoxEntry* AddFunction( SvLBoxEntry* pTarget = NULL, bool bFront = FALSE, bool bAllowDuplicates = FALSE ); - virtual void MoveEntry( bool bMoveUp ); + virtual void MoveEntry( bool bMoveUp ); - bool MoveEntryData( SvLBoxEntry* pSourceEntry, + bool MoveEntryData( SvLBoxEntry* pSourceEntry, SvLBoxEntry* pTargetEntry ); - BOOL FillItemSet( SfxItemSet& ); - void Reset( const SfxItemSet& ); + BOOL FillItemSet( SfxItemSet& ); + void Reset( const SfxItemSet& ); - virtual bool DeleteSelectedContent() = 0; - virtual void DeleteSelectedTopLevel() = 0; + virtual bool DeleteSelectedContent() = 0; + virtual void DeleteSelectedTopLevel() = 0; - SvxConfigEntry* GetTopLevelSelection() + SvxConfigEntry* GetTopLevelSelection() { return (SvxConfigEntry*) aTopLevelListBox.GetEntryData( aTopLevelListBox.GetSelectEntryPos() ); @@ -524,11 +524,11 @@ private: DECL_LINK( AddCommandsHdl, Button * ); DECL_LINK( AddFunctionHdl, SvxScriptSelectorDialog * ); - void Init(); - void UpdateButtonStates(); - short QueryReset(); - bool DeleteSelectedContent(); - void DeleteSelectedTopLevel(); + void Init(); + void UpdateButtonStates(); + short QueryReset(); + bool DeleteSelectedContent(); + void DeleteSelectedTopLevel(); public: SvxMenuConfigPage( Window *pParent, const SfxItemSet& rItemSet ); @@ -545,19 +545,19 @@ public: class SvxMainMenuOrganizerDialog : public ModalDialog { - FixedText aMenuNameText; - Edit aMenuNameEdit; - FixedText aMenuListText; - SvTreeListBox aMenuListBox; - ImageButton aMoveUpButton; - ImageButton aMoveDownButton; - OKButton aOKButton; - CancelButton aCloseButton; - HelpButton aHelpButton; - - SvxEntries* pEntries; - SvLBoxEntry* pNewMenuEntry; - bool bModified; + FixedText aMenuNameText; + Edit aMenuNameEdit; + FixedText aMenuListText; + SvTreeListBox aMenuListBox; + ImageButton aMoveUpButton; + ImageButton aMoveDownButton; + OKButton aOKButton; + CancelButton aCloseButton; + HelpButton aHelpButton; + + SvxEntries* pEntries; + SvLBoxEntry* pNewMenuEntry; + bool bModified; void UpdateButtonStates(); @@ -572,27 +572,27 @@ public: ~SvxMainMenuOrganizerDialog (); - SvxEntries* GetEntries(); - void SetEntries( SvxEntries* ); - SvxConfigEntry* GetSelectedEntry(); + SvxEntries* GetEntries(); + void SetEntries( SvxEntries* ); + SvxConfigEntry* GetSelectedEntry(); }; class SvxToolbarEntriesListBox : public SvxMenuEntriesListBox { - Size m_aCheckBoxImageSizePixel; - Link m_aChangedListener; - SvLBoxButtonData* m_pButtonData; - BOOL m_bHiContrastMode; - SvxConfigPage* pPage; + Size m_aCheckBoxImageSizePixel; + Link m_aChangedListener; + SvLBoxButtonData* m_pButtonData; + BOOL m_bHiContrastMode; + SvxConfigPage* pPage; - void ChangeVisibility( SvLBoxEntry* pEntry ); + void ChangeVisibility( SvLBoxEntry* pEntry ); protected: - virtual void CheckButtonHdl(); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - void BuildCheckBoxButtonImages( SvLBoxButtonData* ); - Image GetSizedImage( + virtual void CheckButtonHdl(); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); + void BuildCheckBoxButtonImages( SvLBoxButtonData* ); + Image GetSizedImage( VirtualDevice& aDev, const Size& aNewSize, const Image& aImage ); public: @@ -602,21 +602,21 @@ public: ~SvxToolbarEntriesListBox(); - void SetChangedListener( const Link& aChangedListener ) + void SetChangedListener( const Link& aChangedListener ) { m_aChangedListener = aChangedListener; } - const Link& GetChangedListener() const { return m_aChangedListener; } + const Link& GetChangedListener() const { return m_aChangedListener; } - Size GetCheckBoxPixelSize() const + Size GetCheckBoxPixelSize() const { return m_aCheckBoxImageSizePixel; } - virtual BOOL NotifyMoving( + virtual BOOL NotifyMoving( SvLBoxEntry*, SvLBoxEntry*, SvLBoxEntry*&, ULONG& ); - virtual BOOL NotifyCopying( + virtual BOOL NotifyCopying( SvLBoxEntry*, SvLBoxEntry*, SvLBoxEntry*&, ULONG&); - void KeyInput( const KeyEvent& rKeyEvent ); + void KeyInput( const KeyEvent& rKeyEvent ); }; class SvxToolbarConfigPage : public SvxConfigPage @@ -632,23 +632,23 @@ private: DECL_LINK( AddFunctionHdl, SvxScriptSelectorDialog * ); DECL_LINK( MoveHdl, Button * ); - void UpdateButtonStates(); - short QueryReset(); - void Init(); - bool DeleteSelectedContent(); - void DeleteSelectedTopLevel(); + void UpdateButtonStates(); + short QueryReset(); + void Init(); + bool DeleteSelectedContent(); + void DeleteSelectedTopLevel(); public: SvxToolbarConfigPage( Window *pParent, const SfxItemSet& rItemSet ); ~SvxToolbarConfigPage(); - SvLBoxEntry* AddFunction( SvLBoxEntry* pTarget = NULL, + SvLBoxEntry* AddFunction( SvLBoxEntry* pTarget = NULL, bool bFront = FALSE, bool bAllowDuplicates = TRUE ); - void MoveEntry( bool bMoveUp ); + void MoveEntry( bool bMoveUp ); - SaveInData* CreateSaveInData( + SaveInData* CreateSaveInData( const ::com::sun::star::uno::Reference < ::com::sun::star::ui::XUIConfigurationManager >&, const ::com::sun::star::uno::Reference < @@ -661,18 +661,18 @@ class ToolbarSaveInData : public SaveInData { private: - SvxConfigEntry* pRootEntry; - rtl::OUString m_aDescriptorContainer; + SvxConfigEntry* pRootEntry; + rtl::OUString m_aDescriptorContainer; ::com::sun::star::uno::Reference < com::sun::star::container::XNameAccess > m_xPersistentWindowState; - bool LoadToolbar( + bool LoadToolbar( const ::com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& xToolBarSettings, SvxConfigEntry* pParentData ); - void ApplyToolbar( + void ApplyToolbar( com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer >& rNewToolbarBar, com::sun::star::uno::Reference< @@ -691,41 +691,41 @@ public: ~ToolbarSaveInData(); - void CreateToolbar( SvxConfigEntry* pToolbar ); - void RestoreToolbar( SvxConfigEntry* pToolbar ); - void RemoveToolbar( SvxConfigEntry* pToolbar ); - void ApplyToolbar( SvxConfigEntry* pToolbar ); - void ReloadToolbar( const rtl::OUString& rURL ); + void CreateToolbar( SvxConfigEntry* pToolbar ); + void RestoreToolbar( SvxConfigEntry* pToolbar ); + void RemoveToolbar( SvxConfigEntry* pToolbar ); + void ApplyToolbar( SvxConfigEntry* pToolbar ); + void ReloadToolbar( const rtl::OUString& rURL ); - rtl::OUString GetSystemUIName( const rtl::OUString& rResourceURL ); + rtl::OUString GetSystemUIName( const rtl::OUString& rResourceURL ); - sal_Int32 GetSystemStyle( const rtl::OUString& rResourceURL ); + sal_Int32 GetSystemStyle( const rtl::OUString& rResourceURL ); - void SetSystemStyle( + void SetSystemStyle( const rtl::OUString& rResourceURL, sal_Int32 nStyle ); - void SetSystemStyle( + void SetSystemStyle( ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame > xFrame, const rtl::OUString& rResourceURL, sal_Int32 nStyle ); - SvxEntries* GetEntries(); - void SetEntries( SvxEntries* ); - bool HasSettings(); - bool HasURL( const rtl::OUString& rURL ); - void Reset(); - bool Apply(); + SvxEntries* GetEntries(); + void SetEntries( SvxEntries* ); + bool HasSettings(); + bool HasURL( const rtl::OUString& rURL ); + void Reset(); + bool Apply(); }; class SvxNewToolbarDialog : public ModalDialog { private: - FixedText aFtDescription; - Edit aEdtName; - FixedText aSaveInText; - OKButton aBtnOK; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + FixedText aFtDescription; + Edit aEdtName; + FixedText aSaveInText; + OKButton aBtnOK; + CancelButton aBtnCancel; + HelpButton aBtnHelp; Link aCheckNameHdl; @@ -734,7 +734,7 @@ private: public: SvxNewToolbarDialog( Window* pWindow, const String& rName ); - ListBox aSaveInListBox; + ListBox aSaveInListBox; void GetName( rtl::OUString& rName ){rName = aEdtName.GetText();} @@ -751,18 +751,18 @@ public: class SvxIconSelectorDialog : public ModalDialog { private: - FixedText aFtDescription; - ToolBox aTbSymbol; - FixedText aFtNote; - OKButton aBtnOK; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - PushButton aBtnImport; - PushButton aBtnDelete; + FixedText aFtDescription; + ToolBox aTbSymbol; + FixedText aFtNote; + OKButton aBtnOK; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + PushButton aBtnImport; + PushButton aBtnDelete; FixedLine aFlSeparator; sal_uInt16 m_nNextId; - sal_Int32 m_nExpectedSize; + sal_Int32 m_nExpectedSize; ::com::sun::star::uno::Reference< ::com::sun::star::ui::XImageManager > m_xImageManager; @@ -771,13 +771,13 @@ private: ::com::sun::star::ui::XImageManager > m_xParentImageManager; ::com::sun::star::uno::Reference< - ::com::sun::star::ui::XImageManager > m_xImportedImageManager; + ::com::sun::star::ui::XImageManager > m_xImportedImageManager; ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicProvider > m_xGraphProvider; - + bool ReplaceGraphicItem( const ::rtl::OUString& aURL ); - + bool ImportGraphic( const ::rtl::OUString& aURL ); void ImportGraphics( @@ -792,8 +792,8 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XImageManager >& rXImageManager, const ::com::sun::star::uno::Reference< - ::com::sun::star::ui::XImageManager >& rXParentImageManager - ); + ::com::sun::star::ui::XImageManager >& rXParentImageManager + ); ~SvxIconSelectorDialog(); @@ -802,19 +802,19 @@ public: DECL_LINK( SelectHdl, ToolBox * ); DECL_LINK( ImportHdl, PushButton * ); - DECL_LINK( DeleteHdl, PushButton * ); + DECL_LINK( DeleteHdl, PushButton * ); }; class SvxIconReplacementDialog : public MessBox { public: - SvxIconReplacementDialog( - Window *pWindow, + SvxIconReplacementDialog( + Window *pWindow, const rtl::OUString& aMessage, bool aYestoAll); - SvxIconReplacementDialog( - Window *pWindow, + SvxIconReplacementDialog( + Window *pWindow, const rtl::OUString& aMessage ); rtl::OUString ReplaceIconName( const rtl::OUString& ); @@ -824,8 +824,8 @@ public: class SvxIconChangeDialog : public ModalDialog { private: - FixedImage aFImageInfo; - OKButton aBtnOK; + FixedImage aFImageInfo; + OKButton aBtnOK; FixedText aDescriptionLabel; SvxDescriptionEdit aLineEditDescription; public: diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx index db8d4740b054..7d14afebacf8 100644 --- a/cui/source/inc/cfgutil.hxx +++ b/cui/source/inc/cfgutil.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 @@ -39,7 +39,7 @@ #include <com/sun/star/script/browse/XBrowseNode.hpp> #define _SVSTDARR_STRINGSDTOR -#include <svl/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <vcl/timer.hxx> #include <svtools/svtabbx.hxx> @@ -110,10 +110,10 @@ struct SfxStylesInfo_Impl struct SfxGroupInfo_Impl { - USHORT nKind; - USHORT nOrd; - void* pObject; - BOOL bWasOpened; + USHORT nKind; + USHORT nOrd; + void* pObject; + BOOL bWasOpened; String sCommand; String sLabel; @@ -143,7 +143,7 @@ public: SvLBoxEntry* GetEntry_Impl( USHORT nId ); SvLBoxEntry* GetEntry_Impl( const String& ); USHORT GetId( SvLBoxEntry *pEntry ); - using Window::GetHelpText; + using Window::GetHelpText; String GetHelpText( SvLBoxEntry *pEntry ); USHORT GetCurId() { return GetId( FirstSelected() ); } String GetCurCommand(); @@ -156,7 +156,7 @@ public: struct SvxConfigGroupBoxResource_Impl; class SfxConfigGroupListBox_Impl : public SvTreeListBox { - SvxConfigGroupBoxResource_Impl* pImp; + SvxConfigGroupBoxResource_Impl* pImp; //SfxSlotPool* pSlotPool; SfxConfigFunctionListBox_Impl* pFunctionListBox; SfxGroupInfoArr_Impl aArr; @@ -191,7 +191,7 @@ protected: public: SfxConfigGroupListBox_Impl ( Window* pParent, - const ResId&, + const ResId&, ULONG nConfigMode = 0 ); ~SfxConfigGroupListBox_Impl(); void ClearAll(); diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index 494d77bf7f13..49169b084ea7 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.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 @@ -44,43 +44,43 @@ class FontList; // ----------------------------------------------------------------------- -#define DISABLE_CASEMAP ((USHORT)0x0001) -#define DISABLE_WORDLINE ((USHORT)0x0002) -#define DISABLE_BLINK ((USHORT)0x0004) -#define DISABLE_UNDERLINE_COLOR ((USHORT)0x0008) +#define DISABLE_CASEMAP ((USHORT)0x0001) +#define DISABLE_WORDLINE ((USHORT)0x0002) +#define DISABLE_BLINK ((USHORT)0x0004) +#define DISABLE_UNDERLINE_COLOR ((USHORT)0x0008) -#define DISABLE_LANGUAGE ((USHORT)0x0010) -#define DISABLE_HIDE_LANGUAGE ((USHORT)0x0020) +#define DISABLE_LANGUAGE ((USHORT)0x0010) +#define DISABLE_HIDE_LANGUAGE ((USHORT)0x0020) // class SvxCharBasePage ------------------------------------------------- class SvxCharBasePage : public SfxTabPage { protected: - SvxFontPrevWindow m_aPreviewWin; - FixedInfo m_aFontTypeFT; + SvxFontPrevWindow m_aPreviewWin; + FixedInfo m_aFontTypeFT; - BOOL m_bPreviewBackgroundToCharacter; + BOOL m_bPreviewBackgroundToCharacter; SvxCharBasePage( Window* pParent, const ResId& rResIdTabPage, const SfxItemSet&, USHORT nResIdPrewievWin, USHORT nResIdFontTypeFT ); - virtual ~SvxCharBasePage(); + virtual ~SvxCharBasePage(); - void SetPrevFontSize( const SfxItemSet& rSet, USHORT nSlot, SvxFont& rFont ); - void SetPrevFont( const SfxItemSet& rSet, USHORT nSlot, SvxFont& rFont ); - void SetPrevFontStyle( const SfxItemSet& rSet, USHORT nSlotPosture, USHORT nSlotWeight, SvxFont& rFont ); // posture/weight - void SetPrevFontWidthScale( const SfxItemSet& rSet ); + void SetPrevFontSize( const SfxItemSet& rSet, USHORT nSlot, SvxFont& rFont ); + void SetPrevFont( const SfxItemSet& rSet, USHORT nSlot, SvxFont& rFont ); + void SetPrevFontStyle( const SfxItemSet& rSet, USHORT nSlotPosture, USHORT nSlotWeight, SvxFont& rFont ); // posture/weight + void SetPrevFontWidthScale( const SfxItemSet& rSet ); - void SetPrevFontEscapement( BYTE nProp, BYTE nEscProp, short nEsc ); + void SetPrevFontEscapement( BYTE nProp, BYTE nEscProp, short nEsc ); - inline SvxFont& GetPreviewFont(); - inline SvxFont& GetPreviewCJKFont(); - inline SvxFont& GetPreviewCTLFont(); + inline SvxFont& GetPreviewFont(); + inline SvxFont& GetPreviewCJKFont(); + inline SvxFont& GetPreviewCTLFont(); public: using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - + virtual void ActivatePage( const SfxItemSet& rSet ); // virtual int DeactivatePage( SfxItemSet* pSet = 0 ); @@ -128,12 +128,12 @@ private: FixedText* m_pColorFT; ColorListBox* m_pColorLB; - SvxCharNamePage_Impl* m_pImpl; + SvxCharNamePage_Impl* m_pImpl; SvxCharNamePage( Window* pParent, const SfxItemSet& rSet ); - void Initialize(); - const FontList* GetFontList() const; + void Initialize(); + const FontList* GetFontList() const; void UpdatePreview_Impl(); void FillStyleBox_Impl( const FontNameBox* rBox ); void FillSizeBox_Impl( const FontNameBox* rBox ); @@ -153,19 +153,19 @@ private: Ctl }; - void Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp ); - BOOL FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp ); - void ResetColor_Impl( const SfxItemSet& rSet ); - BOOL FillItemSetColor_Impl( SfxItemSet& rSet ); + void Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp ); + BOOL FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp ); + void ResetColor_Impl( const SfxItemSet& rSet ); + BOOL FillItemSetColor_Impl( SfxItemSet& rSet ); - DECL_LINK( UpdateHdl_Impl, Timer* ); - DECL_LINK( FontModifyHdl_Impl, void* ); - DECL_LINK( ColorBoxSelectHdl_Impl, ColorListBox* ); + DECL_LINK( UpdateHdl_Impl, Timer* ); + DECL_LINK( FontModifyHdl_Impl, void* ); + DECL_LINK( ColorBoxSelectHdl_Impl, ColorListBox* ); public: using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - + virtual void ActivatePage( const SfxItemSet& rSet ); virtual int DeactivatePage( SfxItemSet* pSet = 0 ); @@ -180,12 +180,12 @@ public: void SetFontList( const SvxFontListItem& rItem ); void EnableRelativeMode(); - void EnableSearchMode(); + void EnableSearchMode(); // the writer uses SID_ATTR_BRUSH as font background void SetPreviewBackgroundToCharacter(); void DisableControls( USHORT nDisable ); - virtual void PageCreated (SfxAllItemSet aSet); + virtual void PageCreated (SfxAllItemSet aSet); }; // class SvxCharEffectsPage ---------------------------------------------- @@ -194,64 +194,64 @@ class SvxCharEffectsPage : public SvxCharBasePage { private: - FixedText m_aFontColorFT; - ColorListBox m_aFontColorLB; + FixedText m_aFontColorFT; + ColorListBox m_aFontColorLB; - FixedText m_aEffectsFT; - SvxCheckListBox m_aEffectsLB; + FixedText m_aEffectsFT; + SvxCheckListBox m_aEffectsLB; - ListBox m_aEffects2LB; + ListBox m_aEffects2LB; FixedText m_aReliefFT; ListBox m_aReliefLB; TriStateBox m_aOutlineBtn; - TriStateBox m_aShadowBtn; - TriStateBox m_aBlinkingBtn; + TriStateBox m_aShadowBtn; + TriStateBox m_aBlinkingBtn; TriStateBox m_aHiddenBtn; - FixedLine m_aVerticalLine; + FixedLine m_aVerticalLine; - FixedText m_aOverlineFT; - ListBox m_aOverlineLB; - FixedText m_aOverlineColorFT; - ColorListBox m_aOverlineColorLB; + FixedText m_aOverlineFT; + ListBox m_aOverlineLB; + FixedText m_aOverlineColorFT; + ColorListBox m_aOverlineColorLB; - FixedText m_aStrikeoutFT; - ListBox m_aStrikeoutLB; + FixedText m_aStrikeoutFT; + ListBox m_aStrikeoutLB; - FixedText m_aUnderlineFT; - ListBox m_aUnderlineLB; - FixedText m_aUnderlineColorFT; - ColorListBox m_aUnderlineColorLB; + FixedText m_aUnderlineFT; + ListBox m_aUnderlineLB; + FixedText m_aUnderlineColorFT; + ColorListBox m_aUnderlineColorLB; - CheckBox m_aIndividualWordsBtn; + CheckBox m_aIndividualWordsBtn; - FixedLine m_aAsianLine; + FixedLine m_aAsianLine; - FixedText m_aEmphasisFT; - ListBox m_aEmphasisLB; + FixedText m_aEmphasisFT; + ListBox m_aEmphasisLB; - FixedText m_aPositionFT; - ListBox m_aPositionLB; + FixedText m_aPositionFT; + ListBox m_aPositionLB; - USHORT m_nHtmlMode; + USHORT m_nHtmlMode; - String m_aTransparentColorName; + String m_aTransparentColorName; SvxCharEffectsPage( Window* pParent, const SfxItemSet& rSet ); - void Initialize(); + void Initialize(); void UpdatePreview_Impl(); void SetCaseMap_Impl( SvxCaseMap eCaseMap ); - void ResetColor_Impl( const SfxItemSet& rSet ); - BOOL FillItemSetColor_Impl( SfxItemSet& rSet ); + void ResetColor_Impl( const SfxItemSet& rSet ); + BOOL FillItemSetColor_Impl( SfxItemSet& rSet ); - DECL_LINK( SelectHdl_Impl, ListBox* ); + DECL_LINK( SelectHdl_Impl, ListBox* ); DECL_LINK( CbClickHdl_Impl, CheckBox* ); DECL_LINK( TristClickHdl_Impl, TriStateBox* ); - DECL_LINK( UpdatePreview_Impl, ListBox* ); - DECL_LINK( ColorBoxSelectHdl_Impl, ColorListBox* ); + DECL_LINK( UpdatePreview_Impl, ListBox* ); + DECL_LINK( ColorBoxSelectHdl_Impl, ColorListBox* ); public: // using SfxTabPage::ActivatePage; @@ -271,7 +271,7 @@ public: void EnableFlash(); // the writer uses SID_ATTR_BRUSH as font background void SetPreviewBackgroundToCharacter(); - virtual void PageCreated (SfxAllItemSet aSet); + virtual void PageCreated (SfxAllItemSet aSet); }; // class SvxCharPositionPage --------------------------------------------- @@ -280,60 +280,60 @@ class SvxCharPositionPage : public SvxCharBasePage { private: - FixedLine m_aPositionLine; - RadioButton m_aHighPosBtn; - RadioButton m_aNormalPosBtn; - RadioButton m_aLowPosBtn; - FixedText m_aHighLowFT; - MetricField m_aHighLowEdit; - CheckBox m_aHighLowRB; - FixedText m_aFontSizeFT; - MetricField m_aFontSizeEdit; - FixedLine m_aRotationScalingFL; - FixedLine m_aScalingFL; - RadioButton m_a0degRB; - RadioButton m_a90degRB; - RadioButton m_a270degRB; - CheckBox m_aFitToLineCB; - FixedText m_aScaleWidthFT; - MetricField m_aScaleWidthMF; - - FixedLine m_aKerningLine; - ListBox m_aKerningLB; - FixedText m_aKerningFT; - MetricField m_aKerningEdit; - CheckBox m_aPairKerningBtn; + FixedLine m_aPositionLine; + RadioButton m_aHighPosBtn; + RadioButton m_aNormalPosBtn; + RadioButton m_aLowPosBtn; + FixedText m_aHighLowFT; + MetricField m_aHighLowEdit; + CheckBox m_aHighLowRB; + FixedText m_aFontSizeFT; + MetricField m_aFontSizeEdit; + FixedLine m_aRotationScalingFL; + FixedLine m_aScalingFL; + RadioButton m_a0degRB; + RadioButton m_a90degRB; + RadioButton m_a270degRB; + CheckBox m_aFitToLineCB; + FixedText m_aScaleWidthFT; + MetricField m_aScaleWidthMF; + + FixedLine m_aKerningLine; + ListBox m_aKerningLB; + FixedText m_aKerningFT; + MetricField m_aKerningEdit; + CheckBox m_aPairKerningBtn; short m_nSuperEsc; short m_nSubEsc; - UINT16 m_nScaleWidthItemSetVal; - UINT16 m_nScaleWidthInitialVal; + UINT16 m_nScaleWidthItemSetVal; + UINT16 m_nScaleWidthInitialVal; BYTE m_nSuperProp; BYTE m_nSubProp; SvxCharPositionPage( Window* pParent, const SfxItemSet& rSet ); - void Initialize(); + void Initialize(); void UpdatePreview_Impl( BYTE nProp, BYTE nEscProp, short nEsc ); void SetEscapement_Impl( USHORT nEsc ); - DECL_LINK( PositionHdl_Impl, RadioButton* ); - DECL_LINK( RotationHdl_Impl, RadioButton* ); - DECL_LINK( FontModifyHdl_Impl, MetricField* ); - DECL_LINK( AutoPositionHdl_Impl, CheckBox* ); - DECL_LINK( FitToLineHdl_Impl, CheckBox* ); - DECL_LINK( KerningSelectHdl_Impl, ListBox* ); - DECL_LINK( KerningModifyHdl_Impl, MetricField* ); - DECL_LINK( PairKerningHdl_Impl, CheckBox* ); - DECL_LINK( LoseFocusHdl_Impl, MetricField* ); - DECL_LINK( ScaleWidthModifyHdl_Impl, MetricField* ); + DECL_LINK( PositionHdl_Impl, RadioButton* ); + DECL_LINK( RotationHdl_Impl, RadioButton* ); + DECL_LINK( FontModifyHdl_Impl, MetricField* ); + DECL_LINK( AutoPositionHdl_Impl, CheckBox* ); + DECL_LINK( FitToLineHdl_Impl, CheckBox* ); + DECL_LINK( KerningSelectHdl_Impl, ListBox* ); + DECL_LINK( KerningModifyHdl_Impl, MetricField* ); + DECL_LINK( PairKerningHdl_Impl, CheckBox* ); + DECL_LINK( LoseFocusHdl_Impl, MetricField* ); + DECL_LINK( ScaleWidthModifyHdl_Impl, MetricField* ); public: using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - + virtual int DeactivatePage( SfxItemSet* pSet = 0 ); virtual void ActivatePage( const SfxItemSet& rSet ); @@ -346,7 +346,7 @@ public: virtual void FillUserData(); // the writer uses SID_ATTR_BRUSH as font background void SetPreviewBackgroundToCharacter(); - virtual void PageCreated (SfxAllItemSet aSet); + virtual void PageCreated (SfxAllItemSet aSet); }; // class SvxCharTwoLinesPage --------------------------------------------- @@ -354,32 +354,32 @@ public: class SvxCharTwoLinesPage : public SvxCharBasePage { private: - FixedLine m_aSwitchOnLine; - CheckBox m_aTwoLinesBtn; + FixedLine m_aSwitchOnLine; + CheckBox m_aTwoLinesBtn; - FixedLine m_aEncloseLine; - FixedText m_aStartBracketFT; - ListBox m_aStartBracketLB; - FixedText m_aEndBracketFT; - ListBox m_aEndBracketLB; + FixedLine m_aEncloseLine; + FixedText m_aStartBracketFT; + ListBox m_aStartBracketLB; + FixedText m_aEndBracketFT; + ListBox m_aEndBracketLB; - USHORT m_nStartBracketPosition; - USHORT m_nEndBracketPosition; + USHORT m_nStartBracketPosition; + USHORT m_nEndBracketPosition; SvxCharTwoLinesPage( Window* pParent, const SfxItemSet& rSet ); - void UpdatePreview_Impl(); - void Initialize(); - void SelectCharacter( ListBox* pBox ); - void SetBracket( sal_Unicode cBracket, BOOL bStart ); + void UpdatePreview_Impl(); + void Initialize(); + void SelectCharacter( ListBox* pBox ); + void SetBracket( sal_Unicode cBracket, BOOL bStart ); - DECL_LINK( TwoLinesHdl_Impl, CheckBox* ); - DECL_LINK( CharacterMapHdl_Impl, ListBox* ); + DECL_LINK( TwoLinesHdl_Impl, CheckBox* ); + DECL_LINK( CharacterMapHdl_Impl, ListBox* ); public: using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - + virtual void ActivatePage( const SfxItemSet& rSet ); virtual int DeactivatePage( SfxItemSet* pSet = 0 ); @@ -391,7 +391,7 @@ public: virtual BOOL FillItemSet( SfxItemSet& rSet ); // the writer uses SID_ATTR_BRUSH as font background void SetPreviewBackgroundToCharacter(); - virtual void PageCreated (SfxAllItemSet aSet); + virtual void PageCreated (SfxAllItemSet aSet); }; #endif // #ifndef _SVX_CHARDLG_HXX diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx index 8bceb90b7ff4..7ffbcee8dabc 100644 --- a/cui/source/inc/connect.hxx +++ b/cui/source/inc/connect.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 @@ -49,36 +49,36 @@ class SdrView; class SvxConnectionPage : public SfxTabPage { private: - FixedText aFtType; - ListBox aLbType; - - FixedLine aFlDelta; - FixedText aFtLine1; - MetricField aMtrFldLine1; - FixedText aFtLine2; - MetricField aMtrFldLine2; - FixedText aFtLine3; - MetricField aMtrFldLine3; - - FixedLine aFlDistance; - FixedText aFtHorz1; - MetricField aMtrFldHorz1; - FixedText aFtVert1; - MetricField aMtrFldVert1; - FixedText aFtHorz2; - MetricField aMtrFldHorz2; - FixedText aFtVert2; - MetricField aMtrFldVert2; - - SvxXConnectionPreview aCtlPreview; - - const SfxItemSet& rOutAttrs; - SfxItemSet aAttrSet; - const SdrView* pView; - SfxMapUnit eUnit; + FixedText aFtType; + ListBox aLbType; + + FixedLine aFlDelta; + FixedText aFtLine1; + MetricField aMtrFldLine1; + FixedText aFtLine2; + MetricField aMtrFldLine2; + FixedText aFtLine3; + MetricField aMtrFldLine3; + + FixedLine aFlDistance; + FixedText aFtHorz1; + MetricField aMtrFldHorz1; + FixedText aFtVert1; + MetricField aMtrFldVert1; + FixedText aFtHorz2; + MetricField aMtrFldHorz2; + FixedText aFtVert2; + MetricField aMtrFldVert2; + + SvxXConnectionPreview aCtlPreview; + + const SfxItemSet& rOutAttrs; + SfxItemSet aAttrSet; + const SdrView* pView; + SfxMapUnit eUnit; #ifdef _SVX_CONNECT_CXX - void FillTypeLB(); + void FillTypeLB(); DECL_LINK( ChangeAttrHdl_Impl, void * ); #endif @@ -88,15 +88,15 @@ public: SvxConnectionPage( Window* pWindow, const SfxItemSet& rInAttrs ); ~SvxConnectionPage(); - static SfxTabPage* Create( Window*, const SfxItemSet& ); - static USHORT* GetRanges(); + static SfxTabPage* Create( Window*, const SfxItemSet& ); + static USHORT* GetRanges(); - virtual BOOL FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet & ); + virtual BOOL FillItemSet( SfxItemSet& ); + virtual void Reset( const SfxItemSet & ); - void Construct(); - void SetView( const SdrView* pSdrView ) { pView = pSdrView; } - virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 + void Construct(); + void SetView( const SdrView* pSdrView ) { pView = pSdrView; } + virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 }; /************************************************************************* diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx index 987759813c27..4a3113836008 100644 --- a/cui/source/inc/cuicharmap.hxx +++ b/cui/source/inc/cuicharmap.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 @@ -33,8 +33,8 @@ #include <vcl/ctrl.hxx> #include <vcl/metric.hxx> #include <vcl/button.hxx> -#include <vcl/fixed.hxx> -#include <vcl/lstbox.hxx> +#include <vcl/fixed.hxx> +#include <vcl/lstbox.hxx> #include <sfx2/basedlgs.hxx> #include <svx/charmap.hxx> @@ -94,7 +94,7 @@ friend class SvxCharacterMap; CancelButton aCancelBtn; HelpButton aHelpBtn; PushButton aDeleteBtn; -// PushButton aAssignBtn; +// PushButton aAssignBtn; FixedText aFontText; ListBox aFontLB; FixedText aSubsetText; @@ -102,7 +102,7 @@ friend class SvxCharacterMap; FixedText aSymbolText; SvxShowText aShowChar; FixedText aCharCodeText; -// FixedText aAssignText; +// FixedText aAssignText; Font aFont; BOOL bOne; const SubsetMap* pSubsetMap; @@ -137,10 +137,10 @@ public: String GetCharacters() const; - virtual short Execute(); + virtual short Execute(); }; #endif - + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx index 52e3663707aa..d204247af943 100644 --- a/cui/source/inc/cuifmsearch.hxx +++ b/cui/source/inc/cuifmsearch.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 @@ -68,59 +68,59 @@ class FmSearchDialog : public ModalDialog // meine ganzen Controls FixedLine m_flSearchFor; - RadioButton m_rbSearchForText; - RadioButton m_rbSearchForNull; - RadioButton m_rbSearchForNotNull; - ComboBox m_cmbSearchText; + RadioButton m_rbSearchForText; + RadioButton m_rbSearchForNull; + RadioButton m_rbSearchForNotNull; + ComboBox m_cmbSearchText; FixedLine m_flWhere; - FixedText m_ftForm; - ListBox m_lbForm; - RadioButton m_rbAllFields; - RadioButton m_rbSingleField; - ListBox m_lbField; + FixedText m_ftForm; + ListBox m_lbForm; + RadioButton m_rbAllFields; + RadioButton m_rbSingleField; + ListBox m_lbField; FixedLine m_flOptions; - FixedText m_ftPosition; - ListBox m_lbPosition; - CheckBox m_cbUseFormat; - CheckBox m_cbCase; - CheckBox m_cbBackwards; - CheckBox m_cbStartOver; - CheckBox m_cbWildCard; - CheckBox m_cbRegular; - CheckBox m_cbApprox; - PushButton m_pbApproxSettings; - CheckBox m_aHalfFullFormsCJK; - CheckBox m_aSoundsLikeCJK; - PushButton m_aSoundsLikeCJKSettings; + FixedText m_ftPosition; + ListBox m_lbPosition; + CheckBox m_cbUseFormat; + CheckBox m_cbCase; + CheckBox m_cbBackwards; + CheckBox m_cbStartOver; + CheckBox m_cbWildCard; + CheckBox m_cbRegular; + CheckBox m_cbApprox; + PushButton m_pbApproxSettings; + CheckBox m_aHalfFullFormsCJK; + CheckBox m_aSoundsLikeCJK; + PushButton m_aSoundsLikeCJKSettings; FixedLine m_flState; - FixedText m_ftRecordLabel; - FixedText m_ftRecord; - FixedText m_ftHint; - PushButton m_pbSearchAgain; - CancelButton m_pbClose; - HelpButton m_pbHelp; + FixedText m_ftRecordLabel; + FixedText m_ftRecord; + FixedText m_ftHint; + PushButton m_pbSearchAgain; + CancelButton m_pbClose; + HelpButton m_pbHelp; String m_sSearch; String m_sCancel; - Window* m_pPreSearchFocus; + Window* m_pPreSearchFocus; - Link m_lnkFoundHandler; // Handler fuer "gefunden" - Link m_lnkCanceledNotFoundHdl; // Handler fuer Positionierung des Cursors + Link m_lnkFoundHandler; // Handler fuer "gefunden" + Link m_lnkCanceledNotFoundHdl; // Handler fuer Positionierung des Cursors - Link m_lnkContextSupplier; // fuer Suche in verschiedenen Kontexten + Link m_lnkContextSupplier; // fuer Suche in verschiedenen Kontexten // ein Array, in dem ich mir fuer jeden Kontext das aktuell selektierte Feld merke ::std::vector<String> m_arrContextFields; // fuer die eigentliche Arbeit ... - FmSearchEngine* m_pSearchEngine; + FmSearchEngine* m_pSearchEngine; - Timer m_aDelayedPaint; + Timer m_aDelayedPaint; // siehe EnableSearchUI - ::svxform::FmSearchConfigItem* m_pConfig; + ::svxform::FmSearchConfigItem* m_pConfig; public: - /** hiermit kann in verschiedenen Saetzen von Feldern gesucht werden. Es gibt eine Reihe von Kontexten, deren Namen in + /** hiermit kann in verschiedenen Saetzen von Feldern gesucht werden. Es gibt eine Reihe von Kontexten, deren Namen in strContexts stehen (getrennt durch ';'), der Benutzer kann einen davon auswaehlen. Wenn der Benutzer einen Kontext auswaehlt, wird lnkContextSupplier aufgerufen, er bekommt einen Zeiger auf eine FmSearchContext-Struktur, die gefuellt werden muss. diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index 6254a9150038..6a418c0546c5 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.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 @@ -65,7 +65,7 @@ class TPGalleryThemeProperties; struct FilterEntry { - String aFilterName; + String aFilterName; }; // ---------------- @@ -76,15 +76,15 @@ class SearchThread : public ::osl::Thread { private: - SearchProgress* mpProgress; - TPGalleryThemeProperties* mpBrowser; - INetURLObject maStartURL; + SearchProgress* mpProgress; + TPGalleryThemeProperties* mpBrowser; + INetURLObject maStartURL; - void ImplSearch( const INetURLObject& rStartURL, + void ImplSearch( const INetURLObject& rStartURL, const ::std::vector< String >& rFormats, BOOL bRecursive ); - virtual void SAL_CALL run(); + virtual void SAL_CALL run(); virtual void SAL_CALL onTerminated(); public: @@ -92,7 +92,7 @@ public: SearchThread( SearchProgress* pProgess, TPGalleryThemeProperties* pBrowser, const INetURLObject& rStartURL ); - virtual ~SearchThread(); + virtual ~SearchThread(); }; // ------------------ @@ -103,15 +103,15 @@ class SearchProgress : public ModalDialog { private: - FixedText aFtSearchDir; + FixedText aFtSearchDir; FixedLine aFLSearchDir; - FixedText aFtSearchType; + FixedText aFtSearchType; FixedLine aFLSearchType; - CancelButton aBtnCancel; - SearchThread maSearchThread; + CancelButton aBtnCancel; + SearchThread maSearchThread; DECL_LINK( ClickCancelBtn, void* ); - void Terminate(); + void Terminate(); public: SearchProgress( Window* pParent, const INetURLObject& rStartURL ); @@ -119,10 +119,10 @@ public: DECL_LINK( CleanUpHdl, void* ); - virtual short Execute(); + virtual short Execute(); virtual void StartExecuteModal( const Link& rEndDialogHdl ); - void SetFileType( const String& rType ) { aFtSearchType.SetText( rType ); } - void SetDirectory( const INetURLObject& rURL ) { aFtSearchDir.SetText( GetReducedString( rURL, 30 ) ); } + void SetFileType( const String& rType ) { aFtSearchType.SetText( rType ); } + void SetDirectory( const INetURLObject& rURL ) { aFtSearchDir.SetText( GetReducedString( rURL, 30 ) ); } }; // -------------- @@ -133,11 +133,11 @@ class TakeThread : public ::osl::Thread { private: - TakeProgress* mpProgress; - TPGalleryThemeProperties* mpBrowser; - List& mrTakenList; + TakeProgress* mpProgress; + TPGalleryThemeProperties* mpBrowser; + List& mrTakenList; - virtual void SAL_CALL run(); + virtual void SAL_CALL run(); virtual void SAL_CALL onTerminated(); public: @@ -154,14 +154,14 @@ class TakeProgress : public ModalDialog { private: - FixedText aFtTakeFile; + FixedText aFtTakeFile; FixedLine aFLTakeProgress; - CancelButton aBtnCancel; - TakeThread maTakeThread; - List maTakenList; + CancelButton aBtnCancel; + TakeThread maTakeThread; + List maTakenList; DECL_LINK( ClickCancelBtn, void* ); - void Terminate(); + void Terminate(); public: @@ -170,8 +170,8 @@ public: DECL_LINK( CleanUpHdl, void* ); - void SetFile( const INetURLObject& rURL ) { aFtTakeFile.SetText( GetReducedString( rURL, 30 ) ); } - virtual short Execute(); + void SetFile( const INetURLObject& rURL ) { aFtTakeFile.SetText( GetReducedString( rURL, 30 ) ); } + virtual short Execute(); virtual void StartExecuteModal( const Link& rEndDialogHdl ); }; @@ -183,12 +183,12 @@ class ActualizeProgress : public ModalDialog { private: - FixedText aFtActualizeFile; + FixedText aFtActualizeFile; FixedLine aFLActualizeProgress; - CancelButton aBtnCancel; - Timer* pTimer; - GalleryTheme* pTheme; - GalleryProgress aStatusProgress; + CancelButton aBtnCancel; + Timer* pTimer; + GalleryTheme* pTheme; + GalleryProgress aStatusProgress; DECL_LINK( ClickCancelBtn, void* ); DECL_LINK( TimeoutHdl, Timer* ); @@ -198,7 +198,7 @@ public: ActualizeProgress( Window* pWindow, GalleryTheme* pThm ); ~ActualizeProgress() {}; - virtual short Execute(); + virtual short Execute(); }; // --------------- @@ -209,16 +209,16 @@ class TitleDialog : public ModalDialog { private: - OKButton maOk; - CancelButton maCancel; - HelpButton maHelp; + OKButton maOk; + CancelButton maCancel; + HelpButton maHelp; FixedLine maFL; - Edit maEdit; + Edit maEdit; public: TitleDialog( Window* pParent, const String& rOldText ); - String GetTitle() const { return maEdit.GetText(); } + String GetTitle() const { return maEdit.GetText(); } }; // ------------------- @@ -229,11 +229,11 @@ class GalleryIdDialog : public ModalDialog { private: - OKButton aBtnOk; - CancelButton aBtnCancel; + OKButton aBtnOk; + CancelButton aBtnCancel; FixedLine aFLId; - ListBox aLbResName; - GalleryTheme* pThm; + ListBox aLbResName; + GalleryTheme* pThm; DECL_LINK( ClickOkHdl, void* ); DECL_LINK( ClickResNameHdl, void* ); @@ -243,7 +243,7 @@ public: GalleryIdDialog( Window* pParent, GalleryTheme* pThm ); ~GalleryIdDialog() {} - ULONG GetId() const { return aLbResName.GetSelectEntryPos(); } + ULONG GetId() const { return aLbResName.GetSelectEntryPos(); } }; // -------------------------- @@ -252,9 +252,9 @@ public: class GalleryThemeProperties : public SfxTabDialog { - ExchangeData* pData; + ExchangeData* pData; - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); public: @@ -270,21 +270,21 @@ class TPGalleryThemeGeneral : public SfxTabPage { private: - FixedImage aFiMSImage; - Edit aEdtMSName; - FixedLine aFlMSGeneralFirst; - FixedText aFtMSType; - FixedText aFtMSShowType; - FixedText aFtMSPath; - FixedText aFtMSShowPath; - FixedText aFtMSContent; - FixedText aFtMSShowContent; - FixedLine aFlMSGeneralSecond; - FixedText aFtMSChangeDate; - FixedText aFtMSShowChangeDate; - ExchangeData* pData; - - virtual void Reset( const SfxItemSet& ) {} + FixedImage aFiMSImage; + Edit aEdtMSName; + FixedLine aFlMSGeneralFirst; + FixedText aFtMSType; + FixedText aFtMSShowType; + FixedText aFtMSPath; + FixedText aFtMSShowPath; + FixedText aFtMSContent; + FixedText aFtMSShowContent; + FixedLine aFlMSGeneralSecond; + FixedText aFtMSChangeDate; + FixedText aFtMSShowChangeDate; + ExchangeData* pData; + + virtual void Reset( const SfxItemSet& ) {} virtual BOOL FillItemSet( SfxItemSet& rSet ); @@ -293,10 +293,10 @@ public: TPGalleryThemeGeneral( Window* pParent, const SfxItemSet& rSet ); ~TPGalleryThemeGeneral() {} - void SetXChgData( ExchangeData* pData ); - const ExchangeData* GetXChgData() const { return pData; } + void SetXChgData( ExchangeData* pData ); + const ExchangeData* GetXChgData() const { return pData; } - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); }; // ---------------------------- @@ -309,28 +309,28 @@ class TPGalleryThemeProperties : public SfxTabPage friend class TakeProgress; friend class TakeThread; - PushButton aBtnSearch; - PushButton aBtnTake; - PushButton aBtnTakeAll; - CheckBox aCbxPreview; - ComboBox aCbbFileType; - MultiListBox aLbxFound; - FixedText aFtFileType; - GalleryPreview aWndPreview; - - ExchangeData* pData; - StringList aFoundList; - List aFilterEntryList; - Timer aPreviewTimer; - String aLastFilterName; - String aPreviewString; - INetURLObject aURL; - USHORT nCurFilterPos; - USHORT nFirstExtFilterPos; - BOOL bEntriesFound; - BOOL bInputAllowed; - BOOL bTakeAll; - BOOL bSearchRecursive; + PushButton aBtnSearch; + PushButton aBtnTake; + PushButton aBtnTakeAll; + CheckBox aCbxPreview; + ComboBox aCbbFileType; + MultiListBox aLbxFound; + FixedText aFtFileType; + GalleryPreview aWndPreview; + + ExchangeData* pData; + StringList aFoundList; + List aFilterEntryList; + Timer aPreviewTimer; + String aLastFilterName; + String aPreviewString; + INetURLObject aURL; + USHORT nCurFilterPos; + USHORT nFirstExtFilterPos; + BOOL bEntriesFound; + BOOL bInputAllowed; + BOOL bTakeAll; + BOOL bSearchRecursive; ::com::sun::star::uno::Reference< ::svt::DialogClosedListener > xDialogListener; ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > xMediaPlayer; @@ -338,12 +338,12 @@ class TPGalleryThemeProperties : public SfxTabPage virtual void Reset( const SfxItemSet& /*rSet*/ ) {} virtual BOOL FillItemSet( SfxItemSet& /*rSet*/ ) { return TRUE; } - ::rtl::OUString addExtension( const ::rtl::OUString&, const ::rtl::OUString& ); - void FillFilterList(); + ::rtl::OUString addExtension( const ::rtl::OUString&, const ::rtl::OUString& ); + void FillFilterList(); - void SearchFiles(); - void TakeFiles(); - void DoPreview(); + void SearchFiles(); + void TakeFiles(); + void DoPreview(); DECL_LINK( ClickPreviewHdl, void* ); DECL_LINK( ClickCloseBrowserHdl, void* ); @@ -362,12 +362,12 @@ public: TPGalleryThemeProperties( Window* pWindow, const SfxItemSet& rSet ); ~TPGalleryThemeProperties(); - void SetXChgData( ExchangeData* pData ); - const ExchangeData* GetXChgData() const { return pData; } + void SetXChgData( ExchangeData* pData ); + const ExchangeData* GetXChgData() const { return pData; } void StartSearchFiles( const String& _rFolderURL, short _nDlgResult ); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); }; #endif // _CUI_GALDLG_HXX_ diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx index ac1bf38ad904..ed17fa9501e0 100644 --- a/cui/source/inc/cuigrfflt.hxx +++ b/cui/source/inc/cuigrfflt.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 @@ // - Error codes - // --------------- -#define SVX_GRAPHICFILTER_ERRCODE_NONE 0x00000000 -#define SVX_GRAPHICFILTER_UNSUPPORTED_GRAPHICTYPE 0x00000001 -#define SVX_GRAPHICFILTER_UNSUPPORTED_SLOT 0x00000002 +#define SVX_GRAPHICFILTER_ERRCODE_NONE 0x00000000 +#define SVX_GRAPHICFILTER_UNSUPPORTED_GRAPHICTYPE 0x00000001 +#define SVX_GRAPHICFILTER_UNSUPPORTED_SLOT 0x00000002 // -------------------- // - SvxGraphicFilter - @@ -60,8 +60,8 @@ class SvxGraphicFilter { public: - static ULONG ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject ); - static void DisableGraphicFilterSlots( SfxItemSet& rSet ); + static ULONG ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject ); + static void DisableGraphicFilterSlots( SfxItemSet& rSet ); }; */ // ----------------------- @@ -75,47 +75,47 @@ private: class PreviewWindow : public Control { private: + + GraphicObject maGraphic; - GraphicObject maGraphic; - - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ); public: PreviewWindow( Window* pParent, const ResId& rResId ); ~PreviewWindow(); - void SetGraphic( const Graphic& rGraphic ); + void SetGraphic( const Graphic& rGraphic ); }; private: - Timer maTimer; - Link maModifyHdl; - Graphic maGraphic; - double mfScaleX; - double mfScaleY; - Size maSizePixel; - PreviewWindow maPreview; - FixedLine maFlParameter; - OKButton maBtnOK; - CancelButton maBtnCancel; - HelpButton maBtnHelp; + Timer maTimer; + Link maModifyHdl; + Graphic maGraphic; + double mfScaleX; + double mfScaleY; + Size maSizePixel; + PreviewWindow maPreview; + FixedLine maFlParameter; + OKButton maBtnOK; + CancelButton maBtnCancel; + HelpButton maBtnHelp; DECL_LINK( ImplPreviewTimeoutHdl, Timer* pTimer ); DECL_LINK( ImplModifyHdl, void* p ); protected: - const Link& GetModifyHdl() const { return maModifyHdl; } - const Size& GetGraphicSizePixel() const { return maSizePixel; } - -public: + const Link& GetModifyHdl() const { return maModifyHdl; } + const Size& GetGraphicSizePixel() const { return maSizePixel; } +public: + GraphicFilterDialog( Window* pParent, const ResId& rResId, const Graphic& rGraphic ); ~GraphicFilterDialog(); - virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) = 0; + virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) = 0; }; // ----------------------- @@ -126,11 +126,11 @@ class GraphicFilterMosaic : public GraphicFilterDialog { private: - FixedText maFtWidth; - MetricField maMtrWidth; - FixedText maFtHeight; - MetricField maMtrHeight; - CheckBox maCbxEdges; + FixedText maFtWidth; + MetricField maMtrWidth; + FixedText maFtHeight; + MetricField maMtrHeight; + CheckBox maCbxEdges; public: @@ -138,10 +138,10 @@ public: USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges ); ~GraphicFilterMosaic(); - virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ); - long GetTileWidth() const { return static_cast<long>(maMtrWidth.GetValue()); } - long GetTileHeight() const { return static_cast<long>(maMtrHeight.GetValue()); } - BOOL IsEnhanceEdges() const { return maCbxEdges.IsChecked(); } + virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ); + long GetTileWidth() const { return static_cast<long>(maMtrWidth.GetValue()); } + long GetTileHeight() const { return static_cast<long>(maMtrHeight.GetValue()); } + BOOL IsEnhanceEdges() const { return maCbxEdges.IsChecked(); } }; // ------------------------- @@ -152,9 +152,9 @@ class GraphicFilterSolarize : public GraphicFilterDialog { private: - FixedText maFtThreshold; - MetricField maMtrThreshold; - CheckBox maCbxInvert; + FixedText maFtThreshold; + MetricField maMtrThreshold; + CheckBox maCbxInvert; public: @@ -162,9 +162,9 @@ public: BYTE nGreyThreshold, BOOL bInvert ); ~GraphicFilterSolarize(); - virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ); - BYTE GetGreyThreshold() const { return( (BYTE) FRound( maMtrThreshold.GetValue() * 2.55 ) ); } - BOOL IsInvert() const { return maCbxInvert.IsChecked(); } + virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ); + BYTE GetGreyThreshold() const { return( (BYTE) FRound( maMtrThreshold.GetValue() * 2.55 ) ); } + BOOL IsInvert() const { return maCbxInvert.IsChecked(); } }; // ---------------------- @@ -175,8 +175,8 @@ class GraphicFilterSepia : public GraphicFilterDialog { private: - FixedText maFtSepia; - MetricField maMtrSepia; + FixedText maFtSepia; + MetricField maMtrSepia; public: @@ -184,8 +184,8 @@ public: USHORT nSepiaPercent ); ~GraphicFilterSepia(); - virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ); - USHORT GetSepiaPercent() const + virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ); + USHORT GetSepiaPercent() const { return sal::static_int_cast< USHORT >(maMtrSepia.GetValue()); } }; @@ -197,8 +197,8 @@ class GraphicFilterPoster : public GraphicFilterDialog { private: - FixedText maFtPoster; - NumericField maNumPoster; + FixedText maFtPoster; + NumericField maNumPoster; public: @@ -206,8 +206,8 @@ public: USHORT nPosterColorCount ); ~GraphicFilterPoster(); - virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ); - USHORT GetPosterColorCount() const { return( (USHORT) maNumPoster.GetValue() ); } + virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ); + USHORT GetPosterColorCount() const { return( (USHORT) maNumPoster.GetValue() ); } }; // ----------------------- @@ -222,22 +222,22 @@ private: { private: - Link maModifyHdl; + Link maModifyHdl; - virtual void MouseButtonDown( const MouseEvent& rEvt ); + virtual void MouseButtonDown( const MouseEvent& rEvt ); public: - EmbossControl( Window* pParent, const ResId& rResId, RECT_POINT eRectPoint ) : + EmbossControl( Window* pParent, const ResId& rResId, RECT_POINT eRectPoint ) : SvxRectCtl( pParent, rResId ) { SetActualRP( eRectPoint ); } - - void SetModifyHdl( const Link& rHdl ) { maModifyHdl = rHdl; } + + void SetModifyHdl( const Link& rHdl ) { maModifyHdl = rHdl; } }; private: - FixedText maFtLight; - EmbossControl maCtlLight; + FixedText maFtLight; + EmbossControl maCtlLight; public: @@ -245,8 +245,8 @@ public: RECT_POINT eLightSource ); ~GraphicFilterEmboss(); - virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ); - RECT_POINT GetLightSource() const { return maCtlLight.GetActualRP(); } + virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ); + RECT_POINT GetLightSource() const { return maCtlLight.GetActualRP(); } }; #endif diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx index c183473da03b..43d25a2b7c63 100644 --- a/cui/source/inc/cuihyperdlg.hxx +++ b/cui/source/inc/cuihyperdlg.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 @@ -50,14 +50,14 @@ class SvxHlinkCtrl : public SfxControllerItem { private : SvxHpLinkDlg *pParent; - + SfxStatusForwarder aOnlineForwarder; SfxStatusForwarder aRdOnlyForwarder; public : SvxHlinkCtrl( USHORT nId, SfxBindings & rBindings, SvxHpLinkDlg* pDlg); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); }; @@ -72,43 +72,43 @@ public : class SvxHpLinkDlg : public IconChoiceDialog { private: - SvxHlinkCtrl maCtrl; // Controler - SfxBindings* mpBindings; - SfxItemSet* mpItemSet; - - sal_Bool mbDummy1 : 1; - sal_Bool mbDummy2 : 1; - sal_Bool mbDummy3 : 1; - sal_Bool mbDummy4 : 1; - sal_Bool mbDummy5 : 1; - sal_Bool mbGrabFocus : 1; - sal_Bool mbReadOnly : 1; - sal_Bool mbIsHTMLDoc : 1; + SvxHlinkCtrl maCtrl; // Controler + SfxBindings* mpBindings; + SfxItemSet* mpItemSet; + + sal_Bool mbDummy1 : 1; + sal_Bool mbDummy2 : 1; + sal_Bool mbDummy3 : 1; + sal_Bool mbDummy4 : 1; + sal_Bool mbDummy5 : 1; + sal_Bool mbGrabFocus : 1; + sal_Bool mbReadOnly : 1; + sal_Bool mbIsHTMLDoc : 1; void* mpDummy1; void* mpDummy2; DECL_LINK (ClickApplyHdl_Impl, void * ); DECL_LINK (ClickCloseHdl_Impl, void * ); - + protected: - virtual BOOL Close(); - virtual void Move(); + virtual BOOL Close(); + virtual void Move(); -// virtual long PreNotify( NotifyEvent& rNEvt ); +// virtual long PreNotify( NotifyEvent& rNEvt ); public: SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings ); ~SvxHpLinkDlg (); virtual void PageCreated( USHORT nId, IconChoicePage& rPage ); - USHORT SetPage( SvxHyperlinkItem* pItem ); - void EnableInetBrowse( sal_Bool bEnable = sal_True ); - void SetReadOnlyMode( sal_Bool bReadOnly = sal_False ); - inline BOOL IsHTMLDoc() const { return mbIsHTMLDoc; } + USHORT SetPage( SvxHyperlinkItem* pItem ); + void EnableInetBrowse( sal_Bool bEnable = sal_True ); + void SetReadOnlyMode( sal_Bool bReadOnly = sal_False ); + inline BOOL IsHTMLDoc() const { return mbIsHTMLDoc; } - inline SfxBindings* GetBindings() const { return mpBindings; }; - inline SfxDispatcher* GetDispatcher() const { return mpBindings->GetDispatcher(); } + inline SfxBindings* GetBindings() const { return mpBindings; }; + inline SfxDispatcher* GetDispatcher() const { return mpBindings->GetDispatcher(); } }; diff --git a/cui/source/inc/cuiimapwnd.hxx b/cui/source/inc/cuiimapwnd.hxx index fa0bfeb1ad64..b12c86ce3088 100644 --- a/cui/source/inc/cuiimapwnd.hxx +++ b/cui/source/inc/cuiimapwnd.hxx @@ -23,20 +23,20 @@ class URLDlg : public ModalDialog { - FixedText maFtURL; - Edit maEdtURL; - FixedText maFtTarget; - ComboBox maCbbTargets; - FixedText maFtName; - Edit maEdtName; - FixedText maFtAlternativeText; - Edit maEdtAlternativeText; - FixedText maFtDescription; - MultiLineEdit maEdtDescription; + FixedText maFtURL; + Edit maEdtURL; + FixedText maFtTarget; + ComboBox maCbbTargets; + FixedText maFtName; + Edit maEdtName; + FixedText maFtAlternativeText; + Edit maEdtAlternativeText; + FixedText maFtDescription; + MultiLineEdit maEdtDescription; FixedLine maFlURL; - HelpButton maBtnHelp; - OKButton maBtnOk; - CancelButton maBtnCancel; + HelpButton maBtnHelp; + OKButton maBtnOk; + CancelButton maBtnCancel; public: @@ -45,13 +45,13 @@ public: const String& rTarget, const String& rName, TargetList& rTargetList ); - String GetURL() const { return maEdtURL.GetText(); } - String GetAltText() const { return maEdtAlternativeText.GetText(); } - String GetDesc() const { return maEdtDescription.GetText(); } - String GetTarget() const { return maCbbTargets.GetText(); } - String GetName() const { return maEdtName.GetText(); } + String GetURL() const { return maEdtURL.GetText(); } + String GetAltText() const { return maEdtAlternativeText.GetText(); } + String GetDesc() const { return maEdtDescription.GetText(); } + String GetTarget() const { return maCbbTargets.GetText(); } + String GetName() const { return maEdtName.GetText(); } }; -#endif +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx index e96e639c05ef..855cee4e01d3 100644 --- a/cui/source/inc/cuioptgenrl.hxx +++ b/cui/source/inc/cuioptgenrl.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 @@ -69,39 +69,39 @@ class SvxGeneralTabPage : public SfxTabPage using TabPage::DeactivatePage; private: FixedLine aAddrFrm; - FixedText aCompanyLbl; + FixedText aCompanyLbl; SvxUserEdit aCompanyEdit; - FixedText aNameLbl; - FixedText aNameLblRuss; - FixedText aNameLblEastern; + FixedText aNameLbl; + FixedText aNameLblRuss; + FixedText aNameLblEastern; SvxUserEdit aFirstName; SvxUserEdit aFatherName; SvxUserEdit aName; SvxUserEdit aShortName; - FixedText aStreetLbl; - FixedText aStreetLblRuss; + FixedText aStreetLbl; + FixedText aStreetLblRuss; SvxUserEdit aStreetEdit; SvxUserEdit aApartmentNrEdit; - FixedText aCityLbl; + FixedText aCityLbl; SvxUserEdit aPLZEdit; SvxUserEdit aCityEdit; SvxUserEdit aUsCityEdit; SvxUserEdit aUsStateEdit; SvxUserEdit aUsZipEdit; - FixedText aCountryLbl; + FixedText aCountryLbl; SvxUserEdit aCountryEdit; - FixedText aTitlePosLbl; + FixedText aTitlePosLbl; SvxUserEdit aTitleEdit; SvxUserEdit aPositionEdit; - FixedText aPhoneLbl; + FixedText aPhoneLbl; SvxUserEdit aTelPrivEdit; SvxUserEdit aTelCompanyEdit; - FixedText aFaxMailLbl; + FixedText aFaxMailLbl; SvxUserEdit aFaxEdit; SvxUserEdit aEmailEdit; - CheckBox aUseDataCB; + CheckBox aUseDataCB; - GeneralTabPage_Impl* pImpl; + GeneralTabPage_Impl* pImpl; #ifdef _SVX_OPTGENRL_CXX DECL_LINK( ModifyHdl_Impl, Edit * ); @@ -111,16 +111,16 @@ private: #endif protected: - virtual int DeactivatePage( SfxItemSet* pSet ); + virtual int DeactivatePage( SfxItemSet* pSet ); public: SvxGeneralTabPage( Window* pParent, const SfxItemSet& rSet ); ~SvxGeneralTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; #endif // #ifndef _SVX_CUIOPTGENRL_HXX diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index 023d9281de94..eb5c21f2d8a6 100755 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.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 @@ -40,17 +40,17 @@ // tab pages // used in "dialogs" -#define RID_SVX_FORMAT_CELLS_DLG ( RID_SVX_START + 42 ) +#define RID_SVX_FORMAT_CELLS_DLG ( RID_SVX_START + 42 ) // used in "tabpages" -#define RID_SVXDLG_TEXT (RID_SVX_START + 183) +#define RID_SVXDLG_TEXT (RID_SVX_START + 183) #define RID_SVXDLG_TRANSFORM (RID_SVX_START + 45) #define RID_SVXDLG_LINE (RID_SVX_START + 50) #define RID_SVXDLG_BBDLG (RID_SVX_START + 40) #define RID_SVXDLG_CAPTION (RID_SVX_START + 151) #define RID_SVXDLG_AREA (RID_SVX_START + 55) -#define RID_SVXSTRARY_PAPERSIZE_STD (RID_SVX_START + 142) -#define RID_SVXSTRARY_PAPERSIZE_DRAW (RID_SVX_START + 143) +#define RID_SVXSTRARY_PAPERSIZE_STD (RID_SVX_START + 142) +#define RID_SVXSTRARY_PAPERSIZE_DRAW (RID_SVX_START + 143) #define RID_SVXSTR_TABLE_PRESET_NONE (RID_SVX_START + 969) #define RID_SVXSTR_TABLE_PRESET_ONLYOUTER (RID_SVX_START + 970) #define RID_SVXSTR_TABLE_PRESET_OUTERHORI (RID_SVX_START + 971) @@ -76,8 +76,8 @@ #define RID_SVXSTR_PAGEDIR_RTL_VERT (RID_SVX_START + 967) #define RID_SVXSTR_PAGEDIR_LTR_VERT (RID_SVX_START + 968) #define RID_STR_EDIT_GRAPHIC (RID_SVX_START + 509) -#define RID_SVXIMG_LOAD_H (RID_SVX_START + 283) -#define RID_SVXIMG_SAVE_H (RID_SVX_START + 284) +#define RID_SVXIMG_LOAD_H (RID_SVX_START + 283) +#define RID_SVXIMG_SAVE_H (RID_SVX_START + 284) #define RID_SVXSTR_DESC_GRADIENT (RID_SVX_START + 163) #define RID_SVXSTR_ASK_DEL_GRADIENT (RID_SVX_START + 165) @@ -108,23 +108,23 @@ // autocor #define RID_OFAPAGE_AUTOCOMPLETE_OPTIONS (RID_OFA_START + 119) -#define RID_OFAPAGE_AUTOCORR_OPTIONS (RID_OFA_START + 102) -#define RID_OFAPAGE_AUTOFMT_APPLY (RID_OFA_START + 110) -#define RID_OFAPAGE_AUTOCORR_REPLACE (RID_OFA_START + 103) -#define RID_OFAPAGE_AUTOCORR_EXCEPT (RID_OFA_START + 104) -#define RID_OFAPAGE_AUTOCORR_QUOTE (RID_OFA_START + 109) -#define RID_OFADLG_PRCNT_SET (RID_OFA_START + 111) +#define RID_OFAPAGE_AUTOCORR_OPTIONS (RID_OFA_START + 102) +#define RID_OFAPAGE_AUTOFMT_APPLY (RID_OFA_START + 110) +#define RID_OFAPAGE_AUTOCORR_REPLACE (RID_OFA_START + 103) +#define RID_OFAPAGE_AUTOCORR_EXCEPT (RID_OFA_START + 104) +#define RID_OFAPAGE_AUTOCORR_QUOTE (RID_OFA_START + 109) +#define RID_OFADLG_PRCNT_SET (RID_OFA_START + 111) // options -#define RID_SVXSTR_DIAGRAM_ROW (RID_SVX_START + 1162) -#define RID_OFAPAGE_CONNPOOLOPTIONS (RID_OFA_START + 122) +#define RID_SVXSTR_DIAGRAM_ROW (RID_SVX_START + 1162) +#define RID_OFAPAGE_CONNPOOLOPTIONS (RID_OFA_START + 122) #define QUERY_DELETE_CONFIRM (RID_SVX_START + 1110) -#define RID_SVXPAGE_JSEARCH_OPTIONS (RID_SVX_START + 840) -#define DLG_DOCUMENTLINK (RID_OFA_START + 124) +#define RID_SVXPAGE_JSEARCH_OPTIONS (RID_SVX_START + 840) +#define DLG_DOCUMENTLINK (RID_OFA_START + 124) #define STR_LINKEDDOC_DOESNOTEXIST (RID_SVX_START + 1111) #define STR_LINKEDDOC_NO_SYSTEM_FILE (RID_SVX_START + 1169) #define STR_NAME_CONFLICT (RID_SVX_START + 1112) -#define RID_SVX_FONT_SUBSTITUTION (RID_SVX_START + 18) +#define RID_SVX_FONT_SUBSTITUTION (RID_SVX_START + 18) // treeopt #define RID_SVXPAGE_COLOR (RID_SVX_START + 60) @@ -136,27 +136,27 @@ #define RID_IMGLIST_TREEOPT_HC (RID_OFA_START + 175) #define RID_RIDER_SLL_SITE (RID_OFA_START + 100)//? #define RID_RIDER_SLL_PERSONAL (RID_OFA_START + 101)//? -#define RID_OFADLG_OPTIONS_TREE_HINT (RID_OFA_START + 118)//? +#define RID_OFADLG_OPTIONS_TREE_HINT (RID_OFA_START + 118)//? // options #define RID_SVXDLG_WEBCONNECTION_INFO (RID_SVX_START + 301) #define RID_SVXDLG_SECURITY_OPTIONS (RID_SVX_START + 300) #define RID_SVXPAGE_ONLINEUPDATE (RID_SVX_START + 298) -#define OFA_TP_MEMORY (RID_OFA_START + 250) -#define RID_SVXPAGE_INET_SECURITY (RID_SVX_START + 200) -#define RID_SVXPAGE_INET_SEARCH (RID_SVX_START + 160) +#define OFA_TP_MEMORY (RID_OFA_START + 250) +#define RID_SVXPAGE_INET_SECURITY (RID_SVX_START + 200) +#define RID_SVXPAGE_INET_SEARCH (RID_SVX_START + 160) #define RID_SVXPAGE_INET_PROXY (RID_SVX_START + 157) #define RID_SVXPAGE_INET_MAIL (RID_SVX_START + 155) -#define RID_SVXPAGE_INET_MOZPLUGIN (RID_SVX_START + 2161) -#define RID_OFAPAGE_HTMLOPT (RID_OFA_START + 100) -#define OFA_TP_LANGUAGES (RID_OFA_START + 205) -#define OFA_TP_MISC (RID_OFA_START + 200) -#define OFA_TP_VIEW (RID_OFA_START + 202) -#define RID_OFAPAGE_MSFILTEROPT (RID_OFA_START + 120) -#define RID_OFAPAGE_MSFILTEROPT2 (RID_OFA_START + 121) +#define RID_SVXPAGE_INET_MOZPLUGIN (RID_SVX_START + 2161) +#define RID_OFAPAGE_HTMLOPT (RID_OFA_START + 100) +#define OFA_TP_LANGUAGES (RID_OFA_START + 205) +#define OFA_TP_MISC (RID_OFA_START + 200) +#define OFA_TP_VIEW (RID_OFA_START + 202) +#define RID_OFAPAGE_MSFILTEROPT (RID_OFA_START + 120) +#define RID_OFAPAGE_MSFILTEROPT2 (RID_OFA_START + 121) #define RID_OFAPAGE_SMARTTAG_OPTIONS (RID_OFA_START + 125) -#define RID_SVXPAGE_OPTIONS_CTL (RID_SVX_START + 252) -#define RID_SVXPAGE_OPTIONS_JAVA (RID_SVX_START + 253) +#define RID_SVXPAGE_OPTIONS_CTL (RID_SVX_START + 252) +#define RID_SVXPAGE_OPTIONS_JAVA (RID_SVX_START + 253) #define RID_SVXPAGE_ACCESSIBILITYCONFIG (RID_SVX_START + 250) #define RID_SVXPAGE_ASIAN_LAYOUT (RID_SVX_START + 246) #define RID_OPTPAGE_CHART_DEFCOLORS (RID_SVX_START + 299) @@ -166,25 +166,25 @@ #define RID_SVXSTR_COLOR_CONFIG_SAVE2 (RID_SVX_START + 854) #define RID_SVXSTR_COLOR_CONFIG_DELETE (RID_SVX_START + 855) #define RID_SVXSTR_OPT_DOUBLE_DICTS (RID_SVX_START + 320) -#define RID_SVX_MSGBOX_LANGUAGE_RESTART ( RID_SVX_START + 2 ) -#define RID_SVXERR_OPT_PROXYPORTS (RID_SVX_START + 224) -#define RID_SVXDLG_OPT_JAVASCRIPT_DISABLE (RID_SVX_START + 225) -#define RID_SVXDLG_JAVA_PARAMETER (RID_SVX_START + 254) -#define RID_SVXDLG_JAVA_CLASSPATH (RID_SVX_START + 255) -#define RID_SVXERR_JRE_NOT_RECOGNIZED (RID_SVX_START + 256) -#define RID_SVXERR_JRE_FAILED_VERSION (RID_SVX_START + 257) -#define RID_SVX_MSGBOX_JAVA_RESTART ( RID_SVX_START + 0 ) -#define RID_SVX_MSGBOX_JAVA_RESTART2 ( RID_SVX_START + 1 ) -#define RID_SVXDLG_LNG_ED_NUM_PREBREAK (RID_SVX_START + 830) -#define RID_SVXDLG_EDIT_MODULES (RID_SVX_START + 831) +#define RID_SVX_MSGBOX_LANGUAGE_RESTART ( RID_SVX_START + 2 ) +#define RID_SVXERR_OPT_PROXYPORTS (RID_SVX_START + 224) +#define RID_SVXDLG_OPT_JAVASCRIPT_DISABLE (RID_SVX_START + 225) +#define RID_SVXDLG_JAVA_PARAMETER (RID_SVX_START + 254) +#define RID_SVXDLG_JAVA_CLASSPATH (RID_SVX_START + 255) +#define RID_SVXERR_JRE_NOT_RECOGNIZED (RID_SVX_START + 256) +#define RID_SVXERR_JRE_FAILED_VERSION (RID_SVX_START + 257) +#define RID_SVX_MSGBOX_JAVA_RESTART ( RID_SVX_START + 0 ) +#define RID_SVX_MSGBOX_JAVA_RESTART2 ( RID_SVX_START + 1 ) +#define RID_SVXDLG_LNG_ED_NUM_PREBREAK (RID_SVX_START + 830) +#define RID_SVXDLG_EDIT_MODULES (RID_SVX_START + 831) #define RID_SVXSTR_PATH_NAME_START (RID_SVX_START + 1003) #define RID_SVXDLG_FILTER_WARNING (RID_SVX_START + 248) #define RID_SVXBMP_LOCK (RID_SVX_START + 118) #define RID_SVXBMP_LOCK_HC (RID_SVX_START + 119) #define RID_SVXSTR_READONLY_CONFIG_TIP (RID_SVX_START + 1026) -#define RID_SVXQB_CHANGEDATA (RID_SVX_START + 214) //? -#define RID_SVXERR_OPT_DOUBLEPATHS (RID_SVX_START + 208) //? -#define RID_SVXSTR_KEY_AUTOCORRECT_DIR (RID_SVX_START + 1004) //? +#define RID_SVXQB_CHANGEDATA (RID_SVX_START + 214) //? +#define RID_SVXERR_OPT_DOUBLEPATHS (RID_SVX_START + 208) //? +#define RID_SVXSTR_KEY_AUTOCORRECT_DIR (RID_SVX_START + 1004) //? #define RID_SVXSTR_KEY_DICTIONARY_PATH (RID_SVX_START + 1010)//? #define RID_SVXSTR_KEY_LINGUISTIC_DIR (RID_SVX_START + 1016)//? #define RID_SVXSTR_KEY_USERCONFIG_PATH (RID_SVX_START + 1023)//? @@ -209,8 +209,8 @@ #define RID_SVXSTR_KEY_USERDICTIONARY_DIR (RID_SVX_START + 1025)//? // dialogs -#define RID_SVX_WND_COMMON_LINGU ( RID_SVX_START + 0 ) -#define RID_SVX_GRFFILTER_DLG_EMBOSS_TAB (RID_SVX_START + 337) +#define RID_SVX_WND_COMMON_LINGU ( RID_SVX_START + 0 ) +#define RID_SVX_GRFFILTER_DLG_EMBOSS_TAB (RID_SVX_START + 337) #define RID_SVXDLG_SEARCHATTR (RID_SVX_START + 22) #define RID_SVXDLG_HYPHENATE (RID_SVX_START + 30) #define RID_SVXDLG_THESAURUS (RID_SVX_START + 31) @@ -218,82 +218,82 @@ #define RID_SVXSTR_HMERR_CHECKINSTALL (RID_SVX_START + 94) // hyperlink dialog -#define RID_SVXDLG_NEWHYPERLINK (RID_SVX_START + 227) -#define RID_SVXBMP_HLINETTP_H (RID_SVX_START + 272) -#define RID_SVXBMP_HLMAILTP_H (RID_SVX_START + 273) -#define RID_SVXBMP_HLDOCTP_H (RID_SVX_START + 274) -#define RID_SVXBMP_HLDOCNTP_H (RID_SVX_START + 275) -#define RID_SVXBMP_HLINETTP (RID_SVX_START + 556) -#define RID_SVXBMP_HLMAILTP (RID_SVX_START + 557) -#define RID_SVXBMP_HLDOCTP (RID_SVX_START + 558) -#define RID_SVXBMP_HLDOCNTP (RID_SVX_START + 559) -#define RID_SVXPAGE_HYPERLINK_INTERNET (RID_SVX_START + 228) -#define RID_SVXPAGE_HYPERLINK_MAIL (RID_SVX_START + 229) -#define RID_SVXPAGE_HYPERLINK_DOCUMENT (RID_SVX_START + 230) -#define RID_SVXPAGE_HYPERLINK_NEWDOCUMENT (RID_SVX_START + 231) -#define RID_SVXSTR_HYPERDLG_HLINETTP (RID_SVX_START + 581) -#define RID_SVXSTR_HYPERDLG_HLINETTP_HELP (RID_SVX_START + 582) -#define RID_SVXSTR_HYPERDLG_HLMAILTP (RID_SVX_START + 583) -#define RID_SVXSTR_HYPERDLG_HLMAILTP_HELP (RID_SVX_START + 584) -#define RID_SVXSTR_HYPERDLG_HLDOCTP (RID_SVX_START + 585) -#define RID_SVXSTR_HYPERDLG_HLDOCTP_HELP (RID_SVX_START + 586) -#define RID_SVXSTR_HYPERDLG_HLDOCNTP (RID_SVX_START + 587) -#define RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP (RID_SVX_START + 588) -#define RID_SVXSTR_HYPDLG_APPLYBUT (RID_SVX_START + 548) -#define RID_SVXSTR_HYPDLG_CLOSEBUT (RID_SVX_START + 549) +#define RID_SVXDLG_NEWHYPERLINK (RID_SVX_START + 227) +#define RID_SVXBMP_HLINETTP_H (RID_SVX_START + 272) +#define RID_SVXBMP_HLMAILTP_H (RID_SVX_START + 273) +#define RID_SVXBMP_HLDOCTP_H (RID_SVX_START + 274) +#define RID_SVXBMP_HLDOCNTP_H (RID_SVX_START + 275) +#define RID_SVXBMP_HLINETTP (RID_SVX_START + 556) +#define RID_SVXBMP_HLMAILTP (RID_SVX_START + 557) +#define RID_SVXBMP_HLDOCTP (RID_SVX_START + 558) +#define RID_SVXBMP_HLDOCNTP (RID_SVX_START + 559) +#define RID_SVXPAGE_HYPERLINK_INTERNET (RID_SVX_START + 228) +#define RID_SVXPAGE_HYPERLINK_MAIL (RID_SVX_START + 229) +#define RID_SVXPAGE_HYPERLINK_DOCUMENT (RID_SVX_START + 230) +#define RID_SVXPAGE_HYPERLINK_NEWDOCUMENT (RID_SVX_START + 231) +#define RID_SVXSTR_HYPERDLG_HLINETTP (RID_SVX_START + 581) +#define RID_SVXSTR_HYPERDLG_HLINETTP_HELP (RID_SVX_START + 582) +#define RID_SVXSTR_HYPERDLG_HLMAILTP (RID_SVX_START + 583) +#define RID_SVXSTR_HYPERDLG_HLMAILTP_HELP (RID_SVX_START + 584) +#define RID_SVXSTR_HYPERDLG_HLDOCTP (RID_SVX_START + 585) +#define RID_SVXSTR_HYPERDLG_HLDOCTP_HELP (RID_SVX_START + 586) +#define RID_SVXSTR_HYPERDLG_HLDOCNTP (RID_SVX_START + 587) +#define RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP (RID_SVX_START + 588) +#define RID_SVXSTR_HYPDLG_APPLYBUT (RID_SVX_START + 548) +#define RID_SVXSTR_HYPDLG_CLOSEBUT (RID_SVX_START + 549) #define RID_SVXSTR_HYPDLG_NOVALIDFILENAME (RID_SVX_START + 553) -#define RID_SVXSTR_HYPERDLG_QUERYOVERWRITE (RID_SVX_START + 815) +#define RID_SVXSTR_HYPERDLG_QUERYOVERWRITE (RID_SVX_START + 815) #define RID_SVXSTR_HYPDLG_ERR_LERR_NOENTRIES (RID_SVX_START + 800) #define RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN (RID_SVX_START + 801) -#define RID_SVXFLOAT_HYPERLINK_MARKWND (RID_SVX_START + 232) -#define RID_SVXSTR_HYPDLG_MACROACT1 (RID_SVX_START + 550) -#define RID_SVXSTR_HYPDLG_MACROACT2 (RID_SVX_START + 551) -#define RID_SVXSTR_HYPDLG_MACROACT3 (RID_SVX_START + 552) -#define RID_SVXSTR_HYPERDLG_FORM_BUTTON (RID_SVX_START + 813) -#define RID_SVXSTR_HYPERDLG_FROM_TEXT (RID_SVX_START + 814) +#define RID_SVXFLOAT_HYPERLINK_MARKWND (RID_SVX_START + 232) +#define RID_SVXSTR_HYPDLG_MACROACT1 (RID_SVX_START + 550) +#define RID_SVXSTR_HYPDLG_MACROACT2 (RID_SVX_START + 551) +#define RID_SVXSTR_HYPDLG_MACROACT3 (RID_SVX_START + 552) +#define RID_SVXSTR_HYPERDLG_FORM_BUTTON (RID_SVX_START + 813) +#define RID_SVXSTR_HYPERDLG_FROM_TEXT (RID_SVX_START + 814) // imap dialog -#define RID_SVX_IMAPDLG_START (RID_SVX_START + 100) -#define RID_SVXDLG_IMAPURL (RID_SVX_IMAPDLG_START + 2) +#define RID_SVX_IMAPDLG_START (RID_SVX_START + 100) +#define RID_SVXDLG_IMAPURL (RID_SVX_IMAPDLG_START + 2) // name dialog #define RID_SVXDLG_NAME (RID_SVX_START + 62) #define RID_SVXDLG_MESSBOX (RID_SVX_START + 63) -#define RID_SVXDLG_OBJECT_NAME (RID_SVX_START + 64) +#define RID_SVXDLG_OBJECT_NAME (RID_SVX_START + 64) #define RID_SVXDLG_OBJECT_TITLE_DESC (RID_SVX_START + 67) // hangulhanja -#define RID_SVX_MDLG_HANGULHANJA (RID_SVX_START + 1 ) -#define RID_SVX_MDLG_HANGULHANJA_OPT ( RID_SVX_START + 4 ) -#define RID_SVX_MDLG_HANGULHANJA_EDIT ( RID_SVX_START + 5 ) -#define RID_SVX_MDLG_HANGULHANJA_NEWDICT ( RID_SVX_START + 6 ) +#define RID_SVX_MDLG_HANGULHANJA (RID_SVX_START + 1 ) +#define RID_SVX_MDLG_HANGULHANJA_OPT ( RID_SVX_START + 4 ) +#define RID_SVX_MDLG_HANGULHANJA_EDIT ( RID_SVX_START + 5 ) +#define RID_SVX_MDLG_HANGULHANJA_NEWDICT ( RID_SVX_START + 6 ) // icon choice -#define RID_SVXSTR_ICONCHOICEDLG_RESETBUT (RID_SVX_START + 580) +#define RID_SVXSTR_ICONCHOICEDLG_RESETBUT (RID_SVX_START + 580) // insert rows&cols -#define DLG_INS_ROW_COL (RID_SVX_START + 156) +#define DLG_INS_ROW_COL (RID_SVX_START + 156) // SvxMultiFileDialog -#define RID_SVXSTR_FILE_TITLE (RID_SVX_START + 482) -#define RID_SVXSTR_FILE_HEADLINE (RID_SVX_START + 483) -#define RID_SVXSTR_ARCHIVE_TITLE (RID_SVX_START + 484) -#define RID_SVXSTR_ARCHIVE_HEADLINE (RID_SVX_START + 485) -#define RID_SVXSTR_MULTIFILE_DBL_ERR (RID_SVX_START + 486) +#define RID_SVXSTR_FILE_TITLE (RID_SVX_START + 482) +#define RID_SVXSTR_FILE_HEADLINE (RID_SVX_START + 483) +#define RID_SVXSTR_ARCHIVE_TITLE (RID_SVX_START + 484) +#define RID_SVXSTR_ARCHIVE_HEADLINE (RID_SVX_START + 485) +#define RID_SVXSTR_MULTIFILE_DBL_ERR (RID_SVX_START + 486) // password to open/modify dialog #define RID_DLG_PASSWORD_TO_OPEN_MODIFY (RID_SVX_START + 500) // multi path dialog -#define RID_SVXDLG_MULTIPATH (RID_SVX_START + 201) -#define RID_MULTIPATH_DBL_ERR (RID_SVX_START + 207) +#define RID_SVXDLG_MULTIPATH (RID_SVX_START + 201) +#define RID_MULTIPATH_DBL_ERR (RID_SVX_START + 207) // new table dialog -#define RID_SVX_NEWTABLE_DLG ( RID_SVX_START + 44 ) +#define RID_SVX_NEWTABLE_DLG ( RID_SVX_START + 44 ) // script organizer #define RID_DLG_SCRIPTORGANIZER (RID_SVX_START + 258) -#define RID_DLG_NEWLIB (RID_SVX_START + 290) +#define RID_DLG_NEWLIB (RID_SVX_START + 290) #define RID_SVXSTR_DELQUERY (RID_SVX_START + 1027) #define RID_SVXSTR_DELQUERY_TITLE (RID_SVX_START + 1028) #define RID_SVXSTR_DELFAILED (RID_SVX_START + 1029) @@ -321,10 +321,10 @@ #define RID_SVXDLG_SPELLCHECK (RID_SVX_START + 32) // split cells -#define RID_SVX_SPLITCELLDLG ( RID_SVX_START + 43 ) +#define RID_SVX_SPLITCELLDLG ( RID_SVX_START + 43 ) // searching -#define RID_SVXDLG_SEARCHSIMILARITY (RID_SVX_START + 23) +#define RID_SVXDLG_SEARCHSIMILARITY (RID_SVX_START + 23) // customize @@ -333,7 +333,7 @@ #define RID_SVXPAGE_KEYBOARD (RID_SVX_START + 293) #define RID_SVXPAGE_TOOLBARS (RID_SVX_START + 294) #define RID_SVXPAGE_EVENTS (RID_SVX_START + 295) -#define RID_SVXPAGE_CONFIGGROUPBOX (RID_SVX_START + 304) +#define RID_SVXPAGE_CONFIGGROUPBOX (RID_SVX_START + 304) #define RID_SVXDLG_ASSIGNCOMPONENT (RID_SVX_START + 297) #define RID_DLG_SCRIPTSELECTOR (RID_SVX_START + 259) #define RID_SVXSTR_NEW_MENU (RID_SVX_START + 1039) @@ -343,10 +343,10 @@ #define RID_SVXSTR_SUBMENU_NAME (RID_SVX_START + 1049) #define RID_SVXSTR_MENU_ADDCOMMANDS_DESCRIPTION (RID_SVX_START + 1050) #define RID_SVXSTR_IMPORT_ICON_ERROR (RID_SVX_START + 1117) -#define RID_SVXSTR_DELETE_ICON_CONFIRM (RID_SVX_START + 1163) //added for issue73355 -#define RID_SVXSTR_REPLACE_ICON_WARNING (RID_SVX_START + 1164) //added for issue73355 -#define RID_SVXSTR_REPLACE_ICON_CONFIRM (RID_SVX_START + 1165) //added for issue73355 -#define RID_SVXSTR_YESTOALL (RID_SVX_START + 1166) //added for issue73355 +#define RID_SVXSTR_DELETE_ICON_CONFIRM (RID_SVX_START + 1163) //added for issue73355 +#define RID_SVXSTR_REPLACE_ICON_WARNING (RID_SVX_START + 1164) //added for issue73355 +#define RID_SVXSTR_REPLACE_ICON_CONFIRM (RID_SVX_START + 1165) //added for issue73355 +#define RID_SVXSTR_YESTOALL (RID_SVX_START + 1166) //added for issue73355 #define RID_SVXSTR_PRODUCTNAME_TOOLBARS (RID_SVX_START + 1042) #define RID_SVXSTR_TOOLBAR (RID_SVX_START + 1043) #define RID_SVXSTR_TOOLBAR_CONTENT (RID_SVX_START + 1044) @@ -360,7 +360,7 @@ #define RID_SVXSTR_RENAME_TOOLBAR (RID_SVX_START + 1137) #define RID_SVXSTR_EVENT_STARTAPP (RID_SVX_START + 1051) #define RID_SVXSTR_EVENT_CLOSEAPP (RID_SVX_START + 1052) -#define RID_SVXSTR_EVENT_NEWDOC (RID_SVX_START + 1053) +#define RID_SVXSTR_EVENT_NEWDOC (RID_SVX_START + 1053) #define RID_SVXSTR_EVENT_CLOSEDOC (RID_SVX_START + 1054) #define RID_SVXSTR_EVENT_PREPARECLOSEDOC (RID_SVX_START + 1055) #define RID_SVXSTR_EVENT_OPENDOC (RID_SVX_START + 1056) @@ -409,24 +409,24 @@ #define RID_SVXSTR_EVENT_RESETTED (RID_SVX_START + 1099) #define RID_SVXSTR_EVENT_SUBCOMPONENT_OPENED (RID_SVX_START + 1170) #define RID_SVXSTR_EVENT_SUBCOMPONENT_CLOSED (RID_SVX_START + 1171) -#define RID_SVXSTR_EVENT_CREATEDOC (RID_SVX_START + 1172) -#define RID_SVXSTR_EVENT_LOADDOCFINISHED (RID_SVX_START + 1173) -#define RID_SVXSTR_EVENT_SAVEDOCFAILED (RID_SVX_START + 1174) -#define RID_SVXSTR_EVENT_SAVEASDOCFAILED (RID_SVX_START + 1175) -#define RID_SVXSTR_EVENT_COPYTODOC (RID_SVX_START + 1176) -#define RID_SVXSTR_EVENT_COPYTODOCDONE (RID_SVX_START + 1177) -#define RID_SVXSTR_EVENT_COPYTODOCFAILED (RID_SVX_START + 1178) -#define RID_SVXSTR_EVENT_VIEWCREATED (RID_SVX_START + 1179) -#define RID_SVXSTR_EVENT_PREPARECLOSEVIEW (RID_SVX_START + 1180) -#define RID_SVXSTR_EVENT_CLOSEVIEW (RID_SVX_START + 1181) -#define RID_SVXSTR_EVENT_TITLECHANGED (RID_SVX_START + 1182) -#define RID_SVXSTR_EVENT_MODECHANGED (RID_SVX_START + 1183) -#define RID_SVXSTR_EVENT_VISAREACHANGED (RID_SVX_START + 1184) -#define RID_SVXSTR_EVENT_STORAGECHANGED (RID_SVX_START + 1185) -#define RID_SVXSTR_EVENT_MAILMERGE_END (RID_SVX_START + 1186) -#define RID_SVXSTR_EVENT_FIELDMERGE (RID_SVX_START + 1187) -#define RID_SVXSTR_EVENT_FIELDMERGE_FINISHED (RID_SVX_START + 1188) -#define RID_SVXSTR_EVENT_LAYOUT_FINISHED (RID_SVX_START + 1189) +#define RID_SVXSTR_EVENT_CREATEDOC (RID_SVX_START + 1172) +#define RID_SVXSTR_EVENT_LOADDOCFINISHED (RID_SVX_START + 1173) +#define RID_SVXSTR_EVENT_SAVEDOCFAILED (RID_SVX_START + 1174) +#define RID_SVXSTR_EVENT_SAVEASDOCFAILED (RID_SVX_START + 1175) +#define RID_SVXSTR_EVENT_COPYTODOC (RID_SVX_START + 1176) +#define RID_SVXSTR_EVENT_COPYTODOCDONE (RID_SVX_START + 1177) +#define RID_SVXSTR_EVENT_COPYTODOCFAILED (RID_SVX_START + 1178) +#define RID_SVXSTR_EVENT_VIEWCREATED (RID_SVX_START + 1179) +#define RID_SVXSTR_EVENT_PREPARECLOSEVIEW (RID_SVX_START + 1180) +#define RID_SVXSTR_EVENT_CLOSEVIEW (RID_SVX_START + 1181) +#define RID_SVXSTR_EVENT_TITLECHANGED (RID_SVX_START + 1182) +#define RID_SVXSTR_EVENT_MODECHANGED (RID_SVX_START + 1183) +#define RID_SVXSTR_EVENT_VISAREACHANGED (RID_SVX_START + 1184) +#define RID_SVXSTR_EVENT_STORAGECHANGED (RID_SVX_START + 1185) +#define RID_SVXSTR_EVENT_MAILMERGE_END (RID_SVX_START + 1186) +#define RID_SVXSTR_EVENT_FIELDMERGE (RID_SVX_START + 1187) +#define RID_SVXSTR_EVENT_FIELDMERGE_FINISHED (RID_SVX_START + 1188) +#define RID_SVXSTR_EVENT_LAYOUT_FINISHED (RID_SVX_START + 1189) // For now, keep new IDs unique only within cui. // Later, cui should perhaps get an own range of IDs. diff --git a/cui/source/inc/cuisrchdlg.hxx b/cui/source/inc/cuisrchdlg.hxx index 6f6718f55378..e4f9fc294f4f 100644 --- a/cui/source/inc/cuisrchdlg.hxx +++ b/cui/source/inc/cuisrchdlg.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 @@ -51,7 +51,7 @@ class SvxJSearchOptionsPage; class SvxJSearchOptionsDialog : public SfxSingleTabDialog { - INT32 nInitialTlFlags; + INT32 nInitialTlFlags; SvxJSearchOptionsPage *pPage; // disallow copy-constructor and assignment-operator for now @@ -65,10 +65,10 @@ public: virtual ~SvxJSearchOptionsDialog(); // Window - virtual void Activate(); + virtual void Activate(); - INT32 GetTransliterationFlags() const; - void SetTransliterationFlags( INT32 nSettings ); + INT32 GetTransliterationFlags() const; + void SetTransliterationFlags( INT32 nSettings ); }; #endif diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index bc7c024fd35e..fa61e02680f5 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.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 @@ -42,7 +42,7 @@ class SvxAreaTabDialog : public SfxTabDialog { private: SdrModel* mpDrawModel; -// const SdrView* mpView; +// const SdrView* mpView; XColorTable* mpColorTab; XColorTable* mpNewColorTab; @@ -81,29 +81,29 @@ public: const SdrView* pSdrView = NULL ); ~SvxAreaTabDialog(); - void SetNewColorTable( XColorTable* pColTab ) + void SetNewColorTable( XColorTable* pColTab ) { mpNewColorTab = pColTab; } - XColorTable* GetNewColorTable() const { return mpNewColorTab; } - const XColorTable* GetColorTable() const { return mpColorTab; } + XColorTable* GetNewColorTable() const { return mpNewColorTab; } + const XColorTable* GetColorTable() const { return mpColorTab; } - void SetNewGradientList( XGradientList* pGrdLst) + void SetNewGradientList( XGradientList* pGrdLst) { mpNewGradientList = pGrdLst; } - XGradientList* GetNewGradientList() const + XGradientList* GetNewGradientList() const { return mpNewGradientList; } const XGradientList* GetGradientList() const { return mpGradientList; } - void SetNewHatchingList( XHatchList* pHtchLst) + void SetNewHatchingList( XHatchList* pHtchLst) { mpNewHatchingList = pHtchLst; } - XHatchList* GetNewHatchingList() const + XHatchList* GetNewHatchingList() const { return mpNewHatchingList; } - const XHatchList* GetHatchingList() const { return mpHatchingList; } + const XHatchList* GetHatchingList() const { return mpHatchingList; } - void SetNewBitmapList( XBitmapList* pBmpLst) + void SetNewBitmapList( XBitmapList* pBmpLst) { mpNewBitmapList = pBmpLst; } - XBitmapList* GetNewBitmapList() const { return mpNewBitmapList; } - const XBitmapList* GetBitmapList() const { return mpBitmapList; } + XBitmapList* GetNewBitmapList() const { return mpNewBitmapList; } + const XBitmapList* GetBitmapList() const { return mpBitmapList; } - void DontDeleteColorTable() { mbDeleteColorTable = FALSE; } + void DontDeleteColorTable() { mbDeleteColorTable = FALSE; } }; /************************************************************************* @@ -122,8 +122,8 @@ class SvxTransparenceTabPage : public SvxTabPage //CHINA001 UINT16* pPageType; //CHINA001 UINT16* pDlgType; - UINT16 nPageType; //add CHINA001 - UINT16 nDlgType; //add CHINA001 + UINT16 nPageType; //add CHINA001 + UINT16 nDlgType; //add CHINA001 // main selection FixedLine aFlProp; @@ -153,7 +153,7 @@ class SvxTransparenceTabPage : public SvxTabPage // preview SvxXRectPreview aCtlBitmapPreview; SvxXRectPreview aCtlXRectPreview; - BOOL bBitmap; + BOOL bBitmap; XOutdevItemPool* pXPool; XFillAttrSetItem aXFillAttr; @@ -190,9 +190,9 @@ public: //CHINA001 void SetPageType(UINT16 *pInType) { pPageType = pInType; } //CHINA001 void SetDlgType(UINT16* pInType) { pDlgType = pInType; } - void SetPageType(UINT16 nInType) { nPageType = nInType; } //add CHINA001 - void SetDlgType(UINT16 nInType) { nDlgType = nInType; }//add CHINA001 - virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 + void SetPageType(UINT16 nInType) { nPageType = nInType; } //add CHINA001 + void SetDlgType(UINT16 nInType) { nDlgType = nInType; }//add CHINA001 + virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 }; /************************************************************************* @@ -220,28 +220,28 @@ private: FixedLine aFlStepCount; NumericField aNumFldStepCount; - CheckBox aCbxHatchBckgrd; + CheckBox aCbxHatchBckgrd; ColorLB aLbHatchBckgrdColor; FixedLine aFlSize; - TriStateBox aTsbOriginal; - TriStateBox aTsbScale; - FixedText aFtXSize; - MetricField aMtrFldXSize; - FixedText aFtYSize; - MetricField aMtrFldYSize; + TriStateBox aTsbOriginal; + TriStateBox aTsbScale; + FixedText aFtXSize; + MetricField aMtrFldXSize; + FixedText aFtYSize; + MetricField aMtrFldYSize; FixedLine aFlPosition; - SvxRectCtl aCtlPosition; - FixedText aFtXOffset; - MetricField aMtrFldXOffset; - FixedText aFtYOffset; - MetricField aMtrFldYOffset; + SvxRectCtl aCtlPosition; + FixedText aFtXOffset; + MetricField aMtrFldXOffset; + FixedText aFtYOffset; + MetricField aMtrFldYOffset; TriStateBox aTsbTile; TriStateBox aTsbStretch; FixedLine aFlOffset; - RadioButton aRbtRow; - RadioButton aRbtColumn; - MetricField aMtrFldOffset; + RadioButton aRbtRow; + RadioButton aRbtColumn; + MetricField aMtrFldOffset; SvxXRectPreview aCtlXRectPreview; @@ -261,9 +261,9 @@ private: //CHINA001 USHORT* pPageType; //CHINA001 USHORT* pDlgType; //CHINA001 USHORT* pPos; - UINT16 nPageType; //add CHINA001 - UINT16 nDlgType;//add CHINA001 - UINT16 nPos; //add CHINA001 + UINT16 nPageType; //add CHINA001 + UINT16 nDlgType;//add CHINA001 + UINT16 nPos; //add CHINA001 BOOL* pbAreaTP; @@ -271,8 +271,8 @@ private: XFillAttrSetItem aXFillAttr; SfxItemSet& rXFSet; - SfxMapUnit ePoolUnit; - FieldUnit eFUnit; + SfxMapUnit ePoolUnit; + FieldUnit eFUnit; #ifdef _SVX_TPAREA_CXX DECL_LINK( SelectDialogTypeHdl_Impl, ListBox * ); @@ -287,7 +287,7 @@ private: DECL_LINK( ToggleHatchBckgrdColorHdl_Impl, void * ); DECL_LINK( ClickBitmapHdl_Impl, void * ); DECL_LINK( ModifyBitmapHdl_Impl, void * ); -// DECL_LINK( ModifyTransparentHdl_Impl, void * ); +// DECL_LINK( ModifyTransparentHdl_Impl, void * ); DECL_LINK( ModifyStepCountHdl_Impl, void * ); DECL_LINK( ModifyTileHdl_Impl, void * ); DECL_LINK( ClickScaleHdl_Impl, void * ); @@ -299,14 +299,14 @@ public: void Construct(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - static USHORT* GetRanges(); + static USHORT* GetRanges(); virtual BOOL FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); virtual void ActivatePage( const SfxItemSet& rSet ); virtual int DeactivatePage( SfxItemSet* pSet ); virtual void PointChanged( Window* pWindow, RECT_POINT eRP ); - + void SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; } void SetGradientList( XGradientList* pGrdLst) { pGradientList = pGrdLst; } @@ -315,13 +315,13 @@ public: void SetBitmapList( XBitmapList* pBmpLst) { pBitmapList = pBmpLst; } //CHINA001 void SetPageType( USHORT* pInType ) { pPageType = pInType; } - void SetPageType( UINT16 nInType ) { nPageType = nInType; } //add CHINA001 + void SetPageType( UINT16 nInType ) { nPageType = nInType; } //add CHINA001 //CHINA001 void SetDlgType( USHORT* pInType ) { pDlgType = pInType; } - void SetDlgType( UINT16 nInType ) { nDlgType = nInType; }//add CHINA001 + void SetDlgType( UINT16 nInType ) { nDlgType = nInType; }//add CHINA001 //CHINA001 void SetPos( USHORT* pInPos ) { pPos = pInPos; } - void SetPos( UINT16 nInPos ) { nPos = nInPos; }//add CHINA001 + void SetPos( UINT16 nInPos ) { nPos = nInPos; }//add CHINA001 void SetAreaTP( BOOL* pIn ) { pbAreaTP = pIn; } - virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 + virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 void SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; } void SetGrdChgd( ChangeType* pIn ) { pnGradientListState = pIn; } void SetHtchChgd( ChangeType* pIn ) { pnHatchingListState = pIn; } @@ -350,24 +350,24 @@ private: ColorLB aLbShadowColor; FixedText aFtTransparent; MetricField aMtrTransparent; - SvxXShadowPreview aCtlXRectPreview; + SvxXShadowPreview aCtlXRectPreview; const SfxItemSet& rOutAttrs; RECT_POINT eRP; XColorTable* pColorTab; ChangeType* pnColorTableState; - UINT16 nPageType; //add CHINA001 - UINT16 nDlgType; //add CHINA001 + UINT16 nPageType; //add CHINA001 + UINT16 nDlgType; //add CHINA001 USHORT* pPos; BOOL* pbAreaTP; - BOOL bDisable; + BOOL bDisable; XOutdevItemPool* pXPool; XFillAttrSetItem aXFillAttr; SfxItemSet& rXFSet; - SfxMapUnit ePoolUnit; + SfxMapUnit ePoolUnit; #ifdef _SVX_TPSHADOW_CXX DECL_LINK( ClickShadowHdl_Impl, void * ); @@ -379,7 +379,7 @@ public: void Construct(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - static USHORT* GetRanges(); + static USHORT* GetRanges(); virtual BOOL FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); @@ -388,14 +388,14 @@ public: virtual void PointChanged( Window* pWindow, RECT_POINT eRP ); void SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; } -//CHINA001 void SetPageType( USHORT* pInType ) { pPageType = pInType; } -//CHINA001 void SetDlgType( USHORT* pInType ) { pDlgType = pInType; } - void SetPageType( UINT16 nInType ) { nPageType = nInType; } //add CHINA001 - void SetDlgType( UINT16 nInType ) { nDlgType = nInType; } //add CHINA001 +//CHINA001 void SetPageType( USHORT* pInType ) { pPageType = pInType; } +//CHINA001 void SetDlgType( USHORT* pInType ) { pDlgType = pInType; } + void SetPageType( UINT16 nInType ) { nPageType = nInType; } //add CHINA001 + void SetDlgType( UINT16 nInType ) { nDlgType = nInType; } //add CHINA001 void SetAreaTP( BOOL* pIn ) { pbAreaTP = pIn; } void SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; } - virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 - void DisablePage( BOOL bIn ) { bDisable = bIn; } + virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 + void DisablePage( BOOL bIn ) { bDisable = bIn; } }; /************************************************************************* @@ -540,7 +540,7 @@ private: XFillAttrSetItem aXFillAttr; SfxItemSet& rXFSet; - SfxMapUnit ePoolUnit; + SfxMapUnit ePoolUnit; #ifdef _SVX_TPHATCH_CXX DECL_LINK( ChangeHatchHdl_Impl, void * ); @@ -580,7 +580,7 @@ public: void SetHtchChgd( ChangeType* pIn ) { pnHatchingListState = pIn; } void SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; } - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); }; /************************************************************************* @@ -681,7 +681,7 @@ public: Return a label control that provides a name for the specified control. */ - virtual Window* GetParentLabeledBy( const Window* pLabeled ) const; + virtual Window* GetParentLabeledBy( const Window* pLabeled ) const; }; /************************************************************************* @@ -745,7 +745,7 @@ private: ColorModel eCM; - Color aAktuellColor; + Color aAktuellColor; #ifdef _SVX_TPCOLOR_CXX void ConvertColorValues (Color& rColor, ColorModel eModell); @@ -756,18 +756,18 @@ private: void FillValueSet_Impl( ValueSet& rVs ); //----------------------------------------------------------------------------------------------------- - DECL_LINK( ClickAddHdl_Impl, void * ); // Button 'Hinzufuegen' - DECL_LINK( ClickModifyHdl_Impl, void * ); // Button 'Aendern' - DECL_LINK( ClickDeleteHdl_Impl, void * ); // Button 'loeschen' - DECL_LINK( ClickWorkOnHdl_Impl, void * ); // Button 'Bearbeiten' - - DECL_LINK( SelectColorLBHdl_Impl, void * ); // Farbe aus Listbox auswählen - DECL_LINK( SelectValSetHdl_Impl, void * ); // Farbe aus Farbpalette (links) auswählen - DECL_LINK( SelectColorModelHdl_Impl, void * ); // Auswahl Listbox 'Farbmodell' + DECL_LINK( ClickAddHdl_Impl, void * ); // Button 'Hinzufuegen' + DECL_LINK( ClickModifyHdl_Impl, void * ); // Button 'Aendern' + DECL_LINK( ClickDeleteHdl_Impl, void * ); // Button 'loeschen' + DECL_LINK( ClickWorkOnHdl_Impl, void * ); // Button 'Bearbeiten' + + DECL_LINK( SelectColorLBHdl_Impl, void * ); // Farbe aus Listbox auswählen + DECL_LINK( SelectValSetHdl_Impl, void * ); // Farbe aus Farbpalette (links) auswählen + DECL_LINK( SelectColorModelHdl_Impl, void * ); // Auswahl Listbox 'Farbmodell' long ChangeColorHdl_Impl( void* p ); - DECL_LINK( ModifiedHdl_Impl, void * ); // Inhalt der Farbwerte-Felder wurde verändert - DECL_LINK( ClickLoadHdl_Impl, void * ); // Button 'Farbtabelle laden' - DECL_LINK( ClickSaveHdl_Impl, void * ); // Button 'Farbtabelle sichern' + DECL_LINK( ModifiedHdl_Impl, void * ); // Inhalt der Farbwerte-Felder wurde verändert + DECL_LINK( ClickLoadHdl_Impl, void * ); // Button 'Farbtabelle laden' + DECL_LINK( ClickSaveHdl_Impl, void * ); // Button 'Farbtabelle sichern' long CheckChanges_Impl(); #endif @@ -793,7 +793,7 @@ public: void SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; } - void SetDeleteColorTable( BOOL bIn ) { bDeleteColorTable = bIn; } + void SetDeleteColorTable( BOOL bIn ) { bDeleteColorTable = bIn; } virtual void FillUserData(); }; diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index efb22b2ff607..03e83ab0dcc4 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.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 @@ -89,7 +89,7 @@ public: XLineEndList* GetNewLineEndList() const { return pNewLineEndList; } const XLineEndList* GetLineEndList() const { return pLineEndList; } - void SetNewColorTable( XColorTable* pColTab ) { mpNewColorTab = pColTab; } + void SetNewColorTable( XColorTable* pColTab ) { mpNewColorTab = pColTab; } XColorTable* GetNewColorTable() const { return mpNewColorTab; } const XColorTable* GetColorTable() const { return pColorTab; } }; @@ -134,27 +134,27 @@ private: //#58425# Symbole auf einer Linie (z.B. StarChart) -> SdrObjList* pSymbolList; //a list of symbols to be shown in menu. Symbol at position SID_ATTR_SYMBOLTYPE is to be shown in preview. The list position is to be used cyclic. - bool bNewSize; - Graphic aAutoSymbolGraphic; //a graphic to be displayed in the preview in case that an automatic symbol is choosen - long nNumMenuGalleryItems; - long nSymbolType; + bool bNewSize; + Graphic aAutoSymbolGraphic; //a graphic to be displayed in the preview in case that an automatic symbol is choosen + long nNumMenuGalleryItems; + long nSymbolType; SfxItemSet* pSymbolAttr; //attributes for the shown symbols; only necessary if not equal to line properties - FixedLine aFlSymbol; + FixedLine aFlSymbol; MenuButton aSymbolMB; FixedText aSymbolWidthFT; - MetricField aSymbolWidthMF; - FixedText aSymbolHeightFT; - MetricField aSymbolHeightMF; - CheckBox aSymbolRatioCB; - List aGrfNames; - List aGrfBrushItems; - String sNumCharFmtName; - BOOL bLastWidthModified; - Size aSymbolLastSize; - Graphic aSymbolGraphic; - Size aSymbolSize; - BOOL bSymbols; - + MetricField aSymbolWidthMF; + FixedText aSymbolHeightFT; + MetricField aSymbolHeightMF; + CheckBox aSymbolRatioCB; + List aGrfNames; + List aGrfBrushItems; + String sNumCharFmtName; + BOOL bLastWidthModified; + Size aSymbolLastSize; + Graphic aSymbolGraphic; + Size aSymbolSize; + BOOL bSymbols; + const SfxItemSet& rOutAttrs; RECT_POINT eRP; BOOL bObjSelected; @@ -174,16 +174,16 @@ private: ChangeType* pnLineEndListState; ChangeType* pnDashListState; ChangeType* pnColorTableState; - UINT16 nPageType; //add CHINA001 - UINT16 nDlgType; //add CHINA001 + UINT16 nPageType; //add CHINA001 + UINT16 nDlgType; //add CHINA001 USHORT* pPosDashLb; USHORT* pPosLineEndLb; SfxMapUnit ePoolUnit; // #63083# - INT32 nActLineWidth; - + INT32 nActLineWidth; + //Handler für Gallery-Popup-Menue-Button + Size DECL_LINK( GraphicHdl_Impl, MenuButton * ); DECL_LINK( MenuCreateHdl_Impl, MenuButton * ); @@ -235,15 +235,15 @@ public: void SetObjSelected( BOOL bHasObj ) { bObjSelected = bHasObj; } void SetPageType( UINT16 nInType ) { nPageType = nInType; }//CHINA001 void SetPageType( USHORT* pInType ) { pPageType = pInType; } - void SetDlgType( UINT16 nInType ) { nDlgType = nInType; } //CHINA001 void SetDlgType( USHORT* pInType ) { pDlgType = pInType; } + void SetDlgType( UINT16 nInType ) { nDlgType = nInType; } //CHINA001 void SetDlgType( USHORT* pInType ) { pDlgType = pInType; } void SetPosDashLb( USHORT* pInPos ) { pPosDashLb = pInPos; } void SetPosLineEndLb( USHORT* pInPos ) { pPosLineEndLb = pInPos; } void SetLineEndChgd( ChangeType* pIn ) { pnLineEndListState = pIn; } void SetDashChgd( ChangeType* pIn ) { pnDashListState = pIn; } - void SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; } + void SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; } - virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 + virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 virtual void DataChanged( const DataChangedEvent& rDCEvt ); }; diff --git a/cui/source/inc/cuitbxform.hxx b/cui/source/inc/cuitbxform.hxx index e2b992dbfc72..ff6381487922 100644 --- a/cui/source/inc/cuitbxform.hxx +++ b/cui/source/inc/cuitbxform.hxx @@ -13,10 +13,10 @@ class FmInputRecordNoDialog : public ModalDialog { public: - FixedText m_aLabel; - NumericField m_aRecordNo; - OKButton m_aOk; - CancelButton m_aCancel; + FixedText m_aLabel; + NumericField m_aRecordNo; + OKButton m_aOk; + CancelButton m_aCancel; public: FmInputRecordNoDialog(Window * pParent); diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index 2ae0bd775304..0f642c16b07a 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.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 @@ -53,18 +53,18 @@ namespace svx { private: FixedLine aStdBox; - FixedText aTypeText; - FixedText aPathText; - SvxControlFocusHelper aPathCtrl; - PushButton m_aNew; - PushButton m_aEdit; - PushButton m_aDelete; - - HeaderBar* pHeaderBar; - ::svx::OptHeaderTabListBox* pPathBox; - SvLBoxEntry* m_pCurEntry; - ULONG m_nOldCount; - BOOL m_bModified; + FixedText aTypeText; + FixedText aPathText; + SvxControlFocusHelper aPathCtrl; + PushButton m_aNew; + PushButton m_aEdit; + PushButton m_aDelete; + + HeaderBar* pHeaderBar; + ::svx::OptHeaderTabListBox* pPathBox; + SvLBoxEntry* m_pCurEntry; + ULONG m_nOldCount; + BOOL m_bModified; #ifdef SVX_DBREGISTER_HXX DECL_LINK( NewHdl, void * ); @@ -79,25 +79,25 @@ namespace svx /** inserts a new entry in the tablistbox - @param _sName + @param _sName The name of the entry. - @param _sLocation + @param _sLocation The location of the file. */ void insertNewEntry( const ::rtl::OUString& _sName,const ::rtl::OUString& _sLocation, const bool bReadOnly ); /** opens the LinkDialog to create a register pair - @param _sOldName + @param _sOldName The old name of the entry may be empty. - @param _sOldLocation + @param _sOldLocation The old location of the entry may be empty. - @param _pEntry + @param _pEntry The entry to remove if the entry will be changed */ void openLinkDialog(const String& _sOldName,const String& _sOldLocation,SvLBoxEntry* _pEntry = NULL); /** opens a file pciker to select a database file - @param _sLocation + @param _sLocation If set, the file picker use it as default directory @return the location of the database file @@ -109,11 +109,11 @@ namespace svx DbRegistrationOptionsPage( Window* pParent, const SfxItemSet& rSet ); virtual ~DbRegistrationOptionsPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - static USHORT* GetRanges(); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); + static USHORT* GetRanges(); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); virtual void FillUserData(); }; @@ -148,11 +148,11 @@ namespace svx DatabaseRegistrationDialog( Window* pParent, const SfxItemSet& rAttr ); ~DatabaseRegistrationDialog(); - virtual short Execute(); + virtual short Execute(); }; //........................................................................ -} // namespace svx +} // namespace svx //........................................................................ #endif // SVX_DBREGISTER_HXX diff --git a/cui/source/inc/defdlgname.hxx b/cui/source/inc/defdlgname.hxx index 39913eaba94a..f2b340a4ed23 100644 --- a/cui/source/inc/defdlgname.hxx +++ b/cui/source/inc/defdlgname.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 @@ -30,13 +30,13 @@ // define ---------------------------------------------------------------- -#define MESS_BTN_1 ((USHORT)0) -#define MESS_BTN_2 ((USHORT)1) +#define MESS_BTN_1 ((USHORT)0) +#define MESS_BTN_2 ((USHORT)1) // const ----------------------------------------------------------------- -const short RET_BTN_1 = 100; -const short RET_BTN_2 = 101; +const short RET_BTN_1 = 100; +const short RET_BTN_2 = 101; #endif diff --git a/cui/source/inc/dialmgr.hxx b/cui/source/inc/dialmgr.hxx index 4d5f4f115931..637c561160a2 100644 --- a/cui/source/inc/dialmgr.hxx +++ b/cui/source/inc/dialmgr.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 @@ -37,13 +37,13 @@ class ResMgr; struct CuiResMgr { - static ResMgr* GetResMgr(); + static ResMgr* GetResMgr(); }; -#define CUI_MGR() (*CuiResMgr::GetResMgr()) -#define CUI_RES(i) ResId(i,CUI_MGR()) -#define CUI_RESSTR(i) UniString(ResId(i,CUI_MGR())) -#define CUI_RESSSTR(i) String(ResId(i,CUI_MGR())) +#define CUI_MGR() (*CuiResMgr::GetResMgr()) +#define CUI_RES(i) ResId(i,CUI_MGR()) +#define CUI_RESSTR(i) UniString(ResId(i,CUI_MGR())) +#define CUI_RESSSTR(i) String(ResId(i,CUI_MGR())) #endif diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx index 641d00342eee..936a560adc7e 100644 --- a/cui/source/inc/dlgname.hxx +++ b/cui/source/inc/dlgname.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 @@ -46,11 +46,11 @@ class SvxNameDialog : public ModalDialog { private: - FixedText aFtDescription; - Edit aEdtName; - OKButton aBtnOK; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + FixedText aFtDescription; + Edit aEdtName; + OKButton aBtnOK; + CancelButton aBtnCancel; + HelpButton aBtnHelp; Link aCheckNameHdl; #if _SOLAR__PRIVATE @@ -96,16 +96,16 @@ class SvxObjectNameDialog : public ModalDialog { private: // name - FixedText aFtName; - Edit aEdtName; + FixedText aFtName; + Edit aEdtName; // separator - FixedLine aFlSeparator; + FixedLine aFlSeparator; // buttons - HelpButton aBtnHelp; - OKButton aBtnOK; - CancelButton aBtnCancel; + HelpButton aBtnHelp; + OKButton aBtnOK; + CancelButton aBtnCancel; // callback link for name uniqueness Link aCheckNameHdl; @@ -140,20 +140,20 @@ class SvxObjectTitleDescDialog : public ModalDialog { private: // title - FixedText aFtTitle; - Edit aEdtTitle; + FixedText aFtTitle; + Edit aEdtTitle; // description - FixedText aFtDescription; - MultiLineEdit aEdtDescription; + FixedText aFtDescription; + MultiLineEdit aEdtDescription; // separator - FixedLine aFlSeparator; + FixedLine aFlSeparator; // buttons - HelpButton aBtnHelp; - OKButton aBtnOK; - CancelButton aBtnCancel; + HelpButton aBtnHelp; + OKButton aBtnOK; + CancelButton aBtnCancel; public: // constructor @@ -174,12 +174,12 @@ public: class SvxMessDialog : public ModalDialog { private: - FixedText aFtDescription; - PushButton aBtn1; - PushButton aBtn2; - CancelButton aBtnCancel; - FixedImage aFtImage; - Image* pImage; + FixedText aFtDescription; + PushButton aBtn1; + PushButton aBtn2; + CancelButton aBtnCancel; + FixedImage aFtImage; + Image* pImage; #if _SOLAR__PRIVATE DECL_LINK( Button1Hdl, Button * ); DECL_LINK( Button2Hdl, Button * ); @@ -188,7 +188,7 @@ public: SvxMessDialog( Window* pWindow, const String& rText, const String& rDesc, Image* pImg = NULL ); ~SvxMessDialog(); - void SetButtonText( USHORT nBtnId, const String& rNewTxt ); + void SetButtonText( USHORT nBtnId, const String& rNewTxt ); }; diff --git a/cui/source/inc/dstribut.hxx b/cui/source/inc/dstribut.hxx index 7c38ffa7c5c5..ad60687fc9cd 100644 --- a/cui/source/inc/dstribut.hxx +++ b/cui/source/inc/dstribut.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 @@ -62,29 +62,29 @@ enum SvxDistributeVertical class SvxDistributePage : public SvxTabPage { - SvxDistributeHorizontal meDistributeHor; - SvxDistributeVertical meDistributeVer; - - FixedLine maFlHorizontal ; - RadioButton maBtnHorNone ; - RadioButton maBtnHorLeft ; - RadioButton maBtnHorCenter ; - RadioButton maBtnHorDistance ; - RadioButton maBtnHorRight ; - FixedImage maHorLow ; - FixedImage maHorCenter ; - FixedImage maHorDistance ; - FixedImage maHorHigh ; - FixedLine maFlVertical ; - RadioButton maBtnVerNone ; - RadioButton maBtnVerTop ; - RadioButton maBtnVerCenter ; - RadioButton maBtnVerDistance ; - RadioButton maBtnVerBottom ; - FixedImage maVerLow ; - FixedImage maVerCenter ; - FixedImage maVerDistance ; - FixedImage maVerHigh ; + SvxDistributeHorizontal meDistributeHor; + SvxDistributeVertical meDistributeVer; + + FixedLine maFlHorizontal ; + RadioButton maBtnHorNone ; + RadioButton maBtnHorLeft ; + RadioButton maBtnHorCenter ; + RadioButton maBtnHorDistance ; + RadioButton maBtnHorRight ; + FixedImage maHorLow ; + FixedImage maHorCenter ; + FixedImage maHorDistance ; + FixedImage maHorHigh ; + FixedLine maFlVertical ; + RadioButton maBtnVerNone ; + RadioButton maBtnVerTop ; + RadioButton maBtnVerCenter ; + RadioButton maBtnVerDistance ; + RadioButton maBtnVerBottom ; + FixedImage maVerLow ; + FixedImage maVerCenter ; + FixedImage maVerDistance ; + FixedImage maVerHigh ; public: SvxDistributePage(Window* pWindow, const SfxItemSet& rInAttrs, @@ -109,7 +109,7 @@ public: class SvxDistributeDialog : public SfxSingleTabDialog { - SvxDistributePage* mpPage; + SvxDistributePage* mpPage; public: SvxDistributeDialog(Window* pParent, const SfxItemSet& rAttr, diff --git a/cui/source/inc/gallery.hrc b/cui/source/inc/gallery.hrc index c9d6729be447..7d6c71e2d213 100644 --- a/cui/source/inc/gallery.hrc +++ b/cui/source/inc/gallery.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 @@ #include <cuires.hrc> // Gallery-TabDialoge/-TabPages -#define RID_SVXTABDLG_GALLERY (RID_CUI_GALLERY_START ) -#define RID_SVXTABDLG_GALLERYTHEME (RID_CUI_GALLERY_START + 2) -#define RID_SVXDLG_GALLERY_TITLE (RID_CUI_GALLERY_START + 82) +#define RID_SVXTABDLG_GALLERY (RID_CUI_GALLERY_START ) +#define RID_SVXTABDLG_GALLERYTHEME (RID_CUI_GALLERY_START + 2) +#define RID_SVXDLG_GALLERY_TITLE (RID_CUI_GALLERY_START + 82) -#define RID_SVXTABPAGE_GALLERY_GENERAL (RID_CUI_GALLERY_START + 1) -#define RID_SVXTABPAGE_GALLERYTHEME_FILES (RID_CUI_GALLERY_START + 4) +#define RID_SVXTABPAGE_GALLERY_GENERAL (RID_CUI_GALLERY_START + 1) +#define RID_SVXTABPAGE_GALLERYTHEME_FILES (RID_CUI_GALLERY_START + 4) // Dialoge -#define RID_SVXDLG_GALLERY_SEARCH_PROGRESS (RID_CUI_GALLERY_START + 6) -#define RID_SVXDLG_GALLERY_TAKE_PROGRESS (RID_CUI_GALLERY_START + 7) +#define RID_SVXDLG_GALLERY_SEARCH_PROGRESS (RID_CUI_GALLERY_START + 6) +#define RID_SVXDLG_GALLERY_TAKE_PROGRESS (RID_CUI_GALLERY_START + 7) #define RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS (RID_CUI_GALLERY_START + 8) -#define RID_SVXDLG_GALLERY_THEMEID (RID_CUI_GALLERY_START + 9) +#define RID_SVXDLG_GALLERY_THEMEID (RID_CUI_GALLERY_START + 9) // Gallery-Strings -#define RID_SVXSTR_GALLERY_NOFILES (RID_CUI_GALLERY_START + 12) -#define RID_SVXSTR_GALLERY_SEARCH (RID_CUI_GALLERY_START + 30) -#define RID_SVXSTR_GALLERYPROPS_OBJECT (RID_CUI_GALLERY_START + 39) -#define RID_SVXSTR_GALLERYPROPS_GALTHEME (RID_CUI_GALLERY_START + 40) -#define RID_SVXSTR_GALLERY_READONLY (RID_CUI_GALLERY_START + 43) -#define RID_SVXSTR_GALLERY_ALLFILES (RID_CUI_GALLERY_START + 44) -#define RID_SVXSTR_GALLERY_ID_EXISTS (RID_CUI_GALLERY_START + 81) +#define RID_SVXSTR_GALLERY_NOFILES (RID_CUI_GALLERY_START + 12) +#define RID_SVXSTR_GALLERY_SEARCH (RID_CUI_GALLERY_START + 30) +#define RID_SVXSTR_GALLERYPROPS_OBJECT (RID_CUI_GALLERY_START + 39) +#define RID_SVXSTR_GALLERYPROPS_GALTHEME (RID_CUI_GALLERY_START + 40) +#define RID_SVXSTR_GALLERY_READONLY (RID_CUI_GALLERY_START + 43) +#define RID_SVXSTR_GALLERY_ALLFILES (RID_CUI_GALLERY_START + 44) +#define RID_SVXSTR_GALLERY_ID_EXISTS (RID_CUI_GALLERY_START + 81) // Images -#define RID_SVXBMP_THEME_NORMAL_BIG (RID_CUI_GALLERY_START + 49) -#define RID_SVXBMP_THEME_IMPORTED_BIG (RID_CUI_GALLERY_START + 51) -#define RID_SVXBMP_THEME_READONLY_BIG (RID_CUI_GALLERY_START + 53) -#define RID_SVXBMP_THEME_DEFAULT_BIG (RID_CUI_GALLERY_START + 55) +#define RID_SVXBMP_THEME_NORMAL_BIG (RID_CUI_GALLERY_START + 49) +#define RID_SVXBMP_THEME_IMPORTED_BIG (RID_CUI_GALLERY_START + 51) +#define RID_SVXBMP_THEME_READONLY_BIG (RID_CUI_GALLERY_START + 53) +#define RID_SVXBMP_THEME_DEFAULT_BIG (RID_CUI_GALLERY_START + 55) // lokale Defines #define BTN_OK 1 @@ -80,22 +80,22 @@ #define FL_ACTUALIZE_PROGRESS 1 #define FT_ACTUALIZE_FILE 1 #define FL_ID 1 -#define LB_RESNAME 1 -#define EDT_TITLE 20 +#define LB_RESNAME 1 +#define EDT_TITLE 20 #define FL_TITLE 21 // Gallery-TabDialog -#define FI_MS_IMAGE 1 +#define FI_MS_IMAGE 1 #define EDT_MS_NAME 1 -#define FL_MS_GENERAL_FIRST 1 -#define FT_MS_TYPE 2 -#define FT_MS_SHOW_TYPE 3 -#define FT_MS_PATH 4 -#define FT_MS_SHOW_PATH 5 -#define FT_MS_CONTENT 6 -#define FT_MS_SHOW_CONTENT 7 -#define FL_MS_GENERAL_SECOND 2 -#define FT_MS_CHANGEDATE 10 -#define FT_MS_SHOW_CHANGEDATE 11 +#define FL_MS_GENERAL_FIRST 1 +#define FT_MS_TYPE 2 +#define FT_MS_SHOW_TYPE 3 +#define FT_MS_PATH 4 +#define FT_MS_SHOW_PATH 5 +#define FT_MS_CONTENT 6 +#define FT_MS_SHOW_CONTENT 7 +#define FL_MS_GENERAL_SECOND 2 +#define FT_MS_CHANGEDATE 10 +#define FT_MS_SHOW_CHANGEDATE 11 diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx index 769937bcc75f..7cfffdd79270 100644 --- a/cui/source/inc/grfpage.hxx +++ b/cui/source/inc/grfpage.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 @@ -44,66 +44,66 @@ class SvxGrfCropPage : public SfxTabPage class SvxCropExample : public Window { - Size aFrameSize; - Point aTopLeft, aBottomRight; - Graphic aGrf; + Size aFrameSize; + Point aTopLeft, aBottomRight; + Graphic aGrf; public: SvxCropExample( Window* pPar, const ResId& rResId ); virtual void Paint( const Rectangle& rRect ); - void SetTopLeft( const Point& rNew ) { aTopLeft = rNew; } - void SetTop( long nVal ) { aTopLeft.X() = nVal; } - void SetBottom( long nVal ) { aBottomRight.X() = nVal; } - void SetLeft( long nVal ) { aTopLeft.Y() = nVal; } - void SetRight( long nVal) { aBottomRight.Y() = nVal; } - void SetBottomRight(const Point& rNew ) { aBottomRight = rNew; } + void SetTopLeft( const Point& rNew ) { aTopLeft = rNew; } + void SetTop( long nVal ) { aTopLeft.X() = nVal; } + void SetBottom( long nVal ) { aBottomRight.X() = nVal; } + void SetLeft( long nVal ) { aTopLeft.Y() = nVal; } + void SetRight( long nVal) { aBottomRight.Y() = nVal; } + void SetBottomRight(const Point& rNew ) { aBottomRight = rNew; } void SetFrameSize( const Size& rSz ); - void SetGraphic( const Graphic& rGrf ) { aGrf = rGrf; } - const Graphic& GetGraphic() const { return aGrf; } + void SetGraphic( const Graphic& rGrf ) { aGrf = rGrf; } + const Graphic& GetGraphic() const { return aGrf; } }; FixedLine aCropFL; - RadioButton aZoomConstRB; - RadioButton aSizeConstRB; - FixedText aLeftFT; - MetricField aLeftMF; - FixedText aRightFT; - MetricField aRightMF; - FixedText aTopFT; - MetricField aTopMF; - FixedText aBottomFT; - MetricField aBottomMF; + RadioButton aZoomConstRB; + RadioButton aSizeConstRB; + FixedText aLeftFT; + MetricField aLeftMF; + FixedText aRightFT; + MetricField aRightMF; + FixedText aTopFT; + MetricField aTopMF; + FixedText aBottomFT; + MetricField aBottomMF; FixedLine aZoomFL; - FixedText aWidthZoomFT; - MetricField aWidthZoomMF; - FixedText aHeightZoomFT; - MetricField aHeightZoomMF; + FixedText aWidthZoomFT; + MetricField aWidthZoomMF; + FixedText aHeightZoomFT; + MetricField aHeightZoomMF; FixedLine aSizeFL; - FixedText aWidthFT; - MetricField aWidthMF; - FixedText aHeightFT; - MetricField aHeightMF; - FixedText aOrigSizeFT; - PushButton aOrigSizePB; + FixedText aWidthFT; + MetricField aWidthMF; + FixedText aHeightFT; + MetricField aHeightMF; + FixedText aOrigSizeFT; + PushButton aOrigSizePB; // Example - SvxCropExample aExampleWN; + SvxCropExample aExampleWN; - Timer aTimer; - String aGraphicName; - Size aOrigSize; - Size aPageSize; - const MetricField* pLastCropField; - long nOldWidth; - long nOldHeight; - BOOL bReset; - BOOL bInitialized; - BOOL bSetOrigSize; + Timer aTimer; + String aGraphicName; + Size aOrigSize; + Size aPageSize; + const MetricField* pLastCropField; + long nOldWidth; + long nOldHeight; + BOOL bReset; + BOOL bInitialized; + BOOL bSetOrigSize; SvxGrfCropPage( Window *pParent, const SfxItemSet &rSet ); @@ -117,12 +117,12 @@ class SvxGrfCropPage : public SfxTabPage DECL_LINK( OrigSizeHdl, PushButton * ); DECL_LINK( Timeout, Timer * ); - void CalcZoom(); - void CalcMinMaxBorder(); - void GraphicHasChanged(BOOL bFound); - virtual void ActivatePage(const SfxItemSet& rSet); + void CalcZoom(); + void CalcMinMaxBorder(); + void GraphicHasChanged(BOOL bFound); + virtual void ActivatePage(const SfxItemSet& rSet); - Size GetGrfOrigSize( const Graphic& ) const; + Size GetGrfOrigSize( const Graphic& ) const; public: static SfxTabPage *Create( Window *pParent, const SfxItemSet &rSet ); diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index 1771cbc192e3..e3e469656063 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.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 @@ -42,7 +42,7 @@ #include <svtools/valueset.hxx> #include <vector> -#include <memory> // for auto_ptr +#include <memory> // for auto_ptr class SvxCommonLinguisticControl; //............................................................................. @@ -79,7 +79,7 @@ namespace svx void SelectEntryPos( USHORT nPos ); USHORT GetEntryCount() const; - + XubString GetEntry( USHORT nPos ) const; XubString GetSelectEntry() const; @@ -106,7 +106,7 @@ namespace svx SuggestionSet m_aValueSet; ListBox m_aListBox; - Link m_aSelectLink; + Link m_aSelectLink; bool m_bInSelectionUpdate; }; @@ -114,77 +114,77 @@ namespace svx { private: ::std::auto_ptr< SvxCommonLinguisticControl > - m_pPlayground; // order matters: before all other controls! + m_pPlayground; // order matters: before all other controls! - PushButton m_aFind; + PushButton m_aFind; SuggestionDisplay m_aSuggestions; - FixedText m_aFormat; - RadioButton m_aSimpleConversion; - RadioButton m_aHangulBracketed; - RadioButton m_aHanjaBracketed; - ::std::auto_ptr< RadioButton > m_pHanjaAbove; - ::std::auto_ptr< RadioButton > m_pHanjaBelow; - ::std::auto_ptr< RadioButton > m_pHangulAbove; - ::std::auto_ptr< RadioButton > m_pHangulBelow; - FixedText m_aConversion; - CheckBox m_aHangulOnly; - CheckBox m_aHanjaOnly; - CheckBox m_aReplaceByChar; - - CheckBox* m_pIgnoreNonPrimary; - bool m_bDocumentMode; + FixedText m_aFormat; + RadioButton m_aSimpleConversion; + RadioButton m_aHangulBracketed; + RadioButton m_aHanjaBracketed; + ::std::auto_ptr< RadioButton > m_pHanjaAbove; + ::std::auto_ptr< RadioButton > m_pHanjaBelow; + ::std::auto_ptr< RadioButton > m_pHangulAbove; + ::std::auto_ptr< RadioButton > m_pHangulBelow; + FixedText m_aConversion; + CheckBox m_aHangulOnly; + CheckBox m_aHanjaOnly; + CheckBox m_aReplaceByChar; + + CheckBox* m_pIgnoreNonPrimary; + bool m_bDocumentMode; // are we working for a document? This is normally true, but in case // the user uses the "find" functionality, we switch to working // with what the user entered, which then does not have any relation to // the document anymore. Some functionality must be disabled then - Link m_aOptionsChangedLink; - Link m_aClickByCharacterLink; + Link m_aOptionsChangedLink; + Link m_aClickByCharacterLink; public: - HangulHanjaConversionDialog( - Window* _pParent, + HangulHanjaConversionDialog( + Window* _pParent, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection ); ~HangulHanjaConversionDialog( ); public: - void SetOptionsChangedHdl( const Link& _rHdl ); - void SetIgnoreHdl( const Link& _rHdl ); - void SetIgnoreAllHdl( const Link& _rHdl ); - void SetChangeHdl( const Link& _rHdl ); - void SetChangeAllHdl( const Link& _rHdl ); - void SetOptionsHdl( const Link& _rHdl ); - - void SetClickByCharacterHdl( const Link& _rHdl ); - void SetConversionFormatChangedHdl( const Link& _rHdl ); - void SetFindHdl( const Link& _rHdl ); - - String GetCurrentString( ) const; - void SetCurrentString( + void SetOptionsChangedHdl( const Link& _rHdl ); + void SetIgnoreHdl( const Link& _rHdl ); + void SetIgnoreAllHdl( const Link& _rHdl ); + void SetChangeHdl( const Link& _rHdl ); + void SetChangeAllHdl( const Link& _rHdl ); + void SetOptionsHdl( const Link& _rHdl ); + + void SetClickByCharacterHdl( const Link& _rHdl ); + void SetConversionFormatChangedHdl( const Link& _rHdl ); + void SetFindHdl( const Link& _rHdl ); + + String GetCurrentString( ) const; + void SetCurrentString( const String& _rNewString, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rSuggestions, bool _bOriginatesFromDocument = true ); - void FocusSuggestion( ); + void FocusSuggestion( ); // retrieves the current suggestion - String GetCurrentSuggestion( ) const; + String GetCurrentSuggestion( ) const; void SetConversionFormat( editeng::HangulHanjaConversion::ConversionFormat _eType ); editeng::HangulHanjaConversion::ConversionFormat GetConversionFormat( ) const; - void SetByCharacter( sal_Bool _bByCharacter ); - sal_Bool GetByCharacter( ) const; + void SetByCharacter( sal_Bool _bByCharacter ); + sal_Bool GetByCharacter( ) const; - void SetConversionDirectionState( sal_Bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ); + void SetConversionDirectionState( sal_Bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ); // should text which does not match the primary conversion direction be ignored? - sal_Bool GetUseBothDirections( ) const; - + sal_Bool GetUseBothDirections( ) const; + // get current conversion direction to use // (return argument if GetUseBothDirections is true) - editeng::HangulHanjaConversion::ConversionDirection GetDirection( editeng::HangulHanjaConversion::ConversionDirection eDefaultDirection ) const; + editeng::HangulHanjaConversion::ConversionDirection GetDirection( editeng::HangulHanjaConversion::ConversionDirection eDefaultDirection ) const; // enables or disbales the checkboxes for ruby formatted replacements void EnableRubySupport( sal_Bool bVal ); @@ -196,7 +196,7 @@ namespace svx DECL_LINK( OnSuggestionSelected, void* ); DECL_LINK( OnConversionDirectionClicked, CheckBox* ); DECL_LINK( ClickByCharacterHdl, CheckBox* ); - + // fill the suggestion list box with suggestions for the actual input void FillSuggestions( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rSuggestions ); }; @@ -207,22 +207,22 @@ namespace svx class HangulHanjaOptionsDialog : public ModalDialog { private: - FixedText m_aUserdefdictFT; - SvxCheckListBox m_aDictsLB; - FixedLine m_aOptionsFL; - CheckBox m_aIgnorepostCB; - CheckBox m_aShowrecentlyfirstCB; - CheckBox m_aAutoreplaceuniqueCB; - PushButton m_aNewPB; - PushButton m_aEditPB; - PushButton m_aDeletePB; - OKButton m_aOkPB; - CancelButton m_aCancelPB; - HelpButton m_aHelpPB; - - SvLBoxButtonData* m_pCheckButtonData; - - HHDictList m_aDictList; + FixedText m_aUserdefdictFT; + SvxCheckListBox m_aDictsLB; + FixedLine m_aOptionsFL; + CheckBox m_aIgnorepostCB; + CheckBox m_aShowrecentlyfirstCB; + CheckBox m_aAutoreplaceuniqueCB; + PushButton m_aNewPB; + PushButton m_aEditPB; + PushButton m_aDeletePB; + OKButton m_aOkPB; + CancelButton m_aCancelPB; + HelpButton m_aHelpPB; + + SvLBoxButtonData* m_pCheckButtonData; + + HHDictList m_aDictList; ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XConversionDictionaryList > m_xConversionDictionaryList; DECL_LINK( OkHdl, void* ); @@ -234,35 +234,35 @@ namespace svx DECL_LINK( EditDictHdl, void* ); DECL_LINK( DeleteDictHdl, void* ); - void Init( void ); // reads settings from core and init controls + void Init( void ); // reads settings from core and init controls public: HangulHanjaOptionsDialog( Window* _pParent ); - virtual ~HangulHanjaOptionsDialog(); + virtual ~HangulHanjaOptionsDialog(); - void AddDict( const String& _rName, bool _bChecked ); + void AddDict( const String& _rName, bool _bChecked ); }; class HangulHanjaNewDictDialog : public ModalDialog { private: - FixedLine m_aNewDictFL; - FixedText m_aDictNameFT; - Edit m_aDictNameED; - OKButton m_aOkBtn; - CancelButton m_aCancelBtn; - HelpButton m_aHelpBtn; + FixedLine m_aNewDictFL; + FixedText m_aDictNameFT; + Edit m_aDictNameED; + OKButton m_aOkBtn; + CancelButton m_aCancelBtn; + HelpButton m_aHelpBtn; - bool m_bEntered; + bool m_bEntered; DECL_LINK( OKHdl, void* ); DECL_LINK( ModifyHdl, void* ); protected: public: HangulHanjaNewDictDialog( Window* _pParent ); - virtual ~HangulHanjaNewDictDialog(); + virtual ~HangulHanjaNewDictDialog(); - bool GetName( String& _rRetName ) const; + bool GetName( String& _rRetName ) const; }; @@ -271,49 +271,49 @@ namespace svx class SuggestionEdit : public Edit { private: - SuggestionEdit* m_pPrev; - SuggestionEdit* m_pNext; - ScrollBar& m_rScrollBar; + SuggestionEdit* m_pPrev; + SuggestionEdit* m_pNext; + ScrollBar& m_rScrollBar; - bool ShouldScroll( bool _bUp ) const; - void DoJump( bool _bUp ); + bool ShouldScroll( bool _bUp ) const; + void DoJump( bool _bUp ); public: SuggestionEdit( Window* pParent, const ResId& rResId, ScrollBar& _rScrollBar, SuggestionEdit* _pPrev, SuggestionEdit* _pNext ); - virtual ~SuggestionEdit(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual ~SuggestionEdit(); + virtual long PreNotify( NotifyEvent& rNEvt ); }; class HangulHanjaEditDictDialog : public ModalDialog { private: - const String m_aEditHintText; - HHDictList& m_rDictList; - sal_uInt32 m_nCurrentDict; - - String m_aOriginal; - SuggestionList* m_pSuggestions; - - FixedText m_aBookFT; - ListBox m_aBookLB; - FixedText m_aOriginalFT; - ComboBox m_aOriginalLB; - FixedText m_aSuggestionsFT; - SuggestionEdit m_aEdit1; - SuggestionEdit m_aEdit2; - SuggestionEdit m_aEdit3; - SuggestionEdit m_aEdit4; - ScrollBar m_aScrollSB; - PushButton m_aNewPB; - PushButton m_aDeletePB; - HelpButton m_aHelpPB; - CancelButton m_aClosePB; - - sal_uInt16 m_nTopPos; + const String m_aEditHintText; + HHDictList& m_rDictList; + sal_uInt32 m_nCurrentDict; + + String m_aOriginal; + SuggestionList* m_pSuggestions; + + FixedText m_aBookFT; + ListBox m_aBookLB; + FixedText m_aOriginalFT; + ComboBox m_aOriginalLB; + FixedText m_aSuggestionsFT; + SuggestionEdit m_aEdit1; + SuggestionEdit m_aEdit2; + SuggestionEdit m_aEdit3; + SuggestionEdit m_aEdit4; + ScrollBar m_aScrollSB; + PushButton m_aNewPB; + PushButton m_aDeletePB; + HelpButton m_aHelpPB; + CancelButton m_aClosePB; + + sal_uInt16 m_nTopPos; bool m_bModifiedSuggestions; - bool m_bModifiedOriginal; + bool m_bModifiedOriginal; DECL_LINK( OriginalModifyHdl, void* ); DECL_LINK( ScrollHdl, void* ); @@ -321,31 +321,31 @@ namespace svx DECL_LINK( EditModifyHdl2, Edit* ); DECL_LINK( EditModifyHdl3, Edit* ); DECL_LINK( EditModifyHdl4, Edit* ); - + DECL_LINK( BookLBSelectHdl, void* ); DECL_LINK( NewPBPushHdl, void* ); DECL_LINK( DeletePBPushHdl, void* ); - void InitEditDictDialog( sal_uInt32 _nSelDict ); - void UpdateOriginalLB( void ); - void UpdateSuggestions( void ); + void InitEditDictDialog( sal_uInt32 _nSelDict ); + void UpdateOriginalLB( void ); + void UpdateSuggestions( void ); void UpdateButtonStates(); + + void SetEditText( Edit& _rEdit, sal_uInt16 _nEntryNum ); + void EditModify( Edit* _pEdit, sal_uInt8 _nEntryOffset ); + void EditFocusLost( Edit* _pEdit, sal_uInt8 _nEntryOffset ); - void SetEditText( Edit& _rEdit, sal_uInt16 _nEntryNum ); - void EditModify( Edit* _pEdit, sal_uInt8 _nEntryOffset ); - void EditFocusLost( Edit* _pEdit, sal_uInt8 _nEntryOffset ); - - bool DeleteEntryFromDictionary( const ::rtl::OUString& rEntry, const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XConversionDictionary >& xDict ); + bool DeleteEntryFromDictionary( const ::rtl::OUString& rEntry, const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XConversionDictionary >& xDict ); public: HangulHanjaEditDictDialog( Window* _pParent, HHDictList& _rDictList, sal_uInt32 _nSelDict ); ~HangulHanjaEditDictDialog(); - void UpdateScrollbar( void ); + void UpdateScrollbar( void ); }; //............................................................................. -} // namespace svx +} // namespace svx //............................................................................. #endif // SVX_HANGUL_HANJA_HXX diff --git a/cui/source/inc/headertablistbox.hxx b/cui/source/inc/headertablistbox.hxx index 426bd39e69b4..7ef6d4971820 100644 --- a/cui/source/inc/headertablistbox.hxx +++ b/cui/source/inc/headertablistbox.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 @@ -36,23 +36,23 @@ class _HeaderTabListBox : public Control { private: - SvHeaderTabListBox maListBox; - HeaderBar maHeaderBar; + SvHeaderTabListBox maListBox; + HeaderBar maHeaderBar; protected: DECL_LINK( HeaderEndDrag_Impl, HeaderBar* ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual long Notify( NotifyEvent& rNEvt ); public: _HeaderTabListBox( Window* pParent, const ResId& rId ); - virtual ~_HeaderTabListBox(); + virtual ~_HeaderTabListBox(); - inline SvHeaderTabListBox& GetListBox( void ); - inline HeaderBar& GetHeaderBar( void ); + inline SvHeaderTabListBox& GetListBox( void ); + inline HeaderBar& GetHeaderBar( void ); - void ConnectElements( void ); + void ConnectElements( void ); // should be called after all manipulations on elements are done // calcs real sizes depending on sizes of this - void Show( BOOL bVisible = TRUE, USHORT nFlags = 0 ); // same meaning as Windows::Show() - void Enable( bool bEnable = true, bool bChild = true ); // same meaning as Windows::Enable() + void Show( BOOL bVisible = TRUE, USHORT nFlags = 0 ); // same meaning as Windows::Show() + void Enable( bool bEnable = true, bool bChild = true ); // same meaning as Windows::Enable() }; inline SvHeaderTabListBox& _HeaderTabListBox::GetListBox( void ) diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc index 6607c5aee4db..5b25f37fdea3 100755 --- a/cui/source/inc/helpid.hrc +++ b/cui/source/inc/helpid.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 @@ -32,21 +32,21 @@ // Help-Ids -------------------------------------------------------------- -#define HID_OPTIONS_COLOR (HID_CUI_START + 1) -#define HID_OPTIONS_SAVE (HID_CUI_START + 2) -#define HID_OPTIONS_PATH (HID_CUI_START + 3) -#define HID_OPTIONS_GENERAL (HID_CUI_START + 4) -#define HID_OPTIONS_LINGU (HID_CUI_START + 5) -#define HID_OPTIONS_SPELL (HID_CUI_START + 6) -#define HID_OPTIONS_DICT_NEW (HID_CUI_START + 7) -#define HID_OPTIONS_DICT_EDIT (HID_CUI_START + 8) -#define HID_OPTIONS_INET (HID_CUI_START + 9) -#define HID_OPTIONS_CHART_DEFCOLORS (HID_CUI_START + 10) -#define HID_OPTIONS_CTL (HID_CUI_START + 11) -#define HID_OPTIONS_PROXY (HID_CUI_START + 12) -#define HID_OPTIONS_SEARCH (HID_CUI_START + 13) -#define HID_OPTIONS_MAIL (HID_CUI_START + 14) -#define HID_OPTIONS_ASIAN_LAYOUT (HID_CUI_START + 15) +#define HID_OPTIONS_COLOR (HID_CUI_START + 1) +#define HID_OPTIONS_SAVE (HID_CUI_START + 2) +#define HID_OPTIONS_PATH (HID_CUI_START + 3) +#define HID_OPTIONS_GENERAL (HID_CUI_START + 4) +#define HID_OPTIONS_LINGU (HID_CUI_START + 5) +#define HID_OPTIONS_SPELL (HID_CUI_START + 6) +#define HID_OPTIONS_DICT_NEW (HID_CUI_START + 7) +#define HID_OPTIONS_DICT_EDIT (HID_CUI_START + 8) +#define HID_OPTIONS_INET (HID_CUI_START + 9) +#define HID_OPTIONS_CHART_DEFCOLORS (HID_CUI_START + 10) +#define HID_OPTIONS_CTL (HID_CUI_START + 11) +#define HID_OPTIONS_PROXY (HID_CUI_START + 12) +#define HID_OPTIONS_SEARCH (HID_CUI_START + 13) +#define HID_OPTIONS_MAIL (HID_CUI_START + 14) +#define HID_OPTIONS_ASIAN_LAYOUT (HID_CUI_START + 15) #define HID_CLB_EDIT_MODULES_DICS (HID_CUI_START + 16) #define HID_CLB_EDIT_MODULES_MODULES (HID_CUI_START + 17) #define HID_CLB_LINGU_MODULES (HID_CUI_START + 18) @@ -177,37 +177,37 @@ #define HID_SVX_CONFIG_TOOLBAR (HID_CUI_START + 141) #define HID_SVX_CONFIG_TOOLBAR_CONTENTS (HID_CUI_START + 142) #define HID_SELECTOR_COMMANDS (HID_CUI_START + 143) -#define HID_GALLERY_EDIT_MSNAME (HID_CUI_START + 144) +#define HID_GALLERY_EDIT_MSNAME (HID_CUI_START + 144) #define HID_SVX_CONFIG_MENU (HID_CUI_START + 145) #define HID_SVX_CONFIG_MENU_CONTENTS (HID_CUI_START + 146) -#define HID_GALLERY_NEWTHEME_FINDFILES (HID_CUI_START + 147) -#define HID_GALLERY_NEWTHEME_ADDFILES (HID_CUI_START + 148) +#define HID_GALLERY_NEWTHEME_FINDFILES (HID_CUI_START + 147) +#define HID_GALLERY_NEWTHEME_ADDFILES (HID_CUI_START + 148) #define HID_HANGULDLG_BUTTON_OPTIONS (HID_CUI_START + 149) -#define HID_HANGULDLG_BUTTON_CLOSE (HID_CUI_START + 150) -#define HID_HANGULDLG_BUTTON_IGNORE (HID_CUI_START + 151) -#define HID_HANGULDLG_BUTTON_IGNOREALL (HID_CUI_START + 152) -#define HID_HANGULDLG_BUTTON_CHANGE (HID_CUI_START + 153) -#define HID_HANGULDLG_BUTTON_CHANGEALL (HID_CUI_START + 154) -#define HID_OFA_FONT_SUBSTITUTION (HID_CUI_START + 155) -#define HID_HANGULDLG_EDIT_NEWWORD (HID_CUI_START + 156) -#define HID_OFA_SUBST_APPLY (HID_CUI_START + 157) -#define HID_OFA_SUBST_DELETE (HID_CUI_START + 158) -#define HID_SPLDLG_BUTTON_CLOSE (HID_CUI_START + 159) -#define HID_SPLDLG_BUTTON_IGNORE (HID_CUI_START + 160) -#define HID_SPLDLG_BUTTON_IGNOREALL (HID_CUI_START + 161) +#define HID_HANGULDLG_BUTTON_CLOSE (HID_CUI_START + 150) +#define HID_HANGULDLG_BUTTON_IGNORE (HID_CUI_START + 151) +#define HID_HANGULDLG_BUTTON_IGNOREALL (HID_CUI_START + 152) +#define HID_HANGULDLG_BUTTON_CHANGE (HID_CUI_START + 153) +#define HID_HANGULDLG_BUTTON_CHANGEALL (HID_CUI_START + 154) +#define HID_OFA_FONT_SUBSTITUTION (HID_CUI_START + 155) +#define HID_HANGULDLG_EDIT_NEWWORD (HID_CUI_START + 156) +#define HID_OFA_SUBST_APPLY (HID_CUI_START + 157) +#define HID_OFA_SUBST_DELETE (HID_CUI_START + 158) +#define HID_SPLDLG_BUTTON_CLOSE (HID_CUI_START + 159) +#define HID_SPLDLG_BUTTON_IGNORE (HID_CUI_START + 160) +#define HID_SPLDLG_BUTTON_IGNOREALL (HID_CUI_START + 161) #define HID_SPLDLG_BUTTON_CHANGE (HID_CUI_START + 162) -#define HID_SPLDLG_BUTTON_CHANGEALL (HID_CUI_START + 163) -#define HID_SPLDLG_BUTTON_EXPLAIN (HID_CUI_START + 164) -#define HID_CHARMAP_CTL_SHOWSET (HID_CUI_START + 165) -#define HID_CHARMAP_CTL_SHOWTEXT (HID_CUI_START + 166) -#define HID_CHARMAP_CTL_SHOWCHAR (HID_CUI_START + 167) -#define HID_DLG_NAME (HID_CUI_START + 168) -#define HID_DLG_MESSBOX (HID_CUI_START + 169) +#define HID_SPLDLG_BUTTON_CHANGEALL (HID_CUI_START + 163) +#define HID_SPLDLG_BUTTON_EXPLAIN (HID_CUI_START + 164) +#define HID_CHARMAP_CTL_SHOWSET (HID_CUI_START + 165) +#define HID_CHARMAP_CTL_SHOWTEXT (HID_CUI_START + 166) +#define HID_CHARMAP_CTL_SHOWCHAR (HID_CUI_START + 167) +#define HID_DLG_NAME (HID_CUI_START + 168) +#define HID_DLG_MESSBOX (HID_CUI_START + 169) #define HID_HANGULDLG_SUGGESTIONS (HID_CUI_START + 170) #define HID_HANGULDLG_SUGGESTIONS_GRID (HID_CUI_START + 171) #define HID_HANGULDLG_SUGGESTIONS_LIST (HID_CUI_START + 172) -#define HID_DLG_OBJECT_NAME (HID_CUI_START + 173) -#define HID_DLG_OBJECT_TITLE_DESC (HID_CUI_START + 174) +#define HID_DLG_OBJECT_NAME (HID_CUI_START + 173) +#define HID_DLG_OBJECT_TITLE_DESC (HID_CUI_START + 174) #define HID_SVX_CONFIG_MENU_ORGANIZER (HID_CUI_START + 175) #define HID_SVX_CONFIG_ICON_SELECTOR (HID_CUI_START + 176) #define HID_SVX_CONFIG_NAME_SUBMENU (HID_CUI_START + 177) @@ -222,151 +222,151 @@ #define HID_SVX_MODIFY_TOOLBAR_ITEM (HID_CUI_START + 186) #define HID_SVX_SAVE_IN (HID_CUI_START + 187) #define HID_OPTIONS_MULTIPATH_LIST (HID_CUI_START + 188) -#define HID_FM_DLG_SEARCH (HID_CUI_START + 189) -#define HID_SEARCH_TEXT (HID_CUI_START + 190) -#define HID_SEARCH_ALLFIELDS (HID_CUI_START + 191) -#define HID_GALLERY_PROPERTIES_GENERAL (HID_CUI_START + 192) -#define HID_SEARCH_FIELDSELECTION (HID_CUI_START + 193) -#define HID_SEARCH_POSITION (HID_CUI_START + 194) -#define HID_SEARCH_FORMATTER (HID_CUI_START + 195) -#define HID_SEARCH_CASE (HID_CUI_START + 196) -#define HID_SEARCH_BACKWARD (HID_CUI_START + 197) -#define HID_SEARCH_STARTOVER (HID_CUI_START + 198) -#define HID_SEARCH_WILDCARD (HID_CUI_START + 199) -#define HID_SEARCH_REGULAR (HID_CUI_START + 200) -#define HID_SEARCH_APPROX (HID_CUI_START + 201) -#define HID_SEARCH_APPROXSETTINGS (HID_CUI_START + 202) -#define HID_SEARCH_BTN_SEARCH (HID_CUI_START + 203) -#define HID_SEARCH_BTN_CLOSE (HID_CUI_START + 204) -#define HID_GALLERY_BROWSER (HID_CUI_START + 205) -#define HID_GALLERY_SEARCH (HID_CUI_START + 206) -#define HID_GALLERY_APPLY (HID_CUI_START + 207) +#define HID_FM_DLG_SEARCH (HID_CUI_START + 189) +#define HID_SEARCH_TEXT (HID_CUI_START + 190) +#define HID_SEARCH_ALLFIELDS (HID_CUI_START + 191) +#define HID_GALLERY_PROPERTIES_GENERAL (HID_CUI_START + 192) +#define HID_SEARCH_FIELDSELECTION (HID_CUI_START + 193) +#define HID_SEARCH_POSITION (HID_CUI_START + 194) +#define HID_SEARCH_FORMATTER (HID_CUI_START + 195) +#define HID_SEARCH_CASE (HID_CUI_START + 196) +#define HID_SEARCH_BACKWARD (HID_CUI_START + 197) +#define HID_SEARCH_STARTOVER (HID_CUI_START + 198) +#define HID_SEARCH_WILDCARD (HID_CUI_START + 199) +#define HID_SEARCH_REGULAR (HID_CUI_START + 200) +#define HID_SEARCH_APPROX (HID_CUI_START + 201) +#define HID_SEARCH_APPROXSETTINGS (HID_CUI_START + 202) +#define HID_SEARCH_BTN_SEARCH (HID_CUI_START + 203) +#define HID_SEARCH_BTN_CLOSE (HID_CUI_START + 204) +#define HID_GALLERY_BROWSER (HID_CUI_START + 205) +#define HID_GALLERY_SEARCH (HID_CUI_START + 206) +#define HID_GALLERY_APPLY (HID_CUI_START + 207) #define HID_SPLDLG_BUTTON_IGNORERULE (HID_CUI_START + 208) -#define HID_CONFIG_ACCEL (HID_CUI_START + 209) -#define HID_ACCELCONFIG_LISTBOX (HID_CUI_START + 210) -#define HID_CONFIGGROUP_ACC_LISTBOX (HID_CUI_START + 211) -#define HID_CONFIGFUNCTION_ACC_LISTBOX (HID_CUI_START + 212) -#define HID_MACRO_LB_EVENT (HID_CUI_START + 213) -#define HID_MACRO_GROUP (HID_CUI_START + 214) -#define HID_MACRO_MACROS (HID_CUI_START + 215) -#define HID_DIALOG_HANGULHANJA (HID_CUI_START + 216) +#define HID_CONFIG_ACCEL (HID_CUI_START + 209) +#define HID_ACCELCONFIG_LISTBOX (HID_CUI_START + 210) +#define HID_CONFIGGROUP_ACC_LISTBOX (HID_CUI_START + 211) +#define HID_CONFIGFUNCTION_ACC_LISTBOX (HID_CUI_START + 212) +#define HID_MACRO_LB_EVENT (HID_CUI_START + 213) +#define HID_MACRO_GROUP (HID_CUI_START + 214) +#define HID_MACRO_MACROS (HID_CUI_START + 215) +#define HID_DIALOG_HANGULHANJA (HID_CUI_START + 216) #define HID_HANGULHANJA_OPT_DLG (HID_CUI_START + 217) #define HID_HANGULHANJA_NEWDICT_DLG (HID_CUI_START + 218) #define HID_HANGULHANJA_EDIT_DLG (HID_CUI_START + 219) #define HID_HANGULHANJA_OPT_DICTS_LB (HID_CUI_START + 220) -#define HID_MULTIPATH (HID_CUI_START + 221) -#define HID_SCRIPTORG_DIALOG (HID_CUI_START + 222) +#define HID_MULTIPATH (HID_CUI_START + 221) +#define HID_SCRIPTORG_DIALOG (HID_CUI_START + 222) #define HID_SCRIPTSBOX (HID_CUI_START + 223) -#define HID_SPELLCHECK (HID_CUI_START + 224) -#define HID_TPSIZE_CTRL (HID_CUI_START + 225) -#define HID_TPROTATION_CTRL1 (HID_CUI_START + 226) -#define HID_TPROTATION_CTRL2 (HID_CUI_START + 227) -#define HID_TRANS_ANGLE (HID_CUI_START + 228) -#define HID_TPPOSITION_CTRL (HID_CUI_START + 229) -#define HID_NUMBERFORMAT_LB_FORMAT (HID_CUI_START + 230) +#define HID_SPELLCHECK (HID_CUI_START + 224) +#define HID_TPSIZE_CTRL (HID_CUI_START + 225) +#define HID_TPROTATION_CTRL1 (HID_CUI_START + 226) +#define HID_TPROTATION_CTRL2 (HID_CUI_START + 227) +#define HID_TRANS_ANGLE (HID_CUI_START + 228) +#define HID_TPPOSITION_CTRL (HID_CUI_START + 229) +#define HID_NUMBERFORMAT_LB_FORMAT (HID_CUI_START + 230) #define HID_NUMBERFORMAT_WND_NUMBER_PREVIEW (HID_CUI_START + 231) -#define HID_TRANS_SLANT (HID_CUI_START + 232) -#define HID_TPHATCH_CTRL (HID_CUI_START + 233) -#define HID_SEARCHATTR_CTL_ATTR (HID_CUI_START + 234) -#define HID_NUMBERFORMAT_TBI_INFO (HID_CUI_START + 235) -#define HID_SEARCHATTR (HID_CUI_START + 236) -#define HID_ALIGNMENT_CTR_DIAL (HID_CUI_START + 237) -#define HID_ALIGNMENT_CTR_BORDER_LOCK (HID_CUI_START + 238) -#define HID_SEARCHSIMILARITY (HID_CUI_START + 239) -#define UID_SEARCH_RECORDSTATUS (HID_CUI_START + 240) -#define HID_OFAPAGE_AUTOCORR_CLB (HID_CUI_START + 241) -#define HID_AUTOCORR_LANGUAGE (HID_CUI_START + 242) -#define HID_OFAPAGE_AUTOFORMAT_CLB (HID_CUI_START + 243) -#define HID_TPCOLOR_RGB_1 (HID_CUI_START + 244) -#define HID_TPCOLOR_RGB_2 (HID_CUI_START + 245) -#define HID_TPCOLOR_RGB_3 (HID_CUI_START + 246) -#define HID_TPCOLOR_CMYK_1 (HID_CUI_START + 247) -#define HID_TPCOLOR_CMYK_2 (HID_CUI_START + 248) -#define HID_TPCOLOR_CMYK_3 (HID_CUI_START + 249) -#define HID_ALIGNMENT (HID_CUI_START + 250) -#define HID_OFAPAGE_AUTOCORR_OPTIONS (HID_CUI_START + 251) -#define HID_OFAPAGE_AUTOFMT_OPTIONS (HID_CUI_START + 252) -#define HID_OFAPAGE_AUTOCORR_REPLACE (HID_CUI_START + 253) -#define HID_OFACTL_AUTOCORR_REPLACE (HID_CUI_START + 254) -#define HID_OFAPAGE_AUTOCORR_EXCEPT (HID_CUI_START + 255) -#define HID_OFAPAGE_AUTOCORR_QUOTE (HID_CUI_START + 256) -#define HID_OFAPAGE_AUTOCOMPLETE_OPTIONS (HID_CUI_START + 257) -#define HID_BACKGROUND (HID_CUI_START + 258) -#define HID_BACKGROUND_CTL_BGDCOLORSET (HID_CUI_START + 259) -#define HID_BACKGROUND_CTL_POSITION (HID_CUI_START + 260) -#define HID_BORDER (HID_CUI_START + 261) -#define HID_BORDER_CTL_PRESETS (HID_CUI_START + 262) -#define HID_BORDER_CTL_SHADOWS (HID_CUI_START + 263) -#define HID_PAGE_CONNECTION (HID_CUI_START + 264) -#define HID_PAGE_CONNECTION_CTL_PREVIEW (HID_CUI_START + 265) -#define HID_PAGE_DISTRIBUTE (HID_CUI_START + 266) -#define HID_SVXPAGE_GRFCROP (HID_CUI_START + 267) -#define HID_CAPTION (HID_CUI_START + 268) -#define HID_CAPTION_CTL_TYPE (HID_CUI_START + 269) -#define HID_PAGE_MEASURE (HID_CUI_START + 270) -#define HID_MEASURE_CTL_POSITION (HID_CUI_START + 271) -#define HID_NUMBERFORMAT (HID_CUI_START + 272) -#define HID_NUMBERFORMAT_TBI_ADD (HID_CUI_START + 273) -#define HID_NUMBERFORMAT_TBI_REMOVE (HID_CUI_START + 274) -#define HID_FORMAT_PAGE (HID_CUI_START + 275) -#define HID_REDLINING_DLG (HID_CUI_START + 276) -#define HID_REDLINING_EDIT (HID_CUI_START + 277) -#define HID_REDLINING_PREV (HID_CUI_START + 278) -#define HID_REDLINING_NEXT (HID_CUI_START + 279) -#define HID_FORMAT_PARAGRAPH_STD (HID_CUI_START + 280) -#define HID_VALUESET_SINGLENUM (HID_CUI_START + 281) -#define HID_VALUESET_BULLET (HID_CUI_START + 282) -#define HID_VALUESET_NUM (HID_CUI_START + 283) -#define HID_VALUESET_NUMBMP (HID_CUI_START + 284) -#define HID_SVXPAGE_PICK_NUM (HID_CUI_START + 285) -#define HID_SVXPAGE_PICK_SINGLE_NUM (HID_CUI_START + 286) -#define HID_SVXPAGE_PICK_BMP (HID_CUI_START + 287) -#define HID_SVXPAGE_PICK_BULLET (HID_CUI_START + 288) -#define HID_SVXPAGE_NUM_OPTIONS (HID_CUI_START + 289) -#define HID_SVXPAGE_NUM_POSITION (HID_CUI_START + 290) -#define HID_MEASURE_CTL_PREVIEW (HID_CUI_START + 291) -#define HID_FORMAT_PARAGRAPH_EXT (HID_CUI_START + 292) -#define HID_FORMAT_PARAGRAPH_ALIGN (HID_CUI_START + 293) -#define HID_SVXPAGE_PARA_ASIAN (HID_CUI_START + 294) +#define HID_TRANS_SLANT (HID_CUI_START + 232) +#define HID_TPHATCH_CTRL (HID_CUI_START + 233) +#define HID_SEARCHATTR_CTL_ATTR (HID_CUI_START + 234) +#define HID_NUMBERFORMAT_TBI_INFO (HID_CUI_START + 235) +#define HID_SEARCHATTR (HID_CUI_START + 236) +#define HID_ALIGNMENT_CTR_DIAL (HID_CUI_START + 237) +#define HID_ALIGNMENT_CTR_BORDER_LOCK (HID_CUI_START + 238) +#define HID_SEARCHSIMILARITY (HID_CUI_START + 239) +#define UID_SEARCH_RECORDSTATUS (HID_CUI_START + 240) +#define HID_OFAPAGE_AUTOCORR_CLB (HID_CUI_START + 241) +#define HID_AUTOCORR_LANGUAGE (HID_CUI_START + 242) +#define HID_OFAPAGE_AUTOFORMAT_CLB (HID_CUI_START + 243) +#define HID_TPCOLOR_RGB_1 (HID_CUI_START + 244) +#define HID_TPCOLOR_RGB_2 (HID_CUI_START + 245) +#define HID_TPCOLOR_RGB_3 (HID_CUI_START + 246) +#define HID_TPCOLOR_CMYK_1 (HID_CUI_START + 247) +#define HID_TPCOLOR_CMYK_2 (HID_CUI_START + 248) +#define HID_TPCOLOR_CMYK_3 (HID_CUI_START + 249) +#define HID_ALIGNMENT (HID_CUI_START + 250) +#define HID_OFAPAGE_AUTOCORR_OPTIONS (HID_CUI_START + 251) +#define HID_OFAPAGE_AUTOFMT_OPTIONS (HID_CUI_START + 252) +#define HID_OFAPAGE_AUTOCORR_REPLACE (HID_CUI_START + 253) +#define HID_OFACTL_AUTOCORR_REPLACE (HID_CUI_START + 254) +#define HID_OFAPAGE_AUTOCORR_EXCEPT (HID_CUI_START + 255) +#define HID_OFAPAGE_AUTOCORR_QUOTE (HID_CUI_START + 256) +#define HID_OFAPAGE_AUTOCOMPLETE_OPTIONS (HID_CUI_START + 257) +#define HID_BACKGROUND (HID_CUI_START + 258) +#define HID_BACKGROUND_CTL_BGDCOLORSET (HID_CUI_START + 259) +#define HID_BACKGROUND_CTL_POSITION (HID_CUI_START + 260) +#define HID_BORDER (HID_CUI_START + 261) +#define HID_BORDER_CTL_PRESETS (HID_CUI_START + 262) +#define HID_BORDER_CTL_SHADOWS (HID_CUI_START + 263) +#define HID_PAGE_CONNECTION (HID_CUI_START + 264) +#define HID_PAGE_CONNECTION_CTL_PREVIEW (HID_CUI_START + 265) +#define HID_PAGE_DISTRIBUTE (HID_CUI_START + 266) +#define HID_SVXPAGE_GRFCROP (HID_CUI_START + 267) +#define HID_CAPTION (HID_CUI_START + 268) +#define HID_CAPTION_CTL_TYPE (HID_CUI_START + 269) +#define HID_PAGE_MEASURE (HID_CUI_START + 270) +#define HID_MEASURE_CTL_POSITION (HID_CUI_START + 271) +#define HID_NUMBERFORMAT (HID_CUI_START + 272) +#define HID_NUMBERFORMAT_TBI_ADD (HID_CUI_START + 273) +#define HID_NUMBERFORMAT_TBI_REMOVE (HID_CUI_START + 274) +#define HID_FORMAT_PAGE (HID_CUI_START + 275) +#define HID_REDLINING_DLG (HID_CUI_START + 276) +#define HID_REDLINING_EDIT (HID_CUI_START + 277) +#define HID_REDLINING_PREV (HID_CUI_START + 278) +#define HID_REDLINING_NEXT (HID_CUI_START + 279) +#define HID_FORMAT_PARAGRAPH_STD (HID_CUI_START + 280) +#define HID_VALUESET_SINGLENUM (HID_CUI_START + 281) +#define HID_VALUESET_BULLET (HID_CUI_START + 282) +#define HID_VALUESET_NUM (HID_CUI_START + 283) +#define HID_VALUESET_NUMBMP (HID_CUI_START + 284) +#define HID_SVXPAGE_PICK_NUM (HID_CUI_START + 285) +#define HID_SVXPAGE_PICK_SINGLE_NUM (HID_CUI_START + 286) +#define HID_SVXPAGE_PICK_BMP (HID_CUI_START + 287) +#define HID_SVXPAGE_PICK_BULLET (HID_CUI_START + 288) +#define HID_SVXPAGE_NUM_OPTIONS (HID_CUI_START + 289) +#define HID_SVXPAGE_NUM_POSITION (HID_CUI_START + 290) +#define HID_MEASURE_CTL_PREVIEW (HID_CUI_START + 291) +#define HID_FORMAT_PARAGRAPH_EXT (HID_CUI_START + 292) +#define HID_FORMAT_PARAGRAPH_ALIGN (HID_CUI_START + 293) +#define HID_SVXPAGE_PARA_ASIAN (HID_CUI_START + 294) #define HID_SVXPAGE_SWPOSSIZE (HID_CUI_START + 295) -#define HID_AREA_TRANSPARENCE (HID_CUI_START + 296) -#define HID_AREA_AREA (HID_CUI_START + 297) -#define HID_AREA_SHADOW (HID_CUI_START + 298) -#define HID_AREA_HATCH (HID_CUI_START + 299) -#define HID_AREA_BITMAP (HID_CUI_START + 300) -#define HID_TPSHADOW_CTRL (HID_CUI_START + 301) -#define HID_AREA_GRADIENT (HID_CUI_START + 302) -#define HID_LINE_ENDDEF (HID_CUI_START + 303) -#define HID_LINE_LINE (HID_CUI_START + 304) -#define HID_LINE_DEF (HID_CUI_START + 305) -#define HID_SPELLDLG_SETWORD (HID_CUI_START + 306) -#define HID_TABULATOR (HID_CUI_START + 307) -#define HID_PAGE_TEXTATTR (HID_CUI_START + 308) -#define HID_TEXTATTR_CTL_POSITION (HID_CUI_START + 309) -#define HID_TRANS_POSITION_SIZE (HID_CUI_START + 310) +#define HID_AREA_TRANSPARENCE (HID_CUI_START + 296) +#define HID_AREA_AREA (HID_CUI_START + 297) +#define HID_AREA_SHADOW (HID_CUI_START + 298) +#define HID_AREA_HATCH (HID_CUI_START + 299) +#define HID_AREA_BITMAP (HID_CUI_START + 300) +#define HID_TPSHADOW_CTRL (HID_CUI_START + 301) +#define HID_AREA_GRADIENT (HID_CUI_START + 302) +#define HID_LINE_ENDDEF (HID_CUI_START + 303) +#define HID_LINE_LINE (HID_CUI_START + 304) +#define HID_LINE_DEF (HID_CUI_START + 305) +#define HID_SPELLDLG_SETWORD (HID_CUI_START + 306) +#define HID_TABULATOR (HID_CUI_START + 307) +#define HID_PAGE_TEXTATTR (HID_CUI_START + 308) +#define HID_TEXTATTR_CTL_POSITION (HID_CUI_START + 309) +#define HID_TRANS_POSITION_SIZE (HID_CUI_START + 310) #define HID_HYPHENATE (HID_CUI_START + 311) -#define HID_SVXPAGE_CHAR_NAME (HID_CUI_START + 312) -#define HID_SVXPAGE_CHAR_EFFECTS (HID_CUI_START + 313) -#define HID_SVXPAGE_CHAR_POSITION (HID_CUI_START + 314) -#define HID_HYPERLINK_INTERNET (HID_CUI_START + 315) -#define HID_HYPERLINK_MAIL (HID_CUI_START + 316) -#define HID_HYPERLINK_DOCUMENT (HID_CUI_START + 317) -#define HID_HYPERLINK_NEWDOCUMENT (HID_CUI_START + 318) -#define HID_HYPERLINK_MARKWND (HID_CUI_START + 319) -#define HID_ICCDIALOG_RESET_BTN (HID_CUI_START + 320) -#define HID_ICCDIALOG_CHOICECTRL (HID_CUI_START + 321) -#define HID_HYPERDLG_INET_PATH (HID_CUI_START + 322) -#define HID_HYPERDLG_MAIL_PATH (HID_CUI_START + 323) -#define HID_HYPERDLG_DOC_PATH (HID_CUI_START + 324) -#define HID_ICCDIALOG_OK_BTN (HID_CUI_START + 325) -#define HID_ICCDIALOG_CANCEL_BTN (HID_CUI_START + 326) -#define HID_HYPERLINK_MARKWND_APPLY (HID_CUI_START + 327) -#define HID_HYPERLINK_MARKWND_CLOSE (HID_CUI_START + 328) -#define HID_HYPERLINK_MARKWND_TREE (HID_CUI_START + 329) -#define HID_SVXPAGE_CHAR_TWOLINES (HID_CUI_START + 330) -#define HID_GRFFILTER_EMBOSS_LIGHT (HID_CUI_START + 331) -#define HID_PASTE_DLG (HID_CUI_START + 333) -#define HID_LINKDLG_TABLB (HID_CUI_START + 334) +#define HID_SVXPAGE_CHAR_NAME (HID_CUI_START + 312) +#define HID_SVXPAGE_CHAR_EFFECTS (HID_CUI_START + 313) +#define HID_SVXPAGE_CHAR_POSITION (HID_CUI_START + 314) +#define HID_HYPERLINK_INTERNET (HID_CUI_START + 315) +#define HID_HYPERLINK_MAIL (HID_CUI_START + 316) +#define HID_HYPERLINK_DOCUMENT (HID_CUI_START + 317) +#define HID_HYPERLINK_NEWDOCUMENT (HID_CUI_START + 318) +#define HID_HYPERLINK_MARKWND (HID_CUI_START + 319) +#define HID_ICCDIALOG_RESET_BTN (HID_CUI_START + 320) +#define HID_ICCDIALOG_CHOICECTRL (HID_CUI_START + 321) +#define HID_HYPERDLG_INET_PATH (HID_CUI_START + 322) +#define HID_HYPERDLG_MAIL_PATH (HID_CUI_START + 323) +#define HID_HYPERDLG_DOC_PATH (HID_CUI_START + 324) +#define HID_ICCDIALOG_OK_BTN (HID_CUI_START + 325) +#define HID_ICCDIALOG_CANCEL_BTN (HID_CUI_START + 326) +#define HID_HYPERLINK_MARKWND_APPLY (HID_CUI_START + 327) +#define HID_HYPERLINK_MARKWND_CLOSE (HID_CUI_START + 328) +#define HID_HYPERLINK_MARKWND_TREE (HID_CUI_START + 329) +#define HID_SVXPAGE_CHAR_TWOLINES (HID_CUI_START + 330) +#define HID_GRFFILTER_EMBOSS_LIGHT (HID_CUI_START + 331) +#define HID_PASTE_DLG (HID_CUI_START + 333) +#define HID_LINKDLG_TABLB (HID_CUI_START + 334) #define HID_MACRO_HEADERTABLISTBOX (HID_CUI_START + 335) #define HID_GALLERY_ENTER_TITLE (HID_CUI_START + 336) #define HID_GALLERY_TITLE_EDIT (HID_CUI_START + 337) diff --git a/cui/source/inc/hldocntp.hxx b/cui/source/inc/hldocntp.hxx index 0bd7309fd953..4501a602e5d5 100644 --- a/cui/source/inc/hldocntp.hxx +++ b/cui/source/inc/hldocntp.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 @@ -39,19 +39,19 @@ class SvxHyperlinkNewDocTp : public SvxHyperlinkTabPageBase { private: - FixedLine maGrpNewDoc; - RadioButton maRbtEditNow; - RadioButton maRbtEditLater; - FixedText maFtPath; - SvxHyperURLBox maCbbPath; - ImageButton maBtCreate; - FixedText maFtDocTypes; - ListBox maLbDocTypes; + FixedLine maGrpNewDoc; + RadioButton maRbtEditNow; + RadioButton maRbtEditLater; + FixedText maFtPath; + SvxHyperURLBox maCbbPath; + ImageButton maBtCreate; + FixedText maFtDocTypes; + ListBox maLbDocTypes; sal_Bool ImplGetURLObject( const String& rPath, const String& rBase, INetURLObject& aURLObject ) const; - void FillDocumentList (); + void FillDocumentList (); - DECL_LINK (ClickNewHdl_Impl , void * ); // Button : New + DECL_LINK (ClickNewHdl_Impl , void * ); // Button : New Image GetImage( USHORT nId ); void ReadURLFile( const String& rFile, String& rTitle, String& rURL, sal_Int32& rIconId, BOOL* pShowAsFolder);//, String* pFrame, String* pOpenAs, String* pDefTempl, String* pDefURL ); @@ -59,8 +59,8 @@ private: protected: void FillDlgFields ( String& aStrURL ); - void GetCurentItemData ( String& aStrURL, String& aStrName, - String& aStrIntName, String& aStrFrame, + void GetCurentItemData ( String& aStrURL, String& aStrName, + String& aStrIntName, String& aStrFrame, SvxLinkInsertMode& eMode ); public: @@ -69,10 +69,10 @@ public: static IconChoicePage* Create( Window* pWindow, const SfxItemSet& rItemSet ); - virtual BOOL AskApply (); - virtual void DoApply (); + virtual BOOL AskApply (); + virtual void DoApply (); - virtual void SetInitFocus(); + virtual void SetInitFocus(); }; diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx index a8e3df5e3a2d..3f657aab474b 100644 --- a/cui/source/inc/hldoctp.hxx +++ b/cui/source/inc/hldoctp.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 @@ -39,45 +39,45 @@ class SvxHyperlinkDocTp : public SvxHyperlinkTabPageBase { private: - FixedLine maGrpDocument; - FixedText maFtPath; - SvxHyperURLBox maCbbPath; - ImageButton maBtFileopen; + FixedLine maGrpDocument; + FixedText maFtPath; + SvxHyperURLBox maCbbPath; + ImageButton maBtFileopen; - FixedLine maGrpTarget; - FixedText maFtTarget; - Edit maEdTarget; - FixedText maFtURL; - FixedText maFtFullURL; - ImageButton maBtBrowse; + FixedLine maGrpTarget; + FixedText maFtTarget; + Edit maEdTarget; + FixedText maFtURL; + FixedText maFtFullURL; + ImageButton maBtBrowse; - String maStrURL; + String maStrURL; - BOOL mbMarkWndOpen; + BOOL mbMarkWndOpen; - DECL_LINK (ClickFileopenHdl_Impl , void * ); // Button : Fileopen - DECL_LINK (ClickTargetHdl_Impl , void * ); // Button : Target + DECL_LINK (ClickFileopenHdl_Impl , void * ); // Button : Fileopen + DECL_LINK (ClickTargetHdl_Impl , void * ); // Button : Target - DECL_LINK (ModifiedPathHdl_Impl , void * ); // Contens of combobox "Path" modified - DECL_LINK (ModifiedTargetHdl_Impl, void * ); // Contens of editfield "Target" modified + DECL_LINK (ModifiedPathHdl_Impl , void * ); // Contens of combobox "Path" modified + DECL_LINK (ModifiedTargetHdl_Impl, void * ); // Contens of editfield "Target" modified - DECL_LINK (LostFocusPathHdl_Impl, void * ); // Combobox "path" lost its focus + DECL_LINK (LostFocusPathHdl_Impl, void * ); // Combobox "path" lost its focus - DECL_LINK (TimeoutHdl_Impl , Timer * ); // Handler for timer -timeout + DECL_LINK (TimeoutHdl_Impl , Timer * ); // Handler for timer -timeout - enum EPathType { Type_Unknown, Type_Invalid, - Type_ExistsFile, Type_File, + enum EPathType { Type_Unknown, Type_Invalid, + Type_ExistsFile, Type_File, Type_ExistsDir, Type_Dir }; EPathType GetPathType ( String& aStrPath ); protected: void FillDlgFields ( String& aStrURL ); - void GetCurentItemData ( String& aStrURL, String& aStrName, - String& aStrIntName, String& aStrFrame, + void GetCurentItemData ( String& aStrURL, String& aStrName, + String& aStrIntName, String& aStrFrame, SvxLinkInsertMode& eMode ); virtual BOOL ShouldOpenMarkWnd () {return mbMarkWndOpen;} virtual void SetMarkWndShouldOpen (BOOL bOpen) {mbMarkWndOpen=bOpen;} - String GetCurrentURL (); + String GetCurrentURL (); public: SvxHyperlinkDocTp ( Window *pParent, const SfxItemSet& rItemSet); @@ -85,9 +85,9 @@ public: static IconChoicePage* Create( Window* pWindow, const SfxItemSet& rItemSet ); - virtual void SetMarkStr ( String& aStrMark ); + virtual void SetMarkStr ( String& aStrMark ); - virtual void SetInitFocus(); + virtual void SetInitFocus(); }; diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx index ae784cd339ad..01c474e60c0b 100644 --- a/cui/source/inc/hlinettp.hxx +++ b/cui/source/inc/hlinettp.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 @@ -41,36 +41,36 @@ class SvxHyperlinkInternetTp : public SvxHyperlinkTabPageBase { private: - FixedLine maGrpLinkTyp; + FixedLine maGrpLinkTyp; RadioButton maRbtLinktypInternet; RadioButton maRbtLinktypFTP; RadioButton maRbtLinktypTelnet; FixedText maFtTarget; - SvxHyperURLBox maCbbTarget; - FixedText maFtLogin; - Edit maEdLogin; - FixedText maFtPassword; - Edit maEdPassword; - CheckBox maCbAnonymous; - ImageButton maBtBrowse; - ImageButton maBtTarget; + SvxHyperURLBox maCbbTarget; + FixedText maFtLogin; + Edit maEdLogin; + FixedText maFtPassword; + Edit maEdPassword; + CheckBox maCbAnonymous; + ImageButton maBtBrowse; + ImageButton maBtTarget; - String maStrOldUser; - String maStrOldPassword; + String maStrOldUser; + String maStrOldPassword; - BOOL mbMarkWndOpen; + BOOL mbMarkWndOpen; - String maStrStdDocURL; + String maStrStdDocURL; - DECL_LINK (Click_SmartProtocol_Impl , void * ); // Radiobutton clicked: Type Internet, FTP or Telnet - DECL_LINK (ClickAnonymousHdl_Impl , void * ); // Checkbox : Anonymer Benutzer - DECL_LINK (ClickBrowseHdl_Impl , void * ); // Button : Browse - DECL_LINK (ClickTargetHdl_Impl , void * ); // Button : Ziel - DECL_LINK (ModifiedLoginHdl_Impl , void * ); // Contens of editfield "Login" modified - DECL_LINK (LostFocusTargetHdl_Impl , void * ); // Combobox "Target" lost its focus - DECL_LINK (ModifiedTargetHdl_Impl , void * ); // Contens of editfield "Target" modified + DECL_LINK (Click_SmartProtocol_Impl , void * ); // Radiobutton clicked: Type Internet, FTP or Telnet + DECL_LINK (ClickAnonymousHdl_Impl , void * ); // Checkbox : Anonymer Benutzer + DECL_LINK (ClickBrowseHdl_Impl , void * ); // Button : Browse + DECL_LINK (ClickTargetHdl_Impl , void * ); // Button : Ziel + DECL_LINK (ModifiedLoginHdl_Impl , void * ); // Contens of editfield "Login" modified + DECL_LINK (LostFocusTargetHdl_Impl , void * ); // Combobox "Target" lost its focus + DECL_LINK (ModifiedTargetHdl_Impl , void * ); // Contens of editfield "Target" modified - DECL_LINK (TimeoutHdl_Impl , Timer * ); // Handler for timer -timeout + DECL_LINK (TimeoutHdl_Impl , Timer * ); // Handler for timer -timeout void SetScheme( const String& aScheme ); @@ -85,9 +85,9 @@ private: void RefreshMarkWindow(); protected: - virtual void FillDlgFields ( String& aStrURL ); - virtual void GetCurentItemData ( String& aStrURL, String& aStrName, - String& aStrIntName, String& aStrFrame, + virtual void FillDlgFields ( String& aStrURL ); + virtual void GetCurentItemData ( String& aStrURL, String& aStrName, + String& aStrIntName, String& aStrFrame, SvxLinkInsertMode& eMode ); virtual BOOL ShouldOpenMarkWnd () {return ( mbMarkWndOpen && maRbtLinktypInternet.IsChecked() );} virtual void SetMarkWndShouldOpen (BOOL bOpen) {mbMarkWndOpen=bOpen;} @@ -98,10 +98,10 @@ public: static IconChoicePage* Create( Window* pWindow, const SfxItemSet& rItemSet ); - virtual void SetMarkStr ( String& aStrMark ); - virtual void SetOnlineMode( BOOL bEnable ); + virtual void SetMarkStr ( String& aStrMark ); + virtual void SetOnlineMode( BOOL bEnable ); - virtual void SetInitFocus(); + virtual void SetInitFocus(); }; diff --git a/cui/source/inc/hlmailtp.hxx b/cui/source/inc/hlmailtp.hxx index a7bc2fe012f3..ea0bda235b83 100644 --- a/cui/source/inc/hlmailtp.hxx +++ b/cui/source/inc/hlmailtp.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 @@ -39,18 +39,18 @@ class SvxHyperlinkMailTp : public SvxHyperlinkTabPageBase { private: - FixedLine maGrpMailNews; - RadioButton maRbtMail; - RadioButton maRbtNews; - FixedText maFtReceiver; - SvxHyperURLBox maCbbReceiver; - ImageButton maBtAdrBook; - FixedText maFtSubject; - Edit maEdSubject; + FixedLine maGrpMailNews; + RadioButton maRbtMail; + RadioButton maRbtNews; + FixedText maFtReceiver; + SvxHyperURLBox maCbbReceiver; + ImageButton maBtAdrBook; + FixedText maFtSubject; + Edit maEdSubject; - DECL_LINK (Click_SmartProtocol_Impl, void * ); // Radiobutton clicked: Type EMAIl or News - DECL_LINK (ClickAdrBookHdl_Impl , void * ); // Button : Address book - DECL_LINK (ModifiedReceiverHdl_Impl, void * ); // Combobox "receiver" modified + DECL_LINK (Click_SmartProtocol_Impl, void * ); // Radiobutton clicked: Type EMAIl or News + DECL_LINK (ClickAdrBookHdl_Impl , void * ); // Button : Address book + DECL_LINK (ModifiedReceiverHdl_Impl, void * ); // Combobox "receiver" modified void SetScheme( const String& aScheme ); void RemoveImproperProtocol(const String& aProperScheme); @@ -61,8 +61,8 @@ private: protected: virtual void FillDlgFields ( String& aStrURL ); - virtual void GetCurentItemData ( String& aStrURL, String& aStrName, - String& aStrIntName, String& aStrFrame, + virtual void GetCurentItemData ( String& aStrURL, String& aStrName, + String& aStrIntName, String& aStrFrame, SvxLinkInsertMode& eMode ); public: @@ -71,7 +71,7 @@ public: static IconChoicePage* Create( Window* pWindow, const SfxItemSet& rItemSet ); - virtual void SetInitFocus(); + virtual void SetInitFocus(); }; diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx index 024637e77991..f3f1156aba74 100644 --- a/cui/source/inc/hlmarkwn.hxx +++ b/cui/source/inc/hlmarkwn.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 @@ -34,12 +34,12 @@ #include <vcl/button.hxx> #include <svtools/svtreebx.hxx> -#include "hlmarkwn_def.hxx" //ADD CHINA001 +#include "hlmarkwn_def.hxx" //ADD CHINA001 class SvxHyperlinkTabPageBase; //######################################################################## //# # -//# Tree-Window # +//# Tree-Window # //# # //######################################################################## @@ -58,7 +58,7 @@ public: //######################################################################## //# # -//# Window-Class # +//# Window-Class # //# # //######################################################################## @@ -67,19 +67,19 @@ class SvxHlinkDlgMarkWnd : public ModalDialog //FloatingWindow private: friend class SvxHlmarkTreeLBox; - PushButton maBtApply; - PushButton maBtClose; - //SvTreeListBox maLbTree; + PushButton maBtApply; + PushButton maBtClose; + //SvTreeListBox maLbTree; SvxHlmarkTreeLBox maLbTree; - BOOL mbUserMoved; - BOOL mbFirst; + BOOL mbUserMoved; + BOOL mbFirst; SvxHyperlinkTabPageBase* mpParent; - String maStrLastURL; + String maStrLastURL; - USHORT mnError; + USHORT mnError; protected: BOOL RefreshFromDoc( ::rtl::OUString aURL ); @@ -107,6 +107,6 @@ public: }; -#endif // _SVX_BKWND_HYPERLINK_HXX +#endif // _SVX_BKWND_HYPERLINK_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/hlmarkwn_def.hxx b/cui/source/inc/hlmarkwn_def.hxx index b6de42439f3b..f44e6c12ffb4 100644 --- a/cui/source/inc/hlmarkwn_def.hxx +++ b/cui/source/inc/hlmarkwn_def.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 @@ -29,9 +29,9 @@ #ifndef _SVX_BKWND_HYPERLINK_DEF_HXX #define _SVX_BKWND_HYPERLINK_DEF_HXX -#define LERR_NOERROR 0 -#define LERR_NOENTRIES 1 -#define LERR_DOCNOTOPEN 2 +#define LERR_NOERROR 0 +#define LERR_NOENTRIES 1 +#define LERR_DOCNOTOPEN 2 #endif diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx index f93f5f346c9e..be491bf041e7 100644 --- a/cui/source/inc/hltpbase.hxx +++ b/cui/source/inc/hltpbase.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 @@ -28,7 +28,7 @@ #ifndef _SVX_TABBASE_HYPERLINK_HXX #define _SVX_TABBASE_HYPERLINK_HXX -#define INET_TELNET_SCHEME "telnet://" +#define INET_TELNET_SCHEME "telnet://" #include <sfx2/app.hxx> #include <sfx2/tabdlg.hxx> @@ -83,7 +83,7 @@ class SvxHyperURLBox : public SvtURLBox, public DropTargetHelper private: BOOL mbAccessAddress; -// String GetAllEmailNamesFromDragItem( USHORT nItem ); +// String GetAllEmailNamesFromDragItem( USHORT nItem ); protected: @@ -110,15 +110,15 @@ class SvxHyperlinkTabPageBase : public IconChoicePage { private: FixedLine *mpGrpMore; - FixedText *mpFtFrame; - SvxFramesComboBox *mpCbbFrame; - FixedText *mpFtForm; - ListBox *mpLbForm; - FixedText *mpFtIndication; - Edit *mpEdIndication; - FixedText *mpFtText; - Edit *mpEdText; - ImageButton *mpBtScript; + FixedText *mpFtFrame; + SvxFramesComboBox *mpCbbFrame; + FixedText *mpFtForm; + ListBox *mpLbForm; + FixedText *mpFtIndication; + Edit *mpEdIndication; + FixedText *mpFtText; + Edit *mpEdText; + ImageButton *mpBtScript; sal_Bool mbIsCloseDisabled; @@ -126,13 +126,13 @@ private: mxDocumentFrame; protected: - Window* mpDialog; + Window* mpDialog; - BOOL mbStdControlsInit; + BOOL mbStdControlsInit; - String maStrInitURL; + String maStrInitURL; - Timer maTimer; + Timer maTimer; SvxHlinkDlgMarkWnd* mpMarkWnd; @@ -144,15 +144,15 @@ protected: SvxLinkInsertMode& eMode ) = 0; virtual String CreateUiNameFromURL( const String& aStrURL ); - void GetDataFromCommonFields( String& aStrName, + void GetDataFromCommonFields( String& aStrName, String& aStrIntName, String& aStrFrame, SvxLinkInsertMode& eMode ); - DECL_LINK (ClickScriptHdl_Impl, void * ); // Button : Script + DECL_LINK (ClickScriptHdl_Impl, void * ); // Button : Script - String aEmptyStr; + String aEmptyStr; - BOOL FileExists( const INetURLObject& rURL ); + BOOL FileExists( const INetURLObject& rURL ); static String GetSchemeFromURL( String aStrURL ); inline void DisableClose( sal_Bool _bDisable ) { mbIsCloseDisabled = _bDisable; } @@ -179,10 +179,10 @@ public: virtual void Reset( const SfxItemSet& ); virtual BOOL FillItemSet( SfxItemSet& ); virtual void ActivatePage( const SfxItemSet& rItemSet ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ); BOOL IsMarkWndVisible () { return ((Window*)mpMarkWnd)->IsVisible(); } - Size GetSizeExtraWnd () { return ( mpMarkWnd->GetSizePixel() ); } + Size GetSizeExtraWnd () { return ( mpMarkWnd->GetSizePixel() ); } BOOL MoveToExtraWnd ( Point aNewPos, BOOL bDisConnectDlg = FALSE ); virtual void ActivatePage(); @@ -194,7 +194,7 @@ protected: virtual void SetMarkWndShouldOpen(BOOL bOpen); void ShowMarkWnd (); - void HideMarkWnd () { ( ( Window* ) mpMarkWnd )->Hide(); } + void HideMarkWnd () { ( ( Window* ) mpMarkWnd )->Hide(); } void InvalidateMarkWnd () { ( ( Window* ) mpMarkWnd )->Invalidate(); } SfxDispatcher* GetDispatcher() const; diff --git a/cui/source/inc/hyphen.hxx b/cui/source/inc/hyphen.hxx index 2cdad5523d4f..6bf036962bc1 100644 --- a/cui/source/inc/hyphen.hxx +++ b/cui/source/inc/hyphen.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 diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index 38725c02ecb7..bc82c8d30cb0 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.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 @@ -39,10 +39,10 @@ #include <tools/list.hxx> #include <tools/string.hxx> -#define CTRLS_OFFSET 3 -#define BUTTON_DISTANCE 8 -#define RET_USER 100 -#define RET_USER_CANCEL 101 +#define CTRLS_OFFSET 3 +#define BUTTON_DISTANCE 8 +#define RET_USER 100 +#define RET_USER_CANCEL 101 // forward-declarations struct IconChoicePageData; @@ -51,7 +51,7 @@ class IconChoicePage; // Create-Function typedef IconChoicePage* (*CreatePage)(Window *pParent, const SfxItemSet &rAttrSet); -typedef USHORT* (*GetPageRanges)(); // liefert internationale Which-Wert +typedef USHORT* (*GetPageRanges)(); // liefert internationale Which-Wert // page-list DECLARE_LIST( IconChoicePageList, IconChoicePageData * ) @@ -67,21 +67,21 @@ enum EIconChoicePos { PosLeft, PosRight, PosTop, PosBottom }; struct IconChoicePageData { - USHORT nId; // Die ID - CreatePage fnCreatePage; // Pointer auf die Factory + USHORT nId; // Die ID + CreatePage fnCreatePage; // Pointer auf die Factory GetPageRanges fnGetRanges;// Pointer auf die Ranges-Funktion - IconChoicePage* pPage; // die TabPage selber - BOOL bOnDemand; // Flag: ItemSet onDemand - BOOL bRefresh; // Flag: Seite mu\s neu initialisiert werden + IconChoicePage* pPage; // die TabPage selber + BOOL bOnDemand; // Flag: ItemSet onDemand + BOOL bRefresh; // Flag: Seite mu\s neu initialisiert werden // Konstruktor IconChoicePageData( USHORT Id, CreatePage fnPage, GetPageRanges fnRanges, BOOL bDemand ) - : nId ( Id ), - fnCreatePage ( fnPage ), - fnGetRanges ( fnRanges ), - pPage ( NULL ), - bOnDemand ( bDemand ), - bRefresh ( FALSE ) + : nId ( Id ), + fnCreatePage ( fnPage ), + fnGetRanges ( fnRanges ), + pPage ( NULL ), + bOnDemand ( bDemand ), + bRefresh ( FALSE ) {} }; @@ -97,40 +97,40 @@ class IconChoicePage : public TabPage using TabPage::DeactivatePage; private : - const SfxItemSet* pSet; - String aUserString; - BOOL bHasExchangeSupport; - IconChoiceDialog* pDialog; - BOOL bStandard; + const SfxItemSet* pSet; + String aUserString; + BOOL bHasExchangeSupport; + IconChoiceDialog* pDialog; + BOOL bStandard; - void SetDialog( IconChoiceDialog* pNew ) { pDialog = pNew; } - IconChoiceDialog* GetDialog() const { return pDialog; } + void SetDialog( IconChoiceDialog* pNew ) { pDialog = pNew; } + IconChoiceDialog* GetDialog() const { return pDialog; } - void SetInputSet( const SfxItemSet* pNew ) { pSet = pNew; } + void SetInputSet( const SfxItemSet* pNew ) { pSet = pNew; } - void ImplInitSettings(); + void ImplInitSettings(); protected : IconChoicePage( Window *pParent, const ResId &, const SfxItemSet &rAttrSet ); - USHORT GetSlot( USHORT nWhich ) const { return pSet->GetPool()->GetSlotId( nWhich ); } - USHORT GetWhich( USHORT nSlot ) const { return pSet->GetPool()->GetWhich( nSlot ); } - const SfxPoolItem* GetOldItem( const SfxItemSet& rSet, USHORT nSlot ); - const SfxPoolItem* GetExchangeItem( const SfxItemSet& rSet, USHORT nSlot ); + USHORT GetSlot( USHORT nWhich ) const { return pSet->GetPool()->GetSlotId( nWhich ); } + USHORT GetWhich( USHORT nSlot ) const { return pSet->GetPool()->GetWhich( nSlot ); } + const SfxPoolItem* GetOldItem( const SfxItemSet& rSet, USHORT nSlot ); + const SfxPoolItem* GetExchangeItem( const SfxItemSet& rSet, USHORT nSlot ); public : virtual ~IconChoicePage(); - const SfxItemSet& GetItemSet() const { return *pSet; } + const SfxItemSet& GetItemSet() const { return *pSet; } - virtual BOOL FillItemSet( SfxItemSet& ) = 0; - virtual void Reset( const SfxItemSet& ) = 0; + virtual BOOL FillItemSet( SfxItemSet& ) = 0; + virtual void Reset( const SfxItemSet& ) = 0; - BOOL HasExchangeSupport() const { return bHasExchangeSupport; } - void SetExchangeSupport( BOOL bNew = TRUE ) { bHasExchangeSupport = bNew; } + BOOL HasExchangeSupport() const { return bHasExchangeSupport; } + void SetExchangeSupport( BOOL bNew = TRUE ) { bHasExchangeSupport = bNew; } enum { - KEEP_PAGE = 0x0000, // Fehlerbehandlung; Seite nicht wechseln + KEEP_PAGE = 0x0000, // Fehlerbehandlung; Seite nicht wechseln // 2. F"ullen eines ItemSets f"ur die Aktualilsierung // "ubergeordneter Beispiele; dieser Pointer kann immer // NULL sein!! @@ -139,18 +139,18 @@ public : REFRESH_SET = 0x0002 }; - virtual void ActivatePage( const SfxItemSet& ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); - void SetUserData(const String& rString) { aUserString = rString; } - String GetUserData() { return aUserString; } - virtual void FillUserData(); - virtual BOOL IsReadOnly() const; + virtual void ActivatePage( const SfxItemSet& ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + void SetUserData(const String& rString) { aUserString = rString; } + String GetUserData() { return aUserString; } + virtual void FillUserData(); + virtual BOOL IsReadOnly() const; virtual sal_Bool QueryClose(); static const SfxPoolItem* GetItem( const SfxItemSet& rSet, USHORT nSlot ); - void StateChanged( StateChangedType nType ); - void DataChanged( const DataChangedEvent& rDCEvt ); + void StateChanged( StateChangedType nType ); + void DataChanged( const DataChangedEvent& rDCEvt ); }; /********************************************************************** @@ -164,63 +164,63 @@ class IconChoiceDialog : public ModalDialog private : friend class IconChoicePage; - EIconChoicePos meChoicePos; // Position des IconChoiceCtrl's - IconChoicePageList maPageList; // Liste von PageData-Pointer + EIconChoicePos meChoicePos; // Position des IconChoiceCtrl's + IconChoicePageList maPageList; // Liste von PageData-Pointer - SvtIconChoiceCtrl maIconCtrl; // DAS IconChoice-Control + SvtIconChoiceCtrl maIconCtrl; // DAS IconChoice-Control - USHORT mnCurrentPageId; // Id der aktuell sichtbaren Page + USHORT mnCurrentPageId; // Id der aktuell sichtbaren Page // Buttons - OKButton aOKBtn; - CancelButton aCancelBtn; - HelpButton aHelpBtn; - PushButton aResetBtn; + OKButton aOKBtn; + CancelButton aCancelBtn; + HelpButton aHelpBtn; + PushButton aResetBtn; - const SfxItemSet* pSet; - SfxItemSet* pOutSet; - SfxItemSet* pExampleSet; - USHORT* pRanges; + const SfxItemSet* pSet; + SfxItemSet* pOutSet; + SfxItemSet* pExampleSet; + USHORT* pRanges; - sal_uInt32 nResId; + sal_uInt32 nResId; - BOOL bHideResetBtn; - BOOL bModal; - BOOL bInOK; - BOOL bModified; - BOOL bItemsReset; + BOOL bHideResetBtn; + BOOL bModal; + BOOL bInOK; + BOOL bModified; + BOOL bItemsReset; DECL_LINK ( ChosePageHdl_Impl, void * ); - DECL_LINK ( OkHdl, Button * ); + DECL_LINK ( OkHdl, Button * ); DECL_LINK ( ResetHdl, Button * ); - DECL_LINK ( CancelHdl, Button * ); + DECL_LINK ( CancelHdl, Button * ); - IconChoicePageData* GetPageData ( USHORT nId ); - void Start_Impl(); - BOOL OK_Impl(); + IconChoicePageData* GetPageData ( USHORT nId ); + void Start_Impl(); + BOOL OK_Impl(); - void SetPosSizeCtrls ( BOOL bInit = FALSE ); - void SetPosSizePages ( USHORT nId ); + void SetPosSizeCtrls ( BOOL bInit = FALSE ); + void SetPosSizePages ( USHORT nId ); - void FocusOnIcon ( USHORT nId ); + void FocusOnIcon ( USHORT nId ); protected : - void ShowPageImpl ( IconChoicePageData* pData ); - void HidePageImpl ( IconChoicePageData* pData ); + void ShowPageImpl ( IconChoicePageData* pData ); + void HidePageImpl ( IconChoicePageData* pData ); virtual void PageCreated( USHORT nId, IconChoicePage& rPage ); - virtual SfxItemSet* CreateInputItemSet( USHORT nId ); - inline SfxItemSet* GetInputSetImpl() { return (SfxItemSet*)pSet; } - inline IconChoicePage* GetTabPage( USHORT nPageId ) + virtual SfxItemSet* CreateInputItemSet( USHORT nId ); + inline SfxItemSet* GetInputSetImpl() { return (SfxItemSet*)pSet; } + inline IconChoicePage* GetTabPage( USHORT nPageId ) { return ( GetPageData (nPageId)->pPage?GetPageData (nPageId)->pPage:NULL); } - const SfxItemSet* GetRefreshedSet(); + const SfxItemSet* GetRefreshedSet(); - void ActivatePageImpl (); - BOOL DeActivatePageImpl (); - void ResetPageImpl (); + void ActivatePageImpl (); + BOOL DeActivatePageImpl (); + void ResetPageImpl (); - short Ok(); - BOOL IsInOK() const; + short Ok(); + BOOL IsInOK() const; public : @@ -233,55 +233,55 @@ public : /////////////////////////////////////////////////////////////////////////////////// // virtuelle Methoden // - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); + virtual void Paint( const Rectangle& rRect ); + virtual void Resize(); /////////////////////////////////////////////////////////////////////////////////// // Schnittstelle // - SvxIconChoiceCtrlEntry* AddTabPage( + SvxIconChoiceCtrlEntry* AddTabPage( USHORT nId, const String& rIconText, const Image& rChoiceIcon, CreatePage pCreateFunc /* != NULL */, GetPageRanges pRangesFunc = NULL /* NULL allowed*/, BOOL bItemsOnDemand = FALSE, ULONG nPos = LIST_APPEND ); - SvxIconChoiceCtrlEntry* AddTabPage( + SvxIconChoiceCtrlEntry* AddTabPage( USHORT nId, const String& rIconText, const Image& rChoiceIcon, const Image& rChoiceIconHC, CreatePage pCreateFunc /* != NULL */, GetPageRanges pRangesFunc = NULL /* NULL allowed*/, BOOL bItemsOnDemand = FALSE, ULONG nPos = LIST_APPEND ); - void RemoveTabPage( USHORT nId ); + void RemoveTabPage( USHORT nId ); - void SetCurPageId( USHORT nId ) { mnCurrentPageId = nId; FocusOnIcon( nId ); } - USHORT GetCurPageId() const { return mnCurrentPageId; } - void ShowPage( USHORT nId ); + void SetCurPageId( USHORT nId ) { mnCurrentPageId = nId; FocusOnIcon( nId ); } + USHORT GetCurPageId() const { return mnCurrentPageId; } + void ShowPage( USHORT nId ); // liefert ggf. per Map konvertierte lokale Slots - const USHORT* GetInputRanges( const SfxItemPool& ); - void SetInputSet( const SfxItemSet* pInSet ); - const SfxItemSet* GetOutputItemSet() const { return pOutSet; } - const SfxItemSet* GetOutputItemSet( USHORT nId ); - int FillOutputItemSet(); - - const OKButton& GetOKButton() const { return aOKBtn; } - OKButton& GetOKButton() { return aOKBtn; } + const USHORT* GetInputRanges( const SfxItemPool& ); + void SetInputSet( const SfxItemSet* pInSet ); + const SfxItemSet* GetOutputItemSet() const { return pOutSet; } + const SfxItemSet* GetOutputItemSet( USHORT nId ); + int FillOutputItemSet(); + + const OKButton& GetOKButton() const { return aOKBtn; } + OKButton& GetOKButton() { return aOKBtn; } const CancelButton& GetCancelButton() const { return aCancelBtn; } - CancelButton& GetCancelButton() { return aCancelBtn; } - const HelpButton& GetHelpButton() const { return aHelpBtn; } - HelpButton& GetHelpButton() { return aHelpBtn; } + CancelButton& GetCancelButton() { return aCancelBtn; } + const HelpButton& GetHelpButton() const { return aHelpBtn; } + HelpButton& GetHelpButton() { return aHelpBtn; } - void RemoveResetButton(); + void RemoveResetButton(); - short Execute(); - void Start( BOOL bShow = TRUE ); + short Execute(); + void Start( BOOL bShow = TRUE ); sal_Bool QueryClose(); - const SfxItemSet* GetExampleSet() const { return pExampleSet; } + const SfxItemSet* GetExampleSet() const { return pExampleSet; } - void SetCtrlColor ( const Color& rColor ); - EIconChoicePos SetCtrlPos ( const EIconChoicePos& rPos ); + void SetCtrlColor ( const Color& rColor ); + EIconChoicePos SetCtrlPos ( const EIconChoicePos& rPos ); - void CreateIconTextAutoMnemonics( void ); + void CreateIconTextAutoMnemonics( void ); }; #endif //_ICCDLG_HXX diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx index 6959cb8b3233..f001efcd63a9 100644 --- a/cui/source/inc/insdlg.hxx +++ b/cui/source/inc/insdlg.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 @@ -40,7 +40,7 @@ #include <vcl/field.hxx> #include <vcl/edit.hxx> #include <vcl/lstbox.hxx> -#include <svtools/svmedit.hxx> // MultiLineEdit +#include <svtools/svmedit.hxx> // MultiLineEdit #include <comphelper/embeddedobjectcontainer.hxx> class INetURLObject; @@ -90,7 +90,7 @@ class SvInsertOleDlg : public InsertObjectDialog_Impl BOOL IsCreateNew() const { return aRbNewObject.IsChecked(); } public: - static void FillObjectServerList( SvObjectServerList* ); + static void FillObjectServerList( SvObjectServerList* ); SvInsertOleDlg( Window* pParent, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage, @@ -171,29 +171,29 @@ public: class SfxInsertFloatingFrameDialog : public InsertObjectDialog_Impl { private: - FixedText aFTName; - Edit aEDName; - FixedText aFTURL; - Edit aEDURL; - PushButton aBTOpen; - - RadioButton aRBScrollingOn; - RadioButton aRBScrollingOff; - RadioButton aRBScrollingAuto; + FixedText aFTName; + Edit aEDName; + FixedText aFTURL; + Edit aEDURL; + PushButton aBTOpen; + + RadioButton aRBScrollingOn; + RadioButton aRBScrollingOff; + RadioButton aRBScrollingAuto; FixedLine aFLScrolling; FixedLine aFLSepLeft; RadioButton aRBFrameBorderOn; - RadioButton aRBFrameBorderOff; + RadioButton aRBFrameBorderOff; FixedLine aFLFrameBorder; FixedLine aFLSepRight; FixedText aFTMarginWidth; - NumericField aNMMarginWidth; - CheckBox aCBMarginWidthDefault; - FixedText aFTMarginHeight; - NumericField aNMMarginHeight; - CheckBox aCBMarginHeightDefault; + NumericField aNMMarginWidth; + CheckBox aCBMarginWidthDefault; + FixedText aFTMarginHeight; + NumericField aNMMarginHeight; + CheckBox aCBMarginHeightDefault; FixedLine aFLMargin; OKButton aOKButton1; diff --git a/cui/source/inc/insrc.hxx b/cui/source/inc/insrc.hxx index 22bb9771e0dc..7552d919d952 100644 --- a/cui/source/inc/insrc.hxx +++ b/cui/source/inc/insrc.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 @@ -40,20 +40,20 @@ class SvxInsRowColDlg : public SvxAbstractInsRowColDlg, public ModalDialog { - FixedText aCount; - NumericField aCountEdit; + FixedText aCount; + NumericField aCountEdit; FixedLine aInsFL; - RadioButton aBeforeBtn; - RadioButton aAfterBtn; + RadioButton aBeforeBtn; + RadioButton aAfterBtn; FixedLine aPosFL; - String aRow; - String aCol; + String aRow; + String aCol; - OKButton aOKBtn; - CancelButton aCancelBtn; - HelpButton aHelpBtn; + OKButton aOKBtn; + CancelButton aCancelBtn; + HelpButton aHelpBtn; bool bColumn; diff --git a/cui/source/inc/internationaloptions.hxx b/cui/source/inc/internationaloptions.hxx index a4372d52ddbe..52f2bbb1a1a4 100644 --- a/cui/source/inc/internationaloptions.hxx +++ b/cui/source/inc/internationaloptions.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 @@ -38,22 +38,22 @@ namespace offapp { private: struct IMPL; - IMPL* m_pImpl; + IMPL* m_pImpl; protected: InternationalOptionsPage( Window* _pParent, const SfxItemSet& _rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& _rSet ); - virtual void Reset( const SfxItemSet& _rSet ); + virtual BOOL FillItemSet( SfxItemSet& _rSet ); + virtual void Reset( const SfxItemSet& _rSet ); public: - virtual ~InternationalOptionsPage(); + virtual ~InternationalOptionsPage(); - static SfxTabPage* CreateSd( Window* _pParent, const SfxItemSet& _rAttrSet ); - static SfxTabPage* CreateSc( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateSd( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateSc( Window* _pParent, const SfxItemSet& _rAttrSet ); }; -} // /namespace offapp +} // /namespace offapp #endif diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx index c4c9254a0894..2bc88101752d 100644 --- a/cui/source/inc/labdlg.hxx +++ b/cui/source/inc/labdlg.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,65 +45,65 @@ const sal_uInt16 CAPTYPE_BITMAPS_COUNT = 3; class SvxCaptionTabPage : public SfxTabPage { private: - ValueSet aCT_CAPTTYPE; - FixedText aFT_ABSTAND; - MetricField aMF_ABSTAND; - FixedText aFT_WINKEL; - ListBox aLB_WINKEL; - FixedText aFT_ANSATZ; - ListBox aLB_ANSATZ; - FixedText aFT_UM; - MetricField aMF_ANSATZ; - FixedText aFT_ANSATZ_REL; - ListBox aLB_ANSATZ_REL; - FixedText aFT_LAENGE; - MetricField aMF_LAENGE; - CheckBox aCB_LAENGE; - - Image* mpBmpCapTypes[CAPTYPE_BITMAPS_COUNT]; - Image* mpBmpCapTypesH[CAPTYPE_BITMAPS_COUNT]; - - String aStrHorzList; - String aStrVertList; - - short nCaptionType; - BOOL bFixedAngle; - INT32 nFixedAngle; - INT32 nGap; - short nEscDir; - BOOL bEscRel; - INT32 nEscAbs; - INT32 nEscRel; - INT32 nLineLen; - BOOL bFitLineLen; - - USHORT nAnsatzRelPos; - USHORT nAnsatzTypePos; - USHORT nWinkelTypePos; + ValueSet aCT_CAPTTYPE; + FixedText aFT_ABSTAND; + MetricField aMF_ABSTAND; + FixedText aFT_WINKEL; + ListBox aLB_WINKEL; + FixedText aFT_ANSATZ; + ListBox aLB_ANSATZ; + FixedText aFT_UM; + MetricField aMF_ANSATZ; + FixedText aFT_ANSATZ_REL; + ListBox aLB_ANSATZ_REL; + FixedText aFT_LAENGE; + MetricField aMF_LAENGE; + CheckBox aCB_LAENGE; + + Image* mpBmpCapTypes[CAPTYPE_BITMAPS_COUNT]; + Image* mpBmpCapTypesH[CAPTYPE_BITMAPS_COUNT]; + + String aStrHorzList; + String aStrVertList; + + short nCaptionType; + BOOL bFixedAngle; + INT32 nFixedAngle; + INT32 nGap; + short nEscDir; + BOOL bEscRel; + INT32 nEscAbs; + INT32 nEscRel; + INT32 nLineLen; + BOOL bFitLineLen; + + USHORT nAnsatzRelPos; + USHORT nAnsatzTypePos; + USHORT nWinkelTypePos; #ifdef _SVX_LABDLG_CXX - void SetupAnsatz_Impl( USHORT nType ); - void SetupType_Impl( USHORT nType ); + void SetupAnsatz_Impl( USHORT nType ); + void SetupType_Impl( USHORT nType ); DECL_LINK( AnsatzSelectHdl_Impl, ListBox * ); DECL_LINK( AnsatzRelSelectHdl_Impl, ListBox * ); DECL_LINK( LineOptHdl_Impl, Button * ); DECL_LINK( SelectCaptTypeHdl_Impl, void * ); #endif - const SfxItemSet& rOutAttrs; - const SdrView* pView; + const SfxItemSet& rOutAttrs; + const SdrView* pView; public: SvxCaptionTabPage( Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SvxCaptionTabPage(); - static SfxTabPage* Create( Window*, const SfxItemSet& ); - static USHORT* GetRanges(); + static SfxTabPage* Create( Window*, const SfxItemSet& ); + static USHORT* GetRanges(); - virtual BOOL FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet & ); - void Construct(); - void SetView( const SdrView* pSdrView ) + virtual BOOL FillItemSet( SfxItemSet& ); + virtual void Reset( const SfxItemSet & ); + void Construct(); + void SetView( const SdrView* pSdrView ) { pView = pSdrView; } virtual void DataChanged( const DataChangedEvent& rDCEvt ); @@ -115,12 +115,12 @@ public: class SvxCaptionTabDialog : public SfxTabDialog { private: -// const SfxItemSet& rOutAttrs; - const SdrView* pView; - USHORT nAnchorCtrls; +// const SfxItemSet& rOutAttrs; + const SdrView* pView; + USHORT nAnchorCtrls; Link aValidateLink; - + virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); public: @@ -129,8 +129,8 @@ public: USHORT nAnchorTypes = 0 ); ~SvxCaptionTabDialog(); - - //link for the Writer to validate positions + + //link for the Writer to validate positions void SetValidateFramePosLink( const Link& rLink ); }; diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx index bcc0fd74625b..0a55ce429235 100644 --- a/cui/source/inc/linkdlg.hxx +++ b/cui/source/inc/linkdlg.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 @@ -37,7 +37,7 @@ #include <vcl/edit.hxx> #include <vcl/lstbox.hxx> -#include <svtools/svmedit.hxx> // MultiLineEdit +#include <svtools/svmedit.hxx> // MultiLineEdit #include <svtools/svtabbx.hxx> // MultiLineEdit /********************** SvUpdateLinksDialog ****************************** @@ -80,7 +80,7 @@ class SvBaseLinksDlg : public ModalDialog String aStrCloselinkmsgMulti; String aStrWaitinglink; sfx2::LinkManager* pLinkMgr; - BOOL bHtmlMode; + BOOL bHtmlMode; SvTabListBox aTbLinks; Timer aUpdateTimer; @@ -101,27 +101,27 @@ class SvBaseLinksDlg : public ModalDialog void InsertEntry( const sfx2::SvBaseLink& rLink, USHORT nPos = LISTBOX_APPEND, sal_Bool bSelect = sal_False); #endif - void StartUpdateTimer() { aUpdateTimer.Start(); } + void StartUpdateTimer() { aUpdateTimer.Start(); } - SvTabListBox& Links() { return aTbLinks; } - FixedText& FileName() { return aFtFullFileName; } - FixedText& SourceName() { return aFtFullSourceName; } - FixedText& TypeName() { return aFtFullTypeName; } - RadioButton& Automatic() { return aRbAutomatic; } - RadioButton& Manual() { return aRbManual; } - PushButton& UpdateNow() { return aPbUpdateNow; } - PushButton& OpenSource() { return aPbOpenSource; } - PushButton& ChangeSource() { return aPbChangeSource; } - PushButton& BreakLink() { return aPbBreakLink; } + SvTabListBox& Links() { return aTbLinks; } + FixedText& FileName() { return aFtFullFileName; } + FixedText& SourceName() { return aFtFullSourceName; } + FixedText& TypeName() { return aFtFullTypeName; } + RadioButton& Automatic() { return aRbAutomatic; } + RadioButton& Manual() { return aRbManual; } + PushButton& UpdateNow() { return aPbUpdateNow; } + PushButton& OpenSource() { return aPbOpenSource; } + PushButton& ChangeSource() { return aPbChangeSource; } + PushButton& BreakLink() { return aPbBreakLink; } - String& Autolink() { return aStrAutolink; } - String& Manuallink() { return aStrManuallink; } - String& Brokenlink() { return aStrBrokenlink; } - String& Graphiclink() { return aStrGraphiclink; } - String& Buttonclose() { return aStrButtonclose; } - String& Closelinkmsg() { return aStrCloselinkmsg; } - String& CloselinkmsgMulti() { return aStrCloselinkmsgMulti; } - String& Waitinglink() { return aStrWaitinglink; } + String& Autolink() { return aStrAutolink; } + String& Manuallink() { return aStrManuallink; } + String& Brokenlink() { return aStrBrokenlink; } + String& Graphiclink() { return aStrGraphiclink; } + String& Buttonclose() { return aStrButtonclose; } + String& Closelinkmsg() { return aStrCloselinkmsg; } + String& CloselinkmsgMulti() { return aStrCloselinkmsgMulti; } + String& Waitinglink() { return aStrWaitinglink; } void SetManager( sfx2::LinkManager* ); public: diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx index 7b8330f31db6..236d974d257c 100644 --- a/cui/source/inc/macroass.hxx +++ b/cui/source/inc/macroass.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 @@ -52,7 +52,7 @@ class _SfxMacroTabPage_Impl; class _SfxMacroTabPage : public SfxTabPage { - SvxMacroTableDtor aTbl; + SvxMacroTableDtor aTbl; DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, SelectEvent_Impl, SvTabListBox * ); DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, SelectGroup_Impl, ListBox * ); DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, SelectMacro_Impl, ListBox * ); @@ -65,41 +65,41 @@ class _SfxMacroTabPage : public SfxTabPage DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, TimeOut_Impl, Timer* ); protected: - _SfxMacroTabPage_Impl* mpImpl; + _SfxMacroTabPage_Impl* mpImpl; _SfxMacroTabPage( Window* pParent, const ResId& rId, const SfxItemSet& rItemSet ); - void InitAndSetHandler(); - void FillEvents(); - void FillMacroList(); - void EnableButtons( const String& rLanguage ); + void InitAndSetHandler(); + void FillEvents(); + void FillMacroList(); + void EnableButtons( const String& rLanguage ); public: - virtual ~_SfxMacroTabPage(); + virtual ~_SfxMacroTabPage(); - void AddEvent( const String & rEventName, USHORT nEventId ); + void AddEvent( const String & rEventName, USHORT nEventId ); - const SvxMacroTableDtor& GetMacroTbl() const; - void SetMacroTbl( const SvxMacroTableDtor& rTbl ); - void ClearMacroTbl(); + const SvxMacroTableDtor& GetMacroTbl() const; + void SetMacroTbl( const SvxMacroTableDtor& rTbl ); + void ClearMacroTbl(); - virtual void ScriptChanged( const String& rLanguage ); - virtual void PageCreated (SfxAllItemSet aSet); + virtual void ScriptChanged( const String& rLanguage ); + virtual void PageCreated (SfxAllItemSet aSet); // zum setzen / abfragen der Links - void SetGetRangeLink( FNGetRangeHdl pFn ); - FNGetRangeHdl GetGetRangeLink() const; - void SetGetMacrosOfRangeLink( FNGetMacrosOfRangeHdl pFn ); - FNGetMacrosOfRangeHdl GetGetMacrosOfRangeLink() const; + void SetGetRangeLink( FNGetRangeHdl pFn ); + FNGetRangeHdl GetGetRangeLink() const; + void SetGetMacrosOfRangeLink( FNGetMacrosOfRangeHdl pFn ); + FNGetMacrosOfRangeHdl GetGetMacrosOfRangeLink() const; // --------- Erben aus der Basis ------------- - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); - void SetReadOnly( BOOL bSet ); - BOOL IsReadOnly() const; - void SelectEvent( const String& rEventName, USHORT nEventId ); + void SetReadOnly( BOOL bSet ); + BOOL IsReadOnly() const; + void SelectEvent( const String& rEventName, USHORT nEventId ); }; inline const SvxMacroTableDtor& _SfxMacroTabPage::GetMacroTbl() const @@ -138,7 +138,7 @@ public: Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame, const SfxItemSet& rSet ); - virtual ~SfxMacroAssignDlg(); + virtual ~SfxMacroAssignDlg(); }; #endif diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index c469410c4247..afdd26a01aef 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.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 @@ -78,7 +78,7 @@ class _SvxMacroTabPage : public SfxTabPage #endif protected: - _SvxMacroTabPage_Impl* mpImpl; + _SvxMacroTabPage_Impl* mpImpl; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > m_xAppEvents; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > m_xDocEvents; ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifiable > m_xModifiable; @@ -89,24 +89,24 @@ protected: _SvxMacroTabPage( Window* pParent, const ResId& rId, const SfxItemSet& rItemSet ); - void EnableButtons( const String& rLanguage ); - ::com::sun::star::uno::Any GetPropsByName( const ::rtl::OUString& eventName, EventsHash& eventsHash ); + void EnableButtons( const String& rLanguage ); + ::com::sun::star::uno::Any GetPropsByName( const ::rtl::OUString& eventName, EventsHash& eventsHash ); ::std::pair< ::rtl::OUString, ::rtl::OUString > GetPairFromAny( ::com::sun::star::uno::Any aAny ); public: - virtual ~_SvxMacroTabPage(); + virtual ~_SvxMacroTabPage(); void InitResources(); - void InitAndSetHandler( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xAppEvents, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xDocEvents, ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifiable > xModifiable ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - + void InitAndSetHandler( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xAppEvents, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xDocEvents, ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifiable > xModifiable ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + using SfxTabPage::Reset; - virtual void Reset(); + virtual void Reset(); - void DisplayAppEvents( bool appEvents); - void SetReadOnly( BOOL bSet ); - BOOL IsReadOnly() const; + void DisplayAppEvents( bool appEvents); + void SetReadOnly( BOOL bSet ); + BOOL IsReadOnly() const; }; class SvxMacroTabPage : public _SvxMacroTabPage @@ -124,7 +124,7 @@ public: // class SvxMacroAssignDlg -------------------------------------------------- -typedef USHORT* (*GetTabPageRanges)(); // liefert internationale Which-Werte +typedef USHORT* (*GetTabPageRanges)(); // liefert internationale Which-Werte class SvxMacroAssignSingleTabDialog : public SfxModalDialog { @@ -133,24 +133,24 @@ public: virtual ~SvxMacroAssignSingleTabDialog(); - void SetTabPage( SfxTabPage* pTabPage ); - // SfxTabPage* GetTabPage() const { return pPage; } + void SetTabPage( SfxTabPage* pTabPage ); + // SfxTabPage* GetTabPage() const { return pPage; } - // OKButton* GetOKButton() const { return pOKBtn; } - // CancelButton* GetCancelButton() const { return pCancelBtn; } + // OKButton* GetOKButton() const { return pOKBtn; } + // CancelButton* GetCancelButton() const { return pCancelBtn; } private: SfxViewFrame* pFrame; - FixedLine* pFixedLine; + FixedLine* pFixedLine; - OKButton* pOKBtn; - CancelButton* pCancelBtn; - HelpButton* pHelpBtn; + OKButton* pOKBtn; + CancelButton* pCancelBtn; + HelpButton* pHelpBtn; - SfxTabPage* pPage; - const SfxItemSet* pOptions; - SfxItemSet* pOutSet; + SfxTabPage* pPage; + const SfxItemSet* pOptions; + SfxItemSet* pOutSet; #if _SOLAR__PRIVATE DECL_DLLPRIVATE_LINK( OKHdl_Impl, Button * ); @@ -168,7 +168,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace >& xNameReplace, sal_uInt16 nSelectedIndex ); - virtual ~SvxMacroAssignDlg(); + virtual ~SvxMacroAssignDlg(); }; #endif diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx index 035232349443..db01be96c4a8 100644 --- a/cui/source/inc/measure.hxx +++ b/cui/source/inc/measure.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 @@ -48,43 +48,43 @@ class SvxMeasurePage : public SvxTabPage { private: - FixedLine aFlLine; - FixedText aFtLineDist; - MetricField aMtrFldLineDist; - FixedText aFtHelplineOverhang; - MetricField aMtrFldHelplineOverhang; - FixedText aFtHelplineDist; - MetricField aMtrFldHelplineDist; - FixedText aFtHelpline1Len; - MetricField aMtrFldHelpline1Len; - FixedText aFtHelpline2Len; - MetricField aMtrFldHelpline2Len; - TriStateBox aTsbBelowRefEdge; - FixedText aFtDecimalPlaces; - MetricField aMtrFldDecimalPlaces; - - FixedLine aFlLabel; + FixedLine aFlLine; + FixedText aFtLineDist; + MetricField aMtrFldLineDist; + FixedText aFtHelplineOverhang; + MetricField aMtrFldHelplineOverhang; + FixedText aFtHelplineDist; + MetricField aMtrFldHelplineDist; + FixedText aFtHelpline1Len; + MetricField aMtrFldHelpline1Len; + FixedText aFtHelpline2Len; + MetricField aMtrFldHelpline2Len; + TriStateBox aTsbBelowRefEdge; + FixedText aFtDecimalPlaces; + MetricField aMtrFldDecimalPlaces; + + FixedLine aFlLabel; FixedText aFtPosition; - SvxRectCtl aCtlPosition; - TriStateBox aTsbAutoPosV; - TriStateBox aTsbAutoPosH; - TriStateBox aTsbShowUnit; - ListBox aLbUnit; - TriStateBox aTsbParallel; + SvxRectCtl aCtlPosition; + TriStateBox aTsbAutoPosV; + TriStateBox aTsbAutoPosH; + TriStateBox aTsbShowUnit; + ListBox aLbUnit; + TriStateBox aTsbParallel; - SvxXMeasurePreview aCtlPreview; + SvxXMeasurePreview aCtlPreview; FixedLine aFlVert; - const SfxItemSet& rOutAttrs; - SfxItemSet aAttrSet; - const SdrView* pView; - SfxMapUnit eUnit; + const SfxItemSet& rOutAttrs; + SfxItemSet aAttrSet; + const SdrView* pView; + SfxMapUnit eUnit; - BOOL bPositionModified; + BOOL bPositionModified; #ifdef _SVX_MEASURE_CXX - void FillUnitLB(); + void FillUnitLB(); DECL_LINK( ClickAutoPosHdl_Impl, void * ); DECL_LINK( ChangeAttrHdl_Impl, void * ); @@ -95,17 +95,17 @@ public: SvxMeasurePage( Window* pWindow, const SfxItemSet& rInAttrs ); ~SvxMeasurePage(); - static SfxTabPage* Create( Window*, const SfxItemSet& ); - static USHORT* GetRanges(); + static SfxTabPage* Create( Window*, const SfxItemSet& ); + static USHORT* GetRanges(); - virtual BOOL FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet & ); + virtual BOOL FillItemSet( SfxItemSet& ); + virtual void Reset( const SfxItemSet & ); - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ); + virtual void PointChanged( Window* pWindow, RECT_POINT eRP ); - void Construct(); - void SetView( const SdrView* pSdrView ) { pView = pSdrView; } - virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 + void Construct(); + void SetView( const SdrView* pSdrView ) { pView = pSdrView; } + virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 }; /************************************************************************* diff --git a/cui/source/inc/multifil.hxx b/cui/source/inc/multifil.hxx index 83f35568516c..26c496902c8a 100644 --- a/cui/source/inc/multifil.hxx +++ b/cui/source/inc/multifil.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 @@ -43,7 +43,7 @@ class SvxMultiFileDialog : public SvxMultiPathDialog private: // #97807# ------------------------------------- std::map< String, ::ucbhelper::Content > aFileContentMap; - + DECL_LINK( AddHdl_Impl, PushButton * ); DECL_LINK( DelHdl_Impl, PushButton * ); @@ -51,8 +51,8 @@ public: SvxMultiFileDialog( Window* pParent, BOOL bEmptyAllowed = FALSE ); ~SvxMultiFileDialog(); - String GetFiles() const { return SvxMultiPathDialog::GetPath(); } - void SetFiles( const String& rPath ) { SvxMultiPathDialog::SetPath(rPath); aDelBtn.Enable(); } + String GetFiles() const { return SvxMultiPathDialog::GetPath(); } + void SetFiles( const String& rPath ) { SvxMultiPathDialog::SetPath(rPath); aDelBtn.Enable(); } }; diff --git a/cui/source/inc/multipat.hxx b/cui/source/inc/multipat.hxx index 6a79ccbcecd7..71395e271b19 100644 --- a/cui/source/inc/multipat.hxx +++ b/cui/source/inc/multipat.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 @@ -42,9 +42,9 @@ // different delimiter for Unix (:) and Windows (;) #ifdef UNX -#define CLASSPATH_DELIMITER ':' +#define CLASSPATH_DELIMITER ':' #else -#define CLASSPATH_DELIMITER ';' +#define CLASSPATH_DELIMITER ';' #endif // forward --------------------------------------------------------------- @@ -66,7 +66,7 @@ protected: CancelButton aCancelBtn; HelpButton aHelpButton; - MultiPath_Impl* pImpl; + MultiPath_Impl* pImpl; DECL_LINK( AddHdl_Impl, PushButton * ); DECL_LINK( DelHdl_Impl, PushButton * ); @@ -77,10 +77,10 @@ public: SvxMultiPathDialog( Window* pParent, BOOL bEmptyAllowed = FALSE ); ~SvxMultiPathDialog(); - String GetPath() const; - void SetPath( const String& rPath ); - void SetClassPathMode(); - sal_Bool IsClassPathMode() const; + String GetPath() const; + void SetPath( const String& rPath ); + void SetClassPathMode(); + sal_Bool IsClassPathMode() const; void EnableRadioButtonMode(); }; diff --git a/cui/source/inc/newtabledlg.hxx b/cui/source/inc/newtabledlg.hxx index 82432585851e..03afebbfd5b1 100644 --- a/cui/source/inc/newtabledlg.hxx +++ b/cui/source/inc/newtabledlg.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 @@ -38,15 +38,15 @@ class SvxNewTableDialog : public SvxAbstractNewTableDialog, public ModalDialog { private: - FixedText maFtColumns; - NumericField maNumColumns; - FixedText maFtRows; - NumericField maNumRows; + FixedText maFtColumns; + NumericField maNumColumns; + FixedText maFtRows; + NumericField maNumRows; - FixedLine maFlSep; - HelpButton maHelpButton; - OKButton maOkButton; - CancelButton maCancelButton; + FixedLine maFlSep; + HelpButton maHelpButton; + OKButton maOkButton; + CancelButton maCancelButton; public: SvxNewTableDialog( Window* pWindow ); diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index 12cac90278d6..255eb4dba53f 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.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 @@ -42,12 +42,12 @@ #include <svx/langbox.hxx> #include <svx/fontlb.hxx> -//CHINA001 #define SVX_NUMVAL_STANDARD -1234.12345678901234 -//CHINA001 #define SVX_NUMVAL_CURRENCY -1234 -//CHINA001 #define SVX_NUMVAL_PERCENT -0.1295 -//CHINA001 #define SVX_NUMVAL_TIME 36525.5678935185 -//CHINA001 #define SVX_NUMVAL_DATE 36525.5678935185 -//CHINA001 #define SVX_NUMVAL_BOOLEAN 1 +//CHINA001 #define SVX_NUMVAL_STANDARD -1234.12345678901234 +//CHINA001 #define SVX_NUMVAL_CURRENCY -1234 +//CHINA001 #define SVX_NUMVAL_PERCENT -0.1295 +//CHINA001 #define SVX_NUMVAL_TIME 36525.5678935185 +//CHINA001 #define SVX_NUMVAL_DATE 36525.5678935185 +//CHINA001 #define SVX_NUMVAL_BOOLEAN 1 //------------------------------------------------------------------------ @@ -59,15 +59,15 @@ class SvxNumberInfoItem; class SvxNumberPreviewImpl : public Window { private: - String aPrevStr; - Color aPrevCol; + String aPrevStr; + Color aPrevCol; - void InitSettings( BOOL bForeground, BOOL bBackground ); + void InitSettings( BOOL bForeground, BOOL bBackground ); protected: - virtual void Paint( const Rectangle& rRect ); - virtual void StateChanged( StateChangedType nStateChange ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void Paint( const Rectangle& rRect ); + virtual void StateChanged( StateChangedType nStateChange ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); public: SvxNumberPreviewImpl( Window* pParent, const ResId& rResId ); @@ -93,83 +93,83 @@ public: # define SfxTabPage ::SfxTabPage #endif - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - static USHORT* GetRanges(); + static USHORT* GetRanges(); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - virtual int DeactivatePage ( SfxItemSet* pSet = NULL ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); + virtual int DeactivatePage ( SfxItemSet* pSet = NULL ); - void SetInfoItem( const SvxNumberInfoItem& rItem ); - void SetNumberFormatList( const SvxNumberInfoItem& rItem ) + void SetInfoItem( const SvxNumberInfoItem& rItem ); + void SetNumberFormatList( const SvxNumberInfoItem& rItem ) { SetInfoItem( rItem ); } - void SetOkHdl( const Link& rOkHandler ); - void HideLanguage(BOOL nFlag=TRUE); - virtual long PreNotify( NotifyEvent& rNEvt ); - virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 + void SetOkHdl( const Link& rOkHandler ); + void HideLanguage(BOOL nFlag=TRUE); + virtual long PreNotify( NotifyEvent& rNEvt ); + virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 private: - SvxNumberFormatTabPage( Window* pParent, + SvxNumberFormatTabPage( Window* pParent, const SfxItemSet& rCoreAttrs ); - FixedText aFtCategory; - ListBox aLbCategory; - FixedText aFtFormat; - ListBox aLbCurrency; - SvxFontListBox aLbFormat; - FixedText aFtLanguage; - SvxLanguageBox aLbLanguage; + FixedText aFtCategory; + ListBox aLbCategory; + FixedText aFtFormat; + ListBox aLbCurrency; + SvxFontListBox aLbFormat; + FixedText aFtLanguage; + SvxLanguageBox aLbLanguage; CheckBox aCbSourceFormat; - FixedText aFtDecimals; - NumericField aEdDecimals; - FixedText aFtLeadZeroes; - NumericField aEdLeadZeroes; - CheckBox aBtnNegRed; - CheckBox aBtnThousand; + FixedText aFtDecimals; + NumericField aEdDecimals; + FixedText aFtLeadZeroes; + NumericField aEdLeadZeroes; + CheckBox aBtnNegRed; + CheckBox aBtnThousand; FixedLine aFlOptions; - FixedText aFtEdFormat; - Edit aEdFormat; - ImageButton aIbAdd; - ImageButton aIbInfo; - ImageButton aIbRemove; + FixedText aFtEdFormat; + Edit aEdFormat; + ImageButton aIbAdd; + ImageButton aIbInfo; + ImageButton aIbRemove; - FixedText aFtComment; - Edit aEdComment; - Timer aResetWinTimer; + FixedText aFtComment; + Edit aEdComment; + Timer aResetWinTimer; - SvxNumberPreviewImpl aWndPreview; + SvxNumberPreviewImpl aWndPreview; - SvxNumberInfoItem* pNumItem; - SvxNumberFormatShell* pNumFmtShell; - ULONG nInitFormat; - Link fnOkHdl; + SvxNumberInfoItem* pNumItem; + SvxNumberFormatShell* pNumFmtShell; + ULONG nInitFormat; + Link fnOkHdl; - BOOL bNumItemFlag; //Fuer Handling mit DocShell - BOOL bOneAreaFlag; - short nFixedCategory; + BOOL bNumItemFlag; //Fuer Handling mit DocShell + BOOL bOneAreaFlag; + short nFixedCategory; - long nCatHeight; + long nCatHeight; - long nCurFormatY; - long nCurFormatHeight; - long nStdFormatY; - long nStdFormatHeight; + long nCurFormatY; + long nCurFormatHeight; + long nStdFormatY; + long nStdFormatHeight; LocalizedString sAutomaticEntry; - Window* pLastActivWindow; + Window* pLastActivWindow; #ifdef _SVX_NUMFMT_CXX - void Init_Impl(); - void FillCurrencyBox(); - void FillFormatListBox_Impl( SvxDelStrgs& rEntries ); - void UpdateOptions_Impl( BOOL bCheckCatChange ); - void UpdateFormatListBox_Impl( USHORT bCat, BOOL bUpdateEdit ); - void DeleteEntryList_Impl( SvxDelStrgs& rEntries ); - void Obstructing(); + void Init_Impl(); + void FillCurrencyBox(); + void FillFormatListBox_Impl( SvxDelStrgs& rEntries ); + void UpdateOptions_Impl( BOOL bCheckCatChange ); + void UpdateFormatListBox_Impl( USHORT bCat, BOOL bUpdateEdit ); + void DeleteEntryList_Impl( SvxDelStrgs& rEntries ); + void Obstructing(); void EnableBySourceFormat_Impl(); - void SetCategory( USHORT nPos ); + void SetCategory( USHORT nPos ); String GetExpColorString( Color*& rpPreviewColor, const String& aFormatStr, short nTmpCatPos ); void MakePreviewText( const String& rFormat ); void ChangePreviewText( USHORT nPos ); diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index c56001f196f5..af53605cb1e7 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.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 @@ -55,12 +55,12 @@ class SvxBrushItem; struct SvxNumSettings_Impl { - short nNumberType; - short nParentNumbering; - rtl::OUString sPrefix; - rtl::OUString sSuffix; - rtl::OUString sBulletChar; - rtl::OUString sBulletFont; + short nNumberType; + short nParentNumbering; + rtl::OUString sPrefix; + rtl::OUString sSuffix; + rtl::OUString sBulletChar; + rtl::OUString sBulletFont; SvxNumSettings_Impl() : nNumberType(0), nParentNumbering(0) @@ -79,16 +79,16 @@ class SvxSingleNumPickTabPage : public SfxTabPage using TabPage::DeactivatePage; FixedLine aValuesFL; - SvxNumValueSet* pExamplesVS; - SvxNumSettingsArr_Impl aNumSettingsArr; - SvxNumRule* pActNum; - SvxNumRule* pSaveNum; - USHORT nActNumLvl; - BOOL bModified : 1; - BOOL bPreset : 1; + SvxNumValueSet* pExamplesVS; + SvxNumSettingsArr_Impl aNumSettingsArr; + SvxNumRule* pActNum; + SvxNumRule* pSaveNum; + USHORT nActNumLvl; + BOOL bModified : 1; + BOOL bPreset : 1; - String sNumCharFmtName; - USHORT nNumItemId; + String sNumCharFmtName; + USHORT nNumItemId; protected: DECL_LINK( NumSelectHdl_Impl, ValueSet*); @@ -99,15 +99,15 @@ class SvxSingleNumPickTabPage : public SfxTabPage const SfxItemSet& rSet); ~SvxSingleNumPickTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet *pSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual void ActivatePage(const SfxItemSet& rSet); + virtual int DeactivatePage(SfxItemSet *pSet); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); - void SetNumCharFmtName(const String& rName){sNumCharFmtName = rName;} + void SetNumCharFmtName(const String& rName){sNumCharFmtName = rName;} }; /*-----------------07.02.97 11.36------------------- @@ -120,15 +120,15 @@ class SvxBulletPickTabPage : public SfxTabPage using TabPage::DeactivatePage; FixedLine aValuesFL; - SvxNumValueSet* pExamplesVS; - SvxNumRule* pActNum; - SvxNumRule* pSaveNum; - USHORT nActNumLvl; - BOOL bModified : 1; - BOOL bPreset : 1; - USHORT nNumItemId; - - String sBulletCharFmtName; + SvxNumValueSet* pExamplesVS; + SvxNumRule* pActNum; + SvxNumRule* pSaveNum; + USHORT nActNumLvl; + BOOL bModified : 1; + BOOL bPreset : 1; + USHORT nNumItemId; + + String sBulletCharFmtName; protected: DECL_LINK(NumSelectHdl_Impl, ValueSet*); DECL_LINK( DoubleClickHdl_Impl, ValueSet* ); @@ -137,16 +137,16 @@ class SvxBulletPickTabPage : public SfxTabPage const SfxItemSet& rSet); ~SvxBulletPickTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet *pSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual void ActivatePage(const SfxItemSet& rSet); + virtual int DeactivatePage(SfxItemSet *pSet); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); - void SetCharFmtName(const String& rName){sBulletCharFmtName = rName;} - virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001 + void SetCharFmtName(const String& rName){sBulletCharFmtName = rName;} + virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001 }; /*-----------------07.02.97 11.36------------------- @@ -160,18 +160,18 @@ class SvxNumPickTabPage : public SfxTabPage using TabPage::DeactivatePage; FixedLine aValuesFL; - SvxNumValueSet* pExamplesVS; - String sNumCharFmtName; - String sBulletCharFmtName; + SvxNumValueSet* pExamplesVS; + String sNumCharFmtName; + String sBulletCharFmtName; - SvxNumSettingsArr_Impl aNumSettingsArrays[NUM_VALUSET_COUNT]; // wird mit den fuenf Formaten initialisiert + SvxNumSettingsArr_Impl aNumSettingsArrays[NUM_VALUSET_COUNT]; // wird mit den fuenf Formaten initialisiert - SvxNumRule* pActNum; - SvxNumRule* pSaveNum; - USHORT nActNumLvl; - USHORT nNumItemId; - BOOL bModified : 1; - BOOL bPreset : 1; + SvxNumRule* pActNum; + SvxNumRule* pSaveNum; + USHORT nActNumLvl; + USHORT nNumItemId; + BOOL bModified : 1; + BOOL bPreset : 1; protected: @@ -183,18 +183,18 @@ class SvxNumPickTabPage : public SfxTabPage const SfxItemSet& rSet); ~SvxNumPickTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet *pSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual void ActivatePage(const SfxItemSet& rSet); + virtual int DeactivatePage(SfxItemSet *pSet); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); - void SetCharFmtNames(const String& rCharName, const String& rBulName) - { sNumCharFmtName = rCharName; + void SetCharFmtNames(const String& rCharName, const String& rBulName) + { sNumCharFmtName = rCharName; sBulletCharFmtName = rBulName;} - virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001 + virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001 }; /*-----------------12.02.97 07.42------------------- @@ -206,20 +206,20 @@ class SvxBitmapPickTabPage : public SfxTabPage using TabPage::DeactivatePage; FixedLine aValuesFL; - SvxBmpNumValueSet* pExamplesVS; - FixedText aErrorText; - CheckBox aLinkedCB; + SvxBmpNumValueSet* pExamplesVS; + FixedText aErrorText; + CheckBox aLinkedCB; - List aGrfNames; - String sNumCharFmtName; + List aGrfNames; + String sNumCharFmtName; - SvxNumRule* pActNum; - SvxNumRule* pSaveNum; - USHORT nActNumLvl; - USHORT nNumItemId; - SfxMapUnit eCoreUnit; - BOOL bModified : 1; - BOOL bPreset : 1; + SvxNumRule* pActNum; + SvxNumRule* pSaveNum; + USHORT nActNumLvl; + USHORT nNumItemId; + SfxMapUnit eCoreUnit; + BOOL bModified : 1; + BOOL bPreset : 1; protected: DECL_LINK( NumSelectHdl_Impl, ValueSet*); @@ -231,15 +231,15 @@ class SvxBitmapPickTabPage : public SfxTabPage const SfxItemSet& rSet); ~SvxBitmapPickTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet *pSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual void ActivatePage(const SfxItemSet& rSet); + virtual int DeactivatePage(SfxItemSet *pSet); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); - void SetNumCharFmtName(const String& rName){sNumCharFmtName = rName;} + void SetNumCharFmtName(const String& rName){sNumCharFmtName = rName;} }; /*-----------------01.12.97 16:13------------------- @@ -252,71 +252,71 @@ class SvxNumOptionsTabPage : public SfxTabPage FixedLine aFormatFL; FixedText aLevelFT; - MultiListBox aLevelLB; + MultiListBox aLevelLB; FixedText aFmtFT; - ListBox aFmtLB; - FixedText aPrefixFT; - Edit aPrefixED; - FixedText aSuffixFT; - Edit aSuffixED; - FixedText aCharFmtFT; - ListBox aCharFmtLB; - FixedText aBulColorFT; - ColorListBox aBulColLB; - FixedText aBulRelSizeFT; - MetricField aBulRelSizeMF; + ListBox aFmtLB; + FixedText aPrefixFT; + Edit aPrefixED; + FixedText aSuffixFT; + Edit aSuffixED; + FixedText aCharFmtFT; + ListBox aCharFmtLB; + FixedText aBulColorFT; + ColorListBox aBulColLB; + FixedText aBulRelSizeFT; + MetricField aBulRelSizeMF; FixedText aAllLevelFT; - NumericField aAllLevelNF; + NumericField aAllLevelNF; FixedText aStartFT; NumericField aStartED; PushButton aBulletPB; - FixedText aAlignFT; - ListBox aAlignLB; - FixedText aBitmapFT; + FixedText aAlignFT; + ListBox aAlignLB; + FixedText aBitmapFT; MenuButton aBitmapMB; - FixedText aSizeFT; - MetricField aWidthMF; - FixedText aMultFT; - MetricField aHeightMF; - CheckBox aRatioCB; - FixedText aOrientFT; - ListBox aOrientLB; + FixedText aSizeFT; + MetricField aWidthMF; + FixedText aMultFT; + MetricField aHeightMF; + CheckBox aRatioCB; + FixedText aOrientFT; + ListBox aOrientLB; FixedLine aSameLevelFL; - CheckBox aSameLevelCB; + CheckBox aSameLevelCB; - String sNumCharFmtName; - String sBulletCharFmtName; + String sNumCharFmtName; + String sBulletCharFmtName; Timer aInvalidateTimer; - SvxNumberingPreview* pPreviewWIN; + SvxNumberingPreview* pPreviewWIN; - SvxNumRule* pActNum; - SvxNumRule* pSaveNum; + SvxNumRule* pActNum; + SvxNumRule* pSaveNum; - Size aInitSize[SVX_MAX_NUM]; + Size aInitSize[SVX_MAX_NUM]; - BOOL bLastWidthModified : 1; - BOOL bModified : 1; - BOOL bPreset : 1; - BOOL bAutomaticCharStyles: 1; - BOOL bHTMLMode : 1; - BOOL bMenuButtonInitialized : 1; + BOOL bLastWidthModified : 1; + BOOL bModified : 1; + BOOL bPreset : 1; + BOOL bAutomaticCharStyles: 1; + BOOL bHTMLMode : 1; + BOOL bMenuButtonInitialized : 1; - List aGrfNames; - Font aActBulletFont; - String sBullet; - String sStartWith; + List aGrfNames; + Font aActBulletFont; + String sBullet; + String sStartWith; - BYTE nBullet; - USHORT nActNumLvl; - USHORT nNumItemId; - SfxMapUnit eCoreUnit; + BYTE nBullet; + USHORT nActNumLvl; + USHORT nNumItemId; + SfxMapUnit eCoreUnit; - void InitControls(); - void SwitchNumberType( BYTE nType, BOOL bBmp = FALSE ); + void InitControls(); + void SwitchNumberType( BYTE nType, BOOL bBmp = FALSE ); void CheckForStartValue_Impl(sal_uInt16 nNumberingType); DECL_LINK( NumberTypeSelectHdl_Impl, ListBox * ); @@ -342,25 +342,25 @@ class SvxNumOptionsTabPage : public SfxTabPage const SfxItemSet& rSet); ~SvxNumOptionsTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet *pSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual void ActivatePage(const SfxItemSet& rSet); + virtual int DeactivatePage(SfxItemSet *pSet); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); -//??? void SetWrtShell(SwWrtShell* pSh); - void SetCharFmts(const String& rNumName, const String& rBulletName ) +//??? void SetWrtShell(SwWrtShell* pSh); + void SetCharFmts(const String& rNumName, const String& rBulletName ) { sNumCharFmtName = rNumName; sBulletCharFmtName = rBulletName; } - void SetMetric(FieldUnit eSet); + void SetMetric(FieldUnit eSet); - ListBox& GetCharFmtListBox() {return aCharFmtLB;} - void SetModified(BOOL bRepaint = TRUE); - virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001 + ListBox& GetCharFmtListBox() {return aCharFmtLB;} + void SetModified(BOOL bRepaint = TRUE); + virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001 }; /*-----------------03.12.97 10:18------------------- @@ -377,15 +377,15 @@ class SvxNumPositionTabPage : public SfxTabPage // former set of controls shown for numbering rules containing list level // attributes in SvxNumberFormat::SvxNumPositionAndSpaceMode == LABEL_WIDTH_AND_POSITION - FixedText aDistBorderFT; - MetricField aDistBorderMF; - CheckBox aRelativeCB; - FixedText aIndentFT; - MetricField aIndentMF; - FixedText aDistNumFT; - MetricField aDistNumMF; - FixedText aAlignFT; - ListBox aAlignLB; + FixedText aDistBorderFT; + MetricField aDistBorderMF; + CheckBox aRelativeCB; + FixedText aIndentFT; + MetricField aIndentMF; + FixedText aDistNumFT; + MetricField aDistNumMF; + FixedText aAlignFT; + ListBox aAlignLB; // <-- // new set of controls shown for numbering rules containing list level @@ -402,23 +402,23 @@ class SvxNumPositionTabPage : public SfxTabPage MetricField aIndentAtMF; // <-- - PushButton aStandardPB; + PushButton aStandardPB; #if OSL_DEBUG_LEVEL > 1 - FixedText* pDebugFixedText; + FixedText* pDebugFixedText; #endif SvxNumberingPreview* pPreviewWIN; - SvxNumRule* pActNum; - SvxNumRule* pSaveNum; + SvxNumRule* pActNum; + SvxNumRule* pSaveNum; - USHORT nActNumLvl; - USHORT nNumItemId; - SfxMapUnit eCoreUnit; + USHORT nActNumLvl; + USHORT nNumItemId; + SfxMapUnit eCoreUnit; - BOOL bModified : 1; - BOOL bPreset : 1; - BOOL bInInintControl : 1; //Modify-Fehler umgehen, soll ab 391 behoben sein + BOOL bModified : 1; + BOOL bPreset : 1; + BOOL bInInintControl : 1; //Modify-Fehler umgehen, soll ab 391 behoben sein bool bLabelAlignmentPosAndSpaceModeActive; void InitControls(); @@ -442,17 +442,17 @@ public: const SfxItemSet& rSet); ~SvxNumPositionTabPage(); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet *pSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual void ActivatePage(const SfxItemSet& rSet); + virtual int DeactivatePage(SfxItemSet *pSet); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - void SetMetric(FieldUnit eSet); - void SetModified(BOOL bRepaint = TRUE); - virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001 + void SetMetric(FieldUnit eSet); + void SetModified(BOOL bRepaint = TRUE); + virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001 }; #endif diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx index ac558573f048..50c903c3000f 100644 --- a/cui/source/inc/optasian.hxx +++ b/cui/source/inc/optasian.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 @@ -39,25 +39,25 @@ struct SvxAsianLayoutPage_Impl; class SvxAsianLayoutPage : public SfxTabPage { FixedLine aKerningGB; - RadioButton aCharKerningRB; - RadioButton aCharPunctKerningRB; + RadioButton aCharKerningRB; + RadioButton aCharPunctKerningRB; FixedLine aCharDistGB; - RadioButton aNoCompressionRB; - RadioButton aPunctCompressionRB; - RadioButton aPunctKanaCompressionRB; + RadioButton aNoCompressionRB; + RadioButton aPunctCompressionRB; + RadioButton aPunctKanaCompressionRB; FixedLine aStartEndGB; - FixedText aLanguageFT; - SvxLanguageBox aLanguageLB; - CheckBox aStandardCB; + FixedText aLanguageFT; + SvxLanguageBox aLanguageLB; + CheckBox aStandardCB; - FixedText aStartFT; - Edit aStartED; - FixedText aEndFT; - Edit aEndED; - FixedText aHintFT; + FixedText aStartFT; + Edit aStartED; + FixedText aEndFT; + Edit aEndED; + FixedText aHintFT; SvxAsianLayoutPage_Impl* pImpl; @@ -70,10 +70,10 @@ public: virtual ~SvxAsianLayoutPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); static UINT16* GetRanges(); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; #endif diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx index ca1d0f395344..79632c91a10b 100644 --- a/cui/source/inc/optdict.hxx +++ b/cui/source/inc/optdict.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 @@ -62,17 +62,17 @@ namespace linguistic2{ class SvxNewDictionaryDialog : public ModalDialog { private: - FixedText aNameText; - Edit aNameEdit; - FixedText aLanguageText; - SvxLanguageBox aLanguageLB; - CheckBox aExceptBtn; + FixedText aNameText; + Edit aNameEdit; + FixedText aLanguageText; + SvxLanguageBox aLanguageLB; + CheckBox aExceptBtn; FixedLine aNewDictBox; - OKButton aOKBtn; - CancelButton aCancelBtn; - HelpButton aHelpBtn; + OKButton aOKBtn; + CancelButton aCancelBtn; + HelpButton aHelpBtn; ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellChecker1 > xSpell; + ::com::sun::star::linguistic2::XSpellChecker1 > xSpell; ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > xNewDic; @@ -95,20 +95,20 @@ public: class SvxDictEdit : public Edit { - Link aActionLink; - sal_Bool bSpaces; + Link aActionLink; + sal_Bool bSpaces; public: SvxDictEdit(Window* pParent, const ResId& rResId) : Edit(pParent, rResId), bSpaces(sal_False){} - void SetActionHdl( const Link& rLink ) + void SetActionHdl( const Link& rLink ) { aActionLink = rLink;} - void SetSpaces(sal_Bool bSet) + void SetSpaces(sal_Bool bSet) {bSpaces = bSet;} - virtual void KeyInput( const KeyEvent& rKEvent ); + virtual void KeyInput( const KeyEvent& rKEvent ); }; // class SvxEditDictionaryDialog ----------------------------------------- @@ -117,37 +117,37 @@ class SvxEditDictionaryDialog : public ModalDialog { private: - FixedText aBookFT; - ListBox aAllDictsLB; - FixedText aLangFT; - SvxLanguageBox aLangLB; - - FixedText aWordFT; - SvxDictEdit aWordED; - FixedText aReplaceFT; - SvxDictEdit aReplaceED; - SvTabListBox aWordsLB; - PushButton aNewReplacePB; - PushButton aDeletePB; + FixedText aBookFT; + ListBox aAllDictsLB; + FixedText aLangFT; + SvxLanguageBox aLangLB; + + FixedText aWordFT; + SvxDictEdit aWordED; + FixedText aReplaceFT; + SvxDictEdit aReplaceED; + SvTabListBox aWordsLB; + PushButton aNewReplacePB; + PushButton aDeletePB; FixedLine aEditDictsBox; - CancelButton aCloseBtn; - HelpButton aHelpBtn; - String sModify; - String sNew; - DecorationView aDecoView; + CancelButton aCloseBtn; + HelpButton aHelpBtn; + String sModify; + String sNew; + DecorationView aDecoView; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionary > > aDics; //! snapshot copy to work on + ::com::sun::star::linguistic2::XDictionary > > aDics; //! snapshot copy to work on ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellChecker1 > xSpell; + ::com::sun::star::linguistic2::XSpellChecker1 > xSpell; - short nOld; - long nWidth; - sal_Bool bFirstSelect; - sal_Bool bDoNothing; - BOOL bDicIsReadonly; + short nOld; + long nWidth; + sal_Bool bFirstSelect; + sal_Bool bDoNothing; + BOOL bDicIsReadonly; #ifdef _SVX_OPTDICT_CXX DECL_LINK( SelectBookHdl_Impl, ListBox * ); @@ -157,20 +157,20 @@ private: DECL_LINK(ModifyHdl, Edit*); - void ShowWords_Impl( sal_uInt16 nId ); - void SetLanguage_Impl( ::com::sun::star::util::Language nLanguage ); - sal_Bool IsDicReadonly_Impl() const { return bDicIsReadonly; } - void SetDicReadonly_Impl( ::com::sun::star::uno::Reference< + void ShowWords_Impl( sal_uInt16 nId ); + void SetLanguage_Impl( ::com::sun::star::util::Language nLanguage ); + sal_Bool IsDicReadonly_Impl() const { return bDicIsReadonly; } + void SetDicReadonly_Impl( ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > &xDic ); - void RemoveDictEntry(SvLBoxEntry* pEntry); - USHORT GetLBInsertPos(const String &rDicWord); + void RemoveDictEntry(SvLBoxEntry* pEntry); + USHORT GetLBInsertPos(const String &rDicWord); #endif protected: - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ); public: SvxEditDictionaryDialog( Window* pParent, diff --git a/cui/source/inc/optimprove.hxx b/cui/source/inc/optimprove.hxx index 532a9fcc68d7..91b8a6b9e524 100644 --- a/cui/source/inc/optimprove.hxx +++ b/cui/source/inc/optimprove.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 diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx index 303ca2558ae3..9bc198eb05c6 100644 --- a/cui/source/inc/optlingu.hxx +++ b/cui/source/inc/optlingu.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 @@ -57,35 +57,35 @@ class SvxLinguData_Impl; // define ---------------------------------------------------------------- -#define GROUP_MODULES ((sal_uInt16)0x0008) +#define GROUP_MODULES ((sal_uInt16)0x0008) // forward --------------------------------------------------------------- class SvxEditModulesDlg : public ModalDialog { FixedLine aModulesFL; - FixedText aLanguageFT; - SvxLanguageBox aLanguageLB; + FixedText aLanguageFT; + SvxLanguageBox aLanguageLB; - SvxCheckListBox aModulesCLB; - PushButton aPrioUpPB; - PushButton aPrioDownPB; - PushButton aBackPB; + SvxCheckListBox aModulesCLB; + PushButton aPrioUpPB; + PushButton aPrioDownPB; + PushButton aBackPB; svt::FixedHyperlink aMoreDictsLink; FixedLine aButtonsFL; HelpButton aHelpPB; OKButton aClosePB; - String sSpell; - String sHyph; - String sThes; + String sSpell; + String sHyph; + String sThes; String sGrammar; SvxLinguData_Impl* pDefaultLinguData; - SvxLinguData_Impl& rLinguData; + SvxLinguData_Impl& rLinguData; - SvLBoxButtonData* pCheckButtonData; + SvLBoxButtonData* pCheckButtonData; SvLBoxEntry* CreateEntry(String& rTxt, USHORT nCol); @@ -102,7 +102,7 @@ class SvxEditModulesDlg : public ModalDialog public: SvxEditModulesDlg(Window* pParent, SvxLinguData_Impl& rData); - virtual ~SvxEditModulesDlg(); + virtual ~SvxEditModulesDlg(); }; // class SvxLinguTabPage ------------------------------------------------- @@ -111,46 +111,46 @@ class SvxLinguTabPage : public SfxTabPage { private: FixedLine aLinguisticFL; - FixedText aLinguModulesFT; - SvxCheckListBox aLinguModulesCLB; - PushButton aLinguModulesEditPB; + FixedText aLinguModulesFT; + SvxCheckListBox aLinguModulesCLB; + PushButton aLinguModulesEditPB; FixedText aLinguDicsFT; SvxCheckListBox aLinguDicsCLB; PushButton aLinguDicsNewPB; PushButton aLinguDicsEditPB; PushButton aLinguDicsDelPB; - FixedText aLinguOptionsFT; - SvxCheckListBox aLinguOptionsCLB; - PushButton aLinguOptionsEditPB; + FixedText aLinguOptionsFT; + SvxCheckListBox aLinguOptionsCLB; + PushButton aLinguOptionsEditPB; svt::FixedHyperlink aMoreDictsLink; - String sCapitalWords; - String sWordsWithDigits; - String sCapitalization; - String sSpellSpecial; - String sSpellAuto; + String sCapitalWords; + String sWordsWithDigits; + String sCapitalization; + String sSpellSpecial; + String sSpellAuto; String sGrammarAuto; - String sNumMinWordlen; - String sNumPreBreak; - String sNumPostBreak; - String sHyphAuto; - String sHyphSpecial; + String sNumMinWordlen; + String sNumPreBreak; + String sNumPostBreak; + String sHyphAuto; + String sHyphSpecial; com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet > xProp; + com::sun::star::beans::XPropertySet > xProp; com::sun::star::uno::Reference< - com::sun::star::linguistic2::XDictionaryList > xDicList; + com::sun::star::linguistic2::XDictionaryList > xDicList; com::sun::star::uno::Sequence< com::sun::star::uno::Reference< - com::sun::star::linguistic2::XDictionary > > aDics; + com::sun::star::linguistic2::XDictionary > > aDics; - SvLBoxButtonData* pCheckButtonData; + SvLBoxButtonData* pCheckButtonData; - SvxLinguData_Impl* pLinguData; + SvxLinguData_Impl* pLinguData; SvxLinguTabPage( Window* pParent, const SfxItemSet& rCoreSet ); - SvLBoxEntry* CreateEntry(String& rTxt, USHORT nCol); + SvLBoxEntry* CreateEntry(String& rTxt, USHORT nCol); void AddDicBoxEntry( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, USHORT nIdx ); ULONG GetDicUserData( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, USHORT nIdx ); @@ -168,14 +168,14 @@ private: #endif public: - virtual ~SvxLinguTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - static sal_uInt16* GetRanges(); + virtual ~SvxLinguTabPage(); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); + static sal_uInt16* GetRanges(); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); - void HideGroups( sal_uInt16 nGrp ); + void HideGroups( sal_uInt16 nGrp ); }; #endif diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index ab72fe4a4773..98706556cc78 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.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 @@ -64,15 +64,15 @@ class SvxPathTabPage : public SfxTabPage { private: FixedLine aStdBox; - FixedText aTypeText; - FixedText aPathText; + FixedText aTypeText; + FixedText aPathText; SvxControlFocusHelper aPathCtrl; - PushButton aStandardBtn; - PushButton aPathBtn; + PushButton aStandardBtn; + PushButton aPathBtn; - HeaderBar* pHeaderBar; - ::svx::OptHeaderTabListBox* pPathBox; - OptPath_Impl* pImpl; + HeaderBar* pHeaderBar; + ::svx::OptHeaderTabListBox* pPathBox; + OptPath_Impl* pImpl; ::com::sun::star::uno::Reference< ::svt::DialogClosedListener > xDialogListener; ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFolderPicker > xFolderPicker; @@ -99,11 +99,11 @@ public: SvxPathTabPage( Window* pParent, const SfxItemSet& rSet ); ~SvxPathTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - static USHORT* GetRanges(); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); + static USHORT* GetRanges(); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); virtual void FillUserData(); }; diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index 8fba32b2bbd1..c5b9ccaa72c8 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.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 @@ //CHINA001 enum SvxModeType //CHINA001 { -//CHINA001 SVX_PAGE_MODE_STANDARD, -//CHINA001 SVX_PAGE_MODE_CENTER, -//CHINA001 SVX_PAGE_MODE_PRESENTATION +//CHINA001 SVX_PAGE_MODE_STANDARD, +//CHINA001 SVX_PAGE_MODE_CENTER, +//CHINA001 SVX_PAGE_MODE_PRESENTATION //CHINA001 }; // class SvxPageDescPage ------------------------------------------------- @@ -85,8 +85,8 @@ <SvxLRSpaceItem>: <SID_ATTR_LRSPACE> */ -struct SvxPage_Impl; -typedef USHORT MarginPosition; +struct SvxPage_Impl; +typedef USHORT MarginPosition; class SvxPageDescPage : public SfxTabPage { @@ -109,8 +109,8 @@ class SvxPageDescPage : public SfxTabPage SvxPageWindow aBspWin; - FixedText aTextFlowLbl; - svx::FrameDirectionListBox aTextFlowBox; + FixedText aTextFlowLbl; + svx::FrameDirectionListBox aTextFlowBox; FixedText aPaperTrayLbl; ListBox aPaperTrayBox; @@ -130,7 +130,7 @@ class SvxPageDescPage : public SfxTabPage FixedLine aLayoutFL; FixedText aPageText; ListBox aLayoutBox; - FixedText aNumberFormatText; + FixedText aNumberFormatText; ListBox aNumberFormatBox; FixedLine aBottomSeparatorFl; @@ -144,26 +144,26 @@ class SvxPageDescPage : public SfxTabPage CheckBox aAdaptBox; //Register Writer - CheckBox aRegisterCB; - FixedText aRegisterFT; - ListBox aRegisterLB; + CheckBox aRegisterCB; + FixedText aRegisterFT; + ListBox aRegisterLB; - String sStandardRegister; + String sStandardRegister; String aInsideText; String aOutsideText; String aLeftText; String aRightText; - String aPrintRangeQueryText; + String aPrintRangeQueryText; - long nFirstLeftMargin; - long nFirstRightMargin; - long nFirstTopMargin; - long nFirstBottomMargin; - long nLastLeftMargin; - long nLastRightMargin; - long nLastTopMargin; - long nLastBottomMargin; + long nFirstLeftMargin; + long nFirstRightMargin; + long nFirstTopMargin; + long nFirstBottomMargin; + long nLastLeftMargin; + long nLastRightMargin; + long nLastTopMargin; + long nLastBottomMargin; Size aMaxSize; BOOL bLandscape; @@ -172,43 +172,43 @@ class SvxPageDescPage : public SfxTabPage Paper ePaperStart; Paper ePaperEnd; - SvxPage_Impl* pImpl; + SvxPage_Impl* pImpl; #ifdef _SVX_PAGE_CXX void Init_Impl(); - DECL_LINK( LayoutHdl_Impl, ListBox* ); - DECL_LINK( PaperBinHdl_Impl, ListBox* ); - DECL_LINK( SwapOrientation_Impl, RadioButton* ); + DECL_LINK( LayoutHdl_Impl, ListBox* ); + DECL_LINK( PaperBinHdl_Impl, ListBox* ); + DECL_LINK( SwapOrientation_Impl, RadioButton* ); void SwapFirstValues_Impl( bool bSet ); - DECL_LINK( BorderModify_Impl, MetricField* ); + DECL_LINK( BorderModify_Impl, MetricField* ); void InitHeadFoot_Impl( const SfxItemSet& rSet ); - DECL_LINK( CenterHdl_Impl, CheckBox* ); + DECL_LINK( CenterHdl_Impl, CheckBox* ); void UpdateExample_Impl( bool bResetbackground = false ); // Papiergroesse - DECL_LINK( PaperSizeSelect_Impl, ListBox* ); - DECL_LINK( PaperSizeModify_Impl, Edit* ); + DECL_LINK( PaperSizeSelect_Impl, ListBox* ); + DECL_LINK( PaperSizeModify_Impl, Edit* ); - DECL_LINK( FrameDirectionModify_Impl, ListBox* ); + DECL_LINK( FrameDirectionModify_Impl, ListBox* ); // Hintergrund void ResetBackground_Impl( const SfxItemSet& rSet ); // Grenzwerte - DECL_LINK( RangeHdl_Impl, Edit* ); + DECL_LINK( RangeHdl_Impl, Edit* ); void CalcMargin_Impl(); // Registerhaltigkeit - DECL_LINK( RegisterModify, CheckBox * ); + DECL_LINK( RegisterModify, CheckBox * ); // page direction /** Disables vertical page direction entries in the text flow listbox. */ void DisableVerticalPageDir(); - bool IsPrinterRangeOverflow( MetricField& rField, long nFirstMargin, + bool IsPrinterRangeOverflow( MetricField& rField, long nFirstMargin, long nLastMargin, MarginPosition nPos ); - void CheckMarginEdits( bool _bClear ); - bool IsMarginOutOfRange(); + void CheckMarginEdits( bool _bClear ); + bool IsMarginOutOfRange(); #endif SvxPageDescPage( Window* pParent, const SfxItemSet& rSet ); @@ -231,8 +231,8 @@ public: void SetPaperFormatRanges( Paper eStart, Paper eEnd ) { ePaperStart = eStart, ePaperEnd = eEnd; } - void SetCollectionList(const List* pList); - virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 + void SetCollectionList(const List* pList); + virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 }; #endif // #ifndef _SVX_PAGE_HXX diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index 579ea4a4a6ad..ccca337aff9c 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.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 @@ -33,8 +33,8 @@ #include <vcl/button.hxx> #include <vcl/fixed.hxx> #include <sfx2/tabdlg.hxx> -#include <svx/relfld.hxx> // SvxRelativeField -#include <svx/paraprev.hxx> // Preview +#include <svx/relfld.hxx> // SvxRelativeField +#include <svx/paraprev.hxx> // Preview #include <svx/frmdirlbox.hxx> #include <vcl/lstbox.hxx> #include <svx/flagsdef.hxx> @@ -52,7 +52,7 @@ class SvxParagraphControllerItem; // class SvxStdParagraphTabPage ------------------------------------------ -/* {k:\svx\prototyp\dialog\parastd.bmp} +/* {k:\svx\prototyp\dialog\parastd.bmp} [Beschreibung] Mit dieser TabPage koennen Standard-Attribute eines Absatzes eingestellt @@ -73,49 +73,49 @@ private: SvxStdParagraphTabPage( Window* pParent, const SfxItemSet& rSet ); // Einzug - FixedText aLeftLabel; - SvxRelativeField aLeftIndent; + FixedText aLeftLabel; + SvxRelativeField aLeftIndent; - FixedText aRightLabel; - SvxRelativeField aRightIndent; + FixedText aRightLabel; + SvxRelativeField aRightIndent; - FixedText aFLineLabel; - SvxRelativeField aFLineIndent; - CheckBox aAutoCB; + FixedText aFLineLabel; + SvxRelativeField aFLineIndent; + CheckBox aAutoCB; FixedLine aIndentFrm; // Abstaende - FixedText aTopLabel; - SvxRelativeField aTopDist; - FixedText aBottomLabel; - SvxRelativeField aBottomDist; + FixedText aTopLabel; + SvxRelativeField aTopDist; + FixedText aBottomLabel; + SvxRelativeField aBottomDist; FixedLine aDistFrm; // Zeilenabstand - ListBox aLineDist; - FixedText aLineDistAtLabel; - MetricField aLineDistAtPercentBox; - MetricField aLineDistAtMetricBox; + ListBox aLineDist; + FixedText aLineDistAtLabel; + MetricField aLineDistAtPercentBox; + MetricField aLineDistAtMetricBox; FixedLine aLineDistFrm; - String sAbsDist; - SvxParaPrevWindow aExampleWin; + String sAbsDist; + SvxParaPrevWindow aExampleWin; //Registerhaltigkeit - nur Writer - CheckBox aRegisterCB; + CheckBox aRegisterCB; FixedLine aRegisterFL; - Edit* pActLineDistFld; - long nAbst; - long nWidth; - long nMinFixDist; - BOOL bRelativeMode; + Edit* pActLineDistFld; + long nAbst; + long nWidth; + long nMinFixDist; + BOOL bRelativeMode; BOOL bNegativeIndents; #ifdef _SVX_PARAGRPH_CXX - void SetLineSpacing_Impl( const SvxLineSpacingItem& rAttr ); - void Init_Impl(); - void UpdateExample_Impl( BOOL bAll = FALSE ); + void SetLineSpacing_Impl( const SvxLineSpacingItem& rAttr ); + void Init_Impl(); + void UpdateExample_Impl( BOOL bAll = FALSE ); DECL_LINK( LineDistHdl_Impl, ListBox* ); DECL_LINK( ModifyHdl_Impl, SvxRelativeField* ); @@ -123,26 +123,26 @@ private: #endif protected: - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ); public: DECL_LINK( ELRLoseFocusHdl, Edit* ); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - static USHORT* GetRanges(); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); + static USHORT* GetRanges(); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); - void SetPageWidth( USHORT nPageWidth ); - void SetMaxDistance( USHORT nMaxDist ); - void EnableRelativeMode(); - void EnableRegisterMode(); - void EnableAutoFirstLine(); - void EnableAbsLineDist(long nMinTwip); - void EnableNegativeMode(); - virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001 + void SetPageWidth( USHORT nPageWidth ); + void SetMaxDistance( USHORT nMaxDist ); + void EnableRelativeMode(); + void EnableRegisterMode(); + void EnableAutoFirstLine(); + void EnableAbsLineDist(long nMinTwip); + void EnableNegativeMode(); + virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001 }; // class SvxParaAlignTabPage ------------------------------------------------ @@ -154,55 +154,55 @@ class SvxParaAlignTabPage : public SfxTabPage // Ausrichtung FixedLine aAlignFrm; RadioButton aLeft; - RadioButton aRight; - RadioButton aCenter; - RadioButton aJustify; - FixedText aLastLineFT; - ListBox aLastLineLB; - CheckBox aExpandCB; + RadioButton aRight; + RadioButton aCenter; + RadioButton aJustify; + FixedText aLastLineFT; + ListBox aLastLineLB; + CheckBox aExpandCB; CheckBox aSnapToGridCB; //preview - SvxParaPrevWindow aExampleWin; + SvxParaPrevWindow aExampleWin; //vertical alignment FixedLine aVertAlignFL; FixedText aVertAlignFT; ListBox aVertAlignLB; - FixedLine aPropertiesFL; - FixedText aTextDirectionFT; - svx::FrameDirectionListBox aTextDirectionLB; + FixedLine aPropertiesFL; + FixedText aTextDirectionFT; + svx::FrameDirectionListBox aTextDirectionLB; #ifdef _SVX_PARAGRPH_CXX - DECL_LINK( AlignHdl_Impl, RadioButton* ); - DECL_LINK( LastLineHdl_Impl, ListBox* ); - DECL_LINK( TextDirectionHdl_Impl, ListBox* ); + DECL_LINK( AlignHdl_Impl, RadioButton* ); + DECL_LINK( LastLineHdl_Impl, ListBox* ); + DECL_LINK( TextDirectionHdl_Impl, ListBox* ); - void UpdateExample_Impl( BOOL bAll = FALSE ); + void UpdateExample_Impl( BOOL bAll = FALSE ); #endif SvxParaAlignTabPage( Window* pParent, const SfxItemSet& rSet ); - virtual ~SvxParaAlignTabPage(); + virtual ~SvxParaAlignTabPage(); protected: - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ); public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - static USHORT* GetRanges(); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); + static USHORT* GetRanges(); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); - void EnableJustifyExt(); - virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001 + void EnableJustifyExt(); + virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001 }; // class SvxExtParagraphTabPage ------------------------------------------ -/* {k:\svx\prototyp\dialog\paraext.bmp} +/* {k:\svx\prototyp\dialog\paraext.bmp} [Beschreibung] Mit dieser TabPage koennen Spezial-Attribute eines Absatzes eingestellt @@ -221,65 +221,65 @@ class SvxExtParagraphTabPage: public SfxTabPage using TabPage::DeactivatePage; public: - virtual ~SvxExtParagraphTabPage(); + virtual ~SvxExtParagraphTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - static USHORT* GetRanges(); + static USHORT* GetRanges(); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); - void DisablePageBreak(); + void DisablePageBreak(); protected: - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ); private: SvxExtParagraphTabPage( Window* pParent, const SfxItemSet& rSet ); // Silbentrennung - TriStateBox aHyphenBox; - FixedText aBeforeText; - NumericField aExtHyphenBeforeBox; -// FixedText aHyphenBeforeLabel; - FixedText aAfterText; - NumericField aExtHyphenAfterBox; -// FixedText aHyphenAfterLabel; - FixedText aMaxHyphenLabel; + TriStateBox aHyphenBox; + FixedText aBeforeText; + NumericField aExtHyphenBeforeBox; +// FixedText aHyphenBeforeLabel; + FixedText aAfterText; + NumericField aExtHyphenAfterBox; +// FixedText aHyphenAfterLabel; + FixedText aMaxHyphenLabel; NumericField aMaxHyphenEdit; FixedLine aExtFL; // Seitenumbruch - FixedLine aBreaksFL; - TriStateBox aPageBreakBox; + FixedLine aBreaksFL; + TriStateBox aPageBreakBox; FixedText aBreakTypeFT; ListBox aBreakTypeLB; FixedText aBreakPositionFT; ListBox aBreakPositionLB; - TriStateBox aApplyCollBtn; - ListBox aApplyCollBox; + TriStateBox aApplyCollBtn; + ListBox aApplyCollBox; FixedText aPagenumText; - NumericField aPagenumEdit; + NumericField aPagenumEdit; FixedLine aExtendFL; // Absatzteilung - TriStateBox aKeepTogetherBox; - TriStateBox aKeepParaBox; + TriStateBox aKeepTogetherBox; + TriStateBox aKeepParaBox; // Witwen/Waisen - TriStateBox aOrphanBox; - NumericField aOrphanRowNo; - FixedText aOrphanRowLabel; + TriStateBox aOrphanBox; + NumericField aOrphanRowNo; + FixedText aOrphanRowLabel; - TriStateBox aWidowBox; - NumericField aWidowRowNo; - FixedText aWidowRowLabel; + TriStateBox aWidowBox; + NumericField aWidowRowNo; + FixedText aWidowRowLabel; BOOL bPageBreak; - BOOL bHtmlMode; - USHORT nStdPos; + BOOL bHtmlMode; + USHORT nStdPos; #ifdef _SVX_PARAGRPH_CXX DECL_LINK( PageBreakHdl_Impl, TriStateBox* ); @@ -291,7 +291,7 @@ private: DECL_LINK( PageBreakPosHdl_Impl, ListBox* ); DECL_LINK( PageBreakTypeHdl_Impl, ListBox* ); #endif - virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001 + virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001 }; /* -----------------------------29.11.00 11:33-------------------------------- @@ -300,10 +300,10 @@ class SvxAsianTabPage : public SfxTabPage { FixedLine aOptionsFL; - TriStateBox aForbiddenRulesCB; - TriStateBox aHangingPunctCB; + TriStateBox aForbiddenRulesCB; + TriStateBox aHangingPunctCB; - TriStateBox aScriptSpaceCB; + TriStateBox aScriptSpaceCB; SvxAsianTabPage( Window* pParent, const SfxItemSet& rSet ); @@ -314,12 +314,12 @@ public: ~SvxAsianTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - static USHORT* GetRanges(); + static USHORT* GetRanges(); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; diff --git a/cui/source/inc/passwdomdlg.hxx b/cui/source/inc/passwdomdlg.hxx index 27e964c5b28a..3b9258462ce9 100644 --- a/cui/source/inc/passwdomdlg.hxx +++ b/cui/source/inc/passwdomdlg.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 @@ -40,14 +40,14 @@ struct PasswordToOpenModifyDialog_Impl; class PasswordToOpenModifyDialog : public SfxModalDialog { std::auto_ptr< PasswordToOpenModifyDialog_Impl > m_pImpl; - + // disallow use of copy c-tor and assignment operator PasswordToOpenModifyDialog( const PasswordToOpenModifyDialog & ); PasswordToOpenModifyDialog & operator = ( const PasswordToOpenModifyDialog & ); - + public: - PasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen, - sal_uInt16 nMaxPasswdLen /* 0 -> no max len enforced */, + PasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen, + sal_uInt16 nMaxPasswdLen /* 0 -> no max len enforced */, bool bIsPasswordToModify ); virtual ~PasswordToOpenModifyDialog(); diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx index 924edae728a5..2686287776b1 100644 --- a/cui/source/inc/pastedlg.hxx +++ b/cui/source/inc/pastedlg.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 @@ -61,22 +61,22 @@ class SvPasteObjectDialog : public ModalDialog CancelButton aCancelButton1; HelpButton aHelpButton1; String aSObject; - Table aSupplementTable; - SvGlobalName aObjClassName; - String aObjName; - USHORT nAspect; - BOOL bLink; + Table aSupplementTable; + SvGlobalName aObjClassName; + String aObjName; + USHORT nAspect; + BOOL bLink; - ListBox& ObjectLB() { return aLbInsertList; } - FixedText& ObjectSource() { return aFtObjectSource; } - RadioButton& PasteLink() { return aRbPasteLink; } - CheckBox& AsIconBox() { return aCbDisplayAsIcon; } + ListBox& ObjectLB() { return aLbInsertList; } + FixedText& ObjectSource() { return aFtObjectSource; } + RadioButton& PasteLink() { return aRbPasteLink; } + CheckBox& AsIconBox() { return aCbDisplayAsIcon; } - const String& GetObjString() { return aSObject; } - void SelectObject(); + const String& GetObjString() { return aSObject; } + void SelectObject(); DECL_LINK( SelectHdl, ListBox * ); DECL_LINK( DoubleClickHdl, ListBox * ); - void SetDefault(); + void SetDefault(); USHORT GetAspect() const { return nAspect; } BOOL ShouldLink() const { return bLink; } diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx index 4648fd3a0a0c..4fda9c7699cb 100644 --- a/cui/source/inc/postdlg.hxx +++ b/cui/source/inc/postdlg.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 @@ -69,20 +69,20 @@ public: void SetNextHdl( const Link& rLink ) { aNextHdlLink = rLink; } - void EnableTravel(BOOL bNext, BOOL bPrev); - inline String GetNote() { return aEditED.GetText(); } - inline void SetNote(const String& rTxt) { aEditED.SetText(rTxt); } + void EnableTravel(BOOL bNext, BOOL bPrev); + inline String GetNote() { return aEditED.GetText(); } + inline void SetNote(const String& rTxt) { aEditED.SetText(rTxt); } - void ShowLastAuthor(const String& rAuthor, const String& rDate); - inline void DontChangeAuthor() { aAuthorBtn.Enable(FALSE); } - inline void HideAuthor() { aAuthorBtn.Hide(); } - inline void SetReadonlyPostIt(BOOL bDisable) + void ShowLastAuthor(const String& rAuthor, const String& rDate); + inline void DontChangeAuthor() { aAuthorBtn.Enable(FALSE); } + inline void HideAuthor() { aAuthorBtn.Hide(); } + inline void SetReadonlyPostIt(BOOL bDisable) { aOKBtn.Enable( !bDisable ); aEditED.SetReadOnly( bDisable ); aAuthorBtn.Enable( !bDisable ); } - inline BOOL IsOkEnabled() const { return aOKBtn.IsEnabled(); } + inline BOOL IsOkEnabled() const { return aOKBtn.IsEnabled(); } private: FixedLine aPostItFL; diff --git a/cui/source/inc/radiobtnbox.hxx b/cui/source/inc/radiobtnbox.hxx index 0a67dcf9fd95..50296e172a58 100644 --- a/cui/source/inc/radiobtnbox.hxx +++ b/cui/source/inc/radiobtnbox.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 diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index 685de4367180..a8ce19ba1cf6 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.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 @@ -46,37 +46,37 @@ #include <hash_map> -#define OBJTYPE_BASICMANAGER 1L -//#define OBJTYPE_LIB 2L -//#define OBJTYPE_MODULE 3L -#define OBJTYPE_METHOD 2L -//#define OBJTYPE_METHODINOBJ 5L -//#define OBJTYPE_OBJECT 6L -//#define OBJTYPE_SUBOBJ 7L -//#define OBJTYPE_PROPERTY 8L -#define OBJTYPE_SCRIPTCONTAINER 3L -#define OBJTYPE_SFROOT 4L - -#define BROWSEMODE_MODULES 0x01 -#define BROWSEMODE_SUBS 0x02 -#define BROWSEMODE_OBJS 0x04 -#define BROWSEMODE_PROPS 0x08 -#define BROWSEMODE_SUBOBJS 0x10 - -#define INPUTMODE_NEWLIB 1 -#define INPUTMODE_NEWMACRO 2 -#define INPUTMODE_RENAME 3 - -typedef ::std::hash_map < ::rtl::OUString, ::rtl::OUString , +#define OBJTYPE_BASICMANAGER 1L +//#define OBJTYPE_LIB 2L +//#define OBJTYPE_MODULE 3L +#define OBJTYPE_METHOD 2L +//#define OBJTYPE_METHODINOBJ 5L +//#define OBJTYPE_OBJECT 6L +//#define OBJTYPE_SUBOBJ 7L +//#define OBJTYPE_PROPERTY 8L +#define OBJTYPE_SCRIPTCONTAINER 3L +#define OBJTYPE_SFROOT 4L + +#define BROWSEMODE_MODULES 0x01 +#define BROWSEMODE_SUBS 0x02 +#define BROWSEMODE_OBJS 0x04 +#define BROWSEMODE_PROPS 0x08 +#define BROWSEMODE_SUBOBJS 0x10 + +#define INPUTMODE_NEWLIB 1 +#define INPUTMODE_NEWMACRO 2 +#define INPUTMODE_RENAME 3 + +typedef ::std::hash_map < ::rtl::OUString, ::rtl::OUString , ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > Selection_hash; class SFEntry; class SFTreeListBox : public SvTreeListBox { - friend class SvxScriptOrgDialog; + friend class SvxScriptOrgDialog; private: - USHORT nMode; + USHORT nMode; Image m_hdImage; Image m_hdImage_hc; Image m_libImage; @@ -95,33 +95,33 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, ::rtl::OUString& docName ); protected: - void ExpandTree( SvLBoxEntry* pRootEntry ); - virtual void RequestingChilds( SvLBoxEntry* pParent ); - virtual void ExpandedHdl(); - SvLBoxEntry* FindEntry( SvLBoxEntry* pParent, const String& rText, BYTE nType ); - virtual long ExpandingHdl(); - static BOOL dialogSort1( com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node1, + void ExpandTree( SvLBoxEntry* pRootEntry ); + virtual void RequestingChilds( SvLBoxEntry* pParent ); + virtual void ExpandedHdl(); + SvLBoxEntry* FindEntry( SvLBoxEntry* pParent, const String& rText, BYTE nType ); + virtual long ExpandingHdl(); + static BOOL dialogSort1( com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node1, com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node2 ); - static BOOL dialogSort2( com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node1, + static BOOL dialogSort2( com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node1, com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node2 ); public: - void Init( const ::rtl::OUString& language ); - void RequestSubEntries( SvLBoxEntry* pRootEntry, ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node, + void Init( const ::rtl::OUString& language ); + void RequestSubEntries( SvLBoxEntry* pRootEntry, ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node, ::com::sun::star::uno::Reference< com::sun::star::frame::XModel>& model ); SFTreeListBox( Window* pParent, const ResId& rRes ); ~SFTreeListBox(); - void UpdateEntries(); + void UpdateEntries(); - void ExpandAllTrees(); + void ExpandAllTrees(); SvLBoxEntry * insertEntry(String const & rText, USHORT nBitmap, SvLBoxEntry * pParent, bool bChildrenOnDemand, - std::auto_ptr< SFEntry > aUserData, + std::auto_ptr< SFEntry > aUserData, ::rtl::OUString factoryURL ); SvLBoxEntry * insertEntry(String const & rText, USHORT nBitmap, SvLBoxEntry * pParent, @@ -134,54 +134,54 @@ public: class InputDialog : public ModalDialog { private: - FixedText aText; - Edit aEdit; - OKButton aOKButton; - CancelButton aCancelButton; + FixedText aText; + Edit aEdit; + OKButton aOKButton; + CancelButton aCancelButton; public: InputDialog( Window * pParent, USHORT nMode ); ~InputDialog(); - String GetObjectName() const { return aEdit.GetText(); } - void SetObjectName( const String& rName ) { aEdit.SetText( rName ); aEdit.SetSelection( Selection( 0, rName.Len() ) );} + String GetObjectName() const { return aEdit.GetText(); } + void SetObjectName( const String& rName ) { aEdit.SetText( rName ); aEdit.SetSelection( Selection( 0, rName.Len() ) );} }; class SFEntry { private: - BYTE nType; + BYTE nType; bool loaded; - ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > nodes; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > model; + ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > nodes; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > model; SFEntry(){} public: - SFEntry( BYTE nT ) { nType = nT; loaded=false; } - SFEntry( BYTE nT, - const ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& entryNodes , + SFEntry( BYTE nT ) { nType = nT; loaded=false; } + SFEntry( BYTE nT, + const ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& entryNodes , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& entryModel) { nType = nT; nodes = entryNodes; loaded=false; model = entryModel; } SFEntry( const SFEntry& r ) { nType = r.nType; nodes = r.nodes; loaded = r.loaded; } - virtual ~SFEntry() {} + virtual ~SFEntry() {} ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > GetNode() { return nodes ;} ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetModel() { return model ;}; - BYTE GetType() const { return nType; } - bool isLoaded() const { return loaded; } - void setLoaded() { loaded=true; } + BYTE GetType() const { return nType; } + bool isLoaded() const { return loaded; } + void setLoaded() { loaded=true; } }; class SvxScriptOrgDialog : public SfxModalDialog { protected: - FixedText aScriptsTxt; - SFTreeListBox aScriptsBox; + FixedText aScriptsTxt; + SFTreeListBox aScriptsBox; - PushButton aRunButton; - CancelButton aCloseButton; - PushButton aCreateButton; - PushButton aEditButton; - PushButton aRenameButton; - PushButton aDelButton; - HelpButton aHelpButton; + PushButton aRunButton; + CancelButton aCloseButton; + PushButton aCreateButton; + PushButton aEditButton; + PushButton aRenameButton; + PushButton aDelButton; + HelpButton aHelpButton; ::rtl::OUString m_sLanguage; static Selection_hash m_lastSelection; @@ -200,22 +200,22 @@ protected: DECL_LINK( MacroDoubleClickHdl, SvTreeListBox * ); DECL_LINK( ScriptSelectHdl, SvTreeListBox * ); DECL_LINK( ButtonHdl, Button * ); - BOOL getBoolProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xProps, ::rtl::OUString& propName ); - void CheckButtons( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node ); - + BOOL getBoolProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xProps, ::rtl::OUString& propName ); + void CheckButtons( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node ); + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, ::rtl::OUString& docName ); - + void createEntry( SvLBoxEntry* pEntry ); void renameEntry( SvLBoxEntry* pEntry ); void deleteEntry( SvLBoxEntry* pEntry ); ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > - getBrowseNode( SvLBoxEntry* pEntry ); + getBrowseNode( SvLBoxEntry* pEntry ); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getModel( SvLBoxEntry* pEntry ); - void EnableButton( Button& rButton, BOOL bEnable ); + void EnableButton( Button& rButton, BOOL bEnable ); String getListOfChildren( ::com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node, int depth ); void StoreCurrentSelection(); void RestorePreviousSelection(); - //String GetInfo( SbxVariable* pVar ); + //String GetInfo( SbxVariable* pVar ); public: // prob need another arg in the ctor @@ -223,7 +223,7 @@ public: SvxScriptOrgDialog( Window* pParent, ::rtl::OUString language ); ~SvxScriptOrgDialog(); - virtual short Execute(); + virtual short Execute(); //DECL_LINK( ActivatePageHdl, TabControl * ); }; @@ -243,7 +243,7 @@ public: ~SvxScriptErrorDialog(); - short Execute(); + short Execute(); }; #endif // _SCRIPTDLG_HXX diff --git a/cui/source/inc/sdrcelldlg.hxx b/cui/source/inc/sdrcelldlg.hxx index 645a45da7d61..5a1e0166c577 100644 --- a/cui/source/inc/sdrcelldlg.hxx +++ b/cui/source/inc/sdrcelldlg.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 @@ -41,7 +41,7 @@ class SdrModel; class SvxFormatCellsDialog : public SfxTabDialog { private: - const SfxItemSet& mrOutAttrs; + const SfxItemSet& mrOutAttrs; XColorTable* mpColorTab; XGradientList* mpGradientList; diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx index 5ea0be27a980..fa1e6b840cb7 100644 --- a/cui/source/inc/selector.hxx +++ b/cui/source/inc/selector.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 @@ -41,7 +41,7 @@ #define _SVSTDARR_USHORTS #define _SVSTDARR_STRINGSDTOR -#include <svl/svstdarr.hxx> // SvUShorts +#include <svl/svstdarr.hxx> // SvUShorts #include <sfx2/minarray.hxx> #define SVX_CFGGROUP_FUNCTION 1 @@ -51,13 +51,13 @@ struct SvxGroupInfo_Impl { - USHORT nKind; - USHORT nOrd; + USHORT nKind; + USHORT nOrd; ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > xBrowseNode; ::rtl::OUString sURL; ::rtl::OUString sHelpText; - BOOL bWasOpened; + BOOL bWasOpened; SvxGroupInfo_Impl( USHORT n, USHORT nr ) :nKind( n ) @@ -104,44 +104,44 @@ public: class SvxConfigFunctionListBox_Impl : public SvTreeListBox { friend class SvxConfigGroupListBox_Impl; - Timer aTimer; - SvLBoxEntry* pCurEntry; - SvxGroupInfoArr_Impl aArr; - SvLBoxEntry* m_pDraggingEntry; + Timer aTimer; + SvLBoxEntry* pCurEntry; + SvxGroupInfoArr_Impl aArr; + SvLBoxEntry* m_pDraggingEntry; - DECL_LINK( TimerHdl, Timer* ); - virtual void MouseMove( const MouseEvent& rMEvt ); + DECL_LINK( TimerHdl, Timer* ); + virtual void MouseMove( const MouseEvent& rMEvt ); public: SvxConfigFunctionListBox_Impl( Window*, const ResId& ); ~SvxConfigFunctionListBox_Impl(); - void ClearAll(); - SvLBoxEntry* GetEntry_Impl( USHORT nId ); - SvLBoxEntry* GetEntry_Impl( const String& ); - USHORT GetId( SvLBoxEntry *pEntry ); - String GetHelpText( SvLBoxEntry *pEntry ); + void ClearAll(); + SvLBoxEntry* GetEntry_Impl( USHORT nId ); + SvLBoxEntry* GetEntry_Impl( const String& ); + USHORT GetId( SvLBoxEntry *pEntry ); + String GetHelpText( SvLBoxEntry *pEntry ); using Window::GetHelpText; - USHORT GetCurId() + USHORT GetCurId() { return GetId( FirstSelected() ); } - SvLBoxEntry* GetLastSelectedEntry(); - void FunctionSelected(); + SvLBoxEntry* GetLastSelectedEntry(); + void FunctionSelected(); // drag n drop methods - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual DragDropMode NotifyStartDrag( + virtual DragDropMode NotifyStartDrag( TransferDataContainer&, SvLBoxEntry* ); - virtual void DragFinished( sal_Int8 ); + virtual void DragFinished( sal_Int8 ); }; class SvxConfigGroupListBox_Impl : public SvTreeListBox { - SvxGroupInfoArr_Impl aArr; + SvxGroupInfoArr_Impl aArr; bool m_bShowSlots; - SvxConfigFunctionListBox_Impl* pFunctionListBox; - ImageProvider* m_pImageProvider; + SvxConfigFunctionListBox_Impl* pFunctionListBox; + ImageProvider* m_pImageProvider; ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame > m_xFrame; @@ -170,8 +170,8 @@ private: ); protected: - virtual void RequestingChilds( SvLBoxEntry *pEntry); - virtual BOOL Expand( SvLBoxEntry* pParent ); + virtual void RequestingChilds( SvLBoxEntry *pEntry); + virtual BOOL Expand( SvLBoxEntry* pParent ); using SvListView::Expand; public: @@ -184,40 +184,40 @@ public: ~SvxConfigGroupListBox_Impl(); - void Init(); - void Open( SvLBoxEntry*, BOOL ); - void ClearAll(); - void GroupSelected(); + void Init(); + void Open( SvLBoxEntry*, BOOL ); + void ClearAll(); + void GroupSelected(); - void SetFunctionListBox( SvxConfigFunctionListBox_Impl *pBox ) + void SetFunctionListBox( SvxConfigFunctionListBox_Impl *pBox ) { pFunctionListBox = pBox; } - void SetImageProvider( ImageProvider* provider ) + void SetImageProvider( ImageProvider* provider ) { m_pImageProvider = provider; } }; class SvxScriptSelectorDialog : public ModelessDialog { - FixedText aDialogDescription; - FixedText aGroupText; - SvxConfigGroupListBox_Impl aCategories; - FixedText aFunctionText; - SvxConfigFunctionListBox_Impl aCommands; - OKButton aOKButton; - CancelButton aCancelButton; - HelpButton aHelpButton; - FixedLine aDescription; - FixedText aDescriptionText; - - BOOL m_bShowSlots; - Link m_aAddHdl; + FixedText aDialogDescription; + FixedText aGroupText; + SvxConfigGroupListBox_Impl aCategories; + FixedText aFunctionText; + SvxConfigFunctionListBox_Impl aCommands; + OKButton aOKButton; + CancelButton aCancelButton; + HelpButton aHelpButton; + FixedLine aDescription; + FixedText aDescriptionText; + + BOOL m_bShowSlots; + Link m_aAddHdl; DECL_LINK( ClickHdl, Button * ); DECL_LINK( SelectHdl, Control* ); DECL_LINK( FunctionDoubleClickHdl, Control* ); - void UpdateUI(); - void ResizeControls(); + void UpdateUI(); + void ResizeControls(); public: @@ -230,18 +230,18 @@ public: ~SvxScriptSelectorDialog ( ); - void SetAddHdl( const Link& rLink ) { m_aAddHdl = rLink; } - const Link& GetAddHdl() const { return m_aAddHdl; } + void SetAddHdl( const Link& rLink ) { m_aAddHdl = rLink; } + const Link& GetAddHdl() const { return m_aAddHdl; } - void SetImageProvider( ImageProvider* provider ) + void SetImageProvider( ImageProvider* provider ) { aCategories.SetImageProvider( provider ); } - USHORT GetSelectedId(); - String GetScriptURL() const; - String GetSelectedDisplayName(); - String GetSelectedHelpText(); - void SetRunLabel(); - void SetDialogDescription(const String& rDescription); + USHORT GetSelectedId(); + String GetScriptURL() const; + String GetSelectedDisplayName(); + String GetSelectedHelpText(); + void SetRunLabel(); + void SetDialogDescription(const String& rDescription); }; #endif diff --git a/cui/source/inc/showcols.hxx b/cui/source/inc/showcols.hxx index cb0dd228daba..d65987548a8b 100644 --- a/cui/source/inc/showcols.hxx +++ b/cui/source/inc/showcols.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 @@ -39,17 +39,17 @@ #include <com/sun/star/container/XIndexContainer.hpp> //========================================================================== -// FmShowColsDialog +// FmShowColsDialog //========================================================================== class FmShowColsDialog : public ModalDialog { - ListBox m_aList; - FixedText m_aLabel; - OKButton m_aOK; - CancelButton m_aCancel; + ListBox m_aList; + FixedText m_aLabel; + OKButton m_aOK; + CancelButton m_aCancel; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > m_xColumns; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > m_xColumns; public: FmShowColsDialog( Window* pParent ); diff --git a/cui/source/inc/splitcelldlg.hxx b/cui/source/inc/splitcelldlg.hxx index e451ddba36cc..5f3ddaab2805 100644 --- a/cui/source/inc/splitcelldlg.hxx +++ b/cui/source/inc/splitcelldlg.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 @@ -38,19 +38,19 @@ class SvxSplitTableDlg : public SvxAbstractSplittTableDialog, public SvxStandardDialog { - FixedText maCountLbl; - NumericField maCountEdit; + FixedText maCountLbl; + NumericField maCountEdit; FixedLine maCountFL; - ImageRadioButton maHorzBox; + ImageRadioButton maHorzBox; ImageRadioButton maVertBox; CheckBox maPropCB; FixedLine maDirFL; - OKButton maOKBtn; - CancelButton maCancelBtn; - HelpButton maHelpBtn; + OKButton maOKBtn; + CancelButton maCancelBtn; + HelpButton maHelpBtn; - long mnMaxVertical; - long mnMaxHorizontal; + long mnMaxVertical; + long mnMaxHorizontal; protected: virtual void Apply(); diff --git a/cui/source/inc/srchxtra.hxx b/cui/source/inc/srchxtra.hxx index bbb01fe9dbf2..093183223b5e 100644 --- a/cui/source/inc/srchxtra.hxx +++ b/cui/source/inc/srchxtra.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 @@ -46,10 +46,10 @@ public: ~SvxSearchFormatDialog(); protected: - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); private: - FontList* pFontList; + FontList* pFontList; }; // class SvxSearchFormatDialog ------------------------------------------- @@ -62,13 +62,13 @@ public: private: FixedText aAttrFL; - SvxCheckListBox aAttrLB; + SvxCheckListBox aAttrLB; - OKButton aOKBtn; - CancelButton aEscBtn; - HelpButton aHelpBtn; + OKButton aOKBtn; + CancelButton aEscBtn; + HelpButton aHelpBtn; - SearchAttrItemList& rList; + SearchAttrItemList& rList; DECL_LINK( OKHdl, Button * ); }; @@ -79,29 +79,29 @@ class SvxSearchSimilarityDialog : public ModalDialog { private: FixedLine aFixedLine; - FixedText aOtherTxt; - NumericField aOtherFld; - FixedText aLongerTxt; - NumericField aLongerFld; - FixedText aShorterTxt; - NumericField aShorterFld; - CheckBox aRelaxBox; - - OKButton aOKBtn; - CancelButton aEscBtn; - HelpButton aHelpBtn; + FixedText aOtherTxt; + NumericField aOtherFld; + FixedText aLongerTxt; + NumericField aLongerFld; + FixedText aShorterTxt; + NumericField aShorterFld; + CheckBox aRelaxBox; + + OKButton aOKBtn; + CancelButton aEscBtn; + HelpButton aHelpBtn; public: - SvxSearchSimilarityDialog( Window* pParent, + SvxSearchSimilarityDialog( Window* pParent, BOOL bRelax, USHORT nOther, USHORT nShorter, USHORT nLonger ); - USHORT GetOther() { return (USHORT)aOtherFld.GetValue(); } - USHORT GetShorter() { return (USHORT)aShorterFld.GetValue(); } - USHORT GetLonger() { return (USHORT)aLongerFld.GetValue(); } - BOOL IsRelaxed() { return aRelaxBox.IsChecked(); } + USHORT GetOther() { return (USHORT)aOtherFld.GetValue(); } + USHORT GetShorter() { return (USHORT)aShorterFld.GetValue(); } + USHORT GetLonger() { return (USHORT)aLongerFld.GetValue(); } + BOOL IsRelaxed() { return aRelaxBox.IsChecked(); } }; diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx index 79d63daa8b9f..c20c3531332f 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.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 @@ -46,18 +46,18 @@ class TabWin_Impl; // define ---------------------------------------------------------------- // Bitfelder f"ur DisableControls() -//CHINA001 #define TABTYPE_LEFT 0x0001 -//CHINA001 #define TABTYPE_RIGHT 0x0002 -//CHINA001 #define TABTYPE_CENTER 0x0004 -//CHINA001 #define TABTYPE_DEZIMAL 0x0008 -//CHINA001 #define TABTYPE_ALL 0x000F -//CHINA001 -//CHINA001 #define TABFILL_NONE 0x0010 -//CHINA001 #define TABFILL_POINT 0x0020 -//CHINA001 #define TABFILL_DASHLINE 0x0040 -//CHINA001 #define TABFILL_SOLIDLINE 0x0080 -//CHINA001 #define TABFILL_SPECIAL 0x0100 -//CHINA001 #define TABFILL_ALL 0x01F0 +//CHINA001 #define TABTYPE_LEFT 0x0001 +//CHINA001 #define TABTYPE_RIGHT 0x0002 +//CHINA001 #define TABTYPE_CENTER 0x0004 +//CHINA001 #define TABTYPE_DEZIMAL 0x0008 +//CHINA001 #define TABTYPE_ALL 0x000F +//CHINA001 +//CHINA001 #define TABFILL_NONE 0x0010 +//CHINA001 #define TABFILL_POINT 0x0020 +//CHINA001 #define TABFILL_DASHLINE 0x0040 +//CHINA001 #define TABFILL_SOLIDLINE 0x0080 +//CHINA001 #define TABFILL_SPECIAL 0x0100 +//CHINA001 #define TABFILL_ALL 0x01F0 // class SvxTabulatorTabPage --------------------------------------------- /* @@ -80,64 +80,64 @@ class SvxTabulatorTabPage : public SfxTabPage public: ~SvxTabulatorTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - static USHORT* GetRanges(); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); + static USHORT* GetRanges(); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); - void DisableControls( const USHORT nFlag ); + void DisableControls( const USHORT nFlag ); protected: - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ); private: SvxTabulatorTabPage( Window* pParent, const SfxItemSet& rSet ); // Tabulatoren und Positionen - MetricBox aTabBox; + MetricBox aTabBox; FixedLine aTabLabel; FixedLine aTabLabelVert; // TabType - RadioButton aLeftTab; - RadioButton aRightTab; - RadioButton aCenterTab; - RadioButton aDezTab; - - TabWin_Impl* pLeftWin; - TabWin_Impl* pRightWin; - TabWin_Impl* pCenterWin; - TabWin_Impl* pDezWin; - - FixedText aDezCharLabel; - Edit aDezChar; + RadioButton aLeftTab; + RadioButton aRightTab; + RadioButton aCenterTab; + RadioButton aDezTab; + + TabWin_Impl* pLeftWin; + TabWin_Impl* pRightWin; + TabWin_Impl* pCenterWin; + TabWin_Impl* pDezWin; + + FixedText aDezCharLabel; + Edit aDezChar; FixedLine aTabTypeLabel; // Fuellzeichen - RadioButton aNoFillChar; - RadioButton aFillPoints; - RadioButton aFillDashLine ; - RadioButton aFillSolidLine; - RadioButton aFillSpecial; - Edit aFillChar; + RadioButton aNoFillChar; + RadioButton aFillPoints; + RadioButton aFillDashLine ; + RadioButton aFillSolidLine; + RadioButton aFillSpecial; + Edit aFillChar; FixedLine aFillLabel; // Buttons - PushButton aNewBtn; - PushButton aDelAllBtn; - PushButton aDelBtn; + PushButton aNewBtn; + PushButton aDelAllBtn; + PushButton aDelBtn; // lokale Variablen, interne Funktionen - SvxTabStop aAktTab; - SvxTabStopItem aNewTabs; - long nDefDist; - FieldUnit eDefUnit; - BOOL bCheck; + SvxTabStop aAktTab; + SvxTabStopItem aNewTabs; + long nDefDist; + FieldUnit eDefUnit; + BOOL bCheck; #ifdef _SVX_TABSTPGE_CXX - void InitTabPos_Impl( USHORT nPos = 0 ); - void SetFillAndTabType_Impl(); + void InitTabPos_Impl( USHORT nPos = 0 ); + void SetFillAndTabType_Impl(); // Handler DECL_LINK( NewHdl_Impl, Button* ); @@ -152,7 +152,7 @@ private: DECL_LINK( GetFillCharHdl_Impl, Edit* ); DECL_LINK( GetDezCharHdl_Impl, Edit* ); #endif - virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001 + virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001 }; #endif // #ifndef _SVX_TABSTPGE_HXX diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx index 427e94e26870..0c6961db7855 100644 --- a/cui/source/inc/textanim.hxx +++ b/cui/source/inc/textanim.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 @@ -48,36 +48,36 @@ class SdrView; class SvxTextAnimationPage : public SfxTabPage { private: - FixedLine aFlEffect; - FixedText aFtEffects; - ListBox aLbEffect; - //ValueSet aCtlEffect; - FixedText aFtDirection; - ImageButton aBtnUp; - ImageButton aBtnLeft; - ImageButton aBtnRight; - ImageButton aBtnDown; - - FixedLine aFlProperties; - TriStateBox aTsbStartInside; - TriStateBox aTsbStopInside; - - FixedText aFtCount; - TriStateBox aTsbEndless; - NumericField aNumFldCount; - - FixedText aFtAmount; - TriStateBox aTsbPixel; - MetricField aMtrFldAmount; - - FixedText aFtDelay; - TriStateBox aTsbAuto; - MetricField aMtrFldDelay; - - const SfxItemSet& rOutAttrs; - SdrTextAniKind eAniKind; - FieldUnit eFUnit; - SfxMapUnit eUnit; + FixedLine aFlEffect; + FixedText aFtEffects; + ListBox aLbEffect; + //ValueSet aCtlEffect; + FixedText aFtDirection; + ImageButton aBtnUp; + ImageButton aBtnLeft; + ImageButton aBtnRight; + ImageButton aBtnDown; + + FixedLine aFlProperties; + TriStateBox aTsbStartInside; + TriStateBox aTsbStopInside; + + FixedText aFtCount; + TriStateBox aTsbEndless; + NumericField aNumFldCount; + + FixedText aFtAmount; + TriStateBox aTsbPixel; + MetricField aMtrFldAmount; + + FixedText aFtDelay; + TriStateBox aTsbAuto; + MetricField aMtrFldDelay; + + const SfxItemSet& rOutAttrs; + SdrTextAniKind eAniKind; + FieldUnit eFUnit; + SfxMapUnit eUnit; #ifdef _SVX_TEXTANIM_CXX DECL_LINK( SelectEffectHdl_Impl, void * ); @@ -86,8 +86,8 @@ private: DECL_LINK( ClickPixelHdl_Impl, void * ); DECL_LINK( ClickDirectionHdl_Impl, ImageButton * ); - void SelectDirection( SdrTextAniDirection nValue ); - USHORT GetSelectedDirection(); + void SelectDirection( SdrTextAniDirection nValue ); + USHORT GetSelectedDirection(); #endif public: @@ -95,13 +95,13 @@ public: SvxTextAnimationPage( Window* pWindow, const SfxItemSet& rInAttrs ); ~SvxTextAnimationPage(); - static SfxTabPage* Create( Window*, const SfxItemSet& ); - static USHORT* GetRanges(); + static SfxTabPage* Create( Window*, const SfxItemSet& ); + static USHORT* GetRanges(); - virtual BOOL FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet & ); + virtual BOOL FillItemSet( SfxItemSet& ); + virtual void Reset( const SfxItemSet & ); - void Construct(); + void Construct(); }; /************************************************************************* @@ -112,10 +112,10 @@ public: class SvxTextTabDialog : public SfxTabDialog { private: - const SfxItemSet& rOutAttrs; - const SdrView* pView; + const SfxItemSet& rOutAttrs; + const SdrView* pView; - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); public: diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx index 258477dc5a5e..a8314998b0ca 100644 --- a/cui/source/inc/textattr.hxx +++ b/cui/source/inc/textattr.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 @@ -48,36 +48,36 @@ class SdrView; class SvxTextAttrPage : public SvxTabPage { private: - FixedLine aFlText; + FixedLine aFlText; TriStateBox aTsbAutoGrowWidth; TriStateBox aTsbAutoGrowHeight; - TriStateBox aTsbFitToSize; - TriStateBox aTsbContour; + TriStateBox aTsbFitToSize; + TriStateBox aTsbContour; TriStateBox aTsbWordWrapText; TriStateBox aTsbAutoGrowSize; - FixedLine aFlDistance; - FixedText aFtLeft; - MetricField aMtrFldLeft; - FixedText aFtRight; - MetricField aMtrFldRight; - FixedText aFtTop; - MetricField aMtrFldTop; - FixedText aFtBottom; - MetricField aMtrFldBottom; + FixedLine aFlDistance; + FixedText aFtLeft; + MetricField aMtrFldLeft; + FixedText aFtRight; + MetricField aMtrFldRight; + FixedText aFtTop; + MetricField aMtrFldTop; + FixedText aFtBottom; + MetricField aMtrFldBottom; - FixedLine aFlSeparator; + FixedLine aFlSeparator; - FixedLine aFlPosition; - SvxRectCtl aCtlPosition; - TriStateBox aTsbFullWidth; + FixedLine aFlPosition; + SvxRectCtl aCtlPosition; + TriStateBox aTsbFullWidth; - const SfxItemSet& rOutAttrs; - const SdrView* pView; + const SfxItemSet& rOutAttrs; + const SdrView* pView; - BOOL bAutoGrowSizeEnabled; - BOOL bContourEnabled; + BOOL bAutoGrowSizeEnabled; + BOOL bContourEnabled; BOOL bAutoGrowWidthEnabled; BOOL bAutoGrowHeightEnabled; BOOL bWordWrapTextEnabled; @@ -98,16 +98,16 @@ public: SvxTextAttrPage( Window* pWindow, const SfxItemSet& rInAttrs ); ~SvxTextAttrPage(); - static SfxTabPage* Create( Window*, const SfxItemSet& ); - static USHORT* GetRanges(); + static SfxTabPage* Create( Window*, const SfxItemSet& ); + static USHORT* GetRanges(); - virtual BOOL FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet & ); + virtual BOOL FillItemSet( SfxItemSet& ); + virtual void Reset( const SfxItemSet & ); - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ); + virtual void PointChanged( Window* pWindow, RECT_POINT eRP ); - void Construct(); - void SetView( const SdrView* pSdrView ) { pView = pSdrView; } + void Construct(); + void SetView( const SdrView* pSdrView ) { pView = pSdrView; } virtual void PageCreated(SfxAllItemSet aSet); }; diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx index 8a3dc22d1715..6ea7bc591abc 100644 --- a/cui/source/inc/thesdlg.hxx +++ b/cui/source/inc/thesdlg.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 diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index 8c427bef17d1..6083a0d56928 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.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 @@ -57,12 +57,12 @@ const USHORT SVX_OBJ_NOPROTECT = 0x0200; class SvxTransformTabDialog : public SfxTabDialog { private: - const SdrView* pView; + const SdrView* pView; - USHORT nAnchorCtrls; + USHORT nAnchorCtrls; Link aValidateLink; - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); public: @@ -70,8 +70,8 @@ public: const SdrView* pView, USHORT nAnchorTypes = 0); ~SvxTransformTabDialog(); - - //link for the Writer to validate positions + + //link for the Writer to validate positions void SetValidateFramePosLink( const Link& rLink ); }; @@ -88,60 +88,60 @@ class SvxPositionSizeTabPage : public SvxTabPage private: // position - FixedLine maFlPosition; - FixedText maFtPosX; - MetricField maMtrPosX; - FixedText maFtPosY; - MetricField maMtrPosY; - FixedText maFtPosReference; - SvxRectCtl maCtlPos; + FixedLine maFlPosition; + FixedText maFtPosX; + MetricField maMtrPosX; + FixedText maFtPosY; + MetricField maMtrPosY; + FixedText maFtPosReference; + SvxRectCtl maCtlPos; // size - FixedLine maFlSize; - FixedText maFtWidth; - MetricField maMtrWidth; - FixedText maFtHeight; - MetricField maMtrHeight; - CheckBox maCbxScale; - FixedText maFtSizeReference; - SvxRectCtl maCtlSize; + FixedLine maFlSize; + FixedText maFtWidth; + MetricField maMtrWidth; + FixedText maFtHeight; + MetricField maMtrHeight; + CheckBox maCbxScale; + FixedText maFtSizeReference; + SvxRectCtl maCtlSize; // protect - FixedLine maFlProtect; - TriStateBox maTsbPosProtect; - TriStateBox maTsbSizeProtect; + FixedLine maFlProtect; + TriStateBox maTsbPosProtect; + TriStateBox maTsbSizeProtect; // adjust - FixedLine maFlAdjust; + FixedLine maFlAdjust; TriStateBox maTsbAutoGrowWidth; TriStateBox maTsbAutoGrowHeight; - FixedLine maFlDivider; + FixedLine maFlDivider; private: - const SfxItemSet& mrOutAttrs; + const SfxItemSet& mrOutAttrs; - const SdrView* mpView; + const SdrView* mpView; // #i75273# - basegfx::B2DRange maRange; - basegfx::B2DRange maWorkRange; - basegfx::B2DPoint maAnchor; - - SfxMapUnit mePoolUnit; - FieldUnit meDlgUnit; - MapUnit meMapUnit; - TriState mnProtectSizeState; - bool mbPageDisabled; - bool mbProtectDisabled; - bool mbSizeDisabled; - bool mbAdjustDisabled; + basegfx::B2DRange maRange; + basegfx::B2DRange maWorkRange; + basegfx::B2DPoint maAnchor; + + SfxMapUnit mePoolUnit; + FieldUnit meDlgUnit; + MapUnit meMapUnit; + TriState mnProtectSizeState; + bool mbPageDisabled; + bool mbProtectDisabled; + bool mbSizeDisabled; + bool mbAdjustDisabled; // frome size // #i75273# - double mfOldWidth; - double mfOldHeight; - RECT_POINT meRP; + double mfOldWidth; + double mfOldHeight; + RECT_POINT meRP; //------------------------------------ #if _SOLAR__PRIVATE @@ -162,15 +162,15 @@ private: DECL_LINK( ClickSizeProtectHdl, void * ); DECL_LINK( ClickAutoHdl, void * ); - void SetMaxSize( Rectangle aRect ); - Rectangle GetRect(); + void SetMaxSize( Rectangle aRect ); + Rectangle GetRect(); #endif public: SvxPositionSizeTabPage( Window* pParent, const SfxItemSet& rInAttrs ); static SfxTabPage* Create( Window*, const SfxItemSet& ); - static USHORT* GetRanges(); + static USHORT* GetRanges(); virtual BOOL FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); @@ -180,16 +180,16 @@ public: virtual void PointChanged( Window* pWindow, RECT_POINT eRP ); - void Construct(); - void SetView( const SdrView* pSdrView ) { mpView = pSdrView; } + void Construct(); + void SetView( const SdrView* pSdrView ) { mpView = pSdrView; } // void ShowAnchorCtrls(USHORT nAnchorCtrls); // Writer-spezifische Controls anzeigen virtual void FillUserData(); - void DisableResize(); - void DisableProtect(); + void DisableResize(); + void DisableProtect(); - void UpdateControlStates(); + void UpdateControlStates(); }; /************************************************************************* @@ -203,30 +203,30 @@ class SvxAngleTabPage : public SvxTabPage using TabPage::DeactivatePage; private: - FixedLine aFlPosition; - FixedText aFtPosX; - MetricField aMtrPosX; - FixedText aFtPosY; - MetricField aMtrPosY; - FixedText aFtPosPresets; - SvxRectCtl aCtlRect; - - FixedLine aFlAngle; - FixedText aFtAngle; - MetricField aMtrAngle; - FixedText aFtAnglePresets; - SvxRectCtl aCtlAngle; - - const SfxItemSet& rOutAttrs; - const SdrView* pView; + FixedLine aFlPosition; + FixedText aFtPosX; + MetricField aMtrPosX; + FixedText aFtPosY; + MetricField aMtrPosY; + FixedText aFtPosPresets; + SvxRectCtl aCtlRect; + + FixedLine aFlAngle; + FixedText aFtAngle; + MetricField aMtrAngle; + FixedText aFtAnglePresets; + SvxRectCtl aCtlAngle; + + const SfxItemSet& rOutAttrs; + const SdrView* pView; // #i75273# - basegfx::B2DRange maRange; - basegfx::B2DPoint maAnchor; + basegfx::B2DRange maRange; + basegfx::B2DPoint maAnchor; - SfxMapUnit ePoolUnit; - FieldUnit eDlgUnit; - MapUnit eMapUnit; + SfxMapUnit ePoolUnit; + FieldUnit eDlgUnit; + MapUnit eMapUnit; //------------------------------------ #if _SOLAR__PRIVATE DECL_LINK( ModifiedHdl, void * ); @@ -235,7 +235,7 @@ public: SvxAngleTabPage( Window* pParent, const SfxItemSet& rInAttrs ); static SfxTabPage* Create( Window*, const SfxItemSet& ); - static USHORT* GetRanges(); + static USHORT* GetRanges(); virtual BOOL FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); @@ -245,8 +245,8 @@ public: virtual void PointChanged( Window* pWindow, RECT_POINT eRP ); - void Construct(); - void SetView( const SdrView* pSdrView ) { pView = pSdrView; } + void Construct(); + void SetView( const SdrView* pSdrView ) { pView = pSdrView; } }; /************************************************************************* @@ -260,31 +260,31 @@ class SvxSlantTabPage : public SvxTabPage using TabPage::DeactivatePage; private: - FixedLine aFlRadius; - FixedText aFtRadius; - MetricField aMtrRadius; - //TriStateBox aTsbVertical; - FixedLine aFlAngle; - FixedText aFtAngle; - MetricField aMtrAngle; - //SvxRectCtl aCtlAngle; + FixedLine aFlRadius; + FixedText aFtRadius; + MetricField aMtrRadius; + //TriStateBox aTsbVertical; + FixedLine aFlAngle; + FixedText aFtAngle; + MetricField aMtrAngle; + //SvxRectCtl aCtlAngle; - const SfxItemSet& rOutAttrs; + const SfxItemSet& rOutAttrs; - const SdrView* pView; + const SdrView* pView; // #i75273# - basegfx::B2DRange maRange; + basegfx::B2DRange maRange; - SfxMapUnit ePoolUnit; - FieldUnit eDlgUnit; - MapUnit eMapUnit; + SfxMapUnit ePoolUnit; + FieldUnit eDlgUnit; + MapUnit eMapUnit; //------------------------------------ public: SvxSlantTabPage( Window* pParent, const SfxItemSet& rInAttrs ); static SfxTabPage* Create( Window*, const SfxItemSet& ); - static USHORT* GetRanges(); + static USHORT* GetRanges(); virtual BOOL FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); @@ -294,8 +294,8 @@ public: virtual void PointChanged( Window* pWindow, RECT_POINT eRP ); - void Construct(); - void SetView( const SdrView* pSdrView ) { pView = pSdrView; } + void Construct(); + void SetView( const SdrView* pSdrView ) { pView = pSdrView; } }; diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index 35f51d7b0183..27c13d5fdba4 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.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 @@ -54,14 +54,14 @@ class OfaOptionsTreeListBox : public SvTreeListBox using SvListView::Collapse; private: - BOOL bInCollapse; + BOOL bInCollapse; public: OfaOptionsTreeListBox(Window* pParent, const ResId& rResId) : SvTreeListBox( pParent, rResId ), bInCollapse(FALSE) {} virtual BOOL Collapse( SvLBoxEntry* pParent ); - BOOL IsInCollapse()const {return bInCollapse;} + BOOL IsInCollapse()const {return bInCollapse;} }; // struct OrderedEntry --------------------------------------------------- @@ -177,40 +177,40 @@ typedef std::vector< ExtensionsTabPage* > VectorOfPages; class OfaTreeOptionsDialog : public SfxModalDialog { private: - OKButton aOkPB; + OKButton aOkPB; CancelButton aCancelPB; - HelpButton aHelpPB; - PushButton aBackPB; + HelpButton aHelpPB; + PushButton aBackPB; - FixedBorder aHiddenGB; - FixedText aPageTitleFT; - FixedLine aLine1FL; - FixedText aHelpFT; - FixedImage aHelpImg; + FixedBorder aHiddenGB; + FixedText aPageTitleFT; + FixedLine aLine1FL; + FixedText aHelpFT; + FixedImage aHelpImg; ImageList aPageImages; ImageList aPageImagesHC; - ResStringArray aHelpTextsArr; + ResStringArray aHelpTextsArr; - OfaOptionsTreeListBox aTreeLB; + OfaOptionsTreeListBox aTreeLB; - String sTitle; - String sNotLoadedError; + String sTitle; + String sNotLoadedError; SvLBoxEntry* pCurrentPageEntry; // for the ColorTabPage - SfxItemSet* pColorPageItemSet; - XColorTable* pColorTab; - USHORT nChangeType; - USHORT nUnknownType; - USHORT nUnknownPos; - BOOL bIsAreaTP; - - BOOL bForgetSelection; - BOOL bExternBrowserActive; - BOOL bImageResized; + SfxItemSet* pColorPageItemSet; + XColorTable* pColorTab; + USHORT nChangeType; + USHORT nUnknownType; + USHORT nUnknownPos; + BOOL bIsAreaTP; + + BOOL bForgetSelection; + BOOL bExternBrowserActive; + BOOL bImageResized; bool bInSelectHdl_Impl; bool bIsFromExtensionManager; @@ -224,11 +224,11 @@ private: static LastPageSaver* pLastPageSaver; - SfxItemSet* CreateItemSet( USHORT nId ); - void ApplyItemSet( USHORT nId, const SfxItemSet& rSet ); + SfxItemSet* CreateItemSet( USHORT nId ); + void ApplyItemSet( USHORT nId, const SfxItemSet& rSet ); void InitTreeAndHandler(); void Initialize( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& _xFrame ); - void ResizeTreeLB( void ); // resizes dialog so that treelistbox has no horizontal scroll bar + void ResizeTreeLB( void ); // resizes dialog so that treelistbox has no horizontal scroll bar void LoadExtensionOptions( const rtl::OUString& rExtensionId ); rtl::OUString GetModuleIdentifier( const com::sun::star::uno::Reference< @@ -284,34 +284,34 @@ public: class OfaPageResource : public Resource { - ResStringArray aGeneralDlgAry; - ResStringArray aInetDlgAry; + ResStringArray aGeneralDlgAry; + ResStringArray aInetDlgAry; ResStringArray aLangDlgAry; ResStringArray aTextDlgAry; - ResStringArray aHTMLDlgAry; - ResStringArray aCalcDlgAry; - ResStringArray aStarMathDlgAry; - ResStringArray aImpressDlgAry; - ResStringArray aDrawDlgAry; - ResStringArray aChartDlgAry; - ResStringArray aFilterDlgAry; - ResStringArray aDatasourcesDlgAry; + ResStringArray aHTMLDlgAry; + ResStringArray aCalcDlgAry; + ResStringArray aStarMathDlgAry; + ResStringArray aImpressDlgAry; + ResStringArray aDrawDlgAry; + ResStringArray aChartDlgAry; + ResStringArray aFilterDlgAry; + ResStringArray aDatasourcesDlgAry; public: OfaPageResource(); - ResStringArray& GetGeneralArray() {return aGeneralDlgAry;} - ResStringArray& GetInetArray() {return aInetDlgAry;} - ResStringArray& GetLangArray() {return aLangDlgAry;} - ResStringArray& GetTextArray() {return aTextDlgAry;} - ResStringArray& GetHTMLArray() {return aHTMLDlgAry;} - ResStringArray& GetCalcArray() {return aCalcDlgAry;} - ResStringArray& GetStarMathArray() {return aStarMathDlgAry;} - ResStringArray& GetImpressArray() {return aImpressDlgAry;} - ResStringArray& GetDrawArray() {return aDrawDlgAry;} - ResStringArray& GetChartArray() {return aChartDlgAry;} - ResStringArray& GetFilterArray() {return aFilterDlgAry;} - ResStringArray& GetDatasourcesArray() {return aDatasourcesDlgAry;} + ResStringArray& GetGeneralArray() {return aGeneralDlgAry;} + ResStringArray& GetInetArray() {return aInetDlgAry;} + ResStringArray& GetLangArray() {return aLangDlgAry;} + ResStringArray& GetTextArray() {return aTextDlgAry;} + ResStringArray& GetHTMLArray() {return aHTMLDlgAry;} + ResStringArray& GetCalcArray() {return aCalcDlgAry;} + ResStringArray& GetStarMathArray() {return aStarMathDlgAry;} + ResStringArray& GetImpressArray() {return aImpressDlgAry;} + ResStringArray& GetDrawArray() {return aDrawDlgAry;} + ResStringArray& GetChartArray() {return aChartDlgAry;} + ResStringArray& GetFilterArray() {return aFilterDlgAry;} + ResStringArray& GetDatasourcesArray() {return aDatasourcesDlgAry;} }; // class ExtensionsTabPage ----------------------------------------------- diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx index 87fbb8a2f74d..88d3d44793ae 100644 --- a/cui/source/inc/zoom.hxx +++ b/cui/source/inc/zoom.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 @@ -44,10 +44,10 @@ private: FixedLine aZoomFl; RadioButton aOptimalBtn; RadioButton aWholePageBtn; - RadioButton aPageWidthBtn; + RadioButton aPageWidthBtn; RadioButton a100Btn; RadioButton aUserBtn; - MetricField aUserEdit; + MetricField aUserEdit; FixedLine aViewLayoutFl; RadioButton aAutomaticBtn; @@ -58,12 +58,12 @@ private: FixedLine aBottomFl; OKButton aOKBtn; - CancelButton aCancelBtn; - HelpButton aHelpBtn; + CancelButton aCancelBtn; + HelpButton aHelpBtn; - const SfxItemSet& rSet; - SfxItemSet* pOutSet; - BOOL bModified; + const SfxItemSet& rSet; + SfxItemSet* pOutSet; + BOOL bModified; #ifdef _SVX_ZOOM_CXX DECL_LINK( UserHdl, RadioButton* ); @@ -78,16 +78,16 @@ public: SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ); ~SvxZoomDialog(); - static USHORT* GetRanges(); - const SfxItemSet* GetOutputItemSet() const { return pOutSet; } + static USHORT* GetRanges(); + const SfxItemSet* GetOutputItemSet() const { return pOutSet; } - USHORT GetFactor() const; - void SetFactor( USHORT nNewFactor, USHORT nBtnId = 0 ); + USHORT GetFactor() const; + void SetFactor( USHORT nNewFactor, USHORT nBtnId = 0 ); - void SetButtonText( USHORT nBtnId, const String& aNewTxt ); - void HideButton( USHORT nBtnId ); - void SetLimits( USHORT nMin, USHORT nMax ); - void SetSpinSize( USHORT nNewSpin ); + void SetButtonText( USHORT nBtnId, const String& aNewTxt ); + void HideButton( USHORT nBtnId ); + void SetLimits( USHORT nMin, USHORT nMax ); + void SetSpinSize( USHORT nNewSpin ); }; #include <layout/layout-post.hxx> |