summaryrefslogtreecommitdiff
path: root/extensions/source/dbpilots
diff options
context:
space:
mode:
Diffstat (limited to 'extensions/source/dbpilots')
-rw-r--r--extensions/source/dbpilots/commonpagesdbp.cxx34
-rw-r--r--extensions/source/dbpilots/controlwizard.cxx52
-rw-r--r--extensions/source/dbpilots/controlwizard.hxx4
-rw-r--r--extensions/source/dbpilots/dbpservices.cxx2
-rw-r--r--extensions/source/dbpilots/dbptools.cxx6
-rw-r--r--extensions/source/dbpilots/dbptools.hxx2
-rw-r--r--extensions/source/dbpilots/gridwizard.cxx40
-rw-r--r--extensions/source/dbpilots/gridwizard.hxx2
-rw-r--r--extensions/source/dbpilots/groupboxwiz.cxx2
-rw-r--r--extensions/source/dbpilots/listcombowizard.cxx22
-rw-r--r--extensions/source/dbpilots/listcombowizard.hxx2
-rw-r--r--extensions/source/dbpilots/optiongrouplayouter.cxx22
-rw-r--r--extensions/source/dbpilots/unoautopilot.hxx10
-rw-r--r--extensions/source/dbpilots/wizardcontext.hxx2
-rw-r--r--extensions/source/dbpilots/wizardservices.cxx30
-rw-r--r--extensions/source/dbpilots/wizardservices.hxx12
16 files changed, 122 insertions, 122 deletions
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index 344f314770ec..77dbb9a91e51 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -110,8 +110,8 @@ namespace dbp
const OControlWizardContext& rContext = getContext();
try
{
- ::rtl::OUString sDataSourceName;
- rContext.xForm->getPropertyValue(::rtl::OUString("DataSourceName")) >>= sDataSourceName;
+ OUString sDataSourceName;
+ rContext.xForm->getPropertyValue(OUString("DataSourceName")) >>= sDataSourceName;
Reference< XConnection > xConnection;
bool bEmbedded = ::dbtools::isEmbeddedInDatabase( rContext.xForm, xConnection );
@@ -128,10 +128,10 @@ namespace dbp
implFillTables(xConnection);
- ::rtl::OUString sCommand;
- OSL_VERIFY( rContext.xForm->getPropertyValue( ::rtl::OUString("Command") ) >>= sCommand );
+ OUString sCommand;
+ OSL_VERIFY( rContext.xForm->getPropertyValue( OUString("Command") ) >>= sCommand );
sal_Int32 nCommandType = CommandType::TABLE;
- OSL_VERIFY( rContext.xForm->getPropertyValue( ::rtl::OUString("CommandType") ) >>= nCommandType );
+ OSL_VERIFY( rContext.xForm->getPropertyValue( OUString("CommandType") ) >>= nCommandType );
// search the entry of the given type with the given name
for ( sal_uInt16 nLookup = 0; nLookup < m_aTable.GetEntryCount(); ++nLookup )
@@ -166,14 +166,14 @@ namespace dbp
{
xOldConn = getFormConnection();
- ::rtl::OUString sDataSource = m_aDatasource.GetSelectEntry();
- rContext.xForm->setPropertyValue( ::rtl::OUString("DataSourceName"), makeAny( sDataSource ) );
+ OUString sDataSource = m_aDatasource.GetSelectEntry();
+ rContext.xForm->setPropertyValue( OUString("DataSourceName"), makeAny( sDataSource ) );
}
- ::rtl::OUString sCommand = m_aTable.GetSelectEntry();
+ OUString sCommand = m_aTable.GetSelectEntry();
sal_Int32 nCommandType = reinterpret_cast< sal_IntPtr >( m_aTable.GetEntryData( m_aTable.GetSelectEntryPos() ) );
- rContext.xForm->setPropertyValue( ::rtl::OUString("Command"), makeAny( sCommand ) );
- rContext.xForm->setPropertyValue( ::rtl::OUString("CommandType"), makeAny( nCommandType ) );
+ rContext.xForm->setPropertyValue( OUString("Command"), makeAny( sCommand ) );
+ rContext.xForm->setPropertyValue( OUString("CommandType"), makeAny( nCommandType ) );
if ( !rContext.bEmbedded )
setFormConnection( xOldConn, sal_False );
@@ -196,7 +196,7 @@ namespace dbp
ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, 0);
aFileDlg.SetDisplayDirectory( SvtPathOptions().GetWorkPath() );
- const SfxFilter* pFilter = SfxFilter::GetFilterByName(rtl::OUString("StarOffice XML (Base)"));
+ const SfxFilter* pFilter = SfxFilter::GetFilterByName(OUString("StarOffice XML (Base)"));
OSL_ENSURE(pFilter,"Filter: StarOffice XML (Base) could not be found!");
if ( pFilter )
{
@@ -241,10 +241,10 @@ namespace dbp
//---------------------------------------------------------------------
namespace
{
- void lcl_fillEntries( ListBox& _rListBox, const Sequence< ::rtl::OUString >& _rNames, const Image& _rImage, sal_Int32 _nCommandType )
+ void lcl_fillEntries( ListBox& _rListBox, const Sequence< OUString >& _rNames, const Image& _rImage, sal_Int32 _nCommandType )
{
- const ::rtl::OUString* pNames = _rNames.getConstArray();
- const ::rtl::OUString* pNamesEnd = _rNames.getConstArray() + _rNames.getLength();
+ const OUString* pNames = _rNames.getConstArray();
+ const OUString* pNamesEnd = _rNames.getConstArray() + _rNames.getLength();
sal_uInt16 nPos = 0;
while ( pNames != pNamesEnd )
{
@@ -262,8 +262,8 @@ namespace dbp
WaitObject aWaitCursor(this);
// will be the table tables of the selected data source
- Sequence< ::rtl::OUString > aTableNames;
- Sequence< ::rtl::OUString > aQueryNames;
+ Sequence< OUString > aTableNames;
+ Sequence< OUString > aQueryNames;
// connect to the data source
Any aSQLException;
@@ -275,7 +275,7 @@ namespace dbp
// connect to the data source
try
{
- ::rtl::OUString sCurrentDatasource = m_aDatasource.GetSelectEntry();
+ OUString sCurrentDatasource = m_aDatasource.GetSelectEntry();
if (!sCurrentDatasource.isEmpty())
{
// obtain the DS object
diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx
index 3c486324795b..32a152be18df 100644
--- a/extensions/source/dbpilots/controlwizard.cxx
+++ b/extensions/source/dbpilots/controlwizard.cxx
@@ -143,12 +143,12 @@ namespace dbp
}
//---------------------------------------------------------------------
- void OControlWizardPage::fillListBox(ListBox& _rList, const Sequence< ::rtl::OUString >& _rItems, sal_Bool _bClear)
+ void OControlWizardPage::fillListBox(ListBox& _rList, const Sequence< OUString >& _rItems, sal_Bool _bClear)
{
if (_bClear)
_rList.Clear();
- const ::rtl::OUString* pItems = _rItems.getConstArray();
- const ::rtl::OUString* pEnd = pItems + _rItems.getLength();
+ const OUString* pItems = _rItems.getConstArray();
+ const OUString* pEnd = pItems + _rItems.getLength();
::svt::WizardTypes::WizardState nPos;
sal_Int32 nIndex = 0;
for (;pItems < pEnd; ++pItems, ++nIndex)
@@ -159,12 +159,12 @@ namespace dbp
}
//---------------------------------------------------------------------
- void OControlWizardPage::fillListBox(ComboBox& _rList, const Sequence< ::rtl::OUString >& _rItems, sal_Bool _bClear)
+ void OControlWizardPage::fillListBox(ComboBox& _rList, const Sequence< OUString >& _rItems, sal_Bool _bClear)
{
if (_bClear)
_rList.Clear();
- const ::rtl::OUString* pItems = _rItems.getConstArray();
- const ::rtl::OUString* pEnd = pItems + _rItems.getLength();
+ const OUString* pItems = _rItems.getConstArray();
+ const OUString* pEnd = pItems + _rItems.getLength();
::svt::WizardTypes::WizardState nPos;
sal_Int32 nIndex = 0;
for (;pItems < pEnd; ++pItems)
@@ -227,14 +227,14 @@ namespace dbp
if (m_pFormDatasource && m_pFormContentTypeLabel && m_pFormTable)
{
const OControlWizardContext& rContext = getContext();
- ::rtl::OUString sDataSource;
- ::rtl::OUString sCommand;
+ OUString sDataSource;
+ OUString sCommand;
sal_Int32 nCommandType = CommandType::COMMAND;
try
{
- rContext.xForm->getPropertyValue(::rtl::OUString("DataSourceName")) >>= sDataSource;
- rContext.xForm->getPropertyValue(::rtl::OUString("Command")) >>= sCommand;
- rContext.xForm->getPropertyValue(::rtl::OUString("CommandType")) >>= nCommandType;
+ rContext.xForm->getPropertyValue(OUString("DataSourceName")) >>= sDataSource;
+ rContext.xForm->getPropertyValue(OUString("Command")) >>= sCommand;
+ rContext.xForm->getPropertyValue(OUString("CommandType")) >>= nCommandType;
}
catch(const Exception&)
{
@@ -298,7 +298,7 @@ namespace dbp
sal_Int16 nClassId = FormComponentType::CONTROL;
try
{
- getContext().xObjectModel->getPropertyValue(::rtl::OUString("ClassId")) >>= nClassId;
+ getContext().xObjectModel->getPropertyValue(OUString("ClassId")) >>= nClassId;
}
catch(const Exception&)
{
@@ -457,7 +457,7 @@ namespace dbp
try
{
if ( !::dbtools::isEmbeddedInDatabase(m_aContext.xForm,xConn) )
- m_aContext.xForm->getPropertyValue(::rtl::OUString("ActiveConnection")) >>= xConn;
+ m_aContext.xForm->getPropertyValue(OUString("ActiveConnection")) >>= xConn;
}
catch(const Exception&)
{
@@ -487,7 +487,7 @@ namespace dbp
}
else
{
- m_aContext.xForm->setPropertyValue( ::rtl::OUString("ActiveConnection"), makeAny( _rxConn ) );
+ m_aContext.xForm->setPropertyValue( OUString("ActiveConnection"), makeAny( _rxConn ) );
}
}
catch(const Exception&)
@@ -512,7 +512,7 @@ namespace dbp
catch(const Exception&) { }
if (!xHandler.is())
{
- const ::rtl::OUString sInteractionHandlerServiceName("com.sun.star.task.InteractionHandler");
+ const OUString sInteractionHandlerServiceName("com.sun.star.task.InteractionHandler");
ShowServiceNotAvailableError(_pWindow, sInteractionHandlerServiceName, sal_True);
}
return xHandler;
@@ -558,8 +558,8 @@ namespace dbp
if (m_aContext.xForm.is())
{
// collect some properties of the form
- ::rtl::OUString sObjectName = ::comphelper::getString(m_aContext.xForm->getPropertyValue(::rtl::OUString("Command")));
- sal_Int32 nObjectType = ::comphelper::getINT32(m_aContext.xForm->getPropertyValue(::rtl::OUString("CommandType")));
+ OUString sObjectName = ::comphelper::getString(m_aContext.xForm->getPropertyValue(OUString("Command")));
+ sal_Int32 nObjectType = ::comphelper::getINT32(m_aContext.xForm->getPropertyValue(OUString("CommandType")));
// calculate the connection the rowset is working with
Reference< XConnection > xConnection;
@@ -604,7 +604,7 @@ namespace dbp
// not interested in any results, only in the fields
Reference< XPropertySet > xStatementProps(xStatement, UNO_QUERY);
- xStatementProps->setPropertyValue(::rtl::OUString("MaxRows"), makeAny(sal_Int32(0)));
+ xStatementProps->setPropertyValue(OUString("MaxRows"), makeAny(sal_Int32(0)));
// TODO: think about handling local SQLExceptions here ...
Reference< XColumnsSupplier > xSupplyCols(xStatement->executeQuery(), UNO_QUERY);
@@ -618,9 +618,9 @@ namespace dbp
if (xColumns.is())
{
m_aContext.aFieldNames = xColumns->getElementNames();
- static const ::rtl::OUString s_sFieldTypeProperty("Type");
- const ::rtl::OUString* pBegin = m_aContext.aFieldNames.getConstArray();
- const ::rtl::OUString* pEnd = pBegin + m_aContext.aFieldNames.getLength();
+ static const OUString s_sFieldTypeProperty("Type");
+ const OUString* pBegin = m_aContext.aFieldNames.getConstArray();
+ const OUString* pEnd = pBegin + m_aContext.aFieldNames.getLength();
for(;pBegin != pEnd;++pBegin)
{
sal_Int32 nFieldType = DataType::OTHER;
@@ -683,13 +683,13 @@ namespace dbp
// the only thing we have at the moment is the label
try
{
- ::rtl::OUString sLabelPropertyName("Label");
+ OUString sLabelPropertyName("Label");
Reference< XPropertySetInfo > xInfo = m_aContext.xObjectModel->getPropertySetInfo();
if (xInfo.is() && xInfo->hasPropertyByName(sLabelPropertyName))
{
- ::rtl::OUString sControlLabel(_pSettings->sControlLabel);
+ OUString sControlLabel(_pSettings->sControlLabel);
m_aContext.xObjectModel->setPropertyValue(
- ::rtl::OUString("Label"),
+ OUString("Label"),
makeAny(sControlLabel)
);
}
@@ -710,11 +710,11 @@ namespace dbp
// initialize some settings from the control model give
try
{
- ::rtl::OUString sLabelPropertyName("Label");
+ OUString sLabelPropertyName("Label");
Reference< XPropertySetInfo > xInfo = m_aContext.xObjectModel->getPropertySetInfo();
if (xInfo.is() && xInfo->hasPropertyByName(sLabelPropertyName))
{
- ::rtl::OUString sControlLabel;
+ OUString sControlLabel;
m_aContext.xObjectModel->getPropertyValue(sLabelPropertyName) >>= sControlLabel;
_pSettings->sControlLabel = sControlLabel;
}
diff --git a/extensions/source/dbpilots/controlwizard.hxx b/extensions/source/dbpilots/controlwizard.hxx
index c6b97bd1d7a8..ccd06a9157e4 100644
--- a/extensions/source/dbpilots/controlwizard.hxx
+++ b/extensions/source/dbpilots/controlwizard.hxx
@@ -81,11 +81,11 @@ namespace dbp
protected:
void fillListBox(
ListBox& _rList,
- const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rItems,
+ const ::com::sun::star::uno::Sequence< OUString >& _rItems,
sal_Bool _bClear = sal_True);
void fillListBox(
ComboBox& _rList,
- const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rItems,
+ const ::com::sun::star::uno::Sequence< OUString >& _rItems,
sal_Bool _bClear = sal_True);
protected:
diff --git a/extensions/source/dbpilots/dbpservices.cxx b/extensions/source/dbpilots/dbpservices.cxx
index 7dbc4faa4d94..7446afc84901 100644
--- a/extensions/source/dbpilots/dbpservices.cxx
+++ b/extensions/source/dbpilots/dbpservices.cxx
@@ -59,7 +59,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbp_component_getFactory(
if (pServiceManager && pImplementationName)
{
xRet = ::dbp::OModule::getComponentFactory(
- ::rtl::OUString::createFromAscii(pImplementationName),
+ OUString::createFromAscii(pImplementationName),
static_cast< XMultiServiceFactory* >(pServiceManager));
}
diff --git a/extensions/source/dbpilots/dbptools.cxx b/extensions/source/dbpilots/dbptools.cxx
index c71815b081c0..947b50865846 100644
--- a/extensions/source/dbpilots/dbptools.cxx
+++ b/extensions/source/dbpilots/dbptools.cxx
@@ -29,7 +29,7 @@ namespace dbp
using namespace ::com::sun::star::container;
//---------------------------------------------------------------------
- void disambiguateName(const Reference< XNameAccess >& _rxContainer, ::rtl::OUString& _rElementsName)
+ void disambiguateName(const Reference< XNameAccess >& _rxContainer, OUString& _rElementsName)
{
DBG_ASSERT(_rxContainer.is(), "::dbp::disambiguateName: invalid container!");
if (!_rxContainer.is())
@@ -37,11 +37,11 @@ namespace dbp
try
{
- ::rtl::OUString sBase(_rElementsName);
+ OUString sBase(_rElementsName);
for (sal_Int32 i=1; i<0x7FFFFFFF; ++i)
{
_rElementsName = sBase;
- _rElementsName += ::rtl::OUString::valueOf((sal_Int32)i);
+ _rElementsName += OUString::valueOf((sal_Int32)i);
if (!_rxContainer->hasByName(_rElementsName))
return;
}
diff --git a/extensions/source/dbpilots/dbptools.hxx b/extensions/source/dbpilots/dbptools.hxx
index 9a43596adc4a..b79bf5709499 100644
--- a/extensions/source/dbpilots/dbptools.hxx
+++ b/extensions/source/dbpilots/dbptools.hxx
@@ -29,7 +29,7 @@ namespace dbp
void disambiguateName(
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxContainer,
- ::rtl::OUString& _rElementsName);
+ OUString& _rElementsName);
//.........................................................................
} // namespace dbp
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx
index 6feabb6d253f..d0885644cedd 100644
--- a/extensions/source/dbpilots/gridwizard.cxx
+++ b/extensions/source/dbpilots/gridwizard.cxx
@@ -103,11 +103,11 @@ namespace dbp
if (!xColumnFactory.is() || !xColumnContainer.is())
return;
- static const ::rtl::OUString s_sDataFieldProperty ("DataField");
- static const ::rtl::OUString s_sLabelProperty ("Label");
- static const ::rtl::OUString s_sWidthProperty ("Width");
- static const ::rtl::OUString s_sMouseWheelBehavior ("MouseWheelBehavior");
- static const ::rtl::OUString s_sEmptyString;
+ static const OUString s_sDataFieldProperty ("DataField");
+ static const OUString s_sLabelProperty ("Label");
+ static const OUString s_sWidthProperty ("Width");
+ static const OUString s_sMouseWheelBehavior ("MouseWheelBehavior");
+ static const OUString s_sEmptyString;
// collect "descriptors" for the to-be-created (grid)columns
std::vector< OUString > aColumnServiceNames; // service names to be used with the XGridColumnFactory
@@ -119,8 +119,8 @@ namespace dbp
aFormFieldNames.reserve(getSettings().aSelectedFields.getLength());
// loop through the selected field names
- const ::rtl::OUString* pSelectedFields = getSettings().aSelectedFields.getConstArray();
- const ::rtl::OUString* pEnd = pSelectedFields + getSettings().aSelectedFields.getLength();
+ const OUString* pSelectedFields = getSettings().aSelectedFields.getConstArray();
+ const OUString* pEnd = pSelectedFields + getSettings().aSelectedFields.getLength();
for (;pSelectedFields < pEnd; ++pSelectedFields)
{
// get the information for the selected column
@@ -134,14 +134,14 @@ namespace dbp
{
case DataType::BIT:
case DataType::BOOLEAN:
- aColumnServiceNames.push_back(::rtl::OUString("CheckBox"));
+ aColumnServiceNames.push_back(OUString("CheckBox"));
aColumnLabelPostfixes.push_back(s_sEmptyString);
break;
case DataType::TINYINT:
case DataType::SMALLINT:
case DataType::INTEGER:
- aColumnServiceNames.push_back(::rtl::OUString("NumericField"));
+ aColumnServiceNames.push_back(OUString("NumericField"));
aColumnLabelPostfixes.push_back(s_sEmptyString);
break;
@@ -150,31 +150,31 @@ namespace dbp
case DataType::DOUBLE:
case DataType::NUMERIC:
case DataType::DECIMAL:
- aColumnServiceNames.push_back(::rtl::OUString("FormattedField"));
+ aColumnServiceNames.push_back(OUString("FormattedField"));
aColumnLabelPostfixes.push_back(s_sEmptyString);
break;
case DataType::DATE:
- aColumnServiceNames.push_back(::rtl::OUString("DateField"));
+ aColumnServiceNames.push_back(OUString("DateField"));
aColumnLabelPostfixes.push_back(s_sEmptyString);
break;
case DataType::TIME:
- aColumnServiceNames.push_back(::rtl::OUString("TimeField"));
+ aColumnServiceNames.push_back(OUString("TimeField"));
aColumnLabelPostfixes.push_back(s_sEmptyString);
break;
case DataType::TIMESTAMP:
- aColumnServiceNames.push_back(::rtl::OUString("DateField"));
+ aColumnServiceNames.push_back(OUString("DateField"));
aColumnLabelPostfixes.push_back(String(ModuleRes(RID_STR_DATEPOSTFIX)));
aFormFieldNames.push_back(*pSelectedFields);
- aColumnServiceNames.push_back(::rtl::OUString("TimeField"));
+ aColumnServiceNames.push_back(OUString("TimeField"));
aColumnLabelPostfixes.push_back(String(ModuleRes(RID_STR_TIMEPOSTFIX)));
break;
default:
- aColumnServiceNames.push_back(::rtl::OUString("TextField"));
+ aColumnServiceNames.push_back(OUString("TextField"));
aColumnLabelPostfixes.push_back(s_sEmptyString);
}
}
@@ -200,13 +200,13 @@ namespace dbp
Reference< XPropertySet > xColumn( xColumnFactory->createColumn(*pColumnServiceName), UNO_SET_THROW );
Reference< XPropertySetInfo > xColumnPSI( xColumn->getPropertySetInfo(), UNO_SET_THROW );
- ::rtl::OUString sColumnName(*pColumnServiceName);
+ OUString sColumnName(*pColumnServiceName);
disambiguateName(xExistenceChecker, sColumnName);
// the data field the column should be bound to
xColumn->setPropertyValue(s_sDataFieldProperty, makeAny(*pFormFieldName));
// the label
- xColumn->setPropertyValue(s_sLabelProperty, makeAny(::rtl::OUString(*pFormFieldName) += *pColumnLabelPostfix));
+ xColumn->setPropertyValue(s_sLabelProperty, makeAny(OUString(*pFormFieldName) += *pColumnLabelPostfix));
// the width (<void/> => column will be auto-sized)
xColumn->setPropertyValue(s_sWidthProperty, Any());
@@ -346,8 +346,8 @@ namespace dbp
m_aSelFields.Clear();
const OGridSettings& rSettings = getSettings();
- const ::rtl::OUString* pSelected = rSettings.aSelectedFields.getConstArray();
- const ::rtl::OUString* pEnd = pSelected + rSettings.aSelectedFields.getLength();
+ const OUString* pSelected = rSettings.aSelectedFields.getConstArray();
+ const OUString* pEnd = pSelected + rSettings.aSelectedFields.getLength();
for (; pSelected < pEnd; ++pSelected)
{
m_aSelFields.InsertEntry(*pSelected);
@@ -367,7 +367,7 @@ namespace dbp
sal_uInt16 nSelected = m_aSelFields.GetEntryCount();
rSettings.aSelectedFields.realloc(nSelected);
- ::rtl::OUString* pSelected = rSettings.aSelectedFields.getArray();
+ OUString* pSelected = rSettings.aSelectedFields.getArray();
for (sal_uInt16 i=0; i<nSelected; ++i, ++pSelected)
*pSelected = m_aSelFields.GetEntry(i);
diff --git a/extensions/source/dbpilots/gridwizard.hxx b/extensions/source/dbpilots/gridwizard.hxx
index b837e3da4989..1cb62c58c0e9 100644
--- a/extensions/source/dbpilots/gridwizard.hxx
+++ b/extensions/source/dbpilots/gridwizard.hxx
@@ -33,7 +33,7 @@ namespace dbp
//=====================================================================
struct OGridSettings : public OControlWizardSettings
{
- ::com::sun::star::uno::Sequence< ::rtl::OUString > aSelectedFields;
+ ::com::sun::star::uno::Sequence< OUString > aSelectedFields;
};
//=====================================================================
diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index 36ddee11b6f3..597e73943c6f 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -263,7 +263,7 @@ namespace dbp
for (::svt::WizardTypes::WizardState i=0; i<m_aExistingRadios.GetEntryCount(); ++i)
{
rSettings.aLabels.push_back(m_aExistingRadios.GetEntry(i));
- rSettings.aValues.push_back(rtl::OUString::valueOf((sal_Int32)(i + 1)));
+ rSettings.aValues.push_back(OUString::valueOf((sal_Int32)(i + 1)));
}
return sal_True;
diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx
index 08e365807d95..eea291394515 100644
--- a/extensions/source/dbpilots/listcombowizard.cxx
+++ b/extensions/source/dbpilots/listcombowizard.cxx
@@ -164,11 +164,11 @@ namespace dbp
// do some quotings
if (xMetaData.is())
{
- ::rtl::OUString sQuoteString = xMetaData->getIdentifierQuoteString();
+ OUString sQuoteString = xMetaData->getIdentifierQuoteString();
if (isListBox()) // only when we have a listbox this should be not empty
getSettings().sLinkedListField = quoteName(sQuoteString, getSettings().sLinkedListField);
- ::rtl::OUString sCatalog, sSchema, sName;
+ OUString sCatalog, sSchema, sName;
::dbtools::qualifiedNameComponents( xMetaData, getSettings().sListContentTable, sCatalog, sSchema, sName, ::dbtools::eInDataManipulation );
getSettings().sListContentTable = ::dbtools::composeTableNameForSelect( xConn, sCatalog, sSchema, sName );
@@ -176,12 +176,12 @@ namespace dbp
}
// ListSourceType: SQL
- getContext().xObjectModel->setPropertyValue(::rtl::OUString("ListSourceType"), makeAny((sal_Int32)ListSourceType_SQL));
+ getContext().xObjectModel->setPropertyValue(OUString("ListSourceType"), makeAny((sal_Int32)ListSourceType_SQL));
if (isListBox())
{
// BoundColumn: 1
- getContext().xObjectModel->setPropertyValue(::rtl::OUString("BoundColumn"), makeAny((sal_Int16)1));
+ getContext().xObjectModel->setPropertyValue(OUString("BoundColumn"), makeAny((sal_Int16)1));
// build the statement to set as list source
String sStatement;
@@ -191,9 +191,9 @@ namespace dbp
sStatement += getSettings().sLinkedListField;
sStatement.AppendAscii(" FROM ");
sStatement += getSettings().sListContentTable;
- Sequence< ::rtl::OUString > aListSource(1);
+ Sequence< OUString > aListSource(1);
aListSource[0] = sStatement;
- getContext().xObjectModel->setPropertyValue(::rtl::OUString("ListSource"), makeAny(aListSource));
+ getContext().xObjectModel->setPropertyValue(OUString("ListSource"), makeAny(aListSource));
}
else
{
@@ -203,11 +203,11 @@ namespace dbp
sStatement += getSettings().sListContentField;
sStatement.AppendAscii(" FROM ");
sStatement += getSettings().sListContentTable;
- getContext().xObjectModel->setPropertyValue(::rtl::OUString("ListSource"), makeAny(::rtl::OUString(sStatement)));
+ getContext().xObjectModel->setPropertyValue(OUString("ListSource"), makeAny(OUString(sStatement)));
}
// the bound field
- getContext().xObjectModel->setPropertyValue(::rtl::OUString("DataField"), makeAny(::rtl::OUString(getSettings().sLinkedFormField)));
+ getContext().xObjectModel->setPropertyValue(OUString("DataField"), makeAny(OUString(getSettings().sLinkedFormField)));
}
catch(const Exception&)
{
@@ -246,10 +246,10 @@ namespace dbp
}
//---------------------------------------------------------------------
- Sequence< ::rtl::OUString > OLCPage::getTableFields(sal_Bool _bNeedIt)
+ Sequence< OUString > OLCPage::getTableFields(sal_Bool _bNeedIt)
{
Reference< XNameAccess > xTables = getTables(_bNeedIt);
- Sequence< ::rtl::OUString > aColumnNames;
+ Sequence< OUString > aColumnNames;
if (xTables.is())
{
try
@@ -335,7 +335,7 @@ namespace dbp
try
{
Reference< XNameAccess > xTables = getTables(sal_True);
- Sequence< ::rtl::OUString > aTableNames;
+ Sequence< OUString > aTableNames;
if (xTables.is())
aTableNames = xTables->getElementNames();
fillListBox(m_aSelectTable, aTableNames);
diff --git a/extensions/source/dbpilots/listcombowizard.hxx b/extensions/source/dbpilots/listcombowizard.hxx
index 8c9fc3ac0268..d2c6eb844dc7 100644
--- a/extensions/source/dbpilots/listcombowizard.hxx
+++ b/extensions/source/dbpilots/listcombowizard.hxx
@@ -97,7 +97,7 @@ namespace dbp
protected:
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >
getTables(sal_Bool _bNeedIt);
- ::com::sun::star::uno::Sequence< ::rtl::OUString >
+ ::com::sun::star::uno::Sequence< OUString >
getTableFields(sal_Bool _bNeedIt);
};
diff --git a/extensions/source/dbpilots/optiongrouplayouter.cxx b/extensions/source/dbpilots/optiongrouplayouter.cxx
index 10f7fac5e267..9e315a8d5811 100644
--- a/extensions/source/dbpilots/optiongrouplayouter.cxx
+++ b/extensions/source/dbpilots/optiongrouplayouter.cxx
@@ -109,7 +109,7 @@ namespace dbp
::com::sun::star::awt::Point aButtonPosition;
aButtonPosition.X = aShapePosition.X + OFFSET;
- ::rtl::OUString sElementsName("RadioGroup");
+ OUString sElementsName("RadioGroup");
disambiguateName(Reference< XNameAccess >(_rContext.xForm, UNO_QUERY), sElementsName);
StringArray::const_iterator aLabelIter = _rSettings.aLabels.begin();
@@ -119,28 +119,28 @@ namespace dbp
aButtonPosition.Y = aShapePosition.Y + (i+1) * nTempHeight + nTopSpace;
Reference< XPropertySet > xRadioModel(
- xDocFactory->createInstance(::rtl::OUString("com.sun.star.form.component.RadioButton")),
+ xDocFactory->createInstance(OUString("com.sun.star.form.component.RadioButton")),
UNO_QUERY);
// the label
- xRadioModel->setPropertyValue(::rtl::OUString("Label"), makeAny(rtl::OUString(*aLabelIter)));
+ xRadioModel->setPropertyValue(OUString("Label"), makeAny(OUString(*aLabelIter)));
// the value
- xRadioModel->setPropertyValue(::rtl::OUString("RefValue"), makeAny(rtl::OUString(*aValueIter)));
+ xRadioModel->setPropertyValue(OUString("RefValue"), makeAny(OUString(*aValueIter)));
// default selection
if (_rSettings.sDefaultField == *aLabelIter)
- xRadioModel->setPropertyValue(::rtl::OUString("DefaultState"), makeAny(sal_Int16(1)));
+ xRadioModel->setPropertyValue(OUString("DefaultState"), makeAny(sal_Int16(1)));
// the connection to the database field
if (0 != _rSettings.sDBField.Len())
- xRadioModel->setPropertyValue(::rtl::OUString("DataField"), makeAny(::rtl::OUString(_rSettings.sDBField)));
+ xRadioModel->setPropertyValue(OUString("DataField"), makeAny(OUString(_rSettings.sDBField)));
// the name for the model
- xRadioModel->setPropertyValue(::rtl::OUString("Name"), makeAny(sElementsName));
+ xRadioModel->setPropertyValue(OUString("Name"), makeAny(sElementsName));
// create a shape for the radio button
Reference< XControlShape > xRadioShape(
- xDocFactory->createInstance(::rtl::OUString("com.sun.star.drawing.ControlShape")),
+ xDocFactory->createInstance(OUString("com.sun.star.drawing.ControlShape")),
UNO_QUERY);
Reference< XPropertySet > xShapeProperties(xRadioShape, UNO_QUERY);
@@ -155,7 +155,7 @@ namespace dbp
// the name of the shape
if (xShapeProperties.is())
- xShapeProperties->setPropertyValue(::rtl::OUString("Name"), makeAny(sElementsName));
+ xShapeProperties->setPropertyValue(OUString("Name"), makeAny(sElementsName));
// add to the page
xPageShapes->add(xRadioShape.get());
@@ -164,7 +164,7 @@ namespace dbp
// set the GroupBox as "LabelControl" for the RadioButton
// (_after_ having inserted the model into the page!)
- xRadioModel->setPropertyValue(::rtl::OUString("LabelControl"), makeAny(_rContext.xObjectModel));
+ xRadioModel->setPropertyValue(OUString("LabelControl"), makeAny(_rContext.xObjectModel));
}
// group the shapes
@@ -188,7 +188,7 @@ namespace dbp
//---------------------------------------------------------------------
void OOptionGroupLayouter::implAnchorShape(const Reference< XPropertySet >& _rxShapeProps)
{
- static const ::rtl::OUString s_sAnchorPropertyName("AnchorType");
+ static const OUString s_sAnchorPropertyName("AnchorType");
Reference< XPropertySetInfo > xPropertyInfo;
if (_rxShapeProps.is())
xPropertyInfo = _rxShapeProps->getPropertySetInfo();
diff --git a/extensions/source/dbpilots/unoautopilot.hxx b/extensions/source/dbpilots/unoautopilot.hxx
index fc75e21b509a..477f7ab34aae 100644
--- a/extensions/source/dbpilots/unoautopilot.hxx
+++ b/extensions/source/dbpilots/unoautopilot.hxx
@@ -41,8 +41,8 @@ namespace dbp
struct IServiceInfo
{
public:
- ::rtl::OUString getImplementationName() const;
- ::com::sun::star::uno::Sequence< ::rtl::OUString >
+ OUString getImplementationName() const;
+ ::com::sun::star::uno::Sequence< OUString >
getServiceNames() const;
};
@@ -67,12 +67,12 @@ namespace dbp
virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException);
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException);
virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
// XServiceInfo - static methods
- static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException );
- static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException );
+ static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException );
+ static OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException );
static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&);
diff --git a/extensions/source/dbpilots/wizardcontext.hxx b/extensions/source/dbpilots/wizardcontext.hxx
index 6b77c7877571..19f76fdd087c 100644
--- a/extensions/source/dbpilots/wizardcontext.hxx
+++ b/extensions/source/dbpilots/wizardcontext.hxx
@@ -71,7 +71,7 @@ namespace dbp
DECLARE_STL_USTRINGACCESS_MAP(sal_Int32,TNameTypeMap);
TNameTypeMap aTypes;
// the column names of the object the form is bound to (table, query or SQL statement)
- ::com::sun::star::uno::Sequence< ::rtl::OUString >
+ ::com::sun::star::uno::Sequence< OUString >
aFieldNames;
sal_Bool bEmbedded;
diff --git a/extensions/source/dbpilots/wizardservices.cxx b/extensions/source/dbpilots/wizardservices.cxx
index fae42c1fe260..c9cd98be6672 100644
--- a/extensions/source/dbpilots/wizardservices.cxx
+++ b/extensions/source/dbpilots/wizardservices.cxx
@@ -57,16 +57,16 @@ namespace dbp
//= OGroupBoxSI
//=====================================================================
//---------------------------------------------------------------------
- ::rtl::OUString OGroupBoxSI::getImplementationName() const
+ OUString OGroupBoxSI::getImplementationName() const
{
- return ::rtl::OUString("org.openoffice.comp.dbp.OGroupBoxWizard");
+ return OUString("org.openoffice.comp.dbp.OGroupBoxWizard");
}
//---------------------------------------------------------------------
- Sequence< ::rtl::OUString > OGroupBoxSI::getServiceNames() const
+ Sequence< OUString > OGroupBoxSI::getServiceNames() const
{
- Sequence< ::rtl::OUString > aReturn(1);
- aReturn[0] = ::rtl::OUString("com.sun.star.sdb.GroupBoxAutoPilot");
+ Sequence< OUString > aReturn(1);
+ aReturn[0] = OUString("com.sun.star.sdb.GroupBoxAutoPilot");
return aReturn;
}
@@ -74,16 +74,16 @@ namespace dbp
//= OListComboSI
//=====================================================================
//---------------------------------------------------------------------
- ::rtl::OUString OListComboSI::getImplementationName() const
+ OUString OListComboSI::getImplementationName() const
{
- return ::rtl::OUString("org.openoffice.comp.dbp.OListComboWizard");
+ return OUString("org.openoffice.comp.dbp.OListComboWizard");
}
//---------------------------------------------------------------------
- Sequence< ::rtl::OUString > OListComboSI::getServiceNames() const
+ Sequence< OUString > OListComboSI::getServiceNames() const
{
- Sequence< ::rtl::OUString > aReturn(1);
- aReturn[0] = ::rtl::OUString("com.sun.star.sdb.ListComboBoxAutoPilot");
+ Sequence< OUString > aReturn(1);
+ aReturn[0] = OUString("com.sun.star.sdb.ListComboBoxAutoPilot");
return aReturn;
}
@@ -91,16 +91,16 @@ namespace dbp
//= OGridSI
//=====================================================================
//---------------------------------------------------------------------
- ::rtl::OUString OGridSI::getImplementationName() const
+ OUString OGridSI::getImplementationName() const
{
- return ::rtl::OUString("org.openoffice.comp.dbp.OGridWizard");
+ return OUString("org.openoffice.comp.dbp.OGridWizard");
}
//---------------------------------------------------------------------
- Sequence< ::rtl::OUString > OGridSI::getServiceNames() const
+ Sequence< OUString > OGridSI::getServiceNames() const
{
- Sequence< ::rtl::OUString > aReturn(1);
- aReturn[0] = ::rtl::OUString("com.sun.star.sdb.GridControlAutoPilot");
+ Sequence< OUString > aReturn(1);
+ aReturn[0] = OUString("com.sun.star.sdb.GridControlAutoPilot");
return aReturn;
}
diff --git a/extensions/source/dbpilots/wizardservices.hxx b/extensions/source/dbpilots/wizardservices.hxx
index 6d46207469ea..e952fbae61a6 100644
--- a/extensions/source/dbpilots/wizardservices.hxx
+++ b/extensions/source/dbpilots/wizardservices.hxx
@@ -35,8 +35,8 @@ namespace dbp
struct OGroupBoxSI
{
public:
- ::rtl::OUString getImplementationName() const;
- ::com::sun::star::uno::Sequence< ::rtl::OUString >
+ OUString getImplementationName() const;
+ ::com::sun::star::uno::Sequence< OUString >
getServiceNames() const;
};
@@ -47,8 +47,8 @@ namespace dbp
struct OListComboSI
{
public:
- ::rtl::OUString getImplementationName() const;
- ::com::sun::star::uno::Sequence< ::rtl::OUString >
+ OUString getImplementationName() const;
+ ::com::sun::star::uno::Sequence< OUString >
getServiceNames() const;
};
@@ -59,8 +59,8 @@ namespace dbp
struct OGridSI
{
public:
- ::rtl::OUString getImplementationName() const;
- ::com::sun::star::uno::Sequence< ::rtl::OUString >
+ OUString getImplementationName() const;
+ ::com::sun::star::uno::Sequence< OUString >
getServiceNames() const;
};