summaryrefslogtreecommitdiff
path: root/vbahelper/source
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-04-07 12:06:47 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-04-07 14:23:11 +0200
commit1946794ae09ba732022fe6a74ea45e304ab70b84 (patch)
treee32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /vbahelper/source
parent5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff)
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'vbahelper/source')
-rw-r--r--vbahelper/source/msforms/vbacombobox.cxx6
-rw-r--r--vbahelper/source/msforms/vbacombobox.hxx4
-rw-r--r--vbahelper/source/msforms/vbacontrols.cxx2
-rw-r--r--vbahelper/source/msforms/vbatextbox.hxx10
-rw-r--r--vbahelper/source/vbahelper/vbacolorformat.cxx2
-rw-r--r--vbahelper/source/vbahelper/vbadocumentsbase.cxx2
-rw-r--r--vbahelper/source/vbahelper/vbashapes.cxx2
7 files changed, 14 insertions, 14 deletions
diff --git a/vbahelper/source/msforms/vbacombobox.cxx b/vbahelper/source/msforms/vbacombobox.cxx
index de7aa1a7c846..30f72379380b 100644
--- a/vbahelper/source/msforms/vbacombobox.cxx
+++ b/vbahelper/source/msforms/vbacombobox.cxx
@@ -120,7 +120,7 @@ void SAL_CALL
ScVbaComboBox::setValue( const uno::Any& _value ) throw (uno::RuntimeException)
{
// booleans are converted to uppercase strings
- m_xProps->setPropertyValue( sSourceName, uno::Any( extractStringFromAny( _value, ::rtl::OUString(), true ) ) );
+ m_xProps->setPropertyValue( sSourceName, uno::Any( extractStringFromAny( _value, OUString(), true ) ) );
}
// see Value
@@ -277,12 +277,12 @@ void SAL_CALL ScVbaComboBox::setLocked( sal_Bool bLocked ) throw (uno::RuntimeEx
ScVbaControl::setLocked( bLocked );
}
-rtl::OUString SAL_CALL ScVbaComboBox::getLinkedCell() throw (uno::RuntimeException)
+OUString SAL_CALL ScVbaComboBox::getLinkedCell() throw (uno::RuntimeException)
{
return ScVbaControl::getControlSource();
}
-void SAL_CALL ScVbaComboBox::setLinkedCell( const ::rtl::OUString& _linkedcell ) throw (uno::RuntimeException)
+void SAL_CALL ScVbaComboBox::setLinkedCell( const OUString& _linkedcell ) throw (uno::RuntimeException)
{
ScVbaControl::setControlSource( _linkedcell );
}
diff --git a/vbahelper/source/msforms/vbacombobox.hxx b/vbahelper/source/msforms/vbacombobox.hxx
index 06adc9df929a..c9959614be6c 100644
--- a/vbahelper/source/msforms/vbacombobox.hxx
+++ b/vbahelper/source/msforms/vbacombobox.hxx
@@ -69,8 +69,8 @@ public:
virtual void SAL_CALL setAutoSize( sal_Bool bAutoSize ) throw (css::uno::RuntimeException);
virtual sal_Bool SAL_CALL getLocked() throw (css::uno::RuntimeException);
virtual void SAL_CALL setLocked( sal_Bool bAutoSize ) throw (css::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getLinkedCell() throw (css::uno::RuntimeException);
- virtual void SAL_CALL setLinkedCell( const ::rtl::OUString& _linkedcell ) throw (css::uno::RuntimeException);
+ virtual OUString SAL_CALL getLinkedCell() throw (css::uno::RuntimeException);
+ virtual void SAL_CALL setLinkedCell( const OUString& _linkedcell ) throw (css::uno::RuntimeException);
// Methods
virtual void SAL_CALL AddItem( const css::uno::Any& pvargItem, const css::uno::Any& pvargIndex ) throw (css::uno::RuntimeException);
diff --git a/vbahelper/source/msforms/vbacontrols.cxx b/vbahelper/source/msforms/vbacontrols.cxx
index cb66c476d880..90840918dcb5 100644
--- a/vbahelper/source/msforms/vbacontrols.cxx
+++ b/vbahelper/source/msforms/vbacontrols.cxx
@@ -488,7 +488,7 @@ void SAL_CALL ScVbaControls::Remove( const uno::Any& StringKeyOrIndex )
}
catch (const uno::Exception&)
{
- // throw lang::WrappedTargetException( ::rtl::OUString( "Can not create AXControl!" ),
+ // throw lang::WrappedTargetException( OUString( "Can not create AXControl!" ),
// uno::Reference< uno::XInterface >(),
// uno::makeAny( e ) );
}
diff --git a/vbahelper/source/msforms/vbatextbox.hxx b/vbahelper/source/msforms/vbatextbox.hxx
index 5007992f9629..9ea4058d54d4 100644
--- a/vbahelper/source/msforms/vbatextbox.hxx
+++ b/vbahelper/source/msforms/vbatextbox.hxx
@@ -33,8 +33,8 @@ public:
// Attributes
virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
- virtual rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
- virtual void SAL_CALL setText( const rtl::OUString& _text ) throw (css::uno::RuntimeException);
+ virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException);
+ virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException);
virtual sal_Int32 SAL_CALL getMaxLength() throw (css::uno::RuntimeException);
virtual void SAL_CALL setMaxLength( sal_Int32 _maxlength ) throw (css::uno::RuntimeException);
virtual sal_Bool SAL_CALL getMultiline() throw (css::uno::RuntimeException);
@@ -53,10 +53,10 @@ public:
virtual void SAL_CALL setLocked( sal_Bool bAutoSize ) throw (css::uno::RuntimeException);
// XDefaultProperty
- rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return ::rtl::OUString("Value"); }
+ OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return OUString("Value"); }
//XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif //SC_VBA_TEXTBOX_HXX
diff --git a/vbahelper/source/vbahelper/vbacolorformat.cxx b/vbahelper/source/vbahelper/vbacolorformat.cxx
index 7496d2b9af9a..b2dcc6695122 100644
--- a/vbahelper/source/vbahelper/vbacolorformat.cxx
+++ b/vbahelper/source/vbahelper/vbacolorformat.cxx
@@ -66,7 +66,7 @@ ScVbaColorFormat::getRGB() throw (uno::RuntimeException)
break;
case ColorFormatType::LINEFORMAT_BACKCOLOR:
//TODO BackColor not supported
- // m_xPropertySet->setPropertyValue( rtl::OUString("Color"), uno::makeAny( nRGB ) );
+ // m_xPropertySet->setPropertyValue( OUString("Color"), uno::makeAny( nRGB ) );
break;
case ColorFormatType::FILLFORMAT_FORECOLOR:
m_xPropertySet->getPropertyValue( "FillColor" ) >>= nRGB;
diff --git a/vbahelper/source/vbahelper/vbadocumentsbase.cxx b/vbahelper/source/vbahelper/vbadocumentsbase.cxx
index 36abda68207d..e06e40c213fd 100644
--- a/vbahelper/source/vbahelper/vbadocumentsbase.cxx
+++ b/vbahelper/source/vbahelper/vbadocumentsbase.cxx
@@ -273,7 +273,7 @@ void VbaDocumentsBase::closeDocuments() throw (uno::RuntimeException)
uno::Reference< lang::XMultiComponentFactory > xSMgr(
mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
- rtl::OUString url = rtl::OUString( ".uno:CloseDoc");
+ OUString url = OUString( ".uno:CloseDoc");
dispatchRequests(xModel,url);
*/
}
diff --git a/vbahelper/source/vbahelper/vbashapes.cxx b/vbahelper/source/vbahelper/vbashapes.cxx
index 4b2440d579ff..57d16c081e62 100644
--- a/vbahelper/source/vbahelper/vbashapes.cxx
+++ b/vbahelper/source/vbahelper/vbashapes.cxx
@@ -415,7 +415,7 @@ ScVbaShapes::setDefaultShapeProperties( uno::Reference< drawing::XShape > xShape
xPropertySet->setPropertyValue( "FillColor", uno::makeAny( sal_Int32(0xFFFFFF) ) );
xPropertySet->setPropertyValue( "TextWordWrap", uno::makeAny( text::WrapTextMode_THROUGHT ) );
//not find in OOo2.3
- //xPropertySet->setPropertyValue( rtl::OUString("Opaque"), uno::makeAny( sal_True ) );
+ //xPropertySet->setPropertyValue( OUString("Opaque"), uno::makeAny( sal_True ) );
}
void