You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2012/11/14 23:46:40 UTC
svn commit: r1409493 - in /incubator/ooo/branches/gbuild/main: ./
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/
lingucomponent/source/spellcheck/spell/
lingucomponent/source/thesaurus/libnth/ linguistic/
linguistic/inc/linguistic/ linguistic/pr...
Author: arist
Date: Wed Nov 14 22:46:38 2012
New Revision: 1409493
URL: http://svn.apache.org/viewvc?rev=1409493&view=rev
Log:
gnumake4_009_fa5f0abd650e.patch
# HG changeset patch
# User mba
# Date 1298563690 -3600
# Node ID fa5f0abd650e8a361ee11528a5c1a5500f27571a
# Parent 34adb0ecf99b70406c5ed8e267b8b68e8caaf7d1
CWS gnumake4: convert linguistic to new build system
Added:
incubator/ooo/branches/gbuild/main/linguistic/JunitTest_linguistic_complex.mk (with props)
incubator/ooo/branches/gbuild/main/linguistic/JunitTest_linguistic_unoapi.mk (with props)
incubator/ooo/branches/gbuild/main/linguistic/Library_lng.mk (with props)
incubator/ooo/branches/gbuild/main/linguistic/Makefile (with props)
incubator/ooo/branches/gbuild/main/linguistic/Module_linguistic.mk (with props)
incubator/ooo/branches/gbuild/main/linguistic/Package_inc.mk (with props)
incubator/ooo/branches/gbuild/main/linguistic/inc/linguistic/lngdllapi.h (with props)
incubator/ooo/branches/gbuild/main/linguistic/prj/makefile.mk (with props)
Modified:
incubator/ooo/branches/gbuild/main/Module_ooo.mk
incubator/ooo/branches/gbuild/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
incubator/ooo/branches/gbuild/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx
incubator/ooo/branches/gbuild/main/lingucomponent/source/spellcheck/spell/sspellimp.cxx
incubator/ooo/branches/gbuild/main/lingucomponent/source/spellcheck/spell/sspellimp.hxx
incubator/ooo/branches/gbuild/main/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
incubator/ooo/branches/gbuild/main/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
incubator/ooo/branches/gbuild/main/linguistic/inc/linguistic/hyphdta.hxx
incubator/ooo/branches/gbuild/main/linguistic/inc/linguistic/lngprophelp.hxx
incubator/ooo/branches/gbuild/main/linguistic/inc/linguistic/misc.hxx
incubator/ooo/branches/gbuild/main/linguistic/inc/linguistic/spelldta.hxx
incubator/ooo/branches/gbuild/main/linguistic/prj/build.lst
incubator/ooo/branches/gbuild/main/linguistic/prj/d.lst
incubator/ooo/branches/gbuild/main/linguistic/qa/unoapi/Test.java
incubator/ooo/branches/gbuild/main/linguistic/source/hyphdta.cxx
incubator/ooo/branches/gbuild/main/linguistic/source/lngprophelp.cxx
incubator/ooo/branches/gbuild/main/linguistic/source/lngreg.cxx
incubator/ooo/branches/gbuild/main/linguistic/source/spelldta.cxx
incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk
Modified: incubator/ooo/branches/gbuild/main/Module_ooo.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/Module_ooo.mk?rev=1409493&r1=1409492&r2=1409493&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/Module_ooo.mk (original)
+++ incubator/ooo/branches/gbuild/main/Module_ooo.mk Wed Nov 14 22:46:38 2012
@@ -29,6 +29,7 @@ $(eval $(call gb_Module_add_moduledirs,o
editeng \
framework \
idl \
+ linguistic \
offapi \
oovbaapi \
oox \
Modified: incubator/ooo/branches/gbuild/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx?rev=1409493&r1=1409492&r2=1409493&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx (original)
+++ incubator/ooo/branches/gbuild/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx Wed Nov 14 22:46:38 2012
@@ -108,17 +108,17 @@ Hyphenator::~Hyphenator()
if (aDicts) delete[] aDicts;
aDicts = NULL;
numdict = 0;
+ delete pPropHelper;
}
-PropertyHelper_Hyphen & Hyphenator::GetPropHelper_Impl()
+PropertyHelper_Hyphenation& Hyphenator::GetPropHelper_Impl()
{
if (!pPropHelper)
{
Reference< XPropertySet > xPropSet( GetLinguProperties(), UNO_QUERY );
- pPropHelper = new PropertyHelper_Hyphen ((XHyphenator *) this, xPropSet );
- xPropHelper = pPropHelper;
+ pPropHelper = new PropertyHelper_Hyphenation ((XHyphenator *) this, xPropSet );
pPropHelper->AddAsPropListener(); //! after a reference is established
}
return *pPropHelper;
@@ -287,7 +287,7 @@ Reference< XHyphenatedWord > SAL_CALL Hy
char *lcword;
int k = 0;
- PropertyHelper_Hyphen & rHelper = GetPropHelper();
+ PropertyHelper_Hyphenation& rHelper = GetPropHelper();
rHelper.SetTmpPropVals(aProperties);
sal_Int16 minTrail = rHelper.GetMinTrailing();
sal_Int16 minLead = rHelper.GetMinLeading();
@@ -500,13 +500,13 @@ Reference< XHyphenatedWord > SAL_CALL Hy
sal_Int16 nPos = (sal_Int16) ((nHyphenationPosAltHyph < nHyphenationPos) ?
nHyphenationPosAltHyph : nHyphenationPos);
// dicretionary hyphenation
- xRes = new HyphenatedWord( aWord, LocaleToLanguage( aLocale ), nPos,
+ xRes = HyphenatedWord::CreateHyphenatedWord( aWord, LocaleToLanguage( aLocale ), nPos,
aWord.replaceAt(nHyphenationPosAlt + 1, cut[nHyphenationPos], repHyph),
(sal_Int16) nHyphenationPosAltHyph);
}
else
{
- xRes = new HyphenatedWord( aWord, LocaleToLanguage( aLocale ),
+ xRes = HyphenatedWord::CreateHyphenatedWord( aWord, LocaleToLanguage( aLocale ),
(sal_Int16)nHyphenationPos, aWord, (sal_Int16) nHyphenationPos);
}
}
@@ -552,7 +552,7 @@ Reference< XPossibleHyphens > SAL_CALL H
char *lcword;
int k;
- PropertyHelper_Hyphen & rHelper = GetPropHelper();
+ PropertyHelper_Hyphenation& rHelper = GetPropHelper();
rHelper.SetTmpPropVals(aProperties);
sal_Int16 minTrail = rHelper.GetMinTrailing();
sal_Int16 minLead = rHelper.GetMinLeading();
@@ -709,7 +709,7 @@ Reference< XPossibleHyphens > SAL_CALL H
//fprintf(stderr,"result is %s\n",OU2A(hyphenatedWord));
//fflush(stderr);
- xRes = new PossibleHyphens( aWord, LocaleToLanguage( aLocale ),
+ xRes = PossibleHyphens::CreatePossibleHyphens( aWord, LocaleToLanguage( aLocale ),
hyphenatedWord, aHyphPos );
delete[] hyphens;
@@ -820,7 +820,6 @@ sal_Bool SAL_CALL Hyphenator::removeLing
sal_Bool bRes = sal_False;
if (!bDisposing && rxLstnr.is())
{
- DBG_ASSERT( xPropHelper.is(), "xPropHelper non existent" );
bRes = GetPropHelper().removeLinguServiceEventListener( rxLstnr );
}
return bRes;
@@ -853,8 +852,7 @@ void SAL_CALL Hyphenator::initialize( co
//! And the reference to the UNO-functions while increasing
//! the ref-count and will implicitly free the memory
//! when the object is not longer used.
- pPropHelper = new PropertyHelper_Hyphen( (XHyphenator *) this, xPropSet );
- xPropHelper = pPropHelper;
+ pPropHelper = new PropertyHelper_Hyphenation( (XHyphenator *) this, xPropSet );
pPropHelper->AddAsPropListener(); //! after a reference is established
}
else
Modified: incubator/ooo/branches/gbuild/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx?rev=1409493&r1=1409492&r2=1409493&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx (original)
+++ incubator/ooo/branches/gbuild/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx Wed Nov 14 22:46:38 2012
@@ -83,17 +83,16 @@ class Hyphenator :
sal_Int32 numdict;
::cppu::OInterfaceContainerHelper aEvtListeners;
- Reference< XPropertyChangeListener > xPropHelper;
Reference< XMultiServiceFactory > rSMgr;
- linguistic::PropertyHelper_Hyphen * pPropHelper;
+ linguistic::PropertyHelper_Hyphenation* pPropHelper;
sal_Bool bDisposing;
// disallow copy-constructor and assignment-operator for now
Hyphenator(const Hyphenator &);
Hyphenator & operator = (const Hyphenator &);
- linguistic::PropertyHelper_Hyphen & GetPropHelper_Impl();
- linguistic::PropertyHelper_Hyphen & GetPropHelper()
+ linguistic::PropertyHelper_Hyphenation& GetPropHelper_Impl();
+ linguistic::PropertyHelper_Hyphenation& GetPropHelper()
{
return pPropHelper ? *pPropHelper : GetPropHelper_Impl();
}
Modified: incubator/ooo/branches/gbuild/main/lingucomponent/source/spellcheck/spell/sspellimp.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/lingucomponent/source/spellcheck/spell/sspellimp.cxx?rev=1409493&r1=1409492&r2=1409493&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/lingucomponent/source/spellcheck/spell/sspellimp.cxx (original)
+++ incubator/ooo/branches/gbuild/main/lingucomponent/source/spellcheck/spell/sspellimp.cxx Wed Nov 14 22:46:38 2012
@@ -102,17 +102,17 @@ SpellChecker::~SpellChecker()
aDNames = NULL;
if (pPropHelper)
pPropHelper->RemoveAsPropListener();
+ delete pPropHelper;
}
-PropertyHelper_Spell & SpellChecker::GetPropHelper_Impl()
+PropertyHelper_Spelling & SpellChecker::GetPropHelper_Impl()
{
if (!pPropHelper)
{
Reference< XPropertySet > xPropSet( GetLinguProperties(), UNO_QUERY );
- pPropHelper = new PropertyHelper_Spell( (XSpellChecker *) this, xPropSet );
- xPropHelper = pPropHelper;
+ pPropHelper = new PropertyHelper_Spelling( (XSpellChecker *) this, xPropSet );
pPropHelper->AddAsPropListener(); //! after a reference is established
}
return *pPropHelper;
@@ -382,7 +382,7 @@ sal_Bool SAL_CALL SpellChecker::isValid(
// You'll probably like to use a simplier solution than the provided
// one using the PropertyHelper_Spell.
- PropertyHelper_Spell &rHelper = GetPropHelper();
+ PropertyHelper_Spelling& rHelper = GetPropHelper();
rHelper.SetTmpPropVals( rProperties );
sal_Int16 nFailure = GetSpellFailure( rWord, rLocale );
@@ -471,12 +471,8 @@ Reference< XSpellAlternatives >
}
// now return an empty alternative for no suggestions or the list of alternatives if some found
- SpellAlternatives *pAlt = new SpellAlternatives;
String aTmp(rWord);
- pAlt->SetWordLanguage( aTmp, nLang );
- pAlt->SetFailureType( SpellFailure::SPELLING_ERROR );
- pAlt->SetAlternatives( aStr );
- xRes = pAlt;
+ xRes = SpellAlternatives::CreateSpellAlternatives( aTmp, nLang, SpellFailure::SPELLING_ERROR, aStr );
return xRes;
}
return xRes;
@@ -543,7 +539,6 @@ sal_Bool SAL_CALL SpellChecker::removeLi
sal_Bool bRes = sal_False;
if (!bDisposing && rxLstnr.is())
{
- DBG_ASSERT( xPropHelper.is(), "xPropHelper non existent" );
bRes = GetPropHelper().removeLinguServiceEventListener( rxLstnr );
}
return bRes;
@@ -576,8 +571,7 @@ void SAL_CALL SpellChecker::initialize(
//! And the reference to the UNO-functions while increasing
//! the ref-count and will implicitly free the memory
//! when the object is not longer used.
- pPropHelper = new PropertyHelper_Spell( (XSpellChecker *) this, xPropSet );
- xPropHelper = pPropHelper;
+ pPropHelper = new PropertyHelper_Spelling( (XSpellChecker *) this, xPropSet );
pPropHelper->AddAsPropListener(); //! after a reference is established
}
else
Modified: incubator/ooo/branches/gbuild/main/lingucomponent/source/spellcheck/spell/sspellimp.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/lingucomponent/source/spellcheck/spell/sspellimp.hxx?rev=1409493&r1=1409492&r2=1409493&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/lingucomponent/source/spellcheck/spell/sspellimp.hxx (original)
+++ incubator/ooo/branches/gbuild/main/lingucomponent/source/spellcheck/spell/sspellimp.hxx Wed Nov 14 22:46:38 2012
@@ -72,16 +72,15 @@ class SpellChecker :
sal_Int32 numdict;
::cppu::OInterfaceContainerHelper aEvtListeners;
- Reference< XPropertyChangeListener > xPropHelper;
- linguistic::PropertyHelper_Spell * pPropHelper;
+ linguistic::PropertyHelper_Spelling* pPropHelper;
sal_Bool bDisposing;
// disallow copy-constructor and assignment-operator for now
SpellChecker(const SpellChecker &);
SpellChecker & operator = (const SpellChecker &);
- linguistic::PropertyHelper_Spell & GetPropHelper_Impl();
- linguistic::PropertyHelper_Spell & GetPropHelper()
+ linguistic::PropertyHelper_Spelling& GetPropHelper_Impl();
+ linguistic::PropertyHelper_Spelling& GetPropHelper()
{
return pPropHelper ? *pPropHelper : GetPropHelper_Impl();
}
Modified: incubator/ooo/branches/gbuild/main/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/lingucomponent/source/thesaurus/libnth/nthesimp.cxx?rev=1409493&r1=1409492&r2=1409493&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/lingucomponent/source/thesaurus/libnth/nthesimp.cxx (original)
+++ incubator/ooo/branches/gbuild/main/lingucomponent/source/thesaurus/libnth/nthesimp.cxx Wed Nov 14 22:46:38 2012
@@ -132,17 +132,17 @@ Thesaurus::~Thesaurus()
if (pPropHelper)
pPropHelper->RemoveAsPropListener();
+ delete pPropHelper;
}
-PropertyHelper_Thes & Thesaurus::GetPropHelper_Impl()
+PropertyHelper_Thesaurus& Thesaurus::GetPropHelper_Impl()
{
if (!pPropHelper)
{
Reference< XPropertySet > xPropSet( GetLinguProperties(), UNO_QUERY );
- pPropHelper = new PropertyHelper_Thes( (XThesaurus *) this, xPropSet );
- xPropHelper = pPropHelper;
+ pPropHelper = new PropertyHelper_Thesaurus( (XThesaurus *) this, xPropSet );
pPropHelper->AddAsPropListener(); //! after a reference is established
}
return *pPropHelper;
@@ -337,7 +337,7 @@ Sequence < Reference < ::com::sun::star:
mentry * pmean = NULL;
sal_Int32 nmean = 0;
- PropertyHelper_Thes &rHelper = GetPropHelper();
+ PropertyHelper_Thesaurus &rHelper = GetPropHelper();
rHelper.SetTmpPropVals( rProperties );
MyThes * pTH = NULL;
@@ -596,8 +596,7 @@ void SAL_CALL Thesaurus::initialize( con
//! And the reference to the UNO-functions while increasing
//! the ref-count and will implicitly free the memory
//! when the object is not longer used.
- pPropHelper = new PropertyHelper_Thes( (XThesaurus *) this, xPropSet );
- xPropHelper = pPropHelper;
+ pPropHelper = new PropertyHelper_Thesaurus( (XThesaurus *) this, xPropSet );
pPropHelper->AddAsPropListener(); //! after a reference is established
}
else
Modified: incubator/ooo/branches/gbuild/main/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/lingucomponent/source/thesaurus/libnth/nthesimp.hxx?rev=1409493&r1=1409492&r2=1409493&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/lingucomponent/source/thesaurus/libnth/nthesimp.hxx (original)
+++ incubator/ooo/branches/gbuild/main/lingucomponent/source/thesaurus/libnth/nthesimp.hxx Wed Nov 14 22:46:38 2012
@@ -81,8 +81,7 @@ class Thesaurus :
Sequence< Locale > aSuppLocales;
::cppu::OInterfaceContainerHelper aEvtListeners;
- Reference< XPropertyChangeListener > xPropHelper;
- linguistic::PropertyHelper_Thes * pPropHelper;
+ linguistic::PropertyHelper_Thesaurus* pPropHelper;
sal_Bool bDisposing;
CharClass ** aCharSetInfo;
MyThes ** aThes;
@@ -100,8 +99,8 @@ class Thesaurus :
Thesaurus(const Thesaurus &);
Thesaurus & operator = (const Thesaurus &);
- linguistic::PropertyHelper_Thes & GetPropHelper_Impl();
- linguistic::PropertyHelper_Thes & GetPropHelper()
+ linguistic::PropertyHelper_Thesaurus& GetPropHelper_Impl();
+ linguistic::PropertyHelper_Thesaurus& GetPropHelper()
{
return pPropHelper ? *pPropHelper : GetPropHelper_Impl();
}
Added: incubator/ooo/branches/gbuild/main/linguistic/JunitTest_linguistic_complex.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/linguistic/JunitTest_linguistic_complex.mk?rev=1409493&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/linguistic/JunitTest_linguistic_complex.mk (added)
+++ incubator/ooo/branches/gbuild/main/linguistic/JunitTest_linguistic_complex.mk Wed Nov 14 22:46:38 2012
@@ -0,0 +1,53 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_JunitTest_JunitTest,linguistic_complex))
+
+$(eval $(call gb_JunitTest_set_defs,linguistic_complex,\
+ $$(DEFS) \
+ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/linguistic/qa/complex/linguistic/testdocuments \
+))
+
+$(eval $(call gb_JunitTest_add_jars,linguistic_complex,\
+ $(OUTDIR)/bin/OOoRunner.jar \
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/test.jar \
+ $(OUTDIR)/bin/test-tools.jar \
+ $(OUTDIR)/bin/unoil.jar \
+ $(OUTDIR)/bin/jurt.jar \
+))
+
+$(eval $(call gb_JunitTest_add_sourcefiles,linguistic_complex,\
+ linguistic/qa/complex/linguistic/HangulHanjaConversion \
+ linguistic/qa/complex/linguistic/TestDocument \
+))
+
+$(eval $(call gb_JunitTest_add_classes,linguistic_complex,\
+ complex.linguistic.HangulHanjaConversion \
+))
+
+# vim: set noet sw=4 ts=4:
Propchange: incubator/ooo/branches/gbuild/main/linguistic/JunitTest_linguistic_complex.mk
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/ooo/branches/gbuild/main/linguistic/JunitTest_linguistic_unoapi.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/linguistic/JunitTest_linguistic_unoapi.mk?rev=1409493&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/linguistic/JunitTest_linguistic_unoapi.mk (added)
+++ incubator/ooo/branches/gbuild/main/linguistic/JunitTest_linguistic_unoapi.mk Wed Nov 14 22:46:38 2012
@@ -0,0 +1,53 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_JunitTest_JunitTest,linguistic_unoapi))
+
+$(eval $(call gb_JunitTest_set_defs,linguistic_unoapi,\
+ $$(DEFS) \
+ -Dorg.openoffice.test.arg.sce=$(SRCDIR)/linguistic/qa/unoapi/lng.sce \
+ -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/linguistic/qa/unoapi/knownissues.xcl \
+ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/linguistic/qa/unoapi \
+))
+
+$(eval $(call gb_JunitTest_add_jars,linguistic_unoapi,\
+ $(OUTDIR)/bin/OOoRunner.jar \
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/test.jar \
+ $(OUTDIR)/bin/unoil.jar \
+ $(OUTDIR)/bin/jurt.jar \
+))
+
+$(eval $(call gb_JunitTest_add_sourcefiles,linguistic_unoapi,\
+ linguistic/qa/unoapi/Test \
+))
+
+$(eval $(call gb_JunitTest_add_classes,linguistic_unoapi,\
+ org.openoffice.linguistic.qa.unoapi.Test \
+))
+
+# vim: set noet sw=4 ts=4:
Propchange: incubator/ooo/branches/gbuild/main/linguistic/JunitTest_linguistic_unoapi.mk
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/ooo/branches/gbuild/main/linguistic/Library_lng.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/linguistic/Library_lng.mk?rev=1409493&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/linguistic/Library_lng.mk (added)
+++ incubator/ooo/branches/gbuild/main/linguistic/Library_lng.mk Wed Nov 14 22:46:38 2012
@@ -0,0 +1,92 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,lng))
+
+$(eval $(call gb_Library_add_package_headers,lng,linguistic_inc))
+
+$(eval $(call gb_Library_add_precompiled_header,lng,$(SRCDIR)/linguistic/inc/pch/precompiled_linguistic))
+
+$(eval $(call gb_Library_set_componentfile,lng,linguistic/source/lng))
+
+$(eval $(call gb_Library_add_api,lng,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_set_include,lng,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/linguistic/inc \
+ -I$(SRCDIR)/linguistic/inc/pch \
+))
+
+$(eval $(call gb_Library_set_defs,lng,\
+ $$(DEFS) \
+ -DLNG_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,lng,\
+ cppu \
+ cppuhelper \
+ comphelper \
+ vos3 \
+ tl \
+ i18nisolang1 \
+ svl \
+ stl \
+ sal \
+ xo \
+ ucbhelper \
+ utl \
+ icuuc \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,lng,\
+ linguistic/source/convdic \
+ linguistic/source/convdiclist \
+ linguistic/source/convdicxml \
+ linguistic/source/dicimp \
+ linguistic/source/dlistimp \
+ linguistic/source/gciterator \
+ linguistic/source/hhconvdic \
+ linguistic/source/hyphdsp \
+ linguistic/source/hyphdta \
+ linguistic/source/iprcache \
+ linguistic/source/lngopt \
+ linguistic/source/lngprophelp \
+ linguistic/source/lngreg \
+ linguistic/source/lngsvcmgr \
+ linguistic/source/misc \
+ linguistic/source/misc2 \
+ linguistic/source/spelldsp \
+ linguistic/source/spelldta \
+ linguistic/source/thesdsp \
+ linguistic/source/thesdta \
+))
+
+# vim: set noet sw=4 ts=4:
Propchange: incubator/ooo/branches/gbuild/main/linguistic/Library_lng.mk
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/ooo/branches/gbuild/main/linguistic/Makefile
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/linguistic/Makefile?rev=1409493&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/linguistic/Makefile (added)
+++ incubator/ooo/branches/gbuild/main/linguistic/Makefile Wed Nov 14 22:46:38 2012
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
Propchange: incubator/ooo/branches/gbuild/main/linguistic/Makefile
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/ooo/branches/gbuild/main/linguistic/Module_linguistic.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/linguistic/Module_linguistic.mk?rev=1409493&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/linguistic/Module_linguistic.mk (added)
+++ incubator/ooo/branches/gbuild/main/linguistic/Module_linguistic.mk Wed Nov 14 22:46:38 2012
@@ -0,0 +1,45 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Module_Module,linguistic))
+
+$(eval $(call gb_Module_add_targets,linguistic,\
+ Library_lng \
+ Package_inc \
+))
+
+#$(eval $(call gb_Module_add_check_targets,linguistic,\
+#))
+
+$(eval $(call gb_Module_add_subsequentcheck_targets,linguistic,\
+ JunitTest_linguistic_unoapi \
+))
+
+# was disabled in old build system
+# JunitTest_linguistic_complex \
+
+# vim: set noet sw=4 ts=4:
Propchange: incubator/ooo/branches/gbuild/main/linguistic/Module_linguistic.mk
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/ooo/branches/gbuild/main/linguistic/Package_inc.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/linguistic/Package_inc.mk?rev=1409493&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/linguistic/Package_inc.mk (added)
+++ incubator/ooo/branches/gbuild/main/linguistic/Package_inc.mk Wed Nov 14 22:46:38 2012
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Package_Package,linguistic_inc,$(SRCDIR)/linguistic/inc))
+
+# add files to the package
+# SOURCE_RELPATH/file.ext is the name of the source file (relative to the root give above)
+# DESTINATION_RELPATH/file.ext is the destination file (relative to $(OUTDIR))
+$(eval $(call gb_Package_add_file,linguistic_inc,inc/linguistic/lngdllapi.h,linguistic/lngdllapi.h))
+$(eval $(call gb_Package_add_file,linguistic_inc,inc/linguistic/hyphdta.hxx,linguistic/hyphdta.hxx))
+$(eval $(call gb_Package_add_file,linguistic_inc,inc/linguistic/lngprophelp.hxx,linguistic/lngprophelp.hxx))
+$(eval $(call gb_Package_add_file,linguistic_inc,inc/linguistic/lngprops.hxx,linguistic/lngprops.hxx))
+$(eval $(call gb_Package_add_file,linguistic_inc,inc/linguistic/misc.hxx,linguistic/misc.hxx))
+$(eval $(call gb_Package_add_file,linguistic_inc,inc/linguistic/spelldta.hxx,linguistic/spelldta.hxx))
+
+# vim: set noet sw=4 ts=4:
Propchange: incubator/ooo/branches/gbuild/main/linguistic/Package_inc.mk
------------------------------------------------------------------------------
svn:executable = *
Modified: incubator/ooo/branches/gbuild/main/linguistic/inc/linguistic/hyphdta.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/linguistic/inc/linguistic/hyphdta.hxx?rev=1409493&r1=1409492&r2=1409493&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/linguistic/inc/linguistic/hyphdta.hxx (original)
+++ incubator/ooo/branches/gbuild/main/linguistic/inc/linguistic/hyphdta.hxx Wed Nov 14 22:46:38 2012
@@ -24,15 +24,12 @@
#ifndef _LINGUISTIC_HYPHDTA_HXX_
#define _LINGUISTIC_HYPHDTA_HXX_
-
#include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
#include <com/sun/star/linguistic2/XPossibleHyphens.hpp>
-
#include <tools/solar.h>
-
#include <uno/lbnames.h> // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
#include <cppuhelper/implbase1.hxx> // helper for implementations
-
+#include <linguistic/lngdllapi.h>
namespace linguistic
{
@@ -87,6 +84,9 @@ public:
void SetWord( ::rtl::OUString &rTxt ) { aWord = rTxt; }
void SetHyphenatedWord( ::rtl::OUString &rTxt ) { aHyphenatedWord = rTxt; }
void SetLanguage( sal_Int16 nLang ) { nLanguage = nLang; }
+ static com::sun::star::uno::Reference <com::sun::star::linguistic2::XHyphenatedWord> LNG_DLLPUBLIC CreateHyphenatedWord(
+ const ::rtl::OUString &rWord, sal_Int16 nLang, sal_Int16 nHyphenationPos,
+ const ::rtl::OUString &rHyphenatedWord, sal_Int16 nHyphenPos );
};
@@ -131,6 +131,11 @@ public:
sal_Int16 GetLanguage() { return nLanguage; }
void SetWord( ::rtl::OUString &rTxt ) { aWord = rTxt; }
void SetLanguage( sal_Int16 nLang ) { nLanguage = nLang; }
+
+ static com::sun::star::uno::Reference < com::sun::star::linguistic2::XPossibleHyphens > LNG_DLLPUBLIC CreatePossibleHyphens
+ (const ::rtl::OUString &rWord, sal_Int16 nLang,
+ const ::rtl::OUString &rHyphWord,
+ const ::com::sun::star::uno::Sequence< sal_Int16 > &rPositions);
};
Added: incubator/ooo/branches/gbuild/main/linguistic/inc/linguistic/lngdllapi.h
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/linguistic/inc/linguistic/lngdllapi.h?rev=1409493&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/linguistic/inc/linguistic/lngdllapi.h (added)
+++ incubator/ooo/branches/gbuild/main/linguistic/inc/linguistic/lngdllapi.h Wed Nov 14 22:46:38 2012
@@ -0,0 +1,42 @@
+/*************************************************************************
+ *
+ * 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
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_LNG_DLLAPI_H
+#define INCLUDED_LNG_DLLAPI_H
+
+#include "sal/config.h"
+#include "sal/types.h"
+
+#if defined LNG_DLLIMPLEMENTATION
+#define LNG_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define LNG_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+
+#define LNG_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif
Propchange: incubator/ooo/branches/gbuild/main/linguistic/inc/linguistic/lngdllapi.h
------------------------------------------------------------------------------
svn:executable = *
Modified: incubator/ooo/branches/gbuild/main/linguistic/inc/linguistic/lngprophelp.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/linguistic/inc/linguistic/lngprophelp.hxx?rev=1409493&r1=1409492&r2=1409493&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/linguistic/inc/linguistic/lngprophelp.hxx (original)
+++ incubator/ooo/branches/gbuild/main/linguistic/inc/linguistic/lngprophelp.hxx Wed Nov 14 22:46:38 2012
@@ -25,14 +25,13 @@
#define _LINGUISTIC_LNGPROPHELP_HXX_
#include <tools/solar.h>
-
#include <uno/lbnames.h>
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/interfacecontainer.h>
#include <com/sun/star/beans/XPropertyChangeListener.hpp>
#include <com/sun/star/beans/PropertyValues.hpp>
-
#include <com/sun/star/linguistic2/XLinguServiceEventBroadcaster.hpp>
+#include <linguistic/lngdllapi.h>
namespace com { namespace sun { namespace star { namespace beans {
class XPropertySet;
@@ -157,7 +156,6 @@ public:
///////////////////////////////////////////////////////////////////////////
-
class PropertyHelper_Thes :
public PropertyChgHelper
{
@@ -179,6 +177,28 @@ public:
throw(::com::sun::star::uno::RuntimeException);
};
+class LNG_DLLPUBLIC PropertyHelper_Thesaurus
+{
+ PropertyHelper_Thes* pInst;
+ com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener > xPropHelper;
+
+ // disallow use of copy-constructor and assignment-operator
+ PropertyHelper_Thesaurus( const PropertyHelper_Thes & );
+ PropertyHelper_Thesaurus & operator = ( const PropertyHelper_Thes & );
+
+public:
+ PropertyHelper_Thesaurus(
+ const ::com::sun::star::uno::Reference<
+ ::com::sun::star::uno::XInterface > &rxSource,
+ ::com::sun::star::uno::Reference<
+ ::com::sun::star::beans::XPropertySet > &rxPropSet );
+ ~PropertyHelper_Thesaurus();
+ void AddAsPropListener();
+ void RemoveAsPropListener();
+ void SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals );
+};
+
+
///////////////////////////////////////////////////////////////////////////
class PropertyHelper_Spell :
@@ -187,6 +207,7 @@ class PropertyHelper_Spell :
// default values
sal_Bool bIsSpellUpperCase;
sal_Bool bIsSpellWithDigits;
+
sal_Bool bIsSpellCapitalization;
// return values, will be set to default value or current temporary value
@@ -230,6 +251,41 @@ public:
sal_Bool IsSpellCapitalization() const { return bResIsSpellCapitalization; }
};
+
+class LNG_DLLPUBLIC PropertyHelper_Spelling
+{
+ PropertyHelper_Spell* pInst;
+ com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener > xPropHelper;
+
+ // disallow use of copy-constructor and assignment-operator
+ PropertyHelper_Spelling( const PropertyHelper_Spell & );
+ PropertyHelper_Spelling & operator = ( const PropertyHelper_Spell & );
+
+public:
+ PropertyHelper_Spelling(
+ const ::com::sun::star::uno::Reference<
+ ::com::sun::star::uno::XInterface > &rxSource,
+ ::com::sun::star::uno::Reference<
+ ::com::sun::star::beans::XPropertySet > &rxPropSet );
+ ~PropertyHelper_Spelling();
+
+ void AddAsPropListener();
+ void RemoveAsPropListener();
+ void SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals );
+ sal_Int16 GetMaxNumberOfSuggestions() const;
+ sal_Bool IsSpellUpperCase() const;
+ sal_Bool IsSpellWithDigits() const;
+ sal_Bool IsSpellCapitalization() const;
+ sal_Bool addLinguServiceEventListener(
+ const ::com::sun::star::uno::Reference<
+ ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
+ throw(::com::sun::star::uno::RuntimeException);
+ sal_Bool removeLinguServiceEventListener(
+ const ::com::sun::star::uno::Reference<
+ ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
+ throw(::com::sun::star::uno::RuntimeException);
+};
+
///////////////////////////////////////////////////////////////////////////
class PropertyHelper_Hyphen :
@@ -276,6 +332,39 @@ public:
sal_Int16 GetMinWordLength() const { return nResHyphMinWordLength; }
};
+class LNG_DLLPUBLIC PropertyHelper_Hyphenation
+{
+ PropertyHelper_Hyphen* pInst;
+ com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener > xPropHelper;
+
+ // disallow use of copy-constructor and assignment-operator
+ PropertyHelper_Hyphenation( const PropertyHelper_Hyphen & );
+ PropertyHelper_Hyphenation & operator = ( const PropertyHelper_Hyphen & );
+
+public:
+ PropertyHelper_Hyphenation(
+ const ::com::sun::star::uno::Reference<
+ ::com::sun::star::uno::XInterface > &rxSource,
+ ::com::sun::star::uno::Reference<
+ ::com::sun::star::beans::XPropertySet > &rxPropSet);
+ ~PropertyHelper_Hyphenation();
+
+ void AddAsPropListener();
+ void RemoveAsPropListener();
+ void SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals );
+ sal_Int16 GetMinLeading() const;
+ sal_Int16 GetMinTrailing() const;
+ sal_Int16 GetMinWordLength() const;
+ sal_Bool addLinguServiceEventListener(
+ const ::com::sun::star::uno::Reference<
+ ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
+ throw(::com::sun::star::uno::RuntimeException);
+ sal_Bool removeLinguServiceEventListener(
+ const ::com::sun::star::uno::Reference<
+ ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
+ throw(::com::sun::star::uno::RuntimeException);
+};
+
///////////////////////////////////////////////////////////////////////////
} // namespace linguistic
Modified: incubator/ooo/branches/gbuild/main/linguistic/inc/linguistic/misc.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/linguistic/inc/linguistic/misc.hxx?rev=1409493&r1=1409492&r2=1409493&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/linguistic/inc/linguistic/misc.hxx (original)
+++ incubator/ooo/branches/gbuild/main/linguistic/inc/linguistic/misc.hxx Wed Nov 14 22:46:38 2012
@@ -24,7 +24,6 @@
#ifndef _LINGUISTIC_MISC_HXX_
#define _LINGUISTIC_MISC_HXX_
-
#include <com/sun/star/uno/Sequence.h>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/beans/PropertyValues.hpp>
@@ -43,6 +42,7 @@
#include <unotools/charclass.hxx>
#include <osl/thread.h>
#include <osl/mutex.hxx>
+#include <linguistic/lngdllapi.h>
namespace com { namespace sun { namespace star { namespace beans {
class XPropertySet;
@@ -91,7 +91,7 @@ namespace linguistic
///////////////////////////////////////////////////////////////////////////
-::osl::Mutex & GetLinguMutex();
+LNG_DLLPUBLIC ::osl::Mutex& GetLinguMutex();
LocaleDataWrapper & GetLocaleDataWrapper( sal_Int16 nLang );
@@ -120,7 +120,7 @@ sal_Int32 LevDistance( const rtl::OUStri
::com::sun::star::lang::Locale
CreateLocale( LanguageType eLang );
-LanguageType
+LNG_DLLPUBLIC LanguageType
LocaleToLanguage( const ::com::sun::star::lang::Locale& rLocale );
::com::sun::star::lang::Locale&
@@ -158,7 +158,7 @@ String GetModulePath( SvtPathOptions::P
/// @returns an URL for a new and writable dictionary rDicName.
/// The URL will point to the path given by 'GetDictionaryWriteablePath'
-String GetWritableDictionaryURL( const String &rDicName );
+LNG_DLLPUBLIC String GetWritableDictionaryURL( const String &rDicName );
// looks for the specified file in the list of paths.
// In case of multiple occurences only the first found is returned.
@@ -167,7 +167,7 @@ String SearchFileInPaths( const Stri
///////////////////////////////////////////////////////////////////////////
-sal_Int32 GetPosInWordToCheck( const rtl::OUString &rTxt, sal_Int32 nPos );
+LNG_DLLPUBLIC sal_Int32 GetPosInWordToCheck( const rtl::OUString &rTxt, sal_Int32 nPos );
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XHyphenatedWord >
@@ -177,8 +177,8 @@ sal_Int32 GetPosInWordToCheck( const rt
///////////////////////////////////////////////////////////////////////////
-sal_Bool IsUpper( const String &rText, xub_StrLen nPos, xub_StrLen nLen, sal_Int16 nLanguage );
-sal_Bool IsLower( const String &rText, xub_StrLen nPos, xub_StrLen nLen, sal_Int16 nLanguage );
+LNG_DLLPUBLIC sal_Bool IsUpper( const String &rText, xub_StrLen nPos, xub_StrLen nLen, sal_Int16 nLanguage );
+LNG_DLLPUBLIC sal_Bool IsLower( const String &rText, xub_StrLen nPos, xub_StrLen nLen, sal_Int16 nLanguage );
inline sal_Bool IsUpper( const String &rText, sal_Int16 nLanguage ) { return IsUpper( rText, 0, rText.Len(), nLanguage ); }
inline sal_Bool IsLower( const String &rText, sal_Int16 nLanguage ) { return IsLower( rText, 0, rText.Len(), nLanguage ); }
@@ -188,13 +188,13 @@ String ToUpper( const String &rText
String ToTitle( const String &rText, sal_Int16 nLanguage );
sal_Unicode ToLower( const sal_Unicode cChar, sal_Int16 nLanguage );
sal_Unicode ToUpper( const sal_Unicode cChar, sal_Int16 nLanguage );
-sal_Bool HasDigits( const ::rtl::OUString &rText );
-sal_Bool IsNumeric( const String &rText );
+LNG_DLLPUBLIC sal_Bool HasDigits( const ::rtl::OUString &rText );
+LNG_DLLPUBLIC sal_Bool IsNumeric( const String &rText );
///////////////////////////////////////////////////////////////////////////
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > GetOneInstanceService( const char *pServiceName );
-::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > GetLinguProperties();
+LNG_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > GetLinguProperties();
::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSearchableDictionaryList > GetSearchableDictionaryList();
::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryList > GetDictionaryList();
::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > GetIgnoreAllList();
@@ -216,13 +216,13 @@ sal_Bool IsIgnoreControlChars( const ::c
const ::rtl::OUString& rWord, sal_Int16 nLanguage,
sal_Bool bSearchPosDics, sal_Bool bSearchSpellEntry );
-sal_uInt8 AddEntryToDic(
+LNG_DLLPUBLIC sal_uInt8 AddEntryToDic(
::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > &rxDic,
const ::rtl::OUString &rWord, sal_Bool bIsNeg,
const ::rtl::OUString &rRplcTxt, sal_Int16 nRplcLang,
sal_Bool bStripDot = sal_True );
-sal_Bool SaveDictionaries( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryList > &xDicList );
+LNG_DLLPUBLIC sal_Bool SaveDictionaries( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryList > &xDicList );
///////////////////////////////////////////////////////////////////////////
//
Modified: incubator/ooo/branches/gbuild/main/linguistic/inc/linguistic/spelldta.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/linguistic/inc/linguistic/spelldta.hxx?rev=1409493&r1=1409492&r2=1409493&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/linguistic/inc/linguistic/spelldta.hxx (original)
+++ incubator/ooo/branches/gbuild/main/linguistic/inc/linguistic/spelldta.hxx Wed Nov 14 22:46:38 2012
@@ -32,6 +32,7 @@
#include <uno/lbnames.h> // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
#include <cppuhelper/implbase2.hxx>
+#include <linguistic/lngdllapi.h>
namespace com { namespace sun { namespace star {
namespace linguistic2 {
@@ -117,8 +118,9 @@ public:
// non-interface specific functions
void SetWordLanguage(const ::rtl::OUString &rWord, sal_Int16 nLang);
void SetFailureType(sal_Int16 nTypeP);
- void SetAlternatives(
- const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rAlt );
+ void SetAlternatives( const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rAlt );
+ static com::sun::star::uno::Reference < com::sun::star::linguistic2::XSpellAlternatives > LNG_DLLPUBLIC CreateSpellAlternatives(
+ const ::rtl::OUString &rWord, sal_Int16 nLang, sal_Int16 nTypeP, const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rAlt );
};
Modified: incubator/ooo/branches/gbuild/main/linguistic/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/linguistic/prj/build.lst?rev=1409493&r1=1409492&r2=1409493&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/linguistic/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/linguistic/prj/build.lst Wed Nov 14 22:46:38 2012
@@ -1,10 +1,2 @@
lg linguistic : svl xmloff ucbhelper vos comphelper ICU:icu LIBXSLT:libxslt NULL
-lg linguistic usr1 - all lg_mkout NULL
-lg linguistic\prj get - all lg_prj NULL
-lg linguistic\inc nmake - all lg_inc NULL
-lg linguistic\source nmake - all lg_src lg_inc NULL
-
-lg linguistic\qa\unoapi nmake - all lg_qa_unoapi NULL
-
-# could be we need a Japanese office version
-# lg linguistic\qa\complex\linguistic nmake - all lg_qa_complex NULL
+lg linguistic\prj nmake - all lg_prj NULL
Modified: incubator/ooo/branches/gbuild/main/linguistic/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/linguistic/prj/d.lst?rev=1409493&r1=1409492&r2=1409493&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/linguistic/prj/d.lst (original)
+++ incubator/ooo/branches/gbuild/main/linguistic/prj/d.lst Wed Nov 14 22:46:38 2012
@@ -1,14 +0,0 @@
-..\%__SRC%\bin\lng* %_DEST%\bin%_EXT%\lng*
-..\%__SRC%\lib\ilng* %_DEST%\lib%_EXT%\ilng*
-..\%__SRC%\lib\lng.lib %_DEST%\lib%_EXT%\lng.lib
-..\%__SRC%\lib\liblng.a %_DEST%\lib%_EXT%\liblng.a
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\lib\liblng*.so %_DEST%\lib%_EXT%\liblng*.so
-
-..\xml\*.xml %_DEST%\xml%_EXT%\*.xml
-
-mkdir: %_DEST%\inc%_EXT%\linguistic
-..\inc\linguistic\*.hxx %_DEST%\inc%_EXT%\linguistic\*.hxx
-
-..\%__SRC%\misc\lng.component %_DEST%\xml%_EXT%\lng.component
-
Added: incubator/ooo/branches/gbuild/main/linguistic/prj/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/linguistic/prj/makefile.mk?rev=1409493&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/linguistic/prj/makefile.mk (added)
+++ incubator/ooo/branches/gbuild/main/linguistic/prj/makefile.mk Wed Nov 14 22:46:38 2012
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# 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
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
Propchange: incubator/ooo/branches/gbuild/main/linguistic/prj/makefile.mk
------------------------------------------------------------------------------
svn:executable = *
Modified: incubator/ooo/branches/gbuild/main/linguistic/qa/unoapi/Test.java
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/linguistic/qa/unoapi/Test.java?rev=1409493&r1=1409492&r2=1409493&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/linguistic/qa/unoapi/Test.java (original)
+++ incubator/ooo/branches/gbuild/main/linguistic/qa/unoapi/Test.java Wed Nov 14 22:46:38 2012
@@ -25,6 +25,7 @@ package org.openoffice.linguistic.qa.uno
import org.openoffice.Runner;
import org.openoffice.test.OfficeConnection;
+import org.openoffice.test.Argument;
import static org.junit.Assert.*;
public final class Test {
@@ -41,8 +42,8 @@ public final class Test {
@org.junit.Test public void test() {
assertTrue(
Runner.run(
- "-sce", "lng.sce", "-xcl", "knownissues.xcl", "-cs",
- connection.getDescription()));
+ "-sce", Argument.get("sce"), "-xcl", Argument.get("xcl"), "-tdoc",
+ Argument.get("tdoc"), "-cs", connection.getDescription()));
}
private final OfficeConnection connection = new OfficeConnection();
Modified: incubator/ooo/branches/gbuild/main/linguistic/source/hyphdta.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/linguistic/source/hyphdta.cxx?rev=1409493&r1=1409492&r2=1409493&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/linguistic/source/hyphdta.cxx (original)
+++ incubator/ooo/branches/gbuild/main/linguistic/source/hyphdta.cxx Wed Nov 14 22:46:38 2012
@@ -179,6 +179,22 @@ Sequence< sal_Int16 > SAL_CALL PossibleH
return aOrigHyphenPos;
}
+com::sun::star::uno::Reference <com::sun::star::linguistic2::XHyphenatedWord> HyphenatedWord::CreateHyphenatedWord(
+ const ::rtl::OUString &rWord, sal_Int16 nLang, sal_Int16 nHyphenationPos,
+ const ::rtl::OUString &rHyphenatedWord, sal_Int16 nHyphenPos )
+{
+ return new HyphenatedWord( rWord, nLang, nHyphenationPos, rHyphenatedWord, nHyphenPos );
+}
+
+com::sun::star::uno::Reference < com::sun::star::linguistic2::XPossibleHyphens > PossibleHyphens::CreatePossibleHyphens
+ (const ::rtl::OUString &rWord, sal_Int16 nLang,
+ const ::rtl::OUString &rHyphWord,
+ const ::com::sun::star::uno::Sequence< sal_Int16 > &rPositions)
+{
+ return new PossibleHyphens( rWord, nLang, rHyphWord, rPositions );
+}
+
+
///////////////////////////////////////////////////////////////////////////
} // namespace linguistic
Modified: incubator/ooo/branches/gbuild/main/linguistic/source/lngprophelp.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/linguistic/source/lngprophelp.cxx?rev=1409493&r1=1409492&r2=1409493&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/linguistic/source/lngprophelp.cxx (original)
+++ incubator/ooo/branches/gbuild/main/linguistic/source/lngprophelp.cxx Wed Nov 14 22:46:38 2012
@@ -707,6 +707,161 @@ void PropertyHelper_Hyphen::SetTmpPropVa
}
}
+PropertyHelper_Thesaurus::PropertyHelper_Thesaurus(
+ const ::com::sun::star::uno::Reference<
+ ::com::sun::star::uno::XInterface > &rxSource,
+ ::com::sun::star::uno::Reference<
+ ::com::sun::star::beans::XPropertySet > &rxPropSet )
+{
+ pInst = new PropertyHelper_Thes( rxSource, rxPropSet );
+ xPropHelper = pInst;
+}
+
+PropertyHelper_Thesaurus::~PropertyHelper_Thesaurus()
+{
+}
+
+void PropertyHelper_Thesaurus::AddAsPropListener()
+{
+ pInst->AddAsPropListener();
+}
+
+void PropertyHelper_Thesaurus::RemoveAsPropListener()
+{
+ pInst->RemoveAsPropListener();
+}
+
+void PropertyHelper_Thesaurus::SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals )
+{
+ pInst->SetTmpPropVals( rPropVals );
+}
+
+PropertyHelper_Hyphenation::PropertyHelper_Hyphenation(
+ const ::com::sun::star::uno::Reference<
+ ::com::sun::star::uno::XInterface > &rxSource,
+ ::com::sun::star::uno::Reference<
+ ::com::sun::star::beans::XPropertySet > &rxPropSet)
+{
+ pInst = new PropertyHelper_Hyphen( rxSource, rxPropSet );
+ xPropHelper = pInst;
+}
+
+PropertyHelper_Hyphenation::~PropertyHelper_Hyphenation()
+{
+}
+
+void PropertyHelper_Hyphenation::AddAsPropListener()
+{
+ pInst->AddAsPropListener();
+}
+
+void PropertyHelper_Hyphenation::RemoveAsPropListener()
+{
+ pInst->RemoveAsPropListener();
+}
+
+void PropertyHelper_Hyphenation::SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals )
+{
+ pInst->SetTmpPropVals( rPropVals );
+}
+
+sal_Int16 PropertyHelper_Hyphenation::GetMinLeading() const
+{
+ return pInst->GetMinLeading();
+}
+
+sal_Int16 PropertyHelper_Hyphenation::GetMinTrailing() const
+{
+ return pInst->GetMinTrailing();
+}
+
+sal_Int16 PropertyHelper_Hyphenation::GetMinWordLength() const
+{
+ return pInst->GetMinWordLength();
+}
+
+sal_Bool PropertyHelper_Hyphenation::addLinguServiceEventListener(
+ const ::com::sun::star::uno::Reference<
+ ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
+ throw(::com::sun::star::uno::RuntimeException)
+{
+ return pInst->addLinguServiceEventListener( rxListener );
+}
+
+sal_Bool PropertyHelper_Hyphenation::removeLinguServiceEventListener(
+ const ::com::sun::star::uno::Reference<
+ ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
+ throw(::com::sun::star::uno::RuntimeException)
+{
+ return pInst->removeLinguServiceEventListener( rxListener );
+}
+
+PropertyHelper_Spelling::PropertyHelper_Spelling(
+ const ::com::sun::star::uno::Reference<
+ ::com::sun::star::uno::XInterface > &rxSource,
+ ::com::sun::star::uno::Reference<
+ ::com::sun::star::beans::XPropertySet > &rxPropSet )
+{
+ pInst = new PropertyHelper_Spell( rxSource, rxPropSet );
+ xPropHelper = pInst;
+}
+
+PropertyHelper_Spelling::~PropertyHelper_Spelling()
+{
+}
+
+void PropertyHelper_Spelling::AddAsPropListener()
+{
+ pInst->AddAsPropListener();
+}
+
+void PropertyHelper_Spelling::RemoveAsPropListener()
+{
+ pInst->RemoveAsPropListener();
+}
+
+void PropertyHelper_Spelling::SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals )
+{
+ pInst->SetTmpPropVals( rPropVals );
+}
+
+sal_Int16 PropertyHelper_Spelling::GetMaxNumberOfSuggestions() const
+{
+ return pInst->GetMaxNumberOfSuggestions();
+}
+
+sal_Bool PropertyHelper_Spelling::IsSpellUpperCase() const
+{
+ return pInst->IsSpellUpperCase();
+}
+
+sal_Bool PropertyHelper_Spelling::IsSpellWithDigits() const
+{
+ return pInst->IsSpellWithDigits();
+}
+
+sal_Bool PropertyHelper_Spelling::IsSpellCapitalization() const
+{
+ return pInst->IsSpellCapitalization();
+}
+
+sal_Bool PropertyHelper_Spelling::addLinguServiceEventListener(
+ const ::com::sun::star::uno::Reference<
+ ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
+ throw(::com::sun::star::uno::RuntimeException)
+{
+ return pInst->addLinguServiceEventListener( rxListener );
+}
+
+sal_Bool PropertyHelper_Spelling::removeLinguServiceEventListener(
+ const ::com::sun::star::uno::Reference<
+ ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
+ throw(::com::sun::star::uno::RuntimeException)
+{
+ return pInst->removeLinguServiceEventListener( rxListener );
+}
+
+
///////////////////////////////////////////////////////////////////////////
} // namespace linguistic
Modified: incubator/ooo/branches/gbuild/main/linguistic/source/lngreg.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/linguistic/source/lngreg.cxx?rev=1409493&r1=1409492&r2=1409493&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/linguistic/source/lngreg.cxx (original)
+++ incubator/ooo/branches/gbuild/main/linguistic/source/lngreg.cxx Wed Nov 14 22:46:38 2012
@@ -83,13 +83,13 @@ extern void * SAL_CALL GrammarCheckingIt
extern "C"
{
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
void * pRet =
Modified: incubator/ooo/branches/gbuild/main/linguistic/source/spelldta.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/linguistic/source/spelldta.cxx?rev=1409493&r1=1409492&r2=1409493&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/linguistic/source/spelldta.cxx (original)
+++ incubator/ooo/branches/gbuild/main/linguistic/source/spelldta.cxx Wed Nov 14 22:46:38 2012
@@ -356,6 +356,16 @@ void SpellAlternatives::SetAlternatives(
}
+com::sun::star::uno::Reference < com::sun::star::linguistic2::XSpellAlternatives > SpellAlternatives::CreateSpellAlternatives(
+ const ::rtl::OUString &rWord, sal_Int16 nLang, sal_Int16 nTypeP, const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rAlt )
+{
+ SpellAlternatives* pAlt = new SpellAlternatives;
+ pAlt->SetWordLanguage( rWord, nLang );
+ pAlt->SetFailureType( nTypeP );
+ pAlt->SetAlternatives( rAlt );
+ return Reference < XSpellAlternatives >(pAlt);
+}
+
///////////////////////////////////////////////////////////////////////////
} // namespace linguistic
Modified: incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk?rev=1409493&r1=1409492&r2=1409493&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk (original)
+++ incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk Wed Nov 14 22:46:38 2012
@@ -56,6 +56,7 @@ my_components = \
component/framework/util/fwk \
component/framework/util/fwl \
component/framework/util/fwm \
+ component/linguistic/source/lng \
component/oox/oox \
component/vbahelper/util/msforms \
component/sfx2/util/sfx \
@@ -110,7 +111,6 @@ my_components = \
hwp \
i18npool \
i18nsearch \
- lng \
lnth \
localebe1 \
log \