summaryrefslogtreecommitdiff
path: root/extensions/source/dbpilots
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-09-19 15:20:39 +0200
committerNoel Grandin <noel@peralex.com>2013-10-01 10:08:36 +0200
commita952bd8aacba91ed654f11da07cbf0059d378918 (patch)
treec0fdd92d645df903db778c0b2606ac41be8a2e80 /extensions/source/dbpilots
parentde6a35f52276b601a8ebc68fbcfd28ad2db84f6f (diff)
convert extensions module from String to OUString
Change-Id: Ia0cb9fe1eaebdd295fb1742074fe2c48be61c077
Diffstat (limited to 'extensions/source/dbpilots')
-rw-r--r--extensions/source/dbpilots/commonpagesdbp.cxx10
-rw-r--r--extensions/source/dbpilots/commonpagesdbp.hxx8
-rw-r--r--extensions/source/dbpilots/controlwizard.hxx2
-rw-r--r--extensions/source/dbpilots/dbptypes.hxx6
-rw-r--r--extensions/source/dbpilots/gridwizard.cxx2
-rw-r--r--extensions/source/dbpilots/groupboxwiz.cxx6
-rw-r--r--extensions/source/dbpilots/groupboxwiz.hxx8
-rw-r--r--extensions/source/dbpilots/listcombowizard.cxx4
-rw-r--r--extensions/source/dbpilots/listcombowizard.hxx10
-rw-r--r--extensions/source/dbpilots/optiongrouplayouter.cxx2
10 files changed, 29 insertions, 29 deletions
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index fea3a5c18e97..dd476337e57f 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -205,7 +205,7 @@ namespace dbp
if (0 == aFileDlg.Execute())
{
- String sDataSourceName = aFileDlg.GetPath();
+ OUString sDataSourceName = aFileDlg.GetPath();
::svt::OFileNotation aFileNotation(sDataSourceName);
sDataSourceName = aFileNotation.get(::svt::OFileNotation::N_SYSTEM);
m_aDatasource.InsertEntry(sDataSourceName);
@@ -416,19 +416,19 @@ namespace dbp
}
//---------------------------------------------------------------------
- void OMaybeListSelectionPage::implInitialize(const String& _rSelection)
+ void OMaybeListSelectionPage::implInitialize(const OUString& _rSelection)
{
DBG_ASSERT(m_pYes, "OMaybeListSelectionPage::implInitialize: no controls announced!");
- sal_Bool bIsSelection = (0 != _rSelection.Len());
+ sal_Bool bIsSelection = ! _rSelection.isEmpty();
m_pYes->Check(bIsSelection);
m_pNo->Check(!bIsSelection);
m_pList->Enable(bIsSelection);
- m_pList->SelectEntry(bIsSelection ? _rSelection : String());
+ m_pList->SelectEntry(bIsSelection ? _rSelection : OUString());
}
//---------------------------------------------------------------------
- void OMaybeListSelectionPage::implCommit(String& _rSelection)
+ void OMaybeListSelectionPage::implCommit(OUString& _rSelection)
{
_rSelection = m_pYes->IsChecked() ? m_pList->GetSelectEntry() : OUString();
}
diff --git a/extensions/source/dbpilots/commonpagesdbp.hxx b/extensions/source/dbpilots/commonpagesdbp.hxx
index 3d00eba2076c..ad201deb7a48 100644
--- a/extensions/source/dbpilots/commonpagesdbp.hxx
+++ b/extensions/source/dbpilots/commonpagesdbp.hxx
@@ -98,8 +98,8 @@ namespace dbp
void implEnableWindows();
- void implInitialize(const String& _rSelection);
- void implCommit(String& _rSelection);
+ void implInitialize(const OUString& _rSelection);
+ void implCommit(OUString& _rSelection);
};
//=====================================================================
@@ -119,14 +119,14 @@ namespace dbp
ODBFieldPage( OControlWizard* _pParent );
protected:
- void setDescriptionText(const String& _rDesc) { m_aDescription.SetText(_rDesc); }
+ void setDescriptionText(const OUString& _rDesc) { m_aDescription.SetText(_rDesc); }
// OWizardPage overridables
virtual void initializePage();
virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
// own overridables
- virtual String& getDBFieldSetting() = 0;
+ virtual OUString& getDBFieldSetting() = 0;
};
//.........................................................................
diff --git a/extensions/source/dbpilots/controlwizard.hxx b/extensions/source/dbpilots/controlwizard.hxx
index ccd06a9157e4..5109454fd026 100644
--- a/extensions/source/dbpilots/controlwizard.hxx
+++ b/extensions/source/dbpilots/controlwizard.hxx
@@ -46,7 +46,7 @@ namespace dbp
//=====================================================================
struct OControlWizardSettings
{
- String sControlLabel;
+ OUString sControlLabel;
};
//=====================================================================
diff --git a/extensions/source/dbpilots/dbptypes.hxx b/extensions/source/dbpilots/dbptypes.hxx
index e9d26fbd9ff9..2f0aa392504e 100644
--- a/extensions/source/dbpilots/dbptypes.hxx
+++ b/extensions/source/dbpilots/dbptypes.hxx
@@ -28,9 +28,9 @@ namespace dbp
{
//.........................................................................
- DECLARE_STL_VECTOR( String, StringArray );
- DECLARE_STL_STDKEY_SET( String, StringBag );
- DECLARE_STL_STDKEY_MAP( sal_uInt32, String, MapInt2String );
+ DECLARE_STL_VECTOR( OUString, StringArray );
+ DECLARE_STL_STDKEY_SET( OUString, StringBag );
+ DECLARE_STL_STDKEY_MAP( sal_uInt32, OUString, MapInt2String );
//.........................................................................
} // namespace dbp
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx
index 4df071e8000b..2a61ab58a5bb 100644
--- a/extensions/source/dbpilots/gridwizard.cxx
+++ b/extensions/source/dbpilots/gridwizard.cxx
@@ -428,7 +428,7 @@ namespace dbp
}
// the text of the entry to move
- String sMovingEntry = bMoveRight ? m_aExistFields.GetEntry(nSelected) : m_aSelFields.GetEntry(nSelected);
+ OUString sMovingEntry = bMoveRight ? m_aExistFields.GetEntry(nSelected) : m_aSelFields.GetEntry(nSelected);
// insert the entry
nInsertPos = rMoveTo.InsertEntry(sMovingEntry, nInsertPos);
diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index 0754ffe4eb9a..7c3ec932edf5 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -238,7 +238,7 @@ namespace dbp
{
OGBWPage::initializePage();
- m_aRadioName.SetText(String());
+ m_aRadioName.SetText("");
// no need to initialize the list of radios here
// (we're the only one affecting this special setting, so it will be in the same state as last time this
@@ -281,7 +281,7 @@ namespace dbp
else
{
m_aExistingRadios.InsertEntry(m_aRadioName.GetText());
- m_aRadioName.SetText(String());
+ m_aRadioName.SetText("");
}
implCheckMoveButtons();
@@ -494,7 +494,7 @@ namespace dbp
}
//---------------------------------------------------------------------
- String& OOptionDBFieldPage::getDBFieldSetting()
+ OUString& OOptionDBFieldPage::getDBFieldSetting()
{
return getSettings().sDBField;
}
diff --git a/extensions/source/dbpilots/groupboxwiz.hxx b/extensions/source/dbpilots/groupboxwiz.hxx
index 026e39e7ea4b..17626c5aa5d2 100644
--- a/extensions/source/dbpilots/groupboxwiz.hxx
+++ b/extensions/source/dbpilots/groupboxwiz.hxx
@@ -35,9 +35,9 @@ namespace dbp
{
StringArray aLabels;
StringArray aValues;
- String sDefaultField;
- String sDBField;
- String sName;
+ OUString sDefaultField;
+ OUString sDBField;
+ OUString sName;
};
//=====================================================================
@@ -186,7 +186,7 @@ namespace dbp
OOptionGroupSettings& getSettings() { return static_cast<OGroupBoxWizard*>(getDialog())->getSettings(); }
// ODBFieldPage overridables
- virtual String& getDBFieldSetting();
+ virtual OUString& getDBFieldSetting();
};
//=====================================================================
diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx
index ca189c3410ab..8c1510d15d11 100644
--- a/extensions/source/dbpilots/listcombowizard.cxx
+++ b/extensions/source/dbpilots/listcombowizard.cxx
@@ -350,7 +350,7 @@ namespace dbp
OListComboSettings& rSettings = getSettings();
rSettings.sListContentTable = m_aSelectTable.GetSelectEntry();
- if (!rSettings.sListContentTable.Len() && (::svt::WizardTypes::eTravelBackward != _eReason))
+ if (rSettings.sListContentTable.isEmpty() && (::svt::WizardTypes::eTravelBackward != _eReason))
// need to select a table
return sal_False;
@@ -521,7 +521,7 @@ namespace dbp
}
//---------------------------------------------------------------------
- String& OComboDBFieldPage::getDBFieldSetting()
+ OUString& OComboDBFieldPage::getDBFieldSetting()
{
return getSettings().sLinkedFormField;
}
diff --git a/extensions/source/dbpilots/listcombowizard.hxx b/extensions/source/dbpilots/listcombowizard.hxx
index d2c6eb844dc7..f807bea73d36 100644
--- a/extensions/source/dbpilots/listcombowizard.hxx
+++ b/extensions/source/dbpilots/listcombowizard.hxx
@@ -39,10 +39,10 @@ namespace dbp
//=====================================================================
struct OListComboSettings : public OControlWizardSettings
{
- String sListContentTable;
- String sListContentField;
- String sLinkedFormField;
- String sLinkedListField;
+ OUString sListContentTable;
+ OUString sListContentField;
+ OUString sLinkedFormField;
+ OUString sLinkedListField;
};
//=====================================================================
@@ -208,7 +208,7 @@ namespace dbp
virtual bool canAdvance() const;
// ODBFieldPage overridables
- virtual String& getDBFieldSetting();
+ virtual OUString& getDBFieldSetting();
};
//.........................................................................
diff --git a/extensions/source/dbpilots/optiongrouplayouter.cxx b/extensions/source/dbpilots/optiongrouplayouter.cxx
index ef1754a002ad..34c3260daf81 100644
--- a/extensions/source/dbpilots/optiongrouplayouter.cxx
+++ b/extensions/source/dbpilots/optiongrouplayouter.cxx
@@ -132,7 +132,7 @@ namespace dbp
xRadioModel->setPropertyValue("DefaultState", makeAny(sal_Int16(1)));
// the connection to the database field
- if (0 != _rSettings.sDBField.Len())
+ if (!_rSettings.sDBField.isEmpty())
xRadioModel->setPropertyValue("DataField", makeAny(OUString(_rSettings.sDBField)));
// the name for the model