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/10/05 01:16:58 UTC
svn commit: r1394326 [7/15] - in /incubator/ooo/branches/buildsys/main: ./
basebmp/inc/basebmp/ basebmp/prj/ basebmp/test/ basegfx/inc/basegfx/color/
basegfx/inc/basegfx/curve/ basegfx/inc/basegfx/matrix/
basegfx/inc/basegfx/numeric/ basegfx/inc/basegf...
Modified: incubator/ooo/branches/buildsys/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx (original)
+++ incubator/ooo/branches/buildsys/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx Thu Oct 4 23:16:35 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/buildsys/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx (original)
+++ incubator/ooo/branches/buildsys/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx Thu Oct 4 23:16:35 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/buildsys/main/lingucomponent/source/spellcheck/spell/sspellimp.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/lingucomponent/source/spellcheck/spell/sspellimp.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/lingucomponent/source/spellcheck/spell/sspellimp.cxx (original)
+++ incubator/ooo/branches/buildsys/main/lingucomponent/source/spellcheck/spell/sspellimp.cxx Thu Oct 4 23:16:35 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/buildsys/main/lingucomponent/source/spellcheck/spell/sspellimp.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/lingucomponent/source/spellcheck/spell/sspellimp.hxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/lingucomponent/source/spellcheck/spell/sspellimp.hxx (original)
+++ incubator/ooo/branches/buildsys/main/lingucomponent/source/spellcheck/spell/sspellimp.hxx Thu Oct 4 23:16:35 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/buildsys/main/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/lingucomponent/source/thesaurus/libnth/nthesimp.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/lingucomponent/source/thesaurus/libnth/nthesimp.cxx (original)
+++ incubator/ooo/branches/buildsys/main/lingucomponent/source/thesaurus/libnth/nthesimp.cxx Thu Oct 4 23:16:35 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/buildsys/main/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/lingucomponent/source/thesaurus/libnth/nthesimp.hxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/lingucomponent/source/thesaurus/libnth/nthesimp.hxx (original)
+++ incubator/ooo/branches/buildsys/main/lingucomponent/source/thesaurus/libnth/nthesimp.hxx Thu Oct 4 23:16:35 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();
}
Modified: incubator/ooo/branches/buildsys/main/linguistic/inc/linguistic/hyphdta.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/linguistic/inc/linguistic/hyphdta.hxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/linguistic/inc/linguistic/hyphdta.hxx (original)
+++ incubator/ooo/branches/buildsys/main/linguistic/inc/linguistic/hyphdta.hxx Thu Oct 4 23:16:35 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);
};
Modified: incubator/ooo/branches/buildsys/main/linguistic/inc/linguistic/lngprophelp.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/linguistic/inc/linguistic/lngprophelp.hxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/linguistic/inc/linguistic/lngprophelp.hxx (original)
+++ incubator/ooo/branches/buildsys/main/linguistic/inc/linguistic/lngprophelp.hxx Thu Oct 4 23:16:35 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/buildsys/main/linguistic/inc/linguistic/misc.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/linguistic/inc/linguistic/misc.hxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/linguistic/inc/linguistic/misc.hxx (original)
+++ incubator/ooo/branches/buildsys/main/linguistic/inc/linguistic/misc.hxx Thu Oct 4 23:16:35 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/buildsys/main/linguistic/inc/linguistic/spelldta.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/linguistic/inc/linguistic/spelldta.hxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/linguistic/inc/linguistic/spelldta.hxx (original)
+++ incubator/ooo/branches/buildsys/main/linguistic/inc/linguistic/spelldta.hxx Thu Oct 4 23:16:35 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/buildsys/main/linguistic/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/linguistic/prj/build.lst?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/linguistic/prj/build.lst (original)
+++ incubator/ooo/branches/buildsys/main/linguistic/prj/build.lst Thu Oct 4 23:16:35 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/buildsys/main/linguistic/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/linguistic/prj/d.lst?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/linguistic/prj/d.lst (original)
+++ incubator/ooo/branches/buildsys/main/linguistic/prj/d.lst Thu Oct 4 23:16:35 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
-
Modified: incubator/ooo/branches/buildsys/main/linguistic/qa/unoapi/Test.java
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/linguistic/qa/unoapi/Test.java?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/linguistic/qa/unoapi/Test.java (original)
+++ incubator/ooo/branches/buildsys/main/linguistic/qa/unoapi/Test.java Thu Oct 4 23:16:35 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/buildsys/main/linguistic/source/hyphdta.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/linguistic/source/hyphdta.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/linguistic/source/hyphdta.cxx (original)
+++ incubator/ooo/branches/buildsys/main/linguistic/source/hyphdta.cxx Thu Oct 4 23:16:35 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/buildsys/main/linguistic/source/lngprophelp.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/linguistic/source/lngprophelp.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/linguistic/source/lngprophelp.cxx (original)
+++ incubator/ooo/branches/buildsys/main/linguistic/source/lngprophelp.cxx Thu Oct 4 23:16:35 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/buildsys/main/linguistic/source/lngreg.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/linguistic/source/lngreg.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/linguistic/source/lngreg.cxx (original)
+++ incubator/ooo/branches/buildsys/main/linguistic/source/lngreg.cxx Thu Oct 4 23:16:35 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/buildsys/main/linguistic/source/spelldta.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/linguistic/source/spelldta.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/linguistic/source/spelldta.cxx (original)
+++ incubator/ooo/branches/buildsys/main/linguistic/source/spelldta.cxx Thu Oct 4 23:16:35 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/buildsys/main/offapi/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/offapi/prj/build.lst?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/offapi/prj/build.lst (original)
+++ incubator/ooo/branches/buildsys/main/offapi/prj/build.lst Thu Oct 4 23:16:35 2012
@@ -1,4 +1,5 @@
oa offapi : udkapi idlc solenv NULL
+oa offapi\prj nmake - all oa_mkout NULL
oa offapi usr1 - all oa_mkout NULL
oa offapi\com\sun\star\script nmake - all oa_script oa_embed NULL
oa offapi\com\sun\star\script\browse nmake - all oa_sfbrowse NULL
Modified: incubator/ooo/branches/buildsys/main/oox/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/oox/prj/build.lst?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/oox/prj/build.lst (original)
+++ incubator/ooo/branches/buildsys/main/oox/prj/build.lst Thu Oct 4 23:16:35 2012
@@ -1,18 +1,2 @@
oox oox : vos cppu cppuhelper comphelper sal offapi sax basegfx xmlscript tools vcl BOOST:boost OPENSSL:openssl LIBXSLT:libxslt NULL
-oox oox usr1 - all oox_mkout NULL
-oox oox\prj get - all oox_prj NULL
-oox oox\source\token nmake - all oox_token NULL
-oox oox\source\helper nmake - all oox_helper oox_token NULL
-oox oox\source\core nmake - all oox_core oox_token NULL
-oox oox\source\ole nmake - all oox_ole oox_token NULL
-oox oox\source\docprop nmake - all oox_docprop oox_token NULL
-oox oox\source\drawingml nmake - all oox_drawingml oox_token NULL
-oox oox\source\drawingml\diagram nmake - all oox_diagram oox_token NULL
-oox oox\source\drawingml\chart nmake - all oox_chart oox_token NULL
-oox oox\source\drawingml\table nmake - all oox_table oox_token NULL
-oox oox\source\ppt nmake - all oox_ppt oox_token NULL
-oox oox\source\vml nmake - all oox_vml oox_token NULL
-oox oox\source\xls nmake - all oox_xls oox_token NULL
-oox oox\source\dump nmake - all oox_dump oox_token NULL
-oox oox\source\shape nmake - all oox_shape oox_token NULL
-oox oox\util nmake - all oox_util oox_token oox_helper oox_core oox_ole oox_vml oox_drawingml oox_diagram oox_chart oox_table oox_ppt oox_xls oox_dump oox_shape oox_docprop NULL
+oox oox\prj nmake - all oox_prj NULL
Modified: incubator/ooo/branches/buildsys/main/oox/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/oox/prj/d.lst?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/oox/prj/d.lst (original)
+++ incubator/ooo/branches/buildsys/main/oox/prj/d.lst Thu Oct 4 23:16:35 2012
@@ -1,48 +0,0 @@
-mkdir: %_DEST%\inc%_EXT%\oox
-mkdir: %_DEST%\inc%_EXT%\oox\core
-mkdir: %_DEST%\inc%_EXT%\oox\drawingml
-mkdir: %_DEST%\inc%_EXT%\oox\drawingml\chart
-mkdir: %_DEST%\inc%_EXT%\oox\drawingml\table
-mkdir: %_DEST%\inc%_EXT%\oox\helper
-mkdir: %_DEST%\inc%_EXT%\oox\ole
-mkdir: %_DEST%\inc%_EXT%\oox\token
-mkdir: %_DEST%\inc%_EXT%\oox\vml
-mkdir: %_DEST%\inc%_EXT%\oox\xls
-
-..\%__SRC%\misc\*.map %_DEST%\bin%_EXT%\*.map
-..\%__SRC%\lib\ixo.lib %_DEST%\lib%_EXT%\ixo.lib
-..\%__SRC%\lib\xol.lib %_DEST%\lib%_EXT%\xol.lib
-..\%__SRC%\lib\libxol.a %_DEST%\lib%_EXT%\libxol.a
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
-..\%__SRC%\lib\i*.lib %_DEST%\lib%_EXT%\i*.lib
-..\%__SRC%\lib\oox.lib %_DEST%\lib%_EXT%\oox.lib
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-
-..\%__SRC%\inc\oox\token\tokens.hxx %_DEST%\inc%_EXT%\oox\token\tokens.hxx
-..\%__SRC%\misc\namespaces.txt %_DEST%\inc%_EXT%\oox\token\namespaces.txt
-
-..\source\token\tokens.txt %_DEST%\inc%_EXT%\oox\token\tokens.txt
-
-..\inc\oox\dllapi.h %_DEST%\inc%_EXT%\oox\dllapi.h
-..\inc\oox\helper\binarystreambase.hxx %_DEST%\inc%_EXT%\oox\helper\binarystreambase.hxx
-..\inc\oox\helper\helper.hxx %_DEST%\inc%_EXT%\oox\helper\helper.hxx
-..\inc\oox\helper\refmap.hxx %_DEST%\inc%_EXT%\oox\helper\refmap.hxx
-..\inc\oox\helper\refvector.hxx %_DEST%\inc%_EXT%\oox\helper\refvector.hxx
-..\inc\oox\helper\storagebase.hxx %_DEST%\inc%_EXT%\oox\helper\storagebase.hxx
-..\inc\oox\helper\zipstorage.hxx %_DEST%\inc%_EXT%\oox\helper\zipstorage.hxx
-..\inc\oox\core\filterbase.hxx %_DEST%\inc%_EXT%\oox\core\filterbase.hxx
-..\inc\oox\core\filterdetect.hxx %_DEST%\inc%_EXT%\oox\core\filterdetect.hxx
-..\inc\oox\core\relations.hxx %_DEST%\inc%_EXT%\oox\core\relations.hxx
-..\inc\oox\core\xmlfilterbase.hxx %_DEST%\inc%_EXT%\oox\core\xmlfilterbase.hxx
-..\inc\oox\drawingml\chart\chartconverter.hxx %_DEST%\inc%_EXT%\oox\drawingml\chart\chartconverter.hxx
-..\inc\oox\drawingml\table\tablestylelist.hxx %_DEST%\inc%_EXT%\oox\drawingml\table\tablestylelist.hxx
-..\inc\oox\ole\vbaproject.hxx %_DEST%\inc%_EXT%\oox\ole\vbaproject.hxx
-..\inc\oox\vml\vmldrawing.hxx %_DEST%\inc%_EXT%\oox\vml\vmldrawing.hxx
-..\inc\oox\vml\vmlshape.hxx %_DEST%\inc%_EXT%\oox\vml\vmlshape.hxx
-..\inc\oox\xls\excelvbaproject.hxx %_DEST%\inc%_EXT%\oox\xls\excelvbaproject.hxx
-
-dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"
-
-..\xml\components.xml %_DEST%\xml%_EXT%\components.xml
-..\%__SRC%\misc\oox.component %_DEST%\xml%_EXT%\oox.component
Modified: incubator/ooo/branches/buildsys/main/oox/source/token/namespacemap.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/oox/source/token/namespacemap.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/oox/source/token/namespacemap.cxx (original)
+++ incubator/ooo/branches/buildsys/main/oox/source/token/namespacemap.cxx Thu Oct 4 23:16:35 2012
@@ -32,7 +32,7 @@ NamespaceMap::NamespaceMap()
static const struct NamespaceUrl { sal_Int32 mnId; const sal_Char* mpcUrl; } spNamespaceUrls[] =
{
// include auto-generated C array with namespace URLs as C strings
-#include "namespacenames.inc"
+#include <token/namespacenames.inc>
{ -1, "" }
};
Modified: incubator/ooo/branches/buildsys/main/oox/source/token/namespaces.pl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/oox/source/token/namespaces.pl?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/oox/source/token/namespaces.pl (original)
+++ incubator/ooo/branches/buildsys/main/oox/source/token/namespaces.pl Thu Oct 4 23:16:35 2012
@@ -20,18 +20,19 @@
#**************************************************************
+# operation mode (1 = identifiers, 2 = names, 3 = plain)
+$op = shift @ARGV;
+die "Error: invalid operation" unless( $op >= 1 && $op <= 3);
-$ARGV0 = shift @ARGV;
-$ARGV1 = shift @ARGV;
-$ARGV2 = shift @ARGV;
-$ARGV3 = shift @ARGV;
-
-# parse input file
-
-open( INFILE, $ARGV0 ) or die "cannot open input file: $!";
-my %namespaces;
-while( <INFILE> )
-{
+# number of bits to shift the namespace identifier
+$shift = 16;
+
+if( $op == 1 ) {
+ print( "const size_t NMSP_SHIFT = $shift;\n" );
+}
+
+$i = 1;
+while( <> ) {
# trim newline
chomp( $_ );
# trim leading/trailing whitespace
@@ -40,36 +41,15 @@ while( <INFILE> )
# trim comments
$_ =~ s/^#.*//;
# skip empty lines
- if( $_ )
- {
+ if( $_ ) {
# check for valid characters
- $_ =~ /^([a-zA-Z]+)\s+([a-zA-Z0-9-.:\/]+)\s*$/ or die "Error: invalid character in input data";
- $namespaces{$1} = $2;
+ $_ =~ /^([a-zA-Z]+)\s+([a-zA-Z0-9-.:\/]+)\s*$/ or die "Error: invalid entry: '$_'";
+ # generate output
+ $id = $i << $shift;
+ if( $op == 1 ) { print( "const sal_Int32 NMSP_$1 = $i << NMSP_SHIFT;\n" ); }
+ elsif( $op == 2 ) { print( "{ $id, \"$2\" },\n" ); }
+ elsif( $op == 3 ) { print( "$id $1 $2\n" ); }
+ ++$i;
}
}
-close( INFILE );
-
-# generate output files
-
-open( IDFILE, ">$ARGV1" ) or die "Error: cannot open output file: $!";
-open( NAMEFILE, ">$ARGV2" ) or die "Error: cannot open output file: $!";
-open( TXTFILE, ">$ARGV3" ) or die "Error: cannot open output file: $!";
-
-# number of bits to shift the namespace identifier
-$shift = 16;
-
-print ( IDFILE "const size_t NMSP_SHIFT = $shift;\n" );
-
-$i = 1;
-foreach( keys( %namespaces ) )
-{
- print( IDFILE "const sal_Int32 NMSP_$_ = $i << NMSP_SHIFT;\n" );
- $id = $i << $shift;
- print( NAMEFILE "{ $id, \"$namespaces{$_}\" },\n" );
- print( TXTFILE "$id $_ $namespaces{$_}\n" );
- ++$i;
-}
-close( IDFILE );
-close( nameFILE );
-close( TXTFILE );
Modified: incubator/ooo/branches/buildsys/main/oox/source/token/propertynames.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/oox/source/token/propertynames.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/oox/source/token/propertynames.cxx (original)
+++ incubator/ooo/branches/buildsys/main/oox/source/token/propertynames.cxx Thu Oct 4 23:16:35 2012
@@ -32,8 +32,7 @@ PropertyNameVector::PropertyNameVector()
static const sal_Char* sppcPropertyNames[] =
{
// include auto-generated C array with property names as C strings
-#include "propertynames.inc"
- ""
+#include <token/propertynames.inc>
};
size_t nArraySize = (sizeof( sppcPropertyNames ) / sizeof( *sppcPropertyNames )) - 1;
Modified: incubator/ooo/branches/buildsys/main/oox/source/token/tokenmap.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/oox/source/token/tokenmap.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/oox/source/token/tokenmap.cxx (original)
+++ incubator/ooo/branches/buildsys/main/oox/source/token/tokenmap.cxx Thu Oct 4 23:16:35 2012
@@ -39,8 +39,10 @@ using ::rtl::OUString;
// ============================================================================
namespace {
-// include auto-generated Perfect_Hash
-#include "tokenhash.inc"
+
+// include auto-generated Perfect_Hash class
+#include <token/tokenhash.inc>
+
} // namespace
// ============================================================================
@@ -51,7 +53,7 @@ TokenMap::TokenMap() :
static const sal_Char* sppcTokenNames[] =
{
// include auto-generated C array with token names as C strings
-#include "tokennames.inc"
+#include <token/tokennames.inc>
""
};
@@ -64,14 +66,14 @@ TokenMap::TokenMap() :
}
#if OSL_DEBUG_LEVEL > 0
- // check that the perfect_hash is in sync with the token name list
+ // check that the Perfect_Hash is in sync with the token name list
bool bOk = true;
for( sal_Int32 nToken = 0; bOk && (nToken < XML_TOKEN_COUNT); ++nToken )
{
// check that the getIdentifier <-> getToken roundtrip works
OString aUtf8Name = OUStringToOString( maTokenNames[ nToken ].maUniName, RTL_TEXTENCODING_UTF8 );
- struct xmltoken* pToken = Perfect_Hash::in_word_set( aUtf8Name.getStr(), aUtf8Name.getLength() );
- bOk = pToken && (pToken->nToken == nToken);
+ const XMLTokenInfo* pTokenInfo = Perfect_Hash::getTokenInfo( aUtf8Name.getStr(), aUtf8Name.getLength() );
+ bOk = pTokenInfo && (pTokenInfo->mnToken == nToken);
OSL_ENSURE( bOk, ::rtl::OStringBuffer( "TokenMap::TokenMap - token list broken, #" ).
append( nToken ).append( ", '" ).append( aUtf8Name ).append( '\'' ).getStr() );
}
@@ -92,8 +94,8 @@ OUString TokenMap::getUnicodeTokenName(
sal_Int32 TokenMap::getTokenFromUnicode( const OUString& rUnicodeName ) const
{
OString aUtf8Name = OUStringToOString( rUnicodeName, RTL_TEXTENCODING_UTF8 );
- struct xmltoken* pToken = Perfect_Hash::in_word_set( aUtf8Name.getStr(), aUtf8Name.getLength() );
- return pToken ? pToken->nToken : XML_TOKEN_INVALID;
+ const XMLTokenInfo* pTokenInfo = Perfect_Hash::getTokenInfo( aUtf8Name.getStr(), aUtf8Name.getLength() );
+ return pTokenInfo ? pTokenInfo->mnToken : XML_TOKEN_INVALID;
}
Sequence< sal_Int8 > TokenMap::getUtf8TokenName( sal_Int32 nToken ) const
@@ -105,9 +107,9 @@ Sequence< sal_Int8 > TokenMap::getUtf8To
sal_Int32 TokenMap::getTokenFromUtf8( const Sequence< sal_Int8 >& rUtf8Name ) const
{
- struct xmltoken* pToken = Perfect_Hash::in_word_set(
+ const XMLTokenInfo* pTokenInfo = Perfect_Hash::getTokenInfo(
reinterpret_cast< const char* >( rUtf8Name.getConstArray() ), rUtf8Name.getLength() );
- return pToken ? pToken->nToken : XML_TOKEN_INVALID;
+ return pTokenInfo ? pTokenInfo->mnToken : XML_TOKEN_INVALID;
}
// ============================================================================
Modified: incubator/ooo/branches/buildsys/main/oox/source/token/tokens.pl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/oox/source/token/tokens.pl?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/oox/source/token/tokens.pl (original)
+++ incubator/ooo/branches/buildsys/main/oox/source/token/tokens.pl Thu Oct 4 23:16:35 2012
@@ -21,56 +21,56 @@
-$ARGV0 = shift @ARGV;
-$ARGV1 = shift @ARGV;
-$ARGV2 = shift @ARGV;
-$ARGV3 = shift @ARGV;
-
-open( INFILE, $ARGV0 ) or die "Error: cannot open input file: $!";
-my %tokens;
-while ( <INFILE> )
+# operation mode (1 = identifiers, 2 = names, 3 = gperf)
+$op = shift @ARGV;
+die "Error: invalid operation" unless( $op >= 1 && $op <= 3);
+
+if( $op == 3 ) {
+ print( "%language=C++\n" );
+ print( "%define slot-name mpcName\n" );
+ print( "%define initializer-suffix ,0\n" );
+ print( "%define lookup-function-name getTokenInfo\n" );
+ print( "%compare-strncmp\n" );
+ print( "%readonly-tables\n" );
+ print( "%enum\n" );
+ print( "%null-strings\n" );
+ print( "%struct-type\n" );
+ print( "struct XMLTokenInfo {\n" );
+ print( " const sal_Char* mpcName;\n" );
+ print( " sal_Int32 mnToken;\n" );
+ print( "};\n" );
+ print( "%%\n" );
+}
+
+$i = 0;
+while( <> )
{
# trim newline
chomp( $_ );
# trim leading/trailing whitespace
$_ =~ s/^\s*//g;
$_ =~ s/\s*$//g;
- # check for valid characters
- $_ =~ /^[a-zA-Z0-9-_]+$/ or die "Error: invalid character in token '$_'";
- $id = "XML_$_";
- $id =~ s/-/_/g;
- $tokens{$_} = $id;
-}
-close ( INFILE );
-
-# generate output files
-open ( IDFILE, ">$ARGV1" ) or die "Error: cannot open output file: $!";
-open ( NAMEFILE, ">$ARGV2" ) or die "Error: cannot open output file: $!";
-open ( GPERFFILE, ">$ARGV3" ) or die "Error: cannot open output file: $!";
-
-print( GPERFFILE "%language=C++\n" );
-print( GPERFFILE "%global-table\n" );
-print( GPERFFILE "%null-strings\n" );
-print( GPERFFILE "%struct-type\n" );
-print( GPERFFILE "struct xmltoken {\n" );
-print( GPERFFILE " const sal_Char *name;\n" );
-print( GPERFFILE " sal_Int32 nToken;\n" );
-print( GPERFFILE "};\n" );
-print( GPERFFILE "%%\n" );
-
-$i = 0;
-foreach( sort( keys( %tokens ) ) )
-{
- print( IDFILE "const sal_Int32 $tokens{$_} = $i;\n" );
- print( NAMEFILE "\"$_\",\n" );
- print( GPERFFILE "$_,$tokens{$_}\n" );
- ++$i;
+ # skip empty lines
+ if( $_ ) {
+ # check for valid characters
+ $_ =~ /^[a-zA-Z0-9-_]+$/ or die "Error: invalid entry: '$_'";
+ # generate output
+ $id = "XML_$_";
+ $id =~ s/-/_/g;
+ if( $op == 1 ) {
+ print( "const sal_Int32 $id = $i;\n" );
+ } elsif( $op == 2 ) {
+ print( "\"$_\",\n" );
+ } elsif( $op == 3 ) {
+ print( "$_,$id\n" );
+ }
+ ++$i;
+ }
}
-print( IDFILE "const sal_Int32 XML_TOKEN_COUNT = $i;\n" );
-print( GPERFFILE "%%\n" );
-
-close( IDFILE );
-close( NAMEFILE );
-close( GPERFFILE );
+if( $op == 1 ) {
+ print( "const sal_Int32 XML_TOKEN_COUNT = $i;\n" );
+} elsif( $op == 3 ) {
+ print( "%%\n" );
+}
Modified: incubator/ooo/branches/buildsys/main/padmin/Executable_spadmin.bin.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/padmin/Executable_spadmin.bin.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/padmin/Executable_spadmin.bin.mk (original)
+++ incubator/ooo/branches/buildsys/main/padmin/Executable_spadmin.bin.mk Thu Oct 4 23:16:35 2012
@@ -29,10 +29,6 @@ $(eval $(call gb_Executable_set_include,
-I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Executable_set_cxxflags,spadmin.bin,\
- $$(CXXFLAGS) \
-))
-
$(eval $(call gb_Executable_add_linked_static_libs,spadmin.bin,\
vclmain \
))
Modified: incubator/ooo/branches/buildsys/main/padmin/Library_spa.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/padmin/Library_spa.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/padmin/Library_spa.mk (original)
+++ incubator/ooo/branches/buildsys/main/padmin/Library_spa.mk Thu Oct 4 23:16:35 2012
@@ -29,8 +29,7 @@ $(eval $(call gb_Library_set_include,spa
-I$(OUTDIR)/inc/stl \
))
-$(eval $(call gb_Library_set_defs,spa,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,spa,\
-DSPA_DLLIMPLEMENTATION \
))
Modified: incubator/ooo/branches/buildsys/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/postprocess/packcomponents/makefile.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/postprocess/packcomponents/makefile.mk (original)
+++ incubator/ooo/branches/buildsys/main/postprocess/packcomponents/makefile.mk Thu Oct 4 23:16:35 2012
@@ -36,7 +36,6 @@ GTK_TWO_FOUR=$(shell @+-$(PKG_CONFIG) --
my_components = \
abp \
- adabasui \
analysis \
animcore \
avmedia \
@@ -56,10 +55,16 @@ 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/sd/util/sd \
+ component/sd/util/sdd \
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 \
@@ -72,28 +77,26 @@ my_components = \
component/sw/util/sw \
component/sw/util/swd \
component/sw/util/vbaswobj \
+ component/unotools/util/utl \
component/toolkit/util/tk \
component/unoxml/source/rdf/unordf \
component/unoxml/source/service/unoxml \
+ component/writerfilter/util/writerfilter \
component/xmloff/source/transform/xof \
component/xmloff/util/xo \
+ component/xmlscript/util/xcr \
configmgr \
ctl \
date \
- dba \
dbase \
- dbaxml \
- dbmm \
dbp \
dbpool2 \
dbtools \
- dbu \
deployment \
deploymentgui \
dlgprov \
embobj \
evtatt \
- fastsax \
fileacc \
filterconfig1 \
flash \
@@ -117,7 +120,6 @@ my_components = \
odbc \
offacc \
oooimprovecore \
- oox \
package2 \
pcr \
pdffilter \
@@ -127,23 +129,15 @@ my_components = \
pythonloader \
pythonscript \
res \
- rpt \
- rptui \
- rptxml \
- sax \
sb \
sc \
scd \
scn \
scriptframe \
- sd \
sdbc2 \
sdbt \
- sdd \
simplecanvas \
slideshow \
- sm \
- smd \
spl \
srtrs1 \
stringresource \
@@ -163,13 +157,9 @@ my_components = \
ucptdoc1 \
updatefeed \
updchk \
- utl \
uui \
vbaevents \
vbaobj \
- vclcanvas \
- writerfilter \
- xcr \
xmlfa \
xmlfd \
xmx \
@@ -220,7 +210,7 @@ my_components += emboleobj
.END
.IF "$(ENABLE_CAIRO_CANVAS)" == "TRUE"
-my_components += cairocanvas
+my_components += component/canvas/source/cairo/cairocanvas
.END
.IF "$(ENABLE_GCONF)" != ""
@@ -258,16 +248,16 @@ my_components += \
ScriptProviderForJava \
XMergeBridge \
XSLTValidate \
- agenda \
- fax \
- form \
+ component/wizards/com/sun/star/wizards/agenda/agenda \
+ component/wizards/com/sun/star/wizards/fax/fax \
+ component/wizards/com/sun/star/wizards/form/form \
hsqldb \
jdbc \
- letter \
- query \
- report \
- table \
- web
+ component/wizards/com/sun/star/wizards/letter/letter \
+ component/wizards/com/sun/star/wizards/query/query \
+ component/wizards/com/sun/star/wizards/report/report \
+ component/wizards/com/sun/star/wizards/table/table \
+ component/wizards/com/sun/star/wizards/web/web
.IF "$(ENABLE_BEANSHELL)" == "YES"
my_components += ScriptProviderForBeanShell
.END
@@ -331,12 +321,12 @@ my_components += \
.IF "$(OS)" == "WNT" && "$(ENABLE_DIRECTX)" != ""
my_components += \
avmediawin \
- directx9canvas \
- gdipluscanvas
+ component/canvas/source/directx/directx9canvas \
+ component/canvas/source/directx/gdipluscanvas
.END
.IF "$(OS)" == "WNT" && "$(ENABLE_DIRECTX)" != "" && "$(USE_DIRECTX5)" != ""
-my_components += directx5canvas
+my_components += component/canvas/source/directx/directx5canvas
.END
.IF "$(OS)" == "LINUX" || "$(OS)" == "NETBSD" || \
Modified: incubator/ooo/branches/buildsys/main/reportdesign/inc/pch/precompiled_reportdesign.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/reportdesign/inc/pch/precompiled_reportdesign.hxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/reportdesign/inc/pch/precompiled_reportdesign.hxx (original)
+++ incubator/ooo/branches/buildsys/main/reportdesign/inc/pch/precompiled_reportdesign.hxx Thu Oct 4 23:16:35 2012
@@ -29,6 +29,35 @@
#include "com/sun/star/chart2/data/XDataReceiver.hpp"
#include "com/sun/star/reflection/XProxyFactory.hpp"
#include "com/sun/star/sdb/CommandType.hpp"
+#include "com/sun/star/report/XFormatCondition.hpp"
+#include "com/sun/star/report/XFunction.hpp"
+#include "com/sun/star/report/XReportComponent.hpp"
+#include <com/sun/star/report/ForceNewPage.hpp>
+#include <com/sun/star/report/GroupKeepTogether.hpp>
+#include <com/sun/star/report/GroupOn.hpp>
+#include <com/sun/star/report/KeepTogether.hpp>
+#include <com/sun/star/report/ReportPrintOption.hpp>
+#include <com/sun/star/report/XFixedLine.hpp>
+#include <com/sun/star/report/XFixedText.hpp>
+#include <com/sun/star/report/XFormatCondition.hpp>
+#include <com/sun/star/report/XFormattedField.hpp>
+#include <com/sun/star/report/XFunction.hpp>
+#include <com/sun/star/report/XFunctions.hpp>
+#include <com/sun/star/report/XFunctionsSupplier.hpp>
+#include <com/sun/star/report/XGroup.hpp>
+#include <com/sun/star/report/XGroups.hpp>
+#include <com/sun/star/report/XImageControl.hpp>
+#include <com/sun/star/report/XReportComponent.hpp>
+#include <com/sun/star/report/XReportControlFormat.hpp>
+#include <com/sun/star/report/XReportControlModel.hpp>
+#include <com/sun/star/report/XReportDefinition.hpp>
+#include <com/sun/star/report/XReportEngine.hpp>
+#include <com/sun/star/report/XSection.hpp>
+#include <com/sun/star/report/XShape.hpp>
+#include <com/sun/star/report/meta/XFormulaParser.hpp>
+#include <com/sun/star/report/meta/XFunctionCategory.hpp>
+#include <com/sun/star/report/meta/XFunctionDescription.hpp>
+#include <com/sun/star/report/meta/XFunctionManager.hpp>
#include "comphelper/sequence.hxx"
#include "comphelper/sequenceashashmap.hxx"
#include "comphelper/documentconstants.hxx"
Modified: incubator/ooo/branches/buildsys/main/reportdesign/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/reportdesign/prj/build.lst?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/reportdesign/prj/build.lst (original)
+++ incubator/ooo/branches/buildsys/main/reportdesign/prj/build.lst Thu Oct 4 23:16:35 2012
@@ -1,18 +1,2 @@
rd reportdesign : L10N:l10n BOOST:boost comphelper dbaccess formula LIBXSLT:libxslt NULL
-rd reportdesign usr1 - all rd_mkout NULL
-rd reportdesign\inc nmake - all rd_inc NULL
-rd reportdesign\source\core\api nmake - all rd_api rd_inc NULL
-rd reportdesign\source\core\resource nmake - all rd_res rd_inc NULL
-rd reportdesign\source\core\sdr nmake - all rd_sdr rd_inc NULL
-rd reportdesign\source\core\misc nmake - all rd_misc rd_inc NULL
-rd reportdesign\source\shared nmake - all rd_shared rd_inc NULL
-rd reportdesign\source\ui\misc nmake - all rd_uimisc rd_inc NULL
-rd reportdesign\source\ui\dlg nmake - all rd_uidlg rd_inc NULL
-rd reportdesign\source\ui\report nmake - all rd_uireport rd_inc NULL
-rd reportdesign\source\ui\inspection nmake - all rd_uiinspection rd_inc NULL
-rd reportdesign\source\filter\xml nmake - all rd_filter_xml rd_inc NULL
-rd reportdesign\util nmake - all rd_util rd_api rd_res rd_shared rd_uimisc rd_uidlg rd_uireport rd_uiinspection rd_sdr rd_misc rd_filter_xml NULL
-
-# has problems in m78, in m83 also
-# rd reportdesign\qa\complex\reportdesign nmake - all rd_qa_complex NULL
-
+rd reportdesign\prj nmake - all rd_prj NULL
Modified: incubator/ooo/branches/buildsys/main/reportdesign/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/reportdesign/prj/d.lst?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/reportdesign/prj/d.lst (original)
+++ incubator/ooo/branches/buildsys/main/reportdesign/prj/d.lst Thu Oct 4 23:16:35 2012
@@ -1,24 +0,0 @@
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbreport\menubar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbreport\statusbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbreport\toolbar
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-
-dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"
-
-# Libraries
-..\%__SRC%\bin\rpt*.dll %_DEST%\bin%_EXT%\rpt*.dll
-..\%__SRC%\lib\librpt*.so %_DEST%\lib%_EXT%\librpt*.so
-# ..\%__SRC%\lib\irpt*.lib %_DEST%\lib%_EXT%\irpt*.lib
-..\%__SRC%\lib\librpt*.dylib %_DEST%\lib%_EXT%\librpt*.dylib
-
-# Resources
-..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
-
-..\uiconfig\dbreport\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\dbreport\menubar\*.xml
-..\uiconfig\dbreport\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\dbreport\statusbar\*.xml
-..\uiconfig\dbreport\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\dbreport\toolbar\*.xml
-
-..\%__SRC%\misc\rpt.component %_DEST%\xml%_EXT%\rpt.component
-..\%__SRC%\misc\rptui.component %_DEST%\xml%_EXT%\rptui.component
-..\%__SRC%\misc\rptxml.component %_DEST%\xml%_EXT%\rptxml.component
Modified: incubator/ooo/branches/buildsys/main/reportdesign/qa/complex/reportdesign/TestDocument.java
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/reportdesign/qa/complex/reportdesign/TestDocument.java?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/reportdesign/qa/complex/reportdesign/TestDocument.java (original)
+++ incubator/ooo/branches/buildsys/main/reportdesign/qa/complex/reportdesign/TestDocument.java Thu Oct 4 23:16:35 2012
@@ -25,13 +25,14 @@ package complex.reportdesign;
import java.io.File;
import org.openoffice.test.OfficeFileUrl;
+import org.openoffice.test.Argument;
final class TestDocument
{
- public static String getUrl(String name)
- {
- return OfficeFileUrl.getAbsolute(new File("test_documents", name));
- }
+ public static String getUrl(String name)
+ {
+ return OfficeFileUrl.getAbsolute(new File(Argument.get("tdoc"), name));
+ }
private TestDocument() {}
}
Modified: incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/FixedLine.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/FixedLine.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/FixedLine.cxx (original)
+++ incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/FixedLine.cxx Thu Oct 4 23:16:35 2012
@@ -20,6 +20,7 @@
*************************************************************/
+#include "precompiled_reportdesign.hxx"
#include "FixedLine.hxx"
#include <com/sun/star/beans/PropertyAttribute.hpp>
#ifndef REPORTDESIGN_SHARED_CORESTRINGS_HRC
Modified: incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/FixedText.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/FixedText.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/FixedText.cxx (original)
+++ incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/FixedText.cxx Thu Oct 4 23:16:35 2012
@@ -20,6 +20,7 @@
*************************************************************/
+#include "precompiled_reportdesign.hxx"
#include "FixedText.hxx"
#include <com/sun/star/beans/PropertyAttribute.hpp>
#ifndef REPORTDESIGN_SHARED_CORESTRINGS_HRC
Modified: incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/FormatCondition.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/FormatCondition.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/FormatCondition.cxx (original)
+++ incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/FormatCondition.cxx Thu Oct 4 23:16:35 2012
@@ -20,11 +20,10 @@
*************************************************************/
+#include "precompiled_reportdesign.hxx"
#include "FormatCondition.hxx"
#include <com/sun/star/beans/PropertyAttribute.hpp>
-#ifndef REPORTDESIGN_SHARED_CORESTRINGS_HRC
#include "corestrings.hrc"
-#endif
#include <tools/debug.hxx>
#include <connectivity/dbtools.hxx>
#include <comphelper/sequence.hxx>
Modified: incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/FormattedField.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/FormattedField.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/FormattedField.cxx (original)
+++ incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/FormattedField.cxx Thu Oct 4 23:16:35 2012
@@ -20,6 +20,7 @@
*************************************************************/
+#include "precompiled_reportdesign.hxx"
#include "FormattedField.hxx"
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/XPropertyState.hpp>
Modified: incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/Function.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/Function.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/Function.cxx (original)
+++ incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/Function.cxx Thu Oct 4 23:16:35 2012
@@ -20,6 +20,7 @@
*************************************************************/
+#include "precompiled_reportdesign.hxx"
#include "Function.hxx"
#include <com/sun/star/beans/PropertyAttribute.hpp>
#ifndef REPORTDESIGN_SHARED_CORESTRINGS_HRC
Modified: incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/Functions.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/Functions.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/Functions.cxx (original)
+++ incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/Functions.cxx Thu Oct 4 23:16:35 2012
@@ -20,6 +20,7 @@
*************************************************************/
+#include "precompiled_reportdesign.hxx"
#include "Functions.hxx"
#include "Function.hxx"
#include <tools/debug.hxx>
Modified: incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/Group.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/Group.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/Group.cxx (original)
+++ incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/Group.cxx Thu Oct 4 23:16:35 2012
@@ -20,6 +20,7 @@
*************************************************************/
+#include "precompiled_reportdesign.hxx"
#include "Group.hxx"
#include "Section.hxx"
#include <com/sun/star/beans/PropertyAttribute.hpp>
Modified: incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/Groups.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/Groups.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/Groups.cxx (original)
+++ incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/Groups.cxx Thu Oct 4 23:16:35 2012
@@ -20,6 +20,7 @@
*************************************************************/
+#include "precompiled_reportdesign.hxx"
#include "Groups.hxx"
#include "Group.hxx"
#include <tools/debug.hxx>
Modified: incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/ImageControl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/ImageControl.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/ImageControl.cxx (original)
+++ incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/ImageControl.cxx Thu Oct 4 23:16:35 2012
@@ -20,15 +20,12 @@
*************************************************************/
+#include "precompiled_reportdesign.hxx"
#include "ImageControl.hxx"
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/XPropertyState.hpp>
-#ifndef REPORTDESIGN_SHARED_CORESTRINGS_HRC
#include "corestrings.hrc"
-#endif
-#ifndef REPORTDESIGN_CORE_RESOURCE_HRC_
#include "core_resource.hrc"
-#endif
#include "core_resource.hxx"
#include <comphelper/sequence.hxx>
#include "Tools.hxx"
Modified: incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/ReportComponent.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/ReportComponent.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/ReportComponent.cxx (original)
+++ incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/ReportComponent.cxx Thu Oct 4 23:16:35 2012
@@ -20,11 +20,10 @@
*************************************************************/
+#include "precompiled_reportdesign.hxx"
#include "ReportComponent.hxx"
-#ifndef REPORTDESIGN_SHARED_CORESTRINGS_HRC
#include "corestrings.hrc"
-#endif
#include <vcl/svapp.hxx>
#include <vcl/outdev.hxx>
#include <toolkit/helper/vclunohelper.hxx>
Modified: incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/ReportControlModel.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/ReportControlModel.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/ReportControlModel.cxx (original)
+++ incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/ReportControlModel.cxx Thu Oct 4 23:16:35 2012
@@ -20,6 +20,7 @@
*************************************************************/
+#include "precompiled_reportdesign.hxx"
#include "ReportControlModel.hxx"
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <com/sun/star/beans/XPropertyState.hpp>
Modified: incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/ReportDefinition.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/ReportDefinition.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/ReportDefinition.cxx (original)
+++ incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/ReportDefinition.cxx Thu Oct 4 23:16:35 2012
@@ -20,7 +20,7 @@
*************************************************************/
-
+#include "precompiled_reportdesign.hxx"
#include "ReportDefinition.hxx"
#include "FixedLine.hxx"
Modified: incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/ReportEngineJFree.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/ReportEngineJFree.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/ReportEngineJFree.cxx (original)
+++ incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/ReportEngineJFree.cxx Thu Oct 4 23:16:35 2012
@@ -20,6 +20,7 @@
*************************************************************/
+#include "precompiled_reportdesign.hxx"
#include <com/sun/star/beans/PropertyValue.hpp>
#include "ReportEngineJFree.hxx"
#include <comphelper/enumhelper.hxx>
Modified: incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/ReportVisitor.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/ReportVisitor.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/ReportVisitor.cxx (original)
+++ incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/ReportVisitor.cxx Thu Oct 4 23:16:35 2012
@@ -20,6 +20,7 @@
*************************************************************/
+#include "precompiled_reportdesign.hxx"
#include "ReportVisitor.hxx"
namespace reportdesign
{
Modified: incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/Section.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/Section.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/Section.cxx (original)
+++ incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/Section.cxx Thu Oct 4 23:16:35 2012
@@ -20,6 +20,7 @@
*************************************************************/
+#include "precompiled_reportdesign.hxx"
#include "Section.hxx"
#include <comphelper/enumhelper.hxx>
#include <connectivity/dbtools.hxx>
Modified: incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/Shape.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/Shape.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/Shape.cxx (original)
+++ incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/Shape.cxx Thu Oct 4 23:16:35 2012
@@ -20,6 +20,7 @@
*************************************************************/
+#include "precompiled_reportdesign.hxx"
#include "Shape.hxx"
#include <com/sun/star/beans/NamedValue.hpp>
Modified: incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/Tools.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/Tools.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/Tools.cxx (original)
+++ incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/Tools.cxx Thu Oct 4 23:16:35 2012
@@ -20,10 +20,9 @@
*************************************************************/
+#include "precompiled_reportdesign.hxx"
#include "Tools.hxx"
-#ifndef REPORTDESIGN_CORE_RESOURCE_HRC_
#include "core_resource.hrc"
-#endif
#include "core_resource.hxx"
#include <comphelper/property.hxx>
Modified: incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/services.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/services.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/services.cxx (original)
+++ incubator/ooo/branches/buildsys/main/reportdesign/source/core/api/services.cxx Thu Oct 4 23:16:35 2012
@@ -20,7 +20,7 @@
*************************************************************/
-
+#include "precompiled_reportdesign.hxx"
#include "sal/types.h"
#include <cppuhelper/factory.hxx>
#include <osl/diagnose.h>
Modified: incubator/ooo/branches/buildsys/main/reportdesign/source/core/misc/conditionalexpression.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/reportdesign/source/core/misc/conditionalexpression.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/reportdesign/source/core/misc/conditionalexpression.cxx (original)
+++ incubator/ooo/branches/buildsys/main/reportdesign/source/core/misc/conditionalexpression.cxx Thu Oct 4 23:16:35 2012
@@ -20,7 +20,7 @@
*************************************************************/
-
+#include "precompiled_reportdesign.hxx"
#include "conditionalexpression.hxx"
/** === begin UNO includes === **/
Modified: incubator/ooo/branches/buildsys/main/reportdesign/source/core/misc/conditionupdater.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/reportdesign/source/core/misc/conditionupdater.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/reportdesign/source/core/misc/conditionupdater.cxx (original)
+++ incubator/ooo/branches/buildsys/main/reportdesign/source/core/misc/conditionupdater.cxx Thu Oct 4 23:16:35 2012
@@ -20,7 +20,7 @@
*************************************************************/
-
+#include "precompiled_reportdesign.hxx"
#include "conditionupdater.hxx"
#include "reportformula.hxx"
Modified: incubator/ooo/branches/buildsys/main/reportdesign/source/core/resource/core_resource.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/reportdesign/source/core/resource/core_resource.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/reportdesign/source/core/resource/core_resource.cxx (original)
+++ incubator/ooo/branches/buildsys/main/reportdesign/source/core/resource/core_resource.cxx Thu Oct 4 23:16:35 2012
@@ -20,7 +20,7 @@
*************************************************************/
-
+#include "precompiled_reportdesign.hxx"
#include "core_resource.hxx"
#include <tools/simplerm.hxx>
Modified: incubator/ooo/branches/buildsys/main/reportdesign/source/core/sdr/ModuleHelper.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/reportdesign/source/core/sdr/ModuleHelper.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/reportdesign/source/core/sdr/ModuleHelper.cxx (original)
+++ incubator/ooo/branches/buildsys/main/reportdesign/source/core/sdr/ModuleHelper.cxx Thu Oct 4 23:16:35 2012
@@ -20,6 +20,7 @@
*************************************************************/
+#include "precompiled_reportdesign.hxx"
#include "ModuleHelper.hxx"
#include <comphelper/configurationhelper.hxx>
#include <comphelper/processfactory.hxx>
Modified: incubator/ooo/branches/buildsys/main/reportdesign/source/core/sdr/PropertyForward.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/reportdesign/source/core/sdr/PropertyForward.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/reportdesign/source/core/sdr/PropertyForward.cxx (original)
+++ incubator/ooo/branches/buildsys/main/reportdesign/source/core/sdr/PropertyForward.cxx Thu Oct 4 23:16:35 2012
@@ -20,6 +20,7 @@
*************************************************************/
+#include "precompiled_reportdesign.hxx"
#include "PropertyForward.hxx"
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
Modified: incubator/ooo/branches/buildsys/main/reportdesign/source/core/sdr/ReportDrawPage.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/reportdesign/source/core/sdr/ReportDrawPage.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/reportdesign/source/core/sdr/ReportDrawPage.cxx (original)
+++ incubator/ooo/branches/buildsys/main/reportdesign/source/core/sdr/ReportDrawPage.cxx Thu Oct 4 23:16:35 2012
@@ -20,7 +20,7 @@
*************************************************************/
-
+#include "precompiled_reportdesign.hxx"
#include "ReportDrawPage.hxx"
#include "RptObject.hxx"
#include "RptModel.hxx"
Modified: incubator/ooo/branches/buildsys/main/reportdesign/source/core/sdr/ReportUndoFactory.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/reportdesign/source/core/sdr/ReportUndoFactory.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/reportdesign/source/core/sdr/ReportUndoFactory.cxx (original)
+++ incubator/ooo/branches/buildsys/main/reportdesign/source/core/sdr/ReportUndoFactory.cxx Thu Oct 4 23:16:35 2012
@@ -20,6 +20,7 @@
*************************************************************/
+#include "precompiled_reportdesign.hxx"
#include "ReportUndoFactory.hxx"
#include "RptObject.hxx"
#include "UndoActions.hxx"
Modified: incubator/ooo/branches/buildsys/main/reportdesign/source/core/sdr/RptModel.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/reportdesign/source/core/sdr/RptModel.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/reportdesign/source/core/sdr/RptModel.cxx (original)
+++ incubator/ooo/branches/buildsys/main/reportdesign/source/core/sdr/RptModel.cxx Thu Oct 4 23:16:35 2012
@@ -20,7 +20,7 @@
*************************************************************/
-
+#include "precompiled_reportdesign.hxx"
#include "RptModel.hxx"
#include "RptPage.hxx"