Fix for N_SE-46932

[apps/osp/Call.git] / src / CallDtmfKeypadPanel.cpp

diff --git a/src/CallDtmfKeypadPanel.cpp b/src/CallDtmfKeypadPanel.cpp
index cb62907..58f0578 100644 (file)
--- a/src/CallDtmfKeypadPanel.cpp
+++ b/src/CallDtmfKeypadPanel.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
-// Licensed under the Flora License, Version 1.0 (the License);
+// Licensed under the Flora License, Version 1.1 (the License);
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
@@ -103,19 +103,19 @@ DtmfKeyPadPanel::OnInitializing(void)
 
        //Set background bitmap
        Label* pKeyBgLbl = static_cast<Label*>(GetControl(IDC_DTMF_KEY_BG_LABEL, true));
-       Bitmap* pKeyBgBitmap = AppUtility::GetBitmapFromResourcesN(IDB_KEYPAD_BG, pKeyBgLbl->GetWidth(), pKeyBgLbl->GetHeight());
+       /*Bitmap* pKeyBgBitmap = AppUtility::GetBitmapFromResourcesN(IDB_KEYPAD_BG, pKeyBgLbl->GetWidth(), pKeyBgLbl->GetHeight());
        if (pKeyBgBitmap != null)
        {
                pKeyBgLbl->SetBackgroundBitmap(*pKeyBgBitmap);
                delete pKeyBgBitmap;
                pKeyBgBitmap = null;
-       }
+       }*/
 
        //DTMF Keys panel
        Panel* pKeysPanel = new (std::nothrow) Panel();
        pKeysPanel->Construct(IDL_DTMF_KEYS_PANEL);
        pKeysPanel->SetBounds(pKeyBgLbl->GetBounds());
-       AddControl(*pKeysPanel);
+       AddControl(pKeysPanel);
 
        //Add action listener and bg to buttons.
        AddListenersToButtons();
@@ -325,7 +325,7 @@ DtmfKeyPadPanel::SetBackgroundtoButton()
        return E_SUCCESS;
 
 CATCH:
-       RemoveAllControls();
+       //RemoveAllControls();
        return r;
 }
 
@@ -413,7 +413,7 @@ DtmfKeyPadPanel::DrawTextToCanvas(const String& buttonText, int textFontStyle, C
        pTextElement->SetFont(*font);
 
        //get dimensions of the text
-       Dimension textDimension;
+       FloatDimension textDimension;
        font->GetTextExtent(buttonText, buttonText.GetLength(), textDimension);
        textDimension.height = textDimension.height + font->GetDescender();
        //create enriched text
@@ -527,6 +527,6 @@ result
 DtmfKeyPadPanel::OnTerminating(void)
 {
        result r = E_SUCCESS;
-       RemoveAllControls();
+       //RemoveAllControls();
        return r;
 }