Merge remote-tracking branch 'origin/master' into feature/gbuild_extensions

Conflicts:
Module_tail_build.mk
Repository.mk
extensions/util/makefile.pmk
postprocess/prj/build.lst
svx/AllLangResTarget_svx.mk

6 files changed, 19 insertions, 19 deletions

diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx
index ee72d16df02b..aed0fbaabc0d 100644
--- a/extensions/source/bibliography/bibconfig.cxx
+++ b/extensions/source/bibliography/bibconfig.cxx
@@ -194,7 +194,7 @@ BibConfig::BibConfig() :
             {
                 pAssignmentValues[nFieldIdx++] >>= sTempLogical;
                 pAssignmentValues[nFieldIdx++] >>= sTempReal;
-                if(sTempLogical.getLength() && sTempReal.getLength())
+                if(!(sTempLogical.isEmpty() || sTempReal.isEmpty()))
                 {
                     pMapping->aColumnPairs[nSetMapping].sLogicalColumnName = sTempLogical;
                     pMapping->aColumnPairs[nSetMapping++].sRealColumnName = sTempReal;
@@ -290,7 +290,7 @@ void    BibConfig::Commit()
         ClearNodeSet( sPrefix );
 
         while(nFieldAssignment < COLUMN_COUNT &&
-            pMapping->aColumnPairs[nFieldAssignment].sLogicalColumnName.getLength())
+            !pMapping->aColumnPairs[nFieldAssignment].sLogicalColumnName.isEmpty())
         {
             OUString sSubPrefix(sPrefix);
             sSubPrefix += C2U("/_");
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index 3ae659d6de38..42b9aa0cf161 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -281,7 +281,7 @@ void BibliographyLoader::loadView(const Reference< XFrame > & rFrame, const rtl:
     m_xDatMan = m_pDatMan;
     BibDBDescriptor aBibDesc = BibModul::GetConfig()->GetBibliographyURL();
 
-    if(!aBibDesc.sDataSource.getLength())
+    if(aBibDesc.sDataSource.isEmpty())
     {
         DBChangeDialogConfig_Impl aConfig;
         const Sequence<OUString> aSources = aConfig.GetDataSourceNames();
@@ -532,7 +532,7 @@ Sequence< rtl::OUString > BibliographyLoader::getElementNames(void) throw ( Runt
             do
             {
                 rtl::OUString sTemp = xIdColumn->getString();
-                if (sTemp.getLength() && !xIdColumn->wasNull())
+                if (!sTemp.isEmpty() && !xIdColumn->wasNull())
                 {
                     int nLen = aRet.getLength();
                     if(nLen == nRealNameCount)
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index f91faac11c44..5958ba626639 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -922,7 +922,7 @@ Reference< XForm >  BibDataManager::createDatabaseForm(BibDBDescriptor& rDesc)
             if(aTableNameSeq.getLength() > 0)
             {
                 const ::rtl::OUString* pTableNames = aTableNameSeq.getConstArray();
-                if(rDesc.sTableOrQuery.getLength())
+                if(!rDesc.sTableOrQuery.isEmpty())
                     aActiveDataTable = rDesc.sTableOrQuery;
                 else
                 {
@@ -1045,7 +1045,7 @@ Sequence< ::rtl::OUString > BibDataManager::getQueryFields()
 {
     BibConfig* pConfig = BibModul::GetConfig();
     ::rtl::OUString aFieldString = pConfig->getQueryField();
-    if(!aFieldString.getLength())
+    if(aFieldString.isEmpty())
     {
         Sequence< ::rtl::OUString > aSeq = getQueryFields();
         const ::rtl::OUString* pFields = aSeq.getConstArray();
@@ -1063,7 +1063,7 @@ void BibDataManager::startQueryWith(const ::rtl::OUString& rQuery)
     pConfig->setQueryText( rQuery );
 
     ::rtl::OUString aQueryString;
-    if(rQuery.getLength()>0)
+    if(!rQuery.isEmpty())
     {
         aQueryString=aQuoteChar;
         aQueryString+=getQueryField();
@@ -1538,7 +1538,7 @@ void BibDataManager::SetMeAsUidListener()
             }
         }
 
-        if(theFieldName.getLength()>0)
+        if(!theFieldName.isEmpty())
         {
             Reference< XPropertySet >  xPropSet;
             Any aElement;
@@ -1582,7 +1582,7 @@ void BibDataManager::RemoveMeAsUidListener()
             }
         }
 
-        if(theFieldName.getLength()>0)
+        if(!theFieldName.isEmpty())
         {
             Reference< XPropertySet >  xPropSet;
             Any aElement;
@@ -1634,7 +1634,7 @@ void BibDataManager::DispatchDBChangeDialog()
 
 const ::rtl::OUString& BibDataManager::GetIdentifierMapping()
 {
-    if(!sIdentifierMapping.getLength())
+    if(sIdentifierMapping.isEmpty())
     {
         BibConfig* pConfig = BibModul::GetConfig();
         BibDBDescriptor aDesc;
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index c645c9af8718..eede2cc92c8e 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -450,7 +450,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen
         else if(aCommand.EqualsAscii("Bib/sdbsource"))
         {
             rtl::OUString aURL = pDatMan->CreateDBChangeDialog(pParent);
-            if(aURL.getLength())
+            if(!aURL.isEmpty())
             {
                 try
                 {
@@ -563,7 +563,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen
                 {
                     FeatureStateEvent  aEvent;
                     aEvent.FeatureURL = pObj->aURL;
-                    aEvent.IsEnabled  = 0 != pDatMan->getParser()->getFilter().getLength();
+                    aEvent.IsEnabled  = !pDatMan->getParser()->getFilter().isEmpty();
                     aEvent.Requery    = sal_False;
                     aEvent.Source     = (XDispatch *) this;
                     pObj->xListener->statusChanged( aEvent );
@@ -755,7 +755,7 @@ void BibFrameController_Impl::addStatusListener(
     else if (aURL.Path == C2U("Bib/removeFilter") )
     {
         rtl::OUString aFilterStr=pDatMan->getFilter();
-        aEvent.IsEnabled  = (aFilterStr.getLength() > 0);
+        aEvent.IsEnabled  = !aFilterStr.isEmpty();
     }
     else if(aURL.Path == C2U("Cut"))
     {
@@ -800,7 +800,7 @@ void BibFrameController_Impl::addStatusListener(
                         uno::Any aData = xDataObj->getTransferData( aFlavor );
                         ::rtl::OUString aText;
                         aData >>= aText;
-                        aEvent.IsEnabled  = aText.getLength() > 0;
+                        aEvent.IsEnabled  = !aText.isEmpty();
                     }
                     catch( const uno::Exception& )
                     {
@@ -845,7 +845,7 @@ void BibFrameController_Impl::removeStatusListener(
             BibStatusDispatch *pObj = aStatusListeners[n];
             sal_Bool bFlag=pObj->xListener.is();
             if (!bFlag || (pObj->xListener == aObject &&
-                ( !aURL.Complete.getLength() || pObj->aURL.Path == aURL.Path  )))
+                ( aURL.Complete.isEmpty() || pObj->aURL.Path == aURL.Path  )))
             {
                 aStatusListeners.DeleteAndDestroy( n );
                 break;
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index 16e2a13d2c24..9c8077820f9e 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -720,7 +720,7 @@ IMPL_LINK(BibGeneralPage, ScrollHdl, ScrollBar*, pScroll)
         nCurrentOffset = aFixedTexts[0]->GetPosPixel().Y() - aBasePos.Y();
     else
         nCurrentOffset = aFixedTexts[0]->GetPosPixel().X() - aBasePos.X();
-    nOffset = pScroll->IsVisible() ? pScroll->GetThumbPos() + nCurrentOffset : nCurrentOffset;;
+    nOffset = pScroll->IsVisible() ? pScroll->GetThumbPos() + nCurrentOffset : nCurrentOffset;
 
     for(sal_uInt16 i = 0; i < FIELD_COUNT; i++)
     {
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index bd2d4a80184d..ba1cb90622c6 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -283,7 +283,7 @@ void BibToolBar::InitListener()
 
             util::URL aURL;
             aURL.Complete = GetItemCommand(nId);
-            if(!aURL.Complete.getLength())
+            if(aURL.Complete.isEmpty())
                 continue;
 
             xTrans->parseStrict( aURL );
@@ -345,7 +345,7 @@ void BibToolBar::SendDispatch(sal_uInt16 nId, const Sequence< PropertyValue >& r
 
     uno::Reference< frame::XDispatchProvider >  xDSP( xController, UNO_QUERY );
 
-    if( xDSP.is() && aCommand.getLength())
+    if( xDSP.is() && !aCommand.isEmpty())
     {
         uno::Reference< lang::XMultiServiceFactory >  xMgr = comphelper::getProcessServiceFactory();
 
@@ -382,7 +382,7 @@ void BibToolBar::Click()
         if(pDatMan)
         {
             OUString sNew = pDatMan->CreateDBChangeDialog(GetParent());
-            if(sNew.getLength())
+            if(!sNew.isEmpty())
                 pDatMan->setActiveDataSource(sNew);
         }
         CheckItem( nId, sal_False );