You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2016/08/07 19:24:15 UTC
svn commit: r1755455 [8/18] - in /openoffice/trunk: ./
ext_libraries/apr-util/ ext_libraries/gtest/win/
ext_libraries/ratscan/scan/ ext_libraries/serf/win/ main/
main/UnoControls/prj/ main/accessibility/prj/ main/animations/prj/
main/basctl/source/dlge...
Modified: openoffice/trunk/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx (original)
+++ openoffice/trunk/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx Sun Aug 7 19:24:03 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/trunk/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx (original)
+++ openoffice/trunk/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx Sun Aug 7 19:24:03 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/trunk/main/lingucomponent/source/spellcheck/spell/sspellimp.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/lingucomponent/source/spellcheck/spell/sspellimp.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/lingucomponent/source/spellcheck/spell/sspellimp.cxx (original)
+++ openoffice/trunk/main/lingucomponent/source/spellcheck/spell/sspellimp.cxx Sun Aug 7 19:24:03 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/trunk/main/lingucomponent/source/spellcheck/spell/sspellimp.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/lingucomponent/source/spellcheck/spell/sspellimp.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/lingucomponent/source/spellcheck/spell/sspellimp.hxx (original)
+++ openoffice/trunk/main/lingucomponent/source/spellcheck/spell/sspellimp.hxx Sun Aug 7 19:24:03 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/trunk/main/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/lingucomponent/source/thesaurus/libnth/nthesimp.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/lingucomponent/source/thesaurus/libnth/nthesimp.cxx (original)
+++ openoffice/trunk/main/lingucomponent/source/thesaurus/libnth/nthesimp.cxx Sun Aug 7 19:24:03 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/trunk/main/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/lingucomponent/source/thesaurus/libnth/nthesimp.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/lingucomponent/source/thesaurus/libnth/nthesimp.hxx (original)
+++ openoffice/trunk/main/lingucomponent/source/thesaurus/libnth/nthesimp.hxx Sun Aug 7 19:24:03 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/trunk/main/linguistic/inc/linguistic/hyphdta.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/linguistic/inc/linguistic/hyphdta.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/linguistic/inc/linguistic/hyphdta.hxx (original)
+++ openoffice/trunk/main/linguistic/inc/linguistic/hyphdta.hxx Sun Aug 7 19:24:03 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/trunk/main/linguistic/inc/linguistic/lngprophelp.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/linguistic/inc/linguistic/lngprophelp.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/linguistic/inc/linguistic/lngprophelp.hxx (original)
+++ openoffice/trunk/main/linguistic/inc/linguistic/lngprophelp.hxx Sun Aug 7 19:24:03 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/trunk/main/linguistic/inc/linguistic/misc.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/linguistic/inc/linguistic/misc.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/linguistic/inc/linguistic/misc.hxx (original)
+++ openoffice/trunk/main/linguistic/inc/linguistic/misc.hxx Sun Aug 7 19:24:03 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/trunk/main/linguistic/inc/linguistic/spelldta.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/linguistic/inc/linguistic/spelldta.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/linguistic/inc/linguistic/spelldta.hxx (original)
+++ openoffice/trunk/main/linguistic/inc/linguistic/spelldta.hxx Sun Aug 7 19:24:03 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/trunk/main/linguistic/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/linguistic/prj/build.lst?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/linguistic/prj/build.lst (original)
+++ openoffice/trunk/main/linguistic/prj/build.lst Sun Aug 7 19:24:03 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/trunk/main/linguistic/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/linguistic/prj/d.lst?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/linguistic/prj/d.lst (original)
+++ openoffice/trunk/main/linguistic/prj/d.lst Sun Aug 7 19:24:03 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/trunk/main/linguistic/qa/unoapi/Test.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/linguistic/qa/unoapi/Test.java?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/linguistic/qa/unoapi/Test.java (original)
+++ openoffice/trunk/main/linguistic/qa/unoapi/Test.java Sun Aug 7 19:24:03 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/trunk/main/linguistic/source/hyphdta.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/linguistic/source/hyphdta.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/linguistic/source/hyphdta.cxx (original)
+++ openoffice/trunk/main/linguistic/source/hyphdta.cxx Sun Aug 7 19:24:03 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/trunk/main/linguistic/source/lngprophelp.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/linguistic/source/lngprophelp.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/linguistic/source/lngprophelp.cxx (original)
+++ openoffice/trunk/main/linguistic/source/lngprophelp.cxx Sun Aug 7 19:24:03 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/trunk/main/linguistic/source/lngreg.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/linguistic/source/lngreg.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/linguistic/source/lngreg.cxx (original)
+++ openoffice/trunk/main/linguistic/source/lngreg.cxx Sun Aug 7 19:24:03 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/trunk/main/linguistic/source/spelldta.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/linguistic/source/spelldta.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/linguistic/source/spelldta.cxx (original)
+++ openoffice/trunk/main/linguistic/source/spelldta.cxx Sun Aug 7 19:24:03 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/trunk/main/mysqlc/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/mysqlc/prj/build.lst?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/mysqlc/prj/build.lst (original)
+++ openoffice/trunk/main/mysqlc/prj/build.lst Sun Aug 7 19:24:03 2016
@@ -1,3 +1,3 @@
-mc mysqlc : solenv offuh cppu soltools cppuhelper readlicense_oo NULL
+mc mysqlc : solenv offapi cppu soltools cppuhelper readlicense_oo NULL
ch mysqlc usr1 - all mc_mkout NULL
mc mysqlc\source nmake - all mc_source NULL
Modified: openoffice/trunk/main/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl Sun Aug 7 19:24:03 2016
@@ -67,8 +67,6 @@ interface XTargetPropertiesCreator : ::c
//=============================================================================
-service TargetPropertiesCreator: XTargetPropertiesCreator;
-
}; }; }; };
#endif
Modified: openoffice/trunk/main/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl Sun Aug 7 19:24:03 2016
@@ -206,10 +206,6 @@ interface XDatabaseDataProvider
[attribute,bound] string DataSourceName;
};
-service DatabaseDataProvider : XDatabaseDataProvider
-{
- createWithConnection([in] com::sun::star::sdbc::XConnection connection);
-};
//=============================================================================
}; }; }; }; };
Modified: openoffice/trunk/main/offapi/com/sun/star/drawing/SlideSorter.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/drawing/SlideSorter.idl?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/drawing/SlideSorter.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/drawing/SlideSorter.idl Sun Aug 7 19:24:03 2016
@@ -42,92 +42,12 @@
#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
#endif
+#ifndef __com_sun_star_drawing_XSlideSorterBase_idl__
+#include <com/sun/star/drawing/XSlideSorterBase.idl>
+#endif
module com { module sun { module star { module drawing {
-/** This interface exists only because services do not directly support
- multiple inheritance and attributes.
- <p>It provides the interfaces and attributes that every object that
- implements the <type>SlideSorter</type> service.</p>
-*/
-interface XSlideSorterBase
-{
- /** This interface is included to mark a <type>SlideSorter</type> object
- as view of the drawing framework and to provide a
- <type>ResourceId</type>.
- */
- interface ::com::sun::star::drawing::framework::XView;
-
- /** The <type>XDrawView</type> interface is included to provide access
- to the current slide (especially write access).
- */
- interface ::com::sun::star::drawing::XDrawView;
-
- /** The set of slides that are displayed by the implementing object.
- <p>The default value is the set of all slides of the document for
- which a slide sorter is created.</p>
- */
- [attribute] ::com::sun::star::container::XIndexAccess DocumentSlides;
-
- /** Set this flag to <TRUE/> in order to have the current slide
- highlighted.
- <p>The default value is <FALSE/>.</p>
- */
- [attribute] boolean IsHighlightCurrentSlide;
-
- /** Set this flag to <TRUE/> in order to visualize the selection of
- slides (typically a bold frame around the selected slides).
- <p>The default value is <TRUE/>.</p>
- */
- [attribute] boolean IsShowSelection;
-
- /** Set this flag to <TRUE/> to visualize to where the focus is by
- showing a dotted rectangle around the focused slide.
- <p>The default value is <TRUE/>.</p>
- */
- [attribute] boolean IsShowFocus;
-
- /** When this flag has the value <TRUE/> then every time the current
- slide is changed the visual area is shifted so that the new current
- slide is display in the center of the slide sorter window.
- <p>It is not always possible to move the current slide into the
- exact center of the window, for example when slides are located near
- the start or end of a document.</p>
- <p>The default value is <FALSE/>.
- */
- [attribute] boolean IsCenterSelection;
-
- /** This flag controls whether updates of previews are created during
- full screen presentations (<FALSE/>) or not (<TRUE/>). The
- suspension of preview creations is an optimization for not slowing
- down a running presentation.
- <p>The default value is <TRUE/>.</p>
- */
- [attribute] boolean IsSuspendPreviewUpdatesDuringFullScreenPresentation;
-
- /** The orientation of a slide sorter can be either vertical (<TRUE/>)
- or horizontal (<FALSE/>).
- */
- [attribute] boolean IsOrientationVertical;
-
- /** This flag is a hint to make scrolling look smooth.
- */
- [attribute] boolean IsSmoothScrolling;
-
- [attribute] ::com::sun::star::util::Color BackgroundColor;
- [attribute] ::com::sun::star::util::Color TextColor;
- [attribute] ::com::sun::star::util::Color SelectionColor;
- [attribute] ::com::sun::star::util::Color HighlightColor;
-
- /** This flag controls whether the model can be modified by using
- keyboard or mouse.
- <p>The default value is <TRUE/>.</p>
- */
- [attribute] boolean IsUIReadOnly;
-};
-
-
-
/** A slide sorter shows previews for a set of slides, typically all slides
in a document, and allows the selection, reordering, creation, and
Modified: openoffice/trunk/main/offapi/com/sun/star/drawing/XPresenterHelper.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/drawing/XPresenterHelper.idl?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/drawing/XPresenterHelper.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/drawing/XPresenterHelper.idl Sun Aug 7 19:24:03 2016
@@ -36,15 +36,12 @@
#ifndef __com_sun_star_awt_Rectangle_idl__
#include <com/sun/star/awt/Rectangle.idl>
#endif
+#ifndef __com_sun_star_drawing_CanvasFeature_idl__
+#include <com/sun/star/drawing/CanvasFeature.idl>
+#endif
module com { module sun { module star { module drawing {
-constants CanvasFeature
-{
- const short None = 0;
- const short SpriteCanvas = 1;
-};
-
/** This interface is a collection of functions that are necessary to
implement larger parts of the presenter screen as extension. The
methods of this interface give access to services that can, at the
Modified: openoffice/trunk/main/offapi/com/sun/star/drawing/XSlidePreviewCache.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/drawing/XSlidePreviewCache.idl?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/drawing/XSlidePreviewCache.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/drawing/XSlidePreviewCache.idl Sun Aug 7 19:24:03 2016
@@ -39,28 +39,12 @@
#ifndef __com_sun_star_rendering_XCanvas_idl__
#include <com/sun/star/rendering/XCanvas.idl>
#endif
+#ifndef __com_sun_star_drawing_XSlidePreviewCacheListener_idl__
+#include <com/sun/star/drawing/XSlidePreviewCacheListener.idl>
+#endif
module com { module sun { module star { module drawing {
-/** Listener for asynchronous preview creations. Called when a slide
- preview has been created that was previously requested via a call to
- <method>XSlidePreviewCache::getSlidePreview()</method>. The
- implementor may then call <method>getSlidePreview()</method> a second
- time to get the up-to-date version of the preview.
-*/
-published interface XSlidePreviewCacheListener
-{
- /** Called by a <interface>XSlidePreviewCache</interface> object when a
- preview has been created for the slide with the given index.
- @param nSlideIndex
- The index of the slide for which a new preview has been created.
- */
- void notifyPreviewCreation ([in] long nSlideIndex);
-};
-
-
-
-
/** A cache of preview bitmaps for the slides of one Impress or Draw
document in one size. There may be more than one cache for one
document. These are internally connected and for missing previews one
Modified: openoffice/trunk/main/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl Sun Aug 7 19:24:03 2016
@@ -33,20 +33,12 @@
#ifndef __com_sun_star_rendering_XCanvas_idl__
#include <com/sun/star/rendering/XCanvas.idl>
#endif
+#ifndef __com_sun_star_rendering_drawing_framework_BorderType_idl__
+#include <com/sun/star/drawing/framework/BorderType.idl>
+#endif
module com { module sun { module star { module drawing { module framework {
-/** See XPaneBorderPainter and its addBorder() and removeBorder() methods
- for an explanation of the border type and its values.
-*/
-published enum BorderType
-{
- INNER_BORDER,
- OUTER_BORDER,
- TOTAL_BORDER
-};
-
-
/** Paint the border around a rectangular region, typically a pane.
<p>Calling objects have to be able to derive inner bounding boxs of the
Modified: openoffice/trunk/main/offapi/com/sun/star/frame/XUntitledNumbers.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/frame/XUntitledNumbers.idl?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/frame/XUntitledNumbers.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/frame/XUntitledNumbers.idl Sun Aug 7 19:24:03 2016
@@ -35,11 +35,6 @@
module com { module sun { module star { module frame {
-constants UntitledNumbersConst
-{
- const long INVALID_NUMBER = 0;
-};
-
//=============================================================================
/** knows all currently used and all free numbers for using with untitled
but counted objects.
Modified: openoffice/trunk/main/offapi/com/sun/star/inspection/XStringRepresentation.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/inspection/XStringRepresentation.idl?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/inspection/XStringRepresentation.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/inspection/XStringRepresentation.idl Sun Aug 7 19:24:03 2016
@@ -59,11 +59,6 @@ published interface XStringRepresentatio
) raises( com::sun::star::uno::Exception );
};
-service StringRepresentation : XStringRepresentation
-{
- create([in]com::sun::star::script::XTypeConverter TypeConverter)raises( com::sun::star::lang::IllegalArgumentException );
- createConstant([in]com::sun::star::script::XTypeConverter TypeConverter,[in] string Constant,[in] sequence<string> Values)raises( com::sun::star::lang::IllegalArgumentException );
-};
//=============================================================================
}; }; }; };
Modified: openoffice/trunk/main/offapi/com/sun/star/presentation/XSlideShow.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/presentation/XSlideShow.idl?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/presentation/XSlideShow.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/presentation/XSlideShow.idl Sun Aug 7 19:24:03 2016
@@ -365,8 +365,6 @@ interface XSlideShow : ::com::sun::star:
};
-service SlideShow : XSlideShow;
-
}; }; }; };
#endif
Modified: openoffice/trunk/main/offapi/com/sun/star/presentation/XTransitionFactory.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/presentation/XTransitionFactory.idl?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/presentation/XTransitionFactory.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/presentation/XTransitionFactory.idl Sun Aug 7 19:24:03 2016
@@ -80,8 +80,6 @@ interface XTransitionFactory : ::com::su
[in] com::sun::star::rendering::XBitmap enteringBitmap );
};
-service TransitionFactory : XTransitionFactory;
-
}; }; }; };
#endif
Modified: openoffice/trunk/main/offapi/com/sun/star/rendering/XBitmapCanvas.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/rendering/XBitmapCanvas.idl?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/rendering/XBitmapCanvas.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/rendering/XBitmapCanvas.idl Sun Aug 7 19:24:03 2016
@@ -35,9 +35,6 @@
#ifndef __com_sun_star_rendering_RenderState_idl__
#include <com/sun/star/rendering/RenderState.idl>
#endif
-#ifndef __com_sun_star_rendering_XBitmap_idl__
-#include <com/sun/star/rendering/XBitmap.idl>
-#endif
#ifndef __com_sun_star_rendering_XCanvas_idl__
#include <com/sun/star/rendering/XCanvas.idl>
#endif
@@ -125,23 +122,6 @@ published interface XBitmapCanvas : XCan
};
-//=============================================================================
-
-// TODO: Multiple-inheritance interfaces
-
-/** This service provides the interfaces for a <type>XBitmapCanvas</type>
- */
-service BitmapCanvas
-{
- /** Canvas interface, to issue rendering operations.
- */
- interface XBitmapCanvas;
-
- /** Bitmap interface, to directly manipulate the pixel.
- */
- interface XBitmap;
-};
-
}; }; }; };
#endif
Modified: openoffice/trunk/main/offapi/com/sun/star/rendering/XCanvas.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/rendering/XCanvas.idl?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/rendering/XCanvas.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/rendering/XCanvas.idl Sun Aug 7 19:24:03 2016
@@ -730,11 +730,6 @@ published interface XCanvas : ::com::sun
XGraphicDevice getDevice();
};
-//=============================================================================
-
-/// Service providing an <type>XCanvas</type> interface
-service Canvas: XCanvas;
-
}; }; }; };
#endif
Modified: openoffice/trunk/main/offapi/com/sun/star/rendering/XColorSpace.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/rendering/XColorSpace.idl?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/rendering/XColorSpace.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/rendering/XColorSpace.idl Sun Aug 7 19:24:03 2016
@@ -35,47 +35,18 @@
#ifndef __com_sun_star_rendering_ColorProfile_idl__
#include <com/sun/star/rendering/ColorProfile.idl>
#endif
+#ifndef __com_sun_star_rendering_ColorComponent_idl__
+#include <com/sun/star/rendering/ColorComponent.idl>
+#endif
+#ifndef __com_sun_star_rendering_RGBColor_idl__
+#include <com/sun/star/rendering/RGBColor.idl>
+#endif
+#ifndef __com_sun_star_rendering_ARGBColor_idl__
+#include <com/sun/star/rendering/ARGBColor.idl>
+#endif
module com { module sun { module star { module rendering {
-/// Shorthand for the device-dependent color components, and easier to read
-published typedef double ColorComponent;
-published typedef sequence<ColorComponent> Color;
-
-//=============================================================================
-
-/// RGB color triplet
-published struct RGBColor
-{
- /// Red component. Valid range is [0,1.0]
- ColorComponent Red;
- /// Green component. Valid range is [0,1.0]
- ColorComponent Green;
- /// Blue component. Valid range is [0,1.0]
- ColorComponent Blue;
-};
-
-//=============================================================================
-
-/// ARGB color quad
-published struct ARGBColor
-{
- /** Alpha component.<p>
-
- Valid range is [0,1.0], with 0.0 denoting fully transparent,
- and 1.0 fully opaque.
- */
- ColorComponent Alpha;
- /// Red component. Valid range is [0,1.0]
- ColorComponent Red;
- /// Green component. Valid range is [0,1.0]
- ColorComponent Green;
- /// Blue component. Valid range is [0,1.0]
- ColorComponent Blue;
-};
-
-//=============================================================================
-
/** Information how to interpret certain color data.<p>
This interface encapsulates all information that is necessary to
Modified: openoffice/trunk/main/offapi/com/sun/star/report/XFixedLine.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/report/XFixedLine.idl?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/report/XFixedLine.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/report/XFixedLine.idl Sun Aug 7 19:24:03 2016
@@ -93,7 +93,6 @@ published interface XFixedLine
//-------------------------------------------------------------------------
};
-published service FixedLine : XFixedLine;
//=============================================================================
}; }; }; };
Modified: openoffice/trunk/main/offapi/com/sun/star/report/XFixedText.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/report/XFixedText.idl?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/report/XFixedText.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/report/XFixedText.idl Sun Aug 7 19:24:03 2016
@@ -40,7 +40,6 @@ published interface XFixedText
[attribute,bound] string Label;
};
-published service FixedText : XFixedText;
//=============================================================================
}; }; }; };
Modified: openoffice/trunk/main/offapi/com/sun/star/report/XFormatCondition.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/report/XFormatCondition.idl?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/report/XFormatCondition.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/report/XFormatCondition.idl Sun Aug 7 19:24:03 2016
@@ -50,7 +50,6 @@ published interface XFormatCondition
[attribute,bound] string Formula;
};
-service FormatCondition : XFormatCondition;
//=============================================================================
}; }; }; };
Modified: openoffice/trunk/main/offapi/com/sun/star/report/XFormattedField.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/report/XFormattedField.idl?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/report/XFormattedField.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/report/XFormattedField.idl Sun Aug 7 19:24:03 2016
@@ -57,7 +57,6 @@ published interface XFormattedField
[attribute,bound] com::sun::star::util::XNumberFormatsSupplier FormatsSupplier;
};
-published service FormattedField : XFormattedField;
//=============================================================================
}; }; }; };
Modified: openoffice/trunk/main/offapi/com/sun/star/report/XFunction.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/report/XFunction.idl?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/report/XFunction.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/report/XFunction.idl Sun Aug 7 19:24:03 2016
@@ -76,10 +76,6 @@ published interface XFunction
[attribute,bound] com::sun::star::beans::Optional<string> InitialFormula;
};
-service Function : XFunction
-{
- create();
-};
//=============================================================================
}; }; }; };
Modified: openoffice/trunk/main/offapi/com/sun/star/report/XGroup.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/report/XGroup.idl?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/report/XGroup.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/report/XGroup.idl Sun Aug 7 19:24:03 2016
@@ -134,7 +134,6 @@ published interface XGroup
[attribute,bound] boolean ResetPageNumber;
};
-service Group : XGroup;
//=============================================================================
}; }; }; };
Modified: openoffice/trunk/main/offapi/com/sun/star/report/XGroups.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/report/XGroups.idl?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/report/XGroups.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/report/XGroups.idl Sun Aug 7 19:24:03 2016
@@ -71,7 +71,6 @@ published interface XGroups
[attribute,readonly] com::sun::star::report::XReportDefinition ReportDefinition;
};
-service Groups : XGroups;
//=============================================================================
}; }; }; };
Modified: openoffice/trunk/main/offapi/com/sun/star/report/XImageControl.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/report/XImageControl.idl?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/report/XImageControl.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/report/XImageControl.idl Sun Aug 7 19:24:03 2016
@@ -77,7 +77,6 @@ published interface XImageControl
[attribute,bound] boolean PreserveIRI;
};
-published service ImageControl : XImageControl;
//=============================================================================
}; }; }; };
Modified: openoffice/trunk/main/offapi/com/sun/star/report/XReportControlFormat.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/report/XReportControlFormat.idl?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/report/XReportControlFormat.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/report/XReportControlFormat.idl Sun Aug 7 19:24:03 2016
@@ -602,7 +602,6 @@ published interface XReportControlFormat
};
};
-service ReportControlFormat : XReportControlFormat;
//=============================================================================
}; }; }; };
Modified: openoffice/trunk/main/offapi/com/sun/star/report/XReportControlModel.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/report/XReportControlModel.idl?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/report/XReportControlModel.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/report/XReportControlModel.idl Sun Aug 7 19:24:03 2016
@@ -100,7 +100,6 @@ published interface XReportControlModel
};
};
-service ReportControlModel : XReportControlModel;
//=============================================================================
}; }; }; };
Modified: openoffice/trunk/main/offapi/com/sun/star/report/XReportDefinition.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/report/XReportDefinition.idl?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/report/XReportDefinition.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/report/XReportDefinition.idl Sun Aug 7 19:24:03 2016
@@ -347,7 +347,6 @@ published interface XReportDefinition
};
};
-published service ReportDefinition : XReportDefinition;
//=============================================================================
}; }; }; };
Modified: openoffice/trunk/main/offapi/com/sun/star/report/XSection.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/report/XSection.idl?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/report/XSection.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/report/XSection.idl Sun Aug 7 19:24:03 2016
@@ -180,7 +180,6 @@ published interface XSection
[attribute,readonly] com::sun::star::report::XReportDefinition ReportDefinition;
};
-service Section : XSection;
//=============================================================================
}; }; }; };
Modified: openoffice/trunk/main/offapi/com/sun/star/report/XShape.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/report/XShape.idl?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/report/XShape.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/report/XShape.idl Sun Aug 7 19:24:03 2016
@@ -81,7 +81,6 @@ published interface XShape
[attribute,bound] boolean Opaque;
};
-service Shape : XShape;
//=============================================================================
}; }; }; };
Modified: openoffice/trunk/main/offapi/com/sun/star/setup/InstallResponse.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/setup/InstallResponse.idl?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/setup/InstallResponse.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/setup/InstallResponse.idl Sun Aug 7 19:24:03 2016
@@ -23,18 +23,10 @@
#ifndef __com_sun_star_setup_InstallResponse_idl__
#define __com_sun_star_setup_InstallResponse_idl__
+#include <com/sun/star/setup/ResponseErrorCode.idl>
+
module com { module sun { module star { module setup {
-/// @deprecated
-published enum ResponseErrorCode
-{
- // DocMerge: empty anyway
- NOERROR,
-
- // DocMerge: empty anyway
- NOT_ENOUGH_SPACE
- };
-
// DocMerge: empty anyway
published struct InstallResponse
{
Modified: openoffice/trunk/main/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl Sun Aug 7 19:24:03 2016
@@ -141,10 +141,6 @@ published interface XFormulaOpCodeMapper
//=============================================================================
-service FormulaOpCodeMapper : XFormulaOpCodeMapper;
-
-//=============================================================================
-
}; }; }; };
#endif
Modified: openoffice/trunk/main/offapi/com/sun/star/sync/SyncInfo.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/sync/SyncInfo.idl?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/sync/SyncInfo.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/sync/SyncInfo.idl Sun Aug 7 19:24:03 2016
@@ -27,13 +27,14 @@
#ifndef __com_sun_star_sync_SyncScheme_idl__
#include <com/sun/star/sync/SyncScheme.idl>
#endif
+#ifndef __com_sun_star_sync_FilterData_idl__
+#include <com/sun/star/sync/FilterData.idl>
+#endif
//=============================================================================
module com { module sun { module star { module sync {
-published typedef sequence< string > FilterData;
-
//=============================================================================
/// @deprecated
Modified: openoffice/trunk/main/offapi/com/sun/star/util/XTextSearch.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/util/XTextSearch.idl?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/util/XTextSearch.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/util/XTextSearch.idl Sun Aug 7 19:24:03 2016
@@ -27,7 +27,8 @@
#include <com/sun/star/lang/Locale.idl>
#include <com/sun/star/uno/XInterface.idl>
-//#include <com/sun/star/lang/CascadeTransliterator.idl>
+#include <com/sun/star/util/SearchOptions.idl>
+#include <com/sun/star/util/SearchResult.idl>
//=============================================================================
@@ -35,181 +36,6 @@ module com { module sun { module star {
//=============================================================================
-
-published enum SearchAlgorithms
-{
- /// Literal
- ABSOLUTE, // implemented as a kind of Boyer-Moore
- /// Regular expression
- REGEXP,
- /// Weighted Levenshtein Distance
- APPROXIMATE
-};
-
-/// Flags for search methods
-published constants SearchFlags
-{
- /**
- @deprecated The constant ALL_IGNORE_CASE is never supported - use
- <const scope="com::sun::star::i18n">TransliterationModules::IGNORE_CASE</const>
- with
- <member>SearchOptions::transliterateFlags</member>
- instead.
-
- @see <type scope="com::sun::star::i18n">TransliterationModules</type>
- */
- const long ALL_IGNORE_CASE = 0x00000001;
-
- /** Flag for normal (Boyer-Moore) search / Search for word only. */
- const long NORM_WORD_ONLY = 0x00000010;
-
- /** Flag for "regular expression" search / Interpret as extended
- regular expression.
-
- @deprecated The flag is currently not supported by OOo.
- */
- const long REG_EXTENDED = 0x00000100;
-
- /** Flag for "regular expression" search / No register information
- or backreferences, i.e., avoid sub expressions. Return only
- true/false if matched or not.
-
- @deprecated The flag is currently not supported by OOo.
- */
- const long REG_NOSUB = 0x00000200;
-
- /** Flag for "regular expression" search / Special new line
- treatment.
-
- @deprecated The flag is currently not supported by OOo.
-
- <p> A NEWLINE character in string will not be matched by a
- period outside bracket expression or by any form of a non
- matching list. </p>
-
- <p> A circumflex (^) in pattern when used to specify expression
- anchoring will match the zero length string immediately after a
- newline in string, regardless of the setting of
- REG_NOT_BEGINOFLINE. </p>
-
- <p> A dollar-sign ($) in pattern when used to specify expression
- anchoring, will match zero-length string immediately before a
- new line in string, regardless of the setting of
- REG_NOT_ENDOFLINE. </p>
- */
- const long REG_NEWLINE = 0x00000400;
-
- /** The first character in the string is not the beginning of the
- line therefore ^ will not match with first character of the
- string.
- */
- const long REG_NOT_BEGINOFLINE = 0x00000800;
-
- /** The last character in the string is not the end of the line
- therefore $ will not match with last character of the string.
- */
- const long REG_NOT_ENDOFLINE = 0x00001000;
-
- /** Flag for "Weighted Levenshtein Distance" search / Relaxed
- checking of limit, split weigh pools.
-
- <p> If not specified (<b>strict</b>), the search is successful if
- the WLD is within a calculated limit where each insertion,
- deletion and replacement adds a weight to a common pool of
- weights. This is the mathematically correct WLD. </p>
-
- <p> From a user's point of view the strict WLD is an
- exclusive-OR of the arguments given, for example if allowed
- insertions=2 and allowed replacements=2, the search fails if 2
- characters had been inserted and an additional operation would
- be needed to match. Depending on the weights it may also fail if
- 1 character was inserted and 1 character replaced and an
- additional operation would be needed to match. The strict
- algorithm may match less than expected from a first glance of
- the specified arguments, but does not return false positives. </p>
-
- <p> If specified (<b>relaxed</b>), the search is also successful
- if the combined pool for insertions and deletions is below a
- doubled calculated limit and replacements are treated
- differently. Additionally, swapped characters are counted as one
- replacement. </p>
-
- <p> From a user's point of view the relaxed WLD is an
- inclusive-OR of the arguments given, for example if allowed
- insertions=2 and allowed replacements=2, the search succeeds if
- 2 characters had been inserted and an additional replacement is
- needed to match. The relaxed algorithm may return false
- positives, but meets user expectation better. </p>
- */
- const long LEV_RELAXED = 0x00010000;
-};
-
-
-published struct SearchOptions {
- //-------------------------------------------------------------------------
- /** search type */
- SearchAlgorithms algorithmType;
-
- /** some flags - can be mixed
-
- @see <type>SearchFlags</type>
- */
- long searchFlag;
-
- /** The text or pattern to be searched. */
- string searchString;
-
- /** The replacement text
- (is for optional replacing - SearchOption is only the data container for it) */
- string replaceString;
-
- /** The locale for case insensitive search. */
- ::com::sun::star::lang::Locale Locale;
-
- /** This many characters can be different (as a replacement) between
- the found word and the search pattern in a "Weighted Levenshtein
- Distance" search. */
- long changedChars;
-
- /** This many characters can be missing in the found word in a
- "Weighted Levenshtein Distance" search. */
- long deletedChars;
-
- /** This many characters can be additional in the found word in a
- "Weighted Levenshtein Distance" search. */
- long insertedChars;
-
- /** Flags for the transliteration. Same meaning as the enum of
- <type scope="com::sun::star::i18n">TransliterationModules</type>
- */
- long transliterateFlags;
-};
-
-
-published struct SearchResult {
- //-------------------------------------------------------------------------
- /** Number of subexpressions,
- if it is 0, then no match found; this value is 1 for ABSOLUTE and APPROXIMATE match.
- The start and endOffset are always dependent on the search direction.
- For example:
- if you search "X" in the text "-X-" the offset are:
- for forward: start = 1, end = 2
- for backward: start = 2, end = 1
- Forward, the startOffset is inclusive, the endOffset exclusive.
- Backward, the startOffset is exclusive, the endOffset inclusive.
-
- For regular expressions it can be greater than 1.
- If the value is 1, startoffset[0] and endoffset[0] points to the matching sub string
- if value is > 1, still startoffset[0] and endoffset[0] points to the matching substring for whole regular expression
- startoffset[i] and endoffset[i] points to the matching substring of i th matching substring.
- */
- long subRegExpressions;
- sequence<long> startOffset; // inclusive
- sequence<long> endOffset; // exclusive
-};
-
-
-
/** enables an object to search in its content.
*/
published interface XTextSearch : com::sun::star::uno::XInterface
Modified: openoffice/trunk/main/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl Sun Aug 7 19:24:03 2016
@@ -31,31 +31,11 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
#include <com/sun/star/xml/sax/XDocumentHandler.idl>
+#include <com/sun/star/xml/crypto/sax/ElementStackItem.idl>
module com { module sun { module star { module xml { module crypto { module sax {
/**
- * A struct to keep a startElement/endElement SAX event.
- */
-struct ElementStackItem
-{
- /**
- * whether it is a startElement event
- */
- boolean isStartElementEvent;
-
- /**
- * the name of the element
- */
- string elementName;
-
- /**
- * attribute list for a startElement event
- */
- com::sun::star::xml::sax::XAttributeList xAttributes;
-};
-
-/**
* Manipulate the "key SAX events" in a SAX event stream.
*
* @see XSecController
Modified: openoffice/trunk/main/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl Sun Aug 7 19:24:03 2016
@@ -31,53 +31,13 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
#include <com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl>
+#include <com/sun/star/xml/crypto/sax/ConstOfSecurityId.idl>
+#include <com/sun/star/xml/crypto/sax/ElementMarkPriority.idl>
+#include <com/sun/star/xml/crypto/sax/ElementMarkType.idl>
module com { module sun { module star { module xml { module crypto { module sax {
/**
- * Represents the undefined security id
- */
-constants ConstOfSecurityId
-{
- const long UNDEFINEDSECURITYID = -1;
-};
-
-/**
- * Defines priority for the element mark's notification.
- * <p>
- * The PRI_MINIMUM priority is a value less than any practical
- * priority value, it is used when compare between different
- * priority values.
- * <p>
- * The PRI_AFTERMODIFY priority represents the notification will be
- * sent after any internal modification has finished.
- * <p>
- * The PRI_BEFOREMODIFY proirity represents the notification will be
- * sent before any internal modification happens.
- * <p>
- * So an element mark with PRI_BEFOREMODIFY will be handled first,
- * and one with PRI_AFTERMODIFY will be handled at last.
- */
-enum ElementMarkPriority
-{
- MINIMUM = 1,
- AFTERMODIFY,
- BEFOREMODIFY
-};
-
-/**
- * Defines types of element mark.
- * <p>
- * the TYPEOFELEMENTMARK type represents a blocker, and the TYPEOFELEMENTCOLLECTOR
- * type represents a element collector.
- */
-enum ElementMarkType
-{
- ELEMENTMARK = 1,
- ELEMENTCOLLECTOR
-};
-
-/**
* Interface of Security SAX Event Keeper.
* <p>
* This interface is an extension of the XSAXEventKeeper interface,
Modified: openoffice/trunk/main/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl Sun Aug 7 19:24:03 2016
@@ -28,27 +28,12 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/xml/sax/SAXException.idl>
+#include <com/sun/star/xml/csax/XMLAttribute.idl>
module com { module sun { module star { module xml { module csax {
/**
- * A struct to keep information of an element's attribute.
- */
-struct XMLAttribute
-{
- /**
- * the attribute name
- */
- string sName;
-
- /**
- * the attribute value
- */
- string sValue;
-};
-
-/**
* A compressed XDocumentHandler interface.
* <p>
* All methods in this interface have the same function with methods