Author: damjan
Date: Sun Mar 6 11:47:02 2016
New Revision: 1733801
URL: http://svn.apache.org/viewvc?rev=1733801&view=rev
Log:
Merge r1409491, r1409493, r1409494, and r1409495 from branches/gbuild.
Also removed ucbhelper from RepositoryFixes.mk and updated its name in
main/scp2/source/ooo/file_library_ooo.scp, renamed references to
tk -> ootk, and other build fixes.
BUILDS
Build updates by: me
Added:
openoffice/branches/gbuild-reintegration/main/linguistic/JunitTest_linguistic_complex.mk
- copied unchanged from r1409495,
incubator/ooo/branches/gbuild/main/linguistic/JunitTest_linguistic_complex.mk
openoffice/branches/gbuild-reintegration/main/linguistic/JunitTest_linguistic_unoapi.mk
- copied unchanged from r1409495,
incubator/ooo/branches/gbuild/main/linguistic/JunitTest_linguistic_unoapi.mk
openoffice/branches/gbuild-reintegration/main/linguistic/Library_lng.mk
- copied unchanged from r1409495,
incubator/ooo/branches/gbuild/main/linguistic/Library_lng.mk
openoffice/branches/gbuild-reintegration/main/linguistic/Makefile
- copied unchanged from r1409495,
incubator/ooo/branches/gbuild/main/linguistic/Makefile
openoffice/branches/gbuild-reintegration/main/linguistic/Module_linguistic.mk
- copied unchanged from r1409495,
incubator/ooo/branches/gbuild/main/linguistic/Module_linguistic.mk
openoffice/branches/gbuild-reintegration/main/linguistic/Package_inc.mk
- copied unchanged from r1409495,
incubator/ooo/branches/gbuild/main/linguistic/Package_inc.mk
openoffice/branches/gbuild-reintegration/main/linguistic/inc/linguistic/lngdllapi.h
- copied unchanged from r1409495,
incubator/ooo/branches/gbuild/main/linguistic/inc/linguistic/lngdllapi.h
openoffice/branches/gbuild-reintegration/main/linguistic/prj/makefile.mk
- copied unchanged from r1409495,
incubator/ooo/branches/gbuild/main/linguistic/prj/makefile.mk
openoffice/branches/gbuild-reintegration/main/starmath/AllLangResTarget_sm.mk
- copied unchanged from r1409495,
incubator/ooo/branches/gbuild/main/starmath/AllLangResTarget_sm.mk
openoffice/branches/gbuild-reintegration/main/starmath/JunitTest_sm_unoapi.mk
- copied unchanged from r1409495,
incubator/ooo/branches/gbuild/main/starmath/JunitTest_sm_unoapi.mk
openoffice/branches/gbuild-reintegration/main/starmath/Library_sm.mk
- copied, changed from r1409495,
incubator/ooo/branches/gbuild/main/starmath/Library_sm.mk
openoffice/branches/gbuild-reintegration/main/starmath/Library_smd.mk
- copied unchanged from r1409495,
incubator/ooo/branches/gbuild/main/starmath/Library_smd.mk
openoffice/branches/gbuild-reintegration/main/starmath/Makefile
- copied unchanged from r1409495,
incubator/ooo/branches/gbuild/main/starmath/Makefile
openoffice/branches/gbuild-reintegration/main/starmath/Module_starmath.mk
- copied unchanged from r1409495,
incubator/ooo/branches/gbuild/main/starmath/Module_starmath.mk
openoffice/branches/gbuild-reintegration/main/starmath/Package_uiconfig.mk
- copied unchanged from r1409495,
incubator/ooo/branches/gbuild/main/starmath/Package_uiconfig.mk
openoffice/branches/gbuild-reintegration/main/starmath/prj/makefile.mk
- copied unchanged from r1409495,
incubator/ooo/branches/gbuild/main/starmath/prj/makefile.mk
openoffice/branches/gbuild-reintegration/main/ucbhelper/Library_ucbhelper.mk
- copied unchanged from r1409495,
incubator/ooo/branches/gbuild/main/ucbhelper/Library_ucbhelper.mk
openoffice/branches/gbuild-reintegration/main/ucbhelper/Makefile
- copied unchanged from r1409495,
incubator/ooo/branches/gbuild/main/ucbhelper/Makefile
openoffice/branches/gbuild-reintegration/main/ucbhelper/Module_ucbhelper.mk
- copied unchanged from r1409495,
incubator/ooo/branches/gbuild/main/ucbhelper/Module_ucbhelper.mk
openoffice/branches/gbuild-reintegration/main/ucbhelper/Package_inc.mk
- copied unchanged from r1409495,
incubator/ooo/branches/gbuild/main/ucbhelper/Package_inc.mk
openoffice/branches/gbuild-reintegration/main/ucbhelper/prj/makefile.mk
- copied unchanged from r1409495,
incubator/ooo/branches/gbuild/main/ucbhelper/prj/makefile.mk
openoffice/branches/gbuild-reintegration/main/unotools/JunitTest_unotools_complex.mk
- copied unchanged from r1409495,
incubator/ooo/branches/gbuild/main/unotools/JunitTest_unotools_complex.mk
openoffice/branches/gbuild-reintegration/main/unotools/Library_utl.mk
- copied unchanged from r1409495,
incubator/ooo/branches/gbuild/main/unotools/Library_utl.mk
openoffice/branches/gbuild-reintegration/main/unotools/Makefile
- copied unchanged from r1409495,
incubator/ooo/branches/gbuild/main/unotools/Makefile
openoffice/branches/gbuild-reintegration/main/unotools/Module_unotools.mk
- copied unchanged from r1409495,
incubator/ooo/branches/gbuild/main/unotools/Module_unotools.mk
openoffice/branches/gbuild-reintegration/main/unotools/Package_inc.mk
- copied unchanged from r1409495,
incubator/ooo/branches/gbuild/main/unotools/Package_inc.mk
openoffice/branches/gbuild-reintegration/main/unotools/prj/makefile.mk
- copied unchanged from r1409495,
incubator/ooo/branches/gbuild/main/unotools/prj/makefile.mk
Modified:
openoffice/branches/gbuild-reintegration/ (props changed)
openoffice/branches/gbuild-reintegration/main/Module_ooo.mk
openoffice/branches/gbuild-reintegration/main/Repository.mk
openoffice/branches/gbuild-reintegration/main/RepositoryFixes.mk
openoffice/branches/gbuild-reintegration/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
openoffice/branches/gbuild-reintegration/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx
openoffice/branches/gbuild-reintegration/main/lingucomponent/source/spellcheck/spell/sspellimp.cxx
openoffice/branches/gbuild-reintegration/main/lingucomponent/source/spellcheck/spell/sspellimp.hxx
openoffice/branches/gbuild-reintegration/main/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
openoffice/branches/gbuild-reintegration/main/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
openoffice/branches/gbuild-reintegration/main/linguistic/inc/linguistic/hyphdta.hxx
openoffice/branches/gbuild-reintegration/main/linguistic/inc/linguistic/lngprophelp.hxx
openoffice/branches/gbuild-reintegration/main/linguistic/inc/linguistic/misc.hxx
openoffice/branches/gbuild-reintegration/main/linguistic/inc/linguistic/spelldta.hxx
openoffice/branches/gbuild-reintegration/main/linguistic/prj/build.lst
openoffice/branches/gbuild-reintegration/main/linguistic/prj/d.lst
openoffice/branches/gbuild-reintegration/main/linguistic/qa/unoapi/Test.java
openoffice/branches/gbuild-reintegration/main/linguistic/source/hyphdta.cxx
openoffice/branches/gbuild-reintegration/main/linguistic/source/lngprophelp.cxx
openoffice/branches/gbuild-reintegration/main/linguistic/source/lngreg.cxx
openoffice/branches/gbuild-reintegration/main/linguistic/source/spelldta.cxx
openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk
openoffice/branches/gbuild-reintegration/main/scp2/source/ooo/file_library_ooo.scp
openoffice/branches/gbuild-reintegration/main/starmath/prj/build.lst
openoffice/branches/gbuild-reintegration/main/starmath/prj/d.lst
openoffice/branches/gbuild-reintegration/main/starmath/source/detreg.cxx
openoffice/branches/gbuild-reintegration/main/starmath/source/eqnolefilehdr.hxx
openoffice/branches/gbuild-reintegration/main/starmath/source/register.cxx
openoffice/branches/gbuild-reintegration/main/starmath/source/smdetect.cxx
openoffice/branches/gbuild-reintegration/main/ucbhelper/prj/build.lst
openoffice/branches/gbuild-reintegration/main/ucbhelper/prj/d.lst
openoffice/branches/gbuild-reintegration/main/unotools/prj/build.lst
openoffice/branches/gbuild-reintegration/main/unotools/prj/d.lst
Propchange: openoffice/branches/gbuild-reintegration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar 6 11:47:02 2016
@@ -1,4 +1,4 @@
-/incubator/ooo/branches/gbuild:1409313-1409490
+/incubator/ooo/branches/gbuild:1409313-1409495
/openoffice/branches/AOO400:1503684
/openoffice/branches/AOO410:1572480,1573601,1583349,1583635,1583666
/openoffice/branches/alg_writerframes:1556289-1579189
Modified: openoffice/branches/gbuild-reintegration/main/Module_ooo.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/Module_ooo.mk?rev=1733801&r1=1733800&r2=1733801&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/Module_ooo.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/Module_ooo.mk Sun Mar 6
11:47:02 2016
@@ -29,12 +29,14 @@ $(eval $(call gb_Module_add_moduledirs,o
editeng \
framework \
idl \
+ linguistic \
offapi \
oovbaapi \
oox \
padmin \
sfx2 \
sot \
+ starmath \
svgio \
svl \
svtools \
@@ -42,7 +44,9 @@ $(eval $(call gb_Module_add_moduledirs,o
sw \
toolkit \
tools \
+ ucbhelper \
udkapi \
+ unotools \
unoxml \
vbahelper \
vcl \
Modified: openoffice/branches/gbuild-reintegration/main/Repository.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/Repository.mk?rev=1733801&r1=1733800&r2=1733801&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/Repository.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/Repository.mk Sun Mar 6
11:47:02 2016
@@ -67,6 +67,8 @@ $(eval $(call gb_Helper_register_librari
sax \
sb \
sfx \
+ sm \
+ smd \
sot \
spa \
svl \
Modified: openoffice/branches/gbuild-reintegration/main/RepositoryFixes.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/RepositoryFixes.mk?rev=1733801&r1=1733800&r2=1733801&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/RepositoryFixes.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/RepositoryFixes.mk Sun Mar 6
11:47:02 2016
@@ -32,7 +32,6 @@ gb_Library_FILENAMES := $(patsubst jvmfw
gb_Library_FILENAMES := $(patsubst
jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst
ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
stl:%,stl:libstdc++.so,$(gb_Library_FILENAMES))
gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
@@ -45,7 +44,6 @@ gb_Library_FILENAMES := $(patsubst comph
gb_Library_FILENAMES := $(patsubst
cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst
ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
ifneq ($(MACOSX_DEPLOYMENT_TARGET),10.4) # default to use libc++
gb_Library_FILENAMES := $(patsubst
stl:%,stl:libc++.dylib,$(gb_Library_FILENAMES))
@@ -98,7 +96,6 @@ gb_Library_DLLFILENAMES := $(patsubst co
gb_Library_DLLFILENAMES := $(patsubst
icule:icule%,icule:icule40%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst
icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst
jvmaccess:jvmaccess%,jvmaccess:jvmaccess$(gb_Library_MAJORVER)%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst
ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
gb_Library_FILENAMES := $(patsubst
stl:%,stl:$(gb_Library_IARCSYSPRE)stdc++_s$(gb_Library_IARCSYSPRE),$(gb_Library_FILENAMES))
@@ -155,7 +152,6 @@ gb_Library_FILENAMES += $(foreach lib,$(
gb_Library_DLLFILENAMES := $(patsubst
comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst
icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst
ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
endif
@@ -179,7 +175,6 @@ gb_Library_FILENAMES := $(patsubst svl:i
gb_Library_FILENAMES := $(patsubst
svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst vcl:ivcl%,vcl:vcl%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst
ucbhelper:ucbhelper%,ucbhelper:ucbh4%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
vos3:vos3%,vos3:vos3gcc3%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst xo:ixo%,xo:xo%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
xml2:ixml2%,xml2:xml2%,$(gb_Library_FILENAMES))
@@ -214,7 +209,6 @@ endif
ifeq ($(OS),SOLARIS)
gb_Library_FILENAMES := $(patsubst
comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst
ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
#$(info libnames: $(gb_Library_FILENAMES))
@@ -229,7 +223,6 @@ gb_Library_FILENAMES := $(patsubst jvmfw
gb_Library_FILENAMES := $(patsubst
jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst
ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
stl:%,stl:libstdc++.so,$(gb_Library_FILENAMES))
gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
Modified:
openoffice/branches/gbuild-reintegration/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx?rev=1733801&r1=1733800&r2=1733801&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
Sun Mar 6 11:47:02 2016
@@ -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:
openoffice/branches/gbuild-reintegration/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx?rev=1733801&r1=1733800&r2=1733801&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx
Sun Mar 6 11:47:02 2016
@@ -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:
openoffice/branches/gbuild-reintegration/main/lingucomponent/source/spellcheck/spell/sspellimp.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/lingucomponent/source/spellcheck/spell/sspellimp.cxx?rev=1733801&r1=1733800&r2=1733801&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/lingucomponent/source/spellcheck/spell/sspellimp.cxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/lingucomponent/source/spellcheck/spell/sspellimp.cxx
Sun Mar 6 11:47:02 2016
@@ -103,17 +103,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;
@@ -399,7 +399,7 @@ sal_Bool SAL_CALL SpellChecker::isValid(
// You'll probably like to use a simpler 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 );
@@ -488,12 +488,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;
@@ -560,7 +556,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;
@@ -593,8 +588,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:
openoffice/branches/gbuild-reintegration/main/lingucomponent/source/spellcheck/spell/sspellimp.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/lingucomponent/source/spellcheck/spell/sspellimp.hxx?rev=1733801&r1=1733800&r2=1733801&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/lingucomponent/source/spellcheck/spell/sspellimp.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/lingucomponent/source/spellcheck/spell/sspellimp.hxx
Sun Mar 6 11:47:02 2016
@@ -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:
openoffice/branches/gbuild-reintegration/main/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/lingucomponent/source/thesaurus/libnth/nthesimp.cxx?rev=1733801&r1=1733800&r2=1733801&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
Sun Mar 6 11:47:02 2016
@@ -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:
openoffice/branches/gbuild-reintegration/main/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/lingucomponent/source/thesaurus/libnth/nthesimp.hxx?rev=1733801&r1=1733800&r2=1733801&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
Sun Mar 6 11:47:02 2016
@@ -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();
}
Modified:
openoffice/branches/gbuild-reintegration/main/linguistic/inc/linguistic/hyphdta.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/linguistic/inc/linguistic/hyphdta.hxx?rev=1733801&r1=1733800&r2=1733801&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/linguistic/inc/linguistic/hyphdta.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/linguistic/inc/linguistic/hyphdta.hxx
Sun Mar 6 11:47:02 2016
@@ -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);
};
Modified:
openoffice/branches/gbuild-reintegration/main/linguistic/inc/linguistic/lngprophelp.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/linguistic/inc/linguistic/lngprophelp.hxx?rev=1733801&r1=1733800&r2=1733801&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/linguistic/inc/linguistic/lngprophelp.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/linguistic/inc/linguistic/lngprophelp.hxx
Sun Mar 6 11:47:02 2016
@@ -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:
openoffice/branches/gbuild-reintegration/main/linguistic/inc/linguistic/misc.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/linguistic/inc/linguistic/misc.hxx?rev=1733801&r1=1733800&r2=1733801&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/linguistic/inc/linguistic/misc.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/linguistic/inc/linguistic/misc.hxx
Sun Mar 6 11:47:02 2016
@@ -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 occurrences 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:
openoffice/branches/gbuild-reintegration/main/linguistic/inc/linguistic/spelldta.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/linguistic/inc/linguistic/spelldta.hxx?rev=1733801&r1=1733800&r2=1733801&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/linguistic/inc/linguistic/spelldta.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/linguistic/inc/linguistic/spelldta.hxx
Sun Mar 6 11:47:02 2016
@@ -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: openoffice/branches/gbuild-reintegration/main/linguistic/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/linguistic/prj/build.lst?rev=1733801&r1=1733800&r2=1733801&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/linguistic/prj/build.lst
(original)
+++ openoffice/branches/gbuild-reintegration/main/linguistic/prj/build.lst Sun
Mar 6 11:47:02 2016
@@ -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: openoffice/branches/gbuild-reintegration/main/linguistic/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/linguistic/prj/d.lst?rev=1733801&r1=1733800&r2=1733801&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/linguistic/prj/d.lst
(original)
+++ openoffice/branches/gbuild-reintegration/main/linguistic/prj/d.lst Sun Mar
6 11:47:02 2016
@@ -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
-
Modified:
openoffice/branches/gbuild-reintegration/main/linguistic/qa/unoapi/Test.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/linguistic/qa/unoapi/Test.java?rev=1733801&r1=1733800&r2=1733801&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/linguistic/qa/unoapi/Test.java
(original)
+++
openoffice/branches/gbuild-reintegration/main/linguistic/qa/unoapi/Test.java
Sun Mar 6 11:47:02 2016
@@ -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:
openoffice/branches/gbuild-reintegration/main/linguistic/source/hyphdta.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/linguistic/source/hyphdta.cxx?rev=1733801&r1=1733800&r2=1733801&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/linguistic/source/hyphdta.cxx
(original)
+++ openoffice/branches/gbuild-reintegration/main/linguistic/source/hyphdta.cxx
Sun Mar 6 11:47:02 2016
@@ -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:
openoffice/branches/gbuild-reintegration/main/linguistic/source/lngprophelp.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/linguistic/source/lngprophelp.cxx?rev=1733801&r1=1733800&r2=1733801&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/linguistic/source/lngprophelp.cxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/linguistic/source/lngprophelp.cxx
Sun Mar 6 11:47:02 2016
@@ -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:
openoffice/branches/gbuild-reintegration/main/linguistic/source/lngreg.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/linguistic/source/lngreg.cxx?rev=1733801&r1=1733800&r2=1733801&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/linguistic/source/lngreg.cxx
(original)
+++ openoffice/branches/gbuild-reintegration/main/linguistic/source/lngreg.cxx
Sun Mar 6 11:47:02 2016
@@ -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:
openoffice/branches/gbuild-reintegration/main/linguistic/source/spelldta.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/linguistic/source/spelldta.cxx?rev=1733801&r1=1733800&r2=1733801&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/linguistic/source/spelldta.cxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/linguistic/source/spelldta.cxx
Sun Mar 6 11:47:02 2016
@@ -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:
openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk?rev=1733801&r1=1733800&r2=1733801&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk
Sun Mar 6 11:47:02 2016
@@ -75,11 +75,14 @@ my_components = \
component/framework/util/fwk \
component/framework/util/fwl \
component/framework/util/fwm \
+ component/linguistic/source/lng \
component/oox/util/oox \
component/vbahelper/util/msforms \
component/sfx2/util/sfx \
component/sot/util/sot \
component/svgio/svgio \
+ component/starmath/util/sm \
+ component/starmath/util/smd \
component/svl/source/fsstor/fsstorage \
component/svl/source/passwordcontainer/passwordcontainer \
component/svl/util/svl \
@@ -92,6 +95,7 @@ my_components = \
component/sw/util/sw \
component/sw/util/swd \
component/sw/util/vbaswobj \
+ component/unotools/util/utl \
component/toolkit/util/ootk \
component/unoxml/source/rdf/unordf \
component/unoxml/source/service/unoxml \
@@ -125,7 +129,6 @@ my_components = \
guesslang \
i18npool \
i18nsearch \
- lng \
lnth \
localebe1 \
log \
@@ -161,8 +164,6 @@ my_components = \
sdd \
simplecanvas \
slideshow \
- sm \
- smd \
spl \
srtrs1 \
stringresource \
@@ -182,7 +183,6 @@ my_components = \
ucptdoc1 \
updatefeed \
updchk \
- utl \
uui \
vbaevents \
vbaobj \
Modified:
openoffice/branches/gbuild-reintegration/main/scp2/source/ooo/file_library_ooo.scp
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/scp2/source/ooo/file_library_ooo.scp?rev=1733801&r1=1733800&r2=1733801&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/scp2/source/ooo/file_library_ooo.scp
(original)
+++
openoffice/branches/gbuild-reintegration/main/scp2/source/ooo/file_library_ooo.scp
Sun Mar 6 11:47:02 2016
@@ -1483,11 +1483,11 @@ File gid_File_Lib_Ucbhelper
Dir = SCP2_OOO_BIN_DIR;
Styles = (PACKED);
#ifdef UNX
- Name = STRING(CONCAT3(libucbhelper4,COMID,UNXSUFFIX));
+ Name = STRING(CONCAT3(libucbhelper,COMID,UNXSUFFIX));
#elif defined OS2
- Name = "ucbh4.dll";
+ Name = "ucbh.dll";
#else
- Name = STRING(CONCAT3(ucbhelper4,COMID,.dll));
+ Name = STRING(CONCAT3(ucbhelper,COMID,.dll));
#endif
End
Copied: openoffice/branches/gbuild-reintegration/main/starmath/Library_sm.mk
(from r1409495, incubator/ooo/branches/gbuild/main/starmath/Library_sm.mk)
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/starmath/Library_sm.mk?p2=openoffice/branches/gbuild-reintegration/main/starmath/Library_sm.mk&p1=incubator/ooo/branches/gbuild/main/starmath/Library_sm.mk&r1=1409495&r2=1733801&rev=1733801&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/starmath/Library_sm.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/starmath/Library_sm.mk Sun
Mar 6 11:47:02 2016
@@ -56,6 +56,7 @@ $(eval $(call gb_Library_add_linked_libs
cppuhelper \
editeng \
i18npaper \
+ ootk \
sal \
sfx \
sot \
@@ -64,7 +65,6 @@ $(eval $(call gb_Library_add_linked_libs
svt \
svx \
svxcore \
- tk \
tl \
utl \
vcl \
Modified: openoffice/branches/gbuild-reintegration/main/starmath/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/starmath/prj/build.lst?rev=1733801&r1=1733800&r2=1733801&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/starmath/prj/build.lst
(original)
+++ openoffice/branches/gbuild-reintegration/main/starmath/prj/build.lst Sun
Mar 6 11:47:02 2016
@@ -1,9 +1,2 @@
sm starmath : LIBXSLT:libxslt L10N:l10n svx NULL
-sm starmath
usr1 - all sm_mkout NULL
-sm starmath\inc nmake
- all sm_inc NULL
-sm starmath\prj get
- all sm_prj NULL
-sm starmath\res get
- all sm_res NULL
-sm starmath\sdi nmake
- all sm_sdi NULL
-sm starmath\source nmake
- all sm_sorce sm_sdi sm_inc NULL
-sm starmath\util nmake
- all sm_util sm_sorce NULL
-sm starmath\qa\unoapi nmake - all sm_qa_unoapi NULL
+sm starmath\prj nmake
- all sm_prj NULL
Modified: openoffice/branches/gbuild-reintegration/main/starmath/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/starmath/prj/d.lst?rev=1733801&r1=1733800&r2=1733801&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/starmath/prj/d.lst (original)
+++ openoffice/branches/gbuild-reintegration/main/starmath/prj/d.lst Sun Mar 6
11:47:02 2016
@@ -1,23 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %_DEST%\xml%_EXT%\uiconfig
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\smath
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\smath\menubar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\smath\toolbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\smath\statusbar
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
-..\%__SRC%\misc\*.map %_DEST%\bin%_EXT%\*.map
-..\xml\*.xml %_DEST%\xml%_EXT%\*.xml
-..\%__SRC%\bin\sm?????.dll %_DEST%\bin%_EXT%\sm?????.dll
-..\%__SRC%\bin\smd?????.dll %_DEST%\bin%_EXT%\smd?????.dll
-..\%__SRC%\bin\sm*.res %_DEST%\bin%_EXT%\sm*.res
-..\%__SRC%\bin\sm?????.sym %_DEST%\bin%_EXT%\sm?????.sym
-mkdir: %_DEST%\inc%_EXT%\starmath
-
-..\uiconfig\smath\menubar\*.xml
%_DEST%\xml%_EXT%\uiconfig\modules\smath\menubar\*.xml
-..\uiconfig\smath\toolbar\*.xml
%_DEST%\xml%_EXT%\uiconfig\modules\smath\toolbar\*.xml
-..\uiconfig\smath\statusbar\*.xml
%_DEST%\xml%_EXT%\uiconfig\modules\smath\statusbar\*.xml
-..\%__SRC%\misc\sm.component %_DEST%\xml%_EXT%\sm.component
-..\%__SRC%\misc\smd.component %_DEST%\xml%_EXT%\smd.component
Modified:
openoffice/branches/gbuild-reintegration/main/starmath/source/detreg.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/starmath/source/detreg.cxx?rev=1733801&r1=1733800&r2=1733801&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/starmath/source/detreg.cxx
(original)
+++ openoffice/branches/gbuild-reintegration/main/starmath/source/detreg.cxx
Sun Mar 6 11:47:02 2016
@@ -37,14 +37,14 @@ using namespace ::com::sun::star::lang;
extern "C" {
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char** ppEnvironmentTypeName,
uno_Environment** /*ppEnvironment*/ )
{
*ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
}
-void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char*
pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/ )
{
Modified:
openoffice/branches/gbuild-reintegration/main/starmath/source/eqnolefilehdr.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/starmath/source/eqnolefilehdr.hxx?rev=1733801&r1=1733800&r2=1733801&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/starmath/source/eqnolefilehdr.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/starmath/source/eqnolefilehdr.hxx
Sun Mar 6 11:47:02 2016
@@ -53,7 +53,7 @@ public:
void Write(SvStorageStream *pS);
};
-sal_Bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion );
+SAL_DLLPUBLIC_EXPORT sal_Bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8
&nVersion );
#endif
Modified:
openoffice/branches/gbuild-reintegration/main/starmath/source/register.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/starmath/source/register.cxx?rev=1733801&r1=1733800&r2=1733801&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/starmath/source/register.cxx
(original)
+++ openoffice/branches/gbuild-reintegration/main/starmath/source/register.cxx
Sun Mar 6 11:47:02 2016
@@ -107,14 +107,14 @@ extern Reference< XInterface > SAL_CALL
extern "C" {
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char** ppEnvironmentTypeName,
uno_Environment** /*ppEnvironment*/ )
{
*ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
}
-void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char*
pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/ )
{
Modified:
openoffice/branches/gbuild-reintegration/main/starmath/source/smdetect.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/starmath/source/smdetect.cxx?rev=1733801&r1=1733800&r2=1733801&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/starmath/source/smdetect.cxx
(original)
+++ openoffice/branches/gbuild-reintegration/main/starmath/source/smdetect.cxx
Sun Mar 6 11:47:02 2016
@@ -25,17 +25,13 @@
#include "precompiled_starmath.hxx"
#include "smdetect.hxx"
-
-//#include <framework/interaction.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
#include <comphelper/processfactory.hxx>
-#endif
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/task/XInteractionHandler.hpp>
@@ -45,12 +41,8 @@
#include <com/sun/star/ucb/XContent.hpp>
#include <com/sun/star/packages/zip/ZipIOException.hpp>
#include <framework/interaction.hxx>
-
-#ifndef _TOOLKIT_UNOHLP_HXX
#include <toolkit/helper/vclunohelper.hxx>
-#endif
#include <ucbhelper/simpleinteractionrequest.hxx>
-
#include <rtl/ustring.h>
#include <rtl/logfile.hxx>
#include <svl/itemset.hxx>
Modified: openoffice/branches/gbuild-reintegration/main/ucbhelper/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/ucbhelper/prj/build.lst?rev=1733801&r1=1733800&r2=1733801&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/ucbhelper/prj/build.lst
(original)
+++ openoffice/branches/gbuild-reintegration/main/ucbhelper/prj/build.lst Sun
Mar 6 11:47:02 2016
@@ -1,7 +1,2 @@
uh ucbhelper : offapi sal cppu cppuhelper salhelper NULL
-uh ucbhelper usr1 - all uh_mkout NULL
-uh ucbhelper\inc nmake - all uh_inc NULL
-uh ucbhelper\source\client nmake - all uh_client uh_inc NULL
-uh ucbhelper\source\provider nmake - all uh_provider uh_inc NULL
-uh ucbhelper\util nmake - all uh_util uh_client
uh_provider NULL
-uh ucbhelper\workben\myucp nmake - all uh_wb_myucp uh_util NULL
+uh ucbhelper\prj nmake - all uh_prj NULL
Modified: openoffice/branches/gbuild-reintegration/main/ucbhelper/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/ucbhelper/prj/d.lst?rev=1733801&r1=1733800&r2=1733801&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/ucbhelper/prj/d.lst (original)
+++ openoffice/branches/gbuild-reintegration/main/ucbhelper/prj/d.lst Sun Mar
6 11:47:02 2016
@@ -1,40 +0,0 @@
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
-..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%\lib*.dylib
-..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
-..\%__SRC%\misc\*.map %_DEST%\bin%_EXT%\*.map
-..\%__SRC%\misc\*.sym %_DEST%\bin%_EXT%\*.sym
-
-..\util\ucbhelper.xml %_DEST%\xml%_EXT%\ucbhelper.xml
-
-mkdir: %_DEST%\inc%_EXT%\ucbhelper
-..\inc\ucbhelper\configurationkeys.hxx
%_DEST%\inc%_EXT%\ucbhelper\configurationkeys.hxx
-..\inc\ucbhelper\registerucb.hxx %_DEST%\inc%_EXT%\ucbhelper\registerucb.hxx
-..\inc\ucbhelper\content.hxx %_DEST%\inc%_EXT%\ucbhelper\content.hxx
-..\inc\ucbhelper\contentbroker.hxx
%_DEST%\inc%_EXT%\ucbhelper\contentbroker.hxx
-..\inc\ucbhelper\commandenvironment.hxx
%_DEST%\inc%_EXT%\ucbhelper\commandenvironment.hxx
-..\inc\ucbhelper\contentidentifier.hxx
%_DEST%\inc%_EXT%\ucbhelper\contentidentifier.hxx
-..\inc\ucbhelper\contenthelper.hxx
%_DEST%\inc%_EXT%\ucbhelper\contenthelper.hxx
-..\inc\ucbhelper\contentidentifier.hxx
%_DEST%\inc%_EXT%\ucbhelper\contentidentifier.hxx
-..\inc\ucbhelper\contentinfo.hxx %_DEST%\inc%_EXT%\ucbhelper\contentinfo.hxx
-..\inc\ucbhelper\fileidentifierconverter.hxx
%_DEST%\inc%_EXT%\ucbhelper\fileidentifierconverter.hxx
-..\inc\ucbhelper\macros.hxx %_DEST%\inc%_EXT%\ucbhelper\macros.hxx
-..\inc\ucbhelper\propertyvalueset.hxx
%_DEST%\inc%_EXT%\ucbhelper\propertyvalueset.hxx
-..\inc\ucbhelper\providerhelper.hxx
%_DEST%\inc%_EXT%\ucbhelper\providerhelper.hxx
-..\inc\ucbhelper\resultset.hxx %_DEST%\inc%_EXT%\ucbhelper\resultset.hxx
-..\inc\ucbhelper\resultsetmetadata.hxx
%_DEST%\inc%_EXT%\ucbhelper\resultsetmetadata.hxx
-..\inc\ucbhelper\resultsethelper.hxx
%_DEST%\inc%_EXT%\ucbhelper\resultsethelper.hxx
-..\inc\ucbhelper\activedatasink.hxx
%_DEST%\inc%_EXT%\ucbhelper\activedatasink.hxx
-..\inc\ucbhelper\commandenvironmentproxy.hxx
%_DEST%\inc%_EXT%\ucbhelper\commandenvironmentproxy.hxx
-..\inc\ucbhelper\interactionrequest.hxx
%_DEST%\inc%_EXT%\ucbhelper\interactionrequest.hxx
-..\inc\ucbhelper\interceptedinteraction.hxx
%_DEST%\inc%_EXT%\ucbhelper\interceptedinteraction.hxx
-..\inc\ucbhelper\simpleinteractionrequest.hxx
%_DEST%\inc%_EXT%\ucbhelper\simpleinteractionrequest.hxx
-..\inc\ucbhelper\simpleauthenticationrequest.hxx
%_DEST%\inc%_EXT%\ucbhelper\simpleauthenticationrequest.hxx
-..\inc\ucbhelper\simplenameclashresolverequest.hxx
%_DEST%\inc%_EXT%\ucbhelper\simplenameclashresolverequest.hxx
-..\inc\ucbhelper\simplecertificatevalidationrequest.hxx
%_DEST%\inc%_EXT%\ucbhelper\simplecertificatevalidationrequest.hxx
-..\inc\ucbhelper\simpleioerrorrequest.hxx
%_DEST%\inc%_EXT%\ucbhelper\simpleioerrorrequest.hxx
-..\inc\ucbhelper\cancelcommandexecution.hxx
%_DEST%\inc%_EXT%\ucbhelper\cancelcommandexecution.hxx
-..\inc\ucbhelper\handleinteractionrequest.hxx
%_DEST%\inc%_EXT%\ucbhelper\handleinteractionrequest.hxx
-..\inc\ucbhelper\proxydecider.hxx %_DEST%\inc%_EXT%\ucbhelper\proxydecider.hxx
-..\version.mk %_DEST%\inc%_EXT%\ucbhelper\version.mk
-..\inc\ucbhelper\ucbhelperdllapi.h
%_DEST%\inc%_EXT%\ucbhelper\ucbhelperdllapi.h
Modified: openoffice/branches/gbuild-reintegration/main/unotools/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/unotools/prj/build.lst?rev=1733801&r1=1733800&r2=1733801&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/unotools/prj/build.lst
(original)
+++ openoffice/branches/gbuild-reintegration/main/unotools/prj/build.lst Sun
Mar 6 11:47:02 2016
@@ -1,14 +1,2 @@
ut unotools : LIBXSLT:libxslt comphelper cppuhelper offapi tools
ucbhelper NULL
-ut unotools
usr1 - all ut_mkout NULL
-ut unotools\inc nmake
- all ut_inc NULL
-ut unotools\source\misc nmake -
all ut_misc ut_config ut_inc NULL
-ut unotools\source\streaming nmake -
all ut_streaming ut_inc NULL
-ut unotools\source\config nmake -
all ut_config ut_i18n ut_inc NULL
-ut unotools\source\ucbhelper nmake -
all ut_ucbhelper ut_inc NULL
-ut unotools\source\processfactory nmake -
all ut_procfact ut_inc NULL
-ut unotools\source\i18n nmake -
all ut_i18n ut_inc NULL
-ut unotools\source\property nmake -
all ut_property ut_inc NULL
-ut unotools\source\accessibility nmake -
all ut_accessibility ut_inc NULL
-ut unotools\util nmake -
all ut_util ut_config ut_i18n ut_misc ut_procfact ut_streaming ut_ucbhelper
ut_property ut_accessibility NULL
-
-ut unotools\qa\complex\tempfile nmake -
all ut_qa_complex ut_util NULL
+ut unotools\prj nmake
- all ut_prj NULL
Modified: openoffice/branches/gbuild-reintegration/main/unotools/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/unotools/prj/d.lst?rev=1733801&r1=1733800&r2=1733801&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/unotools/prj/d.lst (original)
+++ openoffice/branches/gbuild-reintegration/main/unotools/prj/d.lst Sun Mar 6
11:47:02 2016
@@ -1,12 +0,0 @@
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl
-..\%__SRC%\bin\*.bin %_DEST%\bin%_EXT%\*.bin
-..\%__SRC%\inc\*.bin %_DEST%\bin%_EXT%\*.bin
-
-mkdir: %_DEST%\inc%_EXT%\unotools
-..\inc\unotools\*.hxx %_DEST%\inc%_EXT%\unotools\*.hxx
-..\inc\unotools\unotoolsdllapi.h %_DEST%\inc%_EXT%\unotools\unotoolsdllapi.h
-..\%__SRC%\misc\utl.component %_DEST%\xml%_EXT%\utl.component
