[Libreoffice-commits] core.git: filter/source
Noel Grandin
noel at peralex.com
Thu Oct 1 03:22:57 PDT 2015
filter/source/config/cache/contenthandlerfactory.hxx | 14
filter/source/config/cache/frameloaderfactory.hxx | 14
filter/source/config/cache/querytokenizer.hxx | 12
filter/source/config/cache/registration.cxx | 6
filter/source/config/cache/typedetection.hxx | 6
filter/source/flash/impswfdialog.hxx | 4
filter/source/flash/swfdialog.hxx | 28 -
filter/source/flash/swfexporter.cxx | 2
filter/source/flash/swfexporter.hxx | 64 +-
filter/source/flash/swffilter.cxx | 36 -
filter/source/flash/swfwriter.hxx | 8
filter/source/graphicfilter/egif/egif.cxx | 2
filter/source/graphicfilter/eos2met/eos2met.cxx | 2
filter/source/graphicfilter/epbm/epbm.cxx | 2
filter/source/graphicfilter/epgm/epgm.cxx | 2
filter/source/graphicfilter/epict/epict.cxx | 2
filter/source/graphicfilter/eppm/eppm.cxx | 2
filter/source/graphicfilter/eps/eps.cxx | 8
filter/source/graphicfilter/eras/eras.cxx | 2
filter/source/graphicfilter/etiff/etiff.cxx | 2
filter/source/graphicfilter/expm/expm.cxx | 2
filter/source/graphicfilter/icgm/cgm.hxx | 4
filter/source/graphicfilter/icgm/outact.hxx | 32 -
filter/source/msfilter/escherex.cxx | 466 +++++++++---------
filter/source/msfilter/eschesdo.cxx | 26 -
filter/source/msfilter/eschesdo.hxx | 40 -
filter/source/msfilter/msdffimp.cxx | 88 +--
filter/source/msfilter/msoleexp.cxx | 2
filter/source/msfilter/svdfppt.cxx | 73 +-
filter/source/msfilter/util.cxx | 4
filter/source/odfflatxml/OdfFlatXml.cxx | 6
filter/source/pdf/impdialog.hxx | 54 +-
filter/source/pdf/pdfexport.cxx | 8
filter/source/pdf/pdfexport.hxx | 2
filter/source/pdf/pdffilter.cxx | 4
filter/source/pdf/pdfinteract.cxx | 2
filter/source/placeware/exporter.cxx | 4
filter/source/placeware/exporter.hxx | 20
filter/source/placeware/filter.cxx | 18
filter/source/storagefilterdetect/filterdetect.hxx | 32 -
filter/source/svg/impsvgdialog.hxx | 4
filter/source/svg/svgdialog.hxx | 44 -
filter/source/svg/svgexport.cxx | 10
filter/source/svg/svgfilter.cxx | 2
filter/source/svg/svgfilter.hxx | 2
filter/source/svg/svgfontexport.cxx | 6
filter/source/svg/svgreader.hxx | 12
filter/source/svg/svgwriter.cxx | 26 -
filter/source/svg/svgwriter.hxx | 16
filter/source/svg/test/odfserializer.cxx | 2
filter/source/svg/test/odfserializer.hxx | 4
filter/source/svg/test/svg2odf.cxx | 6
filter/source/t602/t602filter.cxx | 26 -
filter/source/t602/t602filter.hxx | 144 ++---
filter/source/textfilterdetect/filterdetect.cxx | 6
filter/source/textfilterdetect/filterdetect.hxx | 32 -
filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx | 18
filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx | 75 +-
filter/source/xmlfilterdetect/filterdetect.cxx | 6
filter/source/xsltdialog/typedetectionexport.hxx | 10
filter/source/xsltdialog/typedetectionimport.hxx | 24
filter/source/xsltdialog/xmlfiltercommon.hxx | 4
filter/source/xsltdialog/xmlfilterdialogcomponent.cxx | 22
filter/source/xsltdialog/xmlfilterjar.cxx | 2
filter/source/xsltdialog/xmlfilterjar.hxx | 10
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 6
filter/source/xsltdialog/xmlfiltersettingsdialog.hxx | 10
filter/source/xsltdialog/xmlfiltertabdialog.hxx | 4
filter/source/xsltdialog/xmlfiltertabpagexslt.cxx | 2
filter/source/xsltdialog/xmlfiltertestdialog.cxx | 14
filter/source/xsltdialog/xmlfiltertestdialog.hxx | 16
filter/source/xsltfilter/LibXSLTTransformer.hxx | 26 -
filter/source/xsltfilter/OleHandler.hxx | 30 -
filter/source/xsltfilter/XSLTFilter.cxx | 4
74 files changed, 858 insertions(+), 872 deletions(-)
New commits:
commit bd8a4ae22376cf9e43df3f4924d37daa8a0796c1
Author: Noel Grandin <noel at peralex.com>
Date: Wed Sep 30 14:17:06 2015 +0200
com::sun::star->css in filter/
Change-Id: I3a5e6a349c903259698118542b0000b0f119859e
diff --git a/filter/source/config/cache/contenthandlerfactory.hxx b/filter/source/config/cache/contenthandlerfactory.hxx
index ee7d2b2..2bb1eb5 100644
--- a/filter/source/config/cache/contenthandlerfactory.hxx
+++ b/filter/source/config/cache/contenthandlerfactory.hxx
@@ -128,21 +128,21 @@ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper< BaseContaine
// Overrides to resolve ambiguity
- virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+ virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return BaseContainer::getByName(aName); }
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+ virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return BaseContainer::getElementNames(); }
- virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+ virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return BaseContainer::hasByName(aName); }
- virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+ virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return BaseContainer::getElementType(); }
- virtual sal_Bool SAL_CALL hasElements() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+ virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return BaseContainer::hasElements(); }
- virtual ::com::sun::star::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery( const ::rtl::OUString& Query ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+ virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery( const ::rtl::OUString& Query ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return BaseContainer::createSubSetEnumerationByQuery(Query); }
- virtual ::com::sun::star::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties( const ::com::sun::star::uno::Sequence< css::beans::NamedValue >& Properties ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+ virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties( const css::uno::Sequence< css::beans::NamedValue >& Properties ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return BaseContainer::createSubSetEnumerationByProperties(Properties); }
diff --git a/filter/source/config/cache/frameloaderfactory.hxx b/filter/source/config/cache/frameloaderfactory.hxx
index 71553ca..c93fe1a 100644
--- a/filter/source/config/cache/frameloaderfactory.hxx
+++ b/filter/source/config/cache/frameloaderfactory.hxx
@@ -127,21 +127,21 @@ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper< BaseContainer
static css::uno::Reference< css::uno::XInterface > impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR);
// Overrides to resolve ambiguity
- virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+ virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return BaseContainer::getByName(aName); }
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+ virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return BaseContainer::getElementNames(); }
- virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+ virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return BaseContainer::hasByName(aName); }
- virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+ virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return BaseContainer::getElementType(); }
- virtual sal_Bool SAL_CALL hasElements() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+ virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return BaseContainer::hasElements(); }
- virtual ::com::sun::star::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery( const ::rtl::OUString& Query ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+ virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery( const ::rtl::OUString& Query ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return BaseContainer::createSubSetEnumerationByQuery(Query); }
- virtual ::com::sun::star::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties( const ::com::sun::star::uno::Sequence< css::beans::NamedValue >& Properties ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+ virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties( const css::uno::Sequence< css::beans::NamedValue >& Properties ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return BaseContainer::createSubSetEnumerationByProperties(Properties); }
};
diff --git a/filter/source/config/cache/querytokenizer.hxx b/filter/source/config/cache/querytokenizer.hxx
index cb754e5..823836f 100644
--- a/filter/source/config/cache/querytokenizer.hxx
+++ b/filter/source/config/cache/querytokenizer.hxx
@@ -29,16 +29,16 @@ namespace filter{
/** @short It can be used to split any query string (which can be used at the
- related interface <type scope="com::sun::star::container">XContainerQuery</type>)
+ related interface <type scope="css::container">XContainerQuery</type>)
into its different tokens using a fix schema.
@descr All queries implemented of the services
<ul>
- <li><type scope="com::sun::star::document">TypeDetection</type></li>
- <li><type scope="com::sun::star::document">FilterFactory</type></li>
- <li><type scope="com::sun::star::document">ExtendedTypeDetectionFactory</type></li>
- <li><type scope="com::sun::star::frame">FrameLoaderFactory</type></li>
- <li><type scope="com::sun::star::frame">ContentHandlerFactory</type></li>
+ <li><type scope="css::document">TypeDetection</type></li>
+ <li><type scope="css::document">FilterFactory</type></li>
+ <li><type scope="css::document">ExtendedTypeDetectionFactory</type></li>
+ <li><type scope="css::frame">FrameLoaderFactory</type></li>
+ <li><type scope="css::frame">ContentHandlerFactory</type></li>
</ul>
uses this schema.
diff --git a/filter/source/config/cache/registration.cxx b/filter/source/config/cache/registration.cxx
index 3687a24..d9e4318 100644
--- a/filter/source/config/cache/registration.cxx
+++ b/filter/source/config/cache/registration.cxx
@@ -40,9 +40,9 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL
if ((!pImplementationName) || (!pServiceManager ))
return NULL;
- com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >
- xSMGR = static_cast< com::sun::star::lang::XMultiServiceFactory* >(pServiceManager);
- com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > xFactory;
+ css::uno::Reference< css::lang::XMultiServiceFactory >
+ xSMGR = static_cast< css::lang::XMultiServiceFactory* >(pServiceManager);
+ css::uno::Reference< css::lang::XSingleServiceFactory > xFactory;
OUString sImplName = OUString::createFromAscii(pImplementationName);
if (TypeDetection::impl_getImplementationName() == sImplName)
diff --git a/filter/source/config/cache/typedetection.hxx b/filter/source/config/cache/typedetection.hxx
index f433a79..14e1794 100644
--- a/filter/source/config/cache/typedetection.hxx
+++ b/filter/source/config/cache/typedetection.hxx
@@ -67,10 +67,10 @@ public:
private:
bool impl_getPreselectionForType(
- const OUString& sPreSelType, const com::sun::star::util::URL& aParsedURL, FlatDetection& rFlatTypes, bool bDocService);
+ const OUString& sPreSelType, const css::util::URL& aParsedURL, FlatDetection& rFlatTypes, bool bDocService);
bool impl_getPreselectionForDocumentService(
- const OUString& sPreSelDocumentService, const com::sun::star::util::URL& aParsedURL, FlatDetection& rFlatTypes);
+ const OUString& sPreSelDocumentService, const css::util::URL& aParsedURL, FlatDetection& rFlatTypes);
OUString impl_getTypeFromFilter(const OUString& rFilterName);
@@ -78,7 +78,7 @@ private:
* Get all format types that we handle.
*/
void impl_getAllFormatTypes(
- const com::sun::star::util::URL& aParsedURL, utl::MediaDescriptor& rDescriptor,
+ const css::util::URL& aParsedURL, utl::MediaDescriptor& rDescriptor,
FlatDetection& rFlatTypes);
diff --git a/filter/source/flash/impswfdialog.hxx b/filter/source/flash/impswfdialog.hxx
index 5ff6f08..259d5a6 100644
--- a/filter/source/flash/impswfdialog.hxx
+++ b/filter/source/flash/impswfdialog.hxx
@@ -56,11 +56,11 @@ private:
public:
ImpSWFDialog( vcl::Window* pParent,
- com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rFilterData );
+ css::uno::Sequence< css::beans::PropertyValue >& rFilterData );
virtual ~ImpSWFDialog();
virtual void dispose() SAL_OVERRIDE;
- com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > GetFilterData();
+ css::uno::Sequence< css::beans::PropertyValue > GetFilterData();
};
#endif // INCLUDED_FILTER_SOURCE_FLASH_IMPSWFDIALOG_HXX
diff --git a/filter/source/flash/swfdialog.hxx b/filter/source/flash/swfdialog.hxx
index 2130f79..e004c15 100644
--- a/filter/source/flash/swfdialog.hxx
+++ b/filter/source/flash/swfdialog.hxx
@@ -34,44 +34,44 @@ class ResMgr;
class SWFDialog : public ::svt::OGenericUnoDialog,
public ::comphelper::OPropertyArrayUsageHelper< SWFDialog >,
- public ::com::sun::star::beans::XPropertyAccess,
- public ::com::sun::star::document::XExporter
+ public css::beans::XPropertyAccess,
+ public css::document::XExporter
{
private:
- com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > maMediaDescriptor;
- com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > maFilterData;
- com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mxSrcDoc;
+ css::uno::Sequence< css::beans::PropertyValue > maMediaDescriptor;
+ css::uno::Sequence< css::beans::PropertyValue > maFilterData;
+ css::uno::Reference< css::lang::XComponent > mxSrcDoc;
protected:
// XInterface
- virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& aType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE;
virtual void SAL_CALL release() throw () SAL_OVERRIDE;
// OGenericUnoDialog
- virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual VclPtr<Dialog> createDialog( vcl::Window* pParent ) SAL_OVERRIDE;
virtual void executedDialog( sal_Int16 nExecutionResult ) SAL_OVERRIDE;
- virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE;
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE;
// XPropertyAccess
using ::cppu::OPropertySetHelper::getPropertyValues;
using ::cppu::OPropertySetHelper::setPropertyValues;
- virtual com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues( ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL setPropertyValues( const com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps ) throw (com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XExporter
- virtual void SAL_CALL setSourceDocument( const com::sun::star::uno::Reference< com::sun::star::lang::XComponent >& xDoc ) throw(com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
public:
- SWFDialog( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext );
+ SWFDialog( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
virtual ~SWFDialog();
};
diff --git a/filter/source/flash/swfexporter.cxx b/filter/source/flash/swfexporter.cxx
index 2a6a700..8ddc7fd 100644
--- a/filter/source/flash/swfexporter.cxx
+++ b/filter/source/flash/swfexporter.cxx
@@ -591,7 +591,7 @@ void FlashExporter::exportShape( const Reference< XShape >& xShape, bool bMaster
try
{
- com::sun::star::awt::Rectangle aBoundRect;
+ css::awt::Rectangle aBoundRect;
xPropSet->getPropertyValue( "BoundRect" ) >>= aBoundRect;
std::unique_ptr<ShapeInfo> pShapeInfo(new ShapeInfo());
diff --git a/filter/source/flash/swfexporter.hxx b/filter/source/flash/swfexporter.hxx
index 7b08669..8895f39 100644
--- a/filter/source/flash/swfexporter.hxx
+++ b/filter/source/flash/swfexporter.hxx
@@ -64,32 +64,32 @@ public:
sal_Int32 mnWidth;
sal_Int32 mnHeight;
- ::com::sun::star::presentation::AnimationEffect meEffect;
- ::com::sun::star::presentation::AnimationEffect meTextEffect;
- ::com::sun::star::presentation::AnimationSpeed meEffectSpeed;
+ css::presentation::AnimationEffect meEffect;
+ css::presentation::AnimationEffect meTextEffect;
+ css::presentation::AnimationSpeed meEffectSpeed;
sal_Int32 mnPresOrder;
- ::com::sun::star::presentation::ClickAction meClickAction;
+ css::presentation::ClickAction meClickAction;
OUString maBookmark;
sal_Int32 mnDimColor;
- bool mbDimHide;
- bool mbDimPrev;
+ bool mbDimHide;
+ bool mbDimPrev;
- bool mbSoundOn;
- bool mbPlayFull;
- OUString maSoundURL;
+ bool mbSoundOn;
+ bool mbPlayFull;
+ OUString maSoundURL;
sal_Int32 mnBlueScreenColor;
ShapeInfo() :
mnID(0), mnX(0), mnY(0), mnWidth(0), mnHeight(0),
- meEffect( ::com::sun::star::presentation::AnimationEffect_NONE ),
- meTextEffect( ::com::sun::star::presentation::AnimationEffect_NONE ),
- meEffectSpeed( ::com::sun::star::presentation::AnimationSpeed_MEDIUM ),
+ meEffect( css::presentation::AnimationEffect_NONE ),
+ meTextEffect( css::presentation::AnimationEffect_NONE ),
+ meEffectSpeed( css::presentation::AnimationSpeed_MEDIUM ),
mnPresOrder( 0 ),
- meClickAction( ::com::sun::star::presentation::ClickAction_NONE ),
+ meClickAction( css::presentation::ClickAction_NONE ),
mnDimColor( 0 ),
mbDimHide( false ),
mbDimPrev( false ),
@@ -139,11 +139,11 @@ class FlashExporter
{
public:
FlashExporter(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
+ const css::uno::Reference< css::uno::XComponentContext >& rxContext,
// #i56084# variables for selection export
- const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxSelectedShapes,
- const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& rxSelectedDrawPage,
+ const css::uno::Reference< css::drawing::XShapes >& rxSelectedShapes,
+ const css::uno::Reference< css::drawing::XDrawPage >& rxSelectedDrawPage,
sal_Int32 nJPEGCompressMode = -1,
bool bExportOLEAsJPEG = false);
@@ -151,10 +151,10 @@ public:
void Flush();
- bool exportAll( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xDoc, com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > &xOutputStream, ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator> &xStatusIndicator );
- bool exportSlides( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > xDrawPage, com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > &xOutputStream, sal_uInt16 nPage);
- sal_uInt16 exportBackgrounds( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > xDrawPage, com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > &xOutputStream, sal_uInt16 nPage, bool bExportObjects );
- sal_uInt16 exportBackgrounds( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > xDrawPage, sal_uInt16 nPage, bool bExportObjects );
+ bool exportAll( css::uno::Reference< css::lang::XComponent > xDoc, css::uno::Reference< css::io::XOutputStream > &xOutputStream, css::uno::Reference< css::task::XStatusIndicator> &xStatusIndicator );
+ bool exportSlides( css::uno::Reference< css::drawing::XDrawPage > xDrawPage, css::uno::Reference< css::io::XOutputStream > &xOutputStream, sal_uInt16 nPage);
+ sal_uInt16 exportBackgrounds( css::uno::Reference< css::drawing::XDrawPage > xDrawPage, css::uno::Reference< css::io::XOutputStream > &xOutputStream, sal_uInt16 nPage, bool bExportObjects );
+ sal_uInt16 exportBackgrounds( css::uno::Reference< css::drawing::XDrawPage > xDrawPage, sal_uInt16 nPage, bool bExportObjects );
ChecksumCache gMasterCache;
ChecksumCache gPrivateCache;
@@ -162,28 +162,28 @@ public:
ChecksumCache gMetafileCache;
private:
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;
+ css::uno::Reference< css::uno::XComponentContext > mxContext;
// #i56084# variables for selection export
- const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > mxSelectedShapes;
- const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > mxSelectedDrawPage;
+ const css::uno::Reference< css::drawing::XShapes > mxSelectedShapes;
+ const css::uno::Reference< css::drawing::XDrawPage > mxSelectedDrawPage;
bool mbExportSelection;
- ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XGraphicExportFilter > mxGraphicExporter;
+ css::uno::Reference< css::drawing::XGraphicExportFilter > mxGraphicExporter;
::std::map<sal_uInt32, PageInfo> maPagesMap;
- sal_uInt16 exportDrawPageBackground(sal_uInt16 nPage, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage);
- sal_uInt16 exportMasterPageObjects(sal_uInt16 nPage, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xMasterPage);
+ sal_uInt16 exportDrawPageBackground(sal_uInt16 nPage, css::uno::Reference< css::drawing::XDrawPage >& xPage);
+ sal_uInt16 exportMasterPageObjects(sal_uInt16 nPage, css::uno::Reference< css::drawing::XDrawPage >& xMasterPage);
- void exportDrawPageContents( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage, bool bStream, bool bMaster );
- void exportShapes( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xShapes, bool bStream, bool bMaster );
- void exportShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape, bool bMaster);
+ void exportDrawPageContents( const css::uno::Reference< css::drawing::XDrawPage >& xPage, bool bStream, bool bMaster );
+ void exportShapes( const css::uno::Reference< css::drawing::XShapes >& xShapes, bool bStream, bool bMaster );
+ void exportShape( const css::uno::Reference< css::drawing::XShape >& xShape, bool bMaster);
- BitmapChecksum ActionSummer(::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape);
- BitmapChecksum ActionSummer(::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xShapes);
+ BitmapChecksum ActionSummer(css::uno::Reference< css::drawing::XShape >& xShape);
+ BitmapChecksum ActionSummer(css::uno::Reference< css::drawing::XShapes >& xShapes);
- bool getMetaFile( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >&xComponent, GDIMetaFile& rMtf, bool bOnlyBackground = false, bool bExportAsJPEG = false );
+ bool getMetaFile( css::uno::Reference< css::lang::XComponent >&xComponent, GDIMetaFile& rMtf, bool bOnlyBackground = false, bool bExportAsJPEG = false );
Writer* mpWriter;
diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx
index 7d18c20..b51a4bc 100644
--- a/filter/source/flash/swffilter.cxx
+++ b/filter/source/flash/swffilter.cxx
@@ -62,7 +62,7 @@ using ::com::sun::star::frame::XModel;
namespace swf {
-class OslOutputStreamWrapper : public ::cppu::WeakImplHelper<com::sun::star::io::XOutputStream>
+class OslOutputStreamWrapper : public ::cppu::WeakImplHelper<css::io::XOutputStream>
{
osl::File mrFile;
@@ -74,12 +74,12 @@ public:
}
// css::io::XOutputStream
- virtual void SAL_CALL writeBytes( const ::com::sun::star::uno::Sequence< sal_Int8 >& aData ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL flush( ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL closeOutput( ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL flush( ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL closeOutput( ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
-void SAL_CALL OslOutputStreamWrapper::writeBytes( const ::com::sun::star::uno::Sequence< sal_Int8 >& aData ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL OslOutputStreamWrapper::writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception)
{
sal_uInt64 uBytesToWrite = aData.getLength();
sal_uInt64 uBytesWritten = 0;
@@ -104,7 +104,7 @@ void SAL_CALL OslOutputStreamWrapper::writeBytes( const ::com::sun::star::uno::S
case osl::File::E_NOLINK: // Link has been severed
case osl::File::E_NOSPC: // No space left on device
case osl::File::E_NXIO: // No such device or address
- throw com::sun::star::io::IOException(); // TODO: Better error handling
+ throw css::io::IOException(); // TODO: Better error handling
default: break;
}
@@ -113,11 +113,11 @@ void SAL_CALL OslOutputStreamWrapper::writeBytes( const ::com::sun::star::uno::S
}
}
-void SAL_CALL OslOutputStreamWrapper::flush( ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL OslOutputStreamWrapper::flush( ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception)
{
}
-void SAL_CALL OslOutputStreamWrapper::closeOutput( ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL OslOutputStreamWrapper::closeOutput( ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception)
{
osl::File::RC eRC = mrFile.close();
@@ -130,7 +130,7 @@ void SAL_CALL OslOutputStreamWrapper::closeOutput( ) throw (::com::sun::star::i
case osl::File::E_NOLINK: // Link has been severed
case osl::File::E_NOSPC: // No space left on device
case osl::File::E_IO: // I/O error
- throw com::sun::star::io::IOException(); // TODO: Better error handling
+ throw css::io::IOException(); // TODO: Better error handling
default: break;
}
}
@@ -139,10 +139,10 @@ void SAL_CALL OslOutputStreamWrapper::closeOutput( ) throw (::com::sun::star::i
class FlashExportFilter : public cppu::WeakImplHelper
<
- com::sun::star::document::XFilter,
- com::sun::star::document::XExporter,
- com::sun::star::lang::XInitialization,
- com::sun::star::lang::XServiceInfo
+ css::document::XFilter,
+ css::document::XExporter,
+ css::lang::XInitialization,
+ css::lang::XServiceInfo
>
{
Reference< XComponent > mxDoc;
@@ -230,7 +230,7 @@ TYPE findPropertyValue(const Sequence< PropertyValue >& aPropertySequence, const
return def;
}
-sal_Bool SAL_CALL FlashExportFilter::filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
+sal_Bool SAL_CALL FlashExportFilter::filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor )
throw (RuntimeException, std::exception)
{
mxStatusIndicator = findPropertyValue<Reference<XStatusIndicator> >(aDescriptor, "StatusIndicator", mxStatusIndicator);
@@ -483,8 +483,8 @@ void SAL_CALL FlashExportFilter::cancel( )
// XExporter
-void SAL_CALL FlashExportFilter::setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc )
- throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException, std::exception)
+void SAL_CALL FlashExportFilter::setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc )
+ throw (css::lang::IllegalArgumentException, RuntimeException, std::exception)
{
mxDoc = xDoc;
}
@@ -492,7 +492,7 @@ void SAL_CALL FlashExportFilter::setSourceDocument( const ::com::sun::star::uno:
// XInitialization
-void SAL_CALL FlashExportFilter::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& /* aArguments */ )
+void SAL_CALL FlashExportFilter::initialize( const css::uno::Sequence< css::uno::Any >& /* aArguments */ )
throw (Exception, RuntimeException, std::exception)
{
}
@@ -531,7 +531,7 @@ sal_Bool SAL_CALL FlashExportFilter::supportsService( const OUString& rServiceNa
return cppu::supportsService( this, rServiceName );
}
-::com::sun::star::uno::Sequence< OUString > SAL_CALL FlashExportFilter::getSupportedServiceNames( )
+css::uno::Sequence< OUString > SAL_CALL FlashExportFilter::getSupportedServiceNames( )
throw (RuntimeException, std::exception)
{
return FlashExportFilter_getSupportedServiceNames();
diff --git a/filter/source/flash/swfwriter.hxx b/filter/source/flash/swfwriter.hxx
index a9a795f..64a3dac 100644
--- a/filter/source/flash/swfwriter.hxx
+++ b/filter/source/flash/swfwriter.hxx
@@ -267,7 +267,7 @@ public:
Writer( sal_Int32 nDocWidthInput, sal_Int32 nDocHeightInput, sal_Int32 nDocWidth, sal_Int32 nDocHeight, sal_Int32 nJPEGcompressMode = -1 );
~Writer();
- void storeTo( com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > &xOutStream );
+ void storeTo( css::uno::Reference< css::io::XOutputStream > &xOutStream );
// geometry
void setClipping( const tools::PolyPolygon* pClipPolyPolygon );
@@ -375,10 +375,10 @@ private:
const double P3x, const double P3y,
const double P4x, const double P4y );
- com::sun::star::uno::Reference < com::sun::star::i18n::XBreakIterator > Impl_GetBreakIterator();
+ css::uno::Reference < css::i18n::XBreakIterator > Impl_GetBreakIterator();
private:
- com::sun::star::uno::Reference< com::sun::star::i18n::XBreakIterator > mxBreakIterator;
+ css::uno::Reference< css::i18n::XBreakIterator > mxBreakIterator;
FontMap maFonts;
@@ -410,7 +410,7 @@ private:
sal_uInt16 mnNextId;
sal_uInt32 mnFrames;
-// com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > mxOutStream;
+// css::uno::Reference< css::io::XOutputStream > mxOutStream;
oslFileHandle mxOutStream;
utl::TempFile maMovieTempFile;
diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx
index d2b1695..2ac0c0f 100644
--- a/filter/source/graphicfilter/egif/egif.cxx
+++ b/filter/source/graphicfilter/egif/egif.cxx
@@ -63,7 +63,7 @@ class GIFWriter
void WriteBitmapEx( const BitmapEx& rBmpEx, const Point& rPoint, bool bExtended,
long nTimer = 0, Disposal eDisposal = DISPOSE_NOT );
- com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator;
+ css::uno::Reference< css::task::XStatusIndicator > xStatusIndicator;
public:
diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx
index a65a4cc..0fcbbdb 100644
--- a/filter/source/graphicfilter/eos2met/eos2met.cxx
+++ b/filter/source/graphicfilter/eos2met/eos2met.cxx
@@ -159,7 +159,7 @@ private:
ScopedVclPtr<VirtualDevice> apDummyVDev;
VclPtr<OutputDevice> pCompDev;
- com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator;
+ css::uno::Reference< css::task::XStatusIndicator > xStatusIndicator;
void MayCallback();
// calculates a percentage based on the 5 parameters above and then does a
diff --git a/filter/source/graphicfilter/epbm/epbm.cxx b/filter/source/graphicfilter/epbm/epbm.cxx
index 1e1118a..f848c80 100644
--- a/filter/source/graphicfilter/epbm/epbm.cxx
+++ b/filter/source/graphicfilter/epbm/epbm.cxx
@@ -43,7 +43,7 @@ private:
void ImplWriteBody();
void ImplWriteNumber( sal_Int32 );
- com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator;
+ css::uno::Reference< css::task::XStatusIndicator > xStatusIndicator;
public:
PBMWriter(SvStream &rPBM);
diff --git a/filter/source/graphicfilter/epgm/epgm.cxx b/filter/source/graphicfilter/epgm/epgm.cxx
index 71b3309..d27e7c1 100644
--- a/filter/source/graphicfilter/epgm/epgm.cxx
+++ b/filter/source/graphicfilter/epgm/epgm.cxx
@@ -43,7 +43,7 @@ private:
void ImplWriteBody();
void ImplWriteNumber( sal_Int32 );
- com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator;
+ css::uno::Reference< css::task::XStatusIndicator > xStatusIndicator;
public:
PGMWriter(SvStream &rStream);
diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx
index b4afb21..b421497 100644
--- a/filter/source/graphicfilter/epict/epict.cxx
+++ b/filter/source/graphicfilter/epict/epict.cxx
@@ -67,7 +67,7 @@ private:
bool bStatus;
sal_uLong nLastPercent; // with which number pCallback has been called the last time
- com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator;
+ css::uno::Reference< css::task::XStatusIndicator > xStatusIndicator;
SvStream * pPict;
diff --git a/filter/source/graphicfilter/eppm/eppm.cxx b/filter/source/graphicfilter/eppm/eppm.cxx
index dfd48d3..8210edf 100644
--- a/filter/source/graphicfilter/eppm/eppm.cxx
+++ b/filter/source/graphicfilter/eppm/eppm.cxx
@@ -43,7 +43,7 @@ private:
void ImplWriteBody();
void ImplWriteNumber( sal_Int32 );
- com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator;
+ css::uno::Reference< css::task::XStatusIndicator > xStatusIndicator;
public:
PPMWriter(SvStream &rStrm);
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index 2a58563..e62e31d 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -159,7 +159,7 @@ private:
sal_uInt32 nOffset;
sal_uInt32 dwShift;
- com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator;
+ css::uno::Reference< css::task::XStatusIndicator > xStatusIndicator;
void ImplWriteProlog( const Graphic* pPreviewEPSI = NULL );
void ImplWriteEpilog();
@@ -2497,17 +2497,17 @@ void PSWriter::ImplWriteLineInfo( const LineInfo& rLineInfo )
}
switch(rLineInfo.GetLineCap())
{
- default: /* com::sun::star::drawing::LineCap_BUTT */
+ default: /* css::drawing::LineCap_BUTT */
{
aCapType = SvtGraphicStroke::capButt;
break;
}
- case com::sun::star::drawing::LineCap_ROUND:
+ case css::drawing::LineCap_ROUND:
{
aCapType = SvtGraphicStroke::capRound;
break;
}
- case com::sun::star::drawing::LineCap_SQUARE:
+ case css::drawing::LineCap_SQUARE:
{
aCapType = SvtGraphicStroke::capSquare;
break;
diff --git a/filter/source/graphicfilter/eras/eras.cxx b/filter/source/graphicfilter/eras/eras.cxx
index 3950a40..1f23212 100644
--- a/filter/source/graphicfilter/eras/eras.cxx
+++ b/filter/source/graphicfilter/eras/eras.cxx
@@ -40,7 +40,7 @@ private:
sal_uLong mnRepCount;
sal_uInt8 mnRepVal;
- com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator;
+ css::uno::Reference< css::task::XStatusIndicator > xStatusIndicator;
void ImplCallback( sal_uLong nCurrentYPos );
bool ImplWriteHeader();
diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx
index 619187c..afc51cd 100644
--- a/filter/source/graphicfilter/etiff/etiff.cxx
+++ b/filter/source/graphicfilter/etiff/etiff.cxx
@@ -92,7 +92,7 @@ private:
sal_uInt32 nOffset;
sal_uInt32 dwShift;
- com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator;
+ css::uno::Reference< css::task::XStatusIndicator > xStatusIndicator;
void ImplCallback( sal_uInt32 nPercent );
bool ImplWriteHeader( bool bMultiPage );
diff --git a/filter/source/graphicfilter/expm/expm.cxx b/filter/source/graphicfilter/expm/expm.cxx
index fca1788..ade4279 100644
--- a/filter/source/graphicfilter/expm/expm.cxx
+++ b/filter/source/graphicfilter/expm/expm.cxx
@@ -36,7 +36,7 @@ private:
sal_uLong mnWidth, mnHeight; // size in Pixel
sal_uInt16 mnColors;
- com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator;
+ css::uno::Reference< css::task::XStatusIndicator > xStatusIndicator;
void ImplCallback( sal_uInt16 nPercent );
bool ImplWriteHeader();
diff --git a/filter/source/graphicfilter/icgm/cgm.hxx b/filter/source/graphicfilter/icgm/cgm.hxx
index 6d05221..50d6e62 100644
--- a/filter/source/graphicfilter/icgm/cgm.hxx
+++ b/filter/source/graphicfilter/icgm/cgm.hxx
@@ -137,9 +137,9 @@ class CGM
~CGM();
- CGM( sal_uInt32 nMode, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > const & rModel );
+ CGM( sal_uInt32 nMode, css::uno::Reference< css::frame::XModel > const & rModel );
GDIMetaFile* mpGDIMetaFile;
- sal_uInt32 GetBackGroundColor();
+ sal_uInt32 GetBackGroundColor();
bool IsValid() const { return mbStatus; };
bool IsFinished() const { return mbIsFinished; };
bool Write( SvStream& rIStm );
diff --git a/filter/source/graphicfilter/icgm/outact.hxx b/filter/source/graphicfilter/icgm/outact.hxx
index c38e819..ecd6179 100644
--- a/filter/source/graphicfilter/icgm/outact.hxx
+++ b/filter/source/graphicfilter/icgm/outact.hxx
@@ -34,12 +34,12 @@
#include <chart.hxx>
#include <tools/poly.hxx>
-typedef struct NodeFrameSet
+struct NodeFrameSet
{
- Point nTopLeft;
- Point nBottomRight;
- ::com::sun::star::awt::Size nSize;
-} NodeFrameSet;
+ Point nTopLeft;
+ Point nBottomRight;
+ css::awt::Size nSize;
+};
class CGM;
class CGMBitmapDescriptor;
@@ -86,32 +86,32 @@ public:
virtual void DrawPolyLine( tools::Polygon& ) {} ;
virtual void DrawPolybezier( tools::Polygon& ) {} ;
virtual void DrawPolyPolygon( tools::PolyPolygon& ) {} ;
- virtual void DrawText( ::com::sun::star::awt::Point&, ::com::sun::star::awt::Size&, char*, sal_uInt32, FinalFlag ) {} ;
+ virtual void DrawText( css::awt::Point&, css::awt::Size&, char*, sal_uInt32, FinalFlag ) {} ;
virtual void AppendText( char*, sal_uInt32, FinalFlag ) {} ;
virtual void DrawChart(){} ;
};
class CGMImpressOutAct : public CGMOutAct
{
- ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPages > maXDrawPages;
- ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > maXDrawPage;
+ css::uno::Reference< css::drawing::XDrawPages > maXDrawPages;
+ css::uno::Reference< css::drawing::XDrawPage > maXDrawPage;
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > maXMultiServiceFactory;
- ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > maXShape;
- bool ImplCreateShape( const OUString& rType );
+ css::uno::Reference< css::lang::XMultiServiceFactory > maXMultiServiceFactory;
+ css::uno::Reference< css::drawing::XShape > maXShape;
- ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > maXPropSet;
- ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > maXShapes;
+ css::uno::Reference< css::beans::XPropertySet > maXPropSet;
+ css::uno::Reference< css::drawing::XShapes > maXShapes;
sal_uInt32 nFinalTextCount;
+ bool ImplCreateShape( const OUString& rType );
bool ImplInitPage();
void ImplSetOrientation( FloatPoint& RefPoint, double& Orientation ) ;
void ImplSetLineBundle() ;
void ImplSetFillBundle() ;
- void ImplSetTextBundle( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & ) ;
+ void ImplSetTextBundle( const css::uno::Reference< css::beans::XPropertySet > & ) ;
public:
- CGMImpressOutAct( CGM&, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & ) ;
+ CGMImpressOutAct( CGM&, const css::uno::Reference< css::frame::XModel > & ) ;
virtual ~CGMImpressOutAct() {} ;
virtual void InsertPage() SAL_OVERRIDE ;
virtual void BeginGroup() SAL_OVERRIDE ;
@@ -126,7 +126,7 @@ public:
virtual void DrawPolyLine( tools::Polygon& ) SAL_OVERRIDE ;
virtual void DrawPolybezier( tools::Polygon& ) SAL_OVERRIDE ;
virtual void DrawPolyPolygon( tools::PolyPolygon& ) SAL_OVERRIDE ;
- virtual void DrawText( ::com::sun::star::awt::Point& TextRectPos, ::com::sun::star::awt::Size& TextRectSize, char* String, sal_uInt32 StringSize, FinalFlag ) SAL_OVERRIDE ;
+ virtual void DrawText( css::awt::Point& TextRectPos, css::awt::Size& TextRectSize, char* String, sal_uInt32 StringSize, FinalFlag ) SAL_OVERRIDE ;
virtual void AppendText( char* String, sal_uInt32 StringSize, FinalFlag ) SAL_OVERRIDE ;
virtual void DrawChart() SAL_OVERRIDE;
};
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 639414e..7629b86 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -341,7 +341,7 @@ sal_uInt32 EscherPropertyContainer::ImplGetColor( const sal_uInt32 nSOColor, boo
}
sal_uInt32 EscherPropertyContainer::GetGradientColor(
- const ::com::sun::star::awt::Gradient* pGradient,
+ const css::awt::Gradient* pGradient,
sal_uInt32 nStartColor )
{
sal_uInt32 nIntensity = 100;
@@ -367,7 +367,7 @@ sal_uInt32 EscherPropertyContainer::GetGradientColor(
}
void EscherPropertyContainer::CreateGradientProperties(
- const ::com::sun::star::awt::Gradient & rGradient )
+ const css::awt::Gradient & rGradient )
{
sal_uInt32 nFillType = ESCHER_FillShadeScale;
sal_uInt32 nAngle = 0;
@@ -379,8 +379,8 @@ void EscherPropertyContainer::CreateGradientProperties(
switch ( rGradient.Style )
{
- case ::com::sun::star::awt::GradientStyle_LINEAR :
- case ::com::sun::star::awt::GradientStyle_AXIAL :
+ case css::awt::GradientStyle_LINEAR :
+ case css::awt::GradientStyle_AXIAL :
{
nFillType = ESCHER_FillShadeScale;
nAngle = (rGradient.Angle * 0x10000) / 10;
@@ -388,10 +388,10 @@ void EscherPropertyContainer::CreateGradientProperties(
sal::static_int_cast<int>(GradientStyle_LINEAR)) ? 0 : 50;
}
break;
- case ::com::sun::star::awt::GradientStyle_RADIAL :
- case ::com::sun::star::awt::GradientStyle_ELLIPTICAL :
- case ::com::sun::star::awt::GradientStyle_SQUARE :
- case ::com::sun::star::awt::GradientStyle_RECT :
+ case css::awt::GradientStyle_RADIAL :
+ case css::awt::GradientStyle_ELLIPTICAL :
+ case css::awt::GradientStyle_SQUARE :
+ case css::awt::GradientStyle_RECT :
{
nFillLR = (rGradient.XOffset * 0x10000) / 100;
nFillTB = (rGradient.YOffset * 0x10000) / 100;
@@ -403,7 +403,7 @@ void EscherPropertyContainer::CreateGradientProperties(
bWriteFillTo = true;
}
break;
- case ::com::sun::star::awt::GradientStyle_MAKE_FIXED_SIZE : break;
+ case css::awt::GradientStyle_MAKE_FIXED_SIZE : break;
}
AddOpt( ESCHER_Prop_fillType, nFillType );
AddOpt( ESCHER_Prop_fillAngle, nAngle );
@@ -420,10 +420,10 @@ void EscherPropertyContainer::CreateGradientProperties(
}
void EscherPropertyContainer::CreateGradientProperties(
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet , bool bTransparentGradient)
+ const css::uno::Reference< css::beans::XPropertySet > & rXPropSet , bool bTransparentGradient)
{
- ::com::sun::star::uno::Any aAny;
- ::com::sun::star::awt::Gradient const * pGradient = NULL;
+ css::uno::Any aAny;
+ css::awt::Gradient const * pGradient = NULL;
sal_uInt32 nFillType = ESCHER_FillShadeScale;
sal_Int32 nAngle = 0;
@@ -439,16 +439,16 @@ void EscherPropertyContainer::CreateGradientProperties(
{
pGradient = static_cast<css::awt::Gradient const *>(aAny.getValue());
- ::com::sun::star::uno::Any aAnyTemp;
+ css::uno::Any aAnyTemp;
const rtl::OUString aPropName( "FillStyle" );
if ( EscherPropertyValueHelper::GetPropertyValue(
aAnyTemp, rXPropSet, aPropName ) )
{
- ::com::sun::star::drawing::FillStyle eFS;
+ css::drawing::FillStyle eFS;
if ( ! ( aAnyTemp >>= eFS ) )
- eFS = ::com::sun::star::drawing::FillStyle_SOLID;
+ eFS = css::drawing::FillStyle_SOLID;
// solid and transparency
- if ( eFS == ::com::sun::star::drawing::FillStyle_SOLID)
+ if ( eFS == css::drawing::FillStyle_SOLID)
{
if ( EscherPropertyValueHelper::GetPropertyValue(
aAnyTemp, rXPropSet, OUString( "FillColor" ) ) )
@@ -458,7 +458,7 @@ void EscherPropertyContainer::CreateGradientProperties(
}
}
// gradient and transparency.
- else if( eFS == ::com::sun::star::drawing::FillStyle_GRADIENT )
+ else if( eFS == css::drawing::FillStyle_GRADIENT )
{
if ( EscherPropertyValueHelper::GetPropertyValue(
aAny, rXPropSet, OUString( "FillGradient" ) ) )
@@ -478,8 +478,8 @@ void EscherPropertyContainer::CreateGradientProperties(
{
switch ( pGradient->Style )
{
- case ::com::sun::star::awt::GradientStyle_LINEAR :
- case ::com::sun::star::awt::GradientStyle_AXIAL :
+ case css::awt::GradientStyle_LINEAR :
+ case css::awt::GradientStyle_AXIAL :
{
nFillType = ESCHER_FillShadeScale;
nAngle = pGradient->Angle;
@@ -488,7 +488,7 @@ void EscherPropertyContainer::CreateGradientProperties(
// Value of the real number = Integral + (Fractional / 65536.0)
nAngle = ( nAngle * 0x10000) / 10;
- nFillFocus = (pGradient->Style == ::com::sun::star::awt::GradientStyle_LINEAR) ?
+ nFillFocus = (pGradient->Style == css::awt::GradientStyle_LINEAR) ?
( pGradient->XOffset + pGradient->YOffset )/2 : -50;
if( !nFillFocus )
nFirstColor=nFirstColor ^ 1;
@@ -496,10 +496,10 @@ void EscherPropertyContainer::CreateGradientProperties(
nFirstColor=nFirstColor ^ 1;
}
break;
- case ::com::sun::star::awt::GradientStyle_RADIAL :
- case ::com::sun::star::awt::GradientStyle_ELLIPTICAL :
- case ::com::sun::star::awt::GradientStyle_SQUARE :
- case ::com::sun::star::awt::GradientStyle_RECT :
+ case css::awt::GradientStyle_RADIAL :
+ case css::awt::GradientStyle_ELLIPTICAL :
+ case css::awt::GradientStyle_SQUARE :
+ case css::awt::GradientStyle_RECT :
{
// according to the import logic and rect type fill** value
nFillLR = (pGradient->XOffset * 0x10000) / 100;
@@ -552,8 +552,8 @@ void EscherPropertyContainer::CreateGradientProperties(
}
void EscherPropertyContainer::CreateFillProperties(
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
- bool bEdge , const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape )
+ const css::uno::Reference< css::beans::XPropertySet > & rXPropSet,
+ bool bEdge , const css::uno::Reference< css::drawing::XShape > & rXShape )
{
if ( rXShape.is() )
{
@@ -570,11 +570,11 @@ void EscherPropertyContainer::CreateFillProperties(
}
void EscherPropertyContainer::CreateFillProperties(
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
+ const css::uno::Reference< css::beans::XPropertySet > & rXPropSet,
bool bEdge , bool bTransparentGradient)
{
- ::com::sun::star::uno::Any aAny;
+ css::uno::Any aAny;
AddOpt( ESCHER_Prop_WrapText, ESCHER_WrapNone );
AddOpt( ESCHER_Prop_AnchorText, ESCHER_AnchorMiddle );
const OUString aPropName( "FillStyle" );
@@ -582,41 +582,41 @@ void EscherPropertyContainer::CreateFillProperties(
if ( EscherPropertyValueHelper::GetPropertyValue(
aAny, rXPropSet, aPropName ) )
{
- ::com::sun::star::drawing::FillStyle eFS;
+ css::drawing::FillStyle eFS;
if ( ! ( aAny >>= eFS ) )
- eFS = ::com::sun::star::drawing::FillStyle_SOLID;
+ eFS = css::drawing::FillStyle_SOLID;
sal_uInt32 nFillBackColor = 0;
switch( eFS )
{
- case ::com::sun::star::drawing::FillStyle_GRADIENT :
+ case css::drawing::FillStyle_GRADIENT :
{
CreateGradientProperties( rXPropSet , bTransparentGradient );
AddOpt( ESCHER_Prop_fNoFillHitTest, 0x140014 );
}
break;
- case ::com::sun::star::drawing::FillStyle_BITMAP :
+ case css::drawing::FillStyle_BITMAP :
{
CreateGraphicProperties( rXPropSet, OUString( "FillBitmapURL" ), true );
AddOpt( ESCHER_Prop_fNoFillHitTest, 0x140014 );
AddOpt( ESCHER_Prop_fillBackColor, nFillBackColor );
}
break;
- case ::com::sun::star::drawing::FillStyle_HATCH :
+ case css::drawing::FillStyle_HATCH :
{
CreateGraphicProperties( rXPropSet, OUString( "FillHatch" ), true );
}
break;
- case ::com::sun::star::drawing::FillStyle_SOLID :
+ case css::drawing::FillStyle_SOLID :
default:
{
if ( bTransparentGradient )
CreateGradientProperties( rXPropSet , bTransparentGradient );
else
{
- ::com::sun::star::beans::PropertyState ePropState = EscherPropertyValueHelper::GetPropertyState(
+ css::beans::PropertyState ePropState = EscherPropertyValueHelper::GetPropertyState(
rXPropSet, aPropName );
- if ( ePropState == ::com::sun::star::beans::PropertyState_DIRECT_VALUE )
+ if ( ePropState == css::beans::PropertyState_DIRECT_VALUE )
AddOpt( ESCHER_Prop_fillType, ESCHER_FillSolid );
if ( EscherPropertyValueHelper::GetPropertyValue(
@@ -631,11 +631,11 @@ void EscherPropertyContainer::CreateFillProperties(
}
break;
}
- case ::com::sun::star::drawing::FillStyle_NONE :
+ case css::drawing::FillStyle_NONE :
AddOpt( ESCHER_Prop_fNoFillHitTest, 0x100000 );
break;
}
- if ( eFS != ::com::sun::star::drawing::FillStyle_NONE )
+ if ( eFS != css::drawing::FillStyle_NONE )
{
sal_uInt16 nTransparency = ( EscherPropertyValueHelper::GetPropertyValue(
aAny, rXPropSet, OUString( "FillTransparence" ), true ) )
@@ -838,7 +838,7 @@ void EscherPropertyContainer::CreateTextProperties(
}
bool EscherPropertyContainer::GetLineArrow( const bool bLineStart,
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
+ const css::uno::Reference< css::beans::XPropertySet > & rXPropSet,
ESCHER_LineEnd& reLineEnd, sal_Int32& rnArrowLength, sal_Int32& rnArrowWidth )
{
static const char sLineStart [] = "LineStart";
@@ -851,7 +851,7 @@ bool EscherPropertyContainer::GetLineArrow( const bool bLineStart,
bool bIsArrow = false;
- ::com::sun::star::uno::Any aAny;
+ css::uno::Any aAny;
if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, sLine ) )
{
tools::PolyPolygon aPolyPoly( EscherPropertyContainer::GetPolyPolygon( aAny ) );
@@ -939,10 +939,10 @@ bool EscherPropertyContainer::GetLineArrow( const bool bLineStart,
}
void EscherPropertyContainer::CreateLineProperties(
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
+ const css::uno::Reference< css::beans::XPropertySet > & rXPropSet,
bool bEdge )
{
- ::com::sun::star::uno::Any aAny;
+ css::uno::Any aAny;
sal_uInt32 nLineFlags = 0x80008;
ESCHER_LineEnd eLineEnd;
@@ -952,10 +952,10 @@ void EscherPropertyContainer::CreateLineProperties(
bool bSwapLineEnds = false;
if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "CircleKind" ), true ) )
{
- ::com::sun::star::drawing::CircleKind eCircleKind;
+ css::drawing::CircleKind eCircleKind;
if ( aAny >>= eCircleKind )
{
- if ( eCircleKind == ::com::sun::star::drawing::CircleKind_ARC )
+ if ( eCircleKind == css::drawing::CircleKind_ARC )
bSwapLineEnds = true;
}
}
@@ -977,23 +977,23 @@ void EscherPropertyContainer::CreateLineProperties(
// support LineCaps
if(EscherPropertyValueHelper::GetPropertyValue(aAny, rXPropSet, OUString( "LineCap" )))
{
- ::com::sun::star::drawing::LineCap aLineCap(com::sun::star::drawing::LineCap_BUTT);
+ css::drawing::LineCap aLineCap(css::drawing::LineCap_BUTT);
if(aAny >>= aLineCap)
{
switch (aLineCap)
{
- default: /* com::sun::star::drawing::LineCap_BUTT */
+ default: /* css::drawing::LineCap_BUTT */
{
AddOpt(ESCHER_Prop_lineEndCapStyle, ESCHER_LineEndCapFlat);
break;
}
- case com::sun::star::drawing::LineCap_ROUND:
+ case css::drawing::LineCap_ROUND:
{
AddOpt(ESCHER_Prop_lineEndCapStyle, ESCHER_LineEndCapRound);
break;
}
- case com::sun::star::drawing::LineCap_SQUARE:
+ case css::drawing::LineCap_SQUARE:
{
AddOpt(ESCHER_Prop_lineEndCapStyle, ESCHER_LineEndCapSquare);
break;
@@ -1004,26 +1004,26 @@ void EscherPropertyContainer::CreateLineProperties(
if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "LineStyle" ) ) )
{
- ::com::sun::star::drawing::LineStyle eLS;
+ css::drawing::LineStyle eLS;
if ( aAny >>= eLS )
{
switch ( eLS )
{
- case ::com::sun::star::drawing::LineStyle_NONE :
+ case css::drawing::LineStyle_NONE :
AddOpt( ESCHER_Prop_fNoLineDrawDash, 0x90000 ); // 80000
break;
- case ::com::sun::star::drawing::LineStyle_DASH :
+ case css::drawing::LineStyle_DASH :
{
if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "LineDash" ) ) )
{
ESCHER_LineDashing eDash = ESCHER_LineSolid;
- ::com::sun::star::drawing::LineDash const * pLineDash = static_cast<css::drawing::LineDash const *>(aAny.getValue());
+ css::drawing::LineDash const * pLineDash = static_cast<css::drawing::LineDash const *>(aAny.getValue());
sal_Int32 nDistance = pLineDash->Distance << 1;
switch ( pLineDash->Style )
{
- case ::com::sun::star::drawing::DashStyle_ROUND :
- case ::com::sun::star::drawing::DashStyle_ROUNDRELATIVE :
+ case css::drawing::DashStyle_ROUND :
+ case css::drawing::DashStyle_ROUNDRELATIVE :
AddOpt( ESCHER_Prop_lineEndCapStyle, 0 ); // set Style Round
break;
default : break;
@@ -1062,7 +1062,7 @@ void EscherPropertyContainer::CreateLineProperties(
AddOpt( ESCHER_Prop_lineDashing, eDash );
}
}
- case ::com::sun::star::drawing::LineStyle_SOLID :
+ case css::drawing::LineStyle_SOLID :
default:
{
AddOpt( ESCHER_Prop_fNoLineDrawDash, nLineFlags );
@@ -1086,21 +1086,21 @@ void EscherPropertyContainer::CreateLineProperties(
ESCHER_LineJoin eLineJoin = ESCHER_LineJoinMiter;
if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "LineJoint" ), true ) )
{
- ::com::sun::star::drawing::LineJoint eLJ;
+ css::drawing::LineJoint eLJ;
if ( aAny >>= eLJ )
{
switch ( eLJ )
{
- case com::sun::star::drawing::LineJoint_NONE :
- case com::sun::star::drawing::LineJoint_MIDDLE :
- case com::sun::star::drawing::LineJoint_BEVEL :
+ case css::drawing::LineJoint_NONE :
+ case css::drawing::LineJoint_MIDDLE :
+ case css::drawing::LineJoint_BEVEL :
eLineJoin = ESCHER_LineJoinBevel;
break;
default:
- case com::sun::star::drawing::LineJoint_MITER :
+ case css::drawing::LineJoint_MITER :
eLineJoin = ESCHER_LineJoinMiter;
break;
- case com::sun::star::drawing::LineJoint_ROUND :
+ case css::drawing::LineJoint_ROUND :
eLineJoin = ESCHER_LineJoinRound;
break;
}
@@ -1134,13 +1134,13 @@ static Size lcl_SizeToEmu(Size aPrefSize, MapMode aPrefMapMode)
return aRetSize;
}
-void EscherPropertyContainer::ImplCreateGraphicAttributes( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
+void EscherPropertyContainer::ImplCreateGraphicAttributes( const css::uno::Reference< css::beans::XPropertySet > & rXPropSet,
sal_uInt32 nBlibId, bool bCreateCroppingAttributes )
{
- ::com::sun::star::uno::Any aAny;
+ css::uno::Any aAny;
sal_uInt32 nPicFlags = 0;
- ::com::sun::star::drawing::ColorMode eColorMode( ::com::sun::star::drawing::ColorMode_STANDARD );
+ css::drawing::ColorMode eColorMode( css::drawing::ColorMode_STANDARD );
sal_Int16 nLuminance = 0;
sal_Int32 nContrast = 0;
@@ -1155,9 +1155,9 @@ void EscherPropertyContainer::ImplCreateGraphicAttributes( const ::com::sun::sta
nContrast = nC;
}
- if ( eColorMode == ::com::sun::star::drawing::ColorMode_WATERMARK )
+ if ( eColorMode == css::drawing::ColorMode_WATERMARK )
{
- eColorMode = ::com::sun::star::drawing::ColorMode_STANDARD;
+ eColorMode = css::drawing::ColorMode_STANDARD;
nLuminance += 70;
if ( nLuminance > 100 )
nLuminance = 100;
@@ -1165,9 +1165,9 @@ void EscherPropertyContainer::ImplCreateGraphicAttributes( const ::com::sun::sta
if ( nContrast < -100 )
nContrast = -100;
}
- if ( eColorMode == ::com::sun::star::drawing::ColorMode_GREYS )
+ if ( eColorMode == css::drawing::ColorMode_GREYS )
nPicFlags |= 0x40004;
- else if ( eColorMode == ::com::sun::star::drawing::ColorMode_MONO )
+ else if ( eColorMode == css::drawing::ColorMode_MONO )
nPicFlags |= 0x60006;
if ( nContrast )
@@ -1202,7 +1202,7 @@ void EscherPropertyContainer::ImplCreateGraphicAttributes( const ::com::sun::sta
{
if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "GraphicCrop" ) ) )
{
- ::com::sun::star::text::GraphicCrop aGraphCrop;
+ css::text::GraphicCrop aGraphCrop;
if ( aAny >>= aGraphCrop )
{
if ( aGraphCrop.Left )
@@ -1232,13 +1232,13 @@ void EscherPropertyContainer::ImplCreateGraphicAttributes( const ::com::sun::sta
}
}
-bool EscherPropertyContainer::CreateShapeProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape )
+bool EscherPropertyContainer::CreateShapeProperties( const css::uno::Reference< css::drawing::XShape > & rXShape )
{
uno::Reference< beans::XPropertySet > aXPropSet( rXShape, uno::UNO_QUERY );
if ( aXPropSet.is() )
{
bool bVal = false;
- ::com::sun::star::uno::Any aAny;
+ css::uno::Any aAny;
sal_uInt32 nShapeAttr = 0;
if (EscherPropertyValueHelper::GetPropertyValue(aAny, aXPropSet, OUString("Visible"), true) && (aAny >>= bVal))
{
@@ -1257,7 +1257,7 @@ bool EscherPropertyContainer::CreateShapeProperties( const ::com::sun::star::uno
}
bool EscherPropertyContainer::CreateOLEGraphicProperties(
- const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape )
+ const css::uno::Reference< css::drawing::XShape > & rXShape )
{
bool bRetValue = false;
@@ -1277,7 +1277,7 @@ bool EscherPropertyContainer::CreateOLEGraphicProperties(
return bRetValue;
}
-bool EscherPropertyContainer::CreateGraphicProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape, const GraphicObject& rGraphicObj )
+bool EscherPropertyContainer::CreateGraphicProperties( const css::uno::Reference< css::drawing::XShape > & rXShape, const GraphicObject& rGraphicObj )
{
bool bRetValue = false;
OString aUniqueId( rGraphicObj.GetUniqueID() );
@@ -1288,11 +1288,11 @@ bool EscherPropertyContainer::CreateGraphicProperties( const ::com::sun::star::u
if ( pGraphicProvider && pPicOutStrm && pShapeBoundRect && aXPropSet.is() )
{
- ::com::sun::star::uno::Any aAny;
- std::unique_ptr< ::com::sun::star::awt::Rectangle> pVisArea;
+ css::uno::Any aAny;
+ std::unique_ptr< css::awt::Rectangle> pVisArea;
if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, OUString("VisibleArea" ) ) )
{
- pVisArea.reset(new ::com::sun::star::awt::Rectangle);
+ pVisArea.reset(new css::awt::Rectangle);
aAny >>= (*pVisArea);
}
Rectangle aRect( Point( 0, 0 ), pShapeBoundRect->GetSize() );
@@ -1309,7 +1309,7 @@ bool EscherPropertyContainer::CreateGraphicProperties( const ::com::sun::star::u
}
bool EscherPropertyContainer::CreateMediaGraphicProperties(
- const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape )
+ const css::uno::Reference< css::drawing::XShape > & rXShape )
{
bool bRetValue = false;
if ( rXShape.is() )
@@ -1346,7 +1346,7 @@ bool EscherPropertyContainer::ImplCreateEmbeddedBmp( const OString& rUniqueId )
}
bool EscherPropertyContainer::CreateEmbeddedBitmapProperties(
- const OUString& rBitmapUrl, ::com::sun::star::drawing::BitmapMode eBitmapMode )
+ const OUString& rBitmapUrl, css::drawing::BitmapMode eBitmapMode )
{
bool bRetValue = false;
OUString aVndUrl( "vnd.sun.star.GraphicObject:" );
@@ -1362,7 +1362,7 @@ bool EscherPropertyContainer::CreateEmbeddedBitmapProperties(
if( bRetValue )
{
// bitmap mode property
- bool bRepeat = eBitmapMode == ::com::sun::star::drawing::BitmapMode_REPEAT;
+ bool bRepeat = eBitmapMode == css::drawing::BitmapMode_REPEAT;
AddOpt( ESCHER_Prop_fillType, bRepeat ? ESCHER_FillTexture : ESCHER_FillPicture );
}
}
@@ -1373,7 +1373,7 @@ bool EscherPropertyContainer::CreateEmbeddedBitmapProperties(
namespace {
-GraphicObject lclDrawHatch( const ::com::sun::star::drawing::Hatch& rHatch, const Color& rBackColor, bool bFillBackground, const Rectangle& rRect )
+GraphicObject lclDrawHatch( const css::drawing::Hatch& rHatch, const Color& rBackColor, bool bFillBackground, const Rectangle& rRect )
{
// #i121183# For hatch, do no longer create a bitmap with the fixed size of 28x28 pixels. Also
// do not create a bitmap in page size, that would explode file sizes (and have no good quality).
@@ -1402,7 +1402,7 @@ GraphicObject lclDrawHatch( const ::com::sun::star::drawing::Hatch& rHatch, cons
} // namespace
-bool EscherPropertyContainer::CreateEmbeddedHatchProperties( const ::com::sun::star::drawing::Hatch& rHatch, const Color& rBackColor, bool bFillBackground )
+bool EscherPropertyContainer::CreateEmbeddedHatchProperties( const css::drawing::Hatch& rHatch, const Color& rBackColor, bool bFillBackground )
{
const Rectangle aRect(pShapeBoundRect ? *pShapeBoundRect : Rectangle(Point(0,0), Size(28000, 21000)));
GraphicObject aGraphicObject = lclDrawHatch( rHatch, rBackColor, bFillBackground, aRect );
@@ -1415,7 +1415,7 @@ bool EscherPropertyContainer::CreateEmbeddedHatchProperties( const ::com::sun::s
bool EscherPropertyContainer::CreateGraphicProperties(
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
+ const css::uno::Reference< css::beans::XPropertySet > & rXPropSet,
const OUString& rSource, const bool bCreateFillBitmap, const bool bCreateCroppingAttributes,
const bool bFillBitmapModeAllowed, const bool bOOxmlExport )
{
@@ -1427,8 +1427,8 @@ bool EscherPropertyContainer::CreateGraphicProperties(
OUString aGraphicUrl;
OString aUniqueId;
- ::com::sun::star::drawing::BitmapMode eBitmapMode( ::com::sun::star::drawing::BitmapMode_NO_REPEAT );
- ::com::sun::star::uno::Any aAny;
+ css::drawing::BitmapMode eBitmapMode( css::drawing::BitmapMode_NO_REPEAT );
+ css::uno::Any aAny;
if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, rSource ) )
{
@@ -1444,7 +1444,7 @@ bool EscherPropertyContainer::CreateGraphicProperties(
sal_uInt16 nAngle = 0;
if ( rSource == "MetaFile" )
{
- ::com::sun::star::uno::Sequence<sal_Int8> aSeq = *static_cast<css::uno::Sequence<sal_Int8> const *>(aAny.getValue());
+ css::uno::Sequence<sal_Int8> aSeq = *static_cast<css::uno::Sequence<sal_Int8> const *>(aAny.getValue());
const sal_Int8* pAry = aSeq.getArray();
sal_uInt32 nAryLen = aSeq.getLength();
@@ -1466,11 +1466,11 @@ bool EscherPropertyContainer::CreateGraphicProperties(
}
else if ( rSource == "Bitmap" )
{
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >xBitmap(
+ css::uno::Reference< css::awt::XBitmap >xBitmap(
aAny, css::uno::UNO_QUERY);
if (xBitmap.is())
{
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap > xBmp;
+ css::uno::Reference< css::awt::XBitmap > xBmp;
if ( aAny >>= xBmp )
{
BitmapEx aBitmapEx( VCLUnoHelper::GetBitmap( xBmp ) );
@@ -1492,7 +1492,7 @@ bool EscherPropertyContainer::CreateGraphicProperties(
}
else if ( rSource == "FillHatch" )
{
- ::com::sun::star::drawing::Hatch aHatch;
+ css::drawing::Hatch aHatch;
if ( aAny >>= aHatch )
{
Color aBackColor;
@@ -1509,7 +1509,7 @@ bool EscherPropertyContainer::CreateGraphicProperties(
const Rectangle aRect(Point(0, 0), pShapeBoundRect ? pShapeBoundRect->GetSize() : Size(28000, 21000));
aGraphicObject = lclDrawHatch( aHatch, aBackColor, bFillBackground, aRect );
aUniqueId = aGraphicObject.GetUniqueID();
- eBitmapMode = ::com::sun::star::drawing::BitmapMode_REPEAT;
+ eBitmapMode = css::drawing::BitmapMode_REPEAT;
bIsGraphicMtf = aGraphicObject.GetType() == GRAPHIC_GDIMETAFILE;
}
}
@@ -1666,7 +1666,7 @@ bool EscherPropertyContainer::CreateGraphicProperties(
AddOpt( ESCHER_Prop_Rotation, ( ( ((sal_Int32)nAngle << 16 ) / 10 ) + 0x8000 ) &~ 0xffff );
}
- if ( eBitmapMode == ::com::sun::star::drawing::BitmapMode_REPEAT )
+ if ( eBitmapMode == css::drawing::BitmapMode_REPEAT )
{
sal_Int32 nSizeX = 0,nSizeY = 0,nOffsetX = 0,nOffsetY = 0,nPosOffsetX = 0,nPosOffsetY = 0;
if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, "FillBitmapSizeX", true ) )
@@ -1762,12 +1762,12 @@ bool EscherPropertyContainer::CreateGraphicProperties(
return bRetValue;
}
-tools::PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape )
+tools::PolyPolygon EscherPropertyContainer::GetPolyPolygon( const css::uno::Reference< css::drawing::XShape > & rXShape )
{
tools::PolyPolygon aRetPolyPoly;
- ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXPropSet;
- ::com::sun::star::uno::Any aAny( rXShape->queryInterface(
- cppu::UnoType<com::sun::star::beans::XPropertySet>::get()));
+ css::uno::Reference< css::beans::XPropertySet > aXPropSet;
+ css::uno::Any aAny( rXShape->queryInterface(
+ cppu::UnoType<css::beans::XPropertySet>::get()));
OUString sPolyPolygonBezier ( "PolyPolygonBezier" );
OUString sPolyPolygon ( "PolyPolygon" );
@@ -1786,41 +1786,41 @@ tools::PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::st
return aRetPolyPoly;
}
-tools::PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::star::uno::Any& rAny )
+tools::PolyPolygon EscherPropertyContainer::GetPolyPolygon( const css::uno::Any& rAny )
{
bool bNoError = true;
tools::Polygon aPolygon;
tools::PolyPolygon aPolyPolygon;
- if ( rAny.getValueType() == cppu::UnoType<com::sun::star::drawing::PolyPolygonBezierCoords>::get())
+ if ( rAny.getValueType() == cppu::UnoType<css::drawing::PolyPolygonBezierCoords>::get())
{
- ::com::sun::star::drawing::PolyPolygonBezierCoords const * pSourcePolyPolygon
+ css::drawing::PolyPolygonBezierCoords const * pSourcePolyPolygon
= static_cast<css::drawing::PolyPolygonBezierCoords const *>(rAny.getValue());
sal_uInt16 nOuterSequenceCount = (sal_uInt16)pSourcePolyPolygon->Coordinates.getLength();
// get pointer of inner sequences
- ::com::sun::star::drawing::PointSequence const * pOuterSequence = pSourcePolyPolygon->Coordinates.getConstArray();
- ::com::sun::star::drawing::FlagSequence const * pOuterFlags = pSourcePolyPolygon->Flags.getConstArray();
+ css::drawing::PointSequence const * pOuterSequence = pSourcePolyPolygon->Coordinates.getConstArray();
+ css::drawing::FlagSequence const * pOuterFlags = pSourcePolyPolygon->Flags.getConstArray();
bNoError = pOuterSequence && pOuterFlags;
if ( bNoError )
{
sal_uInt16 a, b, nInnerSequenceCount;
- ::com::sun::star::awt::Point const * pArray;
+ css::awt::Point const * pArray;
// this will be a polygon set
for ( a = 0; a < nOuterSequenceCount; a++ )
{
- ::com::sun::star::drawing::PointSequence const * pInnerSequence = pOuterSequence++;
- ::com::sun::star::drawing::FlagSequence const * pInnerFlags = pOuterFlags++;
+ css::drawing::PointSequence const * pInnerSequence = pOuterSequence++;
+ css::drawing::FlagSequence const * pInnerFlags = pOuterFlags++;
bNoError = pInnerSequence && pInnerFlags;
if ( bNoError )
{
// get pointer to arrays
pArray = pInnerSequence->getConstArray();
- ::com::sun::star::drawing::PolygonFlags const * pFlags = pInnerFlags->getConstArray();
+ css::drawing::PolygonFlags const * pFlags = pInnerFlags->getConstArray();
if ( pArray && pFlags )
{
@@ -1829,7 +1829,7 @@ tools::PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::st
for( b = 0; b < nInnerSequenceCount; b++)
{
css::drawing::PolygonFlags ePolyFlags = *pFlags++;
- ::com::sun::star::awt::Point aPoint( *(pArray++) );
+ css::awt::Point aPoint( *(pArray++) );
aPolygon[ b ] = Point( aPoint.X, aPoint.Y );
aPolygon.SetFlags( b, static_cast<PolyFlags>(ePolyFlags) );
@@ -1844,12 +1844,12 @@ tools::PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::st
}
else if ( rAny.getValueType() == cppu::UnoType<css::drawing::PointSequenceSequence>::get() )
{
- ::com::sun::star::drawing::PointSequenceSequence const * pSourcePolyPolygon
+ css::drawing::PointSequenceSequence const * pSourcePolyPolygon
= static_cast<css::drawing::PointSequenceSequence const *>(rAny.getValue());
sal_uInt16 nOuterSequenceCount = (sal_uInt16)pSourcePolyPolygon->getLength();
// get pointer to inner sequences
- ::com::sun::star::drawing::PointSequence const * pOuterSequence = pSourcePolyPolygon->getConstArray();
+ css::drawing::PointSequence const * pOuterSequence = pSourcePolyPolygon->getConstArray();
bNoError = pOuterSequence != NULL;
if ( bNoError )
{
@@ -1858,12 +1858,12 @@ tools::PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::st
// this will be a polygon set
for( a = 0; a < nOuterSequenceCount; a++ )
{
- ::com::sun::star::drawing::PointSequence const * pInnerSequence = pOuterSequence++;
+ css::drawing::PointSequence const * pInnerSequence = pOuterSequence++;
bNoError = pInnerSequence != NULL;
if ( bNoError )
{
// get pointer to arrays
- ::com::sun::star::awt::Point const * pArray =
+ css::awt::Point const * pArray =
pInnerSequence->getConstArray();
if ( pArray != NULL )
{
@@ -1882,7 +1882,7 @@ tools::PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::st
}
else if ( rAny.getValueType() == cppu::UnoType<css::drawing::PointSequence>::get() )
{
- ::com::sun::star::drawing::PointSequence const * pInnerSequence =
+ css::drawing::PointSequence const * pInnerSequence =
static_cast<css::drawing::PointSequence const *>(rAny.getValue());
bNoError = pInnerSequence != NULL;
@@ -1891,7 +1891,7 @@ tools::PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::st
sal_uInt16 a, nInnerSequenceCount;
// get pointer to arrays
- ::com::sun::star::awt::Point const * pArray = pInnerSequence->getConstArray();
+ css::awt::Point const * pArray = pInnerSequence->getConstArray();
if ( pArray != NULL )
{
nInnerSequenceCount = (sal_uInt16)pInnerSequence->getLength();
@@ -1909,10 +1909,10 @@ tools::PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::st
}
bool EscherPropertyContainer::CreatePolygonProperties(
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
+ const css::uno::Reference< css::beans::XPropertySet > & rXPropSet,
sal_uInt32 nFlags,
bool bBezier,
- ::com::sun::star::awt::Rectangle& rGeoRect,
+ css::awt::Rectangle& rGeoRect,
tools::Polygon* pPolygon )
{
static const char sPolyPolygonBezier [] = "PolyPolygonBezier";
@@ -1927,7 +1927,7 @@ bool EscherPropertyContainer::CreatePolygonProperties(
aPolyPolygon.Insert( *pPolygon );
else
{
- ::com::sun::star::uno::Any aAny;
+ css::uno::Any aAny;
bRetValue = EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet,
( bBezier ) ? OUString(sPolyPolygonBezier) : OUString(sPolyPolygon), true );
if ( bRetValue )
@@ -1943,7 +1943,7 @@ bool EscherPropertyContainer::CreatePolygonProperties(
if ( ( aPolyPolygon.Count() == 1 ) && ( aPolyPolygon[ 0 ].GetSize() == 2 ) )
{
const tools::Polygon& rPoly = aPolyPolygon[ 0 ];
- rGeoRect = ::com::sun::star::awt::Rectangle(
+ rGeoRect = css::awt::Rectangle(
rPoly[ 0 ].X(),
rPoly[ 0 ].Y(),
rPoly[ 1 ].X() - rPoly[ 0 ].X(),
@@ -1959,7 +1959,7 @@ bool EscherPropertyContainer::CreatePolygonProperties(
sal_uInt16 nPolyCount = aPolyPolygon.Count();
sal_uInt32 nTotalPoints(0), nTotalBezPoints(0);
Rectangle aRect( aPolyPolygon.GetBoundRect() );
- rGeoRect = ::com::sun::star::awt::Rectangle( aRect.Left(), aRect.Top(), aRect.GetWidth(), aRect.GetHeight() );
+ rGeoRect = css::awt::Rectangle( aRect.Left(), aRect.Top(), aRect.GetWidth(), aRect.GetHeight() );
for (sal_uInt16 i = 0; i < nPolyCount; ++i)
{
@@ -2208,8 +2208,8 @@ bool lcl_GetAngle(tools::Polygon &rPoly,sal_uInt16& rShapeFlags,sal_Int32& nAngl
return false;
}
bool EscherPropertyContainer::CreateConnectorProperties(
- const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape,
- EscherSolverContainer& rSolverContainer, ::com::sun::star::awt::Rectangle& rGeoRect,
+ const css::uno::Reference< css::drawing::XShape > & rXShape,
+ EscherSolverContainer& rSolverContainer, css::awt::Rectangle& rGeoRect,
sal_uInt16& rShapeType, sal_uInt16& rShapeFlags )
{
static const char sEdgeKind [] = "EdgeKind";
@@ -2224,15 +2224,15 @@ bool EscherPropertyContainer::CreateConnectorProperties(
if ( rXShape.is() )
{
- ::com::sun::star::awt::Point aStartPoint, aEndPoint;
- ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXPropSet;
- ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > aShapeA, aShapeB;
- ::com::sun::star::uno::Any aAny( rXShape->queryInterface( cppu::UnoType<com::sun::star::beans::XPropertySet>::get()));
+ css::awt::Point aStartPoint, aEndPoint;
+ css::uno::Reference< css::beans::XPropertySet > aXPropSet;
+ css::uno::Reference< css::drawing::XShape > aShapeA, aShapeB;
+ css::uno::Any aAny( rXShape->queryInterface( cppu::UnoType<css::beans::XPropertySet>::get()));
if ( aAny >>= aXPropSet )
{
if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, sEdgeKind, true ) )
{
- ::com::sun::star::drawing::ConnectorType eCt;
+ css::drawing::ConnectorType eCt;
aAny >>= eCt;
if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, sEdgeStartPoint ) )
{
@@ -2242,10 +2242,10 @@ bool EscherPropertyContainer::CreateConnectorProperties(
aEndPoint = *static_cast<css::awt::Point const *>(aAny.getValue());
rShapeFlags = SHAPEFLAG_HAVEANCHOR | SHAPEFLAG_HAVESPT | SHAPEFLAG_CONNECTOR;
- rGeoRect = ::com::sun::star::awt::Rectangle( aStartPoint.X, aStartPoint.Y,
+ rGeoRect = css::awt::Rectangle( aStartPoint.X, aStartPoint.Y,
( aEndPoint.X - aStartPoint.X ) + 1, ( aEndPoint.Y - aStartPoint.Y ) + 1 );
// set standard's FLIP in below code
- if ( eCt != ::com::sun::star::drawing::ConnectorType_STANDARD)
+ if ( eCt != css::drawing::ConnectorType_STANDARD)
{
if ( rGeoRect.Height < 0 ) // justify
{
@@ -2270,7 +2270,7 @@ bool EscherPropertyContainer::CreateConnectorProperties(
rSolverContainer.AddConnector( rXShape, aStartPoint, aShapeA, aEndPoint, aShapeB );
switch ( eCt )
{
- case ::com::sun::star::drawing::ConnectorType_CURVE :
+ case css::drawing::ConnectorType_CURVE :
{
rShapeType = ESCHER_ShpInst_CurvedConnector3;
AddOpt( ESCHER_Prop_cxstyle, ESCHER_cxstyleCurved );
@@ -2279,7 +2279,7 @@ bool EscherPropertyContainer::CreateConnectorProperties(
}
break;
- case ::com::sun::star::drawing::ConnectorType_STANDARD :// Connector 2->5
+ case css::drawing::ConnectorType_STANDARD :// Connector 2->5
{
if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, sEdgePath ) )
{
@@ -2308,8 +2308,8 @@ bool EscherPropertyContainer::CreateConnectorProperties(
}
break;
default:
- case ::com::sun::star::drawing::ConnectorType_LINE :
- case ::com::sun::star::drawing::ConnectorType_LINES : // Connector 2->5
+ case css::drawing::ConnectorType_LINE :
+ case css::drawing::ConnectorType_LINES : // Connector 2->5
{
rShapeType = ESCHER_ShpInst_StraightConnector1;
AddOpt( ESCHER_Prop_cxstyle, ESCHER_cxstyleStraight );
@@ -2327,9 +2327,9 @@ bool EscherPropertyContainer::CreateConnectorProperties(
}
bool EscherPropertyContainer::CreateShadowProperties(
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet )
+ const css::uno::Reference< css::beans::XPropertySet > & rXPropSet )
{
- ::com::sun::star::uno::Any aAny;
+ css::uno::Any aAny;
bool bHasShadow = false; // shadow is possible only if at least a fillcolor, linecolor or graphic is set
sal_uInt32 nLineFlags = 0; // default : shape has no line
@@ -2367,7 +2367,7 @@ bool EscherPropertyContainer::CreateShadowProperties(
return bHasShadow;
}
-sal_Int32 EscherPropertyContainer::GetValueForEnhancedCustomShapeParameter( const ::com::sun::star::drawing::EnhancedCustomShapeParameter& rParameter,
+sal_Int32 EscherPropertyContainer::GetValueForEnhancedCustomShapeParameter( const css::drawing::EnhancedCustomShapeParameter& rParameter,
const std::vector< sal_Int32 >& rEquationOrder, bool bAdjustTrans )
{
sal_Int32 nValue = 0;
@@ -2382,7 +2382,7 @@ sal_Int32 EscherPropertyContainer::GetValueForEnhancedCustomShapeParameter( cons
switch( rParameter.Type )
{
- case com::sun::star::drawing::EnhancedCustomShapeParameterType::EQUATION :
+ case css::drawing::EnhancedCustomShapeParameterType::EQUATION :
{
size_t nIndex = (size_t) nValue;
OSL_ASSERT(nIndex < rEquationOrder.size());
@@ -2393,7 +2393,7 @@ sal_Int32 EscherPropertyContainer::GetValueForEnhancedCustomShapeParameter( cons
}
}
break;
- case com::sun::star::drawing::EnhancedCustomShapeParameterType::ADJUSTMENT:
+ case css::drawing::EnhancedCustomShapeParameterType::ADJUSTMENT:
{
if(bAdjustTrans)
{
@@ -2403,21 +2403,21 @@ sal_Int32 EscherPropertyContainer::GetValueForEnhancedCustomShapeParameter( cons
}
}
break;
- case com::sun::star::drawing::EnhancedCustomShapeParameterType::NORMAL :
+ case css::drawing::EnhancedCustomShapeParameterType::NORMAL :
default:
break;
/* not sure if it is allowed to set following values
(but they are not yet used)
- case com::sun::star::drawing::EnhancedCustomShapeParameterType::BOTTOM :
- case com::sun::star::drawing::EnhancedCustomShapeParameterType::RIGHT :
- case com::sun::star::drawing::EnhancedCustomShapeParameterType::TOP :
- case com::sun::star::drawing::EnhancedCustomShapeParameterType::LEFT :
+ case css::drawing::EnhancedCustomShapeParameterType::BOTTOM :
+ case css::drawing::EnhancedCustomShapeParameterType::RIGHT :
+ case css::drawing::EnhancedCustomShapeParameterType::TOP :
+ case css::drawing::EnhancedCustomShapeParameterType::LEFT :
*/
}
return nValue;
}
-bool GetValueForEnhancedCustomShapeHandleParameter( sal_Int32& nRetValue, const com::sun::star::drawing::EnhancedCustomShapeParameter& rParameter )
+bool GetValueForEnhancedCustomShapeHandleParameter( sal_Int32& nRetValue, const css::drawing::EnhancedCustomShapeParameter& rParameter )
{
bool bSpecial = false;
nRetValue = 0;
@@ -2432,33 +2432,33 @@ bool GetValueForEnhancedCustomShapeHandleParameter( sal_Int32& nRetValue, const
switch( rParameter.Type )
{
- case com::sun::star::drawing::EnhancedCustomShapeParameterType::EQUATION :
+ case css::drawing::EnhancedCustomShapeParameterType::EQUATION :
{
nRetValue += 3;
bSpecial = true;
}
break;
- case com::sun::star::drawing::EnhancedCustomShapeParameterType::ADJUSTMENT :
+ case css::drawing::EnhancedCustomShapeParameterType::ADJUSTMENT :
{
nRetValue += 0x100;
bSpecial = true;
}
break;
- case com::sun::star::drawing::EnhancedCustomShapeParameterType::TOP :
- case com::sun::star::drawing::EnhancedCustomShapeParameterType::LEFT :
+ case css::drawing::EnhancedCustomShapeParameterType::TOP :
+ case css::drawing::EnhancedCustomShapeParameterType::LEFT :
{
nRetValue = 0;
bSpecial = true;
}
break;
- case com::sun::star::drawing::EnhancedCustomShapeParameterType::RIGHT :
- case com::sun::star::drawing::EnhancedCustomShapeParameterType::BOTTOM :
+ case css::drawing::EnhancedCustomShapeParameterType::RIGHT :
+ case css::drawing::EnhancedCustomShapeParameterType::BOTTOM :
{
nRetValue = 1;
bSpecial = true;
}
break;
- case com::sun::star::drawing::EnhancedCustomShapeParameterType::NORMAL :
+ case css::drawing::EnhancedCustomShapeParameterType::NORMAL :
{
}
@@ -2490,8 +2490,8 @@ void ConvertEnhancedCustomShapeEquation( SdrObjCustomShape* pCustoShape,
{
std::shared_ptr< EnhancedCustomShape::ExpressionNode > aExpressNode(
EnhancedCustomShape::FunctionParser::parseFunction( sEquationSource[ i ], aCustoShape2d ) );
- com::sun::star::drawing::EnhancedCustomShapeParameter aPara( aExpressNode->fillNode( rEquations, NULL, 0 ) );
- if ( aPara.Type != com::sun::star::drawing::EnhancedCustomShapeParameterType::EQUATION )
+ css::drawing::EnhancedCustomShapeParameter aPara( aExpressNode->fillNode( rEquations, NULL, 0 ) );
+ if ( aPara.Type != css::drawing::EnhancedCustomShapeParameterType::EQUATION )
{
EnhancedCustomShapeEquation aEquation;
aEquation.nOperation = 0;
@@ -2594,7 +2594,7 @@ void EscherPropertyContainer::LookForPolarHandles( const MSO_SPT eShapeType, sal
}
}
-bool EscherPropertyContainer::GetAdjustmentValue( const com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue & rkProp, sal_Int32 nIndex, sal_Int32 nAdjustmentsWhichNeedsToBeConverted, sal_Int32& nValue )
+bool EscherPropertyContainer::GetAdjustmentValue( const css::drawing::EnhancedCustomShapeAdjustmentValue & rkProp, sal_Int32 nIndex, sal_Int32 nAdjustmentsWhichNeedsToBeConverted, sal_Int32& nValue )
{
if ( rkProp.State != beans::PropertyState_DIRECT_VALUE )
return false;
@@ -2751,7 +2751,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
{
double fDepth = 0;
double fFraction = 0;
- com::sun::star::drawing::EnhancedCustomShapeParameterPair aDepthParaPair;
+ css::drawing::EnhancedCustomShapeParameterPair aDepthParaPair;
if ( ( rrProp.Value >>= aDepthParaPair ) && ( aDepthParaPair.First.Value >>= fDepth ) && ( aDepthParaPair.Second.Value >>= fFraction ) )
{
double fForeDepth = fDepth * fFraction;
@@ -2886,7 +2886,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
{
double fExtrusionAngleX = 0;
double fExtrusionAngleY = 0;
- com::sun::star::drawing::EnhancedCustomShapeParameterPair aRotateAnglePair;
+ css::drawing::EnhancedCustomShapeParameterPair aRotateAnglePair;
if ( ( rrProp.Value >>= aRotateAnglePair ) && ( aRotateAnglePair.First.Value >>= fExtrusionAngleX ) && ( aRotateAnglePair.Second.Value >>= fExtrusionAngleY ) )
{
fExtrusionAngleX *= 65536;
@@ -2916,7 +2916,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
{
double fSkewAmount = 0;
double fSkewAngle = 0;
- com::sun::star::drawing::EnhancedCustomShapeParameterPair aSkewParaPair;
+ css::drawing::EnhancedCustomShapeParameterPair aSkewParaPair;
if ( ( rrProp.Value >>= aSkewParaPair ) && ( aSkewParaPair.First.Value >>= fSkewAmount ) && ( aSkewParaPair.Second.Value >>= fSkewAngle ) )
{
AddOpt( DFF_Prop_c3DSkewAmount, (sal_Int32)fSkewAmount );
@@ -2958,7 +2958,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
{
double fExtrusionOriginX = 0;
double fExtrusionOriginY = 0;
- com::sun::star::drawing::EnhancedCustomShapeParameterPair aOriginPair;
+ css::drawing::EnhancedCustomShapeParameterPair aOriginPair;
if ( ( rrProp.Value >>= aOriginPair ) && ( aOriginPair.First.Value >>= fExtrusionOriginX ) && ( aOriginPair.Second.Value >>= fExtrusionOriginY ) )
{
AddOpt( DFF_Prop_c3DOriginX, (sal_Int32)( fExtrusionOriginX * 65536 ) );
@@ -3100,7 +3100,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
{
if ( !bIsDefaultObject )
{
- com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair> aGluePoints;
+ css::uno::Sequence< css::drawing::EnhancedCustomShapeParameterPair> aGluePoints;
if ( rrProp.Value >>= aGluePoints )
{
// creating the vertices
@@ -3142,7 +3142,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
{
if ( !bIsDefaultObject )
{
- com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeSegment > aSegments;
+ css::uno::Sequence< css::drawing::EnhancedCustomShapeSegment > aSegments;
if ( rrProp.Value >>= aSegments )
{
// creating seginfo
@@ -3173,74 +3173,74 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
case css::drawing::EnhancedCustomShapeSegmentCommand::MOVETO :
nVal = (msopathMoveTo << 13);
break;
- case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::CURVETO :
+ case css::drawing::EnhancedCustomShapeSegmentCommand::CURVETO :
{
nVal |= (msopathCurveTo << 13);
}
break;
- case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::CLOSESUBPATH :
+ case css::drawing::EnhancedCustomShapeSegmentCommand::CLOSESUBPATH :
{
nVal = 1;
nVal |= (msopathClose << 13);
}
break;
- case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ENDSUBPATH :
+ case css::drawing::EnhancedCustomShapeSegmentCommand::ENDSUBPATH :
{
nVal = (msopathEnd << 13);
}
break;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list