summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-10-30 10:16:38 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-10-30 09:58:16 +0000
commit669b9cd5b8924a121114540adac91cd7e2f8b0ad (patch)
tree066c0eecc2be3d76ed327413140df529912aa8bd
parentf8767ea9e53fda2ab144c7edbee75582b0391f2c (diff)
com::sun::star->css in svtools
Change-Id: I95fd8317ab1142068e0c7b50fc62643fe9f95dc2 Reviewed-on: https://gerrit.libreoffice.org/19683 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
-rw-r--r--svtools/inc/table/gridtablerenderer.hxx4
-rw-r--r--svtools/inc/vclxaccessibleheaderbar.hxx16
-rw-r--r--svtools/inc/vclxaccessibleheaderbaritem.hxx48
-rw-r--r--svtools/source/brwbox/brwbox3.cxx4
-rw-r--r--svtools/source/brwbox/brwimpl.hxx9
-rw-r--r--svtools/source/brwbox/editbrowseboximpl.hxx2
-rw-r--r--svtools/source/config/apearcfg.cxx2
-rw-r--r--svtools/source/config/fontsubstconfig.cxx2
-rw-r--r--svtools/source/config/helpopt.cxx4
-rw-r--r--svtools/source/config/htmlcfg.cxx2
-rw-r--r--svtools/source/config/optionsdrawinglayer.cxx4
-rw-r--r--svtools/source/contnr/contentenumeration.cxx4
-rw-r--r--svtools/source/contnr/contentenumeration.hxx11
-rw-r--r--svtools/source/contnr/fileview.cxx16
-rw-r--r--svtools/source/contnr/foldertree.cxx2
-rw-r--r--svtools/source/contnr/ivctrl.cxx8
-rw-r--r--svtools/source/contnr/svimpbox.cxx4
-rw-r--r--svtools/source/contnr/svtabbx.cxx6
-rw-r--r--svtools/source/contnr/treelistbox.cxx11
-rw-r--r--svtools/source/control/accessibleruler.cxx4
-rw-r--r--svtools/source/control/headbar.cxx10
-rw-r--r--svtools/source/control/inettbc.cxx6
-rw-r--r--svtools/source/control/toolbarmenu.cxx20
-rw-r--r--svtools/source/control/toolbarmenuimp.hxx156
-rw-r--r--svtools/source/control/valueacc.cxx18
-rw-r--r--svtools/source/control/valueimp.hxx152
-rw-r--r--svtools/source/control/vclxaccessibleheaderbar.cxx14
-rw-r--r--svtools/source/control/vclxaccessibleheaderbaritem.cxx4
-rw-r--r--svtools/source/dialogs/addresstemplate.cxx15
-rw-r--r--svtools/source/dialogs/colrdlg.cxx4
-rw-r--r--svtools/source/filter/exportdialog.cxx10
-rw-r--r--svtools/source/filter/exportdialog.hxx35
-rw-r--r--svtools/source/graphic/descriptor.hxx28
-rw-r--r--svtools/source/graphic/graphic.cxx6
-rw-r--r--svtools/source/graphic/graphic.hxx34
-rw-r--r--svtools/source/graphic/transformer.hxx26
-rw-r--r--svtools/source/hatchwindow/documentcloser.cxx18
-rw-r--r--svtools/source/hatchwindow/hatchwindow.cxx4
-rw-r--r--svtools/source/hatchwindow/ipwin.cxx2
-rw-r--r--svtools/source/inc/hatchwindow.hxx30
-rw-r--r--svtools/source/inc/provider.hxx32
-rw-r--r--svtools/source/inc/renderer.hxx30
-rw-r--r--svtools/source/inc/unoiface.hxx354
-rw-r--r--svtools/source/java/javainteractionhandler.cxx10
-rw-r--r--svtools/source/misc/acceleratorexecute.cxx60
-rw-r--r--svtools/source/misc/bindablecontrolhelper.cxx2
-rw-r--r--svtools/source/misc/cliplistener.cxx2
-rw-r--r--svtools/source/misc/embedhlp.cxx8
-rw-r--r--svtools/source/misc/embedtransfer.cxx10
-rw-r--r--svtools/source/misc/imagemgr.cxx34
-rw-r--r--svtools/source/misc/imageresourceaccess.cxx8
-rw-r--r--svtools/source/misc/openfiledroptargetlistener.cxx8
-rw-r--r--svtools/source/misc/sampletext.cxx20
-rw-r--r--svtools/source/misc/svtaccessiblefactory.cxx56
-rw-r--r--svtools/source/misc/templatefoldercache.cxx2
-rw-r--r--svtools/source/misc/transfer.cxx65
-rw-r--r--svtools/source/misc/transfer2.cxx12
-rw-r--r--svtools/source/table/cellvalueconversion.hxx2
-rw-r--r--svtools/source/table/tablecontrol_impl.cxx8
-rw-r--r--svtools/source/table/tablecontrol_impl.hxx12
-rw-r--r--svtools/source/toolpanel/dummypanel.hxx4
-rw-r--r--svtools/source/toolpanel/paneltabbarpeer.hxx4
-rw-r--r--svtools/source/toolpanel/toolpaneldeckpeer.hxx4
-rw-r--r--svtools/source/toolpanel/toolpaneldrawer.hxx2
-rw-r--r--svtools/source/toolpanel/toolpaneldrawerpeer.hxx2
-rw-r--r--svtools/source/uno/addrtempuno.cxx18
-rw-r--r--svtools/source/uno/contextmenuhelper.cxx4
-rw-r--r--svtools/source/uno/framestatuslistener.cxx30
-rw-r--r--svtools/source/uno/generictoolboxcontroller.cxx22
-rw-r--r--svtools/source/uno/genericunodialog.cxx8
-rw-r--r--svtools/source/uno/miscservices.cxx4
-rw-r--r--svtools/source/uno/popupmenucontrollerbase.cxx24
-rw-r--r--svtools/source/uno/popupwindowcontroller.cxx6
-rw-r--r--svtools/source/uno/statusbarcontroller.cxx64
-rw-r--r--svtools/source/uno/svtxgridcontrol.cxx62
-rw-r--r--svtools/source/uno/svtxgridcontrol.hxx66
-rw-r--r--svtools/source/uno/toolboxcontroller.cxx54
-rw-r--r--svtools/source/uno/treecontrolpeer.cxx60
-rw-r--r--svtools/source/uno/treecontrolpeer.hxx136
-rw-r--r--svtools/source/uno/unocontroltablemodel.cxx50
-rw-r--r--svtools/source/uno/unocontroltablemodel.hxx50
-rw-r--r--svtools/source/uno/unoevent.cxx16
-rw-r--r--svtools/source/uno/unogridcolumnfacade.cxx30
-rw-r--r--svtools/source/uno/unogridcolumnfacade.hxx6
-rw-r--r--svtools/source/uno/unoiface.cxx424
-rw-r--r--svtools/source/uno/unoimap.cxx14
-rw-r--r--svtools/source/uno/wizard/unowizard.cxx52
-rw-r--r--svtools/source/uno/wizard/wizardpagecontroller.cxx30
-rw-r--r--svtools/source/uno/wizard/wizardpagecontroller.hxx8
-rw-r--r--svtools/source/uno/wizard/wizardshell.cxx32
-rw-r--r--svtools/source/uno/wizard/wizardshell.hxx8
91 files changed, 1387 insertions, 1397 deletions
diff --git a/svtools/inc/table/gridtablerenderer.hxx b/svtools/inc/table/gridtablerenderer.hxx
index 79f28d7fb74c..fba9c2c4b2cf 100644
--- a/svtools/inc/table/gridtablerenderer.hxx
+++ b/svtools/inc/table/gridtablerenderer.hxx
@@ -86,11 +86,11 @@ namespace svt { namespace table
virtual void ShowCellCursor( vcl::Window& _rView, const Rectangle& _rCursorRect) override;
virtual void HideCellCursor( vcl::Window& _rView, const Rectangle& _rCursorRect) override;
virtual bool FitsIntoCell(
- ::com::sun::star::uno::Any const & i_cellContent,
+ css::uno::Any const & i_cellContent,
OutputDevice& i_targetDevice, Rectangle const & i_targetArea
) const override;
virtual bool GetFormattedCellString(
- ::com::sun::star::uno::Any const & i_cellValue,
+ css::uno::Any const & i_cellValue,
OUString & o_cellString
) const override;
diff --git a/svtools/inc/vclxaccessibleheaderbar.hxx b/svtools/inc/vclxaccessibleheaderbar.hxx
index b608752e51ed..165793a615d4 100644
--- a/svtools/inc/vclxaccessibleheaderbar.hxx
+++ b/svtools/inc/vclxaccessibleheaderbar.hxx
@@ -29,7 +29,7 @@ class HeaderBar;
// class VCLXAccessibleHeaderBar
-typedef std::vector< ::com::sun::star::uno::WeakReference< ::com::sun::star::accessibility::XAccessible > >
+typedef std::vector< css::uno::WeakReference< css::accessibility::XAccessible > >
ListItems;
class VCLXAccessibleHeaderBar : public VCLXAccessibleComponent
@@ -45,18 +45,18 @@ public:
VCLXAccessibleHeaderBar( VCLXWindow* pVCLXindow );
// XAccessibleContext
- virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override;
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual ::rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
public:
virtual void SAL_CALL disposing() override;
- ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateChild(sal_Int32 i);
+ css::uno::Reference< css::accessibility::XAccessible > CreateChild(sal_Int32 i);
private:
ListItems m_aAccessibleChildren;
@@ -70,7 +70,7 @@ public:
VCLXHeaderBar(vcl::Window* pHeaderBar);
virtual ~VCLXHeaderBar();
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext() override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override;
};
diff --git a/svtools/inc/vclxaccessibleheaderbaritem.hxx b/svtools/inc/vclxaccessibleheaderbaritem.hxx
index 4aa6dffbeaac..fea0fef803dc 100644
--- a/svtools/inc/vclxaccessibleheaderbaritem.hxx
+++ b/svtools/inc/vclxaccessibleheaderbaritem.hxx
@@ -46,8 +46,8 @@ class AccessibleStateSetHelper;
typedef ::comphelper::OAccessibleExtendedComponentHelper AccessibleExtendedComponentHelper_BASE;
typedef ::cppu::ImplHelper2<
-::com::sun::star::accessibility::XAccessible,
-::com::sun::star::lang::XServiceInfo > VCLXAccessibleHeaderBarItem_BASE;
+ css::accessibility::XAccessible,
+ css::lang::XServiceInfo > VCLXAccessibleHeaderBarItem_BASE;
class VCLXAccessibleHeaderBarItem : public AccessibleExtendedComponentHelper_BASE,
public VCLXAccessibleHeaderBarItem_BASE
@@ -62,7 +62,7 @@ protected:
void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
// OCommonAccessibleComponent
- virtual ::com::sun::star::awt::Rectangle implGetBounds( ) throw (::com::sun::star::uno::RuntimeException) override;
+ virtual css::awt::Rectangle implGetBounds( ) throw (css::uno::RuntimeException) override;
// XComponent
virtual void SAL_CALL disposing() override;
@@ -78,35 +78,35 @@ public:
DECLARE_XTYPEPROVIDER()
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
// XAccessible
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override;
// XAccessibleContext
- virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::lang::Locale SAL_CALL getLocale( ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
// XAccessibleComponent
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override {};
- virtual sal_Int32 SAL_CALL getForeground() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL grabFocus( ) throw (css::uno::RuntimeException, std::exception) override {};
+ virtual sal_Int32 SAL_CALL getForeground() throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getBackground() throw (css::uno::RuntimeException, std::exception) override;
// XAccessibleExtendedComponent
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getTitledBorderText( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getToolTipText( ) throw (css::uno::RuntimeException, std::exception) override;
};
#endif // INCLUDED_SVTOOLS_INC_VCLXACCESSIBLEHEADERBARITEM_HXX
diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx
index d60023587333..fd8ead611073 100644
--- a/svtools/source/brwbox/brwbox3.cxx
+++ b/svtools/source/brwbox/brwbox3.cxx
@@ -482,7 +482,7 @@ sal_Int32 BrowseBox::GetSelectedColumnCount() const
return pColumnSel ? pColumnSel->GetSelectCount() : 0;
}
-void BrowseBox::GetAllSelectedRows( ::com::sun::star::uno::Sequence< sal_Int32 >& _rRows ) const
+void BrowseBox::GetAllSelectedRows( css::uno::Sequence< sal_Int32 >& _rRows ) const
{
sal_Int32 nCount = GetSelectRowCount();
if( nCount )
@@ -496,7 +496,7 @@ void BrowseBox::GetAllSelectedRows( ::com::sun::star::uno::Sequence< sal_Int32 >
}
}
-void BrowseBox::GetAllSelectedColumns( ::com::sun::star::uno::Sequence< sal_Int32 >& _rColumns ) const
+void BrowseBox::GetAllSelectedColumns( css::uno::Sequence< sal_Int32 >& _rColumns ) const
{
const MultiSelection* pColumnSel = GetColumnSelection();
sal_Int32 nCount = GetSelectedColumnCount();
diff --git a/svtools/source/brwbox/brwimpl.hxx b/svtools/source/brwbox/brwimpl.hxx
index 997769dd60db..4738f5bb772b 100644
--- a/svtools/source/brwbox/brwimpl.hxx
+++ b/svtools/source/brwbox/brwimpl.hxx
@@ -37,15 +37,14 @@ namespace svt
{
inline void operator()(const THeaderCellMap::value_type& _aType)
{
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xComp(
- _aType.second, ::com::sun::star::uno::UNO_QUERY );
+ css::uno::Reference< css::lang::XComponent > xComp( _aType.second, css::uno::UNO_QUERY );
OSL_ENSURE( xComp.is() || !_aType.second.is(), "THeaderCellMapFunctorDispose: invalid accessible cell (no XComponent)!" );
if ( xComp.is() )
try
{
xComp->dispose();
}
- catch( const ::com::sun::star::uno::Exception& )
+ catch( const css::uno::Exception& )
{
OSL_FAIL( "THeaderCellMapFunctorDispose: caught an exception!" );
}
@@ -65,11 +64,11 @@ namespace svt
/// @see AccessibleBrowseBox::getHeaderBar
- ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ css::uno::Reference< css::accessibility::XAccessible >
getAccessibleHeaderBar( AccessibleBrowseBoxObjType _eObjType );
/// @see AccessibleBrowseBox::getTable
- ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ css::uno::Reference< css::accessibility::XAccessible >
getAccessibleTable( );
};
diff --git a/svtools/source/brwbox/editbrowseboximpl.hxx b/svtools/source/brwbox/editbrowseboximpl.hxx
index 217a3eb1217b..e9055b393f80 100644
--- a/svtools/source/brwbox/editbrowseboximpl.hxx
+++ b/svtools/source/brwbox/editbrowseboximpl.hxx
@@ -27,7 +27,7 @@ namespace svt
class EditBrowseBoxImpl
{
public:
- ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xActiveCell;
+ css::uno::Reference< css::accessibility::XAccessible > m_xActiveCell;
void clearActiveCell();
};
diff --git a/svtools/source/config/apearcfg.cxx b/svtools/source/config/apearcfg.cxx
index 466da3dabaca..ee4b1342340b 100644
--- a/svtools/source/config/apearcfg.cxx
+++ b/svtools/source/config/apearcfg.cxx
@@ -136,7 +136,7 @@ void SvtTabAppearanceCfg::ImplCommit()
PutProperties(rNames, aValues);
}
-void SvtTabAppearanceCfg::Notify( const com::sun::star::uno::Sequence< OUString >& )
+void SvtTabAppearanceCfg::Notify( const css::uno::Sequence< OUString >& )
{
}
diff --git a/svtools/source/config/fontsubstconfig.cxx b/svtools/source/config/fontsubstconfig.cxx
index 8f37ba836ee7..75863365c572 100644
--- a/svtools/source/config/fontsubstconfig.cxx
+++ b/svtools/source/config/fontsubstconfig.cxx
@@ -94,7 +94,7 @@ SvtFontSubstConfig::~SvtFontSubstConfig()
delete pImpl;
}
-void SvtFontSubstConfig::Notify( const com::sun::star::uno::Sequence< OUString >& )
+void SvtFontSubstConfig::Notify( const css::uno::Sequence< OUString >& )
{
}
diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx
index db2b96403fe6..ba494a5a2437 100644
--- a/svtools/source/config/helpopt.cxx
+++ b/svtools/source/config/helpopt.cxx
@@ -65,8 +65,8 @@ class SvtHelpOptions_Impl : public utl::ConfigItem
public:
SvtHelpOptions_Impl();
- virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
- void Load( const ::com::sun::star::uno::Sequence< OUString>& aPropertyNames);
+ virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
+ void Load( const css::uno::Sequence< OUString>& aPropertyNames);
void SetExtendedHelp( bool b ) { bExtendedHelp= b; SetModified(); }
bool IsExtendedHelp() const { return bExtendedHelp; }
diff --git a/svtools/source/config/htmlcfg.cxx b/svtools/source/config/htmlcfg.cxx
index 84c6cb8beed4..db190b08bb3c 100644
--- a/svtools/source/config/htmlcfg.cxx
+++ b/svtools/source/config/htmlcfg.cxx
@@ -241,7 +241,7 @@ void SvxHtmlOptions::ImplCommit()
PutProperties(aNames, aValues);
}
-void SvxHtmlOptions::Notify( const com::sun::star::uno::Sequence< OUString >& )
+void SvxHtmlOptions::Notify( const css::uno::Sequence< OUString >& )
{
Load( GetPropertyNames() );
}
diff --git a/svtools/source/config/optionsdrawinglayer.cxx b/svtools/source/config/optionsdrawinglayer.cxx
index 68e010f46088..b7dbadf42b74 100644
--- a/svtools/source/config/optionsdrawinglayer.cxx
+++ b/svtools/source/config/optionsdrawinglayer.cxx
@@ -168,7 +168,7 @@ public:
// override methods of baseclass
- virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) override;
+ virtual void Notify( const css::uno::Sequence<OUString>& aPropertyNames) override;
// public interface
@@ -673,7 +673,7 @@ void SvtOptionsDrawinglayer_Impl::ImplCommit()
PutProperties( aSeqNames, aSeqValues );
}
-void SvtOptionsDrawinglayer_Impl::Notify( const com::sun::star::uno::Sequence<OUString>& )
+void SvtOptionsDrawinglayer_Impl::Notify( const css::uno::Sequence<OUString>& )
{
}
diff --git a/svtools/source/contnr/contentenumeration.cxx b/svtools/source/contnr/contentenumeration.cxx
index bb07a8b5fcf6..f4eed434078f 100644
--- a/svtools/source/contnr/contentenumeration.cxx
+++ b/svtools/source/contnr/contentenumeration.cxx
@@ -83,7 +83,7 @@ namespace svt
,m_pTranslator ( _pTranslator )
,m_pResultHandler ( NULL )
,m_bCancelled ( false )
- ,m_rBlackList ( ::com::sun::star::uno::Sequence< OUString >() )
+ ,m_rBlackList ( css::uno::Sequence< OUString >() )
{
}
@@ -106,7 +106,7 @@ namespace svt
EnumerationResult FileViewContentEnumerator::enumerateFolderContentSync(
const FolderDescriptor& _rFolder,
- const ::com::sun::star::uno::Sequence< OUString >& rBlackList )
+ const css::uno::Sequence< OUString >& rBlackList )
{
{
::osl::MutexGuard aGuard( m_aMutex );
diff --git a/svtools/source/contnr/contentenumeration.hxx b/svtools/source/contnr/contentenumeration.hxx
index 1791a21b5001..8c63ef96e9b3 100644
--- a/svtools/source/contnr/contentenumeration.hxx
+++ b/svtools/source/contnr/contentenumeration.hxx
@@ -189,17 +189,16 @@ namespace svt
mutable ::osl::Mutex m_aMutex;
FolderDescriptor m_aFolder;
- ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >
+ css::uno::Reference< css::ucb::XCommandEnvironment >
m_xCommandEnv;
const IContentTitleTranslation* m_pTranslator;
IEnumerationResultHandler* m_pResultHandler;
bool m_bCancelled;
- mutable ::com::sun::star::uno::Reference<
- ::com::sun::star::document::XDocumentProperties>
+ mutable css::uno::Reference< css::document::XDocumentProperties>
m_xDocProps;
- ::com::sun::star::uno::Sequence< OUString > m_rBlackList;
+ css::uno::Sequence< OUString > m_rBlackList;
bool URLOnBlackList ( const OUString& sRealURL );
@@ -214,7 +213,7 @@ namespace svt
an instance which should be used to translate content titles. May be <NULL/>
*/
FileViewContentEnumerator(
- const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& _rxCommandEnv,
+ const css::uno::Reference< css::ucb::XCommandEnvironment >& _rxCommandEnv,
ContentData& _rContentToFill,
::osl::Mutex& _rContentMutex,
const IContentTitleTranslation* _pTranslator
@@ -238,7 +237,7 @@ namespace svt
*/
EnumerationResult enumerateFolderContentSync(
const FolderDescriptor& _rFolder,
- const ::com::sun::star::uno::Sequence< OUString >& rBlackList = ::com::sun::star::uno::Sequence< OUString >()
+ const css::uno::Sequence< OUString >& rBlackList = css::uno::Sequence< OUString >()
);
/** cancels the running operation.
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 7c84374a7eb5..98b01730fb76 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -357,12 +357,12 @@ public:
FileViewResult GetFolderContent_Impl(
const OUString& rFolder,
const FileViewAsyncAction* pAsyncDescriptor,
- const ::com::sun::star::uno::Sequence< OUString >& rBlackList = ::com::sun::star::uno::Sequence< OUString >() );
+ const css::uno::Sequence< OUString >& rBlackList = css::uno::Sequence< OUString >() );
FileViewResult GetFolderContent_Impl(
const FolderDescriptor& _rFolder,
const FileViewAsyncAction* pAsyncDescriptor,
- const ::com::sun::star::uno::Sequence< OUString >& rBlackList = ::com::sun::star::uno::Sequence< OUString >());
+ const css::uno::Sequence< OUString >& rBlackList = css::uno::Sequence< OUString >());
void FilterFolderContent_Impl( const OUString &rFilter );
void CancelRunningAsyncAction();
@@ -954,7 +954,7 @@ bool ViewTabListBox_Impl::Kill( const OUString& rContent )
::ucbhelper::Content aCnt( rContent, mxCmdEnv, comphelper::getProcessComponentContext() );
aCnt.executeCommand( OUString( "delete" ), makeAny( true ) );
}
- catch( ::com::sun::star::ucb::CommandAbortedException const & )
+ catch( css::ucb::CommandAbortedException const & )
{
SAL_INFO( "svtools", "CommandAbortedException" );
bRet = false;
@@ -1077,7 +1077,7 @@ bool SvtFileView::GetParentURL( OUString& rParentURL ) const
{
::ucbhelper::Content aCnt( mpImp->maViewURL, mpImp->mxCmdEnv, comphelper::getProcessComponentContext() );
Reference< XContent > xContent( aCnt.get() );
- Reference< com::sun::star::container::XChild > xChild( xContent, UNO_QUERY );
+ Reference< css::container::XChild > xChild( xContent, UNO_QUERY );
if ( xChild.is() )
{
Reference< XContent > xParent( xChild->getParent(), UNO_QUERY );
@@ -1127,7 +1127,7 @@ void SvtFileView::SetPosSizePixel( const Point& rNewPos, const Size& rNewSize )
}
-bool SvtFileView::Initialize( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent>& _xContent, const OUString& rFilter )
+bool SvtFileView::Initialize( const css::uno::Reference< css::ucb::XContent>& _xContent, const OUString& rFilter )
{
WaitObject aWaitCursor( this );
@@ -1153,7 +1153,7 @@ FileViewResult SvtFileView::Initialize(
const OUString& rURL,
const OUString& rFilter,
const FileViewAsyncAction* pAsyncDescriptor,
- const ::com::sun::star::uno::Sequence< OUString >& rBlackList )
+ const css::uno::Sequence< OUString >& rBlackList )
{
WaitObject aWaitCursor( this );
mpBlackList = rBlackList;
@@ -1514,7 +1514,7 @@ void SvtFileView_Impl::Clear()
FileViewResult SvtFileView_Impl::GetFolderContent_Impl(
const OUString& rFolder,
const FileViewAsyncAction* pAsyncDescriptor,
- const ::com::sun::star::uno::Sequence< OUString >& rBlackList )
+ const css::uno::Sequence< OUString >& rBlackList )
{
::osl::ClearableMutexGuard aGuard( maMutex );
INetURLObject aFolderObj( rFolder );
@@ -1533,7 +1533,7 @@ FileViewResult SvtFileView_Impl::GetFolderContent_Impl(
FileViewResult SvtFileView_Impl::GetFolderContent_Impl(
const FolderDescriptor& _rFolder,
const FileViewAsyncAction* pAsyncDescriptor,
- const ::com::sun::star::uno::Sequence< OUString >& rBlackList )
+ const css::uno::Sequence< OUString >& rBlackList )
{
DBG_TESTSOLARMUTEX();
::osl::ClearableMutexGuard aGuard( maMutex );
diff --git a/svtools/source/contnr/foldertree.cxx b/svtools/source/contnr/foldertree.cxx
index acf54ac9a579..3c7e3cb7474c 100644
--- a/svtools/source/contnr/foldertree.cxx
+++ b/svtools/source/contnr/foldertree.cxx
@@ -153,7 +153,7 @@ void FolderTree::SetTreePath( OUString const & sUrl )
}
}
-void FolderTree::SetBlackList( const ::com::sun::star::uno::Sequence< OUString >& rBlackList )
+void FolderTree::SetBlackList( const css::uno::Sequence< OUString >& rBlackList )
{
m_aBlackList = rBlackList;
}
diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx
index de4293cf88d7..e512931e5f39 100644
--- a/svtools/source/contnr/ivctrl.cxx
+++ b/svtools/source/contnr/ivctrl.cxx
@@ -441,18 +441,18 @@ void SvtIconChoiceCtrl::CallImplEventListeners(sal_uLong nEvent, void* pData)
{
CallEventListeners(nEvent, pData);
}
-::com::sun::star::uno::Reference< XAccessible > SvtIconChoiceCtrl::CreateAccessible()
+css::uno::Reference< XAccessible > SvtIconChoiceCtrl::CreateAccessible()
{
vcl::Window* pParent = GetAccessibleParentWindow();
DBG_ASSERT( pParent, "SvTreeListBox::CreateAccessible - accessible parent not found" );
- ::com::sun::star::uno::Reference< XAccessible > xAccessible;
+ css::uno::Reference< XAccessible > xAccessible;
if ( pParent )
{
- ::com::sun::star::uno::Reference< XAccessible > xAccParent = pParent->GetAccessible();
+ css::uno::Reference< XAccessible > xAccParent = pParent->GetAccessible();
if ( xAccParent.is() )
{
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xTemp(GetComponentInterface());
+ css::uno::Reference< css::awt::XWindowPeer > xTemp(GetComponentInterface());
xAccessible = _pImp->GetAccessibleFactory().createAccessibleIconChoiceCtrl( *this, xAccParent );
}
}
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index 906919144d63..7cf3a8c9f43a 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -132,12 +132,12 @@ SvImpLBox::~SvImpLBox()
void SvImpLBox::UpdateStringSorter()
{
- const ::com::sun::star::lang::Locale& rNewLocale = Application::GetSettings().GetLanguageTag().getLocale();
+ const css::lang::Locale& rNewLocale = Application::GetSettings().GetLanguageTag().getLocale();
if( m_pStringSorter )
{
// different Locale from the older one, drop it and force recreate
- const ::com::sun::star::lang::Locale &aLocale = m_pStringSorter->getLocale();
+ const css::lang::Locale &aLocale = m_pStringSorter->getLocale();
if( aLocale.Language != rNewLocale.Language ||
aLocale.Country != rNewLocale.Country ||
aLocale.Variant != rNewLocale.Variant )
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index 2a8400b7b3e7..f12c49bdf802 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -620,7 +620,7 @@ IMPL_LINK_NOARG_TYPED(SvHeaderTabListBox, CreateAccessibleHdl_Impl, HeaderBar*,
DBG_ASSERT( pParent, "SvHeaderTabListBox..CreateAccessibleHdl_Impl - accessible parent not found" );
if ( pParent )
{
- ::com::sun::star::uno::Reference< XAccessible > xAccParent = pParent->GetAccessible();
+ css::uno::Reference< XAccessible > xAccParent = pParent->GetAccessible();
if ( xAccParent.is() )
{
Reference< XAccessible > xAccessible = m_pImpl->m_aFactoryAccess.getFactory().createAccessibleBrowseBoxHeaderBar(
@@ -777,11 +777,11 @@ bool SvHeaderTabListBox::IsColumnSelected( long ) const
return false;
}
-void SvHeaderTabListBox::GetAllSelectedRows( ::com::sun::star::uno::Sequence< sal_Int32 >& ) const
+void SvHeaderTabListBox::GetAllSelectedRows( css::uno::Sequence< sal_Int32 >& ) const
{
}
-void SvHeaderTabListBox::GetAllSelectedColumns( ::com::sun::star::uno::Sequence< sal_Int32 >& ) const
+void SvHeaderTabListBox::GetAllSelectedColumns( css::uno::Sequence< sal_Int32 >& ) const
{
}
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 36a9ccc9b935..2c907e2fdc40 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -1275,8 +1275,7 @@ void SvTreeListBox::StartDrag( sal_Int8, const Point& rPosPixel )
}
TransferDataContainer* pContainer = new TransferDataContainer;
- ::com::sun::star::uno::Reference<
- ::com::sun::star::datatransfer::XTransferable > xRef( pContainer );
+ css::uno::Reference< css::datatransfer::XTransferable > xRef( pContainer );
nDragDropMode = NotifyStartDrag( *pContainer, pEntry );
if( nDragDropMode == DragDropMode::NONE || 0 == GetSelectionCount() )
{
@@ -3834,19 +3833,19 @@ void SvTreeListBox::EnableList( bool _bEnable )
Invalidate(Rectangle(Point(), GetSizePixel()));
}
-::com::sun::star::uno::Reference< XAccessible > SvTreeListBox::CreateAccessible()
+css::uno::Reference< XAccessible > SvTreeListBox::CreateAccessible()
{
vcl::Window* pParent = GetAccessibleParentWindow();
DBG_ASSERT( pParent, "SvTreeListBox::CreateAccessible - accessible parent not found" );
- ::com::sun::star::uno::Reference< XAccessible > xAccessible;
+ css::uno::Reference< XAccessible > xAccessible;
if ( pParent )
{
- ::com::sun::star::uno::Reference< XAccessible > xAccParent = pParent->GetAccessible();
+ css::uno::Reference< XAccessible > xAccParent = pParent->GetAccessible();
if ( xAccParent.is() )
{
// need to be done here to get the vclxwindow later on in the accessible
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xTemp(GetComponentInterface());
+ css::uno::Reference< css::awt::XWindowPeer > xTemp(GetComponentInterface());
xAccessible = pImp->m_aFactoryAccess.getFactory().createAccessibleTreeListBox( *this, xAccParent );
}
}
diff --git a/svtools/source/control/accessibleruler.cxx b/svtools/source/control/accessibleruler.cxx
index bec4a321ad45..849a6209c283 100644
--- a/svtools/source/control/accessibleruler.cxx
+++ b/svtools/source/control/accessibleruler.cxx
@@ -289,7 +289,7 @@ void SAL_CALL SvtRulerAccessible::grabFocus() throw( RuntimeException, std::exce
}
sal_Int32 SvtRulerAccessible::getForeground( )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( m_aMutex );
@@ -298,7 +298,7 @@ sal_Int32 SvtRulerAccessible::getForeground( )
return mpRepr->GetControlForeground().GetColor();
}
sal_Int32 SvtRulerAccessible::getBackground( )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( m_aMutex );
diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx
index db3192a7d66f..4391d6a3afbb 100644
--- a/svtools/source/control/headbar.cxx
+++ b/svtools/source/control/headbar.cxx
@@ -1383,7 +1383,7 @@ Size HeaderBar::CalcWindowSizePixel() const
return aSize;
}
-::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > HeaderBar::CreateAccessible()
+css::uno::Reference< css::accessibility::XAccessible > HeaderBar::CreateAccessible()
{
if ( !mxAccessible.is() )
{
@@ -1396,18 +1396,18 @@ Size HeaderBar::CalcWindowSizePixel() const
return mxAccessible;
}
-void HeaderBar::SetAccessible( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > _xAccessible )
+void HeaderBar::SetAccessible( css::uno::Reference< css::accessibility::XAccessible > _xAccessible )
{
mxAccessible = _xAccessible;
}
-::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > HeaderBar::GetComponentInterface( bool bCreate )
+css::uno::Reference< css::awt::XWindowPeer > HeaderBar::GetComponentInterface( bool bCreate )
{
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xPeer
+ css::uno::Reference< css::awt::XWindowPeer > xPeer
(Window::GetComponentInterface(false));
if ( !xPeer.is() && bCreate )
{
- ::com::sun::star::awt::XWindowPeer* mxPeer = new VCLXHeaderBar(this);
+ css::awt::XWindowPeer* mxPeer = new VCLXHeaderBar(this);
m_pVCLXHeaderBar = static_cast<VCLXHeaderBar*>(mxPeer);
SetComponentInterface(mxPeer);
return mxPeer;
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 5807711732e9..60c459a77f71 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -386,7 +386,7 @@ void SvtMatchContext_Impl::ReadFolder( const OUString& rURL,
xResultSet = xDynamicResultSet->getStaticResultSet();
}
}
- catch( ::com::sun::star::uno::Exception& ) {}
+ catch( css::uno::Exception& ) {}
if ( xResultSet.is() )
{
@@ -448,12 +448,12 @@ void SvtMatchContext_Impl::ReadFolder( const OUString& rURL,
}
}
}
- catch( ::com::sun::star::uno::Exception& )
+ catch( css::uno::Exception& )
{
}
}
}
- catch( ::com::sun::star::uno::Exception& )
+ catch( css::uno::Exception& )
{
}
}
diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx
index 3e44d862c66b..69fbbef5de85 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -188,7 +188,7 @@ Reference< XAccessible > ToolbarMenuEntry::getAccessibleChild( sal_Int32 index )
-ToolbarMenu_Impl::ToolbarMenu_Impl( ToolbarMenu& rMenu, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame )
+ToolbarMenu_Impl::ToolbarMenu_Impl( ToolbarMenu& rMenu, const css::uno::Reference< css::frame::XFrame >& xFrame )
: mrMenu( rMenu )
, mxFrame( xFrame )
, mnCheckPos(0)
@@ -222,7 +222,7 @@ void ToolbarMenu_Impl::setAccessible( ToolbarMenuAcc* pAccessible )
-void ToolbarMenu_Impl::fireAccessibleEvent( short nEventId, const ::com::sun::star::uno::Any& rOldValue, const ::com::sun::star::uno::Any& rNewValue )
+void ToolbarMenu_Impl::fireAccessibleEvent( short nEventId, const css::uno::Any& rOldValue, const css::uno::Any& rNewValue )
{
if( mxAccessible.is() )
mxAccessible->FireAccessibleEvent( nEventId, rOldValue, rNewValue );
@@ -1520,7 +1520,7 @@ void ToolbarMenu::Command( const CommandEvent& rCEvt )
-Reference< ::com::sun::star::accessibility::XAccessible > ToolbarMenu::CreateAccessible()
+Reference< css::accessibility::XAccessible > ToolbarMenu::CreateAccessible()
{
mpImpl->setAccessible( new ToolbarMenuAcc( *mpImpl ) );
return Reference< XAccessible >( mpImpl->mxAccessible.get() );
@@ -1537,7 +1537,7 @@ void ToolbarMenu::AddStatusListener( const OUString& rCommandURL )
-void ToolbarMenu::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& /*Event*/ ) throw ( ::com::sun::star::uno::RuntimeException, std::exception )
+void ToolbarMenu::statusChanged( const css::frame::FeatureStateEvent& /*Event*/ ) throw ( css::uno::RuntimeException, std::exception )
{
}
@@ -1546,11 +1546,11 @@ void ToolbarMenu::statusChanged( const ::com::sun::star::frame::FeatureStateEven
class ToolbarMenuStatusListener : public svt::FrameStatusListener
{
public:
- ToolbarMenuStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame,
+ ToolbarMenuStatusListener( const css::uno::Reference< css::frame::XFrame >& xFrame,
ToolbarMenu& rToolbarMenu );
- virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
VclPtr<ToolbarMenu> mpMenu;
};
@@ -1558,7 +1558,7 @@ public:
ToolbarMenuStatusListener::ToolbarMenuStatusListener(
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame,
+ const css::uno::Reference< css::frame::XFrame >& xFrame,
ToolbarMenu& rToolbarMenu )
: svt::FrameStatusListener( ::comphelper::getProcessComponentContext(), xFrame )
, mpMenu( &rToolbarMenu )
@@ -1567,7 +1567,7 @@ ToolbarMenuStatusListener::ToolbarMenuStatusListener(
-void SAL_CALL ToolbarMenuStatusListener::dispose() throw (::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL ToolbarMenuStatusListener::dispose() throw (css::uno::RuntimeException, std::exception)
{
mpMenu.clear();
svt::FrameStatusListener::dispose();
@@ -1575,7 +1575,7 @@ void SAL_CALL ToolbarMenuStatusListener::dispose() throw (::com::sun::star::uno:
-void SAL_CALL ToolbarMenuStatusListener::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception )
+void SAL_CALL ToolbarMenuStatusListener::statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception )
{
if( mpMenu )
mpMenu->statusChanged( Event );
diff --git a/svtools/source/control/toolbarmenuimp.hxx b/svtools/source/control/toolbarmenuimp.hxx
index 46296c176dc8..b57c0c908bd6 100644
--- a/svtools/source/control/toolbarmenuimp.hxx
+++ b/svtools/source/control/toolbarmenuimp.hxx
@@ -47,7 +47,7 @@ struct ToolbarMenu_Impl;
class ToolbarMenu;
class ToolbarMenuEntry;
-typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener > > EventListenerVector;
+typedef ::std::vector< css::uno::Reference< css::accessibility::XAccessibleEventListener > > EventListenerVector;
typedef std::vector< ToolbarMenuEntry * > ToolbarMenuEntryVector;
const int SEPARATOR_HEIGHT = 4;
@@ -78,7 +78,7 @@ public:
VclPtr<Control> mpControl;
Rectangle maRect;
- ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > mxAccContext;
+ css::uno::Reference< css::accessibility::XAccessibleContext > mxAccContext;
public:
ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const OUString& rText, MenuItemBits nBits );
@@ -88,10 +88,10 @@ public:
void init( int nEntryId, MenuItemBits nBits );
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >& GetAccessible( bool bCreate = false );
+ const css::uno::Reference< css::accessibility::XAccessibleContext >& GetAccessible( bool bCreate = false );
- sal_Int32 getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException);
- ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > getAccessibleChild( sal_Int32 index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+ sal_Int32 getAccessibleChildCount() throw (css::uno::RuntimeException);
+ css::uno::Reference< css::accessibility::XAccessible > getAccessibleChild( sal_Int32 index ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException);
bool HasCheck() const
{
@@ -104,11 +104,11 @@ public:
typedef ::cppu::WeakComponentImplHelper<
- ::com::sun::star::accessibility::XAccessible,
- ::com::sun::star::accessibility::XAccessibleEventBroadcaster,
- ::com::sun::star::accessibility::XAccessibleContext,
- ::com::sun::star::accessibility::XAccessibleComponent,
- ::com::sun::star::accessibility::XAccessibleSelection >
+ css::accessibility::XAccessible,
+ css::accessibility::XAccessibleEventBroadcaster,
+ css::accessibility::XAccessibleContext,
+ css::accessibility::XAccessibleComponent,
+ css::accessibility::XAccessibleSelection >
ToolbarMenuAccComponentBase;
class ToolbarMenuAcc :
@@ -120,49 +120,49 @@ public:
explicit ToolbarMenuAcc( ToolbarMenu_Impl& rParent );
virtual ~ToolbarMenuAcc();
- void FireAccessibleEvent( short nEventId, const ::com::sun::star::uno::Any& rOldValue, const ::com::sun::star::uno::Any& rNewValue );
+ void FireAccessibleEvent( short nEventId, const css::uno::Any& rOldValue, const css::uno::Any& rNewValue );
bool HasAccessibleListeners() const { return( mxEventListeners.size() > 0 ); }
public:
// XAccessible
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override;
// XAccessibleEventBroadcaster
- virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
// XAccessibleContext
- virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::lang::Locale SAL_CALL getLocale( ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
// XAccessibleComponent
- virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Rectangle SAL_CALL getBounds( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Point SAL_CALL getLocation( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Point SAL_CALL getLocationOnScreen( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Size SAL_CALL getSize( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL grabFocus( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) override;
// XAccessibleSelection
- virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL clearAccessibleSelection( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL selectAllAccessibleChildren( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void );
@@ -184,17 +184,17 @@ private:
DisposedException is thrown to inform the (indirect) caller of the
foul deed.
*/
- void ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException);
+ void ThrowIfDisposed() throw (css::lang::DisposedException);
};
// - ToolbarMenuEntryAcc -
-typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::accessibility::XAccessible,
- ::com::sun::star::accessibility::XAccessibleEventBroadcaster,
- ::com::sun::star::accessibility::XAccessibleContext,
- ::com::sun::star::accessibility::XAccessibleComponent > ToolbarMenuEntryAccBase;
+typedef ::cppu::WeakComponentImplHelper< css::accessibility::XAccessible,
+ css::accessibility::XAccessibleEventBroadcaster,
+ css::accessibility::XAccessibleContext,
+ css::accessibility::XAccessibleComponent > ToolbarMenuEntryAccBase;
class ToolbarMenuEntryAcc : public ::comphelper::OBaseMutex,
public ToolbarMenuEntryAccBase
@@ -204,34 +204,34 @@ public:
virtual ~ToolbarMenuEntryAcc();
// XAccessible
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override;
// XAccessibleEventBroadcaster
- virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
// XAccessibleContext
- virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::lang::Locale SAL_CALL getLocale( ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
// XAccessibleComponent
- virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Rectangle SAL_CALL getBounds( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Point SAL_CALL getLocation( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Point SAL_CALL getLocationOnScreen( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Size SAL_CALL getSize( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL grabFocus( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) override;
private:
EventListenerVector mxEventListeners;
@@ -250,10 +250,10 @@ struct ToolbarMenu_Impl
{
ToolbarMenu& mrMenu;
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
- rtl::Reference< svt::FrameStatusListener > mxStatusListener;
- rtl::Reference< ToolbarMenuAcc > mxAccessible;
- ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > mxOldSelection;
+ css::uno::Reference< css::frame::XFrame > mxFrame;
+ rtl::Reference< svt::FrameStatusListener > mxStatusListener;
+ rtl::Reference< ToolbarMenuAcc > mxAccessible;
+ css::uno::Reference< css::accessibility::XAccessible > mxOldSelection;
ToolbarMenuEntryVector maEntryVector;
@@ -269,20 +269,20 @@ struct ToolbarMenu_Impl
Link<ToolbarMenu*,void> maSelectHdl;
- ToolbarMenu_Impl( ToolbarMenu& rMenu, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame );
+ ToolbarMenu_Impl( ToolbarMenu& rMenu, const css::uno::Reference< css::frame::XFrame >& xFrame );
~ToolbarMenu_Impl();
void setAccessible( ToolbarMenuAcc* pAccessible );
- void fireAccessibleEvent( short nEventId, const ::com::sun::star::uno::Any& rOldValue, const ::com::sun::star::uno::Any& rNewValue );
+ void fireAccessibleEvent( short nEventId, const css::uno::Any& rOldValue, const css::uno::Any& rNewValue );
bool hasAccessibleListeners();
- sal_Int32 getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException);
- ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > getAccessibleChild( sal_Int32 index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
- ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > getAccessibleChild( Control* pControl, sal_Int32 childIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+ sal_Int32 getAccessibleChildCount() throw (css::uno::RuntimeException);
+ css::uno::Reference< css::accessibility::XAccessible > getAccessibleChild( sal_Int32 index ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException);
+ css::uno::Reference< css::accessibility::XAccessible > getAccessibleChild( Control* pControl, sal_Int32 childIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException);
- void selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
- bool isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+ void selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException);
+ bool isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException);
void clearAccessibleSelection();
ToolbarMenuEntry* implGetEntry( int nEntry ) const;
diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx
index ee388f802d36..89eb0756073f 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.cxx
@@ -132,7 +132,7 @@ ValueSetAcc* ValueSetAcc::getImplementation( const uno::Reference< uno::XInterfa
uno::Reference< lang::XUnoTunnel > xUnoTunnel( rxData, uno::UNO_QUERY );
return( xUnoTunnel.is() ? reinterpret_cast<ValueSetAcc*>(sal::static_int_cast<sal_IntPtr>(xUnoTunnel->getSomething( ValueSetAcc::getUnoTunnelId() ))) : NULL );
}
- catch(const ::com::sun::star::uno::Exception&)
+ catch(const css::uno::Exception&)
{
return NULL;
}
@@ -146,10 +146,10 @@ void ValueSetAcc::GetFocus()
mbIsFocused = true;
// Broadcast the state change.
- ::com::sun::star::uno::Any aOldState, aNewState;
- aNewState <<= ::com::sun::star::accessibility::AccessibleStateType::FOCUSED;
+ css::uno::Any aOldState, aNewState;
+ aNewState <<= css::accessibility::AccessibleStateType::FOCUSED;
FireAccessibleEvent(
- ::com::sun::star::accessibility::AccessibleEventId::STATE_CHANGED,
+ css::accessibility::AccessibleEventId::STATE_CHANGED,
aOldState, aNewState);
}
@@ -160,10 +160,10 @@ void ValueSetAcc::LoseFocus()
mbIsFocused = false;
// Broadcast the state change.
- ::com::sun::star::uno::Any aOldState, aNewState;
- aOldState <<= ::com::sun::star::accessibility::AccessibleStateType::FOCUSED;
+ css::uno::Any aOldState, aNewState;
+ aOldState <<= css::accessibility::AccessibleStateType::FOCUSED;
FireAccessibleEvent(
- ::com::sun::star::accessibility::AccessibleEventId::STATE_CHANGED,
+ css::accessibility::AccessibleEventId::STATE_CHANGED,
aOldState, aNewState);
}
@@ -740,7 +740,7 @@ ValueSetItem* ValueSetAcc::getItem (sal_uInt16 nIndex) const
void ValueSetAcc::ThrowIfDisposed()
- throw (::com::sun::star::lang::DisposedException)
+ throw (css::lang::DisposedException)
{
if (rBHelper.bDisposed || rBHelper.bInDispose)
{
@@ -820,7 +820,7 @@ ValueItemAcc* ValueItemAcc::getImplementation( const uno::Reference< uno::XInter
uno::Reference< lang::XUnoTunnel > xUnoTunnel( rxData, uno::UNO_QUERY );
return( xUnoTunnel.is() ? reinterpret_cast<ValueItemAcc*>(sal::static_int_cast<sal_IntPtr>(xUnoTunnel->getSomething( ValueItemAcc::getUnoTunnelId() ))) : NULL );
}
- catch(const ::com::sun::star::uno::Exception&)
+ catch(const css::uno::Exception&)
{
return NULL;
}
diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx
index f1c1ac54311b..eef2fcf41f8b 100644
--- a/svtools/source/control/valueimp.hxx
+++ b/svtools/source/control/valueimp.hxx
@@ -64,17 +64,17 @@ struct ValueSetItem
explicit ValueSetItem( ValueSet& rParent );
~ValueSetItem();
- ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ css::uno::Reference< css::accessibility::XAccessible >
GetAccessible( bool bIsTransientChildrenDisabled );
};
typedef ::cppu::WeakComponentImplHelper<
- ::com::sun::star::accessibility::XAccessible,
- ::com::sun::star::accessibility::XAccessibleEventBroadcaster,
- ::com::sun::star::accessibility::XAccessibleContext,
- ::com::sun::star::accessibility::XAccessibleComponent,
- ::com::sun::star::accessibility::XAccessibleSelection,
- ::com::sun::star::lang::XUnoTunnel >
+ css::accessibility::XAccessible,
+ css::accessibility::XAccessibleEventBroadcaster,
+ css::accessibility::XAccessibleContext,
+ css::accessibility::XAccessibleComponent,
+ css::accessibility::XAccessibleSelection,
+ css::lang::XUnoTunnel >
ValueSetAccComponentBase;
class ValueSetAcc :
@@ -86,10 +86,10 @@ public:
ValueSetAcc( ValueSet* pParent, bool bIsTransientChildrenDisabled );
virtual ~ValueSetAcc();
- void FireAccessibleEvent( short nEventId, const ::com::sun::star::uno::Any& rOldValue, const ::com::sun::star::uno::Any& rNewValue );
+ void FireAccessibleEvent( short nEventId, const css::uno::Any& rOldValue, const css::uno::Any& rNewValue );
bool HasAccessibleListeners() const { return( mxEventListeners.size() > 0 ); }
- static ValueSetAcc* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxData ) throw();
+ static ValueSetAcc* getImplementation( const css::uno::Reference< css::uno::XInterface >& rxData ) throw();
public:
@@ -104,56 +104,56 @@ public:
void LoseFocus();
// XAccessible
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override;
// XAccessibleEventBroadcaster
- virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
// XAccessibleContext
- virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::lang::Locale SAL_CALL getLocale( ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
// XAccessibleComponent
- virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Rectangle SAL_CALL getBounds( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Point SAL_CALL getLocation( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Point SAL_CALL getLocationOnScreen( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Size SAL_CALL getSize( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL grabFocus( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) override;
// XAccessibleSelection
- virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL clearAccessibleSelection( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL selectAllAccessibleChildren( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
// XUnoTunnel
- virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ) override;
private:
- ::std::vector< ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessibleEventListener > > mxEventListeners;
+ ::std::vector< css::uno::Reference<
+ css::accessibility::XAccessibleEventListener > > mxEventListeners;
VclPtr<ValueSet> mpParent;
bool mbIsTransientChildrenDisabled;
/// The current FOCUSED state.
bool mbIsFocused;
- static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId();
+ static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId();
/** Tell all listeners that the object is dying. This callback is
usually called from the WeakComponentImplHelper class.
@@ -181,7 +181,7 @@ private:
foul deed.
*/
void ThrowIfDisposed()
- throw (::com::sun::star::lang::DisposedException);
+ throw (css::lang::DisposedException);
/** Check whether the value set has a 'none' field, i.e. a field (button)
that deselects any items (selects none of them).
@@ -192,21 +192,21 @@ private:
bool HasNoneField() const;
};
-class ValueItemAcc : public ::cppu::WeakImplHelper< ::com::sun::star::accessibility::XAccessible,
- ::com::sun::star::accessibility::XAccessibleEventBroadcaster,
- ::com::sun::star::accessibility::XAccessibleContext,
- ::com::sun::star::accessibility::XAccessibleComponent,
- ::com::sun::star::lang::XUnoTunnel >
+class ValueItemAcc : public ::cppu::WeakImplHelper< css::accessibility::XAccessible,
+ css::accessibility::XAccessibleEventBroadcaster,
+ css::accessibility::XAccessibleContext,
+ css::accessibility::XAccessibleComponent,
+ css::lang::XUnoTunnel >
{
private:
- ::std::vector< ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessibleEventListener > > mxEventListeners;
+ ::std::vector< css::uno::Reference<
+ css::accessibility::XAccessibleEventListener > > mxEventListeners;
::osl::Mutex maMutex;
ValueSetItem* mpParent;
bool mbIsTransientChildrenDisabled;
- static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId();
+ static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId();
public:
@@ -215,44 +215,44 @@ public:
void ParentDestroyed();
- void FireAccessibleEvent( short nEventId, const ::com::sun::star::uno::Any& rOldValue, const ::com::sun::star::uno::Any& rNewValue );
+ void FireAccessibleEvent( short nEventId, const css::uno::Any& rOldValue, const css::uno::Any& rNewValue );
- static ValueItemAcc* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxData ) throw();
+ static ValueItemAcc* getImplementation( const css::uno::Reference< css::uno::XInterface >& rxData ) throw();
public:
// XAccessible
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override;
// XAccessibleEventBroadcaster
- virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
// XAccessibleContext
- virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::lang::Locale SAL_CALL getLocale( ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
// XAccessibleComponent
- virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Rectangle SAL_CALL getBounds( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Point SAL_CALL getLocation( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Point SAL_CALL getLocationOnScreen( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Size SAL_CALL getSize( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL grabFocus( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) override;
// XUnoTunnel
- virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ) override;
};
#endif // INCLUDED_SVTOOLS_SOURCE_CONTROL_VALUEIMP_HXX
diff --git a/svtools/source/control/vclxaccessibleheaderbar.cxx b/svtools/source/control/vclxaccessibleheaderbar.cxx
index 7c928370ff4a..aa1470553671 100644
--- a/svtools/source/control/vclxaccessibleheaderbar.cxx
+++ b/svtools/source/control/vclxaccessibleheaderbar.cxx
@@ -46,7 +46,7 @@ VCLXHeaderBar::~VCLXHeaderBar()
{
}
-::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > VCLXHeaderBar::CreateAccessibleContext()
+css::uno::Reference< css::accessibility::XAccessibleContext > VCLXHeaderBar::CreateAccessibleContext()
{
return new VCLXAccessibleHeaderBar(this);
}
@@ -99,7 +99,7 @@ Sequence< ::rtl::OUString > VCLXAccessibleHeaderBar::getSupportedServiceNames()
// =======XAccessibleContext=======
sal_Int32 SAL_CALL VCLXAccessibleHeaderBar::getAccessibleChildCount( )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
@@ -109,8 +109,8 @@ sal_Int32 SAL_CALL VCLXAccessibleHeaderBar::getAccessibleChildCount( )
return nCount;
}
-::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL
- VCLXAccessibleHeaderBar::getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception)
+css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
+ VCLXAccessibleHeaderBar::getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
@@ -130,9 +130,9 @@ sal_Int32 SAL_CALL VCLXAccessibleHeaderBar::getAccessibleChildCount( )
return xChild;
}
-sal_Int16 SAL_CALL VCLXAccessibleHeaderBar::getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+sal_Int16 SAL_CALL VCLXAccessibleHeaderBar::getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception)
{
- return com::sun::star::accessibility::AccessibleRole::LIST;
+ return css::accessibility::AccessibleRole::LIST;
}
void SAL_CALL VCLXAccessibleHeaderBar::disposing()
@@ -143,7 +143,7 @@ void SAL_CALL VCLXAccessibleHeaderBar::disposing()
VCLXAccessibleComponent::disposing();
}
-::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > VCLXAccessibleHeaderBar::CreateChild (sal_Int32 i)
+css::uno::Reference< css::accessibility::XAccessible > VCLXAccessibleHeaderBar::CreateChild (sal_Int32 i)
{
Reference<XAccessible> xChild;
diff --git a/svtools/source/control/vclxaccessibleheaderbaritem.cxx b/svtools/source/control/vclxaccessibleheaderbaritem.cxx
index dd504066c4c6..c55bf0be9e73 100644
--- a/svtools/source/control/vclxaccessibleheaderbaritem.cxx
+++ b/svtools/source/control/vclxaccessibleheaderbaritem.cxx
@@ -83,7 +83,7 @@ awt::Rectangle VCLXAccessibleHeaderBarItem::implGetBounds() throw (RuntimeExcept
awt::Rectangle aBounds;
OExternalLockGuard aGuard( this );
- ::com::sun::star::awt::Size aSize;
+ css::awt::Size aSize;
if ( m_pHeadBar )
aBounds = AWTRectangle( m_pHeadBar->GetItemRect( sal_uInt16( m_nIndexInParent ) ) );
@@ -248,7 +248,7 @@ Reference< XAccessibleStateSet > VCLXAccessibleHeaderBarItem::getAccessibleState
-com::sun::star::lang::Locale VCLXAccessibleHeaderBarItem::getLocale() throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception)
+css::lang::Locale VCLXAccessibleHeaderBarItem::getLocale() throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception)
{
OExternalLockGuard aGuard( this );
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index bc3be749ce8f..756ac3d55161 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -252,14 +252,11 @@ public:
StringBag m_aStoredFields;
protected:
- ::com::sun::star::uno::Any
- getProperty(const OUString& _rLocalName) const;
- ::com::sun::star::uno::Any
- getProperty(const sal_Char* _pLocalName) const;
+ css::uno::Any getProperty(const OUString& _rLocalName) const;
+ css::uno::Any getProperty(const sal_Char* _pLocalName) const;
- OUString getStringProperty(const sal_Char* _pLocalName) const;
-
- OUString getStringProperty(const OUString& _rLocalName) const;
+ OUString getStringProperty(const sal_Char* _pLocalName) const;
+ OUString getStringProperty(const OUString& _rLocalName) const;
void setStringProperty(const sal_Char* _pLocalName, const OUString& _rValue);
@@ -278,7 +275,7 @@ public:
virtual void setDatasourceName(const OUString& _rName) override;
virtual void setCommand(const OUString& _rCommand) override;
- virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) override;
+ virtual void Notify( const css::uno::Sequence<OUString>& aPropertyNames) override;
private:
virtual void ImplCommit() override;
@@ -286,7 +283,7 @@ public:
};
-void AssignmentPersistentData::Notify( const com::sun::star::uno::Sequence<OUString>& )
+void AssignmentPersistentData::Notify( const css::uno::Sequence<OUString>& )
{
}
diff --git a/svtools/source/dialogs/colrdlg.cxx b/svtools/source/dialogs/colrdlg.cxx
index 96ad7da2c80b..ac147239217b 100644
--- a/svtools/source/dialogs/colrdlg.cxx
+++ b/svtools/source/dialogs/colrdlg.cxx
@@ -75,9 +75,9 @@ short SvColorDialog::Execute()
const OUString sColor( "Color" );
Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
- Reference< com::sun::star::awt::XWindow > xParent( VCLUnoHelper::GetInterface( mpParent ) );
+ Reference< css::awt::XWindow > xParent( VCLUnoHelper::GetInterface( mpParent ) );
- Reference< XExecutableDialog > xDialog = com::sun::star::cui::ColorPicker::createWithParent(xContext, xParent);
+ Reference< XExecutableDialog > xDialog = css::cui::ColorPicker::createWithParent(xContext, xParent);
Reference< XPropertyAccess > xPropertyAccess( xDialog, UNO_QUERY_THROW );
Sequence< PropertyValue > props( 2 );
diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx
index 0278a59399ef..5ccc99e3b65f 100644
--- a/svtools/source/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -343,7 +343,7 @@ awt::Size ExportDialog::GetOriginalSize()
{
sal_Int32 nWidth = 0;
sal_Int32 nHeight= 0;
- com::sun::star::uno::Any aAny;
+ css::uno::Any aAny;
aAny = xPagePropSet->getPropertyValue("Width");
aAny >>= nWidth;
aAny = xPagePropSet->getPropertyValue("Height");
@@ -356,7 +356,7 @@ awt::Size ExportDialog::GetOriginalSize()
uno::Reference< graphic::XPrimitiveFactory2D > xPrimitiveFactory = graphic::PrimitiveFactory2D::create( mxContext );
basegfx::B2DHomMatrix aViewTransformation( Application::GetDefaultDevice()->GetViewTransformation() );
- com::sun::star::geometry::AffineMatrix2D aTransformation;
+ css::geometry::AffineMatrix2D aTransformation;
aTransformation.m00 = aViewTransformation.get(0,0);
aTransformation.m01 = aViewTransformation.get(0,1);
aTransformation.m02 = aViewTransformation.get(0,2);
@@ -502,7 +502,7 @@ Bitmap ExportDialog::GetGraphicBitmap( SvStream& rInputStream )
Bitmap aRet;
Graphic aGraphic;
GraphicFilter aFilter( false );
- if ( aFilter.ImportGraphic( aGraphic, "", rInputStream, GRFILTER_FORMAT_NOTFOUND, NULL, GraphicFilterImportFlags::NONE, static_cast<com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >*>(NULL) ) == GRFILTER_OK )
+ if ( aFilter.ImportGraphic( aGraphic, "", rInputStream, GRFILTER_FORMAT_NOTFOUND, NULL, GraphicFilterImportFlags::NONE, static_cast<css::uno::Sequence< css::beans::PropertyValue >*>(NULL) ) == GRFILTER_OK )
{
aRet = aGraphic.GetBitmap();
}
@@ -551,8 +551,8 @@ bool ExportDialog::IsTempExportAvailable() const
}
ExportDialog::ExportDialog(FltCallDialogParameter& rPara,
- const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext,
- const com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& rxSourceDocument,
+ const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+ const css::uno::Reference< css::lang::XComponent >& rxSourceDocument,
bool bExportSelection, bool bIsPixelFormat)
: ModalDialog(rPara.pWindow, "GraphicExportDialog", "svt/ui/graphicexport.ui")
, mrFltCallPara(rPara)
diff --git a/svtools/source/filter/exportdialog.hxx b/svtools/source/filter/exportdialog.hxx
index ef16700632d5..bf1c96496e71 100644
--- a/svtools/source/filter/exportdialog.hxx
+++ b/svtools/source/filter/exportdialog.hxx
@@ -46,12 +46,12 @@ class ExportDialog : public ModalDialog
{
private:
- FltCallDialogParameter& mrFltCallPara;
+ FltCallDialogParameter& mrFltCallPara;
- const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
- mxContext;
- const com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >&
- mxSourceDocument;
+ const css::uno::Reference< css::uno::XComponentContext >
+ mxContext;
+ const css::uno::Reference< css::lang::XComponent >&
+ mxSourceDocument;
VclPtr<NumericField> mpMfSizeX;
VclPtr<ListBox> mpLbSizeX;
@@ -119,10 +119,8 @@ private:
SvStream* mpTempStream;
Bitmap maBitmap;
- com::sun::star::awt::Size
- maOriginalSize; // the original graphic size in 1/100mm
- com::sun::star::awt::Size
- maSize; // for vector graphics it always contains the logical size in 1/100mm
+ css::awt::Size maOriginalSize; // the original graphic size in 1/100mm
+ css::awt::Size maSize; // for vector graphics it always contains the logical size in 1/100mm
bool mbIsPixelFormat;
bool mbExportSelection;
@@ -131,14 +129,13 @@ private:
sal_Int32 mnInitialResolutionUnit;
// for pixel graphics it always contains the pixel count
- com::sun::star::awt::Size
- maResolution; // it always contains the number of pixels per meter
+ css::awt::Size maResolution; // it always contains the number of pixels per meter
- com::sun::star::uno::Reference< com::sun::star::drawing::XShape >
+ css::uno::Reference< css::drawing::XShape >
mxShape;
- com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >
+ css::uno::Reference< css::drawing::XShapes >
mxShapes;
- com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >
+ css::uno::Reference< css::drawing::XDrawPage >
mxPage;
@@ -160,22 +157,22 @@ private:
void GetGraphicSource();
bool GetGraphicStream();
static Bitmap GetGraphicBitmap( SvStream& rStream );
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
+ css::uno::Sequence< css::beans::PropertyValue >
GetFilterData( bool bUpdateConfig );
sal_uInt32 GetRawFileSize() const;
bool IsTempExportAvailable() const;
- com::sun::star::awt::Size
+ css::awt::Size
GetOriginalSize();
sal_Int32 GetDefaultUnit();
public:
ExportDialog( FltCallDialogParameter& rPara,
- const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext,
- const com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& rxSourceDocument,
- bool bExportSelection, bool bIsExportVectorFormat );
+ const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+ const css::uno::Reference< css::lang::XComponent >& rxSourceDocument,
+ bool bExportSelection, bool bIsExportVectorFormat );
virtual ~ExportDialog();
virtual void dispose() override;
};
diff --git a/svtools/source/graphic/descriptor.hxx b/svtools/source/graphic/descriptor.hxx
index 58c09cf8beb0..24045bd9263c 100644
--- a/svtools/source/graphic/descriptor.hxx
+++ b/svtools/source/graphic/descriptor.hxx
@@ -61,8 +61,8 @@ class Graphic;
namespace unographic {
class GraphicDescriptor : public ::cppu::OWeakAggObject,
- public ::com::sun::star::lang::XServiceInfo,
- public ::com::sun::star::lang::XTypeProvider,
+ public css::lang::XServiceInfo,
+ public css::lang::XTypeProvider,
public ::comphelper::PropertySetHelper
{
public:
@@ -72,39 +72,39 @@ public:
void init( const ::Graphic& rGraphic );
void init( const OUString& rURL );
- void init( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxIStm, const OUString& rURL );
+ void init( const css::uno::Reference< css::io::XInputStream >& rxIStm, const OUString& rURL );
static OUString getImplementationName_Static() throw();
- static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw();
protected:
static ::comphelper::PropertySetInfo* createPropertySetInfo();
// XInterface
- virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL acquire() throw() override;
virtual void SAL_CALL release() throw() override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
// XTypeProvider
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override;
// PropertySetHelper
- virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const ::com::sun::star::uno::Any* pValues ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) override;
- virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, ::com::sun::star::uno::Any* pValue ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const css::uno::Any* pValues ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) override;
+ virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, css::uno::Any* pValue ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
private:
const ::Graphic* mpGraphic;
GraphicType meType;
- OUString maMimeType;
+ OUString maMimeType;
Size maSizePixel;
Size maSize100thMM;
sal_uInt16 mnBitsPerPixel;
diff --git a/svtools/source/graphic/graphic.cxx b/svtools/source/graphic/graphic.cxx
index 0dc360836062..1a29182b45a1 100644
--- a/svtools/source/graphic/graphic.cxx
+++ b/svtools/source/graphic/graphic.cxx
@@ -79,7 +79,7 @@ uno::Any SAL_CALL Graphic::queryAggregation( const uno::Type& rType )
uno::Any SAL_CALL Graphic::queryInterface( const uno::Type & rType )
throw( uno::RuntimeException, std::exception )
{
- ::com::sun::star::uno::Any aReturn = ::unographic::GraphicDescriptor::queryInterface( rType );
+ css::uno::Any aReturn = ::unographic::GraphicDescriptor::queryInterface( rType );
if ( !aReturn.hasValue() )
aReturn = ::cppu::queryInterface ( rType, static_cast< graphic::XGraphicTransformer*>( this ) );
return aReturn;
@@ -205,7 +205,7 @@ uno::Sequence< ::sal_Int8 > SAL_CALL Graphic::getDIB( ) throw (uno::RuntimeExce
SvMemoryStream aMem;
WriteDIB(mpGraphic->GetBitmapEx().GetBitmap(), aMem, false, true);
- return ::com::sun::star::uno::Sequence<sal_Int8>( static_cast<sal_Int8 const *>(aMem.GetData()), aMem.Tell() );
+ return css::uno::Sequence<sal_Int8>( static_cast<sal_Int8 const *>(aMem.GetData()), aMem.Tell() );
}
else
{
@@ -224,7 +224,7 @@ uno::Sequence< ::sal_Int8 > SAL_CALL Graphic::getMaskDIB( ) throw (uno::Runtime
SvMemoryStream aMem;
WriteDIB(mpGraphic->GetBitmapEx().GetMask(), aMem, false, true);
- return ::com::sun::star::uno::Sequence<sal_Int8>( static_cast<sal_Int8 const *>(aMem.GetData()), aMem.Tell() );
+ return css::uno::Sequence<sal_Int8>( static_cast<sal_Int8 const *>(aMem.GetData()), aMem.Tell() );
}
else
{
diff --git a/svtools/source/graphic/graphic.hxx b/svtools/source/graphic/graphic.hxx
index ac841e6c6d88..ec512a8cf601 100644
--- a/svtools/source/graphic/graphic.hxx
+++ b/svtools/source/graphic/graphic.hxx
@@ -30,9 +30,9 @@
namespace unographic {
-class Graphic : public ::com::sun::star::graphic::XGraphic,
- public ::com::sun::star::awt::XBitmap,
- public ::com::sun::star::lang::XUnoTunnel,
+class Graphic : public css::graphic::XGraphic,
+ public css::awt::XBitmap,
+ public css::lang::XUnoTunnel,
public ::unographic::GraphicDescriptor,
public ::unographic::GraphicTransformer
{
@@ -44,37 +44,37 @@ public:
using ::unographic::GraphicDescriptor::init;
void init( const ::Graphic& rGraphic ) throw();
- static const ::Graphic* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw();
+ static const ::Graphic* getImplementation( const css::uno::Reference< css::uno::XInterface >& rxIFace ) throw();
static OUString getImplementationName_Static() throw();
- static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw();
protected:
// XInterface
- virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL acquire() throw() override;
virtual void SAL_CALL release() throw() override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
// XTypeProvider
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override;
// XGraphic
- virtual ::sal_Int8 SAL_CALL getType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual ::sal_Int8 SAL_CALL getType( ) throw (css::uno::RuntimeException, std::exception) override;
// XBitmap
- virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getDIB( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getMaskDIB( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Size SAL_CALL getSize( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getDIB( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getMaskDIB( ) throw (css::uno::RuntimeException, std::exception) override;
// XUnoTunnel
- virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) override;
private:
diff --git a/svtools/source/graphic/transformer.hxx b/svtools/source/graphic/transformer.hxx
index 501fc022b4eb..ceda687f0585 100644
--- a/svtools/source/graphic/transformer.hxx
+++ b/svtools/source/graphic/transformer.hxx
@@ -31,7 +31,7 @@ namespace unographic {
typedef ::cppu::WeakAggImplHelper1<
- ::com::sun::star::graphic::XGraphicTransformer
+ css::graphic::XGraphicTransformer
> GraphicTransformer_UnoImplHelper1;
class GraphicTransformer : public GraphicTransformer_UnoImplHelper1
{
@@ -41,20 +41,20 @@ class GraphicTransformer : public GraphicTransformer_UnoImplHelper1
virtual ~GraphicTransformer();
// XGraphicTransformer
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL colorChange(
- const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& rGraphic,
- sal_Int32 nColorFrom, sal_Int8 nTolerance, sal_Int32 nColorTo, sal_Int8 nAlphaTo )
- throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL colorChange(
+ const css::uno::Reference< css::graphic::XGraphic >& rGraphic,
+ sal_Int32 nColorFrom, sal_Int8 nTolerance, sal_Int32 nColorTo, sal_Int8 nAlphaTo )
+ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL applyDuotone(
- const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& rGraphic,
- sal_Int32 nColorOne, sal_Int32 nColorTwo )
- throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL applyDuotone(
+ const css::uno::Reference< css::graphic::XGraphic >& rGraphic,
+ sal_Int32 nColorOne, sal_Int32 nColorTwo )
+ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL applyBrightnessContrast(
- const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& rxGraphic,
- sal_Int32 nBrightness, sal_Int32 nContrast, sal_Bool mso )
- throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL applyBrightnessContrast(
+ const css::uno::Reference< css::graphic::XGraphic >& rxGraphic,
+ sal_Int32 nBrightness, sal_Int32 nContrast, sal_Bool mso )
+ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
};
diff --git a/svtools/source/hatchwindow/documentcloser.cxx b/svtools/source/hatchwindow/documentcloser.cxx
index 30791fd59b85..31d1d60fdcce 100644
--- a/svtools/source/hatchwindow/documentcloser.cxx
+++ b/svtools/source/hatchwindow/documentcloser.cxx
@@ -44,11 +44,11 @@ namespace {
// the service is implemented as a wrapper to be able to die by refcount
// the disposing mechanics is required for java related scenarios
-class ODocumentCloser : public ::cppu::WeakImplHelper< ::com::sun::star::lang::XComponent,
- ::com::sun::star::lang::XServiceInfo >
+class ODocumentCloser : public ::cppu::WeakImplHelper< css::lang::XComponent,
+ css::lang::XServiceInfo >
{
::osl::Mutex m_aMutex;
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame;
+ css::uno::Reference< css::frame::XFrame > m_xFrame;
::cppu::OInterfaceContainerHelper* m_pListenersContainer; // list of listeners
bool m_bDisposed;
@@ -58,14 +58,14 @@ public:
virtual ~ODocumentCloser();
// XComponent
- virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override;
};
class MainThreadFrameCloserRequest
diff --git a/svtools/source/hatchwindow/hatchwindow.cxx b/svtools/source/hatchwindow/hatchwindow.cxx
index 3ca665552db0..46ba831ceec0 100644
--- a/svtools/source/hatchwindow/hatchwindow.cxx
+++ b/svtools/source/hatchwindow/hatchwindow.cxx
@@ -165,12 +165,12 @@ uno::Sequence< sal_Int8 > SAL_CALL VCLXHatchWindow::getImplementationId()
return css::uno::Sequence<sal_Int8>();
}
-::com::sun::star::awt::Size SAL_CALL VCLXHatchWindow::getHatchBorderSize() throw (::com::sun::star::uno::RuntimeException, std::exception)
+css::awt::Size SAL_CALL VCLXHatchWindow::getHatchBorderSize() throw (css::uno::RuntimeException, std::exception)
{
return aHatchBorderSize;
}
-void SAL_CALL VCLXHatchWindow::setHatchBorderSize( const ::com::sun::star::awt::Size& _hatchbordersize ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL VCLXHatchWindow::setHatchBorderSize( const css::awt::Size& _hatchbordersize ) throw (css::uno::RuntimeException, std::exception)
{
if ( pHatchWindow )
{
diff --git a/svtools/source/hatchwindow/ipwin.cxx b/svtools/source/hatchwindow/ipwin.cxx
index 2930e951d600..be5a80af48e8 100644
--- a/svtools/source/hatchwindow/ipwin.cxx
+++ b/svtools/source/hatchwindow/ipwin.cxx
@@ -446,7 +446,7 @@ SvResizeWindow::SvResizeWindow
{
OSL_ENSURE( pParent != NULL && pWrapper != NULL, "Wrong initialization of hatch window!\n" );
SetBackground();
- SetAccessibleRole( ::com::sun::star::accessibility::AccessibleRole::EMBEDDED_OBJECT );
+ SetAccessibleRole( css::accessibility::AccessibleRole::EMBEDDED_OBJECT );
m_aResizer.SetOuterRectPixel( Rectangle( Point(), GetOutputSizePixel() ) );
}
diff --git a/svtools/source/inc/hatchwindow.hxx b/svtools/source/inc/hatchwindow.hxx
index 3d1384b894d8..cd9e1b887f01 100644
--- a/svtools/source/inc/hatchwindow.hxx
+++ b/svtools/source/inc/hatchwindow.hxx
@@ -26,20 +26,20 @@
#include <cppuhelper/typeprovider.hxx>
class SvResizeWindow;
-class VCLXHatchWindow : public ::com::sun::star::embed::XHatchWindow,
+class VCLXHatchWindow : public css::embed::XHatchWindow,
public VCLXWindow
{
- ::com::sun::star::uno::Reference< ::com::sun::star::embed::XHatchWindowController > m_xController;
- ::com::sun::star::awt::Size aHatchBorderSize;
+ css::uno::Reference< css::embed::XHatchWindowController > m_xController;
+ css::awt::Size aHatchBorderSize;
VclPtr<SvResizeWindow> pHatchWindow;
public:
VCLXHatchWindow();
virtual ~VCLXHatchWindow();
- void initializeWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParent,
- const ::com::sun::star::awt::Rectangle& aBounds,
- const ::com::sun::star::awt::Size& aSize );
+ void initializeWindow( const css::uno::Reference< css::awt::XWindowPeer >& xParent,
+ const css::awt::Rectangle& aBounds,
+ const css::awt::Size& aSize );
void QueryObjAreaPixel( Rectangle & );
void RequestObjAreaPixel( const Rectangle & );
@@ -48,23 +48,23 @@ public:
void Deactivated();
// XInterface
- ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) throw(css::uno::RuntimeException, std::exception) override;
void SAL_CALL acquire() throw() override;
void SAL_CALL release() throw() override;
// XTypeProvider
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
+ css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
// XHatchWindow
- virtual void SAL_CALL setController( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XHatchWindowController >& xController ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::awt::Size SAL_CALL getHatchBorderSize() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setHatchBorderSize( const ::com::sun::star::awt::Size& _hatchbordersize ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setController( const css::uno::Reference< css::embed::XHatchWindowController >& xController ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Size SAL_CALL getHatchBorderSize() throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setHatchBorderSize( const css::awt::Size& _hatchbordersize ) throw (css::uno::RuntimeException, std::exception) override;
// XComponent
- virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
};
#endif // INCLUDED_SVTOOLS_SOURCE_INC_HATCHWINDOW_HXX
diff --git a/svtools/source/inc/provider.hxx b/svtools/source/inc/provider.hxx
index 4580ba863dcb..87bb89e09f6f 100644
--- a/svtools/source/inc/provider.hxx
+++ b/svtools/source/inc/provider.hxx
@@ -27,8 +27,8 @@
namespace {
-class GraphicProvider : public ::cppu::WeakImplHelper< ::com::sun::star::graphic::XGraphicProvider,
- ::com::sun::star::lang::XServiceInfo >
+class GraphicProvider : public ::cppu::WeakImplHelper< css::graphic::XGraphicProvider,
+ css::lang::XServiceInfo >
{
public:
@@ -38,27 +38,27 @@ public:
protected:
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
// XTypeProvider
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override;
// XGraphicProvider
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL queryGraphicDescriptor( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& MediaProperties ) throw (::com::sun::star::io::IOException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL queryGraphic( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& MediaProperties ) throw (::com::sun::star::io::IOException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL storeGraphic( const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& Graphic, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& MediaProperties ) throw (::com::sun::star::io::IOException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL queryGraphicDescriptor( const css::uno::Sequence< css::beans::PropertyValue >& MediaProperties ) throw (css::io::IOException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL queryGraphic( const css::uno::Sequence< css::beans::PropertyValue >& MediaProperties ) throw (css::io::IOException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL storeGraphic( const css::uno::Reference< css::graphic::XGraphic >& Graphic, const css::uno::Sequence< css::beans::PropertyValue >& MediaProperties ) throw (css::io::IOException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
private:
- static ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadMemory( const OUString& rResourceURL );
- static ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadGraphicObject( const OUString& rResourceURL );
- static ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadResource( const OUString& rResourceURL );
- static ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadRepositoryImage( const OUString& rResourceURL );
- static ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadBitmap( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >& rBitmap );
- static ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadStandardImage( const OUString& rResourceURL );
+ static css::uno::Reference< css::graphic::XGraphic > implLoadMemory( const OUString& rResourceURL );
+ static css::uno::Reference< css::graphic::XGraphic > implLoadGraphicObject( const OUString& rResourceURL );
+ static css::uno::Reference< css::graphic::XGraphic > implLoadResource( const OUString& rResourceURL );
+ static css::uno::Reference< css::graphic::XGraphic > implLoadRepositoryImage( const OUString& rResourceURL );
+ static css::uno::Reference< css::graphic::XGraphic > implLoadBitmap( const css::uno::Reference< css::awt::XBitmap >& rBitmap );
+ static css::uno::Reference< css::graphic::XGraphic > implLoadStandardImage( const OUString& rResourceURL );
};
}
diff --git a/svtools/source/inc/renderer.hxx b/svtools/source/inc/renderer.hxx
index 62406145376d..a479b879731d 100644
--- a/svtools/source/inc/renderer.hxx
+++ b/svtools/source/inc/renderer.hxx
@@ -32,10 +32,10 @@ class OutputDevice;
namespace {
class GraphicRendererVCL : public ::cppu::OWeakAggObject,
- public ::com::sun::star::lang::XServiceInfo,
- public ::com::sun::star::lang::XTypeProvider,
+ public css::lang::XServiceInfo,
+ public css::lang::XTypeProvider,
public ::comphelper::PropertySetHelper,
- public ::com::sun::star::graphic::XGraphicRenderer
+ public css::graphic::XGraphicRenderer
{
static ::comphelper::PropertySetInfo* createPropertySetInfo();
@@ -45,34 +45,34 @@ public:
virtual ~GraphicRendererVCL() throw();
// XInterface
- virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL acquire() throw() override;
virtual void SAL_CALL release() throw() override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
// XTypeProvider
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override;
// PropertySetHelper
- virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const ::com::sun::star::uno::Any* pValues ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) override;
- virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, ::com::sun::star::uno::Any* pValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ) override;
+ virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const css::uno::Any* pValues ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) override;
+ virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, css::uno::Any* pValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException ) override;
// XGraphicRenderer
- virtual void SAL_CALL render( const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& Graphic ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL render( const css::uno::Reference< css::graphic::XGraphic >& Graphic ) throw (css::uno::RuntimeException, std::exception) override;
private:
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > mxDevice;
+ css::uno::Reference< css::awt::XDevice > mxDevice;
VclPtr<OutputDevice> mpOutDev;
Rectangle maDestRect;
- ::com::sun::star::uno::Any maRenderData;
+ css::uno::Any maRenderData;
};
}
diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx
index eaa53a942657..d4380badcd4f 100644
--- a/svtools/source/inc/unoiface.hxx
+++ b/svtools/source/inc/unoiface.hxx
@@ -47,9 +47,9 @@ class SvNumberFormatsSupplierObj;
// class VCLXMultiLineEdit
-class VCLXMultiLineEdit : public ::com::sun::star::awt::XTextComponent,
- public ::com::sun::star::awt::XTextArea,
- public ::com::sun::star::awt::XTextLayoutConstrains,
+class VCLXMultiLineEdit : public css::awt::XTextComponent,
+ public css::awt::XTextArea,
+ public css::awt::XTextLayoutConstrains,
public VCLXWindow
{
private:
@@ -63,47 +63,47 @@ public:
VCLXMultiLineEdit();
virtual ~VCLXMultiLineEdit();
- // ::com::sun::star::uno::XInterface
- ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL acquire() throw() override { VCLXWindow::acquire(); }
- void SAL_CALL release() throw() override { VCLXWindow::release(); }
-
- // ::com::sun::star::lang::XTypeProvider
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-
- // ::com::sun::star::awt::XTextComponent
- void SAL_CALL addTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL removeTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL setText( const OUString& aText ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL insertText( const ::com::sun::star::awt::Selection& Sel, const OUString& Text ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- OUString SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- OUString SAL_CALL getSelectedText( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- ::com::sun::star::awt::Selection SAL_CALL getSelection( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- sal_Bool SAL_CALL isEditable( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL setEditable( sal_Bool bEditable ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL setMaxTextLen( sal_Int16 nLen ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- sal_Int16 SAL_CALL getMaxTextLen( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ // css::uno::XInterface
+ css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL acquire() throw() override { VCLXWindow::acquire(); }
+ void SAL_CALL release() throw() override { VCLXWindow::release(); }
+
+ // css::lang::XTypeProvider
+ css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
+ css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+
+ // css::awt::XTextComponent
+ void SAL_CALL addTextListener( const css::uno::Reference< css::awt::XTextListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL removeTextListener( const css::uno::Reference< css::awt::XTextListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL setText( const OUString& aText ) throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL insertText( const css::awt::Selection& Sel, const OUString& Text ) throw(css::uno::RuntimeException, std::exception) override;
+ OUString SAL_CALL getText( ) throw(css::uno::RuntimeException, std::exception) override;
+ OUString SAL_CALL getSelectedText( ) throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL setSelection( const css::awt::Selection& aSelection ) throw(css::uno::RuntimeException, std::exception) override;
+ css::awt::Selection SAL_CALL getSelection( ) throw(css::uno::RuntimeException, std::exception) override;
+ sal_Bool SAL_CALL isEditable( ) throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL setEditable( sal_Bool bEditable ) throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL setMaxTextLen( sal_Int16 nLen ) throw(css::uno::RuntimeException, std::exception) override;
+ sal_Int16 SAL_CALL getMaxTextLen( ) throw(css::uno::RuntimeException, std::exception) override;
//XTextArea
- OUString SAL_CALL getTextLines( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ OUString SAL_CALL getTextLines( ) throw(css::uno::RuntimeException, std::exception) override;
- // ::com::sun::star::awt::XLayoutConstrains
- ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ // css::awt::XLayoutConstrains
+ css::awt::Size SAL_CALL getMinimumSize( ) throw(css::uno::RuntimeException, std::exception) override;
+ css::awt::Size SAL_CALL getPreferredSize( ) throw(css::uno::RuntimeException, std::exception) override;
+ css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) throw(css::uno::RuntimeException, std::exception) override;
- // ::com::sun::star::awt::XTextLayoutConstrains
- ::com::sun::star::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ // css::awt::XTextLayoutConstrains
+ css::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(css::uno::RuntimeException, std::exception) override;
- // ::com::sun::star::awt::XVclWindowPeer
- void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ // css::awt::XVclWindowPeer
+ void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
+ css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
- // ::com::sun::star::awt::XWindow
- void SAL_CALL setFocus( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ // css::awt::XWindow
+ void SAL_CALL setFocus( ) throw(css::uno::RuntimeException, std::exception) override;
static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
@@ -113,7 +113,7 @@ public:
// class VCLXFileControl
-class VCLXFileControl : ::com::sun::star::awt::XTextComponent, public ::com::sun::star::awt::XTextLayoutConstrains, public VCLXWindow
+class VCLXFileControl : css::awt::XTextComponent, public css::awt::XTextLayoutConstrains, public VCLXWindow
{
protected:
DECL_LINK_TYPED(ModifyHdl, Edit&, void);
@@ -126,39 +126,39 @@ public:
virtual void SetWindow( const VclPtr< vcl::Window > &pWindow ) override;
- // ::com::sun::star::uno::XInterface
- ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL acquire() throw() override { VCLXWindow::acquire(); }
- void SAL_CALL release() throw() override { VCLXWindow::release(); }
-
- // ::com::sun::star::lang::XTypeProvider
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-
- // ::com::sun::star::awt::XTextComponent
- void SAL_CALL addTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL removeTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL setText( const OUString& aText ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL insertText( const ::com::sun::star::awt::Selection& Sel, const OUString& Text ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- OUString SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- OUString SAL_CALL getSelectedText( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- ::com::sun::star::awt::Selection SAL_CALL getSelection( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- sal_Bool SAL_CALL isEditable( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL setEditable( sal_Bool bEditable ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL setMaxTextLen( sal_Int16 nLen ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- sal_Int16 SAL_CALL getMaxTextLen( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-
- // ::com::sun::star::awt::XLayoutConstrains
- ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-
- // ::com::sun::star::awt::XTextLayoutConstrains
- ::com::sun::star::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-
- void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ // css::uno::XInterface
+ css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL acquire() throw() override { VCLXWindow::acquire(); }
+ void SAL_CALL release() throw() override { VCLXWindow::release(); }
+
+ // css::lang::XTypeProvider
+ css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
+ css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+
+ // css::awt::XTextComponent
+ void SAL_CALL addTextListener( const css::uno::Reference< css::awt::XTextListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL removeTextListener( const css::uno::Reference< css::awt::XTextListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL setText( const OUString& aText ) throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL insertText( const css::awt::Selection& Sel, const OUString& Text ) throw(css::uno::RuntimeException, std::exception) override;
+ OUString SAL_CALL getText( ) throw(css::uno::RuntimeException, std::exception) override;
+ OUString SAL_CALL getSelectedText( ) throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL setSelection( const css::awt::Selection& aSelection ) throw(css::uno::RuntimeException, std::exception) override;
+ css::awt::Selection SAL_CALL getSelection( ) throw(css::uno::RuntimeException, std::exception) override;
+ sal_Bool SAL_CALL isEditable( ) throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL setEditable( sal_Bool bEditable ) throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL setMaxTextLen( sal_Int16 nLen ) throw(css::uno::RuntimeException, std::exception) override;
+ sal_Int16 SAL_CALL getMaxTextLen( ) throw(css::uno::RuntimeException, std::exception) override;
+
+ // css::awt::XLayoutConstrains
+ css::awt::Size SAL_CALL getMinimumSize( ) throw(css::uno::RuntimeException, std::exception) override;
+ css::awt::Size SAL_CALL getPreferredSize( ) throw(css::uno::RuntimeException, std::exception) override;
+ css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) throw(css::uno::RuntimeException, std::exception) override;
+
+ // css::awt::XTextLayoutConstrains
+ css::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(css::uno::RuntimeException, std::exception) override;
+
+ void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception) override;
static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
@@ -180,33 +180,33 @@ public:
SVTXFormattedField();
virtual ~SVTXFormattedField();
- // ::com::sun::star::awt::XVclWindowPeer
- void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ // css::awt::XVclWindowPeer
+ void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
+ css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
protected:
- ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > getFormatsSupplier() const;
- void setFormatsSupplier(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > & xSupplier);
+ css::uno::Reference< css::util::XNumberFormatsSupplier > getFormatsSupplier() const;
+ void setFormatsSupplier(const css::uno::Reference< css::util::XNumberFormatsSupplier > & xSupplier);
sal_Int32 getFormatKey() const;
void setFormatKey(sal_Int32 nKey);
- void SetValue(const ::com::sun::star::uno::Any& rValue);
- ::com::sun::star::uno::Any GetValue();
+ void SetValue(const css::uno::Any& rValue);
+ css::uno::Any GetValue();
void SetTreatAsNumber(bool bSet);
bool GetTreatAsNumber();
- void SetDefaultValue(const ::com::sun::star::uno::Any& rValue);
- ::com::sun::star::uno::Any GetDefaultValue();
+ void SetDefaultValue(const css::uno::Any& rValue);
+ css::uno::Any GetDefaultValue();
- void SetMinValue(const ::com::sun::star::uno::Any& rValue);
- ::com::sun::star::uno::Any GetMinValue();
+ void SetMinValue(const css::uno::Any& rValue);
+ css::uno::Any GetMinValue();
- void SetMaxValue(const ::com::sun::star::uno::Any& rValue);
- ::com::sun::star::uno::Any GetMaxValue();
+ void SetMaxValue(const css::uno::Any& rValue);
+ css::uno::Any GetMaxValue();
void NotifyTextListeners();
- ::com::sun::star::uno::Any convertEffectiveValue(const ::com::sun::star::uno::Any& rValue);
+ css::uno::Any convertEffectiveValue(const css::uno::Any& rValue);
virtual void SetWindow( const VclPtr< vcl::Window > &_pWindow) override;
@@ -233,9 +233,9 @@ struct RMItemData
};
typedef ::cppu::ImplInheritanceHelper < VCLXGraphicControl
- , ::com::sun::star::container::XContainerListener
- , ::com::sun::star::beans::XPropertyChangeListener
- , ::com::sun::star::awt::XItemEventBroadcaster
+ , css::container::XContainerListener
+ , css::beans::XPropertyChangeListener
+ , css::awt::XItemEventBroadcaster
> SVTXRoadmap_Base;
class SVTXRoadmap : public SVTXRoadmap_Base
@@ -245,7 +245,7 @@ private:
ItemListenerMultiplexer maItemListeners;
RMItemData CurRMItemData;
- static RMItemData GetRMItemData( const ::com::sun::star::container::ContainerEvent& _rEvent );
+ static RMItemData GetRMItemData( const css::container::ContainerEvent& _rEvent );
protected:
virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
@@ -255,24 +255,24 @@ protected:
public:
SVTXRoadmap();
- void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) override { VCLXWindow::disposing( Source ); }
+ void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override { VCLXWindow::disposing( Source ); }
- // ::com::sun::star::awt::XVclWindowPeer
- void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ // css::awt::XVclWindowPeer
+ void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
- ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
// XContainerListener
- void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& rEvent )throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& rEvent )throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& rEvent )throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ void SAL_CALL elementInserted( const css::container::ContainerEvent& rEvent )throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL elementRemoved( const css::container::ContainerEvent& rEvent )throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL elementReplaced( const css::container::ContainerEvent& rEvent )throw(css::uno::RuntimeException, std::exception) override;
// XItemEventBroadcaster
- virtual void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw (css::uno::RuntimeException, std::exception) override;
// XPropertyChangeListener
- virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) override;
protected:
@@ -288,38 +288,38 @@ protected:
// class SVTXNumericField
-class SVTXNumericField : public ::com::sun::star::awt::XNumericField, public SVTXFormattedField
+class SVTXNumericField : public css::awt::XNumericField, public SVTXFormattedField
{
public:
SVTXNumericField();
virtual ~SVTXNumericField();
- // ::com::sun::star::uno::XInterface
- ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL acquire() throw() override { SVTXFormattedField::acquire(); }
- void SAL_CALL release() throw() override { SVTXFormattedField::release(); }
-
- // ::com::sun::star::lang::XTypeProvider
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-
- // ::com::sun::star::awt::XNumericField
- void SAL_CALL setValue( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- double SAL_CALL getValue( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL setMin( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- double SAL_CALL getMin( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL setMax( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- double SAL_CALL getMax( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL setFirst( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- double SAL_CALL getFirst( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL setLast( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- double SAL_CALL getLast( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL setSpinSize( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- double SAL_CALL getSpinSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL setDecimalDigits( sal_Int16 nDigits ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- sal_Int16 SAL_CALL getDecimalDigits( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ // css::uno::XInterface
+ css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL acquire() throw() override { SVTXFormattedField::acquire(); }
+ void SAL_CALL release() throw() override { SVTXFormattedField::release(); }
+
+ // css::lang::XTypeProvider
+ css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
+ css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+
+ // css::awt::XNumericField
+ void SAL_CALL setValue( double Value ) throw(css::uno::RuntimeException, std::exception) override;
+ double SAL_CALL getValue( ) throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL setMin( double Value ) throw(css::uno::RuntimeException, std::exception) override;
+ double SAL_CALL getMin( ) throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL setMax( double Value ) throw(css::uno::RuntimeException, std::exception) override;
+ double SAL_CALL getMax( ) throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL setFirst( double Value ) throw(css::uno::RuntimeException, std::exception) override;
+ double SAL_CALL getFirst( ) throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL setLast( double Value ) throw(css::uno::RuntimeException, std::exception) override;
+ double SAL_CALL getLast( ) throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL setSpinSize( double Value ) throw(css::uno::RuntimeException, std::exception) override;
+ double SAL_CALL getSpinSize( ) throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL setDecimalDigits( sal_Int16 nDigits ) throw(css::uno::RuntimeException, std::exception) override;
+ sal_Int16 SAL_CALL getDecimalDigits( ) throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception) override;
+ sal_Bool SAL_CALL isStrictFormat( ) throw(css::uno::RuntimeException, std::exception) override;
static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
@@ -328,42 +328,42 @@ public:
// class VCLXCurrencyField
-class SVTXCurrencyField : public ::com::sun::star::awt::XCurrencyField, public SVTXFormattedField
+class SVTXCurrencyField : public css::awt::XCurrencyField, public SVTXFormattedField
{
public:
SVTXCurrencyField();
virtual ~SVTXCurrencyField();
- // ::com::sun::star::uno::XInterface
- ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL acquire() throw() override { SVTXFormattedField::acquire(); }
- void SAL_CALL release() throw() override { SVTXFormattedField::release(); }
-
- // ::com::sun::star::lang::XTypeProvider
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-
- // ::com::sun::star::awt::XVclWindowPeer
- void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-
- // ::com::sun::star::awt::XCurrencyField
- void SAL_CALL setValue( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- double SAL_CALL getValue( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL setMin( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- double SAL_CALL getMin( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL setMax( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- double SAL_CALL getMax( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL setFirst( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- double SAL_CALL getFirst( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL setLast( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- double SAL_CALL getLast( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL setSpinSize( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- double SAL_CALL getSpinSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL setDecimalDigits( sal_Int16 nDigits ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- sal_Int16 SAL_CALL getDecimalDigits( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ // css::uno::XInterface
+ css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL acquire() throw() override { SVTXFormattedField::acquire(); }
+ void SAL_CALL release() throw() override { SVTXFormattedField::release(); }
+
+ // css::lang::XTypeProvider
+ css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
+ css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+
+ // css::awt::XVclWindowPeer
+ void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
+ css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
+
+ // css::awt::XCurrencyField
+ void SAL_CALL setValue( double Value ) throw(css::uno::RuntimeException, std::exception) override;
+ double SAL_CALL getValue( ) throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL setMin( double Value ) throw(css::uno::RuntimeException, std::exception) override;
+ double SAL_CALL getMin( ) throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL setMax( double Value ) throw(css::uno::RuntimeException, std::exception) override;
+ double SAL_CALL getMax( ) throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL setFirst( double Value ) throw(css::uno::RuntimeException, std::exception) override;
+ double SAL_CALL getFirst( ) throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL setLast( double Value ) throw(css::uno::RuntimeException, std::exception) override;
+ double SAL_CALL getLast( ) throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL setSpinSize( double Value ) throw(css::uno::RuntimeException, std::exception) override;
+ double SAL_CALL getSpinSize( ) throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL setDecimalDigits( sal_Int16 nDigits ) throw(css::uno::RuntimeException, std::exception) override;
+ sal_Int16 SAL_CALL getDecimalDigits( ) throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception) override;
+ sal_Bool SAL_CALL isStrictFormat( ) throw(css::uno::RuntimeException, std::exception) override;
static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
@@ -372,7 +372,7 @@ public:
// class VCLXProgressBar
-class VCLXProgressBar : public ::com::sun::star::awt::XProgressBar,
+class VCLXProgressBar : public css::awt::XProgressBar,
public VCLXWindow
{
private:
@@ -387,25 +387,25 @@ public:
VCLXProgressBar();
virtual ~VCLXProgressBar();
- // ::com::sun::star::uno::XInterface
- ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL acquire() throw() override { VCLXWindow::acquire(); }
- void SAL_CALL release() throw() override { VCLXWindow::release(); }
+ // css::uno::XInterface
+ css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL acquire() throw() override { VCLXWindow::acquire(); }
+ void SAL_CALL release() throw() override { VCLXWindow::release(); }
- // ::com::sun::star::lang::XTypeProvider
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ // css::lang::XTypeProvider
+ css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
+ css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
- // ::com::sun::star::awt::XProgressBar
- void SAL_CALL setForegroundColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL setBackgroundColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL setValue( sal_Int32 nValue ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- void SAL_CALL setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(::com::sun::star::uno::RuntimeException, std::exception ) override;
- sal_Int32 SAL_CALL getValue() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ // css::awt::XProgressBar
+ void SAL_CALL setForegroundColor( sal_Int32 nColor ) throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL setBackgroundColor( sal_Int32 nColor ) throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL setValue( sal_Int32 nValue ) throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(css::uno::RuntimeException, std::exception ) override;
+ sal_Int32 SAL_CALL getValue() throw(css::uno::RuntimeException, std::exception) override;
- // ::com::sun::star::awt::VclWindowPeer
- void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ // css::awt::VclWindowPeer
+ void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
+ css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
@@ -420,8 +420,8 @@ public:
SVTXDateField();
virtual ~SVTXDateField();
- // ::com::sun::star::awt::VclWindowPeer
- void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ // css::awt::VclWindowPeer
+ void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
diff --git a/svtools/source/java/javainteractionhandler.cxx b/svtools/source/java/javainteractionhandler.cxx
index e380fb1972cf..82a113371abe 100644
--- a/svtools/source/java/javainteractionhandler.cxx
+++ b/svtools/source/java/javainteractionhandler.cxx
@@ -106,11 +106,11 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque
break;
}
- com::sun::star::java::JavaNotFoundException e1;
- com::sun::star::java::InvalidJavaSettingsException e2;
- com::sun::star::java::JavaDisabledException e3;
- com::sun::star::java::JavaVMCreationFailureException e4;
- com::sun::star::java::RestartRequiredException e5;
+ css::java::JavaNotFoundException e1;
+ css::java::InvalidJavaSettingsException e2;
+ css::java::JavaDisabledException e3;
+ css::java::JavaVMCreationFailureException e4;
+ css::java::RestartRequiredException e5;
// Try to recover the Exception type in the any and
// react accordingly.
sal_uInt16 nResult = RET_CANCEL;
diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx
index 0e77360e77bc..1fac755a5cf0 100644
--- a/svtools/source/misc/acceleratorexecute.cxx
+++ b/svtools/source/misc/acceleratorexecute.cxx
@@ -294,65 +294,65 @@ OUString AcceleratorExecute::impl_ts_findCommand(const css::awt::KeyEvent& aKey)
{
switch( aKey.KeyCode )
{
- case com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_LINE:
+ case css::awt::Key::DELETE_TO_BEGIN_OF_LINE:
return OUString( ".uno:DelToStartOfLine" );
- case com::sun::star::awt::Key::DELETE_TO_END_OF_LINE:
+ case css::awt::Key::DELETE_TO_END_OF_LINE:
return OUString( ".uno:DelToEndOfLine" );
- case com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_PARAGRAPH:
+ case css::awt::Key::DELETE_TO_BEGIN_OF_PARAGRAPH:
return OUString( ".uno:DelToStartOfPara" );
- case com::sun::star::awt::Key::DELETE_TO_END_OF_PARAGRAPH:
+ case css::awt::Key::DELETE_TO_END_OF_PARAGRAPH:
return OUString( ".uno:DelToEndOfPara" );
- case com::sun::star::awt::Key::DELETE_WORD_BACKWARD:
+ case css::awt::Key::DELETE_WORD_BACKWARD:
return OUString( ".uno:DelToStartOfWord" );
- case com::sun::star::awt::Key::DELETE_WORD_FORWARD:
+ case css::awt::Key::DELETE_WORD_FORWARD:
return OUString( ".uno:DelToEndOfWord" );
- case com::sun::star::awt::Key::INSERT_LINEBREAK:
+ case css::awt::Key::INSERT_LINEBREAK:
return OUString( ".uno:InsertLinebreak" );
- case com::sun::star::awt::Key::INSERT_PARAGRAPH:
+ case css::awt::Key::INSERT_PARAGRAPH:
return OUString( ".uno:InsertPara" );
- case com::sun::star::awt::Key::MOVE_WORD_BACKWARD:
+ case css::awt::Key::MOVE_WORD_BACKWARD:
return OUString( ".uno:GoToPrevWord" );
- case com::sun::star::awt::Key::MOVE_WORD_FORWARD:
+ case css::awt::Key::MOVE_WORD_FORWARD:
return OUString( ".uno:GoToNextWord" );
- case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_LINE:
+ case css::awt::Key::MOVE_TO_BEGIN_OF_LINE:
return OUString( ".uno:GoToStartOfLine" );
- case com::sun::star::awt::Key::MOVE_TO_END_OF_LINE:
+ case css::awt::Key::MOVE_TO_END_OF_LINE:
return OUString( ".uno:GoToEndOfLine" );
- case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH:
+ case css::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH:
return OUString( ".uno:GoToStartOfPara" );
- case com::sun::star::awt::Key::MOVE_TO_END_OF_PARAGRAPH:
+ case css::awt::Key::MOVE_TO_END_OF_PARAGRAPH:
return OUString( ".uno:GoToEndOfPara" );
- case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT:
+ case css::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT:
return OUString( ".uno:GoToStartOfDoc" );
- case com::sun::star::awt::Key::MOVE_TO_END_OF_DOCUMENT:
+ case css::awt::Key::MOVE_TO_END_OF_DOCUMENT:
return OUString( ".uno:GoToEndOfDoc" );
- case com::sun::star::awt::Key::SELECT_BACKWARD:
+ case css::awt::Key::SELECT_BACKWARD:
return OUString( ".uno:CharLeftSel" );
- case com::sun::star::awt::Key::SELECT_FORWARD:
+ case css::awt::Key::SELECT_FORWARD:
return OUString( ".uno:CharRightSel" );
- case com::sun::star::awt::Key::SELECT_WORD_BACKWARD:
+ case css::awt::Key::SELECT_WORD_BACKWARD:
return OUString( ".uno:WordLeftSel" );
- case com::sun::star::awt::Key::SELECT_WORD_FORWARD:
+ case css::awt::Key::SELECT_WORD_FORWARD:
return OUString( ".uno:WordRightSel" );
- case com::sun::star::awt::Key::SELECT_WORD:
+ case css::awt::Key::SELECT_WORD:
return OUString( ".uno:SelectWord" );
- case com::sun::star::awt::Key::SELECT_LINE:
+ case css::awt::Key::SELECT_LINE:
return OUString();
- case com::sun::star::awt::Key::SELECT_PARAGRAPH:
+ case css::awt::Key::SELECT_PARAGRAPH:
return OUString( ".uno:SelectText" );
- case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_LINE:
+ case css::awt::Key::SELECT_TO_BEGIN_OF_LINE:
return OUString( ".uno:StartOfLineSel" );
- case com::sun::star::awt::Key::SELECT_TO_END_OF_LINE:
+ case css::awt::Key::SELECT_TO_END_OF_LINE:
return OUString( ".uno:EndOfLineSel" );
- case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH:
+ case css::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH:
return OUString( ".uno:StartOfParaSel" );
- case com::sun::star::awt::Key::SELECT_TO_END_OF_PARAGRAPH:
+ case css::awt::Key::SELECT_TO_END_OF_PARAGRAPH:
return OUString( ".uno:EndOfParaSel" );
- case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT:
+ case css::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT:
return OUString( ".uno:StartOfDocumentSel" );
- case com::sun::star::awt::Key::SELECT_TO_END_OF_DOCUMENT:
+ case css::awt::Key::SELECT_TO_END_OF_DOCUMENT:
return OUString( ".uno:EndOfDocumentSel" );
- case com::sun::star::awt::Key::SELECT_ALL:
+ case css::awt::Key::SELECT_ALL:
return OUString( ".uno:SelectAll" );
default:
break;
diff --git a/svtools/source/misc/bindablecontrolhelper.cxx b/svtools/source/misc/bindablecontrolhelper.cxx
index ab22b2b50cb4..165db8854d36 100644
--- a/svtools/source/misc/bindablecontrolhelper.cxx
+++ b/svtools/source/misc/bindablecontrolhelper.cxx
@@ -66,7 +66,7 @@ bool lcl_isNamedRange( const OUString& sAddress, const uno::Reference< frame::XM
void
-BindableControlHelper::ApplyListSourceAndBindableData( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& xModel, const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& rObj, const OUString& rsCtrlSource, const OUString& rsRowSource, sal_uInt16 nRefTab )
+BindableControlHelper::ApplyListSourceAndBindableData( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::uno::XInterface >& rObj, const OUString& rsCtrlSource, const OUString& rsRowSource, sal_uInt16 nRefTab )
{
// XBindable etc.
uno::Reference< lang::XMultiServiceFactory > xFac;
diff --git a/svtools/source/misc/cliplistener.cxx b/svtools/source/misc/cliplistener.cxx
index e20a9d2cc2bb..13f4bf06a255 100644
--- a/svtools/source/misc/cliplistener.cxx
+++ b/svtools/source/misc/cliplistener.cxx
@@ -76,7 +76,7 @@ void TransferableClipboardListener::AddRemoveListener( vcl::Window* pWin, bool b
}
}
}
- catch( const ::com::sun::star::uno::Exception& )
+ catch( const css::uno::Exception& )
{
}
}
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index 18dc2a639982..0b4fe2d5e8e6 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -81,7 +81,7 @@ public:
virtual void SAL_CALL notifyClosing( const lang::EventObject& Source ) throw (uno::RuntimeException, std::exception) override;
virtual void SAL_CALL notifyEvent( const document::EventObject& aEvent ) throw( uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) throw( uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
};
EmbedEventListener_Impl* EmbedEventListener_Impl::Create( EmbeddedObjectRef* p )
@@ -205,7 +205,7 @@ void SAL_CALL EmbedEventListener_Impl::queryClosing( const lang::EventObject& So
throw util::CloseVetoException();
}
-void SAL_CALL EmbedEventListener_Impl::notifyClosing( const lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL EmbedEventListener_Impl::notifyClosing( const lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception)
{
if ( pObject && Source.Source == pObject->GetObject() )
{
@@ -793,7 +793,7 @@ uno::Reference< io::XInputStream > EmbeddedObjectRef::GetGraphicReplacementStrea
return ::comphelper::EmbeddedObjectContainer::GetGraphicReplacementStream(nViewAspect,xObj,pMediaType);
}
-bool EmbeddedObjectRef::IsChart(const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj)
+bool EmbeddedObjectRef::IsChart(const css::uno::Reference < css::embed::XEmbeddedObject >& xObj)
{
SvGlobalName aObjClsId(xObj->getClassID());
if(
@@ -808,7 +808,7 @@ bool EmbeddedObjectRef::IsChart(const ::com::sun::star::uno::Reference < ::com::
return false;
}
-bool EmbeddedObjectRef::IsGLChart(const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj)
+bool EmbeddedObjectRef::IsGLChart(const css::uno::Reference < css::embed::XEmbeddedObject >& xObj)
{
static const char* env = getenv("CHART_DUMMY_FACTORY");
if (IsChart(xObj))
diff --git a/svtools/source/misc/embedtransfer.cxx b/svtools/source/misc/embedtransfer.cxx
index 6a52a98b3397..cc38346d136f 100644
--- a/svtools/source/misc/embedtransfer.cxx
+++ b/svtools/source/misc/embedtransfer.cxx
@@ -133,9 +133,9 @@ bool SvEmbedTransferHelper::GetData( const css::datatransfer::DataFlavor& rFlavo
xStg->openStorageElement( aName, embed::ElementModes::READ )->copyToStorage( xStor );
}
- ::com::sun::star::uno::Any aAny;
- const sal_uInt32 nLen = pStream->Seek( STREAM_SEEK_TO_END );
- ::com::sun::star::uno::Sequence< sal_Int8 > aSeq( nLen );
+ css::uno::Any aAny;
+ const sal_uInt32 nLen = pStream->Seek( STREAM_SEEK_TO_END );
+ css::uno::Sequence< sal_Int8 > aSeq( nLen );
pStream->Seek( STREAM_SEEK_TO_BEGIN );
pStream->Read( aSeq.getArray(), nLen );
@@ -203,12 +203,12 @@ void SvEmbedTransferHelper::ObjectReleased()
}
void SvEmbedTransferHelper::FillTransferableObjectDescriptor( TransferableObjectDescriptor& rDesc,
- const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >& xObj,
+ const css::uno::Reference< css::embed::XEmbeddedObject >& xObj,
const Graphic* pGraphic,
sal_Int64 nAspect )
{
//TODO/LATER: need TypeName to fill it into the Descriptor (will be shown in listbox)
- ::com::sun::star::datatransfer::DataFlavor aFlavor;
+ css::datatransfer::DataFlavor aFlavor;
SotExchange::GetFormatDataFlavor( SotClipboardFormatId::OBJECTDESCRIPTOR, aFlavor );
rDesc.maClassName = SvGlobalName( xObj->getClassID() );
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index 3b189d3279b5..27c3c8e9b0e6 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -222,24 +222,24 @@ static OUString GetImageExtensionByFactory_Impl( const OUString& rURL )
try
{
// get the TypeDetection service to access all registered types
- ::com::sun::star::uno::Reference < ::com::sun::star::uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext();
- ::com::sun::star::uno::Reference < ::com::sun::star::document::XTypeDetection > xTypeDetector(
+ css::uno::Reference < css::uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext();
+ css::uno::Reference < css::document::XTypeDetection > xTypeDetector(
xContext->getServiceManager()->createInstanceWithContext("com.sun.star.document.TypeDetection", xContext),
- ::com::sun::star::uno::UNO_QUERY );
+ css::uno::UNO_QUERY );
OUString aInternalType = xTypeDetector->queryTypeByURL( rURL );
- ::com::sun::star::uno::Reference < ::com::sun::star::container::XNameAccess > xAccess( xTypeDetector, ::com::sun::star::uno::UNO_QUERY );
- ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > aTypeProps;
+ css::uno::Reference < css::container::XNameAccess > xAccess( xTypeDetector, css::uno::UNO_QUERY );
+ css::uno::Sequence < css::beans::PropertyValue > aTypeProps;
if ( !aInternalType.isEmpty() && xAccess->hasByName( aInternalType ) )
{
xAccess->getByName( aInternalType ) >>= aTypeProps;
sal_Int32 nProps = aTypeProps.getLength();
for ( sal_Int32 i = 0; i < nProps; ++i )
{
- const ::com::sun::star::beans::PropertyValue& rProp = aTypeProps[i];
+ const css::beans::PropertyValue& rProp = aTypeProps[i];
if (rProp.Name == "Extensions")
{
- ::com::sun::star::uno::Sequence < OUString > aExtensions;
+ css::uno::Sequence < OUString > aExtensions;
if ( ( rProp.Value >>= aExtensions ) && aExtensions.getLength() > 0 )
{
const OUString* pExtensions = aExtensions.getConstArray();
@@ -250,11 +250,11 @@ static OUString GetImageExtensionByFactory_Impl( const OUString& rURL )
}
}
}
- catch( const ::com::sun::star::uno::RuntimeException& )
+ catch( const css::uno::RuntimeException& )
{
throw; // don't hide it!
}
- catch( const ::com::sun::star::uno::Exception& )
+ catch( const css::uno::Exception& )
{
// type detection failed -> no extension
}
@@ -309,11 +309,11 @@ static bool GetVolumeProperties_Impl( ::ucbhelper::Content& rContent, svtools::V
( rContent.getPropertyValue( "IsFloppy" ) >>= rVolumeInfo.m_bIsFloppy ) &&
( rContent.getPropertyValue( "IsCompactDisc" ) >>= rVolumeInfo.m_bIsCompactDisc ) );
}
- catch( const ::com::sun::star::uno::RuntimeException& )
+ catch( const css::uno::RuntimeException& )
{
throw; // don't hide it!
}
- catch( const ::com::sun::star::uno::Exception& )
+ catch( const css::uno::Exception& )
{
// type detection failed -> no extension
}
@@ -327,7 +327,7 @@ static sal_uInt16 GetFolderImageId_Impl( const OUString& rURL )
::svtools::VolumeInfo aVolumeInfo;
try
{
- ::ucbhelper::Content aCnt( rURL, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() );
+ ::ucbhelper::Content aCnt( rURL, css::uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() );
if ( GetVolumeProperties_Impl( aCnt, aVolumeInfo ) )
{
if ( aVolumeInfo.m_bIsRemote )
@@ -340,11 +340,11 @@ static sal_uInt16 GetFolderImageId_Impl( const OUString& rURL )
nRet = IMG_FIXEDDEV;
}
}
- catch( const ::com::sun::star::uno::RuntimeException& )
+ catch( const css::uno::RuntimeException& )
{
throw; // don't hide it!
}
- catch( const ::com::sun::star::uno::Exception& )
+ catch( const css::uno::Exception& )
{
}
@@ -460,7 +460,7 @@ static sal_uInt16 GetFolderDescriptionId_Impl( const OUString& rURL )
svtools::VolumeInfo aVolumeInfo;
try
{
- ::ucbhelper::Content aCnt( rURL, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() );
+ ::ucbhelper::Content aCnt( rURL, css::uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() );
if ( GetVolumeProperties_Impl( aCnt, aVolumeInfo ) )
{
if ( aVolumeInfo.m_bIsRemote )
@@ -473,11 +473,11 @@ static sal_uInt16 GetFolderDescriptionId_Impl( const OUString& rURL )
nRet = STR_DESCRIPTION_LOCALE_VOLUME;
}
}
- catch( const ::com::sun::star::uno::RuntimeException& )
+ catch( const css::uno::RuntimeException& )
{
throw; // don't hide it!
}
- catch( const ::com::sun::star::uno::Exception& )
+ catch( const css::uno::Exception& )
{
}
diff --git a/svtools/source/misc/imageresourceaccess.cxx b/svtools/source/misc/imageresourceaccess.cxx
index 10a01ed0b4eb..67aaf64d6d22 100644
--- a/svtools/source/misc/imageresourceaccess.cxx
+++ b/svtools/source/misc/imageresourceaccess.cxx
@@ -66,9 +66,9 @@ namespace svt
virtual Reference< XOutputStream > SAL_CALL getOutputStream( ) throw (RuntimeException, std::exception) override;
// XSeekable
- virtual void SAL_CALL seek( ::sal_Int64 location ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::sal_Int64 SAL_CALL getPosition( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::sal_Int64 SAL_CALL getLength( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL seek( ::sal_Int64 location ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+ virtual ::sal_Int64 SAL_CALL getPosition( ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
+ virtual ::sal_Int64 SAL_CALL getLength( ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
};
@@ -145,7 +145,7 @@ namespace svt
try
{
// get a GraphicProvider
- Reference< XGraphicProvider > xProvider = ::com::sun::star::graphic::GraphicProvider::create(_rxContext);
+ Reference< XGraphicProvider > xProvider = css::graphic::GraphicProvider::create(_rxContext);
// let it create a graphic from the given URL
Sequence< PropertyValue > aMediaProperties( 1 );
diff --git a/svtools/source/misc/openfiledroptargetlistener.cxx b/svtools/source/misc/openfiledroptargetlistener.cxx
index 8ea014741d4b..91cb541dbea0 100644
--- a/svtools/source/misc/openfiledroptargetlistener.cxx
+++ b/svtools/source/misc/openfiledroptargetlistener.cxx
@@ -92,7 +92,7 @@ void SAL_CALL OpenFileDropTargetListener::drop( const css::datatransfer::dnd::Dr
}
dtde.Context->dropComplete( css::datatransfer::dnd::DNDConstants::ACTION_NONE != nAction );
}
- catch( const ::com::sun::star::uno::Exception& )
+ catch( const css::uno::Exception& )
{
}
}
@@ -105,7 +105,7 @@ void SAL_CALL OpenFileDropTargetListener::dragEnter( const css::datatransfer::dn
{
implts_BeginDrag( dtdee.SupportedDataFlavors );
}
- catch( const ::com::sun::star::uno::Exception& )
+ catch( const css::uno::Exception& )
{
}
@@ -120,7 +120,7 @@ void SAL_CALL OpenFileDropTargetListener::dragExit( const css::datatransfer::dnd
{
implts_EndDrag();
}
- catch( const ::com::sun::star::uno::Exception& )
+ catch( const css::uno::Exception& )
{
}
}
@@ -139,7 +139,7 @@ void SAL_CALL OpenFileDropTargetListener::dragOver( const css::datatransfer::dnd
else
dtde.Context->acceptDrag( css::datatransfer::dnd::DNDConstants::ACTION_COPY );
}
- catch( const ::com::sun::star::uno::Exception& )
+ catch( const css::uno::Exception& )
{
}
}
diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx
index f55d6d52de9f..ff029c0a25bc 100644
--- a/svtools/source/misc/sampletext.cxx
+++ b/svtools/source/misc/sampletext.cxx
@@ -1098,28 +1098,28 @@ namespace
//false for all bits considered "Latin" by LibreOffice
boost::dynamic_bitset<sal_uInt32> getLatinMask()
{
- static boost::dynamic_bitset<sal_uInt32> aMask(getMaskByScriptType(com::sun::star::i18n::ScriptType::LATIN));
+ static boost::dynamic_bitset<sal_uInt32> aMask(getMaskByScriptType(css::i18n::ScriptType::LATIN));
return aMask;
}
//false for all bits considered "Asian" by LibreOffice
boost::dynamic_bitset<sal_uInt32> getCJKMask()
{
- static boost::dynamic_bitset<sal_uInt32> aMask(getMaskByScriptType(com::sun::star::i18n::ScriptType::ASIAN));
+ static boost::dynamic_bitset<sal_uInt32> aMask(getMaskByScriptType(css::i18n::ScriptType::ASIAN));
return aMask;
}
//false for all bits considered "Complex" by LibreOffice
boost::dynamic_bitset<sal_uInt32> getCTLMask()
{
- static boost::dynamic_bitset<sal_uInt32> aMask(getMaskByScriptType(com::sun::star::i18n::ScriptType::COMPLEX));
+ static boost::dynamic_bitset<sal_uInt32> aMask(getMaskByScriptType(css::i18n::ScriptType::COMPLEX));
return aMask;
}
//false for all bits considered "WEAK" by LibreOffice
boost::dynamic_bitset<sal_uInt32> getWeakMask()
{
- static boost::dynamic_bitset<sal_uInt32> aMask(getMaskByScriptType(com::sun::star::i18n::ScriptType::WEAK));
+ static boost::dynamic_bitset<sal_uInt32> aMask(getMaskByScriptType(css::i18n::ScriptType::WEAK));
return aMask;
}
@@ -1636,14 +1636,14 @@ OUString makeRepresentativeTextForFont(sal_Int16 nScriptType, const vcl::Font &r
aFontCapabilities.maUnicodeRange &= getWeakMask();
- if (nScriptType != com::sun::star::i18n::ScriptType::ASIAN)
+ if (nScriptType != css::i18n::ScriptType::ASIAN)
{
aFontCapabilities.maUnicodeRange &= getCJKMask();
aFontCapabilities.maCodePageRange.clear();
}
- if (nScriptType != com::sun::star::i18n::ScriptType::LATIN)
+ if (nScriptType != css::i18n::ScriptType::LATIN)
aFontCapabilities.maUnicodeRange &= getLatinMask();
- if (nScriptType != com::sun::star::i18n::ScriptType::COMPLEX)
+ if (nScriptType != css::i18n::ScriptType::COMPLEX)
aFontCapabilities.maUnicodeRange &= getCTLMask();
#if OSL_DEBUG_LEVEL > 2
@@ -1654,7 +1654,7 @@ OUString makeRepresentativeTextForFont(sal_Int16 nScriptType, const vcl::Font &r
UScriptCode eScript = getScript(aFontCapabilities);
- if (nScriptType == com::sun::star::i18n::ScriptType::ASIAN)
+ if (nScriptType == css::i18n::ScriptType::ASIAN)
eScript = attemptToDisambiguateHan(eScript, *aDevice.get());
sRet = makeRepresentativeTextForScript(eScript);
@@ -1662,7 +1662,7 @@ OUString makeRepresentativeTextForFont(sal_Int16 nScriptType, const vcl::Font &r
if (sRet.isEmpty())
{
- if (nScriptType == com::sun::star::i18n::ScriptType::COMPLEX)
+ if (nScriptType == css::i18n::ScriptType::COMPLEX)
{
sRet = makeRepresentativeTextForScript(USCRIPT_HEBREW);
if (-1 != aDevice->HasGlyphs(rFont, sRet))
@@ -1672,7 +1672,7 @@ OUString makeRepresentativeTextForFont(sal_Int16 nScriptType, const vcl::Font &r
sRet = makeRepresentativeTextForScript(USCRIPT_ARABIC);
}
}
- else if (nScriptType == com::sun::star::i18n::ScriptType::LATIN)
+ else if (nScriptType == css::i18n::ScriptType::LATIN)
sRet = makeRepresentativeTextForScript(USCRIPT_LATIN);
}
}
diff --git a/svtools/source/misc/svtaccessiblefactory.cxx b/svtools/source/misc/svtaccessiblefactory.cxx
index a11e30a19a15..68bef791c846 100644
--- a/svtools/source/misc/svtaccessiblefactory.cxx
+++ b/svtools/source/misc/svtaccessiblefactory.cxx
@@ -56,7 +56,7 @@ namespace svt
// IAccessibleFactory
virtual IAccessibleTabListBox*
createAccessibleTabListBox(
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& /*rxParent*/,
+ const css::uno::Reference< css::accessibility::XAccessible >& /*rxParent*/,
SvHeaderTabListBox& /*rBox*/
) const override
{
@@ -65,7 +65,7 @@ namespace svt
virtual IAccessibleBrowseBox*
createAccessibleBrowseBox(
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& /*_rxParent*/,
+ const css::uno::Reference< css::accessibility::XAccessible >& /*_rxParent*/,
IAccessibleTableProvider& /*_rBrowseBox*/
) const override
{
@@ -74,23 +74,23 @@ namespace svt
virtual table::IAccessibleTableControl*
createAccessibleTableControl(
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& /*_rxParent*/,
+ const css::uno::Reference< css::accessibility::XAccessible >& /*_rxParent*/,
table::IAccessibleTable& /*_rTable*/
) const override
{
return NULL;
}
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ virtual css::uno::Reference< css::accessibility::XAccessible >
createAccessibleIconChoiceCtrl(
SvtIconChoiceCtrl& /*_rIconCtrl*/,
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& /*_xParent*/
+ const css::uno::Reference< css::accessibility::XAccessible >& /*_xParent*/
) const override
{
return NULL;
}
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ virtual css::uno::Reference< css::accessibility::XAccessible >
createAccessibleTabBar(
TabBar& /*_rTabBar*/
) const override
@@ -98,7 +98,7 @@ namespace svt
return NULL;
}
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+ virtual css::uno::Reference< css::accessibility::XAccessibleContext >
createAccessibleTextWindowContext(
VCLXWindow* /*pVclXWindow*/, TextEngine& /*rEngine*/, TextView& /*rView*/
) const override
@@ -106,18 +106,18 @@ namespace svt
return NULL;
}
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ virtual css::uno::Reference< css::accessibility::XAccessible >
createAccessibleTreeListBox(
SvTreeListBox& /*_rListBox*/,
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& /*_xParent*/
+ const css::uno::Reference< css::accessibility::XAccessible >& /*_xParent*/
) const override
{
return NULL;
}
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ virtual css::uno::Reference< css::accessibility::XAccessible >
createAccessibleBrowseBoxHeaderBar(
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& /*rxParent*/,
+ const css::uno::Reference< css::accessibility::XAccessible >& /*rxParent*/,
IAccessibleTableProvider& /*_rOwningTable*/,
AccessibleBrowseBoxObjType /*_eObjType*/
) const override
@@ -125,11 +125,11 @@ namespace svt
return NULL;
}
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ virtual css::uno::Reference< css::accessibility::XAccessible >
createAccessibleBrowseBoxTableCell(
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& /*_rxParent*/,
+ const css::uno::Reference< css::accessibility::XAccessible >& /*_rxParent*/,
IAccessibleTableProvider& /*_rBrowseBox*/,
- const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& /*_xFocusWindow*/,
+ const css::uno::Reference< css::awt::XWindow >& /*_xFocusWindow*/,
sal_Int32 /*_nRowId*/,
sal_uInt16 /*_nColId*/,
sal_Int32 /*_nOffset*/
@@ -138,23 +138,23 @@ namespace svt
return NULL;
}
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ virtual css::uno::Reference< css::accessibility::XAccessible >
createAccessibleBrowseBoxHeaderCell(
sal_Int32 /*_nColumnRowId*/,
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& /*rxParent*/,
+ const css::uno::Reference< css::accessibility::XAccessible >& /*rxParent*/,
IAccessibleTableProvider& /*_rBrowseBox*/,
- const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& /*_xFocusWindow*/,
+ const css::uno::Reference< css::awt::XWindow >& /*_xFocusWindow*/,
AccessibleBrowseBoxObjType /*_eObjType*/
) const override
{
return NULL;
}
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ virtual css::uno::Reference< css::accessibility::XAccessible >
createAccessibleCheckBoxCell(
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& /*_rxParent*/,
+ const css::uno::Reference< css::accessibility::XAccessible >& /*_rxParent*/,
IAccessibleTableProvider& /*_rBrowseBox*/,
- const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& /*_xFocusWindow*/,
+ const css::uno::Reference< css::awt::XWindow >& /*_xFocusWindow*/,
sal_Int32 /*_nRowPos*/,
sal_uInt16 /*_nColPos*/,
const TriState& /*_eState*/,
@@ -164,11 +164,11 @@ namespace svt
return NULL;
}
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ virtual css::uno::Reference< css::accessibility::XAccessible >
createEditBrowseBoxTableCellAccess(
- const ::com::sun::star::uno::Reference< com::sun::star::accessibility::XAccessible >& /*_rxParent*/,
- const ::com::sun::star::uno::Reference< com::sun::star::accessibility::XAccessible >& /*_rxControlAccessible*/,
- const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& /*_rxFocusWindow*/,
+ const css::uno::Reference< css::accessibility::XAccessible >& /*_rxParent*/,
+ const css::uno::Reference< css::accessibility::XAccessible >& /*_rxControlAccessible*/,
+ const css::uno::Reference< css::awt::XWindow >& /*_rxFocusWindow*/,
IAccessibleTableProvider& /*_rBrowseBox*/,
sal_Int32 /*_nRowPos*/,
sal_uInt16 /*_nColPos*/
@@ -177,17 +177,17 @@ namespace svt
return NULL;
}
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+ virtual css::uno::Reference< css::accessibility::XAccessibleContext >
createAccessibleToolPanelDeck(
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& /*i_rAccessibleParent*/,
+ const css::uno::Reference< css::accessibility::XAccessible >& /*i_rAccessibleParent*/,
::svt::ToolPanelDeck& /*i_rPanelDeck*/
) override
{
return NULL;
}
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+ virtual css::uno::Reference< css::accessibility::XAccessibleContext >
createAccessibleToolPanelTabBar(
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& /*i_rAccessibleParent*/,
+ const css::uno::Reference< css::accessibility::XAccessible >& /*i_rAccessibleParent*/,
::svt::IToolPanelDeck& /*i_rPanelDeck*/,
::svt::PanelTabBar& /*i_rTabBar*/
) override
diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx
index a547dc144098..18652a333892 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.cxx
@@ -607,7 +607,7 @@ namespace svt
SAL_WARN( "svtools.misc", "TemplateFolderCacheImpl::implReadFolder: caught a CommandAbortedException!" );
return false;
}
- catch( ::com::sun::star::uno::Exception& )
+ catch( css::uno::Exception& )
{
}
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 3a166ed9e781..6f7a9bb2f23d 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -105,7 +105,7 @@ SvStream& WriteTransferableObjectDescriptor( SvStream& rOStm, const Transferable
}
-// the reading of the parameter is done using the special service ::com::sun::star::datatransfer::MimeContentType,
+// the reading of the parameter is done using the special service css::datatransfer::MimeContentType,
// a similar approach should be implemented for creation of the mimetype string;
// for now the set of acceptable characters has to be hardcoded, in future it should be part of the service that creates the mimetype
@@ -224,7 +224,7 @@ static void ImplSetParameterString( TransferableObjectDescriptor& rObjDesc, cons
}
}
}
- catch( const ::com::sun::star::uno::Exception& )
+ catch( const css::uno::Exception& )
{
}
}
@@ -391,11 +391,11 @@ Any SAL_CALL TransferableHelper::getTransferData2( const DataFlavor& rFlavor, co
GetData(rFlavor, rDestDoc);
#ifdef DEBUG
- if( maAny.hasValue() && ::com::sun::star::uno::TypeClass_STRING != maAny.getValueType().getTypeClass() )
+ if( maAny.hasValue() && css::uno::TypeClass_STRING != maAny.getValueType().getTypeClass() )
fprintf( stderr, "TransferableHelper delivers sequence of data [ %s ]\n", OUStringToOString(rFlavor.MimeType, RTL_TEXTENCODING_ASCII_US).getStr() );
#endif
}
- catch( const ::com::sun::star::uno::Exception& )
+ catch( const css::uno::Exception& )
{
}
@@ -417,7 +417,7 @@ Sequence< DataFlavor > SAL_CALL TransferableHelper::getTransferDataFlavors() thr
if( mpFormats->empty() )
AddSupportedFormats();
}
- catch( const ::com::sun::star::uno::Exception& )
+ catch( const css::uno::Exception& )
{
}
@@ -445,7 +445,7 @@ sal_Bool SAL_CALL TransferableHelper::isDataFlavorSupported( const DataFlavor& r
if( mpFormats->empty() )
AddSupportedFormats();
}
- catch( const ::com::sun::star::uno::Exception& )
+ catch( const css::uno::Exception& )
{
}
@@ -479,7 +479,7 @@ void SAL_CALL TransferableHelper::lostOwnership( const Reference< XClipboard >&,
ObjectReleased();
}
- catch( const ::com::sun::star::uno::Exception& )
+ catch( const css::uno::Exception& )
{
}
}
@@ -501,7 +501,7 @@ void SAL_CALL TransferableHelper::dragDropEnd( const DragSourceDropEvent& rDSDE
DragFinished( rDSDE.DropSuccess ? ( rDSDE.DropAction & ~DNDConstants::ACTION_DEFAULT ) : DNDConstants::ACTION_NONE );
ObjectReleased();
}
- catch( const ::com::sun::star::uno::Exception& )
+ catch( const css::uno::Exception& )
{
}
}
@@ -561,7 +561,7 @@ void TransferableHelper::ImplFlush()
if( xFlushableClipboard.is() )
xFlushableClipboard->flushClipboard();
}
- catch( const ::com::sun::star::uno::Exception& )
+ catch( const css::uno::Exception& )
{
OSL_FAIL( "Could not flush clipboard" );
}
@@ -781,7 +781,7 @@ bool TransferableHelper::SetGraphic( const Graphic& rGraphic, const DataFlavor&
-bool TransferableHelper::SetImageMap( const ImageMap& rIMap, const ::com::sun::star::datatransfer::DataFlavor& )
+bool TransferableHelper::SetImageMap( const ImageMap& rIMap, const css::datatransfer::DataFlavor& )
{
SvMemoryStream aMemStm( 8192, 8192 );
@@ -795,7 +795,7 @@ bool TransferableHelper::SetImageMap( const ImageMap& rIMap, const ::com::sun::s
bool TransferableHelper::SetTransferableObjectDescriptor( const TransferableObjectDescriptor& rDesc,
- const ::com::sun::star::datatransfer::DataFlavor& )
+ const css::datatransfer::DataFlavor& )
{
PrepareOLE( rDesc );
@@ -810,7 +810,7 @@ bool TransferableHelper::SetTransferableObjectDescriptor( const TransferableObje
bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk,
- const ::com::sun::star::datatransfer::DataFlavor& rFlavor )
+ const css::datatransfer::DataFlavor& rFlavor )
{
rtl_TextEncoding eSysCSet = osl_getThreadTextEncoding();
@@ -900,7 +900,7 @@ bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk,
bool TransferableHelper::SetINetImage( const INetImage& rINtImg,
- const ::com::sun::star::datatransfer::DataFlavor& rFlavor )
+ const css::datatransfer::DataFlavor& rFlavor )
{
SvMemoryStream aMemStm( 1024, 1024 );
@@ -999,7 +999,7 @@ void TransferableHelper::CopyToClipboard( vcl::Window *pWindow ) const
mxClipboard->setContents( pThis, pThis );
}
- catch( const ::com::sun::star::uno::Exception& )
+ catch( const css::uno::Exception& )
{
}
}
@@ -1027,7 +1027,7 @@ void TransferableHelper::CopyToSelection( vcl::Window *pWindow ) const
xSelection->setContents( pThis, pThis );
}
- catch( const ::com::sun::star::uno::Exception& )
+ catch( const css::uno::Exception& )
{
}
}
@@ -1071,7 +1071,7 @@ void TransferableHelper::StartDrag( vcl::Window* pWindow, sal_Int8 nDnDSourceAct
xDragSource->startDrag( aEvt, nDnDSourceActions, nDnDPointer, nDnDImage, this, this );
}
- catch( const ::com::sun::star::uno::Exception& )
+ catch( const css::uno::Exception& )
{
}
}
@@ -1224,7 +1224,7 @@ TransferableDataHelper::TransferableDataHelper() :
-TransferableDataHelper::TransferableDataHelper( const Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable ) :
+TransferableDataHelper::TransferableDataHelper( const Reference< css::datatransfer::XTransferable >& rxTransferable ) :
mxTransfer( rxTransferable ),
mpFormats( new DataFlavorExVector ),
mpObjDesc( new TransferableObjectDescriptor ),
@@ -1305,9 +1305,8 @@ void TransferableDataHelper::FillDataFlavorExVector( const Sequence< DataFlavor
if( !rFlavor.MimeType.isEmpty() )
xMimeType = xMimeFact->createMimeContentType( rFlavor.MimeType );
}
- catch( const ::com::sun::star::uno::Exception& )
+ catch( const css::uno::Exception& )
{
-
}
aFlavorEx.MimeType = rFlavor.MimeType;
@@ -1372,7 +1371,7 @@ void TransferableDataHelper::FillDataFlavorExVector( const Sequence< DataFlavor
}
}
}
- catch( const ::com::sun::star::uno::Exception& )
+ catch( const css::uno::Exception& )
{
}
}
@@ -1493,7 +1492,7 @@ Reference< XTransferable > TransferableDataHelper::GetXTransferable() const
xRet->getTransferDataFlavors();
}
- catch( const ::com::sun::star::uno::Exception& )
+ catch( const css::uno::Exception& )
{
xRet.clear();
}
@@ -1558,7 +1557,7 @@ Any TransferableDataHelper::GetAny( const DataFlavor& rFlavor, const OUString& r
}
}
}
- catch( const ::com::sun::star::uno::Exception& )
+ catch( const css::uno::Exception& )
{
}
@@ -1797,7 +1796,7 @@ bool TransferableDataHelper::GetGraphic( SotClipboardFormatId nFormat, Graphic&
-bool TransferableDataHelper::GetGraphic( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, Graphic& rGraphic )
+bool TransferableDataHelper::GetGraphic( const css::datatransfer::DataFlavor& rFlavor, Graphic& rGraphic )
{
DataFlavor aFlavor;
bool bRet = false;
@@ -1851,7 +1850,7 @@ bool TransferableDataHelper::GetImageMap( SotClipboardFormatId nFormat, ImageMap
-bool TransferableDataHelper::GetImageMap( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, ImageMap& rIMap )
+bool TransferableDataHelper::GetImageMap( const css::datatransfer::DataFlavor& rFlavor, ImageMap& rIMap )
{
tools::SvRef<SotStorageStream> xStm;
bool bRet = GetSotStorageStream( rFlavor, xStm );
@@ -1875,7 +1874,7 @@ bool TransferableDataHelper::GetTransferableObjectDescriptor( SotClipboardFormat
-bool TransferableDataHelper::GetTransferableObjectDescriptor( const ::com::sun::star::datatransfer::DataFlavor&, TransferableObjectDescriptor& rDesc )
+bool TransferableDataHelper::GetTransferableObjectDescriptor( const css::datatransfer::DataFlavor&, TransferableObjectDescriptor& rDesc )
{
rDesc = *mpObjDesc;
return true;
@@ -1891,7 +1890,7 @@ bool TransferableDataHelper::GetINetBookmark( SotClipboardFormatId nFormat, INet
-bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, INetBookmark& rBmk )
+bool TransferableDataHelper::GetINetBookmark( const css::datatransfer::DataFlavor& rFlavor, INetBookmark& rBmk )
{
bool bRet = false;
if( HasFormat( rFlavor ))
@@ -2037,7 +2036,7 @@ bool TransferableDataHelper::GetINetImage( SotClipboardFormatId nFormat,
bool TransferableDataHelper::GetINetImage(
- const ::com::sun::star::datatransfer::DataFlavor& rFlavor,
+ const css::datatransfer::DataFlavor& rFlavor,
INetImage& rINtImg )
{
tools::SvRef<SotStorageStream> xStm;
@@ -2060,7 +2059,7 @@ bool TransferableDataHelper::GetFileList( SotClipboardFormatId nFormat,
bool TransferableDataHelper::GetFileList(
- const ::com::sun::star::datatransfer::DataFlavor&,
+ const css::datatransfer::DataFlavor&,
FileList& rFileList )
{
tools::SvRef<SotStorageStream> xStm;
@@ -2221,7 +2220,7 @@ TransferableDataHelper TransferableDataHelper::CreateFromSystemClipboard( vcl::W
aRet.mxClipboard = xClipboard;
}
}
- catch( const ::com::sun::star::uno::Exception& )
+ catch( const css::uno::Exception& )
{
}
}
@@ -2256,7 +2255,7 @@ TransferableDataHelper TransferableDataHelper::CreateFromSelection( vcl::Window*
aRet.mxClipboard = xSelection;
}
}
- catch( const ::com::sun::star::uno::Exception& )
+ catch( const css::uno::Exception& )
{
}
}
@@ -2265,8 +2264,8 @@ TransferableDataHelper TransferableDataHelper::CreateFromSelection( vcl::Window*
}
-bool TransferableDataHelper::IsEqual( const ::com::sun::star::datatransfer::DataFlavor& rInternalFlavor,
- const ::com::sun::star::datatransfer::DataFlavor& rRequestFlavor,
+bool TransferableDataHelper::IsEqual( const css::datatransfer::DataFlavor& rInternalFlavor,
+ const css::datatransfer::DataFlavor& rRequestFlavor,
bool )
{
Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
@@ -2312,7 +2311,7 @@ bool TransferableDataHelper::IsEqual( const ::com::sun::star::datatransfer::Data
}
}
}
- catch( const ::com::sun::star::uno::Exception& )
+ catch( const css::uno::Exception& )
{
bRet = rInternalFlavor.MimeType.equalsIgnoreAsciiCase( rRequestFlavor.MimeType );
}
diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx
index 12bddb846670..5bafeccf10a1 100644
--- a/svtools/source/misc/transfer2.cxx
+++ b/svtools/source/misc/transfer2.cxx
@@ -171,7 +171,7 @@ void SAL_CALL DropTargetHelper::DropTargetListener::drop( const DropTargetDropEv
mpLastDragOverEvent = NULL;
}
}
- catch( const ::com::sun::star::uno::Exception& )
+ catch( const css::uno::Exception& )
{
}
}
@@ -186,7 +186,7 @@ void SAL_CALL DropTargetHelper::DropTargetListener::dragEnter( const DropTargetD
{
mrParent.ImplBeginDrag( rDTDEE.SupportedDataFlavors );
}
- catch( const ::com::sun::star::uno::Exception& )
+ catch( const css::uno::Exception& )
{
}
@@ -213,7 +213,7 @@ void SAL_CALL DropTargetHelper::DropTargetListener::dragOver( const DropTargetDr
else
rDTDE.Context->acceptDrag( nRet );
}
- catch( const ::com::sun::star::uno::Exception& )
+ catch( const css::uno::Exception& )
{
}
}
@@ -236,7 +236,7 @@ void SAL_CALL DropTargetHelper::DropTargetListener::dragExit( const DropTargetEv
mrParent.ImplEndDrag();
}
- catch( const ::com::sun::star::uno::Exception& )
+ catch( const css::uno::Exception& )
{
}
}
@@ -345,7 +345,7 @@ bool DropTargetHelper::IsDropFormatSupported( SotClipboardFormatId nFormat )
struct TDataCntnrEntry_Impl
{
- ::com::sun::star::uno::Any aAny;
+ css::uno::Any aAny;
SotClipboardFormatId nId;
};
@@ -558,7 +558,7 @@ void TransferDataContainer::CopyString( const OUString& rStr )
void TransferDataContainer::CopyAny( SotClipboardFormatId nFmt,
- const ::com::sun::star::uno::Any& rAny )
+ const css::uno::Any& rAny )
{
TDataCntnrEntry_Impl aEntry;
aEntry.nId = nFmt;
diff --git a/svtools/source/table/cellvalueconversion.hxx b/svtools/source/table/cellvalueconversion.hxx
index 59b91affeacc..17163b6ef7f8 100644
--- a/svtools/source/table/cellvalueconversion.hxx
+++ b/svtools/source/table/cellvalueconversion.hxx
@@ -40,7 +40,7 @@ namespace svt
CellValueConversion();
~CellValueConversion();
- OUString convertToString( const ::com::sun::star::uno::Any& i_cellValue );
+ OUString convertToString( const css::uno::Any& i_cellValue );
private:
::std::unique_ptr< CellValueConversion_Data > m_pData;
diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx
index 424dab7f8a3c..aace80aef05a 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -194,9 +194,9 @@ namespace svt { namespace table
{
return ::boost::optional< ::std::vector< ::Color > >();
}
- virtual ::com::sun::star::style::VerticalAlignment getVerticalAlign() const override
+ virtual css::style::VerticalAlignment getVerticalAlign() const override
{
- return com::sun::star::style::VerticalAlignment(0);
+ return css::style::VerticalAlignment(0);
}
virtual ITableDataSort* getSortAdapter() override
{
@@ -206,13 +206,13 @@ namespace svt { namespace table
{
return true;
}
- virtual void getCellContent( ColPos const i_col, RowPos const i_row, ::com::sun::star::uno::Any& o_cellContent ) override
+ virtual void getCellContent( ColPos const i_col, RowPos const i_row, css::uno::Any& o_cellContent ) override
{
(void)i_row;
(void)i_col;
o_cellContent.clear();
}
- virtual void getCellToolTip( ColPos const, RowPos const, ::com::sun::star::uno::Any& ) override
+ virtual void getCellToolTip( ColPos const, RowPos const, css::uno::Any& ) override
{
}
virtual Any getRowHeading( RowPos const i_rowPos ) const override
diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx
index c004254fdfa2..eb34cda6d2fe 100644
--- a/svtools/source/table/tablecontrol_impl.hxx
+++ b/svtools/source/table/tablecontrol_impl.hxx
@@ -242,9 +242,9 @@ namespace svt { namespace table
*/
bool markAllRowsAsSelected();
- void commitAccessibleEvent( sal_Int16 const i_eventID, const com::sun::star::uno::Any& i_newValue, const com::sun::star::uno::Any& i_oldValue );
- void commitCellEvent( sal_Int16 const i_eventID, const com::sun::star::uno::Any& i_newValue, const com::sun::star::uno::Any& i_oldValue );
- void commitTableEvent( sal_Int16 const i_eventID, const com::sun::star::uno::Any& i_newValue, const com::sun::star::uno::Any& i_oldValue );
+ void commitAccessibleEvent( sal_Int16 const i_eventID, const css::uno::Any& i_newValue, const css::uno::Any& i_oldValue );
+ void commitCellEvent( sal_Int16 const i_eventID, const css::uno::Any& i_newValue, const css::uno::Any& i_oldValue );
+ void commitTableEvent( sal_Int16 const i_eventID, const css::uno::Any& i_newValue, const css::uno::Any& i_oldValue );
// ITableControl
virtual void hideCursor() override;
@@ -283,7 +283,7 @@ namespace svt { namespace table
Rectangle calcCellRect( sal_Int32 nRow, sal_Int32 nCol );
// A11Y
- ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ css::uno::Reference< css::accessibility::XAccessible >
getAccessible( vcl::Window& i_parentWindow );
void disposeAccessible();
@@ -303,8 +303,8 @@ namespace svt { namespace table
bool impl_isAccessibleAlive() const;
void impl_commitAccessibleEvent(
sal_Int16 const i_eventID,
- ::com::sun::star::uno::Any const & i_newValue,
- ::com::sun::star::uno::Any const & i_oldValue
+ css::uno::Any const & i_newValue,
+ css::uno::Any const & i_oldValue
);
/** toggles the cursor visibility
diff --git a/svtools/source/toolpanel/dummypanel.hxx b/svtools/source/toolpanel/dummypanel.hxx
index deb5c3017ce8..1e22b56a3543 100644
--- a/svtools/source/toolpanel/dummypanel.hxx
+++ b/svtools/source/toolpanel/dummypanel.hxx
@@ -47,9 +47,9 @@ namespace svt
virtual void SetSizePixel( const Size& i_rPanelWindowSize ) override;
virtual void GrabFocus() override;
virtual void Dispose() override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ virtual css::uno::Reference< css::accessibility::XAccessible >
CreatePanelAccessible(
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rParentAccessible
+ const css::uno::Reference< css::accessibility::XAccessible >& i_rParentAccessible
) override;
};
diff --git a/svtools/source/toolpanel/paneltabbarpeer.hxx b/svtools/source/toolpanel/paneltabbarpeer.hxx
index c6da471c4e81..21d58b48abd9 100644
--- a/svtools/source/toolpanel/paneltabbarpeer.hxx
+++ b/svtools/source/toolpanel/paneltabbarpeer.hxx
@@ -42,10 +42,10 @@ namespace svt
virtual ~PanelTabBarPeer();
// VCLXWindow overridables
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext() override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override;
// XComponent
- void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override;
private:
AccessibleFactoryAccess m_aAccessibleFactory;
diff --git a/svtools/source/toolpanel/toolpaneldeckpeer.hxx b/svtools/source/toolpanel/toolpaneldeckpeer.hxx
index e822e51f3149..cb44ff7984f3 100644
--- a/svtools/source/toolpanel/toolpaneldeckpeer.hxx
+++ b/svtools/source/toolpanel/toolpaneldeckpeer.hxx
@@ -42,10 +42,10 @@ namespace svt
virtual ~ToolPanelDeckPeer();
// VCLXWindow overridables
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext() override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override;
// XComponent
- void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override;
private:
AccessibleFactoryAccess m_aAccessibleFactory;
diff --git a/svtools/source/toolpanel/toolpaneldrawer.hxx b/svtools/source/toolpanel/toolpaneldrawer.hxx
index e63ec61d7bc9..218e7756b870 100644
--- a/svtools/source/toolpanel/toolpaneldrawer.hxx
+++ b/svtools/source/toolpanel/toolpaneldrawer.hxx
@@ -74,7 +74,7 @@ namespace svt
virtual void DataChanged( const DataChangedEvent& i_rEvent ) override;
virtual void MouseButtonDown( const MouseEvent& i_rMouseEvent ) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >
+ virtual css::uno::Reference< css::awt::XWindowPeer >
GetComponentInterface( bool i_bCreate ) override;
virtual void ApplySettings(vcl::RenderContext& rRenderContext) override;
diff --git a/svtools/source/toolpanel/toolpaneldrawerpeer.hxx b/svtools/source/toolpanel/toolpaneldrawerpeer.hxx
index 444f80af4e53..e796b31d6dc9 100644
--- a/svtools/source/toolpanel/toolpaneldrawerpeer.hxx
+++ b/svtools/source/toolpanel/toolpaneldrawerpeer.hxx
@@ -39,7 +39,7 @@ namespace svt
virtual ~ToolPanelDrawerPeer();
// VCLXWindow overridables
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext() override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override;
};
diff --git a/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx
index 0b4aeb532f72..0033c541850c 100644
--- a/svtools/source/uno/addrtempuno.cxx
+++ b/svtools/source/uno/addrtempuno.cxx
@@ -33,11 +33,11 @@ namespace {
#define UNODIALOG_PROPERTY_ID_ALIASES 100
#define UNODIALOG_PROPERTY_ALIASES "FieldMapping"
- using namespace com::sun::star::uno;
- using namespace com::sun::star::lang;
- using namespace com::sun::star::util;
- using namespace com::sun::star::beans;
- using namespace com::sun::star::sdbc;
+ using namespace css::uno;
+ using namespace css::lang;
+ using namespace css::util;
+ using namespace css::beans;
+ using namespace css::sdbc;
typedef OGenericUnoDialog OAddressBookSourceDialogUnoBase;
class OAddressBookSourceDialogUno
@@ -73,7 +73,7 @@ namespace {
// OGenericUnoDialog overridables
virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) override;
- virtual void implInitialize(const com::sun::star::uno::Any& _rValue) override;
+ virtual void implInitialize(const css::uno::Any& _rValue) override;
virtual void executedDialog(sal_Int16 _nExecutionResult) override;
};
@@ -141,8 +141,8 @@ namespace {
{
if( rArguments.getLength() == 5 )
{
- Reference<com::sun::star::awt::XWindow> xParentWindow;
- Reference<com::sun::star::beans::XPropertySet> xDataSource;
+ Reference<css::awt::XWindow> xParentWindow;
+ Reference<css::beans::XPropertySet> xDataSource;
OUString sDataSourceName;
OUString sCommand;
OUString sTitle;
@@ -172,7 +172,7 @@ namespace {
OGenericUnoDialog::initialize(rArguments);
}
- void OAddressBookSourceDialogUno::implInitialize(const com::sun::star::uno::Any& _rValue)
+ void OAddressBookSourceDialogUno::implInitialize(const css::uno::Any& _rValue)
{
PropertyValue aVal;
if (_rValue >>= aVal)
diff --git a/svtools/source/uno/contextmenuhelper.cxx b/svtools/source/uno/contextmenuhelper.cxx
index cfb487010842..4f27a682fe7a 100644
--- a/svtools/source/uno/contextmenuhelper.cxx
+++ b/svtools/source/uno/contextmenuhelper.cxx
@@ -55,7 +55,7 @@ namespace svt
{
// internal helper class to retrieve status updates
-class StateEventHelper : public ::com::sun::star::frame::XStatusListener,
+class StateEventHelper : public css::frame::XStatusListener,
public ::cppu::OWeakObject,
private boost::noncopyable
{
@@ -492,7 +492,7 @@ ContextMenuHelper::getImageFromCommandURL( const OUString& aCmdURL ) const
try
{
aGraphicSeq = m_xModuleImageMgr->getImages( nImageType, aImageCmdSeq );
- uno::Reference< ::com::sun::star::graphic::XGraphic > xGraphic = aGraphicSeq[0];
+ uno::Reference< css::graphic::XGraphic > xGraphic = aGraphicSeq[0];
aImage = Image( xGraphic );
if ( !!aImage )
diff --git a/svtools/source/uno/framestatuslistener.cxx b/svtools/source/uno/framestatuslistener.cxx
index 76166716bb50..98d5724d7567 100644
--- a/svtools/source/uno/framestatuslistener.cxx
+++ b/svtools/source/uno/framestatuslistener.cxx
@@ -27,12 +27,12 @@
#include <comphelper/processfactory.hxx>
using namespace ::cppu;
-using namespace ::com::sun::star::awt;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::util;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::frame;
+using namespace css::awt;
+using namespace css::uno;
+using namespace css::util;
+using namespace css::beans;
+using namespace css::lang;
+using namespace css::frame;
namespace svt
{
@@ -82,7 +82,7 @@ void SAL_CALL FrameStatusListener::release() throw ()
// XComponent
void SAL_CALL FrameStatusListener::dispose()
-throw (::com::sun::star::uno::RuntimeException, std::exception)
+throw (css::uno::RuntimeException, std::exception)
{
Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY );
@@ -97,8 +97,8 @@ throw (::com::sun::star::uno::RuntimeException, std::exception)
try
{
Reference< XDispatch > xDispatch( pIter->second );
- Reference< XURLTransformer > xURLTransformer( com::sun::star::util::URLTransformer::create( m_xContext ) );
- com::sun::star::util::URL aTargetURL;
+ Reference< XURLTransformer > xURLTransformer( css::util::URLTransformer::create( m_xContext ) );
+ css::util::URL aTargetURL;
aTargetURL.Complete = pIter->first;
xURLTransformer->parseStrict( aTargetURL );
@@ -160,7 +160,7 @@ void FrameStatusListener::addStatusListener( const OUString& aCommandURL )
{
Reference< XDispatch > xDispatch;
Reference< XStatusListener > xStatusListener;
- com::sun::star::util::URL aTargetURL;
+ css::util::URL aTargetURL;
{
SolarMutexGuard aSolarMutexGuard;
@@ -184,7 +184,7 @@ void FrameStatusListener::addStatusListener( const OUString& aCommandURL )
Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
if ( m_xContext.is() && xDispatchProvider.is() )
{
- Reference< XURLTransformer > xURLTransformer( com::sun::star::util::URLTransformer::create( m_xContext ) );
+ Reference< XURLTransformer > xURLTransformer( css::util::URLTransformer::create( m_xContext ) );
aTargetURL.Complete = aCommandURL;
xURLTransformer->parseStrict( aTargetURL );
xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
@@ -242,8 +242,8 @@ void FrameStatusListener::bindListener()
URLToDispatchMap::iterator pIter = m_aListenerMap.begin();
while ( pIter != m_aListenerMap.end() )
{
- Reference< XURLTransformer > xURLTransformer( com::sun::star::util::URLTransformer::create( m_xContext ) );
- com::sun::star::util::URL aTargetURL;
+ Reference< XURLTransformer > xURLTransformer( css::util::URLTransformer::create( m_xContext ) );
+ css::util::URL aTargetURL;
aTargetURL.Complete = pIter->first;
xURLTransformer->parseStrict( aTargetURL );
@@ -311,8 +311,8 @@ void FrameStatusListener::unbindListener()
URLToDispatchMap::iterator pIter = m_aListenerMap.begin();
while ( pIter != m_aListenerMap.end() )
{
- Reference< XURLTransformer > xURLTransformer( com::sun::star::util::URLTransformer::create( m_xContext ) );
- com::sun::star::util::URL aTargetURL;
+ Reference< XURLTransformer > xURLTransformer( css::util::URLTransformer::create( m_xContext ) );
+ css::util::URL aTargetURL;
aTargetURL.Complete = pIter->first;
xURLTransformer->parseStrict( aTargetURL );
diff --git a/svtools/source/uno/generictoolboxcontroller.cxx b/svtools/source/uno/generictoolboxcontroller.cxx
index e8f961cd395f..98184a1d56cf 100644
--- a/svtools/source/uno/generictoolboxcontroller.cxx
+++ b/svtools/source/uno/generictoolboxcontroller.cxx
@@ -31,22 +31,22 @@
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
-using namespace ::com::sun::star::awt;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::frame;
-using namespace ::com::sun::star::frame::status;
-using namespace ::com::sun::star::util;
+using namespace css::awt;
+using namespace css::uno;
+using namespace css::beans;
+using namespace css::lang;
+using namespace css::frame;
+using namespace css::frame::status;
+using namespace css::util;
namespace svt
{
struct ExecuteInfo
{
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch;
- ::com::sun::star::util::URL aTargetURL;
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs;
+ css::uno::Reference< css::frame::XDispatch > xDispatch;
+ css::util::URL aTargetURL;
+ css::uno::Sequence< css::beans::PropertyValue > aArgs;
};
GenericToolboxController::GenericToolboxController( const Reference< XComponentContext >& rxContext,
@@ -108,7 +108,7 @@ throw ( RuntimeException, std::exception )
if ( xDispatch.is() && xURLTransformer.is() )
{
- com::sun::star::util::URL aTargetURL;
+ css::util::URL aTargetURL;
Sequence<PropertyValue> aArgs;
aTargetURL.Complete = aCommandURL;
diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx
index bb4f08654f34..6a811ca3c266 100644
--- a/svtools/source/uno/genericunodialog.cxx
+++ b/svtools/source/uno/genericunodialog.cxx
@@ -35,10 +35,10 @@
#include <vcl/svapp.hxx>
using namespace ::comphelper;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::ucb;
+using namespace css::uno;
+using namespace css::lang;
+using namespace css::beans;
+using namespace css::ucb;
namespace svt
diff --git a/svtools/source/uno/miscservices.cxx b/svtools/source/uno/miscservices.cxx
index 26a2d7d39070..ff1dcf77e944 100644
--- a/svtools/source/uno/miscservices.cxx
+++ b/svtools/source/uno/miscservices.cxx
@@ -26,8 +26,8 @@
#include "fpicker.hxx"
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
+using namespace css::uno;
+using namespace css::lang;
namespace
{
diff --git a/svtools/source/uno/popupmenucontrollerbase.cxx b/svtools/source/uno/popupmenucontrollerbase.cxx
index d89a7fe3d481..06c33ffe5867 100644
--- a/svtools/source/uno/popupmenucontrollerbase.cxx
+++ b/svtools/source/uno/popupmenucontrollerbase.cxx
@@ -34,11 +34,11 @@
#include <cppuhelper/supportsservice.hxx>
using namespace com::sun::star;
-using namespace com::sun::star::uno;
-using namespace com::sun::star::lang;
-using namespace com::sun::star::frame;
-using namespace com::sun::star::beans;
-using namespace com::sun::star::util;
+using namespace css::uno;
+using namespace css::lang;
+using namespace css::frame;
+using namespace css::beans;
+using namespace css::util;
namespace svt
{
@@ -70,11 +70,11 @@ PopupMenuControllerBase::~PopupMenuControllerBase()
void PopupMenuControllerBase::throwIfDisposed() throw ( RuntimeException )
{
if (rBHelper.bDisposed || rBHelper.bInDispose)
- throw com::sun::star::lang::DisposedException();
+ throw css::lang::DisposedException();
}
// protected function
-void PopupMenuControllerBase::resetPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu )
+void PopupMenuControllerBase::resetPopupMenu( css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu )
{
if ( rPopupMenu.is() && rPopupMenu->getItemCount() > 0 )
{
@@ -124,7 +124,7 @@ void SAL_CALL PopupMenuControllerBase::itemSelected( const awt::MenuEvent& rEven
}
}
-void PopupMenuControllerBase::dispatchCommand( const OUString& sCommandURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs )
+void PopupMenuControllerBase::dispatchCommand( const OUString& sCommandURL, const css::uno::Sequence< css::beans::PropertyValue >& rArgs )
{
osl::MutexGuard aLock( m_aMutex );
@@ -163,7 +163,7 @@ void SAL_CALL PopupMenuControllerBase::itemDeactivated( const awt::MenuEvent& )
{
}
-void SAL_CALL PopupMenuControllerBase::updatePopupMenu() throw ( ::com::sun::star::uno::RuntimeException, std::exception )
+void SAL_CALL PopupMenuControllerBase::updatePopupMenu() throw ( css::uno::RuntimeException, std::exception )
{
osl::ClearableMutexGuard aLock( m_aMutex );
throwIfDisposed();
@@ -233,7 +233,7 @@ void SAL_CALL
PopupMenuControllerBase::dispatch(
const URL& /*aURL*/,
const Sequence< PropertyValue >& /*seqProperties*/ )
-throw( ::com::sun::star::uno::RuntimeException, std::exception )
+throw( css::uno::RuntimeException, std::exception )
{
// must be implemented by subclass
osl::MutexGuard aLock( m_aMutex );
@@ -244,7 +244,7 @@ void SAL_CALL
PopupMenuControllerBase::addStatusListener(
const Reference< XStatusListener >& xControl,
const URL& aURL )
-throw( ::com::sun::star::uno::RuntimeException, std::exception )
+throw( css::uno::RuntimeException, std::exception )
{
osl::ResettableMutexGuard aLock( m_aMutex );
throwIfDisposed();
@@ -273,7 +273,7 @@ throw( ::com::sun::star::uno::RuntimeException, std::exception )
void SAL_CALL PopupMenuControllerBase::removeStatusListener(
const Reference< XStatusListener >& xControl,
const URL& /*aURL*/ )
-throw( ::com::sun::star::uno::RuntimeException, std::exception )
+throw( css::uno::RuntimeException, std::exception )
{
rBHelper.removeListener( cppu::UnoType<decltype(xControl)>::get(), xControl );
}
diff --git a/svtools/source/uno/popupwindowcontroller.cxx b/svtools/source/uno/popupwindowcontroller.cxx
index af7124508164..127ba7a6f0c4 100644
--- a/svtools/source/uno/popupwindowcontroller.cxx
+++ b/svtools/source/uno/popupwindowcontroller.cxx
@@ -28,8 +28,8 @@
#include <svtools/toolbarmenu.hxx>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
+using namespace css::uno;
+using namespace css::lang;
namespace svt
@@ -158,7 +158,7 @@ sal_Bool SAL_CALL PopupWindowController::supportsService( const OUString& Servic
}
// XInitialization
-void SAL_CALL PopupWindowController::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL PopupWindowController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
{
svt::ToolboxController::initialize( aArguments );
if( !m_aCommandURL.isEmpty() )
diff --git a/svtools/source/uno/statusbarcontroller.cxx b/svtools/source/uno/statusbarcontroller.cxx
index 06bac92e65d3..a5553d3510ae 100644
--- a/svtools/source/uno/statusbarcontroller.cxx
+++ b/svtools/source/uno/statusbarcontroller.cxx
@@ -36,12 +36,12 @@
#include <comphelper/processfactory.hxx>
using namespace ::cppu;
-using namespace ::com::sun::star::awt;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::util;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::frame;
+using namespace css::awt;
+using namespace css::uno;
+using namespace css::util;
+using namespace css::beans;
+using namespace css::lang;
+using namespace css::frame;
namespace svt
{
@@ -86,7 +86,7 @@ Reference< XURLTransformer > StatusbarController::getURLTransformer() const
SolarMutexGuard aSolarMutexGuard;
if ( !m_xURLTransformer.is() && m_xContext.is() )
{
- m_xURLTransformer = com::sun::star::util::URLTransformer::create( m_xContext );
+ m_xURLTransformer = css::util::URLTransformer::create( m_xContext );
}
return m_xURLTransformer;
@@ -185,7 +185,7 @@ throw ( RuntimeException, std::exception )
// XComponent
void SAL_CALL StatusbarController::dispose()
-throw (::com::sun::star::uno::RuntimeException, std::exception)
+throw (css::uno::RuntimeException, std::exception)
{
Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY );
@@ -195,14 +195,14 @@ throw (::com::sun::star::uno::RuntimeException, std::exception)
throw DisposedException();
}
- com::sun::star::lang::EventObject aEvent( xThis );
+ css::lang::EventObject aEvent( xThis );
m_aListenerContainer.disposeAndClear( aEvent );
SolarMutexGuard aSolarMutexGuard;
Reference< XStatusListener > xStatusListener( static_cast< OWeakObject* >( this ), UNO_QUERY );
Reference< XURLTransformer > xURLTransformer = getURLTransformer();
URLToDispatchMap::iterator pIter = m_aListenerMap.begin();
- com::sun::star::util::URL aTargetURL;
+ css::util::URL aTargetURL;
while ( pIter != m_aListenerMap.end() )
{
try
@@ -301,49 +301,49 @@ throw ( RuntimeException, std::exception )
// XStatusbarController
sal_Bool SAL_CALL StatusbarController::mouseButtonDown(
- const ::com::sun::star::awt::MouseEvent& )
-throw (::com::sun::star::uno::RuntimeException, std::exception)
+ const css::awt::MouseEvent& )
+throw (css::uno::RuntimeException, std::exception)
{
return sal_False;
}
sal_Bool SAL_CALL StatusbarController::mouseMove(
- const ::com::sun::star::awt::MouseEvent& )
-throw (::com::sun::star::uno::RuntimeException, std::exception)
+ const css::awt::MouseEvent& )
+throw (css::uno::RuntimeException, std::exception)
{
return sal_False;
}
sal_Bool SAL_CALL StatusbarController::mouseButtonUp(
- const ::com::sun::star::awt::MouseEvent& )
-throw (::com::sun::star::uno::RuntimeException, std::exception)
+ const css::awt::MouseEvent& )
+throw (css::uno::RuntimeException, std::exception)
{
return sal_False;
}
void SAL_CALL StatusbarController::command(
- const ::com::sun::star::awt::Point&,
+ const css::awt::Point&,
::sal_Int32,
sal_Bool,
- const ::com::sun::star::uno::Any& )
-throw (::com::sun::star::uno::RuntimeException, std::exception)
+ const css::uno::Any& )
+throw (css::uno::RuntimeException, std::exception)
{
}
void SAL_CALL StatusbarController::paint(
- const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >&,
- const ::com::sun::star::awt::Rectangle&,
+ const css::uno::Reference< css::awt::XGraphics >&,
+ const css::awt::Rectangle&,
::sal_Int32 )
-throw (::com::sun::star::uno::RuntimeException, std::exception)
+throw (css::uno::RuntimeException, std::exception)
{
}
-void SAL_CALL StatusbarController::click( const ::com::sun::star::awt::Point& )
-throw (::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL StatusbarController::click( const css::awt::Point& )
+throw (css::uno::RuntimeException, std::exception)
{
}
-void SAL_CALL StatusbarController::doubleClick( const ::com::sun::star::awt::Point& ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL StatusbarController::doubleClick( const css::awt::Point& ) throw (css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aSolarMutexGuard;
@@ -358,7 +358,7 @@ void StatusbarController::addStatusListener( const OUString& aCommandURL )
{
Reference< XDispatch > xDispatch;
Reference< XStatusListener > xStatusListener;
- com::sun::star::util::URL aTargetURL;
+ css::util::URL aTargetURL;
{
SolarMutexGuard aSolarMutexGuard;
@@ -440,7 +440,7 @@ void StatusbarController::bindListener()
while ( pIter != m_aListenerMap.end() )
{
Reference< XURLTransformer > xURLTransformer = getURLTransformer();
- com::sun::star::util::URL aTargetURL;
+ css::util::URL aTargetURL;
aTargetURL.Complete = pIter->first;
xURLTransformer->parseStrict( aTargetURL );
@@ -526,7 +526,7 @@ void StatusbarController::bindListener()
return aRect;
}
-void StatusbarController::execute( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs )
+void StatusbarController::execute( const css::uno::Sequence< css::beans::PropertyValue >& aArgs )
{
Reference< XDispatch > xDispatch;
Reference< XURLTransformer > xURLTransformer;
@@ -555,7 +555,7 @@ void StatusbarController::execute( const ::com::sun::star::uno::Sequence< ::com:
{
try
{
- com::sun::star::util::URL aTargetURL;
+ css::util::URL aTargetURL;
aTargetURL.Complete = aCommandURL;
xURLTransformer->parseStrict( aTargetURL );
@@ -569,10 +569,10 @@ void StatusbarController::execute( const ::com::sun::star::uno::Sequence< ::com:
void StatusbarController::execute(
const OUString& aCommandURL,
- const Sequence< ::com::sun::star::beans::PropertyValue >& aArgs )
+ const Sequence< css::beans::PropertyValue >& aArgs )
{
Reference< XDispatch > xDispatch;
- com::sun::star::util::URL aTargetURL;
+ css::util::URL aTargetURL;
{
SolarMutexGuard aSolarMutexGuard;
@@ -594,7 +594,7 @@ void StatusbarController::execute(
xDispatch = pIter->second;
else
{
- Reference< ::com::sun::star::frame::XDispatchProvider > xDispatchProvider(
+ Reference< css::frame::XDispatchProvider > xDispatchProvider(
m_xFrame->getController(), UNO_QUERY );
if ( xDispatchProvider.is() )
xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
diff --git a/svtools/source/uno/svtxgridcontrol.cxx b/svtools/source/uno/svtxgridcontrol.cxx
index b650903eb148..37038d165c18 100644
--- a/svtools/source/uno/svtxgridcontrol.cxx
+++ b/svtools/source/uno/svtxgridcontrol.cxx
@@ -40,36 +40,36 @@
#include <vcl/svapp.hxx>
-using ::com::sun::star::uno::RuntimeException;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::Exception;
-using ::com::sun::star::uno::UNO_QUERY;
-using ::com::sun::star::uno::UNO_QUERY_THROW;
-using ::com::sun::star::uno::Any;
-using ::com::sun::star::uno::makeAny;
-using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::awt::grid::XGridSelectionListener;
-using ::com::sun::star::style::VerticalAlignment;
-using ::com::sun::star::style::VerticalAlignment_TOP;
-using ::com::sun::star::view::SelectionType;
-using ::com::sun::star::view::SelectionType_NONE;
-using ::com::sun::star::view::SelectionType_RANGE;
-using ::com::sun::star::view::SelectionType_SINGLE;
-using ::com::sun::star::view::SelectionType_MULTI;
-using ::com::sun::star::awt::grid::XGridDataModel;
-using ::com::sun::star::awt::grid::GridInvalidDataException;
-using ::com::sun::star::lang::EventObject;
-using ::com::sun::star::lang::IndexOutOfBoundsException;
-using ::com::sun::star::awt::grid::XGridColumnModel;
-using ::com::sun::star::awt::grid::GridSelectionEvent;
-using ::com::sun::star::awt::grid::XGridColumn;
-using ::com::sun::star::container::ContainerEvent;
-using ::com::sun::star::awt::grid::GridDataEvent;
-using ::com::sun::star::awt::grid::GridInvalidModelException;
-using ::com::sun::star::util::VetoException;
-
-namespace AccessibleEventId = ::com::sun::star::accessibility::AccessibleEventId;
-namespace AccessibleStateType = ::com::sun::star::accessibility::AccessibleStateType;
+using css::uno::RuntimeException;
+using css::uno::Reference;
+using css::uno::Exception;
+using css::uno::UNO_QUERY;
+using css::uno::UNO_QUERY_THROW;
+using css::uno::Any;
+using css::uno::makeAny;
+using css::uno::Sequence;
+using css::awt::grid::XGridSelectionListener;
+using css::style::VerticalAlignment;
+using css::style::VerticalAlignment_TOP;
+using css::view::SelectionType;
+using css::view::SelectionType_NONE;
+using css::view::SelectionType_RANGE;
+using css::view::SelectionType_SINGLE;
+using css::view::SelectionType_MULTI;
+using css::awt::grid::XGridDataModel;
+using css::awt::grid::GridInvalidDataException;
+using css::lang::EventObject;
+using css::lang::IndexOutOfBoundsException;
+using css::awt::grid::XGridColumnModel;
+using css::awt::grid::GridSelectionEvent;
+using css::awt::grid::XGridColumn;
+using css::container::ContainerEvent;
+using css::awt::grid::GridDataEvent;
+using css::awt::grid::GridInvalidModelException;
+using css::util::VetoException;
+
+namespace AccessibleEventId = css::accessibility::AccessibleEventId;
+namespace AccessibleStateType = css::accessibility::AccessibleStateType;
using namespace ::svt::table;
@@ -849,7 +849,7 @@ void SVTXGridControl::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent
}
-void SVTXGridControl::setEnable( sal_Bool bEnable ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void SVTXGridControl::setEnable( sal_Bool bEnable ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
diff --git a/svtools/source/uno/svtxgridcontrol.hxx b/svtools/source/uno/svtxgridcontrol.hxx
index d06844c47c0d..1f4908e7ad3c 100644
--- a/svtools/source/uno/svtxgridcontrol.hxx
+++ b/svtools/source/uno/svtxgridcontrol.hxx
@@ -43,10 +43,10 @@ namespace svt { namespace table {
} }
typedef ::cppu::ImplInheritanceHelper < VCLXWindow
- , ::com::sun::star::awt::grid::XGridControl
- , ::com::sun::star::awt::grid::XGridRowSelection
- , ::com::sun::star::awt::grid::XGridDataListener
- , ::com::sun::star::container::XContainerListener
+ , css::awt::grid::XGridControl
+ , css::awt::grid::XGridRowSelection
+ , css::awt::grid::XGridDataListener
+ , css::container::XContainerListener
> SVTXGridControl_Base;
class SVTXGridControl : public SVTXGridControl_Base
{
@@ -64,45 +64,45 @@ public:
virtual ~SVTXGridControl();
// XGridDataListener
- virtual void SAL_CALL rowsInserted( const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL rowsRemoved( const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL dataChanged( const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL rowHeadingChanged( const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL rowsInserted( const css::awt::grid::GridDataEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL rowsRemoved( const css::awt::grid::GridDataEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dataChanged( const css::awt::grid::GridDataEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL rowHeadingChanged( const css::awt::grid::GridDataEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
// XContainerListener
- virtual void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
// XEventListener
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override;
// XGridControl
- virtual ::sal_Int32 SAL_CALL getRowAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::sal_Int32 SAL_CALL getColumnAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::sal_Int32 SAL_CALL getCurrentColumn( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::sal_Int32 SAL_CALL getCurrentRow( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL goToCell( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::util::VetoException, std::exception) override;
+ virtual ::sal_Int32 SAL_CALL getRowAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (css::uno::RuntimeException, std::exception) override;
+ virtual ::sal_Int32 SAL_CALL getColumnAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (css::uno::RuntimeException, std::exception) override;
+ virtual ::sal_Int32 SAL_CALL getCurrentColumn( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual ::sal_Int32 SAL_CALL getCurrentRow( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL goToCell( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex ) throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, css::util::VetoException, std::exception) override;
// XGridRowSelection
- virtual void SAL_CALL selectRow( ::sal_Int32 i_rowIndex ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception ) override;
- virtual void SAL_CALL selectAllRows() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL deselectRow( ::sal_Int32 i_rowIndex ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception ) override;
- virtual void SAL_CALL deselectAllRows() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< ::sal_Int32 > SAL_CALL getSelectedRows() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL hasSelectedRows() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isRowSelected(::sal_Int32 index) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addSelectionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridSelectionListener > & listener) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeSelectionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridSelectionListener > & listener) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-
- void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-
- // ::com::sun::star::lang::XComponent
- void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL selectRow( ::sal_Int32 i_rowIndex ) throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception ) override;
+ virtual void SAL_CALL selectAllRows() throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL deselectRow( ::sal_Int32 i_rowIndex ) throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception ) override;
+ virtual void SAL_CALL deselectAllRows() throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< ::sal_Int32 > SAL_CALL getSelectedRows() throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasSelectedRows() throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isRowSelected(::sal_Int32 index) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addSelectionListener(const css::uno::Reference< css::awt::grid::XGridSelectionListener > & listener) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL removeSelectionListener(const css::uno::Reference< css::awt::grid::XGridSelectionListener > & listener) throw (css::uno::RuntimeException, std::exception) override;
+
+ void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
+ css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
+
+ // css::lang::XComponent
+ void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override;
// XWindow
- void SAL_CALL setEnable( sal_Bool bEnable ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ void SAL_CALL setEnable( sal_Bool bEnable ) throw(css::uno::RuntimeException, std::exception) override;
protected:
// VCLXWindow
diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx
index cd5c2c5b62f5..2ef47dee93ae 100644
--- a/svtools/source/uno/toolboxcontroller.cxx
+++ b/svtools/source/uno/toolboxcontroller.cxx
@@ -39,12 +39,12 @@ const char TOOLBARCONTROLLER_PROPNAME_SUPPORTSVISIBLE[] = "SupportsVisible";
using namespace ::cppu;
-using namespace ::com::sun::star::awt;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::util;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::frame;
+using namespace css::awt;
+using namespace css::uno;
+using namespace css::util;
+using namespace css::beans;
+using namespace css::lang;
+using namespace css::frame;
namespace svt
{
@@ -234,7 +234,7 @@ throw ( RuntimeException, std::exception )
// XComponent
void SAL_CALL ToolboxController::dispose()
-throw (::com::sun::star::uno::RuntimeException, std::exception)
+throw (css::uno::RuntimeException, std::exception)
{
Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY );
@@ -244,7 +244,7 @@ throw (::com::sun::star::uno::RuntimeException, std::exception)
throw DisposedException();
}
- com::sun::star::lang::EventObject aEvent( xThis );
+ css::lang::EventObject aEvent( xThis );
m_aListenerContainer.disposeAndClear( aEvent );
SolarMutexGuard aSolarMutexGuard;
@@ -256,7 +256,7 @@ throw (::com::sun::star::uno::RuntimeException, std::exception)
{
Reference< XDispatch > xDispatch( pIter->second );
- com::sun::star::util::URL aTargetURL;
+ css::util::URL aTargetURL;
aTargetURL.Complete = pIter->first;
if ( m_xUrlTransformer.is() )
m_xUrlTransformer->parseStrict( aTargetURL );
@@ -321,7 +321,7 @@ throw ( RuntimeException, std::exception )
// XToolbarController
void SAL_CALL ToolboxController::execute( sal_Int16 KeyModifier )
-throw (::com::sun::star::uno::RuntimeException, std::exception)
+throw (css::uno::RuntimeException, std::exception)
{
Reference< XDispatch > xDispatch;
OUString aCommandURL;
@@ -349,7 +349,7 @@ throw (::com::sun::star::uno::RuntimeException, std::exception)
{
try
{
- com::sun::star::util::URL aTargetURL;
+ css::util::URL aTargetURL;
Sequence<PropertyValue> aArgs( 1 );
// Provide key modifier information to dispatch function
@@ -368,23 +368,23 @@ throw (::com::sun::star::uno::RuntimeException, std::exception)
}
void SAL_CALL ToolboxController::click()
-throw (::com::sun::star::uno::RuntimeException, std::exception)
+throw (css::uno::RuntimeException, std::exception)
{
}
void SAL_CALL ToolboxController::doubleClick()
-throw (::com::sun::star::uno::RuntimeException, std::exception)
+throw (css::uno::RuntimeException, std::exception)
{
}
Reference< XWindow > SAL_CALL ToolboxController::createPopupWindow()
-throw (::com::sun::star::uno::RuntimeException, std::exception)
+throw (css::uno::RuntimeException, std::exception)
{
return Reference< XWindow >();
}
Reference< XWindow > SAL_CALL ToolboxController::createItemWindow( const Reference< XWindow >& )
-throw (::com::sun::star::uno::RuntimeException, std::exception)
+throw (css::uno::RuntimeException, std::exception)
{
return Reference< XWindow >();
}
@@ -393,7 +393,7 @@ void ToolboxController::addStatusListener( const OUString& aCommandURL )
{
Reference< XDispatch > xDispatch;
Reference< XStatusListener > xStatusListener;
- com::sun::star::util::URL aTargetURL;
+ css::util::URL aTargetURL;
{
SolarMutexGuard aSolarMutexGuard;
@@ -468,7 +468,7 @@ void ToolboxController::removeStatusListener( const OUString& aCommandURL )
try
{
- com::sun::star::util::URL aTargetURL;
+ css::util::URL aTargetURL;
aTargetURL.Complete = aCommandURL;
if ( m_xUrlTransformer.is() )
m_xUrlTransformer->parseStrict( aTargetURL );
@@ -501,7 +501,7 @@ void ToolboxController::bindListener()
URLToDispatchMap::iterator pIter = m_aListenerMap.begin();
while ( pIter != m_aListenerMap.end() )
{
- com::sun::star::util::URL aTargetURL;
+ css::util::URL aTargetURL;
aTargetURL.Complete = pIter->first;
if ( m_xUrlTransformer.is() )
m_xUrlTransformer->parseStrict( aTargetURL );
@@ -590,7 +590,7 @@ void ToolboxController::unbindListener()
URLToDispatchMap::iterator pIter = m_aListenerMap.begin();
while ( pIter != m_aListenerMap.end() )
{
- com::sun::star::util::URL aTargetURL;
+ css::util::URL aTargetURL;
aTargetURL.Complete = pIter->first;
if ( m_xUrlTransformer.is() )
m_xUrlTransformer->parseStrict( aTargetURL );
@@ -637,7 +637,7 @@ void ToolboxController::updateStatus( const OUString& aCommandURL )
{
Reference< XDispatch > xDispatch;
Reference< XStatusListener > xStatusListener;
- com::sun::star::util::URL aTargetURL;
+ css::util::URL aTargetURL;
{
SolarMutexGuard aSolarMutexGuard;
@@ -700,7 +700,7 @@ void ToolboxController::dispatchCommand( const OUString& sCommandURL, const Sequ
-com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL ToolboxController::getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception)
+css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL ToolboxController::getPropertySetInfo() throw(css::uno::RuntimeException, std::exception)
{
Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) );
return xInfo;
@@ -714,7 +714,7 @@ com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_C
::cppu::IPropertyArrayHelper* ToolboxController::createArrayHelper( ) const
{
- com::sun::star::uno::Sequence< Property > aProps;
+ css::uno::Sequence< Property > aProps;
describeProperties(aProps);
return new ::cppu::OPropertyArrayHelper(aProps);
}
@@ -724,10 +724,10 @@ void ToolboxController::setSupportVisibleProperty(bool bValue)
m_bSupportVisible = bValue;
}
-sal_Bool SAL_CALL ToolboxController::convertFastPropertyValue( com::sun::star::uno::Any& aConvertedValue ,
- com::sun::star::uno::Any& aOldValue ,
+sal_Bool SAL_CALL ToolboxController::convertFastPropertyValue( css::uno::Any& aConvertedValue ,
+ css::uno::Any& aOldValue ,
sal_Int32 nHandle ,
- const com::sun::star::uno::Any& aValue ) throw( com::sun::star::lang::IllegalArgumentException )
+ const css::uno::Any& aValue ) throw( css::lang::IllegalArgumentException )
{
switch (nHandle)
{
@@ -749,8 +749,8 @@ sal_Bool SAL_CALL ToolboxController::convertFastPropertyValue( com::sun::star::u
void SAL_CALL ToolboxController::setFastPropertyValue_NoBroadcast(
sal_Int32 nHandle,
- const com::sun::star::uno::Any& aValue )
-throw( com::sun::star::uno::Exception, std::exception)
+ const css::uno::Any& aValue )
+throw( css::uno::Exception, std::exception)
{
OPropertyContainer::setFastPropertyValue_NoBroadcast(nHandle, aValue);
if (TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIBLE == nHandle)
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index 58fa04d7340e..8a729d27d8f6 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -41,14 +41,14 @@
#include <map>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::awt::tree;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::view;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::util;
-using namespace ::com::sun::star::graphic;
+using namespace css::uno;
+using namespace css::lang;
+using namespace css::awt::tree;
+using namespace css::beans;
+using namespace css::view;
+using namespace css::container;
+using namespace css::util;
+using namespace css::graphic;
struct LockGuard
{
@@ -517,7 +517,7 @@ void TreeControlPeer::ChangeNodesSelection( const Any& rSelection, bool bSelect,
}
-// ::com::sun::star::view::XSelectionSupplier
+// css::view::XSelectionSupplier
sal_Bool SAL_CALL TreeControlPeer::select( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException, std::exception)
@@ -578,7 +578,7 @@ void SAL_CALL TreeControlPeer::removeSelectionChangeListener( const Reference< X
}
-// ::com::sun::star::view::XMultiSelectionSupplier
+// css::view::XMultiSelectionSupplier
sal_Bool SAL_CALL TreeControlPeer::addSelection( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException, std::exception)
@@ -697,10 +697,10 @@ Reference< XEnumeration > SAL_CALL TreeControlPeer::createReverseSelectionEnumer
}
-// ::com::sun::star::awt::XTreeControl
+// css::awt::XTreeControl
-OUString SAL_CALL TreeControlPeer::getDefaultExpandedGraphicURL() throw (::com::sun::star::uno::RuntimeException, std::exception)
+OUString SAL_CALL TreeControlPeer::getDefaultExpandedGraphicURL() throw (css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
return msDefaultExpandedGraphicURL;
@@ -708,7 +708,7 @@ OUString SAL_CALL TreeControlPeer::getDefaultExpandedGraphicURL() throw (::com::
-void SAL_CALL TreeControlPeer::setDefaultExpandedGraphicURL( const OUString& sDefaultExpandedGraphicURL ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL TreeControlPeer::setDefaultExpandedGraphicURL( const OUString& sDefaultExpandedGraphicURL ) throw (css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if( msDefaultExpandedGraphicURL != sDefaultExpandedGraphicURL )
@@ -738,7 +738,7 @@ void SAL_CALL TreeControlPeer::setDefaultExpandedGraphicURL( const OUString& sDe
-OUString SAL_CALL TreeControlPeer::getDefaultCollapsedGraphicURL() throw (::com::sun::star::uno::RuntimeException, std::exception)
+OUString SAL_CALL TreeControlPeer::getDefaultCollapsedGraphicURL() throw (css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
return msDefaultCollapsedGraphicURL;
@@ -746,7 +746,7 @@ OUString SAL_CALL TreeControlPeer::getDefaultCollapsedGraphicURL() throw (::com:
-void SAL_CALL TreeControlPeer::setDefaultCollapsedGraphicURL( const OUString& sDefaultCollapsedGraphicURL ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL TreeControlPeer::setDefaultCollapsedGraphicURL( const OUString& sDefaultCollapsedGraphicURL ) throw (css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if( msDefaultCollapsedGraphicURL != sDefaultCollapsedGraphicURL )
@@ -1009,10 +1009,10 @@ bool TreeControlPeer::onEditedEntry( UnoTreeListEntry* pEntry, const OUString& r
}
-// ::com::sun::star::awt::tree::TreeDataModelListener
+// css::awt::tree::TreeDataModelListener
-void SAL_CALL TreeControlPeer::treeNodesChanged( const ::com::sun::star::awt::tree::TreeDataModelEvent& rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL TreeControlPeer::treeNodesChanged( const css::awt::tree::TreeDataModelEvent& rEvent ) throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1022,7 +1022,7 @@ void SAL_CALL TreeControlPeer::treeNodesChanged( const ::com::sun::star::awt::tr
updateTree( rEvent, true );
}
-void SAL_CALL TreeControlPeer::treeNodesInserted( const ::com::sun::star::awt::tree::TreeDataModelEvent& rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL TreeControlPeer::treeNodesInserted( const css::awt::tree::TreeDataModelEvent& rEvent ) throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1032,7 +1032,7 @@ void SAL_CALL TreeControlPeer::treeNodesInserted( const ::com::sun::star::awt::t
updateTree( rEvent, true );
}
-void SAL_CALL TreeControlPeer::treeNodesRemoved( const ::com::sun::star::awt::tree::TreeDataModelEvent& rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL TreeControlPeer::treeNodesRemoved( const css::awt::tree::TreeDataModelEvent& rEvent ) throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1042,7 +1042,7 @@ void SAL_CALL TreeControlPeer::treeNodesRemoved( const ::com::sun::star::awt::tr
updateTree( rEvent, true );
}
-void SAL_CALL TreeControlPeer::treeStructureChanged( const ::com::sun::star::awt::tree::TreeDataModelEvent& rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL TreeControlPeer::treeStructureChanged( const css::awt::tree::TreeDataModelEvent& rEvent ) throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1052,7 +1052,7 @@ void SAL_CALL TreeControlPeer::treeStructureChanged( const ::com::sun::star::awt
updateTree( rEvent, true );
}
-void TreeControlPeer::updateTree( const ::com::sun::star::awt::tree::TreeDataModelEvent& rEvent, bool bRecursive )
+void TreeControlPeer::updateTree( const css::awt::tree::TreeDataModelEvent& rEvent, bool bRecursive )
{
UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
@@ -1211,7 +1211,7 @@ OUString TreeControlPeer::getEntryString( const Any& rValue )
}
// XEventListener
-void SAL_CALL TreeControlPeer::disposing( const ::com::sun::star::lang::EventObject& ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL TreeControlPeer::disposing( const css::lang::EventObject& ) throw(css::uno::RuntimeException, std::exception)
{
// model is disposed, so we clear our tree
SolarMutexGuard aGuard;
@@ -1239,14 +1239,14 @@ void TreeControlPeer::onChangeDataModel( UnoTreeListBoxImpl& rTree, const Refere
}
-// ::com::sun::star::awt::XLayoutConstrains
+// css::awt::XLayoutConstrains
-::com::sun::star::awt::Size TreeControlPeer::getMinimumSize() throw(RuntimeException, std::exception)
+css::awt::Size TreeControlPeer::getMinimumSize() throw(RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- ::com::sun::star::awt::Size aSz;
+ css::awt::Size aSz;
/* todo
MultiLineEdit* pEdit = (MultiLineEdit*) GetWindow();
if ( pEdit )
@@ -1255,16 +1255,16 @@ void TreeControlPeer::onChangeDataModel( UnoTreeListBoxImpl& rTree, const Refere
return aSz;
}
-::com::sun::star::awt::Size TreeControlPeer::getPreferredSize() throw(RuntimeException, std::exception)
+css::awt::Size TreeControlPeer::getPreferredSize() throw(RuntimeException, std::exception)
{
return getMinimumSize();
}
-::com::sun::star::awt::Size TreeControlPeer::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(RuntimeException, std::exception)
+css::awt::Size TreeControlPeer::calcAdjustedSize( const css::awt::Size& rNewSize ) throw(RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- ::com::sun::star::awt::Size aSz = rNewSize;
+ css::awt::Size aSz = rNewSize;
/* todo
MultiLineEdit* pEdit = (MultiLineEdit*) GetWindow();
if ( pEdit )
@@ -1274,7 +1274,7 @@ void TreeControlPeer::onChangeDataModel( UnoTreeListBoxImpl& rTree, const Refere
}
-// ::com::sun::star::awt::XVclWindowPeer
+// css::awt::XVclWindowPeer
void TreeControlPeer::setProperty( const OUString& PropertyName, const Any& aValue) throw(RuntimeException, std::exception)
@@ -1456,7 +1456,7 @@ bool TreeControlPeer::loadImage( const OUString& rURL, Image& rImage )
try
{
- ::com::sun::star::beans::PropertyValues aProps( 1 );
+ css::beans::PropertyValues aProps( 1 );
aProps[0].Name = "URL";
aProps[0].Value <<= rURL;
diff --git a/svtools/source/uno/treecontrolpeer.hxx b/svtools/source/uno/treecontrolpeer.hxx
index 4eae4987934b..db1992847f23 100644
--- a/svtools/source/uno/treecontrolpeer.hxx
+++ b/svtools/source/uno/treecontrolpeer.hxx
@@ -45,9 +45,9 @@ class UnoTreeListEntry;
class TreeControlPeer;
class UnoTreeListBoxImpl;
-class TreeControlPeer : public ::cppu::ImplInheritanceHelper< VCLXWindow, ::com::sun::star::awt::tree::XTreeControl, ::com::sun::star::awt::tree::XTreeDataModelListener >
+class TreeControlPeer : public ::cppu::ImplInheritanceHelper< VCLXWindow, css::awt::tree::XTreeControl, css::awt::tree::XTreeDataModelListener >
{
- typedef std::map<com::sun::star::uno::Reference<com::sun::star::awt::tree::XTreeNode>, UnoTreeListEntry*> TreeNodeMap;
+ typedef std::map<css::uno::Reference<css::awt::tree::XTreeNode>, UnoTreeListEntry*> TreeNodeMap;
friend class UnoTreeListBoxImpl;
friend class UnoTreeListEntry;
@@ -60,90 +60,90 @@ public:
// VCLXWindow
virtual void SetWindow( const VclPtr< vcl::Window > &pWindow ) override;
- // ::com::sun::star::view::XSelectionSupplier
- virtual sal_Bool SAL_CALL select( const ::com::sun::star::uno::Any& xSelection ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Any SAL_CALL getSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-
- // ::com::sun::star::view::XMultiSelectionSupplier
- virtual sal_Bool SAL_CALL addSelection( const ::com::sun::star::uno::Any& Selection ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeSelection( const ::com::sun::star::uno::Any& Selection ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL clearSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::sal_Int32 SAL_CALL getSelectionCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createSelectionEnumeration( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createReverseSelectionEnumeration( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-
- // ::com::sun::star::awt::XTreeControl
- virtual OUString SAL_CALL getDefaultExpandedGraphicURL() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setDefaultExpandedGraphicURL( const OUString& _defaultexpandedgraphicurl ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getDefaultCollapsedGraphicURL() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setDefaultCollapsedGraphicURL( const OUString& _defaultcollapsedgraphicurl ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isNodeExpanded( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& Node ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isNodeCollapsed( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& Node ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL makeNodeVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& Node ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::awt::tree::ExpandVetoException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isNodeVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& Node ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL expandNode( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& Node ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::awt::tree::ExpandVetoException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL collapseNode( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& Node ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::awt::tree::ExpandVetoException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addTreeExpansionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeExpansionListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeTreeExpansionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeExpansionListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode > SAL_CALL getNodeForLocation( ::sal_Int32 x, ::sal_Int32 y ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode > SAL_CALL getClosestNodeForLocation( ::sal_Int32 x, ::sal_Int32 y ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::awt::Rectangle SAL_CALL getNodeRect( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& Node ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isEditing( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL stopEditing( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL cancelEditing( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL startEditingAtNode( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& Node ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addTreeEditListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeEditListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeTreeEditListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeEditListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-
- // ::com::sun::star::awt::tree::TreeDataModelListener
- virtual void SAL_CALL treeNodesChanged( const ::com::sun::star::awt::tree::TreeDataModelEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL treeNodesInserted( const ::com::sun::star::awt::tree::TreeDataModelEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL treeNodesRemoved( const ::com::sun::star::awt::tree::TreeDataModelEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL treeStructureChanged( const ::com::sun::star::awt::tree::TreeDataModelEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ // css::view::XSelectionSupplier
+ virtual sal_Bool SAL_CALL select( const css::uno::Any& xSelection ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getSelection( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+
+ // css::view::XMultiSelectionSupplier
+ virtual sal_Bool SAL_CALL addSelection( const css::uno::Any& Selection ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL removeSelection( const css::uno::Any& Selection ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL clearSelection( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual ::sal_Int32 SAL_CALL getSelectionCount( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSelectionEnumeration( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createReverseSelectionEnumeration( ) throw (css::uno::RuntimeException, std::exception) override;
+
+ // css::awt::XTreeControl
+ virtual OUString SAL_CALL getDefaultExpandedGraphicURL() throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setDefaultExpandedGraphicURL( const OUString& _defaultexpandedgraphicurl ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getDefaultCollapsedGraphicURL() throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setDefaultCollapsedGraphicURL( const OUString& _defaultcollapsedgraphicurl ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isNodeExpanded( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isNodeCollapsed( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL makeNodeVisible( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::lang::IllegalArgumentException, css::awt::tree::ExpandVetoException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isNodeVisible( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL expandNode( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::lang::IllegalArgumentException, css::awt::tree::ExpandVetoException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL collapseNode( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::lang::IllegalArgumentException, css::awt::tree::ExpandVetoException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addTreeExpansionListener( const css::uno::Reference< css::awt::tree::XTreeExpansionListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL removeTreeExpansionListener( const css::uno::Reference< css::awt::tree::XTreeExpansionListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::awt::tree::XTreeNode > SAL_CALL getNodeForLocation( ::sal_Int32 x, ::sal_Int32 y ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::awt::tree::XTreeNode > SAL_CALL getClosestNodeForLocation( ::sal_Int32 x, ::sal_Int32 y ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Rectangle SAL_CALL getNodeRect( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isEditing( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL stopEditing( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL cancelEditing( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL startEditingAtNode( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addTreeEditListener( const css::uno::Reference< css::awt::tree::XTreeEditListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL removeTreeEditListener( const css::uno::Reference< css::awt::tree::XTreeEditListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
+
+ // css::awt::tree::TreeDataModelListener
+ virtual void SAL_CALL treeNodesChanged( const css::awt::tree::TreeDataModelEvent& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL treeNodesInserted( const css::awt::tree::TreeDataModelEvent& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL treeNodesRemoved( const css::awt::tree::TreeDataModelEvent& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL treeStructureChanged( const css::awt::tree::TreeDataModelEvent& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
// XEventListener
- void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override;
- // ::com::sun::star::awt::XLayoutConstrains
- ::com::sun::star::awt::Size SAL_CALL getMinimumSize() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- ::com::sun::star::awt::Size SAL_CALL getPreferredSize() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ // css::awt::XLayoutConstrains
+ css::awt::Size SAL_CALL getMinimumSize() throw(css::uno::RuntimeException, std::exception) override;
+ css::awt::Size SAL_CALL getPreferredSize() throw(css::uno::RuntimeException, std::exception) override;
+ css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) throw(css::uno::RuntimeException, std::exception) override;
- // ::com::sun::star::awt::XVclWindowPeer
- void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ // css::awt::XVclWindowPeer
+ void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
+ css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
private:
- UnoTreeListEntry* getEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& xNode, bool bThrow = true ) throw (::com::sun::star::lang::IllegalArgumentException );
+ UnoTreeListEntry* getEntry( const css::uno::Reference< css::awt::tree::XTreeNode >& xNode, bool bThrow = true ) throw (css::lang::IllegalArgumentException );
void disposeControl();
bool onEditingEntry( UnoTreeListEntry* pEntry );
bool onEditedEntry( UnoTreeListEntry* pEntry, const OUString& rNewText );
- void fillTree( UnoTreeListBoxImpl& rTree, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeDataModel >& xDataModel );
- void addNode( UnoTreeListBoxImpl& rTree, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& xNode, UnoTreeListEntry* pParentEntry );
+ void fillTree( UnoTreeListBoxImpl& rTree, const css::uno::Reference< css::awt::tree::XTreeDataModel >& xDataModel );
+ void addNode( UnoTreeListBoxImpl& rTree, const css::uno::Reference< css::awt::tree::XTreeNode >& xNode, UnoTreeListEntry* pParentEntry );
- UnoTreeListEntry* createEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& xNode, UnoTreeListEntry* pParent, sal_uLong nPos = TREELIST_APPEND );
+ UnoTreeListEntry* createEntry( const css::uno::Reference< css::awt::tree::XTreeNode >& xNode, UnoTreeListEntry* pParent, sal_uLong nPos = TREELIST_APPEND );
bool updateEntry( UnoTreeListEntry* pEntry );
- void updateTree( const ::com::sun::star::awt::tree::TreeDataModelEvent& rEvent, bool bRecursive );
- void updateNode( UnoTreeListBoxImpl& rTree, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& xNode, bool bRecursive );
- void updateChildNodes( UnoTreeListBoxImpl& rTree, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& xParentNode, UnoTreeListEntry* pParentEntry );
+ void updateTree( const css::awt::tree::TreeDataModelEvent& rEvent, bool bRecursive );
+ void updateNode( UnoTreeListBoxImpl& rTree, const css::uno::Reference< css::awt::tree::XTreeNode >& xNode, bool bRecursive );
+ void updateChildNodes( UnoTreeListBoxImpl& rTree, const css::uno::Reference< css::awt::tree::XTreeNode >& xParentNode, UnoTreeListEntry* pParentEntry );
- static OUString getEntryString( const ::com::sun::star::uno::Any& rValue );
+ static OUString getEntryString( const css::uno::Any& rValue );
- UnoTreeListBoxImpl& getTreeListBoxOrThrow() const throw (::com::sun::star::uno::RuntimeException );
- void ChangeNodesSelection( const ::com::sun::star::uno::Any& rSelection, bool bSelect, bool bSetSelection ) throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException );
+ UnoTreeListBoxImpl& getTreeListBoxOrThrow() const throw (css::uno::RuntimeException );
+ void ChangeNodesSelection( const css::uno::Any& rSelection, bool bSelect, bool bSetSelection ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
- void onChangeDataModel( UnoTreeListBoxImpl& rTree, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeDataModel >& xDataModel );
+ void onChangeDataModel( UnoTreeListBoxImpl& rTree, const css::uno::Reference< css::awt::tree::XTreeDataModel >& xDataModel );
void onSelectionChanged();
- void onRequestChildNodes( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& xNode );
- bool onExpanding( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& xNode, bool bExpanding );
- void onExpanded( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& xNode, bool bExpanding );
+ void onRequestChildNodes( const css::uno::Reference< css::awt::tree::XTreeNode >& xNode );
+ bool onExpanding( const css::uno::Reference< css::awt::tree::XTreeNode >& xNode, bool bExpanding );
+ void onExpanded( const css::uno::Reference< css::awt::tree::XTreeNode >& xNode, bool bExpanding );
void onChangeRootDisplayed( bool bIsRootDisplayed );
@@ -153,7 +153,7 @@ private:
bool loadImage( const OUString& rURL, Image& rImage );
private:
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeDataModel >mxDataModel;
+ css::uno::Reference< css::awt::tree::XTreeDataModel >mxDataModel;
TreeSelectionListenerMultiplexer maSelectionListeners;
TreeExpansionListenerMultiplexer maTreeExpansionListeners;
TreeEditListenerMultiplexer maTreeEditListeners;
@@ -165,7 +165,7 @@ private:
Image maDefaultExpandedImage;
Image maDefaultCollapsedImage;
TreeNodeMap* mpTreeNodeMap;
- ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicProvider > mxGraphicProvider;
+ css::uno::Reference< css::graphic::XGraphicProvider > mxGraphicProvider;
};
#endif // INCLUDED_SVTOOLS_SOURCE_UNO_TREECONTROLPEER_HXX
diff --git a/svtools/source/uno/unocontroltablemodel.cxx b/svtools/source/uno/unocontroltablemodel.cxx
index 59e22fbb9a3b..66a3b96ce846 100644
--- a/svtools/source/uno/unocontroltablemodel.cxx
+++ b/svtools/source/uno/unocontroltablemodel.cxx
@@ -40,28 +40,28 @@ namespace svt { namespace table
{
- using ::com::sun::star::uno::Reference;
- using ::com::sun::star::uno::RuntimeException;
- using ::com::sun::star::uno::Sequence;
- using ::com::sun::star::uno::UNO_QUERY_THROW;
- using ::com::sun::star::uno::UNO_QUERY;
- using ::com::sun::star::awt::grid::XGridColumn;
- using ::com::sun::star::uno::XInterface;
- using ::com::sun::star::uno::Exception;
- using ::com::sun::star::awt::grid::XGridColumnListener;
- using ::com::sun::star::lang::EventObject;
- using ::com::sun::star::awt::grid::GridColumnEvent;
- using ::com::sun::star::awt::grid::XGridDataModel;
- using ::com::sun::star::awt::grid::XGridColumnModel;
- using ::com::sun::star::uno::Any;
- using ::com::sun::star::style::HorizontalAlignment_LEFT;
- using ::com::sun::star::style::HorizontalAlignment;
- using ::com::sun::star::style::VerticalAlignment_TOP;
- using ::com::sun::star::style::VerticalAlignment;
- using ::com::sun::star::uno::WeakReference;
- using ::com::sun::star::awt::grid::GridDataEvent;
- using ::com::sun::star::awt::grid::XSortableGridData;
- using ::com::sun::star::beans::Pair;
+ using css::uno::Reference;
+ using css::uno::RuntimeException;
+ using css::uno::Sequence;
+ using css::uno::UNO_QUERY_THROW;
+ using css::uno::UNO_QUERY;
+ using css::awt::grid::XGridColumn;
+ using css::uno::XInterface;
+ using css::uno::Exception;
+ using css::awt::grid::XGridColumnListener;
+ using css::lang::EventObject;
+ using css::awt::grid::GridColumnEvent;
+ using css::awt::grid::XGridDataModel;
+ using css::awt::grid::XGridColumnModel;
+ using css::uno::Any;
+ using css::style::HorizontalAlignment_LEFT;
+ using css::style::HorizontalAlignment;
+ using css::style::VerticalAlignment_TOP;
+ using css::style::VerticalAlignment;
+ using css::uno::WeakReference;
+ using css::awt::grid::GridDataEvent;
+ using css::awt::grid::XSortableGridData;
+ using css::beans::Pair;
//= UnoControlTableModel_Impl
@@ -718,10 +718,10 @@ namespace svt { namespace table
}
- void UnoControlTableModel::setRowBackgroundColors( ::com::sun::star::uno::Any const & i_APIValue )
+ void UnoControlTableModel::setRowBackgroundColors( css::uno::Any const & i_APIValue )
{
DBG_CHECK_ME();
- Sequence< ::com::sun::star::util::Color > aAPIColors;
+ Sequence< css::util::Color > aAPIColors;
if ( !( i_APIValue >>= aAPIColors ) )
m_pImpl->m_aRowColors.reset();
else
@@ -894,7 +894,7 @@ namespace svt { namespace table
}
- void UnoControlTableModel::notifyDataChanged( ::com::sun::star::awt::grid::GridDataEvent const & i_event ) const
+ void UnoControlTableModel::notifyDataChanged( css::awt::grid::GridDataEvent const & i_event ) const
{
RowPos const firstRow = i_event.FirstRow == -1 ? 0 : i_event.FirstRow;
RowPos const lastRow = i_event.FirstRow == -1 ? getRowCount() - 1 : i_event.LastRow;
diff --git a/svtools/source/uno/unocontroltablemodel.hxx b/svtools/source/uno/unocontroltablemodel.hxx
index ac8e80996d30..ee3ca9d66aee 100644
--- a/svtools/source/uno/unocontroltablemodel.hxx
+++ b/svtools/source/uno/unocontroltablemodel.hxx
@@ -71,9 +71,9 @@ namespace svt { namespace table
virtual ScrollbarVisibility getHorizontalScrollbarVisibility() const override;
virtual void addTableModelListener( const PTableModelListener& i_listener ) override;
virtual void removeTableModelListener( const PTableModelListener& i_listener ) override;
- virtual void getCellContent( ColPos const i_col, RowPos const i_row, ::com::sun::star::uno::Any& o_cellContent ) override;
- virtual void getCellToolTip( ColPos const i_col, RowPos const i_row, ::com::sun::star::uno::Any & o_cellToolTip ) override;
- virtual ::com::sun::star::uno::Any getRowHeading( RowPos const i_rowPos ) const override;
+ virtual void getCellContent( ColPos const i_col, RowPos const i_row, css::uno::Any& o_cellContent ) override;
+ virtual void getCellToolTip( ColPos const i_col, RowPos const i_row, css::uno::Any & o_cellToolTip ) override;
+ virtual css::uno::Any getRowHeading( RowPos const i_rowPos ) const override;
virtual ::boost::optional< ::Color > getLineColor() const override;
virtual ::boost::optional< ::Color > getHeaderBackgroundColor() const override;
virtual ::boost::optional< ::Color > getHeaderTextColor() const override;
@@ -85,7 +85,7 @@ namespace svt { namespace table
virtual ::boost::optional< ::Color > getTextLineColor() const override;
virtual ::boost::optional< ::std::vector< ::Color > >
getRowBackgroundColors() const override;
- virtual ::com::sun::star::style::VerticalAlignment
+ virtual css::style::VerticalAlignment
getVerticalAlign() const override;
virtual ITableDataSort* getSortAdapter() override;
virtual bool isEnabled() const override;
@@ -95,8 +95,8 @@ namespace svt { namespace table
virtual ColumnSort getCurrentSortOrder() const override;
// column write access
- void appendColumn( ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > const & i_column );
- void insertColumn( ColPos const i_position, ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > const & i_column );
+ void appendColumn( css::uno::Reference< css::awt::grid::XGridColumn > const & i_column );
+ void insertColumn( ColPos const i_position, css::uno::Reference< css::awt::grid::XGridColumn > const & i_column );
void removeColumn( ColPos const i_position );
void removeAllColumns();
@@ -104,13 +104,13 @@ namespace svt { namespace table
void setVerticalScrollbarVisibility( ScrollbarVisibility const i_visibility ) const;
void setHorizontalScrollbarVisibility( ScrollbarVisibility const i_visibility ) const;
- void setDataModel( ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridDataModel > const & i_gridDataModel );
+ void setDataModel( css::uno::Reference< css::awt::grid::XGridDataModel > const & i_gridDataModel );
bool hasDataModel() const;
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridDataModel >
+ css::uno::Reference< css::awt::grid::XGridDataModel >
getDataModel() const;
- void setColumnModel( ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumnModel > const & i_gridColumnModel );
+ void setColumnModel( css::uno::Reference< css::awt::grid::XGridColumnModel > const & i_gridColumnModel );
bool hasColumnModel() const;
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumnModel >
+ css::uno::Reference< css::awt::grid::XGridColumnModel >
getColumnModel() const;
void setRowHeaders(bool _bRowHeaders);
@@ -120,24 +120,24 @@ namespace svt { namespace table
void setRowHeaderWidth( TableMetrics _nWidth );
void setColumnHeaderHeight( TableMetrics _nHeight );
- void setLineColor( ::com::sun::star::uno::Any const & i_color );
- void setHeaderBackgroundColor( ::com::sun::star::uno::Any const & i_color );
- void setHeaderTextColor( ::com::sun::star::uno::Any const & i_color );
- void setActiveSelectionBackColor( ::com::sun::star::uno::Any const & i_color );
- void setInactiveSelectionBackColor( ::com::sun::star::uno::Any const & i_color );
- void setActiveSelectionTextColor( ::com::sun::star::uno::Any const & i_color );
- void setInactiveSelectionTextColor( ::com::sun::star::uno::Any const & i_color );
- void setTextColor( ::com::sun::star::uno::Any const & i_color );
- void setTextLineColor( ::com::sun::star::uno::Any const & i_color );
- void setRowBackgroundColors( ::com::sun::star::uno::Any const & i_APIValue );
-
- void setVerticalAlign(::com::sun::star::style::VerticalAlignment _rAlign);
+ void setLineColor( css::uno::Any const & i_color );
+ void setHeaderBackgroundColor( css::uno::Any const & i_color );
+ void setHeaderTextColor( css::uno::Any const & i_color );
+ void setActiveSelectionBackColor( css::uno::Any const & i_color );
+ void setInactiveSelectionBackColor( css::uno::Any const & i_color );
+ void setActiveSelectionTextColor( css::uno::Any const & i_color );
+ void setInactiveSelectionTextColor( css::uno::Any const & i_color );
+ void setTextColor( css::uno::Any const & i_color );
+ void setTextLineColor( css::uno::Any const & i_color );
+ void setRowBackgroundColors( css::uno::Any const & i_APIValue );
+
+ void setVerticalAlign(css::style::VerticalAlignment _rAlign);
void setEnabled( bool _bEnabled );
// multiplexing of XGridDataListener events
- void notifyRowsInserted( ::com::sun::star::awt::grid::GridDataEvent const & i_event ) const;
- void notifyRowsRemoved( ::com::sun::star::awt::grid::GridDataEvent const & i_event ) const;
- void notifyDataChanged( ::com::sun::star::awt::grid::GridDataEvent const & i_event ) const;
+ void notifyRowsInserted( css::awt::grid::GridDataEvent const & i_event ) const;
+ void notifyRowsRemoved( css::awt::grid::GridDataEvent const & i_event ) const;
+ void notifyDataChanged( css::awt::grid::GridDataEvent const & i_event ) const;
/// retrieves the index of a column within the model
ColPos getColumnPos( UnoGridColumnFacade const & i_column ) const;
diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx
index 6d9cb1f3cfbb..5abca39ef371 100644
--- a/svtools/source/uno/unoevent.cxx
+++ b/svtools/source/uno/unoevent.cxx
@@ -26,14 +26,14 @@
#include <svl/macitem.hxx>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
+using namespace css::uno;
-using ::com::sun::star::container::NoSuchElementException;
-using ::com::sun::star::container::XNameReplace;
-using ::com::sun::star::lang::IllegalArgumentException;
-using ::com::sun::star::lang::WrappedTargetException;
-using ::com::sun::star::lang::XServiceInfo;
-using ::com::sun::star::beans::PropertyValue;
+using css::container::NoSuchElementException;
+using css::container::XNameReplace;
+using css::lang::IllegalArgumentException;
+using css::lang::WrappedTargetException;
+using css::lang::XServiceInfo;
+using css::beans::PropertyValue;
const sal_Char sAPI_ServiceName[] = "com.sun.star.container.XNameReplace";
@@ -455,7 +455,7 @@ sal_Int16 SvDetachedEventDescriptor::getIndex(const sal_uInt16 nID) const
}
OUString SvDetachedEventDescriptor::getImplementationName()
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
+ throw( css::uno::RuntimeException, std::exception )
{
return sImplName;
}
diff --git a/svtools/source/uno/unogridcolumnfacade.cxx b/svtools/source/uno/unogridcolumnfacade.cxx
index 048482ccc97c..944d971fcc48 100644
--- a/svtools/source/uno/unogridcolumnfacade.cxx
+++ b/svtools/source/uno/unogridcolumnfacade.cxx
@@ -40,20 +40,20 @@ namespace svt { namespace table
{
- using ::com::sun::star::uno::Reference;
- using ::com::sun::star::uno::RuntimeException;
- using ::com::sun::star::uno::Sequence;
- using ::com::sun::star::uno::UNO_QUERY_THROW;
- using ::com::sun::star::uno::UNO_QUERY;
- using ::com::sun::star::awt::grid::XGridColumn;
- using ::com::sun::star::uno::XInterface;
- using ::com::sun::star::uno::Exception;
- using ::com::sun::star::awt::grid::XGridColumnListener;
- using ::com::sun::star::lang::EventObject;
- using ::com::sun::star::awt::grid::GridColumnEvent;
- using ::com::sun::star::uno::Any;
- using ::com::sun::star::style::HorizontalAlignment_LEFT;
- using ::com::sun::star::style::HorizontalAlignment;
+ using css::uno::Reference;
+ using css::uno::RuntimeException;
+ using css::uno::Sequence;
+ using css::uno::UNO_QUERY_THROW;
+ using css::uno::UNO_QUERY;
+ using css::awt::grid::XGridColumn;
+ using css::uno::XInterface;
+ using css::uno::Exception;
+ using css::awt::grid::XGridColumnListener;
+ using css::lang::EventObject;
+ using css::awt::grid::GridColumnEvent;
+ using css::uno::Any;
+ using css::style::HorizontalAlignment_LEFT;
+ using css::style::HorizontalAlignment;
namespace
@@ -309,7 +309,7 @@ namespace svt { namespace table
}
- ::com::sun::star::style::HorizontalAlignment UnoGridColumnFacade::getHorizontalAlign()
+ css::style::HorizontalAlignment UnoGridColumnFacade::getHorizontalAlign()
{
ENSURE_OR_RETURN( m_xGridColumn.is(), "UnoGridColumnFacade: already disposed!", HorizontalAlignment_LEFT );
return lcl_get( m_xGridColumn, &XGridColumn::getHorizontalAlign );
diff --git a/svtools/source/uno/unogridcolumnfacade.hxx b/svtools/source/uno/unogridcolumnfacade.hxx
index 5ccc8552a583..2aa3091b7f4b 100644
--- a/svtools/source/uno/unogridcolumnfacade.hxx
+++ b/svtools/source/uno/unogridcolumnfacade.hxx
@@ -47,7 +47,7 @@ namespace svt { namespace table
public:
UnoGridColumnFacade(
UnoControlTableModel const & i_owner,
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > const & i_gridColumn
+ css::uno::Reference< css::awt::grid::XGridColumn > const & i_gridColumn
);
virtual ~UnoGridColumnFacade();
@@ -60,7 +60,7 @@ namespace svt { namespace table
virtual void setWidth( TableMetrics _nWidth ) override;
virtual TableMetrics getMinWidth() const override;
virtual TableMetrics getMaxWidth() const override;
- virtual ::com::sun::star::style::HorizontalAlignment getHorizontalAlign() override;
+ virtual css::style::HorizontalAlignment getHorizontalAlign() override;
/** disposes the column wrapper
@@ -82,7 +82,7 @@ namespace svt { namespace table
private:
UnoControlTableModel const * m_pOwner;
sal_Int32 m_nDataColumnIndex;
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > m_xGridColumn;
+ css::uno::Reference< css::awt::grid::XGridColumn > m_xGridColumn;
::rtl::Reference< ColumnChangeMultiplexer > m_pChangeMultiplexer;
};
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index 2859c9b17991..9f1d537ce3c3 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -60,7 +60,7 @@ namespace
extern "C" {
-SAL_DLLPUBLIC_EXPORT vcl::Window* CreateWindow( VCLXWindow** ppNewComp, const ::com::sun::star::awt::WindowDescriptor* pDescriptor, vcl::Window* pParent, WinBits nWinBits )
+SAL_DLLPUBLIC_EXPORT vcl::Window* CreateWindow( VCLXWindow** ppNewComp, const css::awt::WindowDescriptor* pDescriptor, vcl::Window* pParent, WinBits nWinBits )
{
vcl::Window* pWindow = NULL;
OUString aServiceName( pDescriptor->WindowServiceName );
@@ -184,35 +184,35 @@ VCLXMultiLineEdit::~VCLXMultiLineEdit()
{
}
-::com::sun::star::uno::Any VCLXMultiLineEdit::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+css::uno::Any VCLXMultiLineEdit::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
{
- ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
- (static_cast< ::com::sun::star::awt::XTextComponent* >(this)),
- (static_cast< ::com::sun::star::awt::XTextArea* >(this)),
- (static_cast< ::com::sun::star::awt::XTextLayoutConstrains* >(this)),
- (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)) );
+ css::uno::Any aRet = ::cppu::queryInterface( rType,
+ (static_cast< css::awt::XTextComponent* >(this)),
+ (static_cast< css::awt::XTextArea* >(this)),
+ (static_cast< css::awt::XTextLayoutConstrains* >(this)),
+ (static_cast< css::lang::XTypeProvider* >(this)) );
return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType ));
}
-// ::com::sun::star::lang::XTypeProvider
+// css::lang::XTypeProvider
IMPL_XTYPEPROVIDER_START( VCLXMultiLineEdit )
- cppu::UnoType<com::sun::star::awt::XTextComponent>::get(),
- cppu::UnoType<com::sun::star::awt::XTextArea>::get(),
- cppu::UnoType<com::sun::star::awt::XTextLayoutConstrains>::get(),
+ cppu::UnoType<css::awt::XTextComponent>::get(),
+ cppu::UnoType<css::awt::XTextArea>::get(),
+ cppu::UnoType<css::awt::XTextLayoutConstrains>::get(),
VCLXWindow::getTypes()
IMPL_XTYPEPROVIDER_END
-void VCLXMultiLineEdit::addTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener > & l ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void VCLXMultiLineEdit::addTextListener( const css::uno::Reference< css::awt::XTextListener > & l ) throw(css::uno::RuntimeException, std::exception)
{
maTextListeners.addInterface( l );
}
-void VCLXMultiLineEdit::removeTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener > & l ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void VCLXMultiLineEdit::removeTextListener( const css::uno::Reference< css::awt::XTextListener > & l ) throw(css::uno::RuntimeException, std::exception)
{
maTextListeners.removeInterface( l );
}
-void VCLXMultiLineEdit::setText( const OUString& aText ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void VCLXMultiLineEdit::setText( const OUString& aText ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -229,7 +229,7 @@ void VCLXMultiLineEdit::setText( const OUString& aText ) throw(::com::sun::star:
}
}
-void VCLXMultiLineEdit::insertText( const ::com::sun::star::awt::Selection& rSel, const OUString& aText ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void VCLXMultiLineEdit::insertText( const css::awt::Selection& rSel, const OUString& aText ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -241,7 +241,7 @@ void VCLXMultiLineEdit::insertText( const ::com::sun::star::awt::Selection& rSel
}
}
-OUString VCLXMultiLineEdit::getText() throw(::com::sun::star::uno::RuntimeException, std::exception)
+OUString VCLXMultiLineEdit::getText() throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -252,7 +252,7 @@ OUString VCLXMultiLineEdit::getText() throw(::com::sun::star::uno::RuntimeExcept
return aText;
}
-OUString VCLXMultiLineEdit::getSelectedText() throw(::com::sun::star::uno::RuntimeException, std::exception)
+OUString VCLXMultiLineEdit::getSelectedText() throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -264,7 +264,7 @@ OUString VCLXMultiLineEdit::getSelectedText() throw(::com::sun::star::uno::Runti
}
-void VCLXMultiLineEdit::setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void VCLXMultiLineEdit::setSelection( const css::awt::Selection& aSelection ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -275,11 +275,11 @@ void VCLXMultiLineEdit::setSelection( const ::com::sun::star::awt::Selection& aS
}
}
-::com::sun::star::awt::Selection VCLXMultiLineEdit::getSelection() throw(::com::sun::star::uno::RuntimeException, std::exception)
+css::awt::Selection VCLXMultiLineEdit::getSelection() throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- ::com::sun::star::awt::Selection aSel;
+ css::awt::Selection aSel;
VclPtr< MultiLineEdit > pMultiLineEdit = GetAs< MultiLineEdit >();
if ( pMultiLineEdit )
{
@@ -289,7 +289,7 @@ void VCLXMultiLineEdit::setSelection( const ::com::sun::star::awt::Selection& aS
return aSel;
}
-sal_Bool VCLXMultiLineEdit::isEditable() throw(::com::sun::star::uno::RuntimeException, std::exception)
+sal_Bool VCLXMultiLineEdit::isEditable() throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -297,7 +297,7 @@ sal_Bool VCLXMultiLineEdit::isEditable() throw(::com::sun::star::uno::RuntimeExc
return pMultiLineEdit && !pMultiLineEdit->IsReadOnly() && pMultiLineEdit->IsEnabled();
}
-void VCLXMultiLineEdit::setEditable( sal_Bool bEditable ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void VCLXMultiLineEdit::setEditable( sal_Bool bEditable ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -306,7 +306,7 @@ void VCLXMultiLineEdit::setEditable( sal_Bool bEditable ) throw(::com::sun::star
pMultiLineEdit->SetReadOnly( !bEditable );
}
-void VCLXMultiLineEdit::setMaxTextLen( sal_Int16 nLen ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void VCLXMultiLineEdit::setMaxTextLen( sal_Int16 nLen ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -315,7 +315,7 @@ void VCLXMultiLineEdit::setMaxTextLen( sal_Int16 nLen ) throw(::com::sun::star::
pMultiLineEdit->SetMaxTextLen( nLen );
}
-sal_Int16 VCLXMultiLineEdit::getMaxTextLen() throw(::com::sun::star::uno::RuntimeException, std::exception)
+sal_Int16 VCLXMultiLineEdit::getMaxTextLen() throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -323,7 +323,7 @@ sal_Int16 VCLXMultiLineEdit::getMaxTextLen() throw(::com::sun::star::uno::Runtim
return pMultiLineEdit ? (sal_Int16)pMultiLineEdit->GetMaxTextLen() : (sal_Int16)0;
}
-OUString VCLXMultiLineEdit::getTextLines() throw(::com::sun::star::uno::RuntimeException, std::exception)
+OUString VCLXMultiLineEdit::getTextLines() throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -334,45 +334,45 @@ OUString VCLXMultiLineEdit::getTextLines() throw(::com::sun::star::uno::RuntimeE
return aText;
}
-::com::sun::star::awt::Size VCLXMultiLineEdit::getMinimumSize() throw(::com::sun::star::uno::RuntimeException, std::exception)
+css::awt::Size VCLXMultiLineEdit::getMinimumSize() throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- ::com::sun::star::awt::Size aSz;
+ css::awt::Size aSz;
VclPtr< MultiLineEdit > pEdit = GetAs< MultiLineEdit >();
if ( pEdit )
aSz = AWTSize(pEdit->CalcMinimumSize());
return aSz;
}
-::com::sun::star::awt::Size VCLXMultiLineEdit::getPreferredSize() throw(::com::sun::star::uno::RuntimeException, std::exception)
+css::awt::Size VCLXMultiLineEdit::getPreferredSize() throw(css::uno::RuntimeException, std::exception)
{
return getMinimumSize();
}
-::com::sun::star::awt::Size VCLXMultiLineEdit::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+css::awt::Size VCLXMultiLineEdit::calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- ::com::sun::star::awt::Size aSz = rNewSize;
+ css::awt::Size aSz = rNewSize;
VclPtr< MultiLineEdit > pEdit = GetAs< MultiLineEdit >();
if ( pEdit )
aSz = AWTSize(pEdit->CalcAdjustedSize( VCLSize(rNewSize )));
return aSz;
}
-::com::sun::star::awt::Size VCLXMultiLineEdit::getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+css::awt::Size VCLXMultiLineEdit::getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- ::com::sun::star::awt::Size aSz;
+ css::awt::Size aSz;
VclPtr< MultiLineEdit > pEdit = GetAs< MultiLineEdit >();
if ( pEdit )
aSz = AWTSize(pEdit->CalcBlockSize( nCols, nLines ));
return aSz;
}
-void VCLXMultiLineEdit::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void VCLXMultiLineEdit::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -395,7 +395,7 @@ void VCLXMultiLineEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEven
{
if ( maTextListeners.getLength() )
{
- ::com::sun::star::awt::TextEvent aEvent;
+ css::awt::TextEvent aEvent;
aEvent.Source = static_cast<cppu::OWeakObject*>(this);
maTextListeners.textChanged( aEvent );
}
@@ -409,7 +409,7 @@ void VCLXMultiLineEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEven
}
}
-void VCLXMultiLineEdit::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void VCLXMultiLineEdit::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -421,13 +421,13 @@ void VCLXMultiLineEdit::setProperty( const OUString& PropertyName, const ::com::
{
case BASEPROPERTY_LINE_END_FORMAT:
{
- sal_Int16 nLineEndType = ::com::sun::star::awt::LineEndFormat::LINE_FEED;
+ sal_Int16 nLineEndType = css::awt::LineEndFormat::LINE_FEED;
OSL_VERIFY( Value >>= nLineEndType );
switch ( nLineEndType )
{
- case ::com::sun::star::awt::LineEndFormat::CARRIAGE_RETURN: meLineEndType = LINEEND_CR; break;
- case ::com::sun::star::awt::LineEndFormat::LINE_FEED: meLineEndType = LINEEND_LF; break;
- case ::com::sun::star::awt::LineEndFormat::CARRIAGE_RETURN_LINE_FEED: meLineEndType = LINEEND_CRLF; break;
+ case css::awt::LineEndFormat::CARRIAGE_RETURN: meLineEndType = LINEEND_CR; break;
+ case css::awt::LineEndFormat::LINE_FEED: meLineEndType = LINEEND_LF; break;
+ case css::awt::LineEndFormat::CARRIAGE_RETURN_LINE_FEED: meLineEndType = LINEEND_CRLF; break;
default: OSL_FAIL( "VCLXMultiLineEdit::setProperty: invalid line end value!" ); break;
}
}
@@ -465,11 +465,11 @@ void VCLXMultiLineEdit::setProperty( const OUString& PropertyName, const ::com::
}
}
-::com::sun::star::uno::Any VCLXMultiLineEdit::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+css::uno::Any VCLXMultiLineEdit::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- ::com::sun::star::uno::Any aProp;
+ css::uno::Any aProp;
VclPtr< MultiLineEdit > pMultiLineEdit = GetAs< MultiLineEdit >();
if ( pMultiLineEdit )
{
@@ -478,12 +478,12 @@ void VCLXMultiLineEdit::setProperty( const OUString& PropertyName, const ::com::
{
case BASEPROPERTY_LINE_END_FORMAT:
{
- sal_Int16 nLineEndType = ::com::sun::star::awt::LineEndFormat::LINE_FEED;
+ sal_Int16 nLineEndType = css::awt::LineEndFormat::LINE_FEED;
switch ( meLineEndType )
{
- case LINEEND_CR: nLineEndType = ::com::sun::star::awt::LineEndFormat::CARRIAGE_RETURN; break;
- case LINEEND_LF: nLineEndType = ::com::sun::star::awt::LineEndFormat::LINE_FEED; break;
- case LINEEND_CRLF: nLineEndType = ::com::sun::star::awt::LineEndFormat::CARRIAGE_RETURN_LINE_FEED; break;
+ case LINEEND_CR: nLineEndType = css::awt::LineEndFormat::CARRIAGE_RETURN; break;
+ case LINEEND_LF: nLineEndType = css::awt::LineEndFormat::LINE_FEED; break;
+ case LINEEND_CRLF: nLineEndType = css::awt::LineEndFormat::CARRIAGE_RETURN_LINE_FEED; break;
default: OSL_FAIL( "VCLXMultiLineEdit::getProperty: invalid line end value!" ); break;
}
aProp <<= nLineEndType;
@@ -509,7 +509,7 @@ void VCLXMultiLineEdit::setProperty( const OUString& PropertyName, const ::com::
return aProp;
}
-void SAL_CALL VCLXMultiLineEdit::setFocus( ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL VCLXMultiLineEdit::setFocus( ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -548,23 +548,23 @@ VCLXFileControl::~VCLXFileControl()
pControl->GetEdit().SetModifyHdl( Link<Edit&,void>() );
}
-::com::sun::star::uno::Any VCLXFileControl::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+css::uno::Any VCLXFileControl::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
{
- ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
- (static_cast< ::com::sun::star::awt::XTextComponent* >(this)),
- (static_cast< ::com::sun::star::awt::XTextLayoutConstrains* >(this)),
- (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)) );
+ css::uno::Any aRet = ::cppu::queryInterface( rType,
+ (static_cast< css::awt::XTextComponent* >(this)),
+ (static_cast< css::awt::XTextLayoutConstrains* >(this)),
+ (static_cast< css::lang::XTypeProvider* >(this)) );
return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType ));
}
-// ::com::sun::star::lang::XTypeProvider
+// css::lang::XTypeProvider
IMPL_XTYPEPROVIDER_START( VCLXFileControl )
- cppu::UnoType<com::sun::star::awt::XTextComponent>::get(),
- cppu::UnoType<com::sun::star::awt::XTextLayoutConstrains>::get(),
+ cppu::UnoType<css::awt::XTextComponent>::get(),
+ cppu::UnoType<css::awt::XTextLayoutConstrains>::get(),
VCLXWindow::getTypes()
IMPL_XTYPEPROVIDER_END
-void SAL_CALL VCLXFileControl::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL VCLXFileControl::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -604,17 +604,17 @@ void VCLXFileControl::SetWindow( const VclPtr< vcl::Window > &pWindow )
VCLXWindow::SetWindow( pWindow );
}
-void VCLXFileControl::addTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener > & l ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void VCLXFileControl::addTextListener( const css::uno::Reference< css::awt::XTextListener > & l ) throw(css::uno::RuntimeException, std::exception)
{
maTextListeners.addInterface( l );
}
-void VCLXFileControl::removeTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener > & l ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void VCLXFileControl::removeTextListener( const css::uno::Reference< css::awt::XTextListener > & l ) throw(css::uno::RuntimeException, std::exception)
{
maTextListeners.removeInterface( l );
}
-void VCLXFileControl::setText( const OUString& aText ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void VCLXFileControl::setText( const OUString& aText ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -624,12 +624,12 @@ void VCLXFileControl::setText( const OUString& aText ) throw(::com::sun::star::u
pWindow->SetText( aText );
// also in Java a textChanged is triggered, not in VCL.
- // ::com::sun::star::awt::Toolkit should be JAVA-compliant...
+ // css::awt::Toolkit should be JAVA-compliant...
ModifyHdl();
}
}
-void VCLXFileControl::insertText( const ::com::sun::star::awt::Selection& rSel, const OUString& aText ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void VCLXFileControl::insertText( const css::awt::Selection& rSel, const OUString& aText ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -641,7 +641,7 @@ void VCLXFileControl::insertText( const ::com::sun::star::awt::Selection& rSel,
}
}
-OUString VCLXFileControl::getText() throw(::com::sun::star::uno::RuntimeException, std::exception)
+OUString VCLXFileControl::getText() throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -652,7 +652,7 @@ OUString VCLXFileControl::getText() throw(::com::sun::star::uno::RuntimeExceptio
return aText;
}
-OUString VCLXFileControl::getSelectedText() throw(::com::sun::star::uno::RuntimeException, std::exception)
+OUString VCLXFileControl::getSelectedText() throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -664,7 +664,7 @@ OUString VCLXFileControl::getSelectedText() throw(::com::sun::star::uno::Runtime
}
-void VCLXFileControl::setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void VCLXFileControl::setSelection( const css::awt::Selection& aSelection ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -673,11 +673,11 @@ void VCLXFileControl::setSelection( const ::com::sun::star::awt::Selection& aSel
pFileControl->GetEdit().SetSelection( Selection( aSelection.Min, aSelection.Max ) );
}
-::com::sun::star::awt::Selection VCLXFileControl::getSelection() throw(::com::sun::star::uno::RuntimeException, std::exception)
+css::awt::Selection VCLXFileControl::getSelection() throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- ::com::sun::star::awt::Selection aSel;
+ css::awt::Selection aSel;
VclPtr< FileControl > pFileControl = GetAs< FileControl >();
if ( pFileControl )
{
@@ -687,7 +687,7 @@ void VCLXFileControl::setSelection( const ::com::sun::star::awt::Selection& aSel
return aSel;
}
-sal_Bool VCLXFileControl::isEditable() throw(::com::sun::star::uno::RuntimeException, std::exception)
+sal_Bool VCLXFileControl::isEditable() throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -695,7 +695,7 @@ sal_Bool VCLXFileControl::isEditable() throw(::com::sun::star::uno::RuntimeExcep
return pFileControl && !pFileControl->GetEdit().IsReadOnly() && pFileControl->GetEdit().IsEnabled();
}
-void VCLXFileControl::setEditable( sal_Bool bEditable ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void VCLXFileControl::setEditable( sal_Bool bEditable ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -704,7 +704,7 @@ void VCLXFileControl::setEditable( sal_Bool bEditable ) throw(::com::sun::star::
pFileControl->GetEdit().SetReadOnly( !bEditable );
}
-void VCLXFileControl::setMaxTextLen( sal_Int16 nLen ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void VCLXFileControl::setMaxTextLen( sal_Int16 nLen ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -713,7 +713,7 @@ void VCLXFileControl::setMaxTextLen( sal_Int16 nLen ) throw(::com::sun::star::un
pFileControl->GetEdit().SetMaxTextLen( nLen );
}
-sal_Int16 VCLXFileControl::getMaxTextLen() throw(::com::sun::star::uno::RuntimeException, std::exception)
+sal_Int16 VCLXFileControl::getMaxTextLen() throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -729,16 +729,16 @@ IMPL_LINK_NOARG_TYPED(VCLXFileControl, ModifyHdl, Edit&, void)
void VCLXFileControl::ModifyHdl()
{
- ::com::sun::star::awt::TextEvent aEvent;
+ css::awt::TextEvent aEvent;
aEvent.Source = static_cast<cppu::OWeakObject*>(this);
maTextListeners.textChanged( aEvent );
}
-::com::sun::star::awt::Size VCLXFileControl::getMinimumSize() throw(::com::sun::star::uno::RuntimeException, std::exception)
+css::awt::Size VCLXFileControl::getMinimumSize() throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- ::com::sun::star::awt::Size aSz;
+ css::awt::Size aSz;
VclPtr< FileControl > pControl = GetAs< FileControl >();
if ( pControl )
{
@@ -749,33 +749,33 @@ void VCLXFileControl::ModifyHdl()
return aSz;
}
-::com::sun::star::awt::Size VCLXFileControl::getPreferredSize() throw(::com::sun::star::uno::RuntimeException, std::exception)
+css::awt::Size VCLXFileControl::getPreferredSize() throw(css::uno::RuntimeException, std::exception)
{
- ::com::sun::star::awt::Size aSz = getMinimumSize();
+ css::awt::Size aSz = getMinimumSize();
aSz.Height += 4;
return aSz;
}
-::com::sun::star::awt::Size VCLXFileControl::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+css::awt::Size VCLXFileControl::calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- ::com::sun::star::awt::Size aSz =rNewSize;
+ css::awt::Size aSz =rNewSize;
VclPtr< FileControl > pControl = GetAs< FileControl >();
if ( pControl )
{
- ::com::sun::star::awt::Size aMinSz = getMinimumSize();
+ css::awt::Size aMinSz = getMinimumSize();
if ( aSz.Height != aMinSz.Height )
aSz.Height = aMinSz.Height;
}
return aSz;
}
-::com::sun::star::awt::Size VCLXFileControl::getMinimumSize( sal_Int16 nCols, sal_Int16 ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+css::awt::Size VCLXFileControl::getMinimumSize( sal_Int16 nCols, sal_Int16 ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- ::com::sun::star::awt::Size aSz;
+ css::awt::Size aSz;
VclPtr< FileControl > pControl = GetAs< FileControl >();
if ( pControl )
{
@@ -785,7 +785,7 @@ void VCLXFileControl::ModifyHdl()
return aSz;
}
-void VCLXFileControl::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void VCLXFileControl::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -836,7 +836,7 @@ void SVTXFormattedField::SetWindow( const VclPtr< vcl::Window > &_pWindow )
}
-void SVTXFormattedField::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void SVTXFormattedField::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -878,10 +878,10 @@ void SVTXFormattedField::setProperty( const OUString& PropertyName, const ::com:
case BASEPROPERTY_FORMATSSUPPLIER:
if (!Value.hasValue())
- setFormatsSupplier(::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > (NULL));
+ setFormatsSupplier(css::uno::Reference< css::util::XNumberFormatsSupplier > (NULL));
else
{
- ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > xNFS;
+ css::uno::Reference< css::util::XNumberFormatsSupplier > xNFS;
if ( Value >>= xNFS )
setFormatsSupplier(xNFS);
}
@@ -900,18 +900,18 @@ void SVTXFormattedField::setProperty( const OUString& PropertyName, const ::com:
case BASEPROPERTY_EFFECTIVE_VALUE:
case BASEPROPERTY_VALUE_DOUBLE:
{
- const ::com::sun::star::uno::TypeClass rTC = Value.getValueType().getTypeClass();
- if (rTC != ::com::sun::star::uno::TypeClass_STRING)
+ const css::uno::TypeClass rTC = Value.getValueType().getTypeClass();
+ if (rTC != css::uno::TypeClass_STRING)
// no string
- if (rTC != ::com::sun::star::uno::TypeClass_DOUBLE)
+ if (rTC != css::uno::TypeClass_DOUBLE)
// no double
if (Value.hasValue())
{ // but a value
// try if it is something converitble
sal_Int32 nValue = 0;
if (!(Value >>= nValue))
- throw ::com::sun::star::lang::IllegalArgumentException();
- SetValue(::com::sun::star::uno::makeAny((double)nValue));
+ throw css::lang::IllegalArgumentException();
+ SetValue(css::uno::makeAny((double)nValue));
break;
}
@@ -961,11 +961,11 @@ void SVTXFormattedField::setProperty( const OUString& PropertyName, const ::com:
}
-::com::sun::star::uno::Any SVTXFormattedField::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+css::uno::Any SVTXFormattedField::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- ::com::sun::star::uno::Any aReturn;
+ css::uno::Any aReturn;
FormattedField* pField = GetAs< FormattedField >();
if ( pField )
@@ -1008,7 +1008,7 @@ void SVTXFormattedField::setProperty( const OUString& PropertyName, const ::com:
{
if (!bIsStandardSupplier)
{ // ansonsten void
- ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > xSupplier = getFormatsSupplier();
+ css::uno::Reference< css::util::XNumberFormatsSupplier > xSupplier = getFormatsSupplier();
aReturn <<= xSupplier;
}
}
@@ -1028,14 +1028,14 @@ void SVTXFormattedField::setProperty( const OUString& PropertyName, const ::com:
return aReturn;
}
-::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > SVTXFormattedField::getFormatsSupplier() const
+css::uno::Reference< css::util::XNumberFormatsSupplier > SVTXFormattedField::getFormatsSupplier() const
{
- return ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > (m_pCurrentSupplier);
+ return css::uno::Reference< css::util::XNumberFormatsSupplier > (m_pCurrentSupplier);
}
-::com::sun::star::uno::Any SVTXFormattedField::convertEffectiveValue(const ::com::sun::star::uno::Any& rValue)
+css::uno::Any SVTXFormattedField::convertEffectiveValue(const css::uno::Any& rValue)
{
- ::com::sun::star::uno::Any aReturn;
+ css::uno::Any aReturn;
FormattedField* pField = GetAs< FormattedField >();
if (!pField)
@@ -1043,7 +1043,7 @@ void SVTXFormattedField::setProperty( const OUString& PropertyName, const ::com:
switch (rValue.getValueType().getTypeClass())
{
- case ::com::sun::star::uno::TypeClass_DOUBLE:
+ case css::uno::TypeClass_DOUBLE:
if (pField->TreatingAsNumber())
{
double d = 0.0;
@@ -1065,7 +1065,7 @@ void SVTXFormattedField::setProperty( const OUString& PropertyName, const ::com:
aReturn <<= sConverted;
}
break;
- case ::com::sun::star::uno::TypeClass_STRING:
+ case css::uno::TypeClass_STRING:
{
OUString aStr;
rValue >>= aStr;
@@ -1093,7 +1093,7 @@ void SVTXFormattedField::setProperty( const OUString& PropertyName, const ::com:
}
-void SVTXFormattedField::SetMinValue(const ::com::sun::star::uno::Any& rValue)
+void SVTXFormattedField::SetMinValue(const css::uno::Any& rValue)
{
FormattedField* pField = GetAs< FormattedField >();
if (!pField)
@@ -1102,7 +1102,7 @@ void SVTXFormattedField::SetMinValue(const ::com::sun::star::uno::Any& rValue)
switch (rValue.getValueType().getTypeClass())
{
- case ::com::sun::star::uno::TypeClass_DOUBLE:
+ case css::uno::TypeClass_DOUBLE:
{
double d = 0.0;
rValue >>= d;
@@ -1110,11 +1110,11 @@ void SVTXFormattedField::SetMinValue(const ::com::sun::star::uno::Any& rValue)
}
break;
default:
- DBG_ASSERT(rValue.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID, "SVTXFormattedField::SetMinValue : invalid argument (an exception will be thrown) !");
- if ( rValue.getValueType().getTypeClass() != ::com::sun::star::uno::TypeClass_VOID )
+ DBG_ASSERT(rValue.getValueType().getTypeClass() == css::uno::TypeClass_VOID, "SVTXFormattedField::SetMinValue : invalid argument (an exception will be thrown) !");
+ if ( rValue.getValueType().getTypeClass() != css::uno::TypeClass_VOID )
{
- throw ::com::sun::star::lang::IllegalArgumentException();
+ throw css::lang::IllegalArgumentException();
}
pField->ClearMinValue();
break;
@@ -1122,19 +1122,19 @@ void SVTXFormattedField::SetMinValue(const ::com::sun::star::uno::Any& rValue)
}
-::com::sun::star::uno::Any SVTXFormattedField::GetMinValue()
+css::uno::Any SVTXFormattedField::GetMinValue()
{
FormattedField* pField = GetAs< FormattedField >();
if (!pField || !pField->HasMinValue())
- return ::com::sun::star::uno::Any();
+ return css::uno::Any();
- ::com::sun::star::uno::Any aReturn;
+ css::uno::Any aReturn;
aReturn <<= pField->GetMinValue();
return aReturn;
}
-void SVTXFormattedField::SetMaxValue(const ::com::sun::star::uno::Any& rValue)
+void SVTXFormattedField::SetMaxValue(const css::uno::Any& rValue)
{
FormattedField* pField = GetAs< FormattedField >();
if (!pField)
@@ -1143,7 +1143,7 @@ void SVTXFormattedField::SetMaxValue(const ::com::sun::star::uno::Any& rValue)
switch (rValue.getValueType().getTypeClass())
{
- case ::com::sun::star::uno::TypeClass_DOUBLE:
+ case css::uno::TypeClass_DOUBLE:
{
double d = 0.0;
rValue >>= d;
@@ -1151,10 +1151,10 @@ void SVTXFormattedField::SetMaxValue(const ::com::sun::star::uno::Any& rValue)
}
break;
default:
- if (rValue.getValueType().getTypeClass() != ::com::sun::star::uno::TypeClass_VOID)
+ if (rValue.getValueType().getTypeClass() != css::uno::TypeClass_VOID)
{
- throw ::com::sun::star::lang::IllegalArgumentException();
+ throw css::lang::IllegalArgumentException();
}
pField->ClearMaxValue();
break;
@@ -1162,37 +1162,37 @@ void SVTXFormattedField::SetMaxValue(const ::com::sun::star::uno::Any& rValue)
}
-::com::sun::star::uno::Any SVTXFormattedField::GetMaxValue()
+css::uno::Any SVTXFormattedField::GetMaxValue()
{
FormattedField* pField = GetAs< FormattedField >();
if (!pField || !pField->HasMaxValue())
- return ::com::sun::star::uno::Any();
+ return css::uno::Any();
- ::com::sun::star::uno::Any aReturn;
+ css::uno::Any aReturn;
aReturn <<= pField->GetMaxValue();
return aReturn;
}
-void SVTXFormattedField::SetDefaultValue(const ::com::sun::star::uno::Any& rValue)
+void SVTXFormattedField::SetDefaultValue(const css::uno::Any& rValue)
{
FormattedField* pField = GetAs< FormattedField >();
if (!pField)
return;
- ::com::sun::star::uno::Any aConverted = convertEffectiveValue(rValue);
+ css::uno::Any aConverted = convertEffectiveValue(rValue);
switch (aConverted.getValueType().getTypeClass())
{
- case ::com::sun::star::uno::TypeClass_DOUBLE:
+ case css::uno::TypeClass_DOUBLE:
{
double d = 0.0;
aConverted >>= d;
pField->SetDefaultValue(d);
}
break;
- case ::com::sun::star::uno::TypeClass_STRING:
+ case css::uno::TypeClass_STRING:
{
OUString aStr;
aConverted >>= aStr;
@@ -1207,13 +1207,13 @@ void SVTXFormattedField::SetDefaultValue(const ::com::sun::star::uno::Any& rValu
}
-::com::sun::star::uno::Any SVTXFormattedField::GetDefaultValue()
+css::uno::Any SVTXFormattedField::GetDefaultValue()
{
FormattedField* pField = GetAs< FormattedField >();
if (!pField || pField->IsEmptyFieldEnabled())
- return ::com::sun::star::uno::Any();
+ return css::uno::Any();
- ::com::sun::star::uno::Any aReturn;
+ css::uno::Any aReturn;
if (pField->TreatingAsNumber())
aReturn <<= pField->GetDefaultValue();
else
@@ -1240,13 +1240,13 @@ void SVTXFormattedField::SetTreatAsNumber(bool bSet)
}
-::com::sun::star::uno::Any SVTXFormattedField::GetValue()
+css::uno::Any SVTXFormattedField::GetValue()
{
FormattedField* pField = GetAs< FormattedField >();
if (!pField)
- return ::com::sun::star::uno::Any();
+ return css::uno::Any();
- ::com::sun::star::uno::Any aReturn;
+ css::uno::Any aReturn;
if (!pField->TreatingAsNumber())
{
OUString sText = pField->GetTextValue();
@@ -1262,7 +1262,7 @@ void SVTXFormattedField::SetTreatAsNumber(bool bSet)
}
-void SVTXFormattedField::SetValue(const ::com::sun::star::uno::Any& rValue)
+void SVTXFormattedField::SetValue(const css::uno::Any& rValue)
{
FormattedField* pField = GetAs< FormattedField >();
if (!pField)
@@ -1274,7 +1274,7 @@ void SVTXFormattedField::SetValue(const ::com::sun::star::uno::Any& rValue)
}
else
{
- if (rValue.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_DOUBLE )
+ if (rValue.getValueType().getTypeClass() == css::uno::TypeClass_DOUBLE )
{
double d = 0.0;
rValue >>= d;
@@ -1282,7 +1282,7 @@ void SVTXFormattedField::SetValue(const ::com::sun::star::uno::Any& rValue)
}
else
{
- DBG_ASSERT(rValue.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_STRING, "SVTXFormattedField::SetValue : invalid argument !");
+ DBG_ASSERT(rValue.getValueType().getTypeClass() == css::uno::TypeClass_STRING, "SVTXFormattedField::SetValue : invalid argument !");
OUString sText;
rValue >>= sText;
@@ -1298,7 +1298,7 @@ void SVTXFormattedField::SetValue(const ::com::sun::star::uno::Any& rValue)
-void SVTXFormattedField::setFormatsSupplier(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > & xSupplier)
+void SVTXFormattedField::setFormatsSupplier(const css::uno::Reference< css::util::XNumberFormatsSupplier > & xSupplier)
{
FormattedField* pField = GetAs< FormattedField >();
@@ -1327,7 +1327,7 @@ void SVTXFormattedField::setFormatsSupplier(const ::com::sun::star::uno::Referen
if (pField)
{
// save the actual value
- ::com::sun::star::uno::Any aCurrent = GetValue();
+ css::uno::Any aCurrent = GetValue();
pField->SetFormatter(m_pCurrentSupplier->GetNumberFormatter(), false);
if (nKeyToSetDelayed != -1)
{
@@ -1370,7 +1370,7 @@ void SVTXFormattedField::NotifyTextListeners()
{
if ( GetTextListeners().getLength() )
{
- ::com::sun::star::awt::TextEvent aEvent;
+ css::awt::TextEvent aEvent;
aEvent.Source = static_cast<cppu::OWeakObject*>(this);
GetTextListeners().textChanged( aEvent );
}
@@ -1425,7 +1425,7 @@ void SVTXRoadmap::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
if ( pField )
{
sal_Int16 CurItemID = pField->GetCurrentRoadmapItemID();
- ::com::sun::star::awt::ItemEvent aEvent;
+ css::awt::ItemEvent aEvent;
aEvent.Selected = CurItemID;
aEvent.Highlighted = CurItemID;
aEvent.ItemId = CurItemID;
@@ -1440,20 +1440,20 @@ void SVTXRoadmap::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
}
-void SVTXRoadmap::propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+void SVTXRoadmap::propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
::svt::ORoadmap* pField = GetAs< svt::ORoadmap >();
if ( pField )
{
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xRoadmapItem;
+ css::uno::Reference< css::uno::XInterface > xRoadmapItem;
xRoadmapItem = evt.Source;
sal_Int32 nID = 0;
- ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPropertySet( xRoadmapItem, ::com::sun::star::uno::UNO_QUERY );
- ::com::sun::star::uno::Any aValue = xPropertySet->getPropertyValue("ID");
+ css::uno::Reference< css::beans::XPropertySet > xPropertySet( xRoadmapItem, css::uno::UNO_QUERY );
+ css::uno::Any aValue = xPropertySet->getPropertyValue("ID");
aValue >>= nID;
- ::com::sun::star::uno::Any rVal = evt.NewValue;
+ css::uno::Any rVal = evt.NewValue;
evt.NewValue >>= rVal;
OUString sPropertyName = evt.PropertyName;
if ( sPropertyName == "Enabled" )
@@ -1481,25 +1481,25 @@ void SVTXRoadmap::propertyChange( const ::com::sun::star::beans::PropertyChangeE
}
-void SVTXRoadmap::addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+void SVTXRoadmap::addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw (css::uno::RuntimeException, std::exception)
{
maItemListeners.addInterface( l );
}
-void SVTXRoadmap::removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+void SVTXRoadmap::removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw (css::uno::RuntimeException, std::exception)
{
maItemListeners.removeInterface( l );
}
-RMItemData SVTXRoadmap::GetRMItemData( const ::com::sun::star::container::ContainerEvent& _rEvent )
+RMItemData SVTXRoadmap::GetRMItemData( const css::container::ContainerEvent& _rEvent )
{
RMItemData aCurRMItemData;
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xRoadmapItem;
+ css::uno::Reference< css::uno::XInterface > xRoadmapItem;
_rEvent.Element >>= xRoadmapItem;
- ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPropertySet( xRoadmapItem, ::com::sun::star::uno::UNO_QUERY );
+ css::uno::Reference< css::beans::XPropertySet > xPropertySet( xRoadmapItem, css::uno::UNO_QUERY );
if ( xPropertySet.is() )
{
- ::com::sun::star::uno::Any aValue = xPropertySet->getPropertyValue("Label");
+ css::uno::Any aValue = xPropertySet->getPropertyValue("Label");
aValue >>= aCurRMItemData.Label;
aValue = xPropertySet->getPropertyValue("ID");
aValue >>= aCurRMItemData.n_ID;
@@ -1514,7 +1514,7 @@ RMItemData SVTXRoadmap::GetRMItemData( const ::com::sun::star::container::Contai
return aCurRMItemData;
}
-void SVTXRoadmap::elementInserted( const ::com::sun::star::container::ContainerEvent& _rEvent )throw(::com::sun::star::uno::RuntimeException, std::exception)
+void SVTXRoadmap::elementInserted( const css::container::ContainerEvent& _rEvent )throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
::svt::ORoadmap* pField = GetAs< svt::ORoadmap >();
@@ -1527,7 +1527,7 @@ void SVTXRoadmap::elementInserted( const ::com::sun::star::container::ContainerE
}
}
-void SVTXRoadmap::elementRemoved( const ::com::sun::star::container::ContainerEvent& _rEvent )throw(::com::sun::star::uno::RuntimeException, std::exception)
+void SVTXRoadmap::elementRemoved( const css::container::ContainerEvent& _rEvent )throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
::svt::ORoadmap* pField = GetAs< svt::ORoadmap >();
@@ -1539,7 +1539,7 @@ void SVTXRoadmap::elementRemoved( const ::com::sun::star::container::ContainerEv
}
}
-void SVTXRoadmap::elementReplaced( const ::com::sun::star::container::ContainerEvent& _rEvent )throw(::com::sun::star::uno::RuntimeException, std::exception)
+void SVTXRoadmap::elementReplaced( const css::container::ContainerEvent& _rEvent )throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
::svt::ORoadmap* pField = GetAs< svt::ORoadmap >();
@@ -1555,7 +1555,7 @@ void SVTXRoadmap::elementReplaced( const ::com::sun::star::container::ContainerE
-void SVTXRoadmap::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void SVTXRoadmap::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1610,11 +1610,11 @@ void SVTXRoadmap::setProperty( const OUString& PropertyName, const ::com::sun::s
-::com::sun::star::uno::Any SVTXRoadmap::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+css::uno::Any SVTXRoadmap::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- ::com::sun::star::uno::Any aReturn;
+ css::uno::Any aReturn;
::svt::ORoadmap* pField = GetAs< svt::ORoadmap >();
if ( pField )
@@ -1669,22 +1669,22 @@ SVTXNumericField::~SVTXNumericField()
{
}
-::com::sun::star::uno::Any SVTXNumericField::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+css::uno::Any SVTXNumericField::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
{
- ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
- (static_cast< ::com::sun::star::awt::XNumericField* >(this)),
- (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)) );
+ css::uno::Any aRet = ::cppu::queryInterface( rType,
+ (static_cast< css::awt::XNumericField* >(this)),
+ (static_cast< css::lang::XTypeProvider* >(this)) );
return (aRet.hasValue() ? aRet : SVTXFormattedField::queryInterface( rType ));
}
-// ::com::sun::star::lang::XTypeProvider
+// css::lang::XTypeProvider
IMPL_XTYPEPROVIDER_START( SVTXNumericField )
- cppu::UnoType<com::sun::star::awt::XNumericField>::get(),
+ cppu::UnoType<css::awt::XNumericField>::get(),
SVTXFormattedField::getTypes()
IMPL_XTYPEPROVIDER_END
-void SVTXNumericField::setValue( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void SVTXNumericField::setValue( double Value ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1693,7 +1693,7 @@ void SVTXNumericField::setValue( double Value ) throw(::com::sun::star::uno::Run
pField->SetValue( Value );
}
-double SVTXNumericField::getValue() throw(::com::sun::star::uno::RuntimeException, std::exception)
+double SVTXNumericField::getValue() throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1701,7 +1701,7 @@ double SVTXNumericField::getValue() throw(::com::sun::star::uno::RuntimeExceptio
return pField ? pField->GetValue() : 0;
}
-void SVTXNumericField::setMin( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void SVTXNumericField::setMin( double Value ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1710,7 +1710,7 @@ void SVTXNumericField::setMin( double Value ) throw(::com::sun::star::uno::Runti
pField->SetMinValue( Value );
}
-double SVTXNumericField::getMin() throw(::com::sun::star::uno::RuntimeException, std::exception)
+double SVTXNumericField::getMin() throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1718,7 +1718,7 @@ double SVTXNumericField::getMin() throw(::com::sun::star::uno::RuntimeException,
return pField ? pField->GetMinValue() : 0;
}
-void SVTXNumericField::setMax( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void SVTXNumericField::setMax( double Value ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1727,7 +1727,7 @@ void SVTXNumericField::setMax( double Value ) throw(::com::sun::star::uno::Runti
pField->SetMaxValue( Value );
}
-double SVTXNumericField::getMax() throw(::com::sun::star::uno::RuntimeException, std::exception)
+double SVTXNumericField::getMax() throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1735,7 +1735,7 @@ double SVTXNumericField::getMax() throw(::com::sun::star::uno::RuntimeException,
return pField ? pField->GetMaxValue() : 0;
}
-void SVTXNumericField::setFirst( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void SVTXNumericField::setFirst( double Value ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1744,7 +1744,7 @@ void SVTXNumericField::setFirst( double Value ) throw(::com::sun::star::uno::Run
pField->SetSpinFirst( Value );
}
-double SVTXNumericField::getFirst() throw(::com::sun::star::uno::RuntimeException, std::exception)
+double SVTXNumericField::getFirst() throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1752,7 +1752,7 @@ double SVTXNumericField::getFirst() throw(::com::sun::star::uno::RuntimeExceptio
return pField ? pField->GetSpinFirst() : 0;
}
-void SVTXNumericField::setLast( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void SVTXNumericField::setLast( double Value ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1761,7 +1761,7 @@ void SVTXNumericField::setLast( double Value ) throw(::com::sun::star::uno::Runt
pField->SetSpinLast( Value );
}
-double SVTXNumericField::getLast() throw(::com::sun::star::uno::RuntimeException, std::exception)
+double SVTXNumericField::getLast() throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1769,7 +1769,7 @@ double SVTXNumericField::getLast() throw(::com::sun::star::uno::RuntimeException
return pField ? pField->GetSpinLast() : 0;
}
-void SVTXNumericField::setSpinSize( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void SVTXNumericField::setSpinSize( double Value ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1778,7 +1778,7 @@ void SVTXNumericField::setSpinSize( double Value ) throw(::com::sun::star::uno::
pField->SetSpinSize( Value );
}
-double SVTXNumericField::getSpinSize() throw(::com::sun::star::uno::RuntimeException, std::exception)
+double SVTXNumericField::getSpinSize() throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1786,7 +1786,7 @@ double SVTXNumericField::getSpinSize() throw(::com::sun::star::uno::RuntimeExcep
return pField ? pField->GetSpinSize() : 0;
}
-void SVTXNumericField::setDecimalDigits( sal_Int16 Value ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void SVTXNumericField::setDecimalDigits( sal_Int16 Value ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1795,7 +1795,7 @@ void SVTXNumericField::setDecimalDigits( sal_Int16 Value ) throw(::com::sun::sta
pField->SetDecimalDigits( Value );
}
-sal_Int16 SVTXNumericField::getDecimalDigits() throw(::com::sun::star::uno::RuntimeException, std::exception)
+sal_Int16 SVTXNumericField::getDecimalDigits() throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1803,7 +1803,7 @@ sal_Int16 SVTXNumericField::getDecimalDigits() throw(::com::sun::star::uno::Runt
return pField ? pField->GetDecimalDigits() : 0;
}
-void SVTXNumericField::setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void SVTXNumericField::setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1812,7 +1812,7 @@ void SVTXNumericField::setStrictFormat( sal_Bool bStrict ) throw(::com::sun::sta
pField->SetStrictFormat( bStrict );
}
-sal_Bool SVTXNumericField::isStrictFormat() throw(::com::sun::star::uno::RuntimeException, std::exception)
+sal_Bool SVTXNumericField::isStrictFormat() throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1836,21 +1836,21 @@ SVTXCurrencyField::~SVTXCurrencyField()
{
}
-::com::sun::star::uno::Any SVTXCurrencyField::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+css::uno::Any SVTXCurrencyField::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
{
- ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
- (static_cast< ::com::sun::star::awt::XCurrencyField* >(this)),
- (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)) );
+ css::uno::Any aRet = ::cppu::queryInterface( rType,
+ (static_cast< css::awt::XCurrencyField* >(this)),
+ (static_cast< css::lang::XTypeProvider* >(this)) );
return (aRet.hasValue() ? aRet : SVTXFormattedField::queryInterface( rType ));
}
-// ::com::sun::star::lang::XTypeProvider
+// css::lang::XTypeProvider
IMPL_XTYPEPROVIDER_START( SVTXCurrencyField )
- cppu::UnoType<com::sun::star::awt::XCurrencyField>::get(),
+ cppu::UnoType<css::awt::XCurrencyField>::get(),
SVTXFormattedField::getTypes()
IMPL_XTYPEPROVIDER_END
-void SVTXCurrencyField::setValue( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void SVTXCurrencyField::setValue( double Value ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1859,7 +1859,7 @@ void SVTXCurrencyField::setValue( double Value ) throw(::com::sun::star::uno::Ru
pField->SetValue( Value );
}
-double SVTXCurrencyField::getValue() throw(::com::sun::star::uno::RuntimeException, std::exception)
+double SVTXCurrencyField::getValue() throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1867,7 +1867,7 @@ double SVTXCurrencyField::getValue() throw(::com::sun::star::uno::RuntimeExcepti
return pField ? pField->GetValue() : 0;
}
-void SVTXCurrencyField::setMin( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void SVTXCurrencyField::setMin( double Value ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1876,7 +1876,7 @@ void SVTXCurrencyField::setMin( double Value ) throw(::com::sun::star::uno::Runt
pField->SetMinValue( Value );
}
-double SVTXCurrencyField::getMin() throw(::com::sun::star::uno::RuntimeException, std::exception)
+double SVTXCurrencyField::getMin() throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1884,7 +1884,7 @@ double SVTXCurrencyField::getMin() throw(::com::sun::star::uno::RuntimeException
return pField ? pField->GetMinValue() : 0;
}
-void SVTXCurrencyField::setMax( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void SVTXCurrencyField::setMax( double Value ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1893,7 +1893,7 @@ void SVTXCurrencyField::setMax( double Value ) throw(::com::sun::star::uno::Runt
pField->SetMaxValue( Value );
}
-double SVTXCurrencyField::getMax() throw(::com::sun::star::uno::RuntimeException, std::exception)
+double SVTXCurrencyField::getMax() throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1901,7 +1901,7 @@ double SVTXCurrencyField::getMax() throw(::com::sun::star::uno::RuntimeException
return pField ? pField->GetMaxValue() : 0;
}
-void SVTXCurrencyField::setFirst( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void SVTXCurrencyField::setFirst( double Value ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1910,7 +1910,7 @@ void SVTXCurrencyField::setFirst( double Value ) throw(::com::sun::star::uno::Ru
pField->SetSpinFirst( Value );
}
-double SVTXCurrencyField::getFirst() throw(::com::sun::star::uno::RuntimeException, std::exception)
+double SVTXCurrencyField::getFirst() throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1918,7 +1918,7 @@ double SVTXCurrencyField::getFirst() throw(::com::sun::star::uno::RuntimeExcepti
return pField ? pField->GetSpinFirst() : 0;
}
-void SVTXCurrencyField::setLast( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void SVTXCurrencyField::setLast( double Value ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1927,7 +1927,7 @@ void SVTXCurrencyField::setLast( double Value ) throw(::com::sun::star::uno::Run
pField->SetSpinLast( Value );
}
-double SVTXCurrencyField::getLast() throw(::com::sun::star::uno::RuntimeException, std::exception)
+double SVTXCurrencyField::getLast() throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1935,7 +1935,7 @@ double SVTXCurrencyField::getLast() throw(::com::sun::star::uno::RuntimeExceptio
return pField ? pField->GetSpinLast() : 0;
}
-void SVTXCurrencyField::setSpinSize( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void SVTXCurrencyField::setSpinSize( double Value ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1944,7 +1944,7 @@ void SVTXCurrencyField::setSpinSize( double Value ) throw(::com::sun::star::uno:
pField->SetSpinSize( Value );
}
-double SVTXCurrencyField::getSpinSize() throw(::com::sun::star::uno::RuntimeException, std::exception)
+double SVTXCurrencyField::getSpinSize() throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1952,7 +1952,7 @@ double SVTXCurrencyField::getSpinSize() throw(::com::sun::star::uno::RuntimeExce
return pField ? pField->GetSpinSize() : 0;
}
-void SVTXCurrencyField::setDecimalDigits( sal_Int16 Value ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void SVTXCurrencyField::setDecimalDigits( sal_Int16 Value ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1961,7 +1961,7 @@ void SVTXCurrencyField::setDecimalDigits( sal_Int16 Value ) throw(::com::sun::st
pField->SetDecimalDigits( Value );
}
-sal_Int16 SVTXCurrencyField::getDecimalDigits() throw(::com::sun::star::uno::RuntimeException, std::exception)
+sal_Int16 SVTXCurrencyField::getDecimalDigits() throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1969,7 +1969,7 @@ sal_Int16 SVTXCurrencyField::getDecimalDigits() throw(::com::sun::star::uno::Run
return pField ? pField->GetDecimalDigits() : 0;
}
-void SVTXCurrencyField::setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void SVTXCurrencyField::setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1978,7 +1978,7 @@ void SVTXCurrencyField::setStrictFormat( sal_Bool bStrict ) throw(::com::sun::st
pField->SetStrictFormat( bStrict );
}
-sal_Bool SVTXCurrencyField::isStrictFormat() throw(::com::sun::star::uno::RuntimeException, std::exception)
+sal_Bool SVTXCurrencyField::isStrictFormat() throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1986,7 +1986,7 @@ sal_Bool SVTXCurrencyField::isStrictFormat() throw(::com::sun::star::uno::Runtim
return pField && pField->IsStrictFormat();
}
-void SVTXCurrencyField::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void SVTXCurrencyField::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -2019,11 +2019,11 @@ void SVTXCurrencyField::setProperty( const OUString& PropertyName, const ::com::
SVTXFormattedField::setProperty(PropertyName, Value);
}
-::com::sun::star::uno::Any SVTXCurrencyField::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+css::uno::Any SVTXCurrencyField::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- ::com::sun::star::uno::Any aReturn;
+ css::uno::Any aReturn;
VclPtr< DoubleCurrencyField > pField = GetAs< DoubleCurrencyField >();
if ( pField )
@@ -2124,23 +2124,23 @@ void VCLXProgressBar::ImplUpdateValue()
}
}
-// ::com::sun::star::uno::XInterface
-::com::sun::star::uno::Any VCLXProgressBar::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+// css::uno::XInterface
+css::uno::Any VCLXProgressBar::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
{
- ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
- (static_cast< ::com::sun::star::awt::XProgressBar* >(this)),
- (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)) );
+ css::uno::Any aRet = ::cppu::queryInterface( rType,
+ (static_cast< css::awt::XProgressBar* >(this)),
+ (static_cast< css::lang::XTypeProvider* >(this)) );
return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType ));
}
-// ::com::sun::star::lang::XTypeProvider
+// css::lang::XTypeProvider
IMPL_XTYPEPROVIDER_START( VCLXProgressBar )
- cppu::UnoType<com::sun::star::awt::XProgressBar>::get(),
+ cppu::UnoType<css::awt::XProgressBar>::get(),
VCLXWindow::getTypes()
IMPL_XTYPEPROVIDER_END
-// ::com::sun::star::awt::XProgressBar
-void VCLXProgressBar::setForegroundColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+// css::awt::XProgressBar
+void VCLXProgressBar::setForegroundColor( sal_Int32 nColor ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -2152,7 +2152,7 @@ void VCLXProgressBar::setForegroundColor( sal_Int32 nColor ) throw(::com::sun::s
}
}
-void VCLXProgressBar::setBackgroundColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void VCLXProgressBar::setBackgroundColor( sal_Int32 nColor ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -2166,7 +2166,7 @@ void VCLXProgressBar::setBackgroundColor( sal_Int32 nColor ) throw(::com::sun::s
}
}
-void VCLXProgressBar::setValue( sal_Int32 nValue ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void VCLXProgressBar::setValue( sal_Int32 nValue ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -2174,7 +2174,7 @@ void VCLXProgressBar::setValue( sal_Int32 nValue ) throw(::com::sun::star::uno::
ImplUpdateValue();
}
-void VCLXProgressBar::setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(::com::sun::star::uno::RuntimeException, std::exception )
+void VCLXProgressBar::setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(css::uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
@@ -2194,15 +2194,15 @@ void VCLXProgressBar::setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(::com::su
ImplUpdateValue();
}
-sal_Int32 VCLXProgressBar::getValue() throw(::com::sun::star::uno::RuntimeException, std::exception)
+sal_Int32 VCLXProgressBar::getValue() throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
return m_nValue;
}
-// ::com::sun::star::awt::VclWindowPeer
-void VCLXProgressBar::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException, std::exception)
+// css::awt::VclWindowPeer
+void VCLXProgressBar::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -2235,7 +2235,7 @@ void VCLXProgressBar::setProperty( const OUString& PropertyName, const ::com::su
vcl::Window* pWindow = GetWindow();
if ( pWindow )
{
- bool bVoid = Value.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID;
+ bool bVoid = Value.getValueType().getTypeClass() == css::uno::TypeClass_VOID;
if ( bVoid )
{
@@ -2260,11 +2260,11 @@ void VCLXProgressBar::setProperty( const OUString& PropertyName, const ::com::su
}
}
-::com::sun::star::uno::Any VCLXProgressBar::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+css::uno::Any VCLXProgressBar::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- ::com::sun::star::uno::Any aProp;
+ css::uno::Any aProp;
VclPtr< ProgressBar > pProgressBar = GetAs< ProgressBar >();
if ( pProgressBar )
{
@@ -2318,7 +2318,7 @@ SVTXDateField::~SVTXDateField()
{
}
-void SAL_CALL SVTXDateField::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL SVTXDateField::setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception)
{
VCLXDateField::setProperty( PropertyName, Value );
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx
index 72c9f6471d4b..f0a6b11dd44e 100644
--- a/svtools/source/uno/unoimap.cxx
+++ b/svtools/source/uno/unoimap.cxx
@@ -45,12 +45,12 @@
using namespace comphelper;
using namespace cppu;
using namespace com::sun::star;
-using namespace com::sun::star::uno;
-using namespace com::sun::star::lang;
-using namespace com::sun::star::container;
-using namespace com::sun::star::beans;
-using namespace com::sun::star::document;
-using namespace com::sun::star::drawing;
+using namespace css::uno;
+using namespace css::lang;
+using namespace css::container;
+using namespace css::beans;
+using namespace css::document;
+using namespace css::drawing;
const sal_Int32 HANDLE_URL = 1;
const sal_Int32 HANDLE_DESCRIPTION = 2;
@@ -96,7 +96,7 @@ public:
virtual Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(RuntimeException, std::exception) override;
// XEventsSupplier
- virtual Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw(RuntimeException, std::exception) override;
+ virtual Reference< css::container::XNameReplace > SAL_CALL getEvents( ) throw(RuntimeException, std::exception) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName( ) throw( RuntimeException, std::exception ) override;
diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx
index 0a248a05cce6..ba07e6145c45 100644
--- a/svtools/source/uno/wizard/unowizard.cxx
+++ b/svtools/source/uno/wizard/unowizard.cxx
@@ -42,32 +42,32 @@ using namespace ::svt::uno;
namespace {
- using ::com::sun::star::uno::Reference;
- using ::com::sun::star::uno::XInterface;
- using ::com::sun::star::uno::UNO_QUERY;
- using ::com::sun::star::uno::UNO_QUERY_THROW;
- using ::com::sun::star::uno::UNO_SET_THROW;
- using ::com::sun::star::uno::Exception;
- using ::com::sun::star::uno::RuntimeException;
- using ::com::sun::star::uno::Any;
- using ::com::sun::star::uno::makeAny;
- using ::com::sun::star::uno::Sequence;
- using ::com::sun::star::uno::Type;
- using ::com::sun::star::lang::XServiceInfo;
- using ::com::sun::star::ui::dialogs::XWizard;
- using ::com::sun::star::lang::XInitialization;
- using ::com::sun::star::beans::XPropertySetInfo;
- using ::com::sun::star::uno::XComponentContext;
- using ::com::sun::star::beans::Property;
- using ::com::sun::star::lang::IllegalArgumentException;
- using ::com::sun::star::ucb::AlreadyInitializedException;
- using ::com::sun::star::ui::dialogs::XWizardController;
- using ::com::sun::star::ui::dialogs::XWizardPage;
- using ::com::sun::star::container::NoSuchElementException;
- using ::com::sun::star::util::InvalidStateException;
- using ::com::sun::star::awt::XWindow;
-
- namespace WizardButton = ::com::sun::star::ui::dialogs::WizardButton;
+ using css::uno::Reference;
+ using css::uno::XInterface;
+ using css::uno::UNO_QUERY;
+ using css::uno::UNO_QUERY_THROW;
+ using css::uno::UNO_SET_THROW;
+ using css::uno::Exception;
+ using css::uno::RuntimeException;
+ using css::uno::Any;
+ using css::uno::makeAny;
+ using css::uno::Sequence;
+ using css::uno::Type;
+ using css::lang::XServiceInfo;
+ using css::ui::dialogs::XWizard;
+ using css::lang::XInitialization;
+ using css::beans::XPropertySetInfo;
+ using css::uno::XComponentContext;
+ using css::beans::Property;
+ using css::lang::IllegalArgumentException;
+ using css::ucb::AlreadyInitializedException;
+ using css::ui::dialogs::XWizardController;
+ using css::ui::dialogs::XWizardPage;
+ using css::container::NoSuchElementException;
+ using css::util::InvalidStateException;
+ using css::awt::XWindow;
+
+ namespace WizardButton = css::ui::dialogs::WizardButton;
namespace
diff --git a/svtools/source/uno/wizard/wizardpagecontroller.cxx b/svtools/source/uno/wizard/wizardpagecontroller.cxx
index f8f94b58ba6d..3951c93d8cee 100644
--- a/svtools/source/uno/wizard/wizardpagecontroller.cxx
+++ b/svtools/source/uno/wizard/wizardpagecontroller.cxx
@@ -32,21 +32,21 @@ namespace svt { namespace uno
{
- using ::com::sun::star::uno::Reference;
- using ::com::sun::star::uno::XInterface;
- using ::com::sun::star::uno::UNO_QUERY;
- using ::com::sun::star::uno::UNO_QUERY_THROW;
- using ::com::sun::star::uno::UNO_SET_THROW;
- using ::com::sun::star::uno::Exception;
- using ::com::sun::star::uno::RuntimeException;
- using ::com::sun::star::uno::Any;
- using ::com::sun::star::uno::makeAny;
- using ::com::sun::star::uno::Sequence;
- using ::com::sun::star::uno::Type;
- using ::com::sun::star::ui::dialogs::XWizardController;
- using ::com::sun::star::awt::XWindow;
- using ::com::sun::star::lang::XComponent;
- using ::com::sun::star::awt::XControl;
+ using css::uno::Reference;
+ using css::uno::XInterface;
+ using css::uno::UNO_QUERY;
+ using css::uno::UNO_QUERY_THROW;
+ using css::uno::UNO_SET_THROW;
+ using css::uno::Exception;
+ using css::uno::RuntimeException;
+ using css::uno::Any;
+ using css::uno::makeAny;
+ using css::uno::Sequence;
+ using css::uno::Type;
+ using css::ui::dialogs::XWizardController;
+ using css::awt::XWindow;
+ using css::lang::XComponent;
+ using css::awt::XControl;
using namespace ::com::sun::star;
diff --git a/svtools/source/uno/wizard/wizardpagecontroller.hxx b/svtools/source/uno/wizard/wizardpagecontroller.hxx
index 3eb76c49ad33..f38d4a50b1bc 100644
--- a/svtools/source/uno/wizard/wizardpagecontroller.hxx
+++ b/svtools/source/uno/wizard/wizardpagecontroller.hxx
@@ -39,7 +39,7 @@ namespace svt { namespace uno
public:
WizardPageController(
WizardShell& i_rParent,
- const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizardController >& i_rController,
+ const css::uno::Reference< css::ui::dialogs::XWizardController >& i_rController,
const sal_Int16 i_nPageId
);
virtual ~WizardPageController();
@@ -49,13 +49,13 @@ namespace svt { namespace uno
virtual bool commitPage( WizardTypes::CommitPageReason _eReason ) override;
virtual bool canAdvance() const override;
- const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizardPage >&
+ const css::uno::Reference< css::ui::dialogs::XWizardPage >&
getWizardPage() const { return m_xWizardPage; }
TabPage* getTabPage() const;
private:
- const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizardController > m_xController;
- ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizardPage > m_xWizardPage;
+ const css::uno::Reference< css::ui::dialogs::XWizardController > m_xController;
+ css::uno::Reference< css::ui::dialogs::XWizardPage > m_xWizardPage;
const sal_Int16 m_nPageId;
};
diff --git a/svtools/source/uno/wizard/wizardshell.cxx b/svtools/source/uno/wizard/wizardshell.cxx
index c8388b91d5a2..744a9c41b818 100644
--- a/svtools/source/uno/wizard/wizardshell.cxx
+++ b/svtools/source/uno/wizard/wizardshell.cxx
@@ -32,22 +32,22 @@ namespace svt { namespace uno
{
- using ::com::sun::star::uno::Reference;
- using ::com::sun::star::uno::XInterface;
- using ::com::sun::star::uno::UNO_QUERY;
- using ::com::sun::star::uno::UNO_QUERY_THROW;
- using ::com::sun::star::uno::UNO_SET_THROW;
- using ::com::sun::star::uno::Exception;
- using ::com::sun::star::uno::RuntimeException;
- using ::com::sun::star::uno::Any;
- using ::com::sun::star::uno::makeAny;
- using ::com::sun::star::uno::Sequence;
- using ::com::sun::star::uno::Type;
- using ::com::sun::star::ui::dialogs::XWizardController;
- using ::com::sun::star::ui::dialogs::XWizard;
- using ::com::sun::star::ui::dialogs::XWizardPage;
-
- namespace WizardTravelType = ::com::sun::star::ui::dialogs::WizardTravelType;
+ using css::uno::Reference;
+ using css::uno::XInterface;
+ using css::uno::UNO_QUERY;
+ using css::uno::UNO_QUERY_THROW;
+ using css::uno::UNO_SET_THROW;
+ using css::uno::Exception;
+ using css::uno::RuntimeException;
+ using css::uno::Any;
+ using css::uno::makeAny;
+ using css::uno::Sequence;
+ using css::uno::Type;
+ using css::ui::dialogs::XWizardController;
+ using css::ui::dialogs::XWizard;
+ using css::ui::dialogs::XWizardPage;
+
+ namespace WizardTravelType = css::ui::dialogs::WizardTravelType;
namespace
diff --git a/svtools/source/uno/wizard/wizardshell.hxx b/svtools/source/uno/wizard/wizardshell.hxx
index ca9c4698a6ab..dd1442e16a8d 100644
--- a/svtools/source/uno/wizard/wizardshell.hxx
+++ b/svtools/source/uno/wizard/wizardshell.hxx
@@ -43,8 +43,8 @@ namespace svt { namespace uno
public:
WizardShell(
vcl::Window* _pParent,
- const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizardController >& i_rController,
- const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int16 > >& i_rPaths
+ const css::uno::Reference< css::ui::dialogs::XWizardController >& i_rController,
+ const css::uno::Sequence< css::uno::Sequence< sal_Int16 > >& i_rPaths
);
// Dialog overridables
@@ -79,7 +79,7 @@ namespace svt { namespace uno
WizardShell_Base::activatePath( PathId( i_nPathID ), i_bFinal );
}
- ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizardPage >
+ css::uno::Reference< css::ui::dialogs::XWizardPage >
getCurrentWizardPage() const;
sal_Int16 getCurrentPage() const
@@ -117,7 +117,7 @@ namespace svt { namespace uno
private:
typedef ::std::map< VclPtr<TabPage>, PWizardPageController > Page2ControllerMap;
- const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizardController > m_xController;
+ const css::uno::Reference< css::ui::dialogs::XWizardController > m_xController;
const sal_Int16 m_nFirstPageID;
Page2ControllerMap m_aPageControllers;
};