diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-04-28 17:54:25 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-04-28 18:26:55 +0200 |
commit | 1000d122c9999a267d330d664b5263711b8e3f8c (patch) | |
tree | 7aa3b8595d917eae2d2def33fac69ac9e4617a4c | |
parent | 622057bf0b621b56dedce6439cefce28156786db (diff) |
loplugin:salunicodeliteral: svx
Change-Id: Ida6122d53ed5debc4da6b1649f61607df852af23
-rw-r--r-- | include/svx/svdmodel.hxx | 2 | ||||
-rw-r--r-- | svx/source/fmcomp/dbaexchange.cxx | 6 | ||||
-rw-r--r-- | svx/source/fmcomp/gridctrl.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/fmview.cxx | 8 | ||||
-rw-r--r-- | svx/source/svdraw/svdotext.cxx | 4 |
5 files changed, 11 insertions, 11 deletions
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index 45a8c81fb2d0..996a05c765ba 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -49,7 +49,7 @@ class OutputDevice; #include <rtl/ref.hxx> #include <deque> -#define DEGREE_CHAR ((sal_Unicode)0x00B0) /* U+00B0 DEGREE SIGN */ +#define DEGREE_CHAR u'\x00B0' /* U+00B0 DEGREE SIGN */ class SdrOutliner; class SdrLayerAdmin; diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx index df75d54d5546..fd7dd49164c9 100644 --- a/svx/source/fmcomp/dbaexchange.cxx +++ b/svx/source/fmcomp/dbaexchange.cxx @@ -166,7 +166,7 @@ namespace svx ,const OUString& _rCommand , const OUString& _rFieldName) { - const sal_Unicode cSeparator = sal_Unicode(11); + const sal_Unicode cSeparator = u'\x000B'; const OUString sSeparator(&cSeparator, 1); m_sCompatibleFormat.clear(); @@ -340,7 +340,7 @@ namespace svx OUString sFieldDescription; (void)const_cast<TransferableDataHelper&>(_rData).GetString(nRecognizedFormat, sFieldDescription); - const sal_Unicode cSeparator = sal_Unicode(11); + const sal_Unicode cSeparator = u'\x000B'; _rDatasource = sFieldDescription.getToken(0, cSeparator); _rCommand = sFieldDescription.getToken(1, cSeparator); _nCommandType = sFieldDescription.getToken(2, cSeparator).toInt32(); @@ -575,7 +575,7 @@ namespace svx bool bTreatAsStatement = (CommandType::COMMAND == _nCommandType); // statements are - in this old and ugly format - described as queries - const sal_Unicode cSeparator = sal_Unicode(11); + const sal_Unicode cSeparator = u'\x000B'; const OUString sSeparator(&cSeparator, 1); const sal_Unicode cTableMark = '1'; diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 13e1618b4385..b71767efeffa 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -456,7 +456,7 @@ sal_uInt16 DbGridControl::NavigationBar::ArrangeControls() // count an extra hairspace (U+200A) left and right const OUString sevenDigits(m_aAbsolute->CreateFieldText(6000000)); - const OUString hairSpace(static_cast<sal_Unicode>(0x200A)); + const OUString hairSpace(u'\x200A'); OUString textPattern(hairSpace); textPattern += sevenDigits; textPattern += hairSpace; diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index 3adf31d8a34c..fa7c596913d3 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -403,10 +403,10 @@ SdrObject* FmFormView::CreateXFormsControl( const OXFormsDescriptor &_rDesc ) SdrObject* FmFormView::CreateFieldControl(const OUString& rFieldDesc) const { - OUString sDataSource = rFieldDesc.getToken(0,sal_Unicode(11)); - OUString sObjectName = rFieldDesc.getToken(1,sal_Unicode(11)); - sal_uInt16 nObjectType = (sal_uInt16)rFieldDesc.getToken(2,sal_Unicode(11)).toInt32(); - OUString sFieldName = rFieldDesc.getToken(3,sal_Unicode(11)); + OUString sDataSource = rFieldDesc.getToken(0,u'\x000B'); + OUString sObjectName = rFieldDesc.getToken(1,u'\x000B'); + sal_uInt16 nObjectType = (sal_uInt16)rFieldDesc.getToken(2,u'\x000B').toInt32(); + OUString sFieldName = rFieldDesc.getToken(3,u'\x000B'); if (sFieldName.isEmpty() || sObjectName.isEmpty() || sDataSource.isEmpty()) return nullptr; diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 50522622e646..cf43784347e7 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -871,7 +871,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS { // check whether CharStretching is possible at all GDIMetaFile* pMtf = pOut->GetConnectMetaFile(); - OUString aTestString(static_cast<sal_Unicode>('J')); + OUString aTestString(u'J'); if(pMtf && (!pMtf->IsRecord() || pMtf->IsPause())) pMtf = nullptr; @@ -1008,7 +1008,7 @@ OUString SdrTextObj::TakeObjNameSingul() const // avoid non expanded text portions in object name // (second condition is new) - if(!aStr2.isEmpty() && aStr2.indexOf(sal_Unicode(255)) == -1) + if(!aStr2.isEmpty() && aStr2.indexOf(u'\x00FF') == -1) { // space between ResStr and content text aStr += " "; |