[Libreoffice-commits] .: 3 commits - dbaccess/source reportdesign/source

[Caolán McNamara]

 dbaccess/source/ui/browser/brwctrlr.cxx             |    6 +++---
 reportdesign/source/core/resource/core_resource.cxx |    3 +--
 reportdesign/source/core/sdr/ModuleHelper.cxx       |    3 +--
 3 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 8602f40d7d7cd1830e841fe185fca92cc11e4d0f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 1 16:57:50 2011 +0000

    resolve ambiguities

diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index a169852..f7ed72f 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -2516,7 +2516,7 @@ IMPL_LINK(SbaXDataBrowserController, OnSearchContextRequest, FmSearchContext*, p
 
         sal_uInt16 nModelPos = getBrowserView()->View2ModelPos((sal_uInt16)nViewPos);
         Reference< XPropertySet >  xCurrentColModel(xModelColumns->getByIndex(nModelPos),UNO_QUERY);
-        ::rtl::OUString aName = ::comphelper::getString(xCurrentColModel->getPropertyValue(PROPERTY_CONTROLSOURCE));
+        String aName = ::comphelper::getString(xCurrentColModel->getPropertyValue(PROPERTY_CONTROLSOURCE));
 
         sFieldList += aName;
         sFieldList += ';';
commit e4ce526ebcb5448f729cf9f8e5d49a3eaa2234df
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 1 13:04:30 2011 +0000

    Pointless to convert char* to OString and back

diff --git a/reportdesign/source/core/resource/core_resource.cxx b/reportdesign/source/core/resource/core_resource.cxx
index c7e6641..1af6c87 100644
--- a/reportdesign/source/core/resource/core_resource.cxx
+++ b/reportdesign/source/core/resource/core_resource.cxx
@@ -66,8 +66,7 @@ namespace reportdesign
             
             ::com::sun::star::lang::Locale aLocale = Application::GetSettings().GetUILocale();
 
-            rtl::OString sResLibName = rtl::OString( "rpt" );
-            m_pImpl = SimpleResMgr::Create(sResLibName, aLocale);
+            m_pImpl = SimpleResMgr::Create("rpt", aLocale);
         }
     }
 
diff --git a/reportdesign/source/core/sdr/ModuleHelper.cxx b/reportdesign/source/core/sdr/ModuleHelper.cxx
index c823aed..1e3873e 100644
--- a/reportdesign/source/core/sdr/ModuleHelper.cxx
+++ b/reportdesign/source/core/sdr/ModuleHelper.cxx
@@ -90,8 +90,7 @@ ResMgr*	OModuleImpl::getResManager()
     if (!m_pRessources)
     {
         // create a manager with a fixed prefix
-        rtl::OString sName = rtl::OString( "rptui" );
-        m_pRessources = ResMgr::CreateResMgr(sName);
+        m_pRessources = ResMgr::CreateResMgr("rptui");
     }
     return m_pRessources;
 }
commit 1e58b993fdd59baba3dac293cf77406d65290364
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 1 12:56:59 2011 +0000

    pointless cast

diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 59b42d1..a169852 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -1963,7 +1963,7 @@ void SbaXDataBrowserController::ExecuteSearch()
     Reference< XInterface >  xCurControl(xColControls->getByIndex(nViewCol),UNO_QUERY);
     ::rtl::OUString aInitialText;
     if (IsSearchableControl(xCurControl, &aInitialText))
-        sInitialText = (const sal_Unicode*)aInitialText;
+        sInitialText = aInitialText;
 
     // prohibit the synchronization of the grid's display with the cursor's position
     Reference< XPropertySet >  xModelSet(getControlModel(), UNO_QUERY);
@@ -2518,7 +2518,7 @@ IMPL_LINK(SbaXDataBrowserController, OnSearchContextRequest, FmSearchContext*, p
         Reference< XPropertySet >  xCurrentColModel(xModelColumns->getByIndex(nModelPos),UNO_QUERY);
         ::rtl::OUString aName = ::comphelper::getString(xCurrentColModel->getPropertyValue(PROPERTY_CONTROLSOURCE));
 
-        sFieldList += (const sal_Unicode*)aName;
+        sFieldList += aName;
         sFieldList += ';';
 
         pContext->arrFields.push_back(xCurrentColumn);