diff options
| author | Thomas Lange [tl] <tl@openoffice.org> | 2010-02-26 13:02:44 +0100 |
|---|---|---|
| committer | Thomas Lange [tl] <tl@openoffice.org> | 2010-02-26 13:02:44 +0100 |
| commit | 3704620b259a35c75f400f3dce03a5d277a52639 (patch) | |
| tree | 5d2aa18167cef2456147b79f8fe6ae93a13a2e08 /editeng | |
| parent | f3f9bbf544328823c6816bcc6e9afecc886c18ab (diff) | |
cws tl74: merge problem fixed
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/inc/editeng/outliner.hxx | 4 | ||||
| -rwxr-xr-x | editeng/source/outliner/outlvw.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx index 34e1279c7036..a4efc98674fc 100644 --- a/editeng/inc/editeng/outliner.hxx +++ b/editeng/inc/editeng/outliner.hxx @@ -391,8 +391,8 @@ public: // some thesaurus functionality to avoid code duplication in different projects... -bool SVX_DLLPUBLIC GetStatusValueForThesaurusFromContext( String &rStatusVal, LanguageType &rLang, const EditView &rEditView ); -void SVX_DLLPUBLIC ReplaceTextWithSynonym( EditView &rEditView, const String &rSynonmText ); +bool EDITENG_DLLPUBLIC GetStatusValueForThesaurusFromContext( String &rStatusVal, LanguageType &rLang, const EditView &rEditView ); +void EDITENG_DLLPUBLIC ReplaceTextWithSynonym( EditView &rEditView, const String &rSynonmText ); //#if 0 // _SOLAR__PRIVATE diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx index d753cec0e027..e2a1fabea0ba 100755 --- a/editeng/source/outliner/outlvw.cxx +++ b/editeng/source/outliner/outlvw.cxx @@ -1686,7 +1686,7 @@ Selection OutlinerView::GetSurroundingTextSelection() const // returns: true if a word for thesaurus look-up was found at the current cursor position. // The status string will be word + iso language string (e.g. "light#en-US") -bool SVX_DLLPUBLIC GetStatusValueForThesaurusFromContext( +bool EDITENG_DLLPUBLIC GetStatusValueForThesaurusFromContext( String &rStatusVal, LanguageType &rLang, const EditView &rEditView ) @@ -1714,7 +1714,7 @@ bool SVX_DLLPUBLIC GetStatusValueForThesaurusFromContext( } -void SVX_DLLPUBLIC ReplaceTextWithSynonym( EditView &rEditView, const String &rSynonmText ) +void EDITENG_DLLPUBLIC ReplaceTextWithSynonym( EditView &rEditView, const String &rSynonmText ) { // get selection to use ESelection aCurSel( rEditView.GetSelection() ); |