[Libreoffice-commits] .: 2 commits - sc/source

[Caolán McNamara]

 sc/source/core/data/dptabres.cxx       |    2 +-
 sc/source/ui/inc/conflictsdlg.hxx      |   16 ++--------------
 sc/source/ui/inc/sharedocdlg.hxx       |    1 +
 sc/source/ui/miscdlgs/conflictsdlg.cxx |   21 ++++-----------------
 sc/source/ui/miscdlgs/sharedocdlg.cxx  |    3 ++-
 5 files changed, 10 insertions(+), 33 deletions(-)

New commits:
commit 833e0246ac2882161ace89214feec5e03b8f2a30
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jul 14 14:24:29 2011 +0100

    Resolves: fdo#36534 rework SvxSimpleTable to not manage its own parent

diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx
index 069e3cc..69ef0a3 100644
--- a/sc/source/ui/inc/conflictsdlg.hxx
+++ b/sc/source/ui/inc/conflictsdlg.hxx
@@ -140,19 +140,6 @@ public:
 
 
 //=============================================================================
-// class ScConflictsListBox
-//=============================================================================
-
-class ScConflictsListBox: public SvxRedlinTable
-{
-private:
-
-public:
-                        ScConflictsListBox( Window* pParent, const ResId& rResId );
-                        ~ScConflictsListBox();
-};
-
-//=============================================================================
 // class ScConflictsDlg
 //=============================================================================
 
@@ -160,7 +147,8 @@ class ScConflictsDlg : public ModalDialog
 {
 private:
     FixedText           maFtConflicts;
-    ScConflictsListBox  maLbConflicts;
+    SvxSimpleTableContainer m_aLbConflictsContainer;
+    SvxRedlinTable      maLbConflicts;
     PushButton          maBtnKeepMine;
     PushButton          maBtnKeepOther;
     FixedLine           maFlConflicts;
diff --git a/sc/source/ui/inc/sharedocdlg.hxx b/sc/source/ui/inc/sharedocdlg.hxx
index 47ac9ce..b29d6a7 100644
--- a/sc/source/ui/inc/sharedocdlg.hxx
+++ b/sc/source/ui/inc/sharedocdlg.hxx
@@ -49,6 +49,7 @@ private:
     FixedText           maFtWarning;
     FixedLine           maFlUsers;
     FixedText           maFtUsers;
+    SvxSimpleTableContainer m_aLbUsersContainer;
     SvxSimpleTable      maLbUsers;
     FixedLine           maFlEnd;
     HelpButton          maBtnHelp;
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx
index 4013541..5deab78 100644
--- a/sc/source/ui/miscdlgs/conflictsdlg.cxx
+++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx
@@ -393,20 +393,6 @@ void ScConflictsResolver::HandleAction( ScChangeAction* pAction, bool bIsSharedA
     }
 }
 
-
-//=============================================================================
-// class ScConflictsListBox
-//=============================================================================
-
-ScConflictsListBox::ScConflictsListBox( Window* pParent, const ResId& rResId )
-    :SvxRedlinTable( pParent, rResId )
-{
-}
-
-ScConflictsListBox::~ScConflictsListBox()
-{
-}
-
 //=============================================================================
 // class ScConflictsDlg
 //=============================================================================
@@ -414,7 +400,8 @@ ScConflictsListBox::~ScConflictsListBox()
 ScConflictsDlg::ScConflictsDlg( Window* pParent, ScViewData* pViewData, ScDocument* pSharedDoc, ScConflictsList& rConflictsList )
     :ModalDialog( pParent, ScResId( RID_SCDLG_CONFLICTS ) )
     ,maFtConflicts      ( this, ScResId( FT_CONFLICTS ) )
-    ,maLbConflicts      ( this, ScResId( LB_CONFLICTS ) )
+    ,m_aLbConflictsContainer(this, ScResId( LB_CONFLICTS))
+    ,maLbConflicts(m_aLbConflictsContainer)
     ,maBtnKeepMine      ( this, ScResId( BTN_KEEPMINE ) )
     ,maBtnKeepOther     ( this, ScResId( BTN_KEEPOTHER ) )
     ,maFlConflicts      ( this, ScResId( FL_CONFLICTS ) )
@@ -753,8 +740,8 @@ void ScConflictsDlg::Resize()
 
     lcl_ChangeControlWidth( maFtConflicts, nDeltaWidth );
 
-    lcl_ChangeControlWidth( maLbConflicts, nDeltaWidth );
-    lcl_ChangeControlHeight( maLbConflicts, nDeltaHeight );
+    lcl_ChangeControlWidth( m_aLbConflictsContainer, nDeltaWidth );
+    lcl_ChangeControlHeight( m_aLbConflictsContainer, nDeltaHeight );
 
     lcl_MoveControlX( maBtnKeepMine, nDeltaWidth / 2 );
     lcl_MoveControlY( maBtnKeepMine, nDeltaHeight );
diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx
index 8f294ec..547336f 100644
--- a/sc/source/ui/miscdlgs/sharedocdlg.cxx
+++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx
@@ -61,7 +61,8 @@ ScShareDocumentDlg::ScShareDocumentDlg( Window* pParent, ScViewData* pViewData )
     ,maFtWarning          ( this, ScResId( FT_WARNING ) )
     ,maFlUsers            ( this, ScResId( FL_USERS ) )
     ,maFtUsers            ( this, ScResId( FT_USERS ) )
-    ,maLbUsers            ( this, ScResId( LB_USERS ) )
+    ,m_aLbUsersContainer(this, ScResId(LB_USERS))
+    ,maLbUsers(m_aLbUsersContainer)
     ,maFlEnd              ( this, ScResId( FL_END ) )
     ,maBtnHelp            ( this, ScResId( BTN_HELP ) )
     ,maBtnOK              ( this, ScResId( BTN_OK ) )
commit 8fc8db4b1cd8c893f8ee8532f1bb08e79516dd7a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jul 13 21:30:53 2011 +0100

    ByteString::CreateFromInt32->rtl::OString::valueOf

diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index fc5457f..b464e35 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -2838,7 +2838,7 @@ void ScDPResultDimension::LateInitFrom( LateInitParams& rParams/* const vector<S
 {
     if ( rParams.IsEnd( nPos ) )
         return;
-    OSL_ENSURE( nPos <= pItemData.size(), ByteString::CreateFromInt32( pItemData.size()).GetBuffer() );
+    OSL_ENSURE( nPos <= pItemData.size(), rtl::OString::valueOf(static_cast<sal_Int32>(pItemData.size())).getStr() );
     ScDPDimension* pThisDim = rParams.GetDim( nPos );
     ScDPLevel* pThisLevel = rParams.GetLevel( nPos );
     SCROW rThisData = pItemData[nPos];