diff options
Diffstat (limited to 'cui/source/dialogs')
89 files changed, 1463 insertions, 1463 deletions
diff --git a/cui/source/dialogs/SpellAttrib.cxx b/cui/source/dialogs/SpellAttrib.cxx index c4c55b9ebe1b..61f8f82a9547 100644 --- a/cui/source/dialogs/SpellAttrib.cxx +++ b/cui/source/dialogs/SpellAttrib.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,7 +79,7 @@ TextAttrib* SpellErrorAttrib::Clone() const -----------------------------------------------------------------------*/ int SpellErrorAttrib::operator==( const TextAttrib& rAttr ) const { - return Which() == rAttr.Which() && + return Which() == rAttr.Which() && m_aSpellErrorDescription == static_cast<const SpellErrorAttrib&>(rAttr).m_aSpellErrorDescription; } /*-- 10.09.2003 14:27:43--------------------------------------------------- @@ -123,13 +123,13 @@ TextAttrib* SpellLanguageAttrib::Clone() const -----------------------------------------------------------------------*/ int SpellLanguageAttrib::operator==( const TextAttrib& rAttr ) const { - return Which() == rAttr.Which() && + return Which() == rAttr.Which() && m_eLanguage == static_cast<const SpellLanguageAttrib&>(rAttr).m_eLanguage; } /*-- 31.10.2003 16:07:45--------------------------------------------------- -----------------------------------------------------------------------*/ -SpellBackgroundAttrib::SpellBackgroundAttrib(const Color& rCol) : +SpellBackgroundAttrib::SpellBackgroundAttrib(const Color& rCol) : TextAttrib(TEXTATTR_SPELL_BACKGROUND), m_aBackgroundColor(rCol) { @@ -167,7 +167,7 @@ TextAttrib* SpellBackgroundAttrib::Clone() const -----------------------------------------------------------------------*/ int SpellBackgroundAttrib::operator==( const TextAttrib& rAttr ) const { - return Which() == rAttr.Which() && + return Which() == rAttr.Which() && m_aBackgroundColor == static_cast<const SpellBackgroundAttrib&>(rAttr).m_aBackgroundColor; } diff --git a/cui/source/dialogs/SpellAttrib.hxx b/cui/source/dialogs/SpellAttrib.hxx index 72e69270239a..29bd5265c667 100644 --- a/cui/source/dialogs/SpellAttrib.hxx +++ b/cui/source/dialogs/SpellAttrib.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 <tools/color.hxx> //namespace com{ namespace sun{ namespace star{ namespace linguistic2{ // class XSpellAlternatives; -//}}}} +//}}}} #define TEXTATTR_SPELL_ERROR (TEXTATTR_USER_START + 1) #define TEXTATTR_SPELL_LANGUAGE (TEXTATTR_USER_START + 2) @@ -58,8 +58,8 @@ struct SpellErrorDescription SpellErrorDescription() : bIsGrammarError( false ){} - - SpellErrorDescription( bool bGrammar, + + SpellErrorDescription( bool bGrammar, const ::rtl::OUString& rText, const ::com::sun::star::lang::Locale& rLocale, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rSuggestions, @@ -75,7 +75,7 @@ struct SpellErrorDescription sServiceName( rServiceName ), aSuggestions( rSuggestions ) { - if( pDialogTitle ) + if( pDialogTitle ) sDialogTitle = *pDialogTitle; if( pExplanation ) sExplanation = *pExplanation; @@ -85,16 +85,16 @@ struct SpellErrorDescription int operator==( const SpellErrorDescription& rDesc ) const { - return bIsGrammarError == rDesc.bIsGrammarError && - sErrorText.equals( rDesc.sErrorText ) && + return bIsGrammarError == rDesc.bIsGrammarError && + sErrorText.equals( rDesc.sErrorText ) && aLocale.Language.equals( rDesc.aLocale.Language ) && aLocale.Country.equals( rDesc.aLocale.Country ) && aLocale.Variant.equals( rDesc.aLocale.Variant ) && - aSuggestions == rDesc.aSuggestions && + aSuggestions == rDesc.aSuggestions && xGrammarChecker == rDesc.xGrammarChecker && sDialogTitle.equals( rDesc.sDialogTitle ) && - sExplanation.equals( rDesc.sExplanation ) && - sRuleId == rDesc.sRuleId; + sExplanation.equals( rDesc.sExplanation ) && + sRuleId == rDesc.sRuleId; } }; /* -----------------10.09.2003 14:23----------------- @@ -104,10 +104,10 @@ class SpellErrorAttrib : public TextAttrib { public: -private: +private: //com::sun::star::uno::Reference<com::sun::star::linguistic2::XSpellAlternatives> m_xAlternatives; SpellErrorDescription m_aSpellErrorDescription; - + //not accessible SpellErrorAttrib(); public: @@ -118,7 +118,7 @@ public: const SpellErrorDescription& GetErrorDescription() const { return m_aSpellErrorDescription; } - + virtual void SetFont( Font& rFont ) const; virtual TextAttrib* Clone() const; virtual int operator==( const TextAttrib& rAttr ) const; @@ -139,10 +139,10 @@ public: ~SpellLanguageAttrib(); LanguageType GetLanguage() const {return m_eLanguage;} - void SetLanguage(LanguageType eLang) + void SetLanguage(LanguageType eLang) {m_eLanguage = eLang;} - - + + virtual void SetFont( Font& rFont ) const; virtual TextAttrib* Clone() const; virtual int operator==( const TextAttrib& rAttr ) const; @@ -164,8 +164,8 @@ public: const Color& GetColor() const { return m_aBackgroundColor;} void SetColor( const Color& rNewCol ){m_aBackgroundColor = rNewCol;} - - + + virtual void SetFont( Font& rFont ) const; virtual TextAttrib* Clone() const; virtual int operator==( const TextAttrib& rAttr ) const; diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 304407cdba07..e93307901f26 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,12 +77,12 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::linguistic2; -#define C2U(cChar) ::rtl::OUString::createFromAscii(cChar) +#define C2U(cChar) ::rtl::OUString::createFromAscii(cChar) // struct SpellDialog_Impl --------------------------------------------- struct SpellDialog_Impl { - Sequence< Reference< XDictionary > > aDics; + Sequence< Reference< XDictionary > > aDics; }; // ----------------------------------------------------------------------- //#define VENDOR_IMAGE_HEIGHT 44 //as specified @@ -329,7 +329,7 @@ void SpellDialog::UpdateBoxes_Impl() LanguageType nAltLanguage = LANGUAGE_NONE; //String aAltWord; - Sequence< ::rtl::OUString > aNewWords; + Sequence< ::rtl::OUString > aNewWords; bool bIsGrammarError = false; if( pSpellErrorDescription ) { @@ -861,7 +861,7 @@ IMPL_LINK(SpellDialog, LanguageSelectHdl, SvxLanguageBox*, pBox) void SpellDialog::SetLanguage( sal_uInt16 nLang ) -/* [Beschreibung] +/* [Beschreibung] wenn die Sprache im Thesaurus umgestellt wurde, muss auch hier die Sprache umgestellt werden. @@ -899,7 +899,7 @@ void SpellDialog::SetTitle_Impl(LanguageType nLang) if( pSpellErrorDescription && pSpellErrorDescription->sServiceName.getLength() ) { bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - ::rtl::OUString sSuggestionImageUrl = + ::rtl::OUString sSuggestionImageUrl = SvtLinguConfig().GetSpellAndGrammarDialogImage( pSpellErrorDescription->sServiceName, bHighContrast ); aVendorImageFI.SetImage( lcl_GetImageFromPngUrl( sSuggestionImageUrl ) ); uno::Reference< lang::XServiceDisplayName > xDisplayName( pSpellErrorDescription->xGrammarChecker, uno::UNO_QUERY ); @@ -908,7 +908,7 @@ void SpellDialog::SetTitle_Impl(LanguageType nLang) } else { - bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); + bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); aVendorImageFI.SetImage( bHighContrast ? aVendorImageHC : aVendorImage ); } @@ -1159,7 +1159,7 @@ bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck) bool bRet = false; if(!bUseSavedSentence /*&& aSentenceED.IsModified()*/) { - //apply changes and ignored text parts + //apply changes and ignored text parts rParent.ApplyChangedSentence(aSentenceED.CreateSpellPortions(true), bRecheck); } aSentenceED.ResetIgnoreErrorsAt(); @@ -1845,15 +1845,15 @@ void SentenceEditWindow_Impl::SetAlternatives( Reference< XSpellAlternatives> xA DBG_ASSERT(static_cast<const SpellErrorAttrib*>( GetTextEngine()->FindAttrib( aCursor, TEXTATTR_SPELL_ERROR)), "no error set?"); - ::rtl::OUString aWord; - lang::Locale aLocale; - uno::Sequence< ::rtl::OUString > aAlts; + ::rtl::OUString aWord; + lang::Locale aLocale; + uno::Sequence< ::rtl::OUString > aAlts; ::rtl::OUString sServiceName; if (xAlt.is()) { - aWord = xAlt->getWord(); - aLocale = xAlt->getLocale(); - aAlts = xAlt->getAlternatives(); + aWord = xAlt->getWord(); + aLocale = xAlt->getLocale(); + aAlts = xAlt->getAlternatives(); uno::Reference< container::XNamed > xNamed( xAlt, uno::UNO_QUERY ); if (xNamed.is()) sServiceName = xNamed->getName(); @@ -2002,18 +2002,18 @@ svx::SpellPortions SentenceEditWindow_Impl::CreateSpellPortions( bool bSetIgnore String aLeftOverText; for (ULONG i = 1; i < nPara; ++i) { - aLeftOverText.AppendAscii( "\x0a" ); // the manual line break... + aLeftOverText.AppendAscii( "\x0a" ); // the manual line break... aLeftOverText += pTextEngine->GetText(i); } if (pError) - { // we need to add a new portion containing the left-over text + { // we need to add a new portion containing the left-over text svx::SpellPortion aPortion2; aPortion2.eLanguage = eLang; aPortion2.sText = aLeftOverText; aRet.push_back( aPortion2 ); } else - { // we just need to append the left-over text to the last portion (which had no errors) + { // we just need to append the left-over text to the last portion (which had no errors) aRet[ aRet.size() - 1 ].sText += aLeftOverText; } } diff --git a/cui/source/dialogs/SpellDialog.hrc b/cui/source/dialogs/SpellDialog.hrc index 5c9a82ffef0e..8cac9b8b3cc3 100644 --- a/cui/source/dialogs/SpellDialog.hrc +++ b/cui/source/dialogs/SpellDialog.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/SpellDialog.src b/cui/source/dialogs/SpellDialog.src index 5a97025f02af..b91bea09861f 100644 --- a/cui/source/dialogs/SpellDialog.src +++ b/cui/source/dialogs/SpellDialog.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK Size = MAP_APPFONT ( 270, 21 ) ; Hide = TRUE; }; - + FixedText FT_LANGUAGE { Pos = MAP_APPFONT( 6, 8 ); diff --git a/cui/source/dialogs/charmap.hrc b/cui/source/dialogs/charmap.hrc index 0b3aa3e09b49..644ea47b3a2b 100644 --- a/cui/source/dialogs/charmap.hrc +++ b/cui/source/dialogs/charmap.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,23 +29,23 @@ // defines ------------------------------------------------------------------ -#define CT_SHOWSET 10 -#define FT_FONT 11 -#define LB_FONT 12 -#define CT_SHOWTEXT 13 -#define FT_SYMBOLE 14 -#define CT_SHOWCHAR 15 -#define FT_CHARCODE 16 -#define BTN_CHAR_OK 17 -#define BTN_CHAR_CANCEL 18 -#define BTN_CHAR_HELP 19 -#define BTN_DELETE 20 -#define FT_SUBSET 30 -#define LB_SUBSET 31 -#define ED_SHORTCUT 32 -#define BT_ASSIGN 33 -#define FT_ASSIGN 34 -#define CT_ASSIGN 35 +#define CT_SHOWSET 10 +#define FT_FONT 11 +#define LB_FONT 12 +#define CT_SHOWTEXT 13 +#define FT_SYMBOLE 14 +#define CT_SHOWCHAR 15 +#define FT_CHARCODE 16 +#define BTN_CHAR_OK 17 +#define BTN_CHAR_CANCEL 18 +#define BTN_CHAR_HELP 19 +#define BTN_DELETE 20 +#define FT_SUBSET 30 +#define LB_SUBSET 31 +#define ED_SHORTCUT 32 +#define BT_ASSIGN 33 +#define FT_ASSIGN 34 +#define CT_ASSIGN 35 #endif diff --git a/cui/source/dialogs/charmap.src b/cui/source/dialogs/charmap.src index 02e2e728f412..835ab608aa87 100644 --- a/cui/source/dialogs/charmap.src +++ b/cui/source/dialogs/charmap.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ ModalDialog RID_SVXDLG_CHARMAP HelpId = SID_CHARMAP ; SvLook = TRUE ; Text [ en-US ] = "Special Characters"; -/* Size = MAP_APPFONT ( 297 , 169 ) ; */ +/* Size = MAP_APPFONT ( 297 , 169 ) ; */ Size = MAP_APPFONT ( 297 , 153 ) ; OutputSize = TRUE ; Moveable = TRUE ; @@ -92,7 +92,7 @@ ModalDialog RID_SVXDLG_CHARMAP { HelpId = HID_CHARMAP_CTL_SHOWTEXT ; Pos = MAP_APPFONT ( 46 , 137 ) ; -/* Size = MAP_APPFONT ( 190 , 16 ) ; */ +/* Size = MAP_APPFONT ( 190 , 16 ) ; */ Size = MAP_APPFONT ( 244 , 16 ) ; Group = TRUE ; }; @@ -134,7 +134,7 @@ ModalDialog RID_SVXDLG_CHARMAP Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Delete"; }; -/* +/* PushButton BT_ASSIGN { Pos = MAP_APPFONT ( 242 , 140 ) ; @@ -153,7 +153,7 @@ ModalDialog RID_SVXDLG_CHARMAP Pos = MAP_APPFONT ( 60 , 156 ) ; Size = MAP_APPFONT ( 160 , 8 ) ; }; -*/ +*/ }; // ********************************************************************** EOF diff --git a/cui/source/dialogs/commonlingui.cxx b/cui/source/dialogs/commonlingui.cxx index 9b23a1386963..949b62f558c2 100644 --- a/cui/source/dialogs/commonlingui.cxx +++ b/cui/source/dialogs/commonlingui.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -90,17 +90,17 @@ __EXPORT SvxClickInfoCtr::~SvxClickInfoCtr() //----------------------------------------------------------------------------- SvxCommonLinguisticControl::SvxCommonLinguisticControl( ModalDialog* _pParent ) :Window( _pParent, CUI_RES( RID_SVX_WND_COMMON_LINGU ) ) - ,aWordText ( this, CUI_RES( FT_WORD ) ) - ,aAktWord ( this, CUI_RES( FT_AKTWORD ) ) - ,aNewWord ( this, CUI_RES( FT_NEWWORD ) ) - ,aNewWordED ( this, CUI_RES( ED_NEWWORD ) ) - ,aSuggestionFT ( this, CUI_RES( FT_SUGGESTION ) ) + ,aWordText ( this, CUI_RES( FT_WORD ) ) + ,aAktWord ( this, CUI_RES( FT_AKTWORD ) ) + ,aNewWord ( this, CUI_RES( FT_NEWWORD ) ) + ,aNewWordED ( this, CUI_RES( ED_NEWWORD ) ) + ,aSuggestionFT ( this, CUI_RES( FT_SUGGESTION ) ) ,aIgnoreBtn ( this, CUI_RES( BTN_IGNORE ) ) - ,aIgnoreAllBtn ( this, CUI_RES( BTN_IGNOREALL ) ) - ,aChangeBtn ( this, CUI_RES( BTN_CHANGE ) ) - ,aChangeAllBtn ( this, CUI_RES( BTN_CHANGEALL ) ) - ,aOptionsBtn ( this, CUI_RES( BTN_OPTIONS ) ) - ,aStatusText ( this, CUI_RES( FT_STATUS ) ) + ,aIgnoreAllBtn ( this, CUI_RES( BTN_IGNOREALL ) ) + ,aChangeBtn ( this, CUI_RES( BTN_CHANGE ) ) + ,aChangeAllBtn ( this, CUI_RES( BTN_CHANGEALL ) ) + ,aOptionsBtn ( this, CUI_RES( BTN_OPTIONS ) ) + ,aStatusText ( this, CUI_RES( FT_STATUS ) ) ,aHelpBtn ( this, CUI_RES( BTN_SPL_HELP ) ) ,aCancelBtn ( this, CUI_RES( BTN_SPL_CANCEL ) ) ,aAuditBox ( this, CUI_RES( GB_AUDIT ) ) @@ -116,7 +116,7 @@ SvxCommonLinguisticControl::SvxCommonLinguisticControl( ModalDialog* _pParent ) } // ----------------------------------------------------------------------- -PushButton* SvxCommonLinguisticControl::implGetButton( ButtonType _eType ) const +PushButton* SvxCommonLinguisticControl::implGetButton( ButtonType _eType ) const { const PushButton* pButton = NULL; switch ( _eType ) @@ -150,13 +150,13 @@ void SvxCommonLinguisticControl::EnableButton( ButtonType _eType, sal_Bool _bEna // ----------------------------------------------------------------------- void SvxCommonLinguisticControl::InsertControlGroup( Window& _rFirstGroupWindow, Window& _rLastGroupWindow, ControlGroup _eInsertAfter ) { - Window* pInsertAfter = NULL; // will be the last window of our own "undividable" group, after which we insert the foreign group + Window* pInsertAfter = NULL; // will be the last window of our own "undividable" group, after which we insert the foreign group switch ( _eInsertAfter ) { - case eLeftRightWords : pInsertAfter = &aNewWordED; break; - case eSuggestionLabel : pInsertAfter = &aSuggestionFT; break; - case eActionButtons : pInsertAfter = &aChangeAllBtn; break; - case eDialogButtons : pInsertAfter = &aCancelBtn; break; + case eLeftRightWords : pInsertAfter = &aNewWordED; break; + case eSuggestionLabel : pInsertAfter = &aSuggestionFT; break; + case eActionButtons : pInsertAfter = &aChangeAllBtn; break; + case eDialogButtons : pInsertAfter = &aCancelBtn; break; } // now loop through the remaining windows of the foreign group diff --git a/cui/source/dialogs/commonlingui.hxx b/cui/source/dialogs/commonlingui.hxx index 80edc1b73475..dee44a2f45a4 100644 --- a/cui/source/dialogs/commonlingui.hxx +++ b/cui/source/dialogs/commonlingui.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,22 +44,22 @@ class SvxClickInfoCtr: public Control { private: - FixedInfo aFixedInfo; - Link aActivateLink; + FixedInfo aFixedInfo; + Link aActivateLink; public: SvxClickInfoCtr( Window* pParent, const ResId& rResId ); ~SvxClickInfoCtr(); - virtual void SetText( const XubString& rStr ); - virtual XubString GetText() const; + virtual void SetText( const XubString& rStr ); + virtual XubString GetText() const; - void SetActivateHdl( const Link& rLink ) { aActivateLink = rLink; } - const Link& GetActivateHdl() const { return aActivateLink; } + void SetActivateHdl( const Link& rLink ) { aActivateLink = rLink; } + const Link& GetActivateHdl() const { return aActivateLink; } protected: - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual long PreNotify( NotifyEvent& rNEvt ); }; @@ -86,13 +86,13 @@ protected: FixedText aNewWord; Edit aNewWordED; - FixedText aSuggestionFT; + FixedText aSuggestionFT; PushButton aIgnoreBtn; PushButton aIgnoreAllBtn; PushButton aChangeBtn; PushButton aChangeAllBtn; - PushButton aOptionsBtn; + PushButton aOptionsBtn; FixedInfo aStatusText; HelpButton aHelpBtn; @@ -101,35 +101,35 @@ protected: GroupBox aAuditBox; protected: - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ); private: - PushButton* implGetButton( ButtonType _eType ) const; + PushButton* implGetButton( ButtonType _eType ) const; public: SvxCommonLinguisticControl( ModalDialog* _pParent ); // handlers - inline void SetResetWordHdl( const Link& _rLink ) { aAktWord.SetActivateHdl( _rLink ); } - inline const Link& GetResetWordHdl() const { return aAktWord.GetActivateHdl(); } + inline void SetResetWordHdl( const Link& _rLink ) { aAktWord.SetActivateHdl( _rLink ); } + inline const Link& GetResetWordHdl() const { return aAktWord.GetActivateHdl(); } - void SetButtonHandler( ButtonType _eType, const Link& _rHandler ); - void EnableButton( ButtonType _eType, sal_Bool _bEnable ); + void SetButtonHandler( ButtonType _eType, const Link& _rHandler ); + void EnableButton( ButtonType _eType, sal_Bool _bEnable ); - inline PushButton* GetButton( ButtonType _eType ) { return implGetButton( _eType ); } - inline const PushButton* GetButton( ButtonType _eType ) const { return implGetButton( _eType ); } + inline PushButton* GetButton( ButtonType _eType ) { return implGetButton( _eType ); } + inline const PushButton* GetButton( ButtonType _eType ) const { return implGetButton( _eType ); } // users of this class may want to insert own controls in some places, where the ordinary // Z-Order determined by construction time is not sufficient // Use the following methods for this enum ControlGroup // control groups in this window which cannot be devided (e.g. are adjacent in the Z order) { - eLeftRightWords, // the controls for the two words (original and suggestion), including the labels - eSuggestionLabel, // the label for the suggestion - eActionButtons, // the group of "ignore(all)" / "change(all)" buttons - eDialogButtons // the group of dialog control buttons (help and close) + eLeftRightWords, // the controls for the two words (original and suggestion), including the labels + eSuggestionLabel, // the label for the suggestion + eActionButtons, // the group of "ignore(all)" / "change(all)" buttons + eDialogButtons // the group of dialog control buttons (help and close) }; - void InsertControlGroup( Window& _rFirstGroupWindow, Window& _rLastGroupWindow, ControlGroup _eInsertAfter ); + void InsertControlGroup( Window& _rFirstGroupWindow, Window& _rLastGroupWindow, ControlGroup _eInsertAfter ); /** enlarges the window @@ -137,32 +137,32 @@ public: to the right, the dictionary list as well as the close/help buttons stick to the bottom of the window. */ - void Enlarge( sal_Int32 _nX, sal_Int32 _nY ); + void Enlarge( sal_Int32 _nX, sal_Int32 _nY ); // control access methods - inline void SetCurrentText( const String& _rText ) { aAktWord.SetText( _rText ); } - inline String GetCurrentText( ) const { return aAktWord.GetText(); } + inline void SetCurrentText( const String& _rText ) { aAktWord.SetText( _rText ); } + inline String GetCurrentText( ) const { return aAktWord.GetText(); } - inline void SetStatusText( const String& _rText ) { aStatusText.SetText( _rText ); } - inline String GetStatusText( ) const { return aStatusText.GetText(); } + inline void SetStatusText( const String& _rText ) { aStatusText.SetText( _rText ); } + inline String GetStatusText( ) const { return aStatusText.GetText(); } - inline Edit& GetWordInputControl() { return aNewWordED; } - inline const Edit& GetWordInputControl() const { return aNewWordED; } + inline Edit& GetWordInputControl() { return aNewWordED; } + inline const Edit& GetWordInputControl() const { return aNewWordED; } // returns the location (upper-left corner) of the group of action buttons - inline Point GetActionButtonsLocation( ) const { return aIgnoreBtn.GetPosPixel(); } + inline Point GetActionButtonsLocation( ) const { return aIgnoreBtn.GetPosPixel(); } // updates the help texts for the "change" and "change all" buttons according to the currently // entered texts void UpdateChangesHelp( const String& _rNewText ); - inline void UpdateChangesHelp( ) { UpdateChangesHelp( GetWordInputControl().GetText() ); } + inline void UpdateChangesHelp( ) { UpdateChangesHelp( GetWordInputControl().GetText() ); } // updates the help texts for the "ignore" and "always ignore" buttons according to the currently // entered texts void UpdateIgnoreHelp( ); - String GetNewEditWord(); - void SetNewEditWord( const String& _rNew ); + String GetNewEditWord(); + void SetNewEditWord( const String& _rNew ); }; diff --git a/cui/source/dialogs/commonlingui.src b/cui/source/dialogs/commonlingui.src index 60a1eff0e14f..1fb25d8e4009 100644 --- a/cui/source/dialogs/commonlingui.src +++ b/cui/source/dialogs/commonlingui.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ Window RID_SVX_WND_COMMON_LINGU { - DialogControl = TRUE; // we want to tab out of this + DialogControl = TRUE; // we want to tab out of this Hide = TRUE; FixedText FT_WORD diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 6348b73d4e14..a2794ad2a52d 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,7 +69,7 @@ SvxCharacterMap::SvxCharacterMap( Window* pParent, BOOL bOne, const SfxItemSet* bOne = pItem->GetValue(); mpCharMapData = new SvxCharMapData( this, bOne, &CUI_MGR() ); - + SFX_ITEMSET_ARG( pSet, pCharItem, SfxInt32Item, SID_ATTR_CHAR, FALSE ); if ( pCharItem ) SetChar( pCharItem->GetValue() ); diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 7cf48b0c1821..11b21f02a7df 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ #include <svl/cjkoptions.hxx> #include <com/sun/star/i18n/TransliterationModules.hpp> #include <comphelper/processfactory.hxx> -#include <svx/svxdlg.hxx> +#include <svx/svxdlg.hxx> #include <sal/macros.h> using namespace ::com::sun::star::uno; @@ -56,7 +56,7 @@ using namespace ::svxform; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::util; -#define MAX_HISTORY_ENTRIES 50 +#define MAX_HISTORY_ENTRIES 50 //------------------------------------------------------------------------ void FmSearchDialog::initCommon( const Reference< XResultSet >& _rxCursor ) @@ -132,9 +132,9 @@ FmSearchDialog::FmSearchDialog(Window* pParent, const UniString& sInitialText, c ,m_pbHelp (this, CUI_RES(1)) ,m_sSearch ( m_pbSearchAgain.GetText() ) ,m_sCancel ( Button::GetStandardText( BUTTON_CANCEL ) ) - ,m_pPreSearchFocus( NULL ) + ,m_pPreSearchFocus( NULL ) ,m_lnkContextSupplier(lnkContextSupplier) - ,m_pConfig( NULL ) + ,m_pConfig( NULL ) { DBG_ASSERT(m_lnkContextSupplier.IsSet(), "FmSearchDialog::FmSearchDialog : have no ContextSupplier !"); @@ -163,7 +163,7 @@ FmSearchDialog::FmSearchDialog(Window* pParent, const UniString& sInitialText, c m_lbForm.SetSelectHdl(LINK(this, FmSearchDialog, OnContextSelection)); if (m_arrContextFields.size() == 1) - { // remove the context selection listbox and rearrange the controls accordingly + { // remove the context selection listbox and rearrange the controls accordingly sal_Int32 nUpper = m_lbForm.GetPosPixel().Y(); sal_Int32 nDifference = m_rbAllFields.GetPosPixel().Y() - nUpper; @@ -192,7 +192,7 @@ FmSearchDialog::FmSearchDialog(Window* pParent, const UniString& sInitialText, c initCommon( fmscInitial.xCursor ); if (fmscInitial.sFieldDisplayNames.Len() != 0) - { // use the display names if supplied + { // use the display names if supplied DBG_ASSERT(fmscInitial.sFieldDisplayNames.GetTokenCount() == fmscInitial.strUsedFields.GetTokenCount(), "FmSearchDialog::FmSearchDialog : invalid initial context description !"); Init(fmscInitial.sFieldDisplayNames, sInitialText); @@ -203,9 +203,9 @@ FmSearchDialog::FmSearchDialog(Window* pParent, const UniString& sInitialText, c //------------------------------------------------------------------------ void FmSearchDialog::implMoveControls( - Control** _ppControls, - sal_Int32 _nControls, - sal_Int32 _nUp, + Control** _ppControls, + sal_Int32 _nControls, + sal_Int32 _nUp, Control* /*_pToResize*/) { for (sal_Int32 i=0; i<_nControls; ++i) @@ -345,7 +345,7 @@ IMPL_LINK(FmSearchDialog, OnClickedFieldRadios, Button*, pButton) IMPL_LINK(FmSearchDialog, OnClickedSearchAgain, Button*, EMPTYARG) { if (m_pbClose.IsEnabled()) - { // der Button hat die Funktion 'Suchen' + { // der Button hat die Funktion 'Suchen' UniString strThisRoundText = m_cmbSearchText.GetText(); // zur History dazu m_cmbSearchText.RemoveEntry(strThisRoundText); @@ -379,7 +379,7 @@ IMPL_LINK(FmSearchDialog, OnClickedSearchAgain, Button*, EMPTYARG) } } else - { // der Button hat die Fukntion 'Abbrechen' + { // der Button hat die Fukntion 'Abbrechen' DBG_ASSERT(m_pSearchEngine->GetSearchMode() != SM_BRUTE, "FmSearchDialog, OnClickedSearchAgain : falscher Modus !"); // der CancelButton wird normalerweise nur disabled, wenn ich in einem Thread oder mit Reschedule arbeite m_pSearchEngine->CancelSearch(); @@ -544,10 +544,10 @@ IMPL_LINK(FmSearchDialog, OnCheckBoxToggled, CheckBox*, pBox) m_aSoundsLikeCJKSettings.Enable(bChecked); // two other buttons which depend on this one - sal_Bool bEnable = ( m_rbSearchForText.IsChecked() - && !m_aSoundsLikeCJK.IsChecked() + sal_Bool bEnable = ( m_rbSearchForText.IsChecked() + && !m_aSoundsLikeCJK.IsChecked() ) - || !SvtCJKOptions().IsJapaneseFindEnabled(); + || !SvtCJKOptions().IsJapaneseFindEnabled(); m_cbCase.Enable(bEnable); m_aHalfFullFormsCJK.Enable(bEnable); @@ -565,7 +565,7 @@ void FmSearchDialog::InitContext(sal_Int16 nContext) fmscContext.nContext = nContext; #ifdef DBG_UTIL - sal_uInt32 nResult = + sal_uInt32 nResult = #endif m_lnkContextSupplier.Call(&fmscContext); DBG_ASSERT(nResult > 0, "FmSearchDialog::InitContext : ContextSupplier didn't give me any controls !"); @@ -619,7 +619,7 @@ void FmSearchDialog::EnableSearchUI(sal_Bool bEnable) if (!bEnable) EnableControlPaint(sal_False); else - { // beim Enablen teste ich, ob der Timer fuer das delayed paint aktiv ist und stoppe ihn wenn noetig + { // beim Enablen teste ich, ob der Timer fuer das delayed paint aktiv ist und stoppe ihn wenn noetig if (m_aDelayedPaint.IsActive()) m_aDelayedPaint.Stop(); } @@ -629,7 +629,7 @@ void FmSearchDialog::EnableSearchUI(sal_Bool bEnable) if ( !bEnable ) { - // if one of my children has the focus, remember it + // if one of my children has the focus, remember it // 104332 - 2002-10-17 - fs@openoffice.org Window* pFocusWindow = Application::GetFocusWindow( ); if ( pFocusWindow && IsChild( pFocusWindow ) ) @@ -646,23 +646,23 @@ void FmSearchDialog::EnableSearchUI(sal_Bool bEnable) if (m_pSearchEngine->GetSearchMode() != SM_BRUTE) { m_flSearchFor.Enable (bEnable); - m_rbSearchForText.Enable (bEnable); - m_rbSearchForNull.Enable (bEnable); - m_rbSearchForNotNull.Enable (bEnable); + m_rbSearchForText.Enable (bEnable); + m_rbSearchForNull.Enable (bEnable); + m_rbSearchForNotNull.Enable (bEnable); m_flWhere.Enable (bEnable); - m_ftForm.Enable (bEnable); - m_lbForm.Enable (bEnable); - m_rbAllFields.Enable (bEnable); - m_rbSingleField.Enable (bEnable); - m_lbField.Enable (bEnable && m_rbSingleField.IsChecked()); + m_ftForm.Enable (bEnable); + m_lbForm.Enable (bEnable); + m_rbAllFields.Enable (bEnable); + m_rbSingleField.Enable (bEnable); + m_lbField.Enable (bEnable && m_rbSingleField.IsChecked()); m_flOptions.Enable (bEnable); - m_cbBackwards.Enable (bEnable); - m_cbStartOver.Enable (bEnable); - m_pbClose.Enable (bEnable); - EnableSearchForDependees (bEnable); + m_cbBackwards.Enable (bEnable); + m_cbStartOver.Enable (bEnable); + m_pbClose.Enable (bEnable); + EnableSearchForDependees (bEnable); if ( !bEnable ) - { // this means we're preparing for starting a search + { // this means we're preparing for starting a search // In this case, EnableSearchForDependees disabled the search button // But as we're about to use it for cancelling the search, we really need to enable it, again // 07.12.2001 - 95246 - fs@openoffice.org @@ -677,7 +677,7 @@ void FmSearchDialog::EnableSearchUI(sal_Bool bEnable) EnableControlPaint(sal_True); if ( bEnable ) - { // restore focus + { // restore focus // 104332 - 2002-10-17 - fs@openoffice.org if ( m_pPreSearchFocus ) { @@ -703,18 +703,18 @@ void FmSearchDialog::EnableSearchForDependees(sal_Bool bEnable) sal_Bool bEnableRedundants = !m_aSoundsLikeCJK.IsChecked() || !SvtCJKOptions().IsJapaneseFindEnabled(); - m_cmbSearchText.Enable (bEnable); - m_ftPosition.Enable (bEnable && !m_cbWildCard.IsChecked()); - m_cbWildCard.Enable (bEnable && !m_cbRegular.IsChecked() && !m_cbApprox.IsChecked()); - m_cbRegular.Enable (bEnable && !m_cbWildCard.IsChecked() && !m_cbApprox.IsChecked()); - m_cbApprox.Enable (bEnable && !m_cbWildCard.IsChecked() && !m_cbRegular.IsChecked()); - m_pbApproxSettings.Enable (bEnable && m_cbApprox.IsChecked()); - m_aHalfFullFormsCJK.Enable (bEnable && bEnableRedundants); - m_aSoundsLikeCJK.Enable (bEnable); - m_aSoundsLikeCJKSettings.Enable (bEnable && m_aSoundsLikeCJK.IsChecked()); - m_lbPosition.Enable (bEnable && !m_cbWildCard.IsChecked()); - m_cbUseFormat.Enable (bEnable); - m_cbCase.Enable (bEnable && bEnableRedundants); + m_cmbSearchText.Enable (bEnable); + m_ftPosition.Enable (bEnable && !m_cbWildCard.IsChecked()); + m_cbWildCard.Enable (bEnable && !m_cbRegular.IsChecked() && !m_cbApprox.IsChecked()); + m_cbRegular.Enable (bEnable && !m_cbWildCard.IsChecked() && !m_cbApprox.IsChecked()); + m_cbApprox.Enable (bEnable && !m_cbWildCard.IsChecked() && !m_cbRegular.IsChecked()); + m_pbApproxSettings.Enable (bEnable && m_cbApprox.IsChecked()); + m_aHalfFullFormsCJK.Enable (bEnable && bEnableRedundants); + m_aSoundsLikeCJK.Enable (bEnable); + m_aSoundsLikeCJKSettings.Enable (bEnable && m_aSoundsLikeCJK.IsChecked()); + m_lbPosition.Enable (bEnable && !m_cbWildCard.IsChecked()); + m_cbUseFormat.Enable (bEnable); + m_cbCase.Enable (bEnable && bEnableRedundants); } //------------------------------------------------------------------------ @@ -833,8 +833,8 @@ void FmSearchDialog::LoadParams() { FmSearchParams aParams(m_pConfig->getParams()); - const ::rtl::OUString* pHistory = aParams.aHistory.getConstArray(); - const ::rtl::OUString* pHistoryEnd = pHistory + aParams.aHistory.getLength(); + const ::rtl::OUString* pHistory = aParams.aHistory.getConstArray(); + const ::rtl::OUString* pHistoryEnd = pHistory + aParams.aHistory.getLength(); for (; pHistory != pHistoryEnd; ++pHistory) m_cmbSearchText.InsertEntry( *pHistory ); @@ -874,7 +874,7 @@ void FmSearchDialog::LoadParams() LINK(this, FmSearchDialog, OnCheckBoxToggled).Call(&m_cbCase); LINK(this, FmSearchDialog, OnCheckBoxToggled).Call(&m_cbBackwards); - m_aHalfFullFormsCJK.Check( !aParams.isIgnoreWidthCJK( ) ); // BEWARE: this checkbox has a inverse semantics! + m_aHalfFullFormsCJK.Check( !aParams.isIgnoreWidthCJK( ) ); // BEWARE: this checkbox has a inverse semantics! m_aSoundsLikeCJK.Check( aParams.bSoundsLikeCJK ); LINK(this, FmSearchDialog, OnCheckBoxToggled).Call(&m_aHalfFullFormsCJK); LINK(this, FmSearchDialog, OnCheckBoxToggled).Call(&m_aSoundsLikeCJK); @@ -937,22 +937,22 @@ void FmSearchDialog::SaveParams() const for (sal_uInt16 i=0; i<m_cmbSearchText.GetEntryCount(); ++i, ++pHistory) *pHistory = m_cmbSearchText.GetEntry(i); - aCurrentSettings.sSingleSearchField = m_lbField.GetSelectEntry(); - aCurrentSettings.bAllFields = m_rbAllFields.IsChecked(); - aCurrentSettings.nPosition = m_pSearchEngine->GetPosition(); - aCurrentSettings.bUseFormatter = m_pSearchEngine->GetFormatterUsing(); - aCurrentSettings.setCaseSensitive ( m_pSearchEngine->GetCaseSensitive() ); - aCurrentSettings.bBackwards = !m_pSearchEngine->GetDirection(); - aCurrentSettings.bWildcard = m_pSearchEngine->GetWildcard(); - aCurrentSettings.bRegular = m_pSearchEngine->GetRegular(); - aCurrentSettings.bApproxSearch = m_pSearchEngine->GetLevenshtein(); - aCurrentSettings.bLevRelaxed = m_pSearchEngine->GetLevRelaxed(); - aCurrentSettings.nLevOther = m_pSearchEngine->GetLevOther(); - aCurrentSettings.nLevShorter = m_pSearchEngine->GetLevShorter(); - aCurrentSettings.nLevLonger = m_pSearchEngine->GetLevLonger(); - - aCurrentSettings.bSoundsLikeCJK = m_pSearchEngine->GetTransliteration(); - aCurrentSettings.setTransliterationFlags ( m_pSearchEngine->GetTransliterationFlags() ); + aCurrentSettings.sSingleSearchField = m_lbField.GetSelectEntry(); + aCurrentSettings.bAllFields = m_rbAllFields.IsChecked(); + aCurrentSettings.nPosition = m_pSearchEngine->GetPosition(); + aCurrentSettings.bUseFormatter = m_pSearchEngine->GetFormatterUsing(); + aCurrentSettings.setCaseSensitive ( m_pSearchEngine->GetCaseSensitive() ); + aCurrentSettings.bBackwards = !m_pSearchEngine->GetDirection(); + aCurrentSettings.bWildcard = m_pSearchEngine->GetWildcard(); + aCurrentSettings.bRegular = m_pSearchEngine->GetRegular(); + aCurrentSettings.bApproxSearch = m_pSearchEngine->GetLevenshtein(); + aCurrentSettings.bLevRelaxed = m_pSearchEngine->GetLevRelaxed(); + aCurrentSettings.nLevOther = m_pSearchEngine->GetLevOther(); + aCurrentSettings.nLevShorter = m_pSearchEngine->GetLevShorter(); + aCurrentSettings.nLevLonger = m_pSearchEngine->GetLevLonger(); + + aCurrentSettings.bSoundsLikeCJK = m_pSearchEngine->GetTransliteration(); + aCurrentSettings.setTransliterationFlags ( m_pSearchEngine->GetTransliterationFlags() ); if (m_rbSearchForNull.IsChecked()) aCurrentSettings.nSearchForType = 1; diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 26c13ee9fbfa..d1ff4513df3b 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -84,8 +84,8 @@ using namespace ::com::sun::star::uno; SearchThread::SearchThread( SearchProgress* pProgess, TPGalleryThemeProperties* pBrowser, const INetURLObject& rStartURL ) : - mpProgress ( pProgess ), - mpBrowser ( pBrowser ), + mpProgress ( pProgess ), + mpBrowser ( pBrowser ), maStartURL ( rStartURL ) { } @@ -145,8 +145,8 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL, try { - ::com::sun::star::uno::Reference< XCommandEnvironment > xEnv; - Content aCnt( rStartURL.GetMainURL( INetURLObject::NO_DECODE ), xEnv ); + ::com::sun::star::uno::Reference< XCommandEnvironment > xEnv; + Content aCnt( rStartURL.GetMainURL( INetURLObject::NO_DECODE ), xEnv ); Sequence< OUString > aProps( 2 ); aProps.getArray()[ 0 ] = OUString::createFromAscii( "IsFolder" ); @@ -228,7 +228,7 @@ SearchProgress::SearchProgress( Window* pParent, const INetURLObject& rStartURL aFtSearchType ( this, CUI_RES( FT_SEARCH_TYPE ) ), aFLSearchType ( this, CUI_RES( FL_SEARCH_TYPE ) ), aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ), - maSearchThread ( this, (TPGalleryThemeProperties*) pParent, rStartURL ) + maSearchThread ( this, (TPGalleryThemeProperties*) pParent, rStartURL ) { FreeResource(); aBtnCancel.SetClickHdl( LINK( this, SearchProgress, ClickCancelBtn ) ); @@ -281,8 +281,8 @@ void SearchProgress::StartExecuteModal( const Link& rEndDialogHdl ) // -------------- TakeThread::TakeThread( TakeProgress* pProgess, TPGalleryThemeProperties* pBrowser, List& rTakenList ) : - mpProgress ( pProgess ), - mpBrowser ( pBrowser ), + mpProgress ( pProgess ), + mpBrowser ( pBrowser ), mrTakenList ( rTakenList ) { } @@ -297,12 +297,12 @@ TakeThread::~TakeThread() void SAL_CALL TakeThread::run() { - String aName; - INetURLObject aURL; - USHORT nEntries; - GalleryTheme* pThm = mpBrowser->GetXChgData()->pTheme; - USHORT nPos; - GalleryProgress* pStatusProgress; + String aName; + INetURLObject aURL; + USHORT nEntries; + GalleryTheme* pThm = mpBrowser->GetXChgData()->pTheme; + USHORT nPos; + GalleryProgress* pStatusProgress; { SolarMutexGuard aGuard; @@ -383,7 +383,7 @@ IMPL_LINK( TakeProgress, ClickCancelBtn, void*, EMPTYARG ) IMPL_LINK( TakeProgress, CleanUpHdl, void*, EMPTYARG ) { - TPGalleryThemeProperties* mpBrowser = (TPGalleryThemeProperties*) GetParent(); + TPGalleryThemeProperties* mpBrowser = (TPGalleryThemeProperties*) GetParent(); ::std::bit_vector aRemoveEntries( mpBrowser->aFoundList.Count(), false ); ::std::vector< String > aRemainingVector; sal_uInt32 i, nCount; @@ -457,11 +457,11 @@ void TakeProgress::StartExecuteModal( const Link& rEndDialogHdl ) // --------------------- ActualizeProgress::ActualizeProgress( Window* pWindow, GalleryTheme* pThm ) : - ModalDialog ( pWindow, CUI_RES( RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS ) ), - aFtActualizeFile ( this, CUI_RES( FT_ACTUALIZE_FILE ) ), + ModalDialog ( pWindow, CUI_RES( RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS ) ), + aFtActualizeFile ( this, CUI_RES( FT_ACTUALIZE_FILE ) ), aFLActualizeProgress ( this, CUI_RES( FL_ACTUALIZE_PROGRESS ) ), - aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ), - pTheme ( pThm ) + aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ), + pTheme ( pThm ) { FreeResource(); aBtnCancel.SetClickHdl( LINK( this, ActualizeProgress, ClickCancelBtn ) ); @@ -538,12 +538,12 @@ IMPL_LINK( ActualizeProgress, ActualizeHdl, INetURLObject*, pURL ) // --------------- TitleDialog::TitleDialog( Window* pParent, const String& rOldTitle ) : - ModalDialog ( pParent, CUI_RES( RID_SVXDLG_GALLERY_TITLE ) ), - maOk ( this, CUI_RES( BTN_OK ) ), - maCancel ( this, CUI_RES( BTN_CANCEL ) ), - maHelp ( this, CUI_RES( BTN_HELP ) ), + ModalDialog ( pParent, CUI_RES( RID_SVXDLG_GALLERY_TITLE ) ), + maOk ( this, CUI_RES( BTN_OK ) ), + maCancel ( this, CUI_RES( BTN_CANCEL ) ), + maHelp ( this, CUI_RES( BTN_HELP ) ), maFL ( this, CUI_RES( FL_TITLE ) ), - maEdit ( this, CUI_RES( EDT_TITLE ) ) + maEdit ( this, CUI_RES( EDT_TITLE ) ) { FreeResource(); maEdit.SetText( rOldTitle ); @@ -555,12 +555,12 @@ TitleDialog::TitleDialog( Window* pParent, const String& rOldTitle ) : // ------------------- GalleryIdDialog::GalleryIdDialog( Window* pParent, GalleryTheme* _pThm ) : - ModalDialog ( pParent, CUI_RES( RID_SVXDLG_GALLERY_THEMEID ) ), - aBtnOk ( this, CUI_RES( BTN_OK ) ), - aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ), + ModalDialog ( pParent, CUI_RES( RID_SVXDLG_GALLERY_THEMEID ) ), + aBtnOk ( this, CUI_RES( BTN_OK ) ), + aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ), aFLId ( this, CUI_RES( FL_ID ) ), - aLbResName ( this, CUI_RES( LB_RESNAME ) ), - pThm ( _pThm ) + aLbResName ( this, CUI_RES( LB_RESNAME ) ), + pThm ( _pThm ) { FreeResource(); @@ -578,9 +578,9 @@ GalleryIdDialog::GalleryIdDialog( Window* pParent, GalleryTheme* _pThm ) : IMPL_LINK( GalleryIdDialog, ClickOkHdl, void*, EMPTYARG ) { - Gallery* pGal = pThm->GetParent(); - const ULONG nId = GetId(); - BOOL bDifferentThemeExists = FALSE; + Gallery* pGal = pThm->GetParent(); + const ULONG nId = GetId(); + BOOL bDifferentThemeExists = FALSE; for( ULONG i = 0, nCount = pGal->GetThemeCount(); i < nCount && !bDifferentThemeExists; i++ ) { @@ -614,7 +614,7 @@ IMPL_LINK( GalleryIdDialog, ClickOkHdl, void*, EMPTYARG ) GalleryThemeProperties::GalleryThemeProperties( Window* pParent, ExchangeData* _pData, SfxItemSet* pItemSet ) : SfxTabDialog ( pParent, CUI_RES( RID_SVXTABDLG_GALLERYTHEME ), pItemSet ), - pData ( _pData ) + pData ( _pData ) { FreeResource(); @@ -672,12 +672,12 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData ) { pData = _pData; - GalleryTheme* pThm = pData->pTheme; + GalleryTheme* pThm = pData->pTheme; String aOutStr( String::CreateFromInt32( pThm->GetObjectCount() ) ); String aObjStr( CUI_RES( RID_SVXSTR_GALLERYPROPS_OBJECT ) ); String aAccess; - String aType( CUI_RES( RID_SVXSTR_GALLERYPROPS_GALTHEME ) ); - BOOL bReadOnly = pThm->IsReadOnly() && !pThm->IsImported(); + String aType( CUI_RES( RID_SVXSTR_GALLERYPROPS_GALTHEME ) ); + BOOL bReadOnly = pThm->IsReadOnly() && !pThm->IsImported(); aEdtMSName.SetHelpId( HID_GALLERY_EDIT_MSNAME ); aEdtMSName.SetText( pThm->GetName() ); @@ -750,7 +750,7 @@ SfxTabPage* TPGalleryThemeGeneral::Create( Window* pParent, const SfxItemSet& rS // ---------------------------- TPGalleryThemeProperties::TPGalleryThemeProperties( Window* pWindow, const SfxItemSet& rSet ) : - SfxTabPage ( pWindow, CUI_RES( RID_SVXTABPAGE_GALLERYTHEME_FILES ), rSet ), + SfxTabPage ( pWindow, CUI_RES( RID_SVXTABPAGE_GALLERYTHEME_FILES ), rSet ), aBtnSearch ( this, CUI_RES(BTN_SEARCH ) ), aBtnTake ( this, CUI_RES(BTN_TAKE ) ), aBtnTakeAll ( this, CUI_RES(BTN_TAKEALL ) ), @@ -855,13 +855,13 @@ SfxTabPage* TPGalleryThemeProperties::Create( Window* pParent, const SfxItemSet& void TPGalleryThemeProperties::FillFilterList() { - GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); - String aExt; - String aName; - FilterEntry* pFilterEntry; - FilterEntry* pTestEntry; - sal_uInt16 i, nKeyCount; - BOOL bInList; + GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); + String aExt; + String aName; + FilterEntry* pFilterEntry; + FilterEntry* pTestEntry; + sal_uInt16 i, nKeyCount; + BOOL bInList; // graphic filters for( i = 0, nKeyCount = pFilter->GetImportFormatCount(); i < nKeyCount; i++ ) @@ -906,10 +906,10 @@ void TPGalleryThemeProperties::FillFilterList() } // media filters - static const ::rtl::OUString aWildcard( RTL_CONSTASCII_USTRINGPARAM( "*." ) ); - ::avmedia::FilterNameVector aFilters; - const ::rtl::OUString aSeparator( RTL_CONSTASCII_USTRINGPARAM( ";" ) ); - ::rtl::OUString aAllTypes; + static const ::rtl::OUString aWildcard( RTL_CONSTASCII_USTRINGPARAM( "*." ) ); + ::avmedia::FilterNameVector aFilters; + const ::rtl::OUString aSeparator( RTL_CONSTASCII_USTRINGPARAM( ";" ) ); + ::rtl::OUString aAllTypes; ::avmedia::MediaWindow::getMediaFilters( aFilters ); @@ -995,7 +995,7 @@ IMPL_LINK( TPGalleryThemeProperties, SelectFileTypeHdl, void *, EMPTYARG ) void TPGalleryThemeProperties::SearchFiles() { - SearchProgress* pProgress = new SearchProgress( this, aURL ); + SearchProgress* pProgress = new SearchProgress( this, aURL ); for( String* pStr = aFoundList.First(); pStr; pStr = aFoundList.Next() ) delete pStr; @@ -1038,7 +1038,7 @@ IMPL_LINK( TPGalleryThemeProperties, ClickSearchHdl, void *, EMPTYARG ) if ( xFolderPicker.is() ) { // svt::SetDialogHelpId( xFolderPicker, HID_GALLERY_NEWTHEME_FINDFILES ); - String aDlgPathName( SvtPathOptions().GetGraphicPath() ); + String aDlgPathName( SvtPathOptions().GetGraphicPath() ); xFolderPicker->setDisplayDirectory(aDlgPathName); aPreviewTimer.Stop(); @@ -1148,7 +1148,7 @@ IMPL_LINK( TPGalleryThemeProperties, ClickTakeHdl, void*, EMPTYARG ) if( !aLbxFound.GetSelectEntryCount() || !bEntriesFound ) { SvxOpenGraphicDialog aDlg(String( RTL_CONSTASCII_USTRINGPARAM( "Gallery" ) ) ); -// aDlg.SetDialogHelpId( HID_GALLERY_NEWTHEME_ADDFILES ); +// aDlg.SetDialogHelpId( HID_GALLERY_NEWTHEME_ADDFILES ); aDlg.EnableLink(sal_False); aDlg.AsLink(sal_False); diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index beb0774c7bd0..566ddd099992 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,9 +62,9 @@ void GraphicFilterDialog::PreviewWindow::Paint( const Rectangle& rRect ) { Control::Paint( rRect ); - const Size aGrfSize( LogicToPixel( maGraphic.GetPrefSize(), maGraphic.GetPrefMapMode() ) ); - const Size aOutSize( GetOutputSizePixel() ); - const Point aGrfPos( ( aOutSize.Width() - aGrfSize.Width() ) >> 1, + const Size aGrfSize( LogicToPixel( maGraphic.GetPrefSize(), maGraphic.GetPrefMapMode() ) ); + const Size aOutSize( GetOutputSizePixel() ); + const Point aGrfPos( ( aOutSize.Width() - aGrfSize.Width() ) >> 1, ( aOutSize.Height() - aGrfSize.Height() ) >> 1 ); if( maGraphic.IsAnimated() ) @@ -90,22 +90,22 @@ void GraphicFilterDialog::PreviewWindow::SetGraphic( const Graphic& rGraphic ) // ----------------------- GraphicFilterDialog::GraphicFilterDialog( Window* pParent, const ResId& rResId, const Graphic& rGraphic ) : - ModalDialog ( pParent, rResId ), + ModalDialog ( pParent, rResId ), maModifyHdl ( LINK( this, GraphicFilterDialog, ImplModifyHdl ) ), mfScaleX ( 0.0 ), - mfScaleY ( 0.0 ), - maSizePixel ( LogicToPixel( rGraphic.GetPrefSize(), rGraphic.GetPrefMapMode() ) ), + mfScaleY ( 0.0 ), + maSizePixel ( LogicToPixel( rGraphic.GetPrefSize(), rGraphic.GetPrefMapMode() ) ), maPreview ( this, CUI_RES( CTL_PREVIEW ) ), - maFlParameter ( this, CUI_RES( FL_PARAMETER ) ), - maBtnOK ( this, CUI_RES( BTN_OK ) ), - maBtnCancel ( this, CUI_RES( BTN_CANCEL ) ), - maBtnHelp ( this, CUI_RES( BTN_HELP ) ) + maFlParameter ( this, CUI_RES( FL_PARAMETER ) ), + maBtnOK ( this, CUI_RES( BTN_OK ) ), + maBtnCancel ( this, CUI_RES( BTN_CANCEL ) ), + maBtnHelp ( this, CUI_RES( BTN_HELP ) ) { - const Size aPreviewSize( maPreview.GetOutputSizePixel() ); - Size aGrfSize( maSizePixel ); + const Size aPreviewSize( maPreview.GetOutputSizePixel() ); + Size aGrfSize( maSizePixel ); if( rGraphic.GetType() == GRAPHIC_BITMAP && - aPreviewSize.Width() && aPreviewSize.Height() && + aPreviewSize.Width() && aPreviewSize.Height() && aGrfSize.Width() && aGrfSize.Height() ) { const double fGrfWH = (double) aGrfSize.Width() / aGrfSize.Height(); @@ -175,11 +175,11 @@ IMPL_LINK( GraphicFilterDialog, ImplModifyHdl, void*, EMPTYARG ) GraphicFilterMosaic::GraphicFilterMosaic( Window* pParent, const Graphic& rGraphic, USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges ) : GraphicFilterDialog( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_MOSAIC ), rGraphic ), - maFtWidth ( this, CUI_RES( DLG_FILTERMOSAIC_FT_WIDTH ) ), - maMtrWidth ( this, CUI_RES( DLG_FILTERMOSAIC_MTR_WIDTH ) ), - maFtHeight ( this, CUI_RES( DLG_FILTERMOSAIC_FT_HEIGHT ) ), + maFtWidth ( this, CUI_RES( DLG_FILTERMOSAIC_FT_WIDTH ) ), + maMtrWidth ( this, CUI_RES( DLG_FILTERMOSAIC_MTR_WIDTH ) ), + maFtHeight ( this, CUI_RES( DLG_FILTERMOSAIC_FT_HEIGHT ) ), maMtrHeight ( this, CUI_RES( DLG_FILTERMOSAIC_MTR_HEIGHT ) ), - maCbxEdges ( this, CUI_RES( DLG_FILTERMOSAIC_CBX_EDGES ) ) + maCbxEdges ( this, CUI_RES( DLG_FILTERMOSAIC_CBX_EDGES ) ) { FreeResource(); @@ -205,13 +205,13 @@ GraphicFilterMosaic::~GraphicFilterMosaic() // ----------------------------------------------------------------------------- -Graphic GraphicFilterMosaic::GetFilteredGraphic( const Graphic& rGraphic, +Graphic GraphicFilterMosaic::GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) { - Graphic aRet; - const Size aSize( Max( FRound( GetTileWidth() * fScaleX ), 1L ), + Graphic aRet; + const Size aSize( Max( FRound( GetTileWidth() * fScaleX ), 1L ), Max( FRound( GetTileHeight() * fScaleY ), 1L ) ); - BmpFilterParam aParam( aSize ); + BmpFilterParam aParam( aSize ); if( rGraphic.IsAnimated() ) { @@ -247,10 +247,10 @@ Graphic GraphicFilterMosaic::GetFilteredGraphic( const Graphic& rGraphic, GraphicFilterSolarize::GraphicFilterSolarize( Window* pParent, const Graphic& rGraphic, BYTE cGreyThreshold, BOOL bInvert ) : - GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_SOLARIZE ), rGraphic ), - maFtThreshold ( this, CUI_RES( DLG_FILTERSOLARIZE_FT_THRESHOLD ) ), - maMtrThreshold ( this, CUI_RES( DLG_FILTERSOLARIZE_MTR_THRESHOLD ) ), - maCbxInvert ( this, CUI_RES( DLG_FILTERSOLARIZE_CBX_INVERT ) ) + GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_SOLARIZE ), rGraphic ), + maFtThreshold ( this, CUI_RES( DLG_FILTERSOLARIZE_FT_THRESHOLD ) ), + maMtrThreshold ( this, CUI_RES( DLG_FILTERSOLARIZE_MTR_THRESHOLD ) ), + maCbxInvert ( this, CUI_RES( DLG_FILTERSOLARIZE_CBX_INVERT ) ) { FreeResource(); @@ -271,11 +271,11 @@ GraphicFilterSolarize::~GraphicFilterSolarize() // ----------------------------------------------------------------------------- -Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic, +Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic, double /*fScaleX*/, double /*fScaleY*/ ) { - Graphic aRet; - BmpFilterParam aParam( GetGreyThreshold() ); + Graphic aRet; + BmpFilterParam aParam( GetGreyThreshold() ); if( rGraphic.IsAnimated() ) { @@ -311,9 +311,9 @@ Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic, GraphicFilterSepia::GraphicFilterSepia( Window* pParent, const Graphic& rGraphic, USHORT nSepiaPercent ) : - GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_SEPIA ), rGraphic ), - maFtSepia ( this, CUI_RES( DLG_FILTERSEPIA_FT_SEPIA ) ), - maMtrSepia ( this, CUI_RES( DLG_FILTERSEPIA_MTR_SEPIA ) ) + GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_SEPIA ), rGraphic ), + maFtSepia ( this, CUI_RES( DLG_FILTERSEPIA_FT_SEPIA ) ), + maMtrSepia ( this, CUI_RES( DLG_FILTERSEPIA_MTR_SEPIA ) ) { FreeResource(); @@ -331,11 +331,11 @@ GraphicFilterSepia::~GraphicFilterSepia() // ----------------------------------------------------------------------------- -Graphic GraphicFilterSepia::GetFilteredGraphic( const Graphic& rGraphic, +Graphic GraphicFilterSepia::GetFilteredGraphic( const Graphic& rGraphic, double /*fScaleX*/, double /*fScaleY*/ ) { - Graphic aRet; - BmpFilterParam aParam( GetSepiaPercent() ); + Graphic aRet; + BmpFilterParam aParam( GetSepiaPercent() ); if( rGraphic.IsAnimated() ) { @@ -361,9 +361,9 @@ Graphic GraphicFilterSepia::GetFilteredGraphic( const Graphic& rGraphic, GraphicFilterPoster::GraphicFilterPoster( Window* pParent, const Graphic& rGraphic, USHORT nPosterCount ) : - GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_POSTER ), rGraphic ), - maFtPoster ( this, CUI_RES( DLG_FILTERPOSTER_FT_POSTER ) ), - maNumPoster ( this, CUI_RES( DLG_FILTERPOSTER_NUM_POSTER ) ) + GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_POSTER ), rGraphic ), + maFtPoster ( this, CUI_RES( DLG_FILTERPOSTER_FT_POSTER ) ), + maNumPoster ( this, CUI_RES( DLG_FILTERPOSTER_NUM_POSTER ) ) { FreeResource(); @@ -382,11 +382,11 @@ GraphicFilterPoster::~GraphicFilterPoster() // ----------------------------------------------------------------------------- -Graphic GraphicFilterPoster::GetFilteredGraphic( const Graphic& rGraphic, +Graphic GraphicFilterPoster::GetFilteredGraphic( const Graphic& rGraphic, double /*fScaleX*/, double /*fScaleY*/ ) { - Graphic aRet; - const USHORT nPosterCount = GetPosterColorCount(); + Graphic aRet; + const USHORT nPosterCount = GetPosterColorCount(); if( rGraphic.IsAnimated() ) { @@ -424,9 +424,9 @@ void GraphicFilterEmboss::EmbossControl::MouseButtonDown( const MouseEvent& rEvt GraphicFilterEmboss::GraphicFilterEmboss( Window* pParent, const Graphic& rGraphic, RECT_POINT eLightSource ) : - GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_EMBOSS ), rGraphic ), - maFtLight ( this, CUI_RES( DLG_FILTEREMBOSS_FT_LIGHT ) ), - maCtlLight ( this, CUI_RES( DLG_FILTEREMBOSS_CTL_LIGHT ), eLightSource ) + GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_EMBOSS ), rGraphic ), + maFtLight ( this, CUI_RES( DLG_FILTEREMBOSS_FT_LIGHT ) ), + maCtlLight ( this, CUI_RES( DLG_FILTEREMBOSS_CTL_LIGHT ), eLightSource ) { FreeResource(); @@ -442,24 +442,24 @@ GraphicFilterEmboss::~GraphicFilterEmboss() // ----------------------------------------------------------------------------- -Graphic GraphicFilterEmboss::GetFilteredGraphic( const Graphic& rGraphic, +Graphic GraphicFilterEmboss::GetFilteredGraphic( const Graphic& rGraphic, double /*fScaleX*/, double /*fScaleY*/ ) { - Graphic aRet; - USHORT nAzim, nElev; + Graphic aRet; + USHORT nAzim, nElev; switch( maCtlLight.GetActualRP() ) { - default: DBG_ERROR("svx::GraphicFilterEmboss::GetFilteredGraphic(), unknown Reference Point!" ); - case( RP_LT ): nAzim = 4500, nElev = 4500; break; - case( RP_MT ): nAzim = 9000, nElev = 4500; break; - case( RP_RT ): nAzim = 13500, nElev = 4500; break; - case( RP_LM ): nAzim = 0, nElev = 4500; break; - case( RP_MM ): nAzim = 0, nElev = 9000; break; - case( RP_RM ): nAzim = 18000, nElev = 4500; break; - case( RP_LB ): nAzim = 31500, nElev = 4500; break; - case( RP_MB ): nAzim = 27000, nElev = 4500; break; - case( RP_RB ): nAzim = 22500, nElev = 4500; break; + default: DBG_ERROR("svx::GraphicFilterEmboss::GetFilteredGraphic(), unknown Reference Point!" ); + case( RP_LT ): nAzim = 4500, nElev = 4500; break; + case( RP_MT ): nAzim = 9000, nElev = 4500; break; + case( RP_RT ): nAzim = 13500, nElev = 4500; break; + case( RP_LM ): nAzim = 0, nElev = 4500; break; + case( RP_MM ): nAzim = 0, nElev = 9000; break; + case( RP_RM ): nAzim = 18000, nElev = 4500; break; + case( RP_LB ): nAzim = 31500, nElev = 4500; break; + case( RP_MB ): nAzim = 27000, nElev = 4500; break; + case( RP_RB ): nAzim = 22500, nElev = 4500; break; } BmpFilterParam aParam( nAzim, nElev ); diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index ba85929192f4..2359a4d2a2c4 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -102,9 +102,9 @@ void SvxHlinkCtrl::StateChanged( USHORT nSID, SfxItemState eState, |************************************************************************/ SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings) -: IconChoiceDialog( pParent, CUI_RES ( RID_SVXDLG_NEWHYPERLINK ) ), - maCtrl ( SID_HYPERLINK_GETLINK, *pBindings, this ), - mpBindings ( pBindings ), +: IconChoiceDialog( pParent, CUI_RES ( RID_SVXDLG_NEWHYPERLINK ) ), + maCtrl ( SID_HYPERLINK_GETLINK, *pBindings, this ), + mpBindings ( pBindings ), mbReadOnly ( sal_False ), mbIsHTMLDoc ( sal_False ) { @@ -138,7 +138,7 @@ SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings) pEntry->SetQuickHelpText( CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP ) ); // all tab pages set -> create mnemonics - // CreateIconTextAutoMnemonics(); #99671# not useful, because this is not what user expects when using mnemonics on the pages + // CreateIconTextAutoMnemonics(); #99671# not useful, because this is not what user expects when using mnemonics on the pages // create itemset for tabpages mpItemSet = new SfxItemSet( SFX_APP()->GetPool(), SID_HYPERLINK_GETLINK, @@ -201,7 +201,7 @@ void SvxHpLinkDlg::Move() { // Pos&Size of this dialog-window Point aDlgPos ( GetPosPixel () ); - Size aDlgSize ( GetSizePixel () ); + Size aDlgSize ( GetSizePixel () ); // Size of Office-Main-Window Size aWindowSize( SFX_APP()->GetTopWindow()->GetSizePixel() ); diff --git a/cui/source/dialogs/cuiimapdlg.hrc b/cui/source/dialogs/cuiimapdlg.hrc index 5be30abc13a7..8635f1bafde3 100644 --- a/cui/source/dialogs/cuiimapdlg.hrc +++ b/cui/source/dialogs/cuiimapdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,17 +28,17 @@ // ImapDlg-Dialoge -#define FT_URLDESCRIPTION 1 -#define FT_URL1 2 -#define FT_TARGET 3 -#define FT_NAME 4 -#define FT_DESCRIPTION 5 -#define EDT_URLDESCRIPTION 1 -#define EDT_URL 2 -#define EDT_NAME 3 -#define EDT_DESCRIPTION 4 -#define BTN_HELP1 1 -#define BTN_OK1 2 +#define FT_URLDESCRIPTION 1 +#define FT_URL1 2 +#define FT_TARGET 3 +#define FT_NAME 4 +#define FT_DESCRIPTION 5 +#define EDT_URLDESCRIPTION 1 +#define EDT_URL 2 +#define EDT_NAME 3 +#define EDT_DESCRIPTION 4 +#define BTN_HELP1 1 +#define BTN_OK1 2 #define BTN_CANCEL1 3 #define FL_URL 1 -#define CBB_TARGETS 1 +#define CBB_TARGETS 1 diff --git a/cui/source/dialogs/cuiimapdlg.src b/cui/source/dialogs/cuiimapdlg.src index 9b60adf854ca..a7550bcf125e 100644 --- a/cui/source/dialogs/cuiimapdlg.src +++ b/cui/source/dialogs/cuiimapdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,7 +69,7 @@ ModalDialog RID_SVXDLG_IMAPURL DropDown = TRUE ; HScroll = TRUE ; }; - + FixedText FT_NAME { Pos = MAP_APPFONT ( 6 , 59 ) ; @@ -122,7 +122,7 @@ ModalDialog RID_SVXDLG_IMAPURL Pos = MAP_APPFONT ( 0 , 160 ) ; Size = MAP_APPFONT ( 214 , 4 ) ; }; - + // Buttons HelpButton BTN_HELP1 { diff --git a/cui/source/dialogs/cuiimapwnd.cxx b/cui/source/dialogs/cuiimapwnd.cxx index 2da453213f5d..5ce727d08f36 100644 --- a/cui/source/dialogs/cuiimapwnd.cxx +++ b/cui/source/dialogs/cuiimapwnd.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> #include <vcl/help.hxx> -#include <sfx2/sfxsids.hrc> +#include <sfx2/sfxsids.hrc> #define _ANIMATION #include "macroass.hxx" #include <svtools/imaprect.hxx> @@ -60,7 +60,7 @@ /************************************************************************* |* -|* URLDlg +|* URLDlg |* \************************************************************************/ diff --git a/cui/source/dialogs/cuitbxform.cxx b/cui/source/dialogs/cuitbxform.cxx index 4d0f2d91d12f..9e0b89ffc9e6 100644 --- a/cui/source/dialogs/cuitbxform.cxx +++ b/cui/source/dialogs/cuitbxform.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx index ac6cdd178eae..d1f43b143a6e 100644 --- a/cui/source/dialogs/dlgname.cxx +++ b/cui/source/dialogs/dlgname.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,12 +51,12 @@ \************************************************************************/ SvxNameDialog::SvxNameDialog( Window* pWindow, const String& rName, const String& rDesc ) : - ModalDialog ( pWindow, CUI_RES( RID_SVXDLG_NAME ) ), - aFtDescription ( this, CUI_RES( FT_DESCRIPTION ) ), - aEdtName ( this, CUI_RES( EDT_STRING ) ), - aBtnOK ( this, CUI_RES( BTN_OK ) ), - aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ), - aBtnHelp ( this, CUI_RES( BTN_HELP ) ) + ModalDialog ( pWindow, CUI_RES( RID_SVXDLG_NAME ) ), + aFtDescription ( this, CUI_RES( FT_DESCRIPTION ) ), + aEdtName ( this, CUI_RES( EDT_STRING ) ), + aBtnOK ( this, CUI_RES( BTN_OK ) ), + aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ), + aBtnHelp ( this, CUI_RES( BTN_HELP ) ) { FreeResource(); @@ -93,10 +93,10 @@ IMPL_LINK(SvxNameDialog, ModifyHdl, Edit*, EMPTYARG) // Dialog for editing Object Name // plus uniqueness-callback-linkHandler -SvxObjectNameDialog::SvxObjectNameDialog( - Window* pWindow, +SvxObjectNameDialog::SvxObjectNameDialog( + Window* pWindow, const String& rName) -: ModalDialog(pWindow, CUI_RES(RID_SVXDLG_OBJECT_NAME)), +: ModalDialog(pWindow, CUI_RES(RID_SVXDLG_OBJECT_NAME)), aFtName(this, CUI_RES(NTD_FT_NAME)), aEdtName(this, CUI_RES(NTD_EDT_NAME)), aFlSeparator(this, CUI_RES(FL_SEPARATOR_A)), @@ -129,11 +129,11 @@ IMPL_LINK(SvxObjectNameDialog, ModifyHdl, Edit*, EMPTYARG) // #i68101# // Dialog for editing Object Title and Description -SvxObjectTitleDescDialog::SvxObjectTitleDescDialog( - Window* pWindow, - const String& rTitle, +SvxObjectTitleDescDialog::SvxObjectTitleDescDialog( + Window* pWindow, + const String& rTitle, const String& rDescription) -: ModalDialog(pWindow, CUI_RES(RID_SVXDLG_OBJECT_TITLE_DESC)), +: ModalDialog(pWindow, CUI_RES(RID_SVXDLG_OBJECT_TITLE_DESC)), aFtTitle(this, CUI_RES(NTD_FT_TITLE)), aEdtTitle(this, CUI_RES(NTD_EDT_TITLE)), aFtDescription(this, CUI_RES(NTD_FT_DESC)), @@ -162,12 +162,12 @@ SvxObjectTitleDescDialog::SvxObjectTitleDescDialog( \************************************************************************/ SvxMessDialog::SvxMessDialog( Window* pWindow, const String& rText, const String& rDesc, Image* pImg ) : - ModalDialog ( pWindow, CUI_RES( RID_SVXDLG_MESSBOX ) ), - aFtDescription ( this, CUI_RES( FT_DESCRIPTION ) ), - aBtn1 ( this, CUI_RES( BTN_1 ) ), - aBtn2 ( this, CUI_RES( BTN_2 ) ), - aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ), - aFtImage ( this ) + ModalDialog ( pWindow, CUI_RES( RID_SVXDLG_MESSBOX ) ), + aFtDescription ( this, CUI_RES( FT_DESCRIPTION ) ), + aBtn1 ( this, CUI_RES( BTN_1 ) ), + aBtn2 ( this, CUI_RES( BTN_2 ) ), + aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ), + aFtImage ( this ) { FreeResource(); diff --git a/cui/source/dialogs/dlgname.hrc b/cui/source/dialogs/dlgname.hrc index 04e9377be619..be0f2ad84c6d 100644 --- a/cui/source/dialogs/dlgname.hrc +++ b/cui/source/dialogs/dlgname.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 @@ -34,13 +34,13 @@ #define BTN_2 2 // #i68101# -#define NTD_FT_NAME 2 -#define NTD_EDT_NAME 2 -#define NTD_FT_TITLE 3 -#define NTD_EDT_TITLE 3 -#define NTD_FT_DESC 4 -#define NTD_EDT_DESC 4 -#define FL_SEPARATOR_A 1 -#define FL_SEPARATOR_B 2 +#define NTD_FT_NAME 2 +#define NTD_EDT_NAME 2 +#define NTD_FT_TITLE 3 +#define NTD_EDT_TITLE 3 +#define NTD_FT_DESC 4 +#define NTD_EDT_DESC 4 +#define FL_SEPARATOR_A 1 +#define FL_SEPARATOR_B 2 // eof diff --git a/cui/source/dialogs/dlgname.src b/cui/source/dialogs/dlgname.src index e3e961880dfc..ee29629dc054 100644 --- a/cui/source/dialogs/dlgname.src +++ b/cui/source/dialogs/dlgname.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -101,7 +101,7 @@ ModalDialog RID_SVXDLG_OBJECT_NAME Size = MAP_APPFONT ( 168 , 12 ) ; TabStop = TRUE ; }; - + // divider FixedLine FL_SEPARATOR_A { diff --git a/cui/source/dialogs/fmsearch.hrc b/cui/source/dialogs/fmsearch.hrc index cfad011101c2..16936f81f9f6 100644 --- a/cui/source/dialogs/fmsearch.hrc +++ b/cui/source/dialogs/fmsearch.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,58 +29,58 @@ #include "svl/solar.hrc" -#define RID_SVX_DLG_INPUTRECORDNO (RID_FORMS_START + 10) -#define RID_SVX_DLG_SHOWGRIDCOLUMNS (RID_FORMS_START + 11) -#define RID_SVXDLG_SEARCHFORM (RID_FORMS_START + 7) +#define RID_SVX_DLG_INPUTRECORDNO (RID_FORMS_START + 10) +#define RID_SVX_DLG_SHOWGRIDCOLUMNS (RID_FORMS_START + 11) +#define RID_SVXDLG_SEARCHFORM (RID_FORMS_START + 7) #define RID_STR_SEARCH_ANYWHERE (RID_FORMS_START + 85) #define RID_STR_SEARCH_BEGINNING (RID_FORMS_START + 86) #define RID_STR_SEARCH_END (RID_FORMS_START + 87) #define RID_STR_SEARCH_WHOLE (RID_FORMS_START + 88) #define RID_STR_FROM_TOP (RID_FORMS_START + 74) #define RID_STR_FROM_BOTTOM (RID_FORMS_START + 75) -#define RID_SVXERR_SEARCH_NORECORD (RID_FORMS_START + 8) -#define RID_SVXERR_SEARCH_GENERAL_ERROR (RID_FORMS_START + 9) +#define RID_SVXERR_SEARCH_NORECORD (RID_FORMS_START + 8) +#define RID_SVXERR_SEARCH_GENERAL_ERROR (RID_FORMS_START + 9) #define RID_STR_OVERFLOW_FORWARD (RID_FORMS_START + 34) #define RID_STR_OVERFLOW_BACKWARD (RID_FORMS_START + 35) #define RID_STR_SEARCH_COUNTING (RID_FORMS_START + 76) -#define FT_SEARCHTEXT 1 -#define FT_FORM 2 -#define FT_POSITION 3 -#define FT_RECORDLABEL 4 -#define FT_RECORD 5 -#define FT_HINT 6 +#define FT_SEARCHTEXT 1 +#define FT_FORM 2 +#define FT_POSITION 3 +#define FT_RECORDLABEL 4 +#define FT_RECORD 5 +#define FT_HINT 6 -#define CMB_SEARCHTEXT 1 +#define CMB_SEARCHTEXT 1 -#define RB_ALLFIELDS 1 -#define RB_SINGLEFIELD 2 -#define RB_SEARCHFORTEXT 3 -#define RB_SEARCHFORNULL 4 -#define RB_SEARCHFORNOTNULL 5 +#define RB_ALLFIELDS 1 +#define RB_SINGLEFIELD 2 +#define RB_SEARCHFORTEXT 3 +#define RB_SEARCHFORNULL 4 +#define RB_SEARCHFORNOTNULL 5 -#define LB_FORM 1 -#define LB_FIELD 2 -#define LB_POSITION 3 +#define LB_FORM 1 +#define LB_FIELD 2 +#define LB_POSITION 3 -#define PB_APPROXSETTINGS 1 -#define PB_SEARCH 2 -#define PB_SOUNDSLIKESETTINGS 3 +#define PB_APPROXSETTINGS 1 +#define PB_SEARCH 2 +#define PB_SOUNDSLIKESETTINGS 3 #define FL_SEARCHFOR 1 #define FL_WHERE 2 #define FL_OPTIONS 3 #define FL_STATE 4 -#define CB_USEFORMATTER 1 -#define CB_BACKWARD 2 -#define CB_STARTOVER 3 -#define CB_CASE 4 -#define CB_WILDCARD 5 -#define CB_REGULAR 6 -#define CB_APPROX 7 -#define CB_HALFFULLFORMS 8 -#define CB_SOUNDSLIKECJK 9 +#define CB_USEFORMATTER 1 +#define CB_BACKWARD 2 +#define CB_STARTOVER 3 +#define CB_CASE 4 +#define CB_WILDCARD 5 +#define CB_REGULAR 6 +#define CB_APPROX 7 +#define CB_HALFFULLFORMS 8 +#define CB_SOUNDSLIKECJK 9 #endif // _FMSEARCH_HRC diff --git a/cui/source/dialogs/fmsearch.src b/cui/source/dialogs/fmsearch.src index 186db5a48735..1b56c1634501 100644 --- a/cui/source/dialogs/fmsearch.src +++ b/cui/source/dialogs/fmsearch.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/gallery.src b/cui/source/dialogs/gallery.src index db0d4bbf3973..0b7601d5343f 100644 --- a/cui/source/dialogs/gallery.src +++ b/cui/source/dialogs/gallery.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/grfflt.hrc b/cui/source/dialogs/grfflt.hrc index 94d7f8fe392f..eaafe3818c70 100644 --- a/cui/source/dialogs/grfflt.hrc +++ b/cui/source/dialogs/grfflt.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,49 +32,49 @@ // - Common - // ---------- -#define BTN_OK 101 -#define BTN_CANCEL 102 -#define BTN_HELP 103 -#define CTL_PREVIEW 105 -#define FL_PARAMETER 106 - -// -------------------- -// - DLG_FILTERMOSAIC - -// -------------------- - -#define DLG_FILTERMOSAIC_FT_WIDTH 1 -#define DLG_FILTERMOSAIC_MTR_WIDTH 2 -#define DLG_FILTERMOSAIC_FT_HEIGHT 3 -#define DLG_FILTERMOSAIC_MTR_HEIGHT 4 -#define DLG_FILTERMOSAIC_CBX_EDGES 5 +#define BTN_OK 101 +#define BTN_CANCEL 102 +#define BTN_HELP 103 +#define CTL_PREVIEW 105 +#define FL_PARAMETER 106 + +// -------------------- +// - DLG_FILTERMOSAIC - +// -------------------- + +#define DLG_FILTERMOSAIC_FT_WIDTH 1 +#define DLG_FILTERMOSAIC_MTR_WIDTH 2 +#define DLG_FILTERMOSAIC_FT_HEIGHT 3 +#define DLG_FILTERMOSAIC_MTR_HEIGHT 4 +#define DLG_FILTERMOSAIC_CBX_EDGES 5 -// ---------------------- -// - DLG_FILTERSOLARIZE - -// ---------------------- - -#define DLG_FILTERSOLARIZE_FT_THRESHOLD 1 -#define DLG_FILTERSOLARIZE_MTR_THRESHOLD 2 -#define DLG_FILTERSOLARIZE_CBX_INVERT 3 +// ---------------------- +// - DLG_FILTERSOLARIZE - +// ---------------------- + +#define DLG_FILTERSOLARIZE_FT_THRESHOLD 1 +#define DLG_FILTERSOLARIZE_MTR_THRESHOLD 2 +#define DLG_FILTERSOLARIZE_CBX_INVERT 3 // ------------------- -// - DLG_FILTERSEPIA - +// - DLG_FILTERSEPIA - // ------------------- - -#define DLG_FILTERSEPIA_FT_SEPIA 1 -#define DLG_FILTERSEPIA_MTR_SEPIA 2 + +#define DLG_FILTERSEPIA_FT_SEPIA 1 +#define DLG_FILTERSEPIA_MTR_SEPIA 2 // -------------------- -// - DLG_FILTERPOSTER - +// - DLG_FILTERPOSTER - // -------------------- - -#define DLG_FILTERPOSTER_FT_POSTER 1 -#define DLG_FILTERPOSTER_NUM_POSTER 2 + +#define DLG_FILTERPOSTER_FT_POSTER 1 +#define DLG_FILTERPOSTER_NUM_POSTER 2 // -------------------- -// - DLG_FILTEREMBOSS - +// - DLG_FILTEREMBOSS - // -------------------- - -#define DLG_FILTEREMBOSS_FT_LIGHT 1 -#define DLG_FILTEREMBOSS_CTL_LIGHT 2 + +#define DLG_FILTEREMBOSS_FT_LIGHT 1 +#define DLG_FILTEREMBOSS_CTL_LIGHT 2 #endif diff --git a/cui/source/dialogs/grfflt.src b/cui/source/dialogs/grfflt.src index fc1921b47cce..2c49939bcf41 100644 --- a/cui/source/dialogs/grfflt.src +++ b/cui/source/dialogs/grfflt.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,14 +56,14 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC Pos = MAP_APPFONT ( 104 , 3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP ) ; Size = MAP_APPFONT ( 81, 73 ) ; }; -#define MA_Y0 3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP +#define MA_Y0 3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP FixedText DLG_FILTERMOSAIC_FT_WIDTH { Pos = MAP_APPFONT ( 12, MA_Y0 ) ; Size = MAP_APPFONT ( 77, 10 ) ; Text [ en-US ] = "~Width" ; }; -#define MA_Y1 MA_Y0 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y +#define MA_Y1 MA_Y0 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y MetricField DLG_FILTERMOSAIC_MTR_WIDTH { Border = TRUE ; @@ -81,14 +81,14 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC Last = 999 ; SpinSize = 1 ; }; -#define MA_Y2 MA_Y1 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y +#define MA_Y2 MA_Y1 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y FixedText DLG_FILTERMOSAIC_FT_HEIGHT { Pos = MAP_APPFONT ( 12, MA_Y2 ) ; Size = MAP_APPFONT ( 77, 10 ) ; Text [ en-US ] = "H~eight" ; }; -#define MA_Y3 MA_Y2 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y +#define MA_Y3 MA_Y2 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y MetricField DLG_FILTERMOSAIC_MTR_HEIGHT { Border = TRUE ; @@ -106,12 +106,12 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC Last = 999 ; SpinSize = 1 ; }; -#define MA_Y4 MA_Y3 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_Y +#define MA_Y4 MA_Y3 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_Y CheckBox DLG_FILTERMOSAIC_CBX_EDGES - { - Pos = MAP_APPFONT ( 12, MA_Y4 ) ; - Size = MAP_APPFONT ( 91, 12 ) ; - TabStop = TRUE ; + { + Pos = MAP_APPFONT ( 12, MA_Y4 ) ; + Size = MAP_APPFONT ( 91, 12 ) ; + TabStop = TRUE ; Text [ en-US ] = "E~nhance edges" ; }; OKButton BTN_OK @@ -160,35 +160,35 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE Pos = MAP_APPFONT ( 104 , 3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP ) ; Size = MAP_APPFONT ( 81, 73 ) ; }; -#define MA_Y5 3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP +#define MA_Y5 3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP FixedText DLG_FILTERSOLARIZE_FT_THRESHOLD { Pos = MAP_APPFONT ( 12, MA_Y5 ) ; Size = MAP_APPFONT ( 77 , 10 ) ; Text [ en-US ] = "Threshold ~value" ; }; -#define MA_Y6 MA_Y5 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y +#define MA_Y6 MA_Y5 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y MetricField DLG_FILTERSOLARIZE_MTR_THRESHOLD { - Border = TRUE ; + Border = TRUE ; Pos = MAP_APPFONT ( 12 , MA_Y6 ) ; Size = MAP_APPFONT ( 35 , 12 ) ; - TabStop = TRUE ; - Repeat = TRUE ; - Spin = TRUE ; - Maximum = 100 ; - StrictFormat = TRUE ; - Unit = FUNIT_CUSTOM ; + TabStop = TRUE ; + Repeat = TRUE ; + Spin = TRUE ; + Maximum = 100 ; + StrictFormat = TRUE ; + Unit = FUNIT_CUSTOM ; CustomUnitText = "%" ; - Last = 100 ; - SpinSize = 1 ; + Last = 100 ; + SpinSize = 1 ; }; -#define MA_Y7 MA_Y6 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y +#define MA_Y7 MA_Y6 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y CheckBox DLG_FILTERSOLARIZE_CBX_INVERT - { - Pos = MAP_APPFONT ( 12, 46 ) ; - Size = MAP_APPFONT ( 77, 12 ) ; - TabStop = TRUE ; + { + Pos = MAP_APPFONT ( 12, 46 ) ; + Size = MAP_APPFONT ( 77, 12 ) ; + TabStop = TRUE ; Text [ en-US ] = "~Invert" ; }; OKButton BTN_OK @@ -237,31 +237,31 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SEPIA Pos = MAP_APPFONT ( 104 , 3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP ) ; Size = MAP_APPFONT ( 81, 73 ) ; }; -#define MA_Y8 3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP +#define MA_Y8 3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP FixedText DLG_FILTERSEPIA_FT_SEPIA { Pos = MAP_APPFONT ( 12 , MA_Y8 ) ; Size = MAP_APPFONT ( 77 , 10 ) ; Text [ en-US ] = "Aging degree" ; }; -#define MA_Y9 MA_Y8 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y +#define MA_Y9 MA_Y8 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y MetricField DLG_FILTERSEPIA_MTR_SEPIA { - Border = TRUE ; + Border = TRUE ; Pos = MAP_APPFONT ( 12 , MA_Y9 ) ; Size = MAP_APPFONT ( 35 , 12 ) ; - TabStop = TRUE ; - Right = TRUE ; - Repeat = TRUE ; - Spin = TRUE ; - Minimum = 1 ; - Maximum = 100 ; - StrictFormat = TRUE ; - Unit = FUNIT_CUSTOM ; + TabStop = TRUE ; + Right = TRUE ; + Repeat = TRUE ; + Spin = TRUE ; + Minimum = 1 ; + Maximum = 100 ; + StrictFormat = TRUE ; + Unit = FUNIT_CUSTOM ; CustomUnitText = "%" ; - First = 1 ; - Last = 100 ; - SpinSize = 1 ; + First = 1 ; + Last = 100 ; + SpinSize = 1 ; }; OKButton BTN_OK { @@ -295,7 +295,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_POSTER Moveable = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 250, 100 ) ; - + Text [ en-US ] = "Posterize" ; FixedLine FL_PARAMETER @@ -309,28 +309,28 @@ ModalDialog RID_SVX_GRFFILTER_DLG_POSTER Pos = MAP_APPFONT ( 104 , 3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP ) ; Size = MAP_APPFONT ( 81, 73 ) ; }; -#define MA_Y10 3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP +#define MA_Y10 3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP FixedText DLG_FILTERPOSTER_FT_POSTER { Pos = MAP_APPFONT ( 12 , MA_Y10 ) ; Size = MAP_APPFONT ( 77 , 10 ) ; Text [ en-US ] = "Poster colors" ; }; -#define MA_Y11 MA_Y10 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y +#define MA_Y11 MA_Y10 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y NumericField DLG_FILTERPOSTER_NUM_POSTER { - Border = TRUE ; + Border = TRUE ; Pos = MAP_APPFONT ( 12 , MA_Y11 ) ; Size = MAP_APPFONT ( 35 , 12 ) ; - TabStop = TRUE ; - Repeat = TRUE ; - Spin = TRUE ; - Minimum = 2 ; - Maximum = 64 ; - StrictFormat = TRUE ; - First = 2 ; - Last = 64 ; - SpinSize = 1 ; + TabStop = TRUE ; + Repeat = TRUE ; + Spin = TRUE ; + Minimum = 2 ; + Maximum = 64 ; + StrictFormat = TRUE ; + First = 2 ; + Last = 64 ; + SpinSize = 1 ; }; OKButton BTN_OK { @@ -359,8 +359,8 @@ ModalDialog RID_SVX_GRFFILTER_DLG_POSTER TabPage RID_SVX_GRFFILTER_DLG_EMBOSS_TAB { - Pos = MAP_APPFONT ( 0, 0 ) ; - Size = MAP_APPFONT ( 0, 0 ) ; + Pos = MAP_APPFONT ( 0, 0 ) ; + Size = MAP_APPFONT ( 0, 0 ) ; }; ModalDialog RID_SVX_GRFFILTER_DLG_EMBOSS @@ -372,7 +372,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_EMBOSS Size = MAP_APPFONT ( 250, 100 ) ; Text [ en-US ] = "Relief" ; - + FixedLine FL_PARAMETER { Pos = MAP_APPFONT ( 6 , 3 ) ; @@ -384,21 +384,21 @@ ModalDialog RID_SVX_GRFFILTER_DLG_EMBOSS Pos = MAP_APPFONT ( 104 , 3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP ) ; Size = MAP_APPFONT ( 81, 73 ) ; }; -#define MA_Y12 3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP +#define MA_Y12 3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP FixedText DLG_FILTEREMBOSS_FT_LIGHT { Pos = MAP_APPFONT ( 12 , MA_Y12 ) ; Size = MAP_APPFONT ( 77 , 10 ) ; Text [ en-US ] = "Light source" ; }; -#define MA_Y13 MA_Y12 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y +#define MA_Y13 MA_Y12 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y Control DLG_FILTEREMBOSS_CTL_LIGHT { HelpID = HID_GRFFILTER_EMBOSS_LIGHT ; - Border = TRUE ; + Border = TRUE ; Pos = MAP_APPFONT ( 12 , MA_Y13 ) ; Size = MAP_APPFONT ( 77 , 60 ) ; - TabStop = TRUE ; + TabStop = TRUE ; }; OKButton BTN_OK { diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index cb986f6dd1dd..2bd8dcd039be 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -111,9 +111,9 @@ namespace svx }; protected: - const String m_sPrimaryText; - const String m_sSecondaryText; - const RubyPosition m_ePosition; + const String m_sPrimaryText; + const String m_sSecondaryText; + const RubyPosition m_ePosition; public: PseudoRubyText( const String& _rPrimary, const String& _rSecondary, const RubyPosition _ePosition ); @@ -136,9 +136,9 @@ namespace svx void PseudoRubyText::Paint( OutputDevice& _rDevice, const Rectangle& _rRect, USHORT _nTextStyle, Rectangle* _pPrimaryLocation, Rectangle* _pSecondaryLocation, ::vcl::ControlLayoutData* _pLayoutData ) { - bool bLayoutOnly = NULL != _pLayoutData; - MetricVector* pTextMetrics = bLayoutOnly ? &_pLayoutData->m_aUnicodeBoundRects : NULL; - String* pDisplayText = bLayoutOnly ? &_pLayoutData->m_aDisplayText : NULL; + bool bLayoutOnly = NULL != _pLayoutData; + MetricVector* pTextMetrics = bLayoutOnly ? &_pLayoutData->m_aUnicodeBoundRects : NULL; + String* pDisplayText = bLayoutOnly ? &_pLayoutData->m_aDisplayText : NULL; Size aPlaygroundSize( _rRect.GetSize() ); @@ -225,7 +225,7 @@ namespace svx //========================================================================= //= RubyRadioButton //========================================================================= - class RubyRadioButton :public RadioButton + class RubyRadioButton :public RadioButton ,protected PseudoRubyText { using svx::PseudoRubyText::Paint; @@ -233,12 +233,12 @@ namespace svx public: RubyRadioButton( Window* _pParent, - const ResId& _rId, // the text in the resource will be taken as primary text - const String& _rSecondary, // this will be the secondary text which will be printed somewhat smaller + const ResId& _rId, // the text in the resource will be taken as primary text + const String& _rSecondary, // this will be the secondary text which will be printed somewhat smaller const PseudoRubyText::RubyPosition _ePosition ); protected: - virtual void Paint( const Rectangle& _rRect ); + virtual void Paint( const Rectangle& _rRect ); }; //------------------------------------------------------------------------- @@ -261,7 +261,7 @@ namespace svx aImageSize.Height() = CalcZoom( aImageSize.Height() ); Rectangle aOverallRect( Point( 0, 0 ), GetOutputSizePixel() ); - aOverallRect.Left() += aImageSize.Width() + 4; // 4 is the separator between the image and the text + aOverallRect.Left() += aImageSize.Width() + 4; // 4 is the separator between the image and the text // inflate the rect a little bit (because the VCL radio button does the same) Rectangle aTextRect( aOverallRect ); ++aTextRect.Left(); --aTextRect.Right(); @@ -524,16 +524,16 @@ namespace svx HangulHanjaConversionDialog::HangulHanjaConversionDialog( Window* _pParent, HHC::ConversionDirection _ePrimaryDirection ) :ModalDialog( _pParent, CUI_RES( RID_SVX_MDLG_HANGULHANJA ) ) ,m_pPlayground( new SvxCommonLinguisticControl( this ) ) - ,m_aFind ( m_pPlayground.get(), CUI_RES( PB_FIND ) ) - ,m_aSuggestions ( m_pPlayground.get(), CUI_RES( CTL_SUGGESTIONS ) ) - ,m_aFormat ( m_pPlayground.get(), CUI_RES( FT_FORMAT ) ) + ,m_aFind ( m_pPlayground.get(), CUI_RES( PB_FIND ) ) + ,m_aSuggestions ( m_pPlayground.get(), CUI_RES( CTL_SUGGESTIONS ) ) + ,m_aFormat ( m_pPlayground.get(), CUI_RES( FT_FORMAT ) ) ,m_aSimpleConversion( m_pPlayground.get(), CUI_RES( RB_SIMPLE_CONVERSION ) ) - ,m_aHangulBracketed ( m_pPlayground.get(), CUI_RES( RB_HANJA_HANGUL_BRACKETED ) ) - ,m_aHanjaBracketed ( m_pPlayground.get(), CUI_RES( RB_HANGUL_HANJA_BRACKETED ) ) - ,m_aConversion ( m_pPlayground.get(), CUI_RES( FT_CONVERSION ) ) - ,m_aHangulOnly ( m_pPlayground.get(), CUI_RES( CB_HANGUL_ONLY ) ) - ,m_aHanjaOnly ( m_pPlayground.get(), CUI_RES( CB_HANJA_ONLY ) ) - ,m_aReplaceByChar ( m_pPlayground.get(), CUI_RES( CB_REPLACE_BY_CHARACTER ) ) + ,m_aHangulBracketed ( m_pPlayground.get(), CUI_RES( RB_HANJA_HANGUL_BRACKETED ) ) + ,m_aHanjaBracketed ( m_pPlayground.get(), CUI_RES( RB_HANGUL_HANJA_BRACKETED ) ) + ,m_aConversion ( m_pPlayground.get(), CUI_RES( FT_CONVERSION ) ) + ,m_aHangulOnly ( m_pPlayground.get(), CUI_RES( CB_HANGUL_ONLY ) ) + ,m_aHanjaOnly ( m_pPlayground.get(), CUI_RES( CB_HANJA_ONLY ) ) + ,m_aReplaceByChar ( m_pPlayground.get(), CUI_RES( CB_REPLACE_BY_CHARACTER ) ) ,m_pIgnoreNonPrimary( NULL ) ,m_bDocumentMode( true ) { @@ -561,13 +561,13 @@ namespace svx Point aDistance = LogicToPixel( Point( 3, 0 ), MAP_APPFONT ); sal_Int32 nTooLargeByPixels = // right margin of the word input control - ( m_pPlayground->GetWordInputControl().GetPosPixel().X() - + m_pPlayground->GetWordInputControl().GetSizePixel().Width() + ( m_pPlayground->GetWordInputControl().GetPosPixel().X() + + m_pPlayground->GetWordInputControl().GetSizePixel().Width() ) // minus left margin of the find button - - m_aFind.GetPosPixel().X() + - m_aFind.GetPosPixel().X() // plus desired distance between the both - + aDistance.X(); + + aDistance.X(); // make the word input control smaller Size aSize = m_pPlayground->GetWordInputControl().GetSizePixel(); aSize.Width() -= nTooLargeByPixels; @@ -600,16 +600,16 @@ namespace svx m_pPlayground->SetButtonHandler( SvxCommonLinguisticControl::eOptions, LINK( this, HangulHanjaConversionDialog, OnOption ) ); m_pPlayground->GetButton( SvxCommonLinguisticControl::eOptions )->Show(); -// m_pPlayground->EnableButton( SvxCommonLinguisticControl::eOptions, true ); +// m_pPlayground->EnableButton( SvxCommonLinguisticControl::eOptions, true ); if ( editeng::HangulHanjaConversion::eHangulToHanja == _ePrimaryDirection ) { -// m_aHanjaOnly.Enable( sal_False ); +// m_aHanjaOnly.Enable( sal_False ); m_pIgnoreNonPrimary = &m_aHangulOnly; } else { -// m_aHangulOnly.Enable( sal_False ); +// m_aHangulOnly.Enable( sal_False ); m_pIgnoreNonPrimary = &m_aHanjaOnly; } // m_pIgnoreNonPrimary->Check(); @@ -779,7 +779,7 @@ namespace svx IMPL_LINK( HangulHanjaConversionDialog, OnOption, void*, EMPTYARG ) { - HangulHanjaOptionsDialog aOptDlg( this ); + HangulHanjaOptionsDialog aOptDlg( this ); aOptDlg.Execute(); m_aOptionsChangedLink.Call(this); return 0L; @@ -815,7 +815,7 @@ namespace svx m_pPlayground->SetCurrentText( _rNewString ); bool bOldDocumentMode = m_bDocumentMode; - m_bDocumentMode = _bOriginatesFromDocument; // before FillSuggestions! + m_bDocumentMode = _bOriginatesFromDocument; // before FillSuggestions! FillSuggestions( _rSuggestions ); m_pPlayground->EnableButton( SvxCommonLinguisticControl::eIgnoreAll, m_bDocumentMode ); @@ -894,8 +894,8 @@ namespace svx //------------------------------------------------------------------------- sal_Bool HangulHanjaConversionDialog::GetUseBothDirections( ) const { -// DBG_ASSERT( m_pIgnoreNonPrimary, "HangulHanjaConversionDialog::GetUseBothDirections: where's the check box pointer?" ); -// return m_pIgnoreNonPrimary ? !m_pIgnoreNonPrimary->IsChecked( ) : sal_True; +// DBG_ASSERT( m_pIgnoreNonPrimary, "HangulHanjaConversionDialog::GetUseBothDirections: where's the check box pointer?" ); +// return m_pIgnoreNonPrimary ? !m_pIgnoreNonPrimary->IsChecked( ) : sal_True; return !m_aHangulOnly.IsChecked() && !m_aHanjaOnly.IsChecked(); } @@ -983,20 +983,20 @@ namespace svx if( m_xConversionDictionaryList.is() ) { - Reference< XNameContainer > xNameCont = m_xConversionDictionaryList->getDictionaryContainer(); - Reference< XNameAccess > xNameAccess = Reference< XNameAccess >( xNameCont, UNO_QUERY ); + Reference< XNameContainer > xNameCont = m_xConversionDictionaryList->getDictionaryContainer(); + Reference< XNameAccess > xNameAccess = Reference< XNameAccess >( xNameCont, UNO_QUERY ); if( xNameAccess.is() ) { - Sequence< ::rtl::OUString > aDictNames( xNameAccess->getElementNames() ); + Sequence< ::rtl::OUString > aDictNames( xNameAccess->getElementNames() ); - const ::rtl::OUString* pDic = aDictNames.getConstArray(); - sal_Int32 nCount = aDictNames.getLength(); + const ::rtl::OUString* pDic = aDictNames.getConstArray(); + sal_Int32 nCount = aDictNames.getLength(); - sal_Int32 i; + sal_Int32 i; for( i = 0 ; i < nCount ; ++i ) { - Any aAny( xNameAccess->getByName( pDic[ i ] ) ); - Reference< XConversionDictionary > xDic; + Any aAny( xNameAccess->getByName( pDic[ i ] ) ); + Reference< XConversionDictionary > xDic; if( ( aAny >>= xDic ) && xDic.is() ) { if( LANGUAGE_KOREAN == SvxLocaleToLanguage( xDic->getLocale() ) ) @@ -1012,23 +1012,23 @@ namespace svx IMPL_LINK( HangulHanjaOptionsDialog, OkHdl, void*, EMPTYARG ) { - sal_uInt32 nCnt = m_aDictList.size(); - sal_uInt32 n = 0; - sal_uInt32 nActiveDics = 0; - Sequence< OUString > aActiveDics; + sal_uInt32 nCnt = m_aDictList.size(); + sal_uInt32 n = 0; + sal_uInt32 nActiveDics = 0; + Sequence< OUString > aActiveDics; aActiveDics.realloc( nCnt ); - OUString* pActActiveDic = aActiveDics.getArray(); + OUString* pActActiveDic = aActiveDics.getArray(); while( nCnt ) { - Reference< XConversionDictionary > xDict = m_aDictList[ n ]; - SvLBoxEntry* pEntry = m_aDictsLB.SvTreeListBox::GetEntry( n ); + Reference< XConversionDictionary > xDict = m_aDictList[ n ]; + SvLBoxEntry* pEntry = m_aDictsLB.SvTreeListBox::GetEntry( n ); DBG_ASSERT( xDict.is(), "-HangulHanjaOptionsDialog::OkHdl(): someone is evaporated..." ); DBG_ASSERT( pEntry, "-HangulHanjaOptionsDialog::OkHdl(): no one there in list?" ); - bool bActive = m_aDictsLB.GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED; + bool bActive = m_aDictsLB.GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED; xDict->setActive( bActive ); Reference< util::XFlushable > xFlush( xDict, uno::UNO_QUERY ); if( xFlush.is() ) @@ -1046,8 +1046,8 @@ namespace svx // save configuration aActiveDics.realloc( nActiveDics ); - Any aTmp; - SvtLinguConfig aLngCfg; + Any aTmp; + SvtLinguConfig aLngCfg; aTmp <<= aActiveDics; aLngCfg.SetProperty( UPH_ACTIVE_CONVERSION_DICTIONARIES, aTmp ); @@ -1066,7 +1066,7 @@ namespace svx IMPL_LINK( HangulHanjaOptionsDialog, DictsLB_SelectHdl, void*, EMPTYARG ) { - bool bSel = m_aDictsLB.FirstSelected() != NULL; + bool bSel = m_aDictsLB.FirstSelected() != NULL; m_aEditPB.Enable( bSel ); m_aDeletePB.Enable( bSel ); @@ -1076,8 +1076,8 @@ namespace svx IMPL_LINK( HangulHanjaOptionsDialog, NewDictHdl, void*, EMPTYARG ) { - String aName; - HangulHanjaNewDictDialog aNewDlg( this ); + String aName; + HangulHanjaNewDictDialog aNewDlg( this ); aNewDlg.Execute(); if( aNewDlg.GetName( aName ) ) { @@ -1085,7 +1085,7 @@ namespace svx { try { - Reference< XConversionDictionary > xDic = + Reference< XConversionDictionary > xDic = m_xConversionDictionaryList->addNewDictionary( aName, SvxCreateLocale( LANGUAGE_KOREAN ), ConversionDictionaryType::HANGUL_HANJA ); if( xDic.is() ) @@ -1109,11 +1109,11 @@ namespace svx IMPL_LINK( HangulHanjaOptionsDialog, EditDictHdl, void*, EMPTYARG ) { - SvLBoxEntry* pEntry = m_aDictsLB.FirstSelected(); + SvLBoxEntry* pEntry = m_aDictsLB.FirstSelected(); DBG_ASSERT( pEntry, "+HangulHanjaEditDictDialog::EditDictHdl(): call of edit should not be possible with no selection!" ); if( pEntry ) { - HangulHanjaEditDictDialog aEdDlg( this, m_aDictList, m_aDictsLB.GetSelectEntryPos() ); + HangulHanjaEditDictDialog aEdDlg( this, m_aDictList, m_aDictsLB.GetSelectEntryPos() ); aEdDlg.Execute(); } return 0L; @@ -1124,10 +1124,10 @@ namespace svx USHORT nSelPos = m_aDictsLB.GetSelectEntryPos(); if( nSelPos != LISTBOX_ENTRY_NOTFOUND ) { - Reference< XConversionDictionary > xDic( m_aDictList[ nSelPos ] ); + Reference< XConversionDictionary > xDic( m_aDictList[ nSelPos ] ); if( m_xConversionDictionaryList.is() && xDic.is() ) { - Reference< XNameContainer > xNameCont = m_xConversionDictionaryList->getDictionaryContainer(); + Reference< XNameContainer > xNameCont = m_xConversionDictionaryList->getDictionaryContainer(); if( xNameCont.is() ) { try @@ -1153,27 +1153,27 @@ namespace svx } HangulHanjaOptionsDialog::HangulHanjaOptionsDialog( Window* _pParent ) - :ModalDialog ( _pParent, CUI_RES( RID_SVX_MDLG_HANGULHANJA_OPT ) ) - ,m_aUserdefdictFT ( this, CUI_RES( FT_USERDEFDICT ) ) - ,m_aDictsLB ( this, CUI_RES( LB_DICTS ) ) - ,m_aOptionsFL ( this, CUI_RES( FL_OPTIONS ) ) - ,m_aIgnorepostCB ( this, CUI_RES( CB_IGNOREPOST ) ) - ,m_aShowrecentlyfirstCB ( this, CUI_RES( CB_SHOWRECENTLYFIRST ) ) - ,m_aAutoreplaceuniqueCB ( this, CUI_RES( CB_AUTOREPLACEUNIQUE ) ) - ,m_aNewPB ( this, CUI_RES( PB_HHO_NEW ) ) - ,m_aEditPB ( this, CUI_RES( PB_HHO_EDIT ) ) - ,m_aDeletePB ( this, CUI_RES( PB_HHO_DELETE ) ) - ,m_aOkPB ( this, CUI_RES( PB_HHO_OK ) ) - ,m_aCancelPB ( this, CUI_RES( PB_HHO_CANCEL ) ) - ,m_aHelpPB ( this, CUI_RES( PB_HHO_HELP ) ) - - ,m_pCheckButtonData ( NULL ) + :ModalDialog ( _pParent, CUI_RES( RID_SVX_MDLG_HANGULHANJA_OPT ) ) + ,m_aUserdefdictFT ( this, CUI_RES( FT_USERDEFDICT ) ) + ,m_aDictsLB ( this, CUI_RES( LB_DICTS ) ) + ,m_aOptionsFL ( this, CUI_RES( FL_OPTIONS ) ) + ,m_aIgnorepostCB ( this, CUI_RES( CB_IGNOREPOST ) ) + ,m_aShowrecentlyfirstCB ( this, CUI_RES( CB_SHOWRECENTLYFIRST ) ) + ,m_aAutoreplaceuniqueCB ( this, CUI_RES( CB_AUTOREPLACEUNIQUE ) ) + ,m_aNewPB ( this, CUI_RES( PB_HHO_NEW ) ) + ,m_aEditPB ( this, CUI_RES( PB_HHO_EDIT ) ) + ,m_aDeletePB ( this, CUI_RES( PB_HHO_DELETE ) ) + ,m_aOkPB ( this, CUI_RES( PB_HHO_OK ) ) + ,m_aCancelPB ( this, CUI_RES( PB_HHO_CANCEL ) ) + ,m_aHelpPB ( this, CUI_RES( PB_HHO_HELP ) ) + + ,m_pCheckButtonData ( NULL ) ,m_xConversionDictionaryList( NULL ) { m_aDictsLB.SetWindowBits( WB_CLIPCHILDREN | WB_HSCROLL | WB_FORCE_MAKEVISIBLE ); m_aDictsLB.SetSelectionMode( SINGLE_SELECTION ); m_aDictsLB.SetHighlightRange(); -// m_aDictsLB.SetHelpId( xxx ); +// m_aDictsLB.SetHelpId( xxx ); m_aDictsLB.SetSelectHdl( LINK( this, HangulHanjaOptionsDialog, DictsLB_SelectHdl ) ); m_aDictsLB.SetDeselectHdl( LINK( this, HangulHanjaOptionsDialog, DictsLB_SelectHdl ) ); @@ -1184,9 +1184,9 @@ namespace svx FreeResource(); - SvtLinguConfig aLngCfg; - Any aTmp; - bool bVal = bool(); + SvtLinguConfig aLngCfg; + Any aTmp; + bool bVal = bool(); aTmp = aLngCfg.GetProperty( UPH_IS_IGNORE_POST_POSITIONAL_WORD ); if( aTmp >>= bVal ) m_aIgnorepostCB.Check( bVal ); @@ -1204,8 +1204,8 @@ namespace svx HangulHanjaOptionsDialog::~HangulHanjaOptionsDialog() { - SvLBoxEntry* pEntry = m_aDictsLB.First(); - String* pDel; + SvLBoxEntry* pEntry = m_aDictsLB.First(); + String* pDel; while( pEntry ) { pDel = ( String* ) pEntry->GetUserData(); @@ -1220,7 +1220,7 @@ namespace svx void HangulHanjaOptionsDialog::AddDict( const String& _rName, bool _bChecked ) { - SvLBoxEntry* pEntry = m_aDictsLB.SvTreeListBox::InsertEntry( _rName ); + SvLBoxEntry* pEntry = m_aDictsLB.SvTreeListBox::InsertEntry( _rName ); m_aDictsLB.SetCheckButtonState( pEntry, _bChecked? SV_BUTTON_CHECKED : SV_BUTTON_UNCHECKED ); pEntry->SetUserData( new String( _rName ) ); } @@ -1232,12 +1232,12 @@ namespace svx IMPL_LINK( HangulHanjaNewDictDialog, OKHdl, void*, EMPTYARG ) { - String aName( m_aDictNameED.GetText() ); + String aName( m_aDictNameED.GetText() ); aName.EraseTrailingChars(); m_bEntered = aName.Len() > 0; if( m_bEntered ) - m_aDictNameED.SetText( aName ); // do this in case of trailing chars have been deleted + m_aDictNameED.SetText( aName ); // do this in case of trailing chars have been deleted EndDialog( RET_OK ); return 0; @@ -1245,7 +1245,7 @@ namespace svx IMPL_LINK( HangulHanjaNewDictDialog, ModifyHdl, void*, EMPTYARG ) { - String aName( m_aDictNameED.GetText() ); + String aName( m_aDictNameED.GetText() ); aName.EraseTrailingChars(); m_aOkBtn.Enable( aName.Len() > 0 ); @@ -1254,15 +1254,15 @@ namespace svx } HangulHanjaNewDictDialog::HangulHanjaNewDictDialog( Window* _pParent ) - :ModalDialog ( _pParent, CUI_RES( RID_SVX_MDLG_HANGULHANJA_NEWDICT ) ) - ,m_aNewDictFL ( this, CUI_RES( FL_NEWDICT ) ) - ,m_aDictNameFT ( this, CUI_RES( FT_DICTNAME ) ) - ,m_aDictNameED ( this, CUI_RES( ED_DICTNAME ) ) - ,m_aOkBtn ( this, CUI_RES( PB_NEWDICT_OK ) ) - ,m_aCancelBtn ( this, CUI_RES( PB_NEWDICT_ESC ) ) - ,m_aHelpBtn ( this, CUI_RES( PB_NEWDICT_HLP ) ) + :ModalDialog ( _pParent, CUI_RES( RID_SVX_MDLG_HANGULHANJA_NEWDICT ) ) + ,m_aNewDictFL ( this, CUI_RES( FL_NEWDICT ) ) + ,m_aDictNameFT ( this, CUI_RES( FT_DICTNAME ) ) + ,m_aDictNameED ( this, CUI_RES( ED_DICTNAME ) ) + ,m_aOkBtn ( this, CUI_RES( PB_NEWDICT_OK ) ) + ,m_aCancelBtn ( this, CUI_RES( PB_NEWDICT_ESC ) ) + ,m_aHelpBtn ( this, CUI_RES( PB_NEWDICT_HLP ) ) - ,m_bEntered ( false ) + ,m_bEntered ( false ) { m_aOkBtn.SetClickHdl( LINK( this, HangulHanjaNewDictDialog, OKHdl ) ); @@ -1295,25 +1295,25 @@ namespace svx { private: protected: - sal_uInt16 m_nSize; - String** m_ppElements; - sal_uInt16 m_nNumOfEntries; - sal_uInt16 m_nAct; + sal_uInt16 m_nSize; + String** m_ppElements; + sal_uInt16 m_nNumOfEntries; + sal_uInt16 m_nAct; - const String* _Next( void ); + const String* _Next( void ); public: SuggestionList( sal_uInt16 _nNumOfElements ); - virtual ~SuggestionList(); + virtual ~SuggestionList(); - bool Set( const String& _rElement, sal_uInt16 _nNumOfElement ); - bool Reset( sal_uInt16 _nNumOfElement ); - const String* Get( sal_uInt16 _nNumOfElement ) const; - void Clear( void ); + bool Set( const String& _rElement, sal_uInt16 _nNumOfElement ); + bool Reset( sal_uInt16 _nNumOfElement ); + const String* Get( sal_uInt16 _nNumOfElement ) const; + void Clear( void ); - const String* First( void ); - const String* Next( void ); + const String* First( void ); + const String* Next( void ); - inline sal_uInt16 GetCount( void ) const; + inline sal_uInt16 GetCount( void ) const; }; inline sal_uInt16 SuggestionList::GetCount( void ) const @@ -1331,8 +1331,8 @@ namespace svx m_ppElements = new String*[ m_nSize ]; m_nAct = m_nNumOfEntries = 0; - String** ppNull = m_ppElements; - sal_uInt16 n = _nNumOfElements; + String** ppNull = m_ppElements; + sal_uInt16 n = _nNumOfElements; while( n ) { *ppNull = NULL; @@ -1348,10 +1348,10 @@ namespace svx bool SuggestionList::Set( const String& _rElement, sal_uInt16 _nNumOfElement ) { - bool bRet = _nNumOfElement < m_nSize; + bool bRet = _nNumOfElement < m_nSize; if( bRet ) { - String** ppElem = m_ppElements + _nNumOfElement; + String** ppElem = m_ppElements + _nNumOfElement; if( *ppElem ) **ppElem = _rElement; else @@ -1366,10 +1366,10 @@ namespace svx bool SuggestionList::Reset( sal_uInt16 _nNumOfElement ) { - bool bRet = _nNumOfElement < m_nSize; + bool bRet = _nNumOfElement < m_nSize; if( bRet ) { - String** ppElem = m_ppElements + _nNumOfElement; + String** ppElem = m_ppElements + _nNumOfElement; if( *ppElem ) { delete *ppElem; @@ -1383,7 +1383,7 @@ namespace svx const String* SuggestionList::Get( sal_uInt16 _nNumOfElement ) const { - const String* pRet; + const String* pRet; if( _nNumOfElement < m_nSize ) pRet = m_ppElements[ _nNumOfElement ]; @@ -1397,8 +1397,8 @@ namespace svx { if( m_nNumOfEntries ) { - String** ppDel = m_ppElements; - sal_uInt16 nCnt = m_nSize; + String** ppDel = m_ppElements; + sal_uInt16 nCnt = m_nSize; while( nCnt ) { if( *ppDel ) @@ -1417,7 +1417,7 @@ namespace svx const String* SuggestionList::_Next( void ) { - const String* pRet = NULL; + const String* pRet = NULL; while( m_nAct < m_nSize && !pRet ) { pRet = m_ppElements[ m_nAct ]; @@ -1436,7 +1436,7 @@ namespace svx const String* SuggestionList::Next( void ) { - const String* pRet; + const String* pRet; if( m_nAct < m_nNumOfEntries ) { @@ -1452,7 +1452,7 @@ namespace svx bool SuggestionEdit::ShouldScroll( bool _bUp ) const { - bool bRet = false; + bool bRet = false; if( _bUp ) { @@ -1470,7 +1470,7 @@ namespace svx void SuggestionEdit::DoJump( bool _bUp ) { - const Link& rLoseFocusHdl = GetLoseFocusHdl(); + const Link& rLoseFocusHdl = GetLoseFocusHdl(); if( rLoseFocusHdl.IsSet() ) rLoseFocusHdl.Call( this ); m_rScrollBar.SetThumbPos( m_rScrollBar.GetThumbPos() + ( _bUp? -1 : 1 ) ); @@ -1493,16 +1493,16 @@ namespace svx long SuggestionEdit::PreNotify( NotifyEvent& rNEvt ) { - long nHandled = 0; + long nHandled = 0; if( rNEvt.GetType() == EVENT_KEYINPUT ) { - const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); - const KeyCode& rKeyCode = pKEvt->GetKeyCode(); - USHORT nMod = rKeyCode.GetModifier(); - USHORT nCode = rKeyCode.GetCode(); + const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); + const KeyCode& rKeyCode = pKEvt->GetKeyCode(); + USHORT nMod = rKeyCode.GetModifier(); + USHORT nCode = rKeyCode.GetCode(); if( nCode == KEY_TAB && ( !nMod || KEY_SHIFT == nMod ) ) { - bool bUp = KEY_SHIFT == nMod; + bool bUp = KEY_SHIFT == nMod; if( ShouldScroll( bUp ) ) { DoJump( bUp ); @@ -1513,7 +1513,7 @@ namespace svx } else if( KEY_UP == nCode || KEY_DOWN == nCode ) { - bool bUp = KEY_UP == nCode; + bool bUp = KEY_UP == nCode; if( ShouldScroll( bUp ) ) { DoJump( bUp ); @@ -1543,16 +1543,16 @@ namespace svx namespace { - bool GetConversions( Reference< XConversionDictionary > _xDict, + bool GetConversions( Reference< XConversionDictionary > _xDict, const OUString& _rOrg, Sequence< OUString >& _rEntries ) { - bool bRet = false; + bool bRet = false; if( _xDict.is() && _rOrg.getLength() ) { try { - _rEntries = _xDict->getConversions( _rOrg, + _rEntries = _xDict->getConversions( _rOrg, 0, _rOrg.getLength(), ConversionDirection_FROM_LEFT, @@ -1621,14 +1621,14 @@ namespace svx IMPL_LINK( HangulHanjaEditDictDialog, NewPBPushHdl, void*, EMPTYARG ) { DBG_ASSERT( m_pSuggestions, "-HangulHanjaEditDictDialog::NewPBPushHdl(): no suggestions... search in hell..." ); - Reference< XConversionDictionary > xDict = m_rDictList[ m_nCurrentDict ]; + Reference< XConversionDictionary > xDict = m_rDictList[ m_nCurrentDict ]; if( xDict.is() && m_pSuggestions ) { //delete old entry bool bRemovedSomething = DeleteEntryFromDictionary( m_aOriginal, xDict ); - OUString aLeft( m_aOriginal ); - const String* pRight = m_pSuggestions->First(); + OUString aLeft( m_aOriginal ); + const String* pRight = m_pSuggestions->First(); bool bAddedSomething = false; while( pRight ) { @@ -1663,12 +1663,12 @@ namespace svx bool bRemovedSomething = false; if( xDict.is() ) { - OUString aOrg( m_aOriginal ); - Sequence< OUString > aEntries; + OUString aOrg( m_aOriginal ); + Sequence< OUString > aEntries; GetConversions( xDict, m_aOriginal, aEntries ); - sal_uInt32 n = aEntries.getLength(); - OUString* pEntry = aEntries.getArray(); + sal_uInt32 n = aEntries.getLength(); + OUString* pEntry = aEntries.getArray(); while( n ) { try @@ -1677,7 +1677,7 @@ namespace svx bRemovedSomething = true; } catch( const NoSuchElementException& ) - { // can not be... + { // can not be... } ++pEntry; @@ -1722,12 +1722,12 @@ namespace svx void HangulHanjaEditDictDialog::UpdateOriginalLB( void ) { m_aOriginalLB.Clear(); - Reference< XConversionDictionary > xDict = m_rDictList[ m_nCurrentDict ]; + Reference< XConversionDictionary > xDict = m_rDictList[ m_nCurrentDict ]; if( xDict.is() ) { - Sequence< OUString > aEntries = xDict->getConversionEntries( ConversionDirection_FROM_LEFT ); - sal_uInt32 n = aEntries.getLength(); - OUString* pEntry = aEntries.getArray(); + Sequence< OUString > aEntries = xDict->getConversionEntries( ConversionDirection_FROM_LEFT ); + sal_uInt32 n = aEntries.getLength(); + OUString* pEntry = aEntries.getArray(); while( n ) { m_aOriginalLB.InsertEntry( *pEntry ); @@ -1783,15 +1783,15 @@ namespace svx } m_aScrollSB.SetThumbPos( 0 ); - UpdateScrollbar(); // will force edits to be filled new + UpdateScrollbar(); // will force edits to be filled new } void HangulHanjaEditDictDialog::SetEditText( Edit& _rEdit, sal_uInt16 _nEntryNum ) { - String aStr; + String aStr; if( m_pSuggestions ) { - const String* p = m_pSuggestions->Get( _nEntryNum ); + const String* p = m_pSuggestions->Get( _nEntryNum ); if( p ) aStr = *p; } @@ -1803,7 +1803,7 @@ namespace svx { m_bModifiedSuggestions = true; - String aTxt( _pEdit->GetText() ); + String aTxt( _pEdit->GetText() ); sal_uInt16 nEntryNum = m_nTopPos + _nEntryOffset; if( aTxt.Len() == 0 ) { @@ -1823,26 +1823,26 @@ namespace svx } HangulHanjaEditDictDialog::HangulHanjaEditDictDialog( Window* _pParent, HHDictList& _rDictList, sal_uInt32 _nSelDict ) - :ModalDialog ( _pParent, CUI_RES( RID_SVX_MDLG_HANGULHANJA_EDIT ) ) - ,m_aEditHintText ( CUI_RES( STR_EDITHINT ) ) - ,m_rDictList ( _rDictList ) - ,m_nCurrentDict ( 0xFFFFFFFF ) - ,m_pSuggestions ( NULL ) - ,m_aBookFT ( this, CUI_RES( FT_BOOK ) ) - ,m_aBookLB ( this, CUI_RES( LB_BOOK ) ) - ,m_aOriginalFT ( this, CUI_RES( FT_ORIGINAL ) ) - ,m_aOriginalLB ( this, CUI_RES( LB_ORIGINAL ) ) - ,m_aSuggestionsFT ( this, CUI_RES( FT_SUGGESTIONS ) ) - ,m_aEdit1 ( this, CUI_RES( ED_1 ), m_aScrollSB, NULL, &m_aEdit2 ) - ,m_aEdit2 ( this, CUI_RES( ED_2 ), m_aScrollSB, &m_aEdit1, &m_aEdit3 ) - ,m_aEdit3 ( this, CUI_RES( ED_3 ), m_aScrollSB, &m_aEdit2, &m_aEdit4 ) - ,m_aEdit4 ( this, CUI_RES( ED_4 ), m_aScrollSB, &m_aEdit3, NULL ) - ,m_aScrollSB ( this, CUI_RES( SB_SCROLL ) ) - ,m_aNewPB ( this, CUI_RES( PB_HHE_NEW ) ) - ,m_aDeletePB ( this, CUI_RES( PB_HHE_DELETE ) ) - ,m_aHelpPB ( this, CUI_RES( PB_HHE_HELP ) ) - ,m_aClosePB ( this, CUI_RES( PB_HHE_CLOSE ) ) - ,m_nTopPos ( 0 ) + :ModalDialog ( _pParent, CUI_RES( RID_SVX_MDLG_HANGULHANJA_EDIT ) ) + ,m_aEditHintText ( CUI_RES( STR_EDITHINT ) ) + ,m_rDictList ( _rDictList ) + ,m_nCurrentDict ( 0xFFFFFFFF ) + ,m_pSuggestions ( NULL ) + ,m_aBookFT ( this, CUI_RES( FT_BOOK ) ) + ,m_aBookLB ( this, CUI_RES( LB_BOOK ) ) + ,m_aOriginalFT ( this, CUI_RES( FT_ORIGINAL ) ) + ,m_aOriginalLB ( this, CUI_RES( LB_ORIGINAL ) ) + ,m_aSuggestionsFT ( this, CUI_RES( FT_SUGGESTIONS ) ) + ,m_aEdit1 ( this, CUI_RES( ED_1 ), m_aScrollSB, NULL, &m_aEdit2 ) + ,m_aEdit2 ( this, CUI_RES( ED_2 ), m_aScrollSB, &m_aEdit1, &m_aEdit3 ) + ,m_aEdit3 ( this, CUI_RES( ED_3 ), m_aScrollSB, &m_aEdit2, &m_aEdit4 ) + ,m_aEdit4 ( this, CUI_RES( ED_4 ), m_aScrollSB, &m_aEdit3, NULL ) + ,m_aScrollSB ( this, CUI_RES( SB_SCROLL ) ) + ,m_aNewPB ( this, CUI_RES( PB_HHE_NEW ) ) + ,m_aDeletePB ( this, CUI_RES( PB_HHE_DELETE ) ) + ,m_aHelpPB ( this, CUI_RES( PB_HHE_HELP ) ) + ,m_aClosePB ( this, CUI_RES( PB_HHE_CLOSE ) ) + ,m_nTopPos ( 0 ) ,m_bModifiedSuggestions ( false ) ,m_bModifiedOriginal ( false ) { @@ -1859,12 +1859,12 @@ namespace svx #error number of suggestions should not under-run the value of 5 #endif - Link aScrLk( LINK( this, HangulHanjaEditDictDialog, ScrollHdl ) ); + Link aScrLk( LINK( this, HangulHanjaEditDictDialog, ScrollHdl ) ); m_aScrollSB.SetScrollHdl( aScrLk ); m_aScrollSB.SetEndScrollHdl( aScrLk ); m_aScrollSB.SetRangeMin( 0 ); m_aScrollSB.SetRangeMax( MAXNUM_SUGGESTIONS ); - m_aScrollSB.SetPageSize( 4 ); // because we have 4 edits / page + m_aScrollSB.SetPageSize( 4 ); // because we have 4 edits / page m_aScrollSB.SetVisibleSize( 4 ); m_aEdit1.SetModifyHdl( LINK( this, HangulHanjaEditDictDialog, EditModifyHdl1 ) ); @@ -1873,10 +1873,10 @@ namespace svx m_aEdit4.SetModifyHdl( LINK( this, HangulHanjaEditDictDialog, EditModifyHdl4 ) ); m_aBookLB.SetSelectHdl( LINK( this, HangulHanjaEditDictDialog, BookLBSelectHdl ) ); - sal_uInt32 nDictCnt = m_rDictList.size(); + sal_uInt32 nDictCnt = m_rDictList.size(); for( sal_uInt32 n = 0 ; n < nDictCnt ; ++n ) { - Reference< XConversionDictionary > xDic( m_rDictList[n] ); + Reference< XConversionDictionary > xDic( m_rDictList[n] ); String aName; if(xDic.is()) aName = xDic->getName(); @@ -1897,7 +1897,7 @@ namespace svx void HangulHanjaEditDictDialog::UpdateScrollbar( void ) { - sal_uInt16 nPos = sal_uInt16( m_aScrollSB.GetThumbPos() ); + sal_uInt16 nPos = sal_uInt16( m_aScrollSB.GetThumbPos() ); m_nTopPos = nPos; SetEditText( m_aEdit1, nPos++ ); @@ -1907,7 +1907,7 @@ namespace svx } //............................................................................. -} // namespace svx +} // namespace svx //............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/hangulhanjadlg.hrc b/cui/source/dialogs/hangulhanjadlg.hrc index 817e3a17264a..d8ad70b21af0 100644 --- a/cui/source/dialogs/hangulhanjadlg.hrc +++ b/cui/source/dialogs/hangulhanjadlg.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,33 +32,33 @@ #endif // PushButton -#define PB_FIND 1 +#define PB_FIND 1 // Control -#define CTL_SUGGESTIONS 1 +#define CTL_SUGGESTIONS 1 // FixedText -#define FT_FORMAT 1 -#define FT_RESIZE_ANCHOR 2 -#define FT_CONVERSION 3 +#define FT_FORMAT 1 +#define FT_RESIZE_ANCHOR 2 +#define FT_CONVERSION 3 // RadioButton -#define RB_SIMPLE_CONVERSION 1 -#define RB_HANJA_HANGUL_BRACKETED 2 -#define RB_HANGUL_HANJA_BRACKETED 3 -#define RB_HANGUL_HANJA_ABOVE 4 -#define RB_HANGUL_HANJA_BELOW 5 -#define RB_HANJA_HANGUL_ABOVE 6 -#define RB_HANJA_HANGUL_BELOW 7 +#define RB_SIMPLE_CONVERSION 1 +#define RB_HANJA_HANGUL_BRACKETED 2 +#define RB_HANGUL_HANJA_BRACKETED 3 +#define RB_HANGUL_HANJA_ABOVE 4 +#define RB_HANGUL_HANJA_BELOW 5 +#define RB_HANJA_HANGUL_ABOVE 6 +#define RB_HANJA_HANGUL_BELOW 7 // CheckBox -#define CB_REPLACE_BY_CHARACTER 1 -#define CB_HANGUL_ONLY 2 -#define CB_HANJA_ONLY 3 +#define CB_REPLACE_BY_CHARACTER 1 +#define CB_HANGUL_ONLY 2 +#define CB_HANJA_ONLY 3 // String -#define STR_HANGUL 1 -#define STR_HANJA 2 +#define STR_HANGUL 1 +#define STR_HANJA 2 #define FT_WORD 10 #define FT_AKTWORD 11 @@ -78,120 +78,120 @@ // Hangul / Hanja Options Dialog -#define FT_USERDEFDICT 1 -#define FL_OPTIONS 2 +#define FT_USERDEFDICT 1 +#define FL_OPTIONS 2 #define BTN_OPTIONS 10 -#define LB_DICTS 1 +#define LB_DICTS 1 -#define CB_IGNOREPOST 1 -#define CB_SHOWRECENTLYFIRST 3 -#define CB_AUTOREPLACEUNIQUE 4 +#define CB_IGNOREPOST 1 +#define CB_SHOWRECENTLYFIRST 3 +#define CB_AUTOREPLACEUNIQUE 4 -#define PB_HHO_NEW 1 -#define PB_HHO_EDIT 2 -#define PB_HHO_DELETE 3 -#define PB_HHO_OK 4 -#define PB_HHO_CANCEL 5 -#define PB_HHO_HELP 6 +#define PB_HHO_NEW 1 +#define PB_HHO_EDIT 2 +#define PB_HHO_DELETE 3 +#define PB_HHO_OK 4 +#define PB_HHO_CANCEL 5 +#define PB_HHO_HELP 6 // metrics -#define HHO_DLGWIDTH 287 -#define HHx_DLGHIGHT 175 -#define HHO_COL_1 RSC_SP_DLG_INNERBORDER_LEFT -#define HHO_COL_1a (HHO_COL_1+3) -#define HHO_COL_6 (HHO_DLGWIDTH-6) -#define HHO_COL_5 (HHO_COL_6-50) -#define HHO_COL_4 (HHO_COL_5-12) -#define HHO_COL_3 (HHO_COL_4-50) -#define HHO_COL_2 (HHO_COL_3-6) - -#define HHO_ROW_1 RSC_SP_DLG_INNERBORDER_TOP -#define HHO_ROW_2 (HHO_ROW_1+8+2) -#define HHO_ROW_3 (HHO_ROW_2+14) -#define HHO_ROW_4 (HHO_ROW_3+2) -#define HHO_ROW_5 (HHO_ROW_4+14) -#define HHO_ROW_6 (HHO_ROW_5+2) -#define HHO_ROW_7 (HHO_ROW_6+14) -#define HHO_ROW_8 (HHO_ROW_7+4) -#define HHO_ROW_9 (HHO_ROW_8+8+4) -#define HHO_ROW_11 (HHO_ROW_9+8+4) -#define HHO_ROW_12 (HHO_ROW_11+8+4) - -#define HHO_ROW_a1 HHO_ROW_1 -#define HHO_ROW_a2 (HHO_ROW_a1+14) -#define HHO_ROW_a3 (HHO_ROW_a2+2) -#define HHO_ROW_a4 (HHO_ROW_a3+14) -#define HHO_ROW_a5 (HHO_ROW_a4+4) -#define HHO_ROW_a6 (HHO_ROW_a5+14) +#define HHO_DLGWIDTH 287 +#define HHx_DLGHIGHT 175 +#define HHO_COL_1 RSC_SP_DLG_INNERBORDER_LEFT +#define HHO_COL_1a (HHO_COL_1+3) +#define HHO_COL_6 (HHO_DLGWIDTH-6) +#define HHO_COL_5 (HHO_COL_6-50) +#define HHO_COL_4 (HHO_COL_5-12) +#define HHO_COL_3 (HHO_COL_4-50) +#define HHO_COL_2 (HHO_COL_3-6) + +#define HHO_ROW_1 RSC_SP_DLG_INNERBORDER_TOP +#define HHO_ROW_2 (HHO_ROW_1+8+2) +#define HHO_ROW_3 (HHO_ROW_2+14) +#define HHO_ROW_4 (HHO_ROW_3+2) +#define HHO_ROW_5 (HHO_ROW_4+14) +#define HHO_ROW_6 (HHO_ROW_5+2) +#define HHO_ROW_7 (HHO_ROW_6+14) +#define HHO_ROW_8 (HHO_ROW_7+4) +#define HHO_ROW_9 (HHO_ROW_8+8+4) +#define HHO_ROW_11 (HHO_ROW_9+8+4) +#define HHO_ROW_12 (HHO_ROW_11+8+4) + +#define HHO_ROW_a1 HHO_ROW_1 +#define HHO_ROW_a2 (HHO_ROW_a1+14) +#define HHO_ROW_a3 (HHO_ROW_a2+2) +#define HHO_ROW_a4 (HHO_ROW_a3+14) +#define HHO_ROW_a5 (HHO_ROW_a4+4) +#define HHO_ROW_a6 (HHO_ROW_a5+14) // Hangul / Hanja New Dictonary Dialog -#define FL_NEWDICT 1 +#define FL_NEWDICT 1 -#define FT_DICTNAME 1 +#define FT_DICTNAME 1 -#define ED_DICTNAME 1 +#define ED_DICTNAME 1 -#define PB_NEWDICT_OK 1 -#define PB_NEWDICT_ESC 2 -#define PB_NEWDICT_HLP 3 +#define PB_NEWDICT_OK 1 +#define PB_NEWDICT_ESC 2 +#define PB_NEWDICT_HLP 3 // Hangul Hanja Edit Custom Dictionary Dialog -#define MAXNUM_SUGGESTIONS 50 +#define MAXNUM_SUGGESTIONS 50 -#define STR_EDITHINT 1 +#define STR_EDITHINT 1 -#define FT_BOOK 1 -#define FT_ORIGINAL 2 -#define FT_SUGGESTIONS 3 +#define FT_BOOK 1 +#define FT_ORIGINAL 2 +#define FT_SUGGESTIONS 3 -#define LB_BOOK 1 -#define LB_ORIGINAL 2 +#define LB_BOOK 1 +#define LB_ORIGINAL 2 -#define PB_HHE_NEW 1 -#define PB_HHE_DELETE 2 -#define PB_HHE_HELP 3 -#define PB_HHE_CLOSE 4 +#define PB_HHE_NEW 1 +#define PB_HHE_DELETE 2 +#define PB_HHE_HELP 3 +#define PB_HHE_CLOSE 4 -#define SB_SCROLL 1 +#define SB_SCROLL 1 -#define ED_1 1 -#define ED_2 2 -#define ED_3 3 -#define ED_4 4 +#define ED_1 1 +#define ED_2 2 +#define ED_3 3 +#define ED_4 4 // metrics -#define RSC_CD_VSCRLWIDTH 8 // vertical scroll bar width -#define HHE_DLGWIDTH HHO_DLGWIDTH -#define HHE_COL_1 RSC_SP_DLG_INNERBORDER_LEFT -#define HHE_COL_6 (HHE_DLGWIDTH-RSC_SP_DLG_INNERBORDER_RIGHT) -#define HHE_COL_5 (HHE_COL_6-RSC_CD_PUSHBUTTON_WIDTH) -#define HHE_COL_4 (HHE_COL_5-6) -#define HHE_COL_3_2 (HHE_COL_4-RSC_CD_VSCRLWIDTH) -#define HHE_COL_3_1 (HHE_COL_3_2-RSC_SP_CTRL_GROUP_X) -#define HHE_COL_3_0 (HHE_COL_3_2-RSC_CD_PUSHBUTTON_WIDTH) -#define HHE_COL_2 (HHE_COL_1+50) -#define HHE_COL_3 (HHE_COL_2+1) - -#define HHE_ROW_1 RSC_SP_DLG_INNERBORDER_TOP -#define HHE_ROW_2 (HHE_ROW_1+2) -#define HHE_ROW_3 (HHE_ROW_2+12) -#define HHE_ROW_4 (HHE_ROW_3+12) -#define HHE_ROW_5 (HHE_ROW_4+8+2) -#define HHE_ROW_6 (HHE_ROW_5+12) -#define HHE_ROW_7 (HHE_ROW_6+2) -#define HHE_ROW_8 (HHE_ROW_7+2) -#define HHE_ROW_9 (HHE_ROW_6+12) -#define HHE_ROW_10 (HHE_ROW_8+RSC_SP_CTRL_GROUP_Y) -#define HHE_ROW_11 (HHE_ROW_10+8+2) -#define HHE_ROW_12 (HHE_ROW_11+4*12) -#define HHE_ROW_14 (HHx_DLGHIGHT-RSC_SP_DLG_INNERBORDER_BOTTOM) -#define HHE_ROW_13 (HHE_ROW_14-RSC_CD_PUSHBUTTON_HEIGHT) -#define HHE_ROW_a1 (HHE_ROW_5) -#define HHE_ROW_a3 (HHE_ROW_a1+RSC_CD_PUSHBUTTON_HEIGHT+2) +#define RSC_CD_VSCRLWIDTH 8 // vertical scroll bar width +#define HHE_DLGWIDTH HHO_DLGWIDTH +#define HHE_COL_1 RSC_SP_DLG_INNERBORDER_LEFT +#define HHE_COL_6 (HHE_DLGWIDTH-RSC_SP_DLG_INNERBORDER_RIGHT) +#define HHE_COL_5 (HHE_COL_6-RSC_CD_PUSHBUTTON_WIDTH) +#define HHE_COL_4 (HHE_COL_5-6) +#define HHE_COL_3_2 (HHE_COL_4-RSC_CD_VSCRLWIDTH) +#define HHE_COL_3_1 (HHE_COL_3_2-RSC_SP_CTRL_GROUP_X) +#define HHE_COL_3_0 (HHE_COL_3_2-RSC_CD_PUSHBUTTON_WIDTH) +#define HHE_COL_2 (HHE_COL_1+50) +#define HHE_COL_3 (HHE_COL_2+1) + +#define HHE_ROW_1 RSC_SP_DLG_INNERBORDER_TOP +#define HHE_ROW_2 (HHE_ROW_1+2) +#define HHE_ROW_3 (HHE_ROW_2+12) +#define HHE_ROW_4 (HHE_ROW_3+12) +#define HHE_ROW_5 (HHE_ROW_4+8+2) +#define HHE_ROW_6 (HHE_ROW_5+12) +#define HHE_ROW_7 (HHE_ROW_6+2) +#define HHE_ROW_8 (HHE_ROW_7+2) +#define HHE_ROW_9 (HHE_ROW_6+12) +#define HHE_ROW_10 (HHE_ROW_8+RSC_SP_CTRL_GROUP_Y) +#define HHE_ROW_11 (HHE_ROW_10+8+2) +#define HHE_ROW_12 (HHE_ROW_11+4*12) +#define HHE_ROW_14 (HHx_DLGHIGHT-RSC_SP_DLG_INNERBORDER_BOTTOM) +#define HHE_ROW_13 (HHE_ROW_14-RSC_CD_PUSHBUTTON_HEIGHT) +#define HHE_ROW_a1 (HHE_ROW_5) +#define HHE_ROW_a3 (HHE_ROW_a1+RSC_CD_PUSHBUTTON_HEIGHT+2) #endif // SVX_HANGUL_HANJA_DLG_HRC diff --git a/cui/source/dialogs/hangulhanjadlg.src b/cui/source/dialogs/hangulhanjadlg.src index 11e2fe415c38..46f52601f0e9 100644 --- a/cui/source/dialogs/hangulhanjadlg.src +++ b/cui/source/dialogs/hangulhanjadlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -189,7 +189,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_OPT Text [ en-US ] = "Hangul/Hanja Options" ; Moveable = TRUE ; Closeable = TRUE ; - + FixedText FT_USERDEFDICT { Pos = MAP_APPFONT ( HHO_COL_1 , HHO_ROW_1 ) ; @@ -327,7 +327,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT Text [ en-US ] = "Edit Custom Dictionary" ; Moveable = TRUE ; Closeable = TRUE ; - + String STR_EDITHINT { Text [ en-US ] = "[Enter text here]"; @@ -395,7 +395,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT ScrollBar SB_SCROLL { Pos = MAP_APPFONT ( HHE_COL_3_2 , HHE_ROW_11 ) ; - Size = MAP_APPFONT ( RSC_CD_VSCRLWIDTH , HHE_ROW_12 - HHE_ROW_11 ) ; // height = 48 + Size = MAP_APPFONT ( RSC_CD_VSCRLWIDTH , HHE_ROW_12 - HHE_ROW_11 ) ; // height = 48 VScroll = TRUE ; Drag = TRUE ; }; diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index db9ab3647e41..b47d675ff67b 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -113,15 +113,15 @@ sal_Bool SvxHyperlinkNewDocTp::ImplGetURLObject( const String& rPath, const Stri |************************************************************************/ SvxHyperlinkNewDocTp::SvxHyperlinkNewDocTp ( Window *pParent, const SfxItemSet& rItemSet) -: SvxHyperlinkTabPageBase ( pParent, CUI_RES( RID_SVXPAGE_HYPERLINK_NEWDOCUMENT ), rItemSet ), - maGrpNewDoc ( this, CUI_RES (GRP_NEWDOCUMENT) ), - maRbtEditNow ( this, CUI_RES (RB_EDITNOW) ), - maRbtEditLater ( this, CUI_RES (RB_EDITLATER) ), - maFtPath ( this, CUI_RES (FT_PATH_NEWDOC) ), - maCbbPath ( this, INET_PROT_FILE ), - maBtCreate ( this, CUI_RES (BTN_CREATE) ), - maFtDocTypes ( this, CUI_RES (FT_DOCUMENT_TYPES) ), - maLbDocTypes ( this, CUI_RES (LB_DOCUMENT_TYPES) ) +: SvxHyperlinkTabPageBase ( pParent, CUI_RES( RID_SVXPAGE_HYPERLINK_NEWDOCUMENT ), rItemSet ), + maGrpNewDoc ( this, CUI_RES (GRP_NEWDOCUMENT) ), + maRbtEditNow ( this, CUI_RES (RB_EDITNOW) ), + maRbtEditLater ( this, CUI_RES (RB_EDITLATER) ), + maFtPath ( this, CUI_RES (FT_PATH_NEWDOC) ), + maCbbPath ( this, INET_PROT_FILE ), + maBtCreate ( this, CUI_RES (BTN_CREATE) ), + maFtDocTypes ( this, CUI_RES (FT_DOCUMENT_TYPES) ), + maLbDocTypes ( this, CUI_RES (LB_DOCUMENT_TYPES) ) { // Set HC bitmaps and disable display of bitmap names. maBtCreate.SetModeImage( Image( CUI_RES( IMG_CREATE_HC ) ), BMP_COLOR_HIGHCONTRAST ); @@ -136,12 +136,12 @@ SvxHyperlinkNewDocTp::SvxHyperlinkNewDocTp ( Window *pParent, const SfxItemSet& LogicToPixel( Size ( 176 - COL_DIFF, 60), MAP_APPFONT ) ); maCbbPath.Show(); maCbbPath.SetBaseURL(SvtPathOptions().GetWorkPath()); -// maCbbPath.SetHelpId( HID_HYPERDLG_DOC_PATH ); +// maCbbPath.SetHelpId( HID_HYPERDLG_DOC_PATH ); // set defaults maRbtEditNow.Check(); - maBtCreate.SetClickHdl ( LINK ( this, SvxHyperlinkNewDocTp, ClickNewHdl_Impl ) ); + maBtCreate.SetClickHdl ( LINK ( this, SvxHyperlinkNewDocTp, ClickNewHdl_Impl ) ); FillDocumentList (); } @@ -172,7 +172,7 @@ void SvxHyperlinkNewDocTp::FillDlgFields ( String& /*aStrURL*/ ) #define INTERNETSHORTCUT_TARGET_TAG "Target" #define INTERNETSHORTCUT_FOLDER_TAG "Folder" #define INTERNETSHORTCUT_URL_TAG "URL" -#define INTERNETSHORTCUT_ICONID_TAG "IconIndex" +#define INTERNETSHORTCUT_ICONID_TAG "IconIndex" void SvxHyperlinkNewDocTp::ReadURLFile( const String& rFile, String& rTitle, String& rURL, sal_Int32& rIconId, BOOL* pShowAsFolder ) { @@ -239,8 +239,8 @@ void SvxHyperlinkNewDocTp::FillDocumentList () // Insert into listbox if ( aDocumentUrl.getLength() ) { - if ( aDocumentUrl.equalsAscii( "private:factory/simpress?slot=6686" ) ) // SJ: #106216# do not start - aDocumentUrl = String( RTL_CONSTASCII_USTRINGPARAM( "private:factory/simpress" ) ); // the AutoPilot for impress + if ( aDocumentUrl.equalsAscii( "private:factory/simpress?slot=6686" ) ) // SJ: #106216# do not start + aDocumentUrl = String( RTL_CONSTASCII_USTRINGPARAM( "private:factory/simpress" ) ); // the AutoPilot for impress // insert private-url and default-extension as user-data const SfxFilter* pFilter = SfxFilter::GetDefaultFilterFromFactory( aDocumentUrl ); @@ -407,8 +407,8 @@ void SvxHyperlinkNewDocTp::DoApply () &aFrame, &aReferer, 0L ); // save new doc - const SfxViewFrameItem *pItem = PTR_CAST( SfxViewFrameItem, pReturn ); // SJ: pReturn is NULL if the Hyperlink - if ( pItem ) // creation is cancelled #106216# + const SfxViewFrameItem *pItem = PTR_CAST( SfxViewFrameItem, pReturn ); // SJ: pReturn is NULL if the Hyperlink + if ( pItem ) // creation is cancelled #106216# { pViewFrame = pItem->GetFrame(); if (pViewFrame) @@ -452,18 +452,18 @@ void SvxHyperlinkNewDocTp::DoApply () IMPL_LINK ( SvxHyperlinkNewDocTp, ClickNewHdl_Impl, void *, EMPTYARG ) { - rtl::OUString aService( RTL_CONSTASCII_USTRINGPARAM( FOLDER_PICKER_SERVICE_NAME ) ); - uno::Reference < XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); - uno::Reference < XFolderPicker > xFolderPicker( xFactory->createInstance( aService ), UNO_QUERY ); + rtl::OUString aService( RTL_CONSTASCII_USTRINGPARAM( FOLDER_PICKER_SERVICE_NAME ) ); + uno::Reference < XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); + uno::Reference < XFolderPicker > xFolderPicker( xFactory->createInstance( aService ), UNO_QUERY ); - String aStrURL; - String aTempStrURL( maCbbPath.GetText() ); + String aStrURL; + String aTempStrURL( maCbbPath.GetText() ); utl::LocalFileHelper::ConvertSystemPathToURL( aTempStrURL, maCbbPath.GetBaseURL(), aStrURL ); - String aStrPath = aStrURL; - BOOL bZeroPath = ( aStrPath.Len() == 0 ); - BOOL bHandleFileName = bZeroPath; // when path has length of 0, then the rest should always be handled - // as file name, otherwise we do not yet know + String aStrPath = aStrURL; + BOOL bZeroPath = ( aStrPath.Len() == 0 ); + BOOL bHandleFileName = bZeroPath; // when path has length of 0, then the rest should always be handled + // as file name, otherwise we do not yet know if( bZeroPath ) aStrPath = SvtPathOptions().GetWorkPath(); @@ -476,15 +476,15 @@ IMPL_LINK ( SvxHyperlinkNewDocTp, ClickNewHdl_Impl, void *, EMPTYARG ) DisableClose( sal_False ); if( ExecutableDialogResults::OK == nResult ) { - sal_Char const sSlash[] = "/"; + sal_Char const sSlash[] = "/"; - INetURLObject aURL( aStrURL, INET_PROT_FILE ); - String aStrName; + INetURLObject aURL( aStrURL, INET_PROT_FILE ); + String aStrName; if( bHandleFileName ) aStrName = bZeroPath? aTempStrURL : String(aURL.getName()); maCbbPath.SetBaseURL( xFolderPicker->getDirectory() ); - String aStrTmp( xFolderPicker->getDirectory() ); + String aStrTmp( xFolderPicker->getDirectory() ); if( aStrTmp.GetChar( aStrTmp.Len() - 1 ) != sSlash[0] ) aStrTmp.AppendAscii( sSlash ); @@ -493,7 +493,7 @@ IMPL_LINK ( SvxHyperlinkNewDocTp, ClickNewHdl_Impl, void *, EMPTYARG ) if( bHandleFileName ) aStrTmp += aStrName; - INetURLObject aNewURL( aStrTmp ); + INetURLObject aNewURL( aStrTmp ); if( aStrName.Len() > 0 && aNewURL.getExtension().getLength() > 0 && maLbDocTypes.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ) diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index 095e959cdca6..85298cac627b 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,8 +38,8 @@ #include "hyperdlg.hrc" #include "hlmarkwn_def.hxx" -sal_Char __READONLY_DATA sHash[] = "#"; -sal_Char __READONLY_DATA sFileScheme[] = INET_FILE_SCHEME; +sal_Char __READONLY_DATA sHash[] = "#"; +sal_Char __READONLY_DATA sFileScheme[] = INET_FILE_SCHEME; sal_Char __READONLY_DATA sNewsSRVScheme[] = "news://"; // TODO news:// is nonsense sal_Char __READONLY_DATA sHTTPScheme[] = INET_HTTP_SCHEME; @@ -53,15 +53,15 @@ sal_Char __READONLY_DATA sHTTPScheme[] = INET_HTTP_SCHEME; SvxHyperlinkDocTp::SvxHyperlinkDocTp ( Window *pParent, const SfxItemSet& rItemSet) : SvxHyperlinkTabPageBase ( pParent, CUI_RES( RID_SVXPAGE_HYPERLINK_DOCUMENT ), rItemSet ), maGrpDocument ( this, CUI_RES (GRP_DOCUMENT) ), - maFtPath ( this, CUI_RES (FT_PATH_DOC) ), - maCbbPath ( this, INET_PROT_FILE ), - maBtFileopen ( this, CUI_RES (BTN_FILEOPEN) ), - maGrpTarget ( this, CUI_RES (GRP_TARGET) ), - maFtTarget ( this, CUI_RES (FT_TARGET_DOC) ), - maEdTarget ( this, CUI_RES (ED_TARGET_DOC) ), - maFtURL ( this, CUI_RES (FT_URL) ), - maFtFullURL ( this, CUI_RES (FT_FULL_URL) ), - maBtBrowse ( this, CUI_RES (BTN_BROWSE) ), + maFtPath ( this, CUI_RES (FT_PATH_DOC) ), + maCbbPath ( this, INET_PROT_FILE ), + maBtFileopen ( this, CUI_RES (BTN_FILEOPEN) ), + maGrpTarget ( this, CUI_RES (GRP_TARGET) ), + maFtTarget ( this, CUI_RES (FT_TARGET_DOC) ), + maEdTarget ( this, CUI_RES (ED_TARGET_DOC) ), + maFtURL ( this, CUI_RES (FT_URL) ), + maFtFullURL ( this, CUI_RES (FT_FULL_URL) ), + maBtBrowse ( this, CUI_RES (BTN_BROWSE) ), mbMarkWndOpen ( FALSE ) { // Set HC bitmaps and disable display of bitmap names. diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index f0d3cf1878e8..0fb46b07dc01 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,8 +37,8 @@ #include "hyperdlg.hrc" #include "hlmarkwn_def.hxx" -#define STD_DOC_SUBPATH "internal" -#define STD_DOC_NAME "url_transfer.htm" +#define STD_DOC_SUBPATH "internal" +#define STD_DOC_NAME "url_transfer.htm" sal_Char __READONLY_DATA sAnonymous[] = "anonymous"; sal_Char __READONLY_DATA sHTTPScheme[] = INET_HTTP_SCHEME; @@ -57,18 +57,18 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window *pParent, : SvxHyperlinkTabPageBase ( pParent, CUI_RES( RID_SVXPAGE_HYPERLINK_INTERNET ), rItemSet ) , maGrpLinkTyp ( this, CUI_RES (GRP_LINKTYPE) ), - maRbtLinktypInternet ( this, CUI_RES (RB_LINKTYP_INTERNET) ), - maRbtLinktypFTP ( this, CUI_RES (RB_LINKTYP_FTP) ), - maRbtLinktypTelnet ( this, CUI_RES (RB_LINKTYP_TELNET) ), - maFtTarget ( this, CUI_RES (FT_TARGET_HTML) ), - maCbbTarget ( this, INET_PROT_HTTP ), - maFtLogin ( this, CUI_RES (FT_LOGIN) ), - maEdLogin ( this, CUI_RES (ED_LOGIN) ), - maFtPassword ( this, CUI_RES (FT_PASSWD) ), - maEdPassword ( this, CUI_RES (ED_PASSWD) ), - maCbAnonymous ( this, CUI_RES (CBX_ANONYMOUS) ), - maBtBrowse ( this, CUI_RES (BTN_BROWSE) ), - maBtTarget ( this, CUI_RES (BTN_TARGET) ), + maRbtLinktypInternet ( this, CUI_RES (RB_LINKTYP_INTERNET) ), + maRbtLinktypFTP ( this, CUI_RES (RB_LINKTYP_FTP) ), + maRbtLinktypTelnet ( this, CUI_RES (RB_LINKTYP_TELNET) ), + maFtTarget ( this, CUI_RES (FT_TARGET_HTML) ), + maCbbTarget ( this, INET_PROT_HTTP ), + maFtLogin ( this, CUI_RES (FT_LOGIN) ), + maEdLogin ( this, CUI_RES (ED_LOGIN) ), + maFtPassword ( this, CUI_RES (FT_PASSWD) ), + maEdPassword ( this, CUI_RES (ED_PASSWD) ), + maCbAnonymous ( this, CUI_RES (CBX_ANONYMOUS) ), + maBtBrowse ( this, CUI_RES (BTN_BROWSE) ), + maBtTarget ( this, CUI_RES (BTN_TARGET) ), mbMarkWndOpen ( FALSE ) { // Set HC bitmaps and display display of bitmap names. @@ -121,10 +121,10 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window *pParent, maCbAnonymous.SetClickHdl ( LINK ( this, SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl ) ); maBtBrowse.SetClickHdl ( LINK ( this, SvxHyperlinkInternetTp, ClickBrowseHdl_Impl ) ); maBtTarget.SetClickHdl ( LINK ( this, SvxHyperlinkInternetTp, ClickTargetHdl_Impl ) ); - maEdLogin.SetModifyHdl ( LINK ( this, SvxHyperlinkInternetTp, ModifiedLoginHdl_Impl ) ); - maCbbTarget.SetLoseFocusHdl ( LINK ( this, SvxHyperlinkInternetTp, LostFocusTargetHdl_Impl ) ); - maCbbTarget.SetModifyHdl ( LINK ( this, SvxHyperlinkInternetTp, ModifiedTargetHdl_Impl ) ); - maTimer.SetTimeoutHdl ( LINK ( this, SvxHyperlinkInternetTp, TimeoutHdl_Impl ) ); + maEdLogin.SetModifyHdl ( LINK ( this, SvxHyperlinkInternetTp, ModifiedLoginHdl_Impl ) ); + maCbbTarget.SetLoseFocusHdl ( LINK ( this, SvxHyperlinkInternetTp, LostFocusTargetHdl_Impl ) ); + maCbbTarget.SetModifyHdl ( LINK ( this, SvxHyperlinkInternetTp, ModifiedTargetHdl_Impl ) ); + maTimer.SetTimeoutHdl ( LINK ( this, SvxHyperlinkInternetTp, TimeoutHdl_Impl ) ); } SvxHyperlinkInternetTp::~SvxHyperlinkInternetTp () diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index b7d26c2cb378..034e19e4a4b7 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,10 +55,10 @@ SvxHyperlinkMailTp::SvxHyperlinkMailTp ( Window *pParent, const SfxItemSet& rIte : SvxHyperlinkTabPageBase ( pParent, CUI_RES( RID_SVXPAGE_HYPERLINK_MAIL ), rItemSet ), maGrpMailNews ( this, CUI_RES (GRP_MAILNEWS) ), - maRbtMail ( this, CUI_RES (RB_LINKTYP_MAIL) ), - maRbtNews ( this, CUI_RES (RB_LINKTYP_NEWS) ), - maFtReceiver ( this, CUI_RES (FT_RECEIVER) ), - maCbbReceiver ( this, INET_PROT_MAILTO ), + maRbtMail ( this, CUI_RES (RB_LINKTYP_MAIL) ), + maRbtNews ( this, CUI_RES (RB_LINKTYP_NEWS) ), + maFtReceiver ( this, CUI_RES (FT_RECEIVER) ), + maCbbReceiver ( this, INET_PROT_MAILTO ), maBtAdrBook ( this, CUI_RES (BTN_ADRESSBOOK) ), maFtSubject ( this, CUI_RES (FT_SUBJECT) ), maEdSubject ( this, CUI_RES (ED_SUBJECT) ) @@ -83,10 +83,10 @@ SvxHyperlinkMailTp::SvxHyperlinkMailTp ( Window *pParent, const SfxItemSet& rIte maRbtMail.Check (); // overload handlers - maRbtMail.SetClickHdl ( LINK ( this, SvxHyperlinkMailTp, Click_SmartProtocol_Impl ) ); - maRbtNews.SetClickHdl ( LINK ( this, SvxHyperlinkMailTp, Click_SmartProtocol_Impl ) ); - maBtAdrBook.SetClickHdl ( LINK ( this, SvxHyperlinkMailTp, ClickAdrBookHdl_Impl ) ); - maCbbReceiver.SetModifyHdl ( LINK ( this, SvxHyperlinkMailTp, ModifiedReceiverHdl_Impl) ); + maRbtMail.SetClickHdl ( LINK ( this, SvxHyperlinkMailTp, Click_SmartProtocol_Impl ) ); + maRbtNews.SetClickHdl ( LINK ( this, SvxHyperlinkMailTp, Click_SmartProtocol_Impl ) ); + maBtAdrBook.SetClickHdl ( LINK ( this, SvxHyperlinkMailTp, ClickAdrBookHdl_Impl ) ); + maCbbReceiver.SetModifyHdl ( LINK ( this, SvxHyperlinkMailTp, ModifiedReceiverHdl_Impl) ); if ( !SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::E_SDATABASE ) ) maBtAdrBook.Hide(); @@ -311,7 +311,7 @@ IMPL_LINK ( SvxHyperlinkMailTp, ClickAdrBookHdl_Impl, void *, EMPTYARG ) } -/* uno::Reference< frame::XDispatchProvider > xProv( pViewFrame->GetFrame().GetFrameInterface(), uno::UNO_QUERY ); +/* uno::Reference< frame::XDispatchProvider > xProv( pViewFrame->GetFrame().GetFrameInterface(), uno::UNO_QUERY ); if ( xProv.is() ) { !!! (pb) we need a new config item here diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index 99b18e053783..30a6a9f959c0 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,11 +63,11 @@ using namespace ::rtl; struct TargetData { - OUString aUStrLinkname; - BOOL bIsTarget; + OUString aUStrLinkname; + BOOL bIsTarget; TargetData ( OUString aUStrLName, BOOL bTarget ) - : bIsTarget ( bTarget ) + : bIsTarget ( bTarget ) { if ( bIsTarget ) aUStrLinkname = aUStrLName; @@ -77,13 +77,13 @@ struct TargetData //######################################################################## //# # -//# Tree-Window # +//# Tree-Window # //# # //######################################################################## SvxHlmarkTreeLBox::SvxHlmarkTreeLBox( Window* pParent, const ResId& rResId ) -: SvTreeListBox ( pParent, rResId ), - mpParentWnd ( (SvxHlinkDlgMarkWnd*) pParent ) +: SvTreeListBox ( pParent, rResId ), + mpParentWnd ( (SvxHlinkDlgMarkWnd*) pParent ) { SetNodeDefaultImages(); } @@ -119,7 +119,7 @@ void SvxHlmarkTreeLBox::Paint( const Rectangle& rRect ) //######################################################################## //# # -//# Window-Class # +//# Window-Class # //# # //######################################################################## @@ -130,20 +130,20 @@ void SvxHlmarkTreeLBox::Paint( const Rectangle& rRect ) |************************************************************************/ SvxHlinkDlgMarkWnd::SvxHlinkDlgMarkWnd( SvxHyperlinkTabPageBase *pParent ) -: ModalDialog( (Window*)pParent, CUI_RES ( RID_SVXFLOAT_HYPERLINK_MARKWND ) ), +: ModalDialog( (Window*)pParent, CUI_RES ( RID_SVXFLOAT_HYPERLINK_MARKWND ) ), maBtApply( this, CUI_RES (BT_APPLY) ), maBtClose( this, CUI_RES (BT_CLOSE) ), maLbTree ( this, CUI_RES (TLB_MARK) ), mbUserMoved ( FALSE ), - mbFirst ( TRUE ), - mpParent ( pParent ), - mnError ( LERR_NOERROR ) + mbFirst ( TRUE ), + mpParent ( pParent ), + mnError ( LERR_NOERROR ) { FreeResource(); - maBtApply.SetClickHdl ( LINK ( this, SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl ) ); - maBtClose.SetClickHdl ( LINK ( this, SvxHlinkDlgMarkWnd, ClickCloseHdl_Impl ) ); - maLbTree.SetDoubleClickHdl ( LINK ( this, SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl ) ); + maBtApply.SetClickHdl ( LINK ( this, SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl ) ); + maBtClose.SetClickHdl ( LINK ( this, SvxHlinkDlgMarkWnd, ClickCloseHdl_Impl ) ); + maLbTree.SetDoubleClickHdl ( LINK ( this, SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl ) ); // Tree-ListBox mit Linien versehen maLbTree.SetWindowBits( WinBits( WB_TABSTOP | WB_BORDER | WB_HASLINES | diff --git a/cui/source/dialogs/hlmarkwn.hrc b/cui/source/dialogs/hlmarkwn.hrc index 1ac36dafa099..81222451262e 100644 --- a/cui/source/dialogs/hlmarkwn.hrc +++ b/cui/source/dialogs/hlmarkwn.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 @@ -25,10 +25,10 @@ * ************************************************************************/ -#define BT_APPLY 1 -#define BT_CLOSE 2 -#define TLB_MARK 3 +#define BT_APPLY 1 +#define BT_CLOSE 2 +#define TLB_MARK 3 -//#define HYPERLINK_BMP_EXPAND 301 -//#define HYPERLINK_BMP_COLLAPSE 302 +//#define HYPERLINK_BMP_EXPAND 301 +//#define HYPERLINK_BMP_COLLAPSE 302 diff --git a/cui/source/dialogs/hlmarkwn.src b/cui/source/dialogs/hlmarkwn.src index 396e8cd573e0..5454312bf1b4 100644 --- a/cui/source/dialogs/hlmarkwn.src +++ b/cui/source/dialogs/hlmarkwn.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index cc09d911be0c..bbe131c7c33f 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,7 +59,7 @@ using namespace ::ucbhelper; SvxFramesComboBox::SvxFramesComboBox ( Window* pParent, const ResId& rResId, SfxDispatcher* pDispatch ) -: ComboBox (pParent, rResId) +: ComboBox (pParent, rResId) { TargetList* pList = new TargetList; SfxViewFrame* pViewFrame = pDispatch ? pDispatch->GetFrame() : 0; @@ -88,9 +88,9 @@ SvxFramesComboBox::~SvxFramesComboBox () { } //######################################################################## -//# # -//# ComboBox-Control for URL's with History and Autocompletion # -//# # +//# # +//# ComboBox-Control for URL's with History and Autocompletion # +//# # //######################################################################## /************************************************************************* @@ -100,9 +100,9 @@ SvxFramesComboBox::~SvxFramesComboBox () |************************************************************************/ SvxHyperURLBox::SvxHyperURLBox( Window* pParent, INetProtocol eSmart, BOOL bAddresses ) -: SvtURLBox ( pParent, eSmart ), +: SvtURLBox ( pParent, eSmart ), DropTargetHelper ( this ), - mbAccessAddress (bAddresses) + mbAccessAddress (bAddresses) { } @@ -113,7 +113,7 @@ sal_Int8 SvxHyperURLBox::AcceptDrop( const AcceptDropEvent& /* rEvt */ ) sal_Int8 SvxHyperURLBox::ExecuteDrop( const ExecuteDropEvent& rEvt ) { - TransferableDataHelper aDataHelper( rEvt.maDropEvent.Transferable ); + TransferableDataHelper aDataHelper( rEvt.maDropEvent.Transferable ); String aString; sal_Int8 nRet = DND_ACTION_NONE; @@ -158,19 +158,19 @@ long SvxHyperURLBox::PreNotify( NotifyEvent& rNEvt ) SvxHyperlinkTabPageBase::SvxHyperlinkTabPageBase ( Window *pParent, const ResId &rResId, const SfxItemSet& rItemSet ) -: IconChoicePage ( pParent, rResId, rItemSet ), - mpGrpMore ( NULL ), - mpFtFrame ( NULL ), - mpCbbFrame ( NULL ), - mpFtForm ( NULL ), - mpLbForm ( NULL ), - mpFtIndication ( NULL ), - mpEdIndication ( NULL ), - mpFtText ( NULL ), - mpEdText ( NULL ), - mpBtScript ( NULL ), +: IconChoicePage ( pParent, rResId, rItemSet ), + mpGrpMore ( NULL ), + mpFtFrame ( NULL ), + mpCbbFrame ( NULL ), + mpFtForm ( NULL ), + mpLbForm ( NULL ), + mpFtIndication ( NULL ), + mpEdIndication ( NULL ), + mpFtText ( NULL ), + mpEdText ( NULL ), + mpBtScript ( NULL ), mbIsCloseDisabled ( sal_False ), - mpDialog ( pParent ), + mpDialog ( pParent ), mbStdControlsInit ( FALSE ), aEmptyStr() { @@ -192,7 +192,7 @@ SvxHyperlinkTabPageBase::~SvxHyperlinkTabPageBase () delete mpFtIndication; delete mpEdIndication; delete mpFtText; - delete mpEdText ; + delete mpEdText ; delete mpBtScript; } @@ -218,16 +218,16 @@ void SvxHyperlinkTabPageBase::InitStdControls () { if ( !mbStdControlsInit ) { - mpGrpMore = new FixedLine ( this, ResId (GRP_MORE, *m_pResMgr) ); - mpFtFrame = new FixedText ( this, ResId (FT_FRAME, *m_pResMgr) ); + mpGrpMore = new FixedLine ( this, ResId (GRP_MORE, *m_pResMgr) ); + mpFtFrame = new FixedText ( this, ResId (FT_FRAME, *m_pResMgr) ); mpCbbFrame = new SvxFramesComboBox ( this, ResId (CB_FRAME, *m_pResMgr), GetDispatcher() ); - mpFtForm = new FixedText ( this, ResId (FT_FORM, *m_pResMgr) ); - mpLbForm = new ListBox ( this, ResId (LB_FORM, *m_pResMgr) ); - mpFtIndication= new FixedText ( this, ResId (FT_INDICATION, *m_pResMgr) ); - mpEdIndication= new Edit ( this, ResId (ED_INDICATION, *m_pResMgr) ); - mpFtText = new FixedText ( this, ResId (FT_TEXT, *m_pResMgr) ); - mpEdText = new Edit ( this, ResId (ED_TEXT, *m_pResMgr) ); - mpBtScript = new ImageButton ( this, ResId (BTN_SCRIPT, *m_pResMgr) ); + mpFtForm = new FixedText ( this, ResId (FT_FORM, *m_pResMgr) ); + mpLbForm = new ListBox ( this, ResId (LB_FORM, *m_pResMgr) ); + mpFtIndication= new FixedText ( this, ResId (FT_INDICATION, *m_pResMgr) ); + mpEdIndication= new Edit ( this, ResId (ED_INDICATION, *m_pResMgr) ); + mpFtText = new FixedText ( this, ResId (FT_TEXT, *m_pResMgr) ); + mpEdText = new Edit ( this, ResId (ED_TEXT, *m_pResMgr) ); + mpBtScript = new ImageButton ( this, ResId (BTN_SCRIPT, *m_pResMgr) ); mpBtScript->SetClickHdl ( LINK ( this, SvxHyperlinkTabPageBase, ClickScriptHdl_Impl ) ); @@ -246,7 +246,7 @@ void SvxHyperlinkTabPageBase::InitStdControls () BOOL SvxHyperlinkTabPageBase::MoveToExtraWnd( Point aNewPos, BOOL bDisConnectDlg ) { - BOOL bReturn = mpMarkWnd->MoveTo ( aNewPos ); + BOOL bReturn = mpMarkWnd->MoveTo ( aNewPos ); if( bDisConnectDlg ) mpMarkWnd->ConnectToDialog( FALSE ); @@ -267,7 +267,7 @@ void SvxHyperlinkTabPageBase::ShowMarkWnd () // Size of dialog-window in screen pixels Rectangle aDlgRect( mpDialog->GetWindowExtentsRelative( NULL ) ); Point aDlgPos ( aDlgRect.TopLeft() ); - Size aDlgSize ( mpDialog->GetSizePixel () ); + Size aDlgSize ( mpDialog->GetSizePixel () ); // Absolute size of the screen Rectangle aScreen( mpDialog->GetDesktopRectPixel() ); @@ -531,8 +531,8 @@ BOOL SvxHyperlinkTabPageBase::FileExists( const INetURLObject& rURL ) { try { - Content aCnt( rURL.GetMainURL( INetURLObject::NO_DECODE ), ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >() ); - ::rtl::OUString aTitle; + Content aCnt( rURL.GetMainURL( INetURLObject::NO_DECODE ), ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >() ); + ::rtl::OUString aTitle; aCnt.getPropertyValue( ::rtl::OUString::createFromAscii( "Title" ) ) >>= aTitle; bRet = ( aTitle.getLength() > 0 ); @@ -599,10 +599,10 @@ void SvxHyperlinkTabPageBase::GetDataFromCommonFields( String& aStrName, String& aStrIntName, String& aStrFrame, SvxLinkInsertMode& eMode ) { - aStrIntName = mpEdText->GetText(); - aStrName = mpEdIndication->GetText(); - aStrFrame = mpCbbFrame->GetText(); - eMode = (SvxLinkInsertMode) (mpLbForm->GetSelectEntryPos()+1); + aStrIntName = mpEdText->GetText(); + aStrName = mpEdIndication->GetText(); + aStrFrame = mpCbbFrame->GetText(); + eMode = (SvxLinkInsertMode) (mpLbForm->GetSelectEntryPos()+1); if( IsHTMLDoc() ) eMode = (SvxLinkInsertMode) ( UINT16(eMode) | HLINK_HTMLMODE ); } @@ -662,8 +662,8 @@ BOOL SvxHyperlinkTabPageBase::FillItemSet( SfxItemSet& rOut) String SvxHyperlinkTabPageBase::CreateUiNameFromURL( const String& aStrURL ) { - String aStrUiURL; - INetURLObject aURLObj( aStrURL ); + String aStrUiURL; + INetURLObject aURLObj( aStrURL ); switch(aURLObj.GetProtocol()) { @@ -673,7 +673,7 @@ String SvxHyperlinkTabPageBase::CreateUiNameFromURL( const String& aStrURL ) case INET_PROT_FTP : { //remove password from name - INetURLObject aTmpURL(aURLObj); + INetURLObject aTmpURL(aURLObj); aTmpURL.SetPass(aEmptyStr); aStrUiURL = aTmpURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ); } diff --git a/cui/source/dialogs/hyperdlg.hrc b/cui/source/dialogs/hyperdlg.hrc index 0228d65bf3d2..6d6c476dd0f2 100644 --- a/cui/source/dialogs/hyperdlg.hrc +++ b/cui/source/dialogs/hyperdlg.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,74 +27,74 @@ /* Tabpage : Hyperlink - Internet */ -#define GRP_LINKTYPE 1 -#define RB_LINKTYP_INTERNET 2 -#define RB_LINKTYP_FTP 3 -#define RB_LINKTYP_TELNET 4 -#define FT_TARGET_HTML 5 -#define CB_TARGET_HTML 6 -#define FT_LOGIN 7 -#define ED_LOGIN 8 -#define FT_PASSWD 9 -#define ED_PASSWD 10 -#define CBX_ANONYMOUS 11 -#define BTN_BROWSE 12 -#define BTN_TARGET 13 -#define IMG_BROWSE_HC 14 -#define IMG_TARGET_HC 15 +#define GRP_LINKTYPE 1 +#define RB_LINKTYP_INTERNET 2 +#define RB_LINKTYP_FTP 3 +#define RB_LINKTYP_TELNET 4 +#define FT_TARGET_HTML 5 +#define CB_TARGET_HTML 6 +#define FT_LOGIN 7 +#define ED_LOGIN 8 +#define FT_PASSWD 9 +#define ED_PASSWD 10 +#define CBX_ANONYMOUS 11 +#define BTN_BROWSE 12 +#define BTN_TARGET 13 +#define IMG_BROWSE_HC 14 +#define IMG_TARGET_HC 15 /* Tabpage : Hyperlink - Mail & News */ -#define GRP_MAILNEWS 1 -#define RB_LINKTYP_MAIL 2 -#define RB_LINKTYP_NEWS 3 -#define FT_RECEIVER 4 -#define CB_RECEIVER 5 -#define FT_SUBJECT 6 -#define ED_SUBJECT 7 -#define BTN_ADRESSBOOK 8 -#define IMG_ADRESSBOOK_HC 9 +#define GRP_MAILNEWS 1 +#define RB_LINKTYP_MAIL 2 +#define RB_LINKTYP_NEWS 3 +#define FT_RECEIVER 4 +#define CB_RECEIVER 5 +#define FT_SUBJECT 6 +#define ED_SUBJECT 7 +#define BTN_ADRESSBOOK 8 +#define IMG_ADRESSBOOK_HC 9 /* Tabpage : Hyperlink - Document */ -#define GRP_DOCUMENT 1 -#define FT_PATH_DOC 2 -#define CB_PATH_DOC 3 -#define BTN_FILEOPEN 4 -#define GRP_TARGET 5 -#define FT_TARGET_DOC 6 -#define ED_TARGET_DOC 7 -#define FT_URL 8 -#define FT_FULL_URL 9 -#define IMG_FILEOPEN_HC 10 +#define GRP_DOCUMENT 1 +#define FT_PATH_DOC 2 +#define CB_PATH_DOC 3 +#define BTN_FILEOPEN 4 +#define GRP_TARGET 5 +#define FT_TARGET_DOC 6 +#define ED_TARGET_DOC 7 +#define FT_URL 8 +#define FT_FULL_URL 9 +#define IMG_FILEOPEN_HC 10 /* Tabpage : Hyperlink - New document */ -#define GRP_NEWDOCUMENT 1 -#define RB_EDITNOW 2 -#define RB_EDITLATER 3 -#define FT_PATH_NEWDOC 4 -#define ED_PATH_NEWDOC 5 -#define FT_DOCUMENT_TYPES 6 -#define LB_DOCUMENT_TYPES 7 -#define BTN_CREATE 8 -#define IMG_CREATE_HC 9 +#define GRP_NEWDOCUMENT 1 +#define RB_EDITNOW 2 +#define RB_EDITLATER 3 +#define FT_PATH_NEWDOC 4 +#define ED_PATH_NEWDOC 5 +#define FT_DOCUMENT_TYPES 6 +#define LB_DOCUMENT_TYPES 7 +#define BTN_CREATE 8 +#define IMG_CREATE_HC 9 /* Tabpage-section : Hyperlink - more justifications */ -#define GRP_MORE 30 -#define FT_FRAME 31 -#define CB_FRAME 32 -#define FT_FORM 33 -#define LB_FORM 34 -#define FT_INDICATION 35 -#define ED_INDICATION 36 -#define FT_TEXT 37 -#define ED_TEXT 38 -#define BTN_SCRIPT 39 -#define IMG_SCRIPT_HC 40 +#define GRP_MORE 30 +#define FT_FRAME 31 +#define CB_FRAME 32 +#define FT_FORM 33 +#define LB_FORM 34 +#define FT_INDICATION 35 +#define ED_INDICATION 36 +#define FT_TEXT 37 +#define ED_TEXT 38 +#define BTN_SCRIPT 39 +#define IMG_SCRIPT_HC 40 -#define COL_OLD 54 -#define COL_2 63 -#define COL_DIFF (COL_2 - COL_OLD) +#define COL_OLD 54 +#define COL_2 63 +#define COL_DIFF (COL_2 - COL_OLD) diff --git a/cui/source/dialogs/hyperdlg.src b/cui/source/dialogs/hyperdlg.src index 4ed7d1419bba..614c3a41ba66 100644 --- a/cui/source/dialogs/hyperdlg.src +++ b/cui/source/dialogs/hyperdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ #include "helpid.hrc" #include "hyperdlg.hrc" -#define MASKCOLOR MaskColor = Color { Red=0xFFFF; Green=0x0000; Blue=0xFFFF; }; +#define MASKCOLOR MaskColor = Color { Red=0xFFFF; Green=0x0000; Blue=0xFFFF; }; #define HYPERDLG_IMGBUTTON_HEIGHT RSC_CD_PUSHBUTTON_HEIGHT+2 /************************************************************************* diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx index 7f9bede9aedc..45c438ea2fd5 100644 --- a/cui/source/dialogs/hyphen.cxx +++ b/cui/source/dialogs/hyphen.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,7 +63,7 @@ public: HyphenEdit_Impl( Window* pParent, const ResId& rResId ); protected: - virtual void KeyInput( const KeyEvent &rKEvt ); + virtual void KeyInput( const KeyEvent &rKEvt ); }; @@ -75,7 +75,7 @@ HyphenEdit_Impl::HyphenEdit_Impl( Window* pParent, const ResId& rResId ) : void HyphenEdit_Impl::KeyInput( const KeyEvent& rKEvt ) { -// sal_uInt16 nMod = rKEvt.GetKeyCode().GetModifier(); +// sal_uInt16 nMod = rKEvt.GetKeyCode().GetModifier(); sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode(); switch ( nCode ) @@ -94,7 +94,7 @@ void HyphenEdit_Impl::KeyInput( const KeyEvent& rKEvt ) Edit::KeyInput(rKEvt); break; default: - Control::KeyInput( rKEvt ); // An den Dialog weiterleiten + Control::KeyInput( rKEvt ); // An den Dialog weiterleiten break; } } @@ -106,7 +106,7 @@ struct SvxHyphenWordDialog_Impl { SvxHyphenWordDialog * m_pDialog; // Window * m_pParent; - + FixedText aWordFT; HyphenEdit_Impl aWordEdit; ImageButton aLeftBtn; @@ -151,9 +151,9 @@ struct SvxHyphenWordDialog_Impl DECL_LINK( GetFocusHdl_Impl, Edit* ); - SvxHyphenWordDialog_Impl( + SvxHyphenWordDialog_Impl( SvxHyphenWordDialog * pDialog, - const String &rWord, + const String &rWord, LanguageType nLang, uno::Reference< linguistic2::XHyphenator > &xHyphen, SvxSpellWrapper* pWrapper ); @@ -161,9 +161,9 @@ struct SvxHyphenWordDialog_Impl }; -SvxHyphenWordDialog_Impl::SvxHyphenWordDialog_Impl( +SvxHyphenWordDialog_Impl::SvxHyphenWordDialog_Impl( SvxHyphenWordDialog * pDialog, - const String &rWord, + const String &rWord, LanguageType nLang, uno::Reference< linguistic2::XHyphenator > &xHyphen, SvxSpellWrapper* pWrapper ) : @@ -197,7 +197,7 @@ SvxHyphenWordDialog_Impl::SvxHyphenWordDialog_Impl( xHyphenator = xHyphen; pHyphWrapper = pWrapper; - uno::Reference< linguistic2::XHyphenatedWord > xHyphWord( pHyphWrapper ? + uno::Reference< linguistic2::XHyphenatedWord > xHyphWord( pHyphWrapper ? pHyphWrapper->GetLast() : NULL, uno::UNO_QUERY ); DBG_ASSERT( xHyphWord.is(), "hyphenation result missing" ); if (xHyphWord.is()) @@ -209,7 +209,7 @@ SvxHyphenWordDialog_Impl::SvxHyphenWordDialog_Impl( InitControls_Impl(); aWordEdit.GrabFocus(); - + aLeftBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog_Impl, Left_Impl ) ); aRightBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog_Impl, Right_Impl ) ); aOkBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog_Impl, CutHdl_Impl ) ); @@ -219,11 +219,11 @@ SvxHyphenWordDialog_Impl::SvxHyphenWordDialog_Impl( aCancelBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog_Impl, CancelHdl_Impl ) ); aWordEdit.SetGetFocusHdl( LINK( this, SvxHyphenWordDialog_Impl, GetFocusHdl_Impl ) ); } - + SvxHyphenWordDialog_Impl::~SvxHyphenWordDialog_Impl() { -} +} void SvxHyphenWordDialog_Impl::EnableLRBtn_Impl() @@ -264,7 +264,7 @@ String SvxHyphenWordDialog_Impl::EraseUnusableHyphens_Impl( // returns a String showing only those hyphen positions which will result // in a line break if hyphenation is done there // 1) we will need to discard all hyphenation positions at th end that - // will not result in a line break where the text to the left still fits + // will not result in a line break where the text to the left still fits // on the line. // 2) since as from OOo 3.2 '-' are part of a word an thus text like // 'multi-line-editor' is regarded as single word we also need to discard those @@ -272,11 +272,11 @@ String SvxHyphenWordDialog_Impl::EraseUnusableHyphens_Impl( // the rightmost valid hyphenation position according to 1) // // Example: - // If the possible hyphenation position in 'multi-line-editor' are to eb marked + // If the possible hyphenation position in 'multi-line-editor' are to eb marked // by '=' then the text will look like this 'mul=ti-line-ed=it=or'. // If now the first line is only large enough for 'multi-line-edi' we need to discard - // the last possible hyphnation point because of 1). The the right most valid - // hyphenation position is "ed=itor". The first '-' left of this position is + // the last possible hyphnation point because of 1). The the right most valid + // hyphenation position is "ed=itor". The first '-' left of this position is // "line-ed", thus because of 2) we now need to discard all possible hyphneation // positions to the left of that as well. Thus in the end leaving us with just // 'multi-line-ed=itor' as return value for this function. (Just one valid hyphenation @@ -516,7 +516,7 @@ IMPL_LINK( SvxHyphenWordDialog_Impl, HyphenateAllHdl_Impl, Button *, EMPTYARG /* uno::Reference< beans::XPropertySet > xProp( SvxGetLinguPropertySet() ); const rtl::OUString aName( rtl::OUString::createFromAscii( "IsHyphAuto" ) ); uno::Any aAny; - + aAny <<= sal_True; xProp->setPropertyValue( aName, aAny ); @@ -531,10 +531,10 @@ IMPL_LINK( SvxHyphenWordDialog_Impl, HyphenateAllHdl_Impl, Button *, EMPTYARG /* { (void) e; DBG_ASSERT( 0, "Hyphenate All failed" ); - } + } } return 0; -} +} IMPL_LINK( SvxHyphenWordDialog_Impl, DeleteHdl_Impl, Button *, EMPTYARG ) @@ -604,15 +604,15 @@ IMPL_LINK( SvxHyphenWordDialog_Impl, GetFocusHdl_Impl, Edit *, EMPTYARG ) return 0; } - + // class SvxHyphenWordDialog --------------------------------------------- -SvxHyphenWordDialog::SvxHyphenWordDialog( +SvxHyphenWordDialog::SvxHyphenWordDialog( const String &rWord, LanguageType nLang, Window* pParent, uno::Reference< linguistic2::XHyphenator > &xHyphen, SvxSpellWrapper* pWrapper ) : - + SfxModalDialog( pParent, CUI_RES( RID_SVXDLG_HYPHENATE ) ) { m_pImpl = std::auto_ptr< SvxHyphenWordDialog_Impl >( @@ -630,7 +630,7 @@ SvxHyphenWordDialog::SvxHyphenWordDialog( SvxHyphenWordDialog::~SvxHyphenWordDialog() { -} +} void SvxHyphenWordDialog::SetWindowTitle( LanguageType nLang ) diff --git a/cui/source/dialogs/hyphen.hrc b/cui/source/dialogs/hyphen.hrc index f76e2aa75770..ba195caeb3ab 100755 --- a/cui/source/dialogs/hyphen.hrc +++ b/cui/source/dialogs/hyphen.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,17 +29,17 @@ // defines ------------------------------------------------------------------ -#define ED_WORD 10 -#define BTN_LEFT 11 -#define BTN_RIGHT 12 +#define ED_WORD 10 +#define BTN_LEFT 11 +#define BTN_RIGHT 12 #define FT_WORD 13 #define FL_BOTTOM 14 -#define BTN_HYPH_CONTINUE 20 -#define BTN_HYPH_DELETE 21 -#define BTN_HYPH_CUT 22 -#define BTN_HYPH_CANCEL 23 -#define BTN_HYPH_HELP 24 +#define BTN_HYPH_CONTINUE 20 +#define BTN_HYPH_DELETE 21 +#define BTN_HYPH_CUT 22 +#define BTN_HYPH_CANCEL 23 +#define BTN_HYPH_HELP 24 #define BTN_HYPH_ALL 25 #endif diff --git a/cui/source/dialogs/hyphen.src b/cui/source/dialogs/hyphen.src index f10e94626f31..f90048a61823 100755 --- a/cui/source/dialogs/hyphen.src +++ b/cui/source/dialogs/hyphen.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 140338916149..034ef6bc2183 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,8 +60,8 @@ int IconcDlgCmpUS_Impl( const void* p1, const void* p2 ) } // some stuff for easier changes for SvtViewOptions -static const sal_Char* pViewOptDataName = "dialog data"; -#define VIEWOPT_DATANAME ::rtl::OUString::createFromAscii( pViewOptDataName ) +static const sal_Char* pViewOptDataName = "dialog data"; +#define VIEWOPT_DATANAME ::rtl::OUString::createFromAscii( pViewOptDataName ) static inline void SetViewOptUserItem( SvtViewOptions& rOpt, const String& rData ) { @@ -92,11 +92,11 @@ static inline String GetViewOptUserItem( const SvtViewOptions& rOpt ) IconChoicePage::IconChoicePage( Window *pParent, const ResId &rResId, const SfxItemSet &rAttrSet ) -: TabPage ( pParent, rResId ), - pSet ( &rAttrSet ), - bHasExchangeSupport ( FALSE ), - pDialog ( NULL ), - bStandard ( FALSE ) +: TabPage ( pParent, rResId ), + pSet ( &rAttrSet ), + bHasExchangeSupport ( FALSE ), + pDialog ( NULL ), + bStandard ( FALSE ) { SetStyle ( GetStyle() | WB_DIALOGCONTROL | WB_HIDE ); } @@ -269,7 +269,7 @@ void IconChoicePage::DataChanged( const DataChangedEvent& rDCEvt ) IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId, const EIconChoicePos ePos, const SfxItemSet *pItemSet )//, BOOL bEditFmt, const String *pUserButtonText = 0 ) -: ModalDialog ( pParent, rResId ), +: ModalDialog ( pParent, rResId ), meChoicePos ( ePos ), maIconCtrl ( this, WB_3DLOOK | WB_ICON | WB_BORDER | WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME | @@ -277,9 +277,9 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId, mnCurrentPageId ( USHRT_MAX ), aOKBtn ( this, WB_DEFBUTTON ), - aCancelBtn ( this, WB_DEFBUTTON ), - aHelpBtn ( this ), - aResetBtn ( this ), + aCancelBtn ( this, WB_DEFBUTTON ), + aHelpBtn ( this ), + aResetBtn ( this ), pSet ( pItemSet ), pOutSet ( NULL ), pExampleSet ( NULL ), @@ -287,9 +287,9 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId, nResId ( rResId.GetId() ), bHideResetBtn ( FALSE ), - bModal ( FALSE ), - bInOK ( FALSE ), - bModified ( FALSE ), + bModal ( FALSE ), + bInOK ( FALSE ), + bModified ( FALSE ), bItemsReset ( FALSE ) { // IconChoiceCtrl-Settings @@ -311,7 +311,7 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId, } // Buttons - aOKBtn.SetClickHdl ( LINK( this, IconChoiceDialog, OkHdl ) ); + aOKBtn.SetClickHdl ( LINK( this, IconChoiceDialog, OkHdl ) ); aOKBtn.SetHelpId( HID_ICCDIALOG_OK_BTN ); aCancelBtn.SetHelpId( HID_ICCDIALOG_CANCEL_BTN ); aResetBtn.SetClickHdl( LINK( this, IconChoiceDialog, ResetHdl ) ); @@ -331,15 +331,15 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId, IconChoiceDialog ::IconChoiceDialog ( SfxViewFrame *pViewFrame, Window* pParent, const ResId &rResId, const SfxItemSet * = 0, BOOL bEditFmt = FALSE, const String *pUserButtonText = 0 ) -: meChoicePos ( PosLeft ), // Default erst ma Links - maIconCtrl ( this, Die_Winbits ), - aOKBtn ( this ), - pUserBtn ( pUserButtonText? new PushButton(this): 0 ), - aCancelBtn ( this ), - aHelpBtn ( this ), - aResetBtn ( this ), - aBaseFmtBtn ( this ), - mnCurrentPageId ( 0 ) +: meChoicePos ( PosLeft ), // Default erst ma Links + maIconCtrl ( this, Die_Winbits ), + aOKBtn ( this ), + pUserBtn ( pUserButtonText? new PushButton(this): 0 ), + aCancelBtn ( this ), + aHelpBtn ( this ), + aResetBtn ( this ), + aBaseFmtBtn ( this ), + mnCurrentPageId ( 0 ) { FreeResource(); } @@ -382,7 +382,7 @@ IconChoiceDialog ::~IconChoiceDialog () } // remove Pagelist -/* for ( i=0; i<maPageList.Count(); i++ ) +/* for ( i=0; i<maPageList.Count(); i++ ) { IconChoicePageData* pData = (IconChoicePageData*)maPageList.GetObject ( i ); @@ -429,7 +429,7 @@ SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage( USHORT nId, const String& pData->bOnDemand = bItemsOnDemand; USHORT *pId = new USHORT ( nId ); - SvxIconChoiceCtrlEntry* pEntry = maIconCtrl.InsertEntry( rIconText, rChoiceIcon ); + SvxIconChoiceCtrlEntry* pEntry = maIconCtrl.InsertEntry( rIconText, rChoiceIcon ); pEntry->SetUserData ( (void*) pId ); return pEntry; } @@ -450,7 +450,7 @@ SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage( USHORT nId, const String& pData->bOnDemand = bItemsOnDemand; USHORT *pId = new USHORT ( nId ); - SvxIconChoiceCtrlEntry* pEntry = maIconCtrl.InsertEntry( rIconText, rChoiceIcon, rChoiceIconHC ); + SvxIconChoiceCtrlEntry* pEntry = maIconCtrl.InsertEntry( rIconText, rChoiceIcon, rChoiceIconHC ); pEntry->SetUserData ( (void*) pId ); return pEntry; } @@ -625,10 +625,10 @@ void IconChoiceDialog::ShowPage( USHORT nId ) | \**********************************************************************/ -#define ICONCTRL_WIDTH_PIXEL 110 -#define ICONCTRL_HEIGHT_PIXEL 75 -#define MINSIZE_BUTTON_WIDTH 70 -#define MINSIZE_BUTTON_HEIGHT 22 +#define ICONCTRL_WIDTH_PIXEL 110 +#define ICONCTRL_HEIGHT_PIXEL 75 +#define MINSIZE_BUTTON_WIDTH 70 +#define MINSIZE_BUTTON_HEIGHT 22 void IconChoiceDialog::Resize() { @@ -1145,7 +1145,7 @@ void IconChoiceDialog::SetInputSet( const SfxItemSet* pInSet ) // ----------------------------------------------------------------------- -// Liefert die Pages, die ihre Sets onDemand liefern, das OutputItemSet. +// Liefert die Pages, die ihre Sets onDemand liefern, das OutputItemSet. const SfxItemSet* IconChoiceDialog::GetOutputItemSet ( USHORT nId ) { IconChoicePageData * pData = GetPageData ( nId ); @@ -1361,7 +1361,7 @@ short IconChoiceDialog::Ok() if ( !pOutSet ) { if ( !pExampleSet && pSet ) - pOutSet = pSet->Clone( FALSE ); // ohne Items + pOutSet = pSet->Clone( FALSE ); // ohne Items else if ( pExampleSet ) pOutSet = new SfxItemSet( *pExampleSet ); } diff --git a/cui/source/dialogs/iconcdlg.src b/cui/source/dialogs/iconcdlg.src index c7d7d029b0df..6bcca8ba2f82 100644 --- a/cui/source/dialogs/iconcdlg.src +++ b/cui/source/dialogs/iconcdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index 7ffcd1eefe98..cf5a0d59883f 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx index 588b105d26d5..80e41147e022 100644 --- a/cui/source/dialogs/insrc.cxx +++ b/cui/source/dialogs/insrc.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/insrc.hrc b/cui/source/dialogs/insrc.hrc index 2583ade5619f..0c780df36bd9 100644 --- a/cui/source/dialogs/insrc.hrc +++ b/cui/source/dialogs/insrc.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 @@ -24,17 +24,17 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define FT_COUNT 1 -#define ED_COUNT 2 +#define FT_COUNT 1 +#define ED_COUNT 2 #define FL_INS 3 -#define CB_POS_BEFORE 10 -#define CB_POS_AFTER 11 +#define CB_POS_BEFORE 10 +#define CB_POS_AFTER 11 #define FL_POS 12 -#define STR_ROW 20 -#define STR_COL 21 +#define STR_ROW 20 +#define STR_COL 21 -#define BT_OK 100 -#define BT_CANCEL 101 -#define BT_HELP 102 +#define BT_OK 100 +#define BT_CANCEL 101 +#define BT_HELP 102 diff --git a/cui/source/dialogs/insrc.src b/cui/source/dialogs/insrc.src index 69f934a29049..6139dcd37898 100644 --- a/cui/source/dialogs/insrc.src +++ b/cui/source/dialogs/insrc.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index 26f08b73e2f0..13230b7fd851 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,10 +57,10 @@ #define _SVSTDARR_USHORTS #include <svl/svstdarr.hxx> -#define MAX_FILENAME 18 -#define MAX_LINKNAME 18 -#define MAX_TYPENAME 15 -#define MAX_UPDATENAME 10 +#define MAX_FILENAME 18 +#define MAX_LINKNAME 18 +#define MAX_TYPENAME 15 +#define MAX_UPDATENAME 10 #define FILEOBJECT ( OBJECT_CLIENT_FILE & ~OBJECT_CLIENT_SO ) @@ -70,7 +70,7 @@ SV_DECL_IMPL_REF_LIST(SvBaseLink,SvBaseLink*) // Achtung im Code wird dieses Array direkt (0, 1, ...) indiziert static long nTabs[] = - { 4, // Number of Tabs + { 4, // Number of Tabs 0, 77, 144, 209 }; @@ -143,9 +143,9 @@ SvBaseLinksDlg::~SvBaseLinksDlg() /************************************************************************* |* SvBaseLinksDlg::Handler() |* -|* Beschreibung -|* Ersterstellung MM 14.06.94 -|* Letzte Aenderung JP 30.05.95 +|* Beschreibung +|* Ersterstellung MM 14.06.94 +|* Letzte Aenderung JP 30.05.95 *************************************************************************/ IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox ) { @@ -637,7 +637,7 @@ void SvBaseLinksDlg::InsertEntry( const SvBaseLink& rLink, USHORT nPos, sal_Bool INetURLObject aPath( sFileNm, INET_PROT_FILE ); String aFileName = aPath.getName(); aFileName = INetURLObject::decode(aFileName, INET_HEX_ESCAPE, INetURLObject::DECODE_UNAMBIGUOUS); - + if( aFileName.Len() > aTxt.Len() ) aTxt = aFileName; else if( aTxt.Search( aFileName, aTxt.Len() - aFileName.Len() ) == STRING_NOTFOUND ) diff --git a/cui/source/dialogs/multifil.cxx b/cui/source/dialogs/multifil.cxx index 3470d22188c2..b08265991d99 100644 --- a/cui/source/dialogs/multifil.cxx +++ b/cui/source/dialogs/multifil.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx index ffdc3834dc6c..b51f723279fa 100644 --- a/cui/source/dialogs/multipat.cxx +++ b/cui/source/dialogs/multipat.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,8 +56,8 @@ using namespace ::com::sun::star::uno; struct MultiPath_Impl { - BOOL bEmptyAllowed; - BOOL bIsClassPathMode; + BOOL bEmptyAllowed; + BOOL bIsClassPathMode; bool bIsRadioButtonMode; MultiPath_Impl( BOOL bAllowed ) : @@ -198,11 +198,11 @@ SvxMultiPathDialog::SvxMultiPathDialog( Window* pParent, BOOL bEmptyAllowed ) : aRadioLB ( this, CUI_RES( LB_RADIOBUTTON ) ), aRadioFT ( this, CUI_RES( FT_RADIOBUTTON ) ), aAddBtn ( this, CUI_RES( BTN_ADD_MULTIPATH ) ), - aDelBtn ( this, CUI_RES( BTN_DEL_MULTIPATH ) ), - aOKBtn ( this, CUI_RES( BTN_MULTIPATH_OK ) ), - aCancelBtn ( this, CUI_RES( BTN_MULTIPATH_CANCEL ) ), - aHelpButton ( this, CUI_RES( BTN_MULTIPATH_HELP ) ), - pImpl ( new MultiPath_Impl( bEmptyAllowed ) ) + aDelBtn ( this, CUI_RES( BTN_DEL_MULTIPATH ) ), + aOKBtn ( this, CUI_RES( BTN_MULTIPATH_OK ) ), + aCancelBtn ( this, CUI_RES( BTN_MULTIPATH_CANCEL ) ), + aHelpButton ( this, CUI_RES( BTN_MULTIPATH_HELP ) ), + pImpl ( new MultiPath_Impl( bEmptyAllowed ) ) { static long aStaticTabs[]= { 2, 0, 12 }; diff --git a/cui/source/dialogs/multipat.hrc b/cui/source/dialogs/multipat.hrc index 0bfda7212fb8..8d9a19fbee98 100644 --- a/cui/source/dialogs/multipat.hrc +++ b/cui/source/dialogs/multipat.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/multipat.src b/cui/source/dialogs/multipat.src index 987867492e13..45695d850b75 100644 --- a/cui/source/dialogs/multipat.src +++ b/cui/source/dialogs/multipat.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/newtabledlg.cxx b/cui/source/dialogs/newtabledlg.cxx index cdd36aeb1b1b..3e0c69e74265 100644 --- a/cui/source/dialogs/newtabledlg.cxx +++ b/cui/source/dialogs/newtabledlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/newtabledlg.hrc b/cui/source/dialogs/newtabledlg.hrc index 2357a4b1a280..b75c16a8611c 100644 --- a/cui/source/dialogs/newtabledlg.hrc +++ b/cui/source/dialogs/newtabledlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/newtabledlg.src b/cui/source/dialogs/newtabledlg.src index 4bbbd564edd1..67e64254c7b2 100644 --- a/cui/source/dialogs/newtabledlg.src +++ b/cui/source/dialogs/newtabledlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ ModalDialog RID_SVX_NEWTABLE_DLG Moveable = TRUE ; Size = MAP_APPFONT ( 181 , 6+15+15+15+14+6 ) ; Text [ en-US ] = "Insert Table" ; - + FixedText FT_COLUMNS { Pos = MAP_APPFONT ( 6 , 8 ) ; @@ -84,7 +84,7 @@ ModalDialog RID_SVX_NEWTABLE_DLG Pos = MAP_APPFONT ( 6 , 6+15+15+15 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; - }; + }; OKButton BTN_OK { Pos = MAP_APPFONT ( 69 , 6+15+15+15 ) ; diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx index f218fdd2557a..0878eb1a8430 100644 --- a/cui/source/dialogs/passwdomdlg.cxx +++ b/cui/source/dialogs/passwdomdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ class PasswordReenterEdit_Impl : public Edit // disallow use of copy c-tor and assignment operator PasswordReenterEdit_Impl( const PasswordReenterEdit_Impl & ); PasswordReenterEdit_Impl & operator = ( const PasswordReenterEdit_Impl & ); - + public: PasswordReenterEdit_Impl( Window * pParent, const ResId &rResId ); virtual ~PasswordReenterEdit_Impl(); @@ -65,14 +65,14 @@ public: virtual void Paint( const Rectangle& rRect ); }; - + PasswordReenterEdit_Impl::PasswordReenterEdit_Impl( Window * pParent, const ResId &rResId ) : Edit( pParent, rResId ) { -// currently the spec does not want to display this text anymore... +// currently the spec does not want to display this text anymore... // m_aDefaultTxt = String( CUI_RES( STR_PASSWD_MUST_BE_CONFIRMED ) ); } - + PasswordReenterEdit_Impl::~PasswordReenterEdit_Impl() { @@ -101,7 +101,7 @@ void PasswordReenterEdit_Impl::Paint( const Rectangle& rRect ) else Edit::Paint( rRect ); } - + ////////////////////////////////////////////////////////////////////// @@ -132,22 +132,22 @@ struct PasswordToOpenModifyDialog_Impl String m_aTwoMismatch; String m_aInvalidStateForOkButton; String m_aInvalidStateForOkButton_v2; - + bool m_bIsPasswordToModify; - + // DECL_LINK( ModifyHdl, Edit * ); DECL_LINK( OkBtnClickHdl, OKButton * ); - PasswordToOpenModifyDialog_Impl( PasswordToOpenModifyDialog * pParent, + PasswordToOpenModifyDialog_Impl( PasswordToOpenModifyDialog * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ); ~PasswordToOpenModifyDialog_Impl(); }; -PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl( +PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl( PasswordToOpenModifyDialog * pParent, - sal_uInt16 nMinPasswdLen, + sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ) : m_pParent( pParent ), @@ -175,7 +175,7 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl( m_aInvalidStateForOkButton_v2( CUI_RES( STR_INVALID_STATE_FOR_OK_BUTTON_V2 ) ), m_bIsPasswordToModify( bIsPasswordToModify ) { -/* +/* const sal_Bool bHighContrast = pParent->GetSettings().GetStyleSettings().GetHighContrastMode(); const Image aImage( CUI_RES( bHighContrast ? IMG_PASSWD_MATCH_HC : IMG_PASSWD_MATCH ) ); m_aPasswdToOpenMatchFI.SetImage( aImage ); @@ -216,7 +216,7 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl( m_aMoreFewerOptionsBTN.Hide( TRUE ); } - + PasswordToOpenModifyDialog_Impl::~PasswordToOpenModifyDialog_Impl() { } @@ -241,7 +241,7 @@ IMPL_LINK( PasswordToOpenModifyDialog_Impl, ModifyHdl, Edit *, EMPTYARG /*pEdit* // m_aPasswdToOpenMatchFI.Enable( bToOpenMatch && !bBothEmpty ); // m_aPasswdToModifyMatchFI.Enable( bToModifyMatch && !bBothEmpty ); - + return 0; } #endif @@ -249,12 +249,12 @@ IMPL_LINK( PasswordToOpenModifyDialog_Impl, ModifyHdl, Edit *, EMPTYARG /*pEdit* IMPL_LINK( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, OKButton *, EMPTYARG /*pBtn*/ ) { - bool bInvalidState = !m_aOpenReadonlyCB.IsChecked() && - m_aPasswdToOpenED.GetText().Len() == 0 && + bool bInvalidState = !m_aOpenReadonlyCB.IsChecked() && + m_aPasswdToOpenED.GetText().Len() == 0 && m_aPasswdToModifyED.GetText().Len() == 0; if (bInvalidState) { - ErrorBox aErrorBox( m_pParent, WB_OK, + ErrorBox aErrorBox( m_pParent, WB_OK, m_bIsPasswordToModify? m_aInvalidStateForOkButton : m_aInvalidStateForOkButton_v2 ); aErrorBox.Execute(); } @@ -267,7 +267,7 @@ IMPL_LINK( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, OKButton *, EMPTYARG { ErrorBox aErrorBox( m_pParent, WB_OK, nMismatch == 1 ? m_aOneMismatch : m_aTwoMismatch ); aErrorBox.Execute(); - + Edit &rEdit = !bToOpenMatch? m_aPasswdToOpenED : m_aPasswdToModifyED; PasswordReenterEdit_Impl &rRepeatEdit = !bToOpenMatch? m_aReenterPasswdToOpenED : m_aReenterPasswdToModifyED; String aEmpty; @@ -282,56 +282,56 @@ IMPL_LINK( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, OKButton *, EMPTYARG m_aReenterPasswdToOpenED.SetText( aEmpty ); m_aPasswdToModifyED.SetText( aEmpty ); m_aReenterPasswdToModifyED.SetText( aEmpty ); - } + } rEdit.GrabFocus(); } else { m_pParent->EndDialog( RET_OK ); } - } - + } + return 0; } ////////////////////////////////////////////////////////////////////// -PasswordToOpenModifyDialog::PasswordToOpenModifyDialog( - Window * pParent, - sal_uInt16 nMinPasswdLen, +PasswordToOpenModifyDialog::PasswordToOpenModifyDialog( + Window * pParent, + sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ) : SfxModalDialog( pParent, CUI_RES( RID_DLG_PASSWORD_TO_OPEN_MODIFY ) ) { - m_pImpl = std::auto_ptr< PasswordToOpenModifyDialog_Impl >( + m_pImpl = std::auto_ptr< PasswordToOpenModifyDialog_Impl >( new PasswordToOpenModifyDialog_Impl( this, nMinPasswdLen, nMaxPasswdLen, bIsPasswordToModify ) ); - + FreeResource(); -} +} PasswordToOpenModifyDialog::~PasswordToOpenModifyDialog() { -} +} String PasswordToOpenModifyDialog::GetPasswordToOpen() const { - const bool bPasswdOk = + const bool bPasswdOk = m_pImpl->m_aPasswdToOpenED.GetText().Len() > 0 && m_pImpl->m_aPasswdToOpenED.GetText() == m_pImpl->m_aReenterPasswdToOpenED.GetText(); return bPasswdOk ? m_pImpl->m_aPasswdToOpenED.GetText() : String(); -} +} String PasswordToOpenModifyDialog::GetPasswordToModify() const { - const bool bPasswdOk = + const bool bPasswdOk = m_pImpl->m_aPasswdToModifyED.GetText().Len() > 0 && m_pImpl->m_aPasswdToModifyED.GetText() == m_pImpl->m_aReenterPasswdToModifyED.GetText(); return bPasswdOk ? m_pImpl->m_aPasswdToModifyED.GetText() : String(); -} +} bool PasswordToOpenModifyDialog::IsRecommendToOpenReadonly() const diff --git a/cui/source/dialogs/passwdomdlg.hrc b/cui/source/dialogs/passwdomdlg.hrc index 522e4edf1da2..9ce3dab168e7 100755 --- a/cui/source/dialogs/passwdomdlg.hrc +++ b/cui/source/dialogs/passwdomdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/passwdomdlg.src b/cui/source/dialogs/passwdomdlg.src index edb84813d387..355051cba753 100755 --- a/cui/source/dialogs/passwdomdlg.src +++ b/cui/source/dialogs/passwdomdlg.src @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - + #include <cuires.hrc> #include "passwdomdlg.hrc" @@ -47,7 +47,7 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY Size = MAP_APPFONT( 165, 8 ); Text [ en-US ] = "File encryption password"; }; - + FixedText FT_PASSWD_TO_OPEN { Pos = MAP_APPFONT( 6, 17 ); @@ -103,7 +103,7 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY Pos = MAP_APPFONT( 0, 117 ); Size = MAP_APPFONT( 171, 8 ); }; - + MoreButton BTN_MORE_FEWER_OPTIONS { HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY_MORE; @@ -193,7 +193,7 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY { Text [ en-US ] = "More ~Options" ; }; - + String STR_FEWER_OPTIONS { Text [ en-US ] = "Fewer ~Options" ; @@ -213,12 +213,12 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY { Text [ en-US ] = "Please enter a password to open or to modify, or check the open read-only option to continue." ; }; -/* +/* Image IMG_PASSWD_MATCH { ImageBitmap = Bitmap { File = "apply.png"; }; }; - + Image IMG_PASSWD_MATCH_HC { ImageBitmap = Bitmap { File = "apply_h.png"; }; diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx index 90b3c1a8211e..517e778d1822 100644 --- a/cui/source/dialogs/pastedlg.cxx +++ b/cui/source/dialogs/pastedlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -161,7 +161,7 @@ ULONG SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper, ::com::sun::star::datatransfer::DataFlavor aFlavor( *aIter ); SotFormatStringId nFormat = (*aIter++).mnSotId; - String* pName = (String*) aSupplementTable.Get( nFormat ); + String* pName = (String*) aSupplementTable.Get( nFormat ); String aName; #ifdef WNT diff --git a/cui/source/dialogs/plfilter.cxx b/cui/source/dialogs/plfilter.cxx index de3a7ae9a09c..da079a8f95c5 100644 --- a/cui/source/dialogs/plfilter.cxx +++ b/cui/source/dialogs/plfilter.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx index ab4fdb0d3f1f..40ae4d89dbed 100644 --- a/cui/source/dialogs/postdlg.cxx +++ b/cui/source/dialogs/postdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ #include <unotools/useroptions.hxx> #include <unotools/localedatawrapper.hxx> #include <comphelper/processfactory.hxx> -#include <svx/svxids.hrc> // SID_ATTR_... +#include <svx/svxids.hrc> // SID_ATTR_... #include <svx/dialogs.hrc> // RID_SVXDLG_POSTIT #define _SVX_POSTDLG_CXX @@ -73,22 +73,22 @@ SvxPostItDialog::SvxPostItDialog( Window* pParent, aPostItFL ( this, CUI_RES( FL_POSTIT ) ), aLastEditLabelFT( this, CUI_RES( FT_LASTEDITLABEL ) ), - aLastEditFT ( this, CUI_RES( FT_LASTEDIT ) ), - aEditFT ( this, CUI_RES( FT_EDIT ) ), - aEditED ( this, CUI_RES( ED_EDIT ) ), + aLastEditFT ( this, CUI_RES( FT_LASTEDIT ) ), + aEditFT ( this, CUI_RES( FT_EDIT ) ), + aEditED ( this, CUI_RES( ED_EDIT ) ), aAuthorFT ( this, CUI_RES( FT_AUTHOR) ), aAuthorBtn ( this, CUI_RES( BTN_AUTHOR ) ), aOKBtn ( this, CUI_RES( BTN_POST_OK ) ), - aCancelBtn ( this, CUI_RES( BTN_POST_CANCEL ) ), + aCancelBtn ( this, CUI_RES( BTN_POST_CANCEL ) ), aHelpBtn ( this, CUI_RES( BTN_POST_HELP ) ), aPrevBtn ( this, CUI_RES( BTN_PREV ) ), - aNextBtn ( this, CUI_RES( BTN_NEXT ) ), + aNextBtn ( this, CUI_RES( BTN_NEXT ) ), - rSet ( rCoreSet ), - pOutSet ( 0 ) + rSet ( rCoreSet ), + pOutSet ( 0 ) { - if (bRedline) // HelpIDs fuer Redlining + if (bRedline) // HelpIDs fuer Redlining { SetHelpId(HID_REDLINING_DLG); aEditED.SetHelpId(HID_REDLINING_EDIT); @@ -106,7 +106,7 @@ SvxPostItDialog::SvxPostItDialog( Window* pParent, aEditED.SetFont( aFont ); BOOL bNew = TRUE; - USHORT nWhich = 0; + USHORT nWhich = 0; if ( !bPrevNext ) { diff --git a/cui/source/dialogs/postdlg.hrc b/cui/source/dialogs/postdlg.hrc index c0df97b971e2..c0272127de3c 100644 --- a/cui/source/dialogs/postdlg.hrc +++ b/cui/source/dialogs/postdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,22 +29,22 @@ // defines ------------------------------------------------------------------ -#define FT_LASTEDITLABEL 10 -#define FT_LASTEDIT 11 +#define FT_LASTEDITLABEL 10 +#define FT_LASTEDIT 11 #define FT_EDIT 12 -#define ED_EDIT 13 +#define ED_EDIT 13 #define FL_POSTIT 14 -#define BTN_PREV 15 -#define BTN_NEXT 16 -#define BTN_AUTHOR 17 +#define BTN_PREV 15 +#define BTN_NEXT 16 +#define BTN_AUTHOR 17 #define FT_AUTHOR 18 -#define STR_NOTIZ_EDIT 20 -#define STR_NOTIZ_INSERT 21 +#define STR_NOTIZ_EDIT 20 +#define STR_NOTIZ_INSERT 21 -#define BTN_POST_OK 30 -#define BTN_POST_CANCEL 31 -#define BTN_POST_HELP 32 +#define BTN_POST_OK 30 +#define BTN_POST_CANCEL 31 +#define BTN_POST_HELP 32 #endif diff --git a/cui/source/dialogs/postdlg.src b/cui/source/dialogs/postdlg.src index 904319d45355..c05b45134204 100644 --- a/cui/source/dialogs/postdlg.src +++ b/cui/source/dialogs/postdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 9d44e12f55f1..c9996a44c0fe 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -2,7 +2,7 @@ /********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -99,12 +99,12 @@ SFTreeListBox::SFTreeListBox( Window* pParent, const ResId& rResId ) : { FreeResource(); SetSelectionMode( SINGLE_SELECTION ); - + SetWindowBits( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HIDESELECTION | WB_HASLINES | WB_HASLINESATROOT ); SetNodeDefaultImages(); - + nMode = 0xFF; // Alles } @@ -124,8 +124,8 @@ void SFTreeListBox::delUserData( SvLBoxEntry* pEntry ) { delete pUserData; // TBD seem to get a Select event on node that is remove ( below ) - // so need to be able to detect that this node is not to be - // processed in order to do this, setting userData to NULL ( must + // so need to be able to detect that this node is not to be + // processed in order to do this, setting userData to NULL ( must // be a better way to do this ) pUserData = 0; pEntry->SetUserData( pUserData ); @@ -142,7 +142,7 @@ void SFTreeListBox::deleteTree( SvLBoxEntry* pEntry ) { SvLBoxEntry* pNextEntry = NextSibling( pEntry ); deleteTree( pEntry ); - GetModel()->Remove( pEntry ); + GetModel()->Remove( pEntry ); pEntry = pNextEntry; } } @@ -162,7 +162,7 @@ void SFTreeListBox::deleteAllTree() GetModel()->Remove( pEntry ); pEntry = pNextEntry; } - } + } } void SFTreeListBox::Init( const ::rtl::OUString& language ) @@ -176,8 +176,8 @@ void SFTreeListBox::Init( const ::rtl::OUString& language ) Sequence< Reference< browse::XBrowseNode > > children; - ::rtl::OUString userStr = ::rtl::OUString::createFromAscii("user"); - ::rtl::OUString shareStr = ::rtl::OUString::createFromAscii("share"); + ::rtl::OUString userStr = ::rtl::OUString::createFromAscii("user"); + ::rtl::OUString shareStr = ::rtl::OUString::createFromAscii("share"); ::rtl::OUString singleton = ::rtl::OUString::createFromAscii( "/singletons/com.sun.star.script.browse.theBrowseNodeFactory" ); @@ -197,7 +197,7 @@ void SFTreeListBox::Init( const ::rtl::OUString& language ) browse::BrowseNodeFactoryViewTypes::MACROORGANIZER ) ); if ( rootNode.is() && rootNode->hasChildNodes() == sal_True ) - { + { children = rootNode->getChildNodes(); } } @@ -207,7 +207,7 @@ void SFTreeListBox::Init( const ::rtl::OUString& language ) ::rtl::OUStringToOString( e.Message , RTL_TEXTENCODING_ASCII_US ).pData->buffer ); // TODO exception handling - } + } Reference<XModel> xDocumentModel; for ( sal_Int32 n = 0; n < children.getLength(); n++ ) @@ -244,7 +244,7 @@ void SFTreeListBox::Init( const ::rtl::OUString& language ) Sequence<beans::PropertyValue> moduleDescr; try{ ::rtl::OUString appModule = xModuleManager->identify( xDocumentModel ); - xModuleConfig->getByName(appModule) >>= moduleDescr; + xModuleConfig->getByName(appModule) >>= moduleDescr; } catch(const uno::Exception&) {} @@ -264,18 +264,18 @@ void SFTreeListBox::Init( const ::rtl::OUString& language ) } ::rtl::OUString lang( language ); - Reference< browse::XBrowseNode > langEntries = + Reference< browse::XBrowseNode > langEntries = getLangNodeFromRootNode( children[ n ], lang ); /*SvLBoxEntry* pBasicManagerRootEntry =*/ insertEntry( uiName, app ? IMG_HARDDISK : IMG_DOCUMENT, - 0, true, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_SFROOT, langEntries, xDocumentModel )), factoryURL ); + 0, true, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_SFROOT, langEntries, xDocumentModel )), factoryURL ); } SetUpdateMode( TRUE ); } -Reference< XInterface > +Reference< XInterface > SFTreeListBox::getDocumentModel( Reference< XComponentContext >& xCtx, ::rtl::OUString& docName ) { Reference< XInterface > xModel; @@ -307,7 +307,7 @@ SFTreeListBox::getDocumentModel( Reference< XComponentContext >& xCtx, ::rtl::OU return xModel; } -Reference< browse::XBrowseNode > +Reference< browse::XBrowseNode > SFTreeListBox::getLangNodeFromRootNode( Reference< browse::XBrowseNode >& rootNode, ::rtl::OUString& language ) { Reference< browse::XBrowseNode > langNode; @@ -321,8 +321,8 @@ SFTreeListBox::getLangNodeFromRootNode( Reference< browse::XBrowseNode >& rootNo { langNode = children[ n ]; break; - } - } + } + } } catch ( Exception& ) { @@ -349,20 +349,20 @@ void SFTreeListBox:: RequestSubEntries( SvLBoxEntry* pRootEntry, Reference< ::co { // if we catch an exception in getChildNodes then no entries are added } - + for ( sal_Int32 n = 0; n < children.getLength(); n++ ) { ::rtl::OUString name( children[ n ]->getName() ); if ( children[ n ]->getType() != browse::BrowseNodeTypes::SCRIPT) { - insertEntry( name, IMG_LIB, pRootEntry, true, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_SCRIPTCONTAINER, children[ n ],model ))); + insertEntry( name, IMG_LIB, pRootEntry, true, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_SCRIPTCONTAINER, children[ n ],model ))); } else { if ( children[ n ]->getType() == browse::BrowseNodeTypes::SCRIPT ) { - insertEntry( name, IMG_MACRO, pRootEntry, false, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_METHOD, children[ n ],model ))); - + insertEntry( name, IMG_MACRO, pRootEntry, false, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_METHOD, children[ n ],model ))); + } } } @@ -421,7 +421,7 @@ SvLBoxEntry * SFTreeListBox::insertEntry( { aImage = m_hdImage; aHCImage = m_hdImage_hc; - } + } else if( nBitmap == IMG_LIB ) { aImage = m_libImage; @@ -460,7 +460,7 @@ void __EXPORT SFTreeListBox::RequestingChilds( SvLBoxEntry* pEntry ) { node = userData->GetNode(); model = userData->GetModel(); - RequestSubEntries( pEntry, node, model ); + RequestSubEntries( pEntry, node, model ); userData->setLoaded(); } } @@ -565,7 +565,7 @@ SvxScriptOrgDialog::SvxScriptOrgDialog( Window* pParent, ::rtl::OUString languag m_createDupStr( CUI_RES ( RID_SVXSTR_CREATEFAILEDDUP ) ), m_createErrTitleStr( CUI_RES( RID_SVXSTR_CREATEFAILED_TITLE ) ), m_renameErrStr( CUI_RES ( RID_SVXSTR_RENAMEFAILED ) ), - m_renameErrTitleStr( CUI_RES( RID_SVXSTR_RENAMEFAILED_TITLE ) ) + m_renameErrTitleStr( CUI_RES( RID_SVXSTR_RENAMEFAILED_TITLE ) ) { // must be a neater way to deal with the strings than as above @@ -604,22 +604,22 @@ short SvxScriptOrgDialog::Execute() SfxObjectShell *pDoc = SfxObjectShell::GetFirst(); - // force load of MSPs for all documents - while ( pDoc ) + // force load of MSPs for all documents + while ( pDoc ) { - Reference< provider::XScriptProviderSupplier > xSPS = + Reference< provider::XScriptProviderSupplier > xSPS = Reference< provider::XScriptProviderSupplier > ( pDoc->GetModel(), UNO_QUERY ); if ( xSPS.is() ) { - Reference< provider::XScriptProvider > ScriptProvider = + Reference< provider::XScriptProvider > ScriptProvider = xSPS->getScriptProvider(); } - + pDoc = SfxObjectShell::GetNext(*pDoc); } aScriptsBox.ExpandAllTrees(); - + Window* pPrevDlgParent = Application::GetDefDialogParent(); Application::SetDefDialogParent( this ); short nRet = ModalDialog::Execute(); @@ -637,20 +637,20 @@ void SvxScriptOrgDialog::CheckButtons( Reference< browse::XBrowseNode >& node ) { if ( node->getType() == browse::BrowseNodeTypes::SCRIPT) { - aRunButton.Enable(); + aRunButton.Enable(); } else { - aRunButton.Disable(); + aRunButton.Disable(); } Reference< beans::XPropertySet > xProps( node, UNO_QUERY ); - + if ( !xProps.is() ) { aEditButton.Disable(); aDelButton.Disable(); aCreateButton.Disable(); - aRunButton.Disable(); + aRunButton.Disable(); return; } @@ -698,14 +698,14 @@ void SvxScriptOrgDialog::CheckButtons( Reference< browse::XBrowseNode >& node ) { aRenameButton.Disable(); } - } + } else { // no node info available, disable all configurable actions aDelButton.Disable(); aCreateButton.Disable(); aEditButton.Disable(); - aRunButton.Disable(); + aRunButton.Disable(); aRenameButton.Disable(); } } @@ -739,7 +739,7 @@ IMPL_LINK( SvxScriptOrgDialog, ScriptSelectHdl, SvTreeListBox *, pBox ) node = userData->GetNode(); CheckButtons( node ); } - + return 0; } @@ -750,7 +750,7 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton ) StoreCurrentSelection(); EndDialog( 0 ); } - if ( pButton == &aEditButton || + if ( pButton == &aEditButton || pButton == &aCreateButton || pButton == &aDelButton || pButton == &aRunButton || @@ -778,7 +778,7 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton ) { return 0; } - + if ( pButton == &aRunButton ) { ::rtl::OUString tmpString; @@ -887,7 +887,7 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton ) renameEntry( pEntry ); } } - } + } } return 0; } @@ -897,7 +897,7 @@ Reference< browse::XBrowseNode > SvxScriptOrgDialog::getBrowseNode( SvLBoxEntry* Reference< browse::XBrowseNode > node; if ( pEntry ) { - SFEntry* userData = (SFEntry*)pEntry->GetUserData(); + SFEntry* userData = (SFEntry*)pEntry->GetUserData(); if ( userData ) { node = userData->GetNode(); @@ -912,7 +912,7 @@ Reference< XModel > SvxScriptOrgDialog::getModel( SvLBoxEntry* pEntry ) Reference< XModel > model; if ( pEntry ) { - SFEntry* userData = (SFEntry*)pEntry->GetUserData(); + SFEntry* userData = (SFEntry*)pEntry->GetUserData(); if ( userData ) { model = userData->GetModel(); @@ -922,7 +922,7 @@ Reference< XModel > SvxScriptOrgDialog::getModel( SvLBoxEntry* pEntry ) return model; } -Reference< XInterface > +Reference< XInterface > SvxScriptOrgDialog::getDocumentModel( Reference< XComponentContext >& xCtx, ::rtl::OUString& docName ) { Reference< XInterface > xModel; @@ -960,13 +960,13 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry ) Reference< browse::XBrowseNode > aChildNode; Reference< browse::XBrowseNode > node = getBrowseNode( pEntry ); Reference< script::XInvocation > xInv( node, UNO_QUERY ); - + if ( xInv.is() ) { ::rtl::OUString aNewName; ::rtl::OUString aNewStdName; USHORT nMode = INPUTMODE_NEWLIB; - if( aScriptsBox.GetModel()->GetDepth( pEntry ) == 0 ) + if( aScriptsBox.GetModel()->GetDepth( pEntry ) == 0 ) { aNewStdName = ::rtl::OUString::createFromAscii( "Library" ) ; } @@ -979,7 +979,7 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry ) //String aNewStdName( ResId( STR_STDMODULENAME ) ); BOOL bValid = FALSE; USHORT i = 1; - + Sequence< Reference< browse::XBrowseNode > > childNodes; // no children => ok to create Parcel1 or Script1 without checking try @@ -1087,20 +1087,20 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry ) ::rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).pData->buffer ); } - } + } if ( aChildNode.is() ) { String aChildName = aChildNode->getName(); SvLBoxEntry* pNewEntry = NULL; - + ::rtl::OUString name( aChildName ); Reference<XModel> xDocumentModel = getModel( pEntry ); // ISSUE do we need to remove all entries for parent // to achieve sort? Just need to determine position // SvTreeListBox::InsertEntry can take position arg - // -- Basic doesn't do this on create. + // -- Basic doesn't do this on create. // Suppose we could avoid this too. -> created nodes are // not in alphabetical order if ( aChildNode->getType() == browse::BrowseNodeTypes::SCRIPT ) @@ -1210,7 +1210,7 @@ void SvxScriptOrgDialog::renameEntry( SvLBoxEntry* pEntry ) ::rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).pData->buffer ); } - } + } if ( aChildNode.is() ) { aScriptsBox.SetEntryText( pEntry, aChildNode->getName() ); @@ -1259,12 +1259,12 @@ void SvxScriptOrgDialog::deleteEntry( SvLBoxEntry* pEntry ) ::rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).pData->buffer ); } - } - + } + if ( result == sal_True ) { aScriptsBox.deleteTree( pEntry ); - aScriptsBox.GetModel()->Remove( pEntry ); + aScriptsBox.GetModel()->Remove( pEntry ); } else { @@ -1372,11 +1372,11 @@ void SvxScriptOrgDialog::RestorePreviousSelection() aScriptsBox.SetCurEntry( pEntry ); } -BOOL SFTreeListBox::dialogSort1( Reference< browse::XBrowseNode > node1, +BOOL SFTreeListBox::dialogSort1( Reference< browse::XBrowseNode > node1, Reference< browse::XBrowseNode > node2 ) { - ::rtl::OUString userStr = ::rtl::OUString::createFromAscii("user"); - ::rtl::OUString shareStr = ::rtl::OUString::createFromAscii("share"); + ::rtl::OUString userStr = ::rtl::OUString::createFromAscii("user"); + ::rtl::OUString shareStr = ::rtl::OUString::createFromAscii("share"); if( node1->getName().equals( userStr ) ) return true; if( node2->getName().equals( userStr ) ) @@ -1388,7 +1388,7 @@ BOOL SFTreeListBox::dialogSort1( Reference< browse::XBrowseNode > node1, return dialogSort2( node1, node2 ); } -BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1, +BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1, Reference< browse::XBrowseNode > node2 ) { return ( node1->getName().compareTo( node2->getName() ) < 0 ); @@ -1400,7 +1400,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1, const ::rtl::OUString& value ) { sal_Int32 pos = source.indexOf( token ); - + if ( pos != -1 && value.getLength() != 0 ) { return source.replaceAt( pos, token.getLength(), value ); @@ -1455,7 +1455,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1, ::rtl::OUString unknown = ::rtl::OUString::createFromAscii( "UNKNOWN" ); ::rtl::OUString language = unknown; ::rtl::OUString script = unknown; - ::rtl::OUString line = unknown; + ::rtl::OUString line = unknown; ::rtl::OUString type = ::rtl::OUString(); ::rtl::OUString message = eScriptError.Message; @@ -1501,7 +1501,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1, ::rtl::OUString line = unknown; ::rtl::OUString type = unknown; ::rtl::OUString message = eScriptException.Message; - + if ( eScriptException.language.getLength() != 0 ) { language = eScriptException.language; @@ -1543,10 +1543,10 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1, ::rtl::OUString unformatted = String( CUI_RES( RID_SVXSTR_FRAMEWORK_ERROR_RUNNING ) ); - ::rtl::OUString language = + ::rtl::OUString language = ::rtl::OUString::createFromAscii( "UNKNOWN" ); - ::rtl::OUString script = + ::rtl::OUString script = ::rtl::OUString::createFromAscii( "UNKNOWN" ); ::rtl::OUString message; @@ -1565,10 +1565,10 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1, CUI_RES( RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED ) ); message = ReplaceString( message, ::rtl::OUString::createFromAscii( "%LANGUAGENAME" ), language ); - + } else - { + { message = sError.Message; } return FormatErrorString( @@ -1596,7 +1596,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1, ::rtl::OUString GetErrorMessage( const com::sun::star::uno::Any& aException ) { ::rtl::OUString exType; - if ( aException.getValueType() == + if ( aException.getValueType() == ::getCppuType( (const reflection::InvocationTargetException* ) NULL ) ) { reflection::InvocationTargetException ite; @@ -1615,12 +1615,12 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1, ite.TargetException >>= scriptException; return GetErrorMessage( scriptException ); } - else + else { // Unknown error, shouldn't happen // OSL_ASSERT(...) } - + } else if ( aException.getValueType() == ::getCppuType( ( const provider::ScriptFrameworkErrorException* ) NULL ) ) { @@ -1628,7 +1628,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1, provider::ScriptFrameworkErrorException sfe; aException >>= sfe; return GetErrorMessage( sfe ); - + } // unknown exception Exception e; @@ -1638,9 +1638,9 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1, return GetErrorMessage( rte ); } - aException >>= e; + aException >>= e; return GetErrorMessage( e ); - + } SvxScriptErrorDialog::SvxScriptErrorDialog( diff --git a/cui/source/dialogs/scriptdlg.hrc b/cui/source/dialogs/scriptdlg.hrc index 95ba3ddf38c2..3fb0118b04f9 100644 --- a/cui/source/dialogs/scriptdlg.hrc +++ b/cui/source/dialogs/scriptdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,18 +29,18 @@ #include <svl/solar.hrc> -#define SCRIPTDLG_OFFSET 400 +#define SCRIPTDLG_OFFSET 400 // ScriptOrgDialog -#define SF_TXT_SCRIPTS 1 -#define SF_CTRL_SCRIPTSBOX 2 -#define SF_PB_RUN 3 -#define SF_PB_CLOSE 4 -#define SF_PB_CREATE 5 -#define SF_PB_EDIT 6 -#define SF_PB_RENAME 7 -#define SF_PB_DEL 8 -#define SF_PB_HELP 9 +#define SF_TXT_SCRIPTS 1 +#define SF_CTRL_SCRIPTSBOX 2 +#define SF_PB_RUN 3 +#define SF_PB_CLOSE 4 +#define SF_PB_CREATE 5 +#define SF_PB_EDIT 6 +#define SF_PB_RENAME 7 +#define SF_PB_DEL 8 +#define SF_PB_HELP 9 #define IMG_HARDDISK 1 #define IMG_HARDDISK_HC 2 @@ -51,7 +51,7 @@ #define IMG_DOCUMENT 7 #define IMG_DOCUMENT_HC 8 -#define RID_IMGLST_OBJECTS ( RID_BASICIDE_START + 7 ) +#define RID_IMGLST_OBJECTS ( RID_BASICIDE_START + 7 ) #define RID_IMGLST_OBJECTS_HC (RID_BASICIDE_START + 13) // NewObjectDialog @@ -67,9 +67,9 @@ #define STR_RENAME 19 // Others -/* +/* Please be aware that these strings are global resources, don't use self-defined values! -You have to use the RID_SVXSTART macro do avoid ID clashes with other resource files. Sfx2 delivers +You have to use the RID_SVXSTART macro do avoid ID clashes with other resource files. Sfx2 delivers some of its own resource files to svx - where they are added to svx resource file!! */ @@ -77,4 +77,4 @@ some of its own resource files to svx - where they are added to svx resource fil #define STR_PRODMACROS 33 -#endif // _SCRIPTDLG_HRC +#endif // _SCRIPTDLG_HRC diff --git a/cui/source/dialogs/scriptdlg.src b/cui/source/dialogs/scriptdlg.src index 67a81376d662..292c862fe924 100644 --- a/cui/source/dialogs/scriptdlg.src +++ b/cui/source/dialogs/scriptdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/sdrcelldlg.cxx b/cui/source/dialogs/sdrcelldlg.cxx index 9686e04b57aa..01ea9b9aebe2 100644 --- a/cui/source/dialogs/sdrcelldlg.cxx +++ b/cui/source/dialogs/sdrcelldlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ SvxFormatCellsDialog::SvxFormatCellsDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel ) : SfxTabDialog ( pParent, CUI_RES( RID_SVX_FORMAT_CELLS_DLG ), pAttr ) -, mrOutAttrs ( *pAttr ) +, mrOutAttrs ( *pAttr ) , mpColorTab ( pModel->GetColorTable() ) , mpGradientList ( pModel->GetGradientList() ) , mpHatchingList ( pModel->GetHatchList() ) @@ -54,7 +54,7 @@ SvxFormatCellsDialog::SvxFormatCellsDialog( Window* pParent, const SfxItemSet* p AddTabPage( RID_SVXPAGE_CHAR_EFFECTS ); AddTabPage( RID_SVXPAGE_BORDER ); AddTabPage( RID_SVXPAGE_AREA ); - + /* SvtCJKOptions aCJKOptions; if( aCJKOptions.IsAsianTypographyEnabled() ) @@ -80,11 +80,11 @@ void SvxFormatCellsDialog::PageCreated( USHORT nId, SfxTabPage &rPage ) ( (SvxAreaTabPage&) rPage ).SetPageType( PT_AREA ); ( (SvxAreaTabPage&) rPage ).SetDlgType( 1 ); ( (SvxAreaTabPage&) rPage ).SetPos( 0 ); -// ( (SvxAreaTabPage&) rPage ).SetAreaTP( &mbAreaTP ); -// ( (SvxAreaTabPage&) rPage ).SetGrdChgd( &mnGradientListState ); -// ( (SvxAreaTabPage&) rPage ).SetHtchChgd( &mnHatchingListState ); -// ( (SvxAreaTabPage&) rPage ).SetBmpChgd( &mnBitmapListState ); -// ( (SvxAreaTabPage&) rPage ).SetColorChgd( &mnColorTableState ); +// ( (SvxAreaTabPage&) rPage ).SetAreaTP( &mbAreaTP ); +// ( (SvxAreaTabPage&) rPage ).SetGrdChgd( &mnGradientListState ); +// ( (SvxAreaTabPage&) rPage ).SetHtchChgd( &mnHatchingListState ); +// ( (SvxAreaTabPage&) rPage ).SetBmpChgd( &mnBitmapListState ); +// ( (SvxAreaTabPage&) rPage ).SetColorChgd( &mnColorTableState ); ( (SvxAreaTabPage&) rPage ).Construct(); // ActivatePage() wird das erste mal nicht gerufen ( (SvxAreaTabPage&) rPage ).ActivatePage( mrOutAttrs ); diff --git a/cui/source/dialogs/sdrcelldlg.src b/cui/source/dialogs/sdrcelldlg.src index c3ece3326544..cef68d3acf5b 100644 --- a/cui/source/dialogs/sdrcelldlg.src +++ b/cui/source/dialogs/sdrcelldlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx index 4ed267d614d4..aaee4e77cb4d 100644 --- a/cui/source/dialogs/showcols.cxx +++ b/cui/source/dialogs/showcols.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ #define CUIFM_PROP_LABEL rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Label" ) ) //========================================================================== -// FmShowColsDialog +// FmShowColsDialog //========================================================================== DBG_NAME(FmShowColsDialog) //-------------------------------------------------------------------------- diff --git a/cui/source/dialogs/showcols.src b/cui/source/dialogs/showcols.src index 465591e8f0a0..f4d124d1795b 100644 --- a/cui/source/dialogs/showcols.src +++ b/cui/source/dialogs/showcols.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/splitcelldlg.cxx b/cui/source/dialogs/splitcelldlg.cxx index b2574fdb1e37..39fda7fcf393 100644 --- a/cui/source/dialogs/splitcelldlg.cxx +++ b/cui/source/dialogs/splitcelldlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,8 +69,8 @@ SvxSplitTableDlg::SvxSplitTableDlg( Window *pParent, bool bIsTableVertical, long String sTmp(maHorzBox.GetText()); maHorzBox.SetText(maVertBox.GetText()); maHorzBox.SetModeRadioImage(maVertBox.GetModeRadioImage()); - maVertBox.SetText(sTmp); - maVertBox.SetModeRadioImage(aTmpImg); + maVertBox.SetText(sTmp); + maVertBox.SetModeRadioImage(aTmpImg); } } diff --git a/cui/source/dialogs/splitcelldlg.hrc b/cui/source/dialogs/splitcelldlg.hrc index 143f4685abe4..1cf6e5b449bd 100644 --- a/cui/source/dialogs/splitcelldlg.hrc +++ b/cui/source/dialogs/splitcelldlg.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 @@ -24,11 +24,11 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define FT_COUNT 1 -#define ED_COUNT 2 +#define FT_COUNT 1 +#define ED_COUNT 2 #define FL_COUNT 3 -#define RB_HORZ 10 +#define RB_HORZ 10 #define CB_PROP 11 #define RB_VERT 12 #define FL_DIR 12 @@ -36,7 +36,7 @@ #define BMP_SPLIT_VERT 13 #define BMP_SPLIT_HORZ 14 -#define BT_OK 100 -#define BT_CANCEL 101 -#define BT_HELP 102 +#define BT_OK 100 +#define BT_CANCEL 101 +#define BT_HELP 102 diff --git a/cui/source/dialogs/splitcelldlg.src b/cui/source/dialogs/splitcelldlg.src index 5326ca2d0e4d..ea5cbc7d108b 100644 --- a/cui/source/dialogs/splitcelldlg.src +++ b/cui/source/dialogs/splitcelldlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ ModalDialog RID_SVX_SPLITCELLDLG Size = MAP_APPFONT ( 169 , 108 ) ; Text [ en-US ] = "Split Cells" ; Moveable = TRUE ; - + OKButton BT_OK { Pos = MAP_APPFONT ( 115 , 6 ) ; diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx index 85a4b8a9a02c..a37865dbaed5 100644 --- a/cui/source/dialogs/srchxtra.cxx +++ b/cui/source/dialogs/srchxtra.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -93,7 +93,7 @@ void SvxSearchFormatDialog::PageCreated( USHORT nId, SfxTabPage& rPage ) { case RID_SVXPAGE_CHAR_NAME: { - const FontList* pAppFontList = 0; + const FontList* pAppFontList = 0; SfxObjectShell* pSh = SfxObjectShell::Current(); if ( pSh ) @@ -144,7 +144,7 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog( Window* pParent, aAttrFL ( this, CUI_RES( FL_ATTR ) ), aAttrLB ( this, CUI_RES( LB_ATTR ) ), aOKBtn ( this, CUI_RES( BTN_ATTR_OK ) ), - aEscBtn ( this, CUI_RES( BTN_ATTR_CANCEL ) ), + aEscBtn ( this, CUI_RES( BTN_ATTR_CANCEL ) ), aHelpBtn( this, CUI_RES( BTN_ATTR_HELP ) ), rList( rLst ) @@ -183,7 +183,7 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog( Window* pParent, } // item resources are in svx - sal_uInt32 nId = aAttrNames.FindIndex( nSlot ); + sal_uInt32 nId = aAttrNames.FindIndex( nSlot ); SvLBoxEntry* pEntry = NULL; if ( RESARRAY_INDEX_NOTFOUND != nId ) pEntry = aAttrLB.SvTreeListBox::InsertEntry( aAttrNames.GetString(nId) ); @@ -268,16 +268,16 @@ SvxSearchSimilarityDialog::SvxSearchSimilarityDialog aFixedLine ( this, CUI_RES( FL_SIMILARITY ) ), aOtherTxt ( this, CUI_RES( FT_OTHER ) ), - aOtherFld ( this, CUI_RES( NF_OTHER ) ), + aOtherFld ( this, CUI_RES( NF_OTHER ) ), aLongerTxt ( this, CUI_RES( FT_LONGER ) ), aLongerFld ( this, CUI_RES( NF_LONGER ) ), aShorterTxt ( this, CUI_RES( FT_SHORTER ) ), - aShorterFld ( this, CUI_RES( NF_SHORTER ) ), + aShorterFld ( this, CUI_RES( NF_SHORTER ) ), aRelaxBox ( this, CUI_RES( CB_RELAX ) ), - aOKBtn ( this, CUI_RES( BTN_ATTR_OK ) ), - aEscBtn ( this, CUI_RES( BTN_ATTR_CANCEL ) ), - aHelpBtn ( this, CUI_RES( BTN_ATTR_HELP ) ) + aOKBtn ( this, CUI_RES( BTN_ATTR_OK ) ), + aEscBtn ( this, CUI_RES( BTN_ATTR_CANCEL ) ), + aHelpBtn ( this, CUI_RES( BTN_ATTR_HELP ) ) { FreeResource(); diff --git a/cui/source/dialogs/srchxtra.hrc b/cui/source/dialogs/srchxtra.hrc index 5df6d9bd4767..939b1a96554a 100644 --- a/cui/source/dialogs/srchxtra.hrc +++ b/cui/source/dialogs/srchxtra.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/srchxtra.src b/cui/source/dialogs/srchxtra.src index 04265a6d6726..d18c3c4cf2cf 100644 --- a/cui/source/dialogs/srchxtra.src +++ b/cui/source/dialogs/srchxtra.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/svuidlg.hrc b/cui/source/dialogs/svuidlg.hrc index 8add126a33c7..38b89df77fec 100644 --- a/cui/source/dialogs/svuidlg.hrc +++ b/cui/source/dialogs/svuidlg.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 @@ -31,104 +31,104 @@ #define TB_LINKS 32014 // gemeinsame Id's -#define CB_DISPLAY_AS_ICON 12 -#define FI_DISPLAY 13 +#define CB_DISPLAY_AS_ICON 12 +#define FI_DISPLAY 13 #define PB_CHANGE_ICON 14 -#define STR_AUTOLINK 32006 -#define STR_MANUALLINK 32007 -#define STR_BROKENLINK 32008 -#define STR_GRAPHICLINK 32009 -#define STR_BUTTONCLOSE 32010 -#define STR_CLOSELINKMSG 32011 -#define STR_CLOSELINKMSG_MULTI 32024 -#define STR_WAITINGLINK 32028 -#define STR_EDIT_APPLET 32029 +#define STR_AUTOLINK 32006 +#define STR_MANUALLINK 32007 +#define STR_BROKENLINK 32008 +#define STR_GRAPHICLINK 32009 +#define STR_BUTTONCLOSE 32010 +#define STR_CLOSELINKMSG 32011 +#define STR_CLOSELINKMSG_MULTI 32024 +#define STR_WAITINGLINK 32028 +#define STR_EDIT_APPLET 32029 -#define FL_CHOICE 15 -#define LB_INSERT_LIST 7 +#define FL_CHOICE 15 +#define LB_INSERT_LIST 7 -#define MD_PASTE_OBJECT 32001 -#define S_OBJECT 1 -#define RB_PASTE 20 -#define RB_PASTE_LINK 21 -#define FT_OBJECT_SOURCE 22 -#define FT_SOURCE 23 +#define MD_PASTE_OBJECT 32001 +#define S_OBJECT 1 +#define RB_PASTE 20 +#define RB_PASTE_LINK 21 +#define FT_OBJECT_SOURCE 22 +#define FT_SOURCE 23 #define MD_UPDATE_BASELINKS 32002 -#define LB_LINKS 30 -#define FT_FILES 31 -#define FT_LINKS 32 -#define FT_TYPE 33 -#define FT_STATUS 34 -#define PB_UPDATE_NOW 35 -#define PB_OPEN_SOURCE 36 -#define PB_CHANGE_SOURCE 37 -#define PB_BREAK_LINK 38 -#define FT_SOURCE2 39 -#define FT_TYPE2 40 -#define FT_UPDATE 41 -#define RB_AUTOMATIC 42 -#define RB_MANUAL 43 +#define LB_LINKS 30 +#define FT_FILES 31 +#define FT_LINKS 32 +#define FT_TYPE 33 +#define FT_STATUS 34 +#define PB_UPDATE_NOW 35 +#define PB_OPEN_SOURCE 36 +#define PB_CHANGE_SOURCE 37 +#define PB_BREAK_LINK 38 +#define FT_SOURCE2 39 +#define FT_TYPE2 40 +#define FT_UPDATE 41 +#define RB_AUTOMATIC 42 +#define RB_MANUAL 43 #define FT_FULL_SOURCE_NAME 44 -#define FT_FULL_TYPE_NAME 45 -#define GB_LINK 46 -#define FT_FILES2 47 -#define FT_FULL_FILE_NAME 48 +#define FT_FULL_TYPE_NAME 45 +#define GB_LINK 46 +#define FT_FILES2 47 +#define FT_FULL_FILE_NAME 48 -#define MD_LINKEDIT 32004 +#define MD_LINKEDIT 32004 #define ED_FULL_SOURCE_NAME 1 -#define ED_FILEPATH 10 -#define BTN_FILEPATH 11 -#define CB_FILELINK 12 +#define ED_FILEPATH 10 +#define BTN_FILEPATH 11 +#define CB_FILELINK 12 -#define MD_INSERT_OBJECT_PLUGIN 32008 -#define ED_FILEURL 10 -#define BTN_FILEURL 11 -#define GB_FILEURL 12 -#define ED_PLUGINS_OPTIONS 20 -#define GB_PLUGINS_OPTIONS 21 +#define MD_INSERT_OBJECT_PLUGIN 32008 +#define ED_FILEURL 10 +#define BTN_FILEURL 11 +#define GB_FILEURL 12 +#define ED_PLUGINS_OPTIONS 20 +#define GB_PLUGINS_OPTIONS 21 -#define MD_INSERT_OBJECT_APPLET 32009 -#define FT_CLASSFILE 10 -#define ED_CLASSFILE 11 -#define FT_CLASSLOCATION 12 -#define ED_CLASSLOCATION 12 -#define BTN_CLASS 13 -#define GB_CLASS 14 -#define ED_APPLET_OPTIONS 20 -#define GB_APPLET_OPTIONS 21 +#define MD_INSERT_OBJECT_APPLET 32009 +#define FT_CLASSFILE 10 +#define ED_CLASSFILE 11 +#define FT_CLASSLOCATION 12 +#define ED_CLASSLOCATION 12 +#define BTN_CLASS 13 +#define GB_CLASS 14 +#define ED_APPLET_OPTIONS 20 +#define GB_APPLET_OPTIONS 21 -#define MD_INSERT_OLEOBJECT 32010 -#define RB_NEW_OBJECT 10 -#define RB_OBJECT_FROMFILE 11 -#define LB_OBJECTTYPE 12 -#define GB_OBJECT 13 -#define STR_FILE 14 +#define MD_INSERT_OLEOBJECT 32010 +#define RB_NEW_OBJECT 10 +#define RB_OBJECT_FROMFILE 11 +#define LB_OBJECTTYPE 12 +#define GB_OBJECT 13 +#define STR_FILE 14 #define MD_INSERT_OBJECT_IFRAME 32011 -#define FT_FRAMENAME 3 -#define ED_FRAMENAME 4 -#define FT_URL 5 -#define ED_URL 6 -#define BT_FILEOPEN 7 -#define NM_MARGINHEIGHT 8 -#define FT_MARGINHEIGHT 9 -#define NM_MARGINWIDTH 10 -#define FT_MARGINWIDTH 11 -#define GB_MARGIN 12 -#define RB_SCROLLINGON 13 -#define RB_SCROLLINGOFF 14 -#define RB_SCROLLINGAUTO 15 -#define GB_SCROLLING 16 -#define GB_BORDER 17 -#define RB_FRMBORDER_ON 18 -#define RB_FRMBORDER_INHERIT 19 -#define RB_FRMBORDER_OFF 20 -#define CB_MARGINWIDTHDEFAULT 21 -#define CB_MARGINHEIGHTDEFAULT 22 +#define FT_FRAMENAME 3 +#define ED_FRAMENAME 4 +#define FT_URL 5 +#define ED_URL 6 +#define BT_FILEOPEN 7 +#define NM_MARGINHEIGHT 8 +#define FT_MARGINHEIGHT 9 +#define NM_MARGINWIDTH 10 +#define FT_MARGINWIDTH 11 +#define GB_MARGIN 12 +#define RB_SCROLLINGON 13 +#define RB_SCROLLINGOFF 14 +#define RB_SCROLLINGAUTO 15 +#define GB_SCROLLING 16 +#define GB_BORDER 17 +#define RB_FRMBORDER_ON 18 +#define RB_FRMBORDER_INHERIT 19 +#define RB_FRMBORDER_OFF 20 +#define CB_MARGINWIDTHDEFAULT 21 +#define CB_MARGINHEIGHTDEFAULT 22 #define FL_SEP_LEFT 46 #define FL_SEP_RIGHT 47 diff --git a/cui/source/dialogs/svuidlg.src b/cui/source/dialogs/svuidlg.src index 74a8eae82274..5cb13c897b1e 100644 --- a/cui/source/dialogs/svuidlg.src +++ b/cui/source/dialogs/svuidlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ ModalDialog MD_PASTE_OBJECT OutputSize = TRUE ; SVLook = TRUE ; Moveable = TRUE ; - Size = MAP_APPFONT ( 282 , 135 ) ; // 12 under listbox + Size = MAP_APPFONT ( 282 , 135 ) ; // 12 under listbox Text [ en-US ] = "Paste Special" ; FixedText FT_SOURCE { diff --git a/cui/source/dialogs/tbxform.src b/cui/source/dialogs/tbxform.src index 9e9d2fb6eb03..a5f43aae673c 100644 --- a/cui/source/dialogs/tbxform.src +++ b/cui/source/dialogs/tbxform.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index d62d0d98d63e..70063438d3a6 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -105,23 +105,23 @@ static void GetReplaceEditString( String &rText ) } // class LookUpComboBox_Impl -------------------------------------------------- - -LookUpComboBox_Impl::LookUpComboBox_Impl( + +LookUpComboBox_Impl::LookUpComboBox_Impl( Window *pParent, const ResId &rResId, SvxThesaurusDialog_Impl &rImpl ) : ComboBox (pParent, rResId), m_rDialogImpl( rImpl ) { m_aModifyTimer.SetTimeoutHdl( LINK( this, LookUpComboBox_Impl, ModifyTimer_Hdl ) ); m_aModifyTimer.SetTimeout( 500 ); - + EnableAutocomplete( FALSE ); } - + LookUpComboBox_Impl::~LookUpComboBox_Impl() { } - + void LookUpComboBox_Impl::Modify() { @@ -138,18 +138,18 @@ IMPL_LINK( LookUpComboBox_Impl, ModifyTimer_Hdl, Timer *, EMPTYARG /*pTimer*/ ) // class ReplaceEdit_Impl -------------------------------------------------- - -ReplaceEdit_Impl::ReplaceEdit_Impl( + +ReplaceEdit_Impl::ReplaceEdit_Impl( Window *pParent, const ResId &rResId ) : Edit (pParent, rResId) { } - + ReplaceEdit_Impl::~ReplaceEdit_Impl() { } - + void ReplaceEdit_Impl::Modify() { @@ -163,17 +163,17 @@ void ReplaceEdit_Impl::SetText( const XubString& rStr ) Modify(); } - + void ReplaceEdit_Impl::SetText( const XubString& rStr, const Selection& rNewSelection ) { Edit::SetText( rStr, rNewSelection ); Modify(); -} +} // class ThesaurusAlternativesCtrl_Impl ---------------------------------- -AlternativesString_Impl::AlternativesString_Impl( +AlternativesString_Impl::AlternativesString_Impl( ThesaurusAlternativesCtrl_Impl &rControl, SvLBoxEntry* pEntry, USHORT nFlags, const String& rStr ) : // @@ -182,8 +182,8 @@ AlternativesString_Impl::AlternativesString_Impl( { } -void AlternativesString_Impl::Paint( - const Point& rPos, +void AlternativesString_Impl::Paint( + const Point& rPos, SvLBox& rDev, USHORT, SvLBoxEntry* pEntry ) { @@ -204,9 +204,9 @@ void AlternativesString_Impl::Paint( } -ThesaurusAlternativesCtrl_Impl::ThesaurusAlternativesCtrl_Impl( +ThesaurusAlternativesCtrl_Impl::ThesaurusAlternativesCtrl_Impl( Window* pParent, - SvxThesaurusDialog_Impl &rImpl ) : + SvxThesaurusDialog_Impl &rImpl ) : SvxCheckListBox( pParent, CUI_RES( CT_THES_ALTERNATIVES ) ), m_rDialogImpl( rImpl ) { @@ -228,8 +228,8 @@ void ThesaurusAlternativesCtrl_Impl::ClearExtraData() } -void ThesaurusAlternativesCtrl_Impl::SetExtraData( - const SvLBoxEntry *pEntry, +void ThesaurusAlternativesCtrl_Impl::SetExtraData( + const SvLBoxEntry *pEntry, const AlternativesExtraData &rData ) { if (!pEntry) @@ -243,7 +243,7 @@ void ThesaurusAlternativesCtrl_Impl::SetExtraData( } -AlternativesExtraData * ThesaurusAlternativesCtrl_Impl::GetExtraData( +AlternativesExtraData * ThesaurusAlternativesCtrl_Impl::GetExtraData( const SvLBoxEntry *pEntry ) { AlternativesExtraData *pRes = NULL; @@ -263,14 +263,14 @@ SvLBoxEntry * ThesaurusAlternativesCtrl_Impl::AddEntry( sal_Int32 nVal, const St aText = String::CreateFromInt32( nVal ); aText += A2S( ". " ); } - pEntry->AddItem( new SvLBoxString( pEntry, 0, String() ) ); // add empty column + pEntry->AddItem( new SvLBoxString( pEntry, 0, String() ) ); // add empty column aText += rText; pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0 ) ); // otherwise crash pEntry->AddItem( new AlternativesString_Impl( *this, pEntry, 0, aText ) ); SetExtraData( pEntry, AlternativesExtraData( rText, bIsHeader ) ); GetModel()->Insert( pEntry ); - + if (bIsHeader) GetViewDataEntry( pEntry )->SetSelectable( false ); @@ -288,7 +288,7 @@ void ThesaurusAlternativesCtrl_Impl::KeyInput( const KeyEvent& rKEvt ) m_rDialogImpl.AlternativesDoubleClickHdl_Impl( this ); // look up current selected entry else if (GetEntryCount()) SvxCheckListBox::KeyInput( rKEvt ); -} +} void ThesaurusAlternativesCtrl_Impl::Paint( const Rectangle& rRect ) @@ -296,11 +296,11 @@ void ThesaurusAlternativesCtrl_Impl::Paint( const Rectangle& rRect ) if (!m_rDialogImpl.m_bWordFound) { /* Push( PUSH_FONT ); - + Font aFont( GetFont() ); aFont.SetHeight( 2 * aFont.GetHeight() ); SetFont( aFont ); -*/ +*/ Size aTextSize( GetTextWidth( m_rDialogImpl.aErrStr ), GetTextHeight() ); aTextSize = LogicToPixel( aTextSize ); Point aPos; @@ -308,13 +308,13 @@ void ThesaurusAlternativesCtrl_Impl::Paint( const Rectangle& rRect ) aPos.Y() += GetSizePixel().Height() / 2 /*- aTextSize.Height() / 2*/; aPos = PixelToLogic( aPos ); DrawText( aPos, m_rDialogImpl.aErrStr ); - + // Pop(); } else SvxCheckListBox::Paint( rRect ); } - + // struct SvxThesaurusDialog_Impl ---------------------------------------- @@ -342,7 +342,7 @@ SvxThesaurusDialog_Impl::SvxThesaurusDialog_Impl( SvxThesaurusDialog * pDialog ) m_bWordFound( false ) { // note: FreeResource must only be called in the c-tor of SvxThesaurusDialog - + aReplaceEdit.SetButton( &aReplaceBtn ); aLeftBtn.SetClickHdl( LINK( this, SvxThesaurusDialog_Impl, LeftBtnHdl_Impl ) ); @@ -398,7 +398,7 @@ bool SvxThesaurusDialog_Impl::UpdateAlternativesBox_Impl() const uno::Reference< linguistic2::XMeaning > *pMeanings = aMeanings.getConstArray(); m_pAlternativesCT->SetUpdateMode( FALSE ); - + // clear old user data of control before creating new ones via AddEntry below m_pAlternativesCT->ClearExtraData(); @@ -411,7 +411,7 @@ bool SvxThesaurusDialog_Impl::UpdateAlternativesBox_Impl() const OUString *pSynonyms = aSynonyms.getConstArray(); DBG_ASSERT( rMeaningTxt.getLength() > 0, "meaning with empty text" ); DBG_ASSERT( nSynonyms > 0, "meaning without synonym" ); - + m_pAlternativesCT->AddEntry( i + 1, rMeaningTxt, true ); for (sal_Int32 k = 0; k < nSynonyms; ++k) m_pAlternativesCT->AddEntry( -1, pSynonyms[k], false ); @@ -420,7 +420,7 @@ bool SvxThesaurusDialog_Impl::UpdateAlternativesBox_Impl() m_pAlternativesCT->SetUpdateMode( TRUE ); return nMeanings > 0; -} +} void SvxThesaurusDialog_Impl::LookUp( const String &rText ) @@ -428,7 +428,7 @@ void SvxThesaurusDialog_Impl::LookUp( const String &rText ) if (rText != aWordCB.GetText()) // avoid moving of the cursor if the text is the same aWordCB.SetText( rText ); LookUp_Impl(); -} +} IMPL_LINK( SvxThesaurusDialog_Impl, LeftBtnHdl_Impl, Button *, pBtn ) @@ -468,7 +468,7 @@ void SvxThesaurusDialog_Impl::LookUp_Impl() String aText( aWordCB.GetText() ); aLookUpText = OUString( aText ); - if (aLookUpText.getLength() > 0 && + if (aLookUpText.getLength() > 0 && (aLookUpHistory.size() == 0 || aLookUpText != aLookUpHistory.top())) aLookUpHistory.push( aLookUpText ); @@ -507,7 +507,7 @@ IMPL_LINK( SvxThesaurusDialog_Impl, AlternativesSelectHdl_Impl, SvxCheckListBox String aStr; if (pData && !pData->IsHeader()) { - aStr = pData->GetText(); + aStr = pData->GetText(); GetReplaceEditString( aStr ); } aReplaceEdit.SetText( aStr ); @@ -525,16 +525,16 @@ IMPL_LINK( SvxThesaurusDialog_Impl, AlternativesDoubleClickHdl_Impl, SvxCheckLis String aStr; if (pData && !pData->IsHeader()) { - aStr = pData->GetText(); + aStr = pData->GetText(); GetReplaceEditString( aStr ); } - + aWordCB.SetText( aStr ); if (aStr.Len() > 0) LookUp_Impl(); } - //! workaround to set the selection since calling SelectEntryPos within + //! workaround to set the selection since calling SelectEntryPos within //! the double click handler does not work Application::PostUserEvent( STATIC_LINK( this, SvxThesaurusDialog_Impl, SelectFirstHdl_Impl ), pBox ); return 0; @@ -554,10 +554,10 @@ IMPL_STATIC_LINK( SvxThesaurusDialog_Impl, SelectFirstHdl_Impl, SvxCheckListBox static Image lcl_GetImageFromPngUrl( const OUString &rFileUrl ) { Image aRes; - + OUString aTmp; osl::FileBase::getSystemPathFromFileURL( rFileUrl, aTmp ); - + Graphic aGraphic; const String aFilterName( RTL_CONSTASCII_USTRINGPARAM( IMP_PNG ) ); if( GRFILTER_OK == GraphicFilter::LoadGraphic( aTmp, aFilterName, aGraphic, NULL, NULL ) ) @@ -579,7 +579,7 @@ static String lcl_GetThesImplName( const lang::Locale &rLocale ) xLngMgr = uno::Reference< linguistic2::XLinguServiceManager >( xMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.linguistic2.LinguServiceManager" ))), uno::UNO_QUERY_THROW ); - + DBG_ASSERT( xLngMgr.is(), "LinguServiceManager missing" ); if (xLngMgr.is()) { @@ -589,22 +589,22 @@ static String lcl_GetThesImplName( const lang::Locale &rLocale ) DBG_ASSERT( aServiceNames.getLength() <= 1, "more than one thesaurus found. Should not be possible" ); if (aServiceNames.getLength() == 1) aRes = aServiceNames[0]; - } + } } - catch (uno::Exception &e) + catch (uno::Exception &e) { (void) e; DBG_ASSERT( 0, "failed to get thesaurus" ); - } - + } + return aRes; } - + void SvxThesaurusDialog_Impl::UpdateVendorImage() { m_pDialog->SetUpdateMode( sal_False ); - + SvtLinguConfig aCfg; if (aCfg.HasVendorImages( "ThesaurusDialogImage" )) { @@ -619,15 +619,15 @@ void SvxThesaurusDialog_Impl::UpdateVendorImage() aImage = bHC ? aVendorDefaultImageHC : aVendorDefaultImage; aVendorImageFI.SetImage( aImage ); } - + m_pDialog->SetUpdateMode( sal_True ); } - + IMPL_STATIC_LINK( SvxThesaurusDialog_Impl, VendorImageInitHdl, SvxThesaurusDialog_Impl *, EMPTYARG ) { pThis->m_pDialog->SetUpdateMode( sal_False ); - + SvtLinguConfig aCfg; if (aCfg.HasVendorImages( "ThesaurusDialogImage" )) { @@ -676,20 +676,20 @@ IMPL_STATIC_LINK( SvxThesaurusDialog_Impl, VendorImageInitHdl, SvxThesaurusDialo pThis->m_pDialog->SetSizePixel( aDlgSize ); pThis->m_pDialog->Invalidate(); } - + pThis->UpdateVendorImage(); pThis->m_pDialog->SetUpdateMode( sal_True ); - + return 0; }; // class SvxThesaurusDialog ---------------------------------------------- -SvxThesaurusDialog::SvxThesaurusDialog( - Window* pParent, +SvxThesaurusDialog::SvxThesaurusDialog( + Window* pParent, uno::Reference< linguistic2::XThesaurus > xThes, - const String &rWord, + const String &rWord, LanguageType nLanguage ) : SvxStandardDialog( pParent, CUI_RES( RID_SVXDLG_THESAURUS ) ) @@ -738,7 +738,7 @@ SvxThesaurusDialog::SvxThesaurusDialog( m_pImpl->aLangMBtn.SetPopupMenu( pMenu ); SetWindowTitle( nLanguage ); - + // disable controls if service is missing if (!m_pImpl->xThesaurus.is()) Enable( sal_False ); @@ -763,7 +763,7 @@ void SvxThesaurusDialog::SetWindowTitle( LanguageType nLanguage ) String SvxThesaurusDialog::GetWord() -{ +{ return m_pImpl->aReplaceEdit.GetText(); } diff --git a/cui/source/dialogs/thesdlg.hrc b/cui/source/dialogs/thesdlg.hrc index 994c933246de..46e122723e81 100755 --- a/cui/source/dialogs/thesdlg.hrc +++ b/cui/source/dialogs/thesdlg.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 @@ -30,14 +30,14 @@ // defines --------------------------------------------------------------- #define BTN_LEFT 9 -#define BTN_THES_OK 10 -#define BTN_THES_CANCEL 11 +#define BTN_THES_OK 10 +#define BTN_THES_CANCEL 11 #define MB_LANGUAGE 12 -#define BTN_THES_HELP 13 -#define FT_WORD 15 +#define BTN_THES_HELP 13 +#define FT_WORD 15 #define CB_WORD 16 -#define FT_REPL 21 -#define ED_REPL 22 +#define FT_REPL 21 +#define ED_REPL 22 #define FL_VAR 23 #define FT_THES_ALTERNATIVES 24 #define CT_THES_ALTERNATIVES 25 diff --git a/cui/source/dialogs/thesdlg.src b/cui/source/dialogs/thesdlg.src index 6c6a6444b33d..058435d3f378 100755 --- a/cui/source/dialogs/thesdlg.src +++ b/cui/source/dialogs/thesdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -24,12 +24,12 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - + #include "cuires.hrc" #include "thesdlg.hrc" #include "helpid.hrc" #include <svx/svxids.hrc> // SID_THESAURUS - + // RID_SVXDLG_THES ------------------------------------------------------- ModalDialog RID_SVXDLG_THESAURUS @@ -47,7 +47,7 @@ ModalDialog RID_SVXDLG_THESAURUS Size = MAP_APPFONT ( 235, 0 ) ; // correct size will be applied at runtime Hide = TRUE; }; - + ImageButton BTN_LEFT { Pos = MAP_APPFONT ( 5 , 15 ) ; @@ -66,7 +66,7 @@ ModalDialog RID_SVXDLG_THESAURUS { DropDown = TRUE ; Pos = MAP_APPFONT ( 24 , 16 ) ; - Size = MAP_APPFONT ( 141 , 60 ) ; // have drop down space for several lines + Size = MAP_APPFONT ( 141 , 60 ) ; // have drop down space for several lines }; MenuButton MB_LANGUAGE { @@ -74,7 +74,7 @@ ModalDialog RID_SVXDLG_THESAURUS Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "~Language" ; }; - + FixedText FT_THES_ALTERNATIVES { Pos = MAP_APPFONT ( 5 , 33 ) ; diff --git a/cui/source/dialogs/thesdlg_impl.hxx b/cui/source/dialogs/thesdlg_impl.hxx index d72b8625e3ea..573eaed1c2fe 100644 --- a/cui/source/dialogs/thesdlg_impl.hxx +++ b/cui/source/dialogs/thesdlg_impl.hxx @@ -86,7 +86,7 @@ public: // ComboBox virtual void Modify(); }; - + // class ReplaceEdit_Impl -------------------------------------------------- class ReplaceEdit_Impl : public Edit @@ -108,12 +108,12 @@ public: virtual void SetText( const XubString& rStr ); virtual void SetText( const XubString& rStr, const Selection& rNewSelection ); }; - + // class ThesaurusAlternativesCtrl_Impl ---------------------------------- class AlternativesExtraData { - String sText; + String sText; bool bHeader; public: @@ -123,7 +123,7 @@ public: bHeader(bIsHeader) { } - + bool IsHeader() const { return bHeader; } const String& GetText() const { return sText; } }; @@ -141,7 +141,7 @@ public: }; -class ThesaurusAlternativesCtrl_Impl : +class ThesaurusAlternativesCtrl_Impl : public SvxCheckListBox { SvxThesaurusDialog_Impl & m_rDialogImpl; @@ -189,17 +189,17 @@ struct SvxThesaurusDialog_Impl OKButton aReplaceBtn; CancelButton aCancelBtn; - String aErrStr; + String aErrStr; Image aVendorDefaultImage; Image aVendorDefaultImageHC; - uno::Reference< linguistic2::XThesaurus > xThesaurus; + uno::Reference< linguistic2::XThesaurus > xThesaurus; OUString aLookUpText; LanguageType nLookUpLanguage; std::stack< OUString > aLookUpHistory; bool m_bWordFound; - + // Handler DECL_LINK( LeftBtnHdl_Impl, Button * ); DECL_LINK( LanguageHdl_Impl, MenuButton * ); @@ -210,14 +210,14 @@ struct SvxThesaurusDialog_Impl DECL_STATIC_LINK( SvxThesaurusDialog_Impl, SelectFirstHdl_Impl, SvxCheckListBox * ); DECL_STATIC_LINK( SvxThesaurusDialog_Impl, VendorImageInitHdl, SvxThesaurusDialog_Impl * ); - - + + SvxThesaurusDialog_Impl( SvxThesaurusDialog * pDialog ); ~SvxThesaurusDialog_Impl(); - uno::Sequence< uno::Reference< linguistic2::XMeaning > > SAL_CALL + uno::Sequence< uno::Reference< linguistic2::XMeaning > > SAL_CALL queryMeanings_Impl( ::rtl::OUString& rTerm, const lang::Locale& rLocale, const beans::PropertyValues& rProperties ) throw(lang::IllegalArgumentException, uno::RuntimeException); - + bool UpdateAlternativesBox_Impl(); void UpdateVendorImage(); void LookUp( const String &rText ); diff --git a/cui/source/dialogs/winpluginlib.cpp b/cui/source/dialogs/winpluginlib.cpp index c7f0e0af1d61..a8e8a3abac2c 100644 --- a/cui/source/dialogs/winpluginlib.cpp +++ b/cui/source/dialogs/winpluginlib.cpp @@ -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,7 +38,7 @@ #include <stdio.h> -#define SO_PATH_SIZE 4096 +#define SO_PATH_SIZE 4096 #define MOZ_PLUGIN_DLL_NAME "npsopluginmi.dll" extern "C" { int lc_isInstalled(const char* realFilePath) @@ -62,7 +62,7 @@ int lc_isInstalled(const char* realFilePath) RegCloseKey(hKeySoftware); if( ret == ERROR_FILE_NOT_FOUND) return 1; - else + else return -1; } ret = RegOpenKeyEx(hMozillaPlugins, "@sun.com/npsopluginmi;version=1.0", 0, KEY_READ, &hStarOffice); @@ -71,16 +71,16 @@ int lc_isInstalled(const char* realFilePath) RegCloseKey(hMozillaPlugins); if( ret == ERROR_FILE_NOT_FOUND) return 1; - else + else return -1; } - - if((realFilePath == NULL) || (strlen(realFilePath) == 0) || (strlen(realFilePath) >= SO_PATH_SIZE)) - ret = -1; + + if((realFilePath == NULL) || (strlen(realFilePath) == 0) || (strlen(realFilePath) >= SO_PATH_SIZE)) + ret = -1; else{ - sprintf(sSoPath,"%s", realFilePath); + sprintf(sSoPath,"%s", realFilePath); ret = 0; - } + } //ret = GetCurrentDirectory( SO_PATH_SIZE, sSoPath); //ret = GetEnvironmentVariable("prog", sSoPath, SO_PATH_SIZE); // GetCurrentDirectory return the char number of the string @@ -97,10 +97,10 @@ int lc_isInstalled(const char* realFilePath) else ret = -1; } - else + else ret = -1; - RegCloseKey(hStarOffice); - RegCloseKey(hMozillaPlugins); + RegCloseKey(hStarOffice); + RegCloseKey(hMozillaPlugins); RegCloseKey(hKeySoftware); return ret; } @@ -124,7 +124,7 @@ int lc_uninstallPlugin(const char*) RegCloseKey(hKeySoftware); if( ret == ERROR_FILE_NOT_FOUND) return 0; - else + else return -1; } @@ -134,7 +134,7 @@ int lc_uninstallPlugin(const char*) RegCloseKey(hMozillaPlugins); if( ret == ERROR_FILE_NOT_FOUND) return 0; - else + else return -1; } RegCloseKey(hStarOffice); @@ -167,43 +167,43 @@ int lc_installPlugin(const char* realFilePath) } ret = RegOpenKeyEx(hKeySoftware, "MozillaPlugins", 0, KEY_READ|KEY_WRITE, &hMozillaPlugins); if(ret != ERROR_SUCCESS){ - RegCreateKeyEx(hKeySoftware, - "MozillaPlugins", - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_READ|KEY_WRITE, + RegCreateKeyEx(hKeySoftware, + "MozillaPlugins", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_READ|KEY_WRITE, NULL, &hMozillaPlugins, &sState); } - ret = RegCreateKeyEx(hMozillaPlugins, - "@sun.com/npsopluginmi;version=1.0", - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_READ|KEY_WRITE, + ret = RegCreateKeyEx(hMozillaPlugins, + "@sun.com/npsopluginmi;version=1.0", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_READ|KEY_WRITE, NULL, - &hStarOffice, + &hStarOffice, &sState); if(ret != ERROR_SUCCESS){ RegCloseKey(hKeySoftware); RegCloseKey(hMozillaPlugins); return -1; } - + RegFlushKey(hStarOffice); RegFlushKey(hMozillaPlugins); - - - if((realFilePath == NULL) || (strlen(realFilePath) == 0) || (strlen(realFilePath) >= SO_PATH_SIZE)) - ret = -1; + + + if((realFilePath == NULL) || (strlen(realFilePath) == 0) || (strlen(realFilePath) >= SO_PATH_SIZE)) + ret = -1; else{ - sprintf(sSoPath,"%s", realFilePath); - ret = 0; + sprintf(sSoPath,"%s", realFilePath); + ret = 0; } - + //ret = GetCurrentDirectory( SO_PATH_SIZE, sSoPath); // GetCurrentDirectory return the char number of the string if(ret == 0){ @@ -213,7 +213,7 @@ int lc_installPlugin(const char* realFilePath) else ret = -1; } - else + else ret = -1; RegFlushKey(hStarOffice); RegFlushKey(hMozillaPlugins); diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx index 38a03773c7f7..04fe71d5d9b1 100644 --- a/cui/source/dialogs/zoom.cxx +++ b/cui/source/dialogs/zoom.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ #include <svx/viewlayoutitem.hxx> #include <dialmgr.hxx> #include <svx/zoom_def.hxx> -#include <svx/dialogs.hrc> // RID_SVXDLG_ZOOM +#include <svx/dialogs.hrc> // RID_SVXDLG_ZOOM #include <layout/layout-pre.hxx> #if ENABLE_LAYOUT @@ -66,7 +66,7 @@ static USHORT pRanges[] = 0 }; -#define SPECIAL_FACTOR ((USHORT)0xFFFF) +#define SPECIAL_FACTOR ((USHORT)0xFFFF) // class SvxZoomDialog --------------------------------------------------- @@ -211,11 +211,11 @@ SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) : aBottomFl ( this, CUI_RES( FL_BOTTOM ) ), aOKBtn ( this, CUI_RES( BTN_ZOOM_OK ) ), aCancelBtn ( this, CUI_RES( BTN_ZOOM_CANCEL ) ), - aHelpBtn ( this, CUI_RES( BTN_ZOOM_HELP ) ), + aHelpBtn ( this, CUI_RES( BTN_ZOOM_HELP ) ), - rSet ( rCoreSet ), + rSet ( rCoreSet ), pOutSet ( NULL ), - bModified ( FALSE ) + bModified ( FALSE ) { #if ENABLE_LAYOUT diff --git a/cui/source/dialogs/zoom.hrc b/cui/source/dialogs/zoom.hrc index 49412ad085f0..0fb3a8afc6c5 100644 --- a/cui/source/dialogs/zoom.hrc +++ b/cui/source/dialogs/zoom.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/zoom.src b/cui/source/dialogs/zoom.src index 8137b1c7bb89..54b995f3ddd7 100644 --- a/cui/source/dialogs/zoom.src +++ b/cui/source/dialogs/zoom.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite |