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

[Caolán McNamara]

 dbaccess/source/ui/app/AppDetailPageHelper.cxx     |   16 ++++++----------
 dbaccess/source/ui/app/AppDetailPageHelper.hxx     |    8 ++------
 reportdesign/source/ui/report/ReportController.cxx |    4 ++--
 reportdesign/source/ui/report/propbrw.cxx          |    2 +-
 4 files changed, 11 insertions(+), 19 deletions(-)

New commits:
commit c904a7a1df2706191bf6992da584e21a174a8f3c
Author: pjacquod <pjacquod at alumni.ethz.ch>
Date:   Sat Nov 13 12:39:36 2010 +0100

    RTL_CONSTASCII_USTRINGPARAM cleaning in base
    
    base/reportdesign/source/ui/report should now be clean and having no more
    createFromAssci with constant.

diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index eeb35f2..5efea58 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -1710,7 +1710,7 @@ void OReportController::impl_initialize( )
                 throw Exception();
 
             ::comphelper::NamedValueCollection aArgs(getModel()->getArgs());
-            setMode(aArgs.getOrDefault("Mode", rtl::OUString::createFromAscii("normal")));
+            setMode(aArgs.getOrDefault("Mode", ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("normal"))));
 
             listen(true);
             setEditable( !m_aReportModel->IsReadOnly() );
@@ -1812,7 +1812,7 @@ void OReportController::doOpenHelpAgent()
 {
     if (getFrame().is())
     {
-        rtl::OUString suURL = rtl::OUString::createFromAscii("vnd.sun.star.help://shared/text/shared/explorer/database/rep_main.xhp?UseDB=no&DbPAR=swriter");
+        rtl::OUString suURL(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.help://shared/text/shared/explorer/database/rep_main.xhp?UseDB=no&DbPAR=swriter"));
         openHelpAgent(suURL);
         // openHelpAgent(68245 /* HID_REPORT_DESIGN... UNKNOWN */ );
         // HID_APP_REPORT_TREE
diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx
index 5bfb868..e21620d 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -121,7 +121,7 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >&	_xORB,Window* pParent,
         if (m_xMeAsFrame.is())
         {
             m_xMeAsFrame->initialize( VCLUnoHelper::GetInterface ( this ) );
-            m_xMeAsFrame->setName(::rtl::OUString::createFromAscii("report property browser"));  // change name!
+            m_xMeAsFrame->setName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("report property browser")));  // change name!
         }
     }
     catch (Exception&)
commit edee68e73343940af208fa9b712cfa77f725d550
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Nov 13 16:52:28 2010 +0000

    remove unused HiContrast args

diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 845c1c7..1cc79b7 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -623,8 +623,7 @@ void OAppDetailPageHelper::createTablesPage(const Reference< XConnection>& _xCon
 
         ImageProvider aImageProvider( _xConnection );
         createTree( pTreeView,
-            aImageProvider.getDefaultImage( DatabaseObject::TABLE, false ),
-            aImageProvider.getDefaultImage( DatabaseObject::TABLE, true )
+            aImageProvider.getDefaultImage( DatabaseObject::TABLE, false )
         );
 
         pTreeView->notifyHiContrastChanged();
@@ -670,23 +669,20 @@ void OAppDetailPageHelper::createPage(ElementType _eType,const Reference< XNameA
 
     USHORT nHelpId = 0, nImageId = 0, nImageIdH = 0;
     ImageProvider aImageProvider;
-    Image aFolderImage, aFolderImageHC;
+    Image aFolderImage;
     switch( _eType )
     {
         case E_FORM:
             nHelpId = HID_APP_FORM_TREE;
             aFolderImage = aImageProvider.getFolderImage( DatabaseObject::FORM, false );
-            aFolderImageHC = aImageProvider.getFolderImage( DatabaseObject::FORM, true );
             break;
         case E_REPORT:
             nHelpId = HID_APP_REPORT_TREE;
             aFolderImage = aImageProvider.getFolderImage( DatabaseObject::REPORT, false );
-            aFolderImageHC = aImageProvider.getFolderImage( DatabaseObject::REPORT, true );
             break;
         case E_QUERY:
             nHelpId = HID_APP_QUERY_TREE;
             aFolderImage = aImageProvider.getFolderImage( DatabaseObject::QUERY, false );
-            aFolderImageHC = aImageProvider.getFolderImage( DatabaseObject::QUERY, true );
             break;
         default:
             OSL_ENSURE(0,"Illegal call!");
@@ -695,7 +691,7 @@ void OAppDetailPageHelper::createPage(ElementType _eType,const Reference< XNameA
 
     if ( !m_pLists[_eType] )
     {
-        m_pLists[_eType] = createSimpleTree( nHelpId, aFolderImage, aFolderImageHC );
+        m_pLists[_eType] = createSimpleTree( nHelpId, aFolderImage );
     }
 
     if ( m_pLists[_eType] )
@@ -789,15 +785,15 @@ void OAppDetailPageHelper::fillNames( const Reference< XNameAccess >& _xContaine
     }
 }
 // -----------------------------------------------------------------------------
-DBTreeListBox* OAppDetailPageHelper::createSimpleTree( ULONG _nHelpId, const Image& _rImage, const Image& _rImageHC )
+DBTreeListBox* OAppDetailPageHelper::createSimpleTree( ULONG _nHelpId, const Image& _rImage )
 {
     DBTreeListBox* pTreeView = new DBTreeListBox(this,getBorderWin().getView()->getORB(),WB_HASLINES | WB_SORT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT | WB_TABSTOP);
     pTreeView->SetHelpId(_nHelpId);
-    return createTree( pTreeView, _rImage, _rImageHC );
+    return createTree( pTreeView, _rImage );
 }
 
 // -----------------------------------------------------------------------------
-DBTreeListBox* OAppDetailPageHelper::createTree( DBTreeListBox* _pTreeView, const Image& _rImage, const Image& _rImageHC )
+DBTreeListBox* OAppDetailPageHelper::createTree( DBTreeListBox* _pTreeView, const Image& _rImage )
 {
     WaitObject aWaitCursor(this);
 
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
index 663f69c..e799d79 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
@@ -150,24 +150,20 @@ namespace dbaui
                 The newly created DBTreeListBox
             @param	_rImage
                 the resource id of the default icon
-            @param	_rImageHC
-                the resource id of the default icon (HC version)
             @return
                 The new tree.
         */
-        DBTreeListBox* createTree( DBTreeListBox* _pTreeView, const Image& _rImage, const Image& _rImageHC );
+        DBTreeListBox* createTree( DBTreeListBox* _pTreeView, const Image& _rImage );
 
         /** creates the tree and sets all HandleCallbacks
             @param	_nHelpId
                 The help id of the control
             @param	_nCollapsedBitmap
-                The image to use for tree entries.
-            @param	_rImageHC
                 The image to use in high contrast mode.
             @return
                 The new tree.
         */
-        DBTreeListBox* createSimpleTree( ULONG _nHelpId, const Image& _rImage, const Image& _rImageHC );
+        DBTreeListBox* createSimpleTree( ULONG _nHelpId, const Image& _rImage );
 
         DECL_LINK( OnEntryDoubleClick,			SvTreeListBox* );
         DECL_LINK( OnEntrySelChange,			void* );