[Libreoffice-commits] .: 4 commits - binfilter/bf_sd binfilter/bf_sw binfilter/inc

[Caolán McNamara]

 binfilter/bf_sd/source/ui/view/sd_frmview.cxx     |   20 +++-----------------
 binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx |    8 ++++----
 binfilter/inc/bf_sd/frmview.hxx                   |    2 +-
 3 files changed, 8 insertions(+), 22 deletions(-)

New commits:
commit c1a70f44548dcaaf77c4bcfe4c537956c4c6649a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Dec 10 14:16:28 2010 +0000

    remove this unused parameter and NULL effect

diff --git a/binfilter/bf_sd/source/ui/view/sd_frmview.cxx b/binfilter/bf_sd/source/ui/view/sd_frmview.cxx
index 5f332ff..c1553cf 100644
--- a/binfilter/bf_sd/source/ui/view/sd_frmview.cxx
+++ b/binfilter/bf_sd/source/ui/view/sd_frmview.cxx
@@ -56,7 +56,7 @@ using namespace ::std;
 |*
 \************************************************************************/
 
-FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView )
+FrameView::FrameView(SdDrawDocument* pDrawDoc )
 : SdrView(pDrawDoc, (OutputDevice*) NULL)
 , nRefCount(0)
 , nPresViewShellId(SID_VIEWSHELL0)
@@ -73,20 +73,6 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView )
     SetFrameDragSingles( TRUE );
     SetSlidesPerRow(4);
 
-    if( NULL == pFrameView )
-    {
-        SdDrawDocShell* pDocShell = pDrawDoc->GetDocSh();
-
-        if ( pDocShell )
-        {
-            /**********************************************************************
-            * Das Dokument wurde geladen, ist eine FrameView vorhanden?
-            **********************************************************************/
-            ULONG nSdViewShellCount = 0;
-            SdDrawDocument* pDoc = pDocShell->GetDoc();
-        }
-    }
-
         aVisibleLayers.SetAll();
         aPrintableLayers.SetAll();
         SetGridCoarse( Size( 1000, 1000 ) );
diff --git a/binfilter/inc/bf_sd/frmview.hxx b/binfilter/inc/bf_sd/frmview.hxx
index 76cb091..77b53df 100644
--- a/binfilter/inc/bf_sd/frmview.hxx
+++ b/binfilter/inc/bf_sd/frmview.hxx
@@ -82,7 +82,7 @@ private:
     double          nTabCtrlPercent;
 
 public:
-    FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView = NULL );
+    FrameView(SdDrawDocument* pDrawDoc);
     FrameView(const FrameView& rFrameView);
     virtual ~FrameView();
 
commit d8a3d609724bb72b5b4c49bda4c6d543b2c32706
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Dec 10 14:08:47 2010 +0000

    WaE, uninit variable

diff --git a/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx b/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
index 185db45..6e881e8 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
@@ -178,7 +178,7 @@ void lcl_SetSpecialProperty(SwFrmFmt* pFmt, const SfxItemPropertyMap* pMap, cons
         case  FN_TABLE_WIDTH:
         case  FN_TABLE_RELATIVE_WIDTH:
         {
-            sal_Int32 nWidth;
+            sal_Int32 nWidth(0);
             SwFmtFrmSize aSz( pFmt->GetFrmSize() );
             if(FN_TABLE_WIDTH == pMap->nWID)
             {
@@ -188,7 +188,7 @@ void lcl_SetSpecialProperty(SwFrmFmt* pFmt, const SfxItemPropertyMap* pMap, cons
             }
             else if(FN_TABLE_RELATIVE_WIDTH == pMap->nWID)
             {
-                sal_Int16 nSet;
+                sal_Int16 nSet(0);
                 aValue >>= nSet;
                 if(nSet && nSet <=100)
                     aSz.SetWidthPercent( (BYTE)nSet );
@@ -1121,7 +1121,7 @@ void SwXTextTableRow::setPropertyValue(const OUString& rPropertyName,
                     }
                     else
                     {
-                        sal_Int32 nHeight;
+                        sal_Int32 nHeight(0);
                         aValue >>= nHeight;
                          Size aSz(aFrmSize.GetSize());
                         aSz.Height() = MM100_TO_TWIP(nHeight);
commit b0d63adf52d4dc7b064339c9d7ca64ed76e9b68f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Dec 10 14:04:09 2010 +0000

    WaE, uninit variable

diff --git a/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx b/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
index ccf468c..185db45 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
@@ -1774,7 +1774,7 @@ void	SwTableProperties_Impl::ApplyTblAttr(const SwTable& rTbl, SwDoc& rDoc)
                 uno::Any* pPgNo;
                 if(GetProperty(UNO_NAME_PAGE_NUMBER_OFFSET, pPgNo ))
                 {
-                    INT16 nTmp;
+                    INT16 nTmp(0);
                     (*pPgNo) >>= nTmp;
                     aDesc.SetNumOffset( nTmp );
                 }
commit 19bf0ca54ef38a42033346bb2c55c6454c78ef76
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Dec 10 14:03:41 2010 +0000

    WaE, silence unused parameters

diff --git a/binfilter/bf_sd/source/ui/view/sd_frmview.cxx b/binfilter/bf_sd/source/ui/view/sd_frmview.cxx
index f15a98e..5f332ff 100644
--- a/binfilter/bf_sd/source/ui/view/sd_frmview.cxx
+++ b/binfilter/bf_sd/source/ui/view/sd_frmview.cxx
@@ -396,7 +396,7 @@ static OUString createHelpLinesString( const SdrHelpLineList& rHelpLines )
 }
 
 #define addValue( n, v ) push_back( std::pair< OUString, Any >( OUString( RTL_CONSTASCII_USTRINGPARAM( n ) ), v ) )
-void FrameView::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rValues, sal_Bool bBrowse )
+void FrameView::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rValues, sal_Bool /*bBrowse*/ )
 {
     std::vector< std::pair< OUString, Any > > aUserData;
 
@@ -546,7 +546,7 @@ void FrameView::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com:
      }
  }
 
-/*?*/ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rSequence, sal_Bool bBrowse )
+/*?*/ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rSequence, sal_Bool /*bBrowse*/ )
 /*?*/ {
 /*?*/ 		const sal_Int32 nLength = rSequence.getLength();
      if (nLength)