[Libreoffice-commits] core.git: sw/source

[Stephan Bergmann]

 sw/source/filter/html/htmlform.cxx |   63 ++-----------------------------------
 sw/source/filter/html/swhtml.hxx   |    1 
 2 files changed, 4 insertions(+), 60 deletions(-)

New commits:
commit b720ee5d9d2cb72038bf39ed8af6a7467948ee62
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Apr 15 12:29:25 2014 +0200

    The only instantiation of SwHTMLFormPendingStackData_Impl is long gone
    
    ...since ff09ed094d6b1d9b41f482a5b349c4fd9e80d857 "INTEGRATION: CWS
    ab53: #i47763# synchronous html import," so lets hope that SetPendingControlSize
    was indeed a leftover that would never have been called.
    
    Change-Id: I63f91fbde4dd3162bacdb935e8b0f1e590f1d378

diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index 1a78810..6744184 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -634,45 +634,6 @@ static void lcl_html_setFixedFontProperty(
     rPropSet->setPropertyValue("FontHeight", aTmp );
 }
 
-class SwHTMLFormPendingStackData_Impl: public SwPendingStackData
-{
-    uno::Reference< drawing::XShape >   xShape;
-    Size            aTextSz;
-    sal_Bool        bMinWidth;
-    sal_Bool        bMinHeight;
-
-public:
-    SwHTMLFormPendingStackData_Impl(
-            const uno::Reference< drawing::XShape > & rShape, const Size& rTextSz,
-            sal_Bool bMinW, sal_Bool bMinH ) :
-        xShape( rShape ),
-        aTextSz( rTextSz ),
-        bMinWidth( bMinW ),
-        bMinHeight( bMinH )
-    {}
-
-    const uno::Reference< drawing::XShape >& GetShape() const { return xShape; }
-    const Size& GetTextSize() const { return aTextSz; }
-    sal_Bool IsMinWidth() const { return bMinWidth; }
-    sal_Bool IsMinHeight() const { return bMinHeight; }
-};
-
-void SwHTMLParser::SetPendingControlSize()
-{
-    OSL_ENSURE( pPendStack, "Wo ist der Pending Stack?" );
-    SwHTMLFormPendingStackData_Impl *pData =
-        (SwHTMLFormPendingStackData_Impl *)pPendStack->pData;
-
-    SwPendingStack* pTmp = pPendStack->pNext;
-    delete pPendStack;
-    pPendStack = pTmp;
-    OSL_ENSURE( !pPendStack, "Wo kommt der Pending-Stack her?" );
-
-    SetControlSize( pData->GetShape(), pData->GetTextSize(),
-                    pData->IsMinWidth(), pData->IsMinHeight() );
-    delete pData;
-}
-
 void SwHTMLParser::SetControlSize( const uno::Reference< drawing::XShape >& rShape,
                                    const Size& rTextSz,
                                    sal_Bool bMinWidth,
@@ -1453,11 +1414,7 @@ void SwHTMLParser::EndForm( sal_Bool bAppend )
 
 void SwHTMLParser::InsertInput()
 {
-    if( pPendStack )
-    {
-        SetPendingControlSize();
-        return;
-    }
+    assert(pPendStack == 0);
 
     if( !pFormImpl || !pFormImpl->GetFormComps().is() )
         return;
@@ -1947,11 +1904,7 @@ void SwHTMLParser::InsertInput()
 
 void SwHTMLParser::NewTextArea()
 {
-    if( pPendStack )
-    {
-        SetPendingControlSize();
-        return;
-    }
+    assert(pPendStack == 0);
 
     OSL_ENSURE( !bTextArea, "TextArea in TextArea???" );
     OSL_ENSURE( !pFormImpl || !pFormImpl->GetFCompPropSet().is(),
@@ -2243,11 +2196,7 @@ void SwHTMLParser::InsertTextAreaText( sal_uInt16 nToken )
 
 void SwHTMLParser::NewSelect()
 {
-    if( pPendStack )
-    {
-        SetPendingControlSize();
-        return;
-    }
+    assert(pPendStack == 0);
 
     OSL_ENSURE( !bSelect, "Select in Select???" );
     OSL_ENSURE( !pFormImpl || !pFormImpl->GetFCompPropSet().is(),
@@ -2467,11 +2416,7 @@ void SwHTMLParser::NewSelect()
 
 void SwHTMLParser::EndSelect()
 {
-    if( pPendStack )
-    {
-        SetPendingControlSize();
-        return;
-    }
+    assert(pPendStack == 0);
 
     OSL_ENSURE( bSelect, "keine Select" );
     OSL_ENSURE( pFormImpl && pFormImpl->GetFCompPropSet().is(),
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 70648b7..86e39fb 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -788,7 +788,6 @@ private:
                         sal_Bool bHidden = sal_False );
     void SetControlSize( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rShape, const Size& rTextSz,
                          sal_Bool bMinWidth, sal_Bool bMinHeight );
-    void SetPendingControlSize();
 
 public:
     void ResizeDrawObject( SdrObject* pObj, SwTwips nWidth );