mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

com::sun::star->css in include/linguistic to include/sfx2

Browse Source 
Change-Id: Id69e293fda98ee6cf2cc3d3296a0cd2e06bd847e
Reviewed-on: https://gerrit.libreoffice.org/19527
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
Noel Grandin 2015-10-22 16:38:52 +02:00 committed by Noel Grandin
parent fa22a60e71
commit e4acd26406
133 changed files with 1384 additions and 1457 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
include/linguistic/hyphdta.hxx
View File

@ -29,10 +29,7 @@ namespace linguistic
{
class HyphenatedWord :
public cppu::WeakImplHelper
<
::com::sun::star::linguistic2::XHyphenatedWord
>
public cppu::WeakImplHelper< css::linguistic2::XHyphenatedWord >
{
OUString aWord;
OUString aHyphenatedWord;
@ -52,24 +49,24 @@ public:
// XHyphenatedWord
virtual OUString SAL_CALL
getWord()
throw(::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::lang::Locale SAL_CALL
throw(css::uno::RuntimeException, std::exception) override;
virtual css::lang::Locale SAL_CALL
getLocale()
throw(::com::sun::star::uno::RuntimeException, std::exception) override;
throw(css::uno::RuntimeException, std::exception) override;
virtual sal_Int16 SAL_CALL
getHyphenationPos()
throw(::com::sun::star::uno::RuntimeException, std::exception) override;
throw(css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL
getHyphenatedWord()
throw(::com::sun::star::uno::RuntimeException, std::exception) override;
throw(css::uno::RuntimeException, std::exception) override;
virtual sal_Int16 SAL_CALL
getHyphenPos()
throw(::com::sun::star::uno::RuntimeException, std::exception) override;
throw(css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL
isAlternativeSpelling()
throw(::com::sun::star::uno::RuntimeException, std::exception) override;
throw(css::uno::RuntimeException, std::exception) override;
static com::sun::star::uno::Reference <com::sun::star::linguistic2::XHyphenatedWord> LNG_DLLPUBLIC CreateHyphenatedWord(
static css::uno::Reference <css::linguistic2::XHyphenatedWord> LNG_DLLPUBLIC CreateHyphenatedWord(
const OUString &rWord, sal_Int16 nLang, sal_Int16 nHyphenationPos,
const OUString &rHyphenatedWord, sal_Int16 nHyphenPos );
};
@ -78,12 +75,12 @@ public:
class PossibleHyphens :
public cppu::WeakImplHelper
<
::com::sun::star::linguistic2::XPossibleHyphens
css::linguistic2::XPossibleHyphens
>
{
OUString aWord;
OUString aWordWithHyphens;
::com::sun::star::uno::Sequence< sal_Int16 > aOrigHyphenPos;
css::uno::Sequence< sal_Int16 > aOrigHyphenPos;
sal_Int16 nLanguage;
PossibleHyphens(const PossibleHyphens &) = delete;
@ -92,27 +89,27 @@ class PossibleHyphens :
public:
PossibleHyphens(const OUString &rWord, sal_Int16 nLang,
const OUString &rHyphWord,
const ::com::sun::star::uno::Sequence< sal_Int16 > &rPositions);
const css::uno::Sequence< sal_Int16 > &rPositions);
virtual ~PossibleHyphens();
// XPossibleHyphens
virtual OUString SAL_CALL
getWord()
throw(::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::lang::Locale SAL_CALL
throw(css::uno::RuntimeException, std::exception) override;
virtual css::lang::Locale SAL_CALL
getLocale()
throw(::com::sun::star::uno::RuntimeException, std::exception) override;
throw(css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL
getPossibleHyphens()
throw(::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL
throw(css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< sal_Int16 > SAL_CALL
getHyphenationPositions()
throw(::com::sun::star::uno::RuntimeException, std::exception) override;
throw(css::uno::RuntimeException, std::exception) override;
static com::sun::star::uno::Reference < com::sun::star::linguistic2::XPossibleHyphens > LNG_DLLPUBLIC CreatePossibleHyphens
static css::uno::Reference < css::linguistic2::XPossibleHyphens > LNG_DLLPUBLIC CreatePossibleHyphens
(const OUString &rWord, sal_Int16 nLang,
const OUString &rHyphWord,
const ::com::sun::star::uno::Sequence< sal_Int16 > &rPositions);
const css::uno::Sequence< sal_Int16 > &rPositions);
};
} // namespace linguistic

146
include/linguistic/lngprophelp.hxx
View File

@ -51,19 +51,17 @@ namespace linguistic
typedef cppu::WeakImplHelper
<
::com::sun::star::beans::XPropertyChangeListener,
::com::sun::star::linguistic2::XLinguServiceEventBroadcaster
css::beans::XPropertyChangeListener,
css::linguistic2::XLinguServiceEventBroadcaster
> PropertyChgHelperBase;
class PropertyChgHelper :
public PropertyChgHelperBase
{
::com::sun::star::uno::Sequence< OUString > aPropNames;
::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface > xMyEvtObj;
css::uno::Sequence< OUString > aPropNames;
css::uno::Reference< css::uno::XInterface > xMyEvtObj;
::cppu::OInterfaceContainerHelper aLngSvcEvtListeners;
::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > xPropSet;
css::uno::Reference< css::beans::XPropertySet > xPropSet;
int nEvtFlags; // flags for event types allowed to be launched
@ -82,63 +80,55 @@ protected:
virtual void SetDefaultValues();
virtual void GetCurrentValues();
::com::sun::star::uno::Sequence< OUString > &
css::uno::Sequence< OUString > &
GetPropNames() { return aPropNames; }
::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > &
css::uno::Reference<
css::beans::XPropertySet > &
GetPropSet() { return xPropSet; }
void AddPropNames( const char *pNewNames[], sal_Int32 nCount );
virtual bool propertyChange_Impl(
const ::com::sun::star::beans::PropertyChangeEvent& rEvt );
virtual bool propertyChange_Impl( const css::beans::PropertyChangeEvent& rEvt );
public:
PropertyChgHelper(
const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface > &rxSource,
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XLinguProperties > &rxPropSet,
const css::uno::Reference< css::uno::XInterface > &rxSource,
css::uno::Reference< css::linguistic2::XLinguProperties > &rxPropSet,
int nAllowedEvents );
virtual ~PropertyChgHelper();
virtual void SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals );
virtual void SetTmpPropVals( const css::beans::PropertyValues &rPropVals );
// XEventListener
virtual void SAL_CALL
disposing( const ::com::sun::star::lang::EventObject& rSource )
throw(::com::sun::star::uno::RuntimeException, std::exception) override;
disposing( const css::lang::EventObject& rSource )
throw(css::uno::RuntimeException, std::exception) override;
// XPropertyChangeListener
virtual void SAL_CALL
propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvt )
throw(::com::sun::star::uno::RuntimeException, std::exception) override;
propertyChange( const css::beans::PropertyChangeEvent& rEvt )
throw(css::uno::RuntimeException, std::exception) override;
// XLinguServiceEventBroadcaster
virtual sal_Bool SAL_CALL
addLinguServiceEventListener(
const ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
throw(::com::sun::star::uno::RuntimeException, std::exception) override;
const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& rxListener )
throw(css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL
removeLinguServiceEventListener(
const ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
throw(::com::sun::star::uno::RuntimeException, std::exception) override;
const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& rxListener )
throw(css::uno::RuntimeException, std::exception) override;
// non-UNO functions
void LNG_DLLPUBLIC AddAsPropListener();
void LNG_DLLPUBLIC RemoveAsPropListener();
void LaunchEvent(
const ::com::sun::star::linguistic2::LinguServiceEvent& rEvt );
void LaunchEvent( const css::linguistic2::LinguServiceEvent& rEvt );
const ::com::sun::star::uno::Sequence< OUString > &
const css::uno::Sequence< OUString > &
GetPropNames() const { return aPropNames; }
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > &
const css::uno::Reference< css::beans::XPropertySet > &
GetPropSet() const { return xPropSet; }
const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface > &
const css::uno::Reference< css::uno::XInterface > &
GetEvtObj() const { return xMyEvtObj; }
};
@ -151,22 +141,20 @@ class PropertyHelper_Thes :
public:
PropertyHelper_Thes(
const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface > &rxSource,
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XLinguProperties > &rxPropSet );
const css::uno::Reference< css::uno::XInterface > &rxSource,
css::uno::Reference< css::linguistic2::XLinguProperties > &rxPropSet );
virtual ~PropertyHelper_Thes();
// XPropertyChangeListener
virtual void SAL_CALL
propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvt )
throw(::com::sun::star::uno::RuntimeException, std::exception) override;
propertyChange( const css::beans::PropertyChangeEvent& rEvt )
throw(css::uno::RuntimeException, std::exception) override;
};
class LNG_DLLPUBLIC PropertyHelper_Thesaurus
{
PropertyHelper_Thes* pInst;
com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener > xPropHelper;
css::uno::Reference< css::beans::XPropertyChangeListener > xPropHelper;
// disallow use of copy-constructor and assignment-operator
PropertyHelper_Thesaurus( const PropertyHelper_Thes & );
@ -174,14 +162,12 @@ class LNG_DLLPUBLIC PropertyHelper_Thesaurus
public:
PropertyHelper_Thesaurus(
const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface > &rxSource,
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XLinguProperties > &rxPropSet );
const css::uno::Reference< css::uno::XInterface > &rxSource,
css::uno::Reference< css::linguistic2::XLinguProperties > &rxPropSet );
~PropertyHelper_Thesaurus();
void AddAsPropListener();
void RemoveAsPropListener();
void SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals );
void SetTmpPropVals( const css::beans::PropertyValues &rPropVals );
};
@ -207,22 +193,20 @@ protected:
virtual void SetDefaultValues() override;
virtual void GetCurrentValues() override;
virtual bool propertyChange_Impl(
const ::com::sun::star::beans::PropertyChangeEvent& rEvt ) override;
const css::beans::PropertyChangeEvent& rEvt ) override;
public:
PropertyHelper_Spell(
const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface > &rxSource,
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XLinguProperties > &rxPropSet );
const css::uno::Reference< css::uno::XInterface > &rxSource,
css::uno::Reference< css::linguistic2::XLinguProperties > &rxPropSet );
virtual ~PropertyHelper_Spell();
virtual void SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals ) override;
virtual void SetTmpPropVals( const css::beans::PropertyValues &rPropVals ) override;
// XPropertyChangeListener
virtual void SAL_CALL
propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvt )
throw(::com::sun::star::uno::RuntimeException, std::exception) override;
propertyChange( const css::beans::PropertyChangeEvent& rEvt )
throw(css::uno::RuntimeException, std::exception) override;
static sal_Int16 GetDefaultNumberOfSuggestions() { return 16; }
@ -235,7 +219,7 @@ public:
class LNG_DLLPUBLIC PropertyHelper_Spelling
{
PropertyHelper_Spell* pInst;
com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener > xPropHelper;
css::uno::Reference< css::beans::XPropertyChangeListener > xPropHelper;
// disallow use of copy-constructor and assignment-operator
PropertyHelper_Spelling( const PropertyHelper_Spell & );
@ -243,26 +227,22 @@ class LNG_DLLPUBLIC PropertyHelper_Spelling
public:
PropertyHelper_Spelling(
const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface > &rxSource,
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XLinguProperties > &rxPropSet );
const css::uno::Reference< css::uno::XInterface > &rxSource,
css::uno::Reference< css::linguistic2::XLinguProperties > &rxPropSet );
~PropertyHelper_Spelling();
void AddAsPropListener();
void RemoveAsPropListener();
void SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals );
void SetTmpPropVals( const css::beans::PropertyValues &rPropVals );
bool IsSpellUpperCase() const;
bool IsSpellWithDigits() const;
bool IsSpellCapitalization() const;
bool addLinguServiceEventListener(
const ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
throw(::com::sun::star::uno::RuntimeException);
const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& rxListener )
throw(css::uno::RuntimeException);
bool removeLinguServiceEventListener(
const ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
throw(::com::sun::star::uno::RuntimeException);
const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& rxListener )
throw(css::uno::RuntimeException);
};
@ -287,22 +267,20 @@ protected:
virtual void SetDefaultValues() override;
virtual void GetCurrentValues() override;
virtual bool propertyChange_Impl(
const ::com::sun::star::beans::PropertyChangeEvent& rEvt ) override;
const css::beans::PropertyChangeEvent& rEvt ) override;
public:
PropertyHelper_Hyphen(
const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface > &rxSource,
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XLinguProperties > &rxPropSet);
const css::uno::Reference< css::uno::XInterface > &rxSource,
css::uno::Reference< css::linguistic2::XLinguProperties > &rxPropSet);
virtual ~PropertyHelper_Hyphen();
virtual void SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals ) override;
virtual void SetTmpPropVals( const css::beans::PropertyValues &rPropVals ) override;
// XPropertyChangeListener
virtual void SAL_CALL
propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvt )
throw(::com::sun::star::uno::RuntimeException, std::exception) override;
propertyChange( const css::beans::PropertyChangeEvent& rEvt )
throw(css::uno::RuntimeException, std::exception) override;
sal_Int16 GetMinLeading() const { return nResHyphMinLeading; }
sal_Int16 GetMinTrailing() const { return nResHyphMinTrailing; }
@ -312,7 +290,7 @@ public:
class LNG_DLLPUBLIC PropertyHelper_Hyphenation
{
PropertyHelper_Hyphen* pInst;
com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener > xPropHelper;
css::uno::Reference< css::beans::XPropertyChangeListener > xPropHelper;
// disallow use of copy-constructor and assignment-operator
PropertyHelper_Hyphenation( const PropertyHelper_Hyphen & );
@ -320,26 +298,22 @@ class LNG_DLLPUBLIC PropertyHelper_Hyphenation
public:
PropertyHelper_Hyphenation(
const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface > &rxSource,
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XLinguProperties > &rxPropSet);
const css::uno::Reference< css::uno::XInterface > &rxSource,
css::uno::Reference< css::linguistic2::XLinguProperties > &rxPropSet);
~PropertyHelper_Hyphenation();
void AddAsPropListener();
void RemoveAsPropListener();
void SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals );
void SetTmpPropVals( const css::beans::PropertyValues &rPropVals );
sal_Int16 GetMinLeading() const;
sal_Int16 GetMinTrailing() const;
sal_Int16 GetMinWordLength() const;
bool addLinguServiceEventListener(
const ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
throw(::com::sun::star::uno::RuntimeException);
const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& rxListener )
throw(css::uno::RuntimeException);
bool removeLinguServiceEventListener(
const ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
throw(::com::sun::star::uno::RuntimeException);
const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& rxListener )
throw(css::uno::RuntimeException);
};
} // namespace linguistic

60
include/linguistic/misc.hxx
View File

@ -88,13 +88,13 @@ sal_Int32 LevDistance( const OUString &rTxt1, const OUString &rTxt2 );
Linguistic specific handling of an empty locale denoting LANGUAGE_NONE.
Does not resolve empty locale as system locale.
*/
LNG_DLLPUBLIC LanguageType LinguLocaleToLanguage( const ::com::sun::star::lang::Locale& rLocale );
LNG_DLLPUBLIC LanguageType LinguLocaleToLanguage( const css::lang::Locale& rLocale );
/** Convert LanguageType to Locale for legacy handling.
Linguistic specific handling of LANGUAGE_NONE resulting in an empty locale.
Avoid use!
*/
LNG_DLLPUBLIC ::com::sun::star::lang::Locale LinguLanguageToLocale( LanguageType nLanguage );
LNG_DLLPUBLIC css::lang::Locale LinguLanguageToLocale( LanguageType nLanguage );
/** Checks if a LanguageType is one of the values that denote absence of
language or undetermined language or multiple languages, in short all
@ -106,9 +106,8 @@ LNG_DLLPUBLIC bool LinguIsUnspecified( LanguageType nLanguage );
tag string instead. */
LNG_DLLPUBLIC bool LinguIsUnspecified( const OUString & rBcp47 );
::com::sun::star::uno::Sequence< sal_Int16 >
LocaleSeqToLangSeq( ::com::sun::star::uno::Sequence<
::com::sun::star::lang::Locale > &rLocaleSeq );
css::uno::Sequence< sal_Int16 >
LocaleSeqToLangSeq( css::uno::Sequence< css::lang::Locale > &rLocaleSeq );
// checks if file pointed to by rURL is readonly
// and may also check return if such a file exists or not
@ -119,7 +118,7 @@ bool FileExists( const OUString &rURL );
OUString GetDictionaryWriteablePath();
::com::sun::star::uno::Sequence< OUString > GetDictionaryPaths();
css::uno::Sequence< OUString > GetDictionaryPaths();
/// @returns an URL for a new and writable dictionary rDicName.
/// The URL will point to the path given by 'GetDictionaryWriteablePath'
@ -127,11 +126,10 @@ LNG_DLLPUBLIC OUString GetWritableDictionaryURL( const OUString &rDicName );
LNG_DLLPUBLIC sal_Int32 GetPosInWordToCheck( const OUString &rTxt, sal_Int32 nPos );
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XHyphenatedWord >
RebuildHyphensAndControlChars( const OUString &rOrigWord,
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XHyphenatedWord > &rxHyphWord );
css::uno::Reference< css::linguistic2::XHyphenatedWord >
RebuildHyphensAndControlChars(
const OUString &rOrigWord,
css::uno::Reference< css::linguistic2::XHyphenatedWord > &rxHyphWord );
LNG_DLLPUBLIC bool IsUpper( const OUString &rText, sal_Int32 nPos, sal_Int32 nLen, sal_Int16 nLanguage );
@ -144,46 +142,40 @@ LNG_DLLPUBLIC bool HasDigits( const OUString &rText );
LNG_DLLPUBLIC bool IsNumeric( const OUString &rText );
LNG_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLinguProperties > GetLinguProperties();
::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSearchableDictionaryList > GetDictionaryList();
::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > GetIgnoreAllList();
LNG_DLLPUBLIC css::uno::Reference< css::linguistic2::XLinguProperties > GetLinguProperties();
css::uno::Reference< css::linguistic2::XSearchableDictionaryList > GetDictionaryList();
css::uno::Reference< css::linguistic2::XDictionary > GetIgnoreAllList();
bool IsUseDicList( const ::com::sun::star::beans::PropertyValues &rProperties,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > &rxPropSet );
bool IsUseDicList( const css::beans::PropertyValues &rProperties,
const css::uno::Reference< css::beans::XPropertySet > &rxPropSet );
bool IsIgnoreControlChars( const ::com::sun::star::beans::PropertyValues &rProperties,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > &rxPropSet );
bool IsIgnoreControlChars( const css::beans::PropertyValues &rProperties,
const css::uno::Reference< css::beans::XPropertySet > &rxPropSet );
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XDictionaryEntry >
css::uno::Reference<
css::linguistic2::XDictionaryEntry >
SearchDicList(
const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSearchableDictionaryList >& rDicList,
const css::uno::Reference< css::linguistic2::XSearchableDictionaryList >& rDicList,
const OUString& rWord, sal_Int16 nLanguage,
bool bSearchPosDics, bool bSearchSpellEntry );
LNG_DLLPUBLIC DictionaryError AddEntryToDic(
::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > &rxDic,
css::uno::Reference< css::linguistic2::XDictionary > &rxDic,
const OUString &rWord, bool bIsNeg,
const OUString &rRplcTxt, sal_Int16 nRplcLang,
bool bStripDot = true );
LNG_DLLPUBLIC bool SaveDictionaries( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSearchableDictionaryList > &xDicList );
LNG_DLLPUBLIC bool SaveDictionaries( const css::uno::Reference< css::linguistic2::XSearchableDictionaryList > &xDicList );
// AppExitLstnr:
// virtual base class that calls it AtExit function when the application
// (ie the Desktop) is about to terminate
class AppExitListener :
public cppu::WeakImplHelper
<
::com::sun::star::frame::XTerminateListener
>
public cppu::WeakImplHelper< css::frame::XTerminateListener >
{
::com::sun::star::uno::Reference<
::com::sun::star::frame::XDesktop2 > xDesktop;
css::uno::Reference< css::frame::XDesktop2 > xDesktop;
public:
AppExitListener();
@ -195,11 +187,11 @@ public:
void Deactivate();
// XEventListener
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override;
// XTerminateListener
virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL queryTermination( const css::lang::EventObject& aEvent ) throw(css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL notifyTermination( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override;
};
} // namespace linguistic

50
include/linguistic/spelldta.hxx
View File

@ -38,64 +38,62 @@ namespace com { namespace sun { namespace star {
namespace linguistic
{
::com::sun::star::uno::Sequence< OUString >
css::uno::Sequence< OUString >
MergeProposalSeqs(
::com::sun::star::uno::Sequence< OUString > &rAlt1,
::com::sun::star::uno::Sequence< OUString > &rAlt2,
css::uno::Sequence< OUString > &rAlt1,
css::uno::Sequence< OUString > &rAlt2,
bool bAllowDuplicates );
void SeqRemoveNegEntries(
::com::sun::star::uno::Sequence< OUString > &rSeq,
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XSearchableDictionaryList > &rxDicList,
css::uno::Sequence< OUString > &rSeq,
css::uno::Reference< css::linguistic2::XSearchableDictionaryList > &rxDicList,
sal_Int16 nLanguage );
bool SeqHasEntry(
const ::com::sun::star::uno::Sequence< OUString > &rSeq,
const css::uno::Sequence< OUString > &rSeq,
const OUString &rTxt);
void SearchSimilarText( const OUString &rText, sal_Int16 nLanguage,
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XSearchableDictionaryList > &xDicList,
css::uno::Reference< css::linguistic2::XSearchableDictionaryList > &xDicList,
std::vector< OUString > & rDicListProps );
class SpellAlternatives
: public cppu::WeakImplHelper
<
::com::sun::star::linguistic2::XSpellAlternatives,
::com::sun::star::linguistic2::XSetSpellAlternatives
css::linguistic2::XSpellAlternatives,
css::linguistic2::XSetSpellAlternatives
>
, private ::boost::noncopyable
{
::com::sun::star::uno::Sequence< OUString > aAlt; // list of alternatives, may be empty.
OUString aWord;
sal_Int16 nType; // type of failure
sal_Int16 nLanguage;
css::uno::Sequence< OUString > aAlt; // list of alternatives, may be empty.
OUString aWord;
sal_Int16 nType; // type of failure
sal_Int16 nLanguage;
public:
LNG_DLLPUBLIC SpellAlternatives();
SpellAlternatives(const OUString &rWord, sal_Int16 nLang, sal_Int16 nFailureType,
const ::com::sun::star::uno::Sequence< OUString > &rAlternatives );
const css::uno::Sequence< OUString > &rAlternatives );
virtual ~SpellAlternatives();
// XSpellAlternatives
virtual OUString SAL_CALL getWord( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::sal_Int16 SAL_CALL getFailureType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::sal_Int16 SAL_CALL getAlternativesCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAlternatives( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getWord( ) throw (css::uno::RuntimeException, std::exception) override;
virtual css::lang::Locale SAL_CALL getLocale( ) throw (css::uno::RuntimeException, std::exception) override;
virtual ::sal_Int16 SAL_CALL getFailureType( ) throw (css::uno::RuntimeException, std::exception) override;
virtual ::sal_Int16 SAL_CALL getAlternativesCount( ) throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< OUString > SAL_CALL getAlternatives( ) throw (css::uno::RuntimeException, std::exception) override;
// XSetSpellAlternatives
virtual void SAL_CALL setAlternatives( const ::com::sun::star::uno::Sequence< OUString >& aAlternatives ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setFailureType( ::sal_Int16 nFailureType ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setAlternatives( const css::uno::Sequence< OUString >& aAlternatives ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setFailureType( ::sal_Int16 nFailureType ) throw (css::uno::RuntimeException, std::exception) override;
// non-interface specific functions
void LNG_DLLPUBLIC SetWordLanguage(const OUString &rWord, sal_Int16 nLang);
void LNG_DLLPUBLIC SetFailureType(sal_Int16 nTypeP);
void LNG_DLLPUBLIC SetAlternatives( const ::com::sun::star::uno::Sequence< OUString > &rAlt );
static com::sun::star::uno::Reference < com::sun::star::linguistic2::XSpellAlternatives > LNG_DLLPUBLIC CreateSpellAlternatives(
const OUString &rWord, sal_Int16 nLang, sal_Int16 nTypeP, const ::com::sun::star::uno::Sequence< OUString > &rAlt );
void LNG_DLLPUBLIC SetAlternatives( const css::uno::Sequence< OUString > &rAlt );
static css::uno::Reference < css::linguistic2::XSpellAlternatives > LNG_DLLPUBLIC CreateSpellAlternatives(
const OUString &rWord, sal_Int16 nLang, sal_Int16 nTypeP, const css::uno::Sequence< OUString > &rAlt );
};
} // namespace linguistic

8
include/oox/core/binarycodec.hxx
View File

@ -82,7 +82,7 @@ public:
The sequence contains the necessary data to initialize
the codec.
*/
bool initCodec( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aData );
bool initCodec( const css::uno::Sequence< css::beans::NamedValue >& aData );
/** Retrieves the encryption data
@ -90,7 +90,7 @@ public:
The sequence contains the necessary data to initialize
the codec.
*/
::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > getEncryptionData();
css::uno::Sequence< css::beans::NamedValue > getEncryptionData();
/** Verifies the validity of the password using the passed key and hash.
@ -192,7 +192,7 @@ public:
The sequence contains the necessary data to initialize
the codec.
*/
bool initCodec( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aData );
bool initCodec( const css::uno::Sequence< css::beans::NamedValue >& aData );
/** Retrieves the encryption data
@ -200,7 +200,7 @@ public:
The sequence contains the necessary data to initialize
the codec.
*/
::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > getEncryptionData();
css::uno::Sequence< css::beans::NamedValue > getEncryptionData();
/** Initializes the algorithm with the specified password and document ID.

18
include/oox/core/contexthandler.hxx
View File

@ -48,7 +48,7 @@ typedef ::rtl::Reference< ContextHandler > ContextHandlerRef;
struct FragmentBaseData;
typedef std::shared_ptr< FragmentBaseData > FragmentBaseDataRef;
typedef ::cppu::WeakImplHelper< ::com::sun::star::xml::sax::XFastContextHandler > ContextHandler_BASE;
typedef ::cppu::WeakImplHelper< css::xml::sax::XFastContextHandler > ContextHandler_BASE;
class OOX_DLLPUBLIC ContextHandler : public ContextHandler_BASE
{
@ -73,13 +73,13 @@ public:
// com.sun.star.xml.sax.XFastContextHandler interface ---------------------
virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL characters( const OUString& aChars ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
// record context interface -----------------------------------------------
@ -91,7 +91,7 @@ protected:
/** Helper constructor for the FragmentHandler. */
explicit ContextHandler( const FragmentBaseDataRef& rxBaseData );
void implSetLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& rxLocator );
void implSetLocator( const css::uno::Reference< css::xml::sax::XLocator >& rxLocator );
#ifdef _MSC_VER
ContextHandler() {} // workaround

28
include/oox/core/contexthandler2.hxx
View File

@ -164,15 +164,15 @@ public:
protected:
/** Must be called from createFastChildContext() in derived classes. */
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler >
css::uno::Reference< css::xml::sax::XFastContextHandler >
implCreateChildContext(
sal_Int32 nElement,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs );
const css::uno::Reference< css::xml::sax::XFastAttributeList >& rxAttribs );
/** Must be called from startFastElement() in derived classes. */
void implStartElement(
sal_Int32 nElement,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs );
const css::uno::Reference< css::xml::sax::XFastAttributeList >& rxAttribs );
/** Must be called from characters() in derived classes. */
void implCharacters( const OUString& rChars );
@ -219,26 +219,26 @@ public:
// com.sun.star.xml.sax.XFastContextHandler interface ---------------------
virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL
virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
createFastChildContext(
sal_Int32 nElement,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs )
throw( ::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeException, std::exception ) final override;
const css::uno::Reference< css::xml::sax::XFastAttributeList >& rxAttribs )
throw( css::xml::sax::SAXException,
css::uno::RuntimeException, std::exception ) final override;
virtual void SAL_CALL startFastElement(
sal_Int32 nElement,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs )
throw( ::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeException, std::exception ) final override;
const css::uno::Reference< css::xml::sax::XFastAttributeList >& rxAttribs )
throw( css::xml::sax::SAXException,
css::uno::RuntimeException, std::exception ) final override;
virtual void SAL_CALL characters( const OUString& rChars )
throw( ::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeException, std::exception ) final override;
throw( css::xml::sax::SAXException,
css::uno::RuntimeException, std::exception ) final override;
virtual void SAL_CALL endFastElement( sal_Int32 nElement )
throw( ::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeException, std::exception ) final override;
throw( css::xml::sax::SAXException,
css::uno::RuntimeException, std::exception ) final override;
// oox.core.ContextHandler interface --------------------------------------

28
include/oox/core/fastparser.hxx
View File

@ -44,51 +44,51 @@ class FastParser
{
public:
explicit FastParser(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext )
throw( ::com::sun::star::uno::RuntimeException );
const css::uno::Reference< css::uno::XComponentContext >& rxContext )
throw( css::uno::RuntimeException );
virtual ~FastParser();
/** Registers an OOXML namespace at the parser. */
void registerNamespace( sal_Int32 nNamespaceId )
throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
throw( css::lang::IllegalArgumentException, css::uno::RuntimeException );
/** Sets the passed document handler that will receive the SAX parser events. */
void setDocumentHandler(
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastDocumentHandler >& rxDocHandler )
throw( ::com::sun::star::uno::RuntimeException );
const css::uno::Reference< css::xml::sax::XFastDocumentHandler >& rxDocHandler )
throw( css::uno::RuntimeException );
/** Parses the passed SAX input source.
@param bCloseStream True = closes the stream in the input source after parsing. */
void parseStream( const ::com::sun::star::xml::sax::InputSource& rInputSource, bool bCloseStream = false )
throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException );
void parseStream( const css::xml::sax::InputSource& rInputSource, bool bCloseStream = false )
throw( css::xml::sax::SAXException, css::io::IOException, css::uno::RuntimeException );
/** Parses the passed input stream.
@param bCloseStream True = closes the passed stream after parsing. */
void parseStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStream,
const css::uno::Reference< css::io::XInputStream >& rxInStream,
const OUString& rStreamName, bool bCloseStream = false )
throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException );
throw( css::xml::sax::SAXException, css::io::IOException, css::uno::RuntimeException );
/** Parses a stream from the passed storage with the specified name.
@param bCloseStream True = closes the stream after parsing. */
void parseStream( StorageBase& rStorage, const OUString& rStreamName, bool bCloseStream = false )
throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException );
throw( css::xml::sax::SAXException, css::io::IOException, css::uno::RuntimeException );
OUString getNamespaceURL( const OUString& rPrefix )
throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
throw( css::lang::IllegalArgumentException, css::uno::RuntimeException );
bool hasNamespaceURL( const OUString& rPrefix ) const;
sal_Int32 getNamespaceId( const OUString& aUrl );
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastTokenHandler >
css::uno::Reference< css::xml::sax::XFastTokenHandler >
getTokenHandler() const { return mxTokenHandler; }
private:
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastParser >
css::uno::Reference< css::xml::sax::XFastParser >
mxParser;
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastTokenHandler >
css::uno::Reference< css::xml::sax::XFastTokenHandler >
mxTokenHandler;
const NamespaceMap& mrNamespaceMap;

14
include/oox/core/fasttokenhandler.hxx
View File

@ -37,8 +37,8 @@ namespace core {
that provides access to the tokens generated from the internal token name list.
*/
class OOX_DLLPUBLIC FastTokenHandler :
public ::cppu::WeakImplHelper< ::com::sun::star::lang::XServiceInfo,
::com::sun::star::xml::sax::XFastTokenHandler >,
public ::cppu::WeakImplHelper< css::lang::XServiceInfo,
css::xml::sax::XFastTokenHandler >,
public sax_fastparser::FastTokenHandlerBase
{
public:
@ -46,13 +46,13 @@ public:
virtual ~FastTokenHandler();
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
// XFastTokenHandler
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 nToken ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual sal_Int32 SAL_CALL getTokenFromUTF8( const ::com::sun::star::uno::Sequence< sal_Int8 >& Identifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 nToken ) throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Int32 SAL_CALL getTokenFromUTF8( const css::uno::Sequence< sal_Int8 >& Identifier ) throw (css::uno::RuntimeException, std::exception) override;
// Much faster direct C++ shortcut to the method that matters
virtual sal_Int32 getTokenDirect( const char *pToken, sal_Int32 nLength ) const override;

72
include/oox/core/filterbase.hxx
View File

@ -81,19 +81,19 @@ enum OoxmlVersion
struct FilterBaseImpl;
typedef ::cppu::WeakImplHelper<
::com::sun::star::lang::XServiceInfo,
::com::sun::star::lang::XInitialization,
::com::sun::star::document::XImporter,
::com::sun::star::document::XExporter,
::com::sun::star::document::XFilter >
css::lang::XServiceInfo,
css::lang::XInitialization,
css::document::XImporter,
css::document::XExporter,
css::document::XFilter >
FilterBase_BASE;
class OOX_DLLPUBLIC FilterBase : public FilterBase_BASE, public ::cppu::BaseMutex
{
public:
explicit FilterBase(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext )
throw( ::com::sun::star::uno::RuntimeException );
const css::uno::Reference< css::uno::XComponentContext >& rxContext )
throw( css::uno::RuntimeException );
virtual ~FilterBase();
@ -113,27 +113,27 @@ public:
/** Returns the component context passed in the filter constructor (always existing). */
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&
const css::uno::Reference< css::uno::XComponentContext >&
getComponentContext() const;
/** Returns the document model (always existing). */
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >&
const css::uno::Reference< css::frame::XModel >&
getModel() const;
/** Returns the service factory provided by the document model (always existing). */
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&
const css::uno::Reference< css::lang::XMultiServiceFactory >&
getModelFactory() const;
/** Returns the frame that will contain the document model (may be null). */
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >&
const css::uno::Reference< css::frame::XFrame >&
getTargetFrame() const;
/// Returns the parent shape to load into (if any)
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >&
const css::uno::Reference< css::drawing::XShape >&
getParentShape() const;
/** Returns the status indicator (may be null). */
const ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator >&
const css::uno::Reference< css::task::XStatusIndicator >&
getStatusIndicator() const;
/** Returns the FilterData */
@ -159,7 +159,7 @@ public:
access has been enabled in the storage, the base stream can be
accessed by passing an empty string as stream name.
*/
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
css::uno::Reference< css::io::XInputStream >
openInputStream( const OUString& rStreamName ) const;
/** Opens and returns the specified output stream from the base storage.
@ -170,7 +170,7 @@ public:
access has been enabled in the storage, the base stream can be
accessed by passing an empty string as stream name.
*/
::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
css::uno::Reference< css::io::XOutputStream >
openOutputStream( const OUString& rStreamName ) const;
/** Commits changes to base storage (and substorages) */
@ -199,11 +199,11 @@ public:
virtual sal_Bool SAL_CALL
supportsService( const OUString& rServiceName )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
throw( css::uno::RuntimeException, std::exception ) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
throw( css::uno::RuntimeException, std::exception ) override;
// com.sun.star.lang.XInitialization interface ----------------------------
@ -218,49 +218,49 @@ public:
filter implementations may support different arguments.
*/
virtual void SAL_CALL initialize(
const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rArgs )
throw( ::com::sun::star::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) override;
const css::uno::Sequence< css::uno::Any >& rArgs )
throw( css::uno::Exception,
css::uno::RuntimeException, std::exception ) override;
// com.sun.star.document.XImporter interface ------------------------------
virtual void SAL_CALL setTargetDocument(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& rxDocument )
throw( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException, std::exception ) override;
const css::uno::Reference< css::lang::XComponent >& rxDocument )
throw( css::lang::IllegalArgumentException,
css::uno::RuntimeException, std::exception ) override;
// com.sun.star.document.XExporter interface ------------------------------
virtual void SAL_CALL setSourceDocument(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& rxDocument )
throw( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException, std::exception ) override;
const css::uno::Reference< css::lang::XComponent >& rxDocument )
throw( css::lang::IllegalArgumentException,
css::uno::RuntimeException, std::exception ) override;
// com.sun.star.document.XFilter interface --------------------------------
virtual sal_Bool SAL_CALL filter(
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescSeq )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescSeq )
throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL cancel()
throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
throw( css::uno::RuntimeException, std::exception ) override;
bool exportVBA() const;
protected:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
virtual css::uno::Reference< css::io::XInputStream >
implGetInputStream( utl::MediaDescriptor& rMediaDesc ) const;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >
virtual css::uno::Reference< css::io::XStream >
implGetOutputStream( utl::MediaDescriptor& rMediaDesc ) const;
virtual bool implFinalizeExport( utl::MediaDescriptor& rMediaDescriptor );
::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >
css::uno::Reference< css::io::XStream >
getMainDocumentStream( ) const;
private:
void setMediaDescriptor(
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescSeq );
const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescSeq );
/** Derived classes may create a specialized graphic helper, e.g. for
resolving palette colors. */
@ -270,9 +270,9 @@ private:
virtual ::oox::ole::VbaProject* implCreateVbaProject() const = 0;
virtual StorageRef implCreateStorage(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStream ) const = 0;
const css::uno::Reference< css::io::XInputStream >& rxInStream ) const = 0;
virtual StorageRef implCreateStorage(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& rxOutStream ) const = 0;
const css::uno::Reference< css::io::XStream >& rxOutStream ) const = 0;
private:
std::unique_ptr< FilterBaseImpl > mxImpl;

50
include/oox/core/filterdetect.hxx
View File

@ -46,25 +46,25 @@ namespace core {
It takes a reference to the filter string object via its constructor, and
puts the name of the detected filter to it, if it successfully finds one.
*/
class FilterDetectDocHandler : public ::cppu::WeakImplHelper< ::com::sun::star::xml::sax::XFastDocumentHandler >
class FilterDetectDocHandler : public ::cppu::WeakImplHelper< css::xml::sax::XFastDocumentHandler >
{
public:
explicit FilterDetectDocHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, OUString& rFilter );
explicit FilterDetectDocHandler( const css::uno::Reference< css::uno::XComponentContext >& rxContext, OUString& rFilter );
virtual ~FilterDetectDocHandler();
// XFastDocumentHandler
virtual void SAL_CALL startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL startDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL endDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
// XFastContextHandler
virtual void SAL_CALL startFastElement( sal_Int32 nElement, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL endFastElement( sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Reference< XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Reference< XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL startFastElement( sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL endFastElement( sal_Int32 Element ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual css::uno::Reference< XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual css::uno::Reference< XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL characters( const OUString& aChars ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
private:
void parseRelationship( const AttributeList& rAttribs );
@ -76,19 +76,19 @@ private:
private:
typedef ::std::vector< sal_Int32 > ContextVector;
OUString& mrFilterName;
OUString& mrFilterName;
ContextVector maContextStack;
OUString maTargetPath;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;
OUString maTargetPath;
css::uno::Reference< css::uno::XComponentContext > mxContext;
};
class OOX_DLLPUBLIC FilterDetect : public ::cppu::WeakImplHelper< ::com::sun::star::document::XExtendedFilterDetection, ::com::sun::star::lang::XServiceInfo >
class OOX_DLLPUBLIC FilterDetect : public ::cppu::WeakImplHelper< css::document::XExtendedFilterDetection, css::lang::XServiceInfo >
{
public:
explicit FilterDetect( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext )
throw( ::com::sun::star::uno::RuntimeException );
explicit FilterDetect( const css::uno::Reference< css::uno::XComponentContext >& rxContext )
throw( css::uno::RuntimeException );
virtual ~FilterDetect();
/** Tries to extract an unencrypted ZIP package from the passed media
@ -114,14 +114,14 @@ public:
is stored in the property 'ComponentData' of the media descriptor and
its input stream is returned.
*/
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
css::uno::Reference< css::io::XInputStream >
extractUnencryptedPackage( utl::MediaDescriptor& rMediaDesc ) const;
// com.sun.star.lang.XServiceInfo interface -------------------------------
virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
// com.sun.star.document.XExtendedFilterDetection interface ---------------
@ -142,11 +142,11 @@ public:
property of the passed media descriptor.
*/
virtual OUString SAL_CALL
detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescSeq )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
detect( css::uno::Sequence< css::beans::PropertyValue >& rMediaDescSeq )
throw( css::uno::RuntimeException, std::exception ) override;
private:
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;
css::uno::Reference< css::uno::XComponentContext > mxContext;
};

30
include/oox/core/fragmenthandler.hxx
View File

@ -43,8 +43,8 @@ namespace core {
struct FragmentBaseData
{
XmlFilterBase& mrFilter;
const OUString maFragmentPath;
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >
const OUString maFragmentPath;
css::uno::Reference< css::xml::sax::XLocator >
mxLocator;
RelationsRef mxRelations;
@ -74,7 +74,7 @@ struct RecordInfo
typedef ::cppu::ImplInheritanceHelper< ContextHandler, ::com::sun::star::xml::sax::XFastDocumentHandler > FragmentHandler_BASE;
typedef ::cppu::ImplInheritanceHelper< ContextHandler, css::xml::sax::XFastDocumentHandler > FragmentHandler_BASE;
class OOX_DLLPUBLIC FragmentHandler : public FragmentHandler_BASE
{
@ -83,30 +83,30 @@ public:
virtual ~FragmentHandler();
/** Returns the com.sun.star.xml.sax.XFastContextHandler interface of this context. */
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler >
css::uno::Reference< css::xml::sax::XFastContextHandler >
getFastContextHandler() { return static_cast< ContextHandler* >( this ); }
// com.sun.star.xml.sax.XFastDocumentHandler interface --------------------
virtual void SAL_CALL startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& rxLocator ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL startDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL endDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& rxLocator ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
// com.sun.star.xml.sax.XFastContextHandler interface ---------------------
virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL characters( const OUString& aChars ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
// XML stream handling ----------------------------------------------------
/** Opens the fragment stream referred by the own fragment path. Derived
classes may provide specilized stream implementations. */
virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
virtual css::uno::Reference< css::io::XInputStream >
openFragmentStream() const;
// binary records ---------------------------------------------------------

30
include/oox/core/fragmenthandler2.hxx
View File

@ -57,36 +57,36 @@ public:
// com.sun.star.xml.sax.XFastContextHandler interface ---------------------
virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL
virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
createFastChildContext(
sal_Int32 nElement,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs )
throw( ::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeException, std::exception ) final override;
const css::uno::Reference< css::xml::sax::XFastAttributeList >& rxAttribs )
throw( css::xml::sax::SAXException,
css::uno::RuntimeException, std::exception ) final override;
virtual void SAL_CALL startFastElement(
sal_Int32 nElement,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs )
throw( ::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeException, std::exception ) final override;
const css::uno::Reference< css::xml::sax::XFastAttributeList >& rxAttribs )
throw( css::xml::sax::SAXException,
css::uno::RuntimeException, std::exception ) final override;
virtual void SAL_CALL characters( const OUString& rChars )
throw( ::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeException, std::exception ) final override;
throw( css::xml::sax::SAXException,
css::uno::RuntimeException, std::exception ) final override;
virtual void SAL_CALL endFastElement( sal_Int32 nElement )
throw( ::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeException, std::exception ) final override;
throw( css::xml::sax::SAXException,
css::uno::RuntimeException, std::exception ) final override;
// com.sun.star.xml.sax.XFastDocumentHandler interface --------------------
virtual void SAL_CALL startDocument()
throw( ::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeException, std::exception ) override;
throw( css::xml::sax::SAXException,
css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL endDocument()
throw( ::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeException, std::exception ) override;
throw( css::xml::sax::SAXException,
css::uno::RuntimeException, std::exception ) override;
// oox.core.ContextHandler interface --------------------------------------

6
include/oox/core/recordparser.hxx
View File

@ -53,9 +53,9 @@ public:
void setFragmentHandler( const ::rtl::Reference< FragmentHandler >& rxHandler );
void parseStream( const RecordInputSource& rInputSource )
throw( ::com::sun::star::xml::sax::SAXException,
::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException );
throw( css::xml::sax::SAXException,
css::io::IOException,
css::uno::RuntimeException );
const RecordInputSource& getInputSource() const { return maSource; }

6
include/oox/core/relationshandler.hxx
View File

@ -34,11 +34,11 @@ public:
XmlFilterBase& rFilter,
RelationsRef xRelations );
virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL
virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
createFastChildContext(
sal_Int32 nElement,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs )
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
const css::uno::Reference< css::xml::sax::XFastAttributeList >& rxAttribs )
throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
private:
RelationsRef mxRelations;

32
include/oox/core/xmlfilterbase.hxx
View File

@ -62,9 +62,9 @@ class FragmentHandler;
class FastParser;
struct TextField {
com::sun::star::uno::Reference< com::sun::star::text::XText > xText;
com::sun::star::uno::Reference< com::sun::star::text::XTextCursor > xTextCursor;
com::sun::star::uno::Reference< com::sun::star::text::XTextField > xTextField;
css::uno::Reference< css::text::XText > xText;
css::uno::Reference< css::text::XTextCursor > xTextCursor;
css::uno::Reference< css::text::XTextField > xTextField;
};
typedef std::vector< TextField > TextFieldStack;
@ -74,8 +74,8 @@ class OOX_DLLPUBLIC XmlFilterBase : public FilterBase
{
public:
explicit XmlFilterBase(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext )
throw( ::com::sun::star::uno::RuntimeException );
const css::uno::Reference< css::uno::XComponentContext >& rxContext )
throw( css::uno::RuntimeException );
virtual ~XmlFilterBase();
@ -115,8 +115,7 @@ public:
@return a non-empty reference to the XDocument, if the
fragment could be imported.
*/
::com::sun::star::uno::Reference<
::com::sun::star::xml::dom::XDocument> importFragment( const OUString& rFragmentPath );
css::uno::Reference< css::xml::dom::XDocument> importFragment( const OUString& rFragmentPath );
/** Imports a fragment from an xml::dom::XDocument using the
passed fragment handler
@ -130,8 +129,7 @@ public:
@return true, if the fragment could be imported.
*/
bool importFragment( const ::rtl::Reference< FragmentHandler >& rxHandler,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XFastSAXSerializable >& rxSerializer );
const css::uno::Reference< css::xml::sax::XFastSAXSerializable >& rxSerializer );
/** Imports the relations fragment associated with the specified fragment.
@ -164,7 +162,7 @@ public:
@return Added relation Id.
*/
OUString addRelation( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rOutputStream, const OUString& rType, const OUString& rTarget, bool bExternal = false );
OUString addRelation( const css::uno::Reference< css::io::XOutputStream >& rOutputStream, const OUString& rType, const OUString& rTarget, bool bExternal = false );
/** Returns a stack of used textfields, used by the pptx importer to replace links to slidepages with the real page name */
TextFieldStack& getTextFieldStack() const;
@ -183,7 +181,7 @@ public:
@return The opened output stream.
*/
::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
css::uno::Reference< css::io::XOutputStream >
openFragmentStream(
const OUString& rStreamName,
const OUString& rMediaType );
@ -220,7 +218,7 @@ public:
@return *this
*/
XmlFilterBase& exportDocumentProperties( ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties > xProperties );
XmlFilterBase& exportDocumentProperties( css::uno::Reference< css::document::XDocumentProperties > xProperties );
OUString getNamespaceURL( const OUString& rPrefix );
@ -235,22 +233,22 @@ public:
bool isMSO2007Document() const;
void checkDocumentProperties(
com::sun::star::uno::Reference<com::sun::star::document::XDocumentProperties> xDocProps);
css::uno::Reference<css::document::XDocumentProperties> xDocProps);
protected:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
virtual css::uno::Reference< css::io::XInputStream >
implGetInputStream( utl::MediaDescriptor& rMediaDesc ) const override;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >
virtual css::uno::Reference< css::io::XStream >
implGetOutputStream( utl::MediaDescriptor& rMediaDesc ) const override;
virtual bool implFinalizeExport( utl::MediaDescriptor& rMediaDescriptor ) override;
private:
virtual StorageRef implCreateStorage(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStream ) const override;
const css::uno::Reference< css::io::XInputStream >& rxInStream ) const override;
virtual StorageRef implCreateStorage(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& rxOutStream ) const override;
const css::uno::Reference< css::io::XStream >& rxOutStream ) const override;
private:
::std::unique_ptr< XmlFilterBaseImpl > mxImpl;

12
include/oox/crypto/DocumentDecryption.hxx
View File

@ -34,7 +34,7 @@ namespace core {
class OOX_DLLPUBLIC DocumentDecryption
{
private:
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext;
css::uno::Reference< css::uno::XComponentContext > mxContext;
enum CryptoType
{
@ -44,22 +44,22 @@ private:
};
oox::ole::OleStorage& mrOleStorage;
std::unique_ptr<CryptoEngine> mEngine;
std::unique_ptr<CryptoEngine> mEngine;
CryptoType mCryptoType;
bool readAgileEncryptionInfo( com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& rStream );
bool readAgileEncryptionInfo( css::uno::Reference< css::io::XInputStream >& rStream );
bool readStandard2007EncryptionInfo( BinaryInputStream& rStream );
public:
DocumentDecryption(
oox::ole::OleStorage& rOleStorage,
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext);
css::uno::Reference< css::uno::XComponentContext > xContext);
bool decrypt(com::sun::star::uno::Reference< com::sun::star::io::XStream > xDocumentStream);
bool decrypt(css::uno::Reference< css::io::XStream > xDocumentStream);
bool readEncryptionInfo();
bool generateEncryptionKey(const OUString& rPassword);
com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > createEncryptionData(const OUString& rPassword);
css::uno::Sequence< css::beans::NamedValue > createEncryptionData(const OUString& rPassword);
};

4
include/oox/crypto/DocumentEncryption.hxx
View File

@ -31,7 +31,7 @@ namespace core {
class OOX_DLLPUBLIC DocumentEncryption
{
private:
com::sun::star::uno::Reference< com::sun::star::io::XStream > mxDocumentStream;
css::uno::Reference< css::io::XStream > mxDocumentStream;
oox::ole::OleStorage& mrOleStorage;
OUString maPassword;
@ -39,7 +39,7 @@ private:
public:
DocumentEncryption(
com::sun::star::uno::Reference< com::sun::star::io::XStream > xDocumentStream,
css::uno::Reference< css::io::XStream > xDocumentStream,
oox::ole::OleStorage& rOleStorage,
const OUString& aPassword);

10
include/oox/drawingml/chart/chartconverter.hxx
View File

@ -71,15 +71,15 @@ public:
void convertFromModel(
::oox::core::XmlFilterBase& rFilter,
ChartSpaceModel& rChartModel,
const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& rxChartDoc,
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxExternalPage,
const ::com::sun::star::awt::Point& rChartPos,
const ::com::sun::star::awt::Size& rChartSize );
const css::uno::Reference< css::chart2::XChartDocument >& rxChartDoc,
const css::uno::Reference< css::drawing::XShapes >& rxExternalPage,
const css::awt::Point& rChartPos,
const css::awt::Size& rChartSize );
/** Creates an internal data provider. Derived classes may override this
function to create an external data provider. */
virtual void createDataProvider(
const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& rxChartDoc );
const css::uno::Reference< css::chart2::XChartDocument >& rxChartDoc );
/** Creates a data sequence from a formula. Dummy implementation. Derived
classes have to override this function to actually parse the formula. */

2
include/oox/drawingml/chart/datasourcemodel.hxx
View File

@ -31,7 +31,7 @@ namespace chart {
struct DataSequenceModel
{
typedef ::std::map< sal_Int32, ::com::sun::star::uno::Any > AnyMap;
typedef ::std::map< sal_Int32, css::uno::Any > AnyMap;
AnyMap maData; /// Map of values, indexed by point identifier.
OUString maFormula; /// Formula reference, e.g. into a spreadsheet.

4
include/oox/drawingml/color.hxx
View File

@ -97,7 +97,7 @@ public:
/** Returns the scheme name from the a:schemeClr element for interoperability purposes */
OUString getSchemeName() const { return msSchemeName; }
/** Returns the unaltered list of transformations for interoperability purposes */
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > getTransformations() const { return maInteropTransformations;}
css::uno::Sequence< css::beans::PropertyValue > getTransformations() const { return maInteropTransformations;}
/** Translates between color transformation tokens and their names */
static OUString getColorTransformationName( sal_Int32 nElement );
@ -146,7 +146,7 @@ private:
sal_Int32 mnAlpha; /// Alpha value (color opacity).
OUString msSchemeName; /// Scheme name from the a:schemeClr element for interoperability purposes
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
css::uno::Sequence< css::beans::PropertyValue >
maInteropTransformations; /// Unaltered list of transformations for interoperability purposes
};

16
include/oox/drawingml/drawingmltypes.hxx
View File

@ -89,14 +89,14 @@ typedef std::shared_ptr< TableProperties > TablePropertiesPtr;
/** converts the attributes from an CT_TLPoint into an awt Point with 1/1000% */
com::sun::star::awt::Point GetPointPercent( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs );
css::awt::Point GetPointPercent( const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs );
/** converts the attributes from an CT_Size2D into an awt Size with 1/100th mm */
com::sun::star::awt::Size GetSize2D( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes );
css::awt::Size GetSize2D( const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttributes );
/** converts the attributes from a CT_RelativeRect to an IntegerRectangle2D */
com::sun::star::geometry::IntegerRectangle2D GetRelativeRect( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes );
css::geometry::IntegerRectangle2D GetRelativeRect( const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttributes );
/** converts EMUs into 1/100th mmm */
sal_Int32 GetCoordinate( sal_Int32 nValue );
@ -118,7 +118,7 @@ sal_Int32 GetTextSpacingPoint( const OUString& sValue );
sal_Int32 GetTextSpacingPoint( const sal_Int32 nValue );
/** */
::com::sun::star::style::TabAlign GetTabAlign( ::sal_Int32 aToken );
css::style::TabAlign GetTabAlign( ::sal_Int32 aToken );
float GetFontHeight( sal_Int32 nHeight );
@ -132,13 +132,13 @@ sal_Int16 GetCaseMap( sal_Int32 nToken );
sal_Int16 GetParaAdjust( sal_Int32 nAlign );
// Converts vertical adjust tokens to a TextVerticalAdjust item
::com::sun::star::drawing::TextVerticalAdjust GetTextVerticalAdjust( sal_Int32 nToken );
css::drawing::TextVerticalAdjust GetTextVerticalAdjust( sal_Int32 nToken );
// Converts a TextVerticalAdjust item to string value appearing in ooxml
OOX_DLLPUBLIC const char* GetTextVerticalAdjust( ::com::sun::star::drawing::TextVerticalAdjust eAdjust );
OOX_DLLPUBLIC const char* GetTextVerticalAdjust( css::drawing::TextVerticalAdjust eAdjust );
// Converts a Hatch object to an ooxml pattern.
const char* GetHatchPattern( const ::com::sun::star::drawing::Hatch& rHatch );
const char* GetHatchPattern( const css::drawing::Hatch& rHatch );
@ -149,7 +149,7 @@ struct IndexRange {
};
/** retrieve the content of CT_IndexRange */
IndexRange GetIndexRange( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes );
IndexRange GetIndexRange( const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttributes );

24
include/oox/drawingml/fillproperties.hxx
View File

@ -41,8 +41,8 @@ struct GradientFillProperties
typedef ::std::map< double, Color > GradientStopMap;
GradientStopMap maGradientStops; /// Gradient stops (colors/transparence).
OptValue< ::com::sun::star::geometry::IntegerRectangle2D > moFillToRect;
OptValue< ::com::sun::star::geometry::IntegerRectangle2D > moTileRect;
OptValue< css::geometry::IntegerRectangle2D > moFillToRect;
OptValue< css::geometry::IntegerRectangle2D > moTileRect;
OptValue< sal_Int32 > moGradientPath; /// If set, gradient follows rectangle, circle, or shape.
OptValue< sal_Int32 > moShadeAngle; /// Rotation angle of linear gradients.
OptValue< sal_Int32 > moShadeFlip; /// Flip mode of gradient, if not stretched to shape.
@ -88,27 +88,27 @@ struct ArtisticEffectProperties
struct BlipFillProperties
{
::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >
mxGraphic; /// The fill graphic.
css::uno::Reference< css::graphic::XGraphic >
mxGraphic; /// The fill graphic.
OptValue< sal_Int32 > moBitmapMode; /// Bitmap tile or stretch.
OptValue< ::com::sun::star::geometry::IntegerRectangle2D >
moFillRect; /// Stretch fill offsets.
OptValue< ::com::sun::star::geometry::IntegerRectangle2D >
moClipRect;
OptValue< css::geometry::IntegerRectangle2D >
moFillRect; /// Stretch fill offsets.
OptValue< css::geometry::IntegerRectangle2D >
moClipRect;
OptValue< sal_Int32 > moTileOffsetX; /// Width of bitmap tiles (EMUs).
OptValue< sal_Int32 > moTileOffsetY; /// Height of bitmap tiles (EMUs).
OptValue< sal_Int32 > moTileScaleX; /// Horizontal scaling of bitmap tiles (1/1000 percent).
OptValue< sal_Int32 > moTileScaleY; /// Vertical scaling of bitmap tiles (1/1000 percent).
OptValue< sal_Int32 > moTileAlign; /// Anchor point inside bitmap.
OptValue< sal_Int32 > moTileFlip; /// Flip mode of bitmap tiles.
OptValue< bool > moRotateWithShape; /// True = rotate bitmap with shape.
OptValue< bool > moRotateWithShape; /// True = rotate bitmap with shape.
// effects
OptValue< sal_Int32 > moColorEffect; /// XML token for a color effect.
OptValue< sal_Int32 > moBrightness; /// Brightness in the range [-100000,100000].
OptValue< sal_Int32 > moContrast; /// Contrast in the range [-100000,100000].
Color maColorChangeFrom; /// Start color of color transformation.
Color maColorChangeTo; /// Destination color of color transformation.
Color maDuotoneColors[2]; /// Duotone Colors
Color maColorChangeFrom; /// Start color of color transformation.
Color maColorChangeTo; /// Destination color of color transformation.
Color maDuotoneColors[2]; /// Duotone Colors
ArtisticEffectProperties maEffect; /// Artistic effect, not supported by core.

4
include/oox/drawingml/lineproperties.hxx
View File

@ -62,9 +62,9 @@ struct OOX_DLLPUBLIC LineProperties
sal_Int32 nPhClr = API_RGB_TRANSPARENT ) const;
/** Calculates the line style attribute from the internal state of the object */
::com::sun::star::drawing::LineStyle getLineStyle() const;
css::drawing::LineStyle getLineStyle() const;
/** Calculates the line joint attribute from the internal state of the object */
::com::sun::star::drawing::LineJoint getLineJoint() const;
css::drawing::LineJoint getLineJoint() const;
/** Calculates the line width attribute from the internal state of the object */
sal_Int32 getLineWidth() const;
};

80
include/oox/drawingml/shape.hxx
View File

@ -103,14 +103,14 @@ public:
EffectProperties& getEffectProperties() { return *mpEffectPropertiesPtr; }
void setChildPosition( com::sun::star::awt::Point nPosition ){ maChPosition = nPosition; }
void setChildSize( com::sun::star::awt::Size aSize ){ maChSize = aSize; }
void setChildPosition( css::awt::Point nPosition ){ maChPosition = nPosition; }
void setChildSize( css::awt::Size aSize ){ maChSize = aSize; }
void setPosition( com::sun::star::awt::Point nPosition ){ maPosition = nPosition; }
const com::sun::star::awt::Point& getPosition() const { return maPosition; }
void setPosition( css::awt::Point nPosition ){ maPosition = nPosition; }
const css::awt::Point& getPosition() const { return maPosition; }
void setSize( com::sun::star::awt::Size aSize ){ maSize = aSize; }
const com::sun::star::awt::Size& getSize() const { return maSize; }
void setSize( css::awt::Size aSize ){ maSize = aSize; }
const css::awt::Size& getSize() const { return maSize; }
void setRotation( sal_Int32 nRotation ) { mnRotation = nRotation; }
void setFlip( bool bFlipH, bool bFlipV ) { mbFlipH = bFlipH; mbFlipV = bFlipV; }
@ -149,23 +149,23 @@ public:
void addShape(
::oox::core::XmlFilterBase& rFilterBase,
const Theme* pTheme,
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
const css::uno::Reference< css::drawing::XShapes >& rxShapes,
const basegfx::B2DHomMatrix& aTransformation,
FillProperties& rShapeOrParentShapeFillProps,
const ::com::sun::star::awt::Rectangle* pShapeRect = 0,
const css::awt::Rectangle* pShapeRect = 0,
ShapeIdMap* pShapeMap = 0 );
void addChildren(
::oox::core::XmlFilterBase& rFilterBase,
const Theme* pTheme,
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
const css::uno::Reference< css::drawing::XShapes >& rxShapes,
basegfx::B2DHomMatrix& aTransformation,
const ::com::sun::star::awt::Rectangle* pShapeRect = 0,
const css::awt::Rectangle* pShapeRect = 0,
ShapeIdMap* pShapeMap = 0 );
void setXShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rXShape )
void setXShape( const css::uno::Reference< css::drawing::XShape >& rXShape )
{ mxShape = rXShape; };
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > &
const css::uno::Reference< css::drawing::XShape > &
getXShape() const { return mxShape; }
virtual void applyShapeReference( const Shape& rReferencedShape, bool bUseText = true );
@ -180,10 +180,10 @@ public:
void setWps(bool bWps);
bool getWps() { return mbWps;}
void setTextBox(bool bTextBox);
const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> &
const css::uno::Sequence<css::beans::PropertyValue> &
getDiagramDoms() { return maDiagramDoms; }
void setDiagramDoms(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rDiagramDoms) { maDiagramDoms = rDiagramDoms; }
com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::uno::Any > >resolveRelationshipsOfTypeFromOfficeDoc(
void setDiagramDoms(const css::uno::Sequence<css::beans::PropertyValue>& rDiagramDoms) { maDiagramDoms = rDiagramDoms; }
css::uno::Sequence< css::uno::Sequence< css::uno::Any > >resolveRelationshipsOfTypeFromOfficeDoc(
core::XmlFilterBase& rFilter, const OUString& sFragment, const OUString& sType );
void setLinkedTxbxAttributes(const LinkedTxbxAttr& rhs){ maLinkedTxbxAttr = rhs; };
void setTxbxHasLinkedTxtBox( const bool rhs){ mbHasLinkedTxbx = rhs; };
@ -192,13 +192,13 @@ public:
protected:
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
css::uno::Reference< css::drawing::XShape >
createAndInsert(
::oox::core::XmlFilterBase& rFilterBase,
const OUString& rServiceName,
const Theme* pTheme,
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
const ::com::sun::star::awt::Rectangle* pShapeRect,
const css::uno::Reference< css::drawing::XShapes >& rxShapes,
const css::awt::Rectangle* pShapeRect,
bool bClearText,
bool bDoNotInsertEmptyTextBody,
basegfx::B2DHomMatrix& aTransformation,
@ -209,35 +209,35 @@ protected:
::oox::core::XmlFilterBase& rFilterBase,
Shape& rMaster,
const Theme* pTheme,
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
const ::com::sun::star::awt::Rectangle& rClientRect,
const css::uno::Reference< css::drawing::XShapes >& rxShapes,
const css::awt::Rectangle& rClientRect,
ShapeIdMap* pShapeMap,
const basegfx::B2DHomMatrix& aTransformation );
void keepDiagramCompatibilityInfo( ::oox::core::XmlFilterBase& rFilterBase );
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
css::uno::Reference< css::drawing::XShape >
renderDiagramToGraphic( ::oox::core::XmlFilterBase& rFilterBase );
OUString finalizeServiceName(
::oox::core::XmlFilterBase& rFilter,
const OUString& rServiceName,
const ::com::sun::star::awt::Rectangle& rShapeRect );
const css::awt::Rectangle& rShapeRect );
virtual void finalizeXShape(
::oox::core::XmlFilterBase& rFilter,
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes );
const css::uno::Reference< css::drawing::XShapes >& rxShapes );
void putPropertyToGrabBag(
const OUString& sPropertyName, const ::com::sun::star::uno::Any& aPropertyValue );
const OUString& sPropertyName, const css::uno::Any& aPropertyValue );
void putPropertyToGrabBag(
const ::com::sun::star::beans::PropertyValue& pProperty );
const css::beans::PropertyValue& pProperty );
void putPropertiesToGrabBag(
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProperties );
const css::uno::Sequence< css::beans::PropertyValue >& aProperties );
std::vector< ShapePtr > maChildren; // only used for group shapes
com::sun::star::awt::Size maChSize; // only used for group shapes
com::sun::star::awt::Point maChPosition; // only used for group shapes
css::awt::Size maChSize; // only used for group shapes
css::awt::Point maChPosition; // only used for group shapes
bool mbIsChild;
TextBodyPtr mpTextBody;
@ -254,20 +254,20 @@ protected:
PropertyMap maShapeProperties;
PropertyMap maDefaultShapeProperties;
TextListStylePtr mpMasterTextListStyle;
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxShape;
css::uno::Reference< css::drawing::XShape > mxShape;
OUString msServiceName;
OUString msName;
OUString msId;
sal_Int32 mnSubType; // if this type is not zero, then the shape is a placeholder
OptValue< sal_Int32 > moSubTypeIndex;
OUString msServiceName;
OUString msName;
OUString msId;
sal_Int32 mnSubType; // if this type is not zero, then the shape is a placeholder
OptValue< sal_Int32 > moSubTypeIndex;
ShapeStyleRefMap maShapeStyleRefs;
ShapeStyleRefMap maShapeStyleRefs;
com::sun::star::awt::Size maSize;
com::sun::star::awt::Point maPosition;
::std::vector<OUString> maExtDrawings;
Color maFontRefColorForNodes;
css::awt::Size maSize;
css::awt::Point maPosition;
::std::vector<OUString> maExtDrawings;
Color maFontRefColorForNodes;
private:
enum FrameType
@ -299,7 +299,7 @@ private:
LinkedTxbxAttr maLinkedTxbxAttr;
bool mbHasLinkedTxbx; // this text box has linked text box ?
com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> maDiagramDoms;
css::uno::Sequence<css::beans::PropertyValue> maDiagramDoms;
};
} }

20
include/oox/drawingml/shapepropertymap.hxx
View File

@ -109,33 +109,33 @@ public:
bool hasNamedLineMarkerInTable( const OUString& rMarkerName ) const;
/** Sets the specified shape property to the passed value. */
bool setAnyProperty( ShapePropertyId ePropId, const ::com::sun::star::uno::Any& rValue );
bool setAnyProperty( ShapePropertyId ePropId, const css::uno::Any& rValue );
/** Sets the specified shape property to the passed value. */
template< typename Type >
bool setProperty( ShapePropertyId ePropId, const Type& rValue )
{ return setAnyProperty( ePropId, ::com::sun::star::uno::Any( rValue ) ); }
{ return setAnyProperty( ePropId, css::uno::Any( rValue ) ); }
using PropertyMap::setAnyProperty;
using PropertyMap::setProperty;
private:
/** Sets an explicit line marker, or creates a named line marker. */
bool setLineMarker( sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue );
bool setLineMarker( sal_Int32 nPropId, const css::uno::Any& rValue );
/** Sets an explicit line dash, or creates a named line dash. */
bool setLineDash( sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue );
bool setLineDash( sal_Int32 nPropId, const css::uno::Any& rValue );
/** Sets an explicit fill gradient, or creates a named fill gradient. */
bool setFillGradient( sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue );
bool setFillGradient( sal_Int32 nPropId, const css::uno::Any& rValue );
/** Creates a named transparency gradient. */
bool setGradientTrans( sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue );
bool setGradientTrans( sal_Int32 nPropId, const css::uno::Any& rValue );
/** Sets an explicit fill bitmap URL, or creates a named fill bitmap URL. */
bool setFillBitmapUrl( sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue );
bool setFillBitmapUrl( sal_Int32 nPropId, const css::uno::Any& rValue );
/** Sets an explicit fill bitmap URL and pushes the name to FillBitmapName */
bool setFillBitmapNameFromUrl( sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue );
bool setFillBitmapNameFromUrl( sal_Int32 nPropId, const css::uno::Any& rValue );
// not implemented, to prevent implicit conversion from enum to int
::com::sun::star::uno::Any& operator[]( ShapePropertyId ePropId );
const ::com::sun::star::uno::Any& operator[]( ShapePropertyId ePropId ) const;
css::uno::Any& operator[]( ShapePropertyId ePropId );
const css::uno::Any& operator[]( ShapePropertyId ePropId ) const;
private:
ModelObjectHelper& mrModelObjHelper;

8
include/oox/drawingml/theme.hxx
View File

@ -85,11 +85,10 @@ public:
Shape& getTxDef() { return maTxDef; }
const Shape& getTxDef() const { return maTxDef; }
void setFragment( const ::com::sun::star::uno::Reference<
::com::sun::star::xml::dom::XDocument>& xRef ) { mxFragment=xRef; }
void setFragment( const css::uno::Reference< css::xml::dom::XDocument>& xRef ) { mxFragment=xRef; }
private:
OUString maStyleName;
OUString maStyleName;
ClrScheme maClrScheme;
FillStyleList maFillStyleList;
FillStyleList maBgFillStyleList;
@ -99,8 +98,7 @@ private:
Shape maSpDef;
Shape maLnDef;
Shape maTxDef;
::com::sun::star::uno::Reference<
::com::sun::star::xml::dom::XDocument> mxFragment;
css::uno::Reference< css::xml::dom::XDocument> mxFragment;
};

58
include/oox/dump/dumperbase.hxx
View File

@ -111,27 +111,27 @@ public:
// input streams ----------------------------------------------------------
static ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
static css::uno::Reference< css::io::XInputStream >
openInputStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const OUString& rFileName );
// output streams ---------------------------------------------------------
static ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
static css::uno::Reference< css::io::XOutputStream >
openOutputStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const OUString& rFileName );
static ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextOutputStream2 >
static css::uno::Reference< css::io::XTextOutputStream2 >
openTextOutputStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rxOutStrm,
const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const css::uno::Reference< css::io::XOutputStream >& rxOutStrm,
rtl_TextEncoding eTextEnc );
static ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextOutputStream2 >
static css::uno::Reference< css::io::XTextOutputStream2 >
openTextOutputStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const OUString& rFileName,
rtl_TextEncoding eTextEnc );
};
@ -146,7 +146,7 @@ public:
/*implicit*/ BinaryInputStreamRef( BinaryInputStream* pInStrm ) :
::oox::BinaryInputStreamRef( pInStrm ) {}
/*implicit*/ BinaryInputStreamRef( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm ) :
/*implicit*/ BinaryInputStreamRef( const css::uno::Reference< css::io::XInputStream >& rxInStrm ) :
::oox::BinaryInputStreamRef( new BinaryXInputStream( rxInStrm, true ) ) {}
template< typename StreamType >
@ -829,18 +829,18 @@ class SharedConfigData : public Base, public ConfigItemBase
public:
explicit SharedConfigData(
const OUString& rFileName,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const StorageRef& rxRootStrg,
const OUString& rSysFileName );
virtual ~SharedConfigData();
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& getContext() const { return mxContext; }
const css::uno::Reference< css::uno::XComponentContext >& getContext() const { return mxContext; }
const StorageRef& getRootStorage() const { return mxRootStrg; }
const OUString& getSysFileName() const { return maSysFileName; }
void setOption( const OUString& rKey, const OUString& rData );
const OUString* getOption( const OUString& rKey ) const;
const OUString* getOption( const OUString& rKey ) const;
template< typename ListType >
std::shared_ptr< ListType > createNameList( const OUString& rListName );
@ -869,13 +869,13 @@ private:
typedef ::std::map< OUString, OUString > ConfigDataMap;
typedef ::std::map< OUString, NameListRef > NameListMap;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;
css::uno::Reference< css::uno::XComponentContext > mxContext;
StorageRef mxRootStrg;
OUString maSysFileName;
OUString maSysFileName;
ConfigFileSet maConfigFiles;
ConfigDataMap maConfigData;
NameListMap maNameLists;
OUString maConfigPath;
OUString maConfigPath;
bool mbLoaded;
bool mbPwCancelled;
};
@ -913,13 +913,13 @@ public:
const ::oox::core::FilterBase& rFilter );
explicit Config(
const sal_Char* pcEnvVar,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const StorageRef& rxRootStrg,
const OUString& rSysFileName );
virtual ~Config();
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& getContext() const { return mxCfgData->getContext(); }
const css::uno::Reference< css::uno::XComponentContext >& getContext() const { return mxCfgData->getContext(); }
const StorageRef& getRootStorage() const { return mxCfgData->getRootStorage(); }
const OUString& getSysFileName() const { return mxCfgData->getSysFileName(); }
@ -953,7 +953,7 @@ protected:
const ::oox::core::FilterBase& rFilter );
void construct(
const sal_Char* pcEnvVar,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const StorageRef& rxRootStrg,
const OUString& rSysFileName );
@ -1006,7 +1006,7 @@ class Output : public Base
{
public:
explicit Output(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const OUString& rFileName );
@ -1038,7 +1038,7 @@ public:
void writeString( const OUString& rStr );
void writeArray( const sal_uInt8* pnData, sal_Size nSize, sal_Unicode cSep = OOX_DUMP_LISTSEP );
void writeBool( bool bData );
void writeDateTime( const ::com::sun::star::util::DateTime& rDateTime );
void writeDateTime( const css::util::DateTime& rDateTime );
template< typename Type >
void writeDec( Type nData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' )
@ -1072,10 +1072,10 @@ private:
private:
typedef ::std::vector< sal_Int32 > StringLenVec;
::com::sun::star::uno::Reference< ::com::sun::star::io::XTextOutputStream2 > mxStrm;
OUString maIndent;
OUStringBuffer maLine;
OUString maLastItem;
css::uno::Reference< css::io::XTextOutputStream2 > mxStrm;
OUString maIndent;
OUStringBuffer maLine;
OUString maLastItem;
StringLenVec maColPos;
size_t mnCol;
size_t mnItemLevel;
@ -1184,7 +1184,7 @@ class ObjectBase : public Base
public:
virtual ~ObjectBase();
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&
const css::uno::Reference< css::uno::XComponentContext >&
getContext() const { return mxConfig->getContext(); }
void dump();
@ -1226,7 +1226,7 @@ protected:
virtual void implDump() override;
virtual void implDumpStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm,
const css::uno::Reference< css::io::XInputStream >& rxStrm,
const OUString& rStrgPath,
const OUString& rStrmName,
const OUString& rSysFileName );
@ -1307,7 +1307,7 @@ protected:
void writeCharItem( const String& rName, sal_Unicode cData );
void writeStringItem( const String& rName, const OUString& rData );
void writeArrayItem( const String& rName, const sal_uInt8* pnData, sal_Size nSize, sal_Unicode cSep = OOX_DUMP_LISTSEP );
void writeDateTimeItem( const String& rName, const ::com::sun::star::util::DateTime& rDateTime );
void writeDateTimeItem( const String& rName, const css::util::DateTime& rDateTime );
void writeGuidItem( const String& rName, const OUString& rGuid );
template< typename Type >
@ -1487,7 +1487,7 @@ protected:
OUString dumpCharArray( const String& rName, sal_Int32 nLen, rtl_TextEncoding eTextEnc, bool bHideTrailingNul = false );
OUString dumpUnicodeArray( const String& rName, sal_Int32 nLen, bool bHideTrailingNul = false );
::com::sun::star::util::DateTime dumpFileTime( const String& rName = EMPTY_STRING );
css::util::DateTime dumpFileTime( const String& rName = EMPTY_STRING );
OUString dumpGuid( const String& rName = EMPTY_STRING );
void dumpItem( const ItemFormat& rItemFmt );

10
include/oox/dump/oledumper.hxx
View File

@ -149,7 +149,7 @@ protected:
void construct( const ObjectBase& rParent, const StorageRef& rxStrg, const OUString& rSysPath );
virtual void implDumpStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm,
const css::uno::Reference< css::io::XInputStream >& rxStrm,
const OUString& rStrgPath,
const OUString& rStrmName,
const OUString& rSysFileName ) override;
@ -726,7 +726,7 @@ public:
protected:
virtual void implDumpStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm,
const css::uno::Reference< css::io::XInputStream >& rxStrm,
const OUString& rStrgPath,
const OUString& rStrmName,
const OUString& rSysFileName ) override;
@ -821,7 +821,7 @@ public:
protected:
virtual void implDumpStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm,
const css::uno::Reference< css::io::XInputStream >& rxStrm,
const OUString& rStrgPath,
const OUString& rStrmName,
const OUString& rSysFileName ) override;
@ -843,7 +843,7 @@ public:
protected:
virtual void implDumpStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm,
const css::uno::Reference< css::io::XInputStream >& rxStrm,
const OUString& rStrgPath,
const OUString& rStrmName,
const OUString& rSysFileName ) override;
@ -861,7 +861,7 @@ public:
protected:
virtual void implDumpStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm,
const css::uno::Reference< css::io::XInputStream >& rxStrm,
const OUString& rStrgPath,
const OUString& rStrmName,
const OUString& rSysFileName ) override;

6
include/oox/dump/pptxdumper.hxx
View File

@ -37,7 +37,7 @@ public:
protected:
virtual void implDumpStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm,
const css::uno::Reference< css::io::XInputStream >& rxStrm,
const OUString& rStrgPath,
const OUString& rStrmName,
const OUString& rSysFileName ) override;
@ -51,8 +51,8 @@ public:
explicit Dumper( const ::oox::core::FilterBase& rFilter );
explicit Dumper(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm,
const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const css::uno::Reference< css::io::XInputStream >& rxInStrm,
const OUString& rSysFileName );
protected:

6
include/oox/dump/xlsbdumper.hxx
View File

@ -63,7 +63,7 @@ public:
protected:
virtual void implDumpStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm,
const css::uno::Reference< css::io::XInputStream >& rxStrm,
const OUString& rStrgPath,
const OUString& rStrmName,
const OUString& rSysFileName ) override;
@ -77,8 +77,8 @@ public:
explicit Dumper( const ::oox::core::FilterBase& rFilter );
explicit Dumper(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm,
const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const css::uno::Reference< css::io::XInputStream >& rxInStrm,
const OUString& rSysFileName );
protected:

96
include/oox/export/drawingml.hxx
View File

@ -98,28 +98,28 @@ private:
DMLTextExport* mpTextExport;
protected:
::com::sun::star::uno::Any mAny;
::sax_fastparser::FSHelperPtr mpFS;
::oox::core::XmlFilterBase* mpFB;
css::uno::Any mAny;
::sax_fastparser::FSHelperPtr mpFS;
::oox::core::XmlFilterBase* mpFB;
/// If set, this is the parent of the currently handled shape.
com::sun::star::uno::Reference<com::sun::star::drawing::XShape> m_xParent;
bool mbIsBackgroundDark;
css::uno::Reference<css::drawing::XShape> m_xParent;
bool mbIsBackgroundDark;
bool GetProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, const OUString& aName );
bool GetPropertyAndState( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet,
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState > rXPropState,
const OUString& aName, ::com::sun::star::beans::PropertyState& eState );
OUString GetFieldValue( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > rRun, bool& bIsURLField );
bool GetProperty( css::uno::Reference< css::beans::XPropertySet > rXPropSet, const OUString& aName );
bool GetPropertyAndState( css::uno::Reference< css::beans::XPropertySet > rXPropSet,
css::uno::Reference< css::beans::XPropertyState > rXPropState,
const OUString& aName, css::beans::PropertyState& eState );
OUString GetFieldValue( css::uno::Reference< css::text::XTextRange > rRun, bool& bIsURLField );
/// If bRelPathToMedia is true add "../" to image folder path while adding the image relationship
OUString WriteImage( const OUString& rURL, bool bRelPathToMedia = false);
void WriteStyleProperties( sal_Int32 nTokenId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProperties );
void WriteStyleProperties( sal_Int32 nTokenId, const css::uno::Sequence< css::beans::PropertyValue >& aProperties );
const char* GetComponentDir();
const char* GetRelationCompPrefix();
static bool EqualGradients( ::com::sun::star::awt::Gradient aGradient1, ::com::sun::star::awt::Gradient aGradient2 );
static bool EqualGradients( css::awt::Gradient aGradient1, css::awt::Gradient aGradient2 );
public:
DrawingML( ::sax_fastparser::FSHelperPtr pFS, ::oox::core::XmlFilterBase* pFB = NULL, DocumentType eDocumentType = DOCUMENT_PPTX, DMLTextExport* pTextExport = 0 )
@ -136,69 +136,69 @@ public:
OUString WriteImage( const Graphic &rGraphic , bool bRelPathToMedia = false);
void WriteColor( sal_uInt32 nColor, sal_Int32 nAlpha = MAX_PERCENT );
void WriteColor( const OUString& sColorSchemeName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aTransformations );
void WriteColorTransformations( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aTransformations );
void WriteColor( const OUString& sColorSchemeName, const css::uno::Sequence< css::beans::PropertyValue >& aTransformations );
void WriteColorTransformations( const css::uno::Sequence< css::beans::PropertyValue >& aTransformations );
void WriteGradientStop( sal_uInt16 nStop, sal_uInt32 nColor );
void WriteLineArrow( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, bool bLineStart );
void WriteLineArrow( css::uno::Reference< css::beans::XPropertySet > rXPropSet, bool bLineStart );
void WriteConnectorConnections( EscherConnectorListEntry& rConnectorEntry, sal_Int32 nStartID, sal_Int32 nEndID );
void WriteSolidFill( sal_uInt32 nColor, sal_Int32 nAlpha = MAX_PERCENT );
void WriteSolidFill( const OUString& sSchemeName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aTransformations );
void WriteSolidFill( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet );
void WriteGradientFill( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet );
void WriteGradientFill( ::com::sun::star::awt::Gradient rGradient );
void WriteGrabBagGradientFill( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aGradientStops, ::com::sun::star::awt::Gradient rGradient);
void WriteSolidFill( const OUString& sSchemeName, const css::uno::Sequence< css::beans::PropertyValue >& aTransformations );
void WriteSolidFill( css::uno::Reference< css::beans::XPropertySet > rXPropSet );
void WriteGradientFill( css::uno::Reference< css::beans::XPropertySet > rXPropSet );
void WriteGradientFill( css::awt::Gradient rGradient );
void WriteGrabBagGradientFill( const css::uno::Sequence< css::beans::PropertyValue >& aGradientStops, css::awt::Gradient rGradient);
void WriteBlipOrNormalFill( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet,
void WriteBlipOrNormalFill( css::uno::Reference< css::beans::XPropertySet > rXPropSet,
const OUString& rURLPropName );
void WriteBlipFill( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet,
void WriteBlipFill( css::uno::Reference< css::beans::XPropertySet > rXPropSet,
const OUString& sBitmapURL, sal_Int32 nXmlNamespace,
bool bWriteMode, bool bRelPathToMedia = false );
void WriteBlipFill( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet,
void WriteBlipFill( css::uno::Reference< css::beans::XPropertySet > rXPropSet,
const OUString& sURLPropName );
void WriteBlipFill( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet,
void WriteBlipFill( css::uno::Reference< css::beans::XPropertySet > rXPropSet,
const OUString& sURLPropName, sal_Int32 nXmlNamespace );
void WritePattFill( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet );
void WriteSrcRect( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >, const OUString& );
void WriteOutline( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet );
void WriteStretch( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, const OUString& rURL );
void WriteLinespacing( ::com::sun::star::style::LineSpacing& rLineSpacing );
void WritePattFill( css::uno::Reference< css::beans::XPropertySet > rXPropSet );
void WriteSrcRect( css::uno::Reference< css::beans::XPropertySet >, const OUString& );
void WriteOutline( css::uno::Reference< css::beans::XPropertySet > rXPropSet );
void WriteStretch( css::uno::Reference< css::beans::XPropertySet > rXPropSet, const OUString& rURL );
void WriteLinespacing( css::style::LineSpacing& rLineSpacing );
OUString WriteBlip( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet,
OUString WriteBlip( css::uno::Reference< css::beans::XPropertySet > rXPropSet,
const OUString& rURL, bool bRelPathToMedia = false , const Graphic *pGraphic=NULL );
void WriteBlipMode( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, const OUString& rURL );
void WriteBlipMode( css::uno::Reference< css::beans::XPropertySet > rXPropSet, const OUString& rURL );
void WriteShapeTransformation( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > rXShape,
void WriteShapeTransformation( css::uno::Reference< css::drawing::XShape > rXShape,
sal_Int32 nXmlNamespace, bool bFlipH = false, bool bFlipV = false, bool bSuppressRotation = false );
void WriteTransformation( const Rectangle& rRectangle,
sal_Int32 nXmlNamespace, bool bFlipH = false, bool bFlipV = false, sal_Int32 nRotation = 0 );
void WriteText( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > rXIface, const OUString& presetWarp, bool bBodyPr = true, bool bText = true, sal_Int32 nXmlNamespace = 0);
void WriteParagraph( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > rParagraph );
void WriteParagraphProperties( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > rParagraph );
void WriteParagraphNumbering( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet,
void WriteText( css::uno::Reference< css::uno::XInterface > rXIface, const OUString& presetWarp, bool bBodyPr = true, bool bText = true, sal_Int32 nXmlNamespace = 0);
void WriteParagraph( css::uno::Reference< css::text::XTextContent > rParagraph );
void WriteParagraphProperties( css::uno::Reference< css::text::XTextContent > rParagraph );
void WriteParagraphNumbering( css::uno::Reference< css::beans::XPropertySet > rXPropSet,
sal_Int16 nLevel );
void WriteRun( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > rRun );
void WriteRunProperties( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rRun, bool bIsField, sal_Int32 nElement = XML_rPr ,bool bCheckDirect = true);
void WriteRun( css::uno::Reference< css::text::XTextRange > rRun );
void WriteRunProperties( css::uno::Reference< css::beans::XPropertySet > rRun, bool bIsField, sal_Int32 nElement = XML_rPr ,bool bCheckDirect = true);
void WritePresetShape( const char* pShape );
void WritePresetShape( const char* pShape, MSO_SPT eShapeType, bool bPredefinedHandlesUsed, sal_Int32 nAdjustmentsWhichNeedsToBeConverted, const ::com::sun::star::beans::PropertyValue& rProp );
void WritePresetShape( const char* pShape, MSO_SPT eShapeType, bool bPredefinedHandlesUsed, sal_Int32 nAdjustmentsWhichNeedsToBeConverted, const css::beans::PropertyValue& rProp );
void WriteCustomGeometry( css::uno::Reference<css::drawing::XShape> rXShape );
void WritePolyPolygon( const tools::PolyPolygon& rPolyPolygon );
void WriteFill( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPropSet );
void WriteShapeStyle( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet );
void WriteShapeEffects( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet );
void WriteFill( css::uno::Reference< css::beans::XPropertySet > xPropSet );
void WriteShapeStyle( css::uno::Reference< css::beans::XPropertySet > rXPropSet );
void WriteShapeEffects( css::uno::Reference< css::beans::XPropertySet > rXPropSet );
void WriteShapeEffect( const OUString& sName, const css::uno::Sequence< css::beans::PropertyValue >& aEffectProps );
void WriteShape3DEffects( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet );
void WriteArtisticEffect( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet );
OString WriteWdpPicture( const OUString& rFileId, const ::com::sun::star::uno::Sequence< sal_Int8 >& rPictureData );
sal_Int32 getBulletMarginIndentation (::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet,sal_Int16 nLevel, const OUString& propName);
void WriteShape3DEffects( css::uno::Reference< css::beans::XPropertySet > rXPropSet );
void WriteArtisticEffect( css::uno::Reference< css::beans::XPropertySet > rXPropSet );
OString WriteWdpPicture( const OUString& rFileId, const css::uno::Sequence< sal_Int8 >& rPictureData );
sal_Int32 getBulletMarginIndentation (css::uno::Reference< css::beans::XPropertySet > rXPropSet,sal_Int16 nLevel, const OUString& propName);
static void ResetCounters();
static OString GetUUID();
static sal_Unicode SubstituteBullet( sal_Unicode cBulletId, ::com::sun::star::awt::FontDescriptor& rFontDesc );
static sal_Unicode SubstituteBullet( sal_Unicode cBulletId, css::awt::FontDescriptor& rFontDesc );
static sal_uInt32 ColorWithIntensity( sal_uInt32 nColor, sal_uInt32 nIntensity );
@ -207,7 +207,7 @@ public:
sax_fastparser::FSHelperPtr CreateOutputStream (
const OUString& sFullStream,
const OUString& sRelativeStream,
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xParentRelation,
const css::uno::Reference< css::io::XOutputStream >& xParentRelation,
const char* sContentType,
const char* sRelationshipType,
OUString* pRelationshipId = NULL );

62
include/oox/export/shapes.hxx
View File

@ -56,7 +56,7 @@ private:
static int mnEmbeddeDocumentCounter;
struct ShapeCheck
{
bool operator()( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>& s1, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>& s2 ) const
bool operator()( const css::uno::Reference< css::drawing::XShape>& s1, const css::uno::Reference< css::drawing::XShape>& s2 ) const
{
return s1 == s2;
}
@ -64,7 +64,7 @@ private:
struct ShapeHash
{
size_t operator()( const ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShape > ) const;
size_t operator()( const css::uno::Reference < css::drawing::XShape > ) const;
};
public:
@ -73,7 +73,7 @@ public:
protected:
sal_Int32 mnShapeIdMax, mnPictureIdMax;
void WriteGraphicObjectShapePart( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape, const Graphic *pGraphic=NULL );
void WriteGraphicObjectShapePart( css::uno::Reference< css::drawing::XShape > xShape, const Graphic *pGraphic=NULL );
private:
sal_Int32 mnXmlNamespace;
@ -81,7 +81,7 @@ private:
MapMode maMapModeSrc, maMapModeDest;
std::shared_ptr<URLTransformer> mpURLTransformer;
::com::sun::star::awt::Size MapSize( const ::com::sun::star::awt::Size& ) const;
css::awt::Size MapSize( const css::awt::Size& ) const;
ShapeHashMap maShapeMap;
ShapeHashMap* mpShapeMap;
@ -94,32 +94,32 @@ public:
void SetURLTranslator(std::shared_ptr<URLTransformer> pTransformer);
static bool NonEmptyText( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xIface );
static bool NonEmptyText( css::uno::Reference< css::uno::XInterface > xIface );
ShapeExport&
WriteBezierShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape, bool bClosed );
WriteBezierShape( css::uno::Reference< css::drawing::XShape > xShape, bool bClosed );
ShapeExport&
WriteClosedBezierShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
WriteClosedBezierShape( css::uno::Reference< css::drawing::XShape > xShape );
ShapeExport&
WriteConnectorShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
WriteConnectorShape( css::uno::Reference< css::drawing::XShape > xShape );
ShapeExport&
WriteCustomShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
WriteCustomShape( css::uno::Reference< css::drawing::XShape > xShape );
ShapeExport&
WriteEllipseShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
WriteEllipseShape( css::uno::Reference< css::drawing::XShape > xShape );
ShapeExport&
WriteGraphicObjectShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
WriteGraphicObjectShape( css::uno::Reference< css::drawing::XShape > xShape );
ShapeExport&
WriteGroupShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
WriteGroupShape( css::uno::Reference< css::drawing::XShape > xShape );
ShapeExport&
WriteLineShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
WriteLineShape( css::uno::Reference< css::drawing::XShape > xShape );
ShapeExport&
WriteNonVisualDrawingProperties( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape, const char* sName );
WriteNonVisualDrawingProperties( css::uno::Reference< css::drawing::XShape > xShape, const char* sName );
virtual ShapeExport&
WriteNonVisualProperties( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
WriteNonVisualProperties( css::uno::Reference< css::drawing::XShape > xShape );
ShapeExport&
WriteOpenBezierShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
WriteOpenBezierShape( css::uno::Reference< css::drawing::XShape > xShape );
ShapeExport&
WriteRectangleShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
WriteRectangleShape( css::uno::Reference< css::drawing::XShape > xShape );
/**
* Write the DrawingML for a particular shape.
@ -158,29 +158,27 @@ public:
* @param xShape The shape to export as DrawingML.
* @return <tt>*this</tt>
*/
ShapeExport&
WriteShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
ShapeExport&
WriteTextBox( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xIface, sal_Int32 nXmlNamespace );
ShapeExport& WriteShape( css::uno::Reference< css::drawing::XShape > xShape );
ShapeExport& WriteTextBox( css::uno::Reference< css::uno::XInterface > xIface, sal_Int32 nXmlNamespace );
virtual ShapeExport&
WriteTextShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
WriteTextShape( css::uno::Reference< css::drawing::XShape > xShape );
ShapeExport&
WriteTableShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
WriteTableShape( css::uno::Reference< css::drawing::XShape > xShape );
ShapeExport&
WriteOLE2Shape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
WriteOLE2Shape( css::uno::Reference< css::drawing::XShape > xShape );
virtual ShapeExport&
WriteUnknownShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
WriteUnknownShape( css::uno::Reference< css::drawing::XShape > xShape );
void WriteTable( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > rXShape );
void WriteTable( css::uno::Reference< css::drawing::XShape > rXShape );
void WriteTableCellProperties(::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet);
void WriteTableCellProperties(css::uno::Reference< css::beans::XPropertySet > rXPropSet);
void WriteTableCellBorders(::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet);
void WriteTableCellBorders(css::uno::Reference< css::beans::XPropertySet > rXPropSet);
sal_Int32 GetNewShapeID( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > rShape );
sal_Int32 GetNewShapeID( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > rShape, ::oox::core::XmlFilterBase* pFB );
sal_Int32 GetShapeID( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > rShape );
static sal_Int32 GetShapeID( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > rShape, ShapeHashMap* pShapeMap );
sal_Int32 GetNewShapeID( const css::uno::Reference< css::drawing::XShape > rShape );
sal_Int32 GetNewShapeID( const css::uno::Reference< css::drawing::XShape > rShape, ::oox::core::XmlFilterBase* pFB );
sal_Int32 GetShapeID( const css::uno::Reference< css::drawing::XShape > rShape );
static sal_Int32 GetShapeID( const css::uno::Reference< css::drawing::XShape > rShape, ShapeHashMap* pShapeMap );
};
}}

10
include/oox/helper/attributelist.hxx
View File

@ -73,10 +73,10 @@ class OOX_DLLPUBLIC AttributeList
{
public:
explicit AttributeList(
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs );
const css::uno::Reference< css::xml::sax::XFastAttributeList >& rxAttribs );
/** Returns the wrapped com.sun.star.xml.sax.XFastAttributeList object. */
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >
css::uno::Reference< css::xml::sax::XFastAttributeList >
getFastAttributeList() const { return mxAttribs; }
/** Returns true, if the specified attribute is present. */
@ -113,7 +113,7 @@ public:
OptValue< bool > getBool( sal_Int32 nAttrToken ) const;
/** Returns the date/time value of the specified attribute. */
OptValue< ::com::sun::star::util::DateTime > getDateTime( sal_Int32 nAttrToken ) const;
OptValue< css::util::DateTime > getDateTime( sal_Int32 nAttrToken ) const;
// defaulted return values ------------------------------------------------
@ -160,10 +160,10 @@ public:
/** Returns the date/time value of the specified attribute, or the default
value if the attribute is missing or not convertible to a date/time value. */
::com::sun::star::util::DateTime getDateTime( sal_Int32 nAttrToken, const ::com::sun::star::util::DateTime& rDefault ) const;
css::util::DateTime getDateTime( sal_Int32 nAttrToken, const css::util::DateTime& rDefault ) const;
private:
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >
css::uno::Reference< css::xml::sax::XFastAttributeList >
mxAttribs;
mutable sax_fastparser::FastAttributeList *mpAttribList;
sax_fastparser::FastAttributeList *getAttribList() const;

4
include/oox/helper/binaryinputstream.hxx
View File

@ -254,7 +254,7 @@ public:
of this wrapper or when close() is called.
*/
explicit BinaryXInputStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm,
const css::uno::Reference< css::io::XInputStream >& rxInStrm,
bool bAutoClose );
virtual ~BinaryXInputStream();
@ -277,7 +277,7 @@ public:
private:
StreamDataSequence maBuffer; ///< Data buffer used in readMemory() function.
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
css::uno::Reference< css::io::XInputStream >
mxInStrm; ///< Reference to the input stream.
bool mbAutoClose; ///< True = automatically close stream on destruction.
};

4
include/oox/helper/binaryoutputstream.hxx
View File

@ -133,7 +133,7 @@ public:
of this wrapper or when close() is called.
*/
explicit BinaryXOutputStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rxOutStrm,
const css::uno::Reference< css::io::XOutputStream >& rxOutStrm,
bool bAutoClose );
virtual ~BinaryXOutputStream();
@ -150,7 +150,7 @@ public:
private:
StreamDataSequence maBuffer; ///< Data buffer used in writeMemory() function.
::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
css::uno::Reference< css::io::XOutputStream >
mxOutStrm; ///< Reference to the output stream.
bool mbAutoClose; ///< True = automatically close stream on destruction.
};

6
include/oox/helper/binarystreambase.hxx
View File

@ -31,7 +31,7 @@ namespace com { namespace sun { namespace star {
namespace oox {
typedef ::com::sun::star::uno::Sequence< sal_Int8 > StreamDataSequence;
typedef css::uno::Sequence< sal_Int8 > StreamDataSequence;
@ -138,10 +138,10 @@ public:
protected:
explicit BinaryXSeekableStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XSeekable >& rxSeekable );
const css::uno::Reference< css::io::XSeekable >& rxSeekable );
private:
::com::sun::star::uno::Reference< ::com::sun::star::io::XSeekable >
css::uno::Reference< css::io::XSeekable >
mxSeekable; ///< Stream seeking interface.
};

26
include/oox/helper/containerhelper.hxx
View File

@ -165,7 +165,7 @@ public:
contained, otherwise a numerical index will be appended.
*/
static OUString getUnusedName(
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& rxNameAccess,
const css::uno::Reference< css::container::XNameAccess >& rxNameAccess,
const OUString& rSuggestedName,
sal_Unicode cSeparator,
sal_Int32 nFirstIndexToAppend = 1 );
@ -182,9 +182,9 @@ public:
@return True = object successfully inserted.
*/
static bool insertByName(
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxNameContainer,
const css::uno::Reference< css::container::XNameContainer >& rxNameContainer,
const OUString& rName,
const ::com::sun::star::uno::Any& rObject,
const css::uno::Any& rObject,
bool bReplaceOldExisting = true );
/** Inserts an object into a name container.
@ -214,10 +214,10 @@ public:
true.
*/
static OUString insertByUnusedName(
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxNameContainer,
const css::uno::Reference< css::container::XNameContainer >& rxNameContainer,
const OUString& rSuggestedName,
sal_Unicode cSeparator,
const ::com::sun::star::uno::Any& rObject,
const css::uno::Any& rObject,
bool bRenameOldExisting = false );
// std::vector and std::map element access --------------------------------
@ -280,7 +280,7 @@ public:
contained in the passed vector.
*/
template< typename VectorType >
static ::com::sun::star::uno::Sequence< typename VectorType::value_type >
static css::uno::Sequence< typename VectorType::value_type >
vectorToSequence( const VectorType& rVector );
/** Creates a UNO sequence of sequences from a matrix with copies of all elements.
@ -292,7 +292,7 @@ public:
contained in the passed matrix.
*/
template< typename MatrixType >
static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< typename MatrixType::value_type > >
static css::uno::Sequence< css::uno::Sequence< typename MatrixType::value_type > >
matrixToSequenceSequence( const MatrixType& rMatrix );
};
@ -351,25 +351,25 @@ template< typename MapType >
}
template< typename VectorType >
/*static*/ ::com::sun::star::uno::Sequence< typename VectorType::value_type > ContainerHelper::vectorToSequence( const VectorType& rVector )
/*static*/ css::uno::Sequence< typename VectorType::value_type > ContainerHelper::vectorToSequence( const VectorType& rVector )
{
typedef typename VectorType::value_type ValueType;
if( rVector.empty() )
return ::com::sun::star::uno::Sequence< ValueType >();
return ::com::sun::star::uno::Sequence< ValueType >( &rVector.front(), static_cast< sal_Int32 >( rVector.size() ) );
return css::uno::Sequence< ValueType >();
return css::uno::Sequence< ValueType >( &rVector.front(), static_cast< sal_Int32 >( rVector.size() ) );
}
template< typename MatrixType >
/*static*/ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< typename MatrixType::value_type > > ContainerHelper::matrixToSequenceSequence( const MatrixType& rMatrix )
/*static*/ css::uno::Sequence< css::uno::Sequence< typename MatrixType::value_type > > ContainerHelper::matrixToSequenceSequence( const MatrixType& rMatrix )
{
typedef typename MatrixType::value_type ValueType;
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ValueType > > aSeq;
css::uno::Sequence< css::uno::Sequence< ValueType > > aSeq;
if( !rMatrix.empty() )
{
aSeq.realloc( static_cast< sal_Int32 >( rMatrix.height() ) );
for( size_t nRow = 0, nHeight = rMatrix.height(); nRow < nHeight; ++nRow )
aSeq[ static_cast< sal_Int32 >( nRow ) ] =
::com::sun::star::uno::Sequence< ValueType >( &rMatrix.row_front( nRow ), static_cast< sal_Int32 >( rMatrix.width() ) );
css::uno::Sequence< ValueType >( &rMatrix.row_front( nRow ), static_cast< sal_Int32 >( rMatrix.width() ) );
}
return aSeq;
}

44
include/oox/helper/graphichelper.hxx
View File

@ -62,8 +62,8 @@ class OOX_DLLPUBLIC GraphicHelper
{
public:
explicit GraphicHelper(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxTargetFrame,
const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const css::uno::Reference< css::frame::XFrame >& rxTargetFrame,
const StorageRef& rxStorage );
virtual ~GraphicHelper();
@ -81,43 +81,43 @@ public:
// Device info and device dependent unit conversion -----------------------
/** Returns information about the output device. */
const ::com::sun::star::awt::DeviceInfo& getDeviceInfo() const { return maDeviceInfo;}
const css::awt::DeviceInfo& getDeviceInfo() const { return maDeviceInfo;}
/** Converts the passed value from horizontal screen pixels to 1/100 mm. */
sal_Int32 convertScreenPixelXToHmm( double fPixelX ) const;
/** Converts the passed value from vertical screen pixels to 1/100 mm. */
sal_Int32 convertScreenPixelYToHmm( double fPixelY ) const;
/** Converts the passed size from screen pixels to 1/100 mm. */
::com::sun::star::awt::Size convertScreenPixelToHmm( const ::com::sun::star::awt::Size& rPixel ) const;
css::awt::Size convertScreenPixelToHmm( const css::awt::Size& rPixel ) const;
/** Converts the passed value from 1/100 mm to horizontal screen pixels. */
double convertHmmToScreenPixelX( sal_Int32 nHmmX ) const;
/** Converts the passed value from 1/100 mm to vertical screen pixels. */
double convertHmmToScreenPixelY( sal_Int32 nHmmY ) const;
/** Converts the passed point from 1/100 mm to screen pixels. */
::com::sun::star::awt::Point convertHmmToScreenPixel( const ::com::sun::star::awt::Point& rHmm ) const;
css::awt::Point convertHmmToScreenPixel( const css::awt::Point& rHmm ) const;
/** Converts the passed size from 1/100 mm to screen pixels. */
::com::sun::star::awt::Size convertHmmToScreenPixel( const ::com::sun::star::awt::Size& rHmm ) const;
css::awt::Size convertHmmToScreenPixel( const css::awt::Size& rHmm ) const;
/** Converts the passed point from 1/100 mm to AppFont units. */
::com::sun::star::awt::Point convertHmmToAppFont( const ::com::sun::star::awt::Point& rHmm ) const;
css::awt::Point convertHmmToAppFont( const css::awt::Point& rHmm ) const;
/** Converts the passed size from 1/100 mm to AppFont units. */
::com::sun::star::awt::Size convertHmmToAppFont( const ::com::sun::star::awt::Size& rHmm ) const;
css::awt::Size convertHmmToAppFont( const css::awt::Size& rHmm ) const;
// Graphics and graphic objects ------------------------------------------
/** Imports a graphic from the passed input stream. */
::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >
css::uno::Reference< css::graphic::XGraphic >
importGraphic(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm,
const css::uno::Reference< css::io::XInputStream >& rxInStrm,
const WMF_EXTERNALHEADER* pExtHeader = NULL ) const;
/** Imports a graphic from the passed binary memory block. */
::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >
css::uno::Reference< css::graphic::XGraphic >
importGraphic( const StreamDataSequence& rGraphicData ) const;
/** Imports a graphic from the storage stream with the passed path and name. */
::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >
css::uno::Reference< css::graphic::XGraphic >
importEmbeddedGraphic(
const OUString& rStreamName,
const WMF_EXTERNALHEADER* pExtHeader = NULL ) const;
@ -125,12 +125,12 @@ public:
/** Creates a persistent graphic object from the passed graphic.
@return The URL of the created and internally cached graphic object. */
OUString createGraphicObject(
const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& rxGraphic ) const;
const css::uno::Reference< css::graphic::XGraphic >& rxGraphic ) const;
/** Creates a persistent graphic object from the passed input stream.
@return The URL of the created and internally cached graphic object. */
OUString importGraphicObject(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm,
const css::uno::Reference< css::io::XInputStream >& rxInStrm,
const WMF_EXTERNALHEADER* pExtHeader = NULL ) const;
/** Creates a persistent graphic object from the passed binary memory block.
@ -143,23 +143,23 @@ public:
/** calculates the orignal size of a graphic which is necessary to be able to calculate cropping values
@return The original Graphic size in 100thmm */
::com::sun::star::awt::Size getOriginalSize( const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& rxGraphic ) const;
css::awt::Size getOriginalSize( const css::uno::Reference< css::graphic::XGraphic >& rxGraphic ) const;
private:
typedef ::std::map< sal_Int32, sal_Int32 > SystemPalette;
typedef ::std::deque< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject > > GraphicObjectDeque;
typedef ::std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > > EmbeddedGraphicMap;
typedef ::std::deque< css::uno::Reference< css::graphic::XGraphicObject > > GraphicObjectDeque;
typedef ::std::map< OUString, css::uno::Reference< css::graphic::XGraphic > > EmbeddedGraphicMap;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;
::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicProvider > mxGraphicProvider;
::com::sun::star::uno::Reference< ::com::sun::star::awt::XUnitConversion > mxUnitConversion;
::com::sun::star::awt::DeviceInfo maDeviceInfo; ///< Current output device info.
css::uno::Reference< css::uno::XComponentContext > mxContext;
css::uno::Reference< css::graphic::XGraphicProvider > mxGraphicProvider;
css::uno::Reference< css::awt::XUnitConversion > mxUnitConversion;
css::awt::DeviceInfo maDeviceInfo; ///< Current output device info.
SystemPalette maSystemPalette; ///< Maps system colors (XML tokens) to RGB color values.
StorageRef mxStorage; ///< Storage containing embedded graphics.
mutable GraphicObjectDeque maGraphicObjects; ///< Caches all created graphic objects to keep them alive.
mutable EmbeddedGraphicMap maEmbeddedGraphics; ///< Maps all embedded graphics by their storage path.
const OUString maGraphicObjScheme; ///< The URL scheme name for graphic objects.
const OUString maGraphicObjScheme; ///< The URL scheme name for graphic objects.
double mfPixelPerHmmX; ///< Number of screen pixels per 1/100 mm in X direction.
double mfPixelPerHmmY; ///< Number of screen pixels per 1/100 mm in Y direction.
};

30
include/oox/helper/modelobjecthelper.hxx
View File

@ -41,30 +41,30 @@ class OOX_DLLPUBLIC ObjectContainer
{
public:
explicit ObjectContainer(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxModelFactory,
const css::uno::Reference< css::lang::XMultiServiceFactory >& rxModelFactory,
const OUString& rServiceName );
~ObjectContainer();
/** Returns true, if the object with the passed name exists in the container. */
bool hasObject( const OUString& rObjName ) const;
::com::sun::star::uno::Any getObject( const OUString& rObjName ) const;
css::uno::Any getObject( const OUString& rObjName ) const;
/** Inserts the passed object into the container, returns its final name. */
OUString insertObject(
const OUString& rObjName,
const ::com::sun::star::uno::Any& rObj,
const css::uno::Any& rObj,
bool bInsertByUnusedName );
private:
void createContainer() const;
private:
mutable ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
mutable css::uno::Reference< css::lang::XMultiServiceFactory >
mxModelFactory; ///< Factory to create the container.
mutable ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
mutable css::uno::Reference< css::container::XNameContainer >
mxContainer; ///< Container for the objects.
OUString maServiceName; ///< Service name to create the container.
OUString maServiceName; ///< Service name to create the container.
sal_Int32 mnIndex; ///< Index to create unique identifiers.
};
@ -81,7 +81,7 @@ class OOX_DLLPUBLIC ModelObjectHelper
{
public:
explicit ModelObjectHelper(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxModelFactory );
const css::uno::Reference< css::lang::XMultiServiceFactory >& rxModelFactory );
/** Returns true, if the model contains a line marker with the passed name. */
bool hasLineMarker( const OUString& rMarkerName ) const;
@ -90,17 +90,17 @@ public:
with the same name. Returns true, if the marker could be inserted. */
bool insertLineMarker(
const OUString& rMarkerName,
const ::com::sun::star::drawing::PolyPolygonBezierCoords& rMarker );
const css::drawing::PolyPolygonBezierCoords& rMarker );
/** Inserts a new named line dash, returns the line dash name, based on an
internal constant name with a new unused index appended. */
OUString insertLineDash( const ::com::sun::star::drawing::LineDash& rDash );
OUString insertLineDash( const css::drawing::LineDash& rDash );
/** Inserts a new named fill gradient, returns the gradient name, based on
an internal constant name with a new unused index appended. */
OUString insertFillGradient( const ::com::sun::star::awt::Gradient& rGradient );
OUString insertFillGradient( const css::awt::Gradient& rGradient );
OUString insertTransGrandient( const ::com::sun::star::awt::Gradient& rGradient );
OUString insertTransGrandient( const css::awt::Gradient& rGradient );
/** Inserts a new named fill bitmap URL, returns the bitmap name, based on
an internal constant name with a new unused index appended. */
@ -114,10 +114,10 @@ private:
ObjectContainer maGradientContainer; ///< Contains all named fill gradients.
ObjectContainer maTransGradContainer; ///< Contains all named transparency Gradients.
ObjectContainer maBitmapUrlContainer; ///< Contains all named fill bitmap URLs.
const OUString maDashNameBase; ///< Base name for all named line dashes.
const OUString maGradientNameBase; ///< Base name for all named fill gradients.
const OUString maTransGradNameBase; ///< Base name for all named fill gradients.
const OUString maBitmapUrlNameBase; ///< Base name for all named fill bitmap URLs.
const OUString maDashNameBase; ///< Base name for all named line dashes.
const OUString maGradientNameBase; ///< Base name for all named fill gradients.
const OUString maTransGradNameBase; ///< Base name for all named fill gradients.
const OUString maBitmapUrlNameBase; ///< Base name for all named fill bitmap URLs.
};

6
include/oox/helper/progressbar.hxx
View File

@ -86,7 +86,7 @@ class OOX_DLLPUBLIC ProgressBar : public IProgressBar
{
public:
explicit ProgressBar(
const ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator >& rxIndicator,
const css::uno::Reference< css::task::XStatusIndicator >& rxIndicator,
const OUString& rText );
virtual ~ProgressBar();
@ -97,7 +97,7 @@ public:
virtual void setPosition( double fPosition ) override;
private:
::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator >
css::uno::Reference< css::task::XStatusIndicator >
mxIndicator;
double mfPosition;
};
@ -110,7 +110,7 @@ class OOX_DLLPUBLIC SegmentProgressBar : public ISegmentProgressBar
{
public:
explicit SegmentProgressBar(
const ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator >& rxIndicator,
const css::uno::Reference< css::task::XStatusIndicator >& rxIndicator,
const OUString& rText );
/** Returns the current position of the progress bar segment. */

22
include/oox/helper/propertymap.hxx
View File

@ -39,8 +39,8 @@ struct PropertyNameVector;
typedef ::std::map< sal_Int32, ::com::sun::star::uno::Any > PropertyMapType;
typedef ::std::map< OUString, ::com::sun::star::uno::Any > PropertyNameMap;
typedef ::std::map< sal_Int32, css::uno::Any > PropertyMapType;
typedef ::std::map< OUString, css::uno::Any > PropertyNameMap;
/** A helper that maps property identifiers to property values.
@ -62,7 +62,7 @@ public:
/** Sets the specified property to the passed value. Does nothing, if the
identifier is invalid. */
bool setAnyProperty( sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue );
bool setAnyProperty( sal_Int32 nPropId, const css::uno::Any& rValue );
/** Sets the specified property to the passed value. Does nothing, if the
identifier is invalid. */
@ -76,7 +76,7 @@ public:
return true;
}
com::sun::star::uno::Any getProperty( sal_Int32 nPropId );
css::uno::Any getProperty( sal_Int32 nPropId );
void erase( sal_Int32 nPropId );
@ -89,26 +89,26 @@ public:
void assignAll( const PropertyMap& rPropMap );
/** Returns a sequence of property values, filled with all contained properties. */
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
css::uno::Sequence< css::beans::PropertyValue >
makePropertyValueSequence() const;
/** Fills the passed sequences of names and anys with all contained properties. */
void fillSequences(
::com::sun::star::uno::Sequence< OUString >& rNames,
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rValues ) const;
css::uno::Sequence< OUString >& rNames,
css::uno::Sequence< css::uno::Any >& rValues ) const;
void fillPropertyNameMap(PropertyNameMap& rMap) const;
/** Creates a property set supporting the XPropertySet interface and inserts all properties. */
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
css::uno::Reference< css::beans::XPropertySet >
makePropertySet() const;
#if OSL_DEBUG_LEVEL > 0
#ifdef DBG_UTIL
static void dump( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet);
static void dump( css::uno::Reference< css::beans::XPropertySet > rXPropSet);
#endif
static void dumpCode( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet);
static void dumpData(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> rXPropSet);
static void dumpCode( css::uno::Reference< css::beans::XPropertySet > rXPropSet);
static void dumpData(css::uno::Reference<css::beans::XPropertySet> rXPropSet);
#endif
private:
const PropertyNameVector* mpPropNames;

28
include/oox/helper/propertyset.hxx
View File

@ -53,7 +53,7 @@ public:
/** Constructs a property set wrapper with the passed UNO property set. */
explicit PropertySet(
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rxPropSet )
const css::uno::Reference< css::beans::XPropertySet >& rxPropSet )
{ set( rxPropSet ); }
/** Constructs a property set wrapper after querying the XPropertySet interface. */
@ -61,18 +61,18 @@ public:
explicit PropertySet( const Type& rObject ) { set( rObject ); }
/** Sets the passed UNO property set and releases the old UNO property set. */
void set( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rxPropSet );
void set( const css::uno::Reference< css::beans::XPropertySet >& rxPropSet );
/** Queries the passed object (interface or any) for an XPropertySet and releases the old UNO property set. */
template< typename Type >
void set( const Type& rObject )
{ set( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >( rObject, ::com::sun::star::uno::UNO_QUERY ) ); }
{ set( css::uno::Reference< css::beans::XPropertySet >( rObject, css::uno::UNO_QUERY ) ); }
/** Returns true, if the contained XPropertySet interface is valid. */
bool is() const { return mxPropSet.is(); }
/** Returns the contained XPropertySet interface. */
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
css::uno::Reference< css::beans::XPropertySet >
getXPropertySet() const { return mxPropSet; }
/** Returns true, if the specified property is supported by the property set. */
@ -82,7 +82,7 @@ public:
/** Gets the specified property from the property set.
@return the property value, or an empty Any, if the property is missing. */
::com::sun::star::uno::Any getAnyProperty( sal_Int32 nPropId ) const;
css::uno::Any getAnyProperty( sal_Int32 nPropId ) const;
/** Gets the specified property from the property set.
@return true, if the passed variable could be filled with the property value. */
@ -97,19 +97,19 @@ public:
// Set properties ---------------------------------------------------------
/** Puts the passed any into the property set. */
bool setAnyProperty( sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue );
bool setAnyProperty( sal_Int32 nPropId, const css::uno::Any& rValue );
/** Puts the passed value into the property set. */
template< typename Type >
bool setProperty( sal_Int32 nPropId, const Type& rValue )
{ return setAnyProperty( nPropId, ::com::sun::star::uno::Any( rValue ) ); }
{ return setAnyProperty( nPropId, css::uno::Any( rValue ) ); }
/** Puts the passed properties into the property set. Tries to use the XMultiPropertySet interface.
@param rPropNames The property names. MUST be ordered alphabetically.
@param rValues The related property values. */
void setProperties(
const ::com::sun::star::uno::Sequence< OUString >& rPropNames,
const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rValues );
const css::uno::Sequence< OUString >& rPropNames,
const css::uno::Sequence< css::uno::Any >& rValues );
/** Puts the passed property map into the property set. Tries to use the XMultiPropertySet interface.
@param rPropertyMap The property map. */
@ -123,17 +123,17 @@ public:
private:
/** Gets the specified property from the property set.
@return true, if the any could be filled with the property value. */
bool implGetPropertyValue( ::com::sun::star::uno::Any& orValue, const OUString& rPropName ) const;
bool implGetPropertyValue( css::uno::Any& orValue, const OUString& rPropName ) const;
/** Puts the passed any into the property set. */
bool implSetPropertyValue( const OUString& rPropName, const ::com::sun::star::uno::Any& rValue );
bool implSetPropertyValue( const OUString& rPropName, const css::uno::Any& rValue );
private:
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
css::uno::Reference< css::beans::XPropertySet >
mxPropSet; ///< The mandatory property set interface.
::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet >
css::uno::Reference< css::beans::XMultiPropertySet >
mxMultiPropSet; ///< The optional multi property set interface.
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >
css::uno::Reference< css::beans::XPropertySetInfo >
mxPropSetInfo; ///< Property information.
};

24
include/oox/helper/storagebase.hxx
View File

@ -49,11 +49,11 @@ class OOX_DLLPUBLIC StorageBase
{
public:
explicit StorageBase(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStream,
const css::uno::Reference< css::io::XInputStream >& rxInStream,
bool bBaseStreamAccess );
explicit StorageBase(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& rxOutStream,
const css::uno::Reference< css::io::XStream >& rxOutStream,
bool bBaseStreamAccess );
virtual ~StorageBase();
@ -69,7 +69,7 @@ public:
bool isReadOnly() const { return mbReadOnly;}
/** Returns the com.sun.star.embed.XStorage interface of the current storage. */
::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >
css::uno::Reference< css::embed::XStorage >
getXStorage() const;
/** Returns the element name of this storage. */
@ -101,7 +101,7 @@ public:
access has been enabled in the constructor, the base stream can be
accessed by passing an empty string as stream name.
*/
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
css::uno::Reference< css::io::XInputStream >
openInputStream( const OUString& rStreamName );
/** Opens and returns the specified output stream from the storage.
@ -112,7 +112,7 @@ public:
stream access has been enabled in the constructor, the base stream
can be accessed by passing an empty string as stream name.
*/
::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
css::uno::Reference< css::io::XOutputStream >
openOutputStream( const OUString& rStreamName );
/** Copies the specified element from this storage to the passed
@ -145,7 +145,7 @@ private:
virtual bool implIsStorage() const = 0;
/** Returns the com.sun.star.embed.XStorage interface of the current storage. */
virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >
virtual css::uno::Reference< css::embed::XStorage >
implGetXStorage() const = 0;
/** Returns the names of all elements of this storage. */
@ -155,11 +155,11 @@ private:
virtual StorageRef implOpenSubStorage( const OUString& rElementName, bool bCreate ) = 0;
/** Implementation of opening an input stream element. */
virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
virtual css::uno::Reference< css::io::XInputStream >
implOpenInputStream( const OUString& rElementName ) = 0;
/** Implementation of opening an output stream element. */
virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
virtual css::uno::Reference< css::io::XOutputStream >
implOpenOutputStream( const OUString& rElementName ) = 0;
/** Commits the current storage. */
@ -172,12 +172,12 @@ private:
typedef RefMap< OUString, StorageBase > SubStorageMap;
SubStorageMap maSubStorages; ///< Map of direct sub storages.
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
css::uno::Reference< css::io::XInputStream >
mxInStream; ///< Cached base input stream (to keep it alive).
::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >
css::uno::Reference< css::io::XStream >
mxOutStream; ///< Cached base output stream (to keep it alive).
OUString maParentPath; ///< Full path of parent storage.
OUString maStorageName; ///< Name of this storage, if it is a substorage.
OUString maParentPath; ///< Full path of parent storage.
OUString maStorageName; ///< Name of this storage, if it is a substorage.
bool mbBaseStreamAccess; ///< True = access base streams with empty stream name.
bool mbReadOnly; ///< True = storage opened read-only (based on input stream).
};

18
include/oox/helper/textinputstream.hxx
View File

@ -39,12 +39,12 @@ class TextInputStream
{
public:
explicit TextInputStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm,
const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const css::uno::Reference< css::io::XInputStream >& rxInStrm,
rtl_TextEncoding eTextEnc );
explicit TextInputStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const css::uno::Reference< css::uno::XComponentContext >& rxContext,
BinaryInputStream& rInStrm,
rtl_TextEncoding eTextEnc );
@ -91,24 +91,24 @@ public:
/** Creates a UNO text input stream object from the passed UNO input stream.
*/
static ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextInputStream2 >
static css::uno::Reference< css::io::XTextInputStream2 >
createXTextInputStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm,
const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const css::uno::Reference< css::io::XInputStream >& rxInStrm,
rtl_TextEncoding eTextEnc );
private:
void init(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm,
const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const css::uno::Reference< css::io::XInputStream >& rxInStrm,
rtl_TextEncoding eTextEnc );
/** Adds the pending character in front of the passed string, if existing. */
OUString createFinalString( const OUString& rString );
private:
::com::sun::star::uno::Reference< ::com::sun::star::io::XTextInputStream2 >
css::uno::Reference< css::io::XTextInputStream2 >
mxTextStrm;
sal_Unicode mcPendingChar;
};

18
include/oox/helper/zipstorage.hxx
View File

@ -35,26 +35,26 @@ class ZipStorage : public StorageBase
{
public:
explicit ZipStorage(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStream );
const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const css::uno::Reference< css::io::XInputStream >& rxInStream );
explicit ZipStorage(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& rxStream );
const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const css::uno::Reference< css::io::XStream >& rxStream );
virtual ~ZipStorage();
private:
explicit ZipStorage(
const ZipStorage& rParentStorage,
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& rxStorage,
const css::uno::Reference< css::embed::XStorage >& rxStorage,
const OUString& rElementName );
/** Returns true, if the object represents a valid storage. */
virtual bool implIsStorage() const override;
/** Returns the com.sun.star.embed.XStorage interface of the current storage. */
virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >
virtual css::uno::Reference< css::embed::XStorage >
implGetXStorage() const override;
/** Returns the names of all elements of this storage. */
@ -64,18 +64,18 @@ private:
virtual StorageRef implOpenSubStorage( const OUString& rElementName, bool bCreateMissing ) override;
/** Opens and returns the specified input stream from the storage. */
virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
virtual css::uno::Reference< css::io::XInputStream >
implOpenInputStream( const OUString& rElementName ) override;
/** Opens and returns the specified output stream from the storage. */
virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
virtual css::uno::Reference< css::io::XOutputStream >
implOpenOutputStream( const OUString& rElementName ) override;
/** Commits the current storage. */
virtual void implCommit() const override;
private:
::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >
css::uno::Reference< css::embed::XStorage >
mxStorage; ///< Storage based on input or output stream.
};

4
include/oox/mathml/importutils.hxx
View File

@ -127,7 +127,7 @@ public:
struct OOX_DLLPUBLIC Tag
{
Tag( int token = XML_TOKEN_INVALID,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XFastAttributeList >& attributes = com::sun::star::uno::Reference< com::sun::star::xml::sax::XFastAttributeList >(),
const css::uno::Reference< css::xml::sax::XFastAttributeList >& attributes = css::uno::Reference< css::xml::sax::XFastAttributeList >(),
const OUString& text = OUString());
Tag( int token,
const AttributeList& attribs);
@ -219,7 +219,7 @@ class OOX_DLLPUBLIC XmlStreamBuilder
{
public:
void appendOpeningTag( int token,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XFastAttributeList >& attributes = com::sun::star::uno::Reference< com::sun::star::xml::sax::XFastAttributeList >());
const css::uno::Reference< css::xml::sax::XFastAttributeList >& attributes = css::uno::Reference< css::xml::sax::XFastAttributeList >());
void appendOpeningTag( int token,
const AttributeList& attribs );
void appendClosingTag( int token );

32
include/oox/ole/axcontrol.hxx
View File

@ -193,7 +193,7 @@ class OOX_DLLPUBLIC ControlConverter
{
public:
explicit ControlConverter(
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxDocModel,
const css::uno::Reference< css::frame::XModel >& rxDocModel,
const GraphicHelper& rGraphicHelper,
bool bDefaultColorBgr = true );
virtual ~ControlConverter();
@ -257,7 +257,7 @@ public:
/** Binds the passed control model to the passed data sources. The
implementation will check which source types are supported. */
void bindToSources(
const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxCtrlModel,
const css::uno::Reference< css::awt::XControlModel >& rxCtrlModel,
const OUString& rCtrlSource,
const OUString& rRowSource,
sal_Int32 nRefSheet = 0 ) const;
@ -337,7 +337,7 @@ public:
sal_Int32& nOrientation );
private:
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxDocModel;
css::uno::Reference< css::frame::XModel > mxDocModel;
const GraphicHelper& mrGraphicHelper;
mutable PropertySet maAddressConverter;
mutable PropertySet maRangeConverter;
@ -905,8 +905,8 @@ public:
class HtmlSelectModel : public AxListBoxModel
{
com::sun::star::uno::Sequence< OUString > msListData;
com::sun::star::uno::Sequence< sal_Int16 > msIndices;
css::uno::Sequence< OUString > msListData;
css::uno::Sequence< sal_Int16 > msIndices;
public:
HtmlSelectModel();
virtual bool importBinaryModel( BinaryInputStream& rInStrm ) override;
@ -953,11 +953,11 @@ public:
/** Converts all control properties and inserts them into the passed model. */
bool convertProperties(
const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxCtrlModel,
const css::uno::Reference< css::awt::XControlModel >& rxCtrlModel,
const ControlConverter& rConv ) const;
bool convertFromProperties(
const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxCtrlModel,
const css::uno::Reference< css::awt::XControlModel >& rxCtrlModel,
const ControlConverter& rConv );
private:
@ -992,30 +992,30 @@ class EmbeddedForm
{
public:
explicit EmbeddedForm(
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxDocModel,
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& rxDrawPage,
const css::uno::Reference< css::frame::XModel >& rxDocModel,
const css::uno::Reference< css::drawing::XDrawPage >& rxDrawPage,
const GraphicHelper& rGraphicHelper,
bool bDefaultColorBgr = true );
/** Converts the passed control and inserts the control model into the form.
@return The API control model, if conversion was successful. */
::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >
css::uno::Reference< css::awt::XControlModel >
convertAndInsert( const EmbeddedControl& rControl, sal_Int32& rnCtrlIndex );
/** Returns the XIndexContainer interface of the UNO control form, if existing. */
::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >
css::uno::Reference< css::container::XIndexContainer >
getXForm() const { return mxFormIC; }
private:
/** Creates the form that will hold the form controls. */
::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >
css::uno::Reference< css::container::XIndexContainer >
createXForm();
private:
ControlConverter maControlConv;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxModelFactory;
::com::sun::star::uno::Reference< ::com::sun::star::form::XFormsSupplier > mxFormsSupp;
::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > mxFormIC;
ControlConverter maControlConv;
css::uno::Reference< css::lang::XMultiServiceFactory > mxModelFactory;
css::uno::Reference< css::form::XFormsSupplier > mxFormsSupp;
css::uno::Reference< css::container::XIndexContainer > mxFormIC;
};

16
include/oox/ole/olehelper.hxx
View File

@ -150,24 +150,24 @@ namespace OleHelper
class OOX_DLLPUBLIC MSConvertOCXControls : public SvxMSConvertOCXControls
{
protected:
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxCtx;
css::uno::Reference< css::uno::XComponentContext > mxCtx;
::oox::GraphicHelper maGrfHelper;
bool importControlFromStream( ::oox::BinaryInputStream& rInStrm,
::com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rxFormComp,
css::uno::Reference< css::form::XFormComponent > & rxFormComp,
const OUString& rGuidString );
bool importControlFromStream( ::oox::BinaryInputStream& rInStrm,
::com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rxFormComp,
css::uno::Reference< css::form::XFormComponent > & rxFormComp,
const OUString& rGuidString,
sal_Int32 nSize );
public:
MSConvertOCXControls( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel );
MSConvertOCXControls( const css::uno::Reference< css::frame::XModel >& rxModel );
virtual ~MSConvertOCXControls();
bool ReadOCXStorage( tools::SvRef<SotStorage>& rSrc1, ::com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rxFormComp );
bool ReadOCXCtlsStream(tools::SvRef<SotStorageStream>& rSrc1, ::com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rxFormComp,
bool ReadOCXStorage( tools::SvRef<SotStorage>& rSrc1, css::uno::Reference< css::form::XFormComponent > & rxFormComp );
bool ReadOCXCtlsStream(tools::SvRef<SotStorageStream>& rSrc1, css::uno::Reference< css::form::XFormComponent > & rxFormComp,
sal_Int32 nPos, sal_Int32 nSize );
static bool WriteOCXStream( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel, tools::SvRef<SotStorage> &rSrc1, const com::sun::star::uno::Reference< com::sun::star::awt::XControlModel > &rControlModel, const com::sun::star::awt::Size& rSize,OUString &rName);
static bool WriteOCXExcelKludgeStream( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xOutStrm, const com::sun::star::uno::Reference< com::sun::star::awt::XControlModel > &rControlModel, const com::sun::star::awt::Size& rSize,OUString &rName);
static bool WriteOCXStream( const css::uno::Reference< css::frame::XModel >& rxModel, tools::SvRef<SotStorage> &rSrc1, const css::uno::Reference< css::awt::XControlModel > &rControlModel, const css::awt::Size& rSize,OUString &rName);
static bool WriteOCXExcelKludgeStream( const css::uno::Reference< css::frame::XModel >& rxModel, const css::uno::Reference< css::io::XOutputStream >& xOutStrm, const css::uno::Reference< css::awt::XControlModel > &rControlModel, const css::awt::Size& rSize,OUString &rName);
};

10
include/oox/ole/oleobjecthelper.hxx
View File

@ -56,18 +56,18 @@ class OleObjectHelper
{
public:
explicit OleObjectHelper(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxModelFactory );
const css::uno::Reference< css::lang::XMultiServiceFactory >& rxModelFactory );
~OleObjectHelper();
bool importOleObject(
PropertyMap& rPropMap,
const OleObjectInfo& rOleObject,
const ::com::sun::star::awt::Size& rObjSize );
const css::awt::Size& rObjSize );
private:
::com::sun::star::uno::Reference< ::com::sun::star::document::XEmbeddedObjectResolver > mxResolver;
const OUString maEmbeddedObjScheme;
sal_Int32 mnObjectId;
css::uno::Reference< css::document::XEmbeddedObjectResolver > mxResolver;
const OUString maEmbeddedObjScheme;
sal_Int32 mnObjectId;
};

26
include/oox/ole/olestorage.hxx
View File

@ -37,13 +37,13 @@ class OOX_DLLPUBLIC OleStorage : public StorageBase
{
public:
explicit OleStorage(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStream,
const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const css::uno::Reference< css::io::XInputStream >& rxInStream,
bool bBaseStreamAccess );
explicit OleStorage(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& rxOutStream,
const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const css::uno::Reference< css::io::XStream >& rxOutStream,
bool bBaseStreamAccess );
virtual ~OleStorage();
@ -51,18 +51,18 @@ public:
private:
explicit OleStorage(
const OleStorage& rParentStorage,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxStorage,
const css::uno::Reference< css::container::XNameContainer >& rxStorage,
const OUString& rElementName,
bool bReadOnly );
explicit OleStorage(
const OleStorage& rParentStorage,
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& rxOutStream,
const css::uno::Reference< css::io::XStream >& rxOutStream,
const OUString& rElementName );
/** Initializes the API storage object for input. */
void initStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStream );
void initStorage( const css::uno::Reference< css::io::XInputStream >& rxInStream );
/** Initializes the API storage object for input/output. */
void initStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& rxOutStream );
void initStorage( const css::uno::Reference< css::io::XStream >& rxOutStream );
/** Returns true, if the object represents a valid storage. */
virtual bool implIsStorage() const override;
@ -72,7 +72,7 @@ private:
@attention
This function is not implemented for binary OLE storages.
*/
virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >
virtual css::uno::Reference< css::embed::XStorage >
implGetXStorage() const override;
/** Returns the names of all elements of this storage. */
@ -82,20 +82,20 @@ private:
virtual StorageRef implOpenSubStorage( const OUString& rElementName, bool bCreateMissing ) override;
/** Opens and returns the specified input stream from the storage. */
virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
virtual css::uno::Reference< css::io::XInputStream >
implOpenInputStream( const OUString& rElementName ) override;
/** Opens and returns the specified output stream from the storage. */
virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
virtual css::uno::Reference< css::io::XOutputStream >
implOpenOutputStream( const OUString& rElementName ) override;
/** Commits the current storage. */
virtual void implCommit() const override;
private:
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
css::uno::Reference< css::uno::XComponentContext >
mxContext; ///< Component context with service manager.
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
css::uno::Reference< css::container::XNameContainer >
mxStorage; ///< Access to elements of this sub storage.
const OleStorage* mpParentStorage; ///< Parent OLE storage that contains this storage.
};

16
include/oox/ole/vbacontrol.hxx
View File

@ -123,7 +123,7 @@ public:
and converts all control properties. */
void createAndConvert(
sal_Int32 nCtrlIndex,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxParentNC,
const css::uno::Reference< css::container::XNameContainer >& rxParentNC,
const ControlConverter& rConv ) const;
protected:
@ -135,7 +135,7 @@ protected:
/** Converts all control properties, and inserts and converts embedded controls. */
bool convertProperties(
const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxCtrlModel,
const css::uno::Reference< css::awt::XControlModel >& rxCtrlModel,
const ControlConverter& rConv,
sal_Int32 nCtrlIndex ) const;
@ -177,23 +177,23 @@ class VbaUserForm : public VbaFormControl
{
public:
explicit VbaUserForm(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxDocModel,
const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const css::uno::Reference< css::frame::XModel >& rxDocModel,
const GraphicHelper& rGraphicHelper,
bool bDefaultColorBgr = true );
/** Imports the form and its embedded controls, and inserts the form with
all its controls into the passed dialog library. */
void importForm(
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxDialogLib,
const css::uno::Reference< css::container::XNameContainer >& rxDialogLib,
StorageBase& rVbaFormStrg,
const OUString& rModuleName,
rtl_TextEncoding eTextEnc );
private:
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxDocModel;
ControlConverter maConverter;
css::uno::Reference< css::uno::XComponentContext > mxContext;
css::uno::Reference< css::frame::XModel > mxDocModel;
ControlConverter maConverter;
};

26
include/oox/ole/vbamodule.hxx
View File

@ -44,8 +44,8 @@ class VbaModule
{
public:
explicit VbaModule(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxDocModel,
const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const css::uno::Reference< css::frame::XModel >& rxDocModel,
const OUString& rName,
rtl_TextEncoding eTextEnc,
bool bExecutable );
@ -66,12 +66,12 @@ public:
/** Imports the VBA source code into the passed Basic library. */
void createAndImportModule(
StorageBase& rVbaStrg,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxBasicLib,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& rxDocObjectNA ) const;
const css::uno::Reference< css::container::XNameContainer >& rxBasicLib,
const css::uno::Reference< css::container::XNameAccess >& rxDocObjectNA ) const;
/** Creates an empty Basic module in the passed Basic library. */
void createEmptyModule(
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxBasicLib,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& rxDocObjectNA ) const;
const css::uno::Reference< css::container::XNameContainer >& rxBasicLib,
const css::uno::Reference< css::container::XNameAccess >& rxDocObjectNA ) const;
private:
/** Reads and returns the VBA source code from the passed storage. */
@ -80,17 +80,17 @@ private:
/** Creates a new Basic module and inserts it into the passed Basic library. */
void createModule(
const OUString& rVBASourceCode,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxBasicLib,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& rxDocObjectNA ) const;
const css::uno::Reference< css::container::XNameContainer >& rxBasicLib,
const css::uno::Reference< css::container::XNameAccess >& rxDocObjectNA ) const;
private:
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
css::uno::Reference< css::uno::XComponentContext >
mxContext; ///< Component context with service manager.
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
css::uno::Reference< css::frame::XModel >
mxDocModel; ///< Document model used to import/export the VBA project.
OUString maName;
OUString maStreamName;
OUString maDocString;
OUString maName;
OUString maStreamName;
OUString maDocString;
rtl_TextEncoding meTextEnc;
sal_Int32 mnType;
sal_uInt32 mnOffset;

36
include/oox/ole/vbaproject.hxx
View File

@ -47,7 +47,7 @@ class OOX_DLLPUBLIC VbaFilterConfig
{
public:
explicit VbaFilterConfig(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const OUString& rConfigCompName );
~VbaFilterConfig();
@ -59,7 +59,7 @@ public:
bool isExportVba() const;
private:
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
css::uno::Reference< css::uno::XInterface >
mxConfigAccess;
};
@ -91,7 +91,7 @@ public:
/** Resolves the internal macro name to the related macro URL, and attaches
the macro to the object. */
void resolveAndAttachMacro(
const ::com::sun::star::uno::Reference< ::com::sun::star::script::vba::XVBAMacroResolver >& rxResolver );
const css::uno::Reference< css::script::vba::XVBAMacroResolver >& rxResolver );
private:
/** Called after the VBA project has been imported. Derived classes will
@ -110,8 +110,8 @@ class OOX_DLLPUBLIC VbaProject : public VbaFilterConfig
{
public:
explicit VbaProject(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxDocModel,
const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const css::uno::Reference< css::frame::XModel >& rxDocModel,
const OUString& rConfigCompName );
virtual ~VbaProject();
@ -142,7 +142,7 @@ public:
/** Returns true, if the document contains at least one dialog. */
bool hasDialogs() const;
void setOleOverridesSink( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxOleOverridesSink ){ mxOleOverridesSink = rxOleOverridesSink; }
void setOleOverridesSink( css::uno::Reference< css::container::XNameContainer >& rxOleOverridesSink ){ mxOleOverridesSink = rxOleOverridesSink; }
protected:
/** Registers a dummy module that will be created when the VBA project is
@ -157,16 +157,16 @@ private:
VbaProject& operator=( const VbaProject& ) = delete;
/** Returns the Basic or dialog library container. */
::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer >
css::uno::Reference< css::script::XLibraryContainer >
getLibraryContainer( sal_Int32 nPropId );
/** Opens a Basic or dialog library (creates missing if specified). */
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
css::uno::Reference< css::container::XNameContainer >
openLibrary( sal_Int32 nPropId, bool bCreateMissing );
/** Creates and returns the Basic library of the document used for import. */
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
css::uno::Reference< css::container::XNameContainer >
createBasicLibrary();
/** Creates and returns the dialog library of the document used for import. */
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
css::uno::Reference< css::container::XNameContainer >
createDialogLibrary();
/** Imports the VBA code modules and forms. */
@ -185,22 +185,22 @@ private:
typedef RefVector< VbaMacroAttacherBase > MacroAttacherVector;
typedef ::std::map< OUString, sal_Int32 > DummyModuleMap;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
css::uno::Reference< css::uno::XComponentContext >
mxContext; ///< Component context with service manager.
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
css::uno::Reference< css::frame::XModel >
mxDocModel; ///< Document model used to import/export the VBA project.
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
css::uno::Reference< css::container::XNameContainer >
mxBasicLib; ///< The Basic library of the document used for import.
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
css::uno::Reference< css::container::XNameContainer >
mxDialogLib; ///< The dialog library of the document used for import.
MacroAttacherVector maMacroAttachers; ///< Objects that want to attach a VBA macro to an action.
DummyModuleMap maDummyModules; ///< Additional empty modules created on import.
OUString maPrjName; ///< Name of the VBA project.
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
OUString maPrjName; ///< Name of the VBA project.
css::uno::Reference< css::container::XNameContainer >
mxOleOverridesSink;
typedef RefMap< rtl::OUString, VbaModule > VbaModuleMap;
VbaModuleMap maModules;
VbaModuleMap maModulesByStrm;
VbaModuleMap maModules;
VbaModuleMap maModulesByStrm;
};

19
include/oox/ppt/animationspersist.hxx
View File

@ -48,7 +48,7 @@ namespace oox { namespace ppt {
_NP_SIZE
};
typedef boost::array< ::com::sun::star::uno::Any, _NP_SIZE > NodePropertyMap;
typedef boost::array< css::uno::Any, _NP_SIZE > NodePropertyMap;
/** data for CT_TLShapeTargetElement */
@ -60,7 +60,7 @@ namespace oox { namespace ppt {
{
maRange.start = maRange.end = 0;
}
void convert( ::com::sun::star::uno::Any & aAny, sal_Int16 & rSubType ) const;
void convert( css::uno::Any & aAny, sal_Int16 & rSubType ) const;
sal_Int32 mnType;
sal_Int32 mnRangeType;
@ -76,12 +76,11 @@ namespace oox { namespace ppt {
: mnType( 0 )
{}
/** convert to a set of properties */
::com::sun::star::uno::Any convert(const SlidePersistPtr & pSlide, sal_Int16 & nSubType) const;
css::uno::Any convert(const SlidePersistPtr & pSlide, sal_Int16 & nSubType) const;
sal_Int32 mnType;
OUString msValue;
ShapeTargetElement maShapeTarget;
OUString msValue;
ShapeTargetElement maShapeTarget;
};
typedef std::shared_ptr< AnimTargetElement > AnimTargetElementPtr;
@ -97,12 +96,12 @@ namespace oox { namespace ppt {
: mnType( 0 )
{}
::com::sun::star::uno::Any convert(const SlidePersistPtr & pSlide) const;
static ::com::sun::star::uno::Any convertList(const SlidePersistPtr & pSlide, const AnimationConditionList & l);
css::uno::Any convert(const SlidePersistPtr & pSlide) const;
static css::uno::Any convertList(const SlidePersistPtr & pSlide, const AnimationConditionList & l);
AnimTargetElementPtr & getTarget()
{ if(!mpTarget) mpTarget.reset( new AnimTargetElement ); return mpTarget; }
::com::sun::star::uno::Any maValue;
css::uno::Any maValue;
sal_Int32 mnType;
private:
AnimTargetElementPtr mpTarget;
@ -113,7 +112,7 @@ namespace oox { namespace ppt {
{
OUString msFormula;
OUString msTime;
::com::sun::star::uno::Any maValue;
css::uno::Any maValue;
};
typedef ::std::list< TimeAnimationValue > TimeAnimationValueList;

4
include/oox/ppt/comments.hxx
View File

@ -50,7 +50,7 @@ class Comment
OUString x;
OUString y;
OUString text;
::com::sun::star::util::DateTime aDateTime;
css::util::DateTime aDateTime;
void setDateTime (const OUString& datetime);
@ -81,7 +81,7 @@ class Comment
{
return text;
}
::com::sun::star::util::DateTime getDateTime()
css::util::DateTime getDateTime()
{
return aDateTime;
}

2
include/oox/ppt/dgmimport.hxx
View File

@ -37,7 +37,7 @@ class QuickDiagrammingImport : public oox::core::XmlFilterBase
{
public:
QuickDiagrammingImport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
QuickDiagrammingImport( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
// from FilterBase
virtual bool importDocument() throw (css::uno::RuntimeException, std::exception) override;

2
include/oox/ppt/dgmlayout.hxx
View File

@ -37,7 +37,7 @@ class QuickDiagrammingLayout : public oox::core::XmlFilterBase
{
public:
QuickDiagrammingLayout( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
QuickDiagrammingLayout( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
// from FilterBase
virtual bool importDocument() throw (css::uno::RuntimeException) override;

8
include/oox/ppt/pptimport.hxx
View File

@ -37,8 +37,8 @@ class PowerPointImport : public oox::core::XmlFilterBase
{
public:
PowerPointImport( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext )
throw( ::com::sun::star::uno::RuntimeException );
PowerPointImport( const css::uno::Reference< css::uno::XComponentContext >& rxContext )
throw( css::uno::RuntimeException );
virtual ~PowerPointImport();
// from FilterBase
@ -57,8 +57,8 @@ public:
std::vector< SlidePersistPtr >& getMasterPages(){ return maMasterPages; };
std::vector< SlidePersistPtr >& getNotesPages(){ return maNotesPages; };
virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rDescriptor )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& rDescriptor )
throw( css::uno::RuntimeException, std::exception ) override;
sal_Int32 getSchemeColor( sal_Int32 nToken ) const;

4
include/oox/ppt/pptshape.hxx
View File

@ -44,9 +44,9 @@ public:
oox::core::XmlFilterBase& rFilterBase,
SlidePersist& rPersist,
const oox::drawingml::Theme* pTheme,
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
const css::uno::Reference< css::drawing::XShapes >& rxShapes,
basegfx::B2DHomMatrix& aTransformation,
const com::sun::star::awt::Rectangle* pShapeRect = 0,
const css::awt::Rectangle* pShapeRect = 0,
::oox::drawingml::ShapeIdMap* pShapeMap = 0 );
virtual void applyShapeReference( const oox::drawingml::Shape& rReferencedShape, bool bUseText = true ) override;

4
include/oox/ppt/presentationfragmenthandler.hxx
View File

@ -55,8 +55,8 @@ private:
std::vector< OUString > maNotesMasterVector;
::oox::drawingml::TextListStylePtr mpTextListStyle;
::com::sun::star::awt::Size maSlideSize;
::com::sun::star::awt::Size maNotesSize;
css::awt::Size maSlideSize;
css::awt::Size maNotesSize;
std::vector< CustomShow > maCustomShowList;

22
include/oox/ppt/slidepersist.hxx
View File

@ -55,14 +55,14 @@ class SlidePersist : public std::enable_shared_from_this< SlidePersist >
public:
SlidePersist( oox::core::XmlFilterBase& rFilter, bool bMaster, bool bNotes,
const com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >&,
const css::uno::Reference< css::drawing::XDrawPage >&,
oox::drawingml::ShapePtr pShapesPtr, const ::oox::drawingml::TextListStylePtr & );
~SlidePersist();
com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage > getPage() const { return mxPage; };
css::uno::Reference< css::drawing::XDrawPage > getPage() const { return mxPage; };
#if OSL_DEBUG_LEVEL > 0
static com::sun::star::uno::WeakReference< com::sun::star::drawing::XDrawPage > mxDebugPage;
static css::uno::WeakReference< css::drawing::XDrawPage > mxDebugPage;
#endif
void setMasterPersist( SlidePersistPtr pMasterPersistPtr ){ mpMasterPagePtr = pMasterPersistPtr; }
@ -109,7 +109,7 @@ public:
void createBackground( const oox::core::XmlFilterBase& rFilterBase );
void applyTextStyles( const oox::core::XmlFilterBase& rFilterBase );
std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > >& getAnimNodesMap() { return maAnimNodesMap; };
std::map< OUString, css::uno::Reference< css::animations::XAnimationNode > >& getAnimNodesMap() { return maAnimNodesMap; };
::oox::drawingml::ShapePtr getShape( const OUString & id ) { return maShapeMap[ id ]; }
::oox::drawingml::ShapeIdMap& getShapeMap() { return maShapeMap; }
@ -117,10 +117,10 @@ public:
CommentAuthorList& getCommentAuthors() { return maCommentAuthors; }
private:
OUString maPath;
OUString maLayoutPath;
std::shared_ptr< oox::vml::Drawing > mpDrawingPtr;
com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage > mxPage;
OUString maPath;
OUString maLayoutPath;
std::shared_ptr< oox::vml::Drawing > mpDrawingPtr;
css::uno::Reference< css::drawing::XDrawPage > mxPage;
oox::drawingml::ThemePtr mpThemePtr; // the theme that is used
oox::drawingml::ClrSchemePtr mpClrSchemePtr; // the local color scheme (if any)
oox::drawingml::ClrMapPtr mpClrMapPtr; // color mapping (if any)
@ -129,7 +129,7 @@ private:
oox::drawingml::ShapePtr maShapesPtr;
oox::drawingml::Color maBackgroundColor;
oox::drawingml::FillPropertiesPtr mpBackgroundPropertiesPtr;
::std::list< std::shared_ptr< TimeNode > > maTimeNodeList;
::std::list< std::shared_ptr< TimeNode > > maTimeNodeList;
oox::ppt::HeaderFooter maHeaderFooter;
sal_Int32 mnLayoutValueToken;
@ -142,8 +142,8 @@ private:
oox::drawingml::TextListStylePtr maNotesTextStylePtr;
oox::drawingml::TextListStylePtr maOtherTextStylePtr;
std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > > maAnimNodesMap;
std::map< OUString, ::oox::drawingml::ShapePtr > maShapeMap;
std::map< OUString, css::uno::Reference< css::animations::XAnimationNode > > maAnimNodesMap;
std::map< OUString, ::oox::drawingml::ShapePtr > maShapeMap;
// slide comments
CommentList maCommentsList;

2
include/oox/ppt/slidetransition.hxx
View File

@ -36,7 +36,7 @@ namespace oox { namespace ppt {
explicit SlideTransition(const OUString & );
void setSlideProperties( PropertyMap& props );
void setTransitionFilterProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XTransitionFilter > & xFilter );
void setTransitionFilterProperties( const css::uno::Reference< css::animations::XTransitionFilter > & xFilter );
void setOoxTransitionSpeed( sal_Int32 nToken );
void setMode( bool bMode )

16
include/oox/ppt/timenode.hxx
View File

@ -44,7 +44,7 @@ namespace oox { namespace ppt {
class TimeNode
{
public:
typedef ::std::map< OUString, ::com::sun::star::uno::Any > UserDataMap;
typedef ::std::map< OUString, css::uno::Any > UserDataMap;
TimeNode( sal_Int16 nNodeType );
virtual ~TimeNode();
@ -58,18 +58,18 @@ namespace oox { namespace ppt {
void addNode(
const ::oox::core::XmlFilterBase& rFilter,
const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rxNode,
const css::uno::Reference< css::animations::XAnimationNode >& rxNode,
const SlidePersistPtr & slide);
// data setters
void setTo( const ::com::sun::star::uno::Any & aTo );
void setFrom( const ::com::sun::star::uno::Any & aFrom );
void setBy( const ::com::sun::star::uno::Any & aBy );
void setTo( const css::uno::Any & aTo );
void setFrom( const css::uno::Any & aFrom );
void setBy( const css::uno::Any & aBy );
void setTransitionFilter( const SlideTransition & aTransition)
{ maTransitionFilter = aTransition; }
void setNode(
const ::oox::core::XmlFilterBase& rFilter,
const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode,
const css::uno::Reference< css::animations::XAnimationNode >& xNode,
const SlidePersistPtr & pSlide );
AnimTargetElementPtr getTarget()
@ -93,11 +93,11 @@ namespace oox { namespace ppt {
static OUString getServiceName( sal_Int16 nNodeType );
static ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >
static css::uno::Reference< css::animations::XAnimationNode >
createAndInsert(
const ::oox::core::XmlFilterBase& rFilter,
const OUString& rServiceName,
const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rxNode );
const css::uno::Reference< css::animations::XAnimationNode >& rxNode );
private:
const sal_Int16 mnNodeType;

4
include/oox/ppt/timenodelistcontext.hxx
View File

@ -33,10 +33,10 @@ namespace oox { namespace ppt {
public:
virtual ~TimeNodeContext() throw();
static TimeNodeContext * SAL_CALL makeContext( ::oox::core::FragmentHandler2& rParent, sal_Int32 aElement, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode );
static TimeNodeContext * SAL_CALL makeContext( ::oox::core::FragmentHandler2& rParent, sal_Int32 aElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode );
protected:
TimeNodeContext( ::oox::core::FragmentHandler2& rParent, sal_Int32 aElement, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ) throw();
TimeNodeContext( ::oox::core::FragmentHandler2& rParent, sal_Int32 aElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ) throw();
sal_Int32 mnElement;
TimeNodePtr mpNode;

6
include/oox/token/tokenmap.hxx
View File

@ -41,7 +41,7 @@ public:
static sal_Int32 getTokenFromUnicode( const OUString& rUnicodeName );
/** Returns the UTF8 name of the passed token identifier as byte sequence. */
::com::sun::star::uno::Sequence< sal_Int8 >
css::uno::Sequence< sal_Int8 >
getUtf8TokenName( sal_Int32 nToken ) const
{
SAL_WARN_IF(nToken < 0 || nToken >= XML_TOKEN_COUNT, "oox", "Wrong nToken parameter");
@ -52,7 +52,7 @@ public:
/** Returns the token identifier for the passed UTF8 token name. */
sal_Int32 getTokenFromUtf8(
const ::com::sun::star::uno::Sequence< sal_Int8 >& rUtf8Name ) const
const css::uno::Sequence< sal_Int8 >& rUtf8Name ) const
{
return getTokenFromUTF8( reinterpret_cast< const char * >(
rUtf8Name.getConstArray() ),
@ -75,7 +75,7 @@ public:
private:
static sal_Int32 getTokenPerfectHash( const char *pToken, sal_Int32 nLength );
typedef ::std::vector< ::com::sun::star::uno::Sequence< sal_Int8 > > TokenNameVector;
typedef ::std::vector< css::uno::Sequence< sal_Int8 > > TokenNameVector;
TokenNameVector maTokenNames;
sal_Int32 mnAlphaTokens[26];

28
include/oox/vml/vmldrawing.hxx
View File

@ -96,7 +96,7 @@ class OOX_DLLPUBLIC Drawing
public:
explicit Drawing(
::oox::core::XmlFilterBase& rFilter,
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& rxDrawPage,
const css::uno::Reference< css::drawing::XDrawPage >& rxDrawPage,
DrawingType eType );
virtual ~Drawing();
@ -138,19 +138,19 @@ public:
/** Creates a new UNO shape object, inserts it into the passed UNO shape
container, and sets the shape position and size. */
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
css::uno::Reference< css::drawing::XShape >
createAndInsertXShape(
const OUString& rService,
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
const ::com::sun::star::awt::Rectangle& rShapeRect ) const;
const css::uno::Reference< css::drawing::XShapes >& rxShapes,
const css::awt::Rectangle& rShapeRect ) const;
/** Creates a new UNO shape object for a form control, inserts the control
model into the form, and the shape into the passed UNO shape container. */
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
css::uno::Reference< css::drawing::XShape >
createAndInsertXControlShape(
const ::oox::ole::EmbeddedControl& rControl,
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
const ::com::sun::star::awt::Rectangle& rShapeRect,
const css::uno::Reference< css::drawing::XShapes >& rxShapes,
const css::awt::Rectangle& rShapeRect,
sal_Int32& rnCtrlIndex ) const;
/** Derived classes may disable conversion of specific shapes. */
@ -163,24 +163,24 @@ public:
/** Derived classes may calculate the shape rectangle from a non-standard
anchor information string. */
virtual bool convertClientAnchor(
::com::sun::star::awt::Rectangle& orShapeRect,
css::awt::Rectangle& orShapeRect,
const OUString& rShapeAnchor ) const;
/** Derived classes create a UNO shape according to the passed shape model.
Called for shape models that specify being under host control. */
virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
virtual css::uno::Reference< css::drawing::XShape >
createAndInsertClientXShape(
const ShapeBase& rShape,
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
const ::com::sun::star::awt::Rectangle& rShapeRect ) const;
const css::uno::Reference< css::drawing::XShapes >& rxShapes,
const css::awt::Rectangle& rShapeRect ) const;
/** Derived classes may want to know that a UNO shape has been inserted.
Will be called from the convertAndInsert() implementation.
@param bGroupChild True = inserted into a group shape,
false = inserted directly into this drawing. */
virtual void notifyXShapeInserted(
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape,
const ::com::sun::star::awt::Rectangle& rShapeRect,
const css::uno::Reference< css::drawing::XShape >& rxShape,
const css::awt::Rectangle& rShapeRect,
const ShapeBase& rShape, bool bGroupChild );
private:
@ -191,7 +191,7 @@ private:
typedef ::std::map< OUString, ControlInfo > ControlInfoMap;
::oox::core::XmlFilterBase& mrFilter; ///< Filter object that imports/exports the VML drawing.
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >
css::uno::Reference< css::drawing::XDrawPage >
mxDrawPage; ///< UNO draw page used to insert the shapes.
mutable EmbeddedFormPtr mxCtrlForm; ///< The control form used to process embedded controls.
mutable BlockIdVector maBlockIds; ///< Block identifiers used by this drawing.

2
include/oox/vml/vmldrawingfragment.hxx
View File

@ -38,7 +38,7 @@ public:
const OUString& rFragmentPath,
Drawing& rDrawing );
virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
virtual css::uno::Reference< css::io::XInputStream >
openFragmentStream() const override;
virtual ::oox::core::ContextHandlerRef

6
include/oox/vml/vmlformatting.hxx
View File

@ -152,8 +152,8 @@ namespace ConversionHelper
@param rGraphicHelper See above.
*/
OOX_DLLPUBLIC void decodeVmlPath(
::std::vector< ::std::vector< ::com::sun::star::awt::Point > >& rPoints,
::std::vector< ::std::vector< ::com::sun::star::drawing::PolygonFlags > >& rFlags,
::std::vector< ::std::vector< css::awt::Point > >& rPoints,
::std::vector< ::std::vector< css::drawing::PolygonFlags > >& rFlags,
const OUString& rPath );
}
@ -244,7 +244,7 @@ struct OOX_DLLPUBLIC TextpathModel
TextpathModel();
/** Writes the properties to the passed property map. */
void pushToPropMap(oox::drawingml::ShapePropertyMap& rPropMap, com::sun::star::uno::Reference<com::sun::star::drawing::XShape> xShape) const;
void pushToPropMap(oox::drawingml::ShapePropertyMap& rPropMap, css::uno::Reference<css::drawing::XShape> xShape) const;
};
} // namespace vml

38
include/oox/vml/vmlinputstream.hxx
View File

@ -51,38 +51,38 @@ namespace vml {
3) Line breaks represented by a single <br> element (without matching
</br> element) are replaced by a literal LF character.
*/
class InputStream : public ::cppu::WeakImplHelper< ::com::sun::star::io::XInputStream >
class InputStream : public ::cppu::WeakImplHelper< css::io::XInputStream >
{
public:
explicit InputStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm );
const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const css::uno::Reference< css::io::XInputStream >& rxInStrm );
virtual ~InputStream();
virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& rData, sal_Int32 nBytesToRead )
throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& rData, sal_Int32 nMaxBytesToRead )
throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& rData, sal_Int32 nBytesToRead )
throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& rData, sal_Int32 nMaxBytesToRead )
throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
virtual sal_Int32 SAL_CALL available()
throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL closeInput()
throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
private:
void updateBuffer() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
OString readToElementBegin() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
OString readToElementEnd() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
void updateBuffer() throw (css::io::IOException, css::uno::RuntimeException);
OString readToElementBegin() throw (css::io::IOException, css::uno::RuntimeException);
OString readToElementEnd() throw (css::io::IOException, css::uno::RuntimeException);
private:
::com::sun::star::uno::Reference< ::com::sun::star::io::XTextInputStream2 >
css::uno::Reference< css::io::XTextInputStream2 >
mxTextStrm;
::com::sun::star::uno::Sequence< sal_Unicode > maOpeningBracket;
::com::sun::star::uno::Sequence< sal_Unicode > maClosingBracket;
const OString maOpeningCData;
const OString maClosingCData;
OString maBuffer;
css::uno::Sequence< sal_Unicode > maOpeningBracket;
css::uno::Sequence< sal_Unicode > maClosingBracket;
const OString maOpeningCData;
const OString maClosingCData;
OString maBuffer;
sal_Int32 mnBufferPos;
};

78
include/oox/vml/vmlshape.hxx
View File

@ -137,13 +137,13 @@ public:
protected:
/** Returns the coordinate system of this shape. */
::com::sun::star::awt::Rectangle getCoordSystem() const;
css::awt::Rectangle getCoordSystem() const;
/** Returns the absolute shape rectangle according to the passed anchor. */
::com::sun::star::awt::Rectangle getRectangle( const ShapeParentAnchor* pParentAnchor ) const;
css::awt::Rectangle getRectangle( const ShapeParentAnchor* pParentAnchor ) const;
/** Returns the absolute shape rectangle. */
virtual ::com::sun::star::awt::Rectangle getAbsRectangle() const;
virtual css::awt::Rectangle getAbsRectangle() const;
/** Returns the rectangle relative to the parent coordinate system. */
virtual ::com::sun::star::awt::Rectangle getRelRectangle() const;
virtual css::awt::Rectangle getRelRectangle() const;
protected:
Drawing& mrDrawing; ///< The VML drawing page that contains this shape.
@ -192,7 +192,7 @@ struct ClientData
struct ShapeModel
{
typedef ::std::vector< ::com::sun::star::awt::Point > PointVector;
typedef ::std::vector< css::awt::Point > PointVector;
typedef ::std::unique_ptr< TextBox > TextBoxPtr;
typedef ::std::unique_ptr< ClientData > ClientDataPtr;
@ -246,33 +246,33 @@ public:
virtual const ShapeBase* getChildById( const OUString& rShapeId ) const;
/** Creates the corresponding XShape and inserts it into the passed container. */
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
css::uno::Reference< css::drawing::XShape >
convertAndInsert(
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
const css::uno::Reference< css::drawing::XShapes >& rxShapes,
const ShapeParentAnchor* pParentAnchor = 0 ) const;
/** Converts position and formatting into the passed existing XShape. */
void convertFormatting(
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape,
const css::uno::Reference< css::drawing::XShape >& rxShape,
const ShapeParentAnchor* pParentAnchor = 0 ) const;
protected:
explicit ShapeBase( Drawing& rDrawing );
/** Derived classes create the corresponding XShape and insert it into the passed container. */
virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
virtual css::uno::Reference< css::drawing::XShape >
implConvertAndInsert(
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
const ::com::sun::star::awt::Rectangle& rShapeRect ) const = 0;
const css::uno::Reference< css::drawing::XShapes >& rxShapes,
const css::awt::Rectangle& rShapeRect ) const = 0;
/** Calculates the final shape rectangle according to the passed anchor,
if present, otherwise according to the own anchor settings. */
::com::sun::star::awt::Rectangle calcShapeRectangle(
css::awt::Rectangle calcShapeRectangle(
const ShapeParentAnchor* pParentAnchor ) const;
/** Converts common shape properties such as formatting attributes. */
void convertShapeProperties(
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape ) const;
const css::uno::Reference< css::drawing::XShape >& rxShape ) const;
protected:
ShapeModel maShapeModel; ///< The model structure containing shape data.
@ -290,14 +290,14 @@ public:
protected:
/** Creates the corresponding XShape and inserts it into the passed container. */
virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
virtual css::uno::Reference< css::drawing::XShape >
implConvertAndInsert(
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
const ::com::sun::star::awt::Rectangle& rShapeRect ) const override;
const css::uno::Reference< css::drawing::XShapes >& rxShapes,
const css::awt::Rectangle& rShapeRect ) const override;
/** Used by both RectangleShape and ComplexShape. */
com::sun::star::uno::Reference<com::sun::star::drawing::XShape>createPictureObject(
const com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rxShapes,
const com::sun::star::awt::Rectangle& rShapeRect, OUString& rGraphicPath ) const;
css::uno::Reference<css::drawing::XShape>createPictureObject(
const css::uno::Reference< css::drawing::XShapes >& rxShapes,
const css::awt::Rectangle& rShapeRect, OUString& rGraphicPath ) const;
private:
OUString maService; ///< Name of the UNO shape service.
@ -312,10 +312,10 @@ public:
explicit RectangleShape( Drawing& rDrawing );
protected:
/** Creates the corresponding XShape and inserts it into the passed container. */
virtual com::sun::star::uno::Reference<com::sun::star::drawing::XShape>
virtual css::uno::Reference<css::drawing::XShape>
implConvertAndInsert(
const com::sun::star::uno::Reference<com::sun::star::drawing::XShapes>& rxShapes,
const com::sun::star::awt::Rectangle& rShapeRect) const override;
const css::uno::Reference<css::drawing::XShapes>& rxShapes,
const css::awt::Rectangle& rShapeRect) const override;
};
@ -337,10 +337,10 @@ public:
protected:
/** Creates the corresponding XShape and inserts it into the passed container. */
virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
virtual css::uno::Reference< css::drawing::XShape >
implConvertAndInsert(
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
const ::com::sun::star::awt::Rectangle& rShapeRect ) const override;
const css::uno::Reference< css::drawing::XShapes >& rxShapes,
const css::awt::Rectangle& rShapeRect ) const override;
};
/** A Line shape object. */
@ -351,9 +351,9 @@ public:
protected:
/** Returns the absolute shape rectangle. */
virtual ::com::sun::star::awt::Rectangle getAbsRectangle() const override;
virtual css::awt::Rectangle getAbsRectangle() const override;
/** Returns the rectangle relative to the parent coordinate system. */
virtual ::com::sun::star::awt::Rectangle getRelRectangle() const override;
virtual css::awt::Rectangle getRelRectangle() const override;
};
/** Bezier shape object that supports to, from, control1 and control2
@ -365,10 +365,10 @@ public:
protected:
/** Creates the corresponding XShape and inserts it into the passed container. */
virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
virtual css::uno::Reference< css::drawing::XShape >
implConvertAndInsert(
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
const ::com::sun::star::awt::Rectangle& rShapeRect ) const override;
const css::uno::Reference< css::drawing::XShapes >& rxShapes,
const css::awt::Rectangle& rShapeRect ) const override;
};
@ -381,10 +381,10 @@ public:
protected:
/** Creates the corresponding XShape and inserts it into the passed container. */
virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
virtual css::uno::Reference< css::drawing::XShape >
implConvertAndInsert(
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
const ::com::sun::star::awt::Rectangle& rShapeRect ) const override;
const css::uno::Reference< css::drawing::XShapes >& rxShapes,
const css::awt::Rectangle& rShapeRect ) const override;
};
@ -398,10 +398,10 @@ public:
protected:
/** Creates the corresponding XShape and inserts it into the passed container. */
virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
virtual css::uno::Reference< css::drawing::XShape >
implConvertAndInsert(
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
const ::com::sun::star::awt::Rectangle& rShapeRect ) const override;
const css::uno::Reference< css::drawing::XShapes >& rxShapes,
const css::awt::Rectangle& rShapeRect ) const override;
};
@ -428,10 +428,10 @@ public:
protected:
/** Creates the corresponding XShape and inserts it into the passed container. */
virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
virtual css::uno::Reference< css::drawing::XShape >
implConvertAndInsert(
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
const ::com::sun::star::awt::Rectangle& rShapeRect ) const override;
const css::uno::Reference< css::drawing::XShapes >& rxShapes,
const css::awt::Rectangle& rShapeRect ) const override;
private:
typedef ::std::unique_ptr< ShapeContainer > ShapeContainerPtr;

6
include/oox/vml/vmlshapecontainer.hxx
View File

@ -40,8 +40,8 @@ class ShapeBase;
struct ShapeParentAnchor
{
::com::sun::star::awt::Rectangle maShapeRect;
::com::sun::star::awt::Rectangle maCoordSys;
css::awt::Rectangle maShapeRect;
css::awt::Rectangle maCoordSys;
};
@ -104,7 +104,7 @@ public:
/** Creates and inserts all UNO shapes into the passed container. */
void convertAndInsert(
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
const css::uno::Reference< css::drawing::XShapes >& rxShapes,
const ShapeParentAnchor* pParentAnchor = 0 ) const;
private:

2
include/oox/vml/vmltextbox.hxx
View File

@ -88,7 +88,7 @@ public:
const TextFontModel* getFirstFont() const;
/** Returns the entire text of all text portions. */
OUString getText() const;
void convert(com::sun::star::uno::Reference<com::sun::star::drawing::XShape> xShape) const;
void convert(css::uno::Reference<css::drawing::XShape> xShape) const;
ShapeTypeModel& mrTypeModel;
/// Text distance from the border (inset attribute of v:textbox), valid only if set.

8
include/package/Deflater.hxx
View File

@ -32,7 +32,7 @@ class DLLPUBLIC_PACKAGE Deflater
typedef struct z_stream_s z_stream;
protected:
com::sun::star::uno::Sequence< sal_Int8 > sInBuffer;
css::uno::Sequence< sal_Int8 > sInBuffer;
bool bFinish;
bool bFinished;
sal_Int32 nStrategy;
@ -40,16 +40,16 @@ protected:
z_stream* pStream;
void init (sal_Int32 nLevel, sal_Int32 nStrategy, bool bNowrap);
sal_Int32 doDeflateBytes (com::sun::star::uno::Sequence < sal_Int8 > &rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength);
sal_Int32 doDeflateBytes (css::uno::Sequence < sal_Int8 > &rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength);
public:
~Deflater();
Deflater(sal_Int32 nSetLevel, bool bNowrap);
void SAL_CALL setInputSegment( const ::com::sun::star::uno::Sequence< sal_Int8 >& rBuffer );
void SAL_CALL setInputSegment( const css::uno::Sequence< sal_Int8 >& rBuffer );
bool SAL_CALL needsInput( );
void SAL_CALL finish( );
bool SAL_CALL finished( ) { return bFinished;}
sal_Int32 SAL_CALL doDeflateSegment( ::com::sun::star::uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength );
sal_Int32 SAL_CALL doDeflateSegment( css::uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength );
sal_Int64 SAL_CALL getTotalIn( );
sal_Int64 SAL_CALL getTotalOut( );
void SAL_CALL reset( );

8
include/package/Inflater.hxx
View File

@ -35,16 +35,16 @@ protected:
bool bFinished, bSetParams, bNeedDict;
sal_Int32 nOffset, nLength, nLastInflateError;
z_stream* pStream;
com::sun::star::uno::Sequence < sal_Int8 > sInBuffer;
sal_Int32 doInflateBytes (com::sun::star::uno::Sequence < sal_Int8 > &rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength);
css::uno::Sequence < sal_Int8 > sInBuffer;
sal_Int32 doInflateBytes (css::uno::Sequence < sal_Int8 > &rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength);
public:
Inflater(bool bNoWrap = false);
~Inflater();
void SAL_CALL setInput( const ::com::sun::star::uno::Sequence< sal_Int8 >& rBuffer );
void SAL_CALL setInput( const css::uno::Sequence< sal_Int8 >& rBuffer );
bool SAL_CALL needsDictionary( ) { return bNeedDict;}
bool SAL_CALL finished( ) { return bFinished;}
sal_Int32 SAL_CALL doInflateSegment( ::com::sun::star::uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength );
sal_Int32 SAL_CALL doInflateSegment( css::uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength );
void SAL_CALL end( );
sal_Int32 getLastInflateError() { return nLastInflateError; }

22
include/sax/fastattribs.hxx
View File

@ -43,7 +43,7 @@ struct UnknownAttribute
UnknownAttribute( const OUString& rNamespaceURL, const OString& rName, const OString& value );
UnknownAttribute( const OString& rName, const OString& value );
void FillAttribute( ::com::sun::star::xml::Attribute* pAttrib ) const;
void FillAttribute( css::xml::Attribute* pAttrib ) const;
};
typedef std::vector< UnknownAttribute > UnknownAttributeList;
@ -71,10 +71,10 @@ class SAX_DLLPUBLIC FastTokenHandlerBase
const char *pStr, size_t nLength = 0 );
};
class SAX_DLLPUBLIC FastAttributeList : public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XFastAttributeList >
class SAX_DLLPUBLIC FastAttributeList : public ::cppu::WeakImplHelper1< css::xml::sax::XFastAttributeList >
{
public:
FastAttributeList( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastTokenHandler >& xTokenHandler,
FastAttributeList( const css::uno::Reference< css::xml::sax::XFastTokenHandler >& xTokenHandler,
FastTokenHandlerBase *pOptHandlerBase = NULL );
virtual ~FastAttributeList();
@ -95,13 +95,13 @@ public:
bool getAsChar( sal_Int32 nToken, const char*& rPos ) const;
// XFastAttributeList
virtual sal_Bool SAL_CALL hasAttribute( ::sal_Int32 Token ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::sal_Int32 SAL_CALL getValueToken( ::sal_Int32 Token ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::sal_Int32 SAL_CALL getOptionalValueToken( ::sal_Int32 Token, ::sal_Int32 Default ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getValue( ::sal_Int32 Token ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getOptionalValue( ::sal_Int32 Token ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::xml::Attribute > SAL_CALL getUnknownAttributes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::xml::FastAttribute > SAL_CALL getFastAttributes() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL hasAttribute( ::sal_Int32 Token ) throw (css::uno::RuntimeException, std::exception) override;
virtual ::sal_Int32 SAL_CALL getValueToken( ::sal_Int32 Token ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual ::sal_Int32 SAL_CALL getOptionalValueToken( ::sal_Int32 Token, ::sal_Int32 Default ) throw (css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getValue( ::sal_Int32 Token ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getOptionalValue( ::sal_Int32 Token ) throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< css::xml::Attribute > SAL_CALL getUnknownAttributes( ) throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< css::xml::FastAttribute > SAL_CALL getFastAttributes() throw (css::uno::RuntimeException, std::exception) override;
private:
sal_Char *mpChunk; ///< buffer to store all attribute values - null terminated strings
@ -112,7 +112,7 @@ private:
std::vector< sal_Int32 > maAttributeValues;
std::vector< sal_Int32 > maAttributeTokens;
UnknownAttributeList maUnknownAttributes;
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastTokenHandler > mxTokenHandler;
css::uno::Reference< css::xml::sax::XFastTokenHandler > mxTokenHandler;
FastTokenHandlerBase *mpTokenHandler;
};

26
include/sax/fastparser.hxx
View File

@ -43,8 +43,8 @@ class FastSaxParserImpl;
// This class implements the external Parser interface
class FASTSAX_DLLPUBLIC FastSaxParser
: public ::cppu::WeakImplHelper2<
::com::sun::star::xml::sax::XFastParser,
::com::sun::star::lang::XServiceInfo >
css::xml::sax::XFastParser,
css::lang::XServiceInfo >
{
FastSaxParserImpl* mpImpl;
@ -53,19 +53,19 @@ public:
virtual ~FastSaxParser();
// XFastParser
virtual void SAL_CALL parseStream( const ::com::sun::star::xml::sax::InputSource& aInputSource ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setFastDocumentHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastDocumentHandler >& Handler ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setTokenHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastTokenHandler >& Handler ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL registerNamespace( const OUString& NamespaceURL, sal_Int32 NamespaceToken ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getNamespaceURL( const OUString& rPrefix ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setErrorHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XErrorHandler >& Handler ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setEntityResolver( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XEntityResolver >& Resolver ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setLocale( const ::com::sun::star::lang::Locale& rLocale ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL parseStream( const css::xml::sax::InputSource& aInputSource ) throw (css::xml::sax::SAXException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setFastDocumentHandler( const css::uno::Reference< css::xml::sax::XFastDocumentHandler >& Handler ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setTokenHandler( const css::uno::Reference< css::xml::sax::XFastTokenHandler >& Handler ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL registerNamespace( const OUString& NamespaceURL, sal_Int32 NamespaceToken ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getNamespaceURL( const OUString& rPrefix ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setErrorHandler( const css::uno::Reference< css::xml::sax::XErrorHandler >& Handler ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setEntityResolver( const css::uno::Reference< css::xml::sax::XEntityResolver >& Resolver ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setLocale( const css::lang::Locale& rLocale ) throw (css::uno::RuntimeException, std::exception) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override;
bool hasNamespaceURL( const OUString& rPrefix ) const;
};

10
include/sax/fshelper.hxx
View File

@ -62,7 +62,7 @@ namespace sax_fastparser {
enum class MergeMarks { APPEND = 0, PREPEND = 1, POSTPONE = 2, IGNORE = 3 };
typedef ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList > XFastAttributeListRef;
typedef css::uno::Reference< css::xml::sax::XFastAttributeList > XFastAttributeListRef;
class FastSaxSerializer;
@ -70,7 +70,7 @@ class SAX_DLLPUBLIC FastSerializerHelper
{
public:
FastSerializerHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xOutputStream, bool bWriteHeader = true );
FastSerializerHelper( const css::uno::Reference< css::io::XOutputStream >& xOutputStream, bool bWriteHeader = true );
~FastSerializerHelper();
@ -133,13 +133,13 @@ public:
FastSerializerHelper* writeId(sal_Int32 tokenId);
::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > getOutputStream();
css::uno::Reference< css::io::XOutputStream > getOutputStream();
static FastAttributeList *createAttrList();
void mark(sal_Int32 nTag,
const ::com::sun::star::uno::Sequence< sal_Int32 >& rOrder =
::com::sun::star::uno::Sequence< sal_Int32 >() );
const css::uno::Sequence< sal_Int32 >& rOrder =
css::uno::Sequence< sal_Int32 >() );
void mergeTopMarks(sal_Int32 nTag,
MergeMarks eMergeType = MergeMarks::APPEND );

34
include/sax/tools/converter.hxx
View File

@ -50,7 +50,7 @@ namespace sax {
their internal representation to the textual form used in xml
and back.
All unit types are expressed as com::sun::star::util::MeasureUnit
All unit types are expressed as css::util::MeasureUnit
*/
@ -60,15 +60,15 @@ public:
/** convert string to measure using optional min and max values*/
static bool convertMeasure( sal_Int32& rValue,
const OUString& rString,
sal_Int16 nTargetUnit = ::com::sun::star::util::MeasureUnit::MM_100TH,
sal_Int16 nTargetUnit = css::util::MeasureUnit::MM_100TH,
sal_Int32 nMin = SAL_MIN_INT32,
sal_Int32 nMax = SAL_MAX_INT32 );
/** convert measure to string */
static void convertMeasure( OUStringBuffer& rBuffer,
sal_Int32 nMeasure,
sal_Int16 SourceUnit = ::com::sun::star::util::MeasureUnit::MM_100TH,
sal_Int16 nTargetUnit = ::com::sun::star::util::MeasureUnit::INCH );
sal_Int16 SourceUnit = css::util::MeasureUnit::MM_100TH,
sal_Int16 nTargetUnit = css::util::MeasureUnit::INCH );
/** convert string to boolean */
static bool convertBool( bool& rBool,
@ -151,47 +151,47 @@ public:
/** convert util::Duration to ISO "duration" string */
static void convertDuration(OUStringBuffer& rBuffer,
const ::com::sun::star::util::Duration& rDuration);
const css::util::Duration& rDuration);
/** convert ISO "duration" string to double; negative durations allowed */
static bool convertDuration(double & rfTime,
const OUString& rString);
/** convert ISO "duration" string to util::Duration */
static bool convertDuration(::com::sun::star::util::Duration& rDuration,
static bool convertDuration(css::util::Duration& rDuration,
const OUString& rString);
/** convert util::Date to ISO "date" string */
static void convertDate( OUStringBuffer& rBuffer,
const com::sun::star::util::Date& rDate,
const css::util::Date& rDate,
sal_Int16 const* pTimeZoneOffset);
/** convert util::DateTime to ISO "date" or "dateTime" string */
static void convertDateTime( OUStringBuffer& rBuffer,
const com::sun::star::util::DateTime& rDateTime,
const css::util::DateTime& rDateTime,
sal_Int16 const* pTimeZoneOffset,
bool bAddTimeIf0AM = false );
/** convert util::DateTime to ISO "time" or "dateTime" string */
static void convertTimeOrDateTime(OUStringBuffer& rBuffer,
const com::sun::star::util::DateTime& rDateTime,
const css::util::DateTime& rDateTime,
sal_Int16 const* pTimeZoneOffset);
/** convert ISO "date" or "dateTime" string to util::DateTime */
static bool parseDateTime( com::sun::star::util::DateTime& rDateTime,
static bool parseDateTime( css::util::DateTime& rDateTime,
boost::optional<sal_Int16> * pTimeZoneOffset,
const OUString& rString );
/** convert ISO "time" or "dateTime" string to util::DateTime */
static bool parseTimeOrDateTime(com::sun::star::util::DateTime& rDateTime,
static bool parseTimeOrDateTime(css::util::DateTime& rDateTime,
boost::optional<sal_Int16> * pTimeZoneOffset,
const OUString& rString);
/** convert ISO "date" or "dateTime" string to util::DateTime or
util::Date */
static bool parseDateOrDateTime(
com::sun::star::util::Date * pDate,
com::sun::star::util::DateTime & rDateTime,
css::util::Date * pDate,
css::util::DateTime & rDateTime,
bool & rbDateTime,
boost::optional<sal_Int16> * pTimeZoneOffset,
const OUString & rString );
@ -202,16 +202,16 @@ public:
sal_Int32 nPos );
/** encodes the given byte sequence into Base64 */
static void encodeBase64(OUStringBuffer& aStrBuffer, const com::sun::star::uno::Sequence<sal_Int8>& aPass);
static void encodeBase64(OUStringBuffer& aStrBuffer, const css::uno::Sequence<sal_Int8>& aPass);
// Decode a base 64 encoded string into a sequence of bytes. The first
// version can be used for attribute values only, because it does not
// return any chars left from conversion.
// For text submitted throgh the SAX characters call, the later method
// must be used!
static void decodeBase64(com::sun::star::uno::Sequence<sal_Int8>& aPass, const OUString& sBuffer);
static void decodeBase64(css::uno::Sequence<sal_Int8>& aPass, const OUString& sBuffer);
static sal_Int32 decodeBase64SomeChars(com::sun::star::uno::Sequence<sal_Int8>& aPass, const OUString& sBuffer);
static sal_Int32 decodeBase64SomeChars(css::uno::Sequence<sal_Int8>& aPass, const OUString& sBuffer);
static double GetConversionFactor(OUStringBuffer& rUnit, sal_Int16 nSourceUnit, sal_Int16 nTargetUnit);
static sal_Int16 GetUnitFromString(const OUString& rString, sal_Int16 nDefaultUnit);
@ -219,7 +219,7 @@ public:
/** convert an Any to string (typesafe) */
static bool convertAny(OUStringBuffer& rsValue,
OUStringBuffer& rsType ,
const ::com::sun::star::uno::Any& rValue);
const css::uno::Any& rValue);
};

88
include/sax/tools/documenthandleradapter.hxx
View File

@ -24,76 +24,76 @@ namespace sax
*
* See filters/source/odfflatxml/FlatXml.cxx for an example.
*/
class DocumentHandlerAdapter : public ::com::sun::star::xml::sax::XDocumentHandler
class DocumentHandlerAdapter : public css::xml::sax::XDocumentHandler
{
public:
// XDocumentHandler
virtual void SAL_CALL
startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override
startDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override
{
m_handler->startDocument();
}
virtual void SAL_CALL
endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override
endDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override
{
m_handler->endDocument();
}
virtual void SAL_CALL
startElement(const OUString& aName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttribs)
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs)
throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override
{
m_handler->startElement(aName, xAttribs);
}
virtual void SAL_CALL
endElement(const OUString& aName) throw (::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeException, std::exception) override
endElement(const OUString& aName) throw (css::xml::sax::SAXException,
css::uno::RuntimeException, std::exception) override
{
m_handler->endElement(aName);
}
virtual void SAL_CALL
characters(const OUString& aChars) throw (::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeException, std::exception) override
characters(const OUString& aChars) throw (css::xml::sax::SAXException,
css::uno::RuntimeException, std::exception) override
{
m_handler->characters(aChars);
}
virtual void SAL_CALL
ignorableWhitespace(const OUString& aWhitespaces) throw (::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeException, std::exception) override
ignorableWhitespace(const OUString& aWhitespaces) throw (css::xml::sax::SAXException,
css::uno::RuntimeException, std::exception) override
{
m_handler->ignorableWhitespace(aWhitespaces);
}
virtual void SAL_CALL
processingInstruction(const OUString& aTarget, const OUString& aData)
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override
throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override
{
m_handler->processingInstruction(aTarget, aData);
}
virtual void SAL_CALL
setDocumentLocator(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > & xLocator)
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override
setDocumentLocator(const css::uno::Reference< css::xml::sax::XLocator > & xLocator)
throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override
{
m_handler->setDocumentLocator(xLocator);
}
DocumentHandlerAdapter(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >& delegate);
DocumentHandlerAdapter(const css::uno::Reference< css::xml::sax::XDocumentHandler >& delegate);
DocumentHandlerAdapter() :
m_handler(::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > (0, ::com::sun::star::uno::UNO_QUERY))
m_handler(css::uno::Reference< css::xml::sax::XDocumentHandler > (0, css::uno::UNO_QUERY))
{
}
;
protected:
virtual void SAL_CALL
setDelegate(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >& delegate)
setDelegate(const css::uno::Reference< css::xml::sax::XDocumentHandler >& delegate)
{
m_handler = delegate;
}
virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > SAL_CALL
virtual css::uno::Reference< css::xml::sax::XDocumentHandler > SAL_CALL
getDelegate()
{
return m_handler;
@ -105,7 +105,7 @@ namespace sax
}
private:
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_handler;
css::uno::Reference< css::xml::sax::XDocumentHandler > m_handler;
};
@ -114,108 +114,108 @@ namespace sax
* It forwards all method calls to a delegate. An inheriting class only needs to override the
* methods it actually wants to modify.
*/
class ExtendedDocumentHandlerAdapter : public ::com::sun::star::xml::sax::XExtendedDocumentHandler
class ExtendedDocumentHandlerAdapter : public css::xml::sax::XExtendedDocumentHandler
{
public:
// XDocumentHandler
virtual void SAL_CALL
startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override
startDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override
{
m_handler->startDocument();
}
virtual void SAL_CALL
endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override
endDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override
{
m_handler->endDocument();
}
virtual void SAL_CALL
startElement(const OUString& aName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttribs)
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs)
throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override
{
m_handler->startElement(aName, xAttribs);
}
virtual void SAL_CALL
endElement(const OUString& aName) throw (::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeException, std::exception) override
endElement(const OUString& aName) throw (css::xml::sax::SAXException,
css::uno::RuntimeException, std::exception) override
{
m_handler->endElement(aName);
}
virtual void SAL_CALL
characters(const OUString& aChars) throw (::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeException, std::exception) override
characters(const OUString& aChars) throw (css::xml::sax::SAXException,
css::uno::RuntimeException, std::exception) override
{
m_handler->characters(aChars);
}
virtual void SAL_CALL
ignorableWhitespace(const OUString& aWhitespaces) throw (::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeException, std::exception) override
ignorableWhitespace(const OUString& aWhitespaces) throw (css::xml::sax::SAXException,
css::uno::RuntimeException, std::exception) override
{
m_handler->ignorableWhitespace(aWhitespaces);
}
virtual void SAL_CALL
processingInstruction(const OUString& aTarget, const OUString& aData)
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override
throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override
{
m_handler->processingInstruction(aTarget, aData);
}
virtual void SAL_CALL
setDocumentLocator(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > & xLocator)
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override
setDocumentLocator(const css::uno::Reference< css::xml::sax::XLocator > & xLocator)
throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override
{
m_handler->setDocumentLocator(xLocator);
}
// XExtendedDocumentHandler
virtual void SAL_CALL
startCDATA() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override
startCDATA() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override
{
m_handler->startCDATA();
}
virtual void SAL_CALL
endCDATA() throw (::com::sun::star::uno::RuntimeException, std::exception) override
endCDATA() throw (css::uno::RuntimeException, std::exception) override
{
m_handler->endCDATA();
}
virtual void SAL_CALL
comment(const OUString& sComment) throw (::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeException, std::exception) override
comment(const OUString& sComment) throw (css::xml::sax::SAXException,
css::uno::RuntimeException, std::exception) override
{
m_handler->comment(sComment);
}
virtual void SAL_CALL
unknown(const OUString& sString) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override
unknown(const OUString& sString) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override
{
m_handler->unknown(sString);
}
virtual void SAL_CALL
allowLineBreak() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override
allowLineBreak() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override
{
m_handler->allowLineBreak();
}
protected:
ExtendedDocumentHandlerAdapter() :
m_handler(::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XExtendedDocumentHandler > (0, ::com::sun::star::uno::UNO_QUERY))
m_handler(css::uno::Reference< css::xml::sax::XExtendedDocumentHandler > (0, css::uno::UNO_QUERY))
{
}
ExtendedDocumentHandlerAdapter(
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XExtendedDocumentHandler >& delegate) :
const css::uno::Reference< css::xml::sax::XExtendedDocumentHandler >& delegate) :
m_handler(delegate)
{
}
virtual void SAL_CALL
setDelegate(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XExtendedDocumentHandler >& delegate)
setDelegate(const css::uno::Reference< css::xml::sax::XExtendedDocumentHandler >& delegate)
{
m_handler = delegate;
}
virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XExtendedDocumentHandler > SAL_CALL
virtual css::uno::Reference< css::xml::sax::XExtendedDocumentHandler > SAL_CALL
getDelegate()
{
return m_handler;
@ -227,7 +227,7 @@ namespace sax
}
private:
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XExtendedDocumentHandler > m_handler;
css::uno::Reference< css::xml::sax::XExtendedDocumentHandler > m_handler;
};
}
#endif // INCLUDED_SAX_TOOLS_DOCUMENTHANDLERADAPTER_HXX

173
include/sfx2/DocumentMetadataAccess.hxx
View File

@ -59,12 +59,10 @@ namespace sfx2 {
@return a base URI suitable for XDocumentMetadataAccess::loadFromStorage
*/
::com::sun::star::uno::Reference< ::com::sun::star::rdf::XURI> SFX2_DLLPUBLIC
css::uno::Reference< css::rdf::XURI> SFX2_DLLPUBLIC
createBaseURI(
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>
const & i_xContext,
::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage>
const & i_xStorage,
css::uno::Reference< css::uno::XComponentContext> const & i_xContext,
css::uno::Reference< css::embed::XStorage> const & i_xStorage,
OUString const & i_rPkgURI,
OUString const & i_rSubDocument = OUString());
@ -75,125 +73,110 @@ struct DocumentMetadataAccess_Impl;
class SFX2_DLLPUBLIC DocumentMetadataAccess :
private boost::noncopyable,
public ::cppu::WeakImplHelper1<
::com::sun::star::rdf::XDocumentMetadataAccess>
public ::cppu::WeakImplHelper1< css::rdf::XDocumentMetadataAccess>
{
public:
explicit DocumentMetadataAccess(::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > const & i_xContext,
explicit DocumentMetadataAccess(css::uno::Reference< css::uno::XComponentContext > const & i_xContext,
IXmlIdRegistrySupplier const & i_rRegistrySupplier,
OUString const & i_rBaseURI);
// N.B.: in contrast to previous, this constructor does _not_ initialize!
// caller must immediately call loadFromStorage/Medium!
explicit DocumentMetadataAccess(::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > const & i_xContext,
explicit DocumentMetadataAccess(css::uno::Reference< css::uno::XComponentContext > const & i_xContext,
IXmlIdRegistrySupplier const & i_rRegistrySupplier);
virtual ~DocumentMetadataAccess();
// ::com::sun::star::rdf::XNode:
// css::rdf::XNode:
virtual OUString SAL_CALL getStringValue()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
// ::com::sun::star::rdf::XURI:
// css::rdf::XURI:
virtual OUString SAL_CALL getNamespace()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getLocalName()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
// ::com::sun::star::rdf::XRepositorySupplier:
virtual ::com::sun::star::uno::Reference<
::com::sun::star::rdf::XRepository > SAL_CALL getRDFRepository()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
// css::rdf::XRepositorySupplier:
virtual css::uno::Reference<
css::rdf::XRepository > SAL_CALL getRDFRepository()
throw (css::uno::RuntimeException, std::exception) override;
// ::com::sun::star::rdf::XDocumentMetadataAccess:
virtual ::com::sun::star::uno::Reference<
::com::sun::star::rdf::XMetadatable > SAL_CALL
// css::rdf::XDocumentMetadataAccess:
virtual css::uno::Reference<
css::rdf::XMetadatable > SAL_CALL
getElementByMetadataReference(
const ::com::sun::star::beans::StringPair & i_rReference)
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::rdf::XMetadatable > SAL_CALL
getElementByURI(const ::com::sun::star::uno::Reference<
::com::sun::star::rdf::XURI > & i_xURI)
throw (::com::sun::star::uno::RuntimeException,
::com::sun::star::lang::IllegalArgumentException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference<
::com::sun::star::rdf::XURI > > SAL_CALL getMetadataGraphsWithType(
const ::com::sun::star::uno::Reference<
::com::sun::star::rdf::XURI > & i_xType)
throw (::com::sun::star::uno::RuntimeException,
::com::sun::star::lang::IllegalArgumentException, std::exception) override;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::rdf::XURI> SAL_CALL
const css::beans::StringPair & i_rReference)
throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Reference< css::rdf::XMetadatable > SAL_CALL
getElementByURI(const css::uno::Reference< css::rdf::XURI > & i_xURI)
throw (css::uno::RuntimeException,
css::lang::IllegalArgumentException, std::exception) override;
virtual css::uno::Sequence< css::uno::Reference< css::rdf::XURI > > SAL_CALL getMetadataGraphsWithType(
const css::uno::Reference< css::rdf::XURI > & i_xType)
throw (css::uno::RuntimeException,
css::lang::IllegalArgumentException, std::exception) override;
virtual css::uno::Reference< css::rdf::XURI> SAL_CALL
addMetadataFile(const OUString & i_rFileName,
const ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Reference< ::com::sun::star::rdf::XURI >
> & i_rTypes)
throw (::com::sun::star::uno::RuntimeException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::container::ElementExistException, std::exception) override;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::rdf::XURI> SAL_CALL
const css::uno::Sequence< css::uno::Reference< css::rdf::XURI > > & i_rTypes)
throw (css::uno::RuntimeException,
css::lang::IllegalArgumentException,
css::container::ElementExistException, std::exception) override;
virtual css::uno::Reference< css::rdf::XURI> SAL_CALL
importMetadataFile(::sal_Int16 i_Format,
const ::com::sun::star::uno::Reference<
::com::sun::star::io::XInputStream > & i_xInStream,
const css::uno::Reference< css::io::XInputStream > & i_xInStream,
const OUString & i_rFileName,
const ::com::sun::star::uno::Reference<
::com::sun::star::rdf::XURI > & i_xBaseURI,
const ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Reference< ::com::sun::star::rdf::XURI >
> & i_rTypes)
throw (::com::sun::star::uno::RuntimeException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::datatransfer::UnsupportedFlavorException,
::com::sun::star::container::ElementExistException,
::com::sun::star::rdf::ParseException,
::com::sun::star::io::IOException, std::exception) override;
const css::uno::Reference< css::rdf::XURI > & i_xBaseURI,
const css::uno::Sequence< css::uno::Reference< css::rdf::XURI > > & i_rTypes)
throw (css::uno::RuntimeException,
css::lang::IllegalArgumentException,
css::datatransfer::UnsupportedFlavorException,
css::container::ElementExistException,
css::rdf::ParseException,
css::io::IOException, std::exception) override;
virtual void SAL_CALL removeMetadataFile(
const ::com::sun::star::uno::Reference<
::com::sun::star::rdf::XURI > & i_xGraphName)
throw (::com::sun::star::uno::RuntimeException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::container::NoSuchElementException, std::exception) override;
const css::uno::Reference<
css::rdf::XURI > & i_xGraphName)
throw (css::uno::RuntimeException,
css::lang::IllegalArgumentException,
css::container::NoSuchElementException, std::exception) override;
virtual void SAL_CALL addContentOrStylesFile(
const OUString & i_rFileName)
throw (::com::sun::star::uno::RuntimeException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::container::ElementExistException, std::exception) override;
throw (css::uno::RuntimeException,
css::lang::IllegalArgumentException,
css::container::ElementExistException, std::exception) override;
virtual void SAL_CALL removeContentOrStylesFile(
const OUString & i_rFileName)
throw (::com::sun::star::uno::RuntimeException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::container::NoSuchElementException, std::exception) override;
throw (css::uno::RuntimeException,
css::lang::IllegalArgumentException,
css::container::NoSuchElementException, std::exception) override;
virtual void SAL_CALL loadMetadataFromStorage(
const ::com::sun::star::uno::Reference<
::com::sun::star::embed::XStorage > & i_xStorage,
const ::com::sun::star::uno::Reference<
::com::sun::star::rdf::XURI > & i_xBaseURI,
const ::com::sun::star::uno::Reference<
::com::sun::star::task::XInteractionHandler> & i_xHandler)
throw (::com::sun::star::uno::RuntimeException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException, std::exception) override;
const css::uno::Reference<
css::embed::XStorage > & i_xStorage,
const css::uno::Reference<
css::rdf::XURI > & i_xBaseURI,
const css::uno::Reference<
css::task::XInteractionHandler> & i_xHandler)
throw (css::uno::RuntimeException,
css::lang::IllegalArgumentException,
css::lang::WrappedTargetException, std::exception) override;
virtual void SAL_CALL storeMetadataToStorage(
const ::com::sun::star::uno::Reference<
::com::sun::star::embed::XStorage > & i_xStorage)
throw (::com::sun::star::uno::RuntimeException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException, std::exception) override;
const css::uno::Reference<
css::embed::XStorage > & i_xStorage)
throw (css::uno::RuntimeException,
css::lang::IllegalArgumentException,
css::lang::WrappedTargetException, std::exception) override;
virtual void SAL_CALL loadMetadataFromMedium(
const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue > & i_rMedium)
throw (::com::sun::star::uno::RuntimeException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException, std::exception) override;
const css::uno::Sequence<
css::beans::PropertyValue > & i_rMedium)
throw (css::uno::RuntimeException,
css::lang::IllegalArgumentException,
css::lang::WrappedTargetException, std::exception) override;
virtual void SAL_CALL storeMetadataToMedium(
const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue > & i_rMedium)
throw (::com::sun::star::uno::RuntimeException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException, std::exception) override;
const css::uno::Sequence<
css::beans::PropertyValue > & i_rMedium)
throw (css::uno::RuntimeException,
css::lang::IllegalArgumentException,
css::lang::WrappedTargetException, std::exception) override;
private:
std::unique_ptr<DocumentMetadataAccess_Impl> m_pImpl;

36
include/sfx2/Metadatable.hxx
View File

@ -73,9 +73,8 @@ public:
// for MetadatableMixin ----------------------------------------------
::com::sun::star::beans::StringPair GetMetadataReference() const;
void SetMetadataReference(
const ::com::sun::star::beans::StringPair & i_rReference);
css::beans::StringPair GetMetadataReference() const;
void SetMetadataReference( const css::beans::StringPair & i_rReference);
void EnsureMetadataReference();
// hooks -------------------------------------------------------------
@ -116,8 +115,7 @@ public:
note: if IsInUndo or IsInClipboard return true,
MakeUnoObject <em>must not</em> be called!
*/
virtual ::com::sun::star::uno::Reference<
::com::sun::star::rdf::XMetadatable > MakeUnoObject() = 0;
virtual css::uno::Reference< css::rdf::XMetadatable > MakeUnoObject() = 0;
private:
Metadatable(const Metadatable&) = delete;
@ -138,7 +136,7 @@ private:
*/
class SFX2_DLLPUBLIC MetadatableMixin :
public ::cppu::WeakImplHelper1<
::com::sun::star::rdf::XMetadatable>
css::rdf::XMetadatable>
{
public:
@ -146,31 +144,31 @@ public:
virtual ~MetadatableMixin() {}
// ::com::sun::star::rdf::XNode:
// css::rdf::XNode:
virtual OUString SAL_CALL getStringValue()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
// ::com::sun::star::rdf::XURI:
// css::rdf::XURI:
virtual OUString SAL_CALL getLocalName()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getNamespace()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
// ::com::sun::star::rdf::XMetadatable:
virtual ::com::sun::star::beans::StringPair SAL_CALL getMetadataReference()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
// css::rdf::XMetadatable:
virtual css::beans::StringPair SAL_CALL getMetadataReference()
throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setMetadataReference(
const ::com::sun::star::beans::StringPair & i_rReference)
throw (::com::sun::star::uno::RuntimeException,
::com::sun::star::lang::IllegalArgumentException, std::exception) override;
const css::beans::StringPair & i_rReference)
throw (css::uno::RuntimeException,
css::lang::IllegalArgumentException, std::exception) override;
virtual void SAL_CALL ensureMetadataReference()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
protected:
/// get the core object corresponding to this UNO object.
virtual Metadatable * GetCoreObject() = 0;
/// get the XModel for the document
virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
virtual css::uno::Reference< css::frame::XModel >
GetModel() = 0;
};

5
include/sfx2/XmlIdRegistry.hxx
View File

@ -52,10 +52,9 @@ class SFX2_DLLPUBLIC IXmlIdRegistry
public:
virtual ~IXmlIdRegistry() { }
virtual ::com::sun::star::uno::Reference<
::com::sun::star::rdf::XMetadatable >
virtual css::uno::Reference< css::rdf::XMetadatable >
GetElementByMetadataReference(
const ::com::sun::star::beans::StringPair & i_rXmlId) const = 0;
const css::beans::StringPair & i_rXmlId) const = 0;
};

4
include/sfx2/app.hxx
View File

@ -175,8 +175,8 @@ public:
static ErrCode CallAppBasic( const OUString& i_macroName, SbxArray* i_args = NULL, SbxValue* i_ret = NULL )
{ return CallBasic( i_macroName, SfxApplication::GetBasicManager(), i_args, i_ret ); }
static BasicManager* GetBasicManager();
com::sun::star::script::XLibraryContainer * GetDialogContainer();
com::sun::star::script::XLibraryContainer * GetBasicContainer();
css::script::XLibraryContainer * GetDialogContainer();
css::script::XLibraryContainer * GetBasicContainer();
static StarBASIC* GetBasic();
sal_uInt16 SaveBasicAndDialogContainer() const;

14
include/sfx2/bindings.hxx
View File

@ -175,9 +175,9 @@ public:
SfxCallMode nCall = SfxCallMode::SLOT,
const SfxPoolItem **pInternalArgs = 0);
SAL_DLLPRIVATE void SetDispatchProvider_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > & rFrame );
void SetActiveFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > & rFrame );
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > GetActiveFrame() const;
SAL_DLLPRIVATE void SetDispatchProvider_Impl( const css::uno::Reference< css::frame::XDispatchProvider > & rFrame );
void SetActiveFrame( const css::uno::Reference< css::frame::XFrame > & rFrame );
const css::uno::Reference< css::frame::XFrame > GetActiveFrame() const;
// Reconfig
sal_uInt16 EnterRegistrations(const char *pFile = 0, int nLine = 0);
void LeaveRegistrations( sal_uInt16 nLevel = USHRT_MAX, const char *pFile = 0, int nLine = 0 );
@ -185,9 +185,9 @@ public:
void Release( SfxControllerItem& rBinding );
SfxDispatcher* GetDispatcher() const
{ return pDispatcher; }
com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > GetRecorder() const;
com::sun::star::uno::Reference < com::sun::star::frame::XDispatch >
GetDispatch( const SfxSlot*, const com::sun::star::util::URL& aURL, bool bMasterCommand );
css::uno::Reference< css::frame::XDispatchRecorder > GetRecorder() const;
css::uno::Reference < css::frame::XDispatch >
GetDispatch( const SfxSlot*, const css::util::URL& aURL, bool bMasterCommand );
SAL_DLLPRIVATE void ContextChanged_Impl();
SAL_DLLPRIVATE void Execute_Impl( SfxRequest& rReq, const SfxSlot* pSlot, SfxShell* pShell );
SAL_DLLPRIVATE void DeleteControllers_Impl();
@ -202,7 +202,7 @@ public:
SAL_DLLPRIVATE void RegisterUnoController_Impl( SfxUnoControllerItem* );
SAL_DLLPRIVATE void ReleaseUnoController_Impl( SfxUnoControllerItem* );
SAL_DLLPRIVATE bool ExecuteCommand_Impl( const OUString& rCommand );
SAL_DLLPRIVATE void SetRecorder_Impl( com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder >& );
SAL_DLLPRIVATE void SetRecorder_Impl( css::uno::Reference< css::frame::XDispatchRecorder >& );
SAL_DLLPRIVATE void InvalidateSlotsInMap_Impl();
SAL_DLLPRIVATE void AddSlotToInvalidateSlotsMap_Impl( sal_uInt16 nId );
};

4
include/sfx2/brokenpackageint.hxx
View File

@ -34,7 +34,7 @@ public:
RequestPackageReparation( const OUString& aName );
~RequestPackageReparation();
bool isApproved();
com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > GetRequest();
css::uno::Reference < css::task::XInteractionRequest > GetRequest();
};
class NotifyBrokenPackage_Impl;
@ -44,7 +44,7 @@ class SFX2_DLLPUBLIC NotifyBrokenPackage
public:
NotifyBrokenPackage( const OUString& aName );
~NotifyBrokenPackage();
com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > GetRequest();
css::uno::Reference < css::task::XInteractionRequest > GetRequest();
};
#endif // INCLUDED_SFX2_BROKENPACKAGEINT_HXX

2
include/sfx2/childwin.hxx
View File

@ -151,7 +151,7 @@ class SFX2_DLLPUBLIC SfxChildWindow
VclPtr<vcl::Window> pParent; // parent window ( Topwindow )
sal_uInt16 nType; // ChildWindow-Id
VclPtr<vcl::Window> pWindow; // actual contents
SfxChildAlignment eChildAlignment; // Current ::com::sun::star::drawing::Alignment
SfxChildAlignment eChildAlignment; // Current css::drawing::Alignment
SfxChildWindow_Impl* pImp; // Implementation data
SfxChildWindowContext* pContext; // With context-sensitive ChildWindows:
// Annother window in pWindow

61
include/sfx2/dinfdlg.hxx
View File

@ -67,11 +67,11 @@ private:
OUString m_DefaultTarget;
OUString m_TemplateName;
OUString m_Author;
::com::sun::star::util::DateTime m_CreationDate;
css::util::DateTime m_CreationDate;
OUString m_ModifiedBy;
::com::sun::star::util::DateTime m_ModificationDate;
css::util::DateTime m_ModificationDate;
OUString m_PrintedBy;
::com::sun::star::util::DateTime m_PrintDate;
css::util::DateTime m_PrintDate;
sal_Int16 m_EditingCycles;
sal_Int32 m_EditingDuration;
OUString m_Description;
@ -82,24 +82,21 @@ private:
bool m_bDeleteUserData;
bool m_bUseUserData;
std::vector< CustomProperty* > m_aCustomProperties;
::com::sun::star::uno::Sequence< ::com::sun::star::document::CmisProperty > m_aCmisProperties;
css::uno::Sequence< css::document::CmisProperty > m_aCmisProperties;
public:
TYPEINFO_OVERRIDE();
SfxDocumentInfoItem();
SfxDocumentInfoItem( const OUString &rFileName,
const ::com::sun::star::uno::Reference<
::com::sun::star::document::XDocumentProperties> & i_xDocProps,
const ::com::sun::star::uno::Sequence<
::com::sun::star::document::CmisProperty> & i_cmisProps,
const css::uno::Reference< css::document::XDocumentProperties> & i_xDocProps,
const css::uno::Sequence< css::document::CmisProperty> & i_cmisProps,
bool bUseUserData );
SfxDocumentInfoItem( const SfxDocumentInfoItem& );
virtual ~SfxDocumentInfoItem();
/// update i_xDocProps with the data in this object
void UpdateDocumentInfo(
const ::com::sun::star::uno::Reference<
::com::sun::star::document::XDocumentProperties> & i_xDocProps,
const css::uno::Reference< css::document::XDocumentProperties> & i_xDocProps,
bool i_bDoNotUpdateUserDefined = false)
const;
bool isCmisDocument() const { return m_aCmisProperties.getLength() > 0;}
@ -116,7 +113,7 @@ public:
OUString getAuthor() const { return m_Author; }
void setAuthor(const OUString& i_val) { m_Author = i_val; }
::com::sun::star::util::DateTime
css::util::DateTime
getCreationDate() const { return m_CreationDate; }
void setCreationDate(const css::util::DateTime& i_val) {
m_CreationDate = i_val;
@ -124,14 +121,14 @@ public:
OUString getModifiedBy() const { return m_ModifiedBy; }
void setModifiedBy(const OUString& i_val) { m_ModifiedBy = i_val; }
::com::sun::star::util::DateTime
css::util::DateTime
getModificationDate() const { return m_ModificationDate; }
void setModificationDate(const css::util::DateTime& i_val) {
m_ModificationDate = i_val;
}
OUString getPrintedBy() const { return m_PrintedBy; }
void setPrintedBy(const OUString& i_val) { m_PrintedBy = i_val; }
::com::sun::star::util::DateTime
css::util::DateTime
getPrintDate() const { return m_PrintDate; }
void setPrintDate(const css::util::DateTime& i_val) {
m_PrintDate = i_val;
@ -162,16 +159,16 @@ public:
std::vector< CustomProperty* > GetCustomProperties() const;
void ClearCustomProperties();
void AddCustomProperty( const OUString& sName,
const com::sun::star::uno::Any& rValue );
const css::uno::Any& rValue );
::com::sun::star::uno::Sequence< ::com::sun::star::document::CmisProperty >
css::uno::Sequence< css::document::CmisProperty >
GetCmisProperties() const { return m_aCmisProperties;}
void SetCmisProperties(const ::com::sun::star::uno::Sequence< ::com::sun::star::document::CmisProperty >& cmisProps );
void SetCmisProperties(const css::uno::Sequence< css::document::CmisProperty >& cmisProps );
virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const override;
virtual bool operator==( const SfxPoolItem& ) const override;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
};
// class SfxDocumentPage -------------------------------------------------
@ -321,14 +318,14 @@ public:
class CustomPropertiesDurationField : public Edit
{
CustomPropertyLine* m_pLine;
com::sun::star::util::Duration m_aDuration;
css::util::Duration m_aDuration;
protected:
virtual void RequestHelp(const HelpEvent& rEvt) override;
public:
CustomPropertiesDurationField(vcl::Window* pParent, WinBits nStyle, CustomPropertyLine* pLine);
void SetDuration( const com::sun::star::util::Duration& rDuration );
const com::sun::star::util::Duration& GetDuration() const { return m_aDuration; }
void SetDuration( const css::util::Duration& rDuration );
const css::util::Duration& GetDuration() const { return m_aDuration; }
};
class CustomPropertiesEditButton : public PushButton
@ -449,12 +446,12 @@ public:
bool InitControls( HeaderBar* pHeaderBar, const ScrollBar* pScrollBar );
sal_uInt16 GetVisibleLineCount() const;
inline sal_Int32 GetLineHeight() const { return m_nLineHeight; }
void AddLine( const OUString& sName, com::sun::star::uno::Any& rAny );
void AddLine( const OUString& sName, css::uno::Any& rAny );
bool AreAllLinesValid() const;
void ClearAllLines();
void DoScroll( sal_Int32 nNewPos );
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
css::uno::Sequence< css::beans::PropertyValue >
GetCustomProperties() const;
void SetRemovedHdl( const Link<void*,void>& rLink ) { m_aRemovedHdl = rLink; }
@ -482,11 +479,11 @@ public:
virtual ~CustomPropertiesControl();
virtual void dispose() override;
void AddLine( const OUString& sName, com::sun::star::uno::Any& rAny, bool bInteractive );
void AddLine( const OUString& sName, css::uno::Any& rAny, bool bInteractive );
inline bool AreAllLinesValid() const { return m_pPropertiesWin->AreAllLinesValid(); }
inline void ClearAllLines() { m_pPropertiesWin->ClearAllLines(); }
inline ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
inline css::uno::Sequence< css::beans::PropertyValue >
GetCustomProperties() const
{ return m_pPropertiesWin->GetCustomProperties(); }
void Init(VclBuilderContainer& rParent);
@ -529,7 +526,7 @@ struct CmisDateTime : public VclBuilderContainer
VclPtr<DateField> m_aDateField;
VclPtr<TimeField> m_aTimeField;
CmisDateTime( vcl::Window* pParent, const ::com::sun::star::util::DateTime& aDateTime );
CmisDateTime( vcl::Window* pParent, const css::util::DateTime& aDateTime );
};
struct CmisYesNo : public VclBuilderContainer
@ -581,12 +578,12 @@ public:
const OUString& sType, const bool bUpdatable,
const bool bRequired, const bool bMultiValued,
const bool bOpenChoice,
com::sun::star::uno::Any& aChoices,
com::sun::star::uno::Any& rAny );
css::uno::Any& aChoices,
css::uno::Any& rAny );
void ClearAllLines();
void DoScroll( sal_Int32 nNewPos );
::com::sun::star::uno::Sequence< ::com::sun::star::document::CmisProperty >
css::uno::Sequence< css::document::CmisProperty >
GetCmisProperties() const;
};
@ -610,11 +607,11 @@ public:
const OUString& sType, const bool bUpdatable,
const bool bRequired, const bool bMultiValude,
const bool bOpenChoice,
com::sun::star::uno::Any& aChoices,
com::sun::star::uno::Any& rAny );
css::uno::Any& aChoices,
css::uno::Any& rAny );
void ClearAllLines();
inline ::com::sun::star::uno::Sequence< ::com::sun::star::document::CmisProperty >
inline css::uno::Sequence< css::document::CmisProperty >
GetCmisProperties() const
{ return m_pPropertiesWin.GetCmisProperties(); }
};

2
include/sfx2/dispatch.hxx
View File

@ -174,7 +174,7 @@ public:
sal_uInt32 GetObjectBarId( sal_uInt16 nPos ) const;
SfxItemState QueryState( sal_uInt16 nSID, const SfxPoolItem* &rpState );
SfxItemState QueryState( sal_uInt16 nSID, ::com::sun::star::uno::Any& rAny );
SfxItemState QueryState( sal_uInt16 nSID, css::uno::Any& rAny );
void SetDisableFlags( sal_uInt32 nFlags );
sal_uInt32 GetDisableFlags() const;

8
include/sfx2/docfilt.hxx
View File

@ -109,11 +109,11 @@ public:
static OUString GetTypeFromStorage( const SotStorage& rStg );
static OUString GetTypeFromStorage(
const com::sun::star::uno::Reference<com::sun::star::embed::XStorage>& xStorage,
const css::uno::Reference<css::embed::XStorage>& xStorage,
bool bTemplate = false, OUString* pName = NULL )
throw ( com::sun::star::beans::UnknownPropertyException,
com::sun::star::lang::WrappedTargetException,
com::sun::star::uno::RuntimeException,
throw ( css::beans::UnknownPropertyException,
css::lang::WrappedTargetException,
css::uno::RuntimeException,
std::exception );
};

14
include/sfx2/docinf.hxx
View File

@ -43,8 +43,7 @@ namespace sfx2 {
@param i_pStorage OLE Storage
*/
sal_uInt32 SFX2_DLLPUBLIC LoadOlePropertySet(
::com::sun::star::uno::Reference<
::com::sun::star::document::XDocumentProperties> i_xDocProps,
css::uno::Reference< css::document::XDocumentProperties> i_xDocProps,
SotStorage* i_pStorage );
/** save document meta-data to OLE stream
@ -56,15 +55,14 @@ sal_uInt32 SFX2_DLLPUBLIC LoadOlePropertySet(
@param i_pHyperlinks Blob: Hyperlink blob ("_PID_HLINKS")
*/
bool SFX2_DLLPUBLIC SaveOlePropertySet(
::com::sun::star::uno::Reference<
::com::sun::star::document::XDocumentProperties> i_xDocProps,
css::uno::Reference< css::document::XDocumentProperties> i_xDocProps,
SotStorage* i_pStorage,
const ::com::sun::star::uno::Sequence<sal_uInt8> * i_pThumb = 0,
const ::com::sun::star::uno::Sequence<sal_uInt8> * i_pGuid = 0,
const ::com::sun::star::uno::Sequence<sal_uInt8> * i_pHyperlinks = 0);
const css::uno::Sequence<sal_uInt8> * i_pThumb = 0,
const css::uno::Sequence<sal_uInt8> * i_pGuid = 0,
const css::uno::Sequence<sal_uInt8> * i_pHyperlinks = 0);
::com::sun::star::uno::Sequence<sal_uInt8> SFX2_DLLPUBLIC convertMetaFile(
css::uno::Sequence<sal_uInt8> SFX2_DLLPUBLIC convertMetaFile(
GDIMetaFile* i_pThumb);
} // namespace sfx2

4
include/sfx2/dockwin.hxx
View File

@ -34,8 +34,8 @@ class SfxSplitWindow;
class SfxDockingWindow_Impl;
enum class SplitWindowItemFlags;
void SFX2_DLLPUBLIC SAL_CALL SfxDockingWindowFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const OUString& rDockingWindowName );
bool SFX2_DLLPUBLIC SAL_CALL IsDockingWindowVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const OUString& rDockingWindowName );
void SFX2_DLLPUBLIC SAL_CALL SfxDockingWindowFactory( const css::uno::Reference< css::frame::XFrame >& rFrame, const OUString& rDockingWindowName );
bool SFX2_DLLPUBLIC SAL_CALL IsDockingWindowVisible( const css::uno::Reference< css::frame::XFrame >& rFrame, const OUString& rDockingWindowName );
class SFX2_DLLPUBLIC SfxDockingWindow : public DockingWindow
{

27
include/sfx2/docmacromode.hxx
View File

@ -52,9 +52,9 @@ namespace sfx2
If no such mode was passed there, document implementations should return
MacroExecMode::NEVER_EXECUTE.
@see ::com::sun::star::document::MediaDescriptor::MacroExecutionMode
@see ::com::sun::star::frame::XComponentLoader::loadComponentFromURL
@see ::com::sun::star::frame::XModel::attachResource
@see css::document::MediaDescriptor::MacroExecutionMode
@see css::frame::XComponentLoader::loadComponentFromURL
@see css::frame::XModel::attachResource
@see setCurrentMacroExecMode
@ -77,9 +77,9 @@ namespace sfx2
Usually, a document implementation will simply put the macro execution mode
into its media descriptor, as returned by XModel::getArgs.
@see ::com::sun::star::document::MediaDescriptor::MacroExecutionMode
@see ::com::sun::star::frame::XComponentLoader::loadComponentFromURL
@see ::com::sun::star::frame::XModel::attachResource
@see css::document::MediaDescriptor::MacroExecutionMode
@see css::frame::XComponentLoader::loadComponentFromURL
@see css::frame::XModel::attachResource
see getCurrentMacroExecMode
*/
@ -121,7 +121,7 @@ namespace sfx2
can also be replaced with a call to the (to be introduced) getDocumentModel
method, and a queryInterface.
*/
virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XEmbeddedScripts >
virtual css::uno::Reference< css::document::XEmbeddedScripts >
getEmbeddedDocumentScripts() const = 0;
/** returns the state of the signatures for the scripts embedded in the document
@ -165,7 +165,7 @@ namespace sfx2
*/
virtual void
showBrokenSignatureWarning(
const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxInteraction
const css::uno::Reference< css::task::XInteractionHandler >& _rxInteraction
) const = 0;
protected:
@ -179,7 +179,7 @@ namespace sfx2
/** encapsulates handling the macro mode of a document
@see com::sun::star::document::MacroExecMode
@see css::document::MacroExecMode
*/
class SFX2_DLLPUBLIC DocumentMacroMode
{
@ -232,7 +232,7 @@ namespace sfx2
<TRUE/> if and only if macro execution in this document is allowed.
*/
bool adjustMacroMode(
const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxInteraction
const css::uno::Reference< css::task::XInteractionHandler >& _rxInteraction
);
/** determines whether macro execution is disallowed
@ -270,10 +270,9 @@ namespace sfx2
BeanShell-/JavaScript-/Python-Scripts are stored, and a sub storage named "Basic" (where
Basic scripts are stored).
*/
static bool
storageHasMacros( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _rxStorage );
static bool storageHasMacros( const css::uno::Reference< css::embed::XStorage >& _rxStorage );
static bool containerHasBasicMacros( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer >& xContainter );
static bool containerHasBasicMacros( const css::uno::Reference< css::script::XLibraryContainer >& xContainter );
/** checks the macro execution mode while loading the document.
This must be called when the loading is effectively finished, but before any macro action
@ -298,7 +297,7 @@ namespace sfx2
*/
bool
checkMacrosOnLoading(
const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxInteraction
const css::uno::Reference< css::task::XInteractionHandler >& _rxInteraction
);
private:

6
include/sfx2/docstoragemodifylistener.hxx
View File

@ -51,7 +51,7 @@ namespace sfx2
//= DocumentStorageModifyListener
typedef ::cppu::WeakImplHelper1 < ::com::sun::star::util::XModifyListener > DocumentStorageModifyListener_Base;
typedef ::cppu::WeakImplHelper1 < css::util::XModifyListener > DocumentStorageModifyListener_Base;
class SFX2_DLLPUBLIC DocumentStorageModifyListener : public DocumentStorageModifyListener_Base
{
@ -64,10 +64,10 @@ namespace sfx2
void dispose();
// XModifyListener
virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
// XEventListener
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override;
protected:
virtual ~DocumentStorageModifyListener();

4
include/sfx2/event.hxx
View File

@ -62,7 +62,7 @@ public:
class SFX2_DLLPUBLIC SfxViewEventHint : public SfxEventHint
{
::com::sun::star::uno::Reference< css::frame::XController2 > xViewController;
css::uno::Reference< css::frame::XController2 > xViewController;
public:
SfxViewEventHint( sal_uInt16 nId, const OUString& aName, SfxObjectShell *pObj, const css::uno::Reference< css::frame::XController >& xController )
@ -84,7 +84,7 @@ class Printer;
class SfxPrintingHint : public SfxViewEventHint
{
sal_Int32 mnPrintableState;
com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > aOpts;
css::uno::Sequence < css::beans::PropertyValue > aOpts;
public:
SfxPrintingHint(
sal_Int32 nEvent,

2
include/sfx2/evntconf.hxx
View File

@ -103,7 +103,7 @@ class SFX2_DLLPUBLIC SfxEventConfiguration
{
public:
static void ConfigureEvent( const OUString& aName, const SvxMacro&, SfxObjectShell* pObjSh);
static SvxMacro* ConvertToMacro( const com::sun::star::uno::Any& rElement, SfxObjectShell* pDoc, bool bBlowUp );
static SvxMacro* ConvertToMacro( const css::uno::Any& rElement, SfxObjectShell* pDoc, bool bBlowUp );
};
#endif

6
include/sfx2/fcontnr.hxx
View File

@ -85,8 +85,8 @@ public:
SAL_DLLPRIVATE static void ReadFilters_Impl( bool bUpdate=false );
SAL_DLLPRIVATE static void ReadSingleFilter_Impl( const OUString& rName,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xTypeCFG,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xFilterCFG,
const css::uno::Reference< css::container::XNameAccess >& xTypeCFG,
const css::uno::Reference< css::container::XNameAccess >& xFilterCFG,
bool bUpdate );
SAL_DLLPRIVATE static const SfxFilter* GetDefaultFilter_Impl( const OUString& );
};
@ -116,7 +116,7 @@ public:
const SfxFilter* GetFilter4Extension( const OUString& rExt, SfxFilterFlags nMust = SfxFilterFlags::IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
const SfxFilter* GetFilter4FilterName( const OUString& rName, SfxFilterFlags nMust = SfxFilterFlags::NONE, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
const SfxFilter* GetFilter4UIName( const OUString& rName, SfxFilterFlags nMust = SfxFilterFlags::NONE, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
const SfxFilter* GetFilterForProps( const com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue >& aSeq, SfxFilterFlags nMust = SfxFilterFlags::NONE, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
const SfxFilter* GetFilterForProps( const css::uno::Sequence < css::beans::NamedValue >& aSeq, SfxFilterFlags nMust = SfxFilterFlags::NONE, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
const SfxFilter* GetAnyFilter( SfxFilterFlags nMust=SfxFilterFlags::NONE, SfxFilterFlags nDont=SFX_FILTER_NOTINSTALLED ) const;
};

26
include/sfx2/filedlghelper.hxx
View File

@ -93,7 +93,7 @@ private:
Link<FileDialogHelper*,void> m_aDialogClosedLink;
ErrCode m_nError;
::com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XFilePickerListener > mxImp;
css::uno::Reference < css::ui::dialogs::XFilePickerListener > mxImp;
FileDialogHelper_Impl *mpImp;
@ -115,14 +115,14 @@ public:
SfxFilterFlags nMust,
SfxFilterFlags nDont,
const OUString& rStandardDir,
const ::com::sun::star::uno::Sequence< OUString >& rBlackList);
const css::uno::Sequence< OUString >& rBlackList);
FileDialogHelper( sal_Int16 nDialogType,
sal_Int64 nFlags,
const OUString& aFilterUIName,
const OUString& aExtName,
const OUString& rStandardDir,
const ::com::sun::star::uno::Sequence< OUString >& rBlackList,
const css::uno::Sequence< OUString >& rBlackList,
vcl::Window* _pPreferredParent = NULL );
@ -143,10 +143,10 @@ public:
to different folders. As this method always provides the root folder for all selected
files this cannot work.
*/
::com::sun::star::uno::Sequence< OUString > GetMPath() const;
css::uno::Sequence< OUString > GetMPath() const;
/** Provides the selected files with full path information */
::com::sun::star::uno::Sequence< OUString > GetSelectedFiles() const;
css::uno::Sequence< OUString > GetSelectedFiles() const;
void AddFilter( const OUString& rFilterName, const OUString& rExtension );
void SetCurrentFilter( const OUString& rFilter );
@ -169,7 +169,7 @@ public:
specifies the URL of the folder whose content is to be displayed.<br/>
If the URL doesn't denote a valid (existent and accessible) folder, the
request is silently dropped.
@throws ::com::sun::star::uno::RuntimeException
@throws css::uno::RuntimeException
if the invocation of any of the file picker or UCB methods throws a RuntimeException.
*/
void SetDisplayFolder( const OUString& _rURL );
@ -192,17 +192,17 @@ public:
OUString GetDisplayDirectory() const;
ErrCode GetGraphic( Graphic& rGraphic ) const;
::com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XFilePicker2 > GetFilePicker() const;
css::uno::Reference < css::ui::dialogs::XFilePicker2 > GetFilePicker() const;
// XFilePickerListener methods
void SAL_CALL FileSelectionChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent );
void SAL_CALL DirectoryChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent );
virtual void SAL_CALL ControlStateChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent );
void SAL_CALL FileSelectionChanged( const css::ui::dialogs::FilePickerEvent& aEvent );
void SAL_CALL DirectoryChanged( const css::ui::dialogs::FilePickerEvent& aEvent );
virtual void SAL_CALL ControlStateChanged( const css::ui::dialogs::FilePickerEvent& aEvent );
void SAL_CALL DialogSizeChanged();
static OUString SAL_CALL HelpRequested( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent );
static OUString SAL_CALL HelpRequested( const css::ui::dialogs::FilePickerEvent& aEvent );
// XDialogClosedListener methods
void SAL_CALL DialogClosed( const ::com::sun::star::ui::dialogs::DialogClosedEvent& _rEvent );
void SAL_CALL DialogClosed( const css::ui::dialogs::DialogClosedEvent& _rEvent );
/** sets help ids for the controls in the dialog
@param _pControlId
@ -245,7 +245,7 @@ ErrCode FileOpenDialog_Impl( sal_Int16 nDialogType,
const OUString* pPath = NULL,
sal_Int16 nDialog = SFX2_IMPL_DIALOG_CONFIG,
const OUString& rStandardDir = OUString(),
const ::com::sun::star::uno::Sequence< OUString >& rBlackList = ::com::sun::star::uno::Sequence< OUString >());
const css::uno::Sequence< OUString >& rBlackList = css::uno::Sequence< OUString >());
ErrCode RequestPassword(const SfxFilter* pCurrentFilter, OUString& aURL, SfxItemSet* pSet);

36
include/sfx2/frame.hxx
View File

@ -112,8 +112,8 @@ protected:
SAL_DLLPRIVATE SfxFrame( vcl::Window& i_rContainerWindow, bool bHidden );
public:
static SfxFrame* Create( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame );
static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >
static SfxFrame* Create( const css::uno::Reference< css::frame::XFrame >& xFrame );
static css::uno::Reference< css::frame::XFrame >
CreateBlankFrame();
static SfxFrame* Create( SfxObjectShell& rDoc, vcl::Window& rWindow, sal_uInt16 nViewId, bool bHidden );
@ -132,7 +132,7 @@ public:
static SfxFrame* GetNext( SfxFrame& );
static const SfxPoolItem*
OpenDocumentSynchron( SfxItemSet& aSet, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rTargetFrame );
OpenDocumentSynchron( SfxItemSet& aSet, const css::uno::Reference< css::frame::XFrame >& i_rTargetFrame );
SfxObjectShell* GetCurrentDocument() const;
SfxViewFrame* GetCurrentViewFrame() const;
@ -144,17 +144,17 @@ public:
void GetTargetList( TargetList& ) const;
void UpdateDescriptor( SfxObjectShell *pDoc );
void Resize();
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >
css::uno::Reference< css::frame::XFrame >
GetFrameInterface() const;
void Appear();
void AppearWithUpdate();
::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >
css::uno::Reference< css::frame::XController >
GetController() const;
bool IsInPlace() const;
SAL_DLLPRIVATE bool DoClose_Impl();
SAL_DLLPRIVATE void SetFrameInterface_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
SAL_DLLPRIVATE void SetFrameInterface_Impl( const css::uno::Reference< css::frame::XFrame >& rFrame );
SAL_DLLPRIVATE void ReleasingComponent_Impl( bool bSet );
SAL_DLLPRIVATE void GetViewData_Impl();
SAL_DLLPRIVATE void SetFrameType_Impl( sal_uInt32 );
@ -224,8 +224,8 @@ public:
virtual bool operator==( const SfxPoolItem& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
SfxFrame* GetFrame() const
{ return wFrame; }
@ -233,34 +233,34 @@ public:
class SFX2_DLLPUBLIC SfxUsrAnyItem : public SfxPoolItem
{
::com::sun::star::uno::Any aValue;
css::uno::Any aValue;
public:
TYPEINFO_OVERRIDE();
SfxUsrAnyItem( sal_uInt16 nWhich, const ::com::sun::star::uno::Any& rAny );
::com::sun::star::uno::Any GetValue() const
SfxUsrAnyItem( sal_uInt16 nWhich, const css::uno::Any& rAny );
css::uno::Any GetValue() const
{ return aValue; }
virtual bool operator==( const SfxPoolItem& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
};
class SFX2_DLLPUBLIC SfxUnoFrameItem : public SfxPoolItem
{
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >
css::uno::Reference< css::frame::XFrame >
m_xFrame;
public:
TYPEINFO_OVERRIDE();
SfxUnoFrameItem();
SfxUnoFrameItem( sal_uInt16 nWhich, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame );
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >&
SfxUnoFrameItem( sal_uInt16 nWhich, const css::uno::Reference< css::frame::XFrame >& i_rFrame );
const css::uno::Reference< css::frame::XFrame >&
GetFrame() const
{ return m_xFrame; }
virtual bool operator==( const SfxPoolItem& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
};
typedef SfxUsrAnyItem SfxUnoAnyItem;

5
include/sfx2/frmhtmlw.hxx
View File

@ -54,14 +54,13 @@ class SFX2_DLLPUBLIC SfxFrameHTMLWriter
public:
static void Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL,
const ::com::sun::star::uno::Reference<
::com::sun::star::document::XDocumentProperties>&,
const css::uno::Reference< css::document::XDocumentProperties>&,
const sal_Char *pIndent,
rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252,
OUString *pNonConvertableChars = 0 );
static void Out_FrameDescriptor(
SvStream&, const OUString& rBaseURL, const com::sun::star::uno::Reference < com::sun::star::beans::XPropertySet >& xSet,
SvStream&, const OUString& rBaseURL, const css::uno::Reference < css::beans::XPropertySet >& xSet,
rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252,
OUString *pNonConvertableChars = 0 );
};

Some files were not shown because too many files have changed in this diff Show More