summaryrefslogtreecommitdiff
path: root/vcl/source/filter
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/source/filter')
-rw-r--r--vcl/source/filter/FilterConfigCache.hxx2
-rw-r--r--vcl/source/filter/FilterConfigItem.cxx18
-rw-r--r--vcl/source/filter/graphicfilter.cxx6
-rw-r--r--vcl/source/filter/jpeg/JpegWriter.hxx4
-rw-r--r--vcl/source/filter/jpeg/jpeg.cxx2
-rw-r--r--vcl/source/filter/jpeg/jpeg.hxx2
-rw-r--r--vcl/source/filter/wmf/enhwmf.cxx6
-rw-r--r--vcl/source/filter/wmf/winmtf.hxx2
-rw-r--r--vcl/source/filter/wmf/winwmf.cxx6
-rw-r--r--vcl/source/filter/wmf/wmfwr.hxx2
10 files changed, 25 insertions, 25 deletions
diff --git a/vcl/source/filter/FilterConfigCache.hxx b/vcl/source/filter/FilterConfigCache.hxx
index e4c204b817e5..71661f2bbfc2 100644
--- a/vcl/source/filter/FilterConfigCache.hxx
+++ b/vcl/source/filter/FilterConfigCache.hxx
@@ -34,7 +34,7 @@ class FilterConfigCache
{
OUString sInternalFilterName;
OUString sType;
- ::com::sun::star::uno::Sequence< OUString > lExtensionList;
+ css::uno::Sequence< OUString > lExtensionList;
OUString sUIName;
OUString sDocumentService;
OUString sFilterService;
diff --git a/vcl/source/filter/FilterConfigItem.cxx b/vcl/source/filter/FilterConfigItem.cxx
index 428cf72225d6..4a7302f3998b 100644
--- a/vcl/source/filter/FilterConfigItem.cxx
+++ b/vcl/source/filter/FilterConfigItem.cxx
@@ -72,7 +72,7 @@ static bool ImpIsTreeAvailable( Reference< XMultiServiceFactory >& rXCfgProv, co
"com.sun.star.configuration.ConfigurationAccess",
aArguments );
}
- catch (const ::com::sun::star::uno::Exception&)
+ catch (const css::uno::Exception&)
{
bAvailable = false;
}
@@ -139,7 +139,7 @@ void FilterConfigItem::ImpInitTree( const OUString& rSubTree )
if ( xUpdatableView.is() )
xPropSet.set( xUpdatableView, UNO_QUERY );
}
- catch ( ::com::sun::star::uno::Exception& )
+ catch ( css::uno::Exception& )
{
OSL_FAIL( "FilterConfigItem::FilterConfigItem - Could not access configuration Key" );
}
@@ -151,7 +151,7 @@ FilterConfigItem::FilterConfigItem( const OUString& rSubTree )
ImpInitTree( rSubTree );
}
-FilterConfigItem::FilterConfigItem( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData )
+FilterConfigItem::FilterConfigItem( css::uno::Sequence< css::beans::PropertyValue >* pFilterData )
: bModified(false)
{
if ( pFilterData )
@@ -159,7 +159,7 @@ FilterConfigItem::FilterConfigItem( ::com::sun::star::uno::Sequence< ::com::sun:
}
FilterConfigItem::FilterConfigItem( const OUString& rSubTree,
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData )
+ css::uno::Sequence< css::beans::PropertyValue >* pFilterData )
{
ImpInitTree( rSubTree );
@@ -186,7 +186,7 @@ void FilterConfigItem::WriteModifiedConfig()
xUpdateControl->commitChanges();
bModified = false;
}
- catch ( ::com::sun::star::uno::Exception& )
+ catch ( css::uno::Exception& )
{
OSL_FAIL( "FilterConfigItem::FilterConfigItem - Could not update configuration data" );
}
@@ -211,7 +211,7 @@ bool FilterConfigItem::ImplGetPropertyValue( Any& rAny, const Reference< XProper
if ( aXPropSetInfo.is() )
bRetValue = aXPropSetInfo->hasPropertyByName( rString );
}
- catch( ::com::sun::star::uno::Exception& )
+ catch( css::uno::Exception& )
{
}
@@ -224,7 +224,7 @@ bool FilterConfigItem::ImplGetPropertyValue( Any& rAny, const Reference< XProper
if ( !rAny.hasValue() )
bRetValue = false;
}
- catch( ::com::sun::star::uno::Exception& )
+ catch( css::uno::Exception& )
{
bRetValue = false;
}
@@ -361,7 +361,7 @@ void FilterConfigItem::WriteBool( const OUString& rKey, bool bNewValue )
xPropSet->setPropertyValue( rKey, aAny );
bModified = true;
}
- catch ( ::com::sun::star::uno::Exception& )
+ catch ( css::uno::Exception& )
{
OSL_FAIL( "FilterConfigItem::WriteBool - could not set PropertyValue" );
}
@@ -395,7 +395,7 @@ void FilterConfigItem::WriteInt32( const OUString& rKey, sal_Int32 nNewValue )
xPropSet->setPropertyValue( rKey, aAny );
bModified = true;
}
- catch ( ::com::sun::star::uno::Exception& )
+ catch ( css::uno::Exception& )
{
OSL_FAIL( "FilterConfigItem::WriteInt32 - could not set PropertyValue" );
}
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index 653d5367a165..c86d070072a8 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -1319,7 +1319,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat
sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPath, SvStream& rIStream,
sal_uInt16 nFormat, sal_uInt16* pDeterminedFormat, GraphicFilterImportFlags nImportFlags,
- com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData,
+ css::uno::Sequence< css::beans::PropertyValue >* pFilterData,
WMF_EXTERNALHEADER *pExtHeader )
{
OUString aFilterName;
@@ -2000,7 +2000,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString
{
if ( (*pFilterData)[ i ].Name == "AdditionalChunks" )
{
- com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > aAdditionalChunkSequence;
+ css::uno::Sequence< css::beans::PropertyValue > aAdditionalChunkSequence;
if ( (*pFilterData)[ i ].Value >>= aAdditionalChunkSequence )
{
for ( j = 0; j < aAdditionalChunkSequence.getLength(); j++ )
@@ -2013,7 +2013,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString
nChunkType <<= 8;
nChunkType |= (sal_uInt8)aAdditionalChunkSequence[ j ].Name[ k ];
}
- com::sun::star::uno::Sequence< sal_Int8 > aByteSeq;
+ css::uno::Sequence< sal_Int8 > aByteSeq;
if ( aAdditionalChunkSequence[ j ].Value >>= aByteSeq )
{
std::vector< vcl::PNGWriter::ChunkData >& rChunkData = aPNGWriter.GetChunks();
diff --git a/vcl/source/filter/jpeg/JpegWriter.hxx b/vcl/source/filter/jpeg/JpegWriter.hxx
index a9f765a7c67e..edfa8acd391f 100644
--- a/vcl/source/filter/jpeg/JpegWriter.hxx
+++ b/vcl/source/filter/jpeg/JpegWriter.hxx
@@ -39,11 +39,11 @@ class JPEGWriter
bool* mpExpWasGrey;
- com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > mxStatusIndicator;
+ css::uno::Reference< css::task::XStatusIndicator > mxStatusIndicator;
public:
JPEGWriter( SvStream& rStream,
- const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData,
+ const css::uno::Sequence< css::beans::PropertyValue >* pFilterData,
bool* pExportWasGrey = nullptr );
virtual ~JPEGWriter() {};
diff --git a/vcl/source/filter/jpeg/jpeg.cxx b/vcl/source/filter/jpeg/jpeg.cxx
index e403dce69cfe..b2e46720790d 100644
--- a/vcl/source/filter/jpeg/jpeg.cxx
+++ b/vcl/source/filter/jpeg/jpeg.cxx
@@ -67,7 +67,7 @@ VCL_DLLPUBLIC bool ImportJPEG( SvStream& rInputStream, Graphic& rGraphic, void*
}
bool ExportJPEG(SvStream& rOutputStream, const Graphic& rGraphic,
- const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>* pFilterData,
+ const css::uno::Sequence<css::beans::PropertyValue>* pFilterData,
bool* pExportWasGrey)
{
JPEGWriter aJPEGWriter( rOutputStream, pFilterData, pExportWasGrey );
diff --git a/vcl/source/filter/jpeg/jpeg.hxx b/vcl/source/filter/jpeg/jpeg.hxx
index e53eab2be6b9..701a8eaa53dc 100644
--- a/vcl/source/filter/jpeg/jpeg.hxx
+++ b/vcl/source/filter/jpeg/jpeg.hxx
@@ -31,7 +31,7 @@ VCL_DLLPUBLIC bool ImportJPEG( SvStream& rInputStream, Graphic& rGraphic, void*
bool ExportJPEG(SvStream& rOutputStream,
const Graphic& rGraphic,
- const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData,
+ const css::uno::Sequence< css::beans::PropertyValue >* pFilterData,
bool* pExportWasGrey = nullptr);
#endif // INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEG_HXX
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index a55709b0176d..bb029b55ef43 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -953,18 +953,18 @@ bool EnhWMFReader::ReadEnhWMF()
case PS_ENDCAP_ROUND :
if ( aSize.Width() )
{
- aLineInfo.SetLineCap( com::sun::star::drawing::LineCap_ROUND );
+ aLineInfo.SetLineCap( css::drawing::LineCap_ROUND );
break;
}
case PS_ENDCAP_SQUARE :
if ( aSize.Width() )
{
- aLineInfo.SetLineCap( com::sun::star::drawing::LineCap_SQUARE );
+ aLineInfo.SetLineCap( css::drawing::LineCap_SQUARE );
break;
}
case PS_ENDCAP_FLAT :
default :
- aLineInfo.SetLineCap( com::sun::star::drawing::LineCap_BUTT );
+ aLineInfo.SetLineCap( css::drawing::LineCap_BUTT );
}
switch( nStyle & 0xF000 )
{
diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx
index ab7b1aefbddc..af179ba3d844 100644
--- a/vcl/source/filter/wmf/winmtf.hxx
+++ b/vcl/source/filter/wmf/winmtf.hxx
@@ -732,7 +732,7 @@ protected:
FilterConfigItem* pFilterConfigItem;
- com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator;
+ css::uno::Reference< css::task::XStatusIndicator > xStatusIndicator;
// assures aSampledBrush is the actual brush of the GDIMetaFile
diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx
index 29d2f5529829..64508ef7dbfa 100644
--- a/vcl/source/filter/wmf/winwmf.cxx
+++ b/vcl/source/filter/wmf/winwmf.cxx
@@ -855,14 +855,14 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc )
switch( nStyle & 0xF00 )
{
case PS_ENDCAP_ROUND :
- aLineInfo.SetLineCap( com::sun::star::drawing::LineCap_ROUND );
+ aLineInfo.SetLineCap( css::drawing::LineCap_ROUND );
break;
case PS_ENDCAP_SQUARE :
- aLineInfo.SetLineCap( com::sun::star::drawing::LineCap_SQUARE );
+ aLineInfo.SetLineCap( css::drawing::LineCap_SQUARE );
break;
case PS_ENDCAP_FLAT :
default :
- aLineInfo.SetLineCap( com::sun::star::drawing::LineCap_BUTT );
+ aLineInfo.SetLineCap( css::drawing::LineCap_BUTT );
}
switch( nStyle & 0xF000 )
{
diff --git a/vcl/source/filter/wmf/wmfwr.hxx b/vcl/source/filter/wmf/wmfwr.hxx
index dd842400a174..32cf5cf6d1ae 100644
--- a/vcl/source/filter/wmf/wmfwr.hxx
+++ b/vcl/source/filter/wmf/wmfwr.hxx
@@ -55,7 +55,7 @@ private:
sal_uLong nLastPercent; // with which number pCallback was called last time.
- com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator;
+ css::uno::Reference< css::task::XStatusIndicator > xStatusIndicator;
SvStream* pWMF;
VclPtr<VirtualDevice> pVirDev;